tasiaiso/tildefriends
1
0
Fork 0
forked from cory/tildefriends
Code Issues Pull Requests Releases Wiki Activity

ssb: Connection result preliminary hookup to ui, and fix some fallout.

Browse Source
This commit is contained in:
Cory McWilliams 2024-11-11 22:24:54 -05:00
parent b1f6ad17e1
commit 9b00b41a1e
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ssb.json
View File

@ -1,5 +1,5 @@
{ {
"type": "tildefriends-app", "type": "tildefriends-app",
"emoji": "🐌", "emoji": "🐌",
"previous": "&0ZjcRFTyAmJMm3qhqKy5Ffrue23G1CAUfc1i2WYZrzQ=.sha256" "previous": "&+UZSxjoucLAl5r/nfRNu5KXx3K/PdutGnizL/Cn2eCU=.sha256"
} }

13
apps/ssb/tf-tab-connections.js
View File

@ -12,6 +12,7 @@ class TfTabConnectionsElement extends LitElement {
stored_connections: {type: Array}, stored_connections: {type: Array},
users: {type: Object}, users: {type: Object},
server_identity: {type: String}, server_identity: {type: String},
connect_error: {type: String},
}; };
} }
@ -163,6 +164,15 @@ class TfTabConnectionsElement extends LitElement {
tfrpc.rpc.sync(); tfrpc.rpc.sync();
} }
connect(address) {
let self = this;
tfrpc.rpc.connect(address).then(function() {
self.connect_error = 'connected!';
}).catch(function(error) {
self.connect_error = error;
});
}
render() { render() {
let self = this; let self = this;
return html` return html`
@ -178,10 +188,11 @@ class TfTabConnectionsElement extends LitElement {
<button <button
class="w3-button w3-theme-d1" class="w3-button w3-theme-d1"
@click=${() => @click=${() =>
tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)} self.connect(self.renderRoot.getElementById('code').value)}
> >
Connect Connect
</button> </button>
<div ?hidden=${this.connect_error === undefined}>${this.connect_error}</div>
<h2>Broadcasts</h2> <h2>Broadcasts</h2>
<ul class="w3-ul w3-border"> <ul class="w3-ul w3-border">
${this.broadcasts ${this.broadcasts

8
src/ssb.c
View File

@ -1324,6 +1324,12 @@ static void _tf_ssb_connection_verify_identity(tf_ssb_connection_t* connection,
JS_SetPropertyStr(context, connection->object, "is_client", JS_TRUE); JS_SetPropertyStr(context, connection->object, "is_client", JS_TRUE);
connection->state = k_tf_ssb_state_verified; connection->state = k_tf_ssb_state_verified;
if (connection->connect_callback)
{
connection->connect_callback(connection, NULL, connection->connect_callback_user_data);
connection->connect_callback = NULL;
connection->connect_callback_user_data = NULL;
}
if (connection->handshake_timer.data) if (connection->handshake_timer.data)
{ {
uv_timer_stop(&connection->handshake_timer); uv_timer_stop(&connection->handshake_timer);
@ -2909,6 +2915,8 @@ void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* ke
.port = port, .port = port,
.flags = connect_flags, .flags = connect_flags,
.req.data = connect, .req.data = connect,
.callback = callback,
.user_data = user_data,
}; };
char id[k_id_base64_len] = { 0 }; char id[k_id_base64_len] = { 0 };
tf_ssb_id_bin_to_str(id, sizeof(id), key); tf_ssb_id_bin_to_str(id, sizeof(id), key);