Merge branch 'submodules' of https://dev.tildefriends.net/tasiaiso/tildefriends into submodules

.gitignore

@@ -8,3 +8,7 @@ out
 *.swo
 *.swp
 .zsign_cache/
+
+deps/codemirror/cm6.js
+deps/prettier/standalone.mjs
+deps/lit

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "deps/zlib"]
 	path = deps/zlib
 	url = https://github.com/madler/zlib.git
+	branch = master
 [submodule "deps/libsodium"]
 	path = deps/libsodium
 	url = https://github.com/jedisct1/libsodium.git

GNUmakefile

@@ -3,21 +3,31 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 19
-VERSION_NUMBER := 0.0.19-wip
-VERSION_NAME := Don't let your loyalty become a burden.
+VERSION_CODE := 17
+VERSION_NUMBER := 0.0.17-wip
+VERSION_NAME := Please enjoy responsibly.
 
-SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3450300.zip
-LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz
+SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3450200.zip
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
 UNAME_S := $(shell uname -s)
 UNAME_M := $(shell uname -m)
 
-ANDROID_SDK ?= ~/Android/Sdk
+#ANDROID_SDK ?= ~/Android/Sdk
+ANDROID_SDK ?= /nix/store/54n9xsbb8gxa719g0bs7ghp336pax6mq-androidsdk/libexec/android-sdk
 
-HAVE_WIN := 0
+ifeq ($(UNAME_M),x86_64)
+ifneq ($(UNAME_S),Haiku)
+debug: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
+debug: LDFLAGS += -fsanitize=address -fsanitize=undefined
+endif
+endif
+
+ifeq ($(UNAME_M),aarch64)
+debug: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
+debug: LDFLAGS += -fsanitize=address -fsanitize=undefined
+endif
 
 ifeq ($(UNAME_S),Darwin)
 BUILD_TYPES := macosdebug macosrelease iosdebug iosrelease iossimdebug iossimrelease
@@ -41,6 +51,7 @@ LDFLAGS += \
 	-lc++abi
 HAVE_ANDROID := 0
 HAVE_LINUX_IOS := 0
+HAVE_WIN := 0
 else
 $(error Unexpected host platform $(UNAME_S).)
 endif
@@ -57,11 +68,11 @@ CFLAGS += \
 	-fno-exceptions \
 	-g
 
+ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
+ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-34
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
-ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
-ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION)
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342
 
 ANDROID_ARMV7A_TARGETS := \
 	out/androiddebug-armv7a/tildefriends \
@@ -211,18 +222,6 @@ $(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
 $(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/include
 $(IOSSIM_TARGETS): LDFLAGS += -Ldeps/openssl/ios/iossimulator-xcrun/usr/local/lib
 
-ifeq ($(UNAME_M),x86_64)
-ifneq ($(UNAME_S),Haiku)
-out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
-out/debug/tildefriends: LDFLAGS += -fsanitize=address -fsanitize=undefined
-endif
-endif
-
-ifeq ($(UNAME_M),aarch64)
-out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
-out/debug/tildefriends: LDFLAGS += -fsanitize=address -fsanitize=undefined
-endif
-
 get_objs = \
 	$(foreach build_type,$(BUILD_TYPES),$(addprefix $(BUILD_DIR)/$(build_type)/,$(addsuffix .o,$(basename $(value $(1)))))) \
 	$(foreach build_type,debug release,$(addprefix $(BUILD_DIR)/$(build_type)/,$(addsuffix .o,$(basename $(value $(1)_unix))))) \
@@ -579,7 +578,7 @@ $(MINIUNZIP_OBJS): CFLAGS += \
 LDFLAGS += \
 	-pthread \
 	-lm
-$(LINUX_TARGETS) $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
+debug release $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
 	-lssl \
 	-lcrypto
 ifneq ($(UNAME_S),Haiku)
@@ -686,6 +685,7 @@ out/res/drawable_icon.xml.flat: src/android/res/drawable/icon.xml
 
 out/apk/res.apk out/gen/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml
 	@mkdir -p $(dir $@)
+	mkdir -p out/apk
 	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat --manifest src/android/AndroidManifest.xml -o out/apk/res.apk --java out/gen/
 
 JAVA_FILES := out/gen/com/unprompted/tildefriends/R.java $(wildcard src/android/com/unprompted/tildefriends/*.java)
@@ -693,7 +693,7 @@ CLASS_FILES := $(foreach src,$(JAVA_FILES),out/classes/com/unprompted/tildefrien
 
 $(CLASS_FILES) &: $(JAVA_FILES)
 	@echo "[javac] $(CLASS_FILES)"
-	@javac --release 8 -encoding UTF-8 -Xlint:deprecation -XDuseUnsharedTable=true -classpath $(ANDROID_PLATFORM)/android.jar:$(ANDROID_BUILD_TOOLS)/core-lambda-stubs.jar -d out/classes $(JAVA_FILES)
+	@javac --release 8 -Xlint:deprecation -classpath $(ANDROID_PLATFORM)/android.jar -d out/classes $(JAVA_FILES)
 
 out/apk/classes.dex: $(CLASS_FILES)
 	@mkdir -p $(dir $@)
@@ -729,7 +729,7 @@ out/apk/TildeFriends-arm-%.unsigned.apk:
 	@cp out/apk/res.apk $@.zip
 	@cp out/apk/classes.dex out/apk-arm-$(BUILD_TYPE)/
 	@cd out/apk-arm-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
-	@zip -u $@.zip -q -9 $(RAW_FILES)
+	@zip -u $@.zip -q $(RAW_FILES)
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
 out/apk/TildeFriends-x86-%.unsigned.apk:
@@ -742,7 +742,7 @@ out/apk/TildeFriends-x86-%.unsigned.apk:
 	@cp out/apk/res.apk $@.zip
 	@cp out/apk/classes.dex out/apk-x86-$(BUILD_TYPE)/
 	@cd out/apk-x86-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
-	@zip -u $@.zip -q -9 $(RAW_FILES)
+	@zip -u $@.zip -q $(RAW_FILES)
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
 out/%.apk: out/apk/%.unsigned.apk
@@ -759,7 +759,7 @@ release-apk: out/TildeFriends-arm-release.zopfli.apk out/TildeFriends-x86-releas
 
 releaseapkgo: out/TildeFriends-arm-release.apk
 	@adb install -r $<
-	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
+	@adb shell am start com.unprompted.tildefriends/.MainActivity
 .PHONY: releaseapkgo
 
 # iOS Support
@@ -770,10 +770,10 @@ out/%.app/tildefriends.png: src/ios/tildefriends.png
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
 
-out/data.zip: $(RAW_FILES)
+out/%/data.zip: $(RAW_FILES)
 	@zip -u $@ -q -9 $(RAW_FILES)
 
-out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip
+out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/tildefriends-%.app/data.zip
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
 ifeq ($(HAVE_LINUX_IOS),1)
@@ -788,16 +788,6 @@ out/tildefriends-%.ipa: out/tildefriends-ios%.app/tildefriends
 	@cd $@.tmp/ && zip -u ../../$@ -q -9 -r ./
 	@rm -rf $@.tmp/
 
-
-out/%/tildefriends.standalone: out/%/tildefriends out/data.zip
-	@echo "[standalone] $@"
-	@cat $< out/data.zip > $@
-	@chmod +x $@
-out/%/tildefriends.standalone.exe: out/%/tildefriends.exe out/data.zip
-	@echo "[standalone] $@"
-	@cat $< out/data.zip > $@
-	@chmod +x $@
-
 iossimdebug-app: out/tildefriends-iossimdebug.app/tildefriends
 iossimrelease-app: out/tildefriends-iossimrelease.app/tildefriends
 iosdebug-app: out/tildefriends-iosdebug.app/tildefriends
@@ -820,10 +810,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)
@@ -858,11 +844,11 @@ clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe)
+dist: release-apk iosrelease-ipa
 	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
 	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
-	@git ls-files --recurse-submodules | tar -c -T- | tar -x -C out/tildefriends-$(VERSION_NUMBER)
+	@git archive main | tar -x -C out/tildefriends-$(VERSION_NUMBER)
 	@tar \
 		--exclude=apps/welcome* \
 		--exclude=deps/libbacktrace/Isaac.Newton-Opticks.txt \
@@ -887,8 +873,6 @@ dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.s
 	@cp out/TildeFriends-arm-release.zopfli.apk dist/TildeFriends-arm-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-$(VERSION_NUMBER).ipa"
 	@cp out/tildefriends-release.ipa dist/TildeFriends-$(VERSION_NUMBER).ipa
-	@test $(HAVE_WIN) && echo "[cp] tildefriends-$(VERSION_NUMBER).exe"
-	@test $(HAVE_WIN) && cp out/winrelease/tildefriends.standalone.exe dist/tildefriends-$(VERSION_NUMBER).exe
 .PHONY: dist
 
 dist-test: dist

android-sdk.nix

@@ -0,0 +1,27 @@
+with import <nixpkgs> {};
+let
+  androidComposition = androidenv.composeAndroidPackages {
+    cmdLineToolsVersion = "9.0";
+    toolsVersion = "26.1.1";
+    platformToolsVersion = "34.0.5";
+    buildToolsVersions = [ "34.0.0" ];
+    includeEmulator = false;
+    #emulatorVersion = "30.3.4";
+    platformVersions = [ "34" ];
+    includeSources = false;
+    includeSystemImages = false;
+    #systemImageTypes = [ "google_apis_playstore" ];
+    #abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+    #cmakeVersions = [ "3.10.2" ];
+    includeNDK = true;
+    ndkVersions = ["26.0.10792818"];
+    useGoogleAPIs = false;
+    useGoogleTVAddOns = false;
+    #includeExtras = [
+    #  "extras;google;gcm"
+    #];
+  };
+in
+androidComposition.androidsdk
+
+# $ NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE=1 NIXPKGS_ALLOW_UNFREE=1 nix-build android-sdk.nix --impure

apps/admin.json

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

apps/admin/index.html

@@ -4,37 +4,9 @@
 		<script>
 			const g_data = $data;
 		</script>
-		<link rel="stylesheet" href="w3.css"></link>
-		<style>
-			/* 2018 Valiant Poppy */
-			.w3-theme-l5 {color:#000 !important; background-color:#fbf3f3 !important}
-			.w3-theme-l4 {color:#000 !important; background-color:#f3d7d6 !important}
-			.w3-theme-l3 {color:#000 !important; background-color:#e6afae !important}
-			.w3-theme-l2 {color:#fff !important; background-color:#da8785 !important}
-			.w3-theme-l1 {color:#fff !important; background-color:#cd5f5d !important}
-			.w3-theme-d1 {color:#fff !important; background-color:#a93634 !important}
-			.w3-theme-d2 {color:#fff !important; background-color:#96302e !important}
-			.w3-theme-d3 {color:#fff !important; background-color:#832a28 !important}
-			.w3-theme-d4 {color:#fff !important; background-color:#702423 !important}
-			.w3-theme-d5 {color:#fff !important; background-color:#5e1e1d !important}
-
-			.w3-theme-light {color:#000 !important; background-color:#fbf3f3 !important}
-			.w3-theme-dark {color:#fff !important; background-color:#5e1e1d !important}
-			.w3-theme-action {color:#fff !important; background-color:#5e1e1d !important}
-
-			.w3-theme {color:#fff !important; background-color:#bd3d3a !important}
-			.w3-text-theme {color:#bd3d3a !important}
-			.w3-border-theme {border-color:#bd3d3a !important}
-
-			.w3-hover-theme:hover {color:#fff !important; background-color:#bd3d3a !important}
-			.w3-hover-text-theme:hover {color:#bd3d3a !important}
-			.w3-hover-border-theme:hover {border-color:#bd3d3a !important}
-		</style>
 	</head>
-	<body class="w3-theme-l4">
-		<header class="w3-row w3-padding w3-header w3-theme-l1">
-			<h1>Tilde Friends Administration</h1>
-		</header>
+	<body style="color: #fff; width: 100%">
+		<h1>Tilde Friends Administration</h1>
 	</body>
 	<script type="module" src="script.js"></script>
 </html>

apps/admin/script.js

@@ -32,54 +32,59 @@ window.addEventListener('load', function () {
 	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>
-					<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>
-				</li>
+				<div style="margin-top: 1em">
+					<label for=${'gs_' + key} style="font-weight: bold">${key}: </label>
+					<div>
+						<input type="checkbox" ?checked=${description.value} id=${'gs_' + key}></input>
+						<button @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.checked)}>Set</button>
+						<div>${description.description}</div>
+					</div>
+				</div>
 			`;
 		} else if (description.type === 'textarea') {
 			return html`
-				<li class="w3-row">
-					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${key}</label>
-					<div class="w3-rest w3-padding">${description.description}</div>
-					<textarea class="w3-input" style="vertical-align: top; resize: vertical" id=${'gs_' + key}>${description.value}</textarea>
-					<button class="w3-button w3-right w3-quarter w3-theme-action" @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.value)}>Set</button>
-				</li>
+				<div style="margin-top: 1em"">
+					<label for=${'gs_' + key} style="font-weight: bold">${key}: </label>
+					<div style="width: 100%; padding: 0; margin: 0">
+						<div style="width: 90%; padding: 0 margin: 0">
+							<textarea style="vertical-align: top; width: 100%" rows=20 cols=80 id=${'gs_' + key}>${description.value}</textarea>
+						</div>
+						<button @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.firstElementChild.value)}>Set</button>
+						<div>${description.description}</div>
+					</div>
+				</div>
 			`;
 		} else {
 			return html`
-				<li class="w3-row">
-					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${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>
-				</li>
+				<div style="margin-top: 1em">
+					<label for=${'gs_' + key} style="font-weight: bold">${key}: </label>
+					<div>
+						<input type="text" value="${description.value}" id=${'gs_' + key}></input>
+						<button @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.value)}>Set</button>
+						<div>${description.description}</div>
+					</div>
+				</div>
 			`;
 		}
 	}
 	const user_template = (user, permissions) => html`
-		<li class="w3-card w3-margin">
-			<button class="w3-button w3-theme-action" @click=${(e) => delete_user(user)}>Delete</button>
+		<li>
+			<button @click=${(e) => delete_user(user)}>Delete</button>
 			${user}: ${permissions.map((x) => permission_template(x))}
 		</li>
 	`;
 	const users_template = (users) =>
-		html`
-			<header class="w3-container w3-theme-l2"><h2>Users</h2></header>
-			<ul class="w3-ul">
+		html`<h2>Users</h2>
+			<ul>
 				${Object.entries(users).map((u) => user_template(u[0], u[1]))}
 			</ul>`;
 	const page_template = (data) =>
 		html`<div style="padding: 0; margin: 0; width: 100%; max-width: 100%">
-			<header class="w3-container w3-theme-l2"><h2>Global Settings</h2></header>
-			<div class="w3-container">
-				<ul class="w3-ul">
-					${Object.keys(data.settings)
-						.sort()
-						.map((x) => html`${input_template(x, data.settings[x])}`)}
-				</ul>
+			<h2>Global Settings</h2>
+			<div>
+				${Object.keys(data.settings)
+					.sort()
+					.map((x) => html`${input_template(x, data.settings[x])}`)}
 			</div>
 			${users_template(data.users)}
 		</div> `;

apps/admin/w3.css

@@ -1,235 +0,0 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
-html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
-/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
-html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
-article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}summary{display:list-item}
-audio,canvas,progress,video{display:inline-block}progress{vertical-align:baseline}
-audio:not([controls]){display:none;height:0}[hidden],template{display:none}
-a{background-color:transparent}a:active,a:hover{outline-width:0}
-abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}
-b,strong{font-weight:bolder}dfn{font-style:italic}mark{background:#ff0;color:#000}
-small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
-sub{bottom:-0.25em}sup{top:-0.5em}figure{margin:1em 40px}img{border-style:none}
-code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}hr{box-sizing:content-box;height:0;overflow:visible}
-button,input,select,textarea,optgroup{font:inherit;margin:0}optgroup{font-weight:bold}
-button,input{overflow:visible}button,select{text-transform:none}
-button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}
-button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}
-button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}
-fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}
-legend{color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}
-[type=checkbox],[type=radio]{padding:0}
-[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}
-[type=search]{-webkit-appearance:textfield;outline-offset:-2px}
-[type=search]::-webkit-search-decoration{-webkit-appearance:none}
-::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
-/* End extract */
-html,body{font-family:Verdana,sans-serif;font-size:15px;line-height:1.5}html{overflow-x:hidden}
-h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}
-.w3-serif{font-family:serif}.w3-sans-serif{font-family:sans-serif}.w3-cursive{font-family:cursive}.w3-monospace{font-family:monospace}
-h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin:10px 0}.w3-wide{letter-spacing:4px}
-hr{border:0;border-top:1px solid #eee;margin:20px 0}
-.w3-image{max-width:100%;height:auto}img{vertical-align:middle}a{color:inherit}
-.w3-table,.w3-table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
-.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
-.w3-table-all tr:nth-child(odd){background-color:#fff}.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
-.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
-.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
-.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
-.w3-btn,.w3-button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
-.w3-btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
-.w3-btn,.w3-button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
-.w3-disabled,.w3-btn:disabled,.w3-button:disabled{cursor:not-allowed;opacity:0.3}.w3-disabled *,:disabled *{pointer-events:none}
-.w3-btn.w3-disabled:hover,.w3-btn:disabled:hover{box-shadow:none}
-.w3-badge,.w3-tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.w3-badge{border-radius:50%}
-.w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
-.w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
-.w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
-.w3-input{padding:8px;display:block;border:none;border-bottom:1px solid #ccc;width:100%}
-.w3-select{padding:9px 0;width:100%;border:none;border-bottom:1px solid #ccc}
-.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
-.w3-dropdown-hover:hover .w3-dropdown-content{display:block}
-.w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
-.w3-dropdown-hover:hover > .w3-button:first-child,.w3-dropdown-click:hover > .w3-button:first-child{background-color:#ccc;color:#000}
-.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0;z-index:1}
-.w3-check,.w3-radio{width:24px;height:24px;position:relative;top:6px}
-.w3-sidebar{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
-.w3-bar-block .w3-dropdown-hover,.w3-bar-block .w3-dropdown-click{width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-dropdown-content,.w3-bar-block .w3-dropdown-click .w3-dropdown-content{min-width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-button,.w3-bar-block .w3-dropdown-click .w3-button{width:100%;text-align:left;padding:8px 16px}
-.w3-main,#main{transition:margin-left .4s}
-.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
-.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
-.w3-bar{width:100%;overflow:hidden}.w3-center .w3-bar{display:inline-block;width:auto}
-.w3-bar .w3-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
-.w3-bar .w3-dropdown-hover,.w3-bar .w3-dropdown-click{position:static;float:left}
-.w3-bar .w3-button{white-space:normal}
-.w3-bar-block .w3-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
-.w3-bar-block.w3-center .w3-bar-item{text-align:center}.w3-block{display:block;width:100%}
-.w3-responsive{display:block;overflow-x:auto}
-.w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
-.w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
-.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
-.w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
-.w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
-.w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
-@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}
-.w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
-.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}}
-@media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
-.w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
-.w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
-.w3-rest{overflow:hidden}.w3-stretch{margin-left:-16px;margin-right:-16px}
-.w3-content,.w3-auto{margin-left:auto;margin-right:auto}.w3-content{max-width:980px}.w3-auto{max-width:1140px}
-.w3-cell-row{display:table;width:100%}.w3-cell{display:table-cell}
-.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
-.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
-@media (max-width:1205px){.w3-auto{max-width:95%}}
-@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
-.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}	
-.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
-.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
-@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
-@media (min-width:993px){.w3-modal-content{width:900px}.w3-hide-large{display:none!important}.w3-sidebar.w3-collapse{display:block!important}}
-@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
-@media (max-width:992px){.w3-sidebar.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}.w3-auto{max-width:100%}}
-.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
-.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
-.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
-.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
-.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
-.w3-display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
-.w3-display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
-.w3-display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-container:hover .w3-display-hover{display:block}.w3-display-container:hover span.w3-display-hover{display:inline-block}.w3-display-hover{display:none}
-.w3-display-position{position:absolute}
-.w3-circle{border-radius:50%}
-.w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
-.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
-.w3-container,.w3-panel{padding:0.01em 16px}.w3-panel{margin-top:16px;margin-bottom:16px}
-.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
-.w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
-.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
-.w3-card,.w3-card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)}
-.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
-.w3-spin{animation:w3-spin 2s infinite linear}@keyframes w3-spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
-.w3-animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
-.w3-animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
-.w3-animate-top{position:relative;animation:animatetop 0.4s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
-.w3-animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
-.w3-animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
-.w3-animate-bottom{position:relative;animation:animatebottom 0.4s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
-.w3-animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
-.w3-animate-input{transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
-.w3-opacity,.w3-hover-opacity:hover{opacity:0.60}.w3-opacity-off,.w3-hover-opacity-off:hover{opacity:1}
-.w3-opacity-max{opacity:0.25}.w3-opacity-min{opacity:0.75}
-.w3-greyscale-max,.w3-grayscale-max,.w3-hover-greyscale:hover,.w3-hover-grayscale:hover{filter:grayscale(100%)}
-.w3-greyscale,.w3-grayscale{filter:grayscale(75%)}.w3-greyscale-min,.w3-grayscale-min{filter:grayscale(50%)}
-.w3-sepia{filter:sepia(75%)}.w3-sepia-max,.w3-hover-sepia:hover{filter:sepia(100%)}.w3-sepia-min{filter:sepia(50%)}
-.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
-.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
-.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
-.w3-border-0{border:0!important}.w3-border{border:1px solid #ccc!important}
-.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
-.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
-.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
-.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
-.w3-section,.w3-code{margin-top:16px!important;margin-bottom:16px!important}
-.w3-margin{margin:16px!important}.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
-.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
-.w3-padding-small{padding:4px 8px!important}.w3-padding{padding:8px 16px!important}.w3-padding-large{padding:12px 24px!important}
-.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
-.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
-.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
-.w3-padding-top-64{padding-top:64px!important}.w3-padding-top-48{padding-top:48px!important}
-.w3-padding-top-32{padding-top:32px!important}.w3-padding-top-24{padding-top:24px!important}
-.w3-left{float:left!important}.w3-right{float:right!important}
-.w3-button:hover{color:#000!important;background-color:#ccc!important}
-.w3-transparent,.w3-hover-none:hover{background-color:transparent!important}
-.w3-hover-none:hover{box-shadow:none!important}
-/* Colors */
-.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
-.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
-.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
-.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
-.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
-.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
-.w3-blue-grey,.w3-hover-blue-grey:hover,.w3-blue-gray,.w3-hover-blue-gray:hover{color:#fff!important;background-color:#607d8b!important}
-.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
-.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
-.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
-.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
-.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
-.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
-.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
-.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
-.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
-.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
-.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
-.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
-.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
-.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
-.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
-.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
-.w3-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover{color:#000!important;background-color:#9e9e9e!important}
-.w3-light-grey,.w3-hover-light-grey:hover,.w3-light-gray,.w3-hover-light-gray:hover{color:#000!important;background-color:#f1f1f1!important}
-.w3-dark-grey,.w3-hover-dark-grey:hover,.w3-dark-gray,.w3-hover-dark-gray:hover{color:#fff!important;background-color:#616161!important}
-.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
-.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
-.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
-.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
-.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
-.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
-.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
-.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
-.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
-.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
-.w3-text-blue-grey,.w3-hover-text-blue-grey:hover,.w3-text-blue-gray,.w3-hover-text-blue-gray:hover{color:#607d8b!important}
-.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
-.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
-.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
-.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
-.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
-.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
-.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
-.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
-.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
-.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
-.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
-.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
-.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
-.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
-.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
-.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
-.w3-text-grey,.w3-hover-text-grey:hover,.w3-text-gray,.w3-hover-text-gray:hover{color:#757575!important}
-.w3-text-light-grey,.w3-hover-text-light-grey:hover,.w3-text-light-gray,.w3-hover-text-light-gray:hover{color:#f1f1f1!important}
-.w3-text-dark-grey,.w3-hover-text-dark-grey:hover,.w3-text-dark-gray,.w3-hover-text-dark-gray:hover{color:#3a3a3a!important}
-.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
-.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
-.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
-.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
-.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
-.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
-.w3-border-blue-grey,.w3-hover-border-blue-grey:hover,.w3-border-blue-gray,.w3-hover-border-blue-gray:hover{border-color:#607d8b!important}
-.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
-.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
-.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
-.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
-.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
-.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
-.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
-.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
-.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
-.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
-.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
-.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
-.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
-.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
-.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
-.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
-.w3-border-grey,.w3-hover-border-grey:hover,.w3-border-gray,.w3-hover-border-gray:hover{border-color:#9e9e9e!important}
-.w3-border-light-grey,.w3-hover-border-light-grey:hover,.w3-border-light-gray,.w3-hover-border-light-gray:hover{border-color:#f1f1f1!important}
-.w3-border-dark-grey,.w3-hover-border-dark-grey:hover,.w3-border-dark-gray,.w3-hover-border-dark-gray:hover{border-color:#616161!important}
-.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
-.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffcc!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}

apps/identity.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🪪",
-	"previous": "&de7q4A59auHP/34bXgeNH05JZoxsGr5TjwXPvehWH30=.sha256"
+	"previous": "&kgukkyDk1RxgfzgMH6H/0QeDPIuwPZypLuAFax21ljk=.sha256"
 }

apps/identity/app.js

@@ -19,36 +19,7 @@ tfrpc.register(async function reload() {
 async function main() {
 	let ids = await ssb.getIdentities();
 	await app.setDocument(
-		`
-		<head>
-			<link rel="stylesheet" href="w3.css"></link>
-			<style>
-				/* "2018 Sargasso Sea" */
-				.w3-theme-l5 {color:#000 !important; background-color:#f3f4f7 !important}
-				.w3-theme-l4 {color:#000 !important; background-color:#d7dbe3 !important}
-				.w3-theme-l3 {color:#000 !important; background-color:#b0b6c8 !important}
-				.w3-theme-l2 {color:#fff !important; background-color:#8892ac !important}
-				.w3-theme-l1 {color:#fff !important; background-color:#636f8e !important}
-				.w3-theme-d1 {color:#fff !important; background-color:#40485c !important}
-				.w3-theme-d2 {color:#fff !important; background-color:#394052 !important}
-				.w3-theme-d3 {color:#fff !important; background-color:#323848 !important}
-				.w3-theme-d4 {color:#fff !important; background-color:#2b303d !important}
-				.w3-theme-d5 {color:#fff !important; background-color:#242833 !important}
-
-				.w3-theme-light {color:#000 !important; background-color:#f3f4f7 !important}
-				.w3-theme-dark {color:#fff !important; background-color:#242833 !important}
-				.w3-theme-action {color:#fff !important; background-color:#242833 !important}
-
-				.w3-theme {color:#fff !important; background-color:#485167 !important}
-				.w3-text-theme {color:#485167 !important}
-				.w3-border-theme {border-color:#485167 !important}
-
-				.w3-hover-theme:hover {color:#fff !important; background-color:#485167 !important}
-				.w3-hover-text-theme:hover {color:#485167 !important}
-				.w3-hover-border-theme:hover {border-color:#485167 !important}
-			</style>
-		</head>
-		<body class="w3-theme-l3">
+		`<body style="color: #fff">
 		<script>const handler = {};</script>
 		<script type="module">
 			import * as tfrpc from '/static/tfrpc.js';
@@ -56,8 +27,7 @@ async function main() {
 				let id = event.srcElement.dataset.id;
 				let element = document.createElement('textarea');
 				element.value = await tfrpc.rpc.get_private_key(id);
-				element.style = 'width: 100%; height: auto; read-only: true; resize: none';
-				element.classList.add('w3-input');
+				element.style = 'width: 100%; read-only: true';
 				element.readOnly = true;
 				event.srcElement.parentElement.appendChild(element);
 				event.srcElement.onclick = event => handler.hide_id(event, element);
@@ -99,34 +69,23 @@ async function main() {
 				}
 			}
 		</script>
-		<header class="w3-theme w3-padding"><h1>SSB Identity Management</h1></header>
-		<div class="w3-card-4 w3-margin">
-			<header class="w3-container w3-theme-l2"><h2>Create a new identity</h2></header>
-			<footer class="w3-padding">
-				<button id="create_id" onclick="handler.create_id()" class="w3-button w3-theme">Create Identity</button>
-			</footer>
-		</div>
-		<div class="w3-card-4 w3-margin">
-			<header class="w3-container w3-theme-l2"><h2>Import an SSB Identity from 12 BIP39 English Words</h2></header>
-			<textarea id="add_id" style="width: 100%" rows="4" class="w3-input"></textarea>
-			<footer class="w3-padding">
-				<button id="add" onclick="handler.add_id(event)" class="w3-button w3-theme">Import Identity</button>
-			</footer>
-		</div>
-		<div class="w3-card-4 w3-margin">
-			<header class="w3-container w3-theme-l2"><h2>Identities</h2></header>
-			<ul class="w3-ul">` +
-				ids
-					.map(
-						(id) => `<li style="overflow: hidden; text-wrap: nowrap; text-overflow: ellipsis">
-				<button onclick="handler.export_id(event)" data-id="${id}" class="w3-button w3-theme">Export Identity</button>
-				<button onclick="handler.delete_id(event)" data-id="${id}" class="w3-button w3-theme">Delete Identity</button>
-				${id}
-			</li>`
-					)
-					.join('\n') +
-				`	</ul>
-		</div>
+		<h1>SSB Identity Management</h1>
+		<h2>Create a new identity</h2>
+		<button id="create_id" onclick="handler.create_id()">Create Identity</button>
+		<h2>Import an SSB Identity from 12 BIP39 English Words</h2>
+		<textarea id="add_id" style="width: 100%" rows="4"></textarea><button id="add" onclick="handler.add_id(event)">Import Identity</button>
+		<h2>Identities</h2>
+		<ul>` +
+			ids
+				.map(
+					(id) => `<li>
+			<button onclick="handler.export_id(event)" data-id="${id}">Export Identity</button>
+			<button onclick="handler.delete_id(event)" data-id="${id}">Delete Identity</button>
+			${id}
+		</li>`
+				)
+				.join('\n') +
+			`	</ul>
 	</body>`
 	);
 }

apps/identity/w3.css

@@ -1,235 +0,0 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
-html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
-/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
-html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
-article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}summary{display:list-item}
-audio,canvas,progress,video{display:inline-block}progress{vertical-align:baseline}
-audio:not([controls]){display:none;height:0}[hidden],template{display:none}
-a{background-color:transparent}a:active,a:hover{outline-width:0}
-abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}
-b,strong{font-weight:bolder}dfn{font-style:italic}mark{background:#ff0;color:#000}
-small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
-sub{bottom:-0.25em}sup{top:-0.5em}figure{margin:1em 40px}img{border-style:none}
-code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}hr{box-sizing:content-box;height:0;overflow:visible}
-button,input,select,textarea,optgroup{font:inherit;margin:0}optgroup{font-weight:bold}
-button,input{overflow:visible}button,select{text-transform:none}
-button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}
-button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}
-button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}
-fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}
-legend{color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}
-[type=checkbox],[type=radio]{padding:0}
-[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}
-[type=search]{-webkit-appearance:textfield;outline-offset:-2px}
-[type=search]::-webkit-search-decoration{-webkit-appearance:none}
-::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
-/* End extract */
-html,body{font-family:Verdana,sans-serif;font-size:15px;line-height:1.5}html{overflow-x:hidden}
-h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}
-.w3-serif{font-family:serif}.w3-sans-serif{font-family:sans-serif}.w3-cursive{font-family:cursive}.w3-monospace{font-family:monospace}
-h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin:10px 0}.w3-wide{letter-spacing:4px}
-hr{border:0;border-top:1px solid #eee;margin:20px 0}
-.w3-image{max-width:100%;height:auto}img{vertical-align:middle}a{color:inherit}
-.w3-table,.w3-table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
-.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
-.w3-table-all tr:nth-child(odd){background-color:#fff}.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
-.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
-.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
-.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
-.w3-btn,.w3-button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
-.w3-btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
-.w3-btn,.w3-button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
-.w3-disabled,.w3-btn:disabled,.w3-button:disabled{cursor:not-allowed;opacity:0.3}.w3-disabled *,:disabled *{pointer-events:none}
-.w3-btn.w3-disabled:hover,.w3-btn:disabled:hover{box-shadow:none}
-.w3-badge,.w3-tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.w3-badge{border-radius:50%}
-.w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
-.w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
-.w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
-.w3-input{padding:8px;display:block;border:none;border-bottom:1px solid #ccc;width:100%}
-.w3-select{padding:9px 0;width:100%;border:none;border-bottom:1px solid #ccc}
-.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
-.w3-dropdown-hover:hover .w3-dropdown-content{display:block}
-.w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
-.w3-dropdown-hover:hover > .w3-button:first-child,.w3-dropdown-click:hover > .w3-button:first-child{background-color:#ccc;color:#000}
-.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0;z-index:1}
-.w3-check,.w3-radio{width:24px;height:24px;position:relative;top:6px}
-.w3-sidebar{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
-.w3-bar-block .w3-dropdown-hover,.w3-bar-block .w3-dropdown-click{width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-dropdown-content,.w3-bar-block .w3-dropdown-click .w3-dropdown-content{min-width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-button,.w3-bar-block .w3-dropdown-click .w3-button{width:100%;text-align:left;padding:8px 16px}
-.w3-main,#main{transition:margin-left .4s}
-.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
-.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
-.w3-bar{width:100%;overflow:hidden}.w3-center .w3-bar{display:inline-block;width:auto}
-.w3-bar .w3-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
-.w3-bar .w3-dropdown-hover,.w3-bar .w3-dropdown-click{position:static;float:left}
-.w3-bar .w3-button{white-space:normal}
-.w3-bar-block .w3-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
-.w3-bar-block.w3-center .w3-bar-item{text-align:center}.w3-block{display:block;width:100%}
-.w3-responsive{display:block;overflow-x:auto}
-.w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
-.w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
-.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
-.w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
-.w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
-.w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
-@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}
-.w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
-.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}}
-@media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
-.w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
-.w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
-.w3-rest{overflow:hidden}.w3-stretch{margin-left:-16px;margin-right:-16px}
-.w3-content,.w3-auto{margin-left:auto;margin-right:auto}.w3-content{max-width:980px}.w3-auto{max-width:1140px}
-.w3-cell-row{display:table;width:100%}.w3-cell{display:table-cell}
-.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
-.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
-@media (max-width:1205px){.w3-auto{max-width:95%}}
-@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
-.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}	
-.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
-.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
-@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
-@media (min-width:993px){.w3-modal-content{width:900px}.w3-hide-large{display:none!important}.w3-sidebar.w3-collapse{display:block!important}}
-@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
-@media (max-width:992px){.w3-sidebar.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}.w3-auto{max-width:100%}}
-.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
-.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
-.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
-.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
-.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
-.w3-display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
-.w3-display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
-.w3-display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-container:hover .w3-display-hover{display:block}.w3-display-container:hover span.w3-display-hover{display:inline-block}.w3-display-hover{display:none}
-.w3-display-position{position:absolute}
-.w3-circle{border-radius:50%}
-.w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
-.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
-.w3-container,.w3-panel{padding:0.01em 16px}.w3-panel{margin-top:16px;margin-bottom:16px}
-.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
-.w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
-.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
-.w3-card,.w3-card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)}
-.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
-.w3-spin{animation:w3-spin 2s infinite linear}@keyframes w3-spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
-.w3-animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
-.w3-animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
-.w3-animate-top{position:relative;animation:animatetop 0.4s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
-.w3-animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
-.w3-animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
-.w3-animate-bottom{position:relative;animation:animatebottom 0.4s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
-.w3-animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
-.w3-animate-input{transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
-.w3-opacity,.w3-hover-opacity:hover{opacity:0.60}.w3-opacity-off,.w3-hover-opacity-off:hover{opacity:1}
-.w3-opacity-max{opacity:0.25}.w3-opacity-min{opacity:0.75}
-.w3-greyscale-max,.w3-grayscale-max,.w3-hover-greyscale:hover,.w3-hover-grayscale:hover{filter:grayscale(100%)}
-.w3-greyscale,.w3-grayscale{filter:grayscale(75%)}.w3-greyscale-min,.w3-grayscale-min{filter:grayscale(50%)}
-.w3-sepia{filter:sepia(75%)}.w3-sepia-max,.w3-hover-sepia:hover{filter:sepia(100%)}.w3-sepia-min{filter:sepia(50%)}
-.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
-.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
-.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
-.w3-border-0{border:0!important}.w3-border{border:1px solid #ccc!important}
-.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
-.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
-.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
-.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
-.w3-section,.w3-code{margin-top:16px!important;margin-bottom:16px!important}
-.w3-margin{margin:16px!important}.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
-.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
-.w3-padding-small{padding:4px 8px!important}.w3-padding{padding:8px 16px!important}.w3-padding-large{padding:12px 24px!important}
-.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
-.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
-.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
-.w3-padding-top-64{padding-top:64px!important}.w3-padding-top-48{padding-top:48px!important}
-.w3-padding-top-32{padding-top:32px!important}.w3-padding-top-24{padding-top:24px!important}
-.w3-left{float:left!important}.w3-right{float:right!important}
-.w3-button:hover{color:#000!important;background-color:#ccc!important}
-.w3-transparent,.w3-hover-none:hover{background-color:transparent!important}
-.w3-hover-none:hover{box-shadow:none!important}
-/* Colors */
-.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
-.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
-.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
-.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
-.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
-.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
-.w3-blue-grey,.w3-hover-blue-grey:hover,.w3-blue-gray,.w3-hover-blue-gray:hover{color:#fff!important;background-color:#607d8b!important}
-.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
-.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
-.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
-.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
-.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
-.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
-.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
-.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
-.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
-.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
-.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
-.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
-.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
-.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
-.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
-.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
-.w3-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover{color:#000!important;background-color:#9e9e9e!important}
-.w3-light-grey,.w3-hover-light-grey:hover,.w3-light-gray,.w3-hover-light-gray:hover{color:#000!important;background-color:#f1f1f1!important}
-.w3-dark-grey,.w3-hover-dark-grey:hover,.w3-dark-gray,.w3-hover-dark-gray:hover{color:#fff!important;background-color:#616161!important}
-.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
-.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
-.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
-.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
-.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
-.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
-.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
-.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
-.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
-.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
-.w3-text-blue-grey,.w3-hover-text-blue-grey:hover,.w3-text-blue-gray,.w3-hover-text-blue-gray:hover{color:#607d8b!important}
-.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
-.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
-.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
-.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
-.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
-.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
-.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
-.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
-.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
-.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
-.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
-.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
-.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
-.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
-.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
-.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
-.w3-text-grey,.w3-hover-text-grey:hover,.w3-text-gray,.w3-hover-text-gray:hover{color:#757575!important}
-.w3-text-light-grey,.w3-hover-text-light-grey:hover,.w3-text-light-gray,.w3-hover-text-light-gray:hover{color:#f1f1f1!important}
-.w3-text-dark-grey,.w3-hover-text-dark-grey:hover,.w3-text-dark-gray,.w3-hover-text-dark-gray:hover{color:#3a3a3a!important}
-.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
-.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
-.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
-.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
-.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
-.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
-.w3-border-blue-grey,.w3-hover-border-blue-grey:hover,.w3-border-blue-gray,.w3-hover-border-blue-gray:hover{border-color:#607d8b!important}
-.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
-.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
-.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
-.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
-.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
-.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
-.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
-.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
-.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
-.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
-.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
-.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
-.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
-.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
-.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
-.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
-.w3-border-grey,.w3-hover-border-grey:hover,.w3-border-gray,.w3-hover-border-gray:hover{border-color:#9e9e9e!important}
-.w3-border-light-grey,.w3-hover-border-light-grey:hover,.w3-border-light-gray,.w3-hover-border-light-gray:hover{border-color:#f1f1f1!important}
-.w3-border-dark-grey,.w3-hover-border-dark-grey:hover,.w3-border-dark-gray,.w3-hover-border-dark-gray:hover{border-color:#616161!important}
-.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
-.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffcc!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}

apps/issues.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦟",
-	"previous": "&cUqvSDUls3jn0haD85LPFAGdkc8wFuy347TtATNcJgg=.sha256"
+	"previous": "&TegdzvFE+im94shygaHkgDYSaSrwY2h0OKUXSRPBQDM=.sha256"
 }

apps/issues/app.js

@@ -85,9 +85,6 @@ tfrpc.register(async function store_message(message) {
 tfrpc.register(function apps() {
 	return core.apps();
 });
-tfrpc.register(function getActiveIdentity() {
-	return ssb.getActiveIdentity();
-});
 tfrpc.register(async function try_decrypt(id, content) {
 	return await ssb.privateMessageDecrypt(id, content);
 });

apps/issues/script.js

@@ -4,6 +4,48 @@ import * as tfutils from './tf-utils.js';
 
 const k_project = '%Hr+4xEVtjplidSKBlRWi4Aw/0Tfw7B+1OR9BzlDKmOI=.sha256';
 
+class TfIdPickerElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			selected: {type: String},
+		};
+	}
+
+	constructor() {
+		super();
+		this.load();
+	}
+
+	async load() {
+		this.selected = await tfrpc.rpc.localStorageGet('whoami');
+		this.ids = (await tfrpc.rpc.getIdentities()) || [];
+	}
+
+	changed(event) {
+		this.selected = event.srcElement.value;
+		tfrpc.rpc.localStorageSet('whoami', this.selected);
+	}
+
+	render() {
+		if (this.ids) {
+			return html`
+				<select @change=${this.changed} style="max-width: 100%">
+					${this.ids.map(
+						(id) =>
+							html`<option ?selected=${id == this.selected} value=${id}>
+								${id}
+							</option>`
+					)}
+				</select>
+			`;
+		} else {
+			return html`<div>Loading...</div>`;
+		}
+	}
+}
+customElements.define('tf-id-picker', TfIdPickerElement);
+
 class TfComposeElement extends LitElement {
 	static get properties() {
 		return {
@@ -63,10 +105,10 @@ class TfIssuesAppElement extends LitElement {
 		let issues = {};
 		let messages = await tfrpc.rpc.query(
 			`
-			WITH issues AS (SELECT messages.id, json(messages.content) AS content, messages.author, messages.timestamp FROM messages_refs JOIN messages ON
+			WITH issues AS (SELECT messages.* FROM messages_refs JOIN messages ON
 				messages.id = messages_refs.message
 				WHERE messages_refs.ref = ? AND json_extract(messages.content, '$.type') = 'issue'),
-			edits AS (SELECT messages.id, json(messages.content) AS content, messages.author, messages.timestamp FROM issues JOIN messages_refs ON
+			edits AS (SELECT messages.* FROM issues JOIN messages_refs ON
 				issues.id = messages_refs.ref JOIN messages ON
 				messages.id = messages_refs.message
 				WHERE json_extract(messages.content, '$.type') IN ('issue-edit', 'post'))
@@ -164,7 +206,7 @@ class TfIssuesAppElement extends LitElement {
 		if (
 			confirm(`Are you sure you want to ${open ? 'open' : 'close'} this issue?`)
 		) {
-			let whoami = await tfrpc.rpc.getActiveIdentity();
+			let whoami = this.shadowRoot.getElementById('picker').selected;
 			await tfrpc.rpc.appendMessage(whoami, {
 				type: 'issue-edit',
 				issues: [
@@ -179,7 +221,7 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	async create_issue(event) {
-		let whoami = await tfrpc.rpc.getActiveIdentity();
+		let whoami = this.shadowRoot.getElementById('picker').selected;
 		await tfrpc.rpc.appendMessage(whoami, {
 			type: 'issue',
 			project: k_project,
@@ -189,7 +231,7 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	async reply_to_issue(event) {
-		let whoami = await tfrpc.rpc.getActiveIdentity();
+		let whoami = this.shadowRoot.getElementById('picker').selected;
 		await tfrpc.rpc.appendMessage(whoami, {
 			type: 'post',
 			text: event.detail.value,
@@ -207,7 +249,10 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	render() {
-		let header = html` <h1>Tilde Friends Issues</h1> `;
+		let header = html`
+			<h1>Tilde Friends Issues</h1>
+			<tf-id-picker id="picker"></tf-id-picker>
+		`;
 		if (this.selected) {
 			return html`
 				${header}

apps/room.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
-	"emoji": "🚪",
-	"previous": "&HXCdDG8gGYXElTyEFbg85jqa6lDXNL2ENPIA9UoJNbI=.sha256"
+	"emoji": "📦",
+	"previous": "&IU+TwyM7TznD8NBfnw7tgW2zxVlMqTVxSqWFjuosLwo=.sha256"
 }

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&vEaOZjrNb0u9rhNqrQ8eU9TlOFlo4HsgW6hbI7VdIT0=.sha256"
+	"previous": "&Xs1X5TzLCk6KVr+5IDc80JAHYxJyoD10cXKBUYpFqWQ=.sha256"
 }

apps/ssb/app.js

@@ -100,9 +100,6 @@ tfrpc.register(async function try_decrypt(id, content) {
 tfrpc.register(async function encrypt(id, recipients, content) {
 	return await ssb.privateMessageEncrypt(id, recipients, content);
 });
-tfrpc.register(async function getActiveIdentity() {
-	return await ssb.getActiveIdentity();
-});
 ssb.addEventListener('broadcasts', async function () {
 	await tfrpc.rpc.set('broadcasts', await ssb.getBroadcasts());
 });
@@ -110,9 +107,6 @@ ssb.addEventListener('broadcasts', async function () {
 core.register('onConnectionsChanged', async function () {
 	await tfrpc.rpc.set('connections', await ssb.connections());
 });
-core.register('setActiveIdentity', async function (id) {
-	await tfrpc.rpc.set('identity', id);
-});
 
 async function main() {
 	if (typeof database !== 'undefined') {

apps/ssb/commonmark-hashtag.js

@@ -1,94 +1,90 @@
 function textNode(text) {
-	const node = new commonmark.Node('text', undefined);
-	node.literal = text;
-	return node;
+  const node = new commonmark.Node("text", undefined);
+  node.literal = text;
+  return node;
 }
 
 function linkNode(text, link) {
-	const linkNode = new commonmark.Node('link', undefined);
-	if (link.startsWith('#')) {
-		linkNode.destination = `#q=${encodeURIComponent(link)}`;
-	} else {
-		linkNode.destination = link;
-	}
-	linkNode.appendChild(textNode(text));
-	return linkNode;
+  const linkNode = new commonmark.Node("link", undefined);
+  linkNode.destination = `#q=${encodeURIComponent(link)}`;
+  linkNode.appendChild(textNode(text));
+  return linkNode;
 }
 
 function splitMatches(text, regexp) {
-	// Regexp must be sticky.
-	regexp = new RegExp(regexp, 'gm');
+  // Regexp must be sticky.
+  regexp = new RegExp(regexp, "gm");
 
-	let i = 0;
-	const result = [];
+  let i = 0;
+  const result = [];
 
-	let match = regexp.exec(text);
-	while (match) {
-		const matchText = match[0];
+  let match = regexp.exec(text);
+  while (match) {
+    const matchText = match[0];
 
-		if (match.index > i) {
-			result.push([text.substring(i, match.index), false]);
-		}
+    if (match.index > i) {
+      result.push([text.substring(i, match.index), false]);
+    }
 
-		result.push([matchText, true]);
-		i = match.index + matchText.length;
+    result.push([matchText, true]);
+    i = match.index + matchText.length;
 
-		match = regexp.exec(text);
-	}
+    match = regexp.exec(text);
+  }
 
-	if (i < text.length) {
-		result.push([text.substring(i, text.length), false]);
-	}
+  if (i < text.length) {
+    result.push([text.substring(i, text.length), false]);
+  }
 
-	return result;
+  return result;
 }
 
-const regex = new RegExp('(?:https?://[^ ]+[^ .,])|(?:(?<!\\w)#[\\w-]+)|(?:@[A-Za-z0-9+/]+=.ed25519)|(?:[%&][A-Za-z0-9+/]+=.sha256)');
+const regex = new RegExp("(?<!\\w)#[\\w-]+");
 
 function split(textNodes) {
-	const text = textNodes.map((n) => n.literal).join('');
-	const parts = splitMatches(text, regex);
+  const text = textNodes.map(n => n.literal).join("");
+  const parts = splitMatches(text, regex);
 
-	return parts.map((part) => {
-		if (part[1]) {
-			return linkNode(part[0], part[0]);
-		} else {
-			return textNode(part[0]);
-		}
-	});
+  return parts.map(part => {
+    if (part[1]) {
+      return linkNode(part[0], part[0]);
+    } else {
+      return textNode(part[0]);
+    }
+  });
 }
 
 export function transform(parsed) {
-	const walker = parsed.walker();
-	let event;
+  const walker = parsed.walker();
+  let event;
 
-	let nodes = [];
-	while ((event = walker.next())) {
-		const node = event.node;
-		if (event.entering && node.type === 'text') {
-			nodes.push(node);
-		} else {
-			if (nodes.length > 0) {
-				split(nodes)
-					.reverse()
-					.forEach((newNode) => {
-						nodes[0].insertAfter(newNode);
-					});
+  let nodes = [];
+  while ((event = walker.next())) {
+    const node = event.node;
+    if (event.entering && node.type === "text") {
+      nodes.push(node);
+    } else {
+      if (nodes.length > 0) {
+        split(nodes)
+          .reverse()
+          .forEach(newNode => {
+            nodes[0].insertAfter(newNode);
+          });
 
-				nodes.forEach((n) => n.unlink());
-				nodes = [];
-			}
-		}
-	}
+        nodes.forEach(n => n.unlink());
+        nodes = [];
+      }
+    }
+  }
 
-	if (nodes.length > 0) {
-		split(nodes)
-			.reverse()
-			.forEach((newNode) => {
-				nodes[0].insertAfter(newNode);
-			});
-		nodes.forEach((n) => n.unlink());
-	}
+  if (nodes.length > 0) {
+    split(nodes)
+      .reverse()
+      .forEach(newNode => {
+        nodes[0].insertAfter(newNode);
+      });
+    nodes.forEach(n => n.unlink());
+  }
 
-	return parsed;
+  return parsed;
 }

apps/ssb/commonmark-linkify.js

@@ -0,0 +1,91 @@
+function textNode(text) {
+  const node = new commonmark.Node("text", undefined);
+  node.literal = text;
+  return node;
+}
+
+function linkNode(text, url) {
+  const urlNode = new commonmark.Node("link", undefined);
+  urlNode.destination = url;
+  urlNode.appendChild(textNode(text));
+
+  return urlNode;
+}
+
+function splitMatches(text, regexp) {
+  // Regexp must be sticky.
+  regexp = new RegExp(regexp, "gm");
+
+  let i = 0;
+  const result = [];
+
+  let match = regexp.exec(text);
+  while (match) {
+    const matchText = match[0];
+
+    if (match.index > i) {
+      result.push([text.substring(i, match.index), false]);
+    }
+
+    result.push([matchText, true]);
+    i = match.index + matchText.length;
+
+    match = regexp.exec(text);
+  }
+
+  if (i < text.length) {
+    result.push([text.substring(i, text.length), false]);
+  }
+
+  return result;
+}
+
+const urlRegexp = new RegExp("https?://[^ ]+[^ .,]");
+
+function splitURLs(textNodes) {
+  const text = textNodes.map(n => n.literal).join("");
+  const parts = splitMatches(text, urlRegexp);
+
+  return parts.map(part => {
+    if (part[1]) {
+      return linkNode(part[0], part[0]);
+    } else {
+      return textNode(part[0]);
+    }
+  });
+}
+
+export function transform(parsed) {
+  const walker = parsed.walker();
+  let event;
+
+  let nodes = [];
+  while ((event = walker.next())) {
+    const node = event.node;
+    if (event.entering && node.type === "text") {
+      nodes.push(node);
+    } else {
+      if (nodes.length > 0) {
+        splitURLs(nodes)
+          .reverse()
+          .forEach(newNode => {
+            nodes[0].insertAfter(newNode);
+          });
+
+        nodes.forEach(n => n.unlink());
+        nodes = [];
+      }
+    }
+  }
+
+  if (nodes.length > 0) {
+    splitURLs(nodes)
+      .reverse()
+      .forEach(newNode => {
+        nodes[0].insertAfter(newNode);
+      });
+    nodes.forEach(n => n.unlink());
+  }
+
+  return parsed;
+}

apps/ssb/emojis.js

@@ -1,5 +1,3 @@
-import * as tfrpc from '/static/tfrpc.js';
-
 let g_emojis;
 
 function get_emojis() {
@@ -12,154 +10,105 @@ function get_emojis() {
 	});
 }
 
-async function get_recent(author) {
-	let recent = await tfrpc.rpc.query(
-		`
-		SELECT DISTINCT content ->> '$.vote.expression' AS value
-		FROM messages
-		WHERE author = ? AND
-		content ->> '$.type' = 'vote'
-		ORDER BY timestamp DESC LIMIT 10
-	`,
-		[author]
-	);
-	return recent.map((x) => x.value);
-}
+export function picker(callback, anchor) {
+	get_emojis().then(function (json) {
+		let div = document.createElement('div');
+		div.id = 'emoji_picker';
+		div.style.color = '#000';
+		div.style.background = '#fff';
+		div.style.border = '1px solid #000';
+		div.style.display = 'block';
+		div.style.position = 'absolute';
+		div.style.minWidth = 'min(16em, 90vw)';
+		div.style.width = 'min(16em, 90vw)';
+		div.style.maxWidth = 'min(16em, 90vw)';
+		div.style.maxHeight = '16em';
+		div.style.overflow = 'scroll';
+		div.style.fontWeight = 'bold';
+		div.style.fontSize = 'xx-large';
+		let input = document.createElement('input');
+		input.type = 'text';
+		input.style.display = 'block';
+		input.style.boxSizing = 'border-box';
+		input.style.width = '100%';
+		input.style.margin = '0';
+		input.style.position = 'relative';
+		div.appendChild(input);
+		let list = document.createElement('div');
+		div.appendChild(list);
+		div.addEventListener('mousedown', function (event) {
+			event.stopPropagation();
+		});
 
-export async function picker(callback, anchor, author) {
-	let json = await get_emojis();
-	let recent = await get_recent(author);
+		function cleanup() {
+			console.log('emoji cleanup');
+			div.parentElement.removeChild(div);
+			window.removeEventListener('keydown', key_down);
+			console.log('removing click');
+			document.body.removeEventListener('mousedown', cleanup);
+		}
 
-	let div = document.createElement('div');
-	div.id = 'emoji_picker';
-	div.style.color = '#000';
-	div.style.background = '#fff';
-	div.style.border = '1px solid #000';
-	div.style.display = 'block';
-	div.style.position = 'absolute';
-	div.style.minWidth = 'min(16em, 90vw)';
-	div.style.width = 'min(16em, 90vw)';
-	div.style.maxWidth = 'min(16em, 90vw)';
-	div.style.maxHeight = '16em';
-	div.style.overflow = 'scroll';
-	div.style.fontWeight = 'bold';
-	div.style.fontSize = 'xx-large';
-	let input = document.createElement('input');
-	input.type = 'text';
-	input.style.display = 'block';
-	input.style.boxSizing = 'border-box';
-	input.style.width = '100%';
-	input.style.margin = '0';
-	input.style.position = 'relative';
-	div.appendChild(input);
-	let list = document.createElement('div');
-	div.appendChild(list);
-	div.addEventListener('mousedown', function (event) {
-		event.stopPropagation();
-	});
+		function key_down(event) {
+			if (event.key == 'Escape') {
+				cleanup();
+			}
+		}
 
-	function cleanup() {
-		console.log('emoji cleanup');
-		div.parentElement.removeChild(div);
-		window.removeEventListener('keydown', key_down);
-		console.log('removing click');
-		document.body.removeEventListener('mousedown', cleanup);
-	}
-
-	function key_down(event) {
-		if (event.key == 'Escape') {
+		function chosen(event) {
+			console.log(event.srcElement.innerText);
+			callback(event.srcElement.innerText);
 			cleanup();
 		}
-	}
 
-	function chosen(event) {
-		console.log(event.srcElement.innerText);
-		callback(event.srcElement.innerText);
-		cleanup();
-	}
-
-	function refresh() {
-		while (list.firstChild) {
-			list.removeChild(list.firstChild);
-		}
-		let search = input.value.toLowerCase();
-		let any_at_all = false;
-		if (recent) {
-			let emoji_to_name = {};
-			for (let row of Object.values(json)) {
-				for (let entry of Object.entries(row)) {
-					emoji_to_name[entry[1]] = entry[0];
+		function refresh() {
+			while (list.firstChild) {
+				list.removeChild(list.firstChild);
+			}
+			let search = input.value.toLowerCase();
+			let any_at_all = false;
+			for (let row of Object.entries(json)) {
+				let header = document.createElement('div');
+				header.appendChild(document.createTextNode(row[0]));
+				list.appendChild(header);
+				let any = false;
+				for (let entry of Object.entries(row[1])) {
+					if (
+						search &&
+						search.length &&
+						entry[0].toLowerCase().indexOf(search) == -1
+					) {
+						continue;
+					}
+					let emoji = document.createElement('span');
+					const k_size = '1.25em';
+					emoji.style.display = 'inline-block';
+					emoji.style.overflow = 'hidden';
+					emoji.style.cursor = 'pointer';
+					emoji.onclick = chosen;
+					emoji.title = entry[0];
+					emoji.appendChild(document.createTextNode(entry[1]));
+					list.appendChild(emoji);
+					any = true;
+					any_at_all = true;
+				}
+				if (!any) {
+					list.removeChild(header);
 				}
 			}
-			let header = document.createElement('div');
-			header.appendChild(document.createTextNode('Recent'));
-			list.appendChild(header);
-			let any = false;
-			for (let entry of recent) {
-				if (
-					search &&
-					search.length &&
-					(emoji_to_name[entry] || '').toLowerCase().indexOf(search) == -1
-				) {
-					continue;
-				}
-				let emoji = document.createElement('span');
-				const k_size = '1.25em';
-				emoji.style.display = 'inline-block';
-				emoji.style.overflow = 'hidden';
-				emoji.style.cursor = 'pointer';
-				emoji.onclick = chosen;
-				emoji.title = emoji_to_name[entry] || entry;
-				emoji.appendChild(document.createTextNode(entry));
-				list.appendChild(emoji);
-				any = true;
-			}
-			if (!any) {
-				list.removeChild(header);
+			if (!any_at_all) {
+				list.appendChild(document.createTextNode('No matches found.'));
 			}
 		}
-		for (let row of Object.entries(json)) {
-			let header = document.createElement('div');
-			header.appendChild(document.createTextNode(row[0]));
-			list.appendChild(header);
-			let any = false;
-			for (let entry of Object.entries(row[1])) {
-				if (
-					search &&
-					search.length &&
-					entry[0].toLowerCase().indexOf(search) == -1
-				) {
-					continue;
-				}
-				let emoji = document.createElement('span');
-				const k_size = '1.25em';
-				emoji.style.display = 'inline-block';
-				emoji.style.overflow = 'hidden';
-				emoji.style.cursor = 'pointer';
-				emoji.onclick = chosen;
-				emoji.title = entry[0];
-				emoji.appendChild(document.createTextNode(entry[1]));
-				list.appendChild(emoji);
-				any = true;
-				any_at_all = true;
-			}
-			if (!any) {
-				list.removeChild(header);
-			}
-		}
-		if (!any_at_all) {
-			list.appendChild(document.createTextNode('No matches found.'));
-		}
-	}
-	refresh();
-	input.oninput = refresh;
-	document.body.appendChild(div);
-	div.style.position = 'fixed';
-	div.style.top = '50%';
-	div.style.left = '50%';
-	div.style.transform = 'translate(-50%, -50%)';
-	input.focus();
-	console.log('adding click');
-	document.body.addEventListener('mousedown', cleanup);
-	window.addEventListener('keydown', key_down);
+		refresh();
+		input.oninput = refresh;
+		document.body.appendChild(div);
+		div.style.position = 'fixed';
+		div.style.top = '50%';
+		div.style.left = '50%';
+		div.style.transform = 'translate(-50%, -50%)';
+		input.focus();
+		console.log('adding click');
+		document.body.addEventListener('mousedown', cleanup);
+		window.addEventListener('keydown', key_down);
+	});
 }

apps/ssb/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html style="color: #fff">
 	<head>
 		<title>Tilde Friends</title>
 		<base target="_top" />
@@ -10,14 +10,14 @@
 			}
 		</style>
 	</head>
-	<body style="margin: 0; padding: 0">
-		<tf-app></tf-app>
-		<tf-reactions-modal id="reactions_modal"></tf-reactions-modal>
+	<body style="background-color: #223a5e">
+		<tf-app class="w3-deep-purple" />
 		<script>
 			window.litDisableBundleWarning = true;
 		</script>
 		<script src="filesaver.min.js"></script>
 		<script src="commonmark.min.js"></script>
+		<script src="commonmark-linkify.js" type="module"></script>
 		<script src="commonmark-hashtag.js" type="module"></script>
 		<script src="script.js" type="module"></script>
 	</body>

apps/ssb/script.js

@@ -1,13 +1,13 @@
 import {LitElement, html} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
 
+import * as tf_id_picker from './tf-id-picker.js';
 import * as tf_app from './tf-app.js';
 import * as tf_message from './tf-message.js';
 import * as tf_user from './tf-user.js';
 import * as tf_compose from './tf-compose.js';
 import * as tf_news from './tf-news.js';
 import * as tf_profile from './tf-profile.js';
-import * as tf_reactions_modal from './tf-reactions-modal.js';
 import * as tf_tab_mentions from './tf-tab-mentions.js';
 import * as tf_tab_news from './tf-tab-news.js';
 import * as tf_tab_news_feed from './tf-tab-news-feed.js';

apps/ssb/tf-app.js

@@ -52,15 +52,13 @@ class TfElement extends LitElement {
 				self.broadcasts = value;
 			} else if (name === 'connections') {
 				self.connections = value;
-			} else if (name === 'identity') {
-				self.whoami = value;
 			}
 		});
 		this.initial_load();
 	}
 
 	async initial_load() {
-		let whoami = await tfrpc.rpc.getActiveIdentity();
+		let whoami = await tfrpc.rpc.localStorageGet('whoami');
 		let ids = (await tfrpc.rpc.getIdentities()) || [];
 		this.whoami = whoami ?? (ids.length ? ids[0] : undefined);
 		this.ids = ids;
@@ -195,6 +193,29 @@ class TfElement extends LitElement {
 		}
 	}
 
+	render_id_picker() {
+		return html`
+			<div style="display: flex; gap: 8px">
+				<tf-id-picker
+					id="picker"
+					style="flex: 1 1 auto"
+					selected=${this.whoami}
+					.ids=${this.ids}
+					.users=${this.users}
+					@change=${this._handle_whoami_changed}
+				></tf-id-picker>
+				<button
+					class="w3-button w3-dark-grey w3-border"
+					style="flex: 0 0 auto"
+					@click=${this.create_identity}
+					id="create_identity"
+				>
+					Create Identity
+				</button>
+			</div>
+		`;
+	}
+
 	async load_recent_tags() {
 		let start = new Date();
 		this.tags = await tfrpc.rpc.query(
@@ -234,15 +255,7 @@ class TfElement extends LitElement {
 			by_count.push({count: v.of, id: id});
 		}
 		console.log(by_count.sort((x, y) => y.count - x.count).slice(0, 20));
-		let start_time = new Date();
 		users = await this.fetch_about(Object.keys(following).sort(), users);
-		console.log(
-			'about took',
-			(new Date() - start_time) / 1000.0,
-			'seconds for',
-			Object.keys(users).length,
-			'users'
-		);
 		this.following = Object.keys(following);
 		this.users = users;
 		await tags;
@@ -339,15 +352,15 @@ class TfElement extends LitElement {
 		};
 
 		let tabs = html`
-			<div class="w3-bar w3-theme-l1">
+			<div class="w3-bar w3-black">
 				${Object.entries(k_tabs).map(
 					([k, v]) => html`
 						<button
 							title=${v}
-							class="w3-bar-item w3-padding-large w3-hover-theme tab ${self.tab ==
+							class="w3-bar-item w3-padding-large w3-hover-gray tab ${self.tab ==
 							v
-								? 'w3-theme-l2'
-								: 'w3-theme-l1'}"
+								? 'w3-red'
+								: 'w3-black'}"
 							@click=${() => self.set_tab(v)}
 						>
 							${k}
@@ -358,25 +371,15 @@ class TfElement extends LitElement {
 		`;
 		let contents = !this.loaded
 			? this.loading
-				? html`<div class="w3-panel w3-theme-l5 w3-card-4 w3-padding-large w3-round-xlarge">
-					Loading...
-				</div>
-				${this.render_tab()}`
+				? html`<div>Loading...</div>`
 				: html`<div>Select or create an identity.</div>`
 			: this.render_tab();
 		return html`
-			<div
-				style="width: 100vw; min-height: 100vh; height: 100%"
-				class="w3-theme-dark"
-			>
-				${tabs}
-				<div style="padding: 8px">
-					${this.tags.map(
-						(x) => html`<tf-tag tag=${x.tag} count=${x.count}></tf-tag>`
-					)}
-					${contents}
-				</div>
-			</div>
+			${this.render_id_picker()} ${tabs}
+			${this.tags.map(
+				(x) => html`<tf-tag tag=${x.tag} count=${x.count}></tf-tag>`
+			)}
+			${contents}
 		`;
 	}
 }

apps/ssb/tf-compose.js

@@ -1,4 +1,4 @@
-import {LitElement, html, unsafeHTML, live} from './lit-all.min.js';
+import {LitElement, html, unsafeHTML} from './lit-all.min.js';
 import * as tfutils from './tf-utils.js';
 import * as tfrpc from '/static/tfrpc.js';
 import {styles} from './tf-styles.js';
@@ -13,7 +13,6 @@ class TfComposeElement extends LitElement {
 			branch: {type: String},
 			apps: {type: Object},
 			drafts: {type: Object},
-			author: {type: String},
 		};
 	}
 
@@ -26,7 +25,6 @@ class TfComposeElement extends LitElement {
 		this.branch = undefined;
 		this.apps = undefined;
 		this.drafts = {};
-		this.author = undefined;
 	}
 
 	process_text(text) {
@@ -66,7 +64,7 @@ class TfComposeElement extends LitElement {
 			updated = true;
 		}
 		if (updated) {
-			setTimeout(() => this.notify(draft), 0);
+			this.requestUpdate();
 		}
 		return tfutils.markdown(text);
 	}
@@ -74,7 +72,7 @@ class TfComposeElement extends LitElement {
 	input(event) {
 		let edit = this.renderRoot.getElementById('edit');
 		let preview = this.renderRoot.getElementById('preview');
-		preview.innerHTML = this.process_text(edit.innerText);
+		preview.innerHTML = this.process_text(edit.value);
 		let content_warning = this.renderRoot.getElementById('content_warning');
 		let content_warning_preview = this.renderRoot.getElementById(
 			'content_warning_preview'
@@ -82,10 +80,6 @@ class TfComposeElement extends LitElement {
 		if (content_warning && content_warning_preview) {
 			content_warning_preview.innerText = content_warning.value;
 		}
-		let draft = this.get_draft();
-		draft.text = edit.innerText;
-		draft.content_warning = content_warning?.innerText;
-		setTimeout(() => this.notify(draft), 0);
 	}
 
 	notify(draft) {
@@ -101,6 +95,14 @@ class TfComposeElement extends LitElement {
 		);
 	}
 
+	change() {
+		let draft = this.get_draft();
+		draft.text = this.renderRoot.getElementById('edit')?.value;
+		draft.content_warning =
+			this.renderRoot.getElementById('content_warning')?.value;
+		this.notify(draft);
+	}
+
 	convert_to_format(buffer, type, mime_type) {
 		return new Promise(function (resolve, reject) {
 			let img = new Image();
@@ -167,7 +169,8 @@ class TfComposeElement extends LitElement {
 				size: buffer.length ?? buffer.byteLength,
 			};
 			let edit = self.renderRoot.getElementById('edit');
-			edit.innerText += `\n![${name}](${id})`;
+			edit.value += `\n![${name}](${id})`;
+			self.change();
 			self.input();
 		} catch (e) {
 			alert(e?.message);
@@ -194,7 +197,7 @@ class TfComposeElement extends LitElement {
 		let edit = this.renderRoot.getElementById('edit');
 		let message = {
 			type: 'post',
-			text: edit.innerText,
+			text: edit.value,
 		};
 		if (this.root || this.branch) {
 			message.root = this.root;
@@ -222,8 +225,8 @@ class TfComposeElement extends LitElement {
 		}
 		try {
 			await tfrpc.rpc.appendMessage(this.whoami, message).then(function () {
-				edit.innerText = '';
-				self.input();
+				edit.value = '';
+				self.change();
 				self.notify(undefined);
 				self.requestUpdate();
 			});
@@ -233,11 +236,17 @@ class TfComposeElement extends LitElement {
 	}
 
 	discard() {
+		let edit = this.renderRoot.getElementById('edit');
+		edit.value = '';
+		this.change();
+		let preview = this.renderRoot.getElementById('preview');
+		preview.innerHTML = '';
 		this.notify(undefined);
 	}
 
 	attach() {
 		let self = this;
+		let edit = this.renderRoot.getElementById('edit');
 		let input = document.createElement('input');
 		input.type = 'file';
 		input.onchange = function (event) {
@@ -275,34 +284,22 @@ class TfComposeElement extends LitElement {
 	}
 
 	firstUpdated() {
-		let values = Object.entries(this.users).map((x) => ({
-			key: x[1].name ?? x[0],
-			value: x[0],
-		}));
-		if (this.author) {
-			values = [].concat(
-				[
-					{
-						key: this.users[this.author]?.name,
-						value: this.author,
-					},
-				],
-				values
-			);
-		}
 		let tribute = new Tribute({
 			collection: [
 				{
-					values: values,
+					values: Object.entries(this.users).map((x) => ({
+						key: x[1].name,
+						value: x[0],
+					})),
 					selectTemplate: function (item) {
-						return item ? `[@${item.original.key}](${item.original.value})` : undefined;
+						return `[@${item.original.key}](${item.original.value})`;
 					},
 				},
 				{
 					trigger: '&',
 					values: this.autocomplete,
 					selectTemplate: function (item) {
-						return item ? `![${item.original.key}](${item.original.value})` : undefined;
+						return `![${item.original.key}](${item.original.value})`;
 					},
 				},
 			],
@@ -313,10 +310,10 @@ class TfComposeElement extends LitElement {
 	updated() {
 		super.updated();
 		let edit = this.renderRoot.getElementById('edit');
-		if (this.last_updated_text !== edit.innerText) {
+		if (this.last_updated_text !== edit.value) {
 			let preview = this.renderRoot.getElementById('preview');
-			preview.innerHTML = this.process_text(edit.innerText);
-			this.last_updated_text = edit.innerText;
+			preview.innerHTML = this.process_text(edit.value);
+			this.last_updated_text = edit.value;
 		}
 		let encrypt = this.renderRoot.getElementById('encrypt_to');
 		if (encrypt) {
@@ -336,7 +333,8 @@ class TfComposeElement extends LitElement {
 	remove_mention(id) {
 		let draft = this.get_draft();
 		delete draft.mentions[id];
-		setTimeout(() => this.notify(), 0);
+		this.notify(draft);
+		this.requestUpdate();
 	}
 
 	render_mention(mention) {
@@ -344,7 +342,7 @@ class TfComposeElement extends LitElement {
 		return html` <div style="display: flex; flex-direction: row">
 			<div style="align-self: center; margin: 0.5em">
 				<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					title="Remove ${mention.name} mention"
 					@click=${() => self.remove_mention(mention.link)}
 				>
@@ -398,16 +396,16 @@ class TfComposeElement extends LitElement {
 		if (this.apps) {
 			return html`
 				<div class="w3-card-4 w3-margin w3-padding">
-					<select id="select" class="w3-select w3-theme-d1">
+					<select id="select" class="w3-select w3-dark-grey">
 						${Object.keys(self.apps).map(
 							(app) => html`<option value=${app}>${app}</option>`
 						)}
 					</select>
-					<button class="w3-button w3-theme-d1" @click=${attach_selected_app}>
+					<button class="w3-button w3-dark-grey" @click=${attach_selected_app}>
 						Attach
 					</button>
 					<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => (this.apps = null)}
 					>
 						Cancel
@@ -423,12 +421,12 @@ class TfComposeElement extends LitElement {
 			self.apps = await tfrpc.rpc.apps();
 		}
 		if (!this.apps) {
-			return html`<button class="w3-button w3-theme-d1" @click=${attach_app}>
+			return html`<button class="w3-button w3-dark-grey" @click=${attach_app}>
 				Attach App
 			</button>`;
 		} else {
 			return html`<button
-				class="w3-button w3-theme-d1"
+				class="w3-button w3-dark-grey"
 				@click=${() => (this.apps = null)}
 			>
 				Discard App
@@ -450,15 +448,15 @@ class TfComposeElement extends LitElement {
 			return html`
 				<div class="w3-container w3-padding">
 					<p>
-						<input type="checkbox" class="w3-check w3-theme-d1" id="cw" @change=${() => self.set_content_warning(undefined)} checked="checked"></input>
+						<input type="checkbox" class="w3-check w3-dark-grey" id="cw" @change=${() => self.set_content_warning(undefined)} checked="checked"></input>
 						<label for="cw">CW</label>
 					</p>
-					<input type="text" class="w3-input w3-border w3-theme-d1" id="content_warning" placeholder="Enter a content warning here." @input=${this.input} @change=${this.change} value=${draft.content_warning}></input>
+					<input type="text" class="w3-input w3-border w3-dark-grey" id="content_warning" placeholder="Enter a content warning here." @input=${this.input} @change=${this.change} value=${draft.content_warning}></input>
 				</div>
 			`;
 		} else {
 			return html`
-				<input type="checkbox" class="w3-check w3-theme-d1" id="cw" @change=${() => self.set_content_warning('')}></input>
+				<input type="checkbox" class="w3-check w3-dark-grey" id="cw" @change=${() => self.set_content_warning('')}></input>
 				<label for="cw">CW</label>
 			`;
 		}
@@ -488,14 +486,14 @@ class TfComposeElement extends LitElement {
 			<div style="display: flex; flex-direction: row; width: 100%">
 				<label for="encrypt_to">🔐 To:</label>
 				<input type="text" id="encrypt_to" style="display: flex; flex: 1 1" @input=${this.update_encrypt}></input>
-				<button class="w3-button w3-theme-d1" @click=${() => this.set_encrypt(undefined)}>🚮</button>
+				<button class="w3-button w3-dark-grey" @click=${() => this.set_encrypt(undefined)}>🚮</button>
 			</div>
 			<ul>
 				${draft.encrypt_to.map(
 					(x) => html`
 					<li>
 						<tf-user id=${x} .users=${this.users}></tf-user>
-						<input type="button" class="w3-button w3-theme-d1" value="🚮" @click=${() => this.set_encrypt(draft.encrypt_to.filter((id) => id != x))}></input>
+						<input type="button" class="w3-button w3-dark-grey" value="🚮" @click=${() => this.set_encrypt(draft.encrypt_to.filter((id) => id != x))}></input>
 					</li>`
 				)}
 			</ul>
@@ -514,7 +512,7 @@ class TfComposeElement extends LitElement {
 		let draft = self.get_draft();
 		let content_warning =
 			draft.content_warning !== undefined
-				? html`<div class="w3-panel w3-round-xlarge w3-theme-d2">
+				? html`<div class="w3-panel w3-round-xlarge w3-blue">
 						<p id="content_warning_preview">${draft.content_warning}</p>
 					</div>`
 				: undefined;
@@ -522,31 +520,34 @@ class TfComposeElement extends LitElement {
 			draft.encrypt_to !== undefined
 				? undefined
 				: html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => this.set_encrypt([])}
 					>
 						🔐
 					</button>`;
 		let result = html`
 			<div
-				class="w3-card-4 w3-theme-d4 w3-padding-small"
+				class="w3-card-4 w3-blue-grey w3-padding"
 				style="box-sizing: border-box"
 			>
 				${this.render_encrypt()}
-				<div class="w3-container w3-padding-small">
-					<div class="w3-half">
-						<span
-							class="w3-input w3-theme-d1 w3-border"
-							style="resize: vertical; width: 100%; overflow: hidden; white-space: pre-wrap"
-							placeholder="Write a post here."
-							id="edit"
-							@input=${this.input}
-							@paste=${this.paste}
-							contenteditable
-							.innerText=${live(draft.text ?? '')}
-							></span>
+				<div style="display: flex; flex-direction: row; width: 100%; gap: 4px">
+					<div style="flex: 1 0 50%">
+						<p>
+							<textarea
+								class="w3-input w3-dark-grey w3-border"
+								style="resize: vertical"
+								placeholder="Write a post here."
+								id="edit"
+								@input=${this.input}
+								@change=${this.change}
+								@paste=${this.paste}
+							>
+${draft.text}</textarea
+							>
+						</p>
 					</div>
-					<div class="w3-half w3-padding">
+					<div style="flex: 1 0 50%">
 						${content_warning}
 						<div id="preview"></div>
 					</div>
@@ -555,14 +556,18 @@ class TfComposeElement extends LitElement {
 					self.render_mention(x)
 				)}
 				${this.render_attach_app()} ${this.render_content_warning()}
-				<button class="w3-button w3-theme-d1" id="submit" @click=${this.submit}>
+				<button
+					class="w3-button w3-dark-grey"
+					id="submit"
+					@click=${this.submit}
+				>
 					Submit
 				</button>
-				<button class="w3-button w3-theme-d1" @click=${this.attach}>
+				<button class="w3-button w3-dark-grey" @click=${this.attach}>
 					Attach
 				</button>
 				${this.render_attach_app_button()} ${encrypt}
-				<button class="w3-button w3-theme-d1" @click=${this.discard}>
+				<button class="w3-button w3-dark-grey" @click=${this.discard}>
 					Discard
 				</button>
 			</div>

apps/ssb/tf-id-picker.js

@@ -0,0 +1,54 @@
+import {LitElement, html} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+import {styles} from './tf-styles.js';
+
+/*
+ ** Provide a list of IDs, and this lets the user pick one.
+ */
+class TfIdentityPickerElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			selected: {type: String},
+			users: {type: Object},
+		};
+	}
+
+	static styles = styles;
+
+	constructor() {
+		super();
+		this.ids = [];
+		this.users = {};
+	}
+
+	changed(event) {
+		this.selected = event.srcElement.value;
+		this.dispatchEvent(
+			new Event('change', {
+				srcElement: this,
+			})
+		);
+	}
+
+	render() {
+		return html`
+			<select
+				class="w3-select w3-dark-grey w3-padding w3-border"
+				@change=${this.changed}
+				style="max-width: 100%; overflow: hidden"
+			>
+				${(this.ids ?? []).map(
+					(id) =>
+						html`<option ?selected=${id == this.selected} value=${id}>
+							${this.users[id]?.name
+								? this.users[id]?.name + ' - '
+								: undefined}<small>${id}</small>
+						</option>`
+				)}
+			</select>
+		`;
+	}
+}
+
+customElements.define('tf-id-picker', TfIdentityPickerElement);

apps/ssb/tf-message.js

@@ -1,4 +1,4 @@
-import {LitElement, html, render, unsafeHTML} from './lit-all.min.js';
+import {LitElement, html, unsafeHTML} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
 import * as tfutils from './tf-utils.js';
 import * as emojis from './emojis.js';
@@ -54,12 +54,6 @@ class TfMessageElement extends LitElement {
 		);
 	}
 
-	show_reactions() {
-		let modal = document.getElementById('reactions_modal');
-		modal.users = this.users;
-		modal.votes = this.message?.votes || [];
-	}
-
 	render_votes() {
 		function normalize_expression(expression) {
 			if (expression === 'Like' || !expression) {
@@ -72,21 +66,19 @@ class TfMessageElement extends LitElement {
 				return expression;
 			}
 		}
-		if (this.message?.votes?.length) {
-			return html`<div class="w3-button" @click=${this.show_reactions}>
-				${(this.message.votes || []).map(
-					(vote) => html`
-						<span
-							title="${this.users[vote.author]?.name ?? vote.author} ${new Date(
-								vote.timestamp
-							)}"
-						>
-							${normalize_expression(vote.content.vote.expression)}
-						</span>
-					`
-				)}
-			</div>`;
-		}
+		return html`<div>
+			${(this.message.votes || []).map(
+				(vote) => html`
+					<span
+						title="${this.users[vote.author]?.name ?? vote.author} ${new Date(
+							vote.timestamp
+						)}"
+					>
+						${normalize_expression(vote.content.vote.expression)}
+					</span>
+				`
+			)}
+		</div>`;
 	}
 
 	render_raw() {
@@ -133,7 +125,7 @@ class TfMessageElement extends LitElement {
 	}
 
 	react(event) {
-		emojis.picker((x) => this.vote(x), null, this.whoami);
+		emojis.picker((x) => this.vote(x));
 	}
 
 	show_image(link) {
@@ -248,7 +240,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 			let self = this;
 			return html`
 				<fieldset
-					style="padding: 0.5em; border: 1px solid black"
+					style="background-color: rgba(0, 0, 0, 0.1); padding: 0.5em; border: 1px solid black"
 				>
 					<legend>Mentions</legend>
 					${mentions.map((x) => self.render_mention(x))}
@@ -290,14 +282,14 @@ ${JSON.stringify(mention, null, 2)}</pre
 		if (this.message.child_messages?.length) {
 			if (!this.expanded[this.message.id]) {
 				return html`<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${() => self.set_expanded(true)}
 				>
 					+ ${this.total_child_messages(this.message) + ' More'}
 				</button>`;
 			} else {
 				return html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => self.set_expanded(false)}
 					>
 						Collapse</button
@@ -339,23 +331,20 @@ ${JSON.stringify(mention, null, 2)}</pre
 		if (this.message?.decrypted?.type == 'post') {
 			content = this.message.decrypted;
 		}
-		let class_background = this.message?.decrypted
-			? 'w3-pale-red'
-			: 'w3-theme-d4';
 		let self = this;
 		let raw_button;
 		switch (this.format) {
 			case 'raw':
 				if (content?.type == 'post' || content?.type == 'blog') {
 					raw_button = html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => (self.format = 'md')}
 					>
 						Markdown
 					</button>`;
 				} else {
 					raw_button = html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => (self.format = 'message')}
 					>
 						Message
@@ -364,7 +353,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 				break;
 			case 'md':
 				raw_button = html`<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${() => (self.format = 'message')}
 				>
 					Message
@@ -372,7 +361,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 				break;
 			case 'decrypted':
 				raw_button = html`<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${() => (self.format = 'raw')}
 				>
 					Raw
@@ -381,14 +370,14 @@ ${JSON.stringify(mention, null, 2)}</pre
 			default:
 				if (this.message.decrypted) {
 					raw_button = html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => (self.format = 'decrypted')}
 					>
 						Decrypted
 					</button>`;
 				} else {
 					raw_button = html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => (self.format = 'raw')}
 					>
 						Raw
@@ -400,8 +389,8 @@ ${JSON.stringify(mention, null, 2)}</pre
 			let body;
 			return html`
 				<div
-					class="w3-card-4 w3-theme-d4 w3-border-theme"
-					style="margin-top: 8px; padding: 16px; display: inline-block; overflow-wrap: anywhere"
+					class="w3-card-4"
+					style="background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; display: inline-block; overflow-wrap: anywhere"
 				>
 					<tf-user id=${self.message.author} .users=${self.users}></tf-user>
 					<span style="padding-right: 8px"
@@ -411,24 +400,13 @@ ${JSON.stringify(mention, null, 2)}</pre
 					>
 					${raw_button} ${self.format == 'raw' ? self.render_raw() : inner}
 					${self.render_votes()}
-					${(self.message.child_messages || []).map(
-						(x) => html`
-							<tf-message
-								.message=${x}
-								whoami=${self.whoami}
-								.users=${self.users}
-								.drafts=${self.drafts}
-								.expanded=${self.expanded}
-							></tf-message>
-						`
-					)}
 				</div>
 			`;
 		}
 		if (this.message?.type === 'contact_group') {
 			return html` <div
-				class="w3-card-4 w3-theme-d4 w3-border-theme"
-				style="margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
+				class="w3-card-4"
+				style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
 			>
 				${this.message.messages.map(
 					(x) =>
@@ -443,8 +421,8 @@ ${JSON.stringify(mention, null, 2)}</pre
 			</div>`;
 		} else if (this.message.placeholder) {
 			return html` <div
-				class="w3-card-4 w3-theme-d4 w3-border-theme"
-				style="margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
+				class="w3-card-4"
+				style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
 			>
 				<a target="_top" href=${'#' + this.message.id}>${this.message.id}</a>
 				(placeholder)
@@ -520,11 +498,13 @@ ${JSON.stringify(mention, null, 2)}</pre
 									branch=${this.message.id}
 									.drafts=${this.drafts}
 									@tf-discard=${this.discard_reply}
-									author=${this.message.author}
 								></tf-compose>
 							`
 						: html`
-								<button class="w3-button w3-theme-d1" @click=${this.show_reply}>
+								<button
+									class="w3-button w3-dark-grey"
+									@click=${this.show_reply}
+								>
 									Reply
 								</button>
 							`;
@@ -553,7 +533,7 @@ ${JSON.stringify(content, null, 2)}</pre
 				}
 				let content_warning = html`
 					<div
-						class="w3-panel w3-round-xlarge w3-theme-l4"
+						class="w3-panel w3-round-xlarge w3-blue"
 						style="cursor: pointer"
 						@click=${(x) => this.toggle_expanded(':cw')}
 					>
@@ -573,6 +553,9 @@ ${JSON.stringify(content, null, 2)}</pre
 				let is_encrypted = this.message?.decrypted
 					? html`<span style="align-self: center">🔓</span>`
 					: undefined;
+				let style_background = this.message?.decrypted
+					? 'rgba(255, 0, 0, 0.2)'
+					: 'rgba(255, 255, 255, 0.1)';
 				return html`
 					<style>
 						code {
@@ -589,8 +572,8 @@ ${JSON.stringify(content, null, 2)}</pre
 						}
 					</style>
 					<div
-						class="w3-card-4 ${class_background} w3-border-theme"
-						style="margin-top: 8px; padding: 16px"
+						class="w3-card-4"
+						style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px"
 					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
@@ -605,7 +588,7 @@ ${JSON.stringify(content, null, 2)}</pre
 						${payload} ${this.render_votes()}
 						<p>
 							${reply}
-							<button class="w3-button w3-theme-d1" @click=${this.react}>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>
 								React
 							</button>
 						</p>
@@ -616,6 +599,9 @@ ${JSON.stringify(content, null, 2)}</pre
 				let is_encrypted = this.message?.decrypted
 					? html`<span style="align-self: center">🔓</span>`
 					: undefined;
+				let style_background = this.message?.decrypted
+					? 'rgba(255, 0, 0, 0.2)'
+					: 'rgba(255, 255, 255, 0.1)';
 				return html`
 					<style>
 						code {
@@ -632,8 +618,8 @@ ${JSON.stringify(content, null, 2)}</pre
 						}
 					</style>
 					<div
-						class="w3-card-4 ${class_background} w3-border-theme"
-						style="margin-top: 8px; padding: 16px"
+						class="w3-card-4"
+						style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px"
 					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
@@ -647,7 +633,7 @@ ${JSON.stringify(content, null, 2)}</pre
 						</div>
 						${content.text} ${this.render_votes()}
 						<p>
-							<button class="w3-button w3-theme-d1" @click=${this.react}>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>
 								React
 							</button>
 						</p>
@@ -699,11 +685,13 @@ ${JSON.stringify(content, null, 2)}</pre
 									branch=${this.message.id}
 									.drafts=${this.drafts}
 									@tf-discard=${this.discard_reply}
-									author=${this.message.author}
 								></tf-compose>
 							`
 						: html`
-								<button class="w3-button w3-theme-d1" @click=${this.show_reply}>
+								<button
+									class="w3-button w3-dark-grey"
+									@click=${this.show_reply}
+								>
 									Reply
 								</button>
 							`;
@@ -723,8 +711,8 @@ ${JSON.stringify(content, null, 2)}</pre
 						}
 					</style>
 					<div
-						class="w3-card-4 w3-theme-d4 w3-border-theme"
-						style="margin-top: 8px; padding: 16px"
+						class="w3-card-4"
+						style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px"
 					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
@@ -740,7 +728,7 @@ ${JSON.stringify(content, null, 2)}</pre
 						${this.render_mentions()}
 						<div>
 							${reply}
-							<button class="w3-button w3-theme-d1" @click=${this.react}>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>
 								React
 							</button>
 						</div>

apps/ssb/tf-profile.js

@@ -215,49 +215,49 @@ class TfProfileElement extends LitElement {
 				let server_follow;
 				if (this.server_follows_me === true) {
 					server_follow = html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => this.server_follow_me(false)}
 					>
 						Server, Stop Following Me
 					</button>`;
 				} else if (this.server_follows_me === false) {
 					server_follow = html`<button
-						class="w3-button w3-theme-d1"
+						class="w3-button w3-dark-grey"
 						@click=${() => this.server_follow_me(true)}
 					>
 						Server, Follow Me
 					</button>`;
 				}
 				edit = html`
-					<button class="w3-button w3-theme-d1" @click=${this.save_edits}>
+					<button class="w3-button w3-dark-grey" @click=${this.save_edits}>
 						Save Profile
 					</button>
-					<button class="w3-button w3-theme-d1" @click=${this.discard_edits}>
+					<button class="w3-button w3-dark-grey" @click=${this.discard_edits}>
 						Discard
 					</button>
 					${server_follow}
 				`;
 			} else {
-				edit = html`<button class="w3-button w3-theme-d1" @click=${this.edit}>
+				edit = html`<button class="w3-button w3-dark-grey" @click=${this.edit}>
 					Edit Profile
 				</button>`;
 			}
 		}
 		if (this.id !== this.whoami && this.following !== undefined) {
 			follow = this.following
-				? html`<button class="w3-button w3-theme-d1" @click=${this.unfollow}>
+				? html`<button class="w3-button w3-dark-grey" @click=${this.unfollow}>
 						Unfollow
 					</button>`
-				: html`<button class="w3-button w3-theme-d1" @click=${this.follow}>
+				: html`<button class="w3-button w3-dark-grey" @click=${this.follow}>
 						Follow
 					</button>`;
 		}
 		if (this.id !== this.whoami && this.blocking !== undefined) {
 			block = this.blocking
-				? html`<button class="w3-button w3-theme-d1" @click=${this.unblock}>
+				? html`<button class="w3-button w3-dark-grey" @click=${this.unblock}>
 						Unblock
 					</button>`
-				: html`<button class="w3-button w3-theme-d1" @click=${this.block}>
+				: html`<button class="w3-button w3-dark-grey" @click=${this.block}>
 						Block
 					</button>`;
 		}
@@ -267,16 +267,16 @@ class TfProfileElement extends LitElement {
 				<div class="w3-container">
 					<div>
 						<label for="name">Name:</label>
-						<input class="w3-input w3-theme-d1" type="text" id="name" value=${this.editing.name} @input=${(event) => (this.editing = Object.assign({}, this.editing, {name: event.srcElement.value}))}></input>
+						<input class="w3-input w3-dark-grey" type="text" id="name" value=${this.editing.name} @input=${(event) => (this.editing = Object.assign({}, this.editing, {name: event.srcElement.value}))}></input>
 					</div>
 					<div><label for="description">Description:</label></div>
-					<textarea class="w3-input w3-theme-d1" style="resize: vertical" rows="8" id="description" @input=${(event) => (this.editing = Object.assign({}, this.editing, {description: event.srcElement.value}))}>${this.editing.description}</textarea>
+					<textarea class="w3-input w3-dark-grey" style="resize: vertical" rows="8" id="description" @input=${(event) => (this.editing = Object.assign({}, this.editing, {description: event.srcElement.value}))}>${this.editing.description}</textarea>
 					<div>
 						<label for="public_web_hosting">Public Web Hosting:</label>
-						<input class="w3-check w3-theme-d1" type="checkbox" id="public_web_hosting" ?checked=${this.editing.publicWebHosting} @input=${(event) => (self.editing = Object.assign({}, self.editing, {publicWebHosting: event.srcElement.checked}))}></input>
+						<input class="w3-check w3-dark-grey" type="checkbox" id="public_web_hosting" ?checked=${this.editing.publicWebHosting} @input=${(event) => (self.editing = Object.assign({}, self.editing, {publicWebHosting: event.srcElement.checked}))}></input>
 					</div>
 					<div>
-						<button class="w3-button w3-theme-d1" @click=${this.attach_image}>Attach Image</button>
+						<button class="w3-button w3-dark-grey" @click=${this.attach_image}>Attach Image</button>
 					</div>
 				</div>
 			</div>`

apps/ssb/tf-reactions-modal.js

@@ -1,68 +0,0 @@
-import {LitElement, html, unsafeHTML} from './lit-all.min.js';
-import {styles} from './tf-styles.js';
-
-class TfReactionsModalElement extends LitElement {
-	static get properties() {
-		return {
-			users: {type: Object},
-			votes: {type: Array},
-		};
-	}
-
-	static styles = styles;
-
-	constructor() {
-		super();
-		this.votes = [];
-		this.users = {};
-	}
-
-	clear() {
-		this.votes = [];
-	}
-
-	render() {
-		let self = this;
-		return this.votes?.length
-			? html` <div
-					class="w3-modal w3-animate-opacity"
-					style="display: block; box-sizing: border-box"
-				>
-					<div class="w3-modal-content w3-card-4 w3-theme-d1">
-						<div class="w3-container w3-padding">
-							<header class="w3-container">
-								<h2>Reactions</h2>
-								<span class="w3-button w3-display-topright" @click=${this.clear}
-									>&times;</span
-								>
-							</header>
-							<ul class="w3-theme-dark w3-container w3-ul">
-								${this.votes.map(
-									(x) => html`
-										<li class="w3-bar">
-											<span class="w3-bar-item"
-												>${x?.content?.vote?.expression}</span
-											>
-											<tf-user
-												class="w3-bar-item"
-												id=${x.author}
-												.users=${this.users}
-											></tf-user>
-											<span class="w3-bar-item w3-right"
-												>${new Date(x?.timestamp).toLocaleString()}</span
-											>
-										</li>
-									`
-								)}
-							</ul>
-							<footer class="w3-container w3-padding">
-								<button class="w3-button" @click=${this.clear}>Close</button>
-							</footer>
-						</div>
-					</div>
-				</div>`
-			: undefined;
-	}
-}
-
-customElements.define('tf-reactions-modal', TfReactionsModalElement);

apps/ssb/tf-tab-connections.js

@@ -33,11 +33,9 @@ class TfTabConnectionsElement extends LitElement {
 
 	render_connection_summary(connection) {
 		if (connection.address && connection.port) {
-			return html`<div>
-				<small>${connection.address}:${connection.port}</small>
-			</div>`;
+			return html`(<small>${connection.address}:${connection.port}</small>)`;
 		} else if (connection.tunnel) {
-			return html`<div>room peer</div>`;
+			return html`(room peer)`;
 		} else {
 			return JSON.stringify(connection);
 		}
@@ -63,7 +61,7 @@ class TfTabConnectionsElement extends LitElement {
 		return html`
 			<li>
 				<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${() => self._tunnel(connection.tunnel.id, connection.pubkey)}
 				>
 					Connect
@@ -75,17 +73,15 @@ class TfTabConnectionsElement extends LitElement {
 
 	render_broadcast(connection) {
 		return html`
-			<li class="w3-bar" style="overflow: hidden; overflow-wrap: nowrap">
+			<li>
 				<button
-					class="w3-bar-item w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${() => tfrpc.rpc.connect(connection)}
 				>
 					Connect
 				</button>
-				<div class="w3-bar-item">
-					<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
-					${this.render_connection_summary(connection)}
-				</div>
+				<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
+				${this.render_connection_summary(connection)}
 			</li>
 		`;
 	}
@@ -98,7 +94,7 @@ class TfTabConnectionsElement extends LitElement {
 	render_connection(connection) {
 		return html`
 			<button
-				class="w3-button w3-theme-d1"
+				class="w3-button w3-dark-grey"
 				@click=${() => tfrpc.rpc.closeConnection(connection.id)}
 			>
 				Close
@@ -107,9 +103,6 @@ class TfTabConnectionsElement extends LitElement {
 			${connection.tunnel !== undefined
 				? '🚇'
 				: html`(${connection.host}:${connection.port})`}
-			<div>${connection.requests.map(x => html`
-				<span class="w3-tag w3-small">${x.request_number > 0 ? '🟩' : '🟥'} ${x.name}</span>
-			`)}</div>
 			<ul>
 				${this.connections
 					.filter((x) => x.tunnel === this.connections.indexOf(connection))
@@ -122,64 +115,56 @@ class TfTabConnectionsElement extends LitElement {
 	render() {
 		let self = this;
 		return html`
-			<div class="w3-container" style="box-sizing: border-box">
+			<div class="w3-container">
 				<h2>New Connection</h2>
-				<textarea class="w3-input w3-theme-d1" id="code"></textarea>
+				<textarea class="w3-input w3-dark-grey" id="code"></textarea>
 				<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${() =>
 						tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)}
 				>
 					Connect
 				</button>
 				<h2>Broadcasts</h2>
-				<ul class="w3-ul w3-border">
+				<ul>
 					${this.broadcasts
 						.filter((x) => x.address)
 						.map((x) => self.render_broadcast(x))}
 				</ul>
 				<h2>Connections</h2>
-				<ul class="w3-ul w3-border">
+				<ul>
 					${this.connections
 						.filter((x) => x.tunnel === undefined)
-						.map(
-							(x) => html`
-								<li class="w3-bar">${this.render_connection(x)}</li>
-							`
-						)}
+						.map((x) => html` <li>${this.render_connection(x)}</li> `)}
 				</ul>
-				<h2>Stored Connections</h2>
-				<ul class="w3-ul w3-border">
+				<h2>Stored Connections (WIP)</h2>
+				<ul>
 					${this.stored_connections.map(
 						(x) => html`
-							<li class="w3-bar">
+							<li>
 								<button
-									class="w3-bar-item w3-button w3-theme-d1"
+									class="w3-button w3-dark-grey"
 									@click=${() => self.forget_stored_connection(x)}
 								>
 									Forget
 								</button>
 								<button
-									class="w3-bar-item w3-button w3-theme-d1"
+									class="w3-button w3-dark-grey"
 									@click=${() => tfrpc.rpc.connect(x)}
 								>
 									Connect
 								</button>
-								<div class="w3-bar-item">
-									<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
-									<div><small>${x.address}:${x.port}</small></div>
-								</div>
+								${x.address}:${x.port}
+								<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
 							</li>
 						`
 					)}
 				</ul>
 				<h2>Local Accounts</h2>
-				<ul class="w3-ul w3-border">
+				<ul>
 					${this.identities.map(
 						(x) =>
-							html`<li class="w3-bar">
-								<tf-user id=${x} .users=${this.users}></tf-user>
-							</li>`
+							html`<li><tf-user id=${x} .users=${this.users}></tf-user></li>`
 					)}
 				</ul>
 			</div>

apps/ssb/tf-tab-news-feed.js

@@ -187,7 +187,7 @@ class TfTabNewsFeedElement extends LitElement {
 		if (!this.hash.startsWith('#@') && !this.hash.startsWith('#%')) {
 			more = html`
 				<p>
-					<button class="w3-button w3-theme-d1" @click=${this.load_more}>
+					<button class="w3-button w3-dark-grey" @click=${this.load_more}>
 						Load More
 					</button>
 				</p>

apps/ssb/tf-tab-news.js

@@ -84,7 +84,10 @@ class TfTabNewsElement extends LitElement {
 		} else {
 			delete this.drafts[id];
 		}
-		this.drafts = Object.assign({}, this.drafts);
+		/* Only trigger a re-render if we're creating a new draft or discarding an old one. */
+		if ((previous !== undefined) != (event.detail.draft !== undefined)) {
+			this.drafts = Object.assign({}, this.drafts);
+		}
 		tfrpc.rpc.localStorageSet('drafts', JSON.stringify(this.drafts));
 	}
 
@@ -116,7 +119,7 @@ class TfTabNewsElement extends LitElement {
 		return html`
 			<p class="w3-bar">
 				<button
-					class="w3-bar-item w3-button w3-theme-d1"
+					class="w3-bar-item w3-button w3-dark-grey"
 					@click=${this.show_more}
 				>
 					${this.new_messages_text()}

apps/ssb/tf-tab-query.js

@@ -110,14 +110,14 @@ class TfTabQueryElement extends LitElement {
 				<textarea
 					id="search"
 					rows="8"
-					class="w3-input w3-theme-d1"
+					class="w3-input w3-dark-grey"
 					style="flex: 1; resize: vertical"
 					@keydown=${this.search_keydown}
 				>
 ${this.query}</textarea
 				>
 				<button
-					class="w3-button w3-theme-d1"
+					class="w3-button w3-dark-grey"
 					@click=${(event) =>
 						self.search(self.renderRoot.getElementById('search').value)}
 				>

apps/ssb/tf-tab-search.js

@@ -78,8 +78,8 @@ class TfTabSearchElement extends LitElement {
 		let self = this;
 		return html`
 			<div style="display: flex; flex-direction: row; gap: 4px">
-				<input type="text" class="w3-input w3-theme-d1" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></input>
-				<button class="w3-button w3-theme-d1" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}>Search</button>
+				<input type="text" class="w3-input w3-dark-grey" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></input>
+				<button class="w3-button w3-dark-grey" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}>Search</button>
 			</div>
 			<tf-news id="news" whoami=${this.whoami} .messages=${this.messages} .users=${this.users} .expanded=${this.expanded} @tf-expand=${this.on_expand}></tf-news>
 		`;

apps/ssb/tf-utils.js

@@ -1,7 +1,6 @@
+import * as linkify from './commonmark-linkify.js';
 import * as hashtagify from './commonmark-hashtag.js';
 
-const k_code_classes = 'w3-theme-l4 w3-theme-border w3-round';
-
 function image(node, entering) {
 	if (
 		node.firstChild?.type === 'text' &&
@@ -62,32 +61,13 @@ function image(node, entering) {
 	}
 }
 
-function code(node) {
-	let attrs = this.attrs(node);
-	attrs.push(['class', k_code_classes]);
-	this.tag('code', attrs);
-	this.out(node.literal);
-	this.tag('/code');
-}
-
-function attrs(node) {
-	let result = commonmark.HtmlRenderer.prototype.attrs.bind(this)(node);
-	if (node.type == 'block_quote') {
-		result.push(['class', 'w3-theme-d1']);
-	} else if (node.type == 'code_block') {
-		result.push(['class', k_code_classes]);
-	}
-	return result;
-}
-
 export function markdown(md) {
 	let reader = new commonmark.Parser({safe: true});
 	let writer = new commonmark.HtmlRenderer();
 	writer.image = image;
-	writer.code = code;
-	writer.attrs = attrs;
 	let parsed = reader.parse(md || '');
 	parsed = hashtagify.transform(parsed);
+	parsed = linkify.transform(parsed);
 	let walker = parsed.walker();
 	let event, node;
 	while ((event = walker.next())) {

apps/welcome.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "👋",
-	"previous": "&W5aJp2DgOW5rQ0AOIC9Ut3DpsahPrO6PjkJ1PQbNRdM=.sha256"
+	"previous": "&zFISmRDAv+SXFonfZ9/sHNhrmMe+poTU22gwZzuSkT4=.sha256"
 }

apps/welcome/index.html

@@ -55,7 +55,7 @@
 					</p>
 					<a
 						class="w3-button w3-black w3-padding-large"
-						href="https://dev.tildefriends.net/cory/tildefriends/releases"
+						href="https://www.tildefriends.net/~cory/releases/"
 						><i class="fa fa-download"></i> Download</a
 					>
 					<a
@@ -63,11 +63,6 @@
 						href="https://www.tildefriends.net/~cory/apps/"
 						><i class="fa fa-link"></i> Try It</a
 					>
-					<a
-						class="w3-button w3-black w3-padding-large"
-						href="https://dev.tildefriends.net/"
-						><i class="fa fa-mug-hot"></i> Code</a
-					>
 				</div>
 				<div class="w3-col l4 m6">
 					<img src="tildefriends.png" class="w3-image w3-right w3-hide-small" />
@@ -75,60 +70,6 @@
 			</div>
 		</div>
 
-		<!-- Getting Starting Section -->
-		<div class="w3-indigo w3-center">
-			<div class="w3-row-padding w3-padding-64">
-				<div class="w3-jumbo">
-					<i class="fa fa-rocket"></i> <b>Getting Started</b>
-				</div>
-				<div>
-					<h2>First-time user checklist:</h2>
-					<ol type="1" style="text-align: left">
-						<li>
-							<a href="https://dev.tildefriends.net/cory/tildefriends/releases"
-								>Download</a
-							>
-							Tilde Friends and run your own instance, or use
-							<a href="https://www.tildefriends.net/"
-								>https://www.tildefriends.net/</a
-							>.
-						</li>
-						<li>
-							Create an account to identify yourself with that instance by
-							username and password.
-						</li>
-						<li>
-							Create an SSB identity in the <b>ssb</b> app. This will generate a
-							keypair used to identify yourself to other users and sign your
-							messages so that they can be verified as from you.
-						</li>
-						<li>
-							Describe yourself in your profile in the <b>ssb</b> app. Give
-							yourself a name and an avatar if you like.
-						</li>
-						<li>
-							Connect to others. You will automatically discover peers on the
-							same instance and same network if there are any. Or use
-							<a href="https://github.com/staltz/ssb-room/blob/master/FAQ.md"
-								>rooms</a
-							>
-							and pubs to reach more distant users.
-							<a href="https://www.tildefriends.net/~cory/room/"
-								>tildefriends.net itself</a
-							>
-							operates as a room, so you can connect and see who else is online
-							and establish a connection.
-						</li>
-						<li>Follow people to grow your network.</li>
-						<li>
-							Use the <b>edit</b> link at the top of any page to start modifying
-							and making apps.
-						</li>
-					</ol>
-				</div>
-			</div>
-		</div>
-
 		<!-- SSB Section -->
 		<div class="w3-light-grey">
 			<div class="w3-row-padding w3-padding-64">
@@ -258,7 +199,7 @@
 			</div>
 
 			<div class="w3-row" style="margin-top: 64px">
-				<a href="https://codemirror.net/docs/changelog/" class="w3-col s3">
+				<a href="https://codemirror.net/5/" class="w3-col s3">
 					<i class="fa fa-keyboard w3-text-indigo w3-jumbo"></i>
 					<p>CodeMirror</p>
 				</a>

apps/wiki.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📝",
-	"previous": "&DaYqKHRBKhjFGaOzbKZ1+/pLspJeEkDJYTF2B50tH6k=.sha256"
+	"previous": "&DnfuAUGzzalSh9NgZXnzDc9Ru5aM0omfRJ4h27jYw4k=.sha256"
 }

apps/wiki/app.js

@@ -4,9 +4,6 @@ import * as utils from './utils.js';
 let g_hash;
 let g_collection_notifies = {};
 
-tfrpc.register(async function getActiveIdentity() {
-	return ssb.getActiveIdentity();
-});
 tfrpc.register(async function getOwnerIdentities() {
 	return ssb.getOwnerIdentities();
 });
@@ -57,9 +54,6 @@ core.register('message', async function message_handler(message) {
 		await tfrpc.rpc.hash_changed(message.hash);
 	}
 });
-core.register('setActiveIdentity', async function setActiveIdentityHandler(id) {
-	await tfrpc.rpc.setActiveIdentity(id);
-});
 
 tfrpc.register(function set_hash(hash) {
 	if (g_hash != hash) {

apps/wiki/index.html

@@ -10,6 +10,7 @@
 			window.litDisableBundleWarning = true;
 		</script>
 		<script src="tf-collection.js" type="module"></script>
+		<script src="tf-id-picker.js" type="module"></script>
 		<script src="tf-wiki-doc.js" type="module"></script>
 		<script src="tf-wiki-app.js" type="module"></script>
 	</body>

apps/wiki/tf-id-picker.js

@@ -0,0 +1,44 @@
+import {LitElement, html} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+/*
+ ** Provide a list of IDs, and this lets the user pick one.
+ */
+class TfIdentityPickerElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			selected: {type: String},
+		};
+	}
+
+	constructor() {
+		super();
+		this.ids = [];
+	}
+
+	changed(event) {
+		this.selected = event.srcElement.value;
+		this.dispatchEvent(
+			new Event('change', {
+				srcElement: this,
+			})
+		);
+	}
+
+	render() {
+		return html`
+			<link rel="stylesheet" href="tildefriends.css" />
+			<select @change=${this.changed} style="max-width: 100%">
+				${(this.ids ?? []).map(
+					(id) =>
+						html`<option ?selected=${id == this.selected} value=${id}>
+							${id}
+						</option>`
+				)}
+			</select>
+		`;
+	}
+}
+
+customElements.define('tf-id-picker', TfIdentityPickerElement);

apps/wiki/tf-wiki-app.js

@@ -31,16 +31,13 @@ class TfCollectionsAppElement extends LitElement {
 		tfrpc.register(function hash_changed(hash) {
 			self.notify_hash_changed(hash);
 		});
-		tfrpc.register(function setActiveIdentity(id) {
-			self.whoami = id;
-		});
 		tfrpc.rpc.get_hash().then((hash) => self.notify_hash_changed(hash));
 	}
 
 	async load() {
 		this.ids = await tfrpc.rpc.getIdentities();
 		this.owner_ids = await tfrpc.rpc.getOwnerIdentities();
-		this.whoami = await tfrpc.rpc.getActiveIdentity();
+		this.whoami = await tfrpc.rpc.localStorageGet('collections_whoami');
 		let ids = [...new Set([...this.owner_ids, this.whoami])].sort();
 		this.following = Object.keys(await tfrpc.rpc.following(ids, 1)).sort();
 
@@ -276,6 +273,9 @@ class TfCollectionsAppElement extends LitElement {
 					margin-right: 16px;
 				}
 			</style>
+			<div>
+				<tf-id-picker .ids=${this.ids} selected=${this.whoami} @change=${this.on_whoami_changed} ?hidden=${!this.ids?.length}></tf-id-picker>
+			</div>
 			<div>
 				${keyed(
 					this.whoami,

apps/wiki/utils.js

@@ -96,7 +96,7 @@ export async function collection(
 		let rows = [];
 		await ssb.sqlAsync(
 			`
-				SELECT messages.id, author, json(content) AS content, timestamp
+				SELECT messages.id, author, content, timestamp
 				FROM messages
 				JOIN json_each(?1) AS id ON messages.author = id.value
 				WHERE

core/app.js

@@ -1,3 +1,4 @@
+import * as auth from './auth.js';
 import * as core from './core.js';
 
 let g_next_id = 1;
@@ -86,7 +87,8 @@ App.prototype.send = function (message) {
 function socket(request, response, client) {
 	let process;
 	let options = {};
-	let credentials = httpd.auth_query(request.headers);
+	let credentials = auth.query(request.headers);
+	let refresh = auth.makeRefresh(credentials);
 
 	response.onClose = async function () {
 		if (process && process.task) {
@@ -141,21 +143,12 @@ function socket(request, response, client) {
 					}
 				}
 				response.send(
-					JSON.stringify(
-						Object.assign(
-							{
-								action: 'session',
-								credentials: credentials,
-								parentApp: parentApp,
-								id: blobId,
-							},
-							await ssb.getIdentityInfo(
-								credentials?.session?.name,
-								packageOwner,
-								packageName
-							)
-						)
-					),
+					JSON.stringify({
+						action: 'session',
+						credentials: credentials,
+						parentApp: parentApp,
+						id: blobId,
+					}),
 					0x1
 				);
 
@@ -219,10 +212,6 @@ function socket(request, response, client) {
 				if (process) {
 					process.resetPermission(message.permission);
 				}
-			} else if (message.action == 'setActiveIdentity') {
-				process.setActiveIdentity(message.identity);
-			} else if (message.action == 'createIdentity') {
-				process.createIdentity();
 			} else if (message.message == 'tfrpc') {
 				if (message.id && g_calls[message.id]) {
 					if (message.error !== undefined) {
@@ -252,7 +241,14 @@ function socket(request, response, client) {
 		}
 	};
 
-	response.upgrade(100, {});
+	response.upgrade(
+		100,
+		refresh
+			? {
+					'Set-Cookie': `session=${refresh.token}; path=/; Max-Age=${refresh.interval}; Secure; SameSite=Strict`,
+				}
+			: {}
+	);
 }
 
 export {socket, App};

core/auth.html

@@ -19,11 +19,8 @@
 			Object.assign(app, g_data);
 
 			class TfAuthElement extends LitElement {
-				static get properties() {
+				static get_properties() {
 					return {
-						code_of_conduct: {type: String},
-						error: {type: String},
-						have_administrator: {type: Boolean},
 						name: {type: String},
 						tab: {type: String},
 					};
@@ -34,6 +31,11 @@
 					this.tab = 'login';
 				}
 
+				tab_changed(name) {
+					this.tab = name;
+					this.requestUpdate();
+				}
+
 				render() {
 					let self = this;
 					return html`
@@ -81,16 +83,16 @@
 							<h1 ?hidden=${this.name === undefined}>Welcome, ${this.name}.</h1>
 
 							<div style="display: flex; flex-direction: row; width: 100%">
-								<input type="radio" name="tab" id="login" value="Login" ?checked=${this.tab == 'login'} @change=${() => (self.tab = 'login')}></input>
+								<input type="radio" name="tab" id="login" value="Login" ?checked=${this.tab == 'login'} @change=${() => self.tab_changed('login')}></input>
 								<label for="login" id="login_label">Login</label>
 
-								<input type="radio" name="tab" id="register" value="Register" ?checked=${this.tab == 'register'} @change=${() => (self.tab = 'register')}></input>
+								<input type="radio" name="tab" id="register" value="Register" ?checked=${this.tab == 'register'} @change=${() => self.tab_changed('register')}></input>
 								<label for="register" id="register_label">Register</label>
 
-								<input type="radio" name="tab" id="guest" value="Guest" ?checked=${this.tab == 'guest'} @change=${() => (self.tab = 'guest')}></input>
+								<input type="radio" name="tab" id="guest" value="Guest" ?checked=${this.tab == 'guest'} @change=${() => self.tab_changed('guest')}></input>
 								<label for="guest" id="guest_label">Guest</label>
 
-								<input type="radio" name="tab" id="change" value="Change Password" ?checked=${this.tab == 'change'} @change=${() => (self.tab = 'change')}></input>
+								<input type="radio" name="tab" id="change" value="Change Password" ?checked=${this.tab == 'change'} @change=${() => self.tab_changed('change')}></input>
 								<label for="change" id="change_label">Change Password</label>
 							</div>
 

core/auth.js

@@ -0,0 +1,420 @@
+import * as core from './core.js';
+import * as form from './form.js';
+
+let gDatabase = new Database('auth');
+
+const kRefreshInterval = 1 * 7 * 24 * 60 * 60 * 1000;
+
+/**
+ * Makes a Base64 value URL safe
+ * @param {string} value
+ * @returns TODOC
+ */
+function b64url(value) {
+	value = value.replaceAll('+', '-').replaceAll('/', '_');
+	let equals = value.indexOf('=');
+
+	if (equals !== -1) {
+		return value.substring(0, equals);
+	} else {
+		return value;
+	}
+}
+
+/**
+ * TODOC
+ * @param {string} value
+ * @returns
+ */
+function unb64url(value) {
+	value = value.replaceAll('-', '+').replaceAll('_', '/');
+	let remainder = value.length % 4;
+
+	if (remainder == 3) {
+		return value + '=';
+	} else if (remainder == 2) {
+		return value + '==';
+	} else {
+		return value;
+	}
+}
+
+/**
+ * Creates a JSON Web Token
+ * @param {object} payload Object: {"name": "username"}
+ * @returns the JWT
+ */
+function makeJwt(payload) {
+	const ids = ssb.getIdentities(':auth');
+	let id;
+
+	if (ids?.length) {
+		id = ids[0];
+	} else {
+		id = ssb.createIdentity(':auth');
+	}
+
+	const final_payload = b64url(
+		base64Encode(
+			JSON.stringify(
+				Object.assign({}, payload, {
+					exp: new Date().valueOf() + kRefreshInterval,
+				})
+			)
+		)
+	);
+	const jwt = [
+		b64url(base64Encode(JSON.stringify({alg: 'HS256', typ: 'JWT'}))),
+		final_payload,
+		b64url(ssb.hmacsha256sign(final_payload, ':auth', id)),
+	].join('.');
+	return jwt;
+}
+
+/**
+ * Validates a JWT ?
+ * @param {*} session TODOC
+ * @returns
+ */
+function readSession(session) {
+	let jwt_parts = session?.split('.');
+
+	if (jwt_parts?.length === 3) {
+		let [header, payload, signature] = jwt_parts;
+		header = JSON.parse(utf8Decode(base64Decode(unb64url(header))));
+
+		if (header.typ === 'JWT' && header.alg === 'HS256') {
+			signature = unb64url(signature);
+			let id = ssb.getIdentities(':auth');
+
+			if (id?.length && ssb.hmacsha256verify(id[0], payload, signature)) {
+				const result = JSON.parse(utf8Decode(base64Decode(unb64url(payload))));
+				const now = new Date().valueOf();
+
+				if (now < result.exp) {
+					print(`JWT valid for another ${(result.exp - now) / 1000} seconds.`);
+					return result;
+				} else {
+					print(`JWT expired by ${(now - result.exp) / 1000} seconds.`);
+				}
+			} else {
+				print('JWT verification failed.');
+			}
+		} else {
+			print('Invalid JWT header.');
+		}
+	}
+}
+
+/**
+ * Check the provided password matches the hash
+ * @param {string} password
+ * @param {string} hash bcrypt hash
+ * @returns true if the password matches the hash
+ */
+function verifyPassword(password, hash) {
+	return bCrypt.hashpw(password, hash) === hash;
+}
+
+/**
+ * Hashes a password
+ * @param {string} password
+ * @returns {string} TODOC
+ */
+function hashPassword(password) {
+	let salt = bCrypt.gensalt(12);
+	return bCrypt.hashpw(password, salt);
+}
+
+/**
+ * Check if there is an administrator on the instance
+ * @returns TODOC
+ */
+function noAdministrator() {
+	return (
+		!core.globalSettings ||
+		!core.globalSettings.permissions ||
+		!Object.keys(core.globalSettings.permissions).some(function (name) {
+			return (
+				core.globalSettings.permissions[name].indexOf('administration') != -1
+			);
+		})
+	);
+}
+
+/**
+ * Makes a user an administrator
+ * @param {string} name the user's name
+ */
+function makeAdministrator(name) {
+	if (!core.globalSettings.permissions) {
+		core.globalSettings.permissions = {};
+	}
+	if (!core.globalSettings.permissions[name]) {
+		core.globalSettings.permissions[name] = [];
+	}
+	if (core.globalSettings.permissions[name].indexOf('administration') == -1) {
+		core.globalSettings.permissions[name].push('administration');
+	}
+
+	core.setGlobalSettings(core.globalSettings);
+}
+
+/**
+ * TODOC
+ * @param {*} headers most likely an object
+ * @returns
+ */
+function getCookies(headers) {
+	let cookies = {};
+
+	if (headers.cookie) {
+		let parts = headers.cookie.split(/,|;/);
+		for (let i in parts) {
+			let equals = parts[i].indexOf('=');
+			let name = parts[i].substring(0, equals).trim();
+			let value = parts[i].substring(equals + 1).trim();
+			cookies[name] = value;
+		}
+	}
+
+	return cookies;
+}
+
+/**
+ * Validates a username
+ * @param {string} name
+ * @returns false | boolean[] ?
+ */
+function isNameValid(name) {
+	// TODO(tasiaiso): convert this into a regex
+	let c = name.charAt(0);
+	return (
+		((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) &&
+		name
+			.split()
+			.map(
+				(x) =>
+					x >= ('a' && x <= 'z') ||
+					x >= ('A' && x <= 'Z') ||
+					x >= ('0' && x <= '9')
+			)
+	);
+}
+
+/**
+ * Request handler ?
+ * @param {*} request TODOC
+ * @param {*} response
+ * @returns
+ */
+function handler(request, response) {
+	// TODO(tasiaiso): split this function
+	let session = getCookies(request.headers).session;
+	if (request.uri == '/login') {
+		let formData = form.decodeForm(request.query);
+		if (query(request.headers)?.permissions?.authenticated) {
+			if (formData.return) {
+				response.writeHead(303, {Location: formData.return});
+			} else {
+				response.writeHead(303, {
+					Location:
+						(request.client.tls ? 'https://' : 'http://') +
+						request.headers.host +
+						'/',
+					'Content-Length': '0',
+				});
+			}
+			response.end();
+			return;
+		}
+
+		let sessionIsNew = false;
+		let loginError;
+
+		if (request.method == 'POST' || formData.submit) {
+			sessionIsNew = true;
+			formData = form.decodeForm(utf8Decode(request.body), formData);
+			if (formData.submit == 'Login') {
+				let account = gDatabase.get('user:' + formData.name);
+				account = account ? JSON.parse(account) : account;
+				if (formData.register == '1') {
+					if (
+						!account &&
+						isNameValid(formData.name) &&
+						formData.password == formData.confirm
+					) {
+						let users = new Set();
+						let users_original = gDatabase.get('users');
+						try {
+							users = new Set(JSON.parse(users_original));
+						} catch {}
+						if (!users.has(formData.name)) {
+							users.add(formData.name);
+						}
+						users = JSON.stringify([...users].sort());
+						if (users !== users_original) {
+							gDatabase.set('users', users);
+						}
+						session = makeJwt({name: formData.name});
+						account = {password: hashPassword(formData.password)};
+						gDatabase.set('user:' + formData.name, JSON.stringify(account));
+						if (noAdministrator()) {
+							makeAdministrator(formData.name);
+						}
+					} else {
+						loginError = 'Error registering account.';
+					}
+				} else if (formData.change == '1') {
+					if (
+						account &&
+						isNameValid(formData.name) &&
+						formData.new_password == formData.confirm &&
+						verifyPassword(formData.password, account.password)
+					) {
+						session = makeJwt({name: formData.name});
+						account = {password: hashPassword(formData.new_password)};
+						gDatabase.set('user:' + formData.name, JSON.stringify(account));
+					} else {
+						loginError = 'Error changing password.';
+					}
+				} else {
+					if (
+						account &&
+						account.password &&
+						verifyPassword(formData.password, account.password)
+					) {
+						session = makeJwt({name: formData.name});
+						if (noAdministrator()) {
+							makeAdministrator(formData.name);
+						}
+					} else {
+						loginError = 'Invalid username or password.';
+					}
+				}
+			} else {
+				// Proceed as Guest
+				session = makeJwt({name: 'guest'});
+			}
+		}
+
+		let cookie = `session=${session}; path=/; Max-Age=${kRefreshInterval}; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; HttpOnly`;
+		let entry = readSession(session);
+		if (entry && formData.return) {
+			response.writeHead(303, {
+				Location: formData.return,
+				'Set-Cookie': cookie,
+			});
+			response.end();
+		} else {
+			File.readFile('core/auth.html')
+				.then(function (data) {
+					let html = utf8Decode(data);
+					let auth_data = {
+						session_is_new: sessionIsNew,
+						name: entry?.name,
+						error: loginError,
+						code_of_conduct: core.globalSettings.code_of_conduct,
+						have_administrator: !noAdministrator(),
+					};
+					html = utf8Encode(
+						html.replace('$AUTH_DATA', JSON.stringify(auth_data))
+					);
+					response.writeHead(200, {
+						'Content-Type': 'text/html; charset=utf-8',
+						'Set-Cookie': cookie,
+						'Content-Length': html.length,
+					});
+					response.end(html);
+				})
+				.catch(function (error) {
+					response.writeHead(404, {
+						'Content-Type': 'text/plain; charset=utf-8',
+						Connection: 'close',
+					});
+					response.end('404 File not found');
+				});
+		}
+	} else if (request.uri == '/login/logout') {
+		response.writeHead(303, {
+			'Set-Cookie': `session=; path=/; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly`,
+			Location: '/login' + (request.query ? '?' + request.query : ''),
+		});
+		response.end();
+	} else {
+		response.writeHead(200, {
+			'Content-Type': 'text/plain; charset=utf-8',
+			Connection: 'close',
+		});
+		response.end('Hello, ' + request.client.peerName + '.');
+	}
+}
+
+/**
+ * Gets a user's permissions based on it's session ?
+ * @param {*} session TODOC
+ * @returns
+ */
+function getPermissions(session) {
+	let permissions;
+	let entry = readSession(session);
+	if (entry) {
+		permissions = getPermissionsForUser(entry.name);
+		permissions.authenticated = entry.name !== 'guest';
+	}
+	return permissions || {};
+}
+
+/**
+ * Get a user's permissions ?
+ * @param {string} userName TODOC
+ * @returns
+ */
+function getPermissionsForUser(userName) {
+	let permissions = {};
+	if (
+		core.globalSettings &&
+		core.globalSettings.permissions &&
+		core.globalSettings.permissions[userName]
+	) {
+		for (let i in core.globalSettings.permissions[userName]) {
+			permissions[core.globalSettings.permissions[userName][i]] = true;
+		}
+	}
+	return permissions;
+}
+
+/**
+ * TODOC
+ * @param {*} headers
+ * @returns
+ */
+function query(headers) {
+	let session = getCookies(headers).session;
+	let entry;
+	let autologin = tildefriends.args.autologin;
+	if ((entry = autologin ? {name: autologin} : readSession(session))) {
+		return {
+			session: entry,
+			permissions: autologin
+				? getPermissionsForUser(autologin)
+				: getPermissions(session),
+		};
+	}
+}
+
+/**
+ * Refreshes a JWT ?
+ * @param {*} credentials TODOC
+ * @returns
+ */
+function makeRefresh(credentials) {
+	if (credentials?.session?.name) {
+		return {
+			token: makeJwt({name: credentials.session.name}),
+			interval: kRefreshInterval,
+		};
+	}
+}
+
+export {handler, query, makeRefresh};

core/client.js

@@ -56,9 +56,6 @@ class TfNavigationElement extends LitElement {
 			spark_lines: {type: Object},
 			version: {type: Object},
 			show_version: {type: Boolean},
-			identity: {type: String},
-			identities: {type: Array},
-			names: {type: Object},
 		};
 	}
 
@@ -68,8 +65,6 @@ class TfNavigationElement extends LitElement {
 		this.show_permissions = false;
 		this.status = {};
 		this.spark_lines = {};
-		this.identities = [];
-		this.names = {};
 	}
 
 	/**
@@ -102,10 +97,10 @@ class TfNavigationElement extends LitElement {
 	get_spark_line(key, options) {
 		if (!this.spark_lines[key]) {
 			let spark_line = document.createElement('tf-sparkline');
+			spark_line.style.display = 'flex';
+			spark_line.style.flexDirection = 'row';
+			spark_line.style.flex = '0 50 5em';
 			spark_line.title = key;
-			spark_line.classList.add('w3-bar-item');
-			spark_line.classList.add('w3-hide-small');
-			spark_line.style.paddingRight = '0';
 			if (options) {
 				if (options.max) {
 					spark_line.max = options.max;
@@ -123,105 +118,16 @@ class TfNavigationElement extends LitElement {
 	 */
 	render_login() {
 		if (this?.credentials?.session?.name) {
-			return html`<a
-				class="w3-bar-item w3-right"
-				id="login"
-				href="/login/logout?return=${url() + hash()}"
+			return html`<a id="login" href="/login/logout?return=${url() + hash()}"
 				>logout ${this.credentials.session.name}</a
 			>`;
 		} else {
-			return html`<a
-				class="w3-bar-item w3-right"
-				id="login"
-				href="/login?return=${url() + hash()}"
+			return html`<a id="login" href="/login?return=${url() + hash()}"
 				>login</a
 			>`;
 		}
 	}
 
-	set_active_identity(id) {
-		send({action: 'setActiveIdentity', identity: id});
-		this.renderRoot.getElementById('id_dropdown').classList.remove('w3-show');
-	}
-
-	create_identity(event) {
-		if (confirm('Are you sure you want to create a new identity?')) {
-			send({action: 'createIdentity'});
-		}
-	}
-
-	toggle_id_dropdown() {
-		this.renderRoot.getElementById('id_dropdown').classList.toggle('w3-show');
-	}
-
-	edit_profile() {
-		window.location.href = '/~core/ssb/#' + this.identity;
-	}
-
-	render_identity() {
-		let self = this;
-		if (this.identities?.length) {
-			return html`
-				<link type="text/css" rel="stylesheet" href="/static/w3.css" />
-				<div class="w3-dropdown-click w3-right" style="max-width: 100%">
-					<button
-						class="w3-button w3-rest w3-cyan"
-						style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap; max-width: 100%"
-						@click=${self.toggle_id_dropdown}
-					>
-						${self.names[this.identity]}${self.names[this.identity] ===
-						this.identity
-							? ''
-							: html` - ${this.identity}`}
-						▾
-					</button>
-					<div
-						id="id_dropdown"
-						class="w3-dropdown-content w3-bar-block w3-card-4"
-						style="max-width: 100%"
-					>
-						<button
-							class="w3-bar-item w3-button w3-border"
-							@click=${() => (window.location.href = '/~core/identity')}
-						>
-							Manage Identities...
-						</button>
-						<button
-							class="w3-bar-item w3-button w3-border"
-							@click=${self.edit_profile}
-						>
-							Edit Profile...
-						</button>
-						${this.identities.map(
-							(x) => html`
-								<button
-									class="w3-bar-item w3-button ${x === self.identity
-										? 'w3-cyan'
-										: ''}"
-									@click=${() => self.set_active_identity(x)}
-									style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-								>
-									${self.names[x]}${self.names[x] === x ? '' : html` - ${x}`}
-								</button>
-							`
-						)}
-					</div>
-				</div>
-			`;
-		} else {
-			return html`
-				<link type="text/css" rel="stylesheet" href="/static/w3.css" />
-				<button
-					id="create_identity"
-					@click=${this.create_identity}
-					class="w3-button w3-mobile w3-blue w3-right"
-				>
-					Create an Identity
-				</button>
-			`;
-		}
-	}
-
 	/**
 	 * TODOC
 	 * @returns
@@ -239,17 +145,11 @@ class TfNavigationElement extends LitElement {
 						<div>This app has the following permissions:</div>
 						${Object.keys(this.permissions).map(
 							(key) => html`
-								<div>
-									<span>${key}</span>:
-									${this.permissions[key] ? '✅ Allowed' : '❌ Denied'}
-									<button
-										@click=${() => this.reset_permission(key)}
-										class="w3-button w3-red"
-									>
-										Reset
-									</button>
-								</div>
-							`
+							<div>
+								<span>${key}</span>: ${this.permissions[key] ? '✅ Allowed' : '❌ Denied'}
+								<button @click=${() => this.reset_permission(key)} class='w3-button w3-red">Reset</button>
+							</div>
+						`
 						)}
 						<button
 							@click=${() => (this.show_permissions = false)}
@@ -263,10 +163,6 @@ class TfNavigationElement extends LitElement {
 		}
 	}
 
-	clear_error() {
-		this.status = {};
-	}
-
 	/**
 	 * TODOC
 	 * @returns
@@ -274,7 +170,6 @@ class TfNavigationElement extends LitElement {
 	render() {
 		let self = this;
 		return html`
-			<link type="text/css" rel="stylesheet" href="/static/w3.css" />
 			<style>
 				${k_global_style} .tooltip {
 					position: absolute;
@@ -290,17 +185,17 @@ class TfNavigationElement extends LitElement {
 					display: inline-block;
 				}
 			</style>
-			<div class="w3-black w3-bar">
+			<div
+				style="margin: 4px; display: flex; flex-direction: row; flex-wrap: nowrap; gap: 3px; align-items: center"
+			>
 				<span
-					class="w3-bar-item"
 					style="cursor: pointer"
 					@click=${() => (this.show_version = !this.show_version)}
 					>😎</span
 				>
 				<span
-					class="w3-bar-item"
-					style=${'white-space: nowrap' +
-					(this.show_version ? '' : '; display: none')}
+					?hidden=${!this.show_version}
+					style="flex: 0 0; white-space: nowrap"
 					title=${this.version?.name +
 					' ' +
 					Object.entries(this.version || {})
@@ -309,7 +204,6 @@ class TfNavigationElement extends LitElement {
 					>${this.version?.number}</span
 				>
 				<a
-					class="w3-bar-item"
 					accesskey="h"
 					@mouseover=${set_access_key_title}
 					data-tip="Open home app."
@@ -318,7 +212,6 @@ class TfNavigationElement extends LitElement {
 					>TF</a
 				>
 				<a
-					class="w3-bar-item"
 					accesskey="a"
 					@mouseover=${set_access_key_title}
 					data-tip="Open apps list."
@@ -326,7 +219,6 @@ class TfNavigationElement extends LitElement {
 					>apps</a
 				>
 				<a
-					class="w3-bar-item"
 					accesskey="e"
 					@mouseover=${set_access_key_title}
 					data-tip="Toggle the app editor."
@@ -335,7 +227,6 @@ class TfNavigationElement extends LitElement {
 					>edit</a
 				>
 				<a
-					class="w3-bar-item"
 					accesskey="p"
 					@mouseover=${set_access_key_title}
 					data-tip="View and change permissions."
@@ -343,34 +234,27 @@ class TfNavigationElement extends LitElement {
 					@click=${() => (self.show_permissions = !self.show_permissions)}
 					>🎛️</a
 				>
+				<span
+					style="display: inline-block; vertical-align: top; white-space: pre; color: ${this
+						.status.color ?? kErrorColor}"
+					>${this.status.message}</span
+				>
+				<span id="requests"></span>
 				${this.render_permissions()}
-				${this.status?.message && !this.status.is_error
-					? html`
-							<link type="text/css" rel="stylesheet" href="/static/w3.css" />
-							<div
-								class="w3-bar-item"
-								style="color: ${this.status.color ?? kStatusColor}"
-							>
-								${this.status.message}
-							</div>
-						`
-					: undefined}
-				${Object.keys(this.spark_lines)
-					.sort()
-					.map((x) => this.spark_lines[x])}
-				${this.render_login()} ${this.render_identity()}
+				<span
+					style="flex: 1 1; display: flex; flex-direction: row; white-space: nowrap; margin: 0; padding: 0"
+					>${Object.keys(this.spark_lines)
+						.sort()
+						.map((x) => this.spark_lines[x])
+						.map((x) => [
+							html`<span style="font-size: xx-small">${x.dataset.emoji}</span>`,
+							x,
+						])}</span
+				>
+				<span style="flex: 0 0; white-space: nowrap"
+					>${this.render_login()}</span
+				>
 			</div>
-			${this.status?.is_error
-				? html`
-					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
-					<div class="w3-model w3-animate-top" style="position: absolute; left: 50%; transform: translate(-50%); z-index: 1">
-						<dijv class="w3-modal-content w3-card-4" style="display: block; padding: 1em">
-							<span @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
-							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p style="white-space: pre">${this.status.message}</p></div>
-						</div>
-					</div>
-					`
-				: undefined}
 		`;
 	}
 }
@@ -694,13 +578,13 @@ class TfSparkLineElement extends LitElement {
 			) / 10.0;
 		return html`
 			<svg
-				style="max-width: 7.5em; margin: 0; padding: 0; background: #000; height: 1em"
+				style="max-width: 7.5em; max-height: 1.5em; margin: 0; padding: 0; background: #000"
 				viewBox="0 0 50 10"
 				xmlns="http://www.w3.org/2000/svg"
 			>
 				${this.lines.map((x) => this.render_line(x))}
 				<text x="0" y="1em" style="font: 8px sans-serif; fill: #fff">
-					${this.dataset.emoji}${max}
+					${max}
 				</text>
 			</svg>
 		`;
@@ -1116,9 +1000,9 @@ function api_postMessage(message) {
 function api_error(error) {
 	if (error) {
 		if (typeof error == 'string') {
-			setStatusMessage('⚠️ ' + error, kErrorColor);
+			setStatusMessage('⚠️ ' + error, '#f00');
 		} else {
-			setStatusMessage('⚠️ ' + error.message + '\n' + error.stack, kErrorColor);
+			setStatusMessage('⚠️ ' + error.message + '\n' + error.stack, '#f00');
 		}
 	}
 	console.log('error', error);
@@ -1235,19 +1119,11 @@ function api_setHash(hash) {
 function _receive_websocket_message(message) {
 	if (message && message.action == 'session') {
 		setStatusMessage('🟢 Executing...', kStatusColor);
-		let navigation = document.getElementsByTagName('tf-navigation')[0];
-		navigation.credentials = message.credentials;
-		navigation.identities = message.identities;
-		navigation.identity = message.identity;
-		navigation.names = message.names;
+		document.getElementsByTagName('tf-navigation')[0].credentials =
+			message.credentials;
 	} else if (message && message.action == 'permissions') {
-		let navigation = document.getElementsByTagName('tf-navigation')[0];
-		navigation.permissions = message.permissions ?? {};
-	} else if (message && message.action == 'identities') {
-		let navigation = document.getElementsByTagName('tf-navigation')[0];
-		navigation.identities = message.identities;
-		navigation.identity = message.identity;
-		navigation.names = message.names;
+		document.getElementsByTagName('tf-navigation')[0].permissions =
+			message.permissions ?? {};
 	} else if (message && message.action == 'ready') {
 		setStatusMessage(null);
 		if (window.location.hash) {
@@ -1335,7 +1211,6 @@ function setStatusMessage(message, color) {
 	document.getElementsByTagName('tf-navigation')[0].status = {
 		message: message,
 		color: color,
-		is_error: color == kErrorColor,
 	};
 }
 

core/core.js

@@ -1,4 +1,5 @@
 import * as app from './app.js';
+import * as auth from './auth.js';
 import * as form from './form.js';
 import * as http from './http.js';
 
@@ -244,7 +245,6 @@ function broadcastEvent(eventName, argv) {
 	}
 	return Promise.all(promises);
 }
-
 /**
  * TODOC
  * @param {*} message
@@ -266,34 +266,6 @@ function broadcast(message) {
 	return Promise.all(promises);
 }
 
-/**
- * TODOC
- * @param {String} eventName
- * @param {*} argv
- * @returns
- */
-function broadcastAppEventToUser(
-	user,
-	packageOwner,
-	packageName,
-	eventName,
-	argv
-) {
-	let promises = [];
-	for (let process of Object.values(gProcesses)) {
-		if (
-			process.credentials?.session?.name === user &&
-			process.packageOwner == packageOwner &&
-			process.packageName == packageName
-		) {
-			if (process.eventHandlers[eventName]) {
-				promises.push(invoke(process.eventHandlers[eventName], argv));
-			}
-		}
-	}
-	return Promise.all(promises);
-}
-
 /**
  * TODOC
  * @param {*} caller
@@ -389,8 +361,6 @@ async function getProcessBlob(blobId, key, options) {
 			process.key = key;
 			process.credentials = options.credentials || {};
 			process.task = new Task();
-			process.packageOwner = options.packageOwner;
-			process.packageName = options.packageName;
 			process.eventHandlers = {};
 			if (!options?.script || options?.script === 'app.js') {
 				process.app = new app.App();
@@ -539,64 +509,6 @@ async function getProcessBlob(blobId, key, options) {
 					url: options?.url,
 				},
 			};
-			process.sendIdentities = async function () {
-				process.app.send(
-					Object.assign(
-						{
-							action: 'identities',
-						},
-						await ssb.getIdentityInfo(
-							process?.credentials?.session?.name,
-							options?.packageOwner,
-							options?.packageName
-						)
-					)
-				);
-			};
-			process.setActiveIdentity = async function (identity) {
-				if (
-					process?.credentials?.session?.name &&
-					options.packageOwner &&
-					options.packageName
-				) {
-					await new Database(process?.credentials?.session?.name).set(
-						`id:${options.packageOwner}:${options.packageName}`,
-						identity
-					);
-				}
-				process.sendIdentities();
-				broadcastAppEventToUser(
-					process?.credentials?.session?.name,
-					options.packageOwner,
-					options.packageName,
-					'setActiveIdentity',
-					[identity]
-				);
-			};
-			process.createIdentity = async function () {
-				if (
-					process.credentials &&
-					process.credentials.session &&
-					process.credentials.session.name
-				) {
-					let id = ssb.createIdentity(process.credentials.session.name);
-					await process.sendIdentities();
-					broadcastAppEventToUser(
-						process?.credentials?.session?.name,
-						options.packageOwner,
-						options.packageName,
-						'setActiveIdentity',
-						[
-							await ssb.getActiveIdentity(
-								process.credentials?.session?.name,
-								options.packageOwner,
-								options.packageName
-							),
-						]
-					);
-					return id;
-				}
-			};
 			if (process.credentials?.permissions?.administration) {
 				imports.core.globalSettingsDescriptions = function () {
 					let settings = Object.assign({}, k_global_settings);
@@ -667,7 +579,15 @@ async function getProcessBlob(blobId, key, options) {
 				Object.keys(ssb).map((key) => [key, ssb[key].bind(ssb)])
 			);
 			imports.ssb.port = tildefriends.ssb_port;
-			imports.ssb.createIdentity = () => process.createIdentity();
+			imports.ssb.createIdentity = function () {
+				if (
+					process.credentials &&
+					process.credentials.session &&
+					process.credentials.session.name
+				) {
+					return ssb.createIdentity(process.credentials.session.name);
+				}
+			};
 			imports.ssb.addIdentity = function (id) {
 				if (
 					process.credentials &&
@@ -694,13 +614,6 @@ async function getProcessBlob(blobId, key, options) {
 					});
 				}
 			};
-			imports.ssb.setActiveIdentity = (id) => process.setActiveIdentity(id);
-			imports.ssb.getActiveIdentity = () =>
-				ssb.getActiveIdentity(
-					process.credentials?.session?.name,
-					options.packageOwner,
-					options.packageName
-				);
 			imports.ssb.getOwnerIdentities = function () {
 				if (options.packageOwner) {
 					return ssb.getIdentities(options.packageOwner);
@@ -785,7 +698,6 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				}
 			};
-			imports.ssb.getIdentityInfo = undefined;
 			imports.fetch = function (url, options) {
 				return http.fetch(url, options, gGlobalSettings.fetch_hosts);
 			};
@@ -1055,7 +967,7 @@ async function useAppHandler(
 					},
 					respond: do_resolve,
 				},
-				credentials: httpd.auth_query(headers),
+				credentials: auth.query(headers),
 				packageOwner: packageOwner,
 				packageName: packageName,
 			}
@@ -1186,7 +1098,7 @@ async function blobHandler(request, response, blobId, uri) {
 		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
 			let user = match[1];
 			let appName = match[2];
-			let credentials = httpd.auth_query(request.headers);
+			let credentials = auth.query(request.headers);
 			if (
 				credentials &&
 				credentials.session &&
@@ -1249,7 +1161,7 @@ async function blobHandler(request, response, blobId, uri) {
 		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
 			let user = match[1];
 			let appName = match[2];
-			let credentials = httpd.auth_query(request.headers);
+			let credentials = auth.query(request.headers);
 			if (
 				credentials &&
 				credentials.session &&
@@ -1422,10 +1334,39 @@ loadSettings()
 		if (tildefriends.https_port && gGlobalSettings.http_redirect) {
 			httpd.set_http_redirect(gGlobalSettings.http_redirect);
 		}
+		httpd.all('/login', auth.handler);
+		httpd.all('/login/logout', auth.handler);
 		httpd.all('/app/socket', app.socket);
 		httpd.all('', function default_http_handler(request, response) {
 			let match;
-			if ((match = /^(\/~[^\/]+\/[^\/]+)(\/?.*)$/.exec(request.uri))) {
+			if (request.uri === '/' || request.uri === '') {
+				let host = request.headers['x-forwarded-host'] ?? request.headers.host;
+				try {
+					for (let line of (gGlobalSettings.index_map || '').split('\n')) {
+						let parts = line.split('=');
+						if (parts.length == 2 && host.match(new RegExp(parts[0], 'i'))) {
+							response.writeHead(303, {
+								Location:
+									(request.client.tls ? 'https://' : 'http://') +
+									host +
+									parts[1],
+								'Content-Length': '0',
+							});
+							return response.end();
+						}
+					}
+				} catch (e) {
+					print(e);
+				}
+				response.writeHead(303, {
+					Location:
+						(request.client.tls ? 'https://' : 'http://') +
+						host +
+						gGlobalSettings.index,
+					'Content-Length': '0',
+				});
+				return response.end();
+			} else if ((match = /^(\/~[^\/]+\/[^\/]+)(\/?.*)$/.exec(request.uri))) {
 				return blobHandler(request, response, match[1], match[2]);
 			} else if (
 				(match = /^\/([&\%][^\.]{44}(?:\.\w+)?)(\/?.*)/.exec(request.uri))
@@ -1465,15 +1406,8 @@ loadSettings()
 			async function start_tls() {
 				const kCertificatePath = 'data/httpd/certificate.pem';
 				const kPrivateKeyPath = 'data/httpd/privatekey.pem';
-				let privateKey;
-				let certificate;
-				try {
-					privateKey = utf8Decode(await File.readFile(kPrivateKeyPath));
-					certificate = utf8Decode(await File.readFile(kCertificatePath));
-				} catch (e) {
-					print(`TLS disabled (${e.message}).`);
-					return;
-				}
+				let privateKey = utf8Decode(await File.readFile(kPrivateKeyPath));
+				let certificate = utf8Decode(await File.readFile(kCertificatePath));
 				let context = new TlsContext();
 				context.setPrivateKey(privateKey);
 				context.setCertificate(certificate);

core/style.css

@@ -15,6 +15,22 @@ body {
 	margin: 0;
 }
 
+a:link {
+	color: #268bd2;
+}
+
+a:visited {
+	color: #6c71c4;
+}
+
+a:hover {
+	color: #859900;
+}
+
+a:active {
+	color: #2aa198;
+}
+
 #logo {
 	vertical-align: middle;
 }

default.nix

@@ -0,0 +1,36 @@
+with import <nixpkgs> {};
+stdenv.mkDerivation rec {
+  pname = "tildefriends";
+  version = "0.0.16";
+
+  src = fetchurl {
+    url = "https://dev.tildefriends.net/cory/${pname}/archive/v${version}.tar.gz";
+    sha256 = "19iay794xxs3j3mhnpl4vwx65sflw5vvjaahp0jk85wlwlrc7ddw";
+  };
+
+  nativeBuildInputs = [
+    gnumake
+    openssl
+  ];
+  # buildInputs = [  ]
+  #doCheck = true;
+
+
+  strictDeps = true;
+
+  outputs = [ "out" ];
+
+  meta = with lib; {
+    #description = "A program that produces a familiar, friendly greeting";
+    #longDescription = ''
+    #  GNU Hello is a program that prints "Hello, world!" when you run it.
+    #  It is fully customizable.
+    #'';
+    #homepage = "https://www.gnu.org/software/hello/manual/";
+    #changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}";
+
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.tasiaiso ];
+    platforms = platforms.all;
+  };
+}

deps/codemirror_src/package-lock.json

@@ -5,23 +5,23 @@
   "packages": {
     "": {
       "dependencies": {
-        "@codemirror/lang-css": "^6.2.1",
-        "@codemirror/lang-html": "^6.4.8",
-        "@codemirror/lang-javascript": "^6.2.2",
-        "@codemirror/lang-json": "^6.0.1",
-        "@codemirror/theme-one-dark": "^6.1.2",
-        "@rollup/plugin-node-resolve": "^15.2.3",
-        "codemirror": "^6.0.1",
-        "rollup": "^4.13.0"
+        "@codemirror/lang-css": "6.2.1",
+        "@codemirror/lang-html": "6.4.8",
+        "@codemirror/lang-javascript": "6.2.2",
+        "@codemirror/lang-json": "6.0.1",
+        "@codemirror/theme-one-dark": "6.1.2",
+        "@rollup/plugin-node-resolve": "15.2.3",
+        "codemirror": "6.0.1",
+        "rollup": "4.13.0"
       },
       "devDependencies": {
-        "@rollup/plugin-terser": "^0.4.4"
+        "@rollup/plugin-terser": "0.4.4"
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.0.tgz",
-      "integrity": "sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
+      "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -36,9 +36,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.5.0.tgz",
-      "integrity": "sha512-rK+sj4fCAN/QfcY9BEzYMgp4wwL/q5aj/VfNSoH1RWPF9XS/dUwBkvlL3hpWgEjOqlpdN1uLC9UkjJ4tmyjJYg==",
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.3.3.tgz",
+      "integrity": "sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
@@ -59,9 +59,9 @@
       }
     },
     "node_modules/@codemirror/lang-html": {
-      "version": "6.4.9",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
-      "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
+      "version": "6.4.8",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.8.tgz",
+      "integrity": "sha512-tE2YK7wDlb9ZpAH6mpTPiYm6rhfdQKVDa5r9IwIFlwwgvVaKsCfuKKZoJGWsmMZIf3FQAuJ5CHMPLymOtg1hXw==",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -111,9 +111,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.7.0.tgz",
-      "integrity": "sha512-LTLOL2nT41ADNSCCCCw8Q/UmdAFzB23OUYSjsHTdsVaH0XEo+orhuqbDNWzrzodm14w6FOxqxpmy4LF8Lixqjw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz",
+      "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -147,9 +147,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.3.tgz",
-      "integrity": "sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==",
+      "version": "6.25.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.25.1.tgz",
+      "integrity": "sha512-2LXLxsQnHDdfGzDvjzAwZh2ZviNJm7im6tGpa0IONIDnFd8RZ80D2SNi8PDi6YjKcMoMRK20v6OmKIdsrwsyoQ==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -248,9 +248,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.15.tgz",
-      "integrity": "sha512-B082ZdjI0vo2AgLqD834GlRTE9gwRX8NzHzKq5uDwEnQ9Dq+A/CEhd3nf68tiNA2f9O+8jS1NeSTUYT9IAqcTw==",
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.13.tgz",
+      "integrity": "sha512-5IBr8LIO3xJdJH1e9aj/ZNLE4LSbdsx25wFmGRAZsj2zSmwAYjx26JyU/BYOCpRQlu1jcv1z3vy4NB9+UkfRow==",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -343,9 +343,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
-      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
+      "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
       "cpu": [
         "arm"
       ],
@@ -355,9 +355,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
-      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
+      "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
       "cpu": [
         "arm64"
       ],
@@ -367,9 +367,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
-      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
+      "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
       "cpu": [
         "arm64"
       ],
@@ -379,9 +379,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
-      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
+      "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
       "cpu": [
         "x64"
       ],
@@ -391,21 +391,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
-      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
-      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
+      "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
       "cpu": [
         "arm"
       ],
@@ -415,9 +403,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
-      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
       "cpu": [
         "arm64"
       ],
@@ -427,9 +415,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
-      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
+      "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
       "cpu": [
         "arm64"
       ],
@@ -438,22 +426,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
-      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
-      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
       "cpu": [
         "riscv64"
       ],
@@ -462,22 +438,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
-      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
-      "cpu": [
-        "s390x"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
-      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
+      "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
       "cpu": [
         "x64"
       ],
@@ -487,9 +451,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
-      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
+      "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
       "cpu": [
         "x64"
       ],
@@ -499,9 +463,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
-      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
+      "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
       "cpu": [
         "arm64"
       ],
@@ -511,9 +475,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
-      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
+      "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
       "cpu": [
         "ia32"
       ],
@@ -523,9 +487,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
-      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
+      "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
       "cpu": [
         "x64"
       ],
@@ -715,9 +679,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.17.2.tgz",
-      "integrity": "sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
+      "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -729,22 +693,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.17.2",
-        "@rollup/rollup-android-arm64": "4.17.2",
-        "@rollup/rollup-darwin-arm64": "4.17.2",
-        "@rollup/rollup-darwin-x64": "4.17.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.17.2",
-        "@rollup/rollup-linux-arm64-musl": "4.17.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-musl": "4.17.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.17.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.17.2",
-        "@rollup/rollup-win32-x64-msvc": "4.17.2",
+        "@rollup/rollup-android-arm-eabi": "4.13.0",
+        "@rollup/rollup-android-arm64": "4.13.0",
+        "@rollup/rollup-darwin-arm64": "4.13.0",
+        "@rollup/rollup-darwin-x64": "4.13.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.13.0",
+        "@rollup/rollup-linux-arm64-musl": "4.13.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-musl": "4.13.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.13.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.13.0",
+        "@rollup/rollup-win32-x64-msvc": "4.13.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -778,9 +739,9 @@
       }
     },
     "node_modules/smob": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
-      "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz",
+      "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==",
       "dev": true
     },
     "node_modules/source-map": {
@@ -819,9 +780,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.31.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
-      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
+      "version": "5.29.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
+      "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",

deps/codemirror_src/package.json

@@ -3,16 +3,16 @@
     "build": "rollup --config rollup.config.mjs --input editor.mjs"
   },
   "dependencies": {
-    "@codemirror/lang-css": "^6.2.1",
-    "@codemirror/lang-html": "^6.4.8",
-    "@codemirror/lang-javascript": "^6.2.2",
-    "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/theme-one-dark": "^6.1.2",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "codemirror": "^6.0.1",
-    "rollup": "^4.13.0"
+    "@codemirror/lang-css": "6.2.1",
+    "@codemirror/lang-html": "6.4.8",
+    "@codemirror/lang-javascript": "6.2.2",
+    "@codemirror/lang-json": "6.0.1",
+    "@codemirror/theme-one-dark": "6.1.2",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "codemirror": "6.0.1",
+    "rollup": "4.13.0"
   },
   "devDependencies": {
-    "@rollup/plugin-terser": "^0.4.4"
+    "@rollup/plugin-terser": "0.4.4"
   }
 }

deps/sqlite/shell.c

@@ -14753,15 +14753,6 @@ static void dbdataValue(
   }
 }
 
-/* This macro is a copy of the MX_CELL() macro in the SQLite core. Given
-** a page-size, it returns the maximum number of cells that may be present
-** on the page.  */
-#define DBDATA_MX_CELL(pgsz) ((pgsz-8)/6)
-
-/* Maximum number of fields that may appear in a single record. This is
-** the "hard-limit", according to comments in sqliteLimit.h. */
-#define DBDATA_MX_FIELD 32676
-
 /*
 ** Move an sqlite_dbdata or sqlite_dbptr cursor to the next entry.
 */
@@ -14790,9 +14781,6 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
       assert( iOff+3+2<=pCsr->nPage );
       pCsr->iCell = pTab->bPtr ? -2 : 0;
       pCsr->nCell = get_uint16(&pCsr->aPage[iOff+3]);
-      if( pCsr->nCell>DBDATA_MX_CELL(pCsr->nPage) ){
-        pCsr->nCell = DBDATA_MX_CELL(pCsr->nPage);
-      }
     }
 
     if( pTab->bPtr ){
@@ -14837,19 +14825,19 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
         if( pCsr->iCell>=pCsr->nCell ){
           bNextPage = 1;
         }else{
-          int iCellPtr = iOff + 8 + nPointer + pCsr->iCell*2;
   
-          if( iCellPtr>pCsr->nPage ){
+          iOff += 8 + nPointer + pCsr->iCell*2;
+          if( iOff>pCsr->nPage ){
             bNextPage = 1;
           }else{
-            iOff = get_uint16(&pCsr->aPage[iCellPtr]);
+            iOff = get_uint16(&pCsr->aPage[iOff]);
           }
     
           /* For an interior node cell, skip past the child-page number */
           iOff += nPointer;
     
           /* Load the "byte of payload including overflow" field */
-          if( bNextPage || iOff>pCsr->nPage || iOff<=iCellPtr ){
+          if( bNextPage || iOff>pCsr->nPage ){
             bNextPage = 1;
           }else{
             iOff += dbdataGetVarintU32(&pCsr->aPage[iOff], &nPayload);
@@ -14932,9 +14920,7 @@ static int dbdataNext(sqlite3_vtab_cursor *pCursor){
         pCsr->iField++;
         if( pCsr->iField>0 ){
           sqlite3_int64 iType;
-          if( pCsr->pHdrPtr>=&pCsr->pRec[pCsr->nRec] 
-           || pCsr->iField>=DBDATA_MX_FIELD
-          ){
+          if( pCsr->pHdrPtr>&pCsr->pRec[pCsr->nRec] ){
             bNextPage = 1;
           }else{
             int szField = 0;
@@ -16422,7 +16408,7 @@ static int recoverWriteSchema1(sqlite3_recover *p){
         if( bTable && !bVirtual ){
           if( SQLITE_ROW==sqlite3_step(pTblname) ){
             const char *zTbl = (const char*)sqlite3_column_text(pTblname, 0);
-            if( zTbl ) recoverAddTable(p, zTbl, iRoot);
+            recoverAddTable(p, zTbl, iRoot);
           }
           recoverReset(p, pTblname);
         }
@@ -28785,7 +28771,6 @@ static const char zOptions[] =
   "   -newline SEP         set output row separator. Default: '\\n'\n"
   "   -nofollow            refuse to open symbolic links to database files\n"
   "   -nonce STRING        set the safe-mode escape nonce\n"
-  "   -no-rowid-in-view    Disable rowid-in-view using sqlite3_config()\n"
   "   -nullvalue TEXT      set text string for NULL values. Default ''\n"
   "   -pagecache SIZE N    use N slots of SZ bytes each for page cache memory\n"
   "   -pcachetrace         trace all page cache operations\n"
@@ -29076,10 +29061,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       stdin_is_interactive = 0;
     }else if( cli_strcmp(z,"-utf8")==0 ){
     }else if( cli_strcmp(z,"-no-utf8")==0 ){
-    }else if( cli_strcmp(z,"-no-rowid-in-view")==0 ){
-      int val = 0;
-      sqlite3_config(SQLITE_CONFIG_ROWID_IN_VIEW, &val);
-      assert( val==0 );
     }else if( cli_strcmp(z,"-heap")==0 ){
 #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
       const char *zSize;
@@ -29355,8 +29336,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       /* already handled */
     }else if( cli_strcmp(z,"-no-utf8")==0 ){
       /* already handled */
-    }else if( cli_strcmp(z,"-no-rowid-in-view")==0 ){
-      /* already handled */
     }else if( cli_strcmp(z,"-heap")==0 ){
       i++;
     }else if( cli_strcmp(z,"-pagecache")==0 ){

deps/sqlite/sqlite3.c

@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.45.3.  By combining all the individual C code files into this
+** version 3.45.2.  By combining all the individual C code files into this
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -18,7 +18,7 @@
 ** separate file. This file contains only code for the core SQLite library.
 **
 ** The content in this amalgamation comes from Fossil check-in
-** 8653b758870e6ef0c98d46b3ace27849054a.
+** d8cd6d49b46a395b13955387d05e9e1a2a47.
 */
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1
@@ -459,9 +459,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.45.3"
-#define SQLITE_VERSION_NUMBER 3045003
-#define SQLITE_SOURCE_ID      "2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355"
+#define SQLITE_VERSION        "3.45.2"
+#define SQLITE_VERSION_NUMBER 3045002
+#define SQLITE_SOURCE_ID      "2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -2456,22 +2456,6 @@ struct sqlite3_mem_methods {
 ** configuration setting is never used, then the default maximum is determined
 ** by the [SQLITE_MEMDB_DEFAULT_MAXSIZE] compile-time option.  If that
 ** compile-time option is not set, then the default maximum is 1073741824.
-**
-** [[SQLITE_CONFIG_ROWID_IN_VIEW]]
-** <dt>SQLITE_CONFIG_ROWID_IN_VIEW
-** <dd>The SQLITE_CONFIG_ROWID_IN_VIEW option enables or disables the ability
-** for VIEWs to have a ROWID.  The capability can only be enabled if SQLite is
-** compiled with -DSQLITE_ALLOW_ROWID_IN_VIEW, in which case the capability
-** defaults to on.  This configuration option queries the current setting or
-** changes the setting to off or on.  The argument is a pointer to an integer.
-** If that integer initially holds a value of 1, then the ability for VIEWs to
-** have ROWIDs is activated.  If the integer initially holds zero, then the
-** ability is deactivated.  Any other initial value for the integer leaves the
-** setting unchanged.  After changes, if any, the integer is written with
-** a 1 or 0, if the ability for VIEWs to have ROWIDs is on or off.  If SQLite
-** is compiled without -DSQLITE_ALLOW_ROWID_IN_VIEW (which is the usual and
-** recommended case) then the integer is always filled with zero, regardless
-** if its initial value.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
@@ -2503,7 +2487,6 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
 #define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
 #define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
-#define SQLITE_CONFIG_ROWID_IN_VIEW       30  /* int* */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -18447,15 +18430,6 @@ struct Table {
 #define HasRowid(X)     (((X)->tabFlags & TF_WithoutRowid)==0)
 #define VisibleRowid(X) (((X)->tabFlags & TF_NoVisibleRowid)==0)
 
-/* Macro is true if the SQLITE_ALLOW_ROWID_IN_VIEW (mis-)feature is
-** available.  By default, this macro is false
-*/
-#ifndef SQLITE_ALLOW_ROWID_IN_VIEW
-# define ViewCanHaveRowid     0
-#else
-# define ViewCanHaveRowid     (sqlite3Config.mNoVisibleRowid==0)
-#endif
-
 /*
 ** Each foreign key constraint is an instance of the following structure.
 **
@@ -20170,11 +20144,6 @@ struct Sqlite3Config {
 #endif
 #ifndef SQLITE_UNTESTABLE
   int (*xTestCallback)(int);        /* Invoked by sqlite3FaultSim() */
-#endif
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-  u32 mNoVisibleRowid;              /* TF_NoVisibleRowid if the ROWID_IN_VIEW
-                                    ** feature is disabled.  0 if rowids can
-                                    ** occur in views. */
 #endif
   int bLocaltimeFault;              /* True to fail localtime() calls */
   int (*xAltLocaltime)(const void*,void*); /* Alternative localtime() routine */
@@ -20631,13 +20600,10 @@ SQLITE_PRIVATE void sqlite3MutexWarnOnContention(sqlite3_mutex*);
 # define EXP754 (((u64)0x7ff)<<52)
 # define MAN754 ((((u64)1)<<52)-1)
 # define IsNaN(X) (((X)&EXP754)==EXP754 && ((X)&MAN754)!=0)
-# define IsOvfl(X) (((X)&EXP754)==EXP754)
 SQLITE_PRIVATE   int sqlite3IsNaN(double);
-SQLITE_PRIVATE   int sqlite3IsOverflow(double);
 #else
-# define IsNaN(X)             0
-# define sqlite3IsNaN(X)      0
-# define sqlite3IsOVerflow(X) 0
+# define IsNaN(X)         0
+# define sqlite3IsNaN(X)  0
 #endif
 
 /*
@@ -21873,9 +21839,6 @@ static const char * const sqlite3azCompileOpt[] = {
   "ALLOW_COVERING_INDEX_SCAN=" CTIMEOPT_VAL(SQLITE_ALLOW_COVERING_INDEX_SCAN),
 # endif
 #endif
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-  "ALLOW_ROWID_IN_VIEW",
-#endif
 #ifdef SQLITE_ALLOW_URI_AUTHORITY
   "ALLOW_URI_AUTHORITY",
 #endif
@@ -22895,9 +22858,6 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
 #endif
 #ifndef SQLITE_UNTESTABLE
    0,                         /* xTestCallback */
-#endif
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-   0,                         /* mNoVisibleRowid.  0 == allow rowid-in-view */
 #endif
    0,                         /* bLocaltimeFault */
    0,                         /* xAltLocaltime */
@@ -34686,19 +34646,6 @@ SQLITE_PRIVATE int sqlite3IsNaN(double x){
 }
 #endif /* SQLITE_OMIT_FLOATING_POINT */
 
-#ifndef SQLITE_OMIT_FLOATING_POINT
-/*
-** Return true if the floating point value is NaN or +Inf or -Inf.
-*/
-SQLITE_PRIVATE int sqlite3IsOverflow(double x){
-  int rc;   /* The value return */
-  u64 y;
-  memcpy(&y,&x,sizeof(y));
-  rc = IsOvfl(y);
-  return rc;
-}
-#endif /* SQLITE_OMIT_FLOATING_POINT */
-
 /*
 ** Compute a string length that is limited to what can be stored in
 ** lower 30 bits of a 32-bit signed integer.
@@ -63855,7 +63802,7 @@ SQLITE_PRIVATE sqlite3_file *sqlite3PagerFile(Pager *pPager){
 ** This will be either the rollback journal or the WAL file.
 */
 SQLITE_PRIVATE sqlite3_file *sqlite3PagerJrnlFile(Pager *pPager){
-#ifdef SQLITE_OMIT_WAL
+#if SQLITE_OMIT_WAL
   return pPager->jfd;
 #else
   return pPager->pWal ? sqlite3WalFile(pPager->pWal) : pPager->jfd;
@@ -79672,7 +79619,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   }else if( loc<0 && pPage->nCell>0 ){
     assert( pPage->leaf );
     idx = ++pCur->ix;
-    pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
+    pCur->curFlags &= ~BTCF_ValidNKey;
   }else{
     assert( pPage->leaf );
   }
@@ -79702,7 +79649,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   */
   if( pPage->nOverflow ){
     assert( rc==SQLITE_OK );
-    pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
+    pCur->curFlags &= ~(BTCF_ValidNKey);
     rc = balance(pCur);
 
     /* Must make sure nOverflow is reset to zero even if the balance()
@@ -106709,37 +106656,8 @@ static int lookupName(
           }
         }
         if( 0==cnt && VisibleRowid(pTab) ){
-          /* pTab is a potential ROWID match.  Keep track of it and match
-          ** the ROWID later if that seems appropriate.  (Search for "cntTab"
-          ** to find related code.)  Only allow a ROWID match if there is
-          ** a single ROWID match candidate.
-          */
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-          /* In SQLITE_ALLOW_ROWID_IN_VIEW mode, allow a ROWID match
-          ** if there is a single VIEW candidate or if there is a single
-          ** non-VIEW candidate plus multiple VIEW candidates.  In other
-          ** words non-VIEW candidate terms take precedence over VIEWs.
-          */
-          if( cntTab==0
-           || (cntTab==1
-               && ALWAYS(pMatch!=0)
-               && ALWAYS(pMatch->pTab!=0)
-               && (pMatch->pTab->tabFlags & TF_Ephemeral)!=0
-               && (pTab->tabFlags & TF_Ephemeral)==0)
-          ){
-            cntTab = 1;
-            pMatch = pItem;
-          }else{
-            cntTab++;
-          }
-#else
-          /* The (much more common) non-SQLITE_ALLOW_ROWID_IN_VIEW case is
-          ** simpler since we require exactly one candidate, which will
-          ** always be a non-VIEW
-          */
           cntTab++;
           pMatch = pItem;
-#endif
         }
       }
       if( pMatch ){
@@ -106865,13 +106783,13 @@ static int lookupName(
     ** Perhaps the name is a reference to the ROWID
     */
     if( cnt==0
-     && cntTab>=1
+     && cntTab==1
      && pMatch
      && (pNC->ncFlags & (NC_IdxExpr|NC_GenCol))==0
      && sqlite3IsRowid(zCol)
      && ALWAYS(VisibleRowid(pMatch->pTab) || pMatch->fg.isNestedFrom)
     ){
-      cnt = cntTab;
+      cnt = 1;
       if( pMatch->fg.isNestedFrom==0 ) pExpr->iColumn = -1;
       pExpr->affExpr = SQLITE_AFF_INTEGER;
     }
@@ -108729,10 +108647,9 @@ SQLITE_PRIVATE Expr *sqlite3ExprSkipCollateAndLikely(Expr *pExpr){
       assert( pExpr->x.pList->nExpr>0 );
       assert( pExpr->op==TK_FUNCTION );
       pExpr = pExpr->x.pList->a[0].pExpr;
-    }else if( pExpr->op==TK_COLLATE ){
-      pExpr = pExpr->pLeft;
     }else{
-      break;
+      assert( pExpr->op==TK_COLLATE );
+      pExpr = pExpr->pLeft;
     }
   }
   return pExpr;
@@ -111251,12 +111168,9 @@ SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr *p){
       return 0;
     case TK_COLUMN:
       assert( ExprUseYTab(p) );
-      return ExprHasProperty(p, EP_CanBeNull)
-          || NEVER(p->y.pTab==0) /* Reference to column of index on expr */
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-          || (p->iColumn==XN_ROWID && IsView(p->y.pTab))
-#endif
-          || (p->iColumn>=0
+      return ExprHasProperty(p, EP_CanBeNull) ||
+             NEVER(p->y.pTab==0) ||  /* Reference to column of index on expr */
+             (p->iColumn>=0
               && p->y.pTab->aCol!=0 /* Possible due to prior error */
               && ALWAYS(p->iColumn<p->y.pTab->nCol)
               && p->y.pTab->aCol[p->iColumn].notNull==0);
@@ -123747,12 +123661,9 @@ SQLITE_PRIVATE void sqlite3CreateView(
   ** on a view, even though views do not have rowids.  The following flag
   ** setting fixes this problem.  But the fix can be disabled by compiling
   ** with -DSQLITE_ALLOW_ROWID_IN_VIEW in case there are legacy apps that
-  ** depend upon the old buggy behavior.  The ability can also be toggled
-  ** using sqlite3_config(SQLITE_CONFIG_ROWID_IN_VIEW,...) */
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-  p->tabFlags |= sqlite3Config.mNoVisibleRowid; /* Optional. Allow by default */
-#else
-  p->tabFlags |= TF_NoVisibleRowid;             /* Never allow rowid in view */
+  ** depend upon the old buggy behavior. */
+#ifndef SQLITE_ALLOW_ROWID_IN_VIEW
+  p->tabFlags |= TF_NoVisibleRowid;
 #endif
 
   sqlite3TwoPartName(pParse, pName1, pName2, &pName);
@@ -129916,7 +129827,7 @@ static void sumFinalize(sqlite3_context *context){
     if( p->approx ){
       if( p->ovrfl ){
         sqlite3_result_error(context,"integer overflow",-1);
-      }else if( !sqlite3IsOverflow(p->rErr) ){
+      }else if( !sqlite3IsNaN(p->rErr) ){
         sqlite3_result_double(context, p->rSum+p->rErr);
       }else{
         sqlite3_result_double(context, p->rSum);
@@ -129933,7 +129844,7 @@ static void avgFinalize(sqlite3_context *context){
     double r;
     if( p->approx ){
       r = p->rSum;
-      if( !sqlite3IsOverflow(p->rErr) ) r += p->rErr;
+      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
     }else{
       r = (double)(p->iSum);
     }
@@ -129947,7 +129858,7 @@ static void totalFinalize(sqlite3_context *context){
   if( p ){
     if( p->approx ){
       r = p->rSum;
-      if( !sqlite3IsOverflow(p->rErr) ) r += p->rErr;
+      if( !sqlite3IsNaN(p->rErr) ) r += p->rErr;
     }else{
       r = (double)(p->iSum);
     }
@@ -135245,10 +135156,7 @@ static int xferOptimization(
     }
   }
 #ifndef SQLITE_OMIT_CHECK
-  if( pDest->pCheck
-   && (db->mDbFlags & DBFLAG_Vacuum)==0
-   && sqlite3ExprListCompare(pSrc->pCheck,pDest->pCheck,-1)
-  ){
+  if( pDest->pCheck && sqlite3ExprListCompare(pSrc->pCheck,pDest->pCheck,-1) ){
     return 0;   /* Tables have different CHECK constraints.  Ticket #2252 */
   }
 #endif
@@ -140649,11 +140557,7 @@ static int pragmaVtabBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   j = seen[0]-1;
   pIdxInfo->aConstraintUsage[j].argvIndex = 1;
   pIdxInfo->aConstraintUsage[j].omit = 1;
-  if( seen[1]==0 ){
-    pIdxInfo->estimatedCost = (double)1000;
-    pIdxInfo->estimatedRows = 1000;
-    return SQLITE_OK;
-  }
+  if( seen[1]==0 ) return SQLITE_OK;
   pIdxInfo->estimatedCost = (double)20;
   pIdxInfo->estimatedRows = 20;
   j = seen[1]-1;
@@ -143880,7 +143784,11 @@ static const char *columnTypeImpl(
         ** data for the result-set column of the sub-select.
         */
         if( iCol<pS->pEList->nExpr
-         && (!ViewCanHaveRowid || iCol>=0)
+#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
+         && iCol>=0
+#else
+         && ALWAYS(iCol>=0)
+#endif
         ){
           /* If iCol is less than zero, then the expression requests the
           ** rowid of the sub-select or view. This expression is legal (see
@@ -147055,10 +146963,6 @@ static int pushDownWindowCheck(Parse *pParse, Select *pSubq, Expr *pExpr){
 **
 **  (11) The subquery is not a VALUES clause
 **
-**  (12) The WHERE clause is not "rowid ISNULL" or the equivalent.  This
-**       case only comes up if SQLite is compiled using
-**       SQLITE_ALLOW_ROWID_IN_VIEW.
-**
 ** Return 0 if no changes are made and non-zero if one or more WHERE clause
 ** terms are duplicated into the subquery.
 */
@@ -147169,18 +147073,6 @@ static int pushDownWhereTerms(
   }
 #endif
 
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-  if( ViewCanHaveRowid && (pWhere->op==TK_ISNULL || pWhere->op==TK_NOTNULL) ){
-    Expr *pLeft = pWhere->pLeft;
-    if( ALWAYS(pLeft)
-     && pLeft->op==TK_COLUMN
-     && pLeft->iColumn < 0
-    ){
-      return 0;  /* Restriction (12) */
-    }
-  }
-#endif
-
   if( sqlite3ExprIsSingleTableConstraint(pWhere, pSrcList, iSrc) ){
     nChng++;
     pSubq->selFlags |= SF_PushDown;
@@ -147808,14 +147700,12 @@ SQLITE_PRIVATE int sqlite3ExpandSubquery(Parse *pParse, SrcItem *pFrom){
   while( pSel->pPrior ){ pSel = pSel->pPrior; }
   sqlite3ColumnsFromExprList(pParse, pSel->pEList,&pTab->nCol,&pTab->aCol);
   pTab->iPKey = -1;
-  pTab->eTabType = TABTYP_VIEW;
   pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
 #ifndef SQLITE_ALLOW_ROWID_IN_VIEW
   /* The usual case - do not allow ROWID on a subquery */
   pTab->tabFlags |= TF_Ephemeral | TF_NoVisibleRowid;
 #else
-  /* Legacy compatibility mode */
-  pTab->tabFlags |= TF_Ephemeral | sqlite3Config.mNoVisibleRowid;
+  pTab->tabFlags |= TF_Ephemeral;  /* Legacy compatibility mode */
 #endif
   return pParse->nErr ? SQLITE_ERROR : SQLITE_OK;
 }
@@ -148083,7 +147973,7 @@ static int selectExpander(Walker *pWalker, Select *p){
             pNestedFrom = pFrom->pSelect->pEList;
             assert( pNestedFrom!=0 );
             assert( pNestedFrom->nExpr==pTab->nCol );
-            assert( VisibleRowid(pTab)==0 || ViewCanHaveRowid );
+            assert( VisibleRowid(pTab)==0 );
           }else{
             if( zTName && sqlite3StrICmp(zTName, zTabName)!=0 ){
               continue;
@@ -148115,8 +148005,7 @@ static int selectExpander(Walker *pWalker, Select *p){
             pUsing = 0;
           }
 
-          nAdd = pTab->nCol;
-          if( VisibleRowid(pTab) && (selFlags & SF_NestedFrom)!=0 ) nAdd++;
+          nAdd = pTab->nCol + (VisibleRowid(pTab) && (selFlags&SF_NestedFrom));
           for(j=0; j<nAdd; j++){
             const char *zName;
             struct ExprList_item *pX; /* Newly added ExprList term */
@@ -148198,8 +148087,7 @@ static int selectExpander(Walker *pWalker, Select *p){
             pX = &pNew->a[pNew->nExpr-1];
             assert( pX->zEName==0 );
             if( (selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){
-              if( pNestedFrom && (!ViewCanHaveRowid || j<pNestedFrom->nExpr) ){
-                assert( j<pNestedFrom->nExpr );
+              if( pNestedFrom ){
                 pX->zEName = sqlite3DbStrDup(db, pNestedFrom->a[j].zEName);
                 testcase( pX->zEName==0 );
               }else{
@@ -153133,9 +153021,6 @@ SQLITE_PRIVATE void sqlite3Update(
       }
     }
     if( chngRowid==0 && pPk==0 ){
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-      if( isView ) sqlite3VdbeAddOp2(v, OP_Null, 0, regOldRowid);
-#endif
       sqlite3VdbeAddOp2(v, OP_Copy, regOldRowid, regNewRowid);
     }
   }
@@ -166845,10 +166730,16 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
   for(i=0; i<pIdx->nColumn; i++){
     Expr *pExpr;
     int j = pIdx->aiColumn[i];
+    int bMaybeNullRow;
     if( j==XN_EXPR ){
       pExpr = pIdx->aColExpr->a[i].pExpr;
+      testcase( pTabItem->fg.jointype & JT_LEFT );
+      testcase( pTabItem->fg.jointype & JT_RIGHT );
+      testcase( pTabItem->fg.jointype & JT_LTORJ );
+      bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0;
     }else if( j>=0 && (pTab->aCol[j].colFlags & COLFLAG_VIRTUAL)!=0 ){
       pExpr = sqlite3ColumnExpr(pTab, &pTab->aCol[j]);
+      bMaybeNullRow = 0;
     }else{
       continue;
     }
@@ -166880,7 +166771,7 @@ static SQLITE_NOINLINE void whereAddIndexedExpr(
     p->iDataCur = pTabItem->iCursor;
     p->iIdxCur = iIdxCur;
     p->iIdxCol = i;
-    p->bMaybeNullRow = (pTabItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT))!=0;
+    p->bMaybeNullRow = bMaybeNullRow;
     if( sqlite3IndexAffinityStr(pParse->db, pIdx) ){
       p->aff = pIdx->zColAff[i];
     }
@@ -179085,18 +178976,6 @@ SQLITE_API int sqlite3_config(int op, ...){
     }
 #endif /* SQLITE_OMIT_DESERIALIZE */
 
-    case SQLITE_CONFIG_ROWID_IN_VIEW: {
-      int *pVal = va_arg(ap,int*);
-#ifdef SQLITE_ALLOW_ROWID_IN_VIEW
-      if( 0==*pVal ) sqlite3GlobalConfig.mNoVisibleRowid = TF_NoVisibleRowid;
-      if( 1==*pVal ) sqlite3GlobalConfig.mNoVisibleRowid = 0;
-      *pVal = (sqlite3GlobalConfig.mNoVisibleRowid==0);
-#else
-      *pVal = 0;
-#endif
-      break;
-    }
-
     default: {
       rc = SQLITE_ERROR;
       break;
@@ -250799,7 +250678,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77", -1, SQLITE_TRANSIENT);
 }
 
 /*

deps/sqlite/sqlite3.h

@@ -146,9 +146,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.45.3"
-#define SQLITE_VERSION_NUMBER 3045003
-#define SQLITE_SOURCE_ID      "2024-04-15 13:34:05 8653b758870e6ef0c98d46b3ace27849054af85da891eb121e9aaa537f1e8355"
+#define SQLITE_VERSION        "3.45.2"
+#define SQLITE_VERSION_NUMBER 3045002
+#define SQLITE_SOURCE_ID      "2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -2143,22 +2143,6 @@ struct sqlite3_mem_methods {
 ** configuration setting is never used, then the default maximum is determined
 ** by the [SQLITE_MEMDB_DEFAULT_MAXSIZE] compile-time option.  If that
 ** compile-time option is not set, then the default maximum is 1073741824.
-**
-** [[SQLITE_CONFIG_ROWID_IN_VIEW]]
-** <dt>SQLITE_CONFIG_ROWID_IN_VIEW
-** <dd>The SQLITE_CONFIG_ROWID_IN_VIEW option enables or disables the ability
-** for VIEWs to have a ROWID.  The capability can only be enabled if SQLite is
-** compiled with -DSQLITE_ALLOW_ROWID_IN_VIEW, in which case the capability
-** defaults to on.  This configuration option queries the current setting or
-** changes the setting to off or on.  The argument is a pointer to an integer.
-** If that integer initially holds a value of 1, then the ability for VIEWs to
-** have ROWIDs is activated.  If the integer initially holds zero, then the
-** ability is deactivated.  Any other initial value for the integer leaves the
-** setting unchanged.  After changes, if any, the integer is written with
-** a 1 or 0, if the ability for VIEWs to have ROWIDs is on or off.  If SQLite
-** is compiled without -DSQLITE_ALLOW_ROWID_IN_VIEW (which is the usual and
-** recommended case) then the integer is always filled with zero, regardless
-** if its initial value.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
@@ -2190,7 +2174,6 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
 #define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
 #define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
-#define SQLITE_CONFIG_ROWID_IN_VIEW       30  /* int* */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options

package-lock.json

@@ -5,9 +5,10 @@
 	"packages": {
 		"": {
 			"name": "tildefriends",
+			"hasInstallScript": true,
 			"license": "MIT",
 			"dependencies": {
-				"prettier": "^3.2.5"
+				"prettier": "3.2.5"
 			}
 		},
 		"node_modules/prettier": {

package.json

@@ -1,11 +1,12 @@
 {
 	"name": "tildefriends",
 	"scripts": {
-		"prettier": "prettier . --check --cache --write"
+		"prettier": "prettier . --check --cache --write",
+		"postinstall": "sh tools/install_dependencies.sh"
 	},
 	"author": "Cory McWilliams",
 	"license": "MIT",
 	"dependencies": {
-		"prettier": "^3.2.5"
+		"prettier": "3.2.5"
 	}
 }

shell.nix

@@ -0,0 +1,13 @@
+with import <nixpkgs> {};
+stdenv.mkDerivation {
+  name = "env";
+  nativeBuildInputs = [
+    cmake
+    openssl
+    nodePackages.npm
+    jdk11
+  ];
+  buildInputs = [
+  
+  ];
+}

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="19"
-	android:versionName="0.0.19-wip">
+	android:versionCode="17"
+	android:versionName="0.0.17-wip">
 	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="34"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
@@ -12,7 +12,7 @@
 		android:extractNativeLibs="true">
 		<meta-data android:name="android.max_aspect" android:value="2.1"/>
 		<activity
-			android:name=".TildeFriendsActivity"
+			android:name=".MainActivity"
 			android:icon="@drawable/icon"
 			android:configChanges="orientation|screenSize"
 			android:exported="true">

src/android/com/unprompted/tildefriends/MainActivity.java

@@ -15,13 +15,10 @@ import android.os.strictmode.Violation;
 import android.util.Base64;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.webkit.CookieManager;
 import android.webkit.DownloadListener;
-import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
 import android.webkit.URLUtil;
 import android.webkit.ValueCallback;
@@ -50,15 +47,14 @@ import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
 import java.util.concurrent.TimeUnit;
 
-public class TildeFriendsActivity extends Activity {
-	TildeFriendsWebView web_view;
+public class MainActivity extends Activity {
+	WebView web_view;
 	String base_url;
 	Process process;
 	Thread thread;
 
 	private ValueCallback<Uri[]> upload_message;
 	private final static int FILECHOOSER_RESULT = 1;
-	private float touch_down_y;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -70,7 +66,7 @@ public class TildeFriendsActivity extends Activity {
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.activity_main);
 
-		web_view = (TildeFriendsWebView)findViewById(R.id.web);
+		web_view = (WebView)findViewById(R.id.web);
 		set_status("Extracting executable...");
 		Log.w("tildefriends", String.format("getFilesDir() is %s", getFilesDir().toString()));
 		Log.w("tildefriends", String.format("getPackageResourcePath() is %s", getPackageResourcePath().toString()));
@@ -80,7 +76,7 @@ public class TildeFriendsActivity extends Activity {
 		new File(port_file_path).delete();
 		base_url = "http://127.0.0.1:12345/";
 
-		TildeFriendsActivity activity = this;
+		MainActivity activity = this;
 
 		thread = new Thread(new Runnable() {
 			@Override
@@ -184,7 +180,7 @@ public class TildeFriendsActivity extends Activity {
 
 		web_view.setWebChromeClient(new WebChromeClient() {
 			@Override
-			public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
+			public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
 				new AlertDialog.Builder(view.getContext())
 					.setTitle("Tilde Friends")
 					.setMessage(message)
@@ -207,23 +203,6 @@ public class TildeFriendsActivity extends Activity {
 				return true;
 			}
 
-			@Override
-			public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-				new AlertDialog.Builder(view.getContext())
-					.setTitle("Tilde Friends")
-					.setMessage(message)
-					.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int which)
-						{
-							result.confirm();
-						}
-					})
-					.create()
-					.show();
-				return true;
-			}
-
 			/*
 			** https://stackoverflow.com/questions/5907369/file-upload-in-webview
 			** https://stackoverflow.com/questions/8586691/how-to-open-file-save-dialog-in-android
@@ -235,7 +214,7 @@ public class TildeFriendsActivity extends Activity {
 				Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
 				intent.addCategory(Intent.CATEGORY_OPENABLE);
 				intent.setType("*/*");
-				TildeFriendsActivity.this.startActivityForResult(Intent.createChooser(intent, "File Chooser"), TildeFriendsActivity.FILECHOOSER_RESULT);
+				MainActivity.this.startActivityForResult(Intent.createChooser(intent, "File Chooser"), MainActivity.FILECHOOSER_RESULT);
 				return true;
 			}
 
@@ -247,6 +226,7 @@ public class TildeFriendsActivity extends Activity {
 		});
 
 		web_view.setWebViewClient(new WebViewClient() {
+			@Override
 			public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request)
 			{
 				if (request.getUrl() != null && request.getUrl().toString().startsWith(base_url)) {
@@ -258,9 +238,12 @@ public class TildeFriendsActivity extends Activity {
 			}
 		});
 
-		TextView refresh = (TextView)findViewById(R.id.refresh);
-		refresh.setVisibility(View.GONE);
-		refresh.setText("REFRESH");
+		Button refresh = (Button)findViewById(R.id.refresh);
+		refresh.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View view) {
+				web_view.reload();
+			}
+		});
 	}
 
 	@Override
@@ -315,40 +298,6 @@ public class TildeFriendsActivity extends Activity {
 		return super.onKeyDown(keyCode, event);
 	}
 
-	@Override
-	public boolean dispatchTouchEvent(MotionEvent event) {
-		final int k_drag_distance = 160;
-		switch (event.getActionMasked()) {
-		case MotionEvent.ACTION_DOWN:
-			touch_down_y = event.getY();
-			web_view.clearOverscrolledY();
-			break;
-		case MotionEvent.ACTION_MOVE:
-			{
-				float delta = web_view.getOverscrolledY() ? event.getY() - touch_down_y : 0.0f;
-				TextView refresh = (TextView)findViewById(R.id.refresh);
-				LayoutParams layout = refresh.getLayoutParams();
-				layout.height =
-					Math.min(Math.max((int)delta, 0), k_drag_distance) +
-					(delta > k_drag_distance ? (int)Math.sqrt(delta - k_drag_distance) : 0);
-				refresh.setLayoutParams(layout);
-				refresh.setVisibility(layout.height > 0 ? View.VISIBLE : View.GONE);
-			}
-			break;
-		case MotionEvent.ACTION_UP:
-			{
-				float delta = web_view.getOverscrolledY() ? event.getY() - touch_down_y : 0.0f;
-				if (delta > getWindow().getDecorView().getHeight() / 4) {
-					web_view.reload();
-				}
-				TextView refresh = (TextView)findViewById(R.id.refresh);
-				refresh.setVisibility(View.GONE);
-			}
-			break;
-		}
-		return super.dispatchTouchEvent(event);
-	}
-
 	private int read_port(String path) {
 		try (BufferedReader reader = new BufferedReader(new FileReader(path))) {
 			return Integer.parseInt(reader.readLine());

src/android/com/unprompted/tildefriends/TildeFriendsWebView.java

@@ -1,31 +0,0 @@
-package com.unprompted.tildefriends;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.util.Log;
-
-public class TildeFriendsWebView extends android.webkit.WebView {
-	boolean overscrolledY = false;
-
-	public TildeFriendsWebView(final Context context) {
-		super(context);
-	}
-
-	public TildeFriendsWebView(final Context context, final AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	@Override
-	protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
-		super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);
-		overscrolledY = true;
-	}
-
-	public boolean getOverscrolledY() {
-		return overscrolledY;
-	}
-
-	public void clearOverscrolledY() {
-		overscrolledY = false;
-	}
-}

src/android/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
-	<com.unprompted.tildefriends.TildeFriendsWebView
+	<WebView
 		android:id="@+id/web"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
@@ -13,12 +13,12 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:gravity="center_horizontal|center_vertical"/>
-	<TextView
+	<Button
 		android:id="@+id/refresh"
-		android:layout_width="match_parent"
-		android:layout_height="160dp"
-		android:layout_alignParentTop="true"
-		android:gravity="center_horizontal|center_vertical"
-		android:textColor="#fff"
-		android:background="#44f"/>
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:text="REFRESH"/>
 </RelativeLayout>

src/file.js.c

@@ -78,7 +78,7 @@ static void _file_write_write_callback(uv_fs_t* req)
 	}
 	else
 	{
-		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to write %s: %s", req->path, uv_strerror(req->result)));
+		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(req->result)));
 	}
 	int result = uv_fs_close(req->loop, req, fsreq->file, _file_async_close_callback);
 	if (result < 0)
@@ -91,7 +91,6 @@ static void _file_write_write_callback(uv_fs_t* req)
 static void _file_write_open_callback(uv_fs_t* req)
 {
 	fs_req_t* fsreq = (fs_req_t*)req;
-	const char* path = tf_strdup(req->path);
 	uv_fs_req_cleanup(req);
 	tf_task_t* task = req->loop->data;
 	JSContext* context = tf_task_get_context(task);
@@ -103,8 +102,7 @@ static void _file_write_open_callback(uv_fs_t* req)
 		int result = uv_fs_write(req->loop, req, fsreq->file, &buf, 1, 0, _file_write_write_callback);
 		if (result < 0)
 		{
-			uv_fs_req_cleanup(req);
-			tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to write %s: %s", path, uv_strerror(result)));
+			tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(result)));
 			result = uv_fs_close(req->loop, req, fsreq->file, _file_async_close_callback);
 			if (result < 0)
 			{
@@ -116,9 +114,9 @@ static void _file_write_open_callback(uv_fs_t* req)
 	else
 	{
 		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(req->result)));
+		uv_fs_req_cleanup(req);
 		tf_free(req);
 	}
-	tf_free((void*)path);
 }
 
 static JSValue _file_write_file(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
@@ -158,7 +156,7 @@ static JSValue _file_write_file(JSContext* context, JSValueConst this_val, int a
 	int result = uv_fs_open(tf_task_get_loop(task), &req->fs, file_name, UV_FS_O_CREAT | UV_FS_O_WRONLY, 0644, _file_write_open_callback);
 	if (result < 0)
 	{
-		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to open %s for write: %s", file_name, uv_strerror(result)));
+		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(result)));
 	}
 	JS_FreeCString(context, file_name);
 	return promise_value;
@@ -166,6 +164,7 @@ static JSValue _file_write_file(JSContext* context, JSValueConst this_val, int a
 
 static void _file_read_read_callback(uv_fs_t* req)
 {
+	uv_fs_req_cleanup(req);
 	fs_req_t* fsreq = (fs_req_t*)req;
 	tf_task_t* task = req->loop->data;
 	JSContext* context = tf_task_get_context(task);
@@ -178,9 +177,8 @@ static void _file_read_read_callback(uv_fs_t* req)
 	}
 	else
 	{
-		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to read %s: %s", req->path, uv_strerror(req->result)));
+		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(req->result)));
 	}
-	uv_fs_req_cleanup(req);
 	int result = uv_fs_close(req->loop, req, fsreq->file, _file_async_close_callback);
 	if (result < 0)
 	{
@@ -191,7 +189,6 @@ static void _file_read_read_callback(uv_fs_t* req)
 
 static void _file_read_open_callback(uv_fs_t* req)
 {
-	const char* path = tf_strdup(req->path);
 	uv_fs_req_cleanup(req);
 	fs_req_t* fsreq = (fs_req_t*)req;
 	tf_task_t* task = req->loop->data;
@@ -204,7 +201,7 @@ static void _file_read_open_callback(uv_fs_t* req)
 		int result = uv_fs_read(req->loop, req, fsreq->file, &buf, 1, 0, _file_read_read_callback);
 		if (result < 0)
 		{
-			tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to read %s: %s", path, uv_strerror(result)));
+			tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(result)));
 			result = uv_fs_close(req->loop, req, fsreq->file, _file_async_close_callback);
 			if (result < 0)
 			{
@@ -215,11 +212,10 @@ static void _file_read_open_callback(uv_fs_t* req)
 	}
 	else
 	{
-		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to open %s for read: %s", path, uv_strerror(req->result)));
+		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(req->result)));
 		uv_fs_req_cleanup(req);
 		tf_free(req);
 	}
-	tf_free((void*)path);
 }
 
 static JSValue _file_read_file(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
@@ -242,7 +238,7 @@ static JSValue _file_read_file(JSContext* context, JSValueConst this_val, int ar
 	int result = uv_fs_open(tf_task_get_loop(task), &req->fs, file_name, UV_FS_O_RDONLY, 0, _file_read_open_callback);
 	if (result < 0)
 	{
-		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "Failed to open %s for read: %s", file_name, uv_strerror(result)));
+		tf_task_reject_promise(task, promise, JS_ThrowInternalError(context, "%s", uv_strerror(result)));
 		uv_fs_req_cleanup(&req->fs);
 		tf_free(req);
 	}
@@ -320,13 +316,11 @@ static void _file_read_file_zip_after_work(uv_work_t* work, int status)
 	tf_trace_begin(trace, "file_read_zip_after_work");
 	if (data->result >= 0)
 	{
-		JSValue array = tf_util_new_uint8_array(data->context, data->buffer, data->result);
-		tf_task_resolve_promise(data->task, data->promise, array);
-		JS_FreeValue(data->context, array);
+		tf_task_resolve_promise(data->task, data->promise, tf_util_new_uint8_array(data->context, data->buffer, data->result));
 	}
 	else
 	{
-		tf_task_reject_promise(data->task, data->promise, JS_ThrowInternalError(data->context, "Failed to read %s: %d.", data->file_path, data->result));
+		tf_task_reject_promise(data->task, data->promise, JS_ThrowInternalError(data->context, "Error: %d.", data->result));
 	}
 	tf_free(data->buffer);
 	tf_free((void*)data->file_path);
@@ -356,7 +350,7 @@ static JSValue _file_read_file_zip(JSContext* context, JSValueConst this_val, in
 	int r = uv_queue_work(tf_task_get_loop(task), &work->request, _file_read_file_zip_work, _file_read_file_zip_after_work);
 	if (r)
 	{
-		tf_task_reject_promise(task, work->promise, JS_ThrowInternalError(context, "Failed to create read work for %s: %s", file_name, uv_strerror(r)));
+		tf_task_reject_promise(task, work->promise, JS_ThrowInternalError(context, "%s", uv_strerror(r)));
 		tf_free((void*)work->file_path);
 		tf_free(work);
 	}

src/http.c

@@ -67,7 +67,6 @@ typedef struct _tf_http_connection_t
 typedef struct _tf_http_handler_t
 {
 	const char* pattern;
-	bool is_wildcard;
 	tf_http_callback_t* callback;
 	tf_http_cleanup_t* cleanup;
 	void* user_data;
@@ -128,48 +127,12 @@ static void _http_allocate_buffer(uv_handle_t* handle, size_t suggested_size, uv
 	*buf = uv_buf_init(connection->incoming, sizeof(connection->incoming));
 }
 
-static bool _http_pattern_matches(const char* pattern, const char* path, bool is_wildcard)
-{
-	if (!pattern || !*pattern || (!is_wildcard && strcmp(path, pattern) == 0))
-	{
-		return true;
-	}
-
-	if (is_wildcard)
-	{
-		int i = 0;
-		int j = 0;
-		while (pattern[i] && path[j] && pattern[i] != '*' && pattern[i] == path[j])
-		{
-			i++;
-			j++;
-		}
-
-		if (pattern[i] == '*')
-		{
-			while (true)
-			{
-				if (_http_pattern_matches(pattern + i + 1, path + j, strchr(pattern + i + 1, '*') != NULL))
-				{
-					return true;
-				}
-				if (!path[j])
-				{
-					break;
-				}
-				j++;
-			}
-		}
-		return !pattern[i] && !path[j];
-	}
-	return false;
-}
-
 static bool _http_find_handler(tf_http_t* http, const char* path, tf_http_callback_t** out_callback, const char** out_trace_name, void** out_user_data)
 {
 	for (int i = 0; i < http->handlers_count; i++)
 	{
-		if (_http_pattern_matches(http->handlers[i].pattern, path, http->handlers[i].is_wildcard))
+		if (!http->handlers[i].pattern || !*http->handlers[i].pattern || strcmp(path, http->handlers[i].pattern) == 0 ||
+			(*http->handlers[i].pattern && strncmp(path, http->handlers[i].pattern, strlen(http->handlers[i].pattern)) == 0 && path[strlen(http->handlers[i].pattern) - 1] == '/'))
 		{
 			*out_callback = http->handlers[i].callback;
 			*out_trace_name = http->handlers[i].pattern;
@@ -198,11 +161,10 @@ static void _http_request_destroy(tf_http_request_t* request)
 	tf_http_close_callback* on_close = request->on_close;
 	if (on_close)
 	{
-		tf_trace_t* trace = request->http->trace;
 		request->on_close = NULL;
-		tf_trace_begin(trace, request->connection && request->connection->trace_name ? request->connection->trace_name : "websocket");
+		tf_trace_begin(request->http->trace, request->connection && request->connection->trace_name ? request->connection->trace_name : "websocket");
 		on_close(request);
-		tf_trace_end(trace);
+		tf_trace_end(request->http->trace);
 	}
 }
 
@@ -212,9 +174,12 @@ static void _http_connection_destroy(tf_http_connection_t* connection, const cha
 
 	if (connection->request)
 	{
-		tf_http_request_t* request = connection->request;
+		_http_request_destroy(connection->request);
+		if (connection->request && connection->request->ref_count == 0)
+		{
+			tf_free(connection->request);
+		}
 		connection->request = NULL;
-		_http_request_destroy(request);
 	}
 
 	if (connection->tcp.data && !uv_is_closing((uv_handle_t*)&connection->tcp))
@@ -418,19 +383,11 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
 			};
 			connection->request = request;
 
-			if (!connection->http->is_shutting_down)
-			{
-				tf_http_request_ref(request);
-				tf_trace_begin(connection->http->trace, connection->trace_name ? connection->trace_name : "http");
-				connection->callback(request);
-				tf_trace_end(connection->http->trace);
-				tf_http_request_unref(request);
-			}
-			else
-			{
-				const char* k_payload = tf_http_status_text(503);
-				tf_http_respond(request, 503, NULL, 0, k_payload, strlen(k_payload));
-			}
+			tf_http_request_ref(request);
+			tf_trace_begin(connection->http->trace, connection->trace_name ? connection->trace_name : "http");
+			connection->callback(request);
+			tf_trace_end(connection->http->trace);
+			tf_http_request_unref(request);
 		}
 	}
 }
@@ -731,7 +688,6 @@ void tf_http_add_handler(tf_http_t* http, const char* pattern, tf_http_callback_
 	http->handlers = tf_resize_vec(http->handlers, sizeof(tf_http_handler_t) * (http->handlers_count + 1));
 	http->handlers[http->handlers_count++] = (tf_http_handler_t) {
 		.pattern = tf_strdup(pattern),
-		.is_wildcard = pattern && strchr(pattern, '*') != NULL,
 		.callback = callback,
 		.cleanup = cleanup,
 		.user_data = user_data,
@@ -830,8 +786,6 @@ const char* tf_http_status_text(int status)
 		return "File not found";
 	case 500:
 		return "Internal server error";
-	case 503:
-		return "Service Unavailable";
 	default:
 		return "Unknown";
 	}
@@ -1011,11 +965,11 @@ void tf_http_request_unref(tf_http_request_t* request)
 	tf_http_connection_t* connection = request->connection;
 	if (--request->ref_count == 0)
 	{
+		_http_request_destroy(request);
 		if (connection)
 		{
 			connection->request = NULL;
 		}
-		_http_request_destroy(request);
 		tf_free(request);
 	}
 
@@ -1068,46 +1022,3 @@ void* tf_http_get_user_data(tf_http_t* http)
 {
 	return http->user_data;
 }
-
-const char* tf_http_get_cookie(const char* cookie_header, const char* name)
-{
-	if (!cookie_header)
-	{
-		return NULL;
-	}
-
-	int name_start = 0;
-	int equals = 0;
-	for (int i = 0;; i++)
-	{
-		if (cookie_header[i] == '=')
-		{
-			equals = i;
-		}
-		else if (cookie_header[i] == ',' || cookie_header[i] == ';' || cookie_header[i] == '\0')
-		{
-			if (equals > name_start && strncmp(cookie_header + name_start, name, equals - name_start) == 0 && (int)strlen(name) == equals - name_start)
-			{
-				int length = i - equals - 1;
-				char* result = tf_malloc(length + 1);
-				memcpy(result, cookie_header + equals + 1, length);
-				result[length] = '\0';
-				return result;
-			}
-
-			if (cookie_header[i] == '\0')
-			{
-				break;
-			}
-			else
-			{
-				name_start = i + 1;
-				while (cookie_header[name_start] == ' ')
-				{
-					name_start++;
-				}
-			}
-		}
-	}
-	return NULL;
-}

src/http.h

@@ -196,15 +196,6 @@ void tf_http_request_unref(tf_http_request_t* request);
 */
 const char* tf_http_request_get_header(tf_http_request_t* request, const char* name);
 
-/**
-** Get a cookie value from request headers.
-** @param cookie_header The value of the "Cookie" header of the form
-** "name1=value1; name2=value2".
-** @param name The cookie name.
-** @return The cookie value, if found, or NULL.  Must be freed with tf_free().
-*/
-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

src/httpd.js.c

@@ -4,24 +4,16 @@
 #include "http.h"
 #include "log.h"
 #include "mem.h"
-#include "ssb.h"
-#include "ssb.db.h"
 #include "task.h"
 #include "tlscontext.js.h"
 #include "trace.h"
 #include "util.js.h"
 
-#include "ow-crypt.h"
-
 #include "picohttpparser.h"
 
-#include "sodium/crypto_sign.h"
-#include "sodium/utils.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include <openssl/sha.h>
 
@@ -31,12 +23,7 @@
 
 #define tf_countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
 
-const int64_t k_refresh_interval = 1ULL * 7 * 24 * 60 * 60 * 1000;
-
-static JSValue _authenticate_jwt(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_set_session_cookie_header(tf_http_request_t* request, const char* session_cookie);
 
 static JSClassID _httpd_class_id;
 static JSClassID _httpd_request_class_id;
@@ -324,22 +311,6 @@ static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_va
 		headers[headers_count * 2 + 1] = key;
 		headers_count++;
 
-		tf_ssb_t* ssb = tf_task_get_ssb(tf_task_get(context));
-		const char* session = tf_http_get_cookie(tf_http_request_get_header(request, "cookie"), "session");
-		JSValue jwt = _authenticate_jwt(context, session);
-		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* cookie = _make_set_session_cookie_header(request, session_token);
-		tf_free((void*)session_token);
-		JS_FreeCString(context, name_string);
-		JS_FreeValue(context, name);
-		JS_FreeValue(context, jwt);
-		headers[headers_count * 2 + 0] = "Set-Cookie";
-		headers[headers_count * 2 + 1] = cookie ? cookie : "";
-		headers_count++;
-
 		bool send_version = !tf_http_request_get_header(request, "sec-websocket-version") || strcmp(tf_http_request_get_header(request, "sec-websocket-version"), "13") != 0;
 		if (send_version)
 		{
@@ -359,8 +330,6 @@ static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_va
 			JS_FreeCString(context, headers[i * 2 + 1]);
 		}
 
-		tf_free((void*)cookie);
-
 		request->on_message = _httpd_message_callback;
 		request->on_close = _httpd_websocket_close_callback;
 		request->context = context;
@@ -441,58 +410,6 @@ static JSValue _httpd_set_http_redirect(JSContext* context, JSValueConst this_va
 	return JS_UNDEFINED;
 }
 
-static JSValue _httpd_auth_query(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	tf_task_t* task = tf_task_get(context);
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	JSValue headers = argv[0];
-	if (JS_IsUndefined(headers))
-	{
-		return JS_UNDEFINED;
-	}
-
-	JSValue cookie = JS_GetPropertyStr(context, headers, "cookie");
-	const char* cookie_string = JS_ToCString(context, cookie);
-	const char* session = tf_http_get_cookie(cookie_string, "session");
-	JSValue entry = _authenticate_jwt(context, session);
-	tf_free((void*)session);
-	JS_FreeCString(context, cookie_string);
-	JS_FreeValue(context, cookie);
-
-	JSValue result = JS_UNDEFINED;
-	if (!JS_IsUndefined(entry))
-	{
-		result = JS_NewObject(context);
-		JS_SetPropertyStr(context, result, "session", entry);
-		JSValue out_permissions = JS_NewObject(context);
-		JS_SetPropertyStr(context, result, "permissions", out_permissions);
-
-		JSValue name = JS_GetPropertyStr(context, entry, "name");
-		const char* name_string = JS_ToCString(context, name);
-
-		const char* settings = tf_ssb_db_get_property(ssb, "core", "settings");
-		JSValue settings_value = settings ? JS_ParseJSON(context, settings, strlen(settings), NULL) : JS_UNDEFINED;
-		JSValue permissions = !JS_IsUndefined(settings_value) ? JS_GetPropertyStr(context, settings_value, "permissions") : JS_UNDEFINED;
-		JSValue user_permissions = !JS_IsUndefined(permissions) ? JS_GetPropertyStr(context, permissions, name_string) : JS_UNDEFINED;
-		int length = !JS_IsUndefined(user_permissions) ? tf_util_get_length(context, user_permissions) : 0;
-		for (int i = 0; i < length; i++)
-		{
-			JSValue permission = JS_GetPropertyUint32(context, user_permissions, i);
-			const char* permission_string = JS_ToCString(context, permission);
-			JS_SetPropertyStr(context, out_permissions, permission_string, JS_TRUE);
-			JS_FreeCString(context, permission_string);
-			JS_FreeValue(context, permission);
-		}
-		JS_FreeValue(context, user_permissions);
-		JS_FreeValue(context, permissions);
-		JS_FreeValue(context, settings_value);
-		tf_free((void*)settings);
-		JS_FreeCString(context, name_string);
-		JS_FreeValue(context, name);
-	}
-	return result;
-}
-
 static void _httpd_finalizer(JSRuntime* runtime, JSValue value)
 {
 	tf_http_t* http = JS_GetOpaque(value, _httpd_class_id);
@@ -626,15 +543,11 @@ static const char* _ext_to_content_type(const char* ext)
 {
 	if (ext)
 	{
-		if (strcmp(ext, ".html") == 0)
-		{
-			return "text/html; charset=UTF-8";
-		}
-		else if (strcmp(ext, ".js") == 0 || strcmp(ext, ".mjs") == 0)
+		if (strcmp(ext, ".js") == 0 || strcmp(ext, ".mjs") == 0)
 		{
 			return "text/javascript; charset=UTF-8";
 		}
-		else if (strcmp(ext, ".css") == 0)
+		if (strcmp(ext, ".css") == 0)
 		{
 			return "text/css; charset=UTF-8";
 		}
@@ -752,11 +665,6 @@ static void _httpd_endpoint_static(tf_http_request_t* request)
 		is_core = is_core || (after && i == 0);
 	}
 
-	if (strcmp(request->path, "/speedscope/") == 0)
-	{
-		after = "index.html";
-	}
-
 	if (!after || strstr(after, ".."))
 	{
 		const char* k_payload = tf_http_status_text(404);
@@ -792,38 +700,6 @@ static void _httpd_endpoint_static(tf_http_request_t* request)
 	tf_file_stat(task, path, _httpd_endpoint_static_stat, request);
 }
 
-static void _httpd_endpoint_root_callback(const char* path, void* user_data)
-{
-	tf_http_request_t* request = user_data;
-	const char* host = tf_http_request_get_header(request, "x-forwarded-host");
-	if (!host)
-	{
-		host = tf_http_request_get_header(request, "host");
-	}
-
-	char url[1024];
-	snprintf(url, sizeof(url), "%s%s%s", request->is_tls ? "https://" : "http://", host, path ? path : "/~core/apps/");
-	const char* headers[] = {
-		"Location",
-		url,
-	};
-	tf_http_respond(request, 303, headers, tf_countof(headers) / 2, NULL, 0);
-	tf_http_request_unref(request);
-}
-
-static void _httpd_endpoint_root(tf_http_request_t* request)
-{
-	const char* host = tf_http_request_get_header(request, "x-forwarded-host");
-	if (!host)
-	{
-		host = tf_http_request_get_header(request, "host");
-	}
-	tf_task_t* task = request->user_data;
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	tf_http_request_ref(request);
-	tf_ssb_db_resolve_index_async(ssb, host, _httpd_endpoint_root_callback, request);
-}
-
 static void _httpd_endpoint_robots_txt(tf_http_request_t* request)
 {
 	if (_httpd_redirect(request))
@@ -856,616 +732,6 @@ static void _httpd_endpoint_debug(tf_http_request_t* request)
 	tf_free(response);
 }
 
-const char** _form_data_decode(const char* data, int length)
-{
-	int key_max = 1;
-	for (int i = 0; i < length; i++)
-	{
-		if (data[i] == '&')
-		{
-			key_max++;
-		}
-	}
-
-	int write_length = length + 1;
-	char** result = tf_malloc(sizeof(const char*) * (key_max + 1) * 2 + write_length);
-	char* result_buffer = ((char*)result) + sizeof(const char*) * (key_max + 1) * 2;
-
-	char* write_pos = result_buffer;
-	int count = 0;
-	int i = 0;
-	while (i < length)
-	{
-		result[count++] = write_pos;
-		while (i < length)
-		{
-			if (data[i] == '+')
-			{
-				*write_pos++ = ' ';
-				i++;
-			}
-			else if (data[i] == '%' && i + 2 < length)
-			{
-				*write_pos++ = (char)strtoul((const char[]) { data[i + 1], data[i + 2], 0 }, NULL, 16);
-				i += 3;
-			}
-			else if (data[i] == '=')
-			{
-				if (count % 2 == 0)
-				{
-					result[count++] = "";
-				}
-				i++;
-				break;
-			}
-			else if (data[i] == '&')
-			{
-				if (count % 2 != 0)
-				{
-					result[count++] = "";
-				}
-				i++;
-				break;
-			}
-			else
-			{
-				*write_pos++ = data[i++];
-			}
-		}
-		*write_pos++ = '\0';
-	}
-
-	result[count++] = NULL;
-	result[count++] = NULL;
-
-	return (const char**)result;
-}
-
-const char* _form_data_get(const char** form_data, const char* key)
-{
-	for (int i = 0; form_data[i]; i += 2)
-	{
-		if (form_data[i] && strcmp(form_data[i], key) == 0)
-		{
-			return form_data[i + 1];
-		}
-	}
-	return NULL;
-}
-
-typedef struct _login_request_t
-{
-	tf_http_request_t* request;
-	const char* session_cookie;
-	JSValue jwt;
-	const char* name;
-	const char* error;
-	const char* code_of_conduct;
-	bool have_administrator;
-	bool session_is_new;
-} login_request_t;
-
-static const char* _make_set_session_cookie_header(tf_http_request_t* request, const char* session_cookie)
-{
-	const char* k_pattern = "session=%s; path=/; Max-Age=%" PRId64 "; %sSameSite=Strict; HttpOnly";
-	int length = session_cookie ? snprintf(NULL, 0, k_pattern, session_cookie, k_refresh_interval, request->is_tls ? "Secure; " : "") : 0;
-	char* cookie = length ? tf_malloc(length + 1) : NULL;
-	if (cookie)
-	{
-		snprintf(cookie, length + 1, k_pattern, session_cookie, k_refresh_interval, request->is_tls ? "Secure; " : "");
-	}
-	return cookie;
-}
-
-static void _httpd_endpoint_login_file_read_callback(tf_task_t* task, const char* path, int result, const void* data, void* user_data)
-{
-	login_request_t* login = user_data;
-	tf_http_request_t* request = login->request;
-	if (result >= 0)
-	{
-		const char* cookie = _make_set_session_cookie_header(request, login->session_cookie);
-		const char* headers[] = {
-			"Content-Type",
-			"text/html; charset=utf-8",
-			"Set-Cookie",
-			cookie ? cookie : "",
-		};
-		const char* replace_me = "$AUTH_DATA";
-		const char* auth = strstr(data, replace_me);
-		if (auth)
-		{
-			JSContext* context = tf_task_get_context(task);
-			JSValue object = JS_NewObject(context);
-			JS_SetPropertyStr(context, object, "session_is_new", JS_NewBool(context, login->session_is_new));
-			JS_SetPropertyStr(context, object, "name", login->name ? JS_NewString(context, login->name) : JS_UNDEFINED);
-			JS_SetPropertyStr(context, object, "error", login->error ? JS_NewString(context, login->error) : JS_UNDEFINED);
-			JS_SetPropertyStr(context, object, "code_of_conduct", login->code_of_conduct ? JS_NewString(context, login->code_of_conduct) : JS_UNDEFINED);
-			JS_SetPropertyStr(context, object, "have_administrator", JS_NewBool(context, login->have_administrator));
-			JSValue object_json = JS_JSONStringify(context, object, JS_NULL, JS_NULL);
-			size_t json_length = 0;
-			const char* json = JS_ToCStringLen(context, &json_length, object_json);
-
-			char* copy = tf_malloc(result + json_length);
-			int replace_start = (auth - (const char*)data);
-			int replace_end = (auth - (const char*)data) + (int)strlen(replace_me);
-			memcpy(copy, data, replace_start);
-			memcpy(copy + replace_start, json, json_length);
-			memcpy(copy + replace_start + json_length, ((const char*)data) + replace_end, result - replace_end);
-			tf_http_respond(request, 200, headers, tf_countof(headers) / 2, copy, replace_start + json_length + (result - replace_end));
-			tf_free(copy);
-
-			JS_FreeCString(context, json);
-			JS_FreeValue(context, object_json);
-			JS_FreeValue(context, object);
-		}
-		else
-		{
-			tf_http_respond(request, 200, headers, tf_countof(headers) / 2, data, result);
-		}
-		tf_free((void*)cookie);
-	}
-	else
-	{
-		const char* k_payload = tf_http_status_text(404);
-		tf_http_respond(request, 404, NULL, 0, k_payload, strlen(k_payload));
-	}
-	tf_http_request_unref(request);
-	tf_free((void*)login->name);
-	tf_free((void*)login->code_of_conduct);
-	tf_free((void*)login->session_cookie);
-	tf_free(login);
-}
-
-static bool _string_property_equals(JSContext* context, JSValue object, const char* name, const char* value)
-{
-	JSValue object_value = JS_GetPropertyStr(context, object, name);
-	const char* object_value_string = JS_ToCString(context, object_value);
-	bool equals = object_value_string && strcmp(object_value_string, value) == 0;
-	JS_FreeCString(context, object_value_string);
-	JS_FreeValue(context, object_value);
-	return equals;
-}
-
-static void _public_key_visit(const char* identity, void* user_data)
-{
-	snprintf(user_data, k_id_base64_len, "%s", identity);
-}
-
-static JSValue _authenticate_jwt(JSContext* context, const char* jwt)
-{
-	if (!jwt)
-	{
-		return JS_UNDEFINED;
-	}
-
-	int dot[2] = { 0 };
-	int dot_count = 0;
-	for (int i = 0; jwt[i]; i++)
-	{
-		if (jwt[i] == '.')
-		{
-			if (dot_count >= tf_countof(dot))
-			{
-				return JS_UNDEFINED;
-			}
-			dot[dot_count++] = i;
-		}
-	}
-	if (dot_count != 2)
-	{
-		return JS_UNDEFINED;
-	}
-
-	uint8_t header[256] = { 0 };
-	size_t actual_length = 0;
-	if (sodium_base642bin(header, sizeof(header), jwt, dot[0], NULL, &actual_length, NULL, sodium_base64_VARIANT_URLSAFE_NO_PADDING) != 0 || actual_length >= sizeof(header))
-	{
-		return JS_UNDEFINED;
-	}
-
-	header[actual_length] = '\0';
-	JSValue header_value = JS_ParseJSON(context, (const char*)header, actual_length, NULL);
-	bool header_valid = _string_property_equals(context, header_value, "typ", "JWT") && _string_property_equals(context, header_value, "alg", "HS256");
-	JS_FreeValue(context, header_value);
-	if (!header_valid)
-	{
-		return JS_UNDEFINED;
-	}
-
-	tf_task_t* task = tf_task_get(context);
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	char public_key_b64[k_id_base64_len] = { 0 };
-	tf_ssb_db_identity_visit(ssb, ":auth", _public_key_visit, public_key_b64);
-
-	const char* payload = jwt + dot[0] + 1;
-	size_t payload_length = dot[1] - dot[0] - 1;
-	if (!tf_ssb_hmacsha256_verify(public_key_b64, payload, payload_length, jwt + dot[1] + 1, true))
-	{
-		return JS_UNDEFINED;
-	}
-
-	uint8_t payload_bin[256];
-	size_t actual_payload_length = 0;
-	if (sodium_base642bin(payload_bin, sizeof(payload_bin), payload, payload_length, NULL, &actual_payload_length, NULL, sodium_base64_VARIANT_URLSAFE_NO_PADDING) != 0 ||
-		actual_payload_length >= sizeof(payload_bin))
-	{
-		return JS_UNDEFINED;
-	}
-
-	payload_bin[actual_payload_length] = '\0';
-	JSValue parsed = JS_ParseJSON(context, (const char*)payload_bin, actual_payload_length, NULL);
-	JSValue exp = JS_GetPropertyStr(context, parsed, "exp");
-	int64_t exp_value = 0;
-	JS_ToInt64(context, &exp_value, exp);
-	if (time(NULL) >= exp_value)
-	{
-		JS_FreeValue(context, parsed);
-		return JS_UNDEFINED;
-	}
-
-	return parsed;
-}
-
-static bool _session_is_authenticated_as_user(JSContext* context, JSValue session)
-{
-	bool result = false;
-	JSValue user = JS_GetPropertyStr(context, session, "user");
-	const char* user_string = JS_ToCString(context, user);
-	result = user_string && strcmp(user_string, "guest") != 0;
-	JS_FreeCString(context, user_string);
-	JS_FreeValue(context, user);
-	return result;
-}
-
-static bool _is_name_valid(const char* name)
-{
-	if (!name || !((*name >= 'a' && *name <= 'z') || (*name >= 'A' && *name <= 'Z')))
-	{
-		return false;
-	}
-	for (const char* p = name; *p; p++)
-	{
-		bool in_range = (*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') || (*p >= '0' && *p <= '9');
-		if (!in_range)
-		{
-			return false;
-		}
-	}
-	return true;
-}
-
-static void _visit_auth_identity(const char* identity, void* user_data)
-{
-	if (!*(char*)user_data)
-	{
-		snprintf((char*)user_data, k_id_base64_len, "%s", identity);
-	}
-}
-
-static bool _get_auth_private_key(tf_ssb_t* ssb, uint8_t* out_private_key)
-{
-	char id[k_id_base64_len] = { 0 };
-	tf_ssb_db_identity_visit(ssb, ":auth", _visit_auth_identity, id);
-	if (*id)
-	{
-		return tf_ssb_db_identity_get_private_key(ssb, ":auth", id, out_private_key, crypto_sign_SECRETKEYBYTES);
-	}
-	else
-	{
-		return tf_ssb_db_identity_create(ssb, ":auth", out_private_key + crypto_sign_PUBLICKEYBYTES, out_private_key);
-	}
-}
-
-static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name)
-{
-	if (!name || !*name)
-	{
-		return NULL;
-	}
-	uint8_t private_key[crypto_sign_SECRETKEYBYTES] = { 0 };
-	if (!_get_auth_private_key(ssb, private_key))
-	{
-		return NULL;
-	}
-
-	uv_timespec64_t now = { 0 };
-	uv_clock_gettime(UV_CLOCK_REALTIME, &now);
-
-	JSContext* context = tf_ssb_get_context(ssb);
-
-	const char* header_json = "{\"alg\":\"HS256\",\"typ\":\"JWT\"}";
-	char header_base64[256];
-	sodium_bin2base64(header_base64, sizeof(header_base64), (uint8_t*)header_json, strlen(header_json), sodium_base64_VARIANT_URLSAFE_NO_PADDING);
-
-	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));
-	JSValue payload_json = JS_JSONStringify(context, payload, JS_NULL, JS_NULL);
-	size_t payload_length = 0;
-	const char* payload_string = JS_ToCStringLen(context, &payload_length, payload_json);
-	char payload_base64[256];
-	sodium_bin2base64(payload_base64, sizeof(payload_base64), (uint8_t*)payload_string, payload_length, sodium_base64_VARIANT_URLSAFE_NO_PADDING);
-
-	char* result = NULL;
-	uint8_t signature[crypto_sign_BYTES];
-	unsigned long long signature_length = 0;
-	char signature_base64[256] = { 0 };
-
-	if (crypto_sign_detached(signature, &signature_length, (const uint8_t*)payload_base64, strlen(payload_base64), private_key) == 0)
-	{
-		sodium_bin2base64(signature_base64, sizeof(signature_base64), signature, sizeof(signature), sodium_base64_VARIANT_URLSAFE_NO_PADDING);
-		size_t size = strlen(header_base64) + 1 + strlen(payload_base64) + 1 + strlen(signature_base64) + 1;
-		result = tf_malloc(size);
-		snprintf(result, size, "%s.%s.%s", header_base64, payload_base64, signature_base64);
-	}
-
-	JS_FreeCString(context, payload_string);
-	JS_FreeValue(context, payload_json);
-	JS_FreeValue(context, payload);
-
-	return result;
-}
-
-static bool _verify_password(const char* password, const char* hash)
-{
-	char buffer[7 + 22 + 31 + 1];
-	const char* out_hash = crypt_rn(password, hash, buffer, sizeof(buffer));
-	return out_hash && strcmp(hash, out_hash) == 0;
-}
-
-static const char* _get_code_of_conduct(tf_ssb_t* ssb)
-{
-	JSContext* context = tf_ssb_get_context(ssb);
-	const char* settings = tf_ssb_db_get_property(ssb, "core", "settings");
-	JSValue settings_value = settings ? JS_ParseJSON(context, settings, strlen(settings), NULL) : JS_UNDEFINED;
-	JSValue code_of_conduct_value = JS_GetPropertyStr(context, settings_value, "code_of_conduct");
-	const char* code_of_conduct = JS_ToCString(context, code_of_conduct_value);
-	const char* result = tf_strdup(code_of_conduct);
-	JS_FreeCString(context, code_of_conduct);
-	JS_FreeValue(context, code_of_conduct_value);
-	JS_FreeValue(context, settings_value);
-	tf_free((void*)settings);
-	return result;
-}
-
-static bool _make_administrator_if_first(tf_ssb_t* ssb, const char* account_name_copy, bool may_become_first_admin)
-{
-	JSContext* context = tf_ssb_get_context(ssb);
-	const char* settings = tf_ssb_db_get_property(ssb, "core", "settings");
-	JSValue settings_value = settings ? JS_ParseJSON(context, settings, strlen(settings), NULL) : JS_UNDEFINED;
-	if (JS_IsUndefined(settings_value))
-	{
-		settings_value = JS_NewObject(context);
-	}
-
-	bool have_administrator = false;
-	JSValue permissions = JS_GetPropertyStr(context, settings_value, "permissions");
-
-	JSPropertyEnum* ptab = NULL;
-	uint32_t plen = 0;
-	JS_GetOwnPropertyNames(context, &ptab, &plen, permissions, JS_GPN_STRING_MASK);
-	for (int i = 0; i < (int)plen; i++)
-	{
-		JSPropertyDescriptor desc = { 0 };
-		if (JS_GetOwnProperty(context, &desc, permissions, ptab[i].atom) == 1)
-		{
-			int permission_length = tf_util_get_length(context, desc.value);
-			for (int i = 0; i < permission_length; i++)
-			{
-				JSValue entry = JS_GetPropertyUint32(context, desc.value, i);
-				const char* permission = JS_ToCString(context, entry);
-				if (permission && strcmp(permission, "administration") == 0)
-				{
-					have_administrator = true;
-				}
-				JS_FreeCString(context, permission);
-				JS_FreeValue(context, entry);
-			}
-			JS_FreeValue(context, desc.setter);
-			JS_FreeValue(context, desc.getter);
-			JS_FreeValue(context, desc.value);
-		}
-	}
-	for (uint32_t i = 0; i < plen; ++i)
-	{
-		JS_FreeAtom(context, ptab[i].atom);
-	}
-	js_free(context, ptab);
-
-	if (!have_administrator && may_become_first_admin)
-	{
-		if (JS_IsUndefined(permissions))
-		{
-			permissions = JS_NewObject(context);
-			JS_SetPropertyStr(context, settings_value, "permissions", JS_DupValue(context, permissions));
-		}
-		JSValue user = JS_GetPropertyStr(context, permissions, account_name_copy);
-		if (JS_IsUndefined(user))
-		{
-			user = JS_NewArray(context);
-			JS_SetPropertyStr(context, permissions, account_name_copy, JS_DupValue(context, user));
-		}
-		JS_SetPropertyUint32(context, user, tf_util_get_length(context, user), JS_NewString(context, "administration"));
-		JS_FreeValue(context, user);
-
-		JSValue settings_json = JS_JSONStringify(context, settings_value, JS_NULL, JS_NULL);
-		const char* settings_string = JS_ToCString(context, settings_json);
-		tf_ssb_db_set_property(ssb, "core", "settings", settings_string);
-		JS_FreeCString(context, settings_string);
-		JS_FreeValue(context, settings_json);
-	}
-
-	JS_FreeValue(context, permissions);
-	JS_FreeValue(context, settings_value);
-	tf_free((void*)settings);
-	return have_administrator;
-}
-
-static void _httpd_endpoint_login(tf_http_request_t* request)
-{
-	tf_task_t* task = request->user_data;
-	JSContext* context = tf_task_get_context(task);
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	const char* session = tf_http_get_cookie(tf_http_request_get_header(request, "cookie"), "session");
-	const char** form_data = _form_data_decode(request->query, request->query ? strlen(request->query) : 0);
-	const char* account_name_copy = NULL;
-	JSValue jwt = _authenticate_jwt(context, session);
-
-	if (_session_is_authenticated_as_user(context, jwt))
-	{
-		const char* return_url = _form_data_get(form_data, "return");
-		char url[1024];
-		if (!return_url)
-		{
-			snprintf(url, sizeof(url), "%s%s/", request->is_tls ? "https://" : "http://", tf_http_request_get_header(request, "host"));
-			return_url = url;
-		}
-		const char* headers[] = {
-			"Location",
-			return_url,
-		};
-		tf_http_respond(request, 303, headers, tf_countof(headers) / 2, NULL, 0);
-		goto done;
-	}
-
-	const char* send_session = tf_strdup(session);
-	bool session_is_new = false;
-	const char* login_error = NULL;
-	bool may_become_first_admin = false;
-	if (strcmp(request->method, "POST") == 0)
-	{
-		session_is_new = true;
-		const char** post_form_data = _form_data_decode(request->body, request->content_length);
-		const char* submit = _form_data_get(post_form_data, "submit");
-		if (submit && strcmp(submit, "Login") == 0)
-		{
-			const char* account_name = _form_data_get(post_form_data, "name");
-			account_name_copy = tf_strdup(account_name);
-			const char* password = _form_data_get(post_form_data, "password");
-			const char* new_password = _form_data_get(post_form_data, "new_password");
-			const char* confirm = _form_data_get(post_form_data, "confirm");
-			const char* change = _form_data_get(post_form_data, "change");
-			const char* form_register = _form_data_get(post_form_data, "register");
-			char account_passwd[256] = { 0 };
-			bool have_account = tf_ssb_db_get_account_password_hash(ssb, _form_data_get(post_form_data, "name"), account_passwd, sizeof(account_passwd));
-
-			if (form_register && strcmp(form_register, "1") == 0)
-			{
-				if (!have_account && _is_name_valid(account_name) && password && confirm && strcmp(password, confirm) == 0 &&
-					tf_ssb_db_register_account(ssb, account_name, password))
-				{
-					tf_free((void*)send_session);
-					send_session = _make_session_jwt(ssb, account_name);
-					may_become_first_admin = true;
-				}
-				else
-				{
-					login_error = "Error registering account.";
-				}
-			}
-			else if (change && strcmp(change, "1") == 0)
-			{
-				if (have_account && _is_name_valid(account_name) && new_password && confirm && strcmp(new_password, confirm) == 0 && _verify_password(password, account_passwd) &&
-					tf_ssb_db_set_account_password(ssb, account_name, new_password))
-				{
-					tf_free((void*)send_session);
-					send_session = _make_session_jwt(ssb, account_name);
-				}
-				else
-				{
-					login_error = "Error changing password.";
-				}
-			}
-			else
-			{
-				if (have_account && *account_passwd && _verify_password(password, account_passwd))
-				{
-					tf_free((void*)send_session);
-					send_session = _make_session_jwt(ssb, account_name);
-					may_become_first_admin = true;
-				}
-				else
-				{
-					login_error = "Invalid username or password.";
-				}
-			}
-		}
-		else
-		{
-			tf_free((void*)send_session);
-			send_session = _make_session_jwt(ssb, "guest");
-		}
-		tf_free(post_form_data);
-	}
-
-	bool have_administrator = _make_administrator_if_first(ssb, account_name_copy, may_become_first_admin);
-
-	if (session_is_new && _form_data_get(form_data, "return") && !login_error)
-	{
-		const char* return_url = _form_data_get(form_data, "return");
-		char url[1024];
-		if (!return_url)
-		{
-			snprintf(url, sizeof(url), "%s%s/", request->is_tls ? "https://" : "http://", tf_http_request_get_header(request, "host"));
-			return_url = url;
-		}
-		const char* cookie = _make_set_session_cookie_header(request, send_session);
-		const char* headers[] = {
-			"Location",
-			return_url,
-			"Set-Cookie",
-			cookie ? cookie : "",
-		};
-		tf_http_respond(request, 303, headers, tf_countof(headers) / 2, NULL, 0);
-		tf_free((void*)cookie);
-		tf_free((void*)send_session);
-	}
-	else
-	{
-		tf_http_request_ref(request);
-
-		login_request_t* login = tf_malloc(sizeof(login_request_t));
-		const char* code_of_conduct = _get_code_of_conduct(ssb);
-		*login = (login_request_t) {
-			.request = request,
-			.name = account_name_copy,
-			.jwt = jwt,
-			.error = login_error,
-			.session_cookie = send_session,
-			.session_is_new = session_is_new,
-			.code_of_conduct = code_of_conduct,
-			.have_administrator = have_administrator,
-		};
-
-		tf_file_read(request->user_data, "core/auth.html", _httpd_endpoint_login_file_read_callback, login);
-		jwt = JS_UNDEFINED;
-		account_name_copy = NULL;
-	}
-
-done:
-	tf_free((void*)session);
-	tf_free(form_data);
-	tf_free((void*)account_name_copy);
-	JS_FreeValue(context, jwt);
-}
-
-static void _httpd_endpoint_logout(tf_http_request_t* request)
-{
-	const char* k_set_cookie = request->is_tls ? "session=; path=/; Secure; SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly"
-											   : "session=; path=/; SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly";
-	const char* k_location_format = "/login%s%s";
-	int length = snprintf(NULL, 0, k_location_format, request->query ? "?" : "", request->query);
-	char* location = alloca(length + 1);
-	snprintf(location, length + 1, k_location_format, request->query ? "?" : "", request->query ? request->query : "");
-	const char* headers[] = {
-		"Set-Cookie",
-		k_set_cookie,
-		"Location",
-		location,
-	};
-	tf_http_respond(request, 303, headers, tf_countof(headers) / 2, NULL, 0);
-}
-
 void tf_httpd_register(JSContext* context)
 {
 	JS_NewClassID(&_httpd_class_id);
@@ -1495,13 +761,12 @@ void tf_httpd_register(JSContext* context)
 	tf_http_set_trace(http, tf_task_get_trace(task));
 	JS_SetOpaque(httpd, http);
 
-	tf_http_add_handler(http, "/", _httpd_endpoint_root, NULL, task);
-	tf_http_add_handler(http, "/codemirror/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/lit/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/prettier/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/speedscope/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/static/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/.well-known/*", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/codemirror/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/lit/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/prettier/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/speedscope/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/static/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/.well-known/", _httpd_endpoint_static, NULL, task);
 
 	tf_http_add_handler(http, "/robots.txt", _httpd_endpoint_robots_txt, NULL, NULL);
 	tf_http_add_handler(http, "/debug", _httpd_endpoint_debug, NULL, task);
@@ -1510,14 +775,10 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/mem", _httpd_endpoint_mem, NULL, task);
 	tf_http_add_handler(http, "/trace", _httpd_endpoint_trace, NULL, task);
 
-	tf_http_add_handler(http, "/login/logout", _httpd_endpoint_logout, NULL, task);
-	tf_http_add_handler(http, "/login", _httpd_endpoint_login, NULL, task);
-
 	JS_SetPropertyStr(context, httpd, "handlers", JS_NewObject(context));
 	JS_SetPropertyStr(context, httpd, "all", JS_NewCFunction(context, _httpd_endpoint_all, "all", 2));
 	JS_SetPropertyStr(context, httpd, "start", JS_NewCFunction(context, _httpd_endpoint_start, "start", 2));
 	JS_SetPropertyStr(context, httpd, "set_http_redirect", JS_NewCFunction(context, _httpd_set_http_redirect, "set_http_redirect", 1));
-	JS_SetPropertyStr(context, httpd, "auth_query", JS_NewCFunction(context, _httpd_auth_query, "auth_query", 1));
 	JS_SetPropertyStr(context, global, "httpd", httpd);
 	JS_FreeValue(context, global);
 }

src/main.c

@@ -11,7 +11,6 @@
 
 #include "backtrace.h"
 #include "sqlite3.h"
-#include "unzip.h"
 
 #include <getopt.h>
 #include <stdlib.h>
@@ -417,14 +416,6 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 	};
 	bool show_usage = false;
 
-	/* Check if the executable has data attached. */
-	unzFile zip = unzOpen(file);
-	if (zip)
-	{
-		args.zip = file;
-		unzClose(zip);
-	}
-
 	while (!show_usage)
 	{
 		static const struct option k_options[] = {
@@ -516,7 +507,7 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 
 	if (args.count == 1)
 	{
-		result = _tf_run_task(&args, 0);
+		_tf_run_task(&args, 0);
 	}
 	if (args.count > 1)
 	{

src/packetstream.c

@@ -147,12 +147,7 @@ void tf_packetstream_send(tf_packetstream_t* stream, int packet_type, const char
 		uv_buf_t write_buffer;
 		write_buffer.base = buffer;
 		write_buffer.len = sizeof(packet_type) + sizeof(length) + length;
-		int result = uv_write(request, (uv_stream_t*)&stream->stream, &write_buffer, 1, _packetstream_on_write);
-		if (result)
-		{
-			tf_printf("uv_write: %s\n", uv_strerror(result));
-			tf_free(request);
-		}
+		uv_write(request, (uv_stream_t*)&stream->stream, &write_buffer, 1, _packetstream_on_write);
 	}
 }
 

src/ssb.c

@@ -98,7 +98,6 @@ typedef struct _tf_ssb_debug_close_t
 
 typedef struct _tf_ssb_request_t
 {
-	char name[256];
 	tf_ssb_rpc_callback_t* callback;
 	tf_ssb_callback_cleanup_t* cleanup;
 	void* user_data;
@@ -348,16 +347,15 @@ static JSClassID _connection_class_id;
 static int s_connection_index;
 static int s_tunnel_index;
 
-static void _tf_ssb_connection_client_send_hello(tf_ssb_connection_t* connection);
-static void _tf_ssb_connection_close(tf_ssb_connection_t* connection, const char* reason);
 static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const char* reason);
-static void _tf_ssb_connection_finalizer(JSRuntime* runtime, JSValue value);
+static void _tf_ssb_connection_client_send_hello(tf_ssb_connection_t* connection);
 static void _tf_ssb_connection_on_close(uv_handle_t* handle);
+static void _tf_ssb_connection_close(tf_ssb_connection_t* connection, const char* reason);
 static void _tf_ssb_nonce_inc(uint8_t* nonce);
-static void _tf_ssb_notify_connections_changed(tf_ssb_t* ssb, tf_ssb_change_t change, tf_ssb_connection_t* connection);
-static void _tf_ssb_start_update_settings(tf_ssb_t* ssb);
-static void _tf_ssb_update_settings(tf_ssb_t* ssb);
 static void _tf_ssb_write(tf_ssb_connection_t* connection, void* data, size_t size);
+static void _tf_ssb_connection_finalizer(JSRuntime* runtime, JSValue value);
+static void _tf_ssb_update_settings(tf_ssb_t* ssb);
+static void _tf_ssb_start_update_settings(tf_ssb_t* ssb);
 
 static void _tf_ssb_add_debug_close(tf_ssb_t* ssb, tf_ssb_connection_t* connection, const char* reason)
 {
@@ -484,8 +482,7 @@ static void _tf_ssb_write(tf_ssb_connection_t* connection, void* data, size_t si
 	}
 	else if (connection->tunnel_connection)
 	{
-		tf_ssb_connection_rpc_send(
-			connection->tunnel_connection, k_ssb_rpc_flag_binary | k_ssb_rpc_flag_stream, -connection->tunnel_request_number, NULL, data, size, NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send(connection->tunnel_connection, k_ssb_rpc_flag_binary | k_ssb_rpc_flag_stream, -connection->tunnel_request_number, data, size, NULL, NULL, NULL);
 	}
 }
 
@@ -643,8 +640,8 @@ static bool _tf_ssb_connection_get_request_callback(tf_ssb_connection_t* connect
 	return false;
 }
 
-void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t request_number, const char* name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup,
-	void* user_data, tf_ssb_connection_t* dependent_connection)
+void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t request_number, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data,
+	tf_ssb_connection_t* dependent_connection)
 {
 	tf_ssb_request_t* existing =
 		connection->requests_count ? bsearch(&request_number, connection->requests, connection->requests_count, sizeof(tf_ssb_request_t), _request_compare) : NULL;
@@ -669,7 +666,6 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 			.user_data = user_data,
 			.dependent_connection = dependent_connection,
 		};
-		snprintf(request.name, sizeof(request.name), "%s", name);
 		int index = tf_util_insert_index(&request_number, connection->requests, connection->requests_count, sizeof(tf_ssb_request_t), _request_compare);
 		connection->requests = tf_resize_vec(connection->requests, sizeof(tf_ssb_request_t) * (connection->requests_count + 1));
 		if (connection->requests_count - index)
@@ -681,7 +677,6 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 
 		connection->ssb->request_count++;
 	}
-	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_update, connection);
 }
 
 static int _message_request_compare(const void* a, const void* b)
@@ -742,12 +737,11 @@ void tf_ssb_connection_remove_request(tf_ssb_connection_t* connection, int32_t r
 		connection->requests_count--;
 		connection->requests = tf_resize_vec(connection->requests, sizeof(tf_ssb_request_t) * connection->requests_count);
 		connection->ssb->request_count--;
-		_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_update, connection);
 	}
 }
 
-void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
-	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
+void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const uint8_t* message, size_t size, tf_ssb_rpc_callback_t* callback,
+	tf_ssb_callback_cleanup_t* cleanup, void* user_data)
 {
 	if (!connection)
 	{
@@ -761,18 +755,10 @@ void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags,
 	{
 		assert(request_number > 0);
 		assert(!_tf_ssb_connection_get_request_callback(connection, request_number, NULL, NULL));
-		assert(new_request_name);
 	}
 	else if (!_tf_ssb_connection_get_request_callback(connection, request_number, NULL, NULL))
 	{
-		if (flags & k_ssb_rpc_flag_binary)
-		{
-			tf_printf("Dropping message with no active request (%d): (%zd bytes).\n", request_number, size);
-		}
-		else
-		{
-			tf_printf("Dropping message with no active request (%d): %.*s\n", request_number, (int)size, message);
-		}
+		tf_printf("Dropping message with no active request (%d): %.*s\n", request_number, (int)size, message);
 		return;
 	}
 
@@ -793,25 +779,24 @@ void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags,
 	_tf_ssb_connection_box_stream_send(connection, combined, 1 + 2 * sizeof(uint32_t) + size);
 	tf_free(combined);
 	connection->ssb->rpc_out++;
-	if ((flags & k_ssb_rpc_flag_end_error) || (request_number < 0 && !(flags & k_ssb_rpc_flag_stream)))
+	if (flags & k_ssb_rpc_flag_end_error)
 	{
 		tf_ssb_connection_remove_request(connection, request_number);
 	}
 	else if (flags & k_ssb_rpc_flag_new_request)
 	{
-		tf_ssb_connection_add_request(connection, request_number, new_request_name, callback, cleanup, user_data, NULL);
+		tf_ssb_connection_add_request(connection, request_number, callback, cleanup, user_data, NULL);
 	}
 }
 
-void tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
-	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
+void tf_ssb_connection_rpc_send_json(
+	tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue message, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
 {
 	JSContext* context = connection->ssb->context;
 	JSValue json = JS_JSONStringify(context, message, JS_NULL, JS_NULL);
 	size_t size = 0;
 	const char* json_string = JS_ToCStringLen(context, &size, json);
-	tf_ssb_connection_rpc_send(
-		connection, k_ssb_rpc_flag_json | (flags & ~k_ssb_rpc_mask_type), request_number, new_request_name, (const uint8_t*)json_string, size, callback, cleanup, user_data);
+	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | (flags & ~k_ssb_rpc_mask_type), request_number, (const uint8_t*)json_string, size, callback, cleanup, user_data);
 	JS_FreeCString(context, json_string);
 	JS_FreeValue(context, json);
 }
@@ -825,7 +810,7 @@ void tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t f
 	JS_SetPropertyStr(context, message, "stack", JS_NewString(context, stack ? stack : "stack unavailable"));
 	JS_SetPropertyStr(context, message, "message", JS_NewString(context, error));
 	tf_ssb_connection_rpc_send_json(
-		connection, ((flags & k_ssb_rpc_flag_stream) ? (k_ssb_rpc_flag_stream) : 0) | k_ssb_rpc_flag_end_error, request_number, NULL, message, NULL, NULL, NULL);
+		connection, ((flags & k_ssb_rpc_flag_stream) ? (k_ssb_rpc_flag_stream) : 0) | k_ssb_rpc_flag_end_error, request_number, message, NULL, NULL, NULL);
 	JS_FreeValue(context, message);
 	tf_free((void*)stack);
 }
@@ -1560,43 +1545,16 @@ static void _tf_ssb_connection_rpc_recv(tf_ssb_connection_t* connection, uint8_t
 					callback(connection, flags, request_number, val, message, size, user_data);
 					POST_CALLBACK(connection->ssb, callback);
 					tf_trace_end(connection->ssb->trace);
-					if (!(flags & k_ssb_rpc_flag_stream))
-					{
-						tf_ssb_connection_remove_request(connection, -request_number);
-					}
 				}
 			}
 			else if (JS_IsObject(val))
 			{
 				bool found = false;
-				char namebuf[256] = "";
-				JSValue name = JS_GetPropertyStr(context, val, "name");
-				if (JS_IsArray(context, name))
-				{
-					int length = tf_util_get_length(context, name);
-					int offset = 0;
-					for (int i = 0; i < length; i++)
-					{
-						JSValue part = JS_GetPropertyUint32(context, name, i);
-						const char* part_str = JS_ToCString(context, part);
-						offset += snprintf(namebuf + offset, sizeof(namebuf) - offset, "%s%s", i == 0 ? "" : ".", part_str);
-						JS_FreeCString(context, part_str);
-						JS_FreeValue(context, part);
-					}
-				}
-				else if (JS_IsString(name))
-				{
-					const char* part_str = JS_ToCString(context, name);
-					snprintf(namebuf, sizeof(namebuf), "%s", part_str);
-					JS_FreeCString(context, part_str);
-				}
-				JS_FreeValue(context, name);
-
+				tf_ssb_connection_add_request(connection, -request_number, NULL, NULL, NULL, NULL);
 				for (tf_ssb_rpc_callback_node_t* it = connection->ssb->rpc; it; it = it->next)
 				{
 					if (_tf_ssb_name_equals(context, val, it->name))
 					{
-						tf_ssb_connection_add_request(connection, -request_number, namebuf, NULL, NULL, NULL, NULL);
 						tf_trace_begin(connection->ssb->trace, it->flattened_name);
 						PRE_CALLBACK(connection->ssb, it->callback);
 						it->callback(connection, flags, request_number, val, message, size, it->user_data);
@@ -2649,7 +2607,7 @@ static void _tf_ssb_connection_tunnel_callback(
 	tf_ssb_connection_t* tunnel = user_data;
 	if (flags & k_ssb_rpc_flag_end_error)
 	{
-		tf_ssb_connection_rpc_send(connection, flags, -request_number, NULL, (const uint8_t*)"false", strlen("false"), NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send(connection, flags, -request_number, (const uint8_t*)"false", strlen("false"), NULL, NULL, NULL);
 		tf_ssb_connection_close(tunnel);
 	}
 	else
@@ -2686,7 +2644,7 @@ tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char*
 	ssb->connections_count++;
 	_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_create, tunnel);
 
-	tf_ssb_connection_add_request(connection, request_number, "tunnel.connect", _tf_ssb_connection_tunnel_callback, NULL, tunnel, tunnel);
+	tf_ssb_connection_add_request(connection, request_number, _tf_ssb_connection_tunnel_callback, NULL, tunnel, tunnel);
 	if (request_number > 0)
 	{
 		tunnel->state = k_tf_ssb_state_connected;
@@ -3421,7 +3379,7 @@ void tf_ssb_notify_message_added(tf_ssb_t* ssb, const char* id, JSValue message_
 			if (message_request)
 			{
 				tf_ssb_connection_rpc_send_json(
-					connection, k_ssb_rpc_flag_stream, message_request->request_number, NULL, message_request->keys ? message_keys : message, NULL, NULL, NULL);
+					connection, k_ssb_rpc_flag_stream, message_request->request_number, message_request->keys ? message_keys : message, NULL, NULL, NULL);
 			}
 		}
 
@@ -3721,8 +3679,6 @@ typedef struct _connection_work_t
 {
 	uv_work_t work;
 	tf_ssb_connection_t* connection;
-	const char* name;
-	const char* after_name;
 	void (*work_callback)(tf_ssb_connection_t* connection, void* user_data);
 	void (*after_work_callback)(tf_ssb_connection_t* connection, int result, void* user_data);
 	void* user_data;
@@ -3734,9 +3690,7 @@ static void _tf_ssb_connection_work_callback(uv_work_t* work)
 	tf_ssb_record_thread_busy(data->connection->ssb, true);
 	if (data->work_callback)
 	{
-		tf_trace_begin(data->connection->ssb->trace, data->name);
 		data->work_callback(data->connection, data->user_data);
-		tf_trace_end(data->connection->ssb->trace);
 	}
 	tf_ssb_record_thread_busy(data->connection->ssb, false);
 }
@@ -3746,17 +3700,13 @@ static void _tf_ssb_connection_after_work_callback(uv_work_t* work, int status)
 	connection_work_t* data = work->data;
 	if (data->after_work_callback)
 	{
-		tf_trace_begin(data->connection->ssb->trace, data->after_name);
 		data->after_work_callback(data->connection, status, data->user_data);
-		tf_trace_end(data->connection->ssb->trace);
 	}
 	data->connection->ref_count--;
 	if (data->connection->ref_count == 0 && data->connection->closing)
 	{
 		_tf_ssb_connection_destroy(data->connection, "work completed");
 	}
-	tf_free((void*)data->name);
-	tf_free((void*)data->after_name);
 	tf_free(data);
 }
 
@@ -3784,70 +3734,6 @@ void tf_ssb_connection_run_work(tf_ssb_connection_t* connection, void (*work_cal
 	}
 }
 
-typedef struct _ssb_work_t
-{
-	uv_work_t work;
-	tf_ssb_t* ssb;
-	const char* name;
-	const char* after_name;
-	void (*work_callback)(tf_ssb_t* ssb, void* user_data);
-	void (*after_work_callback)(tf_ssb_t* ssb, int result, void* user_data);
-	void* user_data;
-} ssb_work_t;
-
-static void _tf_ssb_work_callback(uv_work_t* work)
-{
-	ssb_work_t* data = work->data;
-	tf_ssb_record_thread_busy(data->ssb, true);
-	if (data->work_callback)
-	{
-		tf_trace_begin(data->ssb->trace, data->name);
-		data->work_callback(data->ssb, data->user_data);
-		tf_trace_end(data->ssb->trace);
-	}
-	tf_ssb_record_thread_busy(data->ssb, false);
-}
-
-static void _tf_ssb_after_work_callback(uv_work_t* work, int status)
-{
-	ssb_work_t* data = work->data;
-	if (data->after_work_callback)
-	{
-		tf_trace_begin(data->ssb->trace, data->after_name);
-		data->after_work_callback(data->ssb, status, data->user_data);
-		tf_trace_end(data->ssb->trace);
-	}
-	tf_ssb_unref(data->ssb);
-	tf_free((void*)data->name);
-	tf_free((void*)data->after_name);
-	tf_free(data);
-}
-
-void tf_ssb_run_work(tf_ssb_t* ssb, void (*work_callback)(tf_ssb_t* ssb, void* user_data), void (*after_work_callback)(tf_ssb_t* ssb, int result, void* user_data), void* user_data)
-{
-	ssb_work_t* work = tf_malloc(sizeof(ssb_work_t));
-	*work = (ssb_work_t)
-	{
-		.work =
-		{
-			.data = work,
-		},
-		.name = tf_util_function_to_string(work_callback),
-		.after_name = tf_util_function_to_string(after_work_callback),
-		.ssb = ssb,
-		.work_callback = work_callback,
-		.after_work_callback = after_work_callback,
-		.user_data = user_data,
-	};
-
-	tf_ssb_ref(ssb);
-	int result = uv_queue_work(ssb->loop, &work->work, _tf_ssb_work_callback, _tf_ssb_after_work_callback);
-	if (result)
-	{
-		_tf_ssb_connection_after_work_callback(&work->work, result);
-	}
-}
-
 bool tf_ssb_is_room(tf_ssb_t* ssb)
 {
 	return ssb->is_room;
@@ -3871,6 +3757,8 @@ void tf_ssb_set_room_name(tf_ssb_t* ssb, const char* room_name)
 
 typedef struct _update_settings_t
 {
+	uv_work_t work;
+	tf_ssb_t* ssb;
 	bool is_room;
 	char room_name[1024];
 } update_settings_t;
@@ -3924,35 +3812,58 @@ static bool _get_global_setting_bool(tf_ssb_t* ssb, const char* name, bool defau
 	return result;
 }
 
-static void _tf_ssb_update_settings_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_update_settings_work(uv_work_t* work)
 {
-	update_settings_t* update = user_data;
-	update->is_room = _get_global_setting_bool(ssb, "room", true);
-	_get_global_setting_string(ssb, "room_name", update->room_name, sizeof(update->room_name));
+	update_settings_t* update = work->data;
+	tf_ssb_record_thread_busy(update->ssb, true);
+	update->is_room = _get_global_setting_bool(update->ssb, "room", true);
+	_get_global_setting_string(update->ssb, "room_name", update->room_name, sizeof(update->room_name));
+	tf_ssb_record_thread_busy(update->ssb, false);
 }
 
-static void _tf_ssb_update_settings_after_work(tf_ssb_t* ssb, int result, void* user_data)
+static void _tf_ssb_update_settings_after_work(uv_work_t* work, int result)
 {
-	update_settings_t* update = user_data;
-	tf_ssb_set_is_room(ssb, update->is_room);
-	tf_ssb_set_room_name(ssb, update->room_name);
-	_tf_ssb_start_update_settings(ssb);
+	update_settings_t* update = work->data;
+	tf_ssb_unref(update->ssb);
+	tf_ssb_set_is_room(update->ssb, update->is_room);
+	tf_ssb_set_room_name(update->ssb, update->room_name);
+	_tf_ssb_start_update_settings(update->ssb);
 	tf_free(update);
 }
 
 static void _tf_ssb_start_update_settings_timer(tf_ssb_t* ssb, void* user_data)
 {
 	update_settings_t* update = tf_malloc(sizeof(update_settings_t));
-	*update = (update_settings_t) { 0 };
-	tf_ssb_run_work(ssb, _tf_ssb_update_settings_work, _tf_ssb_update_settings_after_work, update);
+	*update = (update_settings_t)
+	{
+		.work =
+		{
+			.data = update,
+		},
+		.ssb = ssb,
+	};
+	tf_ssb_ref(ssb);
+	int result = uv_queue_work(tf_ssb_get_loop(ssb), &update->work, _tf_ssb_update_settings_work, _tf_ssb_update_settings_after_work);
+	if (result)
+	{
+		_tf_ssb_update_settings_after_work(&update->work, result);
+	}
 }
 
 static void _tf_ssb_update_settings(tf_ssb_t* ssb)
 {
 	update_settings_t* update = tf_malloc(sizeof(update_settings_t));
-	*update = (update_settings_t) { 0 };
-	_tf_ssb_update_settings_work(ssb, update);
-	_tf_ssb_update_settings_after_work(ssb, 0, update);
+	*update = (update_settings_t)
+	{
+		.work =
+		{
+			.data = update,
+		},
+		.ssb = ssb,
+	};
+	tf_ssb_ref(ssb);
+	_tf_ssb_update_settings_work(&update->work);
+	_tf_ssb_update_settings_after_work(&update->work, 0);
 }
 
 static void _tf_ssb_start_update_settings(tf_ssb_t* ssb)
@@ -3999,44 +3910,3 @@ void tf_ssb_schedule_work(tf_ssb_t* ssb, int delay_ms, void (*callback)(tf_ssb_t
 	uv_timer_start(&timer->timer, _tf_ssb_scheduled_timer, delay_ms, 0);
 	uv_unref((uv_handle_t*)&timer->timer);
 }
-
-bool tf_ssb_hmacsha256_verify(const char* public_key, const void* payload, size_t payload_length, const char* signature, bool signature_is_urlb64)
-{
-	bool result = false;
-
-	const char* public_key_start = public_key && *public_key == '@' ? public_key + 1 : public_key;
-	const char* public_key_end = public_key_start ? strstr(public_key_start, ".ed25519") : NULL;
-	if (public_key_start && !public_key_end)
-	{
-		public_key_end = public_key_start + strlen(public_key_start);
-	}
-
-	uint8_t bin_public_key[crypto_sign_PUBLICKEYBYTES] = { 0 };
-	if (tf_base64_decode(public_key_start, public_key_end - public_key_start, bin_public_key, sizeof(bin_public_key)) > 0)
-	{
-		uint8_t bin_signature[crypto_sign_BYTES] = { 0 };
-		if (sodium_base642bin(bin_signature, sizeof(bin_signature), signature, strlen(signature), NULL, NULL, NULL,
-				signature_is_urlb64 ? sodium_base64_VARIANT_URLSAFE_NO_PADDING : sodium_base64_VARIANT_ORIGINAL) == 0)
-		{
-			if (crypto_sign_verify_detached(bin_signature, (const uint8_t*)payload, payload_length, bin_public_key) == 0)
-			{
-				result = true;
-			}
-		}
-	}
-	return result;
-}
-
-JSValue tf_ssb_connection_requests_to_object(tf_ssb_connection_t* connection)
-{
-	JSContext* context = connection->ssb->context;
-	JSValue object = JS_NewArray(context);
-	for (int i = 0; i < connection->requests_count; i++)
-	{
-		JSValue request = JS_NewObject(context);
-		JS_SetPropertyStr(context, request, "name", JS_NewString(context, connection->requests[i].name));
-		JS_SetPropertyStr(context, request, "request_number", JS_NewInt32(context, connection->requests[i].request_number));
-		JS_SetPropertyUint32(context, object, i, request);
-	}
-	return object;
-}

src/ssb.connections.c

@@ -44,7 +44,6 @@ static void _tf_ssb_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_change_t
 		}
 		break;
 	case k_tf_ssb_change_remove:
-	case k_tf_ssb_change_update:
 		break;
 	}
 }
@@ -76,28 +75,32 @@ static bool _tf_ssb_connections_get_next_connection(tf_ssb_connections_t* connec
 
 typedef struct _tf_ssb_connections_get_next_t
 {
+	uv_work_t work;
 	tf_ssb_connections_t* connections;
+	tf_ssb_t* ssb;
 	bool ready;
 	char host[256];
 	int port;
 	char key[k_id_base64_len];
 } tf_ssb_connections_get_next_t;
 
-static void _tf_ssb_connections_get_next_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_connections_get_next_work(uv_work_t* work)
 {
-	tf_ssb_connections_get_next_t* next = user_data;
+	tf_ssb_connections_get_next_t* next = work->data;
+	tf_ssb_record_thread_busy(next->ssb, true);
 	next->ready = _tf_ssb_connections_get_next_connection(next->connections, next->host, sizeof(next->host), &next->port, next->key, sizeof(next->key));
+	tf_ssb_record_thread_busy(next->ssb, false);
 }
 
-static void _tf_ssb_connections_get_next_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_connections_get_next_after_work(uv_work_t* work, int status)
 {
-	tf_ssb_connections_get_next_t* next = user_data;
+	tf_ssb_connections_get_next_t* next = work->data;
 	if (next->ready)
 	{
 		uint8_t key_bin[k_id_bin_len];
 		if (tf_ssb_id_str_to_bin(key_bin, next->key))
 		{
-			tf_ssb_connect(ssb, next->host, next->port, key_bin);
+			tf_ssb_connect(next->ssb, next->host, next->port, key_bin);
 		}
 	}
 	tf_free(next);
@@ -111,10 +114,20 @@ static void _tf_ssb_connections_timer(uv_timer_t* timer)
 	if (count < (int)_countof(active))
 	{
 		tf_ssb_connections_get_next_t* next = tf_malloc(sizeof(tf_ssb_connections_get_next_t));
-		*next = (tf_ssb_connections_get_next_t) {
+		*next = (tf_ssb_connections_get_next_t)
+		{
+			.work =
+			{
+				.data = next,
+			},
+			.ssb = connections->ssb,
 			.connections = connections,
 		};
-		tf_ssb_run_work(connections->ssb, _tf_ssb_connections_get_next_work, _tf_ssb_connections_get_next_after_work, next);
+		int result = uv_queue_work(tf_ssb_get_loop(connections->ssb), &next->work, _tf_ssb_connections_get_next_work, _tf_ssb_connections_get_next_after_work);
+		if (result)
+		{
+			_tf_ssb_connections_get_next_after_work(&next->work, result);
+		}
 	}
 }
 
@@ -149,6 +162,8 @@ void tf_ssb_connections_destroy(tf_ssb_connections_t* connections)
 
 typedef struct _tf_ssb_connections_update_t
 {
+	uv_work_t work;
+	tf_ssb_t* ssb;
 	char host[256];
 	int port;
 	char key[k_id_base64_len];
@@ -156,11 +171,12 @@ typedef struct _tf_ssb_connections_update_t
 	bool succeeded;
 } tf_ssb_connections_update_t;
 
-static void _tf_ssb_connections_update_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_connections_update_work(uv_work_t* work)
 {
-	tf_ssb_connections_update_t* update = user_data;
+	tf_ssb_connections_update_t* update = work->data;
+	tf_ssb_record_thread_busy(update->ssb, true);
 	sqlite3_stmt* statement;
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+	sqlite3* db = tf_ssb_acquire_db_writer(update->ssb);
 	if (update->attempted)
 	{
 		if (sqlite3_prepare(db, "UPDATE connections SET last_attempt = strftime('%s', 'now') WHERE host = ?1 AND port = ?2 AND key = ?3", -1, &statement, NULL) == SQLITE_OK)
@@ -207,23 +223,31 @@ static void _tf_ssb_connections_update_work(tf_ssb_t* ssb, void* user_data)
 			sqlite3_finalize(statement);
 		}
 	}
-	tf_ssb_release_db_writer(ssb, db);
+	tf_ssb_release_db_writer(update->ssb, db);
+	tf_ssb_record_thread_busy(update->ssb, false);
 }
 
-static void _tf_ssb_connections_update_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_connections_update_after_work(uv_work_t* work, int status)
 {
-	tf_free(user_data);
+	tf_ssb_connections_update_t* update = work->data;
+	tf_free(update);
 }
 
 static void _tf_ssb_connections_queue_update(tf_ssb_connections_t* connections, tf_ssb_connections_update_t* update)
 {
-	tf_ssb_run_work(connections->ssb, _tf_ssb_connections_update_work, _tf_ssb_connections_update_after_work, update);
+	update->work.data = update;
+	int result = uv_queue_work(tf_ssb_get_loop(connections->ssb), &update->work, _tf_ssb_connections_update_work, _tf_ssb_connections_update_after_work);
+	if (result)
+	{
+		_tf_ssb_connections_update_after_work(&update->work, result);
+	}
 }
 
 void tf_ssb_connections_store(tf_ssb_connections_t* connections, const char* host, int port, const char* key)
 {
 	tf_ssb_connections_update_t* update = tf_malloc(sizeof(tf_ssb_connections_update_t));
 	*update = (tf_ssb_connections_update_t) {
+		.ssb = connections->ssb,
 		.port = port,
 	};
 	snprintf(update->host, sizeof(update->host), "%s", host);
@@ -235,6 +259,7 @@ void tf_ssb_connections_set_attempted(tf_ssb_connections_t* connections, const c
 {
 	tf_ssb_connections_update_t* update = tf_malloc(sizeof(tf_ssb_connections_update_t));
 	*update = (tf_ssb_connections_update_t) {
+		.ssb = connections->ssb,
 		.port = port,
 		.attempted = true,
 	};
@@ -247,6 +272,7 @@ void tf_ssb_connections_set_succeeded(tf_ssb_connections_t* connections, const c
 {
 	tf_ssb_connections_update_t* update = tf_malloc(sizeof(tf_ssb_connections_update_t));
 	*update = (tf_ssb_connections_update_t) {
+		.ssb = connections->ssb,
 		.port = port,
 		.succeeded = true,
 	};

src/ssb.db.c

@@ -6,7 +6,6 @@
 #include "trace.h"
 #include "util.js.h"
 
-#include "ow-crypt.h"
 #include "sodium/crypto_hash_sha256.h"
 #include "sodium/crypto_sign.h"
 #include "sqlite3.h"
@@ -19,7 +18,8 @@
 
 typedef struct _message_store_t message_store_t;
 
-static void _tf_ssb_db_store_message_after_work(tf_ssb_t* ssb, int status, void* user_data);
+static void _tf_ssb_db_store_message_work_finish(message_store_t* store);
+static void _tf_ssb_db_store_message_after_work(uv_work_t* work, int status);
 
 static void _tf_ssb_db_exec(sqlite3* db, const char* statement)
 {
@@ -346,7 +346,7 @@ static int64_t _tf_ssb_db_store_message_raw(tf_ssb_t* ssb, const char* id, const
 	}
 	else
 	{
-		tf_printf("%p: Previous message doesn't exist for author=%s sequence=%" PRId64 " previous=%s.\n", db, author, sequence, previous);
+		tf_printf("%p: Previous message doesn't exist for author=%s sequence=%" PRId64 ".\n", db, author, sequence);
 	}
 	tf_ssb_release_db_writer(ssb, db);
 	return last_row_id;
@@ -399,6 +399,8 @@ static char* _tf_ssb_db_get_message_blob_wants(tf_ssb_t* ssb, int64_t rowid)
 
 typedef struct _message_store_t
 {
+	uv_work_t work;
+	tf_ssb_t* ssb;
 	char id[k_id_base64_len];
 	char signature[512];
 	int flags;
@@ -418,16 +420,21 @@ typedef struct _message_store_t
 	message_store_t* next;
 } message_store_t;
 
-static void _tf_ssb_db_store_message_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_db_store_message_work(uv_work_t* work)
 {
-	message_store_t* store = user_data;
-	int64_t last_row_id = _tf_ssb_db_store_message_raw(
-		ssb, store->id, *store->previous ? store->previous : NULL, store->author, store->sequence, store->timestamp, store->content, store->length, store->signature, store->flags);
+	message_store_t* store = work->data;
+	tf_ssb_record_thread_busy(store->ssb, true);
+	tf_trace_t* trace = tf_ssb_get_trace(store->ssb);
+	tf_trace_begin(trace, "message_store_work");
+	int64_t last_row_id = _tf_ssb_db_store_message_raw(store->ssb, store->id, *store->previous ? store->previous : NULL, store->author, store->sequence, store->timestamp,
+		store->content, store->length, store->signature, store->flags);
 	if (last_row_id != -1)
 	{
 		store->out_stored = true;
-		store->out_blob_wants = _tf_ssb_db_get_message_blob_wants(ssb, last_row_id);
+		store->out_blob_wants = _tf_ssb_db_get_message_blob_wants(store->ssb, last_row_id);
 	}
+	tf_trace_end(trace);
+	tf_ssb_record_thread_busy(store->ssb, false);
 }
 
 static void _wake_up_queue(tf_ssb_t* ssb, tf_ssb_store_queue_t* queue)
@@ -444,19 +451,38 @@ static void _wake_up_queue(tf_ssb_t* ssb, tf_ssb_store_queue_t* queue)
 			}
 			next->next = NULL;
 			queue->running = true;
-			tf_ssb_run_work(ssb, _tf_ssb_db_store_message_work, _tf_ssb_db_store_message_after_work, next);
+			int r = uv_queue_work(tf_ssb_get_loop(ssb), &next->work, _tf_ssb_db_store_message_work, _tf_ssb_db_store_message_after_work);
+			if (r)
+			{
+				_tf_ssb_db_store_message_work_finish(next);
+			}
 		}
 	}
 }
 
-static void _tf_ssb_db_store_message_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_db_store_message_work_finish(message_store_t* store)
 {
-	message_store_t* store = user_data;
-	tf_trace_t* trace = tf_ssb_get_trace(ssb);
+	JSContext* context = tf_ssb_get_context(store->ssb);
+	if (store->callback)
+	{
+		store->callback(store->id, store->out_stored, store->user_data);
+	}
+	JS_FreeCString(context, store->content);
+	tf_ssb_store_queue_t* queue = tf_ssb_get_store_queue(store->ssb);
+	queue->running = false;
+	_wake_up_queue(store->ssb, queue);
+	tf_free(store);
+}
+
+static void _tf_ssb_db_store_message_after_work(uv_work_t* work, int status)
+{
+	message_store_t* store = work->data;
+	tf_trace_t* trace = tf_ssb_get_trace(store->ssb);
+	tf_trace_begin(trace, "message_store_after_work");
 	if (store->out_stored)
 	{
 		tf_trace_begin(trace, "notify_message_added");
-		JSContext* context = tf_ssb_get_context(ssb);
+		JSContext* context = tf_ssb_get_context(store->ssb);
 		JSValue formatted =
 			tf_ssb_format_message(context, store->previous, store->author, store->sequence, store->timestamp, "sha256", store->content, store->signature, store->flags);
 		JSValue message = JS_NewObject(context);
@@ -465,7 +491,7 @@ static void _tf_ssb_db_store_message_after_work(tf_ssb_t* ssb, int status, void*
 		char timestamp_string[256];
 		snprintf(timestamp_string, sizeof(timestamp_string), "%f", store->timestamp);
 		JS_SetPropertyStr(context, message, "timestamp", JS_NewString(context, timestamp_string));
-		tf_ssb_notify_message_added(ssb, store->id, message);
+		tf_ssb_notify_message_added(store->ssb, store->id, message);
 		JS_FreeValue(context, message);
 		tf_trace_end(trace);
 	}
@@ -474,22 +500,13 @@ static void _tf_ssb_db_store_message_after_work(tf_ssb_t* ssb, int status, void*
 		tf_trace_begin(trace, "notify_blob_wants_added");
 		for (char* p = store->out_blob_wants; *p; p = p + strlen(p))
 		{
-			tf_ssb_notify_blob_want_added(ssb, p);
+			tf_ssb_notify_blob_want_added(store->ssb, p);
 		}
 		tf_free(store->out_blob_wants);
 		tf_trace_end(trace);
 	}
-
-	JSContext* context = tf_ssb_get_context(ssb);
-	if (store->callback)
-	{
-		store->callback(store->id, store->out_stored, store->user_data);
-	}
-	JS_FreeCString(context, store->content);
-	tf_ssb_store_queue_t* queue = tf_ssb_get_store_queue(ssb);
-	queue->running = false;
-	_wake_up_queue(ssb, queue);
-	tf_free(store);
+	_tf_ssb_db_store_message_work_finish(store);
+	tf_trace_end(trace);
 }
 
 void tf_ssb_db_store_message(
@@ -521,7 +538,13 @@ void tf_ssb_db_store_message(
 	JS_FreeValue(context, contentval);
 
 	message_store_t* store = tf_malloc(sizeof(message_store_t));
-	*store = (message_store_t) {
+	*store = (message_store_t)
+	{
+		.work =
+		{
+			.data = store,
+		},
+		.ssb = ssb,
 		.sequence = sequence,
 		.timestamp = timestamp,
 		.content = contentstr,
@@ -636,6 +659,8 @@ bool tf_ssb_db_blob_get(tf_ssb_t* ssb, const char* id, uint8_t** out_blob, size_
 
 typedef struct _blob_store_work_t
 {
+	uv_work_t work;
+	tf_ssb_t* ssb;
 	const uint8_t* blob;
 	size_t size;
 	char id[k_blob_id_len];
@@ -644,18 +669,25 @@ typedef struct _blob_store_work_t
 	void* user_data;
 } blob_store_work_t;
 
-static void _tf_ssb_db_blob_store_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_db_blob_store_work(uv_work_t* work)
 {
-	blob_store_work_t* blob_work = user_data;
-	tf_ssb_db_blob_store(ssb, blob_work->blob, blob_work->size, blob_work->id, sizeof(blob_work->id), &blob_work->is_new);
+	blob_store_work_t* blob_work = work->data;
+	tf_ssb_record_thread_busy(blob_work->ssb, true);
+	tf_trace_t* trace = tf_ssb_get_trace(blob_work->ssb);
+	tf_trace_begin(trace, "blob_store_work");
+	tf_ssb_db_blob_store(blob_work->ssb, blob_work->blob, blob_work->size, blob_work->id, sizeof(blob_work->id), &blob_work->is_new);
+	tf_trace_end(trace);
+	tf_ssb_record_thread_busy(blob_work->ssb, false);
 }
 
-static void _tf_ssb_db_blob_store_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_db_blob_store_after_work(uv_work_t* work, int status)
 {
-	blob_store_work_t* blob_work = user_data;
+	blob_store_work_t* blob_work = work->data;
+	tf_trace_t* trace = tf_ssb_get_trace(blob_work->ssb);
+	tf_trace_begin(trace, "blob_store_after_work");
 	if (status == 0 && *blob_work->id)
 	{
-		tf_ssb_notify_blob_stored(ssb, blob_work->id);
+		tf_ssb_notify_blob_stored(blob_work->ssb, blob_work->id);
 	}
 	if (status != 0)
 	{
@@ -665,19 +697,35 @@ static void _tf_ssb_db_blob_store_after_work(tf_ssb_t* ssb, int status, void* us
 	{
 		blob_work->callback(status == 0 ? blob_work->id : NULL, blob_work->is_new, blob_work->user_data);
 	}
+	tf_trace_end(trace);
 	tf_free(blob_work);
 }
 
 void tf_ssb_db_blob_store_async(tf_ssb_t* ssb, const uint8_t* blob, size_t size, tf_ssb_db_blob_store_callback_t* callback, void* user_data)
 {
 	blob_store_work_t* work = tf_malloc(sizeof(blob_store_work_t));
-	*work = (blob_store_work_t) {
+	*work = (blob_store_work_t)
+	{
+		.work =
+		{
+			.data = work,
+		},
+		.ssb = ssb,
 		.blob = blob,
 		.size = size,
 		.callback = callback,
 		.user_data = user_data,
 	};
-	tf_ssb_run_work(ssb, _tf_ssb_db_blob_store_work, _tf_ssb_db_blob_store_after_work, work);
+	int r = uv_queue_work(tf_ssb_get_loop(ssb), &work->work, _tf_ssb_db_blob_store_work, _tf_ssb_db_blob_store_after_work);
+	if (r)
+	{
+		tf_printf("tf_ssb_db_blob_store_async -> uv_queue_work failed immediately: %s\n", uv_strerror(r));
+		if (callback)
+		{
+			callback(NULL, false, user_data);
+		}
+		tf_free(work);
+	}
 }
 
 bool tf_ssb_db_blob_store(tf_ssb_t* ssb, const uint8_t* blob, size_t size, char* out_id, size_t out_id_size, bool* out_new)
@@ -1012,14 +1060,8 @@ bool tf_ssb_db_identity_create(tf_ssb_t* ssb, const char* user, uint8_t* out_pub
 		tf_ssb_generate_keys_buffer(public, sizeof(public), private, sizeof(private));
 		if (tf_ssb_db_identity_add(ssb, user, public, private))
 		{
-			if (out_public_key)
-			{
-				tf_ssb_id_str_to_bin(out_public_key, public);
-			}
-			if (out_private_key)
-			{
-				tf_ssb_id_str_to_bin(out_private_key, private);
-			}
+			tf_ssb_id_str_to_bin(out_public_key, public);
+			tf_ssb_id_str_to_bin(out_private_key, private);
 			return true;
 		}
 	}
@@ -1131,16 +1173,8 @@ bool tf_ssb_db_identity_get_private_key(tf_ssb_t* ssb, const char* user, const c
 				}
 			}
 		}
-		else
-		{
-			tf_printf("Bind failed: %s.\n", sqlite3_errmsg(db));
-		}
 		sqlite3_finalize(statement);
 	}
-	else
-	{
-		tf_printf("Prepare failed: %s.\n", sqlite3_errmsg(db));
-	}
 	tf_ssb_release_db_reader(ssb, db);
 	return success;
 }
@@ -1544,243 +1578,3 @@ void tf_ssb_db_forget_stored_connection(tf_ssb_t* ssb, const char* address, int
 	}
 	tf_ssb_release_db_writer(ssb, db);
 }
-
-bool tf_ssb_db_get_account_password_hash(tf_ssb_t* ssb, const char* name, char* out_password, size_t password_size)
-{
-	bool result = false;
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db, "SELECT value ->> '$.password' FROM properties WHERE id = 'auth' AND key = 'user:' || ?", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, name, -1, NULL) == SQLITE_OK)
-		{
-			if (sqlite3_step(statement) == SQLITE_ROW)
-			{
-				snprintf(out_password, password_size, "%s", (const char*)sqlite3_column_text(statement, 0));
-				result = true;
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_reader(ssb, db);
-	return result;
-}
-
-bool tf_ssb_db_set_account_password(tf_ssb_t* ssb, const char* name, const char* password)
-{
-	JSContext* context = tf_ssb_get_context(ssb);
-	bool result = false;
-	static const int k_salt_length = 12;
-
-	char buffer[16];
-	size_t bytes = uv_random(tf_ssb_get_loop(ssb), &(uv_random_t) { 0 }, buffer, sizeof(buffer), 0, NULL) == 0 ? sizeof(buffer) : 0;
-	char output[7 + 22 + 1];
-	char* salt = crypt_gensalt_rn("$2b$", k_salt_length, buffer, bytes, output, sizeof(output));
-	char hash_output[7 + 22 + 31 + 1];
-	char* hash = crypt_rn(password, salt, hash_output, sizeof(hash_output));
-
-	JSValue user_entry = JS_NewObject(context);
-	JS_SetPropertyStr(context, user_entry, "password", JS_NewString(context, hash));
-	JSValue user_json = JS_JSONStringify(context, user_entry, JS_NULL, JS_NULL);
-	size_t user_length = 0;
-	const char* user_string = JS_ToCStringLen(context, &user_length, user_json);
-
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db, "INSERT OR REPLACE INTO properties (id, key, value) VALUES ('auth', 'user:' || ?, ?)", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, name, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, user_string, user_length, NULL) == SQLITE_OK)
-		{
-			result = sqlite3_step(statement) == SQLITE_DONE;
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_writer(ssb, db);
-
-	JS_FreeCString(context, user_string);
-	JS_FreeValue(context, user_json);
-	JS_FreeValue(context, user_entry);
-	return result;
-}
-
-bool tf_ssb_db_register_account(tf_ssb_t* ssb, const char* name, const char* password)
-{
-	bool result = false;
-	JSContext* context = tf_ssb_get_context(ssb);
-	JSValue users_array = JS_UNDEFINED;
-
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db, "SELECT value FROM properties WHERE id = 'auth' AND key = 'users'", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_step(statement) == SQLITE_ROW)
-		{
-			users_array = JS_ParseJSON(context, (const char*)sqlite3_column_text(statement, 0), sqlite3_column_bytes(statement, 0), NULL);
-		}
-		sqlite3_finalize(statement);
-	}
-	if (JS_IsUndefined(users_array))
-	{
-		users_array = JS_NewArray(context);
-	}
-	int length = tf_util_get_length(context, users_array);
-	JS_SetPropertyUint32(context, users_array, length, JS_NewString(context, name));
-
-	JSValue json = JS_JSONStringify(context, users_array, JS_NULL, JS_NULL);
-	JS_FreeValue(context, users_array);
-	size_t value_length = 0;
-	const char* value = JS_ToCStringLen(context, &value_length, json);
-	if (sqlite3_prepare(db, "INSERT OR REPLACE INTO properties (id, key, value) VALUES ('auth', 'users', ?)", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, value, value_length, NULL) == SQLITE_OK)
-		{
-			result = sqlite3_step(statement) == SQLITE_DONE;
-		}
-		sqlite3_finalize(statement);
-	}
-	JS_FreeCString(context, value);
-	JS_FreeValue(context, json);
-	tf_ssb_release_db_writer(ssb, db);
-
-	result = result && tf_ssb_db_set_account_password(ssb, name, password);
-	return result;
-}
-
-const char* tf_ssb_db_get_property(tf_ssb_t* ssb, const char* id, const char* key)
-{
-	char* result = NULL;
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db, "SELECT value FROM properties WHERE id = ? AND key = ?", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK)
-		{
-			if (sqlite3_step(statement) == SQLITE_ROW)
-			{
-				size_t length = sqlite3_column_bytes(statement, 0);
-				result = tf_malloc(length + 1);
-				memcpy(result, sqlite3_column_text(statement, 0), length);
-				result[length] = '\0';
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_reader(ssb, db);
-	return result;
-}
-
-bool tf_ssb_db_set_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value)
-{
-	bool result = false;
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db, "INSERT OR REPLACE INTO properties (id, key, value) VALUES (?, ?, ?)", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK &&
-			sqlite3_bind_text(statement, 3, value, -1, NULL) == SQLITE_OK)
-		{
-			result = sqlite3_step(statement) == SQLITE_DONE;
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_writer(ssb, db);
-	return result;
-}
-
-bool tf_ssb_db_identity_get_active(sqlite3* db, const char* user, const char* package_owner, const char* package_name, char* out_identity, size_t out_identity_size)
-{
-	sqlite3_stmt* statement = NULL;
-	bool found = false;
-	if (sqlite3_prepare(db, "SELECT value FROM properties WHERE id = ? AND key = 'id:' || ? || ':' || ?", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, user, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, package_owner, -1, NULL) == SQLITE_OK &&
-			sqlite3_bind_text(statement, 3, package_name, -1, NULL) == SQLITE_OK && sqlite3_step(statement) == SQLITE_ROW)
-		{
-			snprintf(out_identity, out_identity_size, "%s", (const char*)sqlite3_column_text(statement, 0));
-			found = true;
-		}
-		sqlite3_finalize(statement);
-	}
-	return found;
-}
-
-typedef struct _resolve_index_t
-{
-	const char* host;
-	const char* path;
-	void (*callback)(const char* path, void* user_data);
-	void* user_data;
-} resolve_index_t;
-
-static void _tf_ssb_db_resolve_index_work(tf_ssb_t* ssb, void* user_data)
-{
-	resolve_index_t* request = user_data;
-
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	sqlite3_stmt* statement;
-	if (sqlite3_prepare(db, "SELECT json_extract(value, '$.index_map') FROM properties WHERE id = 'core' AND key = 'settings'", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_step(statement) == SQLITE_ROW)
-		{
-			const char* index_map = (const char*)sqlite3_column_text(statement, 0);
-			const char* start = index_map;
-			while (start)
-			{
-				const char* end = strchr(start, '\n');
-				const char* equals = strchr(start, '=');
-				if (equals && strncasecmp(request->host, start, equals - start) == 0)
-				{
-					size_t value_length = end && equals < end ? (size_t)(end - (equals + 1)) : strlen(equals + 1);
-					char* path = tf_malloc(value_length + 1);
-					memcpy(path, equals + 1, value_length);
-					path[value_length] = '\0';
-					request->path = path;
-					break;
-				}
-				start = end ? end + 1 : NULL;
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-	else
-	{
-		tf_printf("prepare failed: %s\n", sqlite3_errmsg(db));
-	}
-
-	if (!request->path)
-	{
-		if (sqlite3_prepare(db, "SELECT json_extract(value, '$.index') FROM properties WHERE id = 'core' AND key = 'settings'", -1, &statement, NULL) == SQLITE_OK)
-		{
-			if (sqlite3_step(statement) == SQLITE_ROW)
-			{
-				request->path = tf_strdup((const char*)sqlite3_column_text(statement, 0));
-			}
-			sqlite3_finalize(statement);
-		}
-		else
-		{
-			tf_printf("prepare failed: %s\n", sqlite3_errmsg(db));
-		}
-	}
-	tf_ssb_release_db_reader(ssb, db);
-}
-
-static void _tf_ssb_db_resolve_index_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	resolve_index_t* request = user_data;
-	request->callback(request->path, request->user_data);
-	tf_free((void*)request->host);
-	tf_free((void*)request->path);
-	tf_free(request);
-}
-
-void tf_ssb_db_resolve_index_async(tf_ssb_t* ssb, const char* host, void (*callback)(const char* path, void* user_data), void* user_data)
-{
-	resolve_index_t* request = tf_malloc(sizeof(resolve_index_t));
-	*request = (resolve_index_t) {
-		.host = tf_strdup(host),
-		.callback = callback,
-		.user_data = user_data,
-	};
-	tf_ssb_run_work(ssb, _tf_ssb_db_resolve_index_work, _tf_ssb_db_resolve_index_after_work, request);
-}

src/ssb.db.h

@@ -172,7 +172,7 @@ int tf_ssb_db_identity_get_count_for_user(tf_ssb_t* ssb, const char* user);
 ** @param ssb The SSB instance.
 ** @param user The user's username.
 ** @param[out] out_public_key A buffer populated with the new public key.
-** @param[out] out_private_key A buffer populated with the new private key.
+** @param[out] out_private_key A buffer populated with the new privatee key.
 ** @return True if the identity was created.
 */
 bool tf_ssb_db_identity_create(tf_ssb_t* ssb, const char* user, uint8_t* out_public_key, uint8_t* out_private_key);
@@ -195,18 +195,6 @@ bool tf_ssb_db_identity_delete(tf_ssb_t* ssb, const char* user, const char* publ
 */
 bool tf_ssb_db_identity_add(tf_ssb_t* ssb, const char* user, const char* public_key, const char* private_key);
 
-/**
-** Get the active identity for a user for a given package.
-** @param db An sqlite3 database.
-** @param user The username.
-** @param package_owner The username of the package owner.
-** @param package_name The name of the package.
-** @param[out] out_identity Populated with the identity.
-** @param out_identity_size The size of the out_identity buffer.
-** @return true If the identity was retrieved.
-*/
-bool tf_ssb_db_identity_get_active(sqlite3* db, const char* user, const char* package_owner, const char* package_name, char* out_identity, size_t out_identity_size);
-
 /**
 ** Call a function for each identity owned by a user.
 ** @param ssb The SSB instance.
@@ -323,62 +311,6 @@ tf_ssb_db_stored_connection_t* tf_ssb_db_get_stored_connections(tf_ssb_t* ssb, i
 */
 void tf_ssb_db_forget_stored_connection(tf_ssb_t* ssb, const char* address, int port, const char* pubkey);
 
-/**
-** Retrieve a user's hashed password from the database.
-** @param ssb The SSB instance.
-** @param name The username.
-** @param[out] out_password Populated with the password.
-** @param password_size The size of the out_password buffer.
-** @return true if the password hash was successfully retrieved.
-*/
-bool tf_ssb_db_get_account_password_hash(tf_ssb_t* ssb, const char* name, char* out_password, size_t password_size);
-
-/**
-** Insert or update a user's hashed password in the database.
-** @param ssb The SSB instance.
-** @param name The username.
-** @param password The raw password.
-** @return true if the hash of the password was successfully stored.
-*/
-bool tf_ssb_db_set_account_password(tf_ssb_t* ssb, const char* name, const char* password);
-
-/**
-** Add a user account to the database.
-** @param ssb The SSB instance.
-** @param name The username to add.
-** @param password The user's raw password.
-** @return true If the user was added successfully.
-*/
-bool tf_ssb_db_register_account(tf_ssb_t* ssb, const char* name, const char* password);
-
-/**
-** Get an entry from the properties table.
-** @param ssb The SSB instance.
-** @param id The user.
-** @param key The property key.
-** @return The property value or null.  Free with tf_free().
-*/
-const char* tf_ssb_db_get_property(tf_ssb_t* ssb, const char* id, const char* key);
-
-/**
-** Store an entry in the properties table.
-** @param ssb The SSB instance.
-** @param id The user.
-** @param key The property key.
-** @param value The property value.
-** @return true if the property was stored successfully.
-*/
-bool tf_ssb_db_set_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);
-
-/**
-** Resolve a hostname to its index path by global settings.
-** @param ssb The SSB instance.
-** @param host The hostname.
-** @param callback The callback.
-** @param user_data The callback user data.
-*/
-void tf_ssb_db_resolve_index_async(tf_ssb_t* ssb, const char* host, void (*callback)(const char* path, void* user_data), void* user_data);
-
 /**
 ** An SQLite authorizer callback.  See https://www.sqlite.org/c3ref/set_authorizer.html for use.
 ** @param user_data User data registered with the authorizer.

src/ssb.h

@@ -38,7 +38,6 @@ typedef enum _tf_ssb_change_t
 	k_tf_ssb_change_create,
 	k_tf_ssb_change_connect,
 	k_tf_ssb_change_remove,
-	k_tf_ssb_change_update,
 } tf_ssb_change_t;
 
 /**
@@ -659,29 +658,27 @@ void tf_ssb_remove_rpc_callback(tf_ssb_t* ssb, const char** name, tf_ssb_rpc_cal
 ** @param connection The connection on which to send the message.
 ** @param flags The message flags.
 ** @param request_number The request number.
-** @param new_request_name The name of the request if it is new.
 ** @param message The message payload.
 ** @param size The size of the message.
 ** @param callback A callback to call if a response is received.
 ** @param cleanup A callback to call if the callback is removed.
 ** @param user_data User data to pass to the callback.
 */
-void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
-	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
+void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const uint8_t* message, size_t size, tf_ssb_rpc_callback_t* callback,
+	tf_ssb_callback_cleanup_t* cleanup, void* user_data);
 
 /**
 ** Send a JSON MUXRPC message.
 ** @param connection The connection on which to send the message.
 ** @param flags The message flags.
 ** @param request_number The request number.
-** @param new_request_name The name of the request if it is new.
 ** @param message The JS message payload.
 ** @param callback A callback to call if a response is received.
 ** @param cleanup A callback to call if the callback is removed.
 ** @param user_data User data to pass to the callback.
 */
-void tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
-	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
+void tf_ssb_connection_rpc_send_json(
+	tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue message, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
 
 /**
 ** Send a MUXRPC error message.
@@ -706,14 +703,13 @@ void tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* co
 ** request number.
 ** @param connection The connection on which to register the callback.
 ** @param request_number The request number.
-** @param name The name of the RPC request.
 ** @param callback The callback.
 ** @param cleanup The function to call when the callback is removed.
 ** @param user_data User data to pass to the callback.
 ** @param dependent_connection A connection, which, if removed, invalidates this request.
 */
-void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t request_number, const char* name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup,
-	void* user_data, tf_ssb_connection_t* dependent_connection);
+void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t request_number, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data,
+	tf_ssb_connection_t* dependent_connection);
 
 /**
 ** Remove a callback registered to be called when a message is received for the
@@ -723,13 +719,6 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 */
 void tf_ssb_connection_remove_request(tf_ssb_connection_t* connection, int32_t request_number);
 
-/**
-** Get a debug representation of active requests.
-** @param connection The connection.
-** @return The active requests as a JS object.
-*/
-JSValue tf_ssb_connection_requests_to_object(tf_ssb_connection_t* connection);
-
 /**
 ** A function scheduled to be run later.
 ** @param connection The owning connection.
@@ -755,16 +744,6 @@ void tf_ssb_connection_schedule_idle(tf_ssb_connection_t* connection, tf_ssb_sch
 void tf_ssb_connection_run_work(tf_ssb_connection_t* connection, void (*work_callback)(tf_ssb_connection_t* connection, void* user_data),
 	void (*after_work_callback)(tf_ssb_connection_t* connection, int result, void* user_data), void* user_data);
 
-/**
-** Schedule work to run on a worker thread.
-** @param ssb The owning SSB instance.
-** @param work_callback The callback to run on a thread.
-** @param after_work_callback The callback to run on the main thread when the work is complete.
-** @param user_data User data to pass to the callback.
-*/
-void tf_ssb_run_work(
-	tf_ssb_t* ssb, void (*work_callback)(tf_ssb_t* ssb, void* user_data), void (*after_work_callback)(tf_ssb_t* ssb, int result, void* user_data), void* user_data);
-
 /**
 ** Register for new messages on a connection.
 ** @param connection The SHS connection.
@@ -978,15 +957,4 @@ void tf_ssb_set_room_name(tf_ssb_t* ssb, const char* room_name);
 */
 void tf_ssb_schedule_work(tf_ssb_t* ssb, int delay_ms, void (*callback)(tf_ssb_t* ssb, void* user_data), void* user_data);
 
-/**
-** Verify a signature.
-** @param public_key The public key for which the message was signed.
-** @param payload The signed payload.
-** @param payload_length The length of the signed payload in bytes.
-** @param signature The signature.
-** @param signature_is_urlb64 True if the signature is in URL base64 format, otherwise standard base64.
-** @return true If the message was successfully verified.
-*/
-bool tf_ssb_hmacsha256_verify(const char* public_key, const void* payload, size_t payload_length, const char* signature, bool signature_is_urlb64);
-
 /** @} */

src/ssb.import.c

@@ -231,35 +231,28 @@ static void _tf_ssb_import_app_json(tf_ssb_t* ssb, uv_loop_t* loop, JSContext* c
 
 void tf_ssb_import(tf_ssb_t* ssb, const char* user, const char* path)
 {
-	if (strlen(path) > strlen(".json") && strcasecmp(path + strlen(path) - strlen(".json"), ".json") == 0)
+	uv_fs_t req = { 0 };
+	int r = uv_fs_scandir(tf_ssb_get_loop(ssb), &req, path, 0, NULL);
+	if (r >= 0)
 	{
-		_tf_ssb_import_app_json(ssb, tf_ssb_get_loop(ssb), tf_ssb_get_context(ssb), user, path);
+		uv_dirent_t ent;
+		while (uv_fs_scandir_next(&req, &ent) == 0)
+		{
+			size_t len = strlen(path) + strlen(ent.name) + 2;
+			char* full_path = tf_malloc(len);
+			snprintf(full_path, len, "%s/%s", path, ent.name);
+			if (strlen(ent.name) > strlen(".json") && strcasecmp(ent.name + strlen(ent.name) - strlen(".json"), ".json") == 0)
+			{
+				_tf_ssb_import_app_json(ssb, tf_ssb_get_loop(ssb), tf_ssb_get_context(ssb), user, full_path);
+			}
+			tf_free(full_path);
+		}
 	}
 	else
 	{
-		uv_fs_t req = { 0 };
-		int r = uv_fs_scandir(tf_ssb_get_loop(ssb), &req, path, 0, NULL);
-		if (r >= 0)
-		{
-			uv_dirent_t ent;
-			while (uv_fs_scandir_next(&req, &ent) == 0)
-			{
-				size_t len = strlen(path) + strlen(ent.name) + 2;
-				char* full_path = tf_malloc(len);
-				snprintf(full_path, len, "%s/%s", path, ent.name);
-				if (strlen(ent.name) > strlen(".json") && strcasecmp(ent.name + strlen(ent.name) - strlen(".json"), ".json") == 0)
-				{
-					_tf_ssb_import_app_json(ssb, tf_ssb_get_loop(ssb), tf_ssb_get_context(ssb), user, full_path);
-				}
-				tf_free(full_path);
-			}
-		}
-		else
-		{
-			tf_printf("Failed to scan directory %s: %s.", path, uv_strerror(r));
-		}
-		uv_fs_req_cleanup(&req);
+		tf_printf("Failed to scan directory %s: %s.", path, uv_strerror(r));
 	}
+	uv_fs_req_cleanup(&req);
 }
 
 static char* _tf_ssb_import_read_current_file_from_zip(unzFile zip, size_t* size)

src/ssb.js.c

@@ -4,6 +4,7 @@
 #include "mem.h"
 #include "ssb.db.h"
 #include "ssb.h"
+#include "trace.h"
 #include "util.js.h"
 
 #include "sodium/crypto_box.h"
@@ -299,224 +300,6 @@ static JSValue _tf_ssb_getAllIdentities(JSContext* context, JSValueConst this_va
 	return result;
 }
 
-typedef struct _active_identity_work_t
-{
-	JSContext* context;
-	const char* name;
-	const char* package_owner;
-	const char* package_name;
-	char identity[k_id_base64_len];
-	int result;
-	JSValue promise[2];
-} active_identity_work_t;
-
-static void _tf_ssb_getActiveIdentity_visit(const char* identity, void* user_data)
-{
-	active_identity_work_t* request = user_data;
-	if (!*request->identity)
-	{
-		snprintf(request->identity, sizeof(request->identity), "%s", identity);
-	}
-}
-
-static void _tf_ssb_getActiveIdentity_work(tf_ssb_t* ssb, void* user_data)
-{
-	active_identity_work_t* request = user_data;
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	tf_ssb_db_identity_get_active(db, request->name, request->package_owner, request->package_name, request->identity, sizeof(request->identity));
-	tf_ssb_release_db_reader(ssb, db);
-
-	if (!*request->identity)
-	{
-		tf_ssb_db_identity_visit(ssb, request->name, _tf_ssb_getActiveIdentity_visit, request);
-	}
-}
-
-static void _tf_ssb_getActiveIdentity_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	active_identity_work_t* request = user_data;
-	JSContext* context = request->context;
-	if (request->result == 0)
-	{
-		JSValue identity = JS_NewString(context, request->identity);
-		JSValue error = JS_Call(context, request->promise[0], JS_UNDEFINED, 1, &identity);
-		JS_FreeValue(context, identity);
-		tf_util_report_error(context, error);
-		JS_FreeValue(context, error);
-	}
-	else
-	{
-		JSValue error = JS_Call(context, request->promise[1], JS_UNDEFINED, 0, NULL);
-		tf_util_report_error(context, error);
-		JS_FreeValue(context, error);
-	}
-	JS_FreeValue(context, request->promise[0]);
-	JS_FreeValue(context, request->promise[1]);
-	tf_free((void*)request->name);
-	tf_free((void*)request->package_owner);
-	tf_free((void*)request->package_name);
-	tf_free(request);
-}
-
-static JSValue _tf_ssb_getActiveIdentity(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
-	const char* name = JS_ToCString(context, argv[0]);
-	const char* package_owner = JS_ToCString(context, argv[1]);
-	const char* package_name = JS_ToCString(context, argv[2]);
-	active_identity_work_t* work = tf_malloc(sizeof(active_identity_work_t));
-	*work = (active_identity_work_t) {
-		.context = context,
-		.name = tf_strdup(name),
-		.package_owner = tf_strdup(package_owner),
-		.package_name = tf_strdup(package_name),
-	};
-	JSValue result = JS_NewPromiseCapability(context, work->promise);
-	JS_FreeCString(context, name);
-	JS_FreeCString(context, package_owner);
-	JS_FreeCString(context, package_name);
-
-	tf_ssb_run_work(ssb, _tf_ssb_getActiveIdentity_work, _tf_ssb_getActiveIdentity_after_work, work);
-	return result;
-}
-
-typedef struct _identity_info_work_t
-{
-	JSContext* context;
-	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];
-	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*));
-	request->identities[request->count] = tf_strdup(identity);
-	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;
-	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 = ids.value "
-		"	WHERE WHERE identities.user = ? 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)
-		{
-			int r = SQLITE_OK;
-			while ((r = sqlite3_step(statement)) == SQLITE_OK)
-			{
-				for (int i = 0; i < request->count; i++)
-				{
-					const char* identity = (const char*)sqlite3_column_text(statement, 0);
-					const char* name = (const char*)sqlite3_column_text(statement, 1);
-					if (strcmp(request->identities[i], identity) == 0 && !request->names[i])
-					{
-						request->names[i] = tf_strdup(name);
-					}
-					break;
-				}
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-
-	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);
-}
-
-static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	identity_info_work_t* request = user_data;
-	JSContext* context = request->context;
-	JSValue result = JS_NewObject(context);
-
-	JSValue identities = JS_NewArray(context);
-	for (int i = 0; i < request->count; i++)
-	{
-		JS_SetPropertyUint32(context, identities, i, JS_NewString(context, request->identities[i]));
-	}
-	JS_SetPropertyStr(context, result, "identities", identities);
-
-	JSValue names = JS_NewObject(context);
-	for (int i = 0; i < request->count; i++)
-	{
-		JS_SetPropertyStr(context, names, request->identities[i], JS_NewString(context, request->names[i] ? request->names[i] : request->identities[i]));
-	}
-	JS_SetPropertyStr(context, result, "names", names);
-
-	JS_SetPropertyStr(context, result, "identity", JS_NewString(context, request->active_identity));
-
-	JSValue error = JS_Call(context, request->promise[0], JS_UNDEFINED, 1, &result);
-	tf_util_report_error(context, error);
-	JS_FreeValue(context, error);
-	JS_FreeValue(context, result);
-	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);
-}
-
-static JSValue _tf_ssb_getIdentityInfo(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
-	const char* name = JS_ToCString(context, argv[0]);
-	const char* package_owner = JS_ToCString(context, argv[1]);
-	const char* package_name = JS_ToCString(context, argv[2]);
-	identity_info_work_t* work = tf_malloc(sizeof(identity_info_work_t));
-	*work = (identity_info_work_t) {
-		.context = context,
-		.name = tf_strdup(name),
-		.package_owner = tf_strdup(package_owner),
-		.package_name = tf_strdup(package_name),
-	};
-	JSValue result = JS_NewPromiseCapability(context, work->promise);
-	JS_FreeCString(context, name);
-	JS_FreeCString(context, package_owner);
-	JS_FreeCString(context, package_name);
-
-	tf_ssb_run_work(ssb, _tf_ssb_getIdentityInfo_work, _tf_ssb_getIdentityInfo_after_work, work);
-	return result;
-}
-
 typedef struct _append_message_t
 {
 	JSContext* context;
@@ -762,7 +545,6 @@ static JSValue _tf_ssb_connections(JSContext* context, JSValueConst this_val, in
 				}
 				JS_SetPropertyStr(context, object, "tunnel", JS_NewInt32(context, tunnel_index));
 			}
-			JS_SetPropertyStr(context, object, "requests", tf_ssb_connection_requests_to_object(connection));
 			JS_SetPropertyUint32(context, result, i, object);
 		}
 	}
@@ -823,6 +605,7 @@ typedef struct _sql_work_t
 	uint8_t* rows;
 	size_t binds_count;
 	size_t rows_count;
+	uv_work_t request;
 	uv_async_t async;
 	uv_timer_t timeout;
 	uv_mutex_t lock;
@@ -838,10 +621,13 @@ static void _tf_ssb_sql_append(uint8_t** rows, size_t* rows_count, const void* d
 	*rows_count += size;
 }
 
-static void _tf_ssb_sqlAsync_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_sqlAsync_work(uv_work_t* work)
 {
-	sql_work_t* sql_work = user_data;
-	sqlite3* db = tf_ssb_acquire_db_reader_restricted(ssb);
+	sql_work_t* sql_work = work->data;
+	tf_ssb_record_thread_busy(sql_work->ssb, true);
+	tf_trace_t* trace = tf_ssb_get_trace(sql_work->ssb);
+	tf_trace_begin(trace, "sql_async_work");
+	sqlite3* db = tf_ssb_acquire_db_reader_restricted(sql_work->ssb);
 	uv_mutex_lock(&sql_work->lock);
 	sql_work->db = db;
 	uv_mutex_unlock(&sql_work->lock);
@@ -949,7 +735,9 @@ static void _tf_ssb_sqlAsync_work(tf_ssb_t* ssb, void* user_data)
 	uv_mutex_lock(&sql_work->lock);
 	sql_work->db = NULL;
 	uv_mutex_unlock(&sql_work->lock);
-	tf_ssb_release_db_reader(ssb, db);
+	tf_ssb_release_db_reader(sql_work->ssb, db);
+	tf_ssb_record_thread_busy(sql_work->ssb, false);
+	tf_trace_end(trace);
 }
 
 static void _tf_ssb_sqlAsync_handle_close(uv_handle_t* handle)
@@ -975,10 +763,12 @@ static void _tf_ssb_sqlAsync_destroy(sql_work_t* work)
 	uv_close((uv_handle_t*)&work->async, _tf_ssb_sqlAsync_handle_close);
 }
 
-static void _tf_ssb_sqlAsync_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_sqlAsync_after_work(uv_work_t* work, int status)
 {
-	sql_work_t* sql_work = user_data;
-	JSContext* context = tf_ssb_get_context(ssb);
+	sql_work_t* sql_work = work->data;
+	tf_trace_t* trace = tf_ssb_get_trace(sql_work->ssb);
+	tf_trace_begin(trace, "sql_async_after_work");
+	JSContext* context = tf_ssb_get_context(sql_work->ssb);
 	uint8_t* p = sql_work->rows;
 	while (p < sql_work->rows + sql_work->rows_count)
 	{
@@ -1063,6 +853,7 @@ static void _tf_ssb_sqlAsync_after_work(tf_ssb_t* ssb, int status, void* user_da
 	JS_FreeValue(context, sql_work->callback);
 	JS_FreeCString(context, sql_work->query);
 	_tf_ssb_sqlAsync_destroy(sql_work);
+	tf_trace_end(trace);
 }
 
 static void _tf_ssb_sqlAsync_timeout(uv_timer_t* timer)
@@ -1089,6 +880,10 @@ static JSValue _tf_ssb_sqlAsync(JSContext* context, JSValueConst this_val, int a
 	sql_work_t* work = tf_malloc(sizeof(sql_work_t));
 	*work = (sql_work_t)
 	{
+		.request =
+		{
+			.data = work,
+		},
 		.async =
 		{
 			.data = work,
@@ -1148,7 +943,11 @@ static JSValue _tf_ssb_sqlAsync(JSContext* context, JSValueConst this_val, int a
 			}
 			JS_FreeValue(context, value);
 		}
-		tf_ssb_run_work(ssb, _tf_ssb_sqlAsync_work, _tf_ssb_sqlAsync_after_work, work);
+		int r = uv_queue_work(tf_ssb_get_loop(ssb), &work->request, _tf_ssb_sqlAsync_work, _tf_ssb_sqlAsync_after_work);
+		if (r)
+		{
+			error_value = JS_ThrowInternalError(context, "uv_queue_work failed: %s", uv_strerror(r));
+		}
 	}
 	if (!JS_IsUndefined(error_value))
 	{
@@ -1347,22 +1146,6 @@ static void _tf_ssb_on_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_change
 	{
 	case k_tf_ssb_change_create:
 		break;
-	case k_tf_ssb_change_update:
-		{
-			JSValue object = JS_DupValue(context, tf_ssb_connection_get_object(connection));
-			JSValue args[] = {
-				JS_NewString(context, "update"),
-				object,
-			};
-			response = JS_Call(context, callback, JS_UNDEFINED, 2, args);
-			if (tf_util_report_error(context, response))
-			{
-				tf_ssb_remove_connections_changed_callback(ssb, _tf_ssb_on_connections_changed_callback, user_data);
-			}
-			JS_FreeValue(context, args[0]);
-			JS_FreeValue(context, object);
-		}
-		break;
 	case k_tf_ssb_change_connect:
 		{
 			JSValue object = JS_DupValue(context, tf_ssb_connection_get_object(connection));
@@ -1498,6 +1281,78 @@ static JSValue _tf_ssb_remove_event_listener(JSContext* context, JSValueConst th
 	return result;
 }
 
+static JSValue _tf_ssb_hmacsha256_sign(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
+{
+	JSValue result = JS_UNDEFINED;
+	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
+
+	size_t payload_length = 0;
+	const char* payload = JS_ToCStringLen(context, &payload_length, argv[0]);
+	const char* user = JS_ToCString(context, argv[1]);
+	const char* public_key = JS_ToCString(context, argv[2]);
+
+	uint8_t private_key[crypto_sign_SECRETKEYBYTES];
+	if (tf_ssb_db_identity_get_private_key(ssb, user, public_key, private_key, sizeof(private_key)))
+	{
+		uint8_t signature[crypto_sign_BYTES];
+		unsigned long long siglen;
+		if (crypto_sign_detached(signature, &siglen, (const uint8_t*)payload, payload_length, private_key) == 0)
+		{
+			char signature_base64[crypto_sign_BYTES * 2];
+			tf_base64_encode(signature, sizeof(signature), signature_base64, sizeof(signature_base64));
+			result = JS_NewString(context, signature_base64);
+		}
+	}
+	else
+	{
+		result = JS_ThrowInternalError(context, "Private key not found.");
+	}
+
+	JS_FreeCString(context, public_key);
+	JS_FreeCString(context, user);
+	JS_FreeCString(context, payload);
+
+	return result;
+}
+
+static JSValue _tf_ssb_hmacsha256_verify(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
+{
+	JSValue result = JS_UNDEFINED;
+
+	size_t public_key_length = 0;
+	const char* public_key = JS_ToCStringLen(context, &public_key_length, argv[0]);
+	size_t payload_length = 0;
+	const char* payload = JS_ToCStringLen(context, &payload_length, argv[1]);
+	size_t signature_length = 0;
+	const char* signature = JS_ToCStringLen(context, &signature_length, argv[2]);
+
+	const char* public_key_start = public_key && *public_key == '@' ? public_key + 1 : public_key;
+	const char* public_key_end = public_key_start ? strstr(public_key_start, ".ed25519") : NULL;
+	if (public_key_start && !public_key_end)
+	{
+		public_key_end = public_key_start + strlen(public_key_start);
+	}
+
+	uint8_t bin_public_key[crypto_sign_PUBLICKEYBYTES] = { 0 };
+	if (tf_base64_decode(public_key_start, public_key_end - public_key_start, bin_public_key, sizeof(bin_public_key)) > 0)
+	{
+		uint8_t bin_signature[crypto_sign_BYTES] = { 0 };
+		if (tf_base64_decode(signature, signature_length, bin_signature, sizeof(bin_signature)) > 0)
+		{
+			if (crypto_sign_verify_detached(bin_signature, (const uint8_t*)payload, payload_length, bin_public_key) == 0)
+			{
+				result = JS_TRUE;
+			}
+		}
+	}
+
+	JS_FreeCString(context, signature);
+	JS_FreeCString(context, payload);
+	JS_FreeCString(context, public_key);
+
+	return result;
+}
+
 static JSValue _tf_ssb_createTunnel(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
 {
 	JSValue result = JS_UNDEFINED;
@@ -1521,7 +1376,7 @@ static JSValue _tf_ssb_createTunnel(JSContext* context, JSValueConst this_val, i
 		JS_SetPropertyUint32(context, args, 0, arg);
 		JS_SetPropertyStr(context, message, "args", args);
 		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
-		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, "tunnel.connect", message, NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, message, NULL, NULL, NULL);
 		JS_FreeValue(context, message);
 
 		tf_ssb_connection_tunnel_create(ssb, portal_id, request_number, target_id);
@@ -1770,6 +1625,8 @@ static JSValue _tf_ssb_private_message_decrypt(JSContext* context, JSValueConst
 
 typedef struct _following_t
 {
+	uv_work_t work;
+	tf_ssb_t* ssb;
 	JSContext* context;
 	JSValue promise[2];
 
@@ -1780,15 +1637,17 @@ typedef struct _following_t
 	const char* ids[];
 } following_t;
 
-static void _tf_ssb_following_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_following_work(uv_work_t* work)
 {
-	following_t* following = user_data;
-	following->out_following = tf_ssb_db_following_deep(ssb, following->ids, following->ids_count, following->depth);
+	following_t* following = work->data;
+	tf_ssb_record_thread_busy(following->ssb, true);
+	following->out_following = tf_ssb_db_following_deep(following->ssb, following->ids, following->ids_count, following->depth);
+	tf_ssb_record_thread_busy(following->ssb, false);
 }
 
-static void _tf_ssb_following_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_following_after_work(uv_work_t* work, int status)
 {
-	following_t* following = user_data;
+	following_t* following = work->data;
 	JSContext* context = following->context;
 	if (status == 0)
 	{
@@ -1835,8 +1694,14 @@ static JSValue _tf_ssb_following(JSContext* context, JSValueConst this_val, int
 	int ids_count = tf_util_get_length(context, argv[0]);
 
 	following_t* following = tf_malloc(sizeof(following_t) + sizeof(char*) * ids_count);
-	*following = (following_t) {
+	*following = (following_t)
+	{
+		.work =
+		{
+			.data = following,
+		},
 		.context = context,
+		.ssb = ssb,
 	};
 	JS_ToInt32(context, &following->depth, argv[1]);
 
@@ -1854,7 +1719,11 @@ static JSValue _tf_ssb_following(JSContext* context, JSValueConst this_val, int
 		}
 	}
 
-	tf_ssb_run_work(ssb, _tf_ssb_following_work, _tf_ssb_following_after_work, following);
+	int r = uv_queue_work(tf_ssb_get_loop(ssb), &following->work, _tf_ssb_following_work, _tf_ssb_following_after_work);
+	if (r)
+	{
+		_tf_ssb_following_after_work(&following->work, r);
+	}
 	return result;
 }
 
@@ -1881,6 +1750,8 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 	JS_SetPropertyStr(context, object, "setServerFollowingMe", JS_NewCFunction(context, _tf_ssb_set_server_following_me, "setServerFollowingMe", 3));
 	JS_SetPropertyStr(context, object, "getIdentities", JS_NewCFunction(context, _tf_ssb_getIdentities, "getIdentities", 1));
 	JS_SetPropertyStr(context, object, "getPrivateKey", JS_NewCFunction(context, _tf_ssb_getPrivateKey, "getPrivateKey", 2));
+	JS_SetPropertyStr(context, object, "hmacsha256sign", JS_NewCFunction(context, _tf_ssb_hmacsha256_sign, "hmacsha256sign", 3));
+	JS_SetPropertyStr(context, object, "hmacsha256verify", JS_NewCFunction(context, _tf_ssb_hmacsha256_verify, "hmacsha256verify", 3));
 	JS_SetPropertyStr(context, object, "privateMessageEncrypt", JS_NewCFunction(context, _tf_ssb_private_message_encrypt, "privateMessageEncrypt", 4));
 	JS_SetPropertyStr(context, object, "privateMessageDecrypt", JS_NewCFunction(context, _tf_ssb_private_message_decrypt, "privateMessageDecrypt", 3));
 	/* Write. */
@@ -1889,8 +1760,6 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 	/* Does not require an identity. */
 	JS_SetPropertyStr(context, object, "getServerIdentity", JS_NewCFunction(context, _tf_ssb_getServerIdentity, "getServerIdentity", 0));
 	JS_SetPropertyStr(context, object, "getAllIdentities", JS_NewCFunction(context, _tf_ssb_getAllIdentities, "getAllIdentities", 0));
-	JS_SetPropertyStr(context, object, "getActiveIdentity", JS_NewCFunction(context, _tf_ssb_getActiveIdentity, "getActiveIdentity", 3));
-	JS_SetPropertyStr(context, object, "getIdentityInfo", JS_NewCFunction(context, _tf_ssb_getIdentityInfo, "getIdentityInfo", 3));
 	JS_SetPropertyStr(context, object, "getMessage", JS_NewCFunction(context, _tf_ssb_getMessage, "getMessage", 2));
 	JS_SetPropertyStr(context, object, "blobGet", JS_NewCFunction(context, _tf_ssb_blobGet, "blobGet", 1));
 	JS_SetPropertyStr(context, object, "messageContentGet", JS_NewCFunction(context, _tf_ssb_messageContentGet, "messageContentGet", 1));

src/ssb.rpc.c

@@ -50,7 +50,7 @@ static void _tf_ssb_rpc_gossip_ping_callback(
 {
 	char buffer[256];
 	snprintf(buffer, sizeof(buffer), "%" PRId64, (int64_t)time(NULL) * 1000);
-	tf_ssb_connection_rpc_send(connection, flags, -request_number, NULL, (const uint8_t*)buffer, strlen(buffer), NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send(connection, flags, -request_number, (const uint8_t*)buffer, strlen(buffer), NULL, NULL, NULL);
 	if (flags & k_ssb_rpc_flag_end_error)
 	{
 		tf_ssb_connection_remove_request(connection, request_number);
@@ -59,7 +59,7 @@ static void _tf_ssb_rpc_gossip_ping_callback(
 
 static void _tf_ssb_rpc_gossip_ping(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
 {
-	tf_ssb_connection_add_request(connection, -request_number, "gossip.ping", _tf_ssb_rpc_gossip_ping_callback, NULL, NULL, NULL);
+	tf_ssb_connection_add_request(connection, -request_number, _tf_ssb_rpc_gossip_ping_callback, NULL, NULL, NULL);
 }
 
 static void _tf_ssb_rpc_blobs_get_callback(
@@ -74,7 +74,7 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 		return;
 	}
 
-	tf_ssb_connection_add_request(connection, -request_number, "blobs.get", _tf_ssb_rpc_blobs_get_callback, NULL, NULL, NULL);
+	tf_ssb_connection_add_request(connection, -request_number, _tf_ssb_rpc_blobs_get_callback, NULL, NULL, NULL);
 	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
 	JSContext* context = tf_ssb_connection_get_context(connection);
 	JSValue ids = JS_GetPropertyStr(context, args, "args");
@@ -101,7 +101,7 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 		{
 			for (size_t offset = 0; offset < size; offset += k_send_max)
 			{
-				tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_binary | k_ssb_rpc_flag_stream, -request_number, NULL, blob + offset,
+				tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_binary | k_ssb_rpc_flag_stream, -request_number, blob + offset,
 					offset + k_send_max <= size ? k_send_max : (size - offset), NULL, NULL, NULL);
 			}
 			success = true;
@@ -111,8 +111,8 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 		JS_FreeValue(context, arg);
 	}
 	JS_FreeValue(context, ids);
-	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | k_ssb_rpc_flag_end_error | k_ssb_rpc_flag_stream, -request_number, NULL,
-		(const uint8_t*)(success ? "true" : "false"), strlen(success ? "true" : "false"), NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | k_ssb_rpc_flag_end_error | k_ssb_rpc_flag_stream, -request_number, (const uint8_t*)(success ? "true" : "false"),
+		strlen(success ? "true" : "false"), NULL, NULL, NULL);
 }
 
 static void _tf_ssb_rpc_blobs_has(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
@@ -126,7 +126,7 @@ static void _tf_ssb_rpc_blobs_has(tf_ssb_connection_t* connection, uint8_t flags
 	JS_FreeCString(context, id_str);
 	JS_FreeValue(context, id);
 	JS_FreeValue(context, ids);
-	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json, -request_number, NULL, (const uint8_t*)(has ? "true" : "false"), strlen(has ? "true" : "false"), NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json, -request_number, (const uint8_t*)(has ? "true" : "false"), strlen(has ? "true" : "false"), NULL, NULL, NULL);
 }
 
 static void _tf_ssb_rpc_blob_wants_added_callback(tf_ssb_t* ssb, const char* id, void* user_data)
@@ -136,7 +136,7 @@ static void _tf_ssb_rpc_blob_wants_added_callback(tf_ssb_t* ssb, const char* id,
 	JSContext* context = tf_ssb_get_context(ssb);
 	JSValue message = JS_NewObject(context);
 	JS_SetPropertyStr(context, message, id, JS_NewInt64(context, -1));
-	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, NULL, message, NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, message, NULL, NULL, NULL);
 	JS_FreeValue(context, message);
 }
 
@@ -195,7 +195,7 @@ static void _tf_ssb_request_blob_wants_after_work(tf_ssb_connection_t* connectio
 	{
 		JSValue message = JS_NewObject(context);
 		JS_SetPropertyStr(context, message, work->out_id[i], JS_NewInt32(context, -1));
-		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, NULL, message, NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, message, NULL, NULL, NULL);
 		JS_FreeValue(context, message);
 		blob_wants->wants_sent++;
 	}
@@ -239,7 +239,7 @@ static void _tf_ssb_rpc_tunnel_callback(tf_ssb_connection_t* connection, uint8_t
 	}
 	else
 	{
-		tf_ssb_connection_rpc_send(tun->connection, flags, tun->request_number, NULL, message, size, NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send(tun->connection, flags, tun->request_number, message, size, NULL, NULL, NULL);
 	}
 }
 
@@ -290,8 +290,7 @@ static void _tf_ssb_rpc_tunnel_connect(tf_ssb_connection_t* connection, uint8_t
 			JS_SetPropertyStr(context, message, "args", arg_array);
 			JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
 
-			tf_ssb_connection_rpc_send_json(
-				target_connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, "tunnel.connect", message, NULL, NULL, NULL);
+			tf_ssb_connection_rpc_send_json(target_connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, message, NULL, NULL, NULL);
 
 			tunnel_t* data0 = tf_malloc(sizeof(tunnel_t));
 			*data0 = (tunnel_t) {
@@ -303,8 +302,8 @@ static void _tf_ssb_rpc_tunnel_connect(tf_ssb_connection_t* connection, uint8_t
 				.connection = connection,
 				.request_number = -request_number,
 			};
-			tf_ssb_connection_add_request(connection, -request_number, "tunnel.connect", _tf_ssb_rpc_tunnel_callback, _tf_ssb_rpc_tunnel_cleanup, data0, target_connection);
-			tf_ssb_connection_add_request(target_connection, tunnel_request_number, "tunnel.connect", _tf_ssb_rpc_tunnel_callback, _tf_ssb_rpc_tunnel_cleanup, data1, connection);
+			tf_ssb_connection_add_request(connection, -request_number, _tf_ssb_rpc_tunnel_callback, _tf_ssb_rpc_tunnel_cleanup, data0, target_connection);
+			tf_ssb_connection_add_request(target_connection, tunnel_request_number, _tf_ssb_rpc_tunnel_callback, _tf_ssb_rpc_tunnel_cleanup, data1, connection);
 
 			JS_FreeValue(context, message);
 			JS_FreeCString(context, portal_str);
@@ -349,7 +348,7 @@ static void _tf_ssb_rpc_room_meta(tf_ssb_connection_t* connection, uint8_t flags
 		JS_SetPropertyUint32(context, features, 2, JS_NewString(context, "room2"));
 		JS_SetPropertyStr(context, response, "features", features);
 	}
-	tf_ssb_connection_rpc_send_json(connection, flags, -request_number, NULL, response, NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send_json(connection, flags, -request_number, response, NULL, NULL, NULL);
 	JS_FreeValue(context, response);
 }
 
@@ -385,11 +384,11 @@ static void _tf_ssb_rpc_room_attendants(tf_ssb_connection_t* connection, uint8_t
 		{
 			JS_SetPropertyUint32(context, ids, id_count++, JS_NewString(context, id));
 
-			tf_ssb_connection_rpc_send_json(connections[i], flags, -tf_ssb_connection_get_attendant_request_number(connections[i]), NULL, joined, NULL, NULL, NULL);
+			tf_ssb_connection_rpc_send_json(connections[i], flags, -tf_ssb_connection_get_attendant_request_number(connections[i]), joined, NULL, NULL, NULL);
 		}
 	}
 	JS_SetPropertyStr(context, state, "ids", ids);
-	tf_ssb_connection_rpc_send_json(connection, flags, -request_number, NULL, state, NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send_json(connection, flags, -request_number, state, NULL, NULL, NULL);
 	JS_FreeValue(context, joined);
 	JS_FreeValue(context, state);
 
@@ -437,8 +436,8 @@ static void _tf_ssb_rpc_connection_blobs_get_callback(
 		}
 		/* TODO: Should we send the response in the callback? */
 		bool stored = true;
-		tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | k_ssb_rpc_flag_stream | k_ssb_rpc_flag_end_error, -request_number, NULL,
-			(const uint8_t*)(stored ? "true" : "false"), strlen(stored ? "true" : "false"), NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | k_ssb_rpc_flag_stream | k_ssb_rpc_flag_end_error, -request_number, (const uint8_t*)(stored ? "true" : "false"),
+			strlen(stored ? "true" : "false"), NULL, NULL, NULL);
 	}
 }
 
@@ -471,7 +470,7 @@ static void _tf_ssb_rpc_connection_blobs_get(tf_ssb_connection_t* connection, co
 	JS_SetPropertyUint32(context, args, 0, JS_NewString(context, blob_id));
 	JS_SetPropertyStr(context, message, "args", args);
 
-	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), "blobs.get", message,
+	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), message,
 		_tf_ssb_rpc_connection_blobs_get_callback, _tf_ssb_rpc_connection_blobs_get_cleanup, get);
 
 	JS_FreeValue(context, message);
@@ -526,14 +525,14 @@ static void _tf_ssb_rpc_connection_blobs_createWants_callback(
 				{
 					JSValue message = JS_NewObject(context);
 					JS_SetPropertyStr(context, message, blob_id, JS_NewInt64(context, blob_size));
-					tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, NULL, message, NULL, NULL, NULL);
+					tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, message, NULL, NULL, NULL);
 					JS_FreeValue(context, message);
 				}
 				else if (size == -1LL)
 				{
 					JSValue message = JS_NewObject(context);
 					JS_SetPropertyStr(context, message, blob_id, JS_NewInt64(context, -2));
-					tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, NULL, message, NULL, NULL, NULL);
+					tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, message, NULL, NULL, NULL);
 					JS_FreeValue(context, message);
 				}
 			}
@@ -647,8 +646,8 @@ static void _tf_ssb_rpc_connection_tunnel_isRoom_callback(
 		JS_SetPropertyStr(context, message, "name", name);
 		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "source"));
 		JS_SetPropertyStr(context, message, "args", JS_NewArray(context));
-		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), "room.attendants",
-			message, _tf_ssb_rpc_connection_room_attendants_callback, NULL, NULL);
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), message,
+			_tf_ssb_rpc_connection_room_attendants_callback, NULL, NULL);
 		JS_FreeValue(context, message);
 	}
 }
@@ -745,7 +744,7 @@ static void _tf_ssb_connection_send_history_stream_after_work(tf_ssb_connection_
 	{
 		for (int i = 0; i < request->out_messages_count; i++)
 		{
-			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json, request->request_number, NULL, (const uint8_t*)request->out_messages[i],
+			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json, request->request_number, (const uint8_t*)request->out_messages[i],
 				strlen(request->out_messages[i]), NULL, NULL, NULL);
 		}
 		if (!request->out_finished)
@@ -754,7 +753,7 @@ static void _tf_ssb_connection_send_history_stream_after_work(tf_ssb_connection_
 		}
 		else if (!request->live)
 		{
-			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json, request->request_number, NULL, (const uint8_t*)"false", strlen("false"), NULL, NULL, NULL);
+			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json, request->request_number, (const uint8_t*)"false", strlen("false"), NULL, NULL, NULL);
 		}
 	}
 	for (int i = 0; i < request->out_messages_count; i++)
@@ -900,7 +899,7 @@ static void _tf_ssb_rpc_ebt_replicate_send_clock_after_work(tf_ssb_connection_t*
 	if (work->out_clock)
 	{
 		tf_ssb_connection_rpc_send(
-			connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json, -work->request_number, NULL, (const uint8_t*)work->out_clock, strlen(work->out_clock), NULL, NULL, NULL);
+			connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json, -work->request_number, (const uint8_t*)work->out_clock, strlen(work->out_clock), NULL, NULL, NULL);
 		tf_free(work->out_clock);
 	}
 	tf_free(work);
@@ -1061,8 +1060,7 @@ static void _tf_ssb_rpc_send_ebt_replicate(tf_ssb_connection_t* connection)
 	JS_SetPropertyStr(context, message, "args", args);
 	JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
 	int32_t request_number = tf_ssb_connection_next_request_number(connection);
-	tf_ssb_connection_rpc_send_json(
-		connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, "ebt.replicate", message, _tf_ssb_rpc_ebt_replicate_client, NULL, NULL);
+	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, message, _tf_ssb_rpc_ebt_replicate_client, NULL, NULL);
 	if (!tf_ssb_connection_get_ebt_request_number(connection))
 	{
 		tf_ssb_connection_set_ebt_request_number(connection, request_number);
@@ -1078,7 +1076,7 @@ static void _tf_ssb_rpc_ebt_replicate_server(
 		return;
 	}
 	_tf_ssb_rpc_ebt_replicate(connection, flags, request_number, args, message, size, user_data);
-	tf_ssb_connection_add_request(connection, -request_number, "ebt.replicate", _tf_ssb_rpc_ebt_replicate, NULL, NULL, NULL);
+	tf_ssb_connection_add_request(connection, -request_number, _tf_ssb_rpc_ebt_replicate, NULL, NULL, NULL);
 }
 
 static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_change_t change, tf_ssb_connection_t* connection, void* user_data)
@@ -1093,8 +1091,8 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 		JS_SetPropertyStr(context, message, "name", name);
 		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "source"));
 		JS_SetPropertyStr(context, message, "args", JS_NewArray(context));
-		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), "blobs.createWants",
-			message, _tf_ssb_rpc_connection_blobs_createWants_callback, NULL, NULL);
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), message,
+			_tf_ssb_rpc_connection_blobs_createWants_callback, NULL, NULL);
 		JS_FreeValue(context, message);
 
 		if (tf_ssb_connection_is_client(connection))
@@ -1105,8 +1103,8 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 			JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "isRoom"));
 			JS_SetPropertyStr(context, message, "name", name);
 			JS_SetPropertyStr(context, message, "args", JS_NewArray(context));
-			tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), "tunnel.isRoom", message,
-				_tf_ssb_rpc_connection_tunnel_isRoom_callback, NULL, NULL);
+			tf_ssb_connection_rpc_send_json(
+				connection, k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), message, _tf_ssb_rpc_connection_tunnel_isRoom_callback, NULL, NULL);
 			JS_FreeValue(context, message);
 
 			_tf_ssb_rpc_send_ebt_replicate(connection);
@@ -1128,8 +1126,7 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 			{
 				if (tf_ssb_connection_is_attendant(connections[i]))
 				{
-					tf_ssb_connection_rpc_send_json(
-						connections[i], k_ssb_rpc_flag_stream, -tf_ssb_connection_get_attendant_request_number(connections[i]), NULL, left, NULL, NULL, NULL);
+					tf_ssb_connection_rpc_send_json(connections[i], k_ssb_rpc_flag_stream, -tf_ssb_connection_get_attendant_request_number(connections[i]), left, NULL, NULL, NULL);
 				}
 			}
 			JS_FreeValue(context, left);
@@ -1137,6 +1134,12 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 	}
 }
 
+typedef struct _delete_blobs_work_t
+{
+	uv_work_t work;
+	tf_ssb_t* ssb;
+} delete_blobs_work_t;
+
 static void _tf_ssb_rpc_checkpoint(tf_ssb_t* ssb)
 {
 	int64_t checkpoint_start_ms = uv_hrtime();
@@ -1154,12 +1157,16 @@ static void _tf_ssb_rpc_checkpoint(tf_ssb_t* ssb)
 	tf_ssb_release_db_writer(ssb, db);
 }
 
-static void _tf_ssb_rpc_delete_blobs_work(tf_ssb_t* ssb, void* user_data)
+static void _tf_ssb_rpc_delete_blobs_work(uv_work_t* work)
 {
+	delete_blobs_work_t* delete = work->data;
+	tf_ssb_t* ssb = delete->ssb;
+	tf_ssb_record_thread_busy(ssb, true);
 	int64_t age = _get_global_setting_int64(ssb, "blob_expire_age_seconds", -1);
 	if (age <= 0)
 	{
 		_tf_ssb_rpc_checkpoint(ssb);
+		tf_ssb_record_thread_busy(ssb, false);
 		return;
 	}
 	int64_t start_ns = uv_hrtime();
@@ -1201,16 +1208,28 @@ static void _tf_ssb_rpc_delete_blobs_work(tf_ssb_t* ssb, void* user_data)
 	tf_printf("Deleted %d blobs in %d ms.\n", deleted, (int)duration_ms);
 	_tf_ssb_rpc_checkpoint(ssb);
 	_tf_ssb_rpc_start_delete_blobs(ssb, deleted ? (int)duration_ms : (15 * 60 * 1000));
+	tf_ssb_record_thread_busy(ssb, false);
 }
 
-static void _tf_ssb_rpc_delete_blobs_after_work(tf_ssb_t* ssb, int status, void* user_data)
+static void _tf_ssb_rpc_delete_blobs_after_work(uv_work_t* work, int status)
 {
-	tf_ssb_unref(ssb);
+	delete_blobs_work_t* delete = work->data;
+	tf_ssb_unref(delete->ssb);
+	tf_free(delete);
 }
 
 static void _tf_ssb_rpc_start_delete_callback(tf_ssb_t* ssb, void* user_data)
 {
-	tf_ssb_run_work(ssb, _tf_ssb_rpc_delete_blobs_work, _tf_ssb_rpc_delete_blobs_after_work, NULL);
+	delete_blobs_work_t* work = tf_malloc(sizeof(delete_blobs_work_t));
+	*work = (delete_blobs_work_t) { .work = { .data = work }, .ssb = ssb };
+	tf_ssb_ref(ssb);
+	int r = uv_queue_work(tf_ssb_get_loop(ssb), &work->work, _tf_ssb_rpc_delete_blobs_work, _tf_ssb_rpc_delete_blobs_after_work);
+	if (r)
+	{
+		tf_printf("uv_queue_work: %s\n", uv_strerror(r));
+		tf_free(work);
+		tf_ssb_unref(ssb);
+	}
 }
 
 static void _tf_ssb_rpc_start_delete_blobs(tf_ssb_t* ssb, int delay_ms)

src/ssb.tests.c

@@ -444,7 +444,7 @@ void tf_ssb_test_rooms(const tf_test_options_t* options)
 	JS_SetPropertyStr(context, message, "args", args);
 	JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
 
-	tf_ssb_connection_rpc_send_json(connections[0], k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, "tunnel.connect", message, NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send_json(connections[0], k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, message, NULL, NULL, NULL);
 	JS_FreeValue(context, message);
 
 	tf_ssb_connection_t* tun0 = tf_ssb_connection_tunnel_create(ssb1, id0, tunnel_request_number, id2);
@@ -715,8 +715,8 @@ static void _close_callback(uv_timer_t* timer)
 	close_t* data = timer->data;
 	tf_printf("breaking %s %p\n", data->id, data->connection);
 	const char* message = "{\"name\":\"Error\",\"message\":\"whoops\",\"stack\":\"nah\"}";
-	tf_ssb_connection_rpc_send(data->connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json | k_ssb_rpc_flag_end_error, data->request_number, NULL, (const uint8_t*)message,
-		strlen(message), NULL, NULL, NULL);
+	tf_ssb_connection_rpc_send(
+		data->connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json | k_ssb_rpc_flag_end_error, data->request_number, (const uint8_t*)message, strlen(message), NULL, NULL, NULL);
 	uv_close((uv_handle_t*)timer, _timer_close);
 }
 
@@ -769,7 +769,7 @@ static void _ssb_test_room_broadcasts_visit(const char* host, const struct socka
 		JS_SetPropertyStr(context, message, "args", args);
 		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
 
-		tf_ssb_connection_rpc_send_json(tunnel, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, "tunnel.connect", message, NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send_json(tunnel, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, message, NULL, NULL, NULL);
 		JS_FreeValue(context, message);
 
 		tf_printf("tunnel create ssb=%p portal=%s rn=%d target=%s\n", ssb, portal, (int)tunnel_request_number, target);

src/task.c

@@ -113,8 +113,8 @@ typedef struct _tf_task_t
 	bool _trusted;
 	bool _one_proc;
 	bool _killed;
+	int32_t _exitCode;
 	char _scriptName[256];
-	int _global_exception_count;
 
 	JSRuntime* _runtime;
 	JSContext* _context;
@@ -421,11 +421,11 @@ int tf_task_execute(tf_task_t* task, const char* fileName)
 	if (source)
 	{
 		JSValue result = JS_Eval(task->_context, source, strlen(source), fileName, JS_EVAL_TYPE_MODULE | JS_EVAL_FLAG_ASYNC);
-		if (tf_util_report_error(task->_context, result) || task->_global_exception_count)
+		if (tf_util_report_error(task->_context, result))
 		{
 			tf_printf("Reported an error.\n");
 		}
-		else
+		if (!JS_IsError(task->_context, result) && !JS_IsException(result))
 		{
 			executed = true;
 		}
@@ -1457,8 +1457,6 @@ static void _tf_task_promise_rejection_tracker(JSContext* context, JSValueConst
 	if (!is_handled)
 	{
 		tf_util_report_error(context, reason);
-		tf_task_t* task = tf_task_get(context);
-		task->_global_exception_count++;
 	}
 }
 
@@ -1941,11 +1939,6 @@ void tf_task_destroy(tf_task_t* task)
 	tf_free(task->_promise_stacks);
 	tf_free((void*)task->_path);
 	bool was_trusted = task->_trusted;
-	if (task->_zip)
-	{
-		unzClose(task->_zip);
-		task->_zip = NULL;
-	}
 	tf_free(task);
 	if (was_trusted)
 	{

src/taskstub.js.c

@@ -443,7 +443,7 @@ JSValue tf_taskstub_kill(tf_taskstub_t* stub)
 	JSValue result = JS_UNDEFINED;
 	if (!tf_task_get_one_proc(stub->_owner))
 	{
-		uv_process_kill(&stub->_process, SIGKILL);
+		uv_process_kill(&stub->_process, SIGTERM);
 	}
 	else
 	{

src/tests.c

@@ -58,20 +58,6 @@ static void _test_nop(const tf_test_options_t* options)
 	assert(WEXITSTATUS(result) == 0);
 }
 
-static void _test_exception(const tf_test_options_t* options)
-{
-	_write_file("out/test.js", "throw new Error('oops');");
-
-	char command[256];
-	snprintf(command, sizeof(command), "%s run --db-path=:memory: -s out/test.js" TEST_ARGS, options->exe_path);
-	tf_printf("%s\n", command);
-	int result = system(command);
-	tf_printf("result = %d\n", result);
-	(void)result;
-	assert(WIFEXITED(result));
-	assert(WEXITSTATUS(result) != 0);
-}
-
 #if !defined(__HAIKU__)
 static void _test_sandbox(const tf_test_options_t* options)
 {
@@ -386,7 +372,7 @@ static void _test_import(const tf_test_options_t* options)
 	result = system(command);
 	tf_printf("returned %d\n", WEXITSTATUS(result));
 	assert(WIFEXITED(result));
-	assert(WEXITSTATUS(result) != 0);
+	assert(WEXITSTATUS(result) == 0);
 
 	unlink("out/test.js");
 	unlink("out/required.js");
@@ -620,7 +606,36 @@ static void _test_file(const tf_test_options_t* options)
 		"});\n");
 
 	char command[256];
-	snprintf(command, sizeof(command), "%s run --db-path=out/test.db -s out/test.js" TEST_ARGS, options->exe_path);
+	snprintf(command, sizeof(command), "%s run --db-path=:memory: -s out/test.js" TEST_ARGS, options->exe_path);
+	tf_printf("%s\n", command);
+	int result = system(command);
+	tf_printf("returned %d\n", WEXITSTATUS(result));
+	assert(WIFEXITED(result));
+	assert(WEXITSTATUS(result) == 0);
+
+	unlink("out/test.js");
+}
+
+static void _test_sign(const tf_test_options_t* options)
+{
+	_write_file("out/test.js",
+		"'use strict';\n"
+		"let id = ssb.createIdentity('test');\n"
+		"print(id);\n"
+		"let sig = ssb.hmacsha256sign('hello', 'test', id);\n"
+		"print(sig);\n"
+		"if (!ssb.hmacsha256verify(id, 'hello', sig)) {\n"
+		"	exit(1);\n"
+		"}\n"
+		"if (ssb.hmacsha256verify(id, 'world', sig)) {\n"
+		"	exit(1);\n"
+		"}\n"
+		"if (ssb.hmacsha256verify(id, 'hello1', sig)) {\n"
+		"	exit(1);\n"
+		"}\n");
+
+	char command[256];
+	snprintf(command, sizeof(command), "%s run --db-path=:memory: -s out/test.js" TEST_ARGS, options->exe_path);
 	tf_printf("%s\n", command);
 	int result = system(command);
 	tf_printf("returned %d\n", WEXITSTATUS(result));
@@ -686,14 +701,6 @@ static void _test_http_async(uv_async_t* async)
 static void _test_http_thread(void* data)
 {
 	test_http_t* test = data;
-	const char* value = tf_http_get_cookie("a=foo; b=bar", "a");
-	assert(strcmp(value, "foo") == 0);
-	tf_free((void*)value);
-	value = tf_http_get_cookie("a=foo; b=bar", "b");
-	assert(strcmp(value, "bar") == 0);
-	tf_free((void*)value);
-	assert(tf_http_get_cookie("a=foo; b=bar", "c") == NULL);
-
 	int r = system("curl -v http://localhost:23456/404");
 	assert(WEXITSTATUS(r) == 0);
 	tf_printf("curl returned %d\n", WEXITSTATUS(r));
@@ -876,7 +883,6 @@ void tf_tests(const tf_test_options_t* options)
 	_tf_test_run(options, "ssb_id", tf_ssb_test_id_conversion, false);
 	_tf_test_run(options, "ssb_following", tf_ssb_test_following, false);
 	_tf_test_run(options, "nop", _test_nop, false);
-	_tf_test_run(options, "exception", _test_exception, false);
 #if !defined(__HAIKU__)
 	_tf_test_run(options, "sandbox", _test_sandbox, false);
 #endif
@@ -894,6 +900,7 @@ void tf_tests(const tf_test_options_t* options)
 	_tf_test_run(options, "float", _test_float, false);
 	_tf_test_run(options, "socket", _test_socket, false);
 	_tf_test_run(options, "file", _test_file, false);
+	_tf_test_run(options, "sign", _test_sign, false);
 	_tf_test_run(options, "b64", _test_b64, false);
 	_tf_test_run(options, "rooms", tf_ssb_test_rooms, false);
 	_tf_test_run(options, "bench", tf_ssb_test_bench, false);