build: Fix this dependendy test.

We're no longer trying to fit into a 5MB APK or anything.

.gitignore

@@ -7,6 +7,7 @@ deps/openssl/
 dist/
 .flatpak-builder
 .keys
+**/.DS_Store
 logs/
 **/node_modules
 out

Doxyfile

@@ -943,7 +943,9 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = README.md docs/ src/
+INPUT                  = README.md \
+                         docs/ \
+                         src/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1680,7 +1682,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
 # FULL_SIDEBAR option determines if the side bar is limited to only the treeview
@@ -2268,7 +2270,7 @@ GENERATE_AUTOGEN_DEF   = NO
 # database with symbols found by doxygen stored in tables.
 # The default value is: NO.
 
-GENERATE_SQLITE3       = NO
+#GENERATE_SQLITE3       = NO
 
 # The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be
 # put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put
@@ -2276,7 +2278,7 @@ GENERATE_SQLITE3       = NO
 # The default directory is: sqlite3.
 # This tag requires that the tag GENERATE_SQLITE3 is set to YES.
 
-SQLITE3_OUTPUT         = sqlite3
+#SQLITE3_OUTPUT         = sqlite3
 
 # The SQLITE3_OVERWRITE_DB tag is set to YES, the existing doxygen_sqlite3.db
 # database file will be recreated with each doxygen run. If set to NO, doxygen
@@ -2284,7 +2286,7 @@ SQLITE3_OUTPUT         = sqlite3
 # The default value is: YES.
 # This tag requires that the tag GENERATE_SQLITE3 is set to YES.
 
-SQLITE3_RECREATE_DB    = YES
+#SQLITE3_RECREATE_DB    = YES
 
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output

GNUmakefile

@@ -16,11 +16,14 @@ MAKEFLAGS += --no-builtin-rules
 ## LD := Linker.
 ## ANDROID_SDK := Path to the Android SDK.
 
-VERSION_CODE := 33
-VERSION_NUMBER := 0.0.28-wip
+VERSION_CODE := 34
+VERSION_CODE_IOS := 11
+VERSION_NUMBER := 0.0.29
 VERSION_NAME := This program kills fascists.
 
-SQLITE_URL := https://www.sqlite.org/2025/sqlite-amalgamation-3490000.zip
+IPHONEOS_VERSION_MIN=14.0
+
+SQLITE_URL := https://www.sqlite.org/2025/sqlite-amalgamation-3490100.zip
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
 APPIMAGETOOL_URL := https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
 APPIMAGETOOL_MD5 := e989fadfc4d685fd3d6aeeb9b525d74d  out/appimagetool
@@ -42,6 +45,10 @@ export TZ=UTC
 
 ifeq ($(UNAME_S),Darwin)
 BUILD_TYPES := debug release iosdebug iosrelease iossimdebug iossimrelease
+HAVE_ANDROID = 0
+HAVE_LINUX_IOS = 0
+HAVE_LINUX_MACOS = 0
+HAVE_WIN = 0
 else ifeq ($(UNAME_S),Linux)
 BUILD_TYPES := debug release
 HAVE_ANDROID = $(if $(shell which $(ANDROID_SDK)/platform-tools/adb),1)
@@ -59,6 +66,10 @@ LDFLAGS += \
 	-lnetwork \
 	-Wno-stringop-overflow
 USE_SYSTEM_SSL := 1
+HAVE_ANDROID = 0
+HAVE_LINUX_IOS = 0
+HAVE_LINUX_MACOS = 0
+HAVE_WIN = 0
 else ifeq ($(UNAME_S),OpenBSD)
 BUILD_TYPES := debug release
 CFLAGS += \
@@ -302,8 +313,8 @@ $(ANDROID_X86_64_TARGETS): LDFLAGS += -Lout/openssl/android/x86_64/usr/local/lib
 $(NONMACOS_TARGETS): CFLAGS += -Wno-cast-function-type
 $(MACOS_TARGETS): LDFLAGS += -Wl,-dead_strip
 $(NONMACOS_TARGETS): LDFLAGS += -Wl,--gc-sections -Wl,--as-needed
-$(IOS_TARGETS): CFLAGS += -miphoneos-version-min=9.0
-$(IOS_TARGETS): LDFLAGS += -miphoneos-version-min=9.0
+$(IOS_TARGETS): CFLAGS += -miphoneos-version-min=$(IPHONEOS_VERSION_MIN)
+$(IOS_TARGETS): LDFLAGS += -miphoneos-version-min=$(IPHONEOS_VERSION_MIN)
 ifeq ($(UNAME_S),Darwin)
 $(IOS_TARGETS): CFLAGS += -Iout/openssl/ios/ios64-xcrun/usr/local/include
 $(IOS_TARGETS): LDFLAGS += -Lout/openssl/ios/ios64-xcrun/usr/local/lib
@@ -808,7 +819,7 @@ $(MINIUNZIP_OBJS): CFLAGS += \
 LDFLAGS += \
 	-pthread \
 	-lm
-$(HOST_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS) $(AARCH64_TARGETS) $(MACOS_TARGETS): LDFLAGS += \
+$(HOST_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS) $(AARCH64_TARGETS) $(filter-out $(HOST_TARGETS),$(MACOS_TARGETS)): LDFLAGS += \
 	-lssl \
 	-lcrypto
 ifneq ($(UNAME_S),Haiku)
@@ -910,6 +921,17 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST))
 		-e 's/android:targetSdkVersion="[[:digit:]]*"/android:targetSdkVersion="$(ANDROID_TARGET_SDK_VERSION)"/' \
 		$@
 
+src/ios/Info.plist : $(firstword $(MAKEFILE_LIST))
+	@echo "[ios_version] $@"
+	@cat $@ | \
+		tr '\n' '^' | \
+		sed -r \
+			-e 's@(<key>CFBundleShortVersionString</key>\^[[:space:]]*<string>)[0-9.]*(</string>)@\1$(VERSION_NUMBER:%-wip=%)\2@' \
+			-e 's@(<key>CFBundleVersion</key>\^[[:space:]]*<string>)[[:digit:]]+(</string>)@\1$(VERSION_CODE_IOS)\2@' \
+			-e 's@(<key>MinimumOSVersion</key>\^[[:space:]]*<string>)[0-9.]*(</string>)@\1$(IPHONEOS_VERSION_MIN)\2@' | \
+		tr '^' '\n' > \
+		$@.tmp && mv $@.tmp $@ || rm -f $@.tmp
+
 ##
 ## Android targets:
 ##
@@ -927,29 +949,30 @@ out/res/layout_activity_main.xml.flat: src/android/res/layout/activity_main.xml
 	@echo "[aapt2] $@"
 	@$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/layout/activity_main.xml
 
-out/res/drawable_icon.xml.flat: src/android/res/drawable/icon.xml
+out/res/drawable_%.xml.flat: src/android/res/drawable/%.xml
 	@mkdir -p $(dir $@)
 	@echo "[aapt2] $@"
-	@$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/drawable/icon.xml
+	@$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ $(<)
 
-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
+out/apk/res.apk out/gen/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat out/res/drawable_logo.xml.flat src/android/AndroidManifest.xml
 	@echo [aapt2 link] res.apk
 	@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 \
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat out/res/drawable_logo.xml.flat \
 		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
 		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
 		--manifest src/android/AndroidManifest.xml \
 		-o out/apk/res.apk \
 		--java out/gen/
 
-out/apk/res.fdroid.apk out/gen_fdroid/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml
+out/apk/res.fdroid.apk out/gen_fdroid/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon_fdroid.xml.flat out/res/drawable_logo.xml.flat src/android/AndroidManifest.xml
 	@echo [aapt2 link] res.fdroid.apk
 	@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 \
+	@sed -e 's@drawable/icon@drawable/icon_fdroid@' src/android/AndroidManifest.xml > out/apk/AndroidManifest.fdroid.xml
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon_fdroid.xml.flat out/res/drawable_logo.xml.flat \
 		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
 		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
 		--rename-manifest-package com.unprompted.tildefriends.fdroid \
-		--manifest src/android/AndroidManifest.xml \
+		--manifest out/apk/AndroidManifest.fdroid.xml \
 		-o out/apk/res.fdroid.apk \
 		--java out/gen_fdroid/
 
@@ -966,11 +989,12 @@ out/apk/classes.dex: $(CLASS_FILES)
 	@$(ANDROID_BUILD_TOOLS)/d8 --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class
 
 PACKAGE_DIRS := \
-	apps/ \
-	core/ \
-	deps/codemirror/ \
-	deps/prettier/ \
-	deps/lit/
+	apps \
+	core \
+	deps/codemirror \
+	deps/prettier \
+	deps/lit \
+	deps/speedscope
 
 RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f -not -name '.*')))
 
@@ -1000,6 +1024,7 @@ out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGET
 		--manifest src/android/AndroidManifest.xml \
 		-R out/res/layout_activity_main.xml.flat \
 		-R out/res/drawable_icon.xml.flat \
+		-R out/res/drawable_logo.xml.flat \
 		--auto-add-overlay
 	@unzip out/aab/temporary.apk -d out/aab/staging/
 	@mkdir -p out/aab/staging/root/deps
@@ -1137,7 +1162,13 @@ out/zsign_build/zsign: $(wildcard deps/zsign/*.cpp deps/zsign/*.h deps/zsign/*.t
 	@cmake -B out/zsign_build deps/zsign
 	@cmake --build out/zsign_build -- COLOR=0 VERBOSE=0 MAKESILENT=-s
 
-out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip $(if $(HAVE_LINUX_IOS),out/zsign_build/zsign)
+ifeq ($(HAVE_LINUX_IOS),1)
+ZSIGN_DEP = out/zsign_build/zsign
+else
+ZSIGN_DEP =
+endif
+
+out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip $(ZSIGN_DEP)
 	@mkdir -p $(dir $@)
 	@cp -v $(filter-out out/zsign%,$<) $@
 	@cp -v out/data.zip $(@D)/
@@ -1217,7 +1248,7 @@ $(LOCAL_DEPS):
 		CROSS_TOP=../../deps/ios_toolchain/target \
 		CROSS_SDK=iPhoneOS18.2.sdk \
 		CC=clang \
-		OPTIONS=-miphoneos-version-min=9.0 \
+		OPTIONS=-miphoneos-version-min=$(IPHONEOS_VERSION_MIN) \
 		tools/ssl-local
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(LOCAL_DEPS)
 endif
@@ -1264,7 +1295,7 @@ endif
 ifeq ($(UNAME_S),Darwin)
 IOS_DEPS := out/openssl/ios/ios64-xcrun/usr/local/lib/libssl.a
 $(IOS_DEPS):
-	+@BUILD_PLATFORM=ios BUILD_TARGET=ios64-xcrun SSL_TARGET=ios64-xcrun OPTIONS="-fPIC -Wno-macro-redefined -miphoneos-version-min=9.0" tools/ssl-local
+	+@BUILD_PLATFORM=ios BUILD_TARGET=ios64-xcrun SSL_TARGET=ios64-xcrun OPTIONS="-fPIC -Wno-macro-redefined -miphoneos-version-min=$(IPHONEOS_VERSION_MIN)" tools/ssl-local
 	+@BUILD_PLATFORM=ios BUILD_TARGET=iossimulator-xcrun SSL_TARGET=iossimulator-xcrun OPTIONS="-fPIC -Wno-macro-redefined" tools/ssl-local
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS)
 endif
@@ -1398,6 +1429,17 @@ dist-test: dist ## Exercise some built distributable files, making sure they wor
 	@rm -rf tildefriends-$(VERSION_NUMBER)
 .PHONY: dist-test
 
+dist-ios: iosrelease-app
+	rm -rfv out/Payload out/tildefriends.ipa
+	mkdir -p out/Payload/tildefriends.app
+	cp -avR out/tildefriends-iosrelease.app/* out/Payload/tildefriends.app/
+	cp src/ios/tildefriends.png out/Payload/tildefriends.app/
+	xcrun -sdk iphoneos actool --compile out/Payload/tildefriends.app/ --platform iphoneos --minimum-deployment-target $(IPHONEOS_VERSION_MIN) --app-icon AppIcon src/ios/icons/Assets.xcassets src/ios/icons/*.png --output-partial-info-plist out/actool.plist
+	cp src/ios/distribution.mobileprovision out/Payload/tildefriends.app/embedded.mobileprovision
+	xcrun -sdk iphoneos codesign -f -s 'Apple Distribution' --entitlements src/ios/Entitlements.plist --generate-entitlement-der out/Payload/tildefriends.app
+	cd out; zip -r tildefriends.ipa Payload; cd ..
+	xcrun -sdk iphoneos altool --upload-app -f out/tildefriends.ipa -t ios -u $$(cat .keys/altool-user) -p $$(cat .keys/altool-password)
+
 ##
 ## Targets for tidying up:
 ##

apps/admin.json

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

apps/admin/script.js

@@ -72,7 +72,7 @@ ${description.value}</textarea
 					</button>
 				</li>
 			`;
-		} else {
+		} else if (description.type != 'hidden') {
 			return html`
 				<li class="w3-row">
 					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${title_case(key)}</label>

apps/admin/w3.css

@@ -1,4 +1,4 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+/* W3.CSS 5.01 March 14 2025 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}
@@ -108,6 +108,10 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-grid{display:grid}.w3-grid-padding{display:grid;gap:16px}.w3-flex{display:flex}
+.w3-text-center{text-align:center}.w3-text-bold,.w3-bold{font-weight:bold}.w3-text-italic,.w3-italic{font-style:italic}
+
 .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%}
@@ -149,9 +153,9 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-amber,.w3-hover-amber:hover,.w3-warning{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-blue,.w3-hover-blue:hover,.w3-info,.w3-primary{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}
@@ -166,15 +170,24 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-red,.w3-hover-red:hover,.w3-danger{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-yellow,.w3-hover-yellow:hover,.w3-note{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-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover,.w3-secondary{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-asphalt,.w3-hover-asphalt:hover{color:#fff!important;background-color:#343a40!important}.w3-crimson,.w3-hover-crimson:hover{color:#fff!important;background-color:#a20025!important}
+.w3-cobalt,w3-hover-cobalt:hover{color:#fff!important;background-color:#0050ef!important}
+.w3-emerald,.w3-hover-emerald:hover,.w3-success{color:#fff!important;background-color:#008a00!important}
+.w3-olive,.w3-hover-olive:hover{color:#fff!important;background-color:#6d8764!important}
+.w3-paper,.w3-hover-paper:hover{color:#000!important;background-color:#f8f9fa!important}.w3-sienna,.w3-hover-sienna:hover{color:#fff!important;background-color:#a0522d!important}
+.w3-taupe,.w3-hover-taupe:hover{color:#fff!important;background-color:#87794e!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}
@@ -232,4 +245,4 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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}
+.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/apps/w3.css

@@ -1,4 +1,4 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+/* W3.CSS 5.01 March 14 2025 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}
@@ -108,6 +108,10 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-grid{display:grid}.w3-grid-padding{display:grid;gap:16px}.w3-flex{display:flex}
+.w3-text-center{text-align:center}.w3-text-bold,.w3-bold{font-weight:bold}.w3-text-italic,.w3-italic{font-style:italic}
+
 .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%}
@@ -149,9 +153,9 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-amber,.w3-hover-amber:hover,.w3-warning{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-blue,.w3-hover-blue:hover,.w3-info,.w3-primary{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}
@@ -166,15 +170,24 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-red,.w3-hover-red:hover,.w3-danger{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-yellow,.w3-hover-yellow:hover,.w3-note{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-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover,.w3-secondary{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-asphalt,.w3-hover-asphalt:hover{color:#fff!important;background-color:#343a40!important}.w3-crimson,.w3-hover-crimson:hover{color:#fff!important;background-color:#a20025!important}
+.w3-cobalt,w3-hover-cobalt:hover{color:#fff!important;background-color:#0050ef!important}
+.w3-emerald,.w3-hover-emerald:hover,.w3-success{color:#fff!important;background-color:#008a00!important}
+.w3-olive,.w3-hover-olive:hover{color:#fff!important;background-color:#6d8764!important}
+.w3-paper,.w3-hover-paper:hover{color:#000!important;background-color:#f8f9fa!important}.w3-sienna,.w3-hover-sienna:hover{color:#fff!important;background-color:#a0522d!important}
+.w3-taupe,.w3-hover-taupe:hover{color:#fff!important;background-color:#87794e!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}
@@ -232,4 +245,4 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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}
+.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/w3.css

@@ -1,4 +1,4 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+/* W3.CSS 5.01 March 14 2025 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}
@@ -108,6 +108,10 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-grid{display:grid}.w3-grid-padding{display:grid;gap:16px}.w3-flex{display:flex}
+.w3-text-center{text-align:center}.w3-text-bold,.w3-bold{font-weight:bold}.w3-text-italic,.w3-italic{font-style:italic}
+
 .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%}
@@ -149,9 +153,9 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-amber,.w3-hover-amber:hover,.w3-warning{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-blue,.w3-hover-blue:hover,.w3-info,.w3-primary{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}
@@ -166,15 +170,24 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-red,.w3-hover-red:hover,.w3-danger{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-yellow,.w3-hover-yellow:hover,.w3-note{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-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover,.w3-secondary{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-asphalt,.w3-hover-asphalt:hover{color:#fff!important;background-color:#343a40!important}.w3-crimson,.w3-hover-crimson:hover{color:#fff!important;background-color:#a20025!important}
+.w3-cobalt,w3-hover-cobalt:hover{color:#fff!important;background-color:#0050ef!important}
+.w3-emerald,.w3-hover-emerald:hover,.w3-success{color:#fff!important;background-color:#008a00!important}
+.w3-olive,.w3-hover-olive:hover{color:#fff!important;background-color:#6d8764!important}
+.w3-paper,.w3-hover-paper:hover{color:#000!important;background-color:#f8f9fa!important}.w3-sienna,.w3-hover-sienna:hover{color:#fff!important;background-color:#a0522d!important}
+.w3-taupe,.w3-hover-taupe:hover{color:#fff!important;background-color:#87794e!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}
@@ -232,4 +245,4 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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}
+.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/room/app.js

@@ -1,7 +1,9 @@
 async function main() {
-	let host = core.url.match(/.*\/\/(.*?)\//)[1];
+	print(core.url);
+	let host = core.url.match(/.*?\/\/([^:/]*)/)[1];
+	let port = await ssb.port();
 	let id = (await ssb.getServerIdentity()).substring(1);
-	let room = `net:${host}:${ssb.port}~shs:${id}:SSB+Room+SK3TLYC2T86EHQCUHBUHASCASE18JBV24=`;
+	let room = `net:${host}:${port}~shs:${id}:SSB+Room+SK3TLYC2T86EHQCUHBUHASCASE18JBV24=`;
 	await app.setDocument(`
 		<body style="color: #fff">
 			<h1>Server</h1>

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦀",
-	"previous": "&weo9lucKMSz3xzM6l3knRepNnyRIzKlaJnP9NDJAk+g=.sha256"
+	"previous": "&wOd/+1l5wpywBlfxC1Lm0i+HhYidrgSfrn9LRX7qy2w=.sha256"
 }

apps/ssb/tf-compose.js

@@ -255,10 +255,12 @@ class TfComposeElement extends LitElement {
 		let self = this;
 		let input = document.createElement('input');
 		input.type = 'file';
-		input.onchange = function (event) {
+		input.addEventListener('change', function (event) {
+			input.parentNode.removeChild(input);
 			let file = event.target.files[0];
 			self.add_file(file);
-		};
+		});
+		document.body.appendChild(input);
 		input.click();
 	}
 

apps/ssb/tf-profile.js

@@ -139,7 +139,8 @@ class TfProfileElement extends LitElement {
 		let self = this;
 		let input = document.createElement('input');
 		input.type = 'file';
-		input.onchange = function (event) {
+		input.addEventListener('change', function (event) {
+			input.parentNode.removeChild(input);
 			let file = event.target.files[0];
 			file
 				.arrayBuffer()
@@ -154,7 +155,8 @@ class TfProfileElement extends LitElement {
 				.catch(function (e) {
 					alert(e.message);
 				});
-		};
+		});
+		document.body.appendChild(input);
 		input.click();
 	}
 

apps/ssb/tf-styles.js

@@ -48,7 +48,7 @@ const tf = css`
 
 // prettier-ignore
 const w3 = css`
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+/* W3.CSS 5.01 March 14 2025 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}
@@ -88,7 +88,7 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-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%}
@@ -136,7 +136,7 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-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}}
@@ -158,6 +158,10 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-grid{display:grid}.w3-grid-padding{display:grid;gap:16px}.w3-flex{display:flex}
+.w3-text-center{text-align:center}.w3-text-bold,.w3-bold{font-weight:bold}.w3-text-italic,.w3-italic{font-style:italic}
+
 .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%}
@@ -199,9 +203,9 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-amber,.w3-hover-amber:hover,.w3-warning{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-blue,.w3-hover-blue:hover,.w3-info,.w3-primary{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}
@@ -216,15 +220,24 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-red,.w3-hover-red:hover,.w3-danger{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-yellow,.w3-hover-yellow:hover,.w3-note{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-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover,.w3-secondary{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-asphalt,.w3-hover-asphalt:hover{color:#fff!important;background-color:#343a40!important}.w3-crimson,.w3-hover-crimson:hover{color:#fff!important;background-color:#a20025!important}
+.w3-cobalt,w3-hover-cobalt:hover{color:#fff!important;background-color:#0050ef!important}
+.w3-emerald,.w3-hover-emerald:hover,.w3-success{color:#fff!important;background-color:#008a00!important}
+.w3-olive,.w3-hover-olive:hover{color:#fff!important;background-color:#6d8764!important}
+.w3-paper,.w3-hover-paper:hover{color:#000!important;background-color:#f8f9fa!important}.w3-sienna,.w3-hover-sienna:hover{color:#fff!important;background-color:#a0522d!important}
+.w3-taupe,.w3-hover-taupe:hover{color:#fff!important;background-color:#87794e!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}

apps/ssb/tf-tab-connections.js

@@ -103,6 +103,23 @@ class TfTabConnectionsElement extends LitElement {
 		</div>`;
 	}
 
+	render_progress(name, value, max) {
+		if (max && value != max) {
+			return html`
+				<div class="w3-theme-d1 w3-small">
+					<div
+						class="w3-container w3-theme-l1"
+						style="width: ${Math.floor(
+							(100.0 * value) / max
+						)}%; text-wrap: nowrap"
+					>
+						${name} ${value} / ${max} (${Math.round((100.0 * value) / max)}%)
+					</div>
+				</div>
+			`;
+		}
+	}
+
 	render_broadcast(connection) {
 		let self = this;
 		return html`
@@ -154,6 +171,16 @@ class TfTabConnectionsElement extends LitElement {
 				: undefined}
 			${connection.flags.one_shot ? '🔃' : undefined}
 			<tf-user id=${connection.id} .users=${this.users}></tf-user>
+			${this.render_progress(
+				'recv',
+				connection.progress.in.total - connection.progress.in.current,
+				connection.progress.in.total
+			)}
+			${this.render_progress(
+				'send',
+				connection.progress.out.total - connection.progress.out.current,
+				connection.progress.out.total
+			)}
 			${connection.tunnel !== undefined
 				? '🚇'
 				: html`(${connection.host}:${connection.port})`}
@@ -206,6 +233,21 @@ class TfTabConnectionsElement extends LitElement {
 			});
 	}
 
+	toggle_accordian(id) {
+		let element = this.renderRoot.getElementById(id);
+		element.classList.toggle('w3-hide');
+	}
+
+	valid_connections() {
+		return this.connections.filter((x) => x.tunnel === undefined);
+	}
+
+	valid_broadcasts() {
+		return this.broadcasts
+			.filter((x) => x.address)
+			.filter((x) => this.connections.map((c) => c.id).indexOf(x.pubkey) == -1);
+	}
+
 	render() {
 		let self = this;
 		return html`
@@ -220,27 +262,33 @@ class TfTabConnectionsElement extends LitElement {
 				>
 					Connect
 				</button>
-				<h2>Broadcasts</h2>
-				<ul class="w3-ul w3-border">
-					${this.broadcasts
-						.filter((x) => x.address)
-						.filter(
-							(x) => self.connections.map((c) => c.id).indexOf(x.pubkey) == -1
-						)
-						.map((x) => self.render_broadcast(x))}
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('connections')}
+				>
+					Connections (${this.valid_connections().length})
+				</h2>
+				<ul class="w3-ul w3-border" id="connections">
+					${this.valid_connections().map(
+						(x) => html` <li class="w3-bar">${this.render_connection(x)}</li> `
+					)}
 				</ul>
-				<h2>Connections</h2>
-				<ul class="w3-ul w3-border">
-					${this.connections
-						.filter((x) => x.tunnel === undefined)
-						.map(
-							(x) => html`
-								<li class="w3-bar">${this.render_connection(x)}</li>
-							`
-						)}
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('broadcasts')}
+				>
+					Broadcasts (${this.valid_broadcasts().length})
+				</h2>
+				<ul class="w3-ul w3-border w3-hide" id="broadcasts">
+					${this.valid_broadcasts().map((x) => self.render_broadcast(x))}
 				</ul>
-				<h2>Stored Connections</h2>
-				<ul class="w3-ul w3-border">
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('stored_connections')}
+				>
+					Stored Connections (${this.stored_connections.length})
+				</h2>
+				<ul class="w3-ul w3-border w3-hide" id="stored_connections">
 					${this.stored_connections.map(
 						(x) => html`
 							<li>
@@ -267,8 +315,13 @@ class TfTabConnectionsElement extends LitElement {
 						`
 					)}
 				</ul>
-				<h2>Local Accounts</h2>
-				<div class="w3-container">
+				<h2
+					class="w3-button w3-block w3-theme-d1"
+					@click=${() => self.toggle_accordian('local_accounts')}
+				>
+					Local Accounts (${this.identities.length})
+				</h2>
+				<div class="w3-container w3-hide" id="local_accounts">
 					${this.identities.map(
 						(x) =>
 							html`<div

apps/ssb/tf-user.js

@@ -21,7 +21,9 @@ class TfUserElement extends LitElement {
 	render() {
 		let user = this.users[this.id];
 		let shape =
-			!user?.follow_depth || user.follow_depth >= 2 ? 'w3-circle' : 'w3-round';
+			user?.follow_depth === undefined || user.follow_depth >= 2
+				? 'w3-circle'
+				: 'w3-round';
 		let image = html`<span
 			class=${'w3-theme-l4 ' + shape}
 			style="display: inline-block; width: 2em; height: 2em; text-align: center; line-height: 2em"

apps/welcome/w3.css

@@ -1,4 +1,4 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+/* W3.CSS 5.01 March 14 2025 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}
@@ -108,6 +108,10 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-grid{display:grid}.w3-grid-padding{display:grid;gap:16px}.w3-flex{display:flex}
+.w3-text-center{text-align:center}.w3-text-bold,.w3-bold{font-weight:bold}.w3-text-italic,.w3-italic{font-style:italic}
+
 .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%}
@@ -149,9 +153,9 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-amber,.w3-hover-amber:hover,.w3-warning{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-blue,.w3-hover-blue:hover,.w3-info,.w3-primary{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}
@@ -166,15 +170,24 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-red,.w3-hover-red:hover,.w3-danger{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-yellow,.w3-hover-yellow:hover,.w3-note{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-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover,.w3-secondary{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-asphalt,.w3-hover-asphalt:hover{color:#fff!important;background-color:#343a40!important}.w3-crimson,.w3-hover-crimson:hover{color:#fff!important;background-color:#a20025!important}
+.w3-cobalt,w3-hover-cobalt:hover{color:#fff!important;background-color:#0050ef!important}
+.w3-emerald,.w3-hover-emerald:hover,.w3-success{color:#fff!important;background-color:#008a00!important}
+.w3-olive,.w3-hover-olive:hover{color:#fff!important;background-color:#6d8764!important}
+.w3-paper,.w3-hover-paper:hover{color:#000!important;background-color:#f8f9fa!important}.w3-sienna,.w3-hover-sienna:hover{color:#fff!important;background-color:#a0522d!important}
+.w3-taupe,.w3-hover-taupe:hover{color:#fff!important;background-color:#87794e!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}
@@ -232,4 +245,4 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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}
+.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}

core/app.js

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

core/client.js

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

core/core.js

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

core/w3.css

@@ -1,4 +1,4 @@
-/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+/* W3.CSS 5.01 March 14 2025 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}
@@ -108,6 +108,10 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-grid{display:grid}.w3-grid-padding{display:grid;gap:16px}.w3-flex{display:flex}
+.w3-text-center{text-align:center}.w3-text-bold,.w3-bold{font-weight:bold}.w3-text-italic,.w3-italic{font-style:italic}
+
 .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%}
@@ -149,9 +153,9 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-amber,.w3-hover-amber:hover,.w3-warning{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-blue,.w3-hover-blue:hover,.w3-info,.w3-primary{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}
@@ -166,15 +170,24 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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-red,.w3-hover-red:hover,.w3-danger{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-yellow,.w3-hover-yellow:hover,.w3-note{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-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover,.w3-secondary{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-asphalt,.w3-hover-asphalt:hover{color:#fff!important;background-color:#343a40!important}.w3-crimson,.w3-hover-crimson:hover{color:#fff!important;background-color:#a20025!important}
+.w3-cobalt,w3-hover-cobalt:hover{color:#fff!important;background-color:#0050ef!important}
+.w3-emerald,.w3-hover-emerald:hover,.w3-success{color:#fff!important;background-color:#008a00!important}
+.w3-olive,.w3-hover-olive:hover{color:#fff!important;background-color:#6d8764!important}
+.w3-paper,.w3-hover-paper:hover{color:#000!important;background-color:#f8f9fa!important}.w3-sienna,.w3-hover-sienna:hover{color:#fff!important;background-color:#a0522d!important}
+.w3-taupe,.w3-hover-taupe:hover{color:#fff!important;background-color:#87794e!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}
@@ -232,4 +245,4 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .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}
+.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}

default.nix

@@ -1,4 +1,8 @@
 # How to upgrade to a newer version
+# - On the june and december release, you'll have to update nixpkgs to the current branch
+# Change `nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";`
+# to the latest release (see https://nixos.org/)
+# - Run `$ nix flake update`
 # - Comment `src.hash`
 # - Change `version`
 # - Run `$ nix build`
@@ -21,14 +25,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "tildefriends";
-  version = "0.0.27.1";
+  version = "0.0.28";
 
   src = pkgs.fetchFromGitea {
     domain = "dev.tildefriends.net";
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-3t1m9ZomQF3DteWyALJWrnCq0EAROEK8shKXh6Ao38c=";
+    hash = "sha256-vcLJCXgIrjC37t9oavK2QMRcMJljghuzKDYxQ4nyTcE=";
     fetchSubmodules = true;
   };
 

deps/codemirror_src/package-lock.json

@@ -115,9 +115,9 @@
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.9",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.9.tgz",
-      "integrity": "sha512-7DdQ9aaZMMxuWB1u6IIFWWuK9NocVZwvo4nG8QjJTS6oZGvteoLSiXw3EbVZVlO08Ri2ltO89JVInMpfcJxhtg==",
+      "version": "6.5.10",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.10.tgz",
+      "integrity": "sha512-RMdPdmsrUf53pb2VwflKGHEe1XVM07hI7vV2ntgw1dmqhimpatSJKva4VA9h4TLUDOD4EIF02201oZurpnEFsg==",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -144,9 +144,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.36.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.2.tgz",
-      "integrity": "sha512-DZ6ONbs8qdJK0fdN7AB82CgI6tYXf4HWk1wSVa0+9bhVznCuuvhQtX8bFBoy3dv8rZSQqUd8GvhVAcielcidrA==",
+      "version": "6.36.4",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.4.tgz",
+      "integrity": "sha512-ZQ0V5ovw/miKEXTvjgzRyjnrk9TwriUB1k4R5p7uNnHR9Hus+D1SXHGdJshijEzPFjU25xea/7nhIeSqYFKdbA==",
       "dependencies": {
         "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
@@ -344,9 +344,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.6.tgz",
-      "integrity": "sha512-+GcCXtOQoWuC7hhX1P00LqjjIiS/iOouHXhMdiDSnq/1DGTox4SpUvO52Xm+div6+106r+TcvOeo/cxvyEyTgg==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.9.tgz",
+      "integrity": "sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==",
       "cpu": [
         "arm"
       ],
@@ -356,9 +356,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.6.tgz",
-      "integrity": "sha512-E8+2qCIjciYUnCa1AiVF1BkRgqIGW9KzJeesQqVfyRITGQN+dFuoivO0hnro1DjT74wXLRZ7QF8MIbz+luGaJA==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.9.tgz",
+      "integrity": "sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==",
       "cpu": [
         "arm64"
       ],
@@ -368,9 +368,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.6.tgz",
-      "integrity": "sha512-z9Ib+OzqN3DZEjX7PDQMHEhtF+t6Mi2z/ueChQPLS/qUMKY7Ybn5A2ggFoKRNRh1q1T03YTQfBTQCJZiepESAg==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.9.tgz",
+      "integrity": "sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==",
       "cpu": [
         "arm64"
       ],
@@ -380,9 +380,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.6.tgz",
-      "integrity": "sha512-PShKVY4u0FDAR7jskyFIYVyHEPCPnIQY8s5OcXkdU8mz3Y7eXDJPdyM/ZWjkYdR2m0izD9HHWA8sGcXn+Qrsyg==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.9.tgz",
+      "integrity": "sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==",
       "cpu": [
         "x64"
       ],
@@ -392,9 +392,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.6.tgz",
-      "integrity": "sha512-YSwyOqlDAdKqs0iKuqvRHLN4SrD2TiswfoLfvYXseKbL47ht1grQpq46MSiQAx6rQEN8o8URtpXARCpqabqxGQ==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.9.tgz",
+      "integrity": "sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==",
       "cpu": [
         "arm64"
       ],
@@ -404,9 +404,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.6.tgz",
-      "integrity": "sha512-HEP4CgPAY1RxXwwL5sPFv6BBM3tVeLnshF03HMhJYCNc6kvSqBgTMmsEjb72RkZBAWIqiPUyF1JpEBv5XT9wKQ==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.9.tgz",
+      "integrity": "sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==",
       "cpu": [
         "x64"
       ],
@@ -416,9 +416,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.6.tgz",
-      "integrity": "sha512-88fSzjC5xeH9S2Vg3rPgXJULkHcLYMkh8faix8DX4h4TIAL65ekwuQMA/g2CXq8W+NJC43V6fUpYZNjaX3+IIg==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.9.tgz",
+      "integrity": "sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==",
       "cpu": [
         "arm"
       ],
@@ -428,9 +428,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.6.tgz",
-      "integrity": "sha512-wM4ztnutBqYFyvNeR7Av+reWI/enK9tDOTKNF+6Kk2Q96k9bwhDDOlnCUNRPvromlVXo04riSliMBs/Z7RteEg==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.9.tgz",
+      "integrity": "sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==",
       "cpu": [
         "arm"
       ],
@@ -440,9 +440,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.6.tgz",
-      "integrity": "sha512-9RyprECbRa9zEjXLtvvshhw4CMrRa3K+0wcp3KME0zmBe1ILmvcVHnypZ/aIDXpRyfhSYSuN4EPdCCj5Du8FIA==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.9.tgz",
+      "integrity": "sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==",
       "cpu": [
         "arm64"
       ],
@@ -452,9 +452,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.6.tgz",
-      "integrity": "sha512-qTmklhCTyaJSB05S+iSovfo++EwnIEZxHkzv5dep4qoszUMX5Ca4WM4zAVUMbfdviLgCSQOu5oU8YoGk1s6M9Q==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.9.tgz",
+      "integrity": "sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==",
       "cpu": [
         "arm64"
       ],
@@ -464,9 +464,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.6.tgz",
-      "integrity": "sha512-4Qmkaps9yqmpjY5pvpkfOerYgKNUGzQpFxV6rnS7c/JfYbDSU0y6WpbbredB5cCpLFGJEqYX40WUmxMkwhWCjw==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.9.tgz",
+      "integrity": "sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==",
       "cpu": [
         "loong64"
       ],
@@ -476,9 +476,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.6.tgz",
-      "integrity": "sha512-Zsrtux3PuaxuBTX/zHdLaFmcofWGzaWW1scwLU3ZbW/X+hSsFbz9wDIp6XvnT7pzYRl9MezWqEqKy7ssmDEnuQ==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.9.tgz",
+      "integrity": "sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==",
       "cpu": [
         "ppc64"
       ],
@@ -488,9 +488,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.6.tgz",
-      "integrity": "sha512-aK+Zp+CRM55iPrlyKiU3/zyhgzWBxLVrw2mwiQSYJRobCURb781+XstzvA8Gkjg/hbdQFuDw44aUOxVQFycrAg==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.9.tgz",
+      "integrity": "sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==",
       "cpu": [
         "riscv64"
       ],
@@ -500,9 +500,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.6.tgz",
-      "integrity": "sha512-WoKLVrY9ogmaYPXwTH326+ErlCIgMmsoRSx6bO+l68YgJnlOXhygDYSZe/qbUJCSiCiZAQ+tKm88NcWuUXqOzw==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.9.tgz",
+      "integrity": "sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==",
       "cpu": [
         "s390x"
       ],
@@ -512,9 +512,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz",
-      "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.9.tgz",
+      "integrity": "sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==",
       "cpu": [
         "x64"
       ],
@@ -524,9 +524,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz",
-      "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.9.tgz",
+      "integrity": "sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==",
       "cpu": [
         "x64"
       ],
@@ -536,9 +536,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.6.tgz",
-      "integrity": "sha512-3/q1qUsO/tLqGBaD4uXsB6coVGB3usxw3qyeVb59aArCgedSF66MPdgRStUd7vbZOsko/CgVaY5fo2vkvPLWiA==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.9.tgz",
+      "integrity": "sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==",
       "cpu": [
         "arm64"
       ],
@@ -548,9 +548,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.6.tgz",
-      "integrity": "sha512-oLHxuyywc6efdKVTxvc0135zPrRdtYVjtVD5GUm55I3ODxhU/PwkQFD97z16Xzxa1Fz0AEe4W/2hzRtd+IfpOA==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.9.tgz",
+      "integrity": "sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==",
       "cpu": [
         "ia32"
       ],
@@ -560,9 +560,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.6.tgz",
-      "integrity": "sha512-0PVwmgzZ8+TZ9oGBmdZoQVXflbvuwzN/HRclujpl4N/q3i+y0lqLw8n1bXA8ru3sApDjlmONaNAuYr38y1Kr9w==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.9.tgz",
+      "integrity": "sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==",
       "cpu": [
         "x64"
       ],
@@ -582,9 +582,9 @@
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q=="
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -733,9 +733,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz",
-      "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
+      "version": "4.34.9",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.9.tgz",
+      "integrity": "sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==",
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -747,25 +747,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.34.6",
-        "@rollup/rollup-android-arm64": "4.34.6",
-        "@rollup/rollup-darwin-arm64": "4.34.6",
-        "@rollup/rollup-darwin-x64": "4.34.6",
-        "@rollup/rollup-freebsd-arm64": "4.34.6",
-        "@rollup/rollup-freebsd-x64": "4.34.6",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.34.6",
-        "@rollup/rollup-linux-arm-musleabihf": "4.34.6",
-        "@rollup/rollup-linux-arm64-gnu": "4.34.6",
-        "@rollup/rollup-linux-arm64-musl": "4.34.6",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.34.6",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6",
-        "@rollup/rollup-linux-riscv64-gnu": "4.34.6",
-        "@rollup/rollup-linux-s390x-gnu": "4.34.6",
-        "@rollup/rollup-linux-x64-gnu": "4.34.6",
-        "@rollup/rollup-linux-x64-musl": "4.34.6",
-        "@rollup/rollup-win32-arm64-msvc": "4.34.6",
-        "@rollup/rollup-win32-ia32-msvc": "4.34.6",
-        "@rollup/rollup-win32-x64-msvc": "4.34.6",
+        "@rollup/rollup-android-arm-eabi": "4.34.9",
+        "@rollup/rollup-android-arm64": "4.34.9",
+        "@rollup/rollup-darwin-arm64": "4.34.9",
+        "@rollup/rollup-darwin-x64": "4.34.9",
+        "@rollup/rollup-freebsd-arm64": "4.34.9",
+        "@rollup/rollup-freebsd-x64": "4.34.9",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.34.9",
+        "@rollup/rollup-linux-arm-musleabihf": "4.34.9",
+        "@rollup/rollup-linux-arm64-gnu": "4.34.9",
+        "@rollup/rollup-linux-arm64-musl": "4.34.9",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.34.9",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.9",
+        "@rollup/rollup-linux-riscv64-gnu": "4.34.9",
+        "@rollup/rollup-linux-s390x-gnu": "4.34.9",
+        "@rollup/rollup-linux-x64-gnu": "4.34.9",
+        "@rollup/rollup-linux-x64-musl": "4.34.9",
+        "@rollup/rollup-win32-arm64-msvc": "4.34.9",
+        "@rollup/rollup-win32-ia32-msvc": "4.34.9",
+        "@rollup/rollup-win32-x64-msvc": "4.34.9",
         "fsevents": "~2.3.2"
       }
     },
@@ -840,9 +840,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.38.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.38.2.tgz",
-      "integrity": "sha512-w8CXxxbFA5zfNsR/i8HZq5bvn18AK0O9jj7hyo1YqkovLxEFa0uP0LCVGZRqiRaKRFxXhELBp8SteeAjEnfeJg==",
+      "version": "5.39.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",

deps/speedscope/index.html

@@ -11,7 +11,7 @@
     <link rel="icon" type="image/x-icon" href="favicon-FOKUP5Y5.ico">
   </head>
   <body>
-    <script src="speedscope-CAEVGCWN.js"></script>
+    <script src="speedscope-VHEG2FVF.js"></script>
     
     
     

deps/speedscope/release.txt

@@ -1,3 +1,3 @@
-speedscope@1.22.0
-Thu Jan 16 16:49:47 PST 2025
-bd7b44a0a7d63375ee6ea0a0d1b96e65a456642f
+speedscope@1.22.2
+Sat Feb 15 13:02:38 PST 2025
+1c254dcb3e2b4f6d921340d20e972d9d27b788f4

deps/sqlite/sqlite3.c

@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.49.0.  By combining all the individual C code files into this
+** version 3.49.1.  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
-** 4a7dd425dc2a0e5082a9049c9b4a9d4f199a with changes in files:
+** 873d4e274b4988d260ba8354a9718324a1c2 with changes in files:
 **
 **    
 */
@@ -465,9 +465,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.49.0"
-#define SQLITE_VERSION_NUMBER 3049000
-#define SQLITE_SOURCE_ID      "2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde"
+#define SQLITE_VERSION        "3.49.1"
+#define SQLITE_VERSION_NUMBER 3049001
+#define SQLITE_SOURCE_ID      "2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -131067,7 +131067,7 @@ static void concatFuncCore(
   for(i=0; i<argc; i++){
     n += sqlite3_value_bytes(argv[i]);
   }
-  n += (argc-1)*nSep;
+  n += (argc-1)*(i64)nSep;
   z = sqlite3_malloc64(n+1);
   if( z==0 ){
     sqlite3_result_error_nomem(context);
@@ -182305,7 +182305,7 @@ SQLITE_API int sqlite3_config(int op, ...){
 static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
 #ifndef SQLITE_OMIT_LOOKASIDE
   void *pStart;
-  sqlite3_int64 szAlloc = sz*(sqlite3_int64)cnt;
+  sqlite3_int64 szAlloc;
   int nBig;   /* Number of full-size slots */
   int nSm;    /* Number smaller LOOKASIDE_SMALL-byte slots */
 
@@ -182324,7 +182324,9 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
   */
   sz = ROUNDDOWN8(sz);  /* IMP: R-33038-09382 */
   if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0;
+  if( sz>65528 ) sz = 65528;
   if( cnt<0 ) cnt = 0;
+  szAlloc = (i64)sz*(i64)cnt;
   if( sz==0 || cnt==0 ){
     sz = 0;
     pStart = 0;
@@ -182339,10 +182341,10 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
 #ifndef SQLITE_OMIT_TWOSIZE_LOOKASIDE
   if( sz>=LOOKASIDE_SMALL*3 ){
     nBig = szAlloc/(3*LOOKASIDE_SMALL+sz);
-    nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
+    nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
   }else if( sz>=LOOKASIDE_SMALL*2 ){
     nBig = szAlloc/(LOOKASIDE_SMALL+sz);
-    nSm = (szAlloc - sz*nBig)/LOOKASIDE_SMALL;
+    nSm = (szAlloc - (i64)sz*(i64)nBig)/LOOKASIDE_SMALL;
   }else
 #endif /* SQLITE_OMIT_TWOSIZE_LOOKASIDE */
   if( sz>0 ){
@@ -255872,7 +255874,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70", -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.49.0"
-#define SQLITE_VERSION_NUMBER 3049000
-#define SQLITE_SOURCE_ID      "2025-02-06 11:55:18 4a7dd425dc2a0e5082a9049c9b4a9d4f199a71583d014c24b4cfe276c5a77cde"
+#define SQLITE_VERSION        "3.49.1"
+#define SQLITE_VERSION_NUMBER 3049001
+#define SQLITE_SOURCE_ID      "2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers

docs/release_checklist.md

@@ -4,12 +4,17 @@
 - run the tests
 - format + prettier
 - update metadata/en-US/changelogs
-- git tag
+- git tag v1.2.3
+- git tag -f latest_release
 - push
-- make dist
 - make a release on gitea
 - upload the artifacts
+- upload the AppImage and zsyncmake
+- upload to Google
+- upload to Apple with dist-ios on macos
 - nix
+  - june and december: update release version
+  - run `nix flake update`
   - comment out the hash in default.nix
   - update the version
   - run `nix-build`

docs/upgrading.md

@@ -0,0 +1,18 @@
+# Upgrading
+
+Tilde Friends can be upgraded simply by running a new executable against an
+existing database.
+
+Tilde Friends writes all data to a `db.sqlite` file, either in
+`~/.local/share/tildefriends/` or in the working directory where it is run,
+depending on the platform and whether each one already exists. Run with
+`tildefriends run -d DB_PATH` to specify the path to the database explicitly.
+
+This file can be copied and moved across machines as needed like any [sqlite3
+database](https://www.sqlite.org/onefile.html).
+
+Schema changes and compatibility breaks have been rare, by design. In general,
+upgrading is not expected to require any manual intervention and likely does
+not involve any automatic migration, either. Downgrading is not well-supported
+but will probably just work excepting rare changes that will be called out in
+the changelog.

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717281328,
-        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
+        "lastModified": 1739758141,
+        "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
+        "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "Tilde Friends is a platform for making, running, and sharing web applications.";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

metadata/en-US/changelogs/33.txt

@@ -0,0 +1,15 @@
+* Allow specifying all global settings from the command-line (CLI usage changed).
+* Replication improvements.
+* An iOS build is on TestFlight.
+* macOS targets are debug and release like everywhere else.
+* Running from a subdirectory is fine.
+* Patchwork compatibility improvements.
+* Invite fixes.
+* Follow/block UI fixes.
+* Mobile automatically logs in.
+* Updates:
+  * CodeMirror
+  * OpenSSL 3.4.1
+  * libbacktrace
+  * speedscope 1.22.2
+  * sqlite 3.49.1

metadata/en-US/changelogs/34.txt

@@ -0,0 +1,11 @@
+* The connections tab now shows replication progress.
+* Replication performance and thoroughness improvements.
+* Bind only to localhost on mobile, configurable.
+* Request blobs referenced by referenced blobs, and improve performance of that
+  query.
+* Fix file upload on iOS.
+* Add rough back/forward/refresh buttons on iOS.
+* Other crash fixes and performance improvements.
+* Updates:
+  * CodeMirror
+  * w3.css

package-lock.json

@@ -11,9 +11,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.0.tgz",
-			"integrity": "sha512-quyMrVt6svPS7CjQ9gKb3GLEX/rl3BCL2oa/QkNcXv4YNVBC9olt3s+H7ukto06q7B1Qz46PbrKLO34PR6vXcA==",
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+			"integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
 			"bin": {
 				"prettier": "bin/prettier.cjs"
 			},

src/android/AndroidManifest.xml

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

src/android/res/drawable/icon.xml

@@ -1,55 +1,16 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="65dp"
-    android:height="65dp"
-    android:viewportWidth="61"
-    android:viewportHeight="65">
-  <path
-      android:pathData="M6,0h49a8,8 45,0 1,8 8v49a8,8 135,0 1,-8 8H6a8,8 45,0 1,-8 -8V8a8,8 135,0 1,8 -8Z"
-      android:strokeWidth=".712717"
-      android:fillColor="#0af"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m1.6762,36.6891v-4.0039q2.0703,-2.3438 5.4297,-2.3438 1.1719,0 2.4609,0.3516 1.2891,0.332 3.6719,1.3477 1.3477,0.5664 2.0117,0.7422 0.6836,0.1758 1.3672,0.1758 1.2695,0 2.6172,-0.7617 1.3672,-0.7617 2.4219,-1.9141v4.1406q-1.25,1.1719 -2.5391,1.6992 -1.2695,0.5273 -2.8711,0.5273 -1.1719,0 -2.2461,-0.2734 -1.0547,-0.2734 -3.3789,-1.3086 -2.3047,-1.0352 -3.8477,-1.0352 -1.25,0 -2.3633,0.5469 -1.0938,0.5273 -2.7344,2.1094z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M42.4653,32.2273m-16.7723,0a16.7723,16.7723 0,1 1,33.5446 0a16.7723,16.7723 0,1 1,-33.5446 0"
-      android:fillColor="#fcea2b"/>
-  <path
-      android:pathData="M49.2697,34.097c2.8899,0 5.2344,-2.0871 5.2344,-4.6591 0,-1.2871 0.3267,-2.5742 -0.6213,-3.4164 -0.9473,-0.843 -3.1685,-1.2426 -4.6131,-1.2426 -1.7188,0 -3.7504,0.1043 -4.7043,1.2426 -0.6519,0.7766 -0.5302,2.3722 -0.5302,3.4164 0,2.572 2.343,4.6591 5.2344,4.6591zM34.9819,34.097c2.8899,0 5.2351,-2.0871 5.2351,-4.6591 0,-1.2871 0.326,-2.5742 -0.6213,-3.4164 -0.948,-0.843 -3.1685,-1.2426 -4.6138,-1.2426 -1.7181,0 -3.7497,0.1043 -4.7043,1.2426 -0.6512,0.7766 -0.5302,2.3722 -0.5302,3.4164 0,2.572 2.343,4.6591 5.2344,4.6591z"
-      android:fillColor="#3f3f3f"/>
-  <path
-      android:pathData="M42.3829,32.2681m-16.7723,0a16.7723,16.7723 0,1 1,33.5446 0a16.7723,16.7723 0,1 1,-33.5446 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M49.5403,38.6897c-4.794,2.5705 -10.242,2.6675 -14.3148,0M29.983,28.1903s-0.695,6.2349 5.0025,5.774c1.9106,-0.1546 5.7004,-0.474 5.7369,-6.0832 0.0036,-0.509 -0.0051,-1.1668 -0.5907,-1.9179 -0.7766,-0.9969 -2.6048,-1.4373 -7.2522,-1.037 0,0 -2.5129,-0.0729 -2.8965,3.264z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m30.0341,27.8016 l-0.3158,-2.459 2.7951,-0.3843M54.6733,28.1903s0.695,6.2349 -5.0025,5.774c-1.9106,-0.1546 -5.7004,-0.474 -5.7376,-6.0832 -0.0029,-0.509 0.0058,-1.1668 0.5914,-1.9179 0.7766,-0.9969 2.6048,-1.4373 7.2522,-1.037 0,0 2.5129,-0.0729 2.8965,3.264z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M39.1874,25.2383s3.0073,1.8479 6.3129,0M40.6685,28.813s1.6058,-2.7353 3.3078,0M54.6172,27.803l0.3158,-2.4582 -2.7951,-0.385"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M40.974,27.8716s1.309,-2.7346 2.6974,0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"
-      android:strokeLineCap="round"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:gravity="center"
+        android:width="256dp"
+        android:height="256dp">
+        <shape>
+            <solid
+                android:color="#0af"/>
+        </shape>
+    </item>
+    <item android:drawable="@drawable/logo"
+        android:width="65dp"
+        android:height="65dp"
+        android:gravity="center"/>
+</layer-list>

src/android/res/drawable/icon_fdroid.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:gravity="center"
+        android:width="256dp"
+        android:height="256dp">
+        <shape>
+            <solid
+                android:color="#0fa"/>
+        </shape>
+    </item>
+    <item android:drawable="@drawable/logo"
+        android:width="65dp"
+        android:height="65dp"
+        android:gravity="center"/>
+</layer-list>

src/android/res/drawable/logo.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="65dp"
+    android:height="65dp"
+    android:viewportWidth="65"
+    android:viewportHeight="65">
+  <path
+      android:pathData="m1.6762,36.6891v-4.0039q2.0703,-2.3438 5.4297,-2.3438 1.1719,0 2.4609,0.3516 1.2891,0.332 3.6719,1.3477 1.3477,0.5664 2.0117,0.7422 0.6836,0.1758 1.3672,0.1758 1.2695,0 2.6172,-0.7617 1.3672,-0.7617 2.4219,-1.9141v4.1406q-1.25,1.1719 -2.5391,1.6992 -1.2695,0.5273 -2.8711,0.5273 -1.1719,0 -2.2461,-0.2734 -1.0547,-0.2734 -3.3789,-1.3086 -2.3047,-1.0352 -3.8477,-1.0352 -1.25,0 -2.3633,0.5469 -1.0938,0.5273 -2.7344,2.1094z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M42.4653,32.2273m-16.7723,0a16.7723,16.7723 0,1 1,33.5446 0a16.7723,16.7723 0,1 1,-33.5446 0"
+      android:fillColor="#fcea2b"/>
+  <path
+      android:pathData="M49.2697,34.097c2.8899,0 5.2344,-2.0871 5.2344,-4.6591 0,-1.2871 0.3267,-2.5742 -0.6213,-3.4164 -0.9473,-0.843 -3.1685,-1.2426 -4.6131,-1.2426 -1.7188,0 -3.7504,0.1043 -4.7043,1.2426 -0.6519,0.7766 -0.5302,2.3722 -0.5302,3.4164 0,2.572 2.343,4.6591 5.2344,4.6591zM34.9819,34.097c2.8899,0 5.2351,-2.0871 5.2351,-4.6591 0,-1.2871 0.326,-2.5742 -0.6213,-3.4164 -0.948,-0.843 -3.1685,-1.2426 -4.6138,-1.2426 -1.7181,0 -3.7497,0.1043 -4.7043,1.2426 -0.6512,0.7766 -0.5302,2.3722 -0.5302,3.4164 0,2.572 2.343,4.6591 5.2344,4.6591z"
+      android:fillColor="#3f3f3f"/>
+  <path
+      android:pathData="M42.3829,32.2681m-16.7723,0a16.7723,16.7723 0,1 1,33.5446 0a16.7723,16.7723 0,1 1,-33.5446 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M49.5403,38.6897c-4.794,2.5705 -10.242,2.6675 -14.3148,0M29.983,28.1903s-0.695,6.2349 5.0025,5.774c1.9106,-0.1546 5.7004,-0.474 5.7369,-6.0832 0.0036,-0.509 -0.0051,-1.1668 -0.5907,-1.9179 -0.7766,-0.9969 -2.6048,-1.4373 -7.2522,-1.037 0,0 -2.5129,-0.0729 -2.8965,3.264z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m30.0341,27.8016 l-0.3158,-2.459 2.7951,-0.3843M54.6733,28.1903s0.695,6.2349 -5.0025,5.774c-1.9106,-0.1546 -5.7004,-0.474 -5.7376,-6.0832 -0.0029,-0.509 0.0058,-1.1668 0.5914,-1.9179 0.7766,-0.9969 2.6048,-1.4373 7.2522,-1.037 0,0 2.5129,-0.0729 2.8965,3.264z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M39.1874,25.2383s3.0073,1.8479 6.3129,0M40.6685,28.813s1.6058,-2.7353 3.3078,0M54.6172,27.803l0.3158,-2.4582 -2.7951,-0.385"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M40.974,27.8716s1.309,-2.7346 2.6974,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:strokeLineCap="round"/>
+</vector>

src/api.js.c

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

src/api.js.h

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

src/http.c

@@ -84,6 +84,7 @@ typedef struct _tf_http_listener_t
 typedef struct _tf_http_t
 {
 	bool is_shutting_down;
+	bool is_in_destroy;
 
 	tf_http_listener_t** listeners;
 	int listeners_count;
@@ -395,7 +396,7 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
 
 				if (fin)
 				{
-					if (connection->request->on_message)
+					if (connection->request && connection->request->on_message)
 					{
 						tf_trace_begin(connection->http->trace, connection->trace_name ? connection->trace_name : "websocket");
 						connection->request->on_message(connection->request, connection->fragment_length ? connection->fragment_op_code : op_code,
@@ -697,7 +698,7 @@ static void _http_on_connection(uv_stream_t* stream, int status)
 	http->connections[http->connections_count++] = connection;
 }
 
-int tf_http_listen(tf_http_t* http, int port, tf_tls_context_t* tls, tf_http_cleanup_t* cleanup, void* user_data)
+int tf_http_listen(tf_http_t* http, int port, bool local_only, tf_tls_context_t* tls, tf_http_cleanup_t* cleanup, void* user_data)
 {
 	tf_http_listener_t* listener = tf_malloc(sizeof(tf_http_listener_t));
 	*listener = (tf_http_listener_t) {
@@ -715,25 +716,29 @@ int tf_http_listen(tf_http_t* http, int port, tf_tls_context_t* tls, tf_http_cle
 
 	if (r == 0)
 	{
+		bool use_ipv6 = !tf_util_is_mobile();
+
 #if defined(__HAIKU__)
 		/*
 		** Binding to IPv6 here fails with an odd error, and the socket
 		** becomes unusable.  Since we probably want localhost only
 		** on this single-user OS, let's just assume IPv4.
 		*/
-		struct sockaddr_in addr = {
+		use_ipv6 = false;
+#endif
+
+		struct sockaddr_in addr4 = {
 			.sin_family = AF_INET,
-			.sin_addr = { .s_addr = INADDR_ANY },
+			.sin_addr = { .s_addr = local_only ? htonl(INADDR_LOOPBACK) : htonl(INADDR_ANY) },
 			.sin_port = ntohs(port),
 		};
-#else
-		struct sockaddr_in6 addr = {
+		struct sockaddr_in6 addr6 = {
 			.sin6_family = AF_INET6,
-			.sin6_addr = IN6ADDR_ANY_INIT,
+			.sin6_addr = local_only ? (struct in6_addr)IN6ADDR_LOOPBACK_INIT : (struct in6_addr)IN6ADDR_ANY_INIT,
 			.sin6_port = ntohs(port),
 		};
-#endif
-		r = uv_tcp_bind(&listener->tcp, (struct sockaddr*)&addr, 0);
+		struct sockaddr* addr = use_ipv6 ? (struct sockaddr*)&addr6 : (struct sockaddr*)&addr4;
+		r = uv_tcp_bind(&listener->tcp, addr, 0);
 		if (r)
 		{
 			tf_printf("%s:%d: uv_tcp_bind: %s\n", __FILE__, __LINE__, uv_strerror(r));
@@ -786,7 +791,13 @@ static void _http_free_listener_on_close(uv_handle_t* handle)
 
 void tf_http_destroy(tf_http_t* http)
 {
+	if (http->is_in_destroy)
+	{
+		return;
+	}
+
 	http->is_shutting_down = true;
+	http->is_in_destroy = true;
 
 	for (int i = 0; i < http->connections_count; i++)
 	{
@@ -845,6 +856,10 @@ void tf_http_destroy(tf_http_t* http)
 
 		tf_free(http);
 	}
+	else
+	{
+		http->is_in_destroy = false;
+	}
 }
 
 const char* tf_http_status_text(int status)
@@ -963,9 +978,42 @@ static void _http_write(tf_http_connection_t* connection, const void* data, size
 	}
 }
 
-void tf_http_request_send(tf_http_request_t* request, const void* data, size_t size)
+void tf_http_request_websocket_send(tf_http_request_t* request, int op_code, const void* data, size_t size)
 {
-	_http_write(request->connection, data, size);
+	uint8_t* copy = tf_malloc(size + 16);
+	bool fin = true;
+	size_t header = 1;
+	copy[0] = (fin ? (1 << 7) : 0) | (op_code & 0xf);
+	if (size < 126)
+	{
+		copy[1] = size;
+		header += 1;
+	}
+	else if (size < (1 << 16))
+	{
+		copy[1] = 126;
+		copy[2] = (size >> 8) & 0xff;
+		copy[3] = (size >> 0) & 0xff;
+		header += 3;
+	}
+	else
+	{
+		uint32_t high = ((uint64_t)size >> 32) & 0xffffffff;
+		uint32_t low = (size >> 0) & 0xffffffff;
+		copy[1] = 127;
+		copy[2] = (high >> 24) & 0xff;
+		copy[3] = (high >> 16) & 0xff;
+		copy[4] = (high >> 8) & 0xff;
+		copy[5] = (high >> 0) & 0xff;
+		copy[6] = (low >> 24) & 0xff;
+		copy[7] = (low >> 16) & 0xff;
+		copy[8] = (low >> 8) & 0xff;
+		copy[9] = (low >> 0) & 0xff;
+		header += 9;
+	}
+	memcpy(copy + header, data, size);
+	_http_write(request->connection, copy, header + size);
+	tf_free(copy);
 }
 
 void tf_http_respond(tf_http_request_t* request, int status, const char** headers, int headers_count, const void* body, size_t content_length)

src/http.h

@@ -116,12 +116,13 @@ void tf_http_set_trace(tf_http_t* http, tf_trace_t* trace);
 ** times to listen on multiple ports.
 ** @param http The HTTP instance.
 ** @param port The port on which to listen, or 0 to assign a free port.
+** @param local_only Only access connections on localhost, otherwise any address.
 ** @param tls An optional TLS context to use for HTTPS requests.
 ** @param cleanup A function called when the HTTP instance is being cleaned up.
 ** @param user_data User data passed to the cleanup callback.
 ** @return The port number on which the HTTP instance is now listening.
 */
-int tf_http_listen(tf_http_t* http, int port, tf_tls_context_t* tls, tf_http_cleanup_t* cleanup, void* user_data);
+int tf_http_listen(tf_http_t* http, int port, bool local_only, tf_tls_context_t* tls, tf_http_cleanup_t* cleanup, void* user_data);
 
 /**
 ** Add an HTTP request handler.
@@ -209,10 +210,11 @@ const char* tf_http_get_cookie(const char* cookie_header, const char* name);
 ** Send a websocket message.
 ** @param request The HTTP request which was previously updated to a websocket
 ** session with tf_http_request_websocket_upgrade().
+** @param op_code Websocket op code.
 ** @param data The message data.
 ** @param size The size of data.
 */
-void tf_http_request_send(tf_http_request_t* request, const void* data, size_t size);
+void tf_http_request_websocket_send(tf_http_request_t* request, int op_code, const void* data, size_t size);
 
 /**
 ** Upgrade an HTTP request to a websocket session.

src/httpd.js.c

@@ -5,6 +5,7 @@
 #include "log.h"
 #include "mem.h"
 #include "ssb.db.h"
+#include "ssb.ebt.h"
 #include "ssb.h"
 #include "task.h"
 #include "tls.h"
@@ -152,44 +153,9 @@ static JSValue _httpd_response_send(JSContext* context, JSValueConst this_val, i
 	tf_http_request_t* request = JS_GetOpaque(this_val, _httpd_request_class_id);
 	int opcode = 0x1;
 	JS_ToInt32(context, &opcode, argv[1]);
-	uint64_t length = 0;
-	size_t length_size = 0;
-	const char* message = JS_ToCStringLen(context, &length_size, argv[0]);
-	length = length_size;
-	uint8_t* copy = tf_malloc(length + 16);
-	bool fin = true;
-	size_t header = 1;
-	copy[0] = (fin ? (1 << 7) : 0) | (opcode & 0xf);
-	if (length < 126)
-	{
-		copy[1] = length;
-		header += 1;
-	}
-	else if (length < (1 << 16))
-	{
-		copy[1] = 126;
-		copy[2] = (length >> 8) & 0xff;
-		copy[3] = (length >> 0) & 0xff;
-		header += 3;
-	}
-	else
-	{
-		uint32_t high = (length >> 32) & 0xffffffff;
-		uint32_t low = (length >> 0) & 0xffffffff;
-		copy[1] = 127;
-		copy[2] = (high >> 24) & 0xff;
-		copy[3] = (high >> 16) & 0xff;
-		copy[4] = (high >> 8) & 0xff;
-		copy[5] = (high >> 0) & 0xff;
-		copy[6] = (low >> 24) & 0xff;
-		copy[7] = (low >> 16) & 0xff;
-		copy[8] = (low >> 8) & 0xff;
-		copy[9] = (low >> 0) & 0xff;
-		header += 9;
-	}
-	memcpy(copy + header, message, length);
-	tf_http_request_send(request, copy, header + length);
-	tf_free(copy);
+	size_t length = 0;
+	const char* message = JS_ToCStringLen(context, &length, argv[0]);
+	tf_http_request_websocket_send(request, opcode, message, length);
 	JS_FreeCString(context, message);
 	return JS_UNDEFINED;
 }
@@ -604,6 +570,50 @@ static void _httpd_endpoint_trace(tf_http_request_t* request)
 	tf_free(json);
 }
 
+static void _httpd_endpoint_ebt(tf_http_request_t* request)
+{
+	if (_httpd_redirect(request))
+	{
+		return;
+	}
+
+	tf_task_t* task = request->user_data;
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
+	JSContext* context = tf_ssb_get_context(ssb);
+
+	JSValue object = JS_NewObject(context);
+
+	tf_ssb_connection_t* connections[256];
+	int connection_count = tf_ssb_get_connections(ssb, connections, tf_countof(connections));
+	for (int i = 0; i < connection_count; i++)
+	{
+		char id[k_id_base64_len];
+		tf_ssb_connection_get_id(connections[i], id, sizeof(id));
+
+		char key[256];
+		JSValue clock = JS_NewObject(context);
+		snprintf(key, sizeof(key), "%d:%s", i, id);
+
+		tf_ssb_ebt_t* ebt = tf_ssb_connection_get_ebt(connections[i]);
+		tf_ssb_ebt_debug_clock(ebt, context, clock);
+		JS_SetPropertyStr(context, object, key, clock);
+	}
+
+	JSValue json_value = JS_JSONStringify(context, object, JS_NULL, JS_NewInt32(context, 2));
+	const char* json = JS_ToCString(context, json_value);
+	JS_FreeValue(context, json_value);
+
+	const char* headers[] = {
+		"Content-Type",
+		"application/json; charset=utf-8",
+		"Access-Control-Allow-Origin",
+		"*",
+	};
+	tf_http_respond(request, 200, headers, tf_countof(headers) / 2, json, json ? strlen(json) : 0);
+	JS_FreeCString(context, json);
+	JS_FreeValue(context, object);
+}
+
 static void _httpd_endpoint_mem(tf_http_request_t* request)
 {
 	if (_httpd_redirect(request))
@@ -2166,56 +2176,48 @@ static void _httpd_endpoint_logout(tf_http_request_t* request)
 	tf_http_respond(request, 303, headers, tf_countof(headers) / 2, NULL, 0);
 }
 
-static bool _task_arg_is_mobile(tf_task_t* task)
-{
-	bool result = false;
-	JSContext* context = tf_task_get_context(task);
-	JSValue global = JS_GetGlobalObject(context);
-	JSValue tildefriends = JS_GetPropertyStr(context, global, "tildefriends");
-	JSValue args = JS_GetPropertyStr(context, tildefriends, "args");
-	JSValue mobile = JS_GetPropertyStr(context, args, "mobile");
-	result = JS_ToBool(context, mobile) != 0;
-	JS_FreeValue(context, mobile);
-	JS_FreeValue(context, args);
-	JS_FreeValue(context, tildefriends);
-	JS_FreeValue(context, global);
-	return result;
-}
-
 typedef struct _auto_login_t
 {
 	tf_http_request_t* request;
+	bool autologin;
 	const char* users;
 } auto_login_t;
 
 static void _httpd_auto_login_work(tf_ssb_t* ssb, void* user_data)
 {
 	auto_login_t* request = user_data;
-	request->users = tf_ssb_db_get_property(ssb, "auth", "users");
-	if (request->users && strcmp(request->users, "[]") == 0)
-	{
-		tf_free((void*)request->users);
-		request->users = NULL;
-	}
+	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
+	tf_ssb_db_get_global_setting_bool(db, "autologin", &request->autologin);
+	tf_ssb_release_db_reader(ssb, db);
 
-	if (!request->users)
+	if (request->autologin)
 	{
-		JSMallocFunctions funcs = { 0 };
-		tf_get_js_malloc_functions(&funcs);
-		JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
-		JSContext* context = JS_NewContext(runtime);
-		static const char* k_account_name = "mobile";
-		sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-		bool registered = tf_ssb_db_register_account(tf_ssb_get_loop(ssb), db, context, k_account_name, k_account_name);
-		tf_ssb_release_db_writer(ssb, db);
-		if (registered)
-		{
-			_make_administrator_if_first(ssb, context, k_account_name, true);
-		}
-		JS_FreeContext(context);
-		JS_FreeRuntime(runtime);
-
 		request->users = tf_ssb_db_get_property(ssb, "auth", "users");
+		if (request->users && strcmp(request->users, "[]") == 0)
+		{
+			tf_free((void*)request->users);
+			request->users = NULL;
+		}
+
+		if (!request->users)
+		{
+			JSMallocFunctions funcs = { 0 };
+			tf_get_js_malloc_functions(&funcs);
+			JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
+			JSContext* context = JS_NewContext(runtime);
+			static const char* k_account_name = "mobile";
+			sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+			bool registered = tf_ssb_db_register_account(tf_ssb_get_loop(ssb), db, context, k_account_name, k_account_name);
+			tf_ssb_release_db_writer(ssb, db);
+			if (registered)
+			{
+				_make_administrator_if_first(ssb, context, k_account_name, true);
+			}
+			JS_FreeContext(context);
+			JS_FreeRuntime(runtime);
+
+			request->users = tf_ssb_db_get_property(ssb, "auth", "users");
+		}
 	}
 }
 
@@ -2224,36 +2226,44 @@ static void _httpd_auto_login_after_work(tf_ssb_t* ssb, int status, void* user_d
 	auto_login_t* work = user_data;
 	JSContext* context = tf_ssb_get_context(ssb);
 	const char* session_token = NULL;
-	if (work->users)
+	if (!work->autologin)
 	{
-		JSValue json = JS_ParseJSON(context, work->users, strlen(work->users), NULL);
-		JSValue user = JS_GetPropertyUint32(context, json, 0);
-		const char* user_string = JS_ToCString(context, user);
-		session_token = _make_session_jwt(context, ssb, user_string);
-		JS_FreeCString(context, user_string);
-		JS_FreeValue(context, user);
-		JS_FreeValue(context, json);
-	}
-	if (session_token)
-	{
-		const char* cookie = _make_set_session_cookie_header(work->request, session_token);
-		tf_free((void*)session_token);
-		const char* headers[] = {
-			"Set-Cookie",
-			cookie,
-			"Location",
-			"/",
-		};
-		tf_http_respond(work->request, 303, headers, tf_countof(headers) / 2, NULL, 0);
-		tf_free((void*)cookie);
+		const char* k_payload = tf_http_status_text(404);
+		tf_http_respond(work->request, 404, NULL, 0, k_payload, strlen(k_payload));
 	}
 	else
 	{
-		const char* headers[] = {
-			"Location",
-			"/",
-		};
-		tf_http_respond(work->request, 303, headers, tf_countof(headers) / 2, NULL, 0);
+		if (work->users)
+		{
+			JSValue json = JS_ParseJSON(context, work->users, strlen(work->users), NULL);
+			JSValue user = JS_GetPropertyUint32(context, json, 0);
+			const char* user_string = JS_ToCString(context, user);
+			session_token = _make_session_jwt(context, ssb, user_string);
+			JS_FreeCString(context, user_string);
+			JS_FreeValue(context, user);
+			JS_FreeValue(context, json);
+		}
+		if (session_token)
+		{
+			const char* cookie = _make_set_session_cookie_header(work->request, session_token);
+			tf_free((void*)session_token);
+			const char* headers[] = {
+				"Set-Cookie",
+				cookie,
+				"Location",
+				"/",
+			};
+			tf_http_respond(work->request, 303, headers, tf_countof(headers) / 2, NULL, 0);
+			tf_free((void*)cookie);
+		}
+		else
+		{
+			const char* headers[] = {
+				"Location",
+				"/",
+			};
+			tf_http_respond(work->request, 303, headers, tf_countof(headers) / 2, NULL, 0);
+		}
 	}
 	tf_http_request_unref(work->request);
 	tf_free((void*)work->users);
@@ -2263,20 +2273,12 @@ static void _httpd_auto_login_after_work(tf_ssb_t* ssb, int status, void* user_d
 static void _httpd_endpoint_login_auto(tf_http_request_t* request)
 {
 	tf_task_t* task = request->user_data;
-	if (tf_util_is_mobile() || _task_arg_is_mobile(task))
-	{
-		tf_http_request_ref(request);
-		tf_ssb_t* ssb = tf_task_get_ssb(task);
+	tf_http_request_ref(request);
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
 
-		auto_login_t* work = tf_malloc(sizeof(auto_login_t));
-		*work = (auto_login_t) { .request = request };
-		tf_ssb_run_work(ssb, _httpd_auto_login_work, _httpd_auto_login_after_work, work);
-	}
-	else
-	{
-		const char* k_payload = tf_http_status_text(404);
-		tf_http_respond(request, 404, NULL, 0, k_payload, strlen(k_payload));
-	}
+	auto_login_t* work = tf_malloc(sizeof(auto_login_t));
+	*work = (auto_login_t) { .request = request };
+	tf_ssb_run_work(ssb, _httpd_auto_login_work, _httpd_auto_login_after_work, work);
 }
 
 static void _httpd_endpoint_app_socket(tf_http_request_t* request)
@@ -2319,35 +2321,6 @@ static void _httpd_endpoint_app_socket(tf_http_request_t* request)
 	JS_FreeValue(context, global);
 }
 
-static int _tf_httpd_get_tildefriends_int(JSContext* context, const char* arg)
-{
-	JSValue global = JS_GetGlobalObject(context);
-	JSValue tildefriends = JS_GetPropertyStr(context, global, "tildefriends");
-	JSValue arg_value = JS_GetPropertyStr(context, tildefriends, arg);
-	int value = 0;
-	JS_ToInt32(context, &value, arg_value);
-	JS_FreeValue(context, arg_value);
-	JS_FreeValue(context, tildefriends);
-	JS_FreeValue(context, global);
-	return value;
-}
-
-static const char* _tf_httpd_get_tildefriends_arg_string(JSContext* context, const char* arg)
-{
-	JSValue global = JS_GetGlobalObject(context);
-	JSValue tildefriends = JS_GetPropertyStr(context, global, "tildefriends");
-	JSValue args = JS_GetPropertyStr(context, tildefriends, "args");
-	JSValue arg_value = JS_GetPropertyStr(context, args, arg);
-	const char* value = !JS_IsUndefined(arg_value) ? JS_ToCString(context, arg_value) : NULL;
-	const char* result = value ? tf_strdup(value) : NULL;
-	JS_FreeCString(context, value);
-	JS_FreeValue(context, arg_value);
-	JS_FreeValue(context, args);
-	JS_FreeValue(context, tildefriends);
-	JS_FreeValue(context, global);
-	return result;
-}
-
 static void _httpd_free_user_data(void* user_data)
 {
 	tf_free(user_data);
@@ -2394,10 +2367,6 @@ void tf_httpd_register(JSContext* context)
 		fprintf(stderr, "Failed to register Request.\n");
 	}
 
-	int http_port = _tf_httpd_get_tildefriends_int(context, "http_port");
-	int https_port = _tf_httpd_get_tildefriends_int(context, "https_port");
-	const char* out_http_port_file = _tf_httpd_get_tildefriends_arg_string(context, "out_http_port_file");
-
 	JSValue global = JS_GetGlobalObject(context);
 	JSValue httpd = JS_NewObjectClass(context, _httpd_class_id);
 
@@ -2408,6 +2377,17 @@ void tf_httpd_register(JSContext* context)
 	tf_http_set_trace(http, tf_task_get_trace(task));
 	JS_SetOpaque(httpd, http);
 
+	int64_t http_port = 0;
+	int64_t https_port = 0;
+	char out_http_port_file[512] = "";
+	bool local_only = false;
+	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
+	tf_ssb_db_get_global_setting_int64(db, "http_port", &http_port);
+	tf_ssb_db_get_global_setting_int64(db, "https_port", &https_port);
+	tf_ssb_db_get_global_setting_string(db, "out_http_port_file", out_http_port_file, sizeof(out_http_port_file));
+	tf_ssb_db_get_global_setting_bool(db, "http_local_only", &local_only);
+	tf_ssb_release_db_reader(ssb, db);
+
 	if (https_port)
 	{
 		http_user_data_t* user_data = tf_http_get_user_data(http);
@@ -2452,6 +2432,7 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/hitches", _httpd_endpoint_hitches, NULL, task);
 	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, "/ebt", _httpd_endpoint_ebt, NULL, task);
 
 	tf_http_add_handler(http, "/login/logout", _httpd_endpoint_logout, NULL, task);
 	tf_http_add_handler(http, "/login/auto", _httpd_endpoint_login_auto, NULL, task);
@@ -2463,14 +2444,14 @@ void tf_httpd_register(JSContext* context)
 	JS_SetPropertyStr(context, global, "httpd", httpd);
 	JS_FreeValue(context, global);
 
-	if (http_port > 0 || out_http_port_file)
+	if (http_port > 0 || *out_http_port_file)
 	{
 		httpd_listener_t* listener = tf_malloc(sizeof(httpd_listener_t));
 		*listener = (httpd_listener_t) { 0 };
-		int assigned_port = tf_http_listen(http, http_port, NULL, _httpd_listener_cleanup, listener);
+		int assigned_port = tf_http_listen(http, http_port, local_only, NULL, _httpd_listener_cleanup, listener);
 		tf_printf(CYAN "~😎 Tilde Friends" RESET " " YELLOW VERSION_NUMBER RESET " is now up at " MAGENTA "http://127.0.0.1:%d/" RESET ".\n", assigned_port);
 
-		if (out_http_port_file)
+		if (*out_http_port_file)
 		{
 			const char* actual_http_port_file = tf_task_get_path_with_root(task, out_http_port_file);
 			FILE* file = fopen(actual_http_port_file, "wb");
@@ -2500,13 +2481,11 @@ void tf_httpd_register(JSContext* context)
 				tf_tls_context_set_private_key(tls, private_key);
 				httpd_listener_t* listener = tf_malloc(sizeof(httpd_listener_t));
 				*listener = (httpd_listener_t) { .tls = tls };
-				int assigned_port = tf_http_listen(http, https_port, tls, _httpd_listener_cleanup, listener);
+				int assigned_port = tf_http_listen(http, https_port, local_only, tls, _httpd_listener_cleanup, listener);
 				tf_printf(CYAN "~😎 Tilde Friends" RESET " " YELLOW VERSION_NUMBER RESET " is now up at " MAGENTA "https://127.0.0.1:%d/" RESET ".\n", assigned_port);
 			}
 			tf_free((char*)certificate);
 			tf_free((char*)private_key);
 		}
 	}
-
-	tf_free((void*)out_http_port_file);
 }

src/ios.m

@@ -4,34 +4,84 @@
 #import <WebKit/WKWebView.h>
 #import <WebKit/WKWebViewConfiguration.h>
 
+#include "log.h"
+
 #include <libgen.h>
 #include <string.h>
 
 void tf_run_thread_start(const char* zip_path);
 
-@interface ViewController : UIViewController <WKUIDelegate, WKNavigationDelegate>
+@interface ViewController : UINavigationController <WKUIDelegate, WKNavigationDelegate>
 @property (strong, nonatomic) WKWebView* web_view;
 @property bool initial_load_complete;
 @end
 
 static void _start_initial_load(WKWebView* web_view)
 {
-	[web_view loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://localhost:12345/"]]];
+	[web_view loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://localhost:12345/login/auto"]]];
 }
 
-@implementation ViewController : UIViewController
+@implementation ViewController : UINavigationController
 - (void)viewDidLoad
 {
 	[super viewDidLoad];
+
+	[self setToolbarHidden:false animated:false];
+	self.toolbar.items = @[
+		[[UIBarButtonItem alloc] initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(goBack)],
+		[[UIBarButtonItem alloc] initWithTitle:@"Forward" style:UIBarButtonItemStylePlain target:self action:@selector(goForward)],
+		[[UIBarButtonItem alloc] initWithTitle:@"Refresh" style:UIBarButtonItemStylePlain target:self action:@selector(reload)]
+	];
+
 	WKWebViewConfiguration* configuration = [[WKWebViewConfiguration alloc] init];
 	self.web_view = [[WKWebView alloc] initWithFrame:self.view.frame configuration:configuration];
 	self.web_view.UIDelegate = self;
 	self.web_view.navigationDelegate = self;
 	self.web_view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+	self.web_view.translatesAutoresizingMaskIntoConstraints = false;
 	[self.view addSubview:self.web_view];
+
+	[self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.web_view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view
+														  attribute:NSLayoutAttributeTop
+														 multiplier:1.0
+														   constant:0]];
+	[self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.web_view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.view
+														  attribute:NSLayoutAttributeBottom
+														 multiplier:1.0
+														   constant:-75]];
+	[self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.web_view attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view
+														  attribute:NSLayoutAttributeLeft
+														 multiplier:1.0
+														   constant:0]];
+	[self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.web_view attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view
+														  attribute:NSLayoutAttributeRight
+														 multiplier:1.0
+														   constant:0]];
+
 	_start_initial_load(self.web_view);
 }
 
+- (void)goBack
+{
+	if (self.web_view.canGoBack)
+	{
+		[self.web_view goBack];
+	}
+}
+
+- (void)goForward
+{
+	if (self.web_view.canGoForward)
+	{
+		[self.web_view goForward];
+	}
+}
+
+- (void)reload
+{
+	[self.web_view reload];
+}
+
 - (void)webView:(WKWebView*)webView didFinishNavigation:(WKNavigation*)navigation
 {
 	self.initial_load_complete = true;

src/ios/Entitlements.plist

@@ -7,6 +7,6 @@
 	<key>com.apple.developer.team-identifier</key>
 	<string>EDVXQ27EB5</string>
 	<key>get-task-allow</key>
-	<true/>
+	<false/>
 </dict>
 </plist>

src/ios/Info.plist

@@ -2,34 +2,86 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleName</key>
-	<string>tildefriends</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>iPhoneOS</string>
-	</array>
+	<key>CFBundleDisplayName</key>
+	<string>Tilde Friends</string>
 	<key>CFBundleExecutable</key>
 	<string>tildefriends</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.unprompted.tildefriends</string>
-	<key>CFBundleResourceSpecification</key>
-	<string>ResourceRules.plist</string>
+	<key>CFBundleName</key>
+	<string>tildefriends</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.0.29</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>iPhoneOS</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>11</string>
+	<key>DTPlatformName</key>
+	<string>iphoneos</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>CFBundleDisplayName</key>
-	<string>Tilde Friends</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleIconName</key>
-	<string>AppIcon</string>
-	<key>CFBundleIconFile</key>
-	<string>tildefriends.png</string>
+	<key>MinimumOSVersion</key>
+	<string>14.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
 	<key>UILaunchScreen</key>
 	<dict>
 		<key>UIImageName</key>
 		<string>tildefriends.png</string>
 	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
+	<key>BuildMachineOSBuild</key>
+	<string>24D70</string>
+	<key>DTPlatformBuild</key>
+	<string>22C146</string>
+	<key>DTPlatformVersion</key>
+	<string>18.2</string>
+	<key>DTSDKBuild</key>
+	<string>22C146</string>
+	<key>DTSDKName</key>
+	<string>iphoneos18.2</string>
+	<key>DTXcode</key>
+	<string>1620</string>
+	<key>DTXcodeBuild</key>
+	<string>16C5032a</string>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~iphone</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>AppIcon60x60</string>
+			</array>
+			<key>CFBundleIconName</key>
+			<string>AppIcon</string>
+		</dict>
+	</dict>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 </dict>
 </plist>

src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}

src/main.c

@@ -1057,7 +1057,7 @@ static int _tf_command_get_profile(const char* file, int argc, char* argv[])
 	sqlite3_close(db);
 	tf_free((void*)profile);
 	tf_free((void*)default_db_path);
-	return profile != NULL;
+	return profile != NULL ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
 static int _tf_command_get_contacts(const char* file, int argc, char* argv[])
@@ -1217,9 +1217,6 @@ typedef struct tf_run_args_t
 {
 	const char* script;
 	const char* network_key;
-	int ssb_port;
-	int http_port;
-	int https_port;
 	const char* db_path;
 	int count;
 	const char* args;
@@ -1244,9 +1241,6 @@ static int _tf_run_task(const tf_run_args_t* args, int index)
 	tf_printf("setting zip path to %s\n", args->zip);
 	tf_task_set_zip_path(task, args->zip);
 	tf_task_set_ssb_network_key(task, args->network_key);
-	tf_task_set_ssb_port(task, args->ssb_port ? args->ssb_port + index : 0);
-	tf_task_set_http_port(task, args->http_port ? args->http_port + index : 0);
-	tf_task_set_https_port(task, args->https_port ? args->https_port + index : 0);
 	tf_task_set_args(task, args->args);
 	tf_task_set_one_proc(task, args->one_proc);
 	const char* db_path = args->db_path;
@@ -1301,7 +1295,16 @@ static int _tf_run_task(const tf_run_args_t* args, int index)
 	tf_task_activate(task);
 	tf_ssb_set_verbose(tf_task_get_ssb(task), args->verbose);
 	tf_ssb_start_periodic(tf_task_get_ssb(task));
-	if (args->http_port || args->https_port)
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
+	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
+	int64_t http_port = 0;
+	int64_t https_port = 0;
+	char out_http_port_file[512] = "";
+	tf_ssb_db_get_global_setting_int64(db, "http_port", &http_port);
+	tf_ssb_db_get_global_setting_int64(db, "https_port", &https_port);
+	tf_ssb_db_get_global_setting_string(db, "out_http_port_file", out_http_port_file, sizeof(out_http_port_file));
+	tf_ssb_release_db_reader(ssb, db);
+	if (http_port || https_port || *out_http_port_file)
 	{
 		if (args->zip)
 		{
@@ -1417,9 +1420,6 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 	const char* default_db_path = _get_db_path();
 	tf_run_args_t args = {
 		.count = 1,
-		.http_port = 12345,
-		.https_port = 12346,
-		.ssb_port = 8008,
 		.db_path = default_db_path,
 	};
 	bool show_usage = false;
@@ -1436,10 +1436,7 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 	{
 		static const struct option k_options[] = {
 			{ "script", required_argument, NULL, 's' },
-			{ "ssb-port", required_argument, NULL, 'b' },
 			{ "ssb-network-key", required_argument, NULL, 'k' },
-			{ "http-port", required_argument, NULL, 'p' },
-			{ "https-port", required_argument, NULL, 'q' },
 			{ "db-path", required_argument, NULL, 'd' },
 			{ "count", required_argument, NULL, 'n' },
 			{ "args", required_argument, NULL, 'a' },
@@ -1448,7 +1445,7 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 			{ "verbose", no_argument, NULL, 'v' },
 			{ "help", no_argument, NULL, 'h' },
 		};
-		int c = getopt_long(argc, argv, "s:b:k:p:q:d:n:a:oz:vh", k_options, NULL);
+		int c = getopt_long(argc, argv, "s:k:d:n:a:oz:vh", k_options, NULL);
 		if (c == -1)
 		{
 			break;
@@ -1467,15 +1464,6 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 		case 'k':
 			args.network_key = optarg;
 			break;
-		case 'b':
-			args.ssb_port = atoi(optarg);
-			break;
-		case 'p':
-			args.http_port = atoi(optarg);
-			break;
-		case 'q':
-			args.https_port = atoi(optarg);
-			break;
 		case 'd':
 			args.db_path = optarg;
 			break;
@@ -1497,18 +1485,22 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 		}
 	}
 
+	for (int i = optind; i < argc; i++)
+	{
+		tf_printf("Unexpected argument: %s\n", argv[i]);
+		show_usage = true;
+	}
+
 	if (show_usage)
 	{
 		tf_printf("\n%s run [options]\n\n", file);
 		tf_printf("options\n");
 		tf_printf("  -s, --script script        Script to run (default: core/core.js).\n");
-		tf_printf("  -b, --ssb-port port        Port on which to run SSB (default: 8008, 0 disables).\n");
-		tf_printf("  -p, --http-port port       Port on which to run Tilde Friends web server (default: 12345).\n");
-		tf_printf("  -q, --https-port port      Port on which to run secure Tilde Friends web server (default: 12346).\n");
 		tf_printf("  -d, --db-path path         SQLite database path (default: %s).\n", default_db_path);
 		tf_printf("  -k, --ssb-network-key key  SSB network key to use.\n");
 		tf_printf("  -n, --count count          Number of instances to run.\n");
-		tf_printf("  -a, --args args            Arguments of the format key=value,foo=bar,verbose=true.\n");
+		tf_printf("  -a, --args args            Arguments of the format key=value,foo=bar,verbose=true (note: these are persisted to the database).\n");
+		tf_util_document_settings("                                 ");
 		tf_printf("  -o, --one-proc             Run everything in one process (unsafely!).\n");
 		tf_printf("  -z, --zip path             Zip archive from which to load files.\n");
 		tf_printf("  -v, --verbose              Log raw messages.\n");
@@ -1744,18 +1736,15 @@ static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir,
 		tf_printf("uv_chdir: %s\n", uv_strerror(result));
 	}
 
-	size_t port_file_arg_length = strlen(out_port_file) + strlen("out_http_port_file=") + 1;
-	char* port_file_arg = alloca(port_file_arg_length);
-	snprintf(port_file_arg, port_file_arg_length, "out_http_port_file=%s", out_port_file);
+	size_t args_length = strlen(out_port_file) + strlen("--args=http_port=0,out_http_port_file=") + 1;
+	char* args_buffer = alloca(args_length);
+	snprintf(args_buffer, args_length, "--args=http_port=0,out_http_port_file=%s", out_port_file);
 
 	const char* args[] = {
 		"run",
 		"-z",
 		apk,
-		"-a",
-		port_file_arg,
-		"-p",
-		"0",
+		args_buffer,
 	};
 
 	tf_task_set_android_service_callbacks(_tf_service_start, _tf_service_stop);
@@ -1847,9 +1836,6 @@ void tf_run_thread_start(const char* zip_path)
 	tf_run_thread_data_t* data = tf_malloc(sizeof(tf_run_thread_data_t));
 	tf_run_args_t args = {
 		.count = 1,
-		.http_port = 12345,
-		.https_port = 12346,
-		.ssb_port = 8008,
 		.db_path = "db.sqlite",
 		.one_proc = true,
 		.zip = zip_path,

src/mem.c

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

src/ssb.c

@@ -579,6 +579,11 @@ static void _tf_ssb_connection_box_stream_send(tf_ssb_connection_t* connection,
 	{
 		size_t send_size = size - offset > k_send_max ? k_send_max : size - offset;
 		uint8_t* message_enc = tf_malloc(send_size + 34);
+		if (!message_enc)
+		{
+			tf_ssb_connection_close(connection, "out of memory");
+			return;
+		}
 
 		uint8_t nonce1[crypto_secretbox_NONCEBYTES];
 		memcpy(nonce1, connection->send_nonce, sizeof(nonce1));
@@ -746,13 +751,16 @@ static bool _tf_ssb_connection_get_request_callback(
 			*out_name = request->name;
 		}
 		request->last_active = uv_now(connection->ssb->loop);
-		if (connection->flags & k_tf_ssb_connect_flag_one_shot)
+		if (tf_ssb_connection_is_connected(connection) && !tf_ssb_connection_is_closing(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)))
 		{
-			uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
-		}
-		if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
-		{
-			uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+			if ((connection->flags & k_tf_ssb_connect_flag_one_shot))
+			{
+				uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
+			}
+			if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
+			{
+				uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+			}
 		}
 		return true;
 	}
@@ -799,13 +807,16 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 		connection->requests_count++;
 		connection->ssb->request_count++;
 	}
-	if (connection->flags & k_tf_ssb_connect_flag_one_shot)
+	if (tf_ssb_connection_is_connected(connection) && !tf_ssb_connection_is_closing(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)))
 	{
-		uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
-	}
-	if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
-	{
-		uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+		if (connection->flags & k_tf_ssb_connect_flag_one_shot)
+		{
+			uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
+		}
+		if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
+		{
+			uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+		}
 	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_update, connection);
 	connection->last_notified_active = now_ms;
@@ -1404,7 +1415,7 @@ tf_ssb_connection_t* tf_ssb_connection_get_tunnel(tf_ssb_connection_t* connectio
 	return connection ? connection->tunnel_connection : NULL;
 }
 
-static bool _tf_ssb_is_already_connected(tf_ssb_t* ssb, uint8_t* id, tf_ssb_connection_t* ignore_connection)
+static tf_ssb_connection_t* _tf_ssb_is_already_connected(tf_ssb_t* ssb, uint8_t* id, tf_ssb_connection_t* ignore_connection)
 {
 	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
 	{
@@ -1412,15 +1423,15 @@ static bool _tf_ssb_is_already_connected(tf_ssb_t* ssb, uint8_t* id, tf_ssb_conn
 		{
 			if (memcmp(connection->serverpub, id, k_id_bin_len) == 0)
 			{
-				return true;
+				return connection;
 			}
 			else if (memcmp(ssb->pub, id, k_id_bin_len) == 0)
 			{
-				return true;
+				return connection;
 			}
 		}
 	}
-	return false;
+	return NULL;
 }
 
 static void _tf_ssb_connection_is_account_a_stranger_work(tf_ssb_connection_t* connection, void* user_data)
@@ -1436,19 +1447,26 @@ static void _tf_ssb_connection_is_account_a_stranger_work(tf_ssb_connection_t* c
 	{
 		int64_t replication_hops = 2;
 		sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-		tf_ssb_db_get_global_setting_int64(db, "replication_hops", &replication_hops);
+		connection->is_stranger = !tf_ssb_db_has_invite(db, id);
+		if (connection->is_stranger)
+		{
+			tf_ssb_db_get_global_setting_int64(db, "replication_hops", &replication_hops);
+		}
 		tf_ssb_release_db_reader(ssb, db);
 
-		const char** identities = tf_ssb_db_get_all_visible_identities(ssb, replication_hops);
-		for (int i = 0; identities[i]; i++)
+		if (connection->is_stranger)
 		{
-			if (strcmp(id, identities[i]) == 0)
+			const char** identities = tf_ssb_db_get_all_visible_identities(ssb, replication_hops);
+			for (int i = 0; identities[i]; i++)
 			{
-				connection->is_stranger = false;
-				break;
+				if (strcmp(id, identities[i]) == 0)
+				{
+					connection->is_stranger = false;
+					break;
+				}
 			}
+			tf_free((void*)identities);
 		}
-		tf_free((void*)identities);
 	}
 }
 
@@ -1538,14 +1556,14 @@ static void _tf_ssb_connection_verify_client_identity(tf_ssb_connection_t* conne
 	}
 	uint8_t* detached_signature_A = m;
 
-	if (_tf_ssb_is_already_connected(connection->ssb, m + 64, connection))
+	tf_ssb_connection_t* other_connection = NULL;
+	while ((other_connection = _tf_ssb_is_already_connected(connection->ssb, m + 64, connection)))
 	{
 		char id_base64[k_id_base64_len] = { 0 };
 		tf_ssb_id_bin_to_str(id_base64, sizeof(id_base64), m + 64);
 		char reason[256];
-		snprintf(reason, sizeof(reason), "already connected: %s\n", id_base64);
-		tf_ssb_connection_close(connection, reason);
-		return;
+		snprintf(reason, sizeof(reason), "Replacing connection: %s\n", id_base64);
+		tf_ssb_connection_close(other_connection, reason);
 	}
 
 	memcpy(connection->serverpub, m + 64, sizeof(connection->serverpub));
@@ -1990,7 +2008,7 @@ static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const ch
 	if (!connection->is_closing)
 	{
 		connection->is_closing = true;
-		uv_timer_start(&connection->linger_timer, _tf_ssb_connection_linger_timer, 5000, 0);
+		uv_timer_start(&connection->linger_timer, _tf_ssb_connection_linger_timer, ssb->shutting_down ? 0 : 5000, 0);
 		_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_update, connection);
 	}
 	if (connection->connect_callback)
@@ -3864,8 +3882,7 @@ JSValue tf_ssb_connection_get_object(tf_ssb_connection_t* connection)
 	return connection ? connection->object : JS_UNDEFINED;
 }
 
-void tf_ssb_add_message_added_callback(
-	tf_ssb_t* ssb, void (*callback)(tf_ssb_t* ssb, const char* id, void* user_data), void (*cleanup)(tf_ssb_t* ssb, void* user_data), void* user_data)
+void tf_ssb_add_message_added_callback(tf_ssb_t* ssb, tf_ssb_message_added_callback_t* callback, void (*cleanup)(tf_ssb_t* ssb, void* user_data), void* user_data)
 {
 	tf_ssb_message_added_callback_node_t* node = tf_malloc(sizeof(tf_ssb_message_added_callback_node_t));
 	*node = (tf_ssb_message_added_callback_node_t) {
@@ -3906,7 +3923,7 @@ void tf_ssb_notify_blob_stored(tf_ssb_t* ssb, const char* id)
 	ssb->blobs_stored++;
 }
 
-void tf_ssb_notify_message_added(tf_ssb_t* ssb, const char* id, JSValue message_keys)
+void tf_ssb_notify_message_added(tf_ssb_t* ssb, const char* author, int64_t sequence, const char* id, JSValue message_keys)
 {
 	tf_ssb_message_added_callback_node_t* next = NULL;
 	ssb->messages_stored++;
@@ -3915,7 +3932,7 @@ void tf_ssb_notify_message_added(tf_ssb_t* ssb, const char* id, JSValue message_
 		next = node->next;
 		tf_trace_begin(ssb->trace, "message added callback");
 		PRE_CALLBACK(ssb, node->callback);
-		node->callback(ssb, id, node->user_data);
+		node->callback(ssb, author, sequence, id, node->user_data);
 		POST_CALLBACK(ssb, node->callback);
 		tf_trace_end(ssb->trace);
 	}
@@ -4563,7 +4580,7 @@ void tf_ssb_connection_adjust_read_backpressure(tf_ssb_connection_t* connection,
 void tf_ssb_connection_adjust_write_count(tf_ssb_connection_t* connection, int delta)
 {
 	connection->active_write_count += delta;
-	if (!connection->is_closing)
+	if (!connection->is_closing && connection->active_write_count == 0)
 	{
 		uv_async_send(&connection->scheduled_async);
 	}

src/ssb.db.c

@@ -23,6 +23,17 @@ 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 int _tf_ssb_db_try_exec(sqlite3* db, const char* statement)
+{
+	char* error = NULL;
+	int result = sqlite3_exec(db, statement, NULL, NULL, &error);
+	if (result != SQLITE_OK)
+	{
+		tf_printf("Error running '%s': %s.\n", statement, error ? error : sqlite3_errmsg(db));
+	}
+	return result;
+}
+
 static void _tf_ssb_db_exec(sqlite3* db, const char* statement)
 {
 	char* error = NULL;
@@ -60,11 +71,17 @@ static bool _tf_ssb_db_has_rows(sqlite3* db, const char* query)
 	return found;
 }
 
+static int _tf_ssb_db_busy_handler(void* user_data, int count)
+{
+	return 1;
+}
+
 static void _tf_ssb_db_init_internal(sqlite3* db)
 {
 	sqlite3_extended_result_codes(db, 1);
 	_tf_ssb_db_exec(db, "PRAGMA journal_mode = WAL");
 	_tf_ssb_db_exec(db, "PRAGMA synchronous = NORMAL");
+	sqlite3_busy_handler(db, _tf_ssb_db_busy_handler, db);
 }
 
 void tf_ssb_db_init_reader(sqlite3* db)
@@ -108,21 +125,31 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 		"  flags INTEGER,"
 		"  UNIQUE(author, sequence)"
 		")");
+	if (_tf_ssb_db_has_rows(db, "PRAGMA table_list('messages_stats')"))
+	{
+		if (_tf_ssb_db_has_rows(db, "SELECT 1 FROM messages_stats WHERE max_sequence IS NULL LIMIT 1"))
+		{
+			tf_printf("Rebuilding messages_stats.\n");
+			_tf_ssb_db_exec(db, "DROP TABLE messages_stats");
+		}
+	}
 	if (!_tf_ssb_db_has_rows(db, "PRAGMA table_list('messages_stats')"))
 	{
+		_tf_ssb_db_exec(db, "BEGIN TRANSACTION");
 		_tf_ssb_db_exec(db,
 			"CREATE TABLE IF NOT EXISTS messages_stats ("
 			"  author TEXT PRIMARY KEY,"
-			"  max_sequence INTEGER,"
-			"  max_timestamp READ"
+			"  max_sequence INTEGER NOT NULL,"
+			"  max_timestamp REAL NOT NULL"
 			")");
 		_tf_ssb_db_exec(
 			db, "INSERT OR REPLACE INTO messages_stats (author, max_sequence, max_timestamp) SELECT author, MAX(sequence), MAX(timestamp) FROM messages GROUP BY author");
+		_tf_ssb_db_exec(db, "COMMIT TRANSACTION");
 	}
 	_tf_ssb_db_exec(db,
 		"CREATE TRIGGER IF NOT EXISTS messages_ai_stats AFTER INSERT ON messages BEGIN INSERT INTO messages_stats(author, max_sequence, max_timestamp) VALUES (new.author, "
-		"new.sequence, new.timestamp) ON CONFLICT DO UPDATE SET max_sequence = MAX(max_sequence, excluded.max_sequence), max_timestamp = MAX(max_timestamp, "
-		"excluded.max_timestamp); END");
+		"new.sequence, new.timestamp) ON CONFLICT DO UPDATE SET max_sequence = MAX(max_sequence, new.sequence), max_timestamp = MAX(max_timestamp, "
+		"new.timestamp); END");
 	_tf_ssb_db_exec(db,
 		"CREATE TRIGGER IF NOT EXISTS messages_ad_stats AFTER DELETE ON messages BEGIN UPDATE messages_stats SET max_sequence = (SELECT MAX(messages.sequence) FROM messages WHERE "
 		"messages.author = old.author), max_timestamp = (SELECT MAX(messages.timestamp) FROM messages WHERE messages.author = old.author); END");
@@ -228,6 +255,7 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 
 	if (!_tf_ssb_db_has_rows(db, "PRAGMA table_list('messages_refs')"))
 	{
+		_tf_ssb_db_exec(db, "BEGIN TRANSACTION");
 		_tf_ssb_db_exec(db,
 			"CREATE TABLE IF NOT EXISTS messages_refs ("
 			"  message TEXT, "
@@ -242,6 +270,7 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 			"j.value LIKE '%%%.sha256' OR "
 			"j.value LIKE '@%.ed25519' "
 			"ON CONFLICT DO NOTHING");
+		_tf_ssb_db_exec(db, "COMMIT TRANSACTION");
 		tf_printf("Done.\n");
 	}
 
@@ -259,24 +288,94 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_refs_message_idx ON messages_refs (message)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_refs_ref_idx ON messages_refs (ref)");
+
+	if (!_tf_ssb_db_has_rows(db, "PRAGMA table_list('blobs_refs')"))
+	{
+		_tf_ssb_db_exec(db, "BEGIN TRANSACTION");
+		_tf_ssb_db_exec(db,
+			"CREATE TABLE IF NOT EXISTS blobs_refs ("
+			"  blob TEXT, "
+			"  ref TEXT, "
+			"  UNIQUE(blob, ref)"
+			")");
+		tf_printf("Populating blobs_refs...\n");
+		_tf_ssb_db_exec(db,
+			"INSERT INTO blobs_refs(blob, ref) "
+			"SELECT blobs.id, j.value FROM blobs, json_tree(blobs.content) as j WHERE "
+			"json_valid(blobs.content) AND j.value LIKE '&%.sha256' "
+			"ON CONFLICT DO NOTHING");
+		_tf_ssb_db_exec(db, "COMMIT TRANSACTION");
+		tf_printf("Done.\n");
+	}
+	_tf_ssb_db_exec(db, "DROP TRIGGER IF EXISTS blobs_ai_refs");
+	_tf_ssb_db_exec(db,
+		"CREATE TRIGGER IF NOT EXISTS blobs_ai_refs AFTER INSERT ON blobs BEGIN "
+		"INSERT INTO blobs_refs(blob, ref) "
+		"SELECT DISTINCT new.id, j.value FROM json_tree(new.content) as j WHERE "
+		"json_valid(new.content) AND j.value LIKE '&%.sha256' "
+		"ON CONFLICT DO NOTHING; END");
+	_tf_ssb_db_exec(db, "DROP TRIGGER IF EXISTS blobs_ad_refs");
+	_tf_ssb_db_exec(db, "CREATE TRIGGER IF NOT EXISTS blobs_ad_refs AFTER DELETE ON blobs BEGIN DELETE FROM blobs_refs WHERE blobs_refs.blob = old.id; END");
+	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS blobs_refs_blob_idx ON blobs_refs (blob)");
+	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS blobs_refs_ref_idx ON blobs_refs (ref)");
+
 	_tf_ssb_db_exec(db, "DROP VIEW IF EXISTS blob_wants_view");
 	_tf_ssb_db_exec(db,
-		"CREATE VIEW IF NOT EXISTS blob_wants_view (id, timestamp) AS "
-		"  WITH wanted AS ( "
-		"    SELECT messages_refs.ref AS id, messages.timestamp AS timestamp "
+		"CREATE VIEW IF NOT EXISTS blob_wants_view (source, id, timestamp) AS "
+		"  WITH RECURSIVE "
+		"  wanted1 AS ( "
+		"    SELECT messages_refs.message AS source, messages_refs.ref AS id, messages.timestamp AS timestamp "
 		"    FROM messages_refs "
 		"    JOIN messages ON messages.id = messages_refs.message "
 		"    UNION "
-		"    SELECT messages_refs.ref AS id, unixepoch() * 1000 AS timestamp "
+		"    SELECT messages_refs.message AS source, messages_refs.ref AS id, unixepoch() * 1000 AS timestamp "
 		"    FROM messages_refs "
 		"    JOIN messages ON messages.id = messages_refs.message "
 		"    WHERE messages.content ->> 'type' = 'about' "
+		"  ), "
+		"  wanted(source, id, timestamp) AS ( "
+		"    SELECT wanted1.source AS source, wanted1.id AS id, wanted1.timestamp AS timestamp FROM wanted1 "
+		"    UNION "
+		"    SELECT wanted.source AS source, br.ref AS id, wanted.timestamp AS timestamp FROM wanted JOIN blobs_refs br ON br.blob = wanted.id "
 		"  ) "
-		"  SELECT wanted.id, wanted.timestamp FROM wanted "
+		"  SELECT wanted.source, wanted.id, wanted.timestamp FROM wanted "
 		"  LEFT OUTER JOIN blobs ON wanted.id = blobs.id "
 		"  WHERE blobs.id IS NULL "
 		"    AND LENGTH(wanted.id) = 52 "
 		"    AND wanted.id LIKE '&%.sha256'");
+	if (!_tf_ssb_db_has_rows(db, "PRAGMA table_list('blob_wants_cache')"))
+	{
+		tf_printf("Populating blob_wants_cache...\n");
+		_tf_ssb_db_exec(db, "BEGIN TRANSACTION");
+		_tf_ssb_db_exec(db, "CREATE TABLE IF NOT EXISTS blob_wants_cache (source TEXT, id TEXT, timestamp REAL, UNIQUE(source, id))");
+		_tf_ssb_db_exec(
+			db, "INSERT INTO blob_wants_cache SELECT * FROM blob_wants_view WHERE true ON CONFLICT(source, id) DO UPDATE SET timestamp = MAX(timestamp, excluded.timestamp)");
+		_tf_ssb_db_exec(db, "COMMIT TRANSACTION");
+		tf_printf("Done.\n");
+	}
+	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS blob_wants_cache_id_idx ON blob_wants_cache (id)");
+	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS blob_wants_cache_timestamp_id_idx ON blob_wants_cache (timestamp, id)");
+
+	_tf_ssb_db_exec(db,
+		"CREATE TRIGGER IF NOT EXISTS messages_ai_blob_wants_cache AFTER INSERT ON messages_refs BEGIN "
+		"INSERT INTO blob_wants_cache (source, id, timestamp) "
+		"SELECT messages.id, new.ref, messages.timestamp FROM messages WHERE messages.id = new.message AND "
+		"LENGTH(new.ref) = 52 AND new.ref LIKE '&%.sha256' "
+		"ON CONFLICT (source, id) DO NOTHING; END");
+	_tf_ssb_db_exec(db, "DROP TRIGGER IF EXISTS blobs_refs_ai_blob_wants_cache");
+	_tf_ssb_db_exec(db,
+		"CREATE TRIGGER IF NOT EXISTS blobs_refs_ai_blob_wants_cache AFTER INSERT ON blobs_refs BEGIN "
+		"INSERT INTO blob_wants_cache (source, id, timestamp) "
+		"SELECT messages.id, new.ref, messages.timestamp FROM messages "
+		"JOIN blob_wants_cache bwc ON bwc.source = messages.id AND bwc.id = new.blob "
+		"ON CONFLICT (source, id) DO NOTHING; END");
+	_tf_ssb_db_exec(db,
+		"CREATE TRIGGER IF NOT EXISTS messages_ad_blob_wants_cache AFTER DELETE ON messages BEGIN "
+		"DELETE FROM blob_wants_cache WHERE blob_wants_cache.source = old.id; END");
+	_tf_ssb_db_exec(db, "DROP TRIGGER IF EXISTS blobs_ai_blob_wants_cache");
+	_tf_ssb_db_exec(db,
+		"CREATE TRIGGER IF NOT EXISTS blobs_ai_blob_wants_cache AFTER INSERT ON blobs BEGIN "
+		"DELETE FROM blob_wants_cache WHERE blob_wants_cache.id = new.id; END");
 
 	bool need_add_flags = true;
 	bool need_convert_timestamp_to_real = false;
@@ -344,10 +443,9 @@ static bool _tf_ssb_db_previous_message_exists(sqlite3* db, const char* author,
 	return exists;
 }
 
-static int64_t _tf_ssb_db_store_message_raw(tf_ssb_t* ssb, const char* id, const char* previous, const char* author, int64_t sequence, double timestamp, const char* content,
+static int64_t _tf_ssb_db_store_message_raw(sqlite3* db, const char* id, const char* previous, const char* author, int64_t sequence, double timestamp, const char* content,
 	size_t content_len, const char* signature, int flags)
 {
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
 	int64_t last_row_id = -1;
 	bool id_mismatch = false;
 
@@ -396,7 +494,6 @@ static int64_t _tf_ssb_db_store_message_raw(tf_ssb_t* ssb, const char* id, const
 		*/
 		tf_printf("%p: Previous message doesn't exist for author=%s sequence=%" PRId64 " previous=%s.\n", db, author, sequence, previous);
 	}
-	tf_ssb_release_db_writer(ssb, db);
 	return last_row_id;
 }
 
@@ -469,30 +566,47 @@ typedef struct _message_store_t
 static void _tf_ssb_db_store_message_work(tf_ssb_t* ssb, void* user_data)
 {
 	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);
-	if (last_row_id != -1)
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+	bool in_transaction = _tf_ssb_db_try_exec(db, "BEGIN TRANSACTION") == SQLITE_OK;
+
+	while (store)
 	{
-		store->out_stored = true;
-		store->out_blob_wants = _tf_ssb_db_get_message_blob_wants(ssb, last_row_id);
+		int64_t last_row_id = _tf_ssb_db_store_message_raw(db, 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 = store->next;
 	}
+
+	if (in_transaction)
+	{
+		if (_tf_ssb_db_try_exec(db, "COMMIT TRANSACTION") != SQLITE_OK)
+		{
+			store = user_data;
+			while (store)
+			{
+				store->out_stored = false;
+				store = store->next;
+			}
+		}
+	}
+	tf_ssb_release_db_writer(ssb, db);
 }
 
 static void _wake_up_queue(tf_ssb_t* ssb, tf_ssb_store_queue_t* queue)
 {
 	if (!queue->running)
 	{
-		message_store_t* next = queue->head;
-		if (next)
+		message_store_t* stores = queue->head;
+		queue->head = NULL;
+		queue->tail = NULL;
+		if (stores)
 		{
-			queue->head = next->next;
-			if (queue->tail == next)
-			{
-				queue->tail = NULL;
-			}
-			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);
+			tf_ssb_run_work(ssb, _tf_ssb_db_store_message_work, _tf_ssb_db_store_message_after_work, stores);
 		}
 	}
 }
@@ -501,43 +615,63 @@ static void _tf_ssb_db_store_message_after_work(tf_ssb_t* ssb, int status, void*
 {
 	message_store_t* store = user_data;
 	tf_trace_t* trace = tf_ssb_get_trace(ssb);
-	if (store->out_stored)
+
+	message_store_t* last_stored = NULL;
+
+	while (store)
+	{
+		if (store->out_stored)
+		{
+			last_stored = store;
+		}
+		if (store->out_blob_wants)
+		{
+			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_free(store->out_blob_wants);
+			tf_trace_end(trace);
+		}
+
+		if (store->callback)
+		{
+			store->callback(store->id, store->out_stored, store->user_data);
+		}
+		store = store->next;
+	}
+
+	if (last_stored)
 	{
 		tf_trace_begin(trace, "notify_message_added");
 		JSContext* context = tf_ssb_get_context(ssb);
-		JSValue formatted =
-			tf_ssb_format_message(context, store->previous, store->author, store->sequence, store->timestamp, "sha256", store->content, store->signature, store->flags);
+		JSValue formatted = tf_ssb_format_message(context, last_stored->previous, last_stored->author, last_stored->sequence, last_stored->timestamp, "sha256",
+			last_stored->content, last_stored->signature, last_stored->flags);
 		JSValue message = JS_NewObject(context);
-		JS_SetPropertyStr(context, message, "key", JS_NewString(context, store->id));
+		JS_SetPropertyStr(context, message, "key", JS_NewString(context, last_stored->id));
 		JS_SetPropertyStr(context, message, "value", formatted);
 		char timestamp_string[256];
-		snprintf(timestamp_string, sizeof(timestamp_string), "%f", store->timestamp);
+		snprintf(timestamp_string, sizeof(timestamp_string), "%f", last_stored->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(ssb, last_stored->author, last_stored->sequence, last_stored->id, message);
 		JS_FreeValue(context, message);
 		tf_trace_end(trace);
 	}
-	if (store->out_blob_wants)
-	{
-		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_free(store->out_blob_wants);
-		tf_trace_end(trace);
-	}
 
 	JSContext* context = tf_ssb_get_context(ssb);
-	if (store->callback)
+	store = user_data;
+	while (store)
 	{
-		store->callback(store->id, store->out_stored, store->user_data);
+		JS_FreeCString(context, store->content);
+		message_store_t* last = store;
+		store = store->next;
+		tf_free(last);
 	}
-	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);
 }
 
 void tf_ssb_db_store_message(
@@ -880,27 +1014,52 @@ bool tf_ssb_db_get_latest_message_by_author(tf_ssb_t* ssb, const char* author, i
 	bool found = false;
 	sqlite3_stmt* statement;
 	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	const char* query = "SELECT id, sequence FROM messages WHERE author = ?1 AND sequence = (SELECT MAX(sequence) FROM messages WHERE author = ?1)";
-	if (sqlite3_prepare(db, query, -1, &statement, NULL) == SQLITE_OK)
+
+	if (out_message_id)
 	{
-		if (sqlite3_bind_text(statement, 1, author, -1, NULL) == SQLITE_OK && sqlite3_step(statement) == SQLITE_ROW)
+		const char* query = "SELECT id, sequence FROM messages WHERE author = ?1 ORDER BY sequence DESC LIMIT 1";
+		if (sqlite3_prepare(db, query, -1, &statement, NULL) == SQLITE_OK)
 		{
-			if (out_sequence)
+			if (sqlite3_bind_text(statement, 1, author, -1, NULL) == SQLITE_OK && sqlite3_step(statement) == SQLITE_ROW)
 			{
-				*out_sequence = sqlite3_column_int64(statement, 1);
+				if (out_sequence)
+				{
+					*out_sequence = sqlite3_column_int64(statement, 1);
+				}
+				if (out_message_id)
+				{
+					strncpy(out_message_id, (const char*)sqlite3_column_text(statement, 0), out_message_id_size - 1);
+				}
+				found = true;
 			}
-			if (out_message_id)
-			{
-				strncpy(out_message_id, (const char*)sqlite3_column_text(statement, 0), out_message_id_size - 1);
-			}
-			found = true;
+			sqlite3_finalize(statement);
+		}
+		else
+		{
+			tf_printf("%s: prepare failed: %s\n", __FUNCTION__, sqlite3_errmsg(db));
 		}
-		sqlite3_finalize(statement);
 	}
 	else
 	{
-		tf_printf("%s: prepare failed: %s\n", __FUNCTION__, sqlite3_errmsg(db));
+		const char* query = "SELECT max_sequence FROM messages_stats WHERE author = ?1";
+		if (sqlite3_prepare(db, query, -1, &statement, NULL) == SQLITE_OK)
+		{
+			if (sqlite3_bind_text(statement, 1, author, -1, NULL) == SQLITE_OK && sqlite3_step(statement) == SQLITE_ROW)
+			{
+				if (out_sequence)
+				{
+					*out_sequence = sqlite3_column_int64(statement, 0);
+				}
+				found = true;
+			}
+			sqlite3_finalize(statement);
+		}
+		else
+		{
+			tf_printf("%s: prepare failed: %s\n", __FUNCTION__, sqlite3_errmsg(db));
+		}
 	}
+
 	tf_ssb_release_db_reader(ssb, db);
 	return found;
 }
@@ -1004,8 +1163,8 @@ int tf_ssb_sqlite_authorizer(void* user_data, int action_code, const char* arg0,
 		result = SQLITE_OK;
 		break;
 	case SQLITE_READ:
-		result = (strcmp(arg0, "blob_wants_view") == 0 || strcmp(arg0, "json_each") == 0 || strcmp(arg0, "json_tree") == 0 || strcmp(arg0, "messages") == 0 ||
-					 strcmp(arg0, "messages_stats") == 0 || strcmp(arg0, "messages_fts") == 0 || strcmp(arg0, "messages_fts_idx") == 0 ||
+		result = (strcmp(arg0, "blob_wants_cache") == 0 || strcmp(arg0, "blob_wants_view") == 0 || strcmp(arg0, "json_each") == 0 || strcmp(arg0, "json_tree") == 0 ||
+					 strcmp(arg0, "messages") == 0 || strcmp(arg0, "messages_stats") == 0 || strcmp(arg0, "messages_fts") == 0 || strcmp(arg0, "messages_fts_idx") == 0 ||
 					 strcmp(arg0, "messages_fts_config") == 0 || strcmp(arg0, "messages_refs") == 0 || strcmp(arg0, "messages_refs_message_idx") == 0 ||
 					 strcmp(arg0, "messages_refs_ref_idx") == 0 || strcmp(arg0, "sqlite_master") == 0 || false)
 			? SQLITE_OK
@@ -1277,7 +1436,7 @@ static int _following_compare(const void* a, const void* b)
 
 static bool _has_following_entry(const char* id, following_t** list, int count)
 {
-	return count ? bsearch(id, list, count, sizeof(following_t*), _following_compare) != 0 : false;
+	return count ? bsearch(id, list, count, sizeof(following_t*), _following_compare) != NULL : false;
 }
 
 static bool _add_following_entry(following_t*** list, int* count, following_t* add)
@@ -1367,9 +1526,9 @@ static void _populate_follows_and_blocks(tf_ssb_t* ssb, following_t* entry, foll
 	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
 	sqlite3_stmt* statement = NULL;
 	if (sqlite3_prepare(db,
-			"SELECT json_extract(content, '$.contact') AS contact, json_extract(content, '$.following'), json_extract(content, '$.blocking') "
+			"SELECT content ->> '$.contact' AS contact, content ->> '$.following', content ->> '$.blocking' "
 			"FROM messages "
-			"WHERE contact IS NOT NULL AND author = ? AND json_extract(content, '$.type') = 'contact' "
+			"WHERE contact IS NOT NULL AND author = ? AND content ->> '$.type' = 'contact' "
 			"ORDER BY sequence",
 			-1, &statement, NULL) == SQLITE_OK)
 	{
@@ -1432,21 +1591,22 @@ static void _populate_follows_and_blocks(tf_ssb_t* ssb, following_t* entry, foll
 static void _get_following(
 	tf_ssb_t* ssb, following_t* entry, following_t*** following, int* following_count, int depth, int max_depth, block_node_t* active_blocks, bool include_blocks)
 {
+	int old_depth = entry->depth;
 	entry->depth = tf_min(depth, entry->depth);
-	if (depth < max_depth && !entry->populated && !_is_blocked_by_active_blocks(entry->id, active_blocks))
+	if (depth < max_depth && depth < old_depth)
 	{
-		entry->populated = true;
-		_populate_follows_and_blocks(ssb, entry, following, following_count, active_blocks, include_blocks);
-
-		if (depth < max_depth)
+		if (!_is_blocked_by_active_blocks(entry->id, active_blocks))
 		{
+			if (!entry->populated)
+			{
+				entry->populated = true;
+				_populate_follows_and_blocks(ssb, entry, following, following_count, active_blocks, include_blocks);
+			}
+
 			block_node_t blocks = { .entry = entry, .parent = active_blocks };
 			for (int i = 0; i < entry->following_count; i++)
 			{
-				if (!_has_following_entry(entry->following[i]->id, entry->blocking, entry->blocking_count))
-				{
-					_get_following(ssb, entry->following[i], following, following_count, depth + 1, max_depth, &blocks, include_blocks);
-				}
+				_get_following(ssb, entry->following[i], following, following_count, depth + 1, max_depth, &blocks, include_blocks);
 			}
 		}
 	}
@@ -2126,6 +2286,51 @@ bool tf_ssb_db_get_global_setting_string(sqlite3* db, const char* name, char* ou
 	return result;
 }
 
+bool tf_ssb_db_set_global_setting_from_string(sqlite3* db, const char* name, char* value)
+{
+	tf_setting_kind_t kind = tf_util_get_global_setting_kind(name);
+	if (kind == k_kind_unknown)
+	{
+		return false;
+	}
+
+	bool result = false;
+	sqlite3_stmt* statement;
+	if (sqlite3_prepare(db,
+			"INSERT INTO properties (id, key, value) VALUES ('core', 'settings', json_object(?1, ?2)) ON CONFLICT DO UPDATE SET value = json_set(value, '$.' || ?1, ?2)", -1,
+			&statement, NULL) == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, name, -1, NULL) == SQLITE_OK)
+		{
+			bool bound = false;
+			switch (kind)
+			{
+			case k_kind_bool:
+				bound = sqlite3_bind_int(statement, 2, value && (strcmp(value, "true") == 0 || atoi(value))) == SQLITE_OK;
+				break;
+			case k_kind_int:
+				bound = sqlite3_bind_int(statement, 2, atoi(value)) == SQLITE_OK;
+				break;
+			case k_kind_string:
+				bound = sqlite3_bind_text(statement, 2, value, -1, NULL) == SQLITE_OK;
+				break;
+			case k_kind_unknown:
+				break;
+			}
+			if (bound && sqlite3_step(statement) == SQLITE_DONE)
+			{
+				result = sqlite3_changes(db) != 0;
+			}
+		}
+		sqlite3_finalize(statement);
+	}
+	else
+	{
+		tf_printf("prepare failed: %s\n", sqlite3_errmsg(db));
+	}
+	return result;
+}
+
 const char* tf_ssb_db_get_profile(sqlite3* db, const char* id)
 {
 	const char* result = NULL;
@@ -2159,7 +2364,7 @@ const char* tf_ssb_db_get_profile_name(sqlite3* db, const char* id)
 	if (sqlite3_prepare(db,
 			"SELECT 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 WHERE messages.author = ? "
-			"AND json_extract(messages.content, '$.type') = 'about' AND content ->> 'about' = messages.author AND name IS NOT NULL) "
+			"AND messages.content ->> '$.type' = 'about' AND content ->> 'about' = messages.author AND name IS NOT NULL) "
 			"WHERE author_rank = 1",
 			-1, &statement, NULL) == SQLITE_OK)
 	{
@@ -2269,3 +2474,136 @@ bool tf_ssb_db_use_invite(sqlite3* db, const char* id)
 
 	return used;
 }
+
+bool tf_ssb_db_has_invite(sqlite3* db, const char* id)
+{
+	bool has = false;
+	sqlite3_stmt* statement;
+	if (sqlite3_prepare(db, "SELECT COUNT(*) FROM invites WHERE invite_public_key = ? AND (expires < 0 OR expires >= ?) AND (use_count > 0 OR use_count = -1)", -1, &statement,
+			NULL) == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_int64(statement, 2, (int64_t)time(NULL)) == SQLITE_OK)
+		{
+			has = sqlite3_step(statement) == SQLITE_ROW && sqlite3_column_int(statement, 0) > 0;
+		}
+		sqlite3_finalize(statement);
+	}
+	return has;
+}
+
+static void _tf_ssb_db_get_identity_info_visit(const char* identity, void* user_data)
+{
+	tf_ssb_identity_info_t* info = user_data;
+	info->identity = tf_resize_vec(info->identity, (info->count + 1) * sizeof(char*));
+	info->name = tf_resize_vec(info->name, (info->count + 1) * sizeof(char*));
+	char buffer[k_id_base64_len];
+	snprintf(buffer, sizeof(buffer), "@%s", identity);
+	info->identity[info->count] = tf_strdup(buffer);
+	info->name[info->count] = NULL;
+	info->count++;
+}
+
+tf_ssb_identity_info_t* tf_ssb_db_get_identity_info(tf_ssb_t* ssb, const char* user, const char* package_owner, const char* package_name)
+{
+	tf_ssb_identity_info_t* info = tf_malloc(sizeof(tf_ssb_identity_info_t));
+	*info = (tf_ssb_identity_info_t) { 0 };
+
+	char id[k_id_base64_len] = "";
+	if (tf_ssb_db_user_has_permission(ssb, NULL, user, "administration"))
+	{
+		if (tf_ssb_whoami(ssb, id, sizeof(id)))
+		{
+			_tf_ssb_db_get_identity_info_visit(*id == '@' ? id + 1 : id, info);
+		}
+	}
+	tf_ssb_db_identity_visit(ssb, user, _tf_ssb_db_get_identity_info_visit, info);
+
+	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
+	sqlite3_stmt* statement = NULL;
+	int result = sqlite3_prepare(db,
+		"SELECT author, name FROM ( "
+		"	SELECT "
+		"		messages.author, "
+		"		RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank, "
+		"		messages.content ->> 'name' AS name "
+		"	FROM messages "
+		"	JOIN identities ON messages.author = ('@' || identities.public_key) "
+		"	WHERE "
+		"		(identities.user = ? OR identities.public_key = ?) AND "
+		"		messages.content ->> '$.type' = 'about' AND "
+		"		content ->> 'about' = messages.author AND name IS NOT NULL) "
+		"WHERE author_rank = 1 ",
+		-1, &statement, NULL);
+	if (result == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, user, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, *id == '@' ? id + 1 : id, -1, NULL) == SQLITE_OK)
+		{
+			int r = SQLITE_OK;
+			while ((r = sqlite3_step(statement)) == SQLITE_ROW)
+			{
+				const char* identity = (const char*)sqlite3_column_text(statement, 0);
+				const char* name = (const char*)sqlite3_column_text(statement, 1);
+				for (int i = 0; i < info->count; i++)
+				{
+					if (!info->name[i] && strcmp(info->identity[i], identity) == 0)
+					{
+						info->name[i] = tf_strdup(name);
+						break;
+					}
+				}
+			}
+		}
+		sqlite3_finalize(statement);
+	}
+	else
+	{
+		tf_printf("prepare failed: %s.\n", sqlite3_errmsg(db));
+	}
+
+	tf_ssb_db_identity_get_active(db, user, package_owner, package_name, info->active_identity, sizeof(info->active_identity));
+	if (!*info->active_identity && info->count)
+	{
+		snprintf(info->active_identity, sizeof(info->active_identity), "%s", info->identity[0]);
+	}
+	tf_ssb_release_db_reader(ssb, db);
+
+	size_t size = sizeof(tf_ssb_identity_info_t) + sizeof(char*) * info->count * 2;
+	for (int i = 0; i < info->count; i++)
+	{
+		size += strlen(info->identity[i]) + 1;
+		size += info->name[i] ? strlen(info->name[i]) + 1 : 0;
+	}
+	tf_ssb_identity_info_t* copy = tf_malloc(size);
+	*copy = *info;
+
+	copy->identity = (const char**)(copy + 1);
+	copy->name = (const char**)(copy + 1) + copy->count;
+
+	char* p = (char*)((const char**)(copy + 1) + copy->count * 2);
+
+	for (int i = 0; i < info->count; i++)
+	{
+		size_t length = strlen(info->identity[i]);
+		memcpy(p, info->identity[i], length + 1);
+		copy->identity[i] = p;
+		p += length + 1;
+		tf_free((void*)info->identity[i]);
+
+		if (info->name[i])
+		{
+			length = strlen(info->name[i]);
+			memcpy(p, info->name[i], length + 1);
+			copy->name[i] = p;
+			p += length + 1;
+			tf_free((void*)info->name[i]);
+		}
+		else
+		{
+			copy->name[i] = NULL;
+		}
+	}
+	tf_free(info->name);
+	tf_free(info->identity);
+	tf_free(info);
+	return copy;
+}

src/ssb.db.h

@@ -486,6 +486,15 @@ bool tf_ssb_db_get_global_setting_int64(sqlite3* db, const char* name, int64_t*
 */
 bool tf_ssb_db_get_global_setting_string(sqlite3* db, const char* name, char* out_value, size_t size);
 
+/**
+** Set a global setting from a string representation of its value.
+** @param db The database.
+** @param name The setting name.
+** @param value The settinv value.
+** @return true if the setting was set.
+*/
+bool tf_ssb_db_set_global_setting_from_string(sqlite3* db, const char* name, char* value);
+
 /**
 ** Get the latest profile information for the given identity.
 ** @param db The database.
@@ -547,4 +556,37 @@ bool tf_ssb_db_is_account_familiar(sqlite3* db, const char* id, int depth);
 */
 int tf_ssb_sqlite_authorizer(void* user_data, int action_code, const char* arg0, const char* arg1, const char* arg2, const char* arg3);
 
+/**
+** Check if we have an invite for the given account.
+** @param db The database.
+** @param id The invite public key to check.
+** @return true If we have a valid invite for the address.
+*/
+bool tf_ssb_db_has_invite(sqlite3* db, const char* id);
+
+/**
+** Identity information
+*/
+typedef struct _tf_ssb_identity_info_t
+{
+	/** An array of identities. */
+	const char** identity;
+	/** A array of identities, one for each identity. */
+	const char** name;
+	/** The number of elements in both the identity and name arrays. */
+	int count;
+	/** The active identity. */
+	char active_identity[k_id_base64_len];
+} tf_ssb_identity_info_t;
+
+/**
+** Get available identities, names, and the active identity for a user.
+** @param ssb The SSB instance.
+** @param user The user name.
+** @param package_owner The owner of the package for which identity info is being fetched.
+** @param package_name The name of the package for which identity info is being fetched.
+** @return A struct of identities, names, and the active identity.  Free with tf_free().
+*/
+tf_ssb_identity_info_t* tf_ssb_db_get_identity_info(tf_ssb_t* ssb, const char* user, const char* package_owner, const char* package_name);
+
 /** @} */

src/ssb.ebt.c

@@ -7,6 +7,7 @@
 
 #include "uv.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 typedef struct _ebt_entry_t
@@ -29,6 +30,9 @@ typedef struct _tf_ssb_ebt_t
 	int entries_count;
 
 	int send_clock_pending;
+
+	int max_in;
+	int max_out;
 } tf_ssb_ebt_t;
 
 tf_ssb_ebt_t* tf_ssb_ebt_create(tf_ssb_connection_t* connection)
@@ -55,8 +59,33 @@ static int _ebt_entry_compare(const void* a, const void* b)
 	return strcmp(id, entry->id);
 }
 
+static void _ebt_count_messages(tf_ssb_ebt_t* ebt, int* in, int* out)
+{
+	for (int i = 0; i < ebt->entries_count; i++)
+	{
+		ebt_entry_t* entry = &ebt->entries[i];
+		if (entry->in >= 0 && entry->out >= 0)
+		{
+			if (entry->out_receive && entry->in > entry->out)
+			{
+				*in += entry->in - entry->out;
+			}
+			else if (entry->in_receive && entry->out > entry->in)
+			{
+				*out += entry->out - entry->in;
+			}
+		}
+	}
+}
+
 static ebt_entry_t* _ebt_get_entry(tf_ssb_ebt_t* ebt, const char* id)
 {
+	uint8_t bin[k_id_bin_len];
+	if (!tf_ssb_id_str_to_bin(bin, id))
+	{
+		return NULL;
+	}
+
 	int index = tf_util_insert_index(id, ebt->entries, ebt->entries_count, sizeof(ebt_entry_t), _ebt_entry_compare);
 	if (index < ebt->entries_count && strcmp(id, ebt->entries[index].id) == 0)
 	{
@@ -104,27 +133,37 @@ void tf_ssb_ebt_receive_clock(tf_ssb_ebt_t* ebt, JSContext* context, JSValue clo
 				JS_ToInt64(context, &sequence, in_clock);
 
 				ebt_entry_t* entry = _ebt_get_entry(ebt, author);
-				if (sequence < 0)
+				if (entry)
 				{
-					entry->in = -1;
-					entry->in_replicate = false;
-					entry->in_receive = false;
-				}
-				else
-				{
-					entry->in = sequence >> 1;
-					entry->in_replicate = true;
-					entry->in_receive = (sequence & 1) == 0;
-				}
-				if (!entry->in_receive)
-				{
-					tf_ssb_connection_remove_new_message_request(ebt->connection, author);
+					if (sequence < 0)
+					{
+						entry->in = tf_max(entry->in, -1);
+						entry->in_replicate = false;
+						entry->in_receive = false;
+					}
+					else
+					{
+						entry->in = tf_max(entry->in, sequence >> 1);
+						entry->in_replicate = true;
+						entry->in_receive = (sequence & 1) == 0;
+					}
+					if (!entry->in_receive)
+					{
+						tf_ssb_connection_remove_new_message_request(ebt->connection, author);
+					}
 				}
 				JS_FreeCString(context, author);
 				JS_FreeValue(context, key);
 			}
 			JS_FreeValue(context, in_clock);
 		}
+
+		int in = 0;
+		int out = 0;
+		_ebt_count_messages(ebt, &in, &out);
+		ebt->max_in = tf_max(in, ebt->max_in);
+		ebt->max_out = tf_max(out, ebt->max_out);
+
 		uv_mutex_unlock(&ebt->mutex);
 		for (uint32_t i = 0; i < plen; ++i)
 		{
@@ -154,29 +193,33 @@ static void _ebt_add_to_clock(ebt_get_clock_t* work, const char* id, int64_t val
 {
 	int count = work->clock ? work->clock->count : 0;
 	ebt_entry_t* entry = _ebt_get_entry(work->ebt, id);
-	if ((replicate && !entry->out_replicate) || (receive && !entry->out_receive) || ((replicate || receive || entry->out_replicate || entry->out_receive) && entry->out != value))
+	if (entry)
 	{
-		entry->out = value;
+		if ((replicate && !entry->out_replicate) || (receive && !entry->out_receive) ||
+			((replicate || receive || entry->out_replicate || entry->out_receive) && entry->out != value))
+		{
+			int index = tf_util_insert_index(id, count ? work->clock->entries : NULL, count, sizeof(tf_ssb_ebt_clock_entry_t), _ebt_compare_entry);
+			int64_t out_value = (entry->out_replicate || replicate) ? ((tf_max(entry->out, value) << 1) | ((entry->out_receive || receive) ? 0 : 1)) : -1;
+			if (index < count && strcmp(id, work->clock->entries[index].id) == 0)
+			{
+				work->clock->entries[index].value = out_value;
+			}
+			else
+			{
+				work->clock = tf_resize_vec(work->clock, sizeof(tf_ssb_ebt_clock_t) + (count + 1) * sizeof(tf_ssb_ebt_clock_entry_t));
+				if (index < count)
+				{
+					memmove(work->clock->entries + index + 1, work->clock->entries + index, (count - index) * sizeof(tf_ssb_ebt_clock_entry_t));
+				}
+				work->clock->entries[index] = (tf_ssb_ebt_clock_entry_t) { .value = out_value };
+				snprintf(work->clock->entries[index].id, sizeof(work->clock->entries[index].id), "%s", id);
+				work->clock->count = count + 1;
+			}
+		}
+
+		entry->out = tf_max(entry->out, value);
 		entry->out_replicate = entry->out_replicate || replicate;
 		entry->out_receive = entry->out_receive || receive;
-
-		int index = tf_util_insert_index(id, count ? work->clock->entries : NULL, count, sizeof(tf_ssb_ebt_clock_entry_t), _ebt_compare_entry);
-		int64_t out_value = entry->out_replicate ? ((value << 1) | (entry->out_receive ? 0 : 1)) : -1;
-		if (index < count && strcmp(id, work->clock->entries[index].id) == 0)
-		{
-			work->clock->entries[index].value = out_value;
-		}
-		else
-		{
-			work->clock = tf_resize_vec(work->clock, sizeof(tf_ssb_ebt_clock_t) + (count + 1) * sizeof(tf_ssb_ebt_clock_entry_t));
-			if (index < count)
-			{
-				memmove(work->clock->entries + index + 1, work->clock->entries + index, (count - index) * sizeof(tf_ssb_ebt_clock_entry_t));
-			}
-			work->clock->entries[index] = (tf_ssb_ebt_clock_entry_t) { .value = out_value };
-			snprintf(work->clock->entries[index].id, sizeof(work->clock->entries[index].id), "%s", id);
-			work->clock->count = count + 1;
-		}
 	}
 }
 
@@ -257,6 +300,14 @@ static void _tf_ssb_ebt_get_send_clock_work(tf_ssb_connection_t* connection, voi
 		uv_mutex_unlock(&work->ebt->mutex);
 		tf_free(requested);
 	}
+
+	uv_mutex_lock(&work->ebt->mutex);
+	int in = 0;
+	int out = 0;
+	_ebt_count_messages(work->ebt, &in, &out);
+	work->ebt->max_in = tf_max(in, work->ebt->max_in);
+	work->ebt->max_out = tf_max(out, work->ebt->max_out);
+	uv_mutex_unlock(&work->ebt->mutex);
 }
 
 static void _tf_ssb_ebt_get_send_clock_after_work(tf_ssb_connection_t* connection, int status, void* user_data)
@@ -303,10 +354,24 @@ void tf_ssb_ebt_set_messages_sent(tf_ssb_ebt_t* ebt, const char* id, int64_t seq
 {
 	uv_mutex_lock(&ebt->mutex);
 	ebt_entry_t* entry = _ebt_get_entry(ebt, id);
-	entry->in = tf_max(entry->in, sequence);
-	if (entry->in == entry->out && (tf_ssb_connection_get_flags(ebt->connection) & k_tf_ssb_connect_flag_one_shot) == 0)
+	if (entry)
 	{
-		tf_ssb_connection_add_new_message_request(ebt->connection, id, tf_ssb_connection_get_ebt_request_number(ebt->connection), false);
+		entry->in = tf_max(entry->in, sequence);
+		if (entry->in == entry->out && (tf_ssb_connection_get_flags(ebt->connection) & k_tf_ssb_connect_flag_one_shot) == 0)
+		{
+			tf_ssb_connection_add_new_message_request(ebt->connection, id, tf_ssb_connection_get_ebt_request_number(ebt->connection), false);
+		}
+	}
+	uv_mutex_unlock(&ebt->mutex);
+}
+
+void tf_ssb_ebt_set_messages_received(tf_ssb_ebt_t* ebt, const char* id, int64_t sequence)
+{
+	uv_mutex_lock(&ebt->mutex);
+	ebt_entry_t* entry = _ebt_get_entry(ebt, id);
+	if (entry)
+	{
+		entry->out = tf_max(entry->out, sequence);
 	}
 	uv_mutex_unlock(&ebt->mutex);
 }
@@ -320,3 +385,34 @@ void tf_ssb_ebt_set_send_clock_pending(tf_ssb_ebt_t* ebt, int pending)
 {
 	ebt->send_clock_pending = pending;
 }
+
+void tf_ssb_ebt_debug_clock(tf_ssb_ebt_t* ebt, JSContext* context, JSValue debug)
+{
+	uv_mutex_lock(&ebt->mutex);
+	for (int i = 0; i < ebt->entries_count; i++)
+	{
+		ebt_entry_t* entry = &ebt->entries[i];
+		JSValue clock = JS_NewObject(context);
+		JSValue out = JS_NewObject(context);
+		JSValue in = JS_NewObject(context);
+		JS_SetPropertyStr(context, out, "value", JS_NewInt64(context, entry->out));
+		JS_SetPropertyStr(context, out, "replicate", JS_NewBool(context, entry->out_replicate));
+		JS_SetPropertyStr(context, out, "receive", JS_NewBool(context, entry->out_receive));
+		JS_SetPropertyStr(context, clock, "out", out);
+		JS_SetPropertyStr(context, in, "value", JS_NewInt64(context, entry->in));
+		JS_SetPropertyStr(context, in, "replicate", JS_NewBool(context, entry->in_replicate));
+		JS_SetPropertyStr(context, in, "receive", JS_NewBool(context, entry->in_receive));
+		JS_SetPropertyStr(context, clock, "in", in);
+		JS_SetPropertyStr(context, debug, entry->id, clock);
+	}
+	uv_mutex_unlock(&ebt->mutex);
+}
+
+void tf_ssb_ebt_get_progress(tf_ssb_ebt_t* ebt, int* in_pending, int* in_total, int* out_pending, int* out_total)
+{
+	uv_mutex_lock(&ebt->mutex);
+	_ebt_count_messages(ebt, in_pending, out_pending);
+	*in_total = tf_max(*in_pending, ebt->max_in);
+	*out_total = tf_max(*out_pending, ebt->max_out);
+	uv_mutex_unlock(&ebt->mutex);
+}

src/ssb.ebt.h

@@ -78,6 +78,14 @@ tf_ssb_ebt_clock_t* tf_ssb_ebt_get_messages_to_send(tf_ssb_ebt_t* ebt);
 */
 void tf_ssb_ebt_set_messages_sent(tf_ssb_ebt_t* ebt, const char* id, int64_t sequence);
 
+/**
+** Update the clock state indicating the messages that have been received for an account.
+** @param ebt The EBT instance.
+** @param id The identity to update.
+** @param sequence The maximum sequence number received.
+*/
+void tf_ssb_ebt_set_messages_received(tf_ssb_ebt_t* ebt, const char* id, int64_t sequence);
+
 /**
 ** Destroy an EBT instance.
 ** @param ebt The EBT instance.
@@ -97,3 +105,22 @@ int tf_ssb_ebt_get_send_clock_pending(tf_ssb_ebt_t* ebt);
 ** @param pending A value representing the pending status.
 */
 void tf_ssb_ebt_set_send_clock_pending(tf_ssb_ebt_t* ebt, int pending);
+
+/**
+** Get a JSON representation of the clock state for
+** debugging.
+** @param ebt The EBT instance.
+** @param context The JS context.
+** @param debug A JS object populated with the information.
+*/
+void tf_ssb_ebt_debug_clock(tf_ssb_ebt_t* ebt, JSContext* context, JSValue debug);
+
+/**
+** Get a representation of sync progress.
+** @param ebt The EBT instance.
+** @param in_pending Populated with the number of messages remaining to be received.
+** @param in_total Populated with the total number of messages to receive this session.
+** @param out_pending Populated with the number of messages remaining to send.
+** @param out_total Populated with the total number of messages to send this session.
+*/
+void tf_ssb_ebt_get_progress(tf_ssb_ebt_t* ebt, int* in_pending, int* in_total, int* out_pending, int* out_total);

src/ssb.h

@@ -636,10 +636,12 @@ void tf_ssb_remove_broadcasts_changed_callback(tf_ssb_t* ssb, tf_ssb_broadcasts_
 /**
 ** A callback called when a message is added to the database.
 ** @param ssb The SSB instance.
+** @param author The author identity.
+** @param sequence The message sequence number.
 ** @param id The message identifier.
 ** @param user_data The user data.
 */
-typedef void(tf_ssb_message_added_callback_t)(tf_ssb_t* ssb, const char* id, void* user_data);
+typedef void(tf_ssb_message_added_callback_t)(tf_ssb_t* ssb, const char* author, int64_t sequence, const char* id, void* user_data);
 
 /**
 ** Register a callback called when a message is added to the database.
@@ -661,10 +663,12 @@ void tf_ssb_remove_message_added_callback(tf_ssb_t* ssb, tf_ssb_message_added_ca
 /**
 ** Call all callbacks registered for when a message is added to the database.
 ** @param ssb The SSB instance.
+** @param author The message author's identity.
+** @param sequence The message sequence number.
 ** @param id The message identity added.
 ** @param message_with_keys The message added in the format required if keys are requested.
 */
-void tf_ssb_notify_message_added(tf_ssb_t* ssb, const char* id, JSValue message_with_keys);
+void tf_ssb_notify_message_added(tf_ssb_t* ssb, const char* author, int64_t sequence, const char* id, JSValue message_with_keys);
 
 /**
 ** Record that a new blob was stored.

src/ssb.js.c

@@ -3,6 +3,7 @@
 #include "log.h"
 #include "mem.h"
 #include "ssb.db.h"
+#include "ssb.ebt.h"
 #include "ssb.h"
 #include "util.js.h"
 
@@ -613,87 +614,14 @@ typedef struct _identity_info_work_t
 	const char* name;
 	const char* package_owner;
 	const char* package_name;
-	int count;
-	char** identities;
-	char** names;
-	int result;
-	char active_identity[k_id_base64_len];
+	tf_ssb_identity_info_t* info;
 	JSValue promise[2];
 } identity_info_work_t;
 
-static void _tf_ssb_getIdentityInfo_visit(const char* identity, void* data)
-{
-	identity_info_work_t* request = data;
-	request->identities = tf_resize_vec(request->identities, (request->count + 1) * sizeof(char*));
-	request->names = tf_resize_vec(request->names, (request->count + 1) * sizeof(char*));
-	char buffer[k_id_base64_len];
-	snprintf(buffer, sizeof(buffer), "@%s", identity);
-	request->identities[request->count] = tf_strdup(buffer);
-	request->names[request->count] = NULL;
-	request->count++;
-}
-
 static void _tf_ssb_getIdentityInfo_work(tf_ssb_t* ssb, void* user_data)
 {
 	identity_info_work_t* request = user_data;
-	char id[k_id_base64_len] = "";
-	if (tf_ssb_db_user_has_permission(ssb, NULL, request->name, "administration"))
-	{
-		if (tf_ssb_whoami(ssb, id, sizeof(id)))
-		{
-			_tf_ssb_getIdentityInfo_visit(*id == '@' ? id + 1 : id, request);
-		}
-	}
-	tf_ssb_db_identity_visit(ssb, request->name, _tf_ssb_getIdentityInfo_visit, request);
-
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	sqlite3_stmt* statement = NULL;
-	request->result = sqlite3_prepare(db,
-		"SELECT author, name FROM ( "
-		"	SELECT "
-		"		messages.author, "
-		"		RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank, "
-		"		messages.content ->> 'name' AS name "
-		"	FROM messages "
-		"	JOIN identities ON messages.author = ('@' || identities.public_key) "
-		"	WHERE "
-		"		(identities.user = ? OR identities.public_key = ?) AND "
-		"		json_extract(messages.content, '$.type') = 'about' AND "
-		"		content ->> 'about' = messages.author AND name IS NOT NULL) "
-		"WHERE author_rank = 1 ",
-		-1, &statement, NULL);
-	if (request->result == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, request->name, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, *id == '@' ? id + 1 : id, -1, NULL) == SQLITE_OK)
-		{
-			int r = SQLITE_OK;
-			while ((r = sqlite3_step(statement)) == SQLITE_ROW)
-			{
-				const char* identity = (const char*)sqlite3_column_text(statement, 0);
-				const char* name = (const char*)sqlite3_column_text(statement, 1);
-				for (int i = 0; i < request->count; i++)
-				{
-					if (!request->names[i] && strcmp(request->identities[i], identity) == 0)
-					{
-						request->names[i] = tf_strdup(name);
-						break;
-					}
-				}
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-	else
-	{
-		tf_printf("prepare failed: %s.\n", sqlite3_errmsg(db));
-	}
-
-	tf_ssb_db_identity_get_active(db, request->name, request->package_owner, request->package_name, request->active_identity, sizeof(request->active_identity));
-	if (!*request->active_identity && request->count)
-	{
-		snprintf(request->active_identity, sizeof(request->active_identity), "%s", request->identities[0]);
-	}
-	tf_ssb_release_db_reader(ssb, db);
+	request->info = tf_ssb_db_get_identity_info(ssb, request->name, request->package_owner, request->package_name);
 }
 
 static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void* user_data)
@@ -703,20 +631,20 @@ static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void*
 	JSValue result = JS_NewObject(context);
 
 	JSValue identities = JS_NewArray(context);
-	for (int i = 0; i < request->count; i++)
+	for (int i = 0; i < request->info->count; i++)
 	{
-		JS_SetPropertyUint32(context, identities, i, JS_NewString(context, request->identities[i]));
+		JS_SetPropertyUint32(context, identities, i, JS_NewString(context, request->info->identity[i]));
 	}
 	JS_SetPropertyStr(context, result, "identities", identities);
 
 	JSValue names = JS_NewObject(context);
-	for (int i = 0; i < request->count; i++)
+	for (int i = 0; i < request->info->count; i++)
 	{
-		JS_SetPropertyStr(context, names, request->identities[i], JS_NewString(context, request->names[i] ? request->names[i] : request->identities[i]));
+		JS_SetPropertyStr(context, names, request->info->identity[i], JS_NewString(context, request->info->name[i] ? request->info->name[i] : request->info->identity[i]));
 	}
 	JS_SetPropertyStr(context, result, "names", names);
 
-	JS_SetPropertyStr(context, result, "identity", JS_NewString(context, request->active_identity));
+	JS_SetPropertyStr(context, result, "identity", JS_NewString(context, request->info->active_identity));
 
 	JSValue error = JS_Call(context, request->promise[0], JS_UNDEFINED, 1, &result);
 	tf_util_report_error(context, error);
@@ -725,16 +653,10 @@ static void _tf_ssb_getIdentityInfo_after_work(tf_ssb_t* ssb, int status, void*
 	JS_FreeValue(context, request->promise[0]);
 	JS_FreeValue(context, request->promise[1]);
 
-	for (int i = 0; i < request->count; i++)
-	{
-		tf_free(request->identities[i]);
-		tf_free(request->names[i]);
-	}
-	tf_free(request->identities);
-	tf_free(request->names);
 	tf_free((void*)request->name);
 	tf_free((void*)request->package_owner);
 	tf_free((void*)request->package_name);
+	tf_free(request->info);
 	tf_free(request);
 }
 
@@ -1021,6 +943,21 @@ static JSValue _tf_ssb_connections(JSContext* context, JSValueConst this_val, in
 			{
 				JS_SetPropertyStr(context, object, "destroy_reason", JS_NewString(context, destroy_reason));
 			}
+			int in = 0;
+			int out = 0;
+			int max_in = 0;
+			int max_out = 0;
+			tf_ssb_ebt_get_progress(tf_ssb_connection_get_ebt(connection), &in, &max_in, &out, &max_out);
+			JSValue progress = JS_NewObject(context);
+			JSValue in_progress = JS_NewObject(context);
+			JS_SetPropertyStr(context, in_progress, "current", JS_NewInt32(context, in));
+			JS_SetPropertyStr(context, in_progress, "total", JS_NewInt32(context, max_in));
+			JS_SetPropertyStr(context, progress, "in", in_progress);
+			JSValue out_progress = JS_NewObject(context);
+			JS_SetPropertyStr(context, out_progress, "current", JS_NewInt32(context, out));
+			JS_SetPropertyStr(context, out_progress, "total", JS_NewInt32(context, max_out));
+			JS_SetPropertyStr(context, progress, "out", out_progress);
+			JS_SetPropertyStr(context, object, "progress", progress);
 			JS_SetPropertyUint32(context, result, i, object);
 		}
 	}
@@ -1657,7 +1594,7 @@ static void _tf_ssb_cleanup_value(tf_ssb_t* ssb, void* user_data)
 	JS_FreeValue(tf_ssb_get_context(ssb), callback);
 }
 
-static void _tf_ssb_on_message_added_callback(tf_ssb_t* ssb, const char* id, void* user_data)
+static void _tf_ssb_on_message_added_callback(tf_ssb_t* ssb, const char* author, int64_t sequence, const char* id, void* user_data)
 {
 	JSContext* context = tf_ssb_get_context(ssb);
 	JSValue callback = JS_MKPTR(JS_TAG_OBJECT, user_data);
@@ -2357,6 +2294,12 @@ static JSValue _tf_ssb_set_user_permission(JSContext* context, JSValueConst this
 	return result;
 }
 
+static JSValue _tf_ssb_port(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
+{
+	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
+	return JS_NewInt32(context, tf_ssb_server_get_port(ssb));
+}
+
 void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 {
 	JS_NewClassID(&_tf_ssb_classId);
@@ -2403,6 +2346,7 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 	JS_SetPropertyStr(context, object, "createTunnel", JS_NewCFunction(context, _tf_ssb_createTunnel, "createTunnel", 3));
 	JS_SetPropertyStr(context, object, "following", JS_NewCFunction(context, _tf_ssb_following, "following", 2));
 	JS_SetPropertyStr(context, object, "sync", JS_NewCFunction(context, _tf_ssb_sync, "sync", 0));
+	JS_SetPropertyStr(context, object, "port", JS_NewCFunction(context, _tf_ssb_port, "port", 0));
 	/* Write. */
 	JS_SetPropertyStr(context, object, "storeMessage", JS_NewCFunction(context, _tf_ssb_storeMessage, "storeMessage", 1));
 	JS_SetPropertyStr(context, object, "blobStore", JS_NewCFunction(context, _tf_ssb_blobStore, "blobStore", 1));

src/ssb.rpc.c

@@ -83,6 +83,19 @@ static void _tf_ssb_rpc_blobs_get_after_work(tf_ssb_connection_t* connection, in
 	tf_free(work);
 }
 
+static void _tf_ssb_blobs_get_callback(tf_ssb_connection_t* connection, bool skip, void* user_data)
+{
+	blobs_get_work_t* work = user_data;
+	if (!skip)
+	{
+		tf_ssb_connection_run_work(connection, _tf_ssb_rpc_blobs_get_work, _tf_ssb_rpc_blobs_get_after_work, work);
+	}
+	else
+	{
+		_tf_ssb_rpc_blobs_get_after_work(connection, -1, work);
+	}
+}
+
 static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
 {
 	if (flags & k_ssb_rpc_flag_end_error)
@@ -122,7 +135,7 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 			.request_number = request_number,
 		};
 		snprintf(work->id, sizeof(work->id), "%s", id);
-		tf_ssb_connection_run_work(connection, _tf_ssb_rpc_blobs_get_work, _tf_ssb_rpc_blobs_get_after_work, work);
+		tf_ssb_connection_schedule_idle(connection, id, _tf_ssb_blobs_get_callback, work);
 
 		JS_FreeCString(context, id);
 		JS_FreeValue(context, arg);
@@ -219,7 +232,7 @@ static void _tf_ssb_request_blob_wants_work(tf_ssb_connection_t* connection, voi
 
 	db = tf_ssb_acquire_db_reader(ssb);
 	sqlite3_stmt* statement;
-	if (sqlite3_prepare(db, "SELECT id FROM blob_wants_view WHERE id > ? AND timestamp > ? ORDER BY id LIMIT ?", -1, &statement, NULL) == SQLITE_OK)
+	if (sqlite3_prepare(db, "SELECT id FROM blob_wants_cache WHERE id > ? AND timestamp > ? ORDER BY id LIMIT ?", -1, &statement, NULL) == SQLITE_OK)
 	{
 		if (sqlite3_bind_text(statement, 1, blob_wants->last_id, -1, NULL) == SQLITE_OK && sqlite3_bind_int64(statement, 2, timestamp) == SQLITE_OK &&
 			sqlite3_bind_int(statement, 3, tf_countof(work->out_id)) == SQLITE_OK)
@@ -580,6 +593,7 @@ static void _tf_ssb_rpc_connection_blobs_get_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_remove_request(connection, -request_number);
 	}
 }
 
@@ -657,6 +671,22 @@ static void _tf_ssb_rpc_connection_blobs_create_wants_after_work(tf_ssb_connecti
 	tf_free(work);
 }
 
+typedef struct _blob_get_t
+{
+	char id[k_blob_id_len];
+	size_t size;
+} blob_get_t;
+
+static void _tf_ssb_rpc_connection_blobs_get_idle(tf_ssb_connection_t* connection, bool skip, void* user_data)
+{
+	blob_get_t* get = user_data;
+	if (!skip)
+	{
+		_tf_ssb_rpc_connection_blobs_get(connection, get->id, get->size);
+	}
+	tf_free(get);
+}
+
 static void _tf_ssb_rpc_connection_blobs_createWants_callback(
 	tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
 {
@@ -711,7 +741,10 @@ static void _tf_ssb_rpc_connection_blobs_createWants_callback(
 			}
 			else
 			{
-				_tf_ssb_rpc_connection_blobs_get(connection, blob_id, size);
+				blob_get_t* get = tf_malloc(sizeof(blob_get_t));
+				*get = (blob_get_t) { .size = size };
+				snprintf(get->id, sizeof(get->id), "%s", blob_id);
+				tf_ssb_connection_schedule_idle(connection, blob_id, _tf_ssb_rpc_connection_blobs_get_idle, get);
 			}
 			JS_FreeCString(context, blob_id);
 			JS_FreeValue(context, key);
@@ -951,9 +984,9 @@ static void _tf_ssb_connection_send_history_stream_after_work(tf_ssb_connection_
 
 static void _tf_ssb_connection_send_history_stream_callback(tf_ssb_connection_t* connection, bool skip, void* user_data)
 {
-	tf_ssb_connection_adjust_write_count(connection, 1);
 	if (!skip && tf_ssb_connection_is_connected(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)))
 	{
+		tf_ssb_connection_adjust_write_count(connection, 1);
 		tf_ssb_connection_run_work(connection, _tf_ssb_connection_send_history_stream_work, _tf_ssb_connection_send_history_stream_after_work, user_data);
 	}
 	else
@@ -976,9 +1009,7 @@ static void _tf_ssb_connection_send_history_stream(
 			.end_request = end_request,
 		};
 		snprintf(async->author, sizeof(async->author), "%s", author);
-		char key[128];
-		snprintf(key, sizeof(key), "%s:%" PRId64, author, sequence);
-		tf_ssb_connection_schedule_idle(connection, key, _tf_ssb_connection_send_history_stream_callback, async);
+		tf_ssb_connection_schedule_idle(connection, author, _tf_ssb_connection_send_history_stream_callback, async);
 	}
 }
 
@@ -1026,6 +1057,12 @@ static void _tf_ssb_rpc_createHistoryStream(
 
 static void _tf_ssb_rpc_ebt_replicate_send_messages(tf_ssb_connection_t* connection)
 {
+	int32_t request_number = tf_ssb_connection_get_ebt_request_number(connection);
+	if (!request_number)
+	{
+		return;
+	}
+
 	tf_ssb_ebt_t* ebt = tf_ssb_connection_get_ebt(connection);
 	tf_ssb_ebt_clock_t* clock = tf_ssb_ebt_get_messages_to_send(ebt);
 	if (clock)
@@ -1033,7 +1070,6 @@ static void _tf_ssb_rpc_ebt_replicate_send_messages(tf_ssb_connection_t* connect
 		for (int i = 0; i < clock->count; i++)
 		{
 			tf_ssb_ebt_clock_entry_t* entry = &clock->entries[i];
-			int32_t request_number = tf_ssb_connection_get_ebt_request_number(connection);
 			bool live = (tf_ssb_connection_get_flags(connection) & k_tf_ssb_connect_flag_one_shot) == 0;
 			_tf_ssb_connection_send_history_stream(connection, request_number, entry->id, entry->value, false, live, false);
 		}
@@ -1101,6 +1137,24 @@ static void _tf_ssb_rpc_ebt_replicate_resend_clock(tf_ssb_connection_t* connecti
 	}
 }
 
+static void _tf_ssb_rpc_ebt_schedule_send_clock(tf_ssb_connection_t* connection)
+{
+	tf_ssb_ebt_t* ebt = tf_ssb_connection_get_ebt(connection);
+	int pending = tf_ssb_ebt_get_send_clock_pending(ebt) + 1;
+	int32_t request_number = tf_ssb_connection_get_ebt_request_number(connection);
+	tf_ssb_ebt_set_send_clock_pending(ebt, pending);
+	if (pending == 1 && request_number)
+	{
+		resend_clock_t* resend = tf_malloc(sizeof(resend_clock_t));
+		*resend = (resend_clock_t) {
+			.connection = connection,
+			.request_number = -tf_ssb_connection_get_ebt_request_number(connection),
+			.pending = pending,
+		};
+		tf_ssb_connection_schedule_idle(connection, "ebt.clock", _tf_ssb_rpc_ebt_replicate_resend_clock, resend);
+	}
+}
+
 static void _tf_ssb_rpc_ebt_replicate(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_t* ssb = tf_ssb_connection_get_ssb(connection);
@@ -1108,6 +1162,7 @@ static void _tf_ssb_rpc_ebt_replicate(tf_ssb_connection_t* connection, uint8_t f
 	if (_is_error(context, args))
 	{
 		/* TODO: Send createHistoryStream. */
+		tf_ssb_connection_set_ebt_request_number(connection, 0);
 		tf_ssb_connection_remove_request(connection, -request_number);
 		return;
 	}
@@ -1140,18 +1195,7 @@ static void _tf_ssb_rpc_ebt_replicate(tf_ssb_connection_t* connection, uint8_t f
 
 	if (resend_clock && tf_ssb_connection_is_connected(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)) && !tf_ssb_connection_is_closing(connection))
 	{
-		int pending = tf_ssb_ebt_get_send_clock_pending(ebt) + 1;
-		tf_ssb_ebt_set_send_clock_pending(ebt, pending);
-		if (pending == 1)
-		{
-			resend_clock_t* resend = tf_malloc(sizeof(resend_clock_t));
-			*resend = (resend_clock_t) {
-				.connection = connection,
-				.request_number = request_number,
-				.pending = pending,
-			};
-			tf_ssb_connection_schedule_idle(connection, "ebt.clock", _tf_ssb_rpc_ebt_replicate_resend_clock, resend);
-		}
+		_tf_ssb_rpc_ebt_schedule_send_clock(connection);
 	}
 	JS_FreeValue(context, name);
 	JS_FreeValue(context, author);
@@ -1855,10 +1899,26 @@ static void _tf_ssb_rpc_invite_use(tf_ssb_connection_t* connection, uint8_t flag
 	tf_ssb_connection_run_work(connection, _tf_ssb_rpc_invite_use_work, _tf_ssb_rpc_invite_use_after_work, work);
 }
 
+static void _tf_ssb_rpc_message_added_callback(tf_ssb_t* ssb, const char* author, int64_t sequence, const char* id, void* user_data)
+{
+	tf_ssb_connection_t* connections[256];
+	int count = tf_ssb_get_connections(ssb, connections, tf_countof(connections));
+	for (int i = 0; i < count; i++)
+	{
+		tf_ssb_connection_t* connection = connections[i];
+		if (tf_ssb_connection_is_connected(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)) && !tf_ssb_connection_is_closing(connection))
+		{
+			tf_ssb_ebt_set_messages_received(tf_ssb_connection_get_ebt(connections[i]), author, sequence);
+			_tf_ssb_rpc_ebt_schedule_send_clock(connections[i]);
+		}
+	}
+}
+
 void tf_ssb_rpc_register(tf_ssb_t* ssb)
 {
 	tf_ssb_add_connections_changed_callback(ssb, _tf_ssb_rpc_connections_changed_callback, NULL, NULL);
 	tf_ssb_add_broadcasts_changed_callback(ssb, _tf_ssb_rpc_broadcasts_changed_callback, NULL, NULL);
+	tf_ssb_add_message_added_callback(ssb, _tf_ssb_rpc_message_added_callback, NULL, NULL);
 	tf_ssb_add_rpc_callback(ssb, "gossip.ping", _tf_ssb_rpc_gossip_ping, NULL, NULL); /* DUPLEX */
 	tf_ssb_add_rpc_callback(ssb, "blobs.get", _tf_ssb_rpc_blobs_get, NULL, NULL); /* SOURCE */
 	tf_ssb_add_rpc_callback(ssb, "blobs.has", _tf_ssb_rpc_blobs_has, NULL, NULL); /* ASYNC */

src/ssb.tests.c

@@ -112,7 +112,7 @@ static int _ssb_test_count_messages(tf_ssb_t* ssb)
 	return count.count;
 }
 
-static void _message_added(tf_ssb_t* ssb, const char* id, void* user_data)
+static void _message_added(tf_ssb_t* ssb, const char* author, int64_t sequence, const char* id, void* user_data)
 {
 	++*(int*)user_data;
 }
@@ -720,24 +720,21 @@ void tf_ssb_test_bench(const tf_test_options_t* options)
 	tf_ssb_server_open(ssb0, 12347);
 	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
 
-	tf_printf("Waiting for messages.\n");
-	clock_gettime(CLOCK_REALTIME, &start_time);
-	int count = 0;
-	tf_ssb_add_message_added_callback(ssb1, _message_added, NULL, &count);
-	while (count < k_messages)
-	{
-		uv_run(&loop, UV_RUN_ONCE);
-	}
-	tf_ssb_remove_message_added_callback(ssb1, _message_added, &count);
-	clock_gettime(CLOCK_REALTIME, &end_time);
-
 	tf_ssb_set_main_thread(ssb0, false);
 	tf_ssb_set_main_thread(ssb1, false);
-	count = _ssb_test_count_messages(ssb1);
-	if (count < k_messages)
+
+	tf_printf("Waiting for messages.\n");
+	clock_gettime(CLOCK_REALTIME, &start_time);
+	while (_ssb_test_count_messages(ssb1) < k_messages)
 	{
-		abort();
+		tf_ssb_set_main_thread(ssb0, true);
+		tf_ssb_set_main_thread(ssb1, true);
+		uv_run(&loop, UV_RUN_ONCE);
+		tf_ssb_set_main_thread(ssb0, false);
+		tf_ssb_set_main_thread(ssb1, false);
 	}
+	clock_gettime(CLOCK_REALTIME, &end_time);
+
 	tf_printf("Done.\n");
 	tf_printf("replicate = %f seconds\n", (end_time.tv_sec - start_time.tv_sec) + (end_time.tv_nsec - start_time.tv_nsec) / 1e9);
 
@@ -913,7 +910,7 @@ static void _write_file(const char* path, const char* contents)
 	fclose(file);
 }
 
-#define TEST_ARGS " --ssb-port=0 --http-port=0 --https-port=0"
+#define TEST_ARGS " --args=ssb_port=0,http_port=0,https_port=0"
 
 void tf_ssb_test_encrypt(const tf_test_options_t* options)
 {

src/task.c

@@ -1,5 +1,6 @@
 #include "task.h"
 
+#include "api.js.h"
 #include "bcrypt.js.h"
 #include "database.js.h"
 #include "file.js.h"
@@ -9,6 +10,7 @@
 #include "packetstream.h"
 #include "serialize.h"
 #include "socket.js.h"
+#include "ssb.db.h"
 #include "ssb.h"
 #include "ssb.js.h"
 #include "taskstub.js.h"
@@ -154,9 +156,6 @@ typedef struct _tf_task_t
 	JSValue _loadedFiles;
 
 	const char* _network_key;
-	int _ssb_port;
-	int _http_port;
-	int _https_port;
 	char _db_path[256];
 	char _zip_path[256];
 	char _root_path[256];
@@ -165,10 +164,14 @@ typedef struct _tf_task_t
 
 	promise_stack_t* _promise_stacks;
 	int _promise_stack_count;
+	bool _promise_stack_debug;
 
 	timeout_t* timeouts;
 
 	hitch_t hitches[32];
+
+	uint64_t last_gc_ns;
+	int64_t last_gc_duration_ns;
 } tf_task_t;
 
 typedef struct _export_record_t
@@ -398,6 +401,7 @@ static JSValue _tf_task_exit(JSContext* context, JSValueConst this_val, int argc
 	int exitCode = 0;
 	JS_ToInt32(task->_context, &exitCode, argv[0]);
 	tf_trace_end(task->_trace);
+	tf_printf("EXIT %d\n", exitCode);
 	exit(exitCode);
 	return JS_UNDEFINED;
 }
@@ -1252,10 +1256,13 @@ static void _add_promise_stack(tf_task_t* task, uint32_t hash, const char* stack
 
 static void _remove_promise_stack(tf_task_t* task, uint32_t hash)
 {
-	promise_stack_t* found = bsearch(&hash, task->_promise_stacks, task->_promise_stack_count, sizeof(promise_stack_t), _promise_stack_compare);
-	if (found)
+	if (task->_promise_stack_debug)
 	{
-		found->count--;
+		promise_stack_t* found = bsearch(&hash, task->_promise_stacks, task->_promise_stack_count, sizeof(promise_stack_t), _promise_stack_compare);
+		if (found)
+		{
+			found->count--;
+		}
 	}
 }
 
@@ -1271,33 +1278,26 @@ static void _tf_task_free_promise(tf_task_t* task, promiseid_t id)
 	}
 }
 
-uint32_t fnv32a(const void* buffer, int length, uint32_t start)
-{
-	uint32_t result = 0x811c9dc5;
-	for (int i = 0; i < length; i++)
-	{
-		result ^= ((const uint8_t*)buffer)[i];
-		result += (result << 1) + (result << 4) + (result << 7) + (result << 8) + (result << 24);
-	}
-	return result;
-}
-
 JSValue tf_task_allocate_promise(tf_task_t* task, promiseid_t* out_promise)
 {
-	JSValue error = JS_ThrowInternalError(task->_context, "promise callstack");
-	JSValue exception = JS_GetException(task->_context);
-	JSValue stack_value = JS_GetPropertyStr(task->_context, exception, "stack");
-	size_t length = 0;
-	const char* stack = JS_ToCStringLen(task->_context, &length, stack_value);
-	uint32_t stack_hash = fnv32a((const void*)stack, (int)length, 0);
-	void* buffer[32];
-	int count = tf_util_backtrace(buffer, sizeof(buffer) / sizeof(*buffer));
-	stack_hash = fnv32a((const void*)buffer, sizeof(void*) * count, stack_hash);
-	_add_promise_stack(task, stack_hash, stack, buffer, count);
-	JS_FreeCString(task->_context, stack);
-	JS_FreeValue(task->_context, stack_value);
-	JS_FreeValue(task->_context, exception);
-	JS_FreeValue(task->_context, error);
+	uint32_t stack_hash = 0;
+	if (task->_promise_stack_debug)
+	{
+		JSValue error = JS_ThrowInternalError(task->_context, "promise callstack");
+		JSValue exception = JS_GetException(task->_context);
+		JSValue stack_value = JS_GetPropertyStr(task->_context, exception, "stack");
+		size_t length = 0;
+		const char* stack = JS_ToCStringLen(task->_context, &length, stack_value);
+		stack_hash = tf_util_fnv32a((const void*)stack, (int)length, 0);
+		void* buffer[32];
+		int count = tf_util_backtrace(buffer, sizeof(buffer) / sizeof(*buffer));
+		stack_hash = tf_util_fnv32a((const void*)buffer, sizeof(void*) * count, stack_hash);
+		_add_promise_stack(task, stack_hash, stack, buffer, count);
+		JS_FreeCString(task->_context, stack);
+		JS_FreeValue(task->_context, stack_value);
+		JS_FreeValue(task->_context, exception);
+		JS_FreeValue(task->_context, error);
+	}
 
 	promiseid_t promiseId;
 	do
@@ -1459,12 +1459,19 @@ static void _tf_task_promise_rejection_tracker(JSContext* context, JSValueConst
 static void _tf_task_gc_timer(uv_timer_t* timer)
 {
 	tf_task_t* task = timer->data;
-	tf_trace_begin(task->_trace, "JS_RunGC");
-	JS_RunGC(task->_runtime);
-	tf_trace_end(task->_trace);
+	uint64_t start_ns = uv_hrtime();
+	if (task->last_gc_duration_ns < (int64_t)(start_ns - task->last_gc_ns))
+	{
+		tf_trace_begin(task->_trace, "JS_RunGC");
+		JS_RunGC(task->_runtime);
+		tf_trace_end(task->_trace);
 #ifdef M_TRIM_THRESHOLD
-	malloc_trim(0);
+		malloc_trim(0);
 #endif
+		uint64_t end_ns = uv_hrtime();
+		task->last_gc_duration_ns = end_ns - start_ns;
+		task->last_gc_ns = end_ns;
+	}
 }
 
 static void _tf_task_trace_timer(uv_timer_t* timer)
@@ -1592,6 +1599,10 @@ tf_task_t* tf_task_create()
 	*task = (tf_task_t) { 0 };
 	++_count;
 
+	char buffer[8] = { 0 };
+	size_t buffer_size = sizeof(buffer);
+	task->_promise_stack_debug = uv_os_getenv("TF_PROMISE_DEBUG", buffer, &buffer_size) == 0 && strcmp(buffer, "1") == 0;
+
 	JSMallocFunctions funcs = { 0 };
 	tf_get_js_malloc_functions(&funcs);
 	task->_runtime = JS_NewRuntime2(&funcs, NULL);
@@ -1680,38 +1691,6 @@ void tf_task_activate(tf_task_t* task)
 	JS_DefinePropertyGetSet(context, global, atom, JS_NewCFunction(context, _tf_task_get_parent, "parent", 0), JS_UNDEFINED, 0);
 	JS_FreeAtom(context, atom);
 
-	JSValue tildefriends = JS_NewObject(context);
-	JSValue args = JS_NewObject(context);
-	JS_SetPropertyStr(context, tildefriends, "args", args);
-	if (task->_args)
-	{
-		char* saveptr = NULL;
-		char* copy = tf_strdup(task->_args);
-		char* start = copy;
-		while (true)
-		{
-			char* assignment = strtok_r(start, ",", &saveptr);
-			start = NULL;
-			if (!assignment)
-			{
-				break;
-			}
-			char* equals = strchr(assignment, '=');
-			if (equals)
-			{
-				*equals = '\0';
-				JS_SetPropertyStr(context, args, assignment, JS_NewString(context, equals + 1));
-			}
-			else
-			{
-				tf_printf("Assignment missing '=': %s.\n", assignment);
-				exit(1);
-			}
-		}
-		tf_free(copy);
-	}
-	JS_SetPropertyStr(context, global, "tildefriends", tildefriends);
-
 	task->_trace = tf_trace_create();
 	if (task->_trusted)
 	{
@@ -1730,25 +1709,48 @@ void tf_task_activate(tf_task_t* task)
 		task->_ssb = tf_ssb_create(&task->_loop, task->_context, task->_db_path, task->_network_key);
 		tf_ssb_set_trace(task->_ssb, task->_trace);
 		tf_ssb_register(context, task->_ssb);
+		tf_api_register(context);
 		tf_ssb_set_hitch_callback(task->_ssb, _tf_task_record_hitch, task);
 
-		int actual_ssb_port = task->_ssb_port;
+		if (task->_args)
+		{
+			sqlite3* db = tf_ssb_acquire_db_writer(task->_ssb);
+			char* saveptr = NULL;
+			char* copy = tf_strdup(task->_args);
+			char* start = copy;
+			while (true)
+			{
+				char* assignment = strtok_r(start, ",", &saveptr);
+				start = NULL;
+				if (!assignment)
+				{
+					break;
+				}
+				char* equals = strchr(assignment, '=');
+				if (equals)
+				{
+					*equals = '\0';
+					tf_ssb_db_set_global_setting_from_string(db, assignment, equals + 1);
+				}
+				else
+				{
+					tf_printf("Assignment missing '=': %s.\n", assignment);
+					exit(1);
+				}
+			}
+			tf_free(copy);
+			tf_ssb_release_db_writer(task->_ssb, db);
+		}
 
-		if (task->_ssb_port)
+		int64_t ssb_port = 0;
+		sqlite3* db = tf_ssb_acquire_db_reader(task->_ssb);
+		tf_ssb_db_get_global_setting_int64(db, "ssb_port", &ssb_port);
+		tf_ssb_release_db_reader(task->_ssb, db);
+		if (ssb_port)
 		{
 			tf_ssb_broadcast_listener_start(task->_ssb, false);
 			tf_ssb_broadcast_sender_start(task->_ssb);
-			actual_ssb_port = tf_ssb_server_open(task->_ssb, task->_ssb_port);
-		}
-
-		JS_SetPropertyStr(context, tildefriends, "ssb_port", JS_NewInt32(context, actual_ssb_port));
-		if (task->_http_port)
-		{
-			JS_SetPropertyStr(context, tildefriends, "http_port", JS_NewInt32(context, task->_http_port));
-		}
-		if (task->_https_port)
-		{
-			JS_SetPropertyStr(context, tildefriends, "https_port", JS_NewInt32(context, task->_https_port));
+			tf_ssb_server_open(task->_ssb, ssb_port);
 		}
 
 		JS_SetPropertyStr(context, global, "getStats", JS_NewCFunction(context, _tf_task_getStats, "getStats", 0));
@@ -1999,21 +2001,6 @@ void tf_task_set_ssb_network_key(tf_task_t* task, const char* network_key)
 	task->_network_key = network_key;
 }
 
-void tf_task_set_ssb_port(tf_task_t* task, int port)
-{
-	task->_ssb_port = port;
-}
-
-void tf_task_set_http_port(tf_task_t* task, int port)
-{
-	task->_http_port = port;
-}
-
-void tf_task_set_https_port(tf_task_t* task, int port)
-{
-	task->_https_port = port;
-}
-
 void tf_task_set_db_path(tf_task_t* task, const char* db_path)
 {
 	snprintf(task->_db_path, sizeof(task->_db_path), "%s", db_path);

src/task.h

@@ -76,27 +76,6 @@ void tf_task_configure_from_fd(tf_task_t* task, int fd);
 */
 void tf_task_set_ssb_network_key(tf_task_t* task, const char* network_key);
 
-/**
-** Set the port number on which to run an SSB secure handshake server.
-** @param task The task.
-** @param port The port number or 0 to disable.
-*/
-void tf_task_set_ssb_port(tf_task_t* task, int port);
-
-/**
-** Set the port number on which to run an HTTP server.
-** @param task The task.
-** @param port The port number of 0 to disable.
-*/
-void tf_task_set_http_port(tf_task_t* task, int port);
-
-/**
-** Set the port number on which to run an HTTPS server.
-** @param task The task.
-** @param port The port number of 0 to disable.
-*/
-void tf_task_set_https_port(tf_task_t* task, int port);
-
 /**
 ** Set the path to the SQLite database.
 ** @param task The task.

src/tests.c

@@ -32,7 +32,7 @@
 #include <TargetConditionals.h>
 #endif
 
-#define TEST_ARGS " --ssb-port=0 --http-port=0 --https-port=0"
+#define TEST_ARGS " --args=ssb_port=0,http_port=0,https_port=0"
 
 #if !TARGET_OS_IPHONE
 static void _write_file(const char* path, const char* contents)
@@ -311,7 +311,7 @@ static void _test_database(const tf_test_options_t* options)
 		"		print('Expected but did not find: ' + JSON.stringify(expected));\n"
 		"		exit(4);\n"
 		"	}\n"
-		"	if (JSON.stringify(await databases.list('%')) != '[\"testdb\"]') {\n"
+		"	if (JSON.stringify(await databases.list('%')) != '[\"core\",\"testdb\"]') {\n"
 		"		exit(7);\n"
 		"	}\n"
 		"}\n"
@@ -781,7 +781,7 @@ static void _test_http(const tf_test_options_t* options)
 	tf_http_t* http = tf_http_create(&loop);
 	tf_http_add_handler(http, "/hello", _test_http_handler, NULL, NULL);
 	tf_http_add_handler(http, "/post", _test_http_handler_post, NULL, NULL);
-	tf_http_listen(http, 23456, NULL, NULL, NULL);
+	tf_http_listen(http, 23456, true, NULL, NULL, NULL);
 
 	test_http_t test = { .loop = &loop };
 	uv_async_init(&loop, &test.async, _test_http_async);
@@ -864,9 +864,6 @@ static void _test_httpd(const tf_test_options_t* options)
 	uv_loop_init(&loop);
 
 	unlink("out/test_db0.sqlite");
-	char command[256];
-	snprintf(command, sizeof(command), "%s run -b 0 --db-path=out/test_db0.sqlite" TEST_ARGS, options->exe_path);
-
 	uv_stdio_container_t stdio[] = {
 		[STDIN_FILENO] = { .flags = UV_IGNORE },
 		[STDOUT_FILENO] = { .flags = UV_INHERIT_FD },
@@ -876,7 +873,7 @@ static void _test_httpd(const tf_test_options_t* options)
 	uv_spawn(&loop, &process,
 		&(uv_process_options_t) {
 			.file = options->exe_path,
-			.args = (char*[]) { (char*)options->exe_path, "run", "-b0", "--db-path=out/test_db0.sqlite", "--http-port=8080", "--https-port=0", NULL },
+			.args = (char*[]) { (char*)options->exe_path, "run", "--db-path=out/test_db0.sqlite", "--args=ssb_port=0,http_port=8080,https_port=0", NULL },
 			.stdio_count = sizeof(stdio) / sizeof(*stdio),
 			.stdio = stdio,
 		});
@@ -960,7 +957,7 @@ static void _test_auto(const tf_test_options_t* options)
 	unlink("out/selenium.sqlite-shm");
 	unlink("out/selenium.sqlite-wal");
 
-	char* args[] = { executable, "run", "-d", "out/selenium.sqlite", "-b", "0", "-p", "8888", NULL };
+	char* args[] = { executable, "run", "-d", "out/selenium.sqlite", "-a", "ssb_port=0,http_port=8888", NULL };
 
 	uv_stdio_container_t io[3] = {
 		{ .flags = UV_INHERIT_FD },

src/trace.c

@@ -4,6 +4,7 @@
 
 #include "trace.h"
 
+#include "log.h"
 #include "mem.h"
 #include "util.js.h"
 
@@ -149,25 +150,37 @@ static int _tf_trace_escape_name(char* out, size_t out_size, const char* name)
 		{
 		case '"':
 		case '\\':
-			out[p++] = '\\';
-			if ((size_t)p + 1 < out_size)
+			if ((size_t)p + 2 < out_size)
 			{
+				out[p++] = '\\';
 				out[p++] = *c;
 			}
+			else
+			{
+				out[p++] = '$';
+			}
 			break;
 		case '\t':
-			out[p++] = '\\';
-			if ((size_t)p + 1 < out_size)
+			if ((size_t)p + 2 < out_size)
 			{
+				out[p++] = '\\';
 				out[p++] = 't';
 			}
+			else
+			{
+				out[p++] = '$';
+			}
 			break;
 		case '\n':
-			out[p++] = '\\';
-			if ((size_t)p + 1 < out_size)
+			if ((size_t)p + 2 < out_size)
 			{
+				out[p++] = '\\';
 				out[p++] = 'n';
 			}
+			else
+			{
+				out[p++] = '$';
+			}
 			break;
 		default:
 			out[p++] = *c;
@@ -320,21 +333,23 @@ char* tf_trace_export(tf_trace_t* trace)
 	}
 
 	static const int k_extra_size = 1024;
-	char* buffer = tf_malloc(k_buffer_size + k_extra_size);
+	static const size_t k_out_buffer_size = k_buffer_size + k_extra_size;
+	char* buffer = tf_malloc(k_out_buffer_size);
 	uv_mutex_lock(&trace->mutex);
 	const char* newline = strchr(trace->buffer + trace->write_offset, '\n');
 	int begin = newline ? newline - trace->buffer : 0;
 	size_t size = 0;
-	size += snprintf(buffer, k_buffer_size, "{\"displayTimeUnit\": \"ns\",\n\"traceEvents\": [\n");
+	size += snprintf(buffer, k_out_buffer_size, "{\"displayTimeUnit\": \"ns\",\n\"traceEvents\": [\n");
 	if (*trace->process_name)
 	{
-		size += snprintf(buffer + size, k_buffer_size - size, "{\"ph\":\"M\",\"pid\":%d,\"name\":\"process_name\",\"args\":{\"name\":\"%s\"}},\n", getpid(), trace->process_name);
+		size +=
+			snprintf(buffer + size, k_out_buffer_size - size, "{\"ph\":\"M\",\"pid\":%d,\"name\":\"process_name\",\"args\":{\"name\":\"%s\"}},\n", getpid(), trace->process_name);
 	}
 	uv_rwlock_rdlock(&trace->threads_lock);
 	for (int i = 0; i < trace->threads_count; i++)
 	{
 		tf_trace_thread_t* thread = trace->threads[i];
-		size += snprintf(buffer + size, k_buffer_size - size, "{\"ph\":\"M\",\"pid\":%d,\"tid\":%d,\"name\":\"thread_name\",\"args\":{\"name\":\"%s\"}},\n", getpid(),
+		size += snprintf(buffer + size, k_out_buffer_size - size, "{\"ph\":\"M\",\"pid\":%d,\"tid\":%d,\"name\":\"thread_name\",\"args\":{\"name\":\"%s\"}},\n", getpid(),
 			thread->index, thread->name);
 	}
 	uv_rwlock_rdunlock(&trace->threads_lock);
@@ -352,8 +367,8 @@ char* tf_trace_export(tf_trace_t* trace)
 		buffer[size - 2] = '\n';
 		size--;
 	}
-	size += snprintf(buffer + size, k_buffer_size - size, "]}\n");
-	assert(size < (size_t)k_buffer_size + k_extra_size);
+	size += snprintf(buffer + size, k_out_buffer_size - size, "]}\n");
+	assert(size < k_out_buffer_size);
 	buffer[size] = '\0';
 	return buffer;
 }

src/util.js.c

@@ -314,13 +314,6 @@ static JSValue _util_parseHttpResponse(JSContext* context, JSValueConst this_val
 	return result;
 }
 
-typedef enum _value_kind_t
-{
-	k_kind_bool,
-	k_kind_int,
-	k_kind_string,
-} value_kind_t;
-
 static const char* k_kind_name[] = {
 	[k_kind_bool] = "bool",
 	[k_kind_int] = "int",
@@ -329,7 +322,7 @@ static const char* k_kind_name[] = {
 
 typedef struct _setting_value_t
 {
-	value_kind_t kind;
+	tf_setting_kind_t kind;
 	union
 	{
 		bool bool_value;
@@ -348,6 +341,17 @@ typedef struct _setting_t
 
 static const setting_t k_settings[] = {
 	{ .name = "code_of_conduct", .type = "textarea", .description = "Code of conduct presented at sign-in.", .default_value = { .kind = k_kind_string, .string_value = NULL } },
+	{ .name = "ssb_port",
+		.type = "integer",
+		.description = "Port on which to listen for SSB secure handshake connections.",
+		.default_value = { .kind = k_kind_int, .int_value = 8008 } },
+	{ .name = "http_local_only",
+		.type = "boolean",
+		.description = "Whether to bind http(s) to the loopback address.  Otherwise any.",
+		.default_value = { .kind = k_kind_bool, .bool_value = TF_IS_MOBILE ? true : false } },
+	{ .name = "http_port", .type = "integer", .description = "Port on which to listen for HTTP connections.", .default_value = { .kind = k_kind_int, .int_value = 12345 } },
+	{ .name = "https_port", .type = "integer", .description = "Port on which to listen for secure HTTP connections.", .default_value = { .kind = k_kind_int, .int_value = 0 } },
+	{ .name = "out_http_port_file", .type = "hidden", .description = "File to which to write bound HTTP port.", .default_value = { .kind = k_kind_string, .string_value = NULL } },
 	{ .name = "blob_fetch_age_seconds",
 		.type = "integer",
 		.description = "Only blobs mentioned more recently than this age will be automatically fetched.",
@@ -393,21 +397,31 @@ static const setting_t k_settings[] = {
 		.type = "boolean",
 		.description = "Whether connections are accepted from accounts that aren't in the replication range or otherwise already known.",
 		.default_value = { .kind = k_kind_bool, .bool_value = true } },
+	{ .name = "autologin", .type = "boolean", .description = "Whether mobile autologin is supported.", .default_value = { .kind = k_kind_bool, .bool_value = TF_IS_MOBILE != 0 } },
 };
 
-static const setting_t* _util_get_setting(const char* name, value_kind_t kind)
+static const setting_t* _util_get_setting(const char* name, tf_setting_kind_t kind)
 {
 	for (int i = 0; i < tf_countof(k_settings); i++)
 	{
-		if (strcmp(k_settings[i].name, name) == 0 && k_settings[i].default_value.kind == kind)
+		if (strcmp(k_settings[i].name, name) == 0 && (kind == k_kind_unknown || k_settings[i].default_value.kind == kind))
 		{
 			return &k_settings[i];
 		}
 	}
-	tf_printf("Did not find global setting of type %s: %s.\n", k_kind_name[kind], name);
+	if (kind != k_kind_unknown)
+	{
+		tf_printf("Did not find global setting of type %s: %s.\n", k_kind_name[kind], name);
+	}
 	return NULL;
 }
 
+tf_setting_kind_t tf_util_get_global_setting_kind(const char* name)
+{
+	const setting_t* setting = _util_get_setting(name, k_kind_unknown);
+	return setting ? setting->default_value.kind : k_kind_unknown;
+}
+
 bool tf_util_get_default_global_setting_bool(const char* name)
 {
 	const setting_t* setting = _util_get_setting(name, k_kind_bool);
@@ -446,12 +460,41 @@ static JSValue _util_defaultGlobalSettings(JSContext* context, JSValueConst this
 			JS_SetPropertyStr(
 				context, entry, "default_value", k_settings[i].default_value.string_value ? JS_NewString(context, k_settings[i].default_value.string_value) : JS_UNDEFINED);
 			break;
+		case k_kind_unknown:
+			break;
 		}
 		JS_SetPropertyStr(context, settings, k_settings[i].name, entry);
 	}
 	return settings;
 }
 
+void tf_util_document_settings(const char* line_prefix)
+{
+	char buffer[32];
+	for (int i = 0; i < tf_countof(k_settings); i++)
+	{
+		const char* default_value = NULL;
+		const char* quote = "";
+		switch (k_settings[i].default_value.kind)
+		{
+		case k_kind_bool:
+			default_value = k_settings[i].default_value.bool_value ? "true" : "false";
+			break;
+		case k_kind_string:
+			quote = "\"";
+			default_value = k_settings[i].default_value.string_value ? k_settings[i].default_value.string_value : "";
+			break;
+		case k_kind_int:
+			snprintf(buffer, sizeof(buffer), "%d", k_settings[i].default_value.int_value);
+			default_value = buffer;
+			break;
+		case k_kind_unknown:
+			break;
+		}
+		tf_printf("%s%s (default: %s%s%s): %s\n", line_prefix, k_settings[i].name, quote, default_value, quote, k_settings[i].description);
+	}
+}
+
 JSValue tf_util_new_uint8_array(JSContext* context, const uint8_t* data, size_t size)
 {
 	JSValue array_buffer = JS_NewArrayBufferCopy(context, data, size);
@@ -644,3 +687,14 @@ bool tf_util_is_mobile()
 {
 	return TF_IS_MOBILE != 0;
 }
+
+uint32_t tf_util_fnv32a(const void* buffer, int length, uint32_t start)
+{
+	uint32_t result = 0x811c9dc5;
+	for (int i = 0; i < length; i++)
+	{
+		result ^= ((const uint8_t*)buffer)[i];
+		result += (result << 1) + (result << 4) + (result << 7) + (result << 8) + (result << 24);
+	}
+	return result;
+}

src/util.js.h

@@ -10,6 +10,17 @@
 
 #include <stdbool.h>
 
+/**
+** Type of a setting.
+*/
+typedef enum _tf_setting_kind_t
+{
+	k_kind_unknown,
+	k_kind_bool,
+	k_kind_int,
+	k_kind_string,
+} tf_setting_kind_t;
+
 /** An event loop. */
 typedef struct uv_loop_s uv_loop_t;
 
@@ -194,10 +205,32 @@ int tf_util_get_default_global_setting_int(const char* name);
 */
 const char* tf_util_get_default_global_setting_string(const char* name);
 
+/**
+** Get the expected kind of a global setting.
+** @param name The setting name.
+** @return The setting kind or unknown if nonexistent.
+*/
+tf_setting_kind_t tf_util_get_global_setting_kind(const char* name);
+
+/**
+** Log documentation for the available settings.
+** @param line_prefix Text to prefix each line with."
+*/
+void tf_util_document_settings(const char* line_prefix);
+
 /**
 ** Check if the app is running on a mobile device.
 ** @return true for iPhone/Android, false otherwise.
 */
 bool tf_util_is_mobile();
 
+/**
+** Compute a 32-bit hash of a buffer.
+** @param buffer The data.
+** @param length The size of the buffer in bytes.
+** @param start The hash seed.
+** @return The computed hash.
+*/
+uint32_t tf_util_fnv32a(const void* buffer, int length, uint32_t start);
+
 /** @} */

src/version.h

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

tools/buttfeed.py

@@ -25,6 +25,7 @@ def fix_title(entry):
     return entry.title.split('\n')[0]
 
 def get_entries():
+    seen = set()
     results = []
     for name, url in k_feeds.items():
         feed = feedparser.parse(url)
@@ -41,9 +42,13 @@ def get_entries():
                     continue
             if entry.summary.startswith('<a href='):
                 for m in re.findall(r'<a href="(.*?)">.*?</a>$\s*^([^\n]+)$', entry.summary, re.S | re.M):
-                    results.append((time.mktime(entry.get('updated_parsed')), name, m[0], m[1]))
+                    if not m[0] in seen:
+                        seen.add(m[0])
+                        results.append((time.mktime(entry.get('updated_parsed')), name, m[0], m[1]))
             else:
-                results.append((time.mktime(entry.get('updated_parsed')), name, entry.link, entry.title.split('\n')[0]))
+                if not entry.link in seen:
+                    seen.add(entry.link)
+                    results.append((time.mktime(entry.get('updated_parsed')), name, entry.link, entry.title.split('\n')[0]))
     results.sort()
     results.reverse()
     return results

tools/ios-distribute

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash -e
+rm -rfv out/tildefriends-iosrelease.app out/Payload out/tildefriends.ipa
+make iosrelease-app
+cp src/ios/tildefriends.png out/tildefriends-iosrelease.app/tildefriends.png
+cp src/ios/icons/Assets.car out/tildefriends-iosrelease.app/
+cp src/ios/icons/ios/icon-72.png out/tildefriends-iosrelease.app/
+cp src/ios/icons/ios/icon-120.png out/tildefriends-iosrelease.app/
+cp src/ios/icons/ios/icon-152.png out/tildefriends-iosrelease.app/
+cp src/ios/distribution.mobileprovision out/tildefriends-iosrelease.app/embedded.mobileprovision
+xcrun -sdk iphoneos codesign -f -s 'Apple Distribution: Cory McWilliams' --entitlements src/ios/Entitlements.plist --generate-entitlement-der out/tildefriends-iosrelease.app
+mkdir -p out/Payload/tildefriends.app
+cp -avR out/tildefriends-iosrelease.app/* out/Payload/tildefriends.app/
+cd out; zip -r tildefriends.ipa Payload; cd ..
+xcrun -sdk iphoneos altool --upload-app -f out/tildefriends.ipa -t ios -u $(cat .keys/altool-user) -p $(cat .keys/altool-password)