Fix stale data being saved when setting global settings.

GNUmakefile

@@ -4,11 +4,10 @@ MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
 VERSION_CODE := 26
-VERSION_NUMBER := 0.0.22-wip
-VERSION_NAME := Look for the helpers.
+VERSION_NUMBER := 0.0.22
+VERSION_NAME := Get born soon.
 
 SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip
-LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
 
 PROJECT = tildefriends
@@ -55,6 +54,7 @@ CFLAGS += \
 	-Wall \
 	-Wextra \
 	-Wno-unused-parameter \
+	-Wno-unknown-warning-option \
 	-MMD \
 	-MP \
 	-ffunction-sections \
@@ -501,7 +501,8 @@ $(UV_OBJS): CFLAGS += \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-result \
 	-Wno-unused-variable
-$(UV_OBJS): CFLAGS := $(filter-out -flto,$(CFLAGS))
+$(UV_OBJS): CFLAGS += -fno-lto
+$(filter out/win%,$(UV_OBJS)): CFLAGS += -Wno-cast-function-type
 ifeq ($(UNAME_S),Linux)
 $(UV_OBJS): CFLAGS += \
 	-D_GNU_SOURCE
@@ -577,6 +578,7 @@ ifneq ($(UNAME_S),OpenBSD)
 $(filter-out $(BUILD_DIR)/win%,$(SODIUM_OBJS)): CFLAGS += \
 	-DHAVE_ALLOCA_H
 endif
+$(SODIUM_OBJS): CFLAGS := $(filter-out -flto,$(CFLAGS))
 
 SQLITE_SOURCES := deps/sqlite/sqlite3.c
 SQLITE_OBJS := $(call get_objs,SQLITE_SOURCES)
@@ -1034,10 +1036,6 @@ apklog:
 .PHONY: apklog
 
 fetchdeps:
-	@echo "[fetch] libuv"
-	@test -f out/deps/libuv.tar.gz && test "$$(cat out/deps/libuv.txt 2>/dev/null)" = $(LIBUV_URL) || (mkdir -p out/deps/ && curl -q $(LIBUV_URL) -o out/deps/libuv.tar.gz)
-	@test -d deps/libuv/ && test "$$(cat out/deps/libuv.txt 2>/dev/null)" = $(LIBUV_URL) || (rm -rf deps/libuv/ && mkdir -p deps/libuv/ && tar -C deps/libuv/ -m --strip=1 -xf out/deps/libuv.tar.gz)
-	@echo -n $(LIBUV_URL) > out/deps/libuv.txt
 	@echo "[fetch] sqlite"
 	@test -f out/deps/sqlite.zip && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p out/deps/ && curl -q $(SQLITE_URL) -o out/deps/sqlite.zip)
 	@test -d deps/sqlite/ && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p deps/sqlite/ && unzip -qDjo -d deps/sqlite/ out/deps/sqlite.zip)

apps/admin.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🎛",
-	"previous": "&vrpS/vE7n588iYv1p8HafDxHB+YDHTrtUbJiu9nGA9I=.sha256"
+	"previous": "&R49FywYF8CXPhoSEydLbSCgvCddeyTiBwGuDU/gqY+M=.sha256"
 }

apps/admin/script.js

@@ -27,23 +27,27 @@ function global_settings_set(key, value) {
 		});
 }
 
+function title_case(name) {
+	return name.split('_').map(x => x.charAt(0).toUpperCase() + x.substring(1)).join(' ');
+}
+
 window.addEventListener('load', function () {
 	const permission_template = (permission) => html` <code>${permission}</code>`;
 	function input_template(key, description) {
 		if (description.type === 'boolean') {
 			return html`
 				<li class="w3-row">
-					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${key}</label>
+					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${title_case(key)}</label>
 					<div class="w3-quarter w3-padding">${description.description}</div>
-					<input class="w3-quarter w3-check" type="checkbox" ?checked=${description.value} id=${'gs_' + key}></input>
-					<button class="w3-quarter w3-button w3-theme-action" @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.checked)}>Set</button>
+					<div class="w3-quarter w3-padding w3-center"><input class="w3-check" type="checkbox" ?checked=${description.value} id=${'gs_' + key}></input></div>
+					<button class="w3-quarter w3-button w3-theme-action" @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.firstChild.checked)}>Set</button>
 				</li>
 			`;
 		} else if (description.type === 'textarea') {
 			return html`
 				<li class="w3-row">
 					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold"
-						>${key}</label
+						>${title_case(key)}</label
 					>
 					<div class="w3-rest w3-padding">${description.description}</div>
 					<textarea
@@ -68,7 +72,7 @@ ${description.value}</textarea
 		} else {
 			return html`
 				<li class="w3-row">
-					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${key}</label>
+					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${title_case(key)}</label>
 					<div class="w3-quarter w3-padding">${description.description}</div>
 					<input class="w3-input w3-quarter" type="text" value="${description.value}" id=${'gs_' + key}></input>
 					<button class="w3-button w3-quarter w3-theme-action" @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.value)}>Set</button>

core/core.js

@@ -520,8 +520,9 @@ async function getProcessBlob(blobId, key, options) {
 				imports.core.globalSettingsGet = function (key) {
 					return gGlobalSettings[key];
 				};
-				imports.core.globalSettingsSet = function (key, value) {
+				imports.core.globalSettingsSet = async function (key, value) {
 					print('Setting', key, value);
+					await loadSettings();
 					gGlobalSettings[key] = value;
 					setGlobalSettings(gGlobalSettings);
 					print('Done.');
@@ -1351,7 +1352,6 @@ function storePermission(user, packageOwner, packageName, permission, allow) {
 
 export {
 	gGlobalSettings as globalSettings,
-	setGlobalSettings,
 	invoke,
 	getSessionProcessBlob,
 };

default.nix

@@ -21,14 +21,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.21";
+  version = "0.0.22";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-cBj9Hz0qT0Tqm7ivM8HPG9TNwC9iv0lTcE8XCNba8F4=";
+    hash = "sha256-0x4LJXtMUxBsWEOoWAaQlStTfvqUf4Qs/5vJZ2EvBpY=";
     fetchSubmodules = true;
   };
 

deps/c-ares_config/ares_build.h

@@ -34,23 +34,23 @@
 #define CARES_TYPEOF_ARES_SSIZE_T ssize_t
 #endif
 
-#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__)
+#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
 #define GETSERVBYNAME_R_ARGS 6
 #define GETSERVBYPORT_R_ARGS 6
 #define HAVE_GETSERVBYNAME_R 1
 #define HAVE_GETSERVBYPORT_R 1
 #endif
 
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__)
+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
 #define HAVE_PIPE2 1
 #endif
 
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__HAIKU__)
 #define GETSERVBYNAME_R_ARGS 4
 #define GETSERVBYPORT_R_ARGS 4
 #endif
 
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__)
+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
 #define HAVE_MALLOC_H 1
 #define HAVE_EPOLL 1
 #define HAVE_SYS_EPOLL_H 1
@@ -86,7 +86,9 @@
 #define HAVE_GETENV 1
 #define HAVE_GETHOSTNAME 1
 #define HAVE_GETNAMEINFO 1
+#if !defined(__HAIKU__)
 #define HAVE_GETRANDOM 1
+#endif
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_IF_INDEXTONAME 1
 #define HAVE_IF_NAMETOINDEX 1

metadata/en-US/changelogs/26.txt

@@ -0,0 +1,12 @@
+* Took an initial whack at encouraging internet-based discovery of open peers.
+* Added settings to control whether replication, room, peer exchange, and account registration are allowed.
+* Implemented prompt() on Android.
+* Fixed some incorrect cross-thread use of the main JS context.
+* Fixed yet another incorrect use of the DB from the main thread, from an RPC that isn't ever hit.  Hmm.
+* Minor admin layout fixes.
+* Added c-ares for TXT record lookups.
+* Latest libsodium-stable.
+* Latest libbacktrace.
+* Latest CodeMirror.
+* Updated to Lit 3.2.0.
+* Updated sqlite to 3.46.1.

src/android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
 	android:versionCode="26"
-	android:versionName="0.0.22-wip">
+	android:versionName="0.0.22">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/httpd.js.c

@@ -39,7 +39,7 @@ const int64_t k_refresh_interval = 1ULL * 7 * 24 * 60 * 60 * 1000;
 
 static JSValue _authenticate_jwt(tf_ssb_t* ssb, JSContext* context, const char* jwt);
 static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv);
-static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name);
+static const char* _make_session_jwt(JSContext* context, tf_ssb_t* ssb, const char* name);
 static const char* _make_set_session_cookie_header(tf_http_request_t* request, const char* session_cookie);
 
 static JSClassID _httpd_class_id;
@@ -334,7 +334,7 @@ static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_va
 		tf_free((void*)session);
 		JSValue name = !JS_IsUndefined(jwt) ? JS_GetPropertyStr(context, jwt, "name") : JS_UNDEFINED;
 		const char* name_string = !JS_IsUndefined(name) ? JS_ToCString(context, name) : NULL;
-		const char* session_token = _make_session_jwt(ssb, name_string);
+		const char* session_token = _make_session_jwt(tf_ssb_get_context(ssb), ssb, name_string);
 		const char* cookie = _make_set_session_cookie_header(request, session_token);
 		tf_free((void*)session_token);
 		JS_FreeCString(context, name_string);
@@ -1305,7 +1305,7 @@ static bool _is_name_valid(const char* name)
 	return true;
 }
 
-static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name)
+static const char* _make_session_jwt(JSContext* context, tf_ssb_t* ssb, const char* name)
 {
 	if (!name || !*name)
 	{
@@ -1319,7 +1319,6 @@ static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name)
 	char header_base64[256];
 	sodium_bin2base64(header_base64, sizeof(header_base64), (uint8_t*)header_json, strlen(header_json), sodium_base64_VARIANT_URLSAFE_NO_PADDING);
 
-	JSContext* context = tf_ssb_get_context(ssb);
 	JSValue payload = JS_NewObject(context);
 	JS_SetPropertyStr(context, payload, "name", JS_NewString(context, name));
 	JS_SetPropertyStr(context, payload, "exp", JS_NewInt64(context, now.tv_sec * 1000 + now.tv_nsec / 1000000LL + k_refresh_interval));
@@ -1493,7 +1492,7 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 					if (registered)
 					{
 						tf_free((void*)send_session);
-						send_session = _make_session_jwt(ssb, account_name);
+						send_session = _make_session_jwt(context, ssb, account_name);
 						may_become_first_admin = true;
 					}
 				}
@@ -1513,7 +1512,7 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 					if (set)
 					{
 						tf_free((void*)send_session);
-						send_session = _make_session_jwt(ssb, account_name);
+						send_session = _make_session_jwt(context, ssb, account_name);
 					}
 				}
 				if (!set)
@@ -1526,7 +1525,7 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 				if (have_account && *account_passwd && _verify_password(password, account_passwd))
 				{
 					tf_free((void*)send_session);
-					send_session = _make_session_jwt(ssb, account_name);
+					send_session = _make_session_jwt(context, ssb, account_name);
 					may_become_first_admin = true;
 				}
 				else
@@ -1538,7 +1537,7 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 		else
 		{
 			tf_free((void*)send_session);
-			send_session = _make_session_jwt(ssb, "guest");
+			send_session = _make_session_jwt(context, ssb, "guest");
 		}
 		tf_free(post_form_data);
 	}

src/ssb.c

@@ -2402,6 +2402,14 @@ tf_trace_t* tf_ssb_get_trace(tf_ssb_t* ssb)
 
 JSContext* tf_ssb_get_context(tf_ssb_t* ssb)
 {
+	if (ssb->thread_self && uv_thread_self() != ssb->thread_self)
+	{
+		const char* bt = tf_util_backtrace_string();
+		tf_printf("Acquiring JS context from non-main thread:\n%s\n", bt);
+		tf_free((void*)bt);
+		abort();
+	}
+
 	return ssb->context;
 }
 
@@ -3031,6 +3039,21 @@ int tf_ssb_server_open(tf_ssb_t* ssb, int port)
 	return status == 0 ? assigned_port : 0;
 }
 
+int tf_ssb_server_get_port(tf_ssb_t* ssb)
+{
+	int port = 0;
+	if (ssb && ssb->server.data)
+	{
+		struct sockaddr_storage name = { 0 };
+		int size = (int)sizeof(name);
+		if (uv_tcp_getsockname(&ssb->server, (struct sockaddr*)&name, &size) == 0)
+		{
+			port = ntohs(((struct sockaddr_in*)&name)->sin_port);
+		}
+	}
+	return port;
+}
+
 void tf_ssb_server_close(tf_ssb_t* ssb)
 {
 	if (ssb->server.data && !uv_is_closing((uv_handle_t*)&ssb->server))

src/ssb.h

@@ -364,6 +364,13 @@ void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address);
 */
 int tf_ssb_server_open(tf_ssb_t* ssb, int port);
 
+/**
+** Determine the port that a server is listening on.
+** @param ssb The SSB instance.
+** @return The port number, or 0 if not bound.
+*/
+int tf_ssb_server_get_port(tf_ssb_t* ssb);
+
 /**
 ** Stop listening for SHS connections.
 ** @param ssb The SSB instance.

src/ssb.rpc.c

@@ -1384,8 +1384,8 @@ static void _tf_ssb_get_peers_exhange_callback(
 	peers_exchange_t* data = user_data;
 	if (origin == k_tf_ssb_broadcast_origin_peer_exchange)
 	{
-		char fullid[k_id_base64_len] = { 0 };
-		tf_base64_encode(pub, sizeof(pub), fullid, sizeof(fullid));
+		char fullid[256] = { 0 };
+		tf_base64_encode(pub, k_id_bin_len, fullid, sizeof(fullid));
 		char* dot = strchr(fullid, '.');
 		if (dot)
 		{
@@ -1429,8 +1429,13 @@ static void _tf_ssb_rpc_peers_exchange_internal(
 			*dot = '\0';
 		}
 
+		int port = tf_ssb_connection_get_port(connection);
+		JSValue port_value = JS_GetPropertyStr(context, args, "port");
+		JS_ToInt32(context, &port, port_value);
+		JS_FreeValue(context, port_value);
+
 		char connection_string[1024] = { 0 };
-		snprintf(connection_string, sizeof(connection_string), "net:%s:%d~shs:%s", tf_ssb_connection_get_host(connection), tf_ssb_connection_get_port(connection), fullid + 1);
+		snprintf(connection_string, sizeof(connection_string), "net:%s:%d~shs:%s", tf_ssb_connection_get_host(connection), port, fullid + 1);
 		tf_ssb_add_broadcast(ssb, connection_string, k_tf_ssb_broadcast_origin_peer_exchange, k_ssb_peer_exchange_expires_seconds);
 	}
 
@@ -1478,6 +1483,7 @@ static void _tf_ssb_rpc_send_peers_exchange(tf_ssb_connection_t* connection)
 	JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "exchange"));
 	JS_SetPropertyStr(context, message, "name", name);
 	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
+	JS_SetPropertyStr(context, message, "port", JS_NewInt32(context, tf_ssb_server_get_port(ssb)));
 	JS_SetPropertyStr(context, message, "peers", _tf_ssb_get_peers_exchange(ssb));
 	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_new_request, request_number, "peers.exchange", message, _tf_ssb_rpc_peers_exchange_internal, NULL, NULL);
 	JS_FreeValue(context, message);
@@ -1496,6 +1502,7 @@ static void _tf_ssb_rpc_peers_exchange(tf_ssb_connection_t* connection, uint8_t
 
 	JSContext* context = tf_ssb_connection_get_context(connection);
 	JSValue out_message = JS_NewObject(context);
+	JS_SetPropertyStr(context, out_message, "port", JS_NewInt32(context, tf_ssb_server_get_port(ssb)));
 	JS_SetPropertyStr(context, out_message, "peers", _tf_ssb_get_peers_exchange(ssb));
 	tf_ssb_connection_rpc_send_json(connection, flags, -request_number, NULL, out_message, NULL, NULL, NULL);
 	JS_FreeValue(context, out_message);

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.22-wip"
-#define VERSION_NAME "Look for the helpers."
+#define VERSION_NUMBER "0.0.22"
+#define VERSION_NAME "Get born soon."