ssb: Move identity info gathering to db.

GNUmakefile

@@ -16,9 +16,9 @@ MAKEFLAGS += --no-builtin-rules
 ## LD := Linker.
 ## ANDROID_SDK := Path to the Android SDK.
 
-VERSION_CODE := 33
-VERSION_CODE_IOS := 9
-VERSION_NUMBER := 0.0.28
+VERSION_CODE := 34
+VERSION_CODE_IOS := 11
+VERSION_NUMBER := 0.0.29-wip
 VERSION_NAME := This program kills fascists.
 
 IPHONEOS_VERSION_MIN=14.0

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦀",
-	"previous": "&jAAzd36Nmpw0sRA1Dx9wLiIwGX+q//+S/Han+RLlEOw=.sha256"
+	"previous": "&Qae0CxJGEH7OspuapuXX/GurmV+VBtQiMhHRmCBKCwU=.sha256"
 }

apps/ssb/tf-tab-connections.js

@@ -206,6 +206,21 @@ class TfTabConnectionsElement extends LitElement {
 			});
 	}
 
+	toggle_accordian(id) {
+		let element = this.renderRoot.getElementById(id);
+		element.classList.toggle('w3-hide');
+	}
+
+	valid_connections() {
+		return this.connections.filter((x) => x.tunnel === undefined);
+	}
+
+	valid_broadcasts() {
+		return this.broadcasts
+			.filter((x) => x.address)
+			.filter((x) => this.connections.map((c) => c.id).indexOf(x.pubkey) == -1);
+	}
+
 	render() {
 		let self = this;
 		return html`
@@ -220,27 +235,33 @@ class TfTabConnectionsElement extends LitElement {
 				>
 					Connect
 				</button>
-				<h2>Broadcasts</h2>
-				<ul class="w3-ul w3-border">
-					${this.broadcasts
-						.filter((x) => x.address)
-						.filter(
-							(x) => self.connections.map((c) => c.id).indexOf(x.pubkey) == -1
-						)
-						.map((x) => self.render_broadcast(x))}
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('connections')}
+				>
+					Connections (${this.valid_connections().length})
+				</h2>
+				<ul class="w3-ul w3-border" id="connections">
+					${this.valid_connections().map(
+						(x) => html` <li class="w3-bar">${this.render_connection(x)}</li> `
+					)}
 				</ul>
-				<h2>Connections</h2>
-				<ul class="w3-ul w3-border">
-					${this.connections
-						.filter((x) => x.tunnel === undefined)
-						.map(
-							(x) => html`
-								<li class="w3-bar">${this.render_connection(x)}</li>
-							`
-						)}
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('broadcasts')}
+				>
+					Broadcasts (${this.valid_broadcasts().length})
+				</h2>
+				<ul class="w3-ul w3-border w3-hide" id="broadcasts">
+					${this.valid_broadcasts().map((x) => self.render_broadcast(x))}
 				</ul>
-				<h2>Stored Connections</h2>
-				<ul class="w3-ul w3-border">
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('stored_connections')}
+				>
+					Stored Connections (${this.stored_connections.length})
+				</h2>
+				<ul class="w3-ul w3-border w3-hide" id="stored_connections">
 					${this.stored_connections.map(
 						(x) => html`
 							<li>
@@ -267,8 +288,13 @@ class TfTabConnectionsElement extends LitElement {
 						`
 					)}
 				</ul>
-				<h2>Local Accounts</h2>
-				<div class="w3-container">
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('local_accounts')}
+				>
+					Local Accounts (${this.identities.length})
+				</h2>
+				<div class="w3-container w3-hide" id="local_accounts">
 					${this.identities.map(
 						(x) =>
 							html`<div

core/app.js

@@ -1,53 +1,26 @@
 import * as core from './core.js';
 
-let g_next_id = 1;
-let g_calls = {};
-
 let gSessionIndex = 0;
 
-/**
- * TODOC
- * @returns
- */
-function makeSessionId() {
-	return 'session_' + (gSessionIndex++).toString();
-}
-
-/**
- * TODOC
- * @returns
- */
 function App() {
-	this._on_output = null;
 	this._send_queue = [];
+	this.calls = {};
+	this._next_call_id = 1;
 	return this;
 }
 
-/**
- * TODOC
- * @param {*} callback
- */
-App.prototype.readOutput = function (callback) {
-	this._on_output = callback;
-};
-
-/**
- * TODOC
- * @param {*} api
- * @returns
- */
 App.prototype.makeFunction = function (api) {
 	let self = this;
 	let result = function () {
-		let id = g_next_id++;
-		while (!id || g_calls[id]) {
-			id = g_next_id++;
+		let id = self._next_call_id++;
+		while (!id || self.calls[id]) {
+			id = self._next_call_id++;
 		}
 		let promise = new Promise(function (resolve, reject) {
-			g_calls[id] = {resolve: resolve, reject: reject};
+			self.calls[id] = {resolve: resolve, reject: reject};
 		});
 		let message = {
-			message: 'tfrpc',
+			action: 'tfrpc',
 			method: api[0],
 			params: [...arguments],
 			id: id,
@@ -59,10 +32,6 @@ App.prototype.makeFunction = function (api) {
 	return result;
 };
 
-/**
- * TODOC
- * @param {*} message
- */
 App.prototype.send = function (message) {
 	if (this._send_queue) {
 		if (this._on_output) {
@@ -77,11 +46,6 @@ App.prototype.send = function (message) {
 	}
 };
 
-/**
- * TODOC
- * @param {*} request
- * @param {*} response
- */
 exports.app_socket = async function socket(request, response) {
 	let process;
 	let options = {};
@@ -102,10 +66,16 @@ exports.app_socket = async function socket(request, response) {
 			try {
 				message = JSON.parse(event.data);
 			} catch (error) {
-				print('ERROR', error, event.data, event.data.length, event.opCode);
+				print(
+					'WebSocket error:',
+					error,
+					event.data,
+					event.data.length,
+					event.opCode
+				);
 				return;
 			}
-			if (message.action == 'hello') {
+			if (!process && message.action == 'hello') {
 				let packageOwner;
 				let packageName;
 				let blobId;
@@ -122,7 +92,7 @@ exports.app_socket = async function socket(request, response) {
 					if (!blobId) {
 						response.send(
 							JSON.stringify({
-								message: 'tfrpc',
+								action: 'tfrpc',
 								method: 'error',
 								params: [message.path + ' not found'],
 								id: -1,
@@ -163,7 +133,7 @@ exports.app_socket = async function socket(request, response) {
 				options.packageOwner = packageOwner;
 				options.packageName = packageName;
 				options.url = message.url;
-				let sessionId = makeSessionId();
+				let sessionId = 'session_' + (gSessionIndex++).toString();
 				if (blobId) {
 					if (message.edit_only) {
 						response.send(
@@ -175,9 +145,24 @@ exports.app_socket = async function socket(request, response) {
 					}
 				}
 				if (process) {
-					process.app.readOutput(function (message) {
+					process.client_api.tfrpc = function (message) {
+						if (message.id) {
+							let calls = process?.app?.calls;
+							if (calls) {
+								let call = calls[message.id];
+								if (call) {
+									if (message.error !== undefined) {
+										call.reject(message.error);
+									} else {
+										call.resolve(message.result);
+									}
+									delete calls[message.id];
+								}
+							}
+						}
+					};
+					process.app._on_output = (message) =>
 						response.send(JSON.stringify(message), 0x1);
-					});
 					process.app.send();
 				}
 
@@ -206,26 +191,13 @@ exports.app_socket = async function socket(request, response) {
 				if (process && process.timeout > 0) {
 					setTimeout(ping, process.timeout);
 				}
-			} else if (message.action == 'resetPermission') {
-				if (process) {
-					process.resetPermission(message.permission);
-				}
-			} else if (message.action == 'setActiveIdentity') {
-				process.setActiveIdentity(message.identity);
-			} else if (message.action == 'createIdentity') {
-				await process.createIdentity();
-			} else if (message.message == 'tfrpc') {
-				if (message.id && g_calls[message.id]) {
-					if (message.error !== undefined) {
-						g_calls[message.id].reject(message.error);
-					} else {
-						g_calls[message.id].resolve(message.result);
-					}
-					delete g_calls[message.id];
-				}
 			} else {
-				if (process && process.eventHandlers['message']) {
-					await core.invoke(process.eventHandlers['message'], [message]);
+				if (process) {
+					if (process.client_api[message.action]) {
+						process.client_api[message.action](message);
+					} else if (process.eventHandlers['message']) {
+						await core.invoke(process.eventHandlers['message'], [message]);
+					}
 				}
 			}
 		} else if (event.opCode == 0x8) {

core/client.js

@@ -1325,7 +1325,7 @@ function _receive_websocket_message(message) {
 				line.append(key, message.stats[key]);
 			}
 		}
-	} else if (message && message.message === 'tfrpc' && message.method) {
+	} else if (message && message.action === 'tfrpc' && message.method) {
 		let api = k_api[message.method];
 		let id = message.id;
 		let params = message.params;
@@ -1333,14 +1333,14 @@ function _receive_websocket_message(message) {
 			Promise.resolve(api.func(...params))
 				.then(function (result) {
 					send({
-						message: 'tfrpc',
+						action: 'tfrpc',
 						id: id,
 						result: result,
 					});
 				})
 				.catch(function (error) {
 					send({
-						message: 'tfrpc',
+						action: 'tfrpc',
 						id: id,
 						error: error,
 					});

core/core.js

@@ -3,31 +3,22 @@ import * as http from './http.js';
 
 let gProcesses = {};
 let gStatsTimer = false;
-let kPingInterval = 60 * 1000;
+let g_handler_index = 0;
 
-/**
- * TODOC
- * @param {*} out
- * @param {*} error
- */
-function printError(out, error) {
+const k_ping_interval = 60 * 1000;
+
+function printError(error) {
 	if (error.stackTrace) {
-		out.print(error.fileName + ':' + error.lineNumber + ': ' + error.message);
-		out.print(error.stackTrace);
+		print(error.fileName + ':' + error.lineNumber + ': ' + error.message);
+		print(error.stackTrace);
 	} else {
 		for (let [k, v] of Object.entries(error)) {
-			out.print(k, v);
+			print(k, v);
 		}
-		out.print(error.toString());
+		print(error.toString());
 	}
 }
 
-/**
- * TODOC
- * @param {*} handlers
- * @param {*} argv
- * @returns
- */
 function invoke(handlers, argv) {
 	let promises = [];
 	if (handlers) {
@@ -48,12 +39,6 @@ function invoke(handlers, argv) {
 	return Promise.all(promises);
 }
 
-/**
- * TODOC
- * @param {*} eventName
- * @param {*} argv
- * @returns
- */
 function broadcastEvent(eventName, argv) {
 	let promises = [];
 	for (let process of Object.values(gProcesses)) {
@@ -64,11 +49,6 @@ function broadcastEvent(eventName, argv) {
 	return Promise.all(promises);
 }
 
-/**
- * TODOC
- * @param {*} message
- * @returns
- */
 function broadcast(message) {
 	let sender = this;
 	let promises = [];
@@ -85,12 +65,6 @@ function broadcast(message) {
 	return Promise.all(promises);
 }
 
-/**
- * TODOC
- * @param {String} eventName
- * @param {*} argv
- * @returns
- */
 function broadcastAppEventToUser(
 	user,
 	packageOwner,
@@ -113,12 +87,6 @@ function broadcastAppEventToUser(
 	return Promise.all(promises);
 }
 
-/**
- * TODOC
- * @param {*} caller
- * @param {*} process
- * @returns
- */
 function getUser(caller, process) {
 	return {
 		key: process.key,
@@ -129,12 +97,6 @@ function getUser(caller, process) {
 	};
 }
 
-/**
- * TODOC
- * @param {*} user
- * @param {*} process
- * @returns
- */
 async function getApps(user, process) {
 	if (
 		process.credentials &&
@@ -161,28 +123,13 @@ async function getApps(user, process) {
 	return {};
 }
 
-/**
- * TODOC
- * @param {*} from
- * @param {*} to
- * @param {*} message
- * @returns
- */
 function postMessageInternal(from, to, message) {
 	if (to.eventHandlers['message']) {
 		return invoke(to.eventHandlers['message'], [getUser(from, from), message]);
 	}
 }
 
-/**
- * TODOC
- * @param {*} blobId
- * @param {*} key
- * @param {*} options
- * @returns
- */
 async function getProcessBlob(blobId, key, options) {
-	// TODO(tasiaiso): break this down ?
 	let process = gProcesses[key];
 	if (!process && !(options && 'create' in options && !options.create)) {
 		let resolveReady;
@@ -201,7 +148,7 @@ async function getProcessBlob(blobId, key, options) {
 			}
 			process.lastActive = Date.now();
 			process.lastPing = null;
-			process.timeout = kPingInterval;
+			process.timeout = k_ping_interval;
 			process.ready = new Promise(function (resolve, reject) {
 				resolveReady = resolve;
 				rejectReady = reject;
@@ -461,10 +408,10 @@ async function getProcessBlob(blobId, key, options) {
 					if (process.app) {
 						process.app.makeFunction(['error'])(error);
 					} else {
-						printError({print: print}, error);
+						printError(error);
 					}
 				} catch (e) {
-					printError({print: print}, error);
+					printError(error);
 				}
 			};
 			imports.ssb = Object.fromEntries(
@@ -649,17 +596,26 @@ async function getProcessBlob(blobId, key, options) {
 					permissions: await imports.core.permissionsGranted(),
 				});
 			};
-			process.resetPermission = async function resetPermission(permission) {
-				let user = process?.credentials?.session?.name;
-				await ssb.setUserPermission(
-					user,
-					options?.packageOwner,
-					options?.packageName,
-					permission,
-					undefined
-				);
-				return process.sendPermissions();
+			process.client_api = {
+				createIdentity: function () {
+					return process.createIdentity();
+				},
+				resetPermission: async function resetPermission(message) {
+					let user = process?.credentials?.session?.name;
+					await ssb.setUserPermission(
+						user,
+						options?.packageOwner,
+						options?.packageName,
+						message.permission,
+						undefined
+					);
+					return process.sendPermissions();
+				},
+				setActiveIdentity: function setActiveIdentity(message) {
+					return process.setActiveIdentity(message.identity);
+				},
 			};
+			ssb.registerImports(imports, process);
 			process.task.setImports(imports);
 			process.task.activate();
 			let source = await ssb.blobGet(blobId);
@@ -686,7 +642,7 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				}
 			} catch (e) {
-				printError({print: print}, e);
+				printError(e);
 			}
 			broadcastEvent('onSessionBegin', [getUser(process, process)]);
 			if (process.app) {
@@ -700,14 +656,10 @@ async function getProcessBlob(blobId, key, options) {
 				sendStats();
 			}
 		} catch (error) {
-			if (process.app) {
-				if (process?.task?.onError) {
-					process.task.onError(error);
-				} else {
-					printError({print: print}, error);
-				}
+			if (process?.app && process?.task?.onError) {
+				process.task.onError(error);
 			} else {
-				printError({print: print}, error);
+				printError(error);
 			}
 			rejectReady(error);
 		}
@@ -727,9 +679,6 @@ ssb.addEventListener('connections', function () {
 	broadcastEvent('onConnectionsChanged', []);
 });
 
-/**
- * TODOC
- */
 async function loadSettings() {
 	let data = {};
 	try {
@@ -748,9 +697,6 @@ async function loadSettings() {
 	return data;
 }
 
-/**
- * TODOC
- */
 function sendStats() {
 	let apps = Object.values(gProcesses)
 		.filter((process) => process.app)
@@ -766,8 +712,6 @@ function sendStats() {
 	}
 }
 
-let g_handler_index = 0;
-
 exports.callAppHandler = async function callAppHandler(
 	response,
 	app_blob_id,

default.nix

@@ -25,14 +25,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.27.1";
+  version = "0.0.28";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-3t1m9ZomQF3DteWyALJWrnCq0EAROEK8shKXh6Ao38c=";
+    hash = "sha256-vcLJCXgIrjC37t9oavK2QMRcMJljghuzKDYxQ4nyTcE=";
     fetchSubmodules = true;
   };
 

src/android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="33"
-	android:versionName="0.0.28">
+	android:versionCode="34"
+	android:versionName="0.0.29-wip">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/api.js.c

@@ -0,0 +1,19 @@
+#include "api.js.h"
+
+#include "log.h"
+
+#include <quickjs.h>
+
+static JSValue _tf_api_register_imports(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
+{
+	return JS_UNDEFINED;
+}
+
+void tf_api_register(JSContext* context)
+{
+	JSValue global = JS_GetGlobalObject(context);
+	JSValue ssb = JS_GetPropertyStr(context, global, "ssb");
+	JS_SetPropertyStr(context, ssb, "registerImports", JS_NewCFunction(context, _tf_api_register_imports, "registerImports", 2));
+	JS_FreeValue(context, ssb);
+	JS_FreeValue(context, global);
+}

src/api.js.h

@@ -0,0 +1,18 @@
+#pragma once
+
+/**
+** \defgroup api_js JS API
+** Functions that are ultimately exposed to apps.
+** @{
+*/
+
+/** A JS context. */
+typedef struct JSContext JSContext;
+
+/**
+** Register JS API functions.
+** @param context The JS context.
+*/
+void tf_api_register(JSContext* context);
+
+/** @} */

src/http.c

@@ -84,6 +84,7 @@ typedef struct _tf_http_listener_t
 typedef struct _tf_http_t
 {
 	bool is_shutting_down;
+	bool is_in_destroy;
 
 	tf_http_listener_t** listeners;
 	int listeners_count;
@@ -395,7 +396,7 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
 
 				if (fin)
 				{
-					if (connection->request->on_message)
+					if (connection->request && connection->request->on_message)
 					{
 						tf_trace_begin(connection->http->trace, connection->trace_name ? connection->trace_name : "websocket");
 						connection->request->on_message(connection->request, connection->fragment_length ? connection->fragment_op_code : op_code,
@@ -786,7 +787,13 @@ static void _http_free_listener_on_close(uv_handle_t* handle)
 
 void tf_http_destroy(tf_http_t* http)
 {
+	if (http->is_in_destroy)
+	{
+		return;
+	}
+
 	http->is_shutting_down = true;
+	http->is_in_destroy = true;
 
 	for (int i = 0; i < http->connections_count; i++)
 	{
@@ -845,6 +852,10 @@ void tf_http_destroy(tf_http_t* http)
 
 		tf_free(http);
 	}
+	else
+	{
+		http->is_in_destroy = false;
+	}
 }
 
 const char* tf_http_status_text(int status)
@@ -963,9 +974,42 @@ static void _http_write(tf_http_connection_t* connection, const void* data, size
 	}
 }
 
-void tf_http_request_send(tf_http_request_t* request, const void* data, size_t size)
+void tf_http_request_websocket_send(tf_http_request_t* request, int op_code, const void* data, size_t size)
 {
-	_http_write(request->connection, data, size);
+	uint8_t* copy = tf_malloc(size + 16);
+	bool fin = true;
+	size_t header = 1;
+	copy[0] = (fin ? (1 << 7) : 0) | (op_code & 0xf);
+	if (size < 126)
+	{
+		copy[1] = size;
+		header += 1;
+	}
+	else if (size < (1 << 16))
+	{
+		copy[1] = 126;
+		copy[2] = (size >> 8) & 0xff;
+		copy[3] = (size >> 0) & 0xff;
+		header += 3;
+	}
+	else
+	{
+		uint32_t high = ((uint64_t)size >> 32) & 0xffffffff;
+		uint32_t low = (size >> 0) & 0xffffffff;
+		copy[1] = 127;
+		copy[2] = (high >> 24) & 0xff;
+		copy[3] = (high >> 16) & 0xff;
+		copy[4] = (high >> 8) & 0xff;
+		copy[5] = (high >> 0) & 0xff;
+		copy[6] = (low >> 24) & 0xff;
+		copy[7] = (low >> 16) & 0xff;
+		copy[8] = (low >> 8) & 0xff;
+		copy[9] = (low >> 0) & 0xff;
+		header += 9;
+	}
+	memcpy(copy + header, data, size);
+	_http_write(request->connection, copy, header + size);
+	tf_free(copy);
 }
 
 void tf_http_respond(tf_http_request_t* request, int status, const char** headers, int headers_count, const void* body, size_t content_length)

src/http.h

@@ -209,10 +209,11 @@ const char* tf_http_get_cookie(const char* cookie_header, const char* name);
 ** Send a websocket message.
 ** @param request The HTTP request which was previously updated to a websocket
 ** session with tf_http_request_websocket_upgrade().
+** @param op_code Websocket op code.
 ** @param data The message data.
 ** @param size The size of data.
 */
-void tf_http_request_send(tf_http_request_t* request, const void* data, size_t size);
+void tf_http_request_websocket_send(tf_http_request_t* request, int op_code, const void* data, size_t size);
 
 /**
 ** Upgrade an HTTP request to a websocket session.

src/httpd.js.c

@@ -152,44 +152,9 @@ static JSValue _httpd_response_send(JSContext* context, JSValueConst this_val, i
 	tf_http_request_t* request = JS_GetOpaque(this_val, _httpd_request_class_id);
 	int opcode = 0x1;
 	JS_ToInt32(context, &opcode, argv[1]);
-	uint64_t length = 0;
-	size_t length_size = 0;
-	const char* message = JS_ToCStringLen(context, &length_size, argv[0]);
-	length = length_size;
-	uint8_t* copy = tf_malloc(length + 16);
-	bool fin = true;
-	size_t header = 1;
-	copy[0] = (fin ? (1 << 7) : 0) | (opcode & 0xf);
-	if (length < 126)
-	{
-		copy[1] = length;
-		header += 1;
-	}
-	else if (length < (1 << 16))
-	{
-		copy[1] = 126;
-		copy[2] = (length >> 8) & 0xff;
-		copy[3] = (length >> 0) & 0xff;
-		header += 3;
-	}
-	else
-	{
-		uint32_t high = (length >> 32) & 0xffffffff;
-		uint32_t low = (length >> 0) & 0xffffffff;
-		copy[1] = 127;
-		copy[2] = (high >> 24) & 0xff;
-		copy[3] = (high >> 16) & 0xff;
-		copy[4] = (high >> 8) & 0xff;
-		copy[5] = (high >> 0) & 0xff;
-		copy[6] = (low >> 24) & 0xff;
-		copy[7] = (low >> 16) & 0xff;
-		copy[8] = (low >> 8) & 0xff;
-		copy[9] = (low >> 0) & 0xff;
-		header += 9;
-	}
-	memcpy(copy + header, message, length);
-	tf_http_request_send(request, copy, header + length);
-	tf_free(copy);
+	size_t length = 0;
+	const char* message = JS_ToCStringLen(context, &length, argv[0]);
+	tf_http_request_websocket_send(request, opcode, message, length);
 	JS_FreeCString(context, message);
 	return JS_UNDEFINED;
 }

src/ios/Info.plist

@@ -13,13 +13,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.28</string>
+	<string>0.0.29</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>11</string>
 	<key>DTPlatformName</key>
 	<string>iphoneos</string>
 	<key>LSRequiresIPhoneOS</key>

src/mem.c

@@ -22,8 +22,6 @@ static int64_t s_tls_malloc_size;
 static int64_t s_js_malloc_size;
 static int64_t s_sqlite_malloc_size;
 
-extern uint32_t fnv32a(const void* buffer, int length, uint32_t start);
-
 static size_t _tf_mem_round_up(size_t size)
 {
 	return (size + 7) & ~7;
@@ -156,7 +154,7 @@ static void _tf_mem_summarize(void* ptr, size_t size, int frames_count, void* co
 {
 	summary_t* summary = user_data;
 	tf_mem_allocation_t allocation = {
-		.stack_hash = fnv32a(frames, sizeof(void*) * frames_count, 0),
+		.stack_hash = tf_util_fnv32a(frames, sizeof(void*) * frames_count, 0),
 		.count = 1,
 		.size = size,
 		.frames_count = frames_count,

src/ssb.db.c

@@ -2331,3 +2331,120 @@ bool tf_ssb_db_has_invite(sqlite3* db, const char* id)
 	}
 	return has;
 }
+
+static void _tf_ssb_db_get_identity_info_visit(const char* identity, void* user_data)
+{
+	tf_ssb_identity_info_t* info = user_data;
+	info->identity = tf_resize_vec(info->identity, (info->count + 1) * sizeof(char*));
+	info->name = tf_resize_vec(info->name, (info->count + 1) * sizeof(char*));
+	char buffer[k_id_base64_len];
+	snprintf(buffer, sizeof(buffer), "@%s", identity);
+	info->identity[info->count] = tf_strdup(buffer);
+	info->name[info->count] = NULL;
+	info->count++;
+}
+
+tf_ssb_identity_info_t* tf_ssb_db_get_identity_info(tf_ssb_t* ssb, const char* user, const char* package_owner, const char* package_name)
+{
+	tf_ssb_identity_info_t* info = tf_malloc(sizeof(tf_ssb_identity_info_t));
+	*info = (tf_ssb_identity_info_t) { 0 };
+
+	char id[k_id_base64_len] = "";
+	if (tf_ssb_db_user_has_permission(ssb, NULL, user, "administration"))
+	{
+		if (tf_ssb_whoami(ssb, id, sizeof(id)))
+		{
+			_tf_ssb_db_get_identity_info_visit(*id == '@' ? id + 1 : id, info);
+		}
+	}
+	tf_ssb_db_identity_visit(ssb, user, _tf_ssb_db_get_identity_info_visit, info);
+
+	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
+	sqlite3_stmt* statement = NULL;
+	int result = sqlite3_prepare(db,
+		"SELECT author, name FROM ( "
+		"	SELECT "
+		"		messages.author, "
+		"		RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank, "
+		"		messages.content ->> 'name' AS name "
+		"	FROM messages "
+		"	JOIN identities ON messages.author = ('@' || identities.public_key) "
+		"	WHERE "
+		"		(identities.user = ? OR identities.public_key = ?) AND "
+		"		json_extract(messages.content, '$.type') = 'about' AND "
+		"		content ->> 'about' = messages.author AND name IS NOT NULL) "
+		"WHERE author_rank = 1 ",
+		-1, &statement, NULL);
+	if (result == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, user, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, *id == '@' ? id + 1 : id, -1, NULL) == SQLITE_OK)
+		{
+			int r = SQLITE_OK;
+			while ((r = sqlite3_step(statement)) == SQLITE_ROW)
+			{
+				const char* identity = (const char*)sqlite3_column_text(statement, 0);
+				const char* name = (const char*)sqlite3_column_text(statement, 1);
+				for (int i = 0; i < info->count; i++)
+				{
+					if (!info->name[i] && strcmp(info->identity[i], identity) == 0)
+					{
+						info->name[i] = tf_strdup(name);
+						break;
+					}
+				}
+			}
+		}
+		sqlite3_finalize(statement);
+	}
+	else
+	{
+		tf_printf("prepare failed: %s.\n", sqlite3_errmsg(db));
+	}
+
+	tf_ssb_db_identity_get_active(db, user, package_owner, package_name, info->active_identity, sizeof(info->active_identity));
+	if (!*info->active_identity && info->count)
+	{
+		snprintf(info->active_identity, sizeof(info->active_identity), "%s", info->identity[0]);
+	}
+	tf_ssb_release_db_reader(ssb, db);
+
+	size_t size = sizeof(tf_ssb_identity_info_t) + sizeof(char*) * info->count * 2;
+	for (int i = 0; i < info->count; i++)
+	{
+		size += strlen(info->identity[i]) + 1;
+		size += info->name[i] ? strlen(info->name[i]) + 1 : 0;
+	}
+	tf_ssb_identity_info_t* copy = tf_malloc(size);
+	*copy = *info;
+
+	copy->identity = (const char**)(copy + 1);
+	copy->name = (const char**)(copy + 1) + copy->count;
+
+	char* p = (char*)((const char**)(copy + 1) + copy->count * 2);
+
+	for (int i = 0; i < info->count; i++)
+	{
+		size_t length = strlen(info->identity[i]);
+		memcpy(p, info->identity[i], length + 1);
+		copy->identity[i] = p;
+		p += length + 1;
+		tf_free((void*)info->identity[i]);
+
+		if (info->name[i])
+		{
+			length = strlen(info->name[i]);
+			memcpy(p, info->name[i], length + 1);
+			copy->name[i] = p;
+			p += length + 1;
+			tf_free((void*)info->name[i]);
+		}
+		else
+		{
+			copy->name[i] = NULL;
+		}
+	}
+	tf_free(info->name);
+	tf_free(info->identity);
+	tf_free(info);
+	return copy;
+}

src/ssb.db.h

@@ -564,4 +564,29 @@ int tf_ssb_sqlite_authorizer(void* user_data, int action_code, const char* arg0,
 */
 bool tf_ssb_db_has_invite(sqlite3* db, const char* id);
 
+/**
+** Identity information
+*/
+typedef struct _tf_ssb_identity_info_t
+{
+	/** An array of identities. */
+	const char** identity;
+	/** A array of identities, one for each identity. */
+	const char** name;
+	/** The number of elements in both the identity and name arrays. */
+	int count;
+	/** The active identity. */
+	char active_identity[k_id_base64_len];
+} tf_ssb_identity_info_t;
+
+/**
+** Get available identities, names, and the active identity for a user.
+** @param ssb The SSB instance.
+** @param user The user name.
+** @param package_owner The owner of the package for which identity info is being fetched.
+** @param package_name The name of the package for which identity info is being fetched.
+** @return A struct of identities, names, and the active identity.  Free with tf_free().
+*/
+tf_ssb_identity_info_t* tf_ssb_db_get_identity_info(tf_ssb_t* ssb, const char* user, const char* package_owner, const char* package_name);
+
 /** @} */

src/ssb.js.c

@@ -613,87 +613,14 @@ typedef struct _identity_info_work_t
 	const char* name;
 	const char* package_owner;
 	const char* package_name;
-	int count;
-	char** identities;
-	char** names;
-	int result;
-	char active_identity[k_id_base64_len];
+	tf_ssb_identity_info_t* info;
 	JSValue promise[2];
 } identity_info_work_t;
 
-static void _tf_ssb_getIdentityInfo_visit(const char* identity, void* data)
-{
-	identity_info_work_t* request = data;
-	request->identities = tf_resize_vec(request->identities, (request->count + 1) * sizeof(char*));
-	request->names = tf_resize_vec(request->names, (request->count + 1) * sizeof(char*));
-	char buffer[k_id_base64_len];
-	snprintf(buffer, sizeof(buffer), "@%s", identity);
-	request->identities[request->count] = tf_strdup(buffer);
-	request->names[request->count] = NULL;
-	request->count++;
-}
-
 static void _tf_ssb_getIdentityInfo_work(tf_ssb_t* ssb, void* user_data)
 {
 	identity_info_work_t* request = user_data;
-	char id[k_id_base64_len] = "";
-	if (tf_ssb_db_user_has_permission(ssb, NULL, request->name, "administration"))
-	{
-		if (tf_ssb_whoami(ssb, id, sizeof(id)))
-		{
-			_tf_ssb_getIdentityInfo_visit(*id == '@' ? id + 1 : id, request);
-		}
-	}
-	tf_ssb_db_identity_visit(ssb, request->name, _tf_ssb_getIdentityInfo_visit, request);
-
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	sqlite3_stmt* statement = NULL;
-	request->result = sqlite3_prepare(db,
-		"SELECT author, name FROM ( "
-		"	SELECT "
-		"		messages.author, "
-		"		RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank, "
-		"		messages.content ->> 'name' AS name "
-		"	FROM messages "
-		"	JOIN identities ON messages.author = ('@' || identities.public_key) "
-		"	WHERE "
-		"		(identities.user = ? OR identities.public_key = ?) AND "
-		"		json_extract(messages.content, '$.type') = 'about' AND "
-		"		content ->> 'about' = messages.author AND name IS NOT NULL) "
-		"WHERE author_rank = 1 ",
-		-1, &statement, NULL);
-	if (request->result == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, request->name, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, *id == '@' ? id + 1 : id, -1, NULL) == SQLITE_OK)
-		{
-			int r = SQLITE_OK;
-			while ((r = sqlite3_step(statement)) == SQLITE_ROW)
-			{
-				const char* identity = (const char*)sqlite3_column_text(statement, 0);
-				const char* name = (const char*)sqlite3_column_text(statement, 1);
-				for (int i = 0; i < request->count; i++)
-				{
-					if (!request->names[i] && strcmp(request->identities[i], identity) == 0)
-					{
-						request->names[i] = tf_strdup(name);
-						break;
-					}
-				}
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-	else
-	{
-		tf_printf("prepare failed: %s.\n", sqlite3_errmsg(db));
-	}
-
-	tf_ssb_db_identity_get_active(db, request->name, request->package_owner, request->package_name, request->active_identity, sizeof(request->active_identity));
-	if (!*request->active_identity && request->count)
-	{
-		snprintf(request->active_identity, sizeof(request->active_identity), "%s", request->identities[0]);
-	}
-	tf_ssb_release_db_reader(ssb, db);
+	request->info = tf_ssb_db_get_identity_info(ssb, request->name, request->package_owner, request->package_name);
 }
 
 static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void* user_data)
@@ -703,20 +630,20 @@ static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void*
 	JSValue result = JS_NewObject(context);
 
 	JSValue identities = JS_NewArray(context);
-	for (int i = 0; i < request->count; i++)
+	for (int i = 0; i < request->info->count; i++)
 	{
-		JS_SetPropertyUint32(context, identities, i, JS_NewString(context, request->identities[i]));
+		JS_SetPropertyUint32(context, identities, i, JS_NewString(context, request->info->identity[i]));
 	}
 	JS_SetPropertyStr(context, result, "identities", identities);
 
 	JSValue names = JS_NewObject(context);
-	for (int i = 0; i < request->count; i++)
+	for (int i = 0; i < request->info->count; i++)
 	{
-		JS_SetPropertyStr(context, names, request->identities[i], JS_NewString(context, request->names[i] ? request->names[i] : request->identities[i]));
+		JS_SetPropertyStr(context, names, request->info->identity[i], JS_NewString(context, request->info->name[i] ? request->info->name[i] : request->info->identity[i]));
 	}
 	JS_SetPropertyStr(context, result, "names", names);
 
-	JS_SetPropertyStr(context, result, "identity", JS_NewString(context, request->active_identity));
+	JS_SetPropertyStr(context, result, "identity", JS_NewString(context, request->info->active_identity));
 
 	JSValue error = JS_Call(context, request->promise[0], JS_UNDEFINED, 1, &result);
 	tf_util_report_error(context, error);
@@ -725,16 +652,10 @@ static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void*
 	JS_FreeValue(context, request->promise[0]);
 	JS_FreeValue(context, request->promise[1]);
 
-	for (int i = 0; i < request->count; i++)
-	{
-		tf_free(request->identities[i]);
-		tf_free(request->names[i]);
-	}
-	tf_free(request->identities);
-	tf_free(request->names);
 	tf_free((void*)request->name);
 	tf_free((void*)request->package_owner);
 	tf_free((void*)request->package_name);
+	tf_free(request->info);
 	tf_free(request);
 }
 

src/task.c

@@ -1,5 +1,6 @@
 #include "task.h"
 
+#include "api.js.h"
 #include "bcrypt.js.h"
 #include "database.js.h"
 #include "file.js.h"
@@ -163,6 +164,7 @@ typedef struct _tf_task_t
 
 	promise_stack_t* _promise_stacks;
 	int _promise_stack_count;
+	bool _promise_stack_debug;
 
 	timeout_t* timeouts;
 
@@ -1251,10 +1253,13 @@ static void _add_promise_stack(tf_task_t* task, uint32_t hash, const char* stack
 
 static void _remove_promise_stack(tf_task_t* task, uint32_t hash)
 {
-	promise_stack_t* found = bsearch(&hash, task->_promise_stacks, task->_promise_stack_count, sizeof(promise_stack_t), _promise_stack_compare);
-	if (found)
+	if (task->_promise_stack_debug)
 	{
-		found->count--;
+		promise_stack_t* found = bsearch(&hash, task->_promise_stacks, task->_promise_stack_count, sizeof(promise_stack_t), _promise_stack_compare);
+		if (found)
+		{
+			found->count--;
+		}
 	}
 }
 
@@ -1270,33 +1275,26 @@ static void _tf_task_free_promise(tf_task_t* task, promiseid_t id)
 	}
 }
 
-uint32_t fnv32a(const void* buffer, int length, uint32_t start)
-{
-	uint32_t result = 0x811c9dc5;
-	for (int i = 0; i < length; i++)
-	{
-		result ^= ((const uint8_t*)buffer)[i];
-		result += (result << 1) + (result << 4) + (result << 7) + (result << 8) + (result << 24);
-	}
-	return result;
-}
-
 JSValue tf_task_allocate_promise(tf_task_t* task, promiseid_t* out_promise)
 {
-	JSValue error = JS_ThrowInternalError(task->_context, "promise callstack");
-	JSValue exception = JS_GetException(task->_context);
-	JSValue stack_value = JS_GetPropertyStr(task->_context, exception, "stack");
-	size_t length = 0;
-	const char* stack = JS_ToCStringLen(task->_context, &length, stack_value);
-	uint32_t stack_hash = fnv32a((const void*)stack, (int)length, 0);
-	void* buffer[32];
-	int count = tf_util_backtrace(buffer, sizeof(buffer) / sizeof(*buffer));
-	stack_hash = fnv32a((const void*)buffer, sizeof(void*) * count, stack_hash);
-	_add_promise_stack(task, stack_hash, stack, buffer, count);
-	JS_FreeCString(task->_context, stack);
-	JS_FreeValue(task->_context, stack_value);
-	JS_FreeValue(task->_context, exception);
-	JS_FreeValue(task->_context, error);
+	uint32_t stack_hash = 0;
+	if (task->_promise_stack_debug)
+	{
+		JSValue error = JS_ThrowInternalError(task->_context, "promise callstack");
+		JSValue exception = JS_GetException(task->_context);
+		JSValue stack_value = JS_GetPropertyStr(task->_context, exception, "stack");
+		size_t length = 0;
+		const char* stack = JS_ToCStringLen(task->_context, &length, stack_value);
+		stack_hash = tf_util_fnv32a((const void*)stack, (int)length, 0);
+		void* buffer[32];
+		int count = tf_util_backtrace(buffer, sizeof(buffer) / sizeof(*buffer));
+		stack_hash = tf_util_fnv32a((const void*)buffer, sizeof(void*) * count, stack_hash);
+		_add_promise_stack(task, stack_hash, stack, buffer, count);
+		JS_FreeCString(task->_context, stack);
+		JS_FreeValue(task->_context, stack_value);
+		JS_FreeValue(task->_context, exception);
+		JS_FreeValue(task->_context, error);
+	}
 
 	promiseid_t promiseId;
 	do
@@ -1591,6 +1589,10 @@ tf_task_t* tf_task_create()
 	*task = (tf_task_t) { 0 };
 	++_count;
 
+	char buffer[8] = { 0 };
+	size_t buffer_size = sizeof(buffer);
+	task->_promise_stack_debug = uv_os_getenv("TF_PROMISE_DEBUG", buffer, &buffer_size) == 0 && strcmp(buffer, "1") == 0;
+
 	JSMallocFunctions funcs = { 0 };
 	tf_get_js_malloc_functions(&funcs);
 	task->_runtime = JS_NewRuntime2(&funcs, NULL);
@@ -1697,6 +1699,7 @@ void tf_task_activate(tf_task_t* task)
 		task->_ssb = tf_ssb_create(&task->_loop, task->_context, task->_db_path, task->_network_key);
 		tf_ssb_set_trace(task->_ssb, task->_trace);
 		tf_ssb_register(context, task->_ssb);
+		tf_api_register(context);
 		tf_ssb_set_hitch_callback(task->_ssb, _tf_task_record_hitch, task);
 
 		if (task->_args)

src/util.js.c

@@ -683,3 +683,14 @@ bool tf_util_is_mobile()
 {
 	return TF_IS_MOBILE != 0;
 }
+
+uint32_t tf_util_fnv32a(const void* buffer, int length, uint32_t start)
+{
+	uint32_t result = 0x811c9dc5;
+	for (int i = 0; i < length; i++)
+	{
+		result ^= ((const uint8_t*)buffer)[i];
+		result += (result << 1) + (result << 4) + (result << 7) + (result << 8) + (result << 24);
+	}
+	return result;
+}

src/util.js.h

@@ -224,4 +224,13 @@ void tf_util_document_settings(const char* line_prefix);
 */
 bool tf_util_is_mobile();
 
+/**
+** Compute a 32-bit hash of a buffer.
+** @param buffer The data.
+** @param length The size of the buffer in bytes.
+** @param start The hash seed.
+** @return The computed hash.
+*/
+uint32_t tf_util_fnv32a(const void* buffer, int length, uint32_t start);
+
 /** @} */

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.28"
+#define VERSION_NUMBER "0.0.29-wip"
 #define VERSION_NAME "This program kills fascists."