apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&olI6SRBA/dThYusGLGhZ9T2nFKyGB9r+/kb7bJxa4gg=.sha256"
+	"previous": "&CKsS2aS8+7u9S5jDCiqBLA6xr7xLdMHclMKHjzwxcnM=.sha256"
 }

apps/ssb/tf-tab-connections.js

@@ -12,9 +12,7 @@ class TfTabConnectionsElement extends LitElement {
 			stored_connections: {type: Array},
 			users: {type: Object},
 			server_identity: {type: String},
-			connect_attempt: {type: Object},
+			connect_error: {type: String},
-			connect_message: {type: String},
-			connect_success: {type: Boolean},
 		};
 	}
 
@@ -91,36 +89,20 @@ class TfTabConnectionsElement extends LitElement {
 		`;
 	}
 
-	render_message(connection) {
-		return html`<div
-			?hidden=${this.connect_message === undefined ||
-			this.connect_attempt != connection}
-			style="cursor: pointer"
-			class=${'w3-panel ' + (this.connect_success ? 'w3-green' : 'w3-red')}
-			@click=${() => this.connect_attempt = undefined}
-		>
-			<p>${this.connect_message}</p>
-		</div>`;
-	}
-
 	render_broadcast(connection) {
-		let self = this;
 		return html`
-			<li>
+			<li class="w3-bar" style="overflow: hidden; overflow-wrap: nowrap">
-				<div class="w3-bar" style="overflow: hidden; overflow-wrap: nowrap">
+				<button
-					<button
+					class="w3-bar-item w3-button w3-theme-d1"
-						class="w3-bar-item w3-button w3-theme-d1"
+					@click=${() => tfrpc.rpc.connect(connection)}
-						@click=${() => self.connect(connection)}
+				>
-					>
+					Connect
-						Connect
+				</button>
-					</button>
+				<div class="w3-bar-item">
-					<div class="w3-bar-item">
+					${TfTabConnectionsElement.k_broadcast_emojis[connection.origin]}
-						${TfTabConnectionsElement.k_broadcast_emojis[connection.origin]}
+					<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
-						<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
+					${this.render_connection_summary(connection)}
-						${this.render_connection_summary(connection)}
-					</div>
 				</div>
-				${this.render_message(connection)}
 			</li>
 		`;
 	}
@@ -184,23 +166,11 @@ class TfTabConnectionsElement extends LitElement {
 
 	connect(address) {
 		let self = this;
-		self.connect_attempt = address;
+		tfrpc.rpc.connect(address).then(function() {
-		self.connect_message = undefined;
+			self.connect_error = 'connected!';
-		self.connect_success = false;
+		}).catch(function(error) {
-		tfrpc.rpc
+			self.connect_error = error;
-			.connect(address)
+		});
-			.then(function () {
-				if (self.connect_attempt == address) {
-					self.connect_message = 'Connected.';
-					self.connect_success = true;
-				}
-			})
-			.catch(function (error) {
-				if (self.connect_attempt == address) {
-					self.connect_message = 'Error: ' + error;
-					self.connect_success = false;
-				}
-			});
 	}
 
 	render() {
@@ -215,14 +185,14 @@ class TfTabConnectionsElement extends LitElement {
 				</button>
 				<h2>New Connection</h2>
 				<textarea class="w3-input w3-theme-d1" id="code"></textarea>
-				${this.render_message(this.renderRoot.getElementById('code')?.value)}
 				<button
 					class="w3-button w3-theme-d1"
 					@click=${() =>
-						self.connect(self.renderRoot.getElementById('code')?.value)}
+						self.connect(self.renderRoot.getElementById('code').value)}
 				>
 					Connect
 				</button>
+				<div ?hidden=${this.connect_error === undefined}>${this.connect_error}</div>
 				<h2>Broadcasts</h2>
 				<ul class="w3-ul w3-border">
 					${this.broadcasts
@@ -243,26 +213,23 @@ class TfTabConnectionsElement extends LitElement {
 				<ul class="w3-ul w3-border">
 					${this.stored_connections.map(
 						(x) => html`
-							<li>
+							<li class="w3-bar">
-								<div class="w3-bar">
+								<button
-									<button
+									class="w3-bar-item w3-button w3-theme-d1"
-										class="w3-bar-item w3-button w3-theme-d1"
+									@click=${() => self.forget_stored_connection(x)}
-										@click=${() => self.forget_stored_connection(x)}
+								>
-									>
+									Forget
-										Forget
+								</button>
-									</button>
+								<button
-									<button
+									class="w3-bar-item w3-button w3-theme-d1"
-										class="w3-bar-item w3-button w3-theme-d1"
+									@click=${() => tfrpc.rpc.connect(x)}
-										@click=${() => this.connect(x)}
+								>
-									>
+									Connect
-										Connect
+								</button>
-									</button>
+								<div class="w3-bar-item">
-									<div class="w3-bar-item">
+									<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
-										<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
+									<div><small>${x.address}:${x.port}</small></div>
-										<div><small>${x.address}:${x.port}</small></div>
-									</div>
 								</div>
-								${this.render_message(x)}
 							</li>
 						`
 					)}

deps/c-ares

@@ -1 +1 @@
-Subproject commit c29e75d54c3743783d51a609980495cf553b4bca
+Subproject commit a57ff692eeab8d21c853dc1ddaf0164f517074c3

src/ssb.c

@@ -511,9 +511,7 @@ static void _tf_ssb_write(tf_ssb_connection_t* connection, void* data, size_t si
 		if (result)
 		{
 			tf_ssb_connection_adjust_write_count(connection, -1);
-			char buffer[256];
+			_tf_ssb_connection_close(connection, "write failed");
-			snprintf(buffer, sizeof(buffer), "write failed : %s", uv_strerror(result));
-			_tf_ssb_connection_close(connection, buffer);
 			tf_free(write);
 		}
 	}
@@ -2129,9 +2127,8 @@ static bool _tf_ssb_connection_read_start(tf_ssb_connection_t* connection)
 	int result = uv_read_start((uv_stream_t*)&connection->tcp, _tf_ssb_connection_on_tcp_alloc, _tf_ssb_connection_on_tcp_recv);
 	if (result && result != UV_EALREADY)
 	{
-		char reason[1024];
+		tf_printf("uv_read_start => %s\n", uv_strerror(result));
-		snprintf(reason, sizeof(reason), "uv_read_start failed: %s", uv_strerror(result));
+		_tf_ssb_connection_close(connection, "uv_read_start failed");
-		_tf_ssb_connection_close(connection, reason);
 		return false;
 	}
 	return true;
@@ -2142,9 +2139,8 @@ static bool _tf_ssb_connection_read_stop(tf_ssb_connection_t* connection)
 	int result = uv_read_stop((uv_stream_t*)&connection->tcp);
 	if (result && result != UV_EALREADY)
 	{
-		char reason[1024];
+		tf_printf("uv_read_stop => %s\n", uv_strerror(result));
-		snprintf(reason, sizeof(reason), "uv_read_stop failed: %s", uv_strerror(result));
+		_tf_ssb_connection_close(connection, "uv_read_stop failed");
-		_tf_ssb_connection_close(connection, reason);
 		return false;
 	}
 	return true;
@@ -2164,9 +2160,7 @@ static void _tf_ssb_connection_on_connect(uv_connect_t* connect, int status)
 	}
 	else
 	{
-		char reason[1024];
+		_tf_ssb_connection_close(connection, "uv_tcp_connect failed");
-		snprintf(reason, sizeof(reason), "uv_tcp_connect failed: %s", uv_strerror(status));
-		_tf_ssb_connection_close(connection, reason);
 	}
 }
 
@@ -2785,10 +2779,9 @@ static tf_ssb_connection_t* _tf_ssb_connection_create(
 	int result = uv_tcp_connect(&connection->connect, &connection->tcp, (const struct sockaddr*)addr, _tf_ssb_connection_on_connect);
 	if (result)
 	{
-		char reason[1024];
+		tf_printf("uv_tcp_connect(%s): %s\n", host, uv_strerror(result));
-		snprintf(reason, sizeof(reason), "uv_tcp_connect(%s) => %s", host, uv_strerror(result));
 		connection->connect.data = NULL;
-		_tf_ssb_connection_destroy(connection, reason);
+		_tf_ssb_connection_destroy(connection, "connect failed");
 	}
 	else
 	{
@@ -2973,21 +2966,15 @@ static void _tf_ssb_on_connection(uv_stream_t* stream, int status)
 	connection->object = JS_NewObjectClass(ssb->context, _connection_class_id);
 	JS_SetOpaque(connection->object, connection);
 
-	int result = uv_tcp_init(ssb->loop, &connection->tcp);
+	if (uv_tcp_init(ssb->loop, &connection->tcp) != 0)
-	if (result != 0)
 	{
-		char reason[1024];
+		_tf_ssb_connection_destroy(connection, "init failed");
-		snprintf(reason, sizeof(reason), "uv_tcp_init() => %s", uv_strerror(result));
-		_tf_ssb_connection_destroy(connection, reason);
 		return;
 	}
 
-	result = uv_accept(stream, (uv_stream_t*)&connection->tcp);
+	if (uv_accept(stream, (uv_stream_t*)&connection->tcp) != 0)
-	if (result != 0)
 	{
-		char reason[1024];
+		_tf_ssb_connection_destroy(connection, "accept failed");
-		snprintf(reason, sizeof(reason), "uv_accept() => %s", uv_strerror(result));
-		_tf_ssb_connection_destroy(connection, reason);
 		return;
 	}