Fix Haiku.

.clang-format

@@ -14,7 +14,7 @@ IndentWidth: 4
 MaxEmptyLinesToKeep: 1
 ObjCBlockIndentWidth: 4
 ObjCBreakBeforeNestedBlockParam: false
-SortIncludes: true
+SortIncludes: false
 TabWidth: 4
 UseTab: Always
 ...

.fdroid.yml

@@ -0,0 +1,40 @@
+Categories:
+  - Internet
+License: MIT
+
+AutoName: tildefriends
+AuthorName: Cory McWilliams
+AuthorEmail: cory@tildefriends.net
+
+RepoType: git
+Repo: https://dev.tildefriends.net/cory/tildefriends.git
+
+Builds:
+  - versionName: 0.0.21-wip
+    versionCode: 22
+    commit: 09b6a00731d45fa160b23a2c44be6def98d92d6a
+    subdir: src/android
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant make zip
+    androidupdate:
+      - no
+    scandelete:
+      - deps/libuv/docs/src/static/diagrams.key/Index.zip
+      - deps/openssl_src/cloudflare-quiche/*
+      - deps/openssl_src/fuzz/*
+      - deps/openssl_src/gost-engine/*
+      - deps/openssl_src/test/*
+      - deps/openssl_src/tlslite-ng/*
+    prebuild:
+      - sdkmanager "platforms;android-34" "build-tools;34.0.0"
+    build:
+      - mkdir bin/
+      - ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ANDROID_NDK_ROOT=$$NDK$$ make -C ../../ -j`nproc` fdroid
+    ndk: r26d
+
+AutoUpdateMode: Version ^v[0-9\.]+$
+UpdateCheckMode: Tags
+CurrentVersion: 0.0.21-wip
+CurrentVersionCode: 22

.gitea/workflows/build.yaml

@@ -5,34 +5,11 @@ on: [push]
 jobs:
   Build-All:
     runs-on: ubuntu-latest
-    container:
-      valid_volumes: ['/opt/keys']
-      volumes:
-        - /opt/keys:/opt/keys
     steps:
       - name: check out code
         uses: actions/checkout@v4
         with:
           submodules: true
-      - run: ln -s /opt/keys .keys
+      - run: sudo apt update && sudo apt install -y doxygen mingw-w64
-      - name: Setup JDK
+      - run: make all -j`nproc` docs
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-        with:
-          packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264'
-      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64 libgpgme11
-      - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all docs
       - run: docker build .
-      - uses: actions/upload-artifact@v3
-        with:
-          path: out/TildeFriends-release.fdroid.apk
-      - uses: actions/upload-artifact@v3
-        with:
-          path: out/winrelease/tildefriends.exe
-      - uses: actions/upload-artifact@v3
-        with:
-          path: out/tildefriends-x86_64.AppImage

.gitignore

@@ -4,7 +4,6 @@ db.*
 deps/ios_toolchain/
 deps/openssl/
 dist/
-.flatpak-builder
 .keys
 logs/
 **/node_modules

GNUmakefile

@@ -3,14 +3,13 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 30
+VERSION_CODE := 26
-VERSION_NUMBER := 0.0.25-wip
+VERSION_NUMBER := 0.0.22-wip
-VERSION_NAME := This program kills fascists.
+VERSION_NAME := Look for the helpers.
 
-SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3470000.zip
+SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460000.zip
+LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
-APPIMAGETOOL_URL := https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-APPIMAGETOOL_MD5 := e989fadfc4d685fd3d6aeeb9b525d74d  out/appimagetool
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
@@ -37,8 +36,7 @@ BUILD_TYPES := debug release
 CFLAGS += -Dstatic_assert=_Static_assert
 LDFLAGS += \
 	-lbsd \
-	-lnetwork \
+	-lnetwork
-	-Wno-stringop-overflow
 else ifeq ($(UNAME_S),OpenBSD)
 BUILD_TYPES := debug release
 CFLAGS += \
@@ -57,17 +55,16 @@ CFLAGS += \
 	-Wall \
 	-Wextra \
 	-Wno-unused-parameter \
-	-Wno-unknown-warning-option \
 	-MMD \
 	-MP \
 	-ffunction-sections \
 	-fdata-sections \
 	-fno-exceptions \
-	-g
+	-g \
+	-flto
 LDFLAGS += \
-	-Wno-attributes \
+	-flto=auto \
-	-Wno-aggressive-loop-optimizations \
+	-Wno-attributes
-	-flto=auto
 
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
@@ -163,9 +160,6 @@ NONANDROID_RELEASE_TARGETS := $(filter-out $(ANDROID_ARM64_TARGETS),$(RELEASE_TA
 NONANDROID_TARGETS := $(filter-out $(ANDROID_TARGETS),$(ALL_TARGETS))
 NONMACOS_TARGETS := $(filter-out $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS),$(ALL_TARGETS))
 DEADSTRIP_TARGETS := $(filter-out $(ANDROID_TARGETS),$(NONMACOS_TARGETS))
-ifneq ($(UNAME_S),OpenBSD)
-$(NONMACOS_TARGETS): LDFLAGS += -static-libgcc
-endif
 
 $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
 $(filter-out $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
@@ -175,13 +169,10 @@ $(ANDROID_TARGETS): CFLAGS += \
 	-fdebug-compilation-dir . \
 	-fomit-frame-pointer \
 	-fno-asynchronous-unwind-tables \
-	-funwind-tables \
+	-funwind-tables
-	-Wno-unknown-warning-option
 $(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC
 $(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
-$(RELEASE_TARGETS): CFLAGS += \
+$(RELEASE_TARGETS): CFLAGS += -DNDEBUG
-	-DNDEBUG \
-	-flto
 $(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
 $(ANDROID_RELEASE_TARGETS): CFLAGS += -Oz
 $(WINDOWS_TARGETS): CC = x86_64-w64-mingw32-gcc-win32
@@ -225,15 +216,12 @@ $(ANDROID_X86_64_TARGETS): CFLAGS += -Ideps/openssl/android/x86_64/usr/local/inc
 $(ANDROID_X86_64_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86_64/usr/local/lib
 $(NONMACOS_TARGETS): CFLAGS += -Wno-cast-function-type
 $(DEADSTRIP_TARGETS): LDFLAGS += -Wl,--gc-sections
-$(IOS_TARGETS): CFLAGS += -miphoneos-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
+$(IOS_TARGETS): CFLAGS += -mios-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
-$(IOS_TARGETS): LDFLAGS += -miphoneos-version-min=9.0 -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
+$(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
 $(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/include
 $(IOSSIM_TARGETS): LDFLAGS += -Ldeps/openssl/ios/iossimulator-xcrun/usr/local/lib
 
 ifeq ($(UNAME_M),x86_64)
-ifeq ($(UNAME_S),Linux)
-all: appimage
-endif
 ifneq ($(UNAME_S),Haiku)
 out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
 out/debug/tildefriends: LDFLAGS += -fsanitize=address -fsanitize=undefined
@@ -281,101 +269,98 @@ $(filter-out $(BUILD_DIR)/android% $(BUILD_DIR)/macos% $(BUILD_DIR)/ios%,$(APP_O
 endif
 
 ARES_SOURCES := \
-	deps/c-ares/src/lib/ares_addrinfo2hostent.c \
+	deps/c-ares/src/lib/ares_platform.c \
-	deps/c-ares/src/lib/ares_addrinfo_localhost.c \
+	deps/c-ares/src/lib/record/ares_dns_mapping.c \
-	deps/c-ares/src/lib/ares_android.c \
+	deps/c-ares/src/lib/record/ares_dns_parse.c \
-	deps/c-ares/src/lib/ares_cancel.c \
+	deps/c-ares/src/lib/record/ares_dns_write.c \
-	deps/c-ares/src/lib/ares_close_sockets.c \
+	deps/c-ares/src/lib/record/ares_dns_name.c \
-	deps/c-ares/src/lib/ares_conn.c \
+	deps/c-ares/src/lib/record/ares_dns_record.c \
-	deps/c-ares/src/lib/ares_cookie.c \
+	deps/c-ares/src/lib/record/ares_dns_multistring.c \
-	deps/c-ares/src/lib/ares_data.c \
 	deps/c-ares/src/lib/ares_destroy.c \
-	deps/c-ares/src/lib/ares_free_hostent.c \
+	deps/c-ares/src/lib/ares_data.c \
-	deps/c-ares/src/lib/ares_free_string.c \
-	deps/c-ares/src/lib/ares_freeaddrinfo.c \
-	deps/c-ares/src/lib/ares_getaddrinfo.c \
-	deps/c-ares/src/lib/ares_getenv.c \
-	deps/c-ares/src/lib/ares_gethostbyaddr.c \
-	deps/c-ares/src/lib/ares_gethostbyname.c \
-	deps/c-ares/src/lib/ares_getnameinfo.c \
-	deps/c-ares/src/lib/ares_hosts_file.c \
-	deps/c-ares/src/lib/ares_init.c \
-	deps/c-ares/src/lib/ares_library_init.c \
-	deps/c-ares/src/lib/ares_metrics.c \
-	deps/c-ares/src/lib/ares_options.c \
-	deps/c-ares/src/lib/ares_parse_into_addrinfo.c \
-	deps/c-ares/src/lib/ares_process.c \
-	deps/c-ares/src/lib/ares_qcache.c \
-	deps/c-ares/src/lib/ares_query.c \
-	deps/c-ares/src/lib/ares_search.c \
-	deps/c-ares/src/lib/ares_send.c \
-	deps/c-ares/src/lib/ares_set_socket_functions.c \
-	deps/c-ares/src/lib/ares_socket.c \
-	deps/c-ares/src/lib/ares_sortaddrinfo.c \
-	deps/c-ares/src/lib/ares_strerror.c \
 	deps/c-ares/src/lib/ares_sysconfig.c \
-	deps/c-ares/src/lib/ares_sysconfig_files.c \
+	deps/c-ares/src/lib/ares_cancel.c \
-	deps/c-ares/src/lib/ares_sysconfig_mac.c \
+	deps/c-ares/src/lib/ares_metrics.c \
-	deps/c-ares/src/lib/ares_sysconfig_win.c \
+	deps/c-ares/src/lib/ares_getnameinfo.c \
-	deps/c-ares/src/lib/ares_update_servers.c \
+	deps/c-ares/src/lib/legacy/ares_parse_txt_reply.c \
-	deps/c-ares/src/lib/ares_version.c \
+	deps/c-ares/src/lib/legacy/ares_parse_naptr_reply.c \
-	deps/c-ares/src/lib/dsa/ares_array.c \
-	deps/c-ares/src/lib/dsa/ares_htable.c \
-	deps/c-ares/src/lib/dsa/ares_htable_asvp.c \
-	deps/c-ares/src/lib/dsa/ares_htable_dict.c \
-	deps/c-ares/src/lib/dsa/ares_htable_strvp.c \
-	deps/c-ares/src/lib/dsa/ares_htable_szvp.c \
-	deps/c-ares/src/lib/dsa/ares_htable_vpvp.c \
-	deps/c-ares/src/lib/dsa/ares_llist.c \
-	deps/c-ares/src/lib/dsa/ares_slist.c \
-	deps/c-ares/src/lib/event/ares_event_configchg.c \
-	deps/c-ares/src/lib/event/ares_event_epoll.c \
-	deps/c-ares/src/lib/event/ares_event_kqueue.c \
-	deps/c-ares/src/lib/event/ares_event_poll.c \
-	deps/c-ares/src/lib/event/ares_event_select.c \
-	deps/c-ares/src/lib/event/ares_event_thread.c \
-	deps/c-ares/src/lib/event/ares_event_wake_pipe.c \
-	deps/c-ares/src/lib/event/ares_event_win32.c \
-	deps/c-ares/src/lib/inet_net_pton.c \
-	deps/c-ares/src/lib/inet_ntop.c \
 	deps/c-ares/src/lib/legacy/ares_create_query.c \
+	deps/c-ares/src/lib/legacy/ares_parse_mx_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_srv_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_ptr_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_caa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c \
 	deps/c-ares/src/lib/legacy/ares_expand_name.c \
+	deps/c-ares/src/lib/legacy/ares_parse_uri_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_a_reply.c \
 	deps/c-ares/src/lib/legacy/ares_expand_string.c \
 	deps/c-ares/src/lib/legacy/ares_fds.c \
-	deps/c-ares/src/lib/legacy/ares_getsock.c \
-	deps/c-ares/src/lib/legacy/ares_parse_a_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_caa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_mx_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_naptr_reply.c \
 	deps/c-ares/src/lib/legacy/ares_parse_ns_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_ptr_reply.c \
 	deps/c-ares/src/lib/legacy/ares_parse_soa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_srv_reply.c \
+	deps/c-ares/src/lib/legacy/ares_getsock.c \
-	deps/c-ares/src/lib/legacy/ares_parse_txt_reply.c \
+	deps/c-ares/src/lib/windows_port.c \
-	deps/c-ares/src/lib/legacy/ares_parse_uri_reply.c \
+	deps/c-ares/src/lib/ares_qcache.c \
-	deps/c-ares/src/lib/record/ares_dns_mapping.c \
+	deps/c-ares/src/lib/ares_update_servers.c \
-	deps/c-ares/src/lib/record/ares_dns_multistring.c \
+	deps/c-ares/src/lib/ares_process.c \
-	deps/c-ares/src/lib/record/ares_dns_name.c \
+	deps/c-ares/src/lib/ares_getenv.c \
-	deps/c-ares/src/lib/record/ares_dns_parse.c \
+	deps/c-ares/src/lib/ares_gethostbyname.c \
-	deps/c-ares/src/lib/record/ares_dns_record.c \
+	deps/c-ares/src/lib/ares_send.c \
-	deps/c-ares/src/lib/record/ares_dns_write.c \
+	deps/c-ares/src/lib/dsa/ares__slist.c \
-	deps/c-ares/src/lib/str/ares_buf.c \
+	deps/c-ares/src/lib/dsa/ares__htable.c \
-	deps/c-ares/src/lib/str/ares_str.c \
+	deps/c-ares/src/lib/dsa/ares__llist.c \
+	deps/c-ares/src/lib/dsa/ares__htable_szvp.c \
+	deps/c-ares/src/lib/dsa/ares__htable_asvp.c \
+	deps/c-ares/src/lib/dsa/ares__htable_vpvp.c \
+	deps/c-ares/src/lib/dsa/ares__htable_strvp.c \
+	deps/c-ares/src/lib/dsa/ares__array.c \
+	deps/c-ares/src/lib/ares__socket.c \
+	deps/c-ares/src/lib/event/ares_event_poll.c \
+	deps/c-ares/src/lib/event/ares_event_thread.c \
+	deps/c-ares/src/lib/event/ares_event_select.c \
+	deps/c-ares/src/lib/event/ares_event_kqueue.c \
+	deps/c-ares/src/lib/event/ares_event_configchg.c \
+	deps/c-ares/src/lib/event/ares_event_epoll.c \
+	deps/c-ares/src/lib/event/ares_event_wake_pipe.c \
+	deps/c-ares/src/lib/event/ares_event_win32.c \
+	deps/c-ares/src/lib/ares_search.c \
+	deps/c-ares/src/lib/ares__parse_into_addrinfo.c \
+	deps/c-ares/src/lib/ares__hosts_file.c \
+	deps/c-ares/src/lib/ares_getaddrinfo.c \
+	deps/c-ares/src/lib/ares__addrinfo2hostent.c \
+	deps/c-ares/src/lib/ares_freeaddrinfo.c \
+	deps/c-ares/src/lib/ares_strerror.c \
+	deps/c-ares/src/lib/ares_version.c \
+	deps/c-ares/src/lib/ares_gethostbyaddr.c \
+	deps/c-ares/src/lib/ares__addrinfo_localhost.c \
+	deps/c-ares/src/lib/ares_free_hostent.c \
+	deps/c-ares/src/lib/ares__close_sockets.c \
+	deps/c-ares/src/lib/ares_free_string.c \
+	deps/c-ares/src/lib/ares_init.c \
+	deps/c-ares/src/lib/ares_options.c \
+	deps/c-ares/src/lib/str/ares_strcasecmp.c \
+	deps/c-ares/src/lib/str/ares__buf.c \
 	deps/c-ares/src/lib/str/ares_strsplit.c \
-	deps/c-ares/src/lib/util/ares_iface_ips.c \
+	deps/c-ares/src/lib/str/ares_str.c \
+	deps/c-ares/src/lib/ares_sysconfig_mac.c \
+	deps/c-ares/src/lib/ares__sortaddrinfo.c \
+	deps/c-ares/src/lib/ares_sysconfig_files.c \
+	deps/c-ares/src/lib/util/ares__iface_ips.c \
+	deps/c-ares/src/lib/util/ares__timeval.c \
 	deps/c-ares/src/lib/util/ares_math.c \
 	deps/c-ares/src/lib/util/ares_rand.c \
-	deps/c-ares/src/lib/util/ares_threads.c \
+	deps/c-ares/src/lib/util/ares__threads.c \
-	deps/c-ares/src/lib/util/ares_timeval.c \
+	deps/c-ares/src/lib/ares_query.c \
-	deps/c-ares/src/lib/util/ares_uri.c \
+	deps/c-ares/src/lib/ares_cookie.c \
-	deps/c-ares/src/lib/windows_port.c \
+	deps/c-ares/src/lib/inet_net_pton.c \
+	deps/c-ares/src/lib/inet_ntop.c \
+	deps/c-ares/src/lib/ares_library_init.c \
+	deps/c-ares/src/lib/ares_android.c \
+	deps/c-ares/src/lib/ares_sysconfig_win.c \
 	deps/c-ares/src/lib/ares_timeout.c
 ARES_OBJS := $(call get_objs,ARES_SOURCES)
 $(ARES_OBJS): CFLAGS += \
 	-Ideps/c-ares/include \
 	-Ideps/c-ares/src/lib \
-	-Ideps/c-ares/src/lib/include \
 	-Ideps/c-ares_config/ \
 	-D_GNU_SOURCE \
 	-Wno-unused-function \
@@ -509,17 +494,10 @@ $(UV_OBJS): CFLAGS += \
 	-Wno-incompatible-pointer-types \
 	-Wno-maybe-uninitialized \
 	-Wno-sign-compare \
-	-Wno-unknown-attributes \
 	-Wno-unused-but-set-parameter \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-result \
-	-Wno-unused-variable \
+	-Wno-unused-variable
-	-Wno-nonnull
-$(UV_OBJS): CFLAGS += -fno-lto
-$(filter out/win%,$(UV_OBJS)): \
-	CFLAGS += \
-		-Wno-cast-function-type \
-		-Wno-missing-braces
 ifeq ($(UNAME_S),Linux)
 $(UV_OBJS): CFLAGS += \
 	-D_GNU_SOURCE
@@ -858,7 +836,7 @@ PACKAGE_DIRS := \
 	deps/prettier/ \
 	deps/lit/
 
-RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f -not -name '.*')))
+RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f)))
 
 out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release
@@ -1008,7 +986,6 @@ out/data.zip: $(RAW_FILES)
 out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
-	@cp -v out/data.zip $(@D)/
 ifeq ($(HAVE_LINUX_IOS),1)
 	@zsign -q -k .keys/apple.p12 -f -m src/ios/embedded.mobileprovision $(realpath $(dir $@))
 endif
@@ -1053,6 +1030,10 @@ apklog:
 .PHONY: apklog
 
 fetchdeps:
+	@echo "[fetch] libuv"
+	@test -f out/deps/libuv.tar.gz && test "$$(cat out/deps/libuv.txt 2>/dev/null)" = $(LIBUV_URL) || (mkdir -p out/deps/ && curl -q $(LIBUV_URL) -o out/deps/libuv.tar.gz)
+	@test -d deps/libuv/ && test "$$(cat out/deps/libuv.txt 2>/dev/null)" = $(LIBUV_URL) || (rm -rf deps/libuv/ && mkdir -p deps/libuv/ && tar -C deps/libuv/ -m --strip=1 -xf out/deps/libuv.tar.gz)
+	@echo -n $(LIBUV_URL) > out/deps/libuv.txt
 	@echo "[fetch] sqlite"
 	@test -f out/deps/sqlite.zip && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p out/deps/ && curl -q $(SQLITE_URL) -o out/deps/sqlite.zip)
 	@test -d deps/sqlite/ && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p deps/sqlite/ && unzip -qDjo -d deps/sqlite/ out/deps/sqlite.zip)
@@ -1083,41 +1064,14 @@ $(IOS_DEPS):
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS)
 endif
 
-out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip
-	@echo "[appimage] $$@"
-	@rm -rf out/tildefriends.AppDir
-	@mkdir -p out/tildefriends.AppDir/usr/bin
-	@mkdir -p out/tildefriends.AppDir/usr/share/applications
-	@mkdir -p out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps
-	@mkdir -p out/tildefriends.AppDir/usr/share/tildefriends
-	@echo $(APPIMAGETOOL_MD5) > out/appimagetool.md5
-	@test -x out/appimagetool || curl -q -L -o out/appimagetool $(APPIMAGETOOL_URL) && md5sum -c out/appimagetool.md5 && chmod +x out/appimagetool
-	@echo "[Desktop Entry]\nName=tildefriends\nExec=/usr/bin/tildefriends\nIcon=/usr/share/icons/hicolor/scalable/apps/tildefriends\nType=Application\nCategories=Network" > out/tildefriends.AppDir/tildefriends.desktop
-	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps/
-	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/
-	@cp out/release/tildefriends out/tildefriends.AppDir/usr/bin/
-	@cp out/data.zip out/tildefriends.AppDir/usr/share/tildefriends/data.zip
-	@echo "#!/bin/sh\n\$${APPDIR}/usr/bin/tildefriends run -z \$$APPDIR/usr/share/tildefriends/data.zip" > out/tildefriends.AppDir/AppRun
-	@chmod +x out/tildefriends.AppDir/AppRun
-	@cd out; ./appimagetool --appimage-extract; cd ..
-	@cd out; unset SOURCE_DATE_EPOCH; PATH=$$PATH:squashfs-root/usr/bin ARCH=x86_64 squashfs-root/usr/bin/appimagetool -u 'zsync|https://dev.tildefriends.net/releases/tildefriends-x86_64.AppImage.zsync' tildefriends.AppDir tildefriends-x86_64.AppImage; cd ..
-
-appimage: out/tildefriends-x86_64.AppImage
-.PHONY: appimage
-
-flatpak: out/
-	flatpak-builder --force-clean --user --install-deps-from=flathub --install --repo=out/flatpak-repo out/flatpak src/com.unprompted.tildefriends.yml
-	flatpak build-bundle out/flatpak-repo out/tildefriends.flatpak com.unprompted.tildefriends
-.PHONY: flatpak
-
 clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-tarball:
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk
-	@echo [archive] out/tildefriends-$(VERSION_NUMBER).tar.xz
+	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
-	@mkdir -p out/tildefriends-$(VERSION_NUMBER)
+	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
 	@git ls-files --recurse-submodules | tar -c -T- | tar -x -C out/tildefriends-$(VERSION_NUMBER)
 	@tar \
 		--exclude=apps/welcome* \
@@ -1134,15 +1088,9 @@ tarball:
 		--exclude=deps/sqlite/shell.c \
 		--exclude=deps/zlib/contrib/vstudio \
 		--exclude=deps/zlib/doc \
-		-caf out/tildefriends-$(VERSION_NUMBER).tar.xz \
+		-caf dist/tildefriends-$(VERSION_NUMBER).tar.xz \
 		-C out/ \
 		tildefriends-$(VERSION_NUMBER)
-.PHONY: tarball
-
-dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk appimage tarball
-	@mkdir -p dist/
-	@echo "[cp] tildefriends-$(VERSION_NUMBER).tar.xz"
-	@cp out/tildefriends-$(VERSION_NUMBER).tar.xz dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@echo "[cp] TildeFriends-x86-$(VERSION_NUMBER).apk"
 	@cp out/TildeFriends-x86-release.zopfli.apk dist/TildeFriends-x86-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-arm-$(VERSION_NUMBER).apk"
@@ -1151,12 +1099,8 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien
 	@cp out/tildefriends-release.ipa dist/TildeFriends-$(VERSION_NUMBER).ipa
 	@test $(HAVE_WIN) && echo "[cp] tildefriends-$(VERSION_NUMBER).exe"
 	@test $(HAVE_WIN) && cp out/winrelease/tildefriends.standalone.exe dist/tildefriends-$(VERSION_NUMBER).exe
-	@echo "[cp] TildeFriends-$(VERSION_NUMBER).aab"
 	@cp out/TildeFriends.aab dist/TildeFriends-$(VERSION_NUMBER).aab
-	@echo "[cp] TildeFriends-$(VERSION_NUMBER).fdroid.apk"
 	@cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk
-	@echo "[cp] TildeFriends-x86_64-$(VERSION_NUMBER).AppImage"
-	@cp out/tildefriends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage
 .PHONY: dist
 
 dist-test: dist
@@ -1179,4 +1123,4 @@ docs:
 .PHONY: docs
 
 fdroid: out/apk/TildeFriends-release.fdroid.unsigned.apk
-.PHONY: fdroid
+.PHONE: fdroid

README.md

@@ -19,24 +19,8 @@ Scuttlebutt, as well as a platform for writing and running web applications.
 Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku. Builds for
 all of those host platforms plus mingw64, iOS, and android.
 
-Tilde Friends uses git submodules, so either:
+1. Requires openssl (`libssl-dev`, in debian-speak). All other dependencies
-
+   are kept up to date in the tree.
-```
-git clone --recurse-submodules https://dev.tildefriends.net/cory/tildefriends.git
-```
-
-or:
-
-```
-git clone https://dev.tildefriends.net/cory/tildefriends.git
-cd tildefriends
-git submodule update --init --recursive
-```
-
-The `.tar.xz` source releases are all-inclusive.
-
-1. On Linux only, system OpenSSL libraries (`libssl-dev`, in debian-speak) are
-   assumed to be available.
 2. To build, run `make debug` or `make release`. An executable will be
    generated in a subdirectory of `out/`.
 3. It's possible to build for Android, iOS, and Windows on Linux, if you have

apps/admin.json

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

apps/admin/script.js

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

apps/db.json

@@ -1,5 +1,4 @@
 {
 	"type": "tildefriends-app",
-	"emoji": "💽",
+	"emoji": "💽"
-	"previous": "&uQzkIe/Aj8yNhLKe3hEq+5fEJsGwIUx8NVBjJKwoV2U=.sha256"
 }

apps/db/app.js

@@ -51,19 +51,6 @@ async function key_list(db) {
 	app.setDocument(doc);
 }
 
-function load() {
-	if (core.user?.credentials?.session) {
-		database_list();
-	} else {
-		app.setDocument(`<!DOCTYPE html>
-<html>
-<body style="background: #888">
-	<h1>Must be signed in to examine databases.</h1>
-</body>
-</html>`);
-	}
-}
-
 core.register('message', async function (message) {
 	if (message.event == 'hashChange') {
 		let hash = message.hash.substring(1);
@@ -75,9 +62,9 @@ core.register('message', async function (message) {
 		} else if (hash.length) {
 			key_list(await database(hash.split(':').slice(1).join(':')));
 		} else {
-			load();
+			database_list();
 		}
 	}
 });
 
-load();
+database_list();

apps/identity.json

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

apps/identity/app.js

@@ -1,7 +1,5 @@
 import * as tfrpc from '/tfrpc.js';
 
-const is_admin = core.user?.credentials?.permissions?.administration;
-
 tfrpc.register(async function get_private_key(id) {
 	return bip39Words(await ssb.getPrivateKey(id));
 });
@@ -17,13 +15,9 @@ tfrpc.register(async function delete_id(id) {
 tfrpc.register(async function reload() {
 	await main();
 });
-tfrpc.register(async function make_server(id) {
-	return await ssb.swapWithServerIdentity(id);
-});
 
 async function main() {
 	let ids = await ssb.getIdentities();
-	let server_id = await ssb.getServerIdentity();
 	await app.setDocument(
 		`
 		<head>
@@ -104,16 +98,6 @@ async function main() {
 					alert('Error deleting ID: ' + e);
 				}
 			}
-			handler.make_server = async function make_server(event) {
-				let id = event.srcElement.dataset.id;
-				try {
-					if (confirm('Are you sure you want to make "' + id + '" the server identity?\\n\\nFor it to take effect, you will need to both sign in again and restart Tilde Friends.')) {
-						await tfrpc.rpc.make_server(id);
-					}
-				} catch (e) {
-					alert('Error making server ID: ' + e);
-				}
-			}
 		</script>
 		<header class="w3-theme w3-padding"><h1>SSB Identity Management</h1></header>
 		<div class="w3-card-4 w3-margin">
@@ -132,15 +116,14 @@ async function main() {
 		<div class="w3-card-4 w3-margin">
 			<header class="w3-container w3-theme-l2"><h2>Identities</h2></header>
 			<ul class="w3-ul">` +
-			(ids ?? [])
+			ids
 				.map(
 					(
 						id
 					) => `<li style="overflow: hidden; text-wrap: nowrap; text-overflow: ellipsis">
 				<button onclick="handler.export_id(event)" data-id="${id}" class="w3-button w3-theme">Export Identity</button>
 				<button onclick="handler.delete_id(event)" data-id="${id}" class="w3-button w3-theme">Delete Identity</button>
-				${is_admin && id != server_id ? `<button onclick="handler.make_server(event)" data-id="${id}" class="w3-button w3-theme">Make Server Identity</button>` : ''}
+				${id}
-				${id}${id == server_id ? ' <div class="w3-tag w3-theme-l4 w3-round">🖥 local server</div>' : ''}
 			</li>`
 				)
 				.join('\n') +

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&+UZSxjoucLAl5r/nfRNu5KXx3K/PdutGnizL/Cn2eCU=.sha256"
+	"previous": "&2xK//SIpjFb0+uT5I7MSAGJ3d1FKuI/rlzhcCQd3NME=.sha256"
 }

apps/ssb/app.js

@@ -103,9 +103,6 @@ tfrpc.register(async function encrypt(id, recipients, content) {
 tfrpc.register(async function getActiveIdentity() {
 	return await ssb.getActiveIdentity();
 });
-tfrpc.register(async function sync() {
-	return await ssb.sync();
-});
 core.register('onBroadcastsChanged', async function () {
 	await tfrpc.rpc.set('broadcasts', await ssb.getBroadcasts());
 });

apps/ssb/tf-app.js

@@ -67,7 +67,7 @@ class TfElement extends LitElement {
 	}
 
 	set_hash(hash) {
-		this.hash = decodeURIComponent(hash || '#');
+		this.hash = hash || '#';
 		if (this.hash.startsWith('#q=')) {
 			this.tab = 'search';
 		} else if (this.hash === '#connections') {

apps/ssb/tf-compose.js

@@ -180,13 +180,6 @@ class TfComposeElement extends LitElement {
 				break;
 			}
 		}
-
-		event.preventDefault();
-		document.execCommand(
-			'insertText',
-			false,
-			event.clipboardData.getData('text/plain')
-		);
 	}
 
 	async submit() {

apps/ssb/tf-message.js

@@ -73,23 +73,18 @@ class TfMessageElement extends LitElement {
 			}
 		}
 		if (this.message?.votes?.length) {
-			return html` <div class="w3-container">
+			return html`<div class="w3-button" @click=${this.show_reactions}>
-				<div
-					class="w3-button w3-bar w3-padding-small"
-					@click=${this.show_reactions}
-				>
 				${(this.message.votes || []).map(
 					(vote) => html`
 						<span
-								class="w3-bar-item w3-padding-small"
+							title="${this.users[vote.author]?.name ?? vote.author} ${new Date(
-								title="${this.users[vote.author]?.name ??
+								vote.timestamp
-								vote.author} ${new Date(vote.timestamp)}"
+							)}"
 						>
 							${normalize_expression(vote.content.vote.expression)}
 						</span>
 					`
 				)}
-				</div>
 			</div>`;
 		}
 	}

apps/ssb/tf-profile.js

@@ -188,10 +188,6 @@ class TfProfileElement extends LitElement {
 		}
 	}
 
-	copy_id() {
-		navigator.clipboard.writeText(this.id);
-	}
-
 	render() {
 		if (
 			this.id == this.whoami &&
@@ -289,10 +285,8 @@ class TfProfileElement extends LitElement {
 			typeof profile.image == 'string' ? profile.image : profile.image?.link;
 		image = this.editing?.image ?? image;
 		let description = this.editing?.description ?? profile.description;
-		return html`<div class="w3-container" style="box-sizing: border-box; border: 2px solid black; background-color: rgba(255, 255, 255, 0.2)">
+		return html`<div style="border: 2px solid black; background-color: rgba(255, 255, 255, 0.2); padding: 16px">
-			<p><tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
+			<tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
-			<input type="text" class="w3-input w3-border w3-theme-d1" readonly value=${this.id}></input>
-			<button class="w3-button w3-theme-d1 w3-ripple" @click=${this.copy_id}>Copy</button>
 			<div style="display: flex; flex-direction: row; gap: 1em">
 				${edit_profile}
 				<div style="flex: 1 0 50%">
@@ -306,11 +300,11 @@ class TfProfileElement extends LitElement {
 				Blocking ${profile.blocking} identities.
 				Blocked by ${profile.blocked} identities.
 			</div>
-			<p>
+			<div>
 				${edit}
 				${follow}
 				${block}
-			</p>
+			</div>
 		</div>`;
 	}
 }

apps/ssb/tf-reactions-modal.js

@@ -27,12 +27,8 @@ class TfReactionsModalElement extends LitElement {
 			? html` <div
 					class="w3-modal w3-animate-opacity"
 					style="display: block; box-sizing: border-box"
-					@click=${this.clear}
-				>
-					<div
-						class="w3-modal-content w3-card-4 w3-theme-d1"
-						onclick="event.stopPropagation()"
 				>
+					<div class="w3-modal-content w3-card-4 w3-theme-d1">
 						<div class="w3-container w3-padding">
 							<header class="w3-container">
 								<h2>Reactions</h2>

apps/ssb/tf-tab-connections.js

@@ -12,18 +12,11 @@ class TfTabConnectionsElement extends LitElement {
 			stored_connections: {type: Array},
 			users: {type: Object},
 			server_identity: {type: String},
-			connect_error: {type: String},
 		};
 	}
 
 	static styles = styles;
 
-	static k_broadcast_emojis = {
-		discovery: '🏓',
-		room: '🚪',
-		peer_exchange: '🕸',
-	};
-
 	constructor() {
 		super();
 		let self = this;
@@ -99,7 +92,6 @@ class TfTabConnectionsElement extends LitElement {
 					Connect
 				</button>
 				<div class="w3-bar-item">
-					${TfTabConnectionsElement.k_broadcast_emojis[connection.origin]}
 					<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
 					${this.render_connection_summary(connection)}
 				</div>
@@ -130,7 +122,6 @@ class TfTabConnectionsElement extends LitElement {
 			>
 				Close
 			</button>
-			${connection.flags.one_shot ? '🔃' : undefined}
 			<tf-user id=${connection.id} .users=${this.users}></tf-user>
 			${connection.tunnel !== undefined
 				? '🚇'
@@ -138,9 +129,7 @@ class TfTabConnectionsElement extends LitElement {
 			<div>
 				${requests.map(
 					(x) => html`
-						<span
+						<span class="w3-tag w3-small"
-							class=${'w3-tag w3-small ' +
-							(x.active ? 'w3-theme-l3' : 'w3-theme-d3')}
 							>${x.request_number > 0 ? '🟩' : '🟥'} ${x.name}
 							<span
 								class="w3-badge w3-white"
@@ -160,39 +149,19 @@ class TfTabConnectionsElement extends LitElement {
 		`;
 	}
 
-	refresh() {
-		tfrpc.rpc.sync();
-	}
-
-	connect(address) {
-		let self = this;
-		tfrpc.rpc.connect(address).then(function() {
-			self.connect_error = 'connected!';
-		}).catch(function(error) {
-			self.connect_error = error;
-		});
-	}
-
 	render() {
 		let self = this;
 		return html`
 			<div class="w3-container" style="box-sizing: border-box">
-				<button
-					class="w3-button w3-theme-l3 w3-circle w3-ripple w3-large"
-					@click=${this.refresh}
-				>
-					🔃
-				</button>
 				<h2>New Connection</h2>
 				<textarea class="w3-input w3-theme-d1" id="code"></textarea>
 				<button
 					class="w3-button w3-theme-d1"
 					@click=${() =>
-						self.connect(self.renderRoot.getElementById('code').value)}
+						tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)}
 				>
 					Connect
 				</button>
-				<div ?hidden=${this.connect_error === undefined}>${this.connect_error}</div>
 				<h2>Broadcasts</h2>
 				<ul class="w3-ul w3-border">
 					${this.broadcasts

apps/ssb/tf-tab-search.js

@@ -5,7 +5,6 @@ import {styles} from './tf-styles.js';
 class TfTabSearchElement extends LitElement {
 	static get properties() {
 		return {
-			drafts: {type: Object},
 			whoami: {type: String},
 			users: {type: Object},
 			following: {type: Array},
@@ -23,10 +22,6 @@ class TfTabSearchElement extends LitElement {
 		this.users = {};
 		this.following = [];
 		this.expanded = {};
-		this.drafts = {};
-		tfrpc.rpc.localStorageGet('drafts').then(function (d) {
-			self.drafts = JSON.parse(d || '{}');
-		});
 	}
 
 	async search(query) {
@@ -75,18 +70,6 @@ class TfTabSearchElement extends LitElement {
 		}
 	}
 
-	draft(event) {
-		let id = event.detail.id || '';
-		let previous = this.drafts[id];
-		if (event.detail.draft !== undefined) {
-			this.drafts[id] = event.detail.draft;
-		} else {
-			delete this.drafts[id];
-		}
-		this.drafts = Object.assign({}, this.drafts);
-		tfrpc.rpc.localStorageSet('drafts', JSON.stringify(this.drafts));
-	}
-
 	render() {
 		if (this.query !== this.last_query) {
 			this.last_query = this.query;
@@ -98,7 +81,7 @@ class TfTabSearchElement extends LitElement {
 				<input type="text" class="w3-input w3-theme-d1" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></input>
 				<button class="w3-button w3-theme-d1" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}>Search</button>
 			</div>
-			<tf-news id="news" whoami=${this.whoami} .messages=${this.messages} .users=${this.users} .expanded=${this.expanded} .drafts=${this.drafts} @tf-expand=${this.on_expand} @tf-draft=${this.draft}></tf-news>
+			<tf-news id="news" whoami=${this.whoami} .messages=${this.messages} .users=${this.users} .expanded=${this.expanded} @tf-expand=${this.on_expand}></tf-news>
 		`;
 	}
 }

apps/ssb/tf-user.js

@@ -37,7 +37,7 @@ class TfUserElement extends LitElement {
 			if (image_link !== undefined) {
 				image = html`<img
 					class="w3-circle"
-					style="width: 2em; height: 2em; vertical-align: middle; object-fit: cover"
+					style="width: 2em; height: 2em; vertical-align: middle"
 					src="/${image_link}/view"
 				/>`;
 			}

apps/test.json

@@ -1,4 +0,0 @@
-{
-	"type": "tildefriends-app",
-	"emoji": "📦"
-}

apps/test/app.js

@@ -1,3 +0,0 @@
-app.setDocument(
-	'<p style="color: #fff">Maybe one day this app will run tests, but for now there is nothing to see here.</p>'
-);

apps/test/hello.txt

@@ -1 +0,0 @@
-Hello, world!

apps/welcome.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "👋",
-	"previous": "&7gFmLW5zSMhmxWWY1+jeRcHdullgujSqGJg94lVgr1k=.sha256"
+	"previous": "&W5aJp2DgOW5rQ0AOIC9Ut3DpsahPrO6PjkJ1PQbNRdM=.sha256"
 }

apps/welcome/appimage.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48px" height="48px" id="svg3832" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="appimage-assistant_alt3.svg">
-  <defs id="defs3834">
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3308-4-6-931-761-0" id="linearGradient2975" gradientUnits="userSpaceOnUse" x1="24.3125" y1="22.96875" x2="24.3125" y2="41.03125"/>
-    <linearGradient id="linearGradient3308-4-6-931-761-0">
-      <stop id="stop2919-2" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
-      <stop id="stop2921-76" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4222" id="linearGradient2979" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,0.3704967,-0.3617496,0,33.508315,6.1670925)" x1="7.6485429" y1="26.437023" x2="41.861729" y2="26.437023"/>
-    <linearGradient id="linearGradient4222">
-      <stop id="stop4224" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
-      <stop id="stop4226" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3308-4-6-931-761" id="linearGradient2982" gradientUnits="userSpaceOnUse" gradientTransform="translate(0,0.9999987)" x1="23.99999" y1="4.999989" x2="23.99999" y2="43"/>
-    <linearGradient id="linearGradient3308-4-6-931-761">
-      <stop id="stop2919" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
-      <stop id="stop2921" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3575" id="radialGradient2985" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,1.0262008,-1.6561124,9.4072203e-4,-56.097482,-45.332325)" cx="48.42384" cy="-48.027504" fx="48.42384" fy="-48.027504" r="38.212933"/>
-    <linearGradient id="linearGradient3575">
-      <stop id="stop3577" style="stop-color:#fafafa;stop-opacity:1" offset="0"/>
-      <stop id="stop3579" style="stop-color:#e6e6e6;stop-opacity:1" offset="1"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3993" id="radialGradient2990" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,2.0478765,-2.7410544,-8.6412258e-8,47.161382,-8.837436)" cx="9.3330879" cy="8.4497671" fx="9.3330879" fy="8.4497671" r="19.99999"/>
-    <linearGradient id="linearGradient3993">
-      <stop offset="0" style="stop-color:#a3c0d0;stop-opacity:1" id="stop3995"/>
-      <stop offset="1" style="stop-color:#427da1;stop-opacity:1" id="stop4001"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient2508" id="linearGradient2992" gradientUnits="userSpaceOnUse" gradientTransform="translate(0,0.9674382)" x1="14.048676" y1="44.137306" x2="14.048676" y2="4.0000005"/>
-    <linearGradient id="linearGradient2508">
-      <stop offset="0" style="stop-color:#2e4a5a;stop-opacity:1" id="stop2510"/>
-      <stop offset="1" style="stop-color:#6e8796;stop-opacity:1" id="stop2512"/>
-    </linearGradient>
-    <radialGradient cx="4.9929786" cy="43.5" r="2.5" fx="4.9929786" fy="43.5" id="radialGradient2873-966-168" xlink:href="#linearGradient3688-166-749" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"/>
-    <linearGradient id="linearGradient3688-166-749">
-      <stop id="stop2883" style="stop-color:#181818;stop-opacity:1" offset="0"/>
-      <stop id="stop2885" style="stop-color:#181818;stop-opacity:0" offset="1"/>
-    </linearGradient>
-    <radialGradient cx="4.9929786" cy="43.5" r="2.5" fx="4.9929786" fy="43.5" id="radialGradient2875-742-326" xlink:href="#linearGradient3688-464-309" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"/>
-    <linearGradient id="linearGradient3688-464-309">
-      <stop id="stop2889" style="stop-color:#181818;stop-opacity:1" offset="0"/>
-      <stop id="stop2891" style="stop-color:#181818;stop-opacity:0" offset="1"/>
-    </linearGradient>
-    <linearGradient x1="25.058096" y1="47.027729" x2="25.058096" y2="39.999443" id="linearGradient2877-634-617" xlink:href="#linearGradient3702-501-757" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3702-501-757">
-      <stop id="stop2895" style="stop-color:#181818;stop-opacity:0" offset="0"/>
-      <stop id="stop2897" style="stop-color:#181818;stop-opacity:1" offset="0.5"/>
-      <stop id="stop2899" style="stop-color:#181818;stop-opacity:0" offset="1"/>
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7" inkscape:cx="24" inkscape:cy="24" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="603" inkscape:window-height="484" inkscape:window-x="417" inkscape:window-y="162" inkscape:window-maximized="0"/>
-  <metadata id="metadata3837">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g style="display:inline" id="g2036" transform="matrix(1.1,0,0,0.4444449,-2.4000022,25.11107)">
-      <g style="opacity:0.4" id="g3712" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
-        <rect style="fill:url(#radialGradient2873-966-168);fill-opacity:1;stroke:none" id="rect2801" y="40" x="38" height="7" width="5"/>
-        <rect style="fill:url(#radialGradient2875-742-326);fill-opacity:1;stroke:none" id="rect3696" transform="scale(-1,-1)" y="-47" x="-10" height="7" width="5"/>
-        <rect style="fill:url(#linearGradient2877-634-617);fill-opacity:1;stroke:none" id="rect3700" y="40" x="10" height="7.0000005" width="28"/>
-      </g>
-    </g>
-    <rect style="fill:url(#radialGradient2990);fill-opacity:1;stroke:url(#linearGradient2992);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect5505" y="5.4674392" x="4.5" ry="2.2322156" rx="2.2322156" height="39" width="39"/>
-    <path style="opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4294-1" d="m 21,6.9687498 a 2.0165107,2.0165107 0 0 0 -2.03125,2.03125 l 0,3.9687502 -1.15625,0 a 2.0165107,2.0165107 0 0 0 -1.5,3.375 l 5.0625,5.75 c -0.06312,0.110777 -0.178724,0.246032 -0.21875,0.34375 -0.195898,0.478256 -0.25,0.83653 -0.25,1.21875 l 0,0.125 L 20.8125,23.6875 C 20.534322,23.409323 20.213169,23.162739 19.71875,22.96875 19.47154,22.87176 19.185456,22.791748 18.75,22.8125 c -0.435456,0.02075 -1.054055,0.210302 -1.46875,0.625 L 15.75,24.96875 c -0.414689,0.414689 -0.604245,1.033294 -0.625,1.46875 -0.02075,0.435456 0.05925,0.721537 0.15625,0.96875 C 15.475241,27.900677 15.721817,28.221821 16,28.5 l 0.09375,0.09375 -0.125,0 c -0.382218,0 -0.740493,0.0541 -1.21875,0.25 -0.239128,0.09795 -0.538285,0.214988 -0.84375,0.53125 -0.305465,0.316262 -0.625,0.914788 -0.625,1.53125 l 0,2.1875 c 0,0.616465 0.319536,1.214989 0.625,1.53125 0.305464,0.316261 0.604622,0.433301 0.84375,0.53125 0.478256,0.195898 0.83653,0.25 1.21875,0.25 l 0.125,0 L 16,35.5 c -0.278175,0.278176 -0.52476,0.599329 -0.71875,1.09375 -0.09699,0.24721 -0.177003,0.533292 -0.15625,0.96875 0.02075,0.435458 0.210304,1.054058 0.625,1.46875 l 1.53125,1.53125 c 0.414691,0.414697 1.033292,0.604245 1.46875,0.625 0.435458,0.02076 0.721537,-0.05926 0.96875,-0.15625 0.494425,-0.19399 0.81557,-0.440568 1.09375,-0.71875 l 0.09375,-0.09375 0,0.125 c 0,0.38222 0.0541,0.740495 0.25,1.21875 0.09795,0.239127 0.214989,0.538285 0.53125,0.84375 0.316261,0.305465 0.914783,0.625 1.53125,0.625 l 2.1875,0 c 0.616466,0 1.214989,-0.319534 1.53125,-0.625 0.316261,-0.305466 0.433302,-0.604622 0.53125,-0.84375 0.195896,-0.478255 0.25,-0.836532 0.25,-1.21875 l 0,-0.125 0.09375,0.09375 c 0.278176,0.278175 0.599329,0.52476 1.09375,0.71875 0.24721,0.09699 0.533292,0.177003 0.96875,0.15625 0.435458,-0.02075 1.054058,-0.210304 1.46875,-0.625 L 32.875,39.03125 C 33.289697,38.616559 33.479245,37.997958 33.5,37.5625 33.52076,37.127042 33.44074,36.840963 33.34375,36.59375 33.14976,36.099325 32.903182,35.77818 32.625,35.5 l -0.09375,-0.09375 0.125,0 c 0.38222,0 0.740494,-0.0541 1.21875,-0.25 0.239128,-0.09795 0.538286,-0.214988 0.84375,-0.53125 0.305464,-0.316262 0.625,-0.914787 0.625,-1.53125 l 0,-2.1875 c 0,-0.61646 -0.319535,-1.214987 -0.625,-1.53125 -0.305465,-0.316263 -0.604621,-0.433301 -0.84375,-0.53125 -0.478257,-0.195898 -0.836532,-0.25 -1.21875,-0.25 l -0.125,0 L 32.625,28.5 c 0.278177,-0.278177 0.52476,-0.599329 0.71875,-1.09375 C 33.44074,27.15904 33.520753,26.872957 33.5,26.4375 33.47925,26.002043 33.289697,25.383443 32.875,24.96875 L 31.34375,23.4375 c -0.414688,-0.414694 -1.03329,-0.604245 -1.46875,-0.625 -0.43546,-0.02076 -0.721537,0.05925 -0.96875,0.15625 -0.494426,0.193991 -0.815572,0.44057 -1.09375,0.71875 l -0.09375,0.09375 0,-0.125 c 0,-0.382218 -0.0541,-0.740493 -0.25,-1.21875 -0.09112,-0.22245 -0.228127,-0.500183 -0.5,-0.78125 l 4.71875,-5.3125 a 2.0165107,2.0165107 0 0 0 -1.5,-3.375 l -1.15625,0 0,-3.9687502 A 2.0165107,2.0165107 0 0 0 27,6.9687498 l -6,0 z M 24.3125,31.25 c 0.427097,0 0.75,0.322904 0.75,0.75 0,0.427096 -0.322903,0.75 -0.75,0.75 -0.427094,0 -0.75,-0.322906 -0.75,-0.75 0,-0.427094 0.322906,-0.75 0.75,-0.75 z"/>
-    <path style="opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4294" d="m 20.90625,8.0312498 a 0.96385067,0.96385067 0 0 0 -0.875,0.96875 l 0,5.0312502 -2.21875,0 A 0.96385067,0.96385067 0 0 0 17.09375,15.625 l 5.78125,6.53125 c -0.158814,0.0616 -0.341836,0.0951 -0.4375,0.1875 -0.169161,0.163386 -0.252971,0.323419 -0.3125,0.46875 -0.119058,0.290663 -0.15625,0.566746 -0.15625,0.84375 l 0,1.65625 C 21.718163,25.40233 21.485871,25.509772 21.25,25.625 l -1.1875,-1.1875 c -0.199651,-0.19965 -0.421433,-0.352095 -0.71875,-0.46875 -0.148659,-0.05833 -0.329673,-0.104846 -0.5625,-0.09375 -0.232827,0.0111 -0.53583,0.09833 -0.75,0.3125 L 16.5,25.71875 c -0.214168,0.214168 -0.301403,0.517173 -0.3125,0.75 -0.0111,0.232827 0.03542,0.41384 0.09375,0.5625 0.116655,0.297321 0.269096,0.519099 0.46875,0.71875 l 1.1875,1.1875 c -0.115228,0.235871 -0.222668,0.468163 -0.3125,0.71875 l -1.65625,0 c -0.277003,0 -0.553087,0.03719 -0.84375,0.15625 -0.145332,0.05953 -0.305363,0.143338 -0.46875,0.3125 -0.163387,0.169162 -0.3125,0.46403 -0.3125,0.78125 l 0,2.1875 c 0,0.317221 0.149114,0.612089 0.3125,0.78125 0.163386,0.169161 0.323419,0.252971 0.46875,0.3125 0.290663,0.119058 0.566746,0.15625 0.84375,0.15625 l 1.65625,0 c 0.08983,0.250587 0.197272,0.482879 0.3125,0.71875 L 16.75,36.25 c -0.199649,0.19965 -0.352095,0.421432 -0.46875,0.71875 -0.05833,0.148659 -0.104846,0.329672 -0.09375,0.5625 0.0111,0.232828 0.09833,0.535831 0.3125,0.75 l 1.53125,1.53125 c 0.214168,0.214172 0.517172,0.301403 0.75,0.3125 0.232828,0.0111 0.41384,-0.03542 0.5625,-0.09375 0.29732,-0.116655 0.519098,-0.269096 0.71875,-0.46875 L 21.25,38.375 c 0.235871,0.115228 0.468164,0.222668 0.71875,0.3125 l 0,1.65625 c 0,0.277003 0.03719,0.553087 0.15625,0.84375 0.05953,0.145331 0.143339,0.305364 0.3125,0.46875 0.169161,0.163386 0.464028,0.3125 0.78125,0.3125 l 2.1875,0 c 0.317221,0 0.612089,-0.149113 0.78125,-0.3125 0.169161,-0.163387 0.252971,-0.323419 0.3125,-0.46875 0.119057,-0.290663 0.15625,-0.566748 0.15625,-0.84375 l 0,-1.65625 c 0.250586,-0.08983 0.482879,-0.197272 0.71875,-0.3125 l 1.1875,1.1875 c 0.19965,0.199649 0.421432,0.352095 0.71875,0.46875 0.148659,0.05833 0.329672,0.104846 0.5625,0.09375 0.232828,-0.0111 0.535831,-0.09833 0.75,-0.3125 L 32.125,38.28125 c 0.214172,-0.214168 0.301403,-0.517172 0.3125,-0.75 0.0111,-0.232828 -0.03542,-0.41384 -0.09375,-0.5625 C 32.227095,36.67143 32.074654,36.449652 31.875,36.25 L 30.6875,35.0625 C 30.802728,34.82663 30.910168,34.594337 31,34.34375 l 1.65625,0 c 0.277004,0 0.553087,-0.03719 0.84375,-0.15625 0.145332,-0.05953 0.305364,-0.143339 0.46875,-0.3125 0.163386,-0.169161 0.3125,-0.46403 0.3125,-0.78125 l 0,-2.1875 c 0,-0.317219 -0.149114,-0.612088 -0.3125,-0.78125 C 33.805364,29.955838 33.645332,29.872029 33.5,29.8125 33.209336,29.693442 32.933253,29.65625 32.65625,29.65625 l -1.65625,0 C 30.91017,29.405663 30.802728,29.17337 30.6875,28.9375 L 31.875,27.75 c 0.19965,-0.19965 0.352095,-0.421432 0.46875,-0.71875 0.05833,-0.148659 0.104846,-0.329672 0.09375,-0.5625 -0.0111,-0.232828 -0.09833,-0.535831 -0.3125,-0.75 L 30.59375,24.1875 c -0.214167,-0.21417 -0.517171,-0.301403 -0.75,-0.3125 -0.232829,-0.0111 -0.41384,0.03542 -0.5625,0.09375 -0.29732,0.116656 -0.519099,0.269097 -0.71875,0.46875 L 27.375,25.625 c -0.235871,-0.115228 -0.468163,-0.222668 -0.71875,-0.3125 l 0,-1.65625 c 0,-0.277003 -0.03719,-0.553087 -0.15625,-0.84375 -0.05953,-0.145332 -0.143338,-0.305363 -0.3125,-0.46875 -0.169162,-0.163387 -0.46403,-0.3125 -0.78125,-0.3125 l -0.15625,0 5.65625,-6.40625 A 0.96385067,0.96385067 0 0 0 30.1875,14.03125 l -2.21875,0 0,-5.0312502 A 0.96385067,0.96385067 0 0 0 27,8.0312498 l -6,0 a 0.96385067,0.96385067 0 0 0 -0.09375,0 z M 24.3125,30.1875 c 1.002113,0 1.8125,0.810388 1.8125,1.8125 0,1.002112 -0.810387,1.8125 -1.8125,1.8125 C 23.31039,33.8125 22.5,33.002111 22.5,32 c 0,-1.002111 0.81039,-1.8125 1.8125,-1.8125 z"/>
-    <path style="fill:url(#radialGradient2985);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2317" d="M 21,8.9999996 21,15 17.8125,15 24,22 30.1875,15 27,15 l 0,-6.0000004 -6,0 z M 23.21875,23 c -0.172892,0 -0.28125,0.294922 -0.28125,0.65625 l 0,2.28125 C 22.24145,26.095996 21.585954,26.379869 21,26.75 l -1.625,-1.625 c -0.255498,-0.255497 -0.533998,-0.372253 -0.65625,-0.25 l -1.53125,1.53125 c -0.122254,0.122254 -0.0055,0.400753 0.25,0.65625 l 1.625,1.625 c -0.37013,0.585953 -0.654003,1.24145 -0.8125,1.9375 l -2.28125,0 c -0.361328,0 -0.65625,0.108357 -0.65625,0.28125 l 0,2.1875 c 0,0.172892 0.294922,0.28125 0.65625,0.28125 l 2.28125,0 c 0.158497,0.69605 0.44237,1.351546 0.8125,1.9375 l -1.625,1.625 c -0.255497,0.255498 -0.372254,0.533997 -0.25,0.65625 l 1.53125,1.53125 c 0.122252,0.122254 0.400752,0.0055 0.65625,-0.25 L 21,37.25 c 0.585954,0.37013 1.24145,0.654002 1.9375,0.8125 l 0,2.28125 C 22.9375,40.705077 23.045858,41 23.21875,41 l 2.1875,0 c 0.172893,0 0.28125,-0.294924 0.28125,-0.65625 l 0,-2.28125 c 0.69605,-0.158498 1.351546,-0.44237 1.9375,-0.8125 l 1.625,1.625 c 0.255498,0.255497 0.533997,0.372254 0.65625,0.25 l 1.53125,-1.53125 c 0.122254,-0.122252 0.0055,-0.400752 -0.25,-0.65625 l -1.625,-1.625 c 0.370129,-0.585954 0.654003,-1.24145 0.8125,-1.9375 l 2.28125,0 c 0.361329,0 0.65625,-0.108358 0.65625,-0.28125 l 0,-2.1875 c 0,-0.172893 -0.294921,-0.28125 -0.65625,-0.28125 l -2.28125,0 c -0.158497,-0.69605 -0.442371,-1.351547 -0.8125,-1.9375 l 1.625,-1.625 c 0.255497,-0.255497 0.372254,-0.533997 0.25,-0.65625 L 29.90625,24.875 C 29.783997,24.752745 29.505498,24.8695 29.25,25.125 l -1.625,1.625 c -0.585954,-0.370131 -1.24145,-0.654004 -1.9375,-0.8125 l 0,-2.28125 C 25.6875,23.294922 25.579143,23 25.40625,23 l -2.1875,0 z m 1.09375,6.21875 c 1.528616,0 2.78125,1.252635 2.78125,2.78125 0,1.528615 -1.252634,2.78125 -2.78125,2.78125 -1.528614,0 -2.78125,-1.252635 -2.78125,-2.78125 0,-1.528615 1.252636,-2.78125 2.78125,-2.78125 z"/>
-    <rect style="opacity:0.4;fill:none;stroke:url(#linearGradient2982);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect6741" y="6.4999886" x="5.4999981" ry="1.365193" rx="1.365193" height="37.000011" width="36.999985"/>
-    <path style="fill:none;stroke:url(#linearGradient2979);stroke-width:0.99829447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" id="path2777" d="M 28.926376,15.466668 24,21.177578 18.963089,15.5 21.5,15.5 l 0,-6.0000004 5,0 0,6.0000004 2.426376,-0.03333 z"/>
-    <path style="fill:none;stroke:url(#linearGradient2975);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4243" d="m 23.4375,23.46875 c -0.01166,0.05381 -0.03125,0.100205 -0.03125,0.1875 l 0,2.28125 a 0.48185467,0.48185467 0 0 1 -0.375,0.46875 c -0.638467,0.145384 -1.238423,0.407111 -1.78125,0.75 a 0.48185467,0.48185467 0 0 1 -0.59375,-0.0625 l -1.625,-1.625 C 18.9779,25.4154 18.9477,25.40242 18.90625,25.375 l -1.21875,1.21875 c 0.02742,0.04145 0.0404,0.07165 0.09375,0.125 l 1.625,1.625 a 0.48185467,0.48185467 0 0 1 0.0625,0.59375 c -0.342888,0.542826 -0.604615,1.142782 -0.75,1.78125 a 0.48185467,0.48185467 0 0 1 -0.46875,0.375 l -2.28125,0 c -0.08729,0 -0.133695,0.01959 -0.1875,0.03125 l 0,1.75 c 0.05381,0.01166 0.100205,0.03125 0.1875,0.03125 l 2.28125,0 a 0.48185467,0.48185467 0 0 1 0.46875,0.375 c 0.145385,0.638468 0.407112,1.238423 0.75,1.78125 a 0.48185467,0.48185467 0 0 1 -0.0625,0.59375 l -1.625,1.625 c -0.05335,0.05335 -0.06633,0.08355 -0.09375,0.125 l 1.21875,1.21875 c 0.04145,-0.02742 0.07165,-0.0404 0.125,-0.09375 l 1.625,-1.625 A 0.48185467,0.48185467 0 0 1 21.25,36.84375 c 0.542827,0.342888 1.142781,0.604614 1.78125,0.75 a 0.48185467,0.48185467 0 0 1 0.375,0.46875 l 0,2.28125 c 0,0.08729 0.01959,0.133695 0.03125,0.1875 l 1.75,0 c 0.01166,-0.0538 0.03125,-0.100206 0.03125,-0.1875 l 0,-2.28125 a 0.48185467,0.48185467 0 0 1 0.375,-0.46875 c 0.638469,-0.145386 1.238423,-0.407112 1.78125,-0.75 a 0.48185467,0.48185467 0 0 1 0.59375,0.0625 l 1.625,1.625 c 0.05335,0.05335 0.08355,0.06633 0.125,0.09375 l 1.21875,-1.21875 c -0.02742,-0.04145 -0.0404,-0.07165 -0.09375,-0.125 l -1.625,-1.625 a 0.48185467,0.48185467 0 0 1 -0.0625,-0.59375 c 0.342888,-0.542828 0.604615,-1.142783 0.75,-1.78125 a 0.48185467,0.48185467 0 0 1 0.46875,-0.375 l 2.28125,0 c 0.08729,0 0.133695,-0.01959 0.1875,-0.03125 l 0,-1.75 c -0.0538,-0.01166 -0.100204,-0.03125 -0.1875,-0.03125 l -2.28125,0 a 0.48185467,0.48185467 0 0 1 -0.46875,-0.375 c -0.145385,-0.638467 -0.407113,-1.238424 -0.75,-1.78125 a 0.48185467,0.48185467 0 0 1 0.0625,-0.59375 l 1.625,-1.625 c 0.05335,-0.05335 0.06633,-0.08355 0.09375,-0.125 L 29.71875,25.375 c -0.04145,0.02742 -0.07165,0.0404 -0.125,0.09375 l -1.625,1.625 a 0.48185467,0.48185467 0 0 1 -0.59375,0.0625 c -0.542827,-0.342889 -1.142783,-0.604616 -1.78125,-0.75 a 0.48185467,0.48185467 0 0 1 -0.375,-0.46875 l 0,-2.28125 c 0,-0.0873 -0.01959,-0.133695 -0.03125,-0.1875 l -1.75,0 z m 0.875,5.28125 c 1.791829,0 3.25,1.458172 3.25,3.25 0,1.791828 -1.458171,3.25 -3.25,3.25 -1.791827,0 -3.25,-1.458172 -3.25,-3.25 0,-1.791828 1.458173,-3.25 3.25,-3.25 z"/>
-  </g>
-</svg>

apps/welcome/f-droid.svg

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48" height="48" viewBox="0 0 48.000001 48.000001" id="svg4230" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="fdroid-logo.svg">
-  <defs id="defs4232">
-    <linearGradient inkscape:collect="always" id="linearGradient5212">
-      <stop style="stop-color:#ffffff;stop-opacity:0.09803922" offset="0" id="stop5214"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop5216"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5212" id="radialGradient5220" cx="-98.23381" cy="3.4695871" fx="-98.23381" fy="3.4695871" r="22.671185" gradientTransform="matrix(0,1.9747624,-2.117225,3.9784049e-8,8.677247,1199.588)" gradientUnits="userSpaceOnUse"/>
-    <filter inkscape:collect="always" style="color-interpolation-filters:sRGB" id="filter4175" x="-0.023846937" width="1.0476939" y="-0.02415504" height="1.0483101">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="0.45053152" id="feGaussianBlur4177"/>
-    </filter>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.313708" inkscape:cx="6.4184057" inkscape:cy="25.737489" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="0" inkscape:window-y="34" inkscape:window-maximized="1" gridtolerance="10000"/>
-  <metadata id="metadata4235">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"/>
-      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
-        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
-        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
-        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)">
-    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.4;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4175);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.613462,1006.3488 a 1.250125,1.250125 0 0 0 -1.01172,2.0293 l 3.60351,4.6641 c -0.12699,0.3331 -0.20312,0.6915 -0.20312,1.0703 l 0,4 0,2.8652 0,0.1348 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-4 0,-2.8652 0,-0.1348 c 0,-0.3803 -0.0771,-0.74 -0.20508,-1.0742 l 3.60156,-4.6602 a 1.250125,1.250125 0 0 0 -1.04882,-2.0273 1.250125,1.250125 0 0 0 -0.92969,0.498 l -3.43164,4.4414 c -0.31022,-0.1079 -0.63841,-0.1777 -0.98633,-0.1777 l -32,0 c -0.34857,0 -0.67757,0.069 -0.98828,0.1777 l -3.4336,-4.4414 a 1.250125,1.250125 0 0 0 -0.96679,-0.5 z m 5.38867,18.7637 c -0.20775,0 -0.40983,0.021 -0.60547,0.061 -1.36951,0.2761 -2.39453,1.4698 -2.39453,2.9101 l 0,0.029 0,19.7793 0,0.029 0,0.1914 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-20 0,-0.029 c 0,-1.4403 -1.02502,-2.634 -2.39453,-2.9101 -0.19565,-0.039 -0.39772,-0.061 -0.60547,-0.061 l -32,0 z" id="path4192" inkscape:connector-curvature="0"/>
-    <g id="g5012">
-      <g id="g4179" transform="matrix(-1,0,0,1,47.999779,0)">
-        <path style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 2.5889342,1006.8622 4.25,5.5" id="path4181" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
-        <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path4183" d="m 2.6113281,1005.6094 c -0.4534623,0.012 -0.7616975,0.189 -0.9807462,0.4486 2.0269314,2.4089 2.368401,2.7916 5.1354735,6.2214 1.0195329,1.319 2.0816026,0.6373 1.0620696,-0.6817 l -4.25,-5.5 c -0.2289894,-0.3056 -0.5850813,-0.478 -0.9667969,-0.4883 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.29803923;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
-        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4185" d="m 1.6220992,1006.0705 c -0.1238933,0.1479 -0.561176,0.8046 -0.02249,1.5562 l 4.25,5.5 c 1.0195329,1.319 1.1498748,-0.6123 1.1498748,-0.6123 0,0 -3.7344514,-4.51 -5.3773848,-6.4439 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
-        <path sodipodi:nodetypes="cscccc" inkscape:connector-curvature="0" id="path4187" d="m 2.3378905,1005.8443 c -0.438175,0 -0.959862,0.1416 -0.8242183,0.7986 0.103561,0.5016 4.6608262,6.0744 4.6608262,6.0744 1.0195329,1.319 2.4934721,0.6763 1.4739391,-0.6425 l -4.234375,-5.4727 c -0.2602394,-0.29 -0.6085188,-0.7436 -1.076172,-0.7578 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
-      </g>
-      <g id="g4955">
-        <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4945" d="m 2.5889342,1006.8622 4.25,5.5" style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
-        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.29803923;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.6113281,1005.6094 c -0.4534623,0.012 -0.7616975,0.189 -0.9807462,0.4486 2.0269314,2.4089 2.368401,2.7916 5.1354735,6.2214 1.0195329,1.319 2.0816026,0.6373 1.0620696,-0.6817 l -4.25,-5.5 c -0.2289894,-0.3056 -0.5850813,-0.478 -0.9667969,-0.4883 z" id="path4947" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
-        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 1.6220992,1006.0705 c -0.1238933,0.1479 -0.561176,0.8046 -0.02249,1.5562 l 4.25,5.5 c 1.0195329,1.319 1.1498748,-0.6123 1.1498748,-0.6123 0,0 -3.7344514,-4.51 -5.3773848,-6.4439 z" id="path4951" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
-        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.3378905,1005.8443 c -0.438175,0 -0.959862,0.1416 -0.8242183,0.7986 0.103561,0.5016 4.6608262,6.0744 4.6608262,6.0744 1.0195329,1.319 2.4934721,0.6763 1.4739391,-0.6425 l -4.234375,-5.4727 c -0.2602394,-0.29 -0.6085188,-0.7436 -1.076172,-0.7578 z" id="path4925" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccc"/>
-      </g>
-      <g transform="translate(42,0)" id="g4967">
-        <rect style="opacity:1;fill:#aeea00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4144" width="38" height="13" x="-37" y="1010.3622" rx="3" ry="3"/>
-        <rect ry="3" rx="3" y="1013.3622" x="-37" height="10" width="38" id="rect4961" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
-        <rect ry="3" rx="3" y="1010.3622" x="-37" height="10" width="38" id="rect4963" style="opacity:1;fill:#ffffff;fill-opacity:0.29803923;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
-        <rect ry="2.5384617" rx="3" y="1011.3622" x="-37" height="11" width="38" id="rect4965" style="opacity:1;fill:#aeea00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
-      </g>
-      <g id="g4979">
-        <rect style="opacity:1;fill:#1976d2;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4146" width="38" height="26" x="5" y="1024.3622" rx="3" ry="3"/>
-        <rect ry="3" rx="3" y="1037.3622" x="5" height="13" width="38" id="rect4973" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
-        <rect ry="3" rx="3" y="1024.3622" x="5" height="13" width="38" id="rect4975" style="opacity:1;fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
-        <rect ry="2.7692308" rx="3" y="1025.3622" x="5" height="24" width="38" id="rect4977" style="opacity:1;fill:#1976d2;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
-      </g>
-      <g transform="translate(0,1013.3622)" id="g4211">
-        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0d47a1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 24,17.75 c -2.880662,0 -5.319789,1.984685 -6.033203,4.650391 l 3.212891,0 C 21.734004,21.415044 22.774798,20.75 24,20.75 c 1.812692,0 3.25,1.437308 3.25,3.25 0,1.812693 -1.437308,3.25 -3.25,3.25 -1.307381,0 -2.411251,-0.75269 -2.929688,-1.849609 l -3.154296,0 C 18.558263,28.166146 21.04791,30.25 24,30.25 c 3.434013,0 6.25,-2.815987 6.25,-6.25 0,-3.434012 -2.815987,-6.25 -6.25,-6.25 z" id="path4161" inkscape:connector-curvature="0"/>
-        <circle style="opacity:1;fill:none;fill-opacity:0.40392157;stroke:#0d47a1;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4209" cx="24" cy="24" r="9.5500002"/>
-      </g>
-      <g id="g4989" transform="translate(0,0.50001738)">
-        <ellipse cy="1016.4872" cx="14.375" id="circle4985" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" rx="3.375" ry="3.875"/>
-        <circle style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" id="path4859" cx="14.375" cy="1016.9872" r="3.375"/>
-      </g>
-      <g transform="translate(19.5,0.50001738)" id="g4171">
-        <ellipse ry="3.875" rx="3.375" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" id="ellipse4175" cx="14.375" cy="1016.4872"/>
-        <circle r="3.375" cy="1016.9872" cx="14.375" id="circle4177" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117"/>
-      </g>
-    </g>
-    <path inkscape:connector-curvature="0" id="path5128" d="m 2.613462,1005.5987 a 1.250125,1.250125 0 0 0 -1.01172,2.0293 l 3.60351,4.6641 c -0.12699,0.3331 -0.20312,0.6915 -0.20312,1.0703 l 0,4 0,2.8652 0,0.1348 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-4 0,-2.8652 0,-0.1348 c 0,-0.3803 -0.0771,-0.74 -0.20508,-1.0742 l 3.60156,-4.6602 a 1.250125,1.250125 0 0 0 -1.04882,-2.0273 1.250125,1.250125 0 0 0 -0.92969,0.498 l -3.43164,4.4414 c -0.31022,-0.1079 -0.63841,-0.1777 -0.98633,-0.1777 l -32,0 c -0.34857,0 -0.67757,0.069 -0.98828,0.1777 l -3.4336,-4.4414 a 1.250125,1.250125 0 0 0 -0.96679,-0.5 z m 5.38867,18.7637 c -0.20775,0 -0.40983,0.021 -0.60547,0.061 -1.36951,0.2761 -2.39453,1.4698 -2.39453,2.9101 l 0,0.029 0,19.7793 0,0.029 0,0.1914 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-20 0,-0.029 c 0,-1.4403 -1.02502,-2.634 -2.39453,-2.9101 -0.19565,-0.039 -0.39772,-0.061 -0.60547,-0.061 l -32,0 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient5220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
-  </g>
-</svg>

apps/welcome/googleplay.svg

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 511.999 511.999" xml:space="preserve">
-<g>
-	<path style="fill:#32BBFF;" d="M382.369,175.623C322.891,142.356,227.427,88.937,79.355,6.028
-		C69.372-0.565,57.886-1.429,47.962,1.93l254.05,254.05L382.369,175.623z"/>
-	<path style="fill:#32BBFF;" d="M47.962,1.93c-1.86,0.63-3.67,1.39-5.401,2.308C31.602,10.166,23.549,21.573,23.549,36v439.96
-		c0,14.427,8.052,25.834,19.012,31.761c1.728,0.917,3.537,1.68,5.395,2.314L302.012,255.98L47.962,1.93z"/>
-	<path style="fill:#32BBFF;" d="M302.012,255.98L47.956,510.035c9.927,3.384,21.413,2.586,31.399-4.103
-		c143.598-80.41,237.986-133.196,298.152-166.746c1.675-0.941,3.316-1.861,4.938-2.772L302.012,255.98z"/>
-</g>
-<path style="fill:#2C9FD9;" d="M23.549,255.98v219.98c0,14.427,8.052,25.834,19.012,31.761c1.728,0.917,3.537,1.68,5.395,2.314
-	L302.012,255.98H23.549z"/>
-<path style="fill:#29CC5E;" d="M79.355,6.028C67.5-1.8,53.52-1.577,42.561,4.239l255.595,255.596l84.212-84.212
-	C322.891,142.356,227.427,88.937,79.355,6.028z"/>
-<path style="fill:#D93F21;" d="M298.158,252.126L42.561,507.721c10.96,5.815,24.939,6.151,36.794-1.789
-	c143.598-80.41,237.986-133.196,298.152-166.746c1.675-0.941,3.316-1.861,4.938-2.772L298.158,252.126z"/>
-<path style="fill:#FFD500;" d="M488.45,255.98c0-12.19-6.151-24.492-18.342-31.314c0,0-22.799-12.721-92.682-51.809l-83.123,83.123
-	l83.204,83.205c69.116-38.807,92.6-51.892,92.6-51.892C482.299,280.472,488.45,268.17,488.45,255.98z"/>
-<path style="fill:#FFAA00;" d="M470.108,287.294c12.191-6.822,18.342-19.124,18.342-31.314H294.303l83.204,83.205
-	C446.624,300.379,470.108,287.294,470.108,287.294z"/>
-</svg>

apps/welcome/index.html

@@ -66,30 +66,8 @@
 					<a
 						class="w3-button w3-black w3-padding-large"
 						href="https://dev.tildefriends.net/"
-						><i class="fa fa-mug-hot"></i> Development</a
+						><i class="fa fa-mug-hot"></i> Code</a
 					>
-					<p>
-						<a
-							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
-							href="https://f-droid.org/en/packages/com.unprompted.tildefriends.fdroid/"
-							><img src="f-droid.svg" style="height: 2em; margin: 0" /> Get it
-							on F-Droid</a
-						>
-						<a
-							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
-							href="https://dev.tildefriends.net/releases/tildefriends-x86_64.AppImage"
-						>
-							<img src="appimage.svg" style="height: 2em; margin: 0" />
-							Get Linux 64-bit AppImage
-						</a>
-						<a
-							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
-							href="https://play.google.com/store/apps/details?id=com.unprompted.tildefriends"
-						>
-							<img src="googleplay.svg" style="height: 2em; margin: 0" />
-							Get it on Google Play (Open Testing)
-						</a>
-					</p>
 				</div>
 				<div class="w3-col l4 m6">
 					<img src="tildefriends.png" class="w3-image w3-right w3-hide-small" />
@@ -110,31 +88,36 @@
 							<a href="https://dev.tildefriends.net/cory/tildefriends/releases"
 								>Download</a
 							>
-							Tilde Friends or use
+							Tilde Friends and run your own instance, or use
 							<a href="https://www.tildefriends.net/"
 								>https://www.tildefriends.net/</a
 							>.
 						</li>
-						<li>Create an account to identify yourself with that instance.</li>
+						<li>
+							Create an account to identify yourself with that instance by
+							username and password.
+						</li>
+						<li>
+							Create an SSB identity in the <b>ssb</b> app. This will generate a
+							keypair used to identify yourself to other users and sign your
+							messages so that they can be verified as from you.
+						</li>
 						<li>
 							Describe yourself in your profile in the <b>ssb</b> app. Give
 							yourself a name and an avatar if you like.
 						</li>
 						<li>
-							Connect to others.
+							Connect to others. You will automatically discover peers on the
-							<ul>
+							same instance and same network if there are any. Or use
-								<li>Automatically discover peers on the same network.</li>
+							<a href="https://github.com/staltz/ssb-room/blob/master/FAQ.md"
-								<li>
+								>rooms</a
-									Manually connect to rooms and pubs, including
+							>
+							and pubs to reach more distant users.
 							<a href="https://www.tildefriends.net/~cory/room/"
 								>tildefriends.net itself</a
-									>.
+							>
-								</li>
+							operates as a room, so you can connect and see who else is online
-								<li>
+							and establish a connection.
-									Enable <b>Peer Exchange</b> in the <b>admin</b> to discover
-									internet peers.
-								</li>
-							</ul>
 						</li>
 						<li>Follow people to grow your network.</li>
 						<li>
@@ -223,13 +206,8 @@
 
 		<!-- Technlology Section -->
 		<div class="w3-container w3-padding-64 w3-light-grey w3-center">
-			<h1 class="w3-jumbo"><b>Boring Technology</b></h1>
+			<h1 class="w3-jumbo"><b>Trusted Technology</b></h1>
-			<p>
+			<p>Tilde Friends is built using boring, trusted tech.</p>
-				Tilde Friends is built using boring, trusted tech. Unless a better
-				reason presents itself, it strives to use only simple and widely adopted
-				dependencies in order to keep it easy to build for all sorts of
-				platforms and maintainable for a very long time.
-			</p>
 			<p>
 				Though of course for building Tilde Friends apps, you are free to use
 				whatever fits.
@@ -266,7 +244,7 @@
 					<i class="fa fa-lock w3-text-purple w3-jumbo"></i>
 					<p>libsodium</p>
 				</a>
-				<a href="https://github.com/openssl/openssl/releases" class="w3-col s3">
+				<a href="https://www.openssl.org/" class="w3-col s3">
 					<i class="fa fa-shield-halved w3-text-green w3-jumbo"></i>
 					<p>OpenSSL</p>
 				</a>
@@ -292,13 +270,6 @@
 					<i class="fa fa-fire w3-text-cyan w3-jumbo"></i>
 					<p>Lit</p>
 				</a>
-				<a href="https://github.com/c-ares/c-ares" class="w3-col s3">
-					<i class="fa fa-book-atlas w3-text-purple w3-jumbo"></i>
-					<p>c-ares</p>
-				</a>
-			</div>
-
-			<div class="w3-row" style="margin-top: 64px">
 				<a href="https://www.gnu.org/software/make/" class="w3-col s3">
 					<i class="fa fa-hammer w3-text-teal w3-jumbo"></i>
 					<p>GNU Make</p>

core/app.js

@@ -10,7 +10,7 @@ let gSessionIndex = 0;
  * @returns
  */
 function makeSessionId() {
-	return 'session_' + (gSessionIndex++).toString();
+	return (gSessionIndex++).toString();
 }
 
 /**
@@ -172,7 +172,11 @@ async function socket(request, response, client) {
 							0x1
 						);
 					} else {
-						process = await core.getProcessBlob(blobId, sessionId, options);
+						process = await core.getSessionProcessBlob(
+							blobId,
+							sessionId,
+							options
+						);
 					}
 				}
 				if (process) {

core/client.js

@@ -162,7 +162,6 @@ class TfNavigationElement extends LitElement {
 							class="w3-dropdown-content w3-bar-block w3-card-4"
 							style="max-width: 100%; right: 0"
 						>
-							<div style="position: fixed; left: 0; right: 0; top: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.25); z-index: -100" @click=${self.toggle_id_dropdown}></div>
 							<button
 								class="w3-bar-item w3-button w3-border"
 								@click=${() => (window.location.href = '/~core/identity')}
@@ -383,8 +382,8 @@ class TfNavigationElement extends LitElement {
 					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
 					<div class="w3-model w3-animate-top" style="position: absolute; left: 50%; transform: translate(-50%); z-index: 1">
 						<dijv class="w3-modal-content w3-card-4" style="display: block; padding: 1em">
-							<span id="close_error" @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
+							<span @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
-							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p id="error" style="white-space: pre">${this.status.message}</p></div>
+							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p style="white-space: pre">${this.status.message}</p></div>
 						</div>
 					</div>
 					`
@@ -1191,7 +1190,6 @@ function api_requestPermission(permission, id) {
 	check.classList.add('w3-check');
 	check.classList.add('w3-blue');
 	div.appendChild(check);
-	div.appendChild(document.createTextNode(' '));
 	let label = document.createElement('label');
 	label.htmlFor = check.id;
 	label.appendChild(document.createTextNode('Remember this decision.'));
@@ -1784,11 +1782,10 @@ async function sourcePretty() {
 	let prettier = (await import('/prettier/standalone.mjs')).default;
 	let babel = (await import('/prettier/babel.mjs')).default;
 	let estree = (await import('/prettier/estree.mjs')).default;
-	let prettier_html = (await import('/prettier/html.mjs')).default;
 	let source = gEditor.state.doc.toString();
 	let formatted = await prettier.format(source, {
-		parser: gCurrentFile?.toLowerCase()?.endsWith('.html') ? 'html' : 'babel',
+		parser: 'babel',
-		plugins: [babel, estree, prettier_html],
+		plugins: [babel, estree],
 		trailingComma: 'es5',
 		useTabs: true,
 		semi: true,
@@ -1823,8 +1820,8 @@ function toggleVisibleWhitespace() {
 			.cm-highlightTab {
 				background-image: unset !important;
 			}
-			.cm-highlightSpace {
+			.cm-highlightSpace:before {
-				background-image: unset !important;
+				content: unset !important;
 			}
 		`;
 		window.localStorage.setItem('visible_whitespace', '1');

core/core.js

@@ -4,6 +4,77 @@ import * as http from './http.js';
 
 let gProcesses = {};
 let gStatsTimer = false;
+
+const k_content_security_policy =
+	'sandbox allow-downloads allow-top-navigation-by-user-activation';
+
+const k_global_settings = {
+	index: {
+		type: 'string',
+		default_value: '/~core/apps/',
+		description: 'Default path.',
+	},
+	index_map: {
+		type: 'textarea',
+		default_value: undefined,
+		description:
+			'Mappings from hostname to redirect path, one per line, as in: "www.tildefriends.net=/~core/index/"',
+	},
+	room: {
+		type: 'boolean',
+		default_value: true,
+		description: 'Whether this instance should behave as a room.',
+	},
+	room_name: {
+		type: 'string',
+		default_value: 'tilde friends tunnel',
+		description: 'Name of the room.',
+	},
+	code_of_conduct: {
+		type: 'textarea',
+		default_value: undefined,
+		description: 'Code of conduct presented at sign-in.',
+	},
+	http_redirect: {
+		type: 'string',
+		default_value: undefined,
+		description:
+			'If connecting by HTTP and HTTPS is configured, Location header prefix (ie, "https://example.com")',
+	},
+	fetch_hosts: {
+		type: 'string',
+		default_value: undefined,
+		description:
+			'Comma-separated list of host names to which HTTP fetch requests are allowed.  None if empty.',
+	},
+	blob_fetch_age_seconds: {
+		type: 'integer',
+		default_value:
+			platform() == 'android' || platform() == 'iphone'
+				? 0.5 * 365 * 24 * 60 * 60
+				: undefined,
+		description:
+			'Only blobs mentioned more recently than this age will be automatically fetched.',
+	},
+	blob_expire_age_seconds: {
+		type: 'integer',
+		default_value:
+			platform() == 'android' || platform() == 'iphone'
+				? 1.0 * 365 * 24 * 60 * 60
+				: undefined,
+		description: 'Blobs older than this will be automatically deleted.',
+	},
+	seeds_host: {
+		type: 'string',
+		default_value: '',
+		description: 'Hostname for seed connections.',
+	},
+};
+
+let gGlobalSettings = {
+	index: '/~core/apps/',
+};
+
 let kPingInterval = 60 * 1000;
 
 /**
@@ -175,6 +246,23 @@ function postMessageInternal(from, to, message) {
 	}
 }
 
+/**
+ * TODOC
+ * @param {*} blobId
+ * @param {*} session
+ * @param {*} options
+ * @returns
+ */
+async function getSessionProcessBlob(blobId, session, options) {
+	let actualOptions = {timeout: kPingInterval};
+	if (options) {
+		for (let i in options) {
+			actualOptions[i] = options[i];
+		}
+	}
+	return getProcessBlob(blobId, 'session_' + session, actualOptions);
+}
+
 /**
  * TODOC
  * @param {*} blobId
@@ -202,7 +290,7 @@ async function getProcessBlob(blobId, key, options) {
 			}
 			process.lastActive = Date.now();
 			process.lastPing = null;
-			process.timeout = kPingInterval;
+			process.timeout = options.timeout;
 			process.ready = new Promise(function (resolve, reject) {
 				resolveReady = resolve;
 				rejectReady = reject;
@@ -241,59 +329,59 @@ async function getProcessBlob(blobId, key, options) {
 							return [];
 						}
 					},
-					permissionsGranted: async function () {
+					permissionsGranted: function () {
 						let user = process?.credentials?.session?.name;
-						let settings = await loadSettings();
 						if (
 							user &&
 							options?.packageOwner &&
 							options?.packageName &&
-							settings.userPermissions &&
+							gGlobalSettings.userPermissions &&
-							settings.userPermissions[user] &&
+							gGlobalSettings.userPermissions[user] &&
-							settings.userPermissions[user][options.packageOwner]
+							gGlobalSettings.userPermissions[user][options.packageOwner]
 						) {
-							return settings.userPermissions[user][options.packageOwner][
+							return gGlobalSettings.userPermissions[user][
-								options.packageName
+								options.packageOwner
-							];
+							][options.packageName];
 						}
 					},
-					allPermissionsGranted: async function () {
+					allPermissionsGranted: function () {
 						let user = process?.credentials?.session?.name;
-						let settings = await loadSettings();
 						if (
 							user &&
 							options?.packageOwner &&
 							options?.packageName &&
-							settings.userPermissions &&
+							gGlobalSettings.userPermissions &&
-							settings.userPermissions[user]
+							gGlobalSettings.userPermissions[user]
 						) {
-							return settings.userPermissions[user];
+							return gGlobalSettings.userPermissions[user];
 						}
 					},
-					permissionsForUser: async function (user) {
+					permissionsForUser: function (user) {
-						let settings = await loadSettings();
+						return (
-						return settings?.permissions?.[user] ?? [];
+							(gGlobalSettings?.permissions
+								? gGlobalSettings.permissions[user]
+								: []) ?? []
+						);
 					},
 					apps: (user) => getApps(user, process),
 					getSockets: getSockets,
-					permissionTest: async function (permission) {
+					permissionTest: function (permission) {
 						let user = process?.credentials?.session?.name;
-						let settings = await loadSettings();
 						if (!user || !options?.packageOwner || !options?.packageName) {
 							return;
 						} else if (
-							settings.userPermissions &&
+							gGlobalSettings.userPermissions &&
-							settings.userPermissions[user] &&
+							gGlobalSettings.userPermissions[user] &&
-							settings.userPermissions[user][options.packageOwner] &&
+							gGlobalSettings.userPermissions[user][options.packageOwner] &&
-							settings.userPermissions[user][options.packageOwner][
+							gGlobalSettings.userPermissions[user][options.packageOwner][
 								options.packageName
 							] &&
-							settings.userPermissions[user][options.packageOwner][
+							gGlobalSettings.userPermissions[user][options.packageOwner][
 								options.packageName
 							][permission] !== undefined
 						) {
 							if (
-								settings.userPermissions[user][options.packageOwner][
+								gGlobalSettings.userPermissions[user][options.packageOwner][
 									options.packageName
 								][permission]
 							) {
@@ -304,9 +392,9 @@ async function getProcessBlob(blobId, key, options) {
 						} else if (process.app) {
 							return process.app
 								.makeFunction(['requestPermission'])(permission)
-								.then(async function (value) {
+								.then(function (value) {
 									if (value == 'allow') {
-										await ssb.setUserPermission(
+										storePermission(
 											user,
 											options.packageOwner,
 											options.packageName,
@@ -318,7 +406,7 @@ async function getProcessBlob(blobId, key, options) {
 									} else if (value == 'allow once') {
 										return true;
 									} else if (value == 'deny') {
-										await ssb.setUserPermission(
+										storePermission(
 											user,
 											options.packageOwner,
 											options.packageName,
@@ -405,24 +493,22 @@ async function getProcessBlob(blobId, key, options) {
 				}
 			};
 			if (process.credentials?.permissions?.administration) {
-				imports.core.globalSettingsDescriptions = async function () {
+				imports.core.globalSettingsDescriptions = function () {
-					let settings = Object.assign({}, defaultGlobalSettings());
+					let settings = Object.assign({}, k_global_settings);
-					for (let [key, value] of Object.entries(await loadSettings())) {
+					for (let [key, value] of Object.entries(gGlobalSettings)) {
 						if (settings[key]) {
 							settings[key].value = value;
 						}
 					}
 					return settings;
 				};
-				imports.core.globalSettingsGet = async function (key) {
+				imports.core.globalSettingsGet = function (key) {
-					let settings = await loadSettings();
+					return gGlobalSettings[key];
-					return settings?.[key];
 				};
-				imports.core.globalSettingsSet = async function (key, value) {
+				imports.core.globalSettingsSet = function (key, value) {
 					print('Setting', key, value);
-					let settings = await loadSettings();
+					gGlobalSettings[key] = value;
-					settings[key] = value;
+					setGlobalSettings(gGlobalSettings);
-					await new Database('core').set('settings', JSON.stringify(settings));
 					print('Done.');
 				};
 				imports.core.deleteUser = async function (user) {
@@ -589,24 +675,11 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				}
 			};
-			imports.ssb.swapWithServerIdentity = function (id) {
-				if (
-					process.credentials &&
-					process.credentials.session &&
-					process.credentials.session.name
-				) {
-					return ssb.swapWithServerIdentity(
-						process.credentials.session.name,
-						id
-					);
-				}
-			};
 			imports.ssb.addEventListener = undefined;
 			imports.ssb.removeEventListener = undefined;
 			imports.ssb.getIdentityInfo = undefined;
-			imports.fetch = async function (url, options) {
+			imports.fetch = function (url, options) {
-				let settings = await loadSettings();
+				return http.fetch(url, options, gGlobalSettings.fetch_hosts);
-				return http.fetch(url, options, settings?.fetch_hosts);
 			};
 
 			if (
@@ -633,12 +706,12 @@ async function getProcessBlob(blobId, key, options) {
 						Object.keys(db).map((x) => [x, db[x].bind(db)])
 					);
 				};
-				imports.databases = async function () {
+				imports.databases = function () {
 					return [].concat(
-						await databases.list(
+						databases.list(
 							':shared:' + process.credentials.session.name + ':%'
 						),
-						await databases.list(process.credentials.session.name + ':%')
+						databases.list(process.credentials.session.name + ':%')
 					);
 				};
 			}
@@ -657,22 +730,22 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				};
 			}
-			process.sendPermissions = async function sendPermissions() {
+			process.sendPermissions = function sendPermissions() {
 				process.app.send({
 					action: 'permissions',
-					permissions: await imports.core.permissionsGranted(),
+					permissions: imports.core.permissionsGranted(),
 				});
 			};
-			process.resetPermission = async function resetPermission(permission) {
+			process.resetPermission = function resetPermission(permission) {
 				let user = process?.credentials?.session?.name;
-				await ssb.setUserPermission(
+				storePermission(
 					user,
 					options?.packageOwner,
 					options?.packageName,
 					permission,
 					undefined
 				);
-				return process.sendPermissions();
+				process.sendPermissions();
 			};
 			process.task.setImports(imports);
 			process.task.activate();
@@ -705,7 +778,7 @@ async function getProcessBlob(blobId, key, options) {
 			broadcastEvent('onSessionBegin', [getUser(process, process)]);
 			if (process.app) {
 				process.app.send({action: 'ready', version: version()});
-				await process.sendPermissions();
+				process.sendPermissions();
 			}
 			await process.task.execute({name: appSourceName, source: appSource});
 			resolveReady(process);
@@ -729,6 +802,374 @@ async function getProcessBlob(blobId, key, options) {
 	return process;
 }
 
+/**
+ * TODOC
+ * @param {*} settings
+ * @returns
+ */
+async function setGlobalSettings(settings) {
+	gGlobalSettings = settings;
+	try {
+		return await new Database('core').set('settings', JSON.stringify(settings));
+	} catch (error) {
+		print('Error storing settings:', error);
+	}
+}
+
+/**
+ * TODOC
+ * @param {*} response
+ * @param {*} data
+ * @param {*} type
+ * @param {*} headers
+ * @param {*} status_code
+ */
+function sendData(response, data, type, headers, status_code) {
+	if (data) {
+		response.writeHead(
+			status_code ?? 200,
+			Object.assign(
+				{
+					'Content-Type':
+						type ||
+						httpd.mime_type_from_magic_bytes(data) ||
+						'application/binary',
+					'Content-Length': data.byteLength,
+				},
+				headers || {}
+			)
+		);
+		response.end(data);
+	} else {
+		response.writeHead(
+			status_code ?? 404,
+			Object.assign(
+				{
+					'Content-Type': 'text/plain; charset=utf-8',
+					'Content-Length': 'File not found'.length,
+				},
+				headers || {}
+			)
+		);
+		response.end('File not found');
+	}
+}
+
+let g_handler_index = 0;
+
+/**
+ * TODOC
+ * @param {*} response
+ * @param {*} handler_blob_id
+ * @param {*} path
+ * @param {*} query
+ * @param {*} headers
+ * @param {*} packageOwner
+ * @param {*} packageName
+ * @returns
+ */
+async function useAppHandler(
+	response,
+	handler_blob_id,
+	path,
+	query,
+	headers,
+	packageOwner,
+	packageName
+) {
+	print('useAppHandler', packageOwner, packageName);
+	let do_resolve;
+	let promise = new Promise(async function (resolve, reject) {
+		do_resolve = resolve;
+	});
+	let process;
+	let result;
+	try {
+		process = await getProcessBlob(
+			handler_blob_id,
+			'handler_' + g_handler_index++,
+			{
+				script: 'handler.js',
+				imports: {
+					request: {
+						path: path,
+						query: query,
+					},
+					respond: do_resolve,
+				},
+				credentials: await httpd.auth_query(headers),
+				packageOwner: packageOwner,
+				packageName: packageName,
+			}
+		);
+		await process.ready;
+
+		result = await promise;
+	} finally {
+		if (process?.task) {
+			await process.task.kill();
+		}
+	}
+	return result;
+}
+
+/**
+ * TODOC
+ * @param {*} request
+ * @param {*} response
+ * @param {*} blobId
+ * @param {*} uri
+ * @returns
+ */
+async function blobHandler(request, response, blobId, uri) {
+	if (!uri) {
+		response.writeHead(303, {
+			Location:
+				(request.client.tls ? 'https://' : 'http://') +
+				(request.headers['x-forwarded-host'] ?? request.headers.host) +
+				blobId +
+				'/',
+			'Content-Length': '0',
+		});
+		response.end();
+		return;
+	}
+
+	let process;
+	if (uri == '/view') {
+		let data;
+		let match;
+		let query = form.decodeForm(request.query);
+		let headers = {
+			'Content-Security-Policy': k_content_security_policy,
+		};
+		if (query.filename && query.filename.match(/^[A-Za-z0-9\.-]*$/)) {
+			headers['Content-Disposition'] = `attachment; filename=${query.filename}`;
+		}
+		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
+			let id = await new Database(match[1]).get('path:' + match[2]);
+			if (id) {
+				if (request.headers['if-none-match'] === '"' + id + '"') {
+					headers['Content-Length'] = '0';
+					response.writeHead(304, headers);
+					response.end();
+				} else {
+					data = await ssb.blobGet(id);
+					if (match[3]) {
+						let appObject = JSON.parse(data);
+						data = appObject.files[match[3]];
+					}
+					sendData(
+						response,
+						data,
+						undefined,
+						Object.assign({etag: '"' + id + '"'}, headers)
+					);
+				}
+			} else {
+				if (request.headers['if-none-match'] === '"' + blobId + '"') {
+					headers['Content-Length'] = '0';
+					response.writeHead(304, headers);
+					response.end();
+				} else {
+					sendData(
+						response,
+						data,
+						undefined,
+						Object.assign({etag: '"' + blobId + '"'}, headers)
+					);
+				}
+			}
+		} else {
+			if (request.headers['if-none-match'] === '"' + blobId + '"') {
+				headers['Content-Length'] = '0';
+				response.writeHead(304, headers);
+				response.end();
+			} else {
+				data = await ssb.blobGet(blobId);
+				sendData(
+					response,
+					data,
+					undefined,
+					Object.assign({etag: '"' + blobId + '"'}, headers)
+				);
+			}
+		}
+	} else if (uri == '/save') {
+		let match;
+		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
+			let user = match[1];
+			let appName = match[2];
+			let credentials = await httpd.auth_query(request.headers);
+			if (
+				credentials &&
+				credentials.session &&
+				(credentials.session.name == user ||
+					(credentials.permissions.administration && user == 'core'))
+			) {
+				let database = new Database(user);
+
+				let app_object = JSON.parse(utf8Decode(request.body));
+				let previous_id = await database.get('path:' + appName);
+				if (previous_id) {
+					try {
+						let previous_object = JSON.parse(
+							utf8Decode(await ssb.blobGet(previous_id))
+						);
+						delete previous_object.previous;
+						delete app_object.previous;
+						if (JSON.stringify(previous_object) == JSON.stringify(app_object)) {
+							response.writeHead(200, {
+								'Content-Type': 'text/plain; charset=utf-8',
+							});
+							response.end('/' + previous_id);
+							return;
+						}
+					} catch {}
+				}
+				app_object.previous = previous_id;
+				let newBlobId = await ssb.blobStore(JSON.stringify(app_object));
+
+				let apps = new Set();
+				let apps_original = await database.get('apps');
+				try {
+					apps = new Set(JSON.parse(apps_original));
+				} catch {}
+				if (!apps.has(appName)) {
+					apps.add(appName);
+				}
+				apps = JSON.stringify([...apps].sort());
+				if (apps != apps_original) {
+					await database.set('apps', apps);
+				}
+				await database.set('path:' + appName, newBlobId);
+				response.writeHead(200, {'Content-Type': 'text/plain; charset=utf-8'});
+				response.end('/' + newBlobId);
+			} else {
+				response.writeHead(401, {'Content-Type': 'text/plain; charset=utf-8'});
+				response.end('401 Unauthorized');
+				return;
+			}
+		} else if (blobId === '') {
+			let newBlobId = await ssb.blobStore(request.body);
+			response.writeHead(200, {'Content-Type': 'text/plain; charset=utf-8'});
+			response.end('/' + newBlobId);
+		} else {
+			response.writeHead(400, {'Content-Type': 'text/plain; charset=utf-8'});
+			response.end('Invalid name.');
+		}
+	} else if (uri == '/delete') {
+		let match;
+		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
+			let user = match[1];
+			let appName = match[2];
+			let credentials = await httpd.auth_query(request.headers);
+			if (
+				credentials &&
+				credentials.session &&
+				(credentials.session.name == user ||
+					(credentials.permissions.administration && user == 'core'))
+			) {
+				let database = new Database(user);
+				let apps = new Set();
+				try {
+					apps = new Set(JSON.parse(await database.get('apps')));
+				} catch {}
+				if (apps.delete(appName)) {
+					await database.set('apps', JSON.stringify([...apps].sort()));
+				}
+				database.remove('path:' + appName);
+			} else {
+				response.writeHead(401, {'Content-Type': 'text/plain; charset=utf-8'});
+				response.end('401 Unauthorized');
+				return;
+			}
+		}
+
+		response.writeHead(200, {'Content-Type': 'text/plain; charset=utf-8'});
+		response.end('OK');
+	} else {
+		let data;
+		let match;
+		let id;
+		let app_id = blobId;
+		let packageOwner;
+		let packageName;
+		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
+			packageOwner = match[1];
+			packageName = match[2];
+			let db = new Database(match[1]);
+			app_id = await db.get('path:' + match[2]);
+		}
+
+		let app_object = JSON.parse(utf8Decode(await ssb.blobGet(app_id)));
+		id = app_object?.files[uri.substring(1)];
+		if (!id && app_object?.files['handler.js']) {
+			let answer;
+			try {
+				answer = await useAppHandler(
+					response,
+					app_id,
+					uri.substring(1),
+					request.query ? form.decodeForm(request.query) : undefined,
+					request.headers,
+					packageOwner,
+					packageName
+				);
+			} catch (error) {
+				data = utf8Encode(
+					`Internal Server Error\n\n${error?.message}\n${error?.stack}`
+				);
+				response.writeHead(500, {
+					'Content-Type': 'text/plain; charset=utf-8',
+					'Content-Length': data.length,
+				});
+				response.end(data);
+				return;
+			}
+			if (answer && typeof answer.data == 'string') {
+				answer.data = utf8Encode(answer.data);
+			}
+			sendData(
+				response,
+				answer?.data,
+				answer?.content_type,
+				Object.assign(answer?.headers ?? {}, {
+					'Access-Control-Allow-Origin': '*',
+					'Content-Security-Policy': k_content_security_policy,
+				}),
+				answer.status_code
+			);
+		} else if (id) {
+			if (
+				request.headers['if-none-match'] &&
+				request.headers['if-none-match'] == '"' + id + '"'
+			) {
+				let headers = {
+					'Access-Control-Allow-Origin': '*',
+					'Content-Security-Policy': k_content_security_policy,
+					'Content-Length': '0',
+				};
+				response.writeHead(304, headers);
+				response.end();
+			} else {
+				let headers = {
+					ETag: '"' + id + '"',
+					'Access-Control-Allow-Origin': '*',
+					'Content-Security-Policy': k_content_security_policy,
+				};
+				data = await ssb.blobGet(id);
+				let type =
+					httpd.mime_type_from_extension(uri) ||
+					httpd.mime_type_from_magic_bytes(data);
+				sendData(response, data, type, headers);
+			}
+		} else {
+			sendData(response, data, undefined, {});
+		}
+	}
+}
+
 ssb.addEventListener('message', function () {
 	broadcastEvent('onMessage', [...arguments]);
 });
@@ -754,12 +1195,12 @@ async function loadSettings() {
 	} catch (error) {
 		print('Settings not found in database:', error);
 	}
-	for (let [key, value] of Object.entries(defaultGlobalSettings())) {
+	for (let [key, value] of Object.entries(k_global_settings)) {
 		if (data[key] === undefined) {
 			data[key] = value.default_value;
 		}
 	}
-	return data;
+	gGlobalSettings = data;
 }
 
 /**
@@ -780,82 +1221,34 @@ function sendStats() {
 	}
 }
 
-let g_handler_index = 0;
-
-exports.callAppHandler = async function callAppHandler(
-	response,
-	app_blob_id,
-	path,
-	query,
-	headers,
-	package_owner,
-	package_name
-) {
-	let answer;
-	try {
-		let do_resolve;
-		let promise = new Promise(async function (resolve, reject) {
-			do_resolve = resolve;
-		});
-		let process;
-		try {
-			process = await getProcessBlob(
-				app_blob_id,
-				'handler_' + g_handler_index++,
-				{
-					script: 'handler.js',
-					imports: {
-						request: {
-							path: path,
-							query: query,
-						},
-						respond: do_resolve,
-					},
-					credentials: await httpd.auth_query(headers),
-					packageOwner: package_owner,
-					packageName: package_name,
-				}
-			);
-			await process.ready;
-			answer = await promise;
-		} finally {
-			if (process?.task) {
-				await process.task.kill();
-			}
-		}
-	} catch (error) {
-		let data = utf8Encode(
-			`Internal Server Error\n\n${error?.message}\n${error?.stack}`
-		);
-		response.writeHead(500, {
-			'Content-Type': 'text/plain; charset=utf-8',
-			'Content-Length': data.length,
-		});
-		response.end(data);
-		return;
-	}
-	if (typeof answer?.data == 'string') {
-		answer.data = utf8Encode(answer.data);
-	}
-	response.writeHead(answer?.status_code, {
-		'Content-Type': answer?.content_type,
-		'Content-Length': answer?.data?.length,
-		'Access-Control-Allow-Origin': '*',
-		'Content-Security-Policy':
-			'sandbox allow-downloads allow-top-navigation-by-user-activation',
-	});
-	response.end(answer?.data);
-};
-
 /**
  * TODOC
  */
 loadSettings()
-	.then(function (settings) {
+	.then(function () {
-		if (tildefriends.https_port && settings.http_redirect) {
+		if (tildefriends.https_port && gGlobalSettings.http_redirect) {
-			httpd.set_http_redirect(settings.http_redirect);
+			httpd.set_http_redirect(gGlobalSettings.http_redirect);
 		}
 		httpd.all('/app/socket', app.socket);
+		httpd.all('', function default_http_handler(request, response) {
+			let match;
+			if ((match = /^(\/~[^\/]+\/[^\/]+)(\/?.*)$/.exec(request.uri))) {
+				return blobHandler(request, response, match[1], match[2]);
+			} else if (
+				(match = /^\/([&\%][^\.]{44}(?:\.\w+)?)(\/?.*)/.exec(request.uri))
+			) {
+				return blobHandler(request, response, match[1], match[2]);
+			} else if ((match = /^(.*)(\/(?:save|delete)?)$/.exec(request.uri))) {
+				return blobHandler(request, response, match[1], match[2]);
+			} else {
+				let data = 'File not found.';
+				response.writeHead(404, {
+					'Content-Type': 'text/plain; charset=utf-8',
+					'Content-Length': data.length.toString(),
+				});
+				return response.end(data);
+			}
+		});
 		let port = httpd.start(tildefriends.http_port);
 		if (tildefriends.args.out_http_port_file) {
 			print('Writing the port file.');
@@ -902,4 +1295,48 @@ loadSettings()
 		exit(1);
 	});
 
-export {invoke, getProcessBlob};
+/**
+ * TODOC
+ * @param {*} user
+ * @param {*} packageOwner
+ * @param {*} packageName
+ * @param {*} permission
+ * @param {*} allow
+ */
+function storePermission(user, packageOwner, packageName, permission, allow) {
+	if (!gGlobalSettings.userPermissions) {
+		gGlobalSettings.userPermissions = {};
+	}
+	if (!gGlobalSettings.userPermissions[user]) {
+		gGlobalSettings.userPermissions[user] = {};
+	}
+	if (!gGlobalSettings.userPermissions[user][packageOwner]) {
+		gGlobalSettings.userPermissions[user][packageOwner] = {};
+	}
+	if (!gGlobalSettings.userPermissions[user][packageOwner][packageName]) {
+		gGlobalSettings.userPermissions[user][packageOwner][packageName] = {};
+	}
+	if (
+		gGlobalSettings.userPermissions[user][packageOwner][packageName][
+			permission
+		] !== allow
+	) {
+		if (allow === undefined) {
+			delete gGlobalSettings.userPermissions[user][packageOwner][packageName][
+				permission
+			];
+		} else {
+			gGlobalSettings.userPermissions[user][packageOwner][packageName][
+				permission
+			] = allow;
+		}
+		setGlobalSettings(gGlobalSettings);
+	}
+}
+
+export {
+	gGlobalSettings as globalSettings,
+	setGlobalSettings,
+	invoke,
+	getSessionProcessBlob,
+};

default.nix

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

deps/c-ares

@@ -1 +1 @@
-Subproject commit a57ff692eeab8d21c853dc1ddaf0164f517074c3
+Subproject commit caffa5ffb3826cf0926405793361bbad11db3268

deps/c-ares_config/ares_build.h

@@ -39,9 +39,6 @@
 #define GETSERVBYPORT_R_ARGS 6
 #define HAVE_GETSERVBYNAME_R 1
 #define HAVE_GETSERVBYPORT_R 1
-#endif
-
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
 #define HAVE_PIPE2 1
 #endif
 
@@ -50,11 +47,13 @@
 #define GETSERVBYPORT_R_ARGS 4
 #endif
 
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__)
 #define HAVE_MALLOC_H 1
+#if !defined(__HAIKU__)
+#define HAVE_SYS_RANDOM_H 1
 #define HAVE_EPOLL 1
 #define HAVE_SYS_EPOLL_H 1
-#define HAVE_SYS_RANDOM_H 1
+#endif
 #endif
 
 #if !defined(__WIN32)
@@ -139,10 +138,8 @@
 #define HAVE_IFADDRS_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_WRITEV 1
-#if defined(__ANDROID__) || defined(__APPLE__) || defined(__OpenBSD__)
+#if !defined(__HAIKU__)
 #define HAVE_ARC4RANDOM_BUF 1
-#else
-#undef HAVE_ARC4RANDOM_BUF
 #endif
 #define HAVE_GETIFADDRS 1
 #define HAVE_STAT 1

deps/codemirror_src/package-lock.json

@@ -19,10 +19,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.2",
+      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.2.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz",
-      "integrity": "sha512-wJGylKtMFR/Ds6Gh01+OovXE/pncPiKZNNBKuC39pKnH+XK5d9+WsNqcrdxPjFPFTigRBqse0rfxw9UxrfyhPg==",
+      "integrity": "sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -37,10 +36,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.7.1",
+      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
-      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
+      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
@@ -49,23 +47,21 @@
       }
     },
     "node_modules/@codemirror/lang-css": {
-      "version": "6.3.0",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz",
-      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
+      "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
         "@lezer/common": "^1.0.2",
-        "@lezer/css": "^1.1.7"
+        "@lezer/css": "^1.0.0"
       }
     },
     "node_modules/@codemirror/lang-html": {
       "version": "6.4.9",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
       "integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/lang-css": "^6.0.0",
@@ -82,7 +78,6 @@
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
       "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.6.0",
@@ -97,17 +92,15 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz",
       "integrity": "sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@lezer/json": "^1.0.0"
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.3",
+      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
-      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
+      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -118,10 +111,9 @@
       }
     },
     "node_modules/@codemirror/lint": {
-      "version": "6.8.2",
+      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
-      "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==",
+      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -129,10 +121,9 @@
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.7",
+      "version": "6.5.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.7.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
-      "integrity": "sha512-6+iLsXvITWKHYlkgHPCs/qiX4dNzn8N78YfhOFvPtPYCkuXqZq10rAfsUMhOq7O/1VjJqdXRflyExlfVcu/9VQ==",
+      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -142,14 +133,12 @@
     "node_modules/@codemirror/state": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
-      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
-      "license": "MIT"
     },
     "node_modules/@codemirror/theme-one-dark": {
       "version": "6.1.2",
       "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
       "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -158,10 +147,9 @@
       }
     },
     "node_modules/@codemirror/view": {
-      "version": "6.34.2",
+      "version": "6.30.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.2.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.30.0.tgz",
-      "integrity": "sha512-d6n0WFvL970A9Z+l9N2dO+Hk9ev4hDYQzIx+B9tCyBP0W5wPEszi1rhuyFesNSkLZzXbQE5FPH7F/z/TMJfoPA==",
+      "integrity": "sha512-96Nmn8OeLh6aONQprIeYk8hGVnEuYpWuxKSkdsODOx9hWPxyuyZGvmvxV/JmLsp+CubMO1PsLaN5TNNgrl0UrQ==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -173,7 +161,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
       "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -188,7 +175,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -198,7 +184,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -208,7 +193,6 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25"
@@ -218,31 +202,27 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "dev": true,
+      "dev": true
-      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@lezer/common": {
-      "version": "1.2.3",
+      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ=="
-      "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.9",
+      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz",
-      "integrity": "sha512-TYwgljcDv+YrV0MZFFvYFQHCfGgbPMR6nuqLabBdmZoFH3EP1gvw8t0vae326Ne3PszQkbXfVBjCnf3ZVCr0bA==",
+      "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==",
-      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -250,10 +230,9 @@
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.2.1",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.0.tgz",
-      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "integrity": "sha512-WrS5Mw51sGrpqjlh3d4/fOwpEV2Hd3YOkp9DBt4k8XZQcoTHZFB7sx030A6OcahF4J1nDQAa3jXlTVVYH50IFA==",
-      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
@@ -262,7 +241,6 @@
       "version": "1.3.10",
       "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
       "integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
-      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -270,10 +248,9 @@
       }
     },
     "node_modules/@lezer/javascript": {
-      "version": "1.4.19",
+      "version": "1.4.17",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.19.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
-      "integrity": "sha512-j44kbR1QL26l6dMunZ1uhKBFteVGLVCBGNUD2sUaMnic+rbTviVuoK0CD1l9FTW31EueWvFFswCKMH7Z+M3JRA==",
+      "integrity": "sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==",
-      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.1.3",
@@ -284,7 +261,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@lezer/json/-/json-1.0.2.tgz",
       "integrity": "sha512-xHT2P4S5eeCYECyKNPhr4cbEL9tc8w83SPwRC373o9uEdrvGKTZoJVAGxpOsZckMlEh9W23Pc72ew918RWQOBQ==",
-      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
         "@lezer/highlight": "^1.0.0",
@@ -295,20 +271,19 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
       "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
-      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.3.0",
+      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
-      "integrity": "sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==",
+      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
         "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.2.1",
         "is-module": "^1.0.0",
         "resolve": "^1.22.1"
       },
@@ -329,7 +304,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
       "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "serialize-javascript": "^6.0.1",
         "smob": "^1.0.0",
@@ -348,14 +322,13 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.1.3",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
-      "integrity": "sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==",
+      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
-        "picomatch": "^4.0.2"
+        "picomatch": "^2.3.1"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -370,257 +343,212 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.20.0.tgz",
-      "integrity": "sha512-jfUJrFct/hTA0XDM5p/htWKoNNTbDLY0KRwEt6pyOA6k2fmk0WVwl65PdUdJZgzGEHWx+49LilkcSaumQRyNQw==",
+      "integrity": "sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.20.0.tgz",
-      "integrity": "sha512-j4nrEO6nHU1nZUuCfRKoCcvh7PIywQPUCBa2UsootTHvTHIoIu2BzueInGJhhvQO/2FTRdNYpf63xsgEqH9IhA==",
+      "integrity": "sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.20.0.tgz",
-      "integrity": "sha512-GmU/QgGtBTeraKyldC7cDVVvAJEOr3dFLKneez/n7BvX57UdhOqDsVwzU7UOnYA7AAOt+Xb26lk79PldDHgMIQ==",
+      "integrity": "sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.20.0.tgz",
-      "integrity": "sha512-N6oDBiZCBKlwYcsEPXGDE4g9RoxZLK6vT98M8111cW7VsVJFpNEqvJeIPfsCzbf0XEakPslh72X0gnlMi4Ddgg==",
+      "integrity": "sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.4.tgz",
-      "integrity": "sha512-py5oNShCCjCyjWXCZNrRGRpjWsF0ic8f4ieBNra5buQz0O/U6mMXCpC1LvrHuhJsNPgRt36tSYMidGzZiJF6mw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.4.tgz",
-      "integrity": "sha512-L7VVVW9FCnTTp4i7KrmHeDsDvjB4++KOBENYtNYAiYl96jeBThFfhP6HVxL74v4SiZEVDH/1ILscR5U9S4ms4g==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.20.0.tgz",
-      "integrity": "sha512-10ICosOwYChROdQoQo589N5idQIisxjaFE/PAnX2i0Zr84mY0k9zul1ArH0rnJ/fpgiqfu13TFZR5A5YJLOYZA==",
+      "integrity": "sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.20.0.tgz",
-      "integrity": "sha512-ySAfWs69LYC7QhRDZNKqNhz2UKN8LDfbKSMAEtoEI0jitwfAG2iZwVqGACJT+kfYvvz3/JgsLlcBP+WWoKCLcw==",
+      "integrity": "sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.20.0.tgz",
-      "integrity": "sha512-uHYJ0HNOI6pGEeZ/5mgm5arNVTI0nLlmrbdph+pGXpC9tFHFDQmDMOEqkmUObRfosJqpU8RliYoGz06qSdtcjg==",
+      "integrity": "sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.20.0.tgz",
-      "integrity": "sha512-38yiWLemQf7aLHDgTg85fh3hW9stJ0Muk7+s6tIkSUOMmi4Xbv5pH/5Bofnsb6spIwD5FJiR+jg71f0CH5OzoA==",
+      "integrity": "sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.20.0.tgz",
-      "integrity": "sha512-q73XUPnkwt9ZNF2xRS4fvneSuaHw2BXuV5rI4cw0fWYVIWIBeDZX7c7FWhFQPNTnE24172K30I+dViWRVD9TwA==",
+      "integrity": "sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==",
       "cpu": [
         "ppc64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.20.0.tgz",
-      "integrity": "sha512-Aie/TbmQi6UXokJqDZdmTJuZBCU3QBDA8oTKRGtd4ABi/nHgXICulfg1KI6n9/koDsiDbvHAiQO3YAUNa/7BCw==",
+      "integrity": "sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==",
       "cpu": [
         "riscv64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.20.0.tgz",
-      "integrity": "sha512-P8MPErVO/y8ohWSP9JY7lLQ8+YMHfTI4bAdtCi3pC2hTeqFJco2jYspzOzTUB8hwUWIIu1xwOrJE11nP+0JFAQ==",
+      "integrity": "sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==",
       "cpu": [
         "s390x"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.20.0.tgz",
-      "integrity": "sha512-K03TljaaoPK5FOyNMZAAEmhlyO49LaE4qCsr0lYHUKyb6QacTNF9pnfPpXnFlFD3TXuFbFbz7tJ51FujUXkXYA==",
+      "integrity": "sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.20.0.tgz",
-      "integrity": "sha512-VJYl4xSl/wqG2D5xTYncVWW+26ICV4wubwN9Gs5NrqhJtayikwCXzPL8GDsLnaLU3WwhQ8W02IinYSFJfyo34Q==",
+      "integrity": "sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.20.0.tgz",
-      "integrity": "sha512-ku2GvtPwQfCqoPFIJCqZ8o7bJcj+Y54cZSr43hHca6jLwAiCbZdBUOrqE6y29QFajNAzzpIOwsckaTFmN6/8TA==",
+      "integrity": "sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.20.0.tgz",
-      "integrity": "sha512-V3nCe+eTt/W6UYNr/wGvO1fLpHUrnlirlypZfKCT1fG6hWfqhPgQV/K/mRBXBpxc0eKLIF18pIOFVPh0mqHjlg==",
+      "integrity": "sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==",
       "cpu": [
         "ia32"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.20.0.tgz",
-      "integrity": "sha512-LTw1Dfd0mBIEqUVCxbvTE/LLo+9ZxVC9k99v1v4ahg9Aak6FpqOfNu5kRkeTAn0wphoC4JU7No1/rL+bBCEwhg==",
+      "integrity": "sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
+      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
-      "license": "MIT"
     },
     "node_modules/@types/resolve": {
       "version": "1.20.2",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
-      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q=="
-      "license": "MIT"
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
+      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -632,14 +560,23 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
+      "dev": true
-      "license": "MIT"
+    },
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/codemirror": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/commands": "^6.0.0",
@@ -654,20 +591,17 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
+      "dev": true
-      "license": "MIT"
     },
     "node_modules/crelt": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
-      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -675,15 +609,13 @@
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-      "license": "MIT"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "hasInstallScript": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -696,7 +628,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -705,7 +636,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -713,11 +643,24 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
+      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
-      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -731,22 +674,19 @@
     "node_modules/is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
-      "license": "MIT"
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-      "license": "MIT"
     },
     "node_modules/picomatch": {
-      "version": "4.0.2",
+      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8.6"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -757,7 +697,6 @@
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -766,7 +705,6 @@
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
       "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -780,12 +718,11 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.24.4",
+      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.4.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz",
-      "integrity": "sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==",
+      "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==",
-      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.5"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -795,24 +732,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.24.4",
+        "@rollup/rollup-android-arm-eabi": "4.20.0",
-        "@rollup/rollup-android-arm64": "4.24.4",
+        "@rollup/rollup-android-arm64": "4.20.0",
-        "@rollup/rollup-darwin-arm64": "4.24.4",
+        "@rollup/rollup-darwin-arm64": "4.20.0",
-        "@rollup/rollup-darwin-x64": "4.24.4",
+        "@rollup/rollup-darwin-x64": "4.20.0",
-        "@rollup/rollup-freebsd-arm64": "4.24.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.20.0",
-        "@rollup/rollup-freebsd-x64": "4.24.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.20.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.24.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.20.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.24.4",
+        "@rollup/rollup-linux-arm64-musl": "4.20.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.24.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0",
-        "@rollup/rollup-linux-arm64-musl": "4.24.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.20.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.20.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.24.4",
+        "@rollup/rollup-linux-x64-gnu": "4.20.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.24.4",
+        "@rollup/rollup-linux-x64-musl": "4.20.0",
-        "@rollup/rollup-linux-x64-gnu": "4.24.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.20.0",
-        "@rollup/rollup-linux-x64-musl": "4.24.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.20.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.24.4",
+        "@rollup/rollup-win32-x64-msvc": "4.20.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.24.4",
-        "@rollup/rollup-win32-x64-msvc": "4.24.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -834,15 +769,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
+      ]
-      "license": "MIT"
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -851,15 +784,13 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
       "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
-      "dev": true,
+      "dev": true
-      "license": "MIT"
     },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -869,7 +800,6 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -878,14 +808,12 @@
     "node_modules/style-mod": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw=="
-      "license": "MIT"
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -894,11 +822,10 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.36.0",
+      "version": "5.31.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz",
-      "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
+      "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -915,8 +842,7 @@
     "node_modules/w3c-keyname": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+      "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
-      "license": "MIT"
     }
   }
 }

deps/libbacktrace

@@ -1 +1 @@
-Subproject commit d48f84034ce3e53e501d10593710d025cb1121db
+Subproject commit 86885d14049fab06ef8a33aac51664230ca09200

deps/libuv

@@ -1 +1 @@
-Subproject commit e1095c7a4373ce00cd8874d8e820de5afb25776e
+Subproject commit e9f29cb984231524e3931aa0ae2c5dae1a32884e

deps/openssl_src

@@ -1 +1 @@
-Subproject commit 98acb6b02839c609ef5b837794e08d906d965335
+Subproject commit db2ac4f6ebd8f3d7b2a60882992fbea1269114e2

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.47.0"
+#define SQLITE_VERSION        "3.46.0"
-#define SQLITE_VERSION_NUMBER 3047000
+#define SQLITE_VERSION_NUMBER 3046000
-#define SQLITE_SOURCE_ID      "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"
+#define SQLITE_SOURCE_ID      "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -772,8 +772,8 @@ struct sqlite3_file {
 ** to xUnlock() is a no-op.
 ** The xCheckReservedLock() method checks whether any database connection,
 ** either in this process or in some other process, is holding a RESERVED,
-** PENDING, or EXCLUSIVE lock on the file.  It returns, via its output
+** PENDING, or EXCLUSIVE lock on the file.  It returns true
-** pointer parameter, true if such a lock exists and false otherwise.
+** if such a lock exists and false otherwise.
 **
 ** The xFileControl() method is a generic interface that allows custom
 ** VFS implementations to directly control an open file using the
@@ -3570,8 +3570,8 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **
 ** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
 ** <dd>The database connection comes up in "extended result code mode".
-** In other words, the database behaves as if
+** In other words, the database behaves has if
-** [sqlite3_extended_result_codes(db,1)] were called on the database
+** [sqlite3_extended_result_codes(db,1)] where called on the database
 ** connection as soon as the connection is created. In addition to setting
 ** the extended result code mode, this flag also causes [sqlite3_open_v2()]
 ** to return an extended result code.</dd>
@@ -4222,17 +4222,13 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 ** and sqlite3_prepare16_v3() use UTF-16.
 **
 ** ^If the nByte argument is negative, then zSql is read up to the
-** first zero terminator. ^If nByte is positive, then it is the maximum
+** first zero terminator. ^If nByte is positive, then it is the
-** number of bytes read from zSql.  When nByte is positive, zSql is read
+** number of bytes read from zSql.  ^If nByte is zero, then no prepared
-** up to the first zero terminator or until the nByte bytes have been read,
-** whichever comes first.  ^If nByte is zero, then no prepared
 ** statement is generated.
 ** If the caller knows that the supplied string is nul-terminated, then
 ** there is a small performance advantage to passing an nByte parameter that
 ** is the number of bytes in the input string <i>including</i>
 ** the nul-terminator.
-** Note that nByte measure the length of the input in bytes, not
-** characters, even for the UTF-16 interfaces.
 **
 ** ^If pzTail is not NULL then *pzTail is made to point to the first byte
 ** past the end of the first SQL statement in zSql.  These routines only
@@ -5603,7 +5599,7 @@ SQLITE_API int sqlite3_create_window_function(
 ** This flag instructs SQLite to omit some corner-case optimizations that
 ** might disrupt the operation of the [sqlite3_value_subtype()] function,
 ** causing it to return zero rather than the correct subtype().
-** All SQL functions that invoke [sqlite3_value_subtype()] should have this
+** SQL functions that invokes [sqlite3_value_subtype()] should have this
 ** property.  If the SQLITE_SUBTYPE property is omitted, then the return
 ** value from [sqlite3_value_subtype()] might sometimes be zero even though
 ** a non-zero subtype was specified by the function argument expression.
@@ -5619,15 +5615,6 @@ SQLITE_API int sqlite3_create_window_function(
 ** [sqlite3_result_subtype()] should avoid setting this property, as the
 ** purpose of this property is to disable certain optimizations that are
 ** incompatible with subtypes.
-**
-** [[SQLITE_SELFORDER1]] <dt>SQLITE_SELFORDER1</dt><dd>
-** The SQLITE_SELFORDER1 flag indicates that the function is an aggregate
-** that internally orders the values provided to the first argument.  The
-** ordered-set aggregate SQL notation with a single ORDER BY term can be
-** used to invoke this function.  If the ordered-set aggregate notation is
-** used on a function that lacks this flag, then an error is raised. Note
-** that the ordered-set aggregate syntax is only available if SQLite is
-** built using the -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES compile-time option.
 ** </dd>
 ** </dl>
 */
@@ -5636,7 +5623,6 @@ SQLITE_API int sqlite3_create_window_function(
 #define SQLITE_SUBTYPE          0x000100000
 #define SQLITE_INNOCUOUS        0x000200000
 #define SQLITE_RESULT_SUBTYPE   0x001000000
-#define SQLITE_SELFORDER1       0x002000000
 
 /*
 ** CAPI3REF: Deprecated Functions
@@ -5834,7 +5820,7 @@ SQLITE_API int sqlite3_value_encoding(sqlite3_value*);
 ** one SQL function to another.  Use the [sqlite3_result_subtype()]
 ** routine to set the subtype for the return value of an SQL function.
 **
-** Every [application-defined SQL function] that invokes this interface
+** Every [application-defined SQL function] that invoke this interface
 ** should include the [SQLITE_SUBTYPE] property in the text
 ** encoding argument when the function is [sqlite3_create_function|registered].
 ** If the [SQLITE_SUBTYPE] property is omitted, then sqlite3_value_subtype()
@@ -7441,11 +7427,9 @@ struct sqlite3_module {
 ** will be returned by the strategy.
 **
 ** The xBestIndex method may optionally populate the idxFlags field with a
-** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
+** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
-** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
+** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
-** output to show the idxNum has hex instead of as decimal.  Another flag is
+** assumes that the strategy may visit at most one row.
-** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
-** return at most one row.
 **
 ** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
 ** SQLite also assumes that if a call to the xUpdate() method is made as
@@ -7509,9 +7493,7 @@ struct sqlite3_index_info {
 ** [sqlite3_index_info].idxFlags field to some combination of
 ** these bits.
 */
-#define SQLITE_INDEX_SCAN_UNIQUE 0x00000001 /* Scan visits at most 1 row */
+#define SQLITE_INDEX_SCAN_UNIQUE      1     /* Scan visits at most 1 row */
-#define SQLITE_INDEX_SCAN_HEX    0x00000002 /* Display idxNum as hex */
-                                            /* in EXPLAIN QUERY PLAN */
 
 /*
 ** CAPI3REF: Virtual Table Constraint Operator Codes
@@ -8348,7 +8330,6 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_JSON_SELFCHECK          14
 #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
 #define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
-#define SQLITE_TESTCTRL_GETOPT                  16
 #define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
 #define SQLITE_TESTCTRL_INTERNAL_FUNCTIONS      17
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
@@ -8368,7 +8349,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_TRACEFLAGS              31
 #define SQLITE_TESTCTRL_TUNE                    32
 #define SQLITE_TESTCTRL_LOGEST                  33
-#define SQLITE_TESTCTRL_USELONGDOUBLE           34  /* NOT USED */
+#define SQLITE_TESTCTRL_USELONGDOUBLE           34
 #define SQLITE_TESTCTRL_LAST                    34  /* Largest TESTCTRL */
 
 /*
@@ -9344,16 +9325,6 @@ typedef struct sqlite3_backup sqlite3_backup;
 ** APIs are not strictly speaking threadsafe. If they are invoked at the
 ** same time as another thread is invoking sqlite3_backup_step() it is
 ** possible that they return invalid values.
-**
-** <b>Alternatives To Using The Backup API</b>
-**
-** Other techniques for safely creating a consistent backup of an SQLite
-** database include:
-**
-** <ul>
-** <li> The [VACUUM INTO] command.
-** <li> The [sqlite3_rsync] utility program.
-** </ul>
 */
 SQLITE_API sqlite3_backup *sqlite3_backup_init(
   sqlite3 *pDest,                        /* Destination database handle */
@@ -10553,14 +10524,6 @@ typedef struct sqlite3_snapshot {
 ** If there is not already a read-transaction open on schema S when
 ** this function is called, one is opened automatically.
 **
-** If a read-transaction is opened by this function, then it is guaranteed
-** that the returned snapshot object may not be invalidated by a database
-** writer or checkpointer until after the read-transaction is closed. This
-** is not guaranteed if a read-transaction is already open when this
-** function is called. In that case, any subsequent write or checkpoint
-** operation on the database may invalidate the returned snapshot handle,
-** even while the read-transaction remains open.
-**
 ** The following must be true for this function to succeed. If any of
 ** the following statements are false when sqlite3_snapshot_get() is
 ** called, SQLITE_ERROR is returned. The final value of *P is undefined
@@ -10869,6 +10832,8 @@ SQLITE_API int sqlite3_deserialize(
 #if defined(__wasi__)
 # undef SQLITE_WASI
 # define SQLITE_WASI 1
+# undef SQLITE_OMIT_WAL
+# define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */
 # ifndef SQLITE_OMIT_LOAD_EXTENSION
 #  define SQLITE_OMIT_LOAD_EXTENSION
 # endif
@@ -13071,10 +13036,6 @@ struct Fts5PhraseIter {
 **   (i.e. if it is a contentless table), then this API always iterates
 **   through an empty set (all calls to xPhraseFirst() set iCol to -1).
 **
-**   In all cases, matches are visited in (column ASC, offset ASC) order.
-**   i.e. all those in column 0, sorted by offset, followed by those in
-**   column 1, etc.
-**
 ** xPhraseNext()
 **   See xPhraseFirst above.
 **
@@ -13141,32 +13102,9 @@ struct Fts5PhraseIter {
 **
 **   This API can be quite slow if used with an FTS5 table created with the
 **   "detail=none" or "detail=column" option.
-**
-** xColumnLocale(pFts5, iIdx, pzLocale, pnLocale)
-**   If parameter iCol is less than zero, or greater than or equal to the
-**   number of columns in the table, SQLITE_RANGE is returned.
-**
-**   Otherwise, this function attempts to retrieve the locale associated
-**   with column iCol of the current row. Usually, there is no associated
-**   locale, and output parameters (*pzLocale) and (*pnLocale) are set
-**   to NULL and 0, respectively. However, if the fts5_locale() function
-**   was used to associate a locale with the value when it was inserted
-**   into the fts5 table, then (*pzLocale) is set to point to a nul-terminated
-**   buffer containing the name of the locale in utf-8 encoding. (*pnLocale)
-**   is set to the size in bytes of the buffer, not including the
-**   nul-terminator.
-**
-**   If successful, SQLITE_OK is returned. Or, if an error occurs, an
-**   SQLite error code is returned. The final value of the output parameters
-**   is undefined in this case.
-**
-** xTokenize_v2:
-**   Tokenize text using the tokenizer belonging to the FTS5 table. This
-**   API is the same as the xTokenize() API, except that it allows a tokenizer
-**   locale to be specified.
 */
 struct Fts5ExtensionApi {
-  int iVersion;                   /* Currently always set to 4 */
+  int iVersion;                   /* Currently always set to 3 */
 
   void *(*xUserData)(Fts5Context*);
 
@@ -13208,15 +13146,6 @@ struct Fts5ExtensionApi {
       const char **ppToken, int *pnToken
   );
   int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
-
-  /* Below this point are iVersion>=4 only */
-  int (*xColumnLocale)(Fts5Context*, int iCol, const char **pz, int *pn);
-  int (*xTokenize_v2)(Fts5Context*,
-    const char *pText, int nText,      /* Text to tokenize */
-    const char *pLocale, int nLocale,  /* Locale to pass to tokenizer */
-    void *pCtx,                        /* Context passed to xToken() */
-    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
-  );
 };
 
 /*
@@ -13237,7 +13166,7 @@ struct Fts5ExtensionApi {
 **   A tokenizer instance is required to actually tokenize text.
 **
 **   The first argument passed to this function is a copy of the (void*)
-**   pointer provided by the application when the fts5_tokenizer_v2 object
+**   pointer provided by the application when the fts5_tokenizer object
 **   was registered with FTS5 (the third argument to xCreateTokenizer()).
 **   The second and third arguments are an array of nul-terminated strings
 **   containing the tokenizer arguments, if any, specified following the
@@ -13261,7 +13190,7 @@ struct Fts5ExtensionApi {
 **   argument passed to this function is a pointer to an Fts5Tokenizer object
 **   returned by an earlier call to xCreate().
 **
-**   The third argument indicates the reason that FTS5 is requesting
+**   The second argument indicates the reason that FTS5 is requesting
 **   tokenization of the supplied text. This is always one of the following
 **   four values:
 **
@@ -13285,13 +13214,6 @@ struct Fts5ExtensionApi {
 **            on a columnsize=0 database.
 **   </ul>
 **
-**   The sixth and seventh arguments passed to xTokenize() - pLocale and
-**   nLocale - are a pointer to a buffer containing the locale to use for
-**   tokenization (e.g. "en_US") and its size in bytes, respectively. The
-**   pLocale buffer is not nul-terminated. pLocale may be passed NULL (in
-**   which case nLocale is always 0) to indicate that the tokenizer should
-**   use its default locale.
-**
 **   For each token in the input string, the supplied callback xToken() must
 **   be invoked. The first argument to it should be a copy of the pointer
 **   passed as the second argument to xTokenize(). The third and fourth
@@ -13315,30 +13237,6 @@ struct Fts5ExtensionApi {
 **   may abandon the tokenization and return any error code other than
 **   SQLITE_OK or SQLITE_DONE.
 **
-**   If the tokenizer is registered using an fts5_tokenizer_v2 object,
-**   then the xTokenize() method has two additional arguments - pLocale
-**   and nLocale. These specify the locale that the tokenizer should use
-**   for the current request. If pLocale and nLocale are both 0, then the
-**   tokenizer should use its default locale. Otherwise, pLocale points to
-**   an nLocale byte buffer containing the name of the locale to use as utf-8
-**   text. pLocale is not nul-terminated.
-**
-** FTS5_TOKENIZER
-**
-** There is also an fts5_tokenizer object. This is an older, deprecated,
-** version of fts5_tokenizer_v2. It is similar except that:
-**
-**  <ul>
-**    <li> There is no "iVersion" field, and
-**    <li> The xTokenize() method does not take a locale argument.
-**  </ul>
-**
-** Legacy fts5_tokenizer tokenizers must be registered using the
-** legacy xCreateTokenizer() function, instead of xCreateTokenizer_v2().
-**
-** Tokenizer implementations registered using either API may be retrieved
-** using both xFindTokenizer() and xFindTokenizer_v2().
-**
 ** SYNONYM SUPPORT
 **
 **   Custom tokenizers may also support synonyms. Consider a case in which a
@@ -13447,33 +13345,6 @@ struct Fts5ExtensionApi {
 **   inefficient.
 */
 typedef struct Fts5Tokenizer Fts5Tokenizer;
-typedef struct fts5_tokenizer_v2 fts5_tokenizer_v2;
-struct fts5_tokenizer_v2 {
-  int iVersion;             /* Currently always 2 */
-
-  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
-  void (*xDelete)(Fts5Tokenizer*);
-  int (*xTokenize)(Fts5Tokenizer*,
-      void *pCtx,
-      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
-      const char *pText, int nText,
-      const char *pLocale, int nLocale,
-      int (*xToken)(
-        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
-        int tflags,         /* Mask of FTS5_TOKEN_* flags */
-        const char *pToken, /* Pointer to buffer containing token */
-        int nToken,         /* Size of token in bytes */
-        int iStart,         /* Byte offset of token within input text */
-        int iEnd            /* Byte offset of end of token within input text */
-      )
-  );
-};
-
-/*
-** New code should use the fts5_tokenizer_v2 type to define tokenizer
-** implementations. The following type is included for legacy applications
-** that still use it.
-*/
 typedef struct fts5_tokenizer fts5_tokenizer;
 struct fts5_tokenizer {
   int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
@@ -13493,7 +13364,6 @@ struct fts5_tokenizer {
   );
 };
 
-
 /* Flags that may be passed as the third argument to xTokenize() */
 #define FTS5_TOKENIZE_QUERY     0x0001
 #define FTS5_TOKENIZE_PREFIX    0x0002
@@ -13513,7 +13383,7 @@ struct fts5_tokenizer {
 */
 typedef struct fts5_api fts5_api;
 struct fts5_api {
-  int iVersion;                   /* Currently always set to 3 */
+  int iVersion;                   /* Currently always set to 2 */
 
   /* Create a new tokenizer */
   int (*xCreateTokenizer)(
@@ -13540,25 +13410,6 @@ struct fts5_api {
     fts5_extension_function xFunction,
     void (*xDestroy)(void*)
   );
-
-  /* APIs below this point are only available if iVersion>=3 */
-
-  /* Create a new tokenizer */
-  int (*xCreateTokenizer_v2)(
-    fts5_api *pApi,
-    const char *zName,
-    void *pUserData,
-    fts5_tokenizer_v2 *pTokenizer,
-    void (*xDestroy)(void*)
-  );
-
-  /* Find an existing tokenizer */
-  int (*xFindTokenizer_v2)(
-    fts5_api *pApi,
-    const char *zName,
-    void **ppUserData,
-    fts5_tokenizer_v2 **ppTokenizer
-  );
 };
 
 /*

docs/cheatsheet.md

@@ -1,63 +0,0 @@
-# Tilde Friends Cheat Sheet
-
-Making apps for the impatient tilde friend.
-
-## Prerequisites
-
-- either run your own instance or use [tildefriends.net](https://www.tildefriends.net/)
-- register and login
-- [optional] use the `ssb` app to create yourself an SSB identity
-
-## Development Process
-
-1.  hit the `edit` link from any app or new app URL
-2.  make sure the path in the text box is under your username: `/~username/app/`
-3.  write server-side code in `app.js`
-4.  click the `save` button or press the save hotkey (Alt+S or _[browser-specific modifiers]_+S)
-5.  see the app reload on the right side
-
-## Output
-
-- **`app.setDocument(html)`** - send HTML to the browser
-- **`print(...)`** - send values to the browser's developer console
-
-## Persistence
-
-- **`app.localStorageGet(key)`** -> **`value`**
-- **`app.localStorageSet(key, value)`**
-- **`database()`**, **`shared_database(key)`**, **`my_shared_database(package, key)`**
-  - **`db.get(key)`** -> **`value`**
-  - **`db.set(key, value)`**
-  - **`db.exchange(key, expected, value)`** -> **`exchanged`**
-  - **`db.remove(key)`**
-  - **`db.getAll()`** -> **`[key1, ...]`**
-  - **`db.getLike(pattern)`** -> **`{key1: value1, ...}`**
-
-## SSB
-
-- **`ssb.createIdentity()`** -> **`id`**
-- **`ssb.getIdentities()`** -> **`[id1, ...]`**
-- **`ssb.appendMessageWithIdentity(id, content)`** -> **`message_id`**
-- **`ssb.blobStore(blob)`** -> **`blob_id`**
-- **`ssb.blobGet(id)`** -> **`blob`**
-- **`ssb.sqlAsync(query, args, row_callback)`**
-
-## TF-RPC
-
-Stock helper code for calling functions across the web server and browser boundary.
-
-- on the server: `import * as tfrpc from '/tfrpc.js';`
-- in the browser: `import * as tfrpc from '/static/tfrpc.js';`
-- either direction:
-  - register a function: `tfrpc.register(function my_function() {});`
-  - call a remote function: `let promise = tfrpc.rpc.my_function();`
-
-## Share
-
-- give out web links: [https://www.tildefriends.net/~cory/screwble/](https://www.tildefriends.net/~cory/screwble/)
-- use the `Attach App` button when composing a post in [the SSB app](https://www.tildefriends.net/~core/ssb/)
-
-## More Docs
-
-- [api reference](https://www.tildefriends.net/~cory/api/)
-- [source code](https://dev.tildefriends.net/cory/tildefriends/releases)

docs/guide.md

@@ -1,166 +1,209 @@
-# Tilde Friends Developer's Guide
+# Philosophy
 
-A Tilde Friends application starts with code that runs on a Tilde Friends server, possibly far away from where you wrote it, in a little JavaScript environment, in its own restricted process, with the only access to the outside world being the ability to send messages to the server. This document gives some recipes showing how that can be used to build a functional user-facing application in light of the unique constraints present.
+Tilde Friends is a platform for making, running, and sharing web applications.
 
-## Example 1: Hello, world!
+When you visit Tilde Friends in a web browser, you are presented with a
+terminal interface, typically with a big text output box covering most of the
+page and an input box at the bottom, into which text or commands can be
+entered. A script runs to produce text output and consume user input.
 
-Of course we must start with a classic.
+The script is a Tilde Friends application, and it runs on the server, which
+means that unlike client-side JavaScript, it can have the ability to read and
+write files on the server or create network connections to other machines.
+Unlike node.js or other server-side runtime environments, applications are
+limited for security reasons to not interfere with each other or bring the
+entire server down.
 
-### app.js
+Above the terminal, an "Edit" link brings a visitor to the source code for the
+current Tilde Friends application, which they can then edit, save as their own,
+and run.
 
-```
+# Architecture
-app.setDocument('<h1 style="color: #fff">Hello, world!</h1>');
-```
 
-### Output
+Tilde Friends is a C++ application with a JavaScript runtime that provides
+restricted access to filesystem, network, and other system resources. The core
+process runs a core set of scripts that implement a web server, typically
+starting a new process for each visitor's session which runs scripts for the
+active application and stopping it when the visitor leaves.
 
-<iframe srcdoc="&lt;h1 style=&quot;color: #fff&quot;&gt;Hello, world!&lt;/h1&gt;"></iframe>
+Only the core process has access to most system resources, but session
+processes can be given accesss through the core process.
 
-### Explanation
+Service processes are identical to session processes, but they are not tied to
+a user session.
 
-At a glance, this might seem mundane, but for it to work:
+## Communication
 
-- the server starts a real process for your app and loads your code into it
+In the same way that web browsers expose APIs for scripts running in the
-- your code runs
+browser to modify the document, play sounds and video, and draw, Tilde Friends
-- `app.setDocument()` sends a message back to the server
+exposes APIs for scripts running on a Tilde Friends server to interact with a
-- the server interprets the message and redirects it to the browser
+visitor's web browser, read and write files on the server, and otherwise
-- `core/client.js` in the browser receives the message and puts your HTML into an iframe
+interact with the world.
-- your HTML is presented by the browser in an iframe sandbox
 
-But you don't have to think about all that. Call a function, and you see the result.
+There are several distinct classes of APIs.
 
-## Example 2: Hit Counter
+First, there are low-level functions exposed from C++ to JavaScript. Most of
+these are only available to the core process. These typically only go through
+a basic JavaScript to C++ transition and are relatively fast and immediate.
 
-Let's take advantage of code running on the server and create a little hit counter using a key value store shared between all visitors.
+    // Displays some text to the server's console.
+    print("Hello, world!");
 
-### app.js
+There is a mechanism for communicating between processes. Functions can be
+exported and called across process boundaries. When this is done, any
+arguments are serialized to a network protocol, deserialized by the other
+process, the function called, and finally any return value is passed back in
+the same way. Any functions referenced by the arguments or return value are
+also exported and can be subsequently called across process boundaries.
+Functions called across process boundaries are always asynchronous, returning a
+Promise. Care must be taken for security reasons to not pass dangerous
+functions ("deleteAllMydata()") to untrusted processes, and it is best for
+performance reasons to minimize the data size transferred between processes.
 
-```
+    // Send an "add" function to any other running processes.  When called, it
-async function main() {
+    // will run in this process.
-	let db = await shared_database('visitors');
+    core.broadcast({add: function(x, y) { return x + y; }});
-	let count = parseInt((await db.get('visitors')) ?? '0') + 1;
-	await db.set('visitors', count.toString());
-	await app.setDocument(`
-		<h1 style="color: #fff">Welcome, visitor #${count}!</h1>
-	`);
-}
 
-main();
+    // Receive the above message and call the function.
-```
+    core.register("onMessage", function(sender, message) {
-
+    	message.add(3, 4).then(x => terminal.print(x.toString()));
-### Output
-
-<iframe srcdoc="&lt;h1 style=&quot;color: #fff&quot;&gt;Welcome, visitor #1!&lt;/h1&gt;"></iframe>
-
-### Explanation
-
-Just as pure browser apps have access to `localStorage`, Tilde Friends apps have access to key-value storage on the server.
-
-The interface is a bit clunky and will likely change someday, but this example gets a database object, from which you can get and set string values by key. There are various on `shared_database` that let you store data that is private to the user or shared by different criteria.
-
-Also, even though any browser-side code is sandboxed, it is allowed to access browser local storage by going through Tilde Friends API, because sometimes that is useful.
-
-## Example 3: Files
-
-Suppose you don't want to create your entire app in a single server-side file as we've done with the previous examples. There are some tools to allow you to begin to organize.
-
-### app.js
-
-```
-async function main() {
-	let html = utf8Decode(await getFile('index.html'));
-	app.setDocument(html);
-}
-
-main();
-```
-
-### index.html
-
-```
-<html>
-	<head>
-		<script type="module" src="script.js"></script>
-	</head>
-	<body style="color: #fff">
-		<h1>File Test</h1>
-	</body>
-</html>
-```
-
-### script.js
-
-```
-window.addEventListener('load', function() {
-	document.body.appendChild(document.createTextNode('Hello, world');
     });
-```
 
-### Output
+Finally, there is a core web interface that runs on the client's browser that
+extends access to a running Tilde Friends script.
 
-<iframe srcdoc="&lt;body style=&quot;color: #fff&quot;&gt;<h1>File Test</h1>Hello, world!&lt;/body&gt;"></iframe>
+    // Displays a message in the client's browser.
+    terminal.print("Hello, world!");
 
-### Explanation
+## API Documentation
 
-On the server, `utf8Decode(await getFile(fileName))` lets you load a file from your app. In the browser, your app files are made available by HTTP, so you can `<script src="my_script.js"></script>` and such to access them.
+The Tilde Friends API is very much evolving.
 
-## Example 4: Remote Procedure Call
+All currently registered methods can be explored in the
+[documentation](https://www.tildefriends.net/~cory/documentation) app.
 
-While making calls between the client and the server, it is possible to pass functions across that boundary. `tfrpc.js` is a tiny script which builds on that feature to try to hide some of the complexities.
+All browser-facing methods are implemented in [client.js](core/client.js).
+Most process-related methods are implemented in [core.js](core/core.js).
 
-### app.js
+Higher-level behaviors are often implemented within library-style apps
+themselves and are beyond the scope of this document.
 
-```
+### Terminal
-import * as tf from '/tfrpc.js';
 
-function sum() {
+All interaction with a human user is through a terminal-like interface. Though
-	let s = 0
+it is somewhat limiting, it makes simple things easy, and it is possible to
-	for (let x of arguments) {
+construct complicated interfaces by creating and interacting with an iframe.
-		s += x;
-	}
-	return s;
-}
-tf.register(sum);
 
-async function main() {
+#### terminal.print(arguments...)
-	app.setDocument(utf8Decode(await getFile('index.html')));
-}
-main();
-```
 
-### index.html
+Print to the terminal. Arguments and lists are recursively expanded. Numerous
+special values are supported as implemented in client.cs.
 
-```
+    // Create a link.
-<html>
+    terminal.print({href: "http://www.tildefriends.net/", value: "Tilde Friends!"});
-	<body>
-		<h1 id='result'>Calculating...</h1>
-	</body>
-	<script type="module" src="script.js"></script>
-</html>
-```
 
-### script.js
+    // Create an iframe.
+    terminal.print({iframe: "&lt;b&gt;Hello, world!&lt;/b&gt;", width: 640, height: 480});
 
-```
+    // Use style.
-import * as tf from '/static/tfrpc.js';
+    terminal.print({style: "color: #f00", value: "Hello, world!"});
 
-window.addEventListener('load', async function() {
+    // Create a link that when clicked will act as if the user typed a command.
-	document.getElementById('result').innerText = await tf.rpc.sum(1, 2, 3);
+    terminal.print({command: "exit", value: "Get out of here."});
-});
-```
 
-### Output
+#### terminal.clear()
 
-<iframe srcdoc="&lt;body style=&quot;color: #fff&quot;&gt;<h1>6</h1>&lt;/body&gt;"></iframe>
+Clears the terminal output.
 
-### Explanation
+#### terminal.readLine()
 
-Here the browser makes an asynchronous call to the server to do some basic math and update its DOM with the result.
+Read a line of input from the user.
 
-With your favorite Vue/Lit/React/... library on the client-side and your favorite Tilde Friends API calls registered with tfrpc, it becomes pretty easy to start extracting interesting information from, say, SQL queries over Secure Scuttlebutt data, and generating complicated, dynamic user interface. These are the building blocks I used to make the current Tilde Friends SSB client interface.
+#### terminal.setEcho(echo)
 
-## Conclusion
+Controls whether the terminal will automatically echo user input. Defaults to true.
 
-Tilde Friends is currently a pile of all the parts that I thought I needed to build interesting web applications, tied together by code that tries to walk the fine line between being secure enough to let us safely run code on the same device and being usable enough that you can open a tab in your browser and start building just by typing code.
+#### terminal.setPrompt(prompt)
 
-I don't claim it thoroughly accomplishes either yet, but I believe it is at a stage where it is showing how promising this approach can be, and I am excited for you to take it for a spin and share.
+Sets the terminal prompt. The default is "&gt;".
+
+#### terminal.setTitle(title)
+
+Sets the browser window/tab title.
+
+#### terminal.split(terminalList)
+
+Reconfigures the terminal layout, potentially into multiple split panes.
+
+    terminal.split([
+    	{
+    		type: "horizontal",
+    		children: [
+    			{name: "left", basis: "2in", grow: 0, shrink: 0},
+    			{name: "middle", grow: 1},
+    			{name: "right", basis: "2in", grow: 0, shrink: 0},
+    		],
+    	},
+    ]);
+
+#### terminal.select(name)
+
+Directs subsequent output to the named terminal.
+
+#### terminal.postMessageToIframe(iframeName, message)
+
+Sends a message to the iframe that was created with the given name, using the
+browser's window.postMessage.
+
+### Database
+
+Tilde Friends uses lmdb as a basic key value store. Keys and values are all
+expected to be of type String. Each application gets its own isolated
+database.
+
+#### database.get(key)
+
+Retrieve the database value associated with the given key.
+
+#### database.set(key, value)
+
+Sets the database value for the given key, overwriting any existing value.
+
+#### database.remove(key)
+
+Remove the database entry for the given key.
+
+#### database.getAlll()
+
+Retrieve a list of all key names.
+
+### Network
+
+Network access is generally not extended to untrusted users.
+
+It is necessary to grant network permissions to an app owner through the
+administration app.
+
+Apps that require network access must declare it like this:
+
+    //! { "permissions": ["network"] }
+
+#### network.newConnection()
+
+Creates a Connection object.
+
+#### connection.connect(host, port)
+
+Opens a TCP connection to host:port.
+
+#### connection.read(readCallback)
+
+Begins reading and calls readCallback(data) for all data received.
+
+#### connection.write(data)
+
+Writes data to the connection.
+
+#### connection.close()
+
+Closes the connection.

docs/release.md

@@ -1,19 +0,0 @@
-# Release Checklist
-
-- make sure ci is passing
-- run the tests
-- format + prettier
-- update metadata/en-US/changelogs
-- git tag
-- push
-- make dist
-- make a release on gitea
-- upload the artifacts
-- nix
-  - comment out the hash in default.nix
-  - update the version
-  - run `nix-build`
-  - update the hash
-- bump the versions in GNUmakefile for the next release
-- make
-- commit

docs/vision.md

@@ -1,64 +0,0 @@
-# Tilde Friends Vision
-
-Tilde Friends is a tool for making and sharing.
-
-It is both a peer-to-peer social network client, participating in Secure
-Scuttlebutt, and an environment for creating and running web applications.
-
-## Why
-
-This is a thing that I wanted to exist and wanted to work on. No other reason.
-There is not a business model. I believe it is interesting and unique.
-
-## Goals
-
-1. Make it **easy and fun** to run all sorts of web applications.
-
-2. Provide **security** that is easy to understand and protects your data.
-
-3. Make **creating and sharing** web applications accessible to anyone with a
-   browser.
-
-## Ways to Use Tilde Friends
-
-1. **Social Network User**: This is a social network first. You are just here,
-   because your friends are. Or you like how we limit your message length or
-   short videos or whatever the trend is. If you are ambitious, you click links
-   and see interactive experiences (apps) that you wouldn't see elsewhere.
-
-2. **Web Visitor**: You get links from a friend to meeting invites, polls, games,
-   lists, wiki pages, ..., and you interact with them as though they were
-   cloud-hosted by a megacorporation. They just work, and you don't think twice.
-
-3. **Group leader**: You host or use a small public instance, installing apps for
-   a group of friends to use as web visitors.
-
-4. **Developer**: You like to write code and make or improve apps for fun or to
-   solve problems. When you encounter a Tilde Friends app on a strange server,
-   you know you can trivially modify it or download it to your own instance.
-
-## Future Goals / Endgame
-
-1. Mobile apps. This can run on your old phone. Maybe you won't be hosting
-   the web interface publicly, but you can sync, install and edit apps, and
-   otherwise get the full experience from a tiny touch screen.
-
-2. The universal application runtime. The web browser is the universal
-   platform, but even for the simplest application that you might want to host
-   for your friends, cloud hosting, containers, and complicated dependencies might
-   all enter the mix. Tilde Friends, though it is yet another thing to host,
-   includes everything you need out of the box to run a vast variety of interesting
-   apps.
-
-   Tilde Friends will be built out, gradually providing safe access to host
-   resources and client resources the same way web browsers extended access to
-   resources like GPU, persistent storage, cameras, ... over the years.
-
-   Not much effort has been put forward yet to having a robust, long-lasting API,
-   but since the client side longevity is already handled by web browsers, it
-   seems possible that the server-side API can be managed in a similar way.
-
-3. An awesome development environment. Right now it runs JavaScript from the
-   first embeddable text editor I could poorly configure enough to edit code,
-   but it could incorporate a debugger, source control integration a la ssb-git,
-   merge tools, and transpiling from all sorts of different languages.

metadata/en-US/changelogs/26.txt

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

metadata/en-US/changelogs/27.txt

@@ -1,11 +0,0 @@
-* Fix WebView localStorage on some Android versions.
-* Fix viewing apps by blob URL.
-* Let admin users use the server identity.
-* Time out SHS connections that don't handshake.
-* Add an SQL index on message type.
-* Build an AppImage.
-* Improve vote layout.
-* Updated CodeMirror to latest.
-* Updated OpenSSL to 3.3.2.
-* Updated libuv to 1.49.0.
-* Updated c-ares to 1.33.1.

metadata/en-US/changelogs/29.txt

@@ -1,19 +0,0 @@
-* Command-line publishing.
-* SSB replication improvements.
-* Disallow rich text paste more.
-* identity app lets you change the server account.
-* SSB profile icons stretching.
-* Fixed iPhone app missing data.
-* Added an initiate sync button.
-* Fixed the AppImage.
-* Flatpak WIP.
-* Android compatibility fixes.
-* Updates:
-  * CodeMirror
-  * CommonMark 0.31.2
-  * Lit 3.2.1
-  * OpenSSL 3.4.0
-  * c-ares 1.34.2
-  * libbacktrace
-  * libuv 1.49.2
-  * sqlite 3.47.0

package-lock.json

@@ -11,9 +11,7 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.3.3",
+			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
-			"integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
 			"license": "MIT",
 			"bin": {
 				"prettier": "bin/prettier.cjs"

src/android/AndroidManifest.xml

@@ -1,9 +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="30"
+	android:versionCode="26"
-	android:versionName="0.0.25-wip">
+	android:versionName="0.0.22-wip">
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
 		android:label="Tilde Friends"

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

@@ -7,17 +7,14 @@ import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.FileObserver;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
 import android.os.StrictMode;
-import android.text.InputType;
 import android.util.Base64;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -35,7 +32,6 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 import java.io.BufferedReader;
@@ -43,6 +39,12 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.OutputStream;
+import java.nio.file.FileSystems;
+import java.nio.file.Paths;
+import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchService;
 import java.util.concurrent.TimeUnit;
 
 public class TildeFriendsActivity extends Activity {
@@ -50,9 +52,9 @@ public class TildeFriendsActivity extends Activity {
 	TildeFriendsWebView web_view;
 	String base_url;
 	String port_file_path;
+	Thread thread;
 	Thread server_thread;
 	ServiceConnection service_connection;
-	FileObserver observer;
 
 	private ValueCallback<Uri[]> upload_message;
 	private final static int FILECHOOSER_RESULT = 1;
@@ -64,7 +66,7 @@ public class TildeFriendsActivity extends Activity {
 		Log.w("tildefriends", "system.loadLibrary() completed.");
 	}
 
-	public static native int tf_server_main(String files_dir, String apk_path, String out_port_file_path, ConnectivityManager connectivity_manager);
+	public static native int tf_server_main(String files_dir, String apk_path, String out_port_file_path);
 	public static native int tf_sandbox_main(int pipe_fd);
 
 	@Override
@@ -90,20 +92,63 @@ public class TildeFriendsActivity extends Activity {
 
 		TildeFriendsActivity activity = this;
 
+		thread = new Thread(new Runnable() {
+			@Override
+			public void run() {
 				Log.w("tildefriends", "Watching for changes in: " + getFilesDir().toString());
-		observer = make_file_observer(getFilesDir().toString(), port_file_path);
+				try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
-		observer.startWatching();
+					Paths.get(getFilesDir().toString()).register(
+						watcher,
+						StandardWatchEventKinds.ENTRY_CREATE,
+						StandardWatchEventKinds.ENTRY_MODIFY);
+					while (true) {
+						WatchKey key = watcher.poll(100, TimeUnit.MILLISECONDS);
+						boolean attempt_it = true;
+						if (key != null)
+						{
+							attempt_it = false;
+							for (WatchEvent event : key.pollEvents()) {
+								if (event.context().toString().equals("port.txt")) {
+									Log.w("tildefriends", "Observed file write: " + event.context().toString());
+									attempt_it = true;
+								}
+							}
+						}
+						if (attempt_it) {
+							int port = read_port(port_file_path);
+							if (port >= 0) {
+								base_url = "http://127.0.0.1:" + String.valueOf(port) + "/";
+								activity.runOnUiThread(() -> {
+									activity.hide_status();
+									web_view.loadUrl(base_url);
+								});
+								break;
+							} else {
+								activity.runOnUiThread(() -> {
+									activity.set_status("Waiting to connect...");
+								});
+							}
+						}
+						if (key != null && !key.reset()) {
+							Log.w("tildefriends", "watcher is no longer valid");
+							break;
+						}
+					}
+				} catch (java.io.IOException e) {
+					Log.w("tildefriends", "IOException: " + e.toString());
+				} catch (InterruptedException e) {
+					Log.w("tildefriends", "InterruptedException: " + e.toString());
+				}
+			}
+		});
+		thread.start();
 
 		set_status("Starting server...");
 		server_thread = new Thread(new Runnable() {
 			@Override
 			public void run() {
 				Log.w("tildefriends", "Calling tf_server_main.");
-				int result = tf_server_main(
+				int result = tf_server_main(getFilesDir().toString(), getPackageResourcePath().toString(), port_file_path);
-					getFilesDir().toString(),
-					getPackageResourcePath().toString(),
-					port_file_path,
-					(ConnectivityManager)getApplicationContext().getSystemService(CONNECTIVITY_SERVICE));
 				Log.w("tildefriends", "tf_server_main returned " + result + ".");
 			}
 		});
@@ -113,8 +158,6 @@ public class TildeFriendsActivity extends Activity {
 		web_view.getSettings().setDatabaseEnabled(true);
 		web_view.getSettings().setDomStorageEnabled(true);
 
-		set_database_path();
-
 		web_view.setDownloadListener(new DownloadListener() {
 			public void onDownloadStart(String url, String userAgent, String content_disposition, String mime_type, long content_length) {
 				Log.w("tildefriends", "Let's download: " + url + " (" + content_disposition + ")");
@@ -148,6 +191,30 @@ public class TildeFriendsActivity extends Activity {
 		});
 
 		web_view.setWebChromeClient(new WebChromeClient() {
+			@Override
+			public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
+				new AlertDialog.Builder(view.getContext())
+					.setTitle("Tilde Friends")
+					.setMessage(message)
+					.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener()
+					{
+						public void onClick(DialogInterface dialog, int which)
+						{
+							result.confirm();
+						}
+					})
+					.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()
+					{
+						public void onClick(DialogInterface dialog, int which)
+						{
+							result.cancel();
+						}
+					})
+					.create()
+					.show();
+				return true;
+			}
+
 			@Override
 			public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
 				new AlertDialog.Builder(view.getContext())
@@ -165,59 +232,6 @@ public class TildeFriendsActivity extends Activity {
 				return true;
 			}
 
-			@Override
-			public boolean onJsConfirm(WebView view, String url, String message, JsResult result) {
-				new AlertDialog.Builder(view.getContext())
-					.setTitle("Tilde Friends")
-					.setMessage(message)
-					.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int which)
-						{
-							result.confirm();
-						}
-					})
-					.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int which)
-						{
-							result.cancel();
-						}
-					})
-					.create()
-					.show();
-				return true;
-			}
-
-			@Override
-			public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
-				EditText input = new EditText(view.getContext());
-				input.setInputType(InputType.TYPE_CLASS_TEXT);
-				input.setText(defaultValue);
-
-				new AlertDialog.Builder(view.getContext())
-					.setTitle("Tilde Friends")
-					.setMessage(message)
-					.setView(input)
-					.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int which)
-						{
-							result.confirm(input.getText().toString());
-						}
-					})
-					.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()
-					{
-						public void onClick(DialogInterface dialog, int which)
-						{
-							result.cancel();
-						}
-					})
-					.create()
-					.show();
-				return true;
-			}
-
 			/*
 			** https://stackoverflow.com/questions/5907369/file-upload-in-webview
 			** https://stackoverflow.com/questions/8586691/how-to-open-file-save-dialog-in-android
@@ -340,14 +354,11 @@ public class TildeFriendsActivity extends Activity {
 
 	private int read_port(String path) {
 		try (BufferedReader reader = new BufferedReader(new FileReader(path))) {
-			String line = reader.readLine();
+			return Integer.parseInt(reader.readLine());
-			if (line != null) {
-				return Integer.parseInt(line);
-			}
 		} catch (NumberFormatException e) {
 			e.printStackTrace();
 		} catch (java.io.FileNotFoundException e) {
-			Log.w("tildefriends", "Port file does not yet exist.");
+			e.printStackTrace();
 		} catch (java.io.IOException e) {
 			e.printStackTrace();
 		}
@@ -411,42 +422,4 @@ public class TildeFriendsActivity extends Activity {
 			s_activity.service_connection = null;
 		}
 	}
-
-	private void check_port_file(String path) {
-		int port = read_port(port_file_path);
-		if (port >= 0) {
-			base_url = "http://127.0.0.1:" + String.valueOf(port) + "/";
-			runOnUiThread(() -> {
-				hide_status();
-				web_view.loadUrl(base_url);
-			});
-			observer = null;
-		} else {
-			runOnUiThread(() -> {
-				set_status("Waiting to connect...");
-			});
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	private FileObserver make_file_observer(String dir, String path) {
-		FileObserver file_observer = new FileObserver(dir, FileObserver.ALL_EVENTS) {
-			@Override
-			public void onEvent(int event, String file) {
-				if (observer != null) {
-					check_port_file(path);
-				}
-			}
-		};
-		check_port_file(path);
-		return file_observer;
-	}
-
-	@SuppressWarnings("deprecation")
-	private void set_database_path()
-	{
-		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
-			web_view.getSettings().setDatabasePath(getDatabasePath("webview").getPath());
-		}
-	}
 }

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

@@ -41,7 +41,7 @@ public class TildeFriendsSandboxService extends Service {
 			@Override
 			protected boolean onTransact(int code, Parcel data, Parcel reply, int flags) {
 				if (code == START_CALL) {
-					ParcelFileDescriptor pfd = read_pfd(data);
+					ParcelFileDescriptor pfd = data.readParcelable(ParcelFileDescriptor.class.getClassLoader(), ParcelFileDescriptor.class);
 					if (pfd != null) {
 						Log.w("tildefriends", "fd is " + pfd.getFd());
 						start_thread(pfd.detachFd());
@@ -56,9 +56,4 @@ public class TildeFriendsSandboxService extends Service {
 			}
 		};
 	}
-
-	@SuppressWarnings("deprecation")
-	static private ParcelFileDescriptor read_pfd(Parcel data) {
-		return data.readParcelable(ParcelFileDescriptor.class.getClassLoader());
-	}
 }

src/com.unprompted.tildefriends.yml

@@ -1,26 +0,0 @@
-id: com.unprompted.tildefriends
-runtime: org.freedesktop.Platform
-runtime-version: '23.08'
-sdk: org.freedesktop.Sdk
-command: tildefriends-run.sh
-finish-args:
-  - --share=network
-  - --filesystem=xdg-data/applications/tildefriends
-modules:
-  - name: tildefriends
-    buildsystem: simple
-    build-commands:
-      - make release out/data.zip
-      - install -Dm755 out/release/tildefriends /app/bin/tildefriends
-      - install -D out/data.zip /app/share/data.zip
-      - install -Dm755 tildefriends-run.sh /app/bin/tildefriends-run.sh
-    sources:
-      - type: git
-        url: https://dev.tildefriends.net/cory/tildefriends.git
-        dest: .
-        commit: main
-      - type: script
-        dest-filename: tildefriends-run.sh
-        commands:
-          - mkdir -p ~/.local/share/applications/tildefriends/
-          - exec tildefriends run -z /app/share/data.zip -d ~/.local/share/applications/tildefriends/db.sqlite

src/database.js.c

@@ -390,6 +390,8 @@ static JSValue _database_remove(JSContext* context, JSValueConst this_val, int a
 typedef struct _database_get_all_t
 {
 	const char* id;
+	const char* key;
+	size_t key_length;
 	char** out_values;
 	size_t* out_lengths;
 	int out_values_length;
@@ -453,11 +455,17 @@ static JSValue _database_get_all(JSContext* context, JSValueConst this_val, int
 	{
 		tf_ssb_t* ssb = tf_task_get_ssb(database->task);
 
-		database_get_all_t* work = tf_malloc(sizeof(database_get_all_t) + strlen(database->id) + 1);
+		size_t length;
+		const char* key = JS_ToCStringLen(context, &length, argv[0]);
+		database_get_all_t* work = tf_malloc(sizeof(database_get_all_t) + strlen(database->id) + 1 + length + 1);
 		*work = (database_get_all_t) {
 			.id = (const char*)(work + 1),
+			.key = (const char*)(work + 1) + strlen(database->id) + 1,
+			.key_length = length,
 		};
 		memcpy((char*)work->id, database->id, strlen(database->id) + 1);
+		memcpy((char*)work->key, key, length + 1);
+		JS_FreeCString(context, key);
 
 		tf_ssb_run_work(ssb, _database_get_all_work, _database_get_all_after_work, work);
 		result = JS_NewPromiseCapability(context, work->promise);

src/http.c

@@ -67,6 +67,7 @@ typedef struct _tf_http_connection_t
 typedef struct _tf_http_handler_t
 {
 	const char* pattern;
+	bool is_wildcard;
 	tf_http_callback_t* callback;
 	tf_http_cleanup_t* cleanup;
 	void* user_data;
@@ -106,7 +107,6 @@ static const char* _http_connection_get_header(const tf_http_connection_t* conne
 static void _http_connection_destroy(tf_http_connection_t* connection, const char* reason);
 static void _http_timer_reset(tf_http_connection_t* connection);
 static void _http_tls_update(tf_http_connection_t* connection);
-static void _http_builtin_404_handler(tf_http_request_t* request);
 
 tf_http_t* tf_http_create(uv_loop_t* loop)
 {
@@ -128,15 +128,9 @@ static void _http_allocate_buffer(uv_handle_t* handle, size_t suggested_size, uv
 	*buf = uv_buf_init(connection->incoming, sizeof(connection->incoming));
 }
 
-bool tf_http_pattern_matches(const char* pattern, const char* path)
+static bool _http_pattern_matches(const char* pattern, const char* path, bool is_wildcard)
 {
-	if (!*pattern && !*path)
+	if (!pattern || !*pattern || (!is_wildcard && strcmp(path, pattern) == 0))
-	{
-		return true;
-	}
-	const char* k_word = "{word}";
-	bool is_wildcard = strchr(pattern, '*') || strstr(pattern, k_word);
-	if (!is_wildcard && strcmp(path, pattern) == 0)
 	{
 		return true;
 	}
@@ -145,36 +139,17 @@ bool tf_http_pattern_matches(const char* pattern, const char* path)
 	{
 		int i = 0;
 		int j = 0;
-		while (pattern[i] && path[j] && pattern[i] == path[j])
+		while (pattern[i] && path[j] && pattern[i] != '*' && pattern[i] == path[j])
 		{
 			i++;
 			j++;
 		}
 
-		size_t k_word_len = strlen(k_word);
+		if (pattern[i] == '*')
-		if (strncmp(pattern + i, k_word, k_word_len) == 0 && ((path[j] >= 'a' && path[j] <= 'z') || (path[j] >= 'A' && path[j] <= 'Z')))
 		{
 			while (true)
 			{
-				if ((path[j] >= 'a' && path[j] <= 'z') || (path[j] >= 'A' && path[j] <= 'Z') || (path[j] >= '0' && path[j] <= '9'))
+				if (_http_pattern_matches(pattern + i + 1, path + j, strchr(pattern + i + 1, '*') != NULL))
-				{
-					if (tf_http_pattern_matches(pattern + i + k_word_len, path + j + 1))
-					{
-						return true;
-					}
-				}
-				else
-				{
-					break;
-				}
-				j++;
-			}
-		}
-		else if (pattern[i] == '*')
-		{
-			while (true)
-			{
-				if (tf_http_pattern_matches(pattern + i + 1, path + j))
 				{
 					return true;
 				}
@@ -194,7 +169,7 @@ static bool _http_find_handler(tf_http_t* http, const char* path, tf_http_callba
 {
 	for (int i = 0; i < http->handlers_count; i++)
 	{
-		if (tf_http_pattern_matches(http->handlers[i].pattern, path))
+		if (_http_pattern_matches(http->handlers[i].pattern, path, http->handlers[i].is_wildcard))
 		{
 			*out_callback = http->handlers[i].callback;
 			*out_trace_name = http->handlers[i].pattern;
@@ -221,10 +196,6 @@ static void _http_connection_on_close(uv_handle_t* handle)
 static void _http_request_destroy(tf_http_request_t* request)
 {
 	tf_http_close_callback* on_close = request->on_close;
-	if (request->connection && !request->connection->is_response_sent)
-	{
-		_http_builtin_404_handler(request);
-	}
 	if (on_close)
 	{
 		tf_trace_t* trace = request->http->trace;
@@ -431,11 +402,6 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
 
 		if (connection->body_length == connection->content_length)
 		{
-			/* Null-terminate for convenience. */
-			if (connection->body)
-			{
-				((char*)connection->body)[connection->body_length] = '\0';
-			}
 			tf_http_request_t* request = tf_malloc(sizeof(tf_http_request_t));
 			*request = (tf_http_request_t) {
 				.http = connection->http,
@@ -529,7 +495,7 @@ static size_t _http_on_read_plain_internal(tf_http_connection_t* connection, con
 
 			if (connection->content_length)
 			{
-				connection->body = tf_realloc(connection->body, connection->content_length + 1);
+				connection->body = tf_realloc(connection->body, connection->content_length);
 			}
 
 			if (!_http_find_handler(connection->http, connection->path, &connection->callback, &connection->trace_name, &connection->user_data) || !connection->callback)
@@ -765,6 +731,7 @@ void tf_http_add_handler(tf_http_t* http, const char* pattern, tf_http_callback_
 	http->handlers = tf_resize_vec(http->handlers, sizeof(tf_http_handler_t) * (http->handlers_count + 1));
 	http->handlers[http->handlers_count++] = (tf_http_handler_t) {
 		.pattern = tf_strdup(pattern),
+		.is_wildcard = pattern && strchr(pattern, '*') != NULL,
 		.callback = callback,
 		.cleanup = cleanup,
 		.user_data = user_data,
@@ -1104,7 +1071,7 @@ void* tf_http_get_user_data(tf_http_t* http)
 
 const char* tf_http_get_cookie(const char* cookie_header, const char* name)
 {
-	if (!cookie_header || !name)
+	if (!cookie_header)
 	{
 		return NULL;
 	}

src/http.h

@@ -228,12 +228,4 @@ void tf_http_request_websocket_upgrade(tf_http_request_t* request);
 */
 const char* tf_http_status_text(int status);
 
-/**
-** Match URL patterns.  "*" matches anything, and "{word}" matches [a-zA-Z][a-zA-Z0-9]*".
-** @param pattern The pattern to match.
-** @param path The path to test.
-** @return true if the path matches the pattern.
-*/
-bool tf_http_pattern_matches(const char* pattern, const char* path);
-
 /** @} */

src/httpd.js.c

@@ -4,13 +4,12 @@
 #include "http.h"
 #include "log.h"
 #include "mem.h"
-#include "ssb.db.h"
 #include "ssb.h"
+#include "ssb.db.h"
 #include "task.h"
 #include "tlscontext.js.h"
 #include "trace.h"
 #include "util.js.h"
-#include "version.h"
 
 #include "ow-crypt.h"
 
@@ -34,18 +33,14 @@
 
 #define CYAN "\e[1;36m"
 #define MAGENTA "\e[1;35m"
-#define YELLOW "\e[1;33m"
 #define RESET "\e[0m"
 
 const int64_t k_refresh_interval = 1ULL * 7 * 24 * 60 * 60 * 1000;
 
 static JSValue _authenticate_jwt(tf_ssb_t* ssb, JSContext* context, const char* jwt);
 static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv);
-static bool _is_name_valid(const char* name);
+static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name);
-static const char* _make_session_jwt(JSContext* context, tf_ssb_t* ssb, const char* name);
 static const char* _make_set_session_cookie_header(tf_http_request_t* request, const char* session_cookie);
-const char** _form_data_decode(const char* data, int length);
-const char* _form_data_get(const char** form_data, const char* key);
 
 static JSClassID _httpd_class_id;
 static JSClassID _httpd_request_class_id;
@@ -224,17 +219,6 @@ static void _httpd_message_callback(tf_http_request_t* request, int op_code, con
 	JS_FreeValue(context, on_message);
 }
 
-static JSValue _httpd_make_response_object(JSContext* context, tf_http_request_t* request)
-{
-	JSValue response_object = JS_NewObjectClass(context, _httpd_request_class_id);
-	JS_SetOpaque(response_object, request);
-	JS_SetPropertyStr(context, response_object, "writeHead", JS_NewCFunction(context, _httpd_response_write_head, "writeHead", 2));
-	JS_SetPropertyStr(context, response_object, "end", JS_NewCFunction(context, _httpd_response_end, "end", 1));
-	JS_SetPropertyStr(context, response_object, "send", JS_NewCFunction(context, _httpd_response_send, "send", 2));
-	JS_SetPropertyStr(context, response_object, "upgrade", JS_NewCFunction(context, _httpd_websocket_upgrade, "upgrade", 2));
-	return response_object;
-}
-
 static void _httpd_callback_internal(tf_http_request_t* request, bool is_websocket)
 {
 	http_handler_data_t* data = request->user_data;
@@ -261,9 +245,14 @@ static void _httpd_callback_internal(tf_http_request_t* request, bool is_websock
 	JS_SetPropertyStr(context, client, "tls", request->is_tls ? JS_TRUE : JS_FALSE);
 	JS_SetPropertyStr(context, request_object, "client", client);
 
-	JSValue response_object = _httpd_make_response_object(context, request);
+	JSValue response_object = JS_NewObjectClass(context, _httpd_request_class_id);
 	/* The ref is owned by the JS object and will be released by the finalizer. */
 	tf_http_request_ref(request);
+	JS_SetOpaque(response_object, request);
+	JS_SetPropertyStr(context, response_object, "writeHead", JS_NewCFunction(context, _httpd_response_write_head, "writeHead", 2));
+	JS_SetPropertyStr(context, response_object, "end", JS_NewCFunction(context, _httpd_response_end, "end", 1));
+	JS_SetPropertyStr(context, response_object, "send", JS_NewCFunction(context, _httpd_response_send, "send", 2));
+	JS_SetPropertyStr(context, response_object, "upgrade", JS_NewCFunction(context, _httpd_websocket_upgrade, "upgrade", 2));
 	JSValue args[] = {
 		request_object,
 		response_object,
@@ -345,7 +334,7 @@ static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_va
 		tf_free((void*)session);
 		JSValue name = !JS_IsUndefined(jwt) ? JS_GetPropertyStr(context, jwt, "name") : JS_UNDEFINED;
 		const char* name_string = !JS_IsUndefined(name) ? JS_ToCString(context, name) : NULL;
-		const char* session_token = _make_session_jwt(tf_ssb_get_context(ssb), ssb, name_string);
+		const char* session_token = _make_session_jwt(ssb, name_string);
 		const char* cookie = _make_set_session_cookie_header(request, session_token);
 		tf_free((void*)session_token);
 		JS_FreeCString(context, name_string);
@@ -431,7 +420,7 @@ static JSValue _httpd_endpoint_start(JSContext* context, JSValueConst this_val,
 	*listener = (httpd_listener_t) { .context = context, .tls = JS_DupValue(context, argv[1]) };
 	tf_tls_context_t* tls = tf_tls_context_get(listener->tls);
 	int assigned_port = tf_http_listen(http, port, tls, _httpd_listener_cleanup, listener);
-	tf_printf(CYAN "~😎 Tilde Friends" RESET " " YELLOW VERSION_NUMBER RESET " is now up at " MAGENTA "http%s://127.0.0.1:%d/" RESET ".\n", tls ? "s" : "", assigned_port);
+	tf_printf(CYAN "~😎 Tilde Friends" RESET " is now up at " MAGENTA "http%s://127.0.0.1:%d/" RESET ".\n", tls ? "s" : "", assigned_port);
 	return JS_NewInt32(context, assigned_port);
 }
 
@@ -566,11 +555,14 @@ static bool _magic_bytes_match(const magic_bytes_t* magic, const uint8_t* actual
 	return true;
 }
 
-static const char* _httpd_mime_type_from_magic_bytes(const uint8_t* bytes, size_t size)
+static JSValue _httpd_mime_type_from_magic_bytes(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
 {
-	const char* type = "application/binary";
+	JSValue result = JS_UNDEFINED;
+	size_t size = 0;
+	uint8_t* bytes = tf_util_try_get_array_buffer(context, &size, argv[0]);
 	if (bytes)
 	{
+
 		const magic_bytes_t k_magic_bytes[] = {
 			{
 				.type = "image/jpeg",
@@ -635,12 +627,12 @@ static const char* _httpd_mime_type_from_magic_bytes(const uint8_t* bytes, size_
 		{
 			if (_magic_bytes_match(&k_magic_bytes[i], bytes, size))
 			{
-				type = k_magic_bytes[i].type;
+				result = JS_NewString(context, k_magic_bytes[i].type);
 				break;
 			}
 		}
 	}
-	return type;
+	return result;
 }
 
 static const char* _ext_to_content_type(const char* ext, bool use_fallback)
@@ -675,6 +667,14 @@ static const char* _ext_to_content_type(const char* ext, bool use_fallback)
 	return use_fallback ? "application/binary" : NULL;
 }
 
+static JSValue _httpd_mime_type_from_extension(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
+{
+	const char* name = JS_ToCString(context, argv[0]);
+	const char* type = _ext_to_content_type(strrchr(name, '.'), false);
+	JS_FreeCString(context, name);
+	return type ? JS_NewString(context, type) : JS_UNDEFINED;
+}
+
 static void _httpd_finalizer(JSRuntime* runtime, JSValue value)
 {
 	tf_http_t* http = JS_GetOpaque(value, _httpd_class_id);
@@ -959,623 +959,6 @@ static void _httpd_endpoint_static(tf_http_request_t* request)
 	tf_file_stat(task, path, _httpd_endpoint_static_stat, request);
 }
 
-static void _httpd_endpoint_add_slash(tf_http_request_t* request)
-{
-	const char* host = tf_http_request_get_header(request, "x-forwarded-host");
-	if (!host)
-	{
-		host = tf_http_request_get_header(request, "host");
-	}
-	char url[1024];
-	snprintf(url, sizeof(url), "%s%s%s/", request->is_tls ? "https://" : "http://", host, request->path);
-	const char* headers[] = {
-		"Location",
-		url,
-	};
-	tf_http_respond(request, 303, headers, tf_countof(headers) / 2, "", 0);
-}
-
-typedef struct _user_app_t
-{
-	const char* user;
-	const char* app;
-} user_app_t;
-
-static user_app_t* _parse_user_app_from_path(const char* path, const char* expected_suffix)
-{
-	if (!path || path[0] != '/' || path[1] != '~')
-	{
-		return NULL;
-	}
-
-	size_t length = strlen(path);
-	size_t suffix_length = expected_suffix ? strlen(expected_suffix) : 0;
-	if (length < suffix_length || strcmp(path + length - suffix_length, expected_suffix) != 0)
-	{
-		return NULL;
-	}
-
-	const char* slash = strchr(path + 2, '/');
-	if (!slash)
-	{
-		return NULL;
-	}
-
-	const char* user = path + 2;
-	size_t user_length = (size_t)(slash - user);
-	const char* app = slash + 1;
-	size_t app_length = (size_t)(length - suffix_length - user_length - 3);
-	user_app_t* result = tf_malloc(sizeof(user_app_t) + user_length + 1 + app_length + 1);
-
-	*result = (user_app_t) {
-		.user = (char*)(result + 1),
-		.app = (char*)(result + 1) + user_length + 1,
-	};
-	memcpy((char*)result->user, user, user_length);
-	((char*)result->user)[user_length] = '\0';
-	memcpy((char*)result->app, app, app_length);
-	((char*)result->app)[app_length] = '\0';
-
-	if (!_is_name_valid(result->user) || !_is_name_valid(result->app))
-	{
-		tf_free(result);
-		result = NULL;
-	}
-
-	return result;
-}
-
-typedef struct _app_blob_t
-{
-	tf_http_request_t* request;
-	bool found;
-	bool not_modified;
-	bool use_handler;
-	void* data;
-	size_t size;
-	char app_blob_id[k_blob_id_len];
-	const char* file;
-	user_app_t* user_app;
-	char etag[256];
-} app_blob_t;
-
-static void _httpd_endpoint_app_blob_work(tf_ssb_t* ssb, void* user_data)
-{
-	app_blob_t* data = user_data;
-	tf_http_request_t* request = data->request;
-	if (request->path[0] == '/' && request->path[1] == '~')
-	{
-		const char* last_slash = strchr(request->path + 1, '/');
-		if (last_slash)
-		{
-			last_slash = strchr(last_slash + 1, '/');
-		}
-		data->user_app = last_slash ? _parse_user_app_from_path(request->path, last_slash) : NULL;
-		if (data->user_app)
-		{
-			size_t path_length = strlen("path:") + strlen(data->user_app->app) + 1;
-			char* app_path = tf_malloc(path_length);
-			snprintf(app_path, path_length, "path:%s", data->user_app->app);
-			const char* value = tf_ssb_db_get_property(ssb, data->user_app->user, app_path);
-			snprintf(data->app_blob_id, sizeof(data->app_blob_id), "%s", value);
-			tf_free(app_path);
-			tf_free((void*)value);
-			data->file = last_slash + 1;
-		}
-	}
-	else if (request->path[0] == '/' && request->path[1] == '&')
-	{
-		const char* end = strstr(request->path, ".sha256/");
-		if (end)
-		{
-			snprintf(data->app_blob_id, sizeof(data->app_blob_id), "%.*s", (int)(end + strlen(".sha256") - request->path - 1), request->path + 1);
-			data->file = end + strlen(".sha256/");
-		}
-	}
-
-	char* app_blob = NULL;
-	size_t app_blob_size = 0;
-	if (*data->app_blob_id && tf_ssb_db_blob_get(ssb, data->app_blob_id, (uint8_t**)&app_blob, &app_blob_size))
-	{
-		JSMallocFunctions funcs = { 0 };
-		tf_get_js_malloc_functions(&funcs);
-		JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
-		JSContext* context = JS_NewContext(runtime);
-
-		JSValue app_object = JS_ParseJSON(context, app_blob, app_blob_size, NULL);
-		JSValue files = JS_GetPropertyStr(context, app_object, "files");
-		JSValue blob_id = JS_GetPropertyStr(context, files, data->file);
-		if (JS_IsUndefined(blob_id))
-		{
-			blob_id = JS_GetPropertyStr(context, files, "handler.js");
-			if (!JS_IsUndefined(blob_id))
-			{
-				data->use_handler = true;
-			}
-		}
-		else
-		{
-			const char* blob_id_str = JS_ToCString(context, blob_id);
-			if (blob_id_str)
-			{
-				snprintf(data->etag, sizeof(data->etag), "\"%s\"", blob_id_str);
-				const char* match = tf_http_request_get_header(data->request, "if-none-match");
-				if (match && strcmp(match, data->etag) == 0)
-				{
-					data->not_modified = true;
-				}
-				else
-				{
-					data->found = tf_ssb_db_blob_get(ssb, blob_id_str, (uint8_t**)&data->data, &data->size);
-				}
-			}
-			JS_FreeCString(context, blob_id_str);
-		}
-		JS_FreeValue(context, blob_id);
-		JS_FreeValue(context, files);
-		JS_FreeValue(context, app_object);
-
-		JS_FreeContext(context);
-		JS_FreeRuntime(runtime);
-		tf_free(app_blob);
-	}
-}
-
-static void _httpd_call_app_handler(tf_ssb_t* ssb, tf_http_request_t* request, const char* app_blob_id, const char* path, const char* package_owner, const char* app)
-{
-	JSContext* context = tf_ssb_get_context(ssb);
-	JSValue global = JS_GetGlobalObject(context);
-	JSValue exports = JS_GetPropertyStr(context, global, "exports");
-	JSValue call_app_handler = JS_GetPropertyStr(context, exports, "callAppHandler");
-
-	JSValue response = _httpd_make_response_object(context, request);
-	tf_http_request_ref(request);
-	JSValue handler_blob_id = JS_NewString(context, app_blob_id);
-	JSValue path_value = JS_NewString(context, path);
-	JSValue package_owner_value = JS_NewString(context, package_owner);
-	JSValue app_value = JS_NewString(context, app);
-	JSValue query_value = request->query ? JS_NewString(context, request->query) : JS_UNDEFINED;
-
-	JSValue headers = JS_NewObject(context);
-	for (int i = 0; i < request->headers_count; i++)
-	{
-		char name[256] = "";
-		snprintf(name, sizeof(name), "%.*s", (int)request->headers[i].name_len, request->headers[i].name);
-		JS_SetPropertyStr(context, headers, name, JS_NewStringLen(context, request->headers[i].value, request->headers[i].value_len));
-	}
-
-	JSValue args[] = {
-		response,
-		handler_blob_id,
-		path_value,
-		query_value,
-		headers,
-		package_owner_value,
-		app_value,
-	};
-
-	JSValue result = JS_Call(context, call_app_handler, JS_NULL, tf_countof(args), args);
-	tf_util_report_error(context, result);
-	JS_FreeValue(context, result);
-
-	JS_FreeValue(context, headers);
-	JS_FreeValue(context, query_value);
-	JS_FreeValue(context, app_value);
-	JS_FreeValue(context, package_owner_value);
-	JS_FreeValue(context, handler_blob_id);
-	JS_FreeValue(context, path_value);
-	JS_FreeValue(context, response);
-	JS_FreeValue(context, call_app_handler);
-	JS_FreeValue(context, exports);
-	JS_FreeValue(context, global);
-}
-
-static void _httpd_endpoint_app_blob_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	app_blob_t* data = user_data;
-	if (data->not_modified)
-	{
-		tf_http_respond(data->request, 304, NULL, 0, NULL, 0);
-	}
-	else if (data->use_handler)
-	{
-		_httpd_call_app_handler(ssb, data->request, data->app_blob_id, data->file, data->user_app->user, data->user_app->app);
-	}
-	else if (data->found)
-	{
-		const char* mime_type = _ext_to_content_type(strrchr(data->request->path, '.'), false);
-		if (!mime_type)
-		{
-			mime_type = _httpd_mime_type_from_magic_bytes(data->data, data->size);
-		}
-		const char* headers[] = {
-			"Access-Control-Allow-Origin",
-			"*",
-			"Content-Security-Policy",
-			"sandbox allow-downloads allow-top-navigation-by-user-activation",
-			"Content-Type",
-			mime_type ? mime_type : "application/binary",
-			"etag",
-			data->etag,
-		};
-		tf_http_respond(data->request, 200, headers, tf_countof(headers) / 2, data->data, data->size);
-	}
-	tf_free(data->user_app);
-	tf_free(data->data);
-	tf_http_request_unref(data->request);
-	tf_free(data);
-}
-
-static void _httpd_endpoint_app_blob(tf_http_request_t* request)
-{
-	tf_http_request_ref(request);
-	tf_task_t* task = request->user_data;
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	app_blob_t* data = tf_malloc(sizeof(app_blob_t));
-	*data = (app_blob_t) { .request = request };
-	tf_ssb_run_work(ssb, _httpd_endpoint_app_blob_work, _httpd_endpoint_app_blob_after_work, data);
-}
-
-typedef struct _view_t
-{
-	tf_http_request_t* request;
-	const char** form_data;
-	void* data;
-	size_t size;
-	char etag[256];
-	bool not_modified;
-} view_t;
-
-static bool _is_filename_safe(const char* filename)
-{
-	if (!filename)
-	{
-		return NULL;
-	}
-	for (const char* p = filename; *p; p++)
-	{
-		if ((*p <= 'a' && *p >= 'z') && (*p <= 'A' && *p >= 'Z') && (*p <= '0' && *p >= '9') && *p != '.' && *p != '-' && *p != '_')
-		{
-			return false;
-		}
-	}
-	return strlen(filename) < 256;
-}
-
-static void _httpd_endpoint_view_work(tf_ssb_t* ssb, void* user_data)
-{
-	view_t* view = user_data;
-	tf_http_request_t* request = view->request;
-	char blob_id[k_blob_id_len] = "";
-
-	user_app_t* user_app = _parse_user_app_from_path(request->path, "/view");
-	if (user_app)
-	{
-		size_t app_path_length = strlen("path:") + strlen(user_app->app) + 1;
-		char* app_path = tf_malloc(app_path_length);
-		snprintf(app_path, app_path_length, "path:%s", user_app->app);
-		const char* value = tf_ssb_db_get_property(ssb, user_app->user, app_path);
-		snprintf(blob_id, sizeof(blob_id), "%s", value);
-		tf_free(app_path);
-		tf_free((void*)value);
-	}
-	else if (request->path[0] == '/' && request->path[1] == '&')
-	{
-		snprintf(blob_id, sizeof(blob_id), "%.*s", (int)(strlen(request->path) - strlen("/view") - 1), request->path + 1);
-	}
-	tf_free(user_app);
-
-	if (*blob_id)
-	{
-		snprintf(view->etag, sizeof(view->etag), "\"%s\"", blob_id);
-		const char* if_none_match = tf_http_request_get_header(request, "if-none-match");
-		char match[258];
-		snprintf(match, sizeof(match), "\"%s\"", blob_id);
-		if (if_none_match && strcmp(if_none_match, match) == 0)
-		{
-			view->not_modified = true;
-		}
-		else
-		{
-			tf_ssb_db_blob_get(ssb, blob_id, (uint8_t**)&view->data, &view->size);
-		}
-	}
-}
-
-static void _httpd_endpoint_view_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	view_t* view = user_data;
-	const char* filename = _form_data_get(view->form_data, "filename");
-	if (!_is_filename_safe(filename))
-	{
-		filename = NULL;
-	}
-	char content_disposition[512] = "";
-	if (filename)
-	{
-		snprintf(content_disposition, sizeof(content_disposition), "attachment; filename=%s", filename);
-	}
-	const char* headers[] = {
-		"Content-Security-Policy",
-		"sandbox allow-downloads allow-top-navigation-by-user-activation",
-		"Content-Type",
-		view->data ? _httpd_mime_type_from_magic_bytes(view->data, view->size) : "text/plain",
-		"etag",
-		view->etag,
-		filename ? "Content-Disposition" : NULL,
-		filename ? content_disposition : NULL,
-	};
-	int count = filename ? tf_countof(headers) / 2 : (tf_countof(headers) / 2 - 1);
-	if (view->not_modified)
-	{
-		tf_http_respond(view->request, 304, headers, count, NULL, 0);
-	}
-	else if (view->data)
-	{
-		tf_http_respond(view->request, 200, headers, count, view->data, view->size);
-		tf_free(view->data);
-	}
-	else
-	{
-		const char* k_payload = tf_http_status_text(404);
-		tf_http_respond(view->request, 404, NULL, 0, k_payload, strlen(k_payload));
-	}
-	tf_free(view->form_data);
-	tf_http_request_unref(view->request);
-	tf_free(view);
-}
-
-static void _httpd_endpoint_view(tf_http_request_t* request)
-{
-	tf_http_request_ref(request);
-	tf_task_t* task = request->user_data;
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	view_t* view = tf_malloc(sizeof(view_t));
-	*view = (view_t) { .request = request, .form_data = _form_data_decode(request->query, request->query ? strlen(request->query) : 0) };
-	tf_ssb_run_work(ssb, _httpd_endpoint_view_work, _httpd_endpoint_view_after_work, view);
-}
-
-typedef struct _save_t
-{
-	tf_http_request_t* request;
-	int response;
-	char blob_id[k_blob_id_len];
-} save_t;
-
-static void _httpd_endpoint_save_work(tf_ssb_t* ssb, void* user_data)
-{
-	save_t* save = user_data;
-	tf_http_request_t* request = save->request;
-	const char* session = tf_http_get_cookie(tf_http_request_get_header(request, "cookie"), "session");
-
-	JSMallocFunctions funcs = { 0 };
-	tf_get_js_malloc_functions(&funcs);
-	JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
-	JSContext* context = JS_NewContext(runtime);
-
-	JSValue jwt = _authenticate_jwt(ssb, context, session);
-	JSValue user = JS_GetPropertyStr(context, jwt, "name");
-	const char* user_string = JS_ToCString(context, user);
-
-	if (user_string && _is_name_valid(user_string))
-	{
-		user_app_t* user_app = _parse_user_app_from_path(request->path, "/save");
-		if (user_app)
-		{
-			if (strcmp(user_string, user_app->user) == 0 || (strcmp(user_app->user, "core") == 0 && tf_ssb_db_user_has_permission(ssb, user_string, "administration")))
-			{
-				size_t path_length = strlen("path:") + strlen(user_app->app) + 1;
-				char* app_path = tf_malloc(path_length);
-				snprintf(app_path, path_length, "path:%s", user_app->app);
-
-				const char* old_blob_id = tf_ssb_db_get_property(ssb, user_app->user, app_path);
-
-				JSValue new_app = JS_ParseJSON(context, request->body, request->content_length, NULL);
-				tf_util_report_error(context, new_app);
-				if (JS_IsObject(new_app))
-				{
-					uint8_t* old_blob = NULL;
-					size_t old_blob_size = 0;
-					if (tf_ssb_db_blob_get(ssb, old_blob_id, &old_blob, &old_blob_size))
-					{
-						JSValue old_app = JS_ParseJSON(context, (const char*)old_blob, old_blob_size, NULL);
-						if (JS_IsObject(old_app))
-						{
-							JSAtom previous = JS_NewAtom(context, "previous");
-							JS_DeleteProperty(context, old_app, previous, 0);
-							JS_DeleteProperty(context, new_app, previous, 0);
-
-							JSValue old_app_json = JS_JSONStringify(context, old_app, JS_NULL, JS_NULL);
-							JSValue new_app_json = JS_JSONStringify(context, new_app, JS_NULL, JS_NULL);
-							const char* old_app_str = JS_ToCString(context, old_app_json);
-							const char* new_app_str = JS_ToCString(context, new_app_json);
-
-							if (old_app_str && new_app_str && strcmp(old_app_str, new_app_str) == 0)
-							{
-								snprintf(save->blob_id, sizeof(save->blob_id), "/%s", old_blob_id);
-								save->response = 200;
-							}
-
-							JS_FreeCString(context, old_app_str);
-							JS_FreeCString(context, new_app_str);
-							JS_FreeValue(context, old_app_json);
-							JS_FreeValue(context, new_app_json);
-							JS_FreeAtom(context, previous);
-						}
-						JS_FreeValue(context, old_app);
-						tf_free(old_blob);
-					}
-
-					if (!save->response)
-					{
-						if (old_blob_id)
-						{
-							JS_SetPropertyStr(context, new_app, "previous", JS_NewString(context, old_blob_id));
-						}
-						JSValue new_app_json = JS_JSONStringify(context, new_app, JS_NULL, JS_NULL);
-						size_t new_app_length = 0;
-						const char* new_app_str = JS_ToCStringLen(context, &new_app_length, new_app_json);
-
-						char blob_id[k_blob_id_len] = { 0 };
-						if (tf_ssb_db_blob_store(ssb, (const uint8_t*)new_app_str, new_app_length, blob_id, sizeof(blob_id), NULL) &&
-							tf_ssb_db_set_property(ssb, user_app->user, app_path, blob_id))
-						{
-							tf_ssb_db_add_value_to_array_property(ssb, user_app->user, "apps", user_app->app);
-							snprintf(save->blob_id, sizeof(save->blob_id), "%s", blob_id);
-							save->response = 200;
-						}
-
-						JS_FreeCString(context, new_app_str);
-						JS_FreeValue(context, new_app_json);
-					}
-				}
-				else
-				{
-					save->response = 400;
-				}
-				JS_FreeValue(context, new_app);
-
-				tf_free(app_path);
-				tf_free((void*)old_blob_id);
-			}
-			else
-			{
-				save->response = 401;
-			}
-			tf_free(user_app);
-		}
-		else if (strcmp(request->path, "/save") == 0)
-		{
-			char blob_id[k_blob_id_len] = { 0 };
-			if (tf_ssb_db_blob_store(ssb, request->body, request->content_length, blob_id, sizeof(blob_id), NULL))
-			{
-				snprintf(save->blob_id, sizeof(save->blob_id), "%s", blob_id);
-				save->response = 200;
-			}
-		}
-		else
-		{
-			save->response = 400;
-		}
-	}
-
-	tf_free((void*)session);
-	JS_FreeCString(context, user_string);
-	JS_FreeValue(context, user);
-	JS_FreeValue(context, jwt);
-	JS_FreeContext(context);
-	JS_FreeRuntime(runtime);
-}
-
-static void _httpd_endpoint_save_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	save_t* save = user_data;
-	tf_http_request_t* request = save->request;
-	if (*save->blob_id)
-	{
-		char body[256] = "";
-		int length = snprintf(body, sizeof(body), "/%s", save->blob_id);
-		tf_http_respond(request, 200, NULL, 0, body, length);
-	}
-	tf_http_request_unref(request);
-	tf_free(save);
-}
-
-static void _httpd_endpoint_save(tf_http_request_t* request)
-{
-	tf_http_request_ref(request);
-	tf_task_t* task = request->user_data;
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	save_t* save = tf_malloc(sizeof(save_t));
-	*save = (save_t) {
-		.request = request,
-	};
-	tf_ssb_run_work(ssb, _httpd_endpoint_save_work, _httpd_endpoint_save_after_work, save);
-}
-
-typedef struct _delete_t
-{
-	tf_http_request_t* request;
-	const char* session;
-	int response;
-} delete_t;
-
-static void _httpd_endpoint_delete_work(tf_ssb_t* ssb, void* user_data)
-{
-	delete_t* delete = user_data;
-	tf_http_request_t* request = delete->request;
-
-	JSMallocFunctions funcs = { 0 };
-	tf_get_js_malloc_functions(&funcs);
-	JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
-	JSContext* context = JS_NewContext(runtime);
-
-	JSValue jwt = _authenticate_jwt(ssb, context, delete->session);
-	JSValue user = JS_GetPropertyStr(context, jwt, "name");
-	const char* user_string = JS_ToCString(context, user);
-	if (user_string && _is_name_valid(user_string))
-	{
-		user_app_t* user_app = _parse_user_app_from_path(request->path, "/delete");
-		if (user_app)
-		{
-			if (strcmp(user_string, user_app->user) == 0 || (strcmp(user_app->user, "core") == 0 && tf_ssb_db_user_has_permission(ssb, user_string, "administration")))
-			{
-				size_t path_length = strlen("path:") + strlen(user_app->app) + 1;
-				char* app_path = tf_malloc(path_length);
-				snprintf(app_path, path_length, "path:%s", user_app->app);
-
-				bool changed = false;
-				changed = tf_ssb_db_remove_value_from_array_property(ssb, user_string, "apps", user_app->app) || changed;
-				changed = tf_ssb_db_remove_property(ssb, user_string, app_path) || changed;
-				delete->response = changed ? 200 : 404;
-				tf_free(app_path);
-			}
-			else
-			{
-				delete->response = 401;
-			}
-		}
-		else
-		{
-			delete->response = 404;
-		}
-		tf_free(user_app);
-	}
-	else
-	{
-		delete->response = 401;
-	}
-
-	JS_FreeCString(context, user_string);
-	JS_FreeValue(context, user);
-	JS_FreeValue(context, jwt);
-	JS_FreeContext(context);
-	JS_FreeRuntime(runtime);
-}
-
-static void _httpd_endpoint_delete_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	delete_t* delete = user_data;
-	const char* k_payload = tf_http_status_text(delete->response ? delete->response : 404);
-	tf_http_respond(delete->request, delete->response ? delete->response : 404, NULL, 0, k_payload, strlen(k_payload));
-	tf_http_request_unref(delete->request);
-	tf_free((void*)delete->session);
-	tf_free(delete);
-}
-
-static void _httpd_endpoint_delete(tf_http_request_t* request)
-{
-	tf_http_request_ref(request);
-	tf_task_t* task = request->user_data;
-	tf_ssb_t* ssb = tf_task_get_ssb(task);
-	delete_t* delete = tf_malloc(sizeof(delete_t));
-	*delete = (delete_t) {
-		.request = request,
-		.session = tf_http_get_cookie(tf_http_request_get_header(request, "cookie"), "session"),
-	};
-	tf_ssb_run_work(ssb, _httpd_endpoint_delete_work, _httpd_endpoint_delete_after_work, delete);
-}
-
 static void _httpd_endpoint_root_callback(const char* path, void* user_data)
 {
 	tf_http_request_t* request = user_data;
@@ -1897,7 +1280,7 @@ static JSValue _authenticate_jwt(tf_ssb_t* ssb, JSContext* context, const char*
 static bool _session_is_authenticated_as_user(JSContext* context, JSValue session)
 {
 	bool result = false;
-	JSValue user = JS_GetPropertyStr(context, session, "name");
+	JSValue user = JS_GetPropertyStr(context, session, "user");
 	const char* user_string = JS_ToCString(context, user);
 	result = user_string && strcmp(user_string, "guest") != 0;
 	JS_FreeCString(context, user_string);
@@ -1922,7 +1305,7 @@ static bool _is_name_valid(const char* name)
 	return true;
 }
 
-static const char* _make_session_jwt(JSContext* context, tf_ssb_t* ssb, const char* name)
+static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name)
 {
 	if (!name || !*name)
 	{
@@ -1936,6 +1319,7 @@ static const char* _make_session_jwt(JSContext* context, tf_ssb_t* ssb, const ch
 	char header_base64[256];
 	sodium_bin2base64(header_base64, sizeof(header_base64), (uint8_t*)header_json, strlen(header_json), sodium_base64_VARIANT_URLSAFE_NO_PADDING);
 
+	JSContext* context = tf_ssb_get_context(ssb);
 	JSValue payload = JS_NewObject(context);
 	JS_SetPropertyStr(context, payload, "name", JS_NewString(context, name));
 	JS_SetPropertyStr(context, payload, "exp", JS_NewInt64(context, now.tv_sec * 1000 + now.tv_nsec / 1000000LL + k_refresh_interval));
@@ -2100,39 +1484,27 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 
 			if (form_register && strcmp(form_register, "1") == 0)
 			{
-				bool registered = false;
+				if (!have_account && _is_name_valid(account_name) && password && confirm && strcmp(password, confirm) == 0 &&
-				if (!have_account && _is_name_valid(account_name) && password && confirm && strcmp(password, confirm) == 0)
+					tf_ssb_db_register_account(ssb, account_name, password))
-				{
-					sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-					registered = tf_ssb_db_register_account(tf_ssb_get_loop(ssb), db, context, account_name, password);
-					tf_ssb_release_db_writer(ssb, db);
-					if (registered)
 				{
 					tf_free((void*)send_session);
-						send_session = _make_session_jwt(context, ssb, account_name);
+					send_session = _make_session_jwt(ssb, account_name);
 					may_become_first_admin = true;
 				}
-				}
+				else
-				if (!registered)
 				{
 					login_error = "Error registering account.";
 				}
 			}
 			else if (change && strcmp(change, "1") == 0)
 			{
-				bool set = false;
+				if (have_account && _is_name_valid(account_name) && new_password && confirm && strcmp(new_password, confirm) == 0 && _verify_password(password, account_passwd) &&
-				if (have_account && _is_name_valid(account_name) && new_password && confirm && strcmp(new_password, confirm) == 0 && _verify_password(password, account_passwd))
+					tf_ssb_db_set_account_password(ssb, account_name, new_password))
-				{
-					sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-					set = tf_ssb_db_set_account_password(tf_ssb_get_loop(ssb), db, context, account_name, new_password);
-					tf_ssb_release_db_writer(ssb, db);
-					if (set)
 				{
 					tf_free((void*)send_session);
-						send_session = _make_session_jwt(context, ssb, account_name);
+					send_session = _make_session_jwt(ssb, account_name);
 				}
-				}
+				else
-				if (!set)
 				{
 					login_error = "Error changing password.";
 				}
@@ -2142,7 +1514,7 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 				if (have_account && *account_passwd && _verify_password(password, account_passwd))
 				{
 					tf_free((void*)send_session);
-					send_session = _make_session_jwt(context, ssb, account_name);
+					send_session = _make_session_jwt(ssb, account_name);
 					may_become_first_admin = true;
 				}
 				else
@@ -2154,7 +1526,7 @@ static void _httpd_endpoint_login_work(tf_ssb_t* ssb, void* user_data)
 		else
 		{
 			tf_free((void*)send_session);
-			send_session = _make_session_jwt(context, ssb, "guest");
+			send_session = _make_session_jwt(ssb, "guest");
 		}
 		tf_free(post_form_data);
 	}
@@ -2305,17 +1677,7 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/speedscope/*", _httpd_endpoint_static, NULL, task);
 	tf_http_add_handler(http, "/static/*", _httpd_endpoint_static, NULL, task);
 	tf_http_add_handler(http, "/.well-known/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/&*.sha256", _httpd_endpoint_add_slash, NULL, task);
+	tf_http_add_handler(http, "/~*/*/", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/&*.sha256/", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/&*.sha256/view", _httpd_endpoint_view, NULL, task);
-	tf_http_add_handler(http, "/&*.sha256/*", _httpd_endpoint_app_blob, NULL, task);
-	tf_http_add_handler(http, "/~{word}/{word}", _httpd_endpoint_add_slash, NULL, task);
-	tf_http_add_handler(http, "/~{word}/{word}/", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/~{word}/{word}/save", _httpd_endpoint_save, NULL, task);
-	tf_http_add_handler(http, "/~{word}/{word}/delete", _httpd_endpoint_delete, NULL, task);
-	tf_http_add_handler(http, "/~{word}/{word}/view", _httpd_endpoint_view, NULL, task);
-	tf_http_add_handler(http, "/~{word}/{word}/*", _httpd_endpoint_app_blob, NULL, task);
-	tf_http_add_handler(http, "/save", _httpd_endpoint_save, NULL, task);
 
 	tf_http_add_handler(http, "/robots.txt", _httpd_endpoint_robots_txt, NULL, NULL);
 	tf_http_add_handler(http, "/debug", _httpd_endpoint_debug, NULL, task);
@@ -2327,10 +1689,13 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/login/logout", _httpd_endpoint_logout, NULL, task);
 	tf_http_add_handler(http, "/login", _httpd_endpoint_login, NULL, task);
 
+	JS_SetPropertyStr(context, httpd, "handlers", JS_NewObject(context));
 	JS_SetPropertyStr(context, httpd, "all", JS_NewCFunction(context, _httpd_endpoint_all, "all", 2));
 	JS_SetPropertyStr(context, httpd, "start", JS_NewCFunction(context, _httpd_endpoint_start, "start", 2));
 	JS_SetPropertyStr(context, httpd, "set_http_redirect", JS_NewCFunction(context, _httpd_set_http_redirect, "set_http_redirect", 1));
 	JS_SetPropertyStr(context, httpd, "auth_query", JS_NewCFunction(context, _httpd_auth_query, "auth_query", 1));
+	JS_SetPropertyStr(context, httpd, "mime_type_from_magic_bytes", JS_NewCFunction(context, _httpd_mime_type_from_magic_bytes, "mime_type_from_magic_bytes", 1));
+	JS_SetPropertyStr(context, httpd, "mime_type_from_extension", JS_NewCFunction(context, _httpd_mime_type_from_extension, "mime_type_from_extension", 1));
 	JS_SetPropertyStr(context, global, "httpd", httpd);
 	JS_FreeValue(context, global);
 }

src/main.c

@@ -9,7 +9,6 @@
 #include "tests.h"
 #include "util.js.h"
 
-#include "ares.h"
 #include "backtrace.h"
 #include "sqlite3.h"
 #include "unzip.h"
@@ -48,12 +47,11 @@ struct backtrace_state* g_backtrace_state;
 const char* k_db_path_default = "db.sqlite";
 
 #if !TARGET_OS_IPHONE && !defined(__ANDROID__)
-static int _tf_command_export(const char* file, int argc, char* argv[]);
+static int _tf_command_test(const char* file, int argc, char* argv[]);
 static int _tf_command_import(const char* file, int argc, char* argv[]);
-static int _tf_command_publish(const char* file, int argc, char* argv[]);
+static int _tf_command_export(const char* file, int argc, char* argv[]);
 static int _tf_command_run(const char* file, int argc, char* argv[]);
 static int _tf_command_sandbox(const char* file, int argc, char* argv[]);
-static int _tf_command_test(const char* file, int argc, char* argv[]);
 static int _tf_command_verify(const char* file, int argc, char* argv[]);
 static int _tf_command_usage(const char* file);
 
@@ -69,7 +67,6 @@ const command_t k_commands[] = {
 	{ "sandbox", _tf_command_sandbox, "Run a sandboxed tildefriends sandbox process (used internally)." },
 	{ "import", _tf_command_import, "Import apps to SSB." },
 	{ "export", _tf_command_export, "Export apps from SSB." },
-	{ "publish", _tf_command_publish, "Append a message to a feed." },
 	{ "verify", _tf_command_verify, "Verify a feed." },
 	{ "test", _tf_command_test, "Test SSB." },
 };
@@ -276,121 +273,6 @@ static int _tf_command_export(const char* file, int argc, char* argv[])
 	return EXIT_SUCCESS;
 }
 
-static void _tf_published_callback(const char* id, bool verified, bool stored, void* user_data)
-{
-	if (verified)
-	{
-		if (stored)
-		{
-			tf_printf("Message %s stored.\n", id);
-		}
-		else
-		{
-			tf_printf("Unable to store the message.\n");
-		}
-	}
-	else
-	{
-		tf_printf("Failed to verify the message.\n");
-	}
-	*(int*)user_data = stored ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-static int _tf_command_publish(const char* file, int argc, char* argv[])
-{
-	const char* user = NULL;
-	const char* identity = NULL;
-	const char* db_path = k_db_path_default;
-	const char* content = NULL;
-	bool show_usage = false;
-
-	while (!show_usage)
-	{
-		static const struct option k_options[] = {
-			{ "user", required_argument, NULL, 'u' },
-			{ "id", required_argument, NULL, 'i' },
-			{ "db-path", required_argument, NULL, 'd' },
-			{ "content", required_argument, NULL, 'c' },
-			{ "help", no_argument, NULL, 'h' },
-			{ 0 },
-		};
-		int c = getopt_long(argc, argv, "u:i:d:c:h", k_options, NULL);
-		if (c == -1)
-		{
-			break;
-		}
-
-		switch (c)
-		{
-		case '?':
-		case 'h':
-		default:
-			show_usage = true;
-			break;
-		case 'u':
-			user = optarg;
-			break;
-		case 'i':
-			identity = optarg;
-			break;
-		case 'd':
-			db_path = optarg;
-			break;
-		case 'c':
-			content = optarg;
-			break;
-		}
-	}
-
-	if (show_usage || !user || !identity || !content)
-	{
-		tf_printf("\n%s publish [options]\n\n", file);
-		tf_printf("options:\n");
-		tf_printf("  -u, --user user          User owning identity with which to publish.\n");
-		tf_printf("  -i, --id identity        Identity with which to publish message.\n");
-		tf_printf("  -d, --db-path db_path    SQLite database path (default: %s).\n", k_db_path_default);
-		tf_printf("  -c, --content json       JSON content of message to publish.\n");
-		tf_printf("  -h, --help               Show this usage information.\n");
-		return EXIT_FAILURE;
-	}
-
-	int result = EXIT_FAILURE;
-	tf_printf("Posting %s as account %s belonging to %s...\n", content, identity, user);
-	tf_ssb_t* ssb = tf_ssb_create(NULL, NULL, db_path, NULL);
-	uint8_t private_key[512] = { 0 };
-	if (tf_ssb_db_identity_get_private_key(ssb, user, identity, private_key, sizeof(private_key)))
-	{
-		JSContext* context = tf_ssb_get_context(ssb);
-		int64_t sequence = 0;
-		char previous[k_id_base64_len] = { 0 };
-		tf_ssb_db_get_latest_message_by_author(ssb, identity, &sequence, previous, sizeof(previous));
-		JSValue content_value = JS_ParseJSON(context, content, strlen(content), NULL);
-		if (!JS_IsException(content_value))
-		{
-			JSValue message = tf_ssb_sign_message(ssb, identity, private_key, content_value, previous, sequence);
-			JSValue message_value = JS_JSONStringify(context, message, JS_NULL, JS_NULL);
-			const char* message_str = JS_ToCString(context, message_value);
-			tf_printf("Posting: %s.\n", message_str);
-			tf_ssb_verify_strip_and_store_message(ssb, message, _tf_published_callback, &result);
-			JS_FreeCString(context, message_str);
-			JS_FreeValue(context, message_value);
-			JS_FreeValue(context, message);
-		}
-		else
-		{
-			tf_printf("Unable to parse content as JSON: ");
-			tf_util_report_error(context, content_value);
-		}
-		JS_FreeValue(context, content_value);
-	}
-	else
-	{
-		tf_printf("Did not find private key for identity %s belonging to %s.\n", identity, user);
-	}
-	tf_ssb_destroy(ssb);
-	return result;
-}
-
 static int _tf_command_verify(const char* file, int argc, char* argv[])
 {
 	const char* identity = NULL;
@@ -400,7 +282,7 @@ static int _tf_command_verify(const char* file, int argc, char* argv[])
 	while (!show_usage)
 	{
 		static const struct option k_options[] = {
-			{ "id", required_argument, NULL, 'i' },
+			{ "id", required_argument, NULL, 'u' },
 			{ "db-path", required_argument, NULL, 'd' },
 			{ "help", no_argument, NULL, 'h' },
 			{ 0 },
@@ -868,7 +750,7 @@ static void _tf_service_stop()
 	(*s_jni_env)->CallStaticVoidMethod(s_jni_env, c, stop_sandbox);
 }
 
-static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir, jstring apk_path, jstring out_port_file_path, jobject connectivity_manager)
+static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir, jstring apk_path, jstring out_port_file_path)
 {
 	s_jni_env = env;
 
@@ -876,9 +758,6 @@ static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir,
 	_startup(0, (char*[]) { NULL });
 	tf_printf("That was startup.\n");
 
-	ares_library_init_android(connectivity_manager);
-	ares_library_init(0);
-
 	const char* files = (*env)->GetStringUTFChars(env, files_dir, NULL);
 	const char* apk = (*env)->GetStringUTFChars(env, apk_path, NULL);
 	const char* out_port_file = (*env)->GetStringUTFChars(env, out_port_file_path, NULL);
@@ -915,7 +794,6 @@ static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir,
 	(*env)->ReleaseStringUTFChars(env, apk_path, apk);
 	(*env)->ReleaseStringUTFChars(env, out_port_file_path, out_port_file);
 
-	ares_library_cleanup();
 	tf_mem_shutdown();
 	tf_printf("tf_server_main finished with %d.", result);
 
@@ -968,7 +846,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
 
 	tf_printf("Registering method.\n");
 	static const JNINativeMethod methods[] = {
-		{ "tf_server_main", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/ConnectivityManager;)I", _tf_server_main },
+		{ "tf_server_main", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I", _tf_server_main },
 		{ "tf_sandbox_main", "(I)I", _tf_sandbox_main },
 	};
 	int result = (*env)->RegisterNatives(env, c, methods, (int)_countof(methods));
@@ -977,8 +855,6 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
 		return result;
 	}
 
-	ares_library_init_jvm(vm);
-
 	tf_printf("Done.\n");
 	return JNI_VERSION_1_6;
 }
@@ -1013,7 +889,6 @@ void tf_run_thread_start(const char* zip_path)
 int main(int argc, char* argv[])
 {
 	_startup(argc, argv);
-	ares_library_init(0);
 
 	int result = 0;
 	if (argc >= 2)
@@ -1034,7 +909,6 @@ int main(int argc, char* argv[])
 		result = _tf_command_run(argv[0], argc, argv);
 	}
 done:
-	ares_library_cleanup();
 	tf_mem_shutdown();
 	return result;
 }

src/mem.c

@@ -2,14 +2,15 @@
 
 #include "util.js.h"
 
+#include "uv.h"
 #include "quickjs.h"
 #include "sqlite3.h"
 #include "uv.h"
 
 #include <openssl/crypto.h>
 
-#include <stdbool.h>
 #include <string.h>
+#include <stdbool.h>
 
 typedef struct _tf_mem_node_t tf_mem_node_t;
 

src/serialize.c

@@ -6,9 +6,9 @@
 #include "trace.h"
 #include "util.js.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <assert.h>
 

src/ssb.connections.c

@@ -4,8 +4,8 @@
 #include "mem.h"
 #include "ssb.h"
 
-#include "sqlite3.h"
 #include "uv.h"
+#include "sqlite3.h"
 
 #include <string.h>
 
@@ -21,11 +21,6 @@ typedef struct _tf_ssb_connections_t
 
 static void _tf_ssb_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_change_t change, tf_ssb_connection_t* connection, void* user_data)
 {
-	if (!connection || tf_ssb_is_shutting_down(ssb))
-	{
-		return;
-	}
-
 	tf_ssb_connections_t* connections = user_data;
 	switch (change)
 	{
@@ -106,7 +101,7 @@ static void _tf_ssb_connections_get_next_after_work(tf_ssb_t* ssb, int status, v
 		uint8_t key_bin[k_id_bin_len];
 		if (tf_ssb_id_str_to_bin(key_bin, next->key))
 		{
-			tf_ssb_connect(ssb, next->host, next->port, key_bin, 0, NULL, NULL);
+			tf_ssb_connect(ssb, next->host, next->port, key_bin);
 		}
 	}
 	tf_free(next);
@@ -267,82 +262,3 @@ void tf_ssb_connections_set_succeeded(tf_ssb_connections_t* connections, const c
 	snprintf(update->key, sizeof(update->key), "%s", key);
 	_tf_ssb_connections_queue_update(connections, update);
 }
-
-static void _tf_ssb_connections_sync_broadcast_visit(
-	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
-{
-	tf_ssb_t* ssb = user_data;
-	if (tunnel)
-	{
-		char target_id[k_id_base64_len] = { 0 };
-		if (tf_ssb_id_bin_to_str(target_id, sizeof(target_id), pub))
-		{
-			char portal_id[k_id_base64_len] = { 0 };
-			if (tf_ssb_connection_get_id(tunnel, portal_id, sizeof(portal_id)))
-			{
-				tf_ssb_tunnel_create(ssb, portal_id, target_id, k_tf_ssb_connect_flag_one_shot);
-			}
-		}
-	}
-	else
-	{
-		tf_ssb_connect(ssb, host, ntohs(addr->sin_port), pub, k_tf_ssb_connect_flag_one_shot, NULL, NULL);
-	}
-}
-
-typedef struct _tf_ssb_connections_get_all_work_t
-{
-	char** connections;
-	int connections_count;
-} tf_ssb_connections_get_all_work_t;
-
-static void _tf_ssb_connections_get_all_work(tf_ssb_t* ssb, void* user_data)
-{
-	tf_ssb_connections_get_all_work_t* work = user_data;
-	sqlite3_stmt* statement;
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	if (sqlite3_prepare(db, "SELECT host, port, key FROM connections ORDER BY last_attempt", -1, &statement, NULL) == SQLITE_OK)
-	{
-		while (sqlite3_step(statement) == SQLITE_ROW)
-		{
-			const char* host = (const char*)sqlite3_column_text(statement, 0);
-			int port = sqlite3_column_int(statement, 1);
-			const char* key = (const char*)sqlite3_column_text(statement, 2);
-			char connection[1024] = { 0 };
-			snprintf(connection, sizeof(connection), "net:%s:%d~shs:%s", host, port, *key == '@' ? key + 1 : key);
-			char* dot = strrchr(connection, '.');
-			if (dot && strcmp(dot, ".ed25519") == 0)
-			{
-				*dot = '\0';
-			}
-			work->connections = tf_resize_vec(work->connections, sizeof(char*) * (work->connections_count + 1));
-			work->connections[work->connections_count++] = tf_strdup(connection);
-		}
-		sqlite3_finalize(statement);
-	}
-	else
-	{
-		tf_printf("prepare: %s\n", sqlite3_errmsg(db));
-	}
-	tf_ssb_release_db_reader(ssb, db);
-}
-
-static void _tf_ssb_connections_get_all_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	tf_ssb_connections_get_all_work_t* work = user_data;
-	for (int i = 0; i < work->connections_count; i++)
-	{
-		tf_ssb_connect_str(ssb, work->connections[i], k_tf_ssb_connect_flag_one_shot, NULL, NULL);
-		tf_free(work->connections[i]);
-	}
-	tf_free(work->connections);
-	tf_free(work);
-}
-
-void tf_ssb_connections_sync_start(tf_ssb_connections_t* connections)
-{
-	tf_ssb_connections_get_all_work_t* work = tf_malloc(sizeof(tf_ssb_connections_get_all_work_t));
-	*work = (tf_ssb_connections_get_all_work_t) { 0 };
-	tf_ssb_run_work(connections->ssb, _tf_ssb_connections_get_all_work, _tf_ssb_connections_get_all_after_work, work);
-	tf_ssb_visit_broadcasts(connections->ssb, _tf_ssb_connections_sync_broadcast_visit, connections->ssb);
-}

src/ssb.connections.h

@@ -53,10 +53,4 @@ void tf_ssb_connections_set_attempted(tf_ssb_connections_t* connections, const c
 */
 void tf_ssb_connections_set_succeeded(tf_ssb_connections_t* connections, const char* host, int port, const char* key);
 
-/**
-** Initiate an immediate sync.
-** @param connections The connections tracker.
-*/
-void tf_ssb_connections_sync_start(tf_ssb_connections_t* connections);
-
 /** @} */

src/ssb.db.c

@@ -133,7 +133,6 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_author_sequence_index ON messages (author, sequence)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_author_timestamp_index ON messages (author, timestamp)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_timestamp_index ON messages (timestamp)");
-	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_type_timestamp_index ON messages (content ->> 'type', timestamp)");
 	_tf_ssb_db_exec(db,
 		"CREATE TABLE IF NOT EXISTS blobs ("
 		"  id TEXT PRIMARY KEY,"
@@ -767,6 +766,14 @@ bool tf_ssb_db_blob_store(tf_ssb_t* ssb, const uint8_t* blob, size_t size, char*
 	}
 	tf_ssb_release_db_writer(ssb, db);
 
+	if (rows)
+	{
+		if (!out_new)
+		{
+			tf_printf("blob stored %s %zd => %d\n", id, size, result);
+		}
+	}
+
 	if (result && out_id)
 	{
 		snprintf(out_id, out_id_size, "%s", id);
@@ -1637,13 +1644,14 @@ bool tf_ssb_db_get_account_password_hash(tf_ssb_t* ssb, const char* name, char*
 	return result;
 }
 
-bool tf_ssb_db_set_account_password(uv_loop_t* loop, sqlite3* db, JSContext* context, const char* name, const char* password)
+bool tf_ssb_db_set_account_password(tf_ssb_t* ssb, const char* name, const char* password)
 {
+	JSContext* context = tf_ssb_get_context(ssb);
 	bool result = false;
 	static const int k_salt_length = 12;
 
 	char buffer[16];
-	size_t bytes = uv_random(loop, &(uv_random_t) { 0 }, buffer, sizeof(buffer), 0, NULL) == 0 ? sizeof(buffer) : 0;
+	size_t bytes = uv_random(tf_ssb_get_loop(ssb), &(uv_random_t) { 0 }, buffer, sizeof(buffer), 0, NULL) == 0 ? sizeof(buffer) : 0;
 	char output[7 + 22 + 1];
 	char* salt = crypt_gensalt_rn("$2b$", k_salt_length, buffer, bytes, output, sizeof(output));
 	char hash_output[7 + 22 + 31 + 1];
@@ -1655,6 +1663,7 @@ bool tf_ssb_db_set_account_password(uv_loop_t* loop, sqlite3* db, JSContext* con
 	size_t user_length = 0;
 	const char* user_string = JS_ToCStringLen(context, &user_length, user_json);
 
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
 	sqlite3_stmt* statement = NULL;
 	if (sqlite3_prepare(db, "INSERT OR REPLACE INTO properties (id, key, value) VALUES ('auth', 'user:' || ?, ?)", -1, &statement, NULL) == SQLITE_OK)
 	{
@@ -1664,6 +1673,7 @@ bool tf_ssb_db_set_account_password(uv_loop_t* loop, sqlite3* db, JSContext* con
 		}
 		sqlite3_finalize(statement);
 	}
+	tf_ssb_release_db_writer(ssb, db);
 
 	JS_FreeCString(context, user_string);
 	JS_FreeValue(context, user_json);
@@ -1671,36 +1681,13 @@ bool tf_ssb_db_set_account_password(uv_loop_t* loop, sqlite3* db, JSContext* con
 	return result;
 }
 
-static bool _tf_ssb_db_get_global_setting_bool(sqlite3* db, const char* name, bool default_value)
+bool tf_ssb_db_register_account(tf_ssb_t* ssb, const char* name, const char* password)
-{
-	bool result = default_value;
-	sqlite3_stmt* statement;
-	if (sqlite3_prepare(db, "SELECT json_extract(value, '$.' || ?) FROM properties WHERE id = 'core' AND key = 'settings'", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, name, -1, NULL) == SQLITE_OK)
-		{
-			if (sqlite3_step(statement) == SQLITE_ROW && sqlite3_column_type(statement, 0) != SQLITE_NULL)
-			{
-				result = sqlite3_column_int(statement, 0) != 0;
-			}
-		}
-		sqlite3_finalize(statement);
-	}
-	else
-	{
-		tf_printf("prepare failed: %s\n", sqlite3_errmsg(db));
-	}
-	return result;
-}
-
-bool tf_ssb_db_register_account(uv_loop_t* loop, sqlite3* db, JSContext* context, const char* name, const char* password)
 {
 	bool result = false;
+	JSContext* context = tf_ssb_get_context(ssb);
 	JSValue users_array = JS_UNDEFINED;
 
-	bool registration_allowed = _tf_ssb_db_get_global_setting_bool(db, "account_registration", true);
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	if (registration_allowed)
-	{
 	sqlite3_stmt* statement = NULL;
 	if (sqlite3_prepare(db, "SELECT value FROM properties WHERE id = 'auth' AND key = 'users'", -1, &statement, NULL) == SQLITE_OK)
 	{
@@ -1725,15 +1712,16 @@ bool tf_ssb_db_register_account(uv_loop_t* loop, sqlite3* db, JSContext* context
 	{
 		if (sqlite3_bind_text(statement, 1, value, value_length, NULL) == SQLITE_OK)
 		{
+			tf_printf("added user to properties\n");
 			result = sqlite3_step(statement) == SQLITE_DONE;
 		}
 		sqlite3_finalize(statement);
 	}
 	JS_FreeCString(context, value);
 	JS_FreeValue(context, json);
-	}
+	tf_ssb_release_db_writer(ssb, db);
 
-	result = result && tf_ssb_db_set_account_password(loop, db, context, name, password);
+	result = result && tf_ssb_db_set_account_password(ssb, name, password);
 	return result;
 }
 
@@ -1778,65 +1766,6 @@ bool tf_ssb_db_set_property(tf_ssb_t* ssb, const char* id, const char* key, cons
 	return result;
 }
 
-bool tf_ssb_db_remove_property(tf_ssb_t* ssb, const char* id, const char* key)
-{
-	bool result = false;
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db, "DELETE FROM properties WHERE id = ? AND key = ?", -1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK)
-		{
-			result = sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) != 0;
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_writer(ssb, db);
-	return result;
-}
-
-bool tf_ssb_db_remove_value_from_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value)
-{
-	bool result = false;
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db,
-			"UPDATE properties SET value = json_remove(properties.value, entry.fullkey) FROM json_each(properties.value) AS entry WHERE properties.id = ? AND properties.key = ? "
-			"AND entry.value = ?",
-			-1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK &&
-			sqlite3_bind_text(statement, 3, value, -1, NULL) == SQLITE_OK)
-		{
-			result = sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) != 0;
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_writer(ssb, db);
-	return result;
-}
-
-bool tf_ssb_db_add_value_to_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value)
-{
-	bool result = false;
-	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db,
-			"INSERT INTO properties (id, key, value) VALUES (?1, ?2, json_array(?3)) ON CONFLICT DO UPDATE SET value = json_insert(properties.value, '$[#]', ?3) WHERE "
-			"properties.id = ?1 AND properties.key = ?2 AND NOT EXISTS (SELECT 1 FROM json_each(properties.value) AS entry WHERE entry.value = ?3)",
-			-1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK &&
-			sqlite3_bind_text(statement, 3, value, -1, NULL) == SQLITE_OK)
-		{
-			result = sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) != 0;
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_writer(ssb, db);
-	return result;
-}
-
 bool tf_ssb_db_identity_get_active(sqlite3* db, const char* user, const char* package_owner, const char* package_name, char* out_identity, size_t out_identity_size)
 {
 	sqlite3_stmt* statement = NULL;
@@ -1996,24 +1925,3 @@ bool tf_ssb_db_verify(tf_ssb_t* ssb, const char* id)
 	}
 	return verified;
 }
-
-bool tf_ssb_db_user_has_permission(tf_ssb_t* ssb, const char* id, const char* permission)
-{
-	bool has_permission = false;
-	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
-	sqlite3_stmt* statement = NULL;
-	if (sqlite3_prepare(db,
-			"SELECT COUNT(*) FROM properties, json_each(properties.value -> 'permissions' -> ?) AS permission WHERE properties.id = 'core' AND properties.key = 'settings' AND "
-			"permission.value = ?",
-			-1, &statement, NULL) == SQLITE_OK)
-	{
-		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, permission, -1, NULL) == SQLITE_OK &&
-			sqlite3_step(statement) == SQLITE_ROW)
-		{
-			has_permission = sqlite3_column_int64(statement, 0) > 0;
-		}
-		sqlite3_finalize(statement);
-	}
-	tf_ssb_release_db_reader(ssb, db);
-	return has_permission;
-}

src/ssb.db.h

@@ -360,25 +360,21 @@ bool tf_ssb_db_get_account_password_hash(tf_ssb_t* ssb, const char* name, char*
 
 /**
 ** Insert or update a user's hashed password in the database.
-** @param loop The event loop.
+** @param ssb The SSB instance.
-** @param db A DB writer.
-** @param context A JS context.
 ** @param name The username.
 ** @param password The raw password.
 ** @return true if the hash of the password was successfully stored.
 */
-bool tf_ssb_db_set_account_password(uv_loop_t* loop, sqlite3* db, JSContext* context, const char* name, const char* password);
+bool tf_ssb_db_set_account_password(tf_ssb_t* ssb, const char* name, const char* password);
 
 /**
 ** Add a user account to the database.
-** @param loop The event loop.
+** @param ssb The SSB instance.
-** @param db A DB writer.
-** @param context A JS context.
 ** @param name The username to add.
 ** @param password The user's raw password.
 ** @return true If the user was added successfully.
 */
-bool tf_ssb_db_register_account(uv_loop_t* loop, sqlite3* db, JSContext* context, const char* name, const char* password);
+bool tf_ssb_db_register_account(tf_ssb_t* ssb, const char* name, const char* password);
 
 /**
 ** Get an entry from the properties table.
@@ -399,35 +395,6 @@ const char* tf_ssb_db_get_property(tf_ssb_t* ssb, const char* id, const char* ke
 */
 bool tf_ssb_db_set_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);
 
-/**
-** Remove an entry in the properties table.
-** @param ssb The SSB instance.
-** @param id The user.
-** @param key The property key.
-** @return true if the property was removed successfully.
-*/
-bool tf_ssb_db_remove_property(tf_ssb_t* ssb, const char* id, const char* key);
-
-/**
-** Remove a value from an entry in the properties table that is a JSON array.
-** @param ssb The SSB instance.
-** @param id The user.
-** @param key The property key.
-** @param value The value to remove from the JSON array.
-** @return true if the property was updated.
-*/
-bool tf_ssb_db_remove_value_from_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);
-
-/**
-** Ensure a value is in an entry in the properties table that is a JSON array.
-** @param ssb The SSB instance.
-** @param id The user.
-** @param key The property key.
-** @param value The value to add to the JSON array.
-** @return true if the property was updated.
-*/
-bool tf_ssb_db_add_value_to_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);
-
 /**
 ** Resolve a hostname to its index path by global settings.
 ** @param ssb The SSB instance.
@@ -445,15 +412,6 @@ void tf_ssb_db_resolve_index_async(tf_ssb_t* ssb, const char* host, void (*callb
 */
 bool tf_ssb_db_verify(tf_ssb_t* ssb, const char* id);
 
-/**
-** Check if a user has a specific permission.
-** @param ssb The SSB instance.
-** @param id The user ID.
-** @param permission The name of the permission.
-** @return true If the user has the requested permission.
-*/
-bool tf_ssb_db_user_has_permission(tf_ssb_t* ssb, const char* id, const char* permission);
-
 /**
 ** An SQLite authorizer callback.  See https://www.sqlite.org/c3ref/set_authorizer.html for use.
 ** @param user_data User data registered with the authorizer.

src/ssb.export.c

@@ -69,7 +69,7 @@ static void _tf_ssb_export_scandir(uv_fs_t* req)
 				int r = uv_fs_unlink(tf_ssb_get_loop(export->ssb), &req, path, NULL);
 				if (r)
 				{
-					tf_printf("Failed to unlink %s: %s.\n", path, uv_strerror(r));
+					tf_printf("Failed to unlink %s: %s.", path, uv_strerror(r));
 				}
 				uv_fs_req_cleanup(&req);
 				tf_free(path);
@@ -90,7 +90,7 @@ void tf_ssb_export(tf_ssb_t* ssb, const char* key)
 		return;
 	}
 
-	char app_blob_id[k_blob_id_len] = { 0 };
+	char app_blob_id[64] = { 0 };
 	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
 	sqlite3_busy_timeout(db, 10000);
 	sqlite3_stmt* statement;
@@ -199,7 +199,7 @@ void tf_ssb_export(tf_ssb_t* ssb, const char* key)
 	int r = uv_fs_scandir(tf_ssb_get_loop(ssb), &export.req, file_path, 0, _tf_ssb_export_scandir);
 	if (r)
 	{
-		tf_printf("Failed to scan directory %s: %s.\n", file_path, uv_strerror(r));
+		tf_printf("Failed to scan directory %s: %s.", file_path, uv_strerror(r));
 	}
 	while (!export.done)
 	{

src/ssb.h

@@ -28,8 +28,6 @@ enum
 	k_ssb_rpc_flag_new_request = 0x10,
 
 	k_ssb_blob_bytes_max = 5 * 1024 * 1024,
-
-	k_ssb_peer_exchange_expires_seconds = 60 * 60,
 };
 
 /**
@@ -43,16 +41,6 @@ typedef enum _tf_ssb_change_t
 	k_tf_ssb_change_update,
 } tf_ssb_change_t;
 
-/**
-** The origin of a broadcast entry.
-*/
-typedef enum _tf_ssb_broadcast_origin_t
-{
-	k_tf_ssb_broadcast_origin_discovery,
-	k_tf_ssb_broadcast_origin_room,
-	k_tf_ssb_broadcast_origin_peer_exchange,
-} tf_ssb_broadcast_origin_t;
-
 /**
 ** Flags describing the structure of a message.
 */
@@ -65,14 +53,6 @@ typedef enum _tf_ssb_message_flags_t
 	k_tf_ssb_message_flag_sequence_before_author = 1,
 } tf_ssb_message_flags_t;
 
-/**
-** Flags affecting an SSB connection.
-*/
-typedef enum _tf_ssb_connect_flags_t
-{
-	k_tf_ssb_connect_flag_one_shot = 0x1,
-} tf_ssb_connect_flags_t;
-
 /** An SSB instance. */
 typedef struct _tf_ssb_t tf_ssb_t;
 /** An SSB connection. */
@@ -319,18 +299,8 @@ bool tf_ssb_whoami(tf_ssb_t* ssb, char* out_id, size_t out_id_size);
 ** @param callback The callback.
 ** @param user_data User data for the callback.
 */
-void tf_ssb_visit_broadcasts(tf_ssb_t* ssb,
+void tf_ssb_visit_broadcasts(
-	void (*callback)(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data),
+	tf_ssb_t* ssb, void (*callback)(const char* host, const struct sockaddr_in* addr, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data), void* user_data);
-	void* user_data);
-
-/**
-** Add a broadcast entry.
-** @param ssb The SSB instance.
-** @param connection The connection string to add.
-** @param origin The origin of the broadcast entry.
-** @param expires_seconds How long the broadcast entry should last.
-*/
-void tf_ssb_add_broadcast(tf_ssb_t* ssb, const char* connection, tf_ssb_broadcast_origin_t origin, int64_t expires_seconds);
 
 /**
 ** Get the identities of all active connections.
@@ -348,35 +318,21 @@ const char** tf_ssb_get_connection_ids(tf_ssb_t* ssb);
 */
 int tf_ssb_get_connections(tf_ssb_t* ssb, tf_ssb_connection_t** out_connections, int out_connections_count);
 
-/**
-** Callback for completing establishing a connection.
-** @param connection The established connection if successful or null.
-** @param reason The reason for failure if the connection failed.
-** @param user_data User data.
-*/
-typedef void(tf_ssb_connect_callback_t)(tf_ssb_connection_t* connection, const char* reason, void* user_data);
-
 /**
 ** Establish an SHS connection with a host.
 ** @param ssb The SSB instance.
 ** @param host The host name or address.
 ** @param port The host's SHS port.
 ** @param key The host's SSB identity.
-** @param connect_flags Flags affecting the connection.
-** @param callback Completion callback.
-** @param user_data User data to be passed to the callback.
 */
-void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* key, int connect_flags, tf_ssb_connect_callback_t* callback, void* user_data);
+void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* key);
 
 /**
 ** Establish an SHS connection with a host by string address.
 ** @param ssb The SSB instance.
 ** @param address The address.
-** @param connect_flags Flags affecting the connection.
-** @param callback Completion callback.
-** @param user_data User data to be passed to the callback.
 */
-void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address, int connect_flags, tf_ssb_connect_callback_t* callback, void* user_data);
+void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address);
 
 /**
 ** Begin listening for SHS connections on the given port.
@@ -386,13 +342,6 @@ void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address, int connect_flags, t
 */
 int tf_ssb_server_open(tf_ssb_t* ssb, int port);
 
-/**
-** Determine the port that a server is listening on.
-** @param ssb The SSB instance.
-** @return The port number, or 0 if not bound.
-*/
-int tf_ssb_server_get_port(tf_ssb_t* ssb);
-
 /**
 ** Stop listening for SHS connections.
 ** @param ssb The SSB instance.
@@ -402,9 +351,8 @@ void tf_ssb_server_close(tf_ssb_t* ssb);
 /**
 ** Close all active SHS connections.
 ** @param ssb The SSB instance.
-** @param reason Reason for the close.
 */
-void tf_ssb_close_all(tf_ssb_t* ssb, const char* reason);
+void tf_ssb_close_all(tf_ssb_t* ssb);
 
 /**
 ** Send a graceful close message to all active SHS connections.
@@ -699,12 +647,12 @@ typedef void(tf_ssb_rpc_callback_t)(tf_ssb_connection_t* connection, uint8_t fla
 /**
 ** Register a MUXRPC callback by name.
 ** @param ssb The SSB instance.
-** @param name The RPC name as a .-separated string.
+** @param name The NULL-terminated name.
 ** @param callback The callback.
 ** @param cleanup A function to be called when the callback is removed.
 ** @param user_data User data to pass to the callback.
 */
-void tf_ssb_add_rpc_callback(tf_ssb_t* ssb, const char* name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
+void tf_ssb_add_rpc_callback(tf_ssb_t* ssb, const char** name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
 
 /**
 ** Remove a MUXRPC callback.
@@ -726,9 +674,8 @@ void tf_ssb_remove_rpc_callback(tf_ssb_t* ssb, const char** name, tf_ssb_rpc_cal
 ** @param callback A callback to call if a response is received.
 ** @param cleanup A callback to call if the callback is removed.
 ** @param user_data User data to pass to the callback.
-** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-bool tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
+void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
 	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
 
 /**
@@ -741,9 +688,8 @@ bool tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags,
 ** @param callback A callback to call if a response is received.
 ** @param cleanup A callback to call if the callback is removed.
 ** @param user_data User data to pass to the callback.
-** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-bool tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
+void tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
 	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
 
 /**
@@ -752,9 +698,8 @@ bool tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t fl
 ** @param flags The message flags.
 ** @param request_number The request number.
 ** @param error The error string.
-** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-bool tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* error);
+void tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* error);
 
 /**
 ** Send a MUXRPC "method not allowed" error message.
@@ -762,9 +707,8 @@ bool tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t f
 ** @param flags The message flags.
 ** @param request_number The request number.
 ** @param name The name of the not-allowed method.
-** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-bool tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* name);
+void tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* name);
 
 /**
 ** Register a callback to be called when a message is received for the given
@@ -894,10 +838,9 @@ void tf_ssb_connection_remove_room_attendant(tf_ssb_connection_t* connection, co
 ** @param portal_id The identity of the tunnel intermediary.
 ** @param request_number The tunnel request.
 ** @param target_id The identity being tunneled to.
-** @param connect_flags Flags affecting the connection.
 ** @return The new tunnel connection.
 */
-tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char* portal_id, int32_t request_number, const char* target_id, int connect_flags);
+tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char* portal_id, int32_t request_number, const char* target_id);
 
 /**
 ** Get the request number on which to send EBT responses.
@@ -1021,34 +964,6 @@ bool tf_ssb_is_room(tf_ssb_t* ssb);
 */
 void tf_ssb_set_is_room(tf_ssb_t* ssb, bool is_room);
 
-/**
-** Get whether the running server supports replication of messages and blobs.
-** @param ssb The SSB instance.
-** @return True if the server is a replicator.
-*/
-bool tf_ssb_is_replicator(tf_ssb_t* ssb);
-
-/**
-** Set whether the running server supports replication of messages and blobs.
-** @param ssb The SSB instance.
-** @param is_replicator Whether to support replication.
-*/
-void tf_ssb_set_is_replicator(tf_ssb_t* ssb, bool is_replicator);
-
-/**
-** Get whether the running server participates in peer exchange.
-** @param ssb The SSB instance.
-** @return True if the server participates in peer exchange.
-*/
-bool tf_ssb_is_peer_exchange(tf_ssb_t* ssb);
-
-/**
-** Set whether the running server participates in peer exchange.
-** @param ssb The SSB instance.
-** @param is_peer_exchange Whether to participate in peer exchange.
-*/
-void tf_ssb_set_is_peer_exchange(tf_ssb_t* ssb, bool is_peer_exchange);
-
 /**
 ** Get the name of the room hosted by the running server.
 ** @param ssb The SSB instance.
@@ -1101,26 +1016,4 @@ 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);
 
-/**
-** Initiate a tunnel connection.
-** @param ssb The SSB instance.
-** @param portal_id The public key of the instance through which to tunnel.
-** @param target_id The public key of the instance with which to establish a connection.
-** @param connect_flags Flags affecting the connection.
-** @return true if the tunnel instance was found.
-*/
-bool tf_ssb_tunnel_create(tf_ssb_t* ssb, const char* portal_id, const char* target_id, int connect_flags);
-
-/**
-** Initiate a one time sync operation.
-** @param ssb The SSB instance.
-*/
-void tf_ssb_sync_start(tf_ssb_t* ssb);
-
-/**
-** Get a connection's flags.
-** @param connection The connection.
-*/
-int tf_ssb_connection_get_flags(tf_ssb_connection_t* connection);
-
 /** @} */

src/ssb.import.c

@@ -155,7 +155,7 @@ static void _tf_ssb_import_recursive_add_files(tf_ssb_t* ssb, uv_loop_t* loop, J
 	}
 	else
 	{
-		tf_printf("Failed to scan directory %s: %s.\n", path, uv_strerror(r));
+		tf_printf("Failed to scan directory %s: %s.", path, uv_strerror(r));
 	}
 	uv_fs_req_cleanup(&req);
 }
@@ -231,11 +231,7 @@ static void _tf_ssb_import_app_json(tf_ssb_t* ssb, uv_loop_t* loop, JSContext* c
 
 void tf_ssb_import(tf_ssb_t* ssb, const char* user, const char* path)
 {
-	if (!path)
+	if (strlen(path) > strlen(".json") && strcasecmp(path + strlen(path) - strlen(".json"), ".json") == 0)
-	{
-		return;
-	}
-	else if (strlen(path) > strlen(".json") && strcasecmp(path + strlen(path) - strlen(".json"), ".json") == 0)
 	{
 		_tf_ssb_import_app_json(ssb, tf_ssb_get_loop(ssb), tf_ssb_get_context(ssb), user, path);
 	}
@@ -260,7 +256,7 @@ void tf_ssb_import(tf_ssb_t* ssb, const char* user, const char* path)
 		}
 		else
 		{
-			tf_printf("Failed to scan directory %s: %s.\n", path, uv_strerror(r));
+			tf_printf("Failed to scan directory %s: %s.", path, uv_strerror(r));
 		}
 		uv_fs_req_cleanup(&req);
 	}

src/ssb.js.c

@@ -13,8 +13,8 @@
 #include "sodium/crypto_secretbox.h"
 #include "sodium/crypto_sign.h"
 #include "sodium/randombytes.h"
-#include "sqlite3.h"
 #include "string.h"
+#include "sqlite3.h"
 #include "uv.h"
 
 #include <assert.h>
@@ -360,109 +360,6 @@ static JSValue _tf_ssb_set_server_following_me(JSContext* context, JSValueConst
 	return result;
 }
 
-typedef struct _swap_with_server_identity_t
-{
-	char server_id[k_id_base64_len];
-	char id[k_id_base64_len];
-	JSValue promise[2];
-	char* error;
-	char user[];
-} swap_with_server_identity_t;
-
-static void _tf_ssb_swap_with_server_identity_work(tf_ssb_t* ssb, void* user_data)
-{
-	swap_with_server_identity_t* work = user_data;
-	if (tf_ssb_db_user_has_permission(ssb, work->user, "administration"))
-	{
-		sqlite3* db = tf_ssb_acquire_db_writer(ssb);
-		char* error = NULL;
-		if (sqlite3_exec(db, "BEGIN TRANSACTION", NULL, NULL, &error) == SQLITE_OK)
-		{
-			sqlite3_stmt* statement = NULL;
-			if (sqlite3_prepare(db, "UPDATE identities SET user = ? WHERE user = ? AND '@' || public_key = ?", -1, &statement, NULL) == SQLITE_OK)
-			{
-				if (sqlite3_bind_text(statement, 1, work->user, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, ":admin", -1, NULL) == SQLITE_OK &&
-					sqlite3_bind_text(statement, 3, work->server_id, -1, NULL) == SQLITE_OK && sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) == 1 &&
-					sqlite3_reset(statement) == SQLITE_OK && sqlite3_bind_text(statement, 1, ":admin", -1, NULL) == SQLITE_OK &&
-					sqlite3_bind_text(statement, 2, work->user, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 3, work->id, -1, NULL) == SQLITE_OK &&
-					sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) == 1)
-				{
-					error = NULL;
-					if (sqlite3_exec(db, "COMMIT TRANSACTION", NULL, NULL, &error) != SQLITE_OK)
-					{
-						work->error = error ? tf_strdup(error) : tf_strdup(sqlite3_errmsg(db));
-					}
-				}
-				else
-				{
-					work->error = tf_strdup(sqlite3_errmsg(db) ? sqlite3_errmsg(db) : "swap failed");
-				}
-				sqlite3_finalize(statement);
-			}
-			else
-			{
-				work->error = tf_strdup(sqlite3_errmsg(db));
-			}
-		}
-		else
-		{
-			work->error = error ? tf_strdup(error) : tf_strdup(sqlite3_errmsg(db));
-		}
-		tf_ssb_release_db_writer(ssb, db);
-	}
-	else
-	{
-		work->error = tf_strdup("not administrator");
-	}
-}
-
-static void _tf_ssb_swap_with_server_identity_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	swap_with_server_identity_t* work = user_data;
-	JSContext* context = tf_ssb_get_context(ssb);
-	JSValue error = JS_UNDEFINED;
-	if (work->error)
-	{
-		JSValue arg = JS_ThrowInternalError(context, "%s", work->error);
-		JSValue exception = JS_GetException(context);
-		error = JS_Call(context, work->promise[1], JS_UNDEFINED, 1, &exception);
-		tf_free(work->error);
-		JS_FreeValue(context, exception);
-		JS_FreeValue(context, arg);
-	}
-	else
-	{
-		error = JS_Call(context, work->promise[0], JS_UNDEFINED, 0, NULL);
-	}
-	tf_util_report_error(context, error);
-	JS_FreeValue(context, error);
-	JS_FreeValue(context, work->promise[0]);
-	JS_FreeValue(context, work->promise[1]);
-	tf_free(work);
-}
-
-static JSValue _tf_ssb_swap_with_server_identity(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
-	JSValue result = JS_UNDEFINED;
-	if (ssb)
-	{
-		size_t user_length = 0;
-		const char* user = JS_ToCStringLen(context, &user_length, argv[0]);
-		const char* id = JS_ToCString(context, argv[1]);
-		swap_with_server_identity_t* work = tf_malloc(sizeof(swap_with_server_identity_t) + user_length + 1);
-		*work = (swap_with_server_identity_t) { 0 };
-		tf_ssb_whoami(ssb, work->server_id, sizeof(work->server_id));
-		snprintf(work->id, sizeof(work->id), "%s", id);
-		memcpy(work->user, user, user_length + 1);
-		result = JS_NewPromiseCapability(context, work->promise);
-		tf_ssb_run_work(ssb, _tf_ssb_swap_with_server_identity_work, _tf_ssb_swap_with_server_identity_after_work, work);
-		JS_FreeCString(context, user);
-		JS_FreeCString(context, id);
-	}
-	return result;
-}
-
 typedef struct _identities_visit_t
 {
 	JSContext* context;
@@ -484,14 +381,6 @@ static void _tf_ssb_getIdentities_visit(const char* identity, void* user_data)
 static void _tf_ssb_get_identities_work(tf_ssb_t* ssb, void* user_data)
 {
 	identities_visit_t* work = user_data;
-	if (tf_ssb_db_user_has_permission(ssb, work->user, "administration"))
-	{
-		char id[k_id_base64_len] = "";
-		if (tf_ssb_whoami(ssb, id, sizeof(id)))
-		{
-			_tf_ssb_getIdentities_visit(*id == '@' ? id + 1 : id, work);
-		}
-	}
 	tf_ssb_db_identity_visit(ssb, work->user, _tf_ssb_getIdentities_visit, user_data);
 }
 
@@ -556,10 +445,6 @@ static void _tf_ssb_get_private_key_work(tf_ssb_t* ssb, void* user_data)
 {
 	get_private_key_t* work = user_data;
 	work->got_private_key = tf_ssb_db_identity_get_private_key(ssb, work->user, work->id, work->private_key, sizeof(work->private_key));
-	if (!work->got_private_key && tf_ssb_db_user_has_permission(ssb, work->user, "administration"))
-	{
-		work->got_private_key = tf_ssb_db_identity_get_private_key(ssb, ":admin", work->id, work->private_key, sizeof(work->private_key));
-	}
 }
 
 static void _tf_ssb_get_private_key_after_work(tf_ssb_t* ssb, int status, void* user_data)
@@ -740,14 +625,6 @@ static void _tf_ssb_getIdentityInfo_visit(const char* identity, void* data)
 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, 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);
@@ -760,15 +637,12 @@ static void _tf_ssb_getIdentityInfo_work(tf_ssb_t* ssb, void* user_data)
 		"		messages.content ->> 'name' AS name "
 		"	FROM messages "
 		"	JOIN identities ON messages.author = ('@' || identities.public_key) "
-		"	WHERE "
+		"	WHERE identities.user = ? AND json_extract(messages.content, '$.type') = 'about' AND content ->> 'about' = messages.author AND name IS NOT NULL) "
-		"		(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)
+		if (sqlite3_bind_text(statement, 1, request->name, -1, NULL) == SQLITE_OK)
 		{
 			int r = SQLITE_OK;
 			while ((r = sqlite3_step(statement)) == SQLITE_ROW)
@@ -903,10 +777,6 @@ static void _tf_ssb_append_message_with_identity_get_key_work(tf_ssb_t* ssb, voi
 {
 	append_message_t* work = user_data;
 	work->got_private_key = tf_ssb_db_identity_get_private_key(ssb, work->user, work->id, work->private_key, sizeof(work->private_key));
-	if (!work->got_private_key && tf_ssb_db_user_has_permission(ssb, work->user, "administration"))
-	{
-		work->got_private_key = tf_ssb_db_identity_get_private_key(ssb, ":admin", work->id, work->private_key, sizeof(work->private_key));
-	}
 	tf_ssb_db_get_latest_message_by_author(ssb, work->id, &work->previous_sequence, work->previous_id, sizeof(work->previous_id));
 }
 
@@ -1115,10 +985,6 @@ static JSValue _tf_ssb_connections(JSContext* context, JSValueConst this_val, in
 				JS_SetPropertyStr(context, object, "tunnel", JS_NewInt32(context, tunnel_index));
 			}
 			JS_SetPropertyStr(context, object, "requests", tf_ssb_connection_requests_to_object(connection));
-			JSValue flags_object = JS_NewObject(context);
-			int flags = tf_ssb_connection_get_flags(connection);
-			JS_SetPropertyStr(context, flags_object, "one_shot", JS_NewBool(context, (flags & k_tf_ssb_connect_flag_one_shot) != 0));
-			JS_SetPropertyStr(context, object, "flags", flags_object);
 			JS_SetPropertyUint32(context, result, i, object);
 		}
 	}
@@ -1584,25 +1450,12 @@ typedef struct _broadcasts_t
 	int length;
 } broadcasts_t;
 
-static void _tf_ssb_broadcasts_visit(
+static void _tf_ssb_broadcasts_visit(const char* host, const struct sockaddr_in* addr, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
-	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
 {
 	broadcasts_t* broadcasts = user_data;
 	JSValue entry = JS_NewObject(broadcasts->context);
 	char pubkey[k_id_base64_len];
 	tf_ssb_id_bin_to_str(pubkey, sizeof(pubkey), pub);
-	switch (origin)
-	{
-	case k_tf_ssb_broadcast_origin_discovery:
-		JS_SetPropertyStr(broadcasts->context, entry, "origin", JS_NewString(broadcasts->context, "discovery"));
-		break;
-	case k_tf_ssb_broadcast_origin_room:
-		JS_SetPropertyStr(broadcasts->context, entry, "origin", JS_NewString(broadcasts->context, "room"));
-		break;
-	case k_tf_ssb_broadcast_origin_peer_exchange:
-		JS_SetPropertyStr(broadcasts->context, entry, "origin", JS_NewString(broadcasts->context, "peer_exchange"));
-		break;
-	}
 	if (tunnel)
 	{
 		JS_SetPropertyStr(broadcasts->context, entry, "tunnel", JS_DupValue(broadcasts->context, tf_ssb_connection_get_object(tunnel)));
@@ -1633,41 +1486,17 @@ static JSValue _tf_ssb_getBroadcasts(JSContext* context, JSValueConst this_val,
 	return result;
 }
 
-typedef struct _connect_t
-{
-	JSContext* context;
-	JSValue promise[2];
-} connect_t;
-
-static void _tf_ssb_connect_callback(tf_ssb_connection_t* connection, const char* reason, void* user_data)
-{
-	connect_t* connect = user_data;
-	JSContext* context = connect->context;
-	JSValue arg = connection ? JS_UNDEFINED : JS_NewString(context, reason);
-	JSValue result = JS_Call(context, connection ? connect->promise[0] : connect->promise[1], JS_UNDEFINED, connection ? 0 : 1, &arg);
-	tf_util_report_error(context, result);
-	JS_FreeValue(context, result);
-	JS_FreeValue(context, connect->promise[0]);
-	JS_FreeValue(context, connect->promise[1]);
-	JS_FreeValue(context, arg);
-	tf_free(connect);
-}
-
 static JSValue _tf_ssb_connect(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
 {
-	JSValue result = JS_UNDEFINED;
 	JSValue args = argv[0];
 	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
 	if (ssb)
 	{
-		connect_t* connect = tf_malloc(sizeof(connect_t));
-		*connect = (connect_t) { .context = context };
-		result = JS_NewPromiseCapability(context, connect->promise);
 		if (JS_IsString(args))
 		{
 			const char* address_str = JS_ToCString(context, args);
 			tf_printf("Connecting to %s\n", address_str);
-			tf_ssb_connect_str(ssb, address_str, 0, _tf_ssb_connect_callback, connect);
+			tf_ssb_connect_str(ssb, address_str);
 			JS_FreeCString(context, address_str);
 		}
 		else
@@ -1684,11 +1513,11 @@ static JSValue _tf_ssb_connect(JSContext* context, JSValueConst this_val, int ar
 				tf_printf("Connecting to %s:%d\n", address_str, port_int);
 				uint8_t pubkey_bin[k_id_bin_len];
 				tf_ssb_id_str_to_bin(pubkey_bin, pubkey_str);
-				tf_ssb_connect(ssb, address_str, port_int, pubkey_bin, 0, _tf_ssb_connect_callback, connect);
+				tf_ssb_connect(ssb, address_str, port_int, pubkey_bin);
 			}
 			else
 			{
-				_tf_ssb_connect_callback(NULL, "Not connecting to null.", connect);
+				tf_printf("Not connecting to null.\n");
 			}
 			JS_FreeCString(context, pubkey_str);
 			JS_FreeCString(context, address_str);
@@ -1697,7 +1526,7 @@ static JSValue _tf_ssb_connect(JSContext* context, JSValueConst this_val, int ar
 			JS_FreeValue(context, pubkey);
 		}
 	}
-	return result;
+	return JS_UNDEFINED;
 }
 
 typedef struct _forget_stored_connection_t
@@ -1957,15 +1786,37 @@ static JSValue _tf_ssb_remove_event_listener(JSContext* context, JSValueConst th
 
 static JSValue _tf_ssb_createTunnel(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
 {
+	JSValue result = JS_UNDEFINED;
 	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
 	const char* portal_id = JS_ToCString(context, argv[0]);
 	const char* target_id = JS_ToCString(context, argv[1]);
 
-	bool result = tf_ssb_tunnel_create(ssb, portal_id, target_id, 0);
+	tf_ssb_connection_t* connection = tf_ssb_connection_get(ssb, portal_id);
+	if (connection)
+	{
+		int32_t request_number = tf_ssb_connection_next_request_number(connection);
+		JSValue message = JS_NewObject(context);
+		JSValue name = JS_NewArray(context);
+		JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "tunnel"));
+		JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "connect"));
+		JS_SetPropertyStr(context, message, "name", name);
+		JSValue arg = JS_NewObject(context);
+		JS_SetPropertyStr(context, arg, "portal", JS_NewString(context, portal_id));
+		JS_SetPropertyStr(context, arg, "target", JS_NewString(context, target_id));
+		JSValue args = JS_NewArray(context);
+		JS_SetPropertyUint32(context, args, 0, arg);
+		JS_SetPropertyStr(context, message, "args", args);
+		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, "tunnel.connect", message, NULL, NULL, NULL);
+		JS_FreeValue(context, message);
+
+		tf_ssb_connection_tunnel_create(ssb, portal_id, request_number, target_id);
+		result = JS_TRUE;
+	}
 
 	JS_FreeCString(context, target_id);
 	JS_FreeCString(context, portal_id);
-	return result ? JS_TRUE : JS_FALSE;
+	return result;
 }
 
 enum
@@ -1975,7 +1826,7 @@ enum
 
 static bool _tf_ssb_get_private_key_curve25519(sqlite3* db, const char* user, const char* identity, uint8_t out_private_key[static crypto_sign_SECRETKEYBYTES])
 {
-	if (!user || !identity)
+	if (!user || !identity || !out_private_key)
 	{
 		tf_printf("user=%p identity=%p out_private_key=%p\n", user, identity, out_private_key);
 		return false;
@@ -2415,117 +2266,6 @@ static JSValue _tf_ssb_following(JSContext* context, JSValueConst this_val, int
 	return result;
 }
 
-static JSValue _tf_ssb_sync(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
-	tf_ssb_sync_start(ssb);
-	return JS_UNDEFINED;
-}
-
-typedef struct _set_user_permission_t
-{
-	tf_ssb_t* ssb;
-	JSContext* context;
-	const char* user;
-	const char* package_owner;
-	const char* package_name;
-	const char* permission;
-	bool allow;
-	bool result;
-	JSValue promise[2];
-} set_user_permission_t;
-
-static void _tf_ssb_set_user_permission_work(tf_ssb_t* ssb, void* user_data)
-{
-	set_user_permission_t* work = user_data;
-
-	JSMallocFunctions funcs = { 0 };
-	tf_get_js_malloc_functions(&funcs);
-	JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
-	JSContext* context = JS_NewContext(runtime);
-
-	/* XXX: Do this with one DB writer. */
-	const char* settings = tf_ssb_db_get_property(ssb, "core", "settings");
-	if (settings)
-	{
-		JSValue settings_value = JS_ParseJSON(context, settings, strlen(settings), NULL);
-		JSValue user_permissions = JS_GetPropertyStr(context, settings_value, "userPermissions");
-		if (JS_IsUndefined(user_permissions))
-		{
-			user_permissions = JS_NewObject(context);
-			JS_SetPropertyStr(context, settings_value, "userPermissions", JS_DupValue(context, user_permissions));
-		}
-		JSValue user = JS_GetPropertyStr(context, user_permissions, work->user);
-		if (JS_IsUndefined(user))
-		{
-			user = JS_NewObject(context);
-			JS_SetPropertyStr(context, user_permissions, work->user, JS_DupValue(context, user));
-		}
-		JSValue package_owner = JS_GetPropertyStr(context, user, work->package_owner);
-		if (JS_IsUndefined(package_owner))
-		{
-			package_owner = JS_NewObject(context);
-			JS_SetPropertyStr(context, user, work->package_owner, JS_DupValue(context, package_owner));
-		}
-		JSValue package_name = JS_GetPropertyStr(context, package_owner, work->package_name);
-		if (JS_IsUndefined(package_name))
-		{
-			package_name = JS_NewObject(context);
-			JS_SetPropertyStr(context, package_owner, work->package_name, package_name);
-		}
-		JSValue permission = JS_GetPropertyStr(context, package_name, work->permission);
-		if (JS_ToBool(context, permission) != work->allow)
-		{
-			JS_SetPropertyStr(context, package_name, work->permission, JS_NewBool(context, work->allow));
-			JSValue settings_json = JS_JSONStringify(context, settings_value, JS_NULL, JS_NULL);
-			const char* settings_string = JS_ToCString(context, settings_json);
-			work->result = tf_ssb_db_set_property(ssb, "core", "settings", settings_string);
-			JS_FreeCString(context, settings_string);
-			JS_FreeValue(context, settings_json);
-		}
-		else
-		{
-			work->result = true;
-		}
-	}
-
-	JS_FreeContext(context);
-	JS_FreeRuntime(runtime);
-}
-
-static void _tf_ssb_set_user_permission_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	set_user_permission_t* work = user_data;
-	JSContext* context = work->context;
-	JS_FreeCString(context, work->user);
-	JS_FreeCString(context, work->package_owner);
-	JS_FreeCString(context, work->package_name);
-	JS_FreeCString(context, work->permission);
-	JSValue error = JS_Call(context, work->result ? work->promise[0] : work->promise[0], JS_UNDEFINED, 0, NULL);
-	tf_util_report_error(context, error);
-	JS_FreeValue(context, error);
-	JS_FreeValue(context, work->promise[0]);
-	JS_FreeValue(context, work->promise[1]);
-	tf_free(work);
-}
-
-static JSValue _tf_ssb_set_user_permission(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	set_user_permission_t* set = tf_malloc(sizeof(set_user_permission_t));
-	*set = (set_user_permission_t) {
-		.ssb = JS_GetOpaque(this_val, _tf_ssb_classId),
-		.context = context,
-		.user = JS_ToCString(context, argv[0]),
-		.package_owner = JS_ToCString(context, argv[1]),
-		.package_name = JS_ToCString(context, argv[2]),
-		.permission = JS_ToCString(context, argv[3]),
-		.allow = JS_ToBool(context, argv[4]),
-	};
-	JSValue result = JS_NewPromiseCapability(context, set->promise);
-	tf_ssb_run_work(set->ssb, _tf_ssb_set_user_permission_work, _tf_ssb_set_user_permission_after_work, set);
-	return result;
-}
-
 void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 {
 	JS_NewClassID(&_tf_ssb_classId);
@@ -2547,12 +2287,10 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 	JS_SetPropertyStr(context, object, "addIdentity", JS_NewCFunction(context, _tf_ssb_addIdentity, "addIdentity", 2));
 	JS_SetPropertyStr(context, object, "deleteIdentity", JS_NewCFunction(context, _tf_ssb_deleteIdentity, "deleteIdentity", 2));
 	JS_SetPropertyStr(context, object, "setServerFollowingMe", JS_NewCFunction(context, _tf_ssb_set_server_following_me, "setServerFollowingMe", 3));
-	JS_SetPropertyStr(context, object, "swapWithServerIdentity", JS_NewCFunction(context, _tf_ssb_swap_with_server_identity, "swapWithServerIdentity", 2));
 	JS_SetPropertyStr(context, object, "getIdentities", JS_NewCFunction(context, _tf_ssb_getIdentities, "getIdentities", 1));
 	JS_SetPropertyStr(context, object, "getPrivateKey", JS_NewCFunction(context, _tf_ssb_getPrivateKey, "getPrivateKey", 2));
 	JS_SetPropertyStr(context, object, "privateMessageEncrypt", JS_NewCFunction(context, _tf_ssb_private_message_encrypt, "privateMessageEncrypt", 4));
 	JS_SetPropertyStr(context, object, "privateMessageDecrypt", JS_NewCFunction(context, _tf_ssb_private_message_decrypt, "privateMessageDecrypt", 3));
-	JS_SetPropertyStr(context, object, "setUserPermission", JS_NewCFunction(context, _tf_ssb_set_user_permission, "setUserPermission", 5));
 	/* Write. */
 	JS_SetPropertyStr(context, object, "appendMessageWithIdentity", JS_NewCFunction(context, _tf_ssb_appendMessageWithIdentity, "appendMessageWithIdentity", 3));
 
@@ -2572,7 +2310,6 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
 	JS_SetPropertyStr(context, object, "connect", JS_NewCFunction(context, _tf_ssb_connect, "connect", 1));
 	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));
 	/* 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

@@ -2,8 +2,8 @@
 
 #include "log.h"
 #include "mem.h"
-#include "ssb.db.h"
 #include "ssb.h"
+#include "ssb.db.h"
 #include "util.js.h"
 
 #include "sqlite3.h"
@@ -18,9 +18,7 @@
 #define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
 #endif
 
-static void _tf_ssb_connection_send_history_stream(
+static void _tf_ssb_connection_send_history_stream(tf_ssb_connection_t* connection, int32_t request_number, const char* author, int64_t sequence, bool keys, bool live);
-	tf_ssb_connection_t* connection, int32_t request_number, const char* author, int64_t sequence, bool keys, bool live, bool end_request);
-static void _tf_ssb_rpc_send_peers_exchange(tf_ssb_connection_t* connection);
 static void _tf_ssb_rpc_start_delete_blobs(tf_ssb_t* ssb, int delay_ms);
 
 static int64_t _get_global_setting_int64(tf_ssb_t* ssb, const char* name, int64_t default_value)
@@ -93,11 +91,8 @@ static void _tf_ssb_rpc_blobs_get_after_work(tf_ssb_connection_t* connection, in
 		const size_t k_send_max = 8192;
 		for (size_t offset = 0; offset < work->size; offset += k_send_max)
 		{
-			if (!tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_binary | k_ssb_rpc_flag_stream, -work->request_number, NULL, work->blob + offset,
+			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_binary | k_ssb_rpc_flag_stream, -work->request_number, NULL, work->blob + offset,
-					offset + k_send_max <= work->size ? k_send_max : (work->size - offset), NULL, NULL, NULL))
+				offset + k_send_max <= work->size ? k_send_max : (work->size - offset), NULL, NULL, NULL);
-			{
-				break;
-			}
 		}
 		tf_free(work->blob);
 	}
@@ -110,13 +105,6 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 {
 	if (flags & k_ssb_rpc_flag_end_error)
 	{
-		tf_ssb_connection_remove_request(connection, -request_number);
-		return;
-	}
-	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
-	if (!tf_ssb_is_replicator(ssb))
-	{
-		tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, "blobs.get");
 		return;
 	}
 
@@ -153,51 +141,18 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 	JS_FreeValue(context, ids);
 }
 
-typedef struct _blobs_has_work_t
-{
-	int64_t request_number;
-	char id[k_id_base64_len];
-	bool found;
-} blobs_has_work_t;
-
-static void _tf_ssb_rpc_blobs_has_work(tf_ssb_connection_t* connection, void* user_data)
-{
-	blobs_has_work_t* work = user_data;
-	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
-	work->found = tf_ssb_db_blob_has(ssb, work->id);
-}
-
-static void _tf_ssb_rpc_blobs_has_after_work(tf_ssb_connection_t* connection, int status, void* user_data)
-{
-	blobs_has_work_t* work = user_data;
-	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json | k_ssb_rpc_flag_end_error | k_ssb_rpc_flag_stream, -work->request_number, NULL,
-		(const uint8_t*)(work->found ? "true" : "false"), strlen(work->found ? "true" : "false"), NULL, NULL, NULL);
-	tf_free(work);
-}
-
 static void _tf_ssb_rpc_blobs_has(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
 {
 	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
-	if (!tf_ssb_is_replicator(ssb))
-	{
-		tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, "blobs.has");
-		return;
-	}
 	JSContext* context = tf_ssb_connection_get_context(connection);
 	JSValue ids = JS_GetPropertyStr(context, args, "args");
 	JSValue id = JS_GetPropertyUint32(context, ids, 0);
 	const char* id_str = JS_ToCString(context, id);
-
+	bool has = tf_ssb_db_blob_has(ssb, id_str);
-	blobs_has_work_t* work = tf_malloc(sizeof(blobs_has_work_t));
-	*work = (blobs_has_work_t) {
-		.request_number = request_number,
-	};
-	snprintf(work->id, sizeof(work->id), "%s", id_str);
-	tf_ssb_connection_run_work(connection, _tf_ssb_rpc_blobs_has_work, _tf_ssb_rpc_blobs_has_after_work, work);
-
 	JS_FreeCString(context, id_str);
 	JS_FreeValue(context, id);
 	JS_FreeValue(context, ids);
+	tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json, -request_number, NULL, (const uint8_t*)(has ? "true" : "false"), strlen(has ? "true" : "false"), NULL, NULL, NULL);
 }
 
 static void _tf_ssb_rpc_blob_wants_added_callback(tf_ssb_t* ssb, const char* id, void* user_data)
@@ -260,16 +215,13 @@ static void _tf_ssb_request_blob_wants_work(tf_ssb_connection_t* connection, voi
 static void _tf_ssb_request_blob_wants_after_work(tf_ssb_connection_t* connection, int result, void* user_data)
 {
 	blob_wants_work_t* work = user_data;
-	if (!tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)))
-	{
 	JSContext* context = tf_ssb_connection_get_context(connection);
 	tf_ssb_blob_wants_t* blob_wants = tf_ssb_connection_get_blob_wants_state(connection);
-		bool send_failed = false;
+	for (int i = 0; i < work->out_id_count; i++)
-		for (int i = 0; i < work->out_id_count && !send_failed; i++)
 	{
 		JSValue message = JS_NewObject(context);
 		JS_SetPropertyStr(context, message, work->out_id[i], JS_NewInt32(context, -1));
-			send_failed = !tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, NULL, message, NULL, NULL, NULL);
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream, -blob_wants->request_number, NULL, message, NULL, NULL, NULL);
 		JS_FreeValue(context, message);
 		blob_wants->wants_sent++;
 	}
@@ -277,7 +229,6 @@ static void _tf_ssb_request_blob_wants_after_work(tf_ssb_connection_t* connectio
 	{
 		snprintf(blob_wants->last_id, sizeof(blob_wants->last_id), "%s", work->out_id[work->out_id_count - 1]);
 	}
-	}
 	tf_free(work);
 }
 
@@ -291,13 +242,8 @@ static void _tf_ssb_rpc_request_more_blobs(tf_ssb_connection_t* connection)
 static void _tf_ssb_rpc_blobs_createWants(
 	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);
-	if (!tf_ssb_is_replicator(ssb))
-	{
-		tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, "blobs.createWants");
-		return;
-	}
 	tf_ssb_blob_wants_t* blob_wants = tf_ssb_connection_get_blob_wants_state(connection);
+	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
 	tf_ssb_add_blob_want_added_callback(ssb, _tf_ssb_rpc_blob_wants_added_callback, NULL, connection);
 	blob_wants->request_number = request_number;
 	_tf_ssb_rpc_request_more_blobs(connection);
@@ -400,7 +346,7 @@ static void _tf_ssb_rpc_tunnel_connect(tf_ssb_connection_t* connection, uint8_t
 		const char* origin_str = JS_ToCString(context, origin);
 		const char* portal_str = JS_ToCString(context, portal);
 		const char* target_str = JS_ToCString(context, target);
-		tf_ssb_connection_tunnel_create(ssb, portal_str, -request_number, origin_str, 0);
+		tf_ssb_connection_tunnel_create(ssb, portal_str, -request_number, origin_str);
 		JS_FreeCString(context, origin_str);
 		JS_FreeCString(context, portal_str);
 		JS_FreeCString(context, target_str);
@@ -614,7 +560,6 @@ static void _tf_ssb_rpc_connection_blobs_createWants_callback(
 	if (!JS_IsUndefined(name))
 	{
 		/* { name: "Error" } */
-		tf_ssb_connection_remove_request(connection, -request_number);
 		JS_FreeValue(context, name);
 		return;
 	}
@@ -774,7 +719,6 @@ typedef struct _tf_ssb_connection_send_history_stream_t
 	int64_t sequence;
 	bool keys;
 	bool live;
-	bool end_request;
 
 	bool out_finished;
 	int64_t out_max_sequence_seen;
@@ -861,18 +805,14 @@ static void _tf_ssb_connection_send_history_stream_after_work(tf_ssb_connection_
 	{
 		for (int i = 0; i < request->out_messages_count; i++)
 		{
-			if (!tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json, request->request_number, NULL, (const uint8_t*)request->out_messages[i],
+			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_json, request->request_number, NULL, (const uint8_t*)request->out_messages[i],
-					strlen(request->out_messages[i]), NULL, NULL, NULL))
+				strlen(request->out_messages[i]), NULL, NULL, NULL);
-			{
-				break;
-			}
 		}
 		if (!request->out_finished)
 		{
-			_tf_ssb_connection_send_history_stream(
+			_tf_ssb_connection_send_history_stream(connection, request->request_number, request->author, request->out_max_sequence_seen, request->keys, request->live);
-				connection, request->request_number, request->author, request->out_max_sequence_seen, request->keys, request->live, request->end_request);
 		}
-		else if (!request->live && request->end_request)
+		else if (!request->live)
 		{
 			tf_ssb_connection_rpc_send(connection, k_ssb_rpc_flag_json, request->request_number, NULL, (const uint8_t*)"false", strlen("false"), NULL, NULL, NULL);
 		}
@@ -898,8 +838,7 @@ static void _tf_ssb_connection_send_history_stream_callback(tf_ssb_connection_t*
 	}
 }
 
-static void _tf_ssb_connection_send_history_stream(
+static void _tf_ssb_connection_send_history_stream(tf_ssb_connection_t* connection, int32_t request_number, const char* author, int64_t sequence, bool keys, bool live)
-	tf_ssb_connection_t* connection, int32_t request_number, const char* author, int64_t sequence, bool keys, bool live, bool end_request)
 {
 	tf_ssb_connection_send_history_stream_t* async = tf_malloc(sizeof(tf_ssb_connection_send_history_stream_t));
 	*async = (tf_ssb_connection_send_history_stream_t) {
@@ -907,7 +846,6 @@ static void _tf_ssb_connection_send_history_stream(
 		.sequence = sequence,
 		.keys = keys,
 		.live = live,
-		.end_request = end_request,
 	};
 	snprintf(async->author, sizeof(async->author), "%s", author);
 	tf_ssb_connection_schedule_idle(connection, _tf_ssb_connection_send_history_stream_callback, async);
@@ -917,11 +855,6 @@ static void _tf_ssb_rpc_createHistoryStream(
 	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);
-	if (!tf_ssb_is_replicator(ssb))
-	{
-		tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, "createHistoryStream");
-		return;
-	}
 	JSContext* context = tf_ssb_get_context(ssb);
 	JSValue arg_array = JS_GetPropertyStr(context, args, "args");
 	JSValue arg = JS_GetPropertyUint32(context, arg_array, 0);
@@ -934,12 +867,12 @@ static void _tf_ssb_rpc_createHistoryStream(
 	JSValue keys = JS_GetPropertyStr(context, arg, "keys");
 	JSValue live = JS_GetPropertyStr(context, arg, "live");
 	bool is_keys = JS_IsUndefined(keys) || JS_ToBool(context, keys) > 0;
-	bool is_live = JS_ToBool(context, live) > 0 && (tf_ssb_connection_get_flags(connection) & k_tf_ssb_connect_flag_one_shot) == 0;
+	bool is_live = JS_ToBool(context, live) > 0;
 	int64_t sequence = 0;
 	JS_ToInt64(context, &sequence, seq);
 	const char* author = JS_ToCString(context, id);
 
-	_tf_ssb_connection_send_history_stream(connection, -request_number, author, sequence, is_keys, is_live, true);
+	_tf_ssb_connection_send_history_stream(connection, -request_number, author, sequence, is_keys, is_live);
 
 	if (is_live)
 	{
@@ -1120,13 +1053,9 @@ static void _tf_ssb_rpc_ebt_replicate_send_messages(tf_ssb_connection_t* connect
 				if (sequence >= 0 && (sequence & 1) == 0)
 				{
 					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, author, sequence >> 1, false, true);
-					_tf_ssb_connection_send_history_stream(connection, request_number, author, sequence >> 1, false, live, false);
-					if (live)
-					{
 					tf_ssb_connection_add_new_message_request(connection, author, request_number, false);
 				}
-				}
 				else
 				{
 					tf_ssb_connection_remove_new_message_request(connection, author);
@@ -1157,7 +1086,6 @@ 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_remove_request(connection, -request_number);
 		return;
 	}
 
@@ -1229,12 +1157,6 @@ static void _tf_ssb_rpc_ebt_replicate_server(
 	{
 		return;
 	}
-	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
-	if (!tf_ssb_is_replicator(ssb))
-	{
-		tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, "ebt.replicate");
-		return;
-	}
 	_tf_ssb_rpc_ebt_replicate(connection, flags, request_number, args, message, size, user_data);
 	tf_ssb_connection_add_request(connection, -request_number, "ebt.replicate", _tf_ssb_rpc_ebt_replicate, NULL, NULL, NULL);
 }
@@ -1243,8 +1165,6 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 {
 	JSContext* context = tf_ssb_get_context(ssb);
 	if (change == k_tf_ssb_change_connect)
-	{
-		if (tf_ssb_is_replicator(ssb))
 	{
 		JSValue message = JS_NewObject(context);
 		JSValue name = JS_NewArray(context);
@@ -1256,12 +1176,11 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), "blobs.createWants",
 			message, _tf_ssb_rpc_connection_blobs_createWants_callback, NULL, NULL);
 		JS_FreeValue(context, message);
-		}
 
 		if (tf_ssb_connection_is_client(connection))
 		{
-			JSValue message = JS_NewObject(context);
+			message = JS_NewObject(context);
-			JSValue name = JS_NewArray(context);
+			name = JS_NewArray(context);
 			JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "tunnel"));
 			JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "isRoom"));
 			JS_SetPropertyStr(context, message, "name", name);
@@ -1270,17 +1189,9 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 				_tf_ssb_rpc_connection_tunnel_isRoom_callback, NULL, NULL);
 			JS_FreeValue(context, message);
 
-			if (tf_ssb_is_peer_exchange(ssb))
-			{
-				_tf_ssb_rpc_send_peers_exchange(connection);
-			}
-
-			if (tf_ssb_is_replicator(ssb))
-			{
 			_tf_ssb_rpc_send_ebt_replicate(connection);
 		}
 	}
-	}
 	else if (change == k_tf_ssb_change_remove)
 	{
 		tf_ssb_remove_blob_want_added_callback(ssb, _tf_ssb_rpc_blob_wants_added_callback, connection);
@@ -1306,26 +1217,6 @@ static void _tf_ssb_rpc_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_chang
 	}
 }
 
-static void _tf_ssb_rpc_broadcasts_changed_visit(
-	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
-{
-	tf_ssb_t* ssb = user_data;
-	if (tunnel && (tf_ssb_connection_get_flags(tunnel) & k_tf_ssb_connect_flag_one_shot) != 0 && !tf_ssb_connection_get_tunnel(tunnel))
-	{
-		char target_id[k_id_base64_len] = { 0 };
-		char portal_id[k_id_base64_len] = { 0 };
-		if (tf_ssb_id_bin_to_str(target_id, sizeof(target_id), pub) && tf_ssb_connection_get_id(tunnel, portal_id, sizeof(portal_id)))
-		{
-			tf_ssb_tunnel_create(ssb, portal_id, target_id, k_tf_ssb_connect_flag_one_shot);
-		}
-	}
-}
-
-static void _tf_ssb_rpc_broadcasts_changed_callback(tf_ssb_t* ssb, void* user_data)
-{
-	tf_ssb_visit_broadcasts(ssb, _tf_ssb_rpc_broadcasts_changed_visit, ssb);
-}
-
 static void _tf_ssb_rpc_checkpoint(tf_ssb_t* ssb)
 {
 	int64_t checkpoint_start_ms = uv_hrtime();
@@ -1412,155 +1303,17 @@ void tf_ssb_rpc_start_periodic(tf_ssb_t* ssb)
 	_tf_ssb_rpc_start_delete_blobs(ssb, 30 * 1000);
 }
 
-typedef struct _peers_exchange_t
-{
-	tf_ssb_t* ssb;
-	JSValue peers;
-} peers_exchange_t;
-
-static void _tf_ssb_get_peers_exhange_callback(
-	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
-{
-	peers_exchange_t* data = user_data;
-	if (origin == k_tf_ssb_broadcast_origin_peer_exchange)
-	{
-		char fullid[256] = { 0 };
-		tf_base64_encode(pub, k_id_bin_len, fullid, sizeof(fullid));
-		char* dot = strchr(fullid, '.');
-		if (dot)
-		{
-			*dot = '\0';
-		}
-
-		char connection[1024] = { 0 };
-		snprintf(connection, sizeof(connection), "net:%s:%d~shs:%s", host, ntohs(addr->sin_port), fullid);
-
-		JSContext* context = tf_ssb_get_context(data->ssb);
-		JS_SetPropertyStr(context, data->peers, connection, JS_NewInt32(context, 0));
-	}
-}
-
-static JSValue _tf_ssb_get_peers_exchange(tf_ssb_t* ssb)
-{
-	JSContext* context = tf_ssb_get_context(ssb);
-	JSValue peers = JS_NewObject(context);
-	tf_ssb_visit_broadcasts(ssb, _tf_ssb_get_peers_exhange_callback, &(peers_exchange_t) { .ssb = ssb, .peers = peers });
-	return peers;
-}
-
-static void _tf_ssb_rpc_peers_exchange_internal(
-	tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
-{
-	JSContext* context = tf_ssb_connection_get_context(connection);
-	if (_is_error(context, args))
-	{
-		return;
-	}
-
-	/* The peer that participated in the exchange is now a peer exchange entry, too. */
-	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
-	if (*tf_ssb_connection_get_host(connection))
-	{
-		char fullid[k_id_base64_len] = { 0 };
-		tf_ssb_connection_get_id(connection, fullid, sizeof(fullid));
-		char* dot = strchr(fullid, '.');
-		if (dot)
-		{
-			*dot = '\0';
-		}
-
-		int port = tf_ssb_connection_get_port(connection);
-		JSValue port_value = JS_GetPropertyStr(context, args, "port");
-		JS_ToInt32(context, &port, port_value);
-		JS_FreeValue(context, port_value);
-
-		char connection_string[1024] = { 0 };
-		snprintf(connection_string, sizeof(connection_string), "net:%s:%d~shs:%s", tf_ssb_connection_get_host(connection), port, fullid + 1);
-		tf_ssb_add_broadcast(ssb, connection_string, k_tf_ssb_broadcast_origin_peer_exchange, k_ssb_peer_exchange_expires_seconds);
-	}
-
-	JSValue in_peers = JS_GetPropertyStr(context, args, "peers");
-
-	JSPropertyEnum* ptab = NULL;
-	uint32_t plen = 0;
-	if (JS_GetOwnPropertyNames(context, &ptab, &plen, in_peers, JS_GPN_STRING_MASK) == 0)
-	{
-		for (uint32_t i = 0; i < plen; ++i)
-		{
-			JSValue key = JS_AtomToString(context, ptab[i].atom);
-			JSPropertyDescriptor desc;
-			JSValue key_value = JS_NULL;
-			if (JS_GetOwnProperty(context, &desc, args, ptab[i].atom) == 1)
-			{
-				key_value = desc.value;
-				JS_FreeValue(context, desc.setter);
-				JS_FreeValue(context, desc.getter);
-			}
-			const char* connection = JS_ToCString(context, key);
-			int64_t timestamp = 0;
-			JS_ToInt64(context, &timestamp, key_value);
-			/* ADD BROADCAST connection: timestamp */
-			JS_FreeCString(context, connection);
-			JS_FreeValue(context, key);
-			JS_FreeValue(context, key_value);
-		}
-		for (uint32_t i = 0; i < plen; ++i)
-		{
-			JS_FreeAtom(context, ptab[i].atom);
-		}
-		js_free(context, ptab);
-	}
-	JS_FreeValue(context, in_peers);
-}
-
-static void _tf_ssb_rpc_send_peers_exchange(tf_ssb_connection_t* connection)
-{
-	int32_t request_number = tf_ssb_connection_next_request_number(connection);
-	JSContext* context = tf_ssb_connection_get_context(connection);
-	JSValue message = JS_NewObject(context);
-	JSValue name = JS_NewArray(context);
-	JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "peers"));
-	JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "exchange"));
-	JS_SetPropertyStr(context, message, "name", name);
-	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
-	JS_SetPropertyStr(context, message, "port", JS_NewInt32(context, tf_ssb_server_get_port(ssb)));
-	JS_SetPropertyStr(context, message, "peers", _tf_ssb_get_peers_exchange(ssb));
-	tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_new_request, request_number, "peers.exchange", message, _tf_ssb_rpc_peers_exchange_internal, NULL, NULL);
-	JS_FreeValue(context, message);
-}
-
-static void _tf_ssb_rpc_peers_exchange(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);
-	if (!tf_ssb_is_peer_exchange(ssb))
-	{
-		tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, "peers.exchange");
-		return;
-	}
-
-	_tf_ssb_rpc_peers_exchange_internal(connection, flags, request_number, args, message, size, user_data);
-
-	JSContext* context = tf_ssb_connection_get_context(connection);
-	JSValue out_message = JS_NewObject(context);
-	JS_SetPropertyStr(context, out_message, "port", JS_NewInt32(context, tf_ssb_server_get_port(ssb)));
-	JS_SetPropertyStr(context, out_message, "peers", _tf_ssb_get_peers_exchange(ssb));
-	tf_ssb_connection_rpc_send_json(connection, flags, -request_number, NULL, out_message, NULL, NULL, NULL);
-	JS_FreeValue(context, out_message);
-}
-
 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_rpc_callback(ssb, (const char*[]) { "gossip", "ping", NULL }, _tf_ssb_rpc_gossip_ping, NULL, NULL); /* DUPLEX */
-	tf_ssb_add_rpc_callback(ssb, "gossip.ping", _tf_ssb_rpc_gossip_ping, NULL, NULL); /* DUPLEX */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "blobs", "get", NULL }, _tf_ssb_rpc_blobs_get, NULL, NULL); /* SOURCE */
-	tf_ssb_add_rpc_callback(ssb, "blobs.get", _tf_ssb_rpc_blobs_get, NULL, NULL); /* SOURCE */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "blobs", "has", NULL }, _tf_ssb_rpc_blobs_has, NULL, NULL); /* ASYNC */
-	tf_ssb_add_rpc_callback(ssb, "blobs.has", _tf_ssb_rpc_blobs_has, NULL, NULL); /* ASYNC */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "blobs", "createWants", NULL }, _tf_ssb_rpc_blobs_createWants, NULL, NULL); /* SOURCE */
-	tf_ssb_add_rpc_callback(ssb, "blobs.createWants", _tf_ssb_rpc_blobs_createWants, NULL, NULL); /* SOURCE */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "tunnel", "connect", NULL }, _tf_ssb_rpc_tunnel_connect, NULL, NULL); /* DUPLEX */
-	tf_ssb_add_rpc_callback(ssb, "tunnel.connect", _tf_ssb_rpc_tunnel_connect, NULL, NULL); /* DUPLEX */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "tunnel", "isRoom", NULL }, _tf_ssb_rpc_room_meta, NULL, NULL); /* FAKE-ASYNC */
-	tf_ssb_add_rpc_callback(ssb, "tunnel.isRoom", _tf_ssb_rpc_room_meta, NULL, NULL); /* FAKE-ASYNC */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "room", "metadata", NULL }, _tf_ssb_rpc_room_meta, NULL, NULL); /* ASYNC */
-	tf_ssb_add_rpc_callback(ssb, "room.metadata", _tf_ssb_rpc_room_meta, NULL, NULL); /* ASYNC */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "room", "attendants", NULL }, _tf_ssb_rpc_room_attendants, NULL, NULL); /* SOURCE */
-	tf_ssb_add_rpc_callback(ssb, "room.attendants", _tf_ssb_rpc_room_attendants, NULL, NULL); /* SOURCE */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "createHistoryStream", NULL }, _tf_ssb_rpc_createHistoryStream, NULL, NULL); /* SOURCE */
-	tf_ssb_add_rpc_callback(ssb, "createHistoryStream", _tf_ssb_rpc_createHistoryStream, NULL, NULL); /* SOURCE */
+	tf_ssb_add_rpc_callback(ssb, (const char*[]) { "ebt", "replicate", NULL }, _tf_ssb_rpc_ebt_replicate_server, NULL, NULL); /* DUPLEX */
-	tf_ssb_add_rpc_callback(ssb, "ebt.replicate", _tf_ssb_rpc_ebt_replicate_server, NULL, NULL); /* DUPLEX */
-	tf_ssb_add_rpc_callback(ssb, "peers.exchange", _tf_ssb_rpc_peers_exchange, NULL, NULL); /* ASYNC */
 }

src/ssb.tests.c

@@ -158,29 +158,6 @@ void tf_ssb_test_ssb(const tf_test_options_t* options)
 	tf_ssb_t* ssb1 = tf_ssb_create(&loop, NULL, "file:out/test_db1.sqlite", NULL);
 	tf_ssb_register(tf_ssb_get_context(ssb1), ssb1);
 
-	const char* value = tf_ssb_db_get_property(ssb0, "user", "array");
-	assert(value == NULL);
-	assert(tf_ssb_db_add_value_to_array_property(ssb0, "user", "array", "1") == true);
-	value = tf_ssb_db_get_property(ssb0, "user", "array");
-	assert(strcmp(value, "[\"1\"]") == 0);
-	tf_free((void*)value);
-	assert(tf_ssb_db_add_value_to_array_property(ssb0, "user", "array", "2") == true);
-	value = tf_ssb_db_get_property(ssb0, "user", "array");
-	assert(strcmp(value, "[\"1\",\"2\"]") == 0);
-	tf_free((void*)value);
-	assert(tf_ssb_db_add_value_to_array_property(ssb0, "user", "array", "1") == false);
-	assert(tf_ssb_db_add_value_to_array_property(ssb0, "user", "array", "2") == false);
-	value = tf_ssb_db_get_property(ssb0, "user", "array");
-	assert(strcmp(value, "[\"1\",\"2\"]") == 0);
-	tf_free((void*)value);
-	assert(tf_ssb_db_remove_value_from_array_property(ssb0, "user", "array", "1") == true);
-	assert(tf_ssb_db_remove_value_from_array_property(ssb0, "user", "array", "1") == false);
-	assert(tf_ssb_db_remove_value_from_array_property(ssb0, "user", "array", "2") == true);
-	assert(tf_ssb_db_remove_value_from_array_property(ssb0, "user", "array", "2") == false);
-	value = tf_ssb_db_get_property(ssb0, "user", "array");
-	assert(strcmp(value, "[]") == 0);
-	tf_free((void*)value);
-
 	uv_idle_t idle0 = { .data = ssb0 };
 	uv_idle_init(&loop, &idle0);
 	uv_idle_start(&idle0, _ssb_test_idle);
@@ -268,56 +245,27 @@ void tf_ssb_test_ssb(const tf_test_options_t* options)
 
 	uint8_t id0bin[k_id_bin_len];
 	tf_ssb_id_str_to_bin(id0bin, id0);
-	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
+	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin);
 
 	tf_printf("Waiting for connection.\n");
 	while (test.connection_count0 != 1 || test.connection_count1 != 1)
 	{
-		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);
 	}
 	tf_ssb_server_close(ssb0);
 
 	tf_printf("Waiting for messages.\n");
 	while (_ssb_test_count_messages(ssb1) < 3)
 	{
-		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);
 	}
 
 	tf_printf("Waiting for blob.\n");
 	while (!tf_ssb_db_blob_get(ssb1, blob_id, NULL, NULL))
 	{
-		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);
 	}
 
-	JSContext* context = tf_ssb_get_context(ssb1);
-	JSValue message = JS_NewObject(context);
-	JSValue name = JS_NewArray(context);
-	JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "blobs"));
-	JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "has"));
-	JS_SetPropertyStr(context, message, "name", name);
-	JSValue args = JS_NewArray(context);
-	JS_SetPropertyUint32(context, args, 0, JS_NewString(context, blob_id));
-	JS_SetPropertyStr(context, message, "args", args);
-	JS_SetPropertyStr(context, message, "type", JS_NewString(context, "async"));
-
-	tf_ssb_connection_t* connections[4] = { 0 };
-	tf_ssb_get_connections(ssb1, connections, 4);
-	int64_t request_number = tf_ssb_connection_next_request_number(connections[0]);
-	tf_ssb_connection_rpc_send_json(connections[0], k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, "blobs.has", message, NULL, NULL, NULL);
-	JS_FreeValue(context, message);
-
 	uint8_t* b1;
 	size_t s1 = 0;
 	b = tf_ssb_db_blob_get(ssb1, blob_id, &b1, &s1);
@@ -345,22 +293,14 @@ void tf_ssb_test_ssb(const tf_test_options_t* options)
 
 	while (count0 == 0)
 	{
-		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);
 	}
 	tf_ssb_remove_message_added_callback(ssb0, _message_added, &count0);
 
 	tf_printf("Waiting for message from other.\n");
 	while (count1 == 0)
 	{
-		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);
 	}
 	tf_ssb_remove_message_added_callback(ssb1, _message_added, &count1);
 	tf_printf("done\n");
@@ -371,11 +311,7 @@ void tf_ssb_test_ssb(const tf_test_options_t* options)
 	uv_close((uv_handle_t*)&idle1, NULL);
 
 	tf_printf("final run\n");
-	tf_ssb_set_main_thread(ssb0, true);
-	tf_ssb_set_main_thread(ssb1, true);
 	uv_run(&loop, UV_RUN_DEFAULT);
-	tf_ssb_set_main_thread(ssb0, false);
-	tf_ssb_set_main_thread(ssb1, false);
 	tf_printf("done\n");
 
 	tf_printf("destroy 0\n");
@@ -387,7 +323,7 @@ void tf_ssb_test_ssb(const tf_test_options_t* options)
 	uv_loop_close(&loop);
 }
 
-static void _broadcasts_visit(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
+static void _broadcasts_visit(const char* host, const struct sockaddr_in* addr, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
 {
 	int* count = user_data;
 	(*count)++;
@@ -480,8 +416,8 @@ void tf_ssb_test_rooms(const tf_test_options_t* options)
 
 	uint8_t id0bin[k_id_bin_len];
 	tf_ssb_id_str_to_bin(id0bin, id0);
-	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
+	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin);
-	tf_ssb_connect(ssb2, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
+	tf_ssb_connect(ssb2, "127.0.0.1", 12347, id0bin);
 
 	tf_printf("Waiting for connection.\n");
 	while (test.connection_count0 != 2 || test.connection_count1 != 1 || test.connection_count2 != 1)
@@ -520,7 +456,7 @@ void tf_ssb_test_rooms(const tf_test_options_t* options)
 	tf_ssb_connection_rpc_send_json(connections[0], k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tunnel_request_number, "tunnel.connect", message, NULL, NULL, NULL);
 	JS_FreeValue(context, message);
 
-	tf_ssb_connection_t* tun0 = tf_ssb_connection_tunnel_create(ssb1, id0, tunnel_request_number, id2, 0);
+	tf_ssb_connection_t* tun0 = tf_ssb_connection_tunnel_create(ssb1, id0, tunnel_request_number, id2);
 	tf_printf("tun0 = %p\n", tun0);
 
 	tf_printf("Done.\n");
@@ -546,9 +482,9 @@ void tf_ssb_test_rooms(const tf_test_options_t* options)
 	tf_ssb_send_close(ssb1);
 	tf_ssb_send_close(ssb2);
 
-	tf_ssb_close_all(ssb0, "end of test");
+	tf_ssb_close_all(ssb0);
-	tf_ssb_close_all(ssb1, "end of test");
+	tf_ssb_close_all(ssb1);
-	tf_ssb_close_all(ssb2, "end of test");
+	tf_ssb_close_all(ssb2);
 
 	uv_run(&loop, UV_RUN_DEFAULT);
 
@@ -712,7 +648,7 @@ void tf_ssb_test_bench(const tf_test_options_t* options)
 	tf_ssb_register(tf_ssb_get_context(ssb1), ssb1);
 
 	tf_ssb_server_open(ssb0, 12347);
-	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
+	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin);
 
 	tf_printf("Waiting for messages.\n");
 	clock_gettime(CLOCK_REALTIME, &start_time);
@@ -811,8 +747,7 @@ static void _break_in_a_bit(tf_ssb_t* ssb, tf_ssb_connection_t* connection, cons
 	uv_timer_start(&data->timer, _close_callback, 3000, 0);
 }
 
-static void _ssb_test_room_broadcasts_visit(
+static void _ssb_test_room_broadcasts_visit(const char* host, const struct sockaddr_in* addr, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
-	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
 {
 	tf_ssb_t* ssb = user_data;
 	char id[k_id_base64_len] = { 0 };
@@ -847,7 +782,7 @@ static void _ssb_test_room_broadcasts_visit(
 		JS_FreeValue(context, message);
 
 		tf_printf("tunnel create ssb=%p portal=%s rn=%d target=%s\n", ssb, portal, (int)tunnel_request_number, target);
-		tf_ssb_connection_tunnel_create(ssb, portal, tunnel_request_number, target, 0);
+		tf_ssb_connection_tunnel_create(ssb, portal, tunnel_request_number, target);
 		_break_in_a_bit(ssb, tunnel, target, tunnel_request_number);
 	}
 }
@@ -881,8 +816,8 @@ void tf_ssb_test_go_ssb_room(const tf_test_options_t* options)
 
 	tf_ssb_add_broadcasts_changed_callback(ssb0, _ssb_test_room_broadcasts_changed, NULL, NULL);
 
-	tf_ssb_connect_str(ssb0, "net:linode.unprompted.com:8008~shs:Q0pc/7kXQJGIlqJxuwayL2huayzddgkVDoGkYVWQS1Y=:SSB+Room+PSK3TLYC2T86EHQCUHBUHASCASE18JBV24=", 0, NULL, NULL);
+	tf_ssb_connect_str(ssb0, "net:linode.unprompted.com:8008~shs:Q0pc/7kXQJGIlqJxuwayL2huayzddgkVDoGkYVWQS1Y=:SSB+Room+PSK3TLYC2T86EHQCUHBUHASCASE18JBV24=");
-	tf_ssb_connect_str(ssb1, "net:linode.unprompted.com:8008~shs:Q0pc/7kXQJGIlqJxuwayL2huayzddgkVDoGkYVWQS1Y=:SSB+Room+PSK3TLYC2T86EHQCUHBUHASCASE18JBV24=", 0, NULL, NULL);
+	tf_ssb_connect_str(ssb1, "net:linode.unprompted.com:8008~shs:Q0pc/7kXQJGIlqJxuwayL2huayzddgkVDoGkYVWQS1Y=:SSB+Room+PSK3TLYC2T86EHQCUHBUHASCASE18JBV24=");
 
 	uv_run(&loop, UV_RUN_DEFAULT);
 
@@ -934,109 +869,4 @@ void tf_ssb_test_encrypt(const tf_test_options_t* options)
 	printf("returned %d\n", WEXITSTATUS(result));
 	assert(WEXITSTATUS(result) == 0);
 }
-
-static void _count_broadcasts_callback(
-	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
-{
-	int* count = user_data;
-	(*count)++;
-}
-
-static int _count_broadcasts(tf_ssb_t* ssb)
-{
-	int count = 0;
-	tf_ssb_visit_broadcasts(ssb, _count_broadcasts_callback, &count);
-	return count;
-}
-
-void tf_ssb_test_peer_exchange(const tf_test_options_t* options)
-{
-	uv_loop_t loop = { 0 };
-	uv_loop_init(&loop);
-
-	unlink("out/test_db0.sqlite");
-	tf_ssb_t* ssb0 = tf_ssb_create(&loop, NULL, "file:out/test_db0.sqlite", NULL);
-	tf_ssb_set_is_room(ssb0, false);
-	tf_ssb_set_is_replicator(ssb0, false);
-	tf_ssb_set_is_peer_exchange(ssb0, true);
-	tf_ssb_register(tf_ssb_get_context(ssb0), ssb0);
-	tf_ssb_server_open(ssb0, 12347);
-
-	unlink("out/test_db1.sqlite");
-	tf_ssb_t* ssb1 = tf_ssb_create(&loop, NULL, "file:out/test_db1.sqlite", NULL);
-	tf_ssb_set_is_room(ssb1, false);
-	tf_ssb_set_is_replicator(ssb1, false);
-	tf_ssb_set_is_peer_exchange(ssb1, true);
-	tf_ssb_register(tf_ssb_get_context(ssb1), ssb1);
-	tf_ssb_server_open(ssb1, 12348);
-
-	unlink("out/test_db2.sqlite");
-	tf_ssb_t* ssb2 = tf_ssb_create(&loop, NULL, "file:out/test_db2.sqlite", NULL);
-	tf_ssb_set_is_room(ssb2, false);
-	tf_ssb_set_is_replicator(ssb2, false);
-	tf_ssb_set_is_peer_exchange(ssb2, true);
-	tf_ssb_register(tf_ssb_get_context(ssb2), ssb2);
-	tf_ssb_server_open(ssb2, 12349);
-
-	char id0[k_id_base64_len] = { 0 };
-	tf_ssb_whoami(ssb0, id0, sizeof(id0));
-	uint8_t id0bin[k_id_bin_len];
-	tf_ssb_id_str_to_bin(id0bin, id0);
-	tf_ssb_connect(ssb1, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
-	tf_ssb_connect(ssb2, "127.0.0.1", 12347, id0bin, 0, NULL, NULL);
-
-	while (_count_broadcasts(ssb0) != 2 || _count_broadcasts(ssb1) != 1 || _count_broadcasts(ssb2) != 1)
-	{
-		uv_run(&loop, UV_RUN_ONCE);
-	}
-
-	tf_ssb_send_close(ssb0);
-	tf_ssb_send_close(ssb1);
-	tf_ssb_send_close(ssb2);
-
-	tf_ssb_destroy(ssb0);
-	tf_ssb_destroy(ssb1);
-	tf_ssb_destroy(ssb2);
-
-	uv_run(&loop, UV_RUN_DEFAULT);
-
-	uv_loop_close(&loop);
-}
-
-void tf_ssb_test_publish(const tf_test_options_t* options)
-{
-	uv_loop_t loop = { 0 };
-	uv_loop_init(&loop);
-
-	unlink("out/test_db0.sqlite");
-	tf_ssb_t* ssb = tf_ssb_create(&loop, NULL, "file:out/test_db0.sqlite", NULL);
-	tf_ssb_register(tf_ssb_get_context(ssb), ssb);
-
-	char id[k_id_base64_len] = { 0 };
-	tf_ssb_whoami(ssb, id, sizeof(id));
-
-	tf_ssb_destroy(ssb);
-
-	char executable[1024];
-	size_t size = sizeof(executable);
-	uv_exepath(executable, &size);
-
-	char command[4096];
-	snprintf(command, sizeof(command), "%s publish -d out/test_db0.sqlite -u :admin -i %s -c '{\"type\": \"post\", \"text\": \"One.\"}'", executable, id);
-	int result = system(command);
-	(void)result;
-	assert(WIFEXITED(result));
-	printf("returned %d\n", WEXITSTATUS(result));
-	assert(WEXITSTATUS(result) == 0);
-
-	snprintf(command, sizeof(command), "%s publish -d out/test_db0.sqlite -u :admin -i %s -c '{\"type\": \"post\", \"text\": \"Two.\"}'", executable, id);
-	result = system(command);
-	assert(WIFEXITED(result));
-	printf("returned %d\n", WEXITSTATUS(result));
-	assert(WEXITSTATUS(result) == 0);
-
-	uv_run(&loop, UV_RUN_DEFAULT);
-	uv_loop_close(&loop);
-}
-
 #endif

src/ssb.tests.h

@@ -53,16 +53,4 @@ void tf_ssb_test_go_ssb_room(const tf_test_options_t* options);
 */
 void tf_ssb_test_encrypt(const tf_test_options_t* options);
 
-/**
-** Test peer exchange.
-** @param options The test options.
-*/
-void tf_ssb_test_peer_exchange(const tf_test_options_t* options);
-
-/**
-** Test publishing a message.
-** @param options The test options.
-*/
-void tf_ssb_test_publish(const tf_test_options_t* options);
-
 /** @} */

src/task.c

@@ -27,12 +27,12 @@
 #include <openssl/crypto.h>
 
 #include <assert.h>
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
 #if !defined(_WIN32)
-#include <sys/wait.h>
 #include <unistd.h>
+#include <sys/wait.h>
 #endif
 
 #if defined(_WIN32)
@@ -140,7 +140,8 @@ typedef struct _tf_task_t
 	float idle_percent;
 	float thread_percent;
 
-	uv_async_t run_jobs_async;
+	uv_idle_t idle;
+	uv_prepare_t prepare;
 	uv_signal_t sig_term;
 	uv_signal_t sig_int;
 
@@ -207,6 +208,7 @@ static void _tf_task_sendPromiseExportMessage(tf_task_t* from, tf_taskstub_t* to
 static JSValue _tf_task_executeSource(tf_task_t* task, const char* source, const char* name);
 static tf_taskstub_t* _tf_task_get_stub(tf_task_t* task, taskid_t id);
 static void _tf_task_release_export(tf_taskstub_t* stub, exportid_t exportId);
+static void _tf_task_run_jobs_prepare(uv_prepare_t* prepare);
 static void _timeout_unlink(tf_task_t* task, timeout_t* timeout);
 static void _timeout_closed(uv_handle_t* handle);
 
@@ -1519,20 +1521,25 @@ static bool _tf_task_run_jobs(tf_task_t* task)
 	return 0;
 }
 
-static void _tf_task_run_jobs_async(uv_async_t* async)
+static void _tf_task_run_jobs_idle(uv_idle_t* idle)
 {
-	tf_task_t* task = async->data;
+	tf_task_t* task = idle->data;
-	if (_tf_task_run_jobs(task))
+	if (!_tf_task_run_jobs(task))
 	{
-		uv_async_send(async);
+		/* No more jobs.  Don't try again as actively. */
+		uv_idle_stop(&task->idle);
+		uv_prepare_start(&task->prepare, _tf_task_run_jobs_prepare);
 	}
 }
 
-void tf_task_check_jobs(tf_task_t* task)
+static void _tf_task_run_jobs_prepare(uv_prepare_t* prepare)
 {
-	if (task && JS_IsJobPending(task->_runtime))
+	tf_task_t* task = prepare->data;
+	if (_tf_task_run_jobs(task))
 	{
-		uv_async_send(&task->run_jobs_async);
+		/* More jobs.  We can run again immediately. */
+		uv_idle_start(&task->idle, _tf_task_run_jobs_idle);
+		uv_prepare_stop(&task->prepare);
 	}
 }
 
@@ -1629,9 +1636,13 @@ tf_task_t* tf_task_create()
 	uv_timer_init(&task->_loop, &task->gc_timer);
 	uv_timer_start(&task->gc_timer, _tf_task_gc_timer, 1000, 1000);
 	uv_unref((uv_handle_t*)&task->gc_timer);
-	task->run_jobs_async.data = task;
+	task->idle.data = task;
-	uv_async_init(&task->_loop, &task->run_jobs_async, _tf_task_run_jobs_async);
+	uv_idle_init(&task->_loop, &task->idle);
-	uv_unref((uv_handle_t*)&task->run_jobs_async);
+	uv_unref((uv_handle_t*)&task->idle);
+	task->prepare.data = task;
+	uv_prepare_init(&task->_loop, &task->prepare);
+	uv_unref((uv_handle_t*)&task->prepare);
+	uv_idle_start(&task->idle, _tf_task_run_jobs_idle);
 	task->sig_term.data = task;
 	uv_signal_init(&task->_loop, &task->sig_term);
 	uv_signal_start(&task->sig_term, _tf_task_signal_shutdown, SIGTERM);
@@ -1899,13 +1910,14 @@ void tf_task_destroy(tf_task_t* task)
 	{
 		uv_close((uv_handle_t*)&task->gc_timer, _tf_task_on_handle_close);
 	}
-	uv_close((uv_handle_t*)&task->run_jobs_async, _tf_task_on_handle_close);
+	uv_close((uv_handle_t*)&task->idle, _tf_task_on_handle_close);
+	uv_close((uv_handle_t*)&task->prepare, _tf_task_on_handle_close);
 	uv_signal_stop(&task->sig_term);
 	uv_close((uv_handle_t*)&task->sig_term, _tf_task_on_handle_close);
 	uv_signal_stop(&task->sig_int);
 	uv_close((uv_handle_t*)&task->sig_int, _tf_task_on_handle_close);
 
-	while (task->trace_timer.data || task->gc_timer.data || task->run_jobs_async.data || task->sig_term.data || task->sig_int.data)
+	while (task->trace_timer.data || task->gc_timer.data || task->idle.data || task->prepare.data || task->sig_term.data || task->sig_int.data)
 	{
 		uv_run(&task->_loop, UV_RUN_ONCE);
 	}

src/task.h

@@ -364,11 +364,4 @@ tf_android_start_service_t* tf_task_get_android_start_service();
 */
 tf_android_stop_service_t* tf_task_get_android_stop_service();
 
-/**
-** Check for JS jobs that need to be run.  Generally to be called post-JS_Call
-** in tf_util_report_error.
-** @param task The task.
-*/
-void tf_task_check_jobs(tf_task_t* task);
-
 /** @} */

src/taskstub.js.c

@@ -7,8 +7,8 @@
 #include "task.h"
 #include "util.js.h"
 
-#include <stdio.h>
 #include <string.h>
+#include <stdio.h>
 
 #ifdef _WIN32
 #include <io.h>
@@ -44,6 +44,7 @@ void tf_taskstub_startup()
 		JS_NewClassID(&_classId);
 		size_t size = sizeof(_executable);
 		uv_exepath(_executable, &size);
+		tf_printf("exepath is %s\n", _executable);
 		initialized = true;
 	}
 }

src/tests.c

@@ -4,15 +4,13 @@
 #include "http.h"
 #include "log.h"
 #include "mem.h"
-#include "ssb.db.h"
-#include "ssb.h"
 #include "ssb.tests.h"
 #include "util.js.h"
 
 #include <assert.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -784,140 +782,6 @@ static void _test_http(const tf_test_options_t* options)
 	uv_thread_join(&thread);
 }
 
-static int _http_get_status_code(const char* url)
-{
-	char command[1024];
-	snprintf(command, sizeof(command), "curl -s -o /dev/null -w '%%{http_code}' \"%s\"", url);
-	char buffer[256] = "";
-	FILE* file = popen(command, "r");
-	char* result = fgets(buffer, sizeof(buffer), file);
-	pclose(file);
-	return result ? atoi(result) : -1;
-}
-
-static void _http_check_status_code(const char* url, int expected_code)
-{
-	char command[1024];
-	snprintf(command, sizeof(command), "curl -s -o /dev/null -w '%%{http_code}' \"%s\"", url);
-	char buffer[256] = "";
-	FILE* file = popen(command, "r");
-	char* result = fgets(buffer, sizeof(buffer), file);
-	tf_printf("%s => %s\n", command, result);
-	assert(atoi(buffer) == expected_code);
-	assert(file);
-	int status = pclose(file);
-	(void)status;
-	assert(WEXITSTATUS(status) == 0);
-}
-
-static void _http_check_body_contains(const char* url, const char* expected)
-{
-	char command[1024];
-	snprintf(command, sizeof(command), "curl -s \"%s\"", url);
-	char buffer[1024] = "";
-	FILE* file = popen(command, "r");
-	bool found = false;
-	while (!found)
-	{
-		char* result = fgets(buffer, sizeof(buffer), file);
-		if (!result)
-		{
-			break;
-		}
-		found = strstr(buffer, expected) != NULL;
-		if (found)
-		{
-			tf_printf("%s => found: \"%s\"\n", url, expected);
-		}
-	}
-	if (!found)
-	{
-		tf_printf("Didn't find \"%s\" in %s.\n", expected, url);
-	}
-	assert(found);
-	assert(file);
-	int status = pclose(file);
-	(void)status;
-	assert(WEXITSTATUS(status) == 0);
-}
-
-static void _test_httpd(const tf_test_options_t* options)
-{
-	uv_loop_t loop = { 0 };
-	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 },
-		[STDERR_FILENO] = { .flags = UV_INHERIT_FD },
-	};
-	uv_process_t process = { 0 };
-	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 },
-			.stdio_count = sizeof(stdio) / sizeof(*stdio),
-			.stdio = stdio,
-		});
-
-	for (int i = 0; i < 100; i++)
-	{
-		if (_http_get_status_code("http://localhost:8080/debug") == 200)
-		{
-			break;
-		}
-		uv_sleep(1000);
-	}
-
-	tf_ssb_t* ssb = tf_ssb_create(&loop, NULL, "file:out/test_db0.sqlite", NULL);
-	const char* app_id = tf_ssb_db_get_property(ssb, "core", "path:test");
-	tf_ssb_destroy(ssb);
-
-	_http_check_status_code("http://localhost:8080/404", 404);
-	_http_check_status_code("http://localhost:8080/", 303);
-	_http_check_status_code("http://localhost:8080/~core/apps/", 200);
-	_http_check_status_code("http://localhost:8080/~core/apps", 303);
-	_http_check_status_code("http://localhost:8080/~core/apps/view", 200);
-	_http_check_body_contains("http://localhost:8080/~core/apps/", "<title>Tilde Friends</title>");
-	_http_check_body_contains("http://localhost:8080/~core/apps/view", "\"type\":\"tildefriends-app\"");
-	_http_check_body_contains("http://localhost:8080/~core/test/hello.txt", "Hello, world!");
-	_http_check_status_code("http://localhost:8080/~core/test/nonexistent.txt", 404);
-	_http_check_body_contains("http://localhost:8080/&MV9b23bQeMQ7isAGTkoBZGErH853yGk0W/yUx1iU7dM=.sha256/view", "Hello, world!");
-
-	char url[1024];
-	snprintf(url, sizeof(url), "http://localhost:8080/%s/", app_id);
-	_http_check_body_contains(url, "<title>Tilde Friends</title>");
-	snprintf(url, sizeof(url), "http://localhost:8080/%s/view", app_id);
-	_http_check_body_contains(url, "\"type\":\"tildefriends-app\"");
-	snprintf(url, sizeof(url), "http://localhost:8080/%s/hello.txt", app_id);
-	_http_check_body_contains(url, "Hello, world!");
-	tf_free((void*)app_id);
-
-	uv_process_kill(&process, SIGTERM);
-	uv_close((uv_handle_t*)&process, NULL);
-	uv_run(&loop, UV_RUN_ONCE);
-
-	uv_loop_close(&loop);
-}
-
-static void _test_pattern(const tf_test_options_t* options)
-{
-	assert(tf_http_pattern_matches("/~core/test/", "/~core/test/"));
-	assert(tf_http_pattern_matches("/~core/test/*", "/~core/test/"));
-	assert(tf_http_pattern_matches("/~core/test/*", "/~core/test/blah"));
-	assert(tf_http_pattern_matches("*/~core/test/", "/~core/test/"));
-	assert(tf_http_pattern_matches("*/~core/test/", "blah/~core/test/"));
-	assert(tf_http_pattern_matches("/~*/*/", "/~core/test/"));
-	assert(tf_http_pattern_matches("/~{word}/*", "/~core/test"));
-	assert(tf_http_pattern_matches("/~{word}/{word}/", "/~core/test/"));
-	assert(tf_http_pattern_matches("/~{word}/{word}", "/~core/test"));
-	assert(!tf_http_pattern_matches("/~{word}/{word}", "/~foo/bar/baz"));
-}
-
 static void _test_auto_process_exit(uv_process_t* process, int64_t status, int termination_signal)
 {
 	tf_printf("Process exit %d signal=%d.\n", (int)WEXITSTATUS(status), termination_signal);
@@ -1023,8 +887,6 @@ void tf_tests(const tf_test_options_t* options)
 #if !TARGET_OS_IPHONE
 	_tf_test_run(options, "bip39", _test_bip39, false);
 	_tf_test_run(options, "http", _test_http, false);
-	_tf_test_run(options, "httpd", _test_httpd, false);
-	_tf_test_run(options, "pattern", _test_pattern, false);
 	_tf_test_run(options, "ssb", tf_ssb_test_ssb, false);
 	_tf_test_run(options, "ssb_id", tf_ssb_test_id_conversion, false);
 	_tf_test_run(options, "ssb_following", tf_ssb_test_following, false);
@@ -1053,8 +915,6 @@ void tf_tests(const tf_test_options_t* options)
 	_tf_test_run(options, "auto", _test_auto, false);
 	_tf_test_run(options, "go-ssb-room", tf_ssb_test_go_ssb_room, true);
 	_tf_test_run(options, "encrypt", tf_ssb_test_encrypt, false);
-	_tf_test_run(options, "peer_exchange", tf_ssb_test_peer_exchange, false);
-	_tf_test_run(options, "publish", tf_ssb_test_publish, false);
 	tf_printf("Tests completed.\n");
 #endif
 }