GNUmakefile

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

core/core.js

@@ -7,17 +7,18 @@ let kPingInterval = 60 * 1000;
 
 /**
  * TODOC
+ * @param {*} out
  * @param {*} error
  */
-function printError(error) {
+function printError(out, error) {
 	if (error.stackTrace) {
-		print(error.fileName + ':' + error.lineNumber + ': ' + error.message);
+		out.print(error.fileName + ':' + error.lineNumber + ': ' + error.message);
-		print(error.stackTrace);
+		out.print(error.stackTrace);
 	} else {
 		for (let [k, v] of Object.entries(error)) {
-			print(k, v);
+			out.print(k, v);
 		}
-		print(error.toString());
+		out.print(error.toString());
 	}
 }
 
@@ -460,10 +461,10 @@ async function getProcessBlob(blobId, key, options) {
 					if (process.app) {
 						process.app.makeFunction(['error'])(error);
 					} else {
-						printError(error);
+						printError({print: print}, error);
 					}
 				} catch (e) {
-					printError(error);
+					printError({print: print}, error);
 				}
 			};
 			imports.ssb = Object.fromEntries(
@@ -659,7 +660,6 @@ async function getProcessBlob(blobId, key, options) {
 				);
 				return process.sendPermissions();
 			};
-			ssb.registerImports(imports, process);
 			process.task.setImports(imports);
 			process.task.activate();
 			let source = await ssb.blobGet(blobId);
@@ -686,7 +686,7 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				}
 			} catch (e) {
-				printError(e);
+				printError({print: print}, e);
 			}
 			broadcastEvent('onSessionBegin', [getUser(process, process)]);
 			if (process.app) {
@@ -700,10 +700,14 @@ async function getProcessBlob(blobId, key, options) {
 				sendStats();
 			}
 		} catch (error) {
-			if (process?.app && process?.task?.onError) {
+			if (process.app) {
+				if (process?.task?.onError) {
 					process.task.onError(error);
 				} else {
-				printError(error);
+					printError({print: print}, error);
+				}
+			} else {
+				printError({print: print}, error);
 			}
 			rejectReady(error);
 		}

default.nix

@@ -25,14 +25,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.28";
+  version = "0.0.27.1";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-vcLJCXgIrjC37t9oavK2QMRcMJljghuzKDYxQ4nyTcE=";
+    hash = "sha256-3t1m9ZomQF3DteWyALJWrnCq0EAROEK8shKXh6Ao38c=";
     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="34"
+	android:versionCode="33"
-	android:versionName="0.0.29-wip">
+	android:versionName="0.0.28">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/api.js.c

@@ -1,19 +0,0 @@
-#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

@@ -1,18 +0,0 @@
-#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,7 +84,6 @@ 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;
@@ -396,7 +395,7 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
 
 				if (fin)
 				{
-					if (connection->request && connection->request->on_message)
+					if (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,
@@ -787,13 +786,7 @@ 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++)
 	{
@@ -852,10 +845,6 @@ 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)

src/ios/Info.plist

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

src/task.c

@@ -1,6 +1,5 @@
 #include "task.h"
 
-#include "api.js.h"
 #include "bcrypt.js.h"
 #include "database.js.h"
 #include "file.js.h"
@@ -1698,7 +1697,6 @@ 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/version.h

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