Add some images for F-Droid.

.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,31 +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
-      - 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

.gitmodules

@@ -22,7 +22,6 @@
 [submodule "deps/openssl_src"]
 	path = deps/openssl_src
 	url = https://github.com/openssl/openssl.git
-	shallow = true
+[submodule "deps/dht"]
-[submodule "deps/c-ares"]
+	path = deps/dht
-	path = deps/c-ares
+	url = https://github.com/jech/dht.git
-	url = https://github.com/c-ares/c-ares.git

GNUmakefile

@@ -3,11 +3,12 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 27
+VERSION_CODE := 25
-VERSION_NUMBER := 0.0.23-wip
+VERSION_NUMBER := 0.0.22-wip
-VERSION_NAME := Me upon my pony on my boat.
+VERSION_NAME := This looks like a good place.
 
-SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.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
 
 PROJECT = tildefriends
@@ -20,9 +21,6 @@ BUNDLETOOL = out/bundletool.jar
 
 HAVE_WIN := 0
 
-export SOURCE_DATE_EPOCH=1
-export TZ=UTC
-
 ifeq ($(UNAME_S),Darwin)
 BUILD_TYPES := macosdebug macosrelease iosdebug iosrelease iossimdebug iossimrelease
 else ifeq ($(UNAME_S),Linux)
@@ -35,8 +33,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 += \
@@ -55,22 +52,26 @@ 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 \
-	-flto=auto
+	-Wno-attributes
 
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION)
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.3.11579264
+ifneq "$(wildcard $(ANDROID_SDK)/ndk/27.0.12077973/.)" ""
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/27.0.12077973
+else
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342
+endif
 
 ANDROID_ARMV7A_TARGETS := \
 	out/androiddebug-armv7a/tildefriends \
@@ -160,7 +161,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))
-$(NONMACOS_TARGETS): LDFLAGS += -static-libgcc
 
 $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
 $(filter-out $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
@@ -170,13 +170,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
@@ -252,9 +249,8 @@ APP_SOURCES_ios := $(wildcard src/*.m)
 APP_OBJS := $(call get_objs,APP_SOURCES)
 $(APP_OBJS): CFLAGS += \
 	-Ideps/base64c/include \
-	-Ideps/c-ares/include \
-	-Ideps/c-ares_config \
 	-Ideps/crypt_blowfish \
+	-Ideps/dht \
 	-Ideps/libbacktrace \
 	-Ideps/libsodium \
 	-Ideps/libsodium/src/libsodium/include \
@@ -272,105 +268,6 @@ $(filter-out $(BUILD_DIR)/android% $(BUILD_DIR)/macos% $(BUILD_DIR)/ios%,$(APP_O
 	-fanalyzer
 endif
 
-ARES_SOURCES := \
-	deps/c-ares/src/lib/ares_platform.c \
-	deps/c-ares/src/lib/record/ares_dns_mapping.c \
-	deps/c-ares/src/lib/record/ares_dns_parse.c \
-	deps/c-ares/src/lib/record/ares_dns_write.c \
-	deps/c-ares/src/lib/record/ares_dns_name.c \
-	deps/c-ares/src/lib/record/ares_dns_record.c \
-	deps/c-ares/src/lib/record/ares_dns_multistring.c \
-	deps/c-ares/src/lib/ares_destroy.c \
-	deps/c-ares/src/lib/ares_data.c \
-	deps/c-ares/src/lib/ares_sysconfig.c \
-	deps/c-ares/src/lib/ares_cancel.c \
-	deps/c-ares/src/lib/ares_metrics.c \
-	deps/c-ares/src/lib/ares_getnameinfo.c \
-	deps/c-ares/src/lib/legacy/ares_parse_txt_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_naptr_reply.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_parse_ns_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_soa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_getsock.c \
-	deps/c-ares/src/lib/windows_port.c \
-	deps/c-ares/src/lib/ares_qcache.c \
-	deps/c-ares/src/lib/ares_update_servers.c \
-	deps/c-ares/src/lib/ares_process.c \
-	deps/c-ares/src/lib/ares_getenv.c \
-	deps/c-ares/src/lib/ares_gethostbyname.c \
-	deps/c-ares/src/lib/ares_send.c \
-	deps/c-ares/src/lib/dsa/ares__slist.c \
-	deps/c-ares/src/lib/dsa/ares__htable.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/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/ares_query.c \
-	deps/c-ares/src/lib/ares_cookie.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_config/ \
-	-D_GNU_SOURCE \
-	-Wno-unused-function \
-	-Wno-deprecated-declarations \
-	-Wno-unused-result
-
 BLOWFISH_SOURCES := \
 	deps/crypt_blowfish/crypt_blowfish.c \
 	deps/crypt_blowfish/crypt_gensalt.c \
@@ -502,8 +399,6 @@ $(UV_OBJS): CFLAGS += \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-result \
 	-Wno-unused-variable
-$(UV_OBJS): CFLAGS += -fno-lto
-$(filter out/win%,$(UV_OBJS)): CFLAGS += -Wno-cast-function-type
 ifeq ($(UNAME_S),Linux)
 $(UV_OBJS): CFLAGS += \
 	-D_GNU_SOURCE
@@ -579,7 +474,6 @@ ifneq ($(UNAME_S),OpenBSD)
 $(filter-out $(BUILD_DIR)/win%,$(SODIUM_OBJS)): CFLAGS += \
 	-DHAVE_ALLOCA_H
 endif
-$(SODIUM_OBJS): CFLAGS := $(filter-out -flto,$(CFLAGS))
 
 SQLITE_SOURCES := deps/sqlite/sqlite3.c
 SQLITE_OBJS := $(call get_objs,SQLITE_SOURCES)
@@ -694,6 +588,9 @@ $(MINIUNZIP_OBJS): CFLAGS += \
 	-Ideps/zlib \
 	-Wno-maybe-uninitialized
 
+DHT_SOURCES := deps/dht/dht.c
+DHT_OBJS := $(call get_objs,DHT_SOURCES)
+
 LDFLAGS += \
 	-pthread \
 	-lm
@@ -739,8 +636,8 @@ all: $(BUILD_TYPES)
 
 ALL_APP_OBJS := \
 	$(APP_OBJS) \
-	$(ARES_OBJS) \
 	$(BLOWFISH_OBJS) \
+	$(DHT_OBJS) \
 	$(LIBBACKTRACE_OBJS) \
 	$(MINIUNZIP_OBJS) \
 	$(PICOHTTPPARSER_OBJS) \
@@ -843,7 +740,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 := $(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
@@ -936,7 +833,6 @@ out/apk/TildeFriends-x86-%.unsigned.apk:
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
 out/apk/TildeFriends-%.fdroid.unsigned.apk:
-	@rm -rf out/apk-fdroid-$(BUILD_TYPE) out/apk-fdroid-$(BUILD_TYPE)-raw
 	@mkdir -p $(dir $@) out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/ out/apk-fdroid-$(BUILD_TYPE)/lib/x86/ out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/ out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/
 	@echo "[aapt] $@"
 	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
@@ -949,12 +845,8 @@ out/apk/TildeFriends-%.fdroid.unsigned.apk:
 	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
 	@cp out/apk/res.fdroid.apk $@.zip
 	@cp out/apk/classes.dex out/apk-fdroid-$(BUILD_TYPE)/classes.dex
-	@touch -d @0 out/apk-fdroid-$(BUILD_TYPE)/classes.dex out/apk-fdroid-$(BUILD_TYPE)/lib/*/libtildefriends.so
+	@cd out/apk-fdroid-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
-	@chmod 755 out/apk-fdroid-$(BUILD_TYPE)/classes.dex out/apk-fdroid-$(BUILD_TYPE)/lib/*/libtildefriends.so
+	@zip -u $@.zip -q -9 $(RAW_FILES)
-	@cd out/apk-fdroid-$(BUILD_TYPE) && zip -X -u ../../$@.zip -q classes.dex lib/*/libtildefriends.so && cd ../../
-	@mkdir out/apk-fdroid-$(BUILD_TYPE)-raw
-	@for i in $(RAW_FILES); do mkdir -p $$(dirname out/apk-fdroid-$(BUILD_TYPE)-raw/$$i) && cp $$i out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && touch -d @0 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && chmod 644 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i; done
-	@cd out/apk-fdroid-$(BUILD_TYPE)-raw && zip -X -u ../../$@.zip -q $(RAW_FILES) && cd ../../
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
 out/%.apk: out/apk/%.unsigned.apk
@@ -1037,6 +929,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)
@@ -1067,27 +963,14 @@ $(IOS_DEPS):
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS)
 endif
 
-out/Tilde_Friends-x86_64.AppImage: out/release/tildefriends out/data.zip
-	@mkdir -p out/AppDir/usr/bin
-	@mkdir -p out/AppDir/usr/share/applications
-	@mkdir -p out/AppDir/usr/share/icons/hicolor/scalable/apps
-	@echo "[Desktop Entry]\nName=Tilde Friends\nExec=tildefriends\nIcon=tildefriends\nType=Application\nCategories=Network" > out/AppDir/usr/share/applications/tildefriends.desktop
-	@cp src/ios/tildefriends.svg out/AppDir/usr/share/icons/hicolor/scalable/apps/
-	@cat out/release/tildefriends out/data.zip > out/AppDir/usr/bin/tildefriends
-	@chmod +x out/AppDir/usr/bin/tildefriends
-	@unset SOURCE_DATE_EPOCH; cd out; linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage; cd ..
-
-appimage: out/Tilde_Friends-x86_64.AppImage
-.PHONY: appimage
-
 clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-tarball:
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe)
-	@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* \
@@ -1104,15 +987,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
-	@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"
@@ -1121,12 +998,7 @@ 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/Tilde_Friends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage
 .PHONY: dist
 
 dist-test: dist
@@ -1149,4 +1021,4 @@ docs:
 .PHONY: docs
 
 fdroid: out/apk/TildeFriends-release.fdroid.unsigned.apk
-.PHONY: fdroid
+.PHONE: fdroid

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/identity.json

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

apps/identity/app.js

@@ -18,7 +18,6 @@ tfrpc.register(async function reload() {
 
 async function main() {
 	let ids = await ssb.getIdentities();
-	let server_id = await ssb.getServerIdentity();
 	await app.setDocument(
 		`
 		<head>
@@ -124,7 +123,7 @@ async function main() {
 					) => `<li style="overflow: hidden; text-wrap: nowrap; text-overflow: ellipsis">
 				<button onclick="handler.export_id(event)" data-id="${id}" class="w3-button w3-theme">Export Identity</button>
 				<button onclick="handler.delete_id(event)" data-id="${id}" class="w3-button w3-theme">Delete Identity</button>
-				${id}${id == server_id ? ' <div class="w3-tag w3-theme-l4 w3-round">🖥 local server</div>' : ''}
+				${id}
 			</li>`
 				)
 				.join('\n') +

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&6oHPQCA26v+4nBXv+YUdCT43j2DpXDspxhHSSRydkiw=.sha256"
+	"previous": "&2xK//SIpjFb0+uT5I7MSAGJ3d1FKuI/rlzhcCQd3NME=.sha256"
 }

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 &&
@@ -291,14 +287,6 @@ class TfProfileElement extends LitElement {
 		let description = this.editing?.description ?? profile.description;
 		return html`<div style="border: 2px solid black; background-color: rgba(255, 255, 255, 0.2); padding: 16px">
 			<tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
-			<div class="w3-row">
-				<div class="w3-col s1 w3-container w3-right">
-					<button class="w3-button w3-theme-d1 w3-ripple" @click=${this.copy_id}>Copy</button>
-				</div>
-				<div class="w3-rest w3-container">
-					<input type="text" class="w3-theme-d1" style="width: 100%; vertical-align: middle" readonly value=${this.id}></input>
-				</div>
-			</div>
 			<div style="display: flex; flex-direction: row; gap: 1em">
 				${edit_profile}
 				<div style="flex: 1 0 50%">

apps/ssb/tf-tab-connections.js

@@ -17,12 +17,6 @@ class TfTabConnectionsElement extends LitElement {
 
 	static styles = styles;
 
-	static k_broadcast_emojis = {
-		discovery: '🏓',
-		room: '🚪',
-		peer_exchange: '🕸',
-	};
-
 	constructor() {
 		super();
 		let self = this;
@@ -98,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>

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/welcome.json

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

apps/welcome/f-droid.svg

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Original Author: Unknown (if you are the original creator of the F-Droid button, please contact laura@ind.ie so I can credit you!)  -->
-<!-- Author: Created by Laura Kalbag and Released with ❤ by ind.ie (laura@ind.ie) -->
-<!-- License: This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. (As attribution is included in this file, you needn't include additional attribution on your site.) -->
-<!-- How to use: The original blog post about this SVG button and how I use SVG on the Ind.ie website is at https://ind.ie/blog/f-droid-button/ -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="button_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="1490 188 300 104" enable-background="new 1490 188 300 104" xml:space="preserve">
-<g id="get_it_on_f-droid_2_">
-	<path id="button" d="M1780,292h-280c-5.5,0-10-4.5-10-10v-84c0-5.5,4.5-10,10-10h280c5.5,0,10,4.5,10,10v84
-		C1790,287.5,1785.5,292,1780,292z"/>
-	<g id="f-droid_2_">
-		<path fill="#FFFFFF" d="M1621.2,236.8v3.6v1.2v5h-0.3h-0.6h-2.2c-0.7,0-1-0.3-1.2-1c-0.1-0.4-0.2-1.6-0.3-3.4h-13.5v11.1h13.2v5.5
-			h-13.2v10.1c0.9,0.2,1.7,0.3,2.6,0.4c0.9,0.2,1.3,0.7,1.3,1.6v3h-3.9h-7.1h-3.9v-3c0-0.9,0.4-1.5,1.3-1.6c0.9-0.2,1.7-0.3,2.6-0.4
-			V242c-0.9-0.2-1.7-0.3-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h22.7h1.2L1621.2,236.8L1621.2,236.8z"/>
-		<path fill="#FFFFFF" d="M1637.2,256v5.4h-13.5V256H1637.2z"/>
-		<path fill="#FFFFFF" d="M1676.7,255.6c0,5-1.7,10-5.3,13.5c-3.7,3.6-8.8,5.3-13.9,5.3h-13.9h-3.9v-3c0-0.9,0.4-1.5,1.3-1.6
-			c0.9-0.2,1.7-0.3,2.6-0.4V242c-0.9-0.2-1.7-0.3-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h13.9c5.1,0,10.2,1.6,13.9,5.3
-			C1675.1,245.6,1676.7,250.7,1676.7,255.6C1676.7,258.4,1676.7,252.9,1676.7,255.6z M1669.6,255.6c0-3.4-0.8-6.9-3.1-9.5
-			s-5.6-3.7-8.9-3.7h-6.8v26.4h6.8c3.4,0,6.7-1.1,8.9-3.7C1668.8,262.5,1669.6,259,1669.6,255.6z"/>
-		<path fill="#FFFFFF" d="M1699.7,248.1l-0.9,4.8c-0.2,1.1-1.3,0.9-2.1,0.7c-1-0.3-2.2-0.3-3.1,0c-2.2,0.5-3.7,2.3-4.5,4.2v11.4
-			c2.3,0.4,2.3,0.4,2.6,0.4c0.9,0.2,1.3,0.7,1.3,1.6v3h-3.9l0,0h-6.5h-3.9v-3c0-0.9,0.4-1.5,1.3-1.6c0.4-0.1,0.4-0.1,2.6-0.4v-16.3
-			c-2.3-0.4-2.3-0.4-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9l0,0h3.8c1.1,0,1.7,0.4,1.9,1.6l0.3,3.2c1.1-1.9,2.6-3.7,4.7-4.7
-			C1695.2,247,1697.8,246.9,1699.7,248.1z"/>
-		<path fill="#FFFFFF" d="M1719.4,248.3c5.7,2.3,8,8,7.8,13.7c-0.3,5.6-3.4,10.7-9.1,12.3c-5.4,1.5-11.9,0-15.1-4.9
-			c-3.1-4.6-3.2-11.6-0.3-16.4C1706,247.6,1713.6,246,1719.4,248.3C1721,248.9,1717.8,247.6,1719.4,248.3z M1718.9,267.6
-			c2-2.8,2-7.1,1.2-10.2c-0.3-1.5-1-2.9-2.2-3.9c-1.3-1-3-1.4-4.6-1.2c-3.5,0.2-5.3,2.7-5.8,5.9c-0.5,3.1-0.5,7.5,1.8,10
-			C1711.8,270.7,1716.8,270.5,1718.9,267.6C1720,266.2,1717.9,269.1,1718.9,267.6z"/>
-		<path fill="#FFFFFF" d="M1743.3,271.4v3h-3.9h-6.5h-4v-3c0-0.9,0.4-1.5,1.3-1.6c0.9-0.2,1.7-0.3,2.6-0.4v-16.4
-			c-0.9-0.2-1.7-0.3-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h6.5v21.5c0.9,0.2,1.7,0.3,2.6,0.4
-			C1742.9,269.9,1743.3,270.5,1743.3,271.4z M1740,241.6c-1,2-3.4,3-5.4,2.2c-2-0.9-3.1-3.3-2.2-5.3c0.9-2.1,3.3-3,5.4-2.2
-			C1739.9,237.1,1741,239.5,1740,241.6C1739.8,242,1740.3,241,1740,241.6z"/>
-		<path fill="#FFFFFF" d="M1773.4,274.3h-3.7h-3.9c-0.8,0-1.5-0.3-1.7-1.2l-0.5-2.4c-2.4,2.8-5.9,4.5-9.8,4.1
-			c-3.8-0.4-6.5-3.2-7.8-6.6c-2.4-6.6-1.3-16.3,5.6-19.8c3.8-1.9,8.5-1.5,11.6,1.5V241c-0.9-0.2-1.7-0.3-2.6-0.4
-			c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h6.5v33.5c0.8,0.2,1.6,0.3,2.4,0.4c0.9,0.2,1.3,0.7,1.3,1.6V274.3z M1763.3,254.6
-			c-1.7-2-4.2-2.9-6.7-2.3c-2.5,0.6-3.9,2.8-4.4,5.1c-0.5,2.3-0.5,5-0.1,7.4c0.4,2.3,1.7,4.4,4.1,4.9c2.9,0.5,5.4-1,7.2-3.1V254.6z"
-			/>
-	</g>
-	<g id="get_it_on_2_">
-		<path fill="#FFFFFF" d="M1597.5,218.2v-2.9h7.6v6.9c-3.7,3.6-11.2,3.9-14.5-0.3c-3.3-4.2-2.4-11.5,2.6-14c2.2-1.1,5.1-1.1,7.3-0.4
-			s3.8,2.4,4.3,4.7l-3.5,0.7c-0.7-2.5-3.5-3.3-5.8-2.5c-2.2,0.7-3.1,2.8-3.2,4.9c-0.1,2.2,0.3,4.6,2.1,5.9c2.1,1.6,5.1,0.9,7-0.6
-			v-2.3H1597.5z"/>
-		<path fill="#FFFFFF" d="M1608.3,224.7v-17.3h13v2.9h-9.4v3.8h8.8v2.9h-8.8v4.8h9.8v2.9L1608.3,224.7L1608.3,224.7z"/>
-		<path fill="#FFFFFF" d="M1628.6,224.7v-14.4h-5.1v-2.9h13.9v2.9h-5.1v14.5L1628.6,224.7L1628.6,224.7z"/>
-		<path fill="#FFFFFF" d="M1646.3,224.7v-17.3h3.5v17.3H1646.3z"/>
-		<path fill="#FFFFFF" d="M1657.1,224.7v-14.4h-5.1v-2.9h13.9v2.9h-5.1v14.5L1657.1,224.7L1657.1,224.7z"/>
-		<path fill="#FFFFFF" d="M1674.1,216.1c0-1.7,0.3-3.3,0.8-4.4c0.8-1.7,2.2-3.2,3.9-4c2.8-1.1,6.5-1,9,0.9c2.5,1.8,3.4,4.9,3.3,7.8
-			c-0.1,2.9-1.1,5.8-3.8,7.5c-2.5,1.6-6.1,1.6-8.7,0.3C1675.4,222.7,1674.1,219.4,1674.1,216.1z M1677.8,216c0,2.3,0.7,4.8,3.1,5.6
-			c2.2,0.9,4.8,0,5.8-2c1-1.9,1-4.9,0.3-6.8c-0.9-2.1-3.1-3.1-5.3-2.7C1678.7,210.6,1677.8,213.4,1677.8,216z"/>
-		<path fill="#FFFFFF" d="M1693.9,224.7v-17.3h3.4l7.2,11.6v-11.6h3.3v17.3h-3.6l-7.1-11.4v11.4H1693.9z"/>
-	</g>
-	<g id="droid_2_">
-		<g>
-
-				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="413.9844" y1="440.5436" x2="413.9844" y2="452.6552" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#2B6099"/>
-				<stop  offset="0.1299" style="stop-color:#2F69A1"/>
-				<stop  offset="0.3451" style="stop-color:#3B83B6"/>
-				<stop  offset="0.5" style="stop-color:#4699C8"/>
-				<stop  offset="0.9944" style="stop-color:#479ECB"/>
-			</linearGradient>
-			<path fill="url(#SVGID_1_)" d="M1570.1,275.2h-59.3c-2.9,0-5.2-2.3-5.2-5.2v-34.7c0-2.9,2.4-5.2,5.2-5.2h59.3
-				c2.9,0,5.2,2.3,5.2,5.2V270C1575.3,272.8,1572.9,275.2,1570.1,275.2z"/>
-
-				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="413.9844" y1="440.5436" x2="413.9844" y2="452.6552" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#2B6099"/>
-				<stop  offset="0.5" style="stop-color:#58A4CD"/>
-				<stop  offset="0.7865" style="stop-color:#7FB8D9"/>
-				<stop  offset="1" style="stop-color:#9EC9E2"/>
-			</linearGradient>
-			<path fill="url(#SVGID_2_)" d="M1570.1,231.9c1.9,0,3.5,1.6,3.5,3.5V270c0,1.9-1.6,3.5-3.5,3.5h-59.3c-1.9,0-3.5-1.6-3.5-3.5
-				v-34.7c0-1.9,1.6-3.5,3.5-3.5H1570.1 M1570.1,230.1h-59.3c-2.9,0-5.2,2.3-5.2,5.2V270c0,2.9,2.4,5.2,5.2,5.2h59.3
-				c2.9,0,5.2-2.3,5.2-5.2v-34.7C1575.3,232.5,1572.9,230.1,1570.1,230.1L1570.1,230.1z"/>
-		</g>
-		<g>
-			<path fill="#295384" d="M1540.4,236.6c8.9,0,16.1,7.2,16.1,16c0,8.8-7.2,16-16.1,16s-16.1-7.2-16.1-16S1531.5,236.6,1540.4,236.6
-				 M1540.4,235.3c-9.6,0-17.4,7.8-17.4,17.3s7.8,17.3,17.4,17.3s17.4-7.8,17.4-17.3S1550.1,235.3,1540.4,235.3L1540.4,235.3z"/>
-		</g>
-		<path fill="#295384" d="M1535.4,251.1c1.9-5.7,10.7-3.9,10.2,2.2c-0.5,5.6-8.5,6.2-10.2,1.2c0,0,0,0.1,0,0l0,0
-			c-2.4,0.2-4.7,0.4-7.1,0.6c1.7,10.1,15.3,13.1,21.6,5.3c6.5-8,0.3-20.2-10-19.8c-5.6,0.3-10.5,4.3-11.5,9.8"/>
-		<path fill="#7B952D" d="M1580.3,198.7l-2-1.6c-0.3-0.3-1-0.3-1.2,0.1l-6.8,7.9c-0.3,0.3-0.3,1,0.1,1.2l2,1.6
-			c0.3,0.3,1,0.3,1.2-0.1l6.8-7.9C1580.7,199.6,1580.6,199,1580.3,198.7z"/>
-		<path fill="#7B952D" d="M1500.6,198.1l2-1.6c0.3-0.3,1-0.3,1.2,0.1l6.8,7.9c0.3,0.3,0.3,1-0.1,1.2l-2,1.6c-0.3,0.3-1,0.3-1.2-0.1
-			l-6.8-7.9C1500.2,199,1500.3,198.5,1500.6,198.1z"/>
-
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="413.9844" y1="453.354" x2="413.9844" y2="459.4099" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-			<stop  offset="0" style="stop-color:#BCDB52"/>
-			<stop  offset="0.3206" style="stop-color:#C5E358"/>
-			<stop  offset="0.5" style="stop-color:#CDEA5C"/>
-			<stop  offset="0.9944" style="stop-color:#DCF285"/>
-		</linearGradient>
-		<path fill="url(#SVGID_3_)" stroke="#7B952D" stroke-miterlimit="10" d="M1572.7,227.5h-64.5c-1,0-1.7-0.8-1.7-1.7v-19.1
-			c0-1,0.8-1.7,1.7-1.7h64.5c1,0,1.7,0.8,1.7,1.7v19.1C1574.4,226.7,1573.6,227.5,1572.7,227.5z"/>
-		<g>
-			<ellipse fill="#FFFFFF" cx="1523" cy="215.4" rx="6.1" ry="6.1"/>
-
-				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="409.8439" y1="458.401" x2="408.7539" y2="454.8358" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#8BA53D"/>
-				<stop  offset="8.484717e-02" style="stop-color:#94AE45"/>
-				<stop  offset="0.2259" style="stop-color:#AEC65C"/>
-				<stop  offset="0.4048" style="stop-color:#D7ED81"/>
-				<stop  offset="0.4246" style="stop-color:#DCF285"/>
-			</linearGradient>
-			<path fill="url(#SVGID_4_)" d="M1523,222.3c-3.8,0-7-3.1-7-6.9c0-3.8,3.1-6.9,7-6.9c3.8,0,7,3.1,7,6.9
-				C1529.9,219.2,1526.9,222.3,1523,222.3z M1523,210.2c-2.9,0-5.2,2.3-5.2,5.2s2.4,5.2,5.2,5.2s5.2-2.3,5.2-5.2
-				S1525.9,210.2,1523,210.2z"/>
-		</g>
-		<g>
-			<ellipse fill="#FFFFFF" cx="1557.8" cy="215.4" rx="6.1" ry="6.1"/>
-
-				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="419.2189" y1="458.401" x2="418.129" y2="454.8359" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#8BA53D"/>
-				<stop  offset="8.484717e-02" style="stop-color:#94AE45"/>
-				<stop  offset="0.2259" style="stop-color:#AEC65C"/>
-				<stop  offset="0.4048" style="stop-color:#D7ED81"/>
-				<stop  offset="0.4246" style="stop-color:#DCF285"/>
-			</linearGradient>
-			<path fill="url(#SVGID_5_)" d="M1557.8,222.3c-3.8,0-7-3.1-7-6.9c0-3.8,3.1-6.9,7-6.9c3.8,0,7,3.1,7,6.9
-				C1564.8,219.2,1561.8,222.3,1557.8,222.3z M1557.8,210.2c-2.9,0-5.2,2.3-5.2,5.2s2.4,5.2,5.2,5.2c2.9,0,5.2-2.3,5.2-5.2
-				S1560.8,210.2,1557.8,210.2z"/>
-		</g>
-	</g>
-</g>
-</svg>

apps/welcome/index.html

@@ -68,9 +68,6 @@
 						href="https://dev.tildefriends.net/"
 						><i class="fa fa-mug-hot"></i> Code</a
 					>
-					<p>
-						<a href="https://f-droid.org/en/packages/com.unprompted.tildefriends.fdroid/"><img src="f-droid.svg" style="height: 3em"></a>
-					</p>
 				</div>
 				<div class="w3-col l4 m6">
 					<img src="tildefriends.png" class="w3-image w3-right w3-hide-small" />
@@ -273,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/core.js

@@ -23,18 +23,13 @@ const k_global_settings = {
 	room: {
 		type: 'boolean',
 		default_value: true,
-		description: 'Enable peers to tunnel through this instance as a room.',
+		description: 'Whether this instance should behave as a room.',
 	},
 	room_name: {
 		type: 'string',
 		default_value: 'tilde friends tunnel',
 		description: 'Name of the room.',
 	},
-	replicator: {
-		type: 'boolean',
-		default_value: true,
-		description: 'Enable message and blob replication.',
-	},
 	code_of_conduct: {
 		type: 'textarea',
 		default_value: undefined,
@@ -69,22 +64,6 @@ const k_global_settings = {
 				: undefined,
 		description: 'Blobs older than this will be automatically deleted.',
 	},
-	seeds_host: {
-		type: 'string',
-		default_value: 'seeds.tildefriends.net',
-		description: 'Hostname for seed connections.',
-	},
-	peer_exchange: {
-		type: 'boolean',
-		default_value: false,
-		description:
-			'Enable discovery of, sharing of, and connecting to internet peer strangers, including announcing this instance.',
-	},
-	account_registration: {
-		type: 'boolean',
-		default_value: true,
-		description: 'Allow registration of new accounts.',
-	},
 };
 
 let gGlobalSettings = {
@@ -521,9 +500,8 @@ async function getProcessBlob(blobId, key, options) {
 				imports.core.globalSettingsGet = function (key) {
 					return gGlobalSettings[key];
 				};
-				imports.core.globalSettingsSet = async function (key, value) {
+				imports.core.globalSettingsSet = function (key, value) {
 					print('Setting', key, value);
-					await loadSettings();
 					gGlobalSettings[key] = value;
 					setGlobalSettings(gGlobalSettings);
 					print('Done.');
@@ -1351,4 +1329,9 @@ function storePermission(user, packageOwner, packageName, permission, allow) {
 	}
 }
 
-export {gGlobalSettings as globalSettings, invoke, getSessionProcessBlob};
+export {
+	gGlobalSettings as globalSettings,
+	setGlobalSettings,
+	invoke,
+	getSessionProcessBlob,
+};

default.nix

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

deps/c-ares

@@ -1 +0,0 @@
-Subproject commit 27b98d96eff6122fb981e338bddef3d6a57d8d44

deps/c-ares_config/ares_build.h

@@ -1,177 +0,0 @@
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-/*
- * Copyright (C) The c-ares project and its contributors
- * SPDX-License-Identifier: MIT
- */
-
-#define CARES_STATICLIB
-
-#ifdef CARES_HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-#ifdef CARES_HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-#ifdef CARES_HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif
-
-#if defined(_WIN32)
-#undef HAVE_REGISTERWAITFORSINGLEOBJECT
-#define CARES_HAVE_WINSOCK2_H
-#define CARES_HAVE_WINDOWS_H
-#define CARES_HAVE_WS2TCPIP_H
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-#define CARES_TYPEOF_ARES_SOCKLEN_T int
-#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
-#else
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
-#endif
-
-#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
-#define GETSERVBYNAME_R_ARGS 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
-
-#if defined(__OpenBSD__) || defined(__HAIKU__)
-#define GETSERVBYNAME_R_ARGS 4
-#define GETSERVBYPORT_R_ARGS 4
-#endif
-
-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__OpenBSD__) && !defined(__HAIKU__)
-#define HAVE_MALLOC_H 1
-#define HAVE_EPOLL 1
-#define HAVE_SYS_EPOLL_H 1
-#define HAVE_SYS_RANDOM_H 1
-#endif
-
-#if !defined(__WIN32)
-#undef AC_APPLE_UNIVERSAL_BUILD
-#undef ETC_INET
-#define GETHOSTNAME_TYPE_ARG2 size_t
-#define GETNAMEINFO_QUAL_ARG1 
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-#define GETNAMEINFO_TYPE_ARG46 socklen_t
-#define GETNAMEINFO_TYPE_ARG7 int
-#define HAVE_AF_INET6 1
-#define HAVE_ARPA_INET_H 1
-#define HAVE_ARPA_NAMESER_COMPAT_H 1
-#define HAVE_ARPA_NAMESER_H 1
-#define HAVE_ASSERT_H 1
-#define HAVE_CLOCK_GETTIME_MONOTONIC 1
-#define HAVE_CONNECT 1
-#define HAVE_DLFCN_H 1
-#define HAVE_ERRNO_H 1
-#define HAVE_POLL_H 1
-#define HAVE_POLL 1
-#define HAVE_PIPE 1
-#define HAVE_FCNTL 1
-#define HAVE_FCNTL_H 1
-#define HAVE_FCNTL_O_NONBLOCK 1
-#define HAVE_FREEADDRINFO 1
-#define HAVE_GETADDRINFO 1
-#define HAVE_GETENV 1
-#define HAVE_GETHOSTNAME 1
-#define HAVE_GETNAMEINFO 1
-#if !defined(__HAIKU__)
-#define HAVE_GETRANDOM 1
-#endif
-#define HAVE_GETTIMEOFDAY 1
-#define HAVE_IF_INDEXTONAME 1
-#define HAVE_IF_NAMETOINDEX 1
-#define HAVE_INET_NTOP 1
-#define HAVE_INET_PTON 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_IOCTL 1
-#define HAVE_IOCTL_FIONBIO 1
-#define HAVE_IOCTL_SIOCGIFADDR 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LONGLONG 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MSG_NOSIGNAL 1
-#define HAVE_NETDB_H 1
-#define HAVE_NETINET_IN_H 1
-#define HAVE_NETINET_TCP_H 1
-#define HAVE_NET_IF_H 1
-#define HAVE_PF_INET6 1
-#define HAVE_RECV 1
-#define HAVE_RECVFROM 1
-#define HAVE_SEND 1
-#define HAVE_SETSOCKOPT 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-#define HAVE_SOCKET 1
-#define HAVE_STDBOOL_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRDUP 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_STRUCT_ADDRINFO 1
-#define HAVE_STRUCT_IN6_ADDR 1
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-#define HAVE_STRUCT_TIMEVAL 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_SELECT_H 1
-#define HAVE_SYS_SOCKET_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_UIO_H 1
-#define HAVE_TIME_H 1
-#define HAVE_IFADDRS_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_WRITEV 1
-#if defined(__ANDROID__) || defined(__APPLE__) || defined(__OpenBSD__)
-#define HAVE_ARC4RANDOM_BUF 1
-#else
-#undef HAVE_ARC4RANDOM_BUF
-#endif
-#define HAVE_GETIFADDRS 1
-#define HAVE_STAT 1
-#define CARES_RANDOM_FILE "/dev/urandom"
-#define RECVFROM_QUAL_ARG5 
-#define RECVFROM_TYPE_ARG1 int
-#define RECVFROM_TYPE_ARG2 void *
-#define RECVFROM_TYPE_ARG2_IS_VOID 0
-#define RECVFROM_TYPE_ARG3 size_t
-#define RECVFROM_TYPE_ARG4 int
-#define RECVFROM_TYPE_ARG5 struct sockaddr *
-#define RECVFROM_TYPE_ARG5_IS_VOID 0
-#define RECVFROM_TYPE_ARG6 socklen_t *
-#define RECVFROM_TYPE_ARG6_IS_VOID 0
-#define RECVFROM_TYPE_RETV ssize_t
-#define RECV_TYPE_ARG1 int
-#define RECV_TYPE_ARG2 void *
-#define RECV_TYPE_ARG3 size_t
-#define RECV_TYPE_ARG4 int
-#define RECV_TYPE_RETV ssize_t
-#define SEND_TYPE_ARG1 int
-#define SEND_TYPE_ARG2 const void *
-#define SEND_TYPE_ARG3 size_t
-#define SEND_TYPE_ARG4 int
-#define SEND_TYPE_RETV ssize_t
-#undef USE_BLOCKING_SOCKETS
-#undef WIN32_LEAN_AND_MEAN
-#define HAVE_PTHREAD_H 1
-#define CARES_THREADS 1
-#endif
-
-#endif /* __CARES_BUILD_H */

deps/codemirror_src/package-lock.json

@@ -19,10 +19,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.1",
+      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.1.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.17.0.tgz",
-      "integrity": "sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==",
+      "integrity": "sha512-fdfj6e6ZxZf8yrkMHUSJJir7OJkHkZKaOZGzLWIYp2PZ3jd+d+UjG8zVPqJF6d3bKxkhvXTPan/UZ1t7Bqm0gA==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -37,10 +36,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.6.2",
+      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
-      "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==",
+      "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,7 +92,6 @@
       "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"
@@ -107,7 +101,6 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
       "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -121,7 +114,6 @@
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
       "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
-      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.0.0",
@@ -132,7 +124,6 @@
       "version": "6.5.6",
       "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
       "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.33.0",
+      "version": "6.29.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.29.1.tgz",
-      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
+      "integrity": "sha512-7r+DlO/QFwPqKp73uq5mmrS4TuLPUVotbNOKYzN3OLP5ScrOVXcm4g13/48b6ZXGhdmzMinzFYqH0vo+qihIkQ==",
-      "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,15 +202,13 @@
       "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"
@@ -235,14 +217,12 @@
     "node_modules/@lezer/common": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==",
+      "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.18",
+      "version": "1.4.17",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.18.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.17.tgz",
-      "integrity": "sha512-Y8BeHOt4LtcxJgXwadtfSeWPrh0XzklcCHnCVT+vOsxqH4gWmunP2ykX+VVOlM/dusyVyiNfG3lv0f10UK+mgA==",
+      "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,7 +271,6 @@
       "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"
       }
@@ -304,7 +279,6 @@
       "version": "15.2.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
       "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
-      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
         "@types/resolve": "1.20.2",
@@ -330,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",
@@ -352,7 +325,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
       "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -371,231 +343,212 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.1.tgz",
-      "integrity": "sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==",
+      "integrity": "sha512-XzqSg714++M+FXhHfXpS1tDnNZNpgxxuGZWlRG/jSj+VEPmZ0yg6jV4E0AL3uyBKxO8mO3xtOsP5mQ+XLfrlww==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.1.tgz",
-      "integrity": "sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==",
+      "integrity": "sha512-thFUbkHteM20BGShD6P08aungq4irbIZKUNbG70LN8RkO7YztcGPiKTTGZS7Kw+x5h8hOXs0i4OaHwFxlpQN6A==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.1.tgz",
-      "integrity": "sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==",
+      "integrity": "sha512-8o6eqeFZzVLia2hKPUZk4jdE3zW7LCcZr+MD18tXkgBBid3lssGVAYuox8x6YHoEPDdDa9ixTaStcmx88lio5Q==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.1.tgz",
-      "integrity": "sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==",
+      "integrity": "sha512-4T42heKsnbjkn7ovYiAdDVRRWZLU9Kmhdt6HafZxFcUdpjlBlxj4wDrt1yFWLk7G4+E+8p2C9tcmSu0KA6auGA==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.1.tgz",
-      "integrity": "sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==",
+      "integrity": "sha512-MXg1xp+e5GhZ3Vit1gGEyoC+dyQUBy2JgVQ+3hUrD9wZMkUw/ywgkpK7oZgnB6kPpGrxJ41clkPPnsknuD6M2Q==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.1.tgz",
-      "integrity": "sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==",
+      "integrity": "sha512-DZNLwIY4ftPSRVkJEaxYkq7u2zel7aah57HESuNkUnz+3bZHxwkCUkrfS2IWC1sxK6F2QNIR0Qr/YXw7nkF3Pw==",
       "cpu": [
         "arm"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.1.tgz",
-      "integrity": "sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==",
+      "integrity": "sha512-C7evongnjyxdngSDRRSQv5GvyfISizgtk9RM+z2biV5kY6S/NF/wta7K+DanmktC5DkuaJQgoKGf7KUDmA7RUw==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.1.tgz",
-      "integrity": "sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==",
+      "integrity": "sha512-89tFWqxfxLLHkAthAcrTs9etAoBFRduNfWdl2xUs/yLV+7XDrJ5yuXMHptNqf1Zw0UCA3cAutkAiAokYCkaPtw==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.1.tgz",
-      "integrity": "sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==",
+      "integrity": "sha512-PromGeV50sq+YfaisG8W3fd+Cl6mnOOiNv2qKKqKCpiiEke2KiKVyDqG/Mb9GWKbYMHj5a01fq/qlUR28PFhCQ==",
       "cpu": [
         "ppc64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.1.tgz",
-      "integrity": "sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==",
+      "integrity": "sha512-/1BmHYh+iz0cNCP0oHCuF8CSiNj0JOGf0jRlSo3L/FAyZyG2rGBuKpkZVH9YF+x58r1jgWxvm1aRg3DHrLDt6A==",
       "cpu": [
         "riscv64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.1.tgz",
-      "integrity": "sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==",
+      "integrity": "sha512-0cYP5rGkQWRZKy9/HtsWVStLXzCF3cCBTRI+qRL8Z+wkYlqN7zrSYm6FuY5Kd5ysS5aH0q5lVgb/WbG4jqXN1Q==",
       "cpu": [
         "s390x"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.1.tgz",
-      "integrity": "sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==",
+      "integrity": "sha512-XUXeI9eM8rMP8aGvii/aOOiMvTs7xlCosq9xCjcqI9+5hBxtjDpD+7Abm1ZhVIFE1J2h2VIg0t2DX/gjespC2Q==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.1.tgz",
-      "integrity": "sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==",
+      "integrity": "sha512-V7cBw/cKXMfEVhpSvVZhC+iGifD6U1zJ4tbibjjN+Xi3blSXaj/rJynAkCFFQfoG6VZrAiP7uGVzL440Q6Me2Q==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.1.tgz",
-      "integrity": "sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==",
+      "integrity": "sha512-88brja2vldW/76jWATlBqHEoGjJLRnP0WOEKAUbMcXaAZnemNhlAHSyj4jIwMoP2T750LE9lblvD4e2jXleZsA==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.1.tgz",
-      "integrity": "sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==",
+      "integrity": "sha512-LdxxcqRVSXi6k6JUrTah1rHuaupoeuiv38du8Mt4r4IPer3kwlTo+RuvfE8KzZ/tL6BhaPlzJ3835i6CxrFIRQ==",
       "cpu": [
         "ia32"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.1.tgz",
-      "integrity": "sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==",
+      "integrity": "sha512-2bIrL28PcK3YCqD9anGxDxamxdiJAxA+l7fWIwM5o8UqNy1t3d1NdAweO2XhA0KTDJ5aH1FsuiT5+7VhtHliXg==",
       "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.12.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -607,14 +560,12 @@
       "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==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -626,7 +577,6 @@
       "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",
@@ -641,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"
       }
@@ -662,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"
@@ -683,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"
       }
@@ -692,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"
       },
@@ -704,7 +647,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
       "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-      "license": "MIT",
       "dependencies": {
         "builtin-modules": "^3.3.0"
       },
@@ -716,10 +658,9 @@
       }
     },
     "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"
       },
@@ -733,20 +674,17 @@
     "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": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -759,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"
       }
@@ -768,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",
@@ -782,10 +718,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.21.3",
+      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.3.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.19.1.tgz",
-      "integrity": "sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==",
+      "integrity": "sha512-K5vziVlg7hTpYfFBI+91zHBEMo6jafYXpkMlqZjg7/zhIG9iHqazBf4xz9AVdjS9BruRn280ROqLI7G3OFRIlw==",
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -797,31 +732,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.3",
+        "@rollup/rollup-android-arm-eabi": "4.19.1",
-        "@rollup/rollup-android-arm64": "4.21.3",
+        "@rollup/rollup-android-arm64": "4.19.1",
-        "@rollup/rollup-darwin-arm64": "4.21.3",
+        "@rollup/rollup-darwin-arm64": "4.19.1",
-        "@rollup/rollup-darwin-x64": "4.21.3",
+        "@rollup/rollup-darwin-x64": "4.19.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.19.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.19.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.19.1",
-        "@rollup/rollup-linux-arm64-musl": "4.21.3",
+        "@rollup/rollup-linux-arm64-musl": "4.19.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.3",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.19.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.19.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.19.1",
-        "@rollup/rollup-linux-x64-gnu": "4.21.3",
+        "@rollup/rollup-linux-x64-gnu": "4.19.1",
-        "@rollup/rollup-linux-x64-musl": "4.21.3",
+        "@rollup/rollup-linux-x64-musl": "4.19.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.19.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.19.1",
-        "@rollup/rollup-win32-x64-msvc": "4.21.3",
+        "@rollup/rollup-win32-x64-msvc": "4.19.1",
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rollup/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "license": "MIT"
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -840,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"
       }
@@ -857,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"
       }
@@ -875,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"
@@ -884,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"
       },
@@ -900,11 +822,10 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.33.0",
+      "version": "5.31.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz",
-      "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==",
+      "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -921,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/dht

@@ -0,0 +1 @@
+Subproject commit 111230894416d400c9a1e038a033586bfeaafc93

deps/libbacktrace

@@ -1 +1 @@
-Subproject commit 86885d14049fab06ef8a33aac51664230ca09200
+Subproject commit 0dd27b95f9f2c11b4a89db5f185a888af912838e

deps/libsodium

@@ -1 +1 @@
-Subproject commit 0217d07326f0ffbe79d6ce09793843e135a67487
+Subproject commit 9511c982fb1d046470a8b42aa36556cdb7da15de

deps/openssl_src

@@ -1 +1 @@
-Subproject commit fb7fab9fa6f4869eaa8fbb97e0d593159f03ffe4
+Subproject commit db2ac4f6ebd8f3d7b2a60882992fbea1269114e2

deps/sqlite/shell.c

@@ -604,6 +604,11 @@ zSkipValidUtf8(const char *z, int nAccept, long ccm);
 # define CIO_WIN_WC_XLATE 0 /* Not exposing translation routines at all */
 #endif
 
+#if CIO_WIN_WC_XLATE
+/* Character used to represent a known-incomplete UTF-8 char group (<28>) */
+static WCHAR cBadGroup = 0xfffd;
+#endif
+
 #if CIO_WIN_WC_XLATE
 static HANDLE handleOfFile(FILE *pf){
   int fileDesc = _fileno(pf);
@@ -12542,7 +12547,7 @@ static int expertFilter(
   pCsr->pData = 0;
   if( rc==SQLITE_OK ){
     rc = idxPrintfPrepareStmt(pExpert->db, &pCsr->pData, &pVtab->base.zErrMsg,
-        "SELECT * FROM main.%Q WHERE sqlite_expert_sample()", pVtab->pTab->zName
+        "SELECT * FROM main.%Q WHERE sample()", pVtab->pTab->zName
     );
   }
 
@@ -13416,7 +13421,7 @@ struct IdxRemCtx {
 };
 
 /*
-** Implementation of scalar function sqlite_expert_rem().
+** Implementation of scalar function rem().
 */
 static void idxRemFunc(
   sqlite3_context *pCtx,
@@ -13429,7 +13434,7 @@ static void idxRemFunc(
   assert( argc==2 );
 
   iSlot = sqlite3_value_int(argv[0]);
-  assert( iSlot<p->nSlot );
+  assert( iSlot<=p->nSlot );
   pSlot = &p->aSlot[iSlot];
 
   switch( pSlot->eType ){
@@ -13540,8 +13545,7 @@ static int idxPopulateOneStat1(
     const char *zName = (const char*)sqlite3_column_text(pIndexXInfo, 0);
     const char *zColl = (const char*)sqlite3_column_text(pIndexXInfo, 1);
     zCols = idxAppendText(&rc, zCols, 
-        "%sx.%Q IS sqlite_expert_rem(%d, x.%Q) COLLATE %s", 
+        "%sx.%Q IS rem(%d, x.%Q) COLLATE %s", zComma, zName, nCol, zName, zColl
-        zComma, zName, nCol, zName, zColl
     );
     zOrder = idxAppendText(&rc, zOrder, "%s%d", zComma, ++nCol);
   }
@@ -13674,13 +13678,13 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){
 
   if( rc==SQLITE_OK ){
     sqlite3 *dbrem = (p->iSample==100 ? p->db : p->dbv);
-    rc = sqlite3_create_function(dbrem, "sqlite_expert_rem", 
+    rc = sqlite3_create_function(
-        2, SQLITE_UTF8, (void*)pCtx, idxRemFunc, 0, 0
+        dbrem, "rem", 2, SQLITE_UTF8, (void*)pCtx, idxRemFunc, 0, 0
     );
   }
   if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(p->db, "sqlite_expert_sample", 
+    rc = sqlite3_create_function(
-        0, SQLITE_UTF8, (void*)&samplectx, idxSampleFunc, 0, 0
+        p->db, "sample", 0, SQLITE_UTF8, (void*)&samplectx, idxSampleFunc, 0, 0
     );
   }
 
@@ -13732,9 +13736,6 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){
     rc = sqlite3_exec(p->dbm, "ANALYZE sqlite_schema", 0, 0, 0);
   }
 
-  sqlite3_create_function(p->db, "sqlite_expert_rem", 2, SQLITE_UTF8, 0,0,0,0);
-  sqlite3_create_function(p->db, "sqlite_expert_sample", 0,SQLITE_UTF8,0,0,0,0);
-
   sqlite3_exec(p->db, "DROP TABLE IF EXISTS temp."UNIQUE_TABLE_NAME,0,0,0);
   return rc;
 }
@@ -16835,8 +16836,8 @@ static int recoverError(
   va_start(ap, zFmt);
   if( zFmt ){
     z = sqlite3_vmprintf(zFmt, ap);
+    va_end(ap);
   }
-  va_end(ap);
   sqlite3_free(p->zErrMsg);
   p->zErrMsg = z;
   p->errCode = errCode;
@@ -27084,6 +27085,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       import_cleanup(&sCtx);
       shell_out_of_memory();
     }
+    nByte = strlen(zSql);    
     rc =  sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
     sqlite3_free(zSql);
     zSql = 0;
@@ -27102,21 +27104,16 @@ static int do_meta_command(char *zLine, ShellState *p){
     sqlite3_finalize(pStmt);
     pStmt = 0;
     if( nCol==0 ) return 0; /* no columns, no error */
-
+    zSql = sqlite3_malloc64( nByte*2 + 20 + nCol*2 );
-    nByte = 64                 /* space for "INSERT INTO", "VALUES(", ")\0" */
-          + (zSchema ? strlen(zSchema)*2 + 2: 0)  /* Quoted schema name */
-          + strlen(zTable)*2 + 2                  /* Quoted table name */
-          + nCol*2;            /* Space for ",?" for each column */
-    zSql = sqlite3_malloc64( nByte );
     if( zSql==0 ){
       import_cleanup(&sCtx);
       shell_out_of_memory();
     }
     if( zSchema ){
-      sqlite3_snprintf(nByte, zSql, "INSERT INTO \"%w\".\"%w\" VALUES(?", 
+      sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\".\"%w\" VALUES(?", 
                        zSchema, zTable);
     }else{
-      sqlite3_snprintf(nByte, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
+      sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
     }
     j = strlen30(zSql);
     for(i=1; i<nCol; i++){
@@ -27125,7 +27122,6 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
     zSql[j++] = ')';
     zSql[j] = 0;
-    assert( j<nByte );
     if( eVerbose>=2 ){
       oputf("Insert using: %s\n", zSql);
     }

deps/sqlite/sqlite3.c

@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.46.1.  By combining all the individual C code files into this
+** version 3.46.0.  By combining all the individual C code files into this
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -18,7 +18,7 @@
 ** separate file. This file contains only code for the core SQLite library.
 **
 ** The content in this amalgamation comes from Fossil check-in
-** c9c2ab54ba1f5f46360f1b4f35d849cd3f08.
+** 96c92aba00c8375bc32fafcdf12429c58bd8.
 */
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1
@@ -459,9 +459,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.46.1"
+#define SQLITE_VERSION        "3.46.0"
-#define SQLITE_VERSION_NUMBER 3046001
+#define SQLITE_VERSION_NUMBER 3046000
-#define SQLITE_SOURCE_ID      "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
+#define SQLITE_SOURCE_ID      "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -19361,7 +19361,7 @@ struct SrcList {
 #define WHERE_AGG_DISTINCT     0x0400 /* Query is "SELECT agg(DISTINCT ...)" */
 #define WHERE_ORDERBY_LIMIT    0x0800 /* ORDERBY+LIMIT on the inner loop */
 #define WHERE_RIGHT_JOIN       0x1000 /* Processing a RIGHT JOIN */
-#define WHERE_KEEP_ALL_JOINS   0x2000 /* Do not do the omit-noop-join opt */
+                        /*     0x2000    not currently used */
 #define WHERE_USE_LIMIT        0x4000 /* Use the LIMIT in cost estimates */
                         /*     0x8000    not currently used */
 
@@ -90173,8 +90173,7 @@ SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetBoundValue(Vdbe *v, int iVar, u8 aff
   assert( iVar>0 );
   if( v ){
     Mem *pMem = &v->aVar[iVar-1];
-    assert( (v->db->flags & SQLITE_EnableQPSG)==0
+    assert( (v->db->flags & SQLITE_EnableQPSG)==0 );
-         || (v->db->mDbFlags & DBFLAG_InternalFunc)!=0 );
     if( 0==(pMem->flags & MEM_Null) ){
       sqlite3_value *pRet = sqlite3ValueNew(v->db);
       if( pRet ){
@@ -90194,8 +90193,7 @@ SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetBoundValue(Vdbe *v, int iVar, u8 aff
 */
 SQLITE_PRIVATE void sqlite3VdbeSetVarmask(Vdbe *v, int iVar){
   assert( iVar>0 );
-  assert( (v->db->flags & SQLITE_EnableQPSG)==0
+  assert( (v->db->flags & SQLITE_EnableQPSG)==0 );
-       || (v->db->mDbFlags & DBFLAG_InternalFunc)!=0 );
   if( iVar>=32 ){
     v->expmask |= 0x80000000;
   }else{
@@ -106952,7 +106950,7 @@ static void extendFJMatch(
 static SQLITE_NOINLINE int isValidSchemaTableName(
   const char *zTab,         /* Name as it appears in the SQL */
   Table *pTab,              /* The schema table we are trying to match */
-  const char *zDb           /* non-NULL if a database qualifier is present */
+  Schema *pSchema           /* non-NULL if a database qualifier is present */
 ){
   const char *zLegacy;
   assert( pTab!=0 );
@@ -106963,7 +106961,7 @@ static SQLITE_NOINLINE int isValidSchemaTableName(
     if( sqlite3StrICmp(zTab+7, &PREFERRED_TEMP_SCHEMA_TABLE[7])==0 ){
       return 1;
     }
-    if( zDb==0 ) return 0;
+    if( pSchema==0 ) return 0;
     if( sqlite3StrICmp(zTab+7, &LEGACY_SCHEMA_TABLE[7])==0 ) return 1;
     if( sqlite3StrICmp(zTab+7, &PREFERRED_SCHEMA_TABLE[7])==0 ) return 1;
   }else{
@@ -107146,7 +107144,7 @@ static int lookupName(
             }
           }else if( sqlite3StrICmp(zTab, pTab->zName)!=0 ){
             if( pTab->tnum!=1 ) continue;
-            if( !isValidSchemaTableName(zTab, pTab, zDb) ) continue;
+            if( !isValidSchemaTableName(zTab, pTab, pSchema) ) continue;
           }
           assert( ExprUseYTab(pExpr) );
           if( IN_RENAME_OBJECT && pItem->zAlias ){
@@ -108878,9 +108876,6 @@ SQLITE_PRIVATE int sqlite3ResolveExprNames(
 ** Resolve all names for all expression in an expression list.  This is
 ** just like sqlite3ResolveExprNames() except that it works for an expression
 ** list rather than a single expression.
-**
-** The return value is SQLITE_OK (0) for success or SQLITE_ERROR (1) for a
-** failure.
 */
 SQLITE_PRIVATE int sqlite3ResolveExprListNames(
   NameContext *pNC,       /* Namespace to resolve expressions in. */
@@ -108889,7 +108884,7 @@ SQLITE_PRIVATE int sqlite3ResolveExprListNames(
   int i;
   int savedHasAgg = 0;
   Walker w;
-  if( pList==0 ) return SQLITE_OK;
+  if( pList==0 ) return WRC_Continue;
   w.pParse = pNC->pParse;
   w.xExprCallback = resolveExprStep;
   w.xSelectCallback = resolveSelectStep;
@@ -108903,7 +108898,7 @@ SQLITE_PRIVATE int sqlite3ResolveExprListNames(
 #if SQLITE_MAX_EXPR_DEPTH>0
     w.pParse->nHeight += pExpr->nHeight;
     if( sqlite3ExprCheckHeight(w.pParse, w.pParse->nHeight) ){
-      return SQLITE_ERROR;
+      return WRC_Abort;
     }
 #endif
     sqlite3WalkExprNN(&w, pExpr);
@@ -108920,10 +108915,10 @@ SQLITE_PRIVATE int sqlite3ResolveExprListNames(
                           (NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg);
       pNC->ncFlags &= ~(NC_HasAgg|NC_MinMaxAgg|NC_HasWin|NC_OrderAgg);
     }
-    if( w.pParse->nErr>0 ) return SQLITE_ERROR;
+    if( w.pParse->nErr>0 ) return WRC_Abort;
   }
   pNC->ncFlags |= savedHasAgg;
-  return SQLITE_OK;
+  return WRC_Continue;
 }
 
 /*
@@ -117462,7 +117457,7 @@ static int renameResolveTrigger(Parse *pParse){
   /* ALWAYS() because if the table of the trigger does not exist, the
   ** error would have been hit before this point */
   if( ALWAYS(pParse->pTriggerTab) ){
-    rc = sqlite3ViewGetColumnNames(pParse, pParse->pTriggerTab)!=0;
+    rc = sqlite3ViewGetColumnNames(pParse, pParse->pTriggerTab);
   }
 
   /* Resolve symbols in WHEN clause */
@@ -124431,9 +124426,8 @@ create_view_fail:
 #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_VIRTUALTABLE)
 /*
 ** The Table structure pTable is really a VIEW.  Fill in the names of
-** the columns of the view in the pTable structure.  Return non-zero if
+** the columns of the view in the pTable structure.  Return the number
-** there are errors.  If an error is seen an error message is left
+** of errors.  If an error is seen leave an error message in pParse->zErrMsg.
-** in pParse->zErrMsg.
 */
 static SQLITE_NOINLINE int viewGetColumnNames(Parse *pParse, Table *pTable){
   Table *pSelTab;   /* A fake table from which we get the result set */
@@ -124556,7 +124550,7 @@ static SQLITE_NOINLINE int viewGetColumnNames(Parse *pParse, Table *pTable){
     sqlite3DeleteColumnNames(db, pTable);
   }
 #endif /* SQLITE_OMIT_VIEW */
-  return nErr + pParse->nErr;
+  return nErr;
 }
 SQLITE_PRIVATE int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
   assert( pTable!=0 );
@@ -130854,8 +130848,6 @@ static void groupConcatValue(sqlite3_context *context){
       sqlite3_result_error_toobig(context);
     }else if( pAccum->accError==SQLITE_NOMEM ){
       sqlite3_result_error_nomem(context);
-    }else if( pGCC->nAccum>0 && pAccum->nChar==0 ){
-      sqlite3_result_text(context, "", 1, SQLITE_STATIC);
     }else{
       const char *zText = sqlite3_str_value(pAccum);
       sqlite3_result_text(context, zText, pAccum->nChar, SQLITE_TRANSIENT);
@@ -133610,7 +133602,6 @@ SQLITE_PRIVATE Select *sqlite3MultiValues(Parse *pParse, Select *pLeft, ExprList
         pRet->pSrc->nSrc = 1;
         pRet->pPrior = pLeft->pPrior;
         pRet->op = pLeft->op;
-        if( pRet->pPrior ) pRet->selFlags |= SF_Values;
         pLeft->pPrior = 0;
         pLeft->op = TK_SELECT;
         assert( pLeft->pNext==0 );
@@ -166076,9 +166067,7 @@ static int whereLoopAddBtree(
                   " according to whereIsCoveringIndex()\n", pProbe->zName));
             }
           }
-        }else if( m==0
+        }else if( m==0 ){
-           && (HasRowid(pTab) || pWInfo->pSelect!=0 || sqlite3FaultSim(700))
-        ){
           WHERETRACE(0x200,
              ("-> %s a covering index according to bitmasks\n",
              pProbe->zName, m==0 ? "is" : "is not"));
@@ -167967,10 +167956,6 @@ static void showAllWhereLoops(WhereInfo *pWInfo, WhereClause *pWC){
 **      the right-most table of a subquery that was flattened into the
 **      main query and that subquery was the right-hand operand of an
 **      inner join that held an ON or USING clause.
-**   6) The ORDER BY clause has 63 or fewer terms
-**   7) The omit-noop-join optimization is enabled.
-**
-** Items (1), (6), and (7) are checked by the caller.
 **
 ** For example, given:
 **
@@ -168384,7 +168369,6 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   if( pOrderBy && pOrderBy->nExpr>=BMS ){
     pOrderBy = 0;
     wctrlFlags &= ~WHERE_WANT_DISTINCT;
-    wctrlFlags |= WHERE_KEEP_ALL_JOINS; /* Disable omit-noop-join opt */
   }
 
   /* The number of tables in the FROM clause is limited by the number of
@@ -168685,10 +168669,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   ** in-line sqlite3WhereCodeOneLoopStart() for performance reasons.
   */
   notReady = ~(Bitmask)0;
-  if( pWInfo->nLevel>=2       /* Must be a join, or this opt8n is pointless */
+  if( pWInfo->nLevel>=2
-   && pResultSet!=0           /* Condition (1) */
+   && pResultSet!=0                         /* these two combine to guarantee */
-   && 0==(wctrlFlags & (WHERE_AGG_DISTINCT|WHERE_KEEP_ALL_JOINS)) /* (1),(6) */
+   && 0==(wctrlFlags & WHERE_AGG_DISTINCT)  /* condition (1) above */
-   && OptimizationEnabled(db, SQLITE_OmitNoopJoin)                /* (7) */
+   && OptimizationEnabled(db, SQLITE_OmitNoopJoin)
   ){
     notReady = whereOmitNoopJoin(pWInfo, notReady);
     nTabList = pWInfo->nLevel;
@@ -169008,6 +168992,26 @@ whereBeginError:
   }
 #endif
 
+#ifdef SQLITE_DEBUG
+/*
+** Return true if cursor iCur is opened by instruction k of the
+** bytecode.  Used inside of assert() only.
+*/
+static int cursorIsOpen(Vdbe *v, int iCur, int k){
+  while( k>=0 ){
+    VdbeOp *pOp = sqlite3VdbeGetOp(v,k--);
+    if( pOp->p1!=iCur ) continue;
+    if( pOp->opcode==OP_Close ) return 0;
+    if( pOp->opcode==OP_OpenRead ) return 1;
+    if( pOp->opcode==OP_OpenWrite ) return 1;
+    if( pOp->opcode==OP_OpenDup ) return 1;
+    if( pOp->opcode==OP_OpenAutoindex ) return 1;
+    if( pOp->opcode==OP_OpenEphemeral ) return 1;
+  }
+  return 0;
+}
+#endif /* SQLITE_DEBUG */
+
 /*
 ** Generate the end of the WHERE loop.  See comments on
 ** sqlite3WhereBegin() for additional information.
@@ -169307,10 +169311,16 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
             ** reference.  Verify that this is harmless - that the
             ** table being referenced really is open.
             */
-            if( pLoop->wsFlags & WHERE_IDX_ONLY ){
+#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
-              sqlite3ErrorMsg(pParse, "internal query planner error");
+            assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
-              pParse->rc = SQLITE_INTERNAL;
+                 || cursorIsOpen(v,pOp->p1,k)
-            }
+                 || pOp->opcode==OP_Offset
+            );
+#else
+            assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
+                 || cursorIsOpen(v,pOp->p1,k)
+            );
+#endif
           }
         }else if( pOp->opcode==OP_Rowid ){
           pOp->p1 = pLevel->iIdxCur;
@@ -172581,9 +172591,9 @@ static void updateDeleteLimitError(
           break;
         }
       }
-      if( (p->selFlags & (SF_MultiValue|SF_Values))==0
+      if( (p->selFlags & SF_MultiValue)==0 &&
-       && (mxSelect = pParse->db->aLimit[SQLITE_LIMIT_COMPOUND_SELECT])>0
+        (mxSelect = pParse->db->aLimit[SQLITE_LIMIT_COMPOUND_SELECT])>0 &&
-       && cnt>mxSelect
+        cnt>mxSelect
       ){
         sqlite3ErrorMsg(pParse, "too many terms in compound SELECT");
       }
@@ -236994,11 +237004,7 @@ static int sqlite3Fts5ExprNew(
   }
 
   sqlite3_free(sParse.apPhrase);
-  if( 0==*pzErr ){
+  *pzErr = sParse.zErr;
-    *pzErr = sParse.zErr;
-  }else{
-    sqlite3_free(sParse.zErr);
-  }
   return sParse.rc;
 }
 
@@ -239126,7 +239132,6 @@ static Fts5ExprNode *sqlite3Fts5ParseImplicitAnd(
     assert( pRight->eType==FTS5_STRING
         || pRight->eType==FTS5_TERM
         || pRight->eType==FTS5_EOF
-        || (pRight->eType==FTS5_AND && pParse->bPhraseToAnd)
     );
 
     if( pLeft->eType==FTS5_AND ){
@@ -251294,7 +251299,6 @@ static int fts5UpdateMethod(
         rc = SQLITE_ERROR;
       }else{
         rc = fts5SpecialDelete(pTab, apVal);
-        bUpdateOrDelete = 1;
       }
     }else{
       rc = fts5SpecialInsert(pTab, z, apVal[2 + pConfig->nCol + 1]);
@@ -252469,16 +252473,14 @@ static int sqlite3Fts5GetTokenizer(
   if( pMod==0 ){
     assert( nArg>0 );
     rc = SQLITE_ERROR;
-    if( pzErr ) *pzErr = sqlite3_mprintf("no such tokenizer: %s", azArg[0]);
+    *pzErr = sqlite3_mprintf("no such tokenizer: %s", azArg[0]);
   }else{
     rc = pMod->x.xCreate(
         pMod->pUserData, (azArg?&azArg[1]:0), (nArg?nArg-1:0), &pConfig->pTok
     );
     pConfig->pTokApi = &pMod->x;
     if( rc!=SQLITE_OK ){
-      if( pzErr && rc!=SQLITE_NOMEM ){
+      if( pzErr ) *pzErr = sqlite3_mprintf("error in tokenizer constructor");
-        *pzErr = sqlite3_mprintf("error in tokenizer constructor");
-      }
     }else{
       pConfig->ePattern = sqlite3Fts5TokenizerPattern(
           pMod->x.xCreate, pConfig->pTok
@@ -252537,7 +252539,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e", -1, SQLITE_TRANSIENT);
 }
 
 /*
@@ -252572,23 +252574,17 @@ static int fts5IntegrityMethod(
 
   assert( pzErr!=0 && *pzErr==0 );
   UNUSED_PARAM(isQuick);
-  assert( pTab->p.pConfig->pzErrmsg==0 );
-  pTab->p.pConfig->pzErrmsg = pzErr;
   rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, 0);
-  if( *pzErr==0 && rc!=SQLITE_OK ){
+  if( (rc&0xff)==SQLITE_CORRUPT ){
-    if( (rc&0xff)==SQLITE_CORRUPT ){
+    *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s",
-      *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s",
+                zSchema, zTabname);
-          zSchema, zTabname);
+     rc = (*pzErr) ? SQLITE_OK : SQLITE_NOMEM;
-      rc = (*pzErr) ? SQLITE_OK : SQLITE_NOMEM;
+  }else if( rc!=SQLITE_OK ){
-    }else{
+    *pzErr = sqlite3_mprintf("unable to validate the inverted index for"
-      *pzErr = sqlite3_mprintf("unable to validate the inverted index for"
+                             " FTS5 table %s.%s: %s",
-          " FTS5 table %s.%s: %s",
+                zSchema, zTabname, sqlite3_errstr(rc));
-          zSchema, zTabname, sqlite3_errstr(rc));
-    }
   }
-
   sqlite3Fts5IndexCloseReader(pTab->p.pIndex);
-  pTab->p.pConfig->pzErrmsg = 0;
 
   return rc;
 }
@@ -254022,7 +254018,7 @@ static int fts5AsciiCreate(
       int i;
       memset(p, 0, sizeof(AsciiTokenizer));
       memcpy(p->aTokenChar, aAsciiTokenChar, sizeof(aAsciiTokenChar));
-      for(i=0; rc==SQLITE_OK && i<nArg-1; i+=2){
+      for(i=0; rc==SQLITE_OK && i<nArg; i+=2){
         const char *zArg = azArg[i+1];
         if( 0==sqlite3_stricmp(azArg[i], "tokenchars") ){
           fts5AsciiAddExceptions(p, zArg, 1);
@@ -254033,7 +254029,6 @@ static int fts5AsciiCreate(
           rc = SQLITE_ERROR;
         }
       }
-      if( rc==SQLITE_OK && i<nArg ) rc = SQLITE_ERROR;
       if( rc!=SQLITE_OK ){
         fts5AsciiDelete((Fts5Tokenizer*)p);
         p = 0;
@@ -254325,16 +254320,17 @@ static int fts5UnicodeCreate(
       }
 
       /* Search for a "categories" argument */
-      for(i=0; rc==SQLITE_OK && i<nArg-1; i+=2){
+      for(i=0; rc==SQLITE_OK && i<nArg; i+=2){
         if( 0==sqlite3_stricmp(azArg[i], "categories") ){
           zCat = azArg[i+1];
         }
       }
+
       if( rc==SQLITE_OK ){
         rc = unicodeSetCategories(p, zCat);
       }
 
-      for(i=0; rc==SQLITE_OK && i<nArg-1; i+=2){
+      for(i=0; rc==SQLITE_OK && i<nArg; i+=2){
         const char *zArg = azArg[i+1];
         if( 0==sqlite3_stricmp(azArg[i], "remove_diacritics") ){
           if( (zArg[0]!='0' && zArg[0]!='1' && zArg[0]!='2') || zArg[1] ){
@@ -254359,7 +254355,6 @@ static int fts5UnicodeCreate(
           rc = SQLITE_ERROR;
         }
       }
-      if( i<nArg && rc==SQLITE_OK ) rc = SQLITE_ERROR;
 
     }else{
       rc = SQLITE_NOMEM;
@@ -255242,7 +255237,7 @@ static int fts5TriCreate(
     int i;
     pNew->bFold = 1;
     pNew->iFoldParam = 0;
-    for(i=0; rc==SQLITE_OK && i<nArg-1; i+=2){
+    for(i=0; rc==SQLITE_OK && i<nArg; i+=2){
       const char *zArg = azArg[i+1];
       if( 0==sqlite3_stricmp(azArg[i], "case_sensitive") ){
         if( (zArg[0]!='0' && zArg[0]!='1') || zArg[1] ){
@@ -255260,7 +255255,6 @@ static int fts5TriCreate(
         rc = SQLITE_ERROR;
       }
     }
-    if( i<nArg && rc==SQLITE_OK ) rc = SQLITE_ERROR;
 
     if( pNew->iFoldParam!=0 && pNew->bFold==0 ){
       rc = SQLITE_ERROR;

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.46.1"
+#define SQLITE_VERSION        "3.46.0"
-#define SQLITE_VERSION_NUMBER 3046001
+#define SQLITE_VERSION_NUMBER 3046000
-#define SQLITE_SOURCE_ID      "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
+#define SQLITE_SOURCE_ID      "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers

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
+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;h1 style=&quot;color: #fff&quot;&gt;Welcome, visitor #1!&lt;/h1&gt;"></iframe>
+    // Displays a message in the client's browser.
+    terminal.print("Hello, world!");
 
-### Explanation
+## API Documentation
 
-Just as pure browser apps have access to `localStorage`, Tilde Friends apps have access to key-value storage on the server.
+The Tilde Friends API is very much evolving.
 
-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.
+All currently registered methods can be explored in the
+[documentation](https://www.tildefriends.net/~cory/documentation) app.
 
-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.
+All browser-facing methods are implemented in [client.js](core/client.js).
+Most process-related methods are implemented in [core.js](core/core.js).
 
-## Example 3: Files
+Higher-level behaviors are often implemented within library-style apps
+themselves and are beyond the scope of this document.
 
-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.
+### Terminal
 
-### app.js
+All interaction with a human user is through a terminal-like interface. Though
+it is somewhat limiting, it makes simple things easy, and it is possible to
+construct complicated interfaces by creating and interacting with an iframe.
 
-```
+#### terminal.print(arguments...)
-async function main() {
-	let html = utf8Decode(await getFile('index.html'));
-	app.setDocument(html);
-}
 
-main();
+Print to the terminal. Arguments and lists are recursively expanded. Numerous
-```
+special values are supported as implemented in client.cs.
 
-### index.html
+    // Create a link.
+    terminal.print({href: "http://www.tildefriends.net/", value: "Tilde Friends!"});
 
-```
+    // Create an iframe.
-<html>
+    terminal.print({iframe: "&lt;b&gt;Hello, world!&lt;/b&gt;", width: 640, height: 480});
-	<head>
-		<script type="module" src="script.js"></script>
-	</head>
-	<body style="color: #fff">
-		<h1>File Test</h1>
-	</body>
-</html>
-```
 
-### script.js
+    // Use style.
+    terminal.print({style: "color: #f00", value: "Hello, world!"});
 
-```
+    // Create a link that when clicked will act as if the user typed a command.
-window.addEventListener('load', function() {
+    terminal.print({command: "exit", value: "Get out of here."});
-	document.body.appendChild(document.createTextNode('Hello, world');
-});
-```
 
-### Output
+#### terminal.clear()
 
-<iframe srcdoc="&lt;body style=&quot;color: #fff&quot;&gt;<h1>File Test</h1>Hello, world!&lt;/body&gt;"></iframe>
+Clears the terminal output.
 
-### Explanation
+#### terminal.readLine()
 
-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.
+Read a line of input from the user.
 
-## Example 4: Remote Procedure Call
+#### terminal.setEcho(echo)
 
-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.
+Controls whether the terminal will automatically echo user input. Defaults to true.
 
-### app.js
+#### terminal.setPrompt(prompt)
 
-```
+Sets the terminal prompt. The default is "&gt;".
-import * as tf from '/tfrpc.js';
 
-function sum() {
+#### terminal.setTitle(title)
-	let s = 0
-	for (let x of arguments) {
-		s += x;
-	}
-	return s;
-}
-tf.register(sum);
 
-async function main() {
+Sets the browser window/tab title.
-	app.setDocument(utf8Decode(await getFile('index.html')));
-}
-main();
-```
 
-### index.html
+#### terminal.split(terminalList)
 
-```
+Reconfigures the terminal layout, potentially into multiple split panes.
-<html>
-	<body>
-		<h1 id='result'>Calculating...</h1>
-	</body>
-	<script type="module" src="script.js"></script>
-</html>
-```
 
-### script.js
+    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)
-import * as tf from '/static/tfrpc.js';
 
-window.addEventListener('load', async function() {
+Directs subsequent output to the named terminal.
-	document.getElementById('result').innerText = await tf.rpc.sum(1, 2, 3);
-});
-```
 
-### Output
+#### terminal.postMessageToIframe(iframeName, message)
 
-<iframe srcdoc="&lt;body style=&quot;color: #fff&quot;&gt;<h1>6</h1>&lt;/body&gt;"></iframe>
+Sends a message to the iframe that was created with the given name, using the
+browser's window.postMessage.
 
-### Explanation
+### Database
 
-Here the browser makes an asynchronous call to the server to do some basic math and update its DOM with the result.
+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.
 
-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.
+#### database.get(key)
 
-## Conclusion
+Retrieve the database value associated with the given key.
 
-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.
+#### database.set(key, value)
 
-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 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/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.

src/android/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.unprompted.tildefriends"
+	package="com.unprompted.tildefriends">
-	android:versionCode="27"
-	android:versionName="0.0.23-wip">
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
 		android:label="Tilde Friends"
-		android:usesCleartextTraffic="true">
+		android:versionCode="25"
+		android:versionName="0.0.22-wip"
+		android:usesCleartextTraffic="true"
+		android:debuggable="false">
 		<meta-data android:name="android.max_aspect" android:value="2.1"/>
 		<activity
 			android:name=".TildeFriendsActivity"

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

@@ -7,7 +7,6 @@ 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;
@@ -16,7 +15,6 @@ 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;
@@ -34,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;
@@ -69,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
@@ -151,11 +148,7 @@ public class TildeFriendsActivity extends Activity {
 			@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 + ".");
 			}
 		});
@@ -165,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 + ")");
@@ -200,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())
@@ -217,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
@@ -460,12 +422,4 @@ public class TildeFriendsActivity extends Activity {
 			s_activity.service_connection = null;
 		}
 	}
-
-	@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/dht.c

@@ -0,0 +1,34 @@
+#include <stddef.h>
+#include <stdio.h>
+
+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <windows.h>
+#include <winsock.h>
+#include <ws2tcpip.h>
+#else
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
+
+#include "dht.h"
+
+int dht_sendto(int sockfd, const void *buf, int len, int flags, const struct sockaddr *to, int tolen)
+{
+	return -1;
+}
+
+int dht_blacklisted(const struct sockaddr *sa, int salen)
+{
+	return 0;
+}
+
+void dht_hash(void *hash_return, int hash_size, const void *v1, int len1, const void *v2, int len2, const void *v3, int len3)
+{
+}
+
+int dht_random_bytes(void *buf, size_t size)
+{
+	return 0;
+}

src/http.c

@@ -1071,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/httpd.js.c

@@ -39,7 +39,7 @@ 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 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);
 static const char* _make_set_session_cookie_header(tf_http_request_t* request, const char* session_cookie);
 
 static JSClassID _httpd_class_id;
@@ -334,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);
@@ -1305,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)
 	{
@@ -1319,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));
@@ -1483,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);
+					tf_free((void*)send_session);
-					registered = tf_ssb_db_register_account(tf_ssb_get_loop(ssb), db, context, account_name, password);
+					send_session = _make_session_jwt(ssb, account_name);
-					tf_ssb_release_db_writer(ssb, db);
+					may_become_first_admin = true;
-					if (registered)
-					{
-						tf_free((void*)send_session);
-						send_session = _make_session_jwt(context, ssb, account_name);
-						may_become_first_admin = true;
-					}
 				}
-				if (!registered)
+				else
 				{
 					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);
+					tf_free((void*)send_session);
-					set = tf_ssb_db_set_account_password(tf_ssb_get_loop(ssb), db, context, account_name, new_password);
+					send_session = _make_session_jwt(ssb, account_name);
-					tf_ssb_release_db_writer(ssb, db);
-					if (set)
-					{
-						tf_free((void*)send_session);
-						send_session = _make_session_jwt(context, ssb, account_name);
-					}
 				}
-				if (!set)
+				else
 				{
 					login_error = "Error changing password.";
 				}
@@ -1525,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
@@ -1537,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);
 	}
@@ -1689,7 +1678,6 @@ void tf_httpd_register(JSContext* context)
 	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, "/~*/*/", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/&*.sha256/", _httpd_endpoint_static, NULL, task);
 
 	tf_http_add_handler(http, "/robots.txt", _httpd_endpoint_robots_txt, NULL, NULL);
 	tf_http_add_handler(http, "/debug", _httpd_endpoint_debug, NULL, task);

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"
@@ -751,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;
 
@@ -759,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);
@@ -798,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);
 
@@ -851,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));
@@ -860,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;
 }
@@ -896,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)
@@ -917,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/ssb.c

@@ -8,7 +8,6 @@
 #include "trace.h"
 #include "util.js.h"
 
-#include "ares.h"
 #include "quickjs.h"
 #include "sodium/crypto_auth.h"
 #include "sodium/crypto_box.h"
@@ -21,10 +20,6 @@
 #include "sqlite3.h"
 #include "uv.h"
 
-#if !defined(_WIN32)
-#include <arpa/nameser.h>
-#endif
-
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -77,10 +72,6 @@ enum
 	k_tf_ssb_rpc_message_body_length_max = 1 * 1024 * 1024,
 	k_debug_close_message_count = 256,
 	k_debug_close_connection_count = 32,
-	k_seed_expire_seconds = 10 * 60,
-	k_seed_check_interval_seconds = 5 * 60,
-	k_udp_discovery_expires_seconds = 10,
-	k_handshake_timeout_ms = 15000,
 };
 
 typedef struct _tf_ssb_broadcast_t tf_ssb_broadcast_t;
@@ -120,9 +111,7 @@ typedef struct _tf_ssb_broadcast_t
 	tf_ssb_broadcast_t* next;
 	time_t ctime;
 	time_t mtime;
-	time_t expires_at;
 	char host[256];
-	tf_ssb_broadcast_origin_t origin;
 	struct sockaddr_in addr;
 	tf_ssb_connection_t* tunnel_connection;
 	uint8_t pub[crypto_sign_PUBLICKEYBYTES];
@@ -266,11 +255,7 @@ typedef struct _tf_ssb_t
 
 	uv_thread_t thread_self;
 	bool is_room;
-	bool is_replicator;
-	bool is_peer_exchange;
 	char* room_name;
-	char seeds_host[256];
-	time_t last_seed_check;
 
 	tf_ssb_timer_t** timers;
 	int timers_count;
@@ -295,7 +280,6 @@ typedef struct _tf_ssb_connection_t
 	uv_tcp_t tcp;
 	uv_connect_t connect;
 	uv_async_t async;
-	uv_timer_t handshake_timer;
 	bool closing;
 
 	tf_ssb_connection_t* tunnel_connection;
@@ -367,7 +351,6 @@ static JSClassID _connection_class_id;
 static int s_connection_index;
 static int s_tunnel_index;
 
-static void _tf_ssb_add_broadcast(tf_ssb_t* ssb, const tf_ssb_broadcast_t* broadcast, int expires_seconds);
 static void _tf_ssb_connection_client_send_hello(tf_ssb_connection_t* connection);
 static void _tf_ssb_connection_close(tf_ssb_connection_t* connection, const char* reason);
 static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const char* reason);
@@ -375,7 +358,6 @@ static void _tf_ssb_connection_finalizer(JSRuntime* runtime, JSValue value);
 static void _tf_ssb_connection_on_close(uv_handle_t* handle);
 static void _tf_ssb_nonce_inc(uint8_t* nonce);
 static void _tf_ssb_notify_connections_changed(tf_ssb_t* ssb, tf_ssb_change_t change, tf_ssb_connection_t* connection);
-static bool _tf_ssb_parse_broadcast(const char* in_broadcast, tf_ssb_broadcast_t* out_broadcast);
 static void _tf_ssb_start_update_settings(tf_ssb_t* ssb);
 static void _tf_ssb_update_settings(tf_ssb_t* ssb);
 static void _tf_ssb_write(tf_ssb_connection_t* connection, void* data, size_t size);
@@ -1260,10 +1242,6 @@ static void _tf_ssb_connection_verify_identity(tf_ssb_connection_t* connection,
 	JS_SetPropertyStr(context, connection->object, "is_client", JS_TRUE);
 
 	connection->state = k_tf_ssb_state_verified;
-	if (connection->handshake_timer.data)
-	{
-		uv_timer_stop(&connection->handshake_timer);
-	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_connect, connection);
 }
 
@@ -1492,10 +1470,6 @@ static void _tf_ssb_connection_verify_client_identity(tf_ssb_connection_t* conne
 	JS_SetPropertyStr(context, connection->object, "is_client", JS_FALSE);
 
 	connection->state = k_tf_ssb_state_server_verified;
-	if (connection->handshake_timer.data)
-	{
-		uv_timer_stop(&connection->handshake_timer);
-	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_connect, connection);
 }
 
@@ -1941,13 +1915,8 @@ static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const ch
 	{
 		uv_close((uv_handle_t*)&connection->tcp, _tf_ssb_connection_on_close);
 	}
-	if (connection->handshake_timer.data && !uv_is_closing((uv_handle_t*)&connection->handshake_timer))
-	{
-		uv_close((uv_handle_t*)&connection->handshake_timer, _tf_ssb_connection_on_close);
-	}
 
-	if (JS_IsUndefined(connection->object) && !connection->async.data && !connection->tcp.data && !connection->connect.data && !connection->handshake_timer.data &&
+	if (JS_IsUndefined(connection->object) && !connection->async.data && !connection->tcp.data && !connection->connect.data && connection->ref_count == 0)
-		connection->ref_count == 0)
 	{
 		tf_free(connection->message_requests);
 		connection->message_requests = NULL;
@@ -1971,7 +1940,7 @@ static void _tf_ssb_connection_on_close(uv_handle_t* handle)
 {
 	tf_ssb_connection_t* connection = handle->data;
 	handle->data = NULL;
-	if (connection && connection->closing)
+	if (connection)
 	{
 		_tf_ssb_connection_destroy(connection, "handle closed");
 	}
@@ -2213,7 +2182,6 @@ tf_ssb_t* tf_ssb_create(uv_loop_t* loop, JSContext* context, const char* db_path
 {
 	tf_ssb_t* ssb = tf_malloc(sizeof(tf_ssb_t));
 	memset(ssb, 0, sizeof(*ssb));
-	ssb->is_replicator = true;
 
 	const char* actual_key = network_key ? network_key : k_ssb_network_string;
 	if (sodium_hex2bin(ssb->network_key, sizeof(ssb->network_key), actual_key, strlen(actual_key), ": ", NULL, NULL))
@@ -2417,14 +2385,6 @@ tf_trace_t* tf_ssb_get_trace(tf_ssb_t* ssb)
 
 JSContext* tf_ssb_get_context(tf_ssb_t* ssb)
 {
-	if (ssb->thread_self && uv_thread_self() != ssb->thread_self)
-	{
-		const char* bt = tf_util_backtrace_string();
-		tf_printf("Acquiring JS context from non-main thread:\n%s\n", bt);
-		tf_free((void*)bt);
-		abort();
-	}
-
 	return ssb->context;
 }
 
@@ -2658,15 +2618,6 @@ static void _tf_ssb_connection_process_message_async(uv_async_t* async)
 	}
 }
 
-static void _tf_ssb_connection_handshake_timer_callback(uv_timer_t* timer)
-{
-	tf_ssb_connection_t* connection = timer->data;
-	if (connection && connection->state != k_tf_ssb_state_verified && connection->state != k_tf_ssb_state_server_verified)
-	{
-		_tf_ssb_connection_destroy(connection, "handshake timeout");
-	}
-}
-
 tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, const struct sockaddr_in* addr, const uint8_t* public_key)
 {
 	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
@@ -2701,10 +2652,6 @@ tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, c
 	connection->async.data = connection;
 	uv_async_init(ssb->loop, &connection->async, _tf_ssb_connection_process_message_async);
 
-	connection->handshake_timer.data = connection;
-	uv_timer_init(ssb->loop, &connection->handshake_timer);
-	uv_timer_start(&connection->handshake_timer, _tf_ssb_connection_handshake_timer_callback, k_handshake_timeout_ms, 0);
-
 	connection->object = JS_NewObjectClass(ssb->context, _connection_class_id);
 	JS_SetOpaque(connection->object, connection);
 	char public_key_str[k_id_base64_len] = { 0 };
@@ -2765,10 +2712,6 @@ tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char*
 	tunnel->async.data = tunnel;
 	uv_async_init(ssb->loop, &tunnel->async, _tf_ssb_connection_process_message_async);
 
-	tunnel->handshake_timer.data = tunnel;
-	uv_timer_init(ssb->loop, &tunnel->handshake_timer);
-	uv_timer_start(&tunnel->handshake_timer, _tf_ssb_connection_handshake_timer_callback, k_handshake_timeout_ms, 0);
-
 	tunnel->object = JS_NewObjectClass(ssb->context, _connection_class_id);
 	JS_SetOpaque(tunnel->object, tunnel);
 	JS_SetPropertyStr(context, tunnel->object, "id", JS_NewString(context, target_id));
@@ -2891,10 +2834,6 @@ static void _tf_ssb_on_connection(uv_stream_t* stream, int status)
 		return;
 	}
 
-	connection->handshake_timer.data = connection;
-	uv_timer_init(ssb->loop, &connection->handshake_timer);
-	uv_timer_start(&connection->handshake_timer, _tf_ssb_connection_handshake_timer_callback, k_handshake_timeout_ms, 0);
-
 	struct sockaddr_storage addr = { 0 };
 	int size = sizeof(addr);
 	if (uv_tcp_getpeername(&connection->tcp, (struct sockaddr*)&addr, &size) == 0)
@@ -2906,10 +2845,10 @@ static void _tf_ssb_on_connection(uv_stream_t* stream, int status)
 	connection->next = ssb->connections;
 	ssb->connections = connection;
 	ssb->connections_count++;
+	_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_create, connection);
 
 	connection->state = k_tf_ssb_state_server_wait_hello;
 	_tf_ssb_connection_read_start(connection);
-	_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_create, connection);
 }
 
 static void _tf_ssb_send_broadcast(tf_ssb_t* ssb, struct sockaddr_in* address, struct sockaddr_in* netmask)
@@ -2953,60 +2892,6 @@ static void _tf_ssb_send_broadcast(tf_ssb_t* ssb, struct sockaddr_in* address, s
 	}
 }
 
-typedef struct _seeds_t
-{
-	char** seeds;
-	int seeds_count;
-} seeds_t;
-
-static void _tf_ssb_update_seed_callback(void* arg, ares_status_t status, size_t timeouts, const ares_dns_record_t* record)
-{
-	seeds_t* seeds = arg;
-	for (int i = 0; i < (int)ares_dns_record_rr_cnt(record, ARES_SECTION_ANSWER); i++)
-	{
-		const ares_dns_rr_t* rr = ares_dns_record_rr_get_const(record, ARES_SECTION_ANSWER, i);
-		size_t len = 0;
-		const unsigned char* str = ares_dns_rr_get_bin(rr, ARES_RR_TXT_DATA, &len);
-		seeds->seeds = tf_resize_vec(seeds->seeds, sizeof(char*) * (seeds->seeds_count + 1));
-		seeds->seeds[seeds->seeds_count++] = tf_strdup((const char*)str);
-	}
-}
-
-static void _tf_ssb_update_seeds_work(tf_ssb_t* ssb, void* user_data)
-{
-	if (ares_library_init(0) == ARES_SUCCESS)
-	{
-		ares_channel channel;
-		struct ares_options options = { .evsys = ARES_EVSYS_DEFAULT };
-		int result = ares_init_options(&channel, &options, ARES_OPT_EVENT_THREAD);
-		if (result == ARES_SUCCESS)
-		{
-			if (ares_query_dnsrec(channel, ssb->seeds_host, ARES_CLASS_IN, ARES_REC_TYPE_TXT, _tf_ssb_update_seed_callback, user_data, NULL) == ARES_SUCCESS)
-			{
-				ares_queue_wait_empty(channel, -1);
-			}
-			ares_destroy(channel);
-		}
-		ares_library_cleanup();
-	}
-}
-
-static void _tf_ssb_update_seeds_after_work(tf_ssb_t* ssb, int status, void* user_data)
-{
-	seeds_t* seeds = user_data;
-	for (int i = 0; i < seeds->seeds_count; i++)
-	{
-		tf_ssb_broadcast_t broadcast = { .origin = k_tf_ssb_broadcast_origin_peer_exchange };
-		if (_tf_ssb_parse_broadcast(seeds->seeds[i], &broadcast))
-		{
-			_tf_ssb_add_broadcast(ssb, &broadcast, k_seed_expire_seconds);
-		}
-		tf_free(seeds->seeds[i]);
-	}
-	tf_free(seeds->seeds);
-	tf_free(seeds);
-}
-
 static void _tf_ssb_broadcast_timer(uv_timer_t* timer)
 {
 	tf_ssb_t* ssb = timer->data;
@@ -3023,15 +2908,6 @@ static void _tf_ssb_broadcast_timer(uv_timer_t* timer)
 		}
 		uv_free_interface_addresses(info, count);
 	}
-
-	time_t now = time(NULL);
-	if (ssb->is_peer_exchange && *ssb->seeds_host && now - ssb->last_seed_check > k_seed_check_interval_seconds)
-	{
-		seeds_t* seeds = tf_malloc(sizeof(seeds_t));
-		*seeds = (seeds_t) { 0 };
-		ssb->last_seed_check = now;
-		tf_ssb_run_work(ssb, _tf_ssb_update_seeds_work, _tf_ssb_update_seeds_after_work, seeds);
-	}
 }
 
 int tf_ssb_server_open(tf_ssb_t* ssb, int port)
@@ -3075,21 +2951,6 @@ int tf_ssb_server_open(tf_ssb_t* ssb, int port)
 	return status == 0 ? assigned_port : 0;
 }
 
-int tf_ssb_server_get_port(tf_ssb_t* ssb)
-{
-	int port = 0;
-	if (ssb && ssb->server.data)
-	{
-		struct sockaddr_storage name = { 0 };
-		int size = (int)sizeof(name);
-		if (uv_tcp_getsockname(&ssb->server, (struct sockaddr*)&name, &size) == 0)
-		{
-			port = ntohs(((struct sockaddr_in*)&name)->sin_port);
-		}
-	}
-	return port;
-}
-
 void tf_ssb_server_close(tf_ssb_t* ssb)
 {
 	if (ssb->server.data && !uv_is_closing((uv_handle_t*)&ssb->server))
@@ -3159,7 +3020,7 @@ static void _tf_ssb_notify_broadcasts_changed(tf_ssb_t* ssb)
 	}
 }
 
-static void _tf_ssb_add_broadcast(tf_ssb_t* ssb, const tf_ssb_broadcast_t* broadcast, int expires_seconds)
+static void _tf_ssb_add_broadcast(tf_ssb_t* ssb, const tf_ssb_broadcast_t* broadcast)
 {
 	if (memcmp(broadcast->pub, ssb->pub, sizeof(ssb->pub)) == 0)
 	{
@@ -3173,7 +3034,6 @@ static void _tf_ssb_add_broadcast(tf_ssb_t* ssb, const tf_ssb_broadcast_t* broad
 			if (node->tunnel_connection == broadcast->tunnel_connection && memcmp(node->pub, broadcast->pub, sizeof(node->pub)) == 0)
 			{
 				node->mtime = time(NULL);
-				node->expires_at = node->mtime + expires_seconds;
 				return;
 			}
 		}
@@ -3186,7 +3046,6 @@ static void _tf_ssb_add_broadcast(tf_ssb_t* ssb, const tf_ssb_broadcast_t* broad
 				node->addr.sin_addr.s_addr == broadcast->addr.sin_addr.s_addr && memcmp(node->pub, broadcast->pub, sizeof(node->pub)) == 0)
 			{
 				node->mtime = time(NULL);
-				node->expires_at = node->mtime + expires_seconds;
 				return;
 			}
 		}
@@ -3203,22 +3062,12 @@ static void _tf_ssb_add_broadcast(tf_ssb_t* ssb, const tf_ssb_broadcast_t* broad
 	node->next = ssb->broadcasts;
 	node->ctime = time(NULL);
 	node->mtime = node->ctime;
-	node->expires_at = node->mtime + expires_seconds;
 	ssb->broadcasts = node;
 	ssb->broadcasts_count++;
 
 	_tf_ssb_notify_broadcasts_changed(ssb);
 }
 
-void tf_ssb_add_broadcast(tf_ssb_t* ssb, const char* connection, tf_ssb_broadcast_origin_t origin, int64_t expires_seconds)
-{
-	tf_ssb_broadcast_t broadcast = { .origin = origin };
-	if (_tf_ssb_parse_broadcast(connection, &broadcast))
-	{
-		_tf_ssb_add_broadcast(ssb, &broadcast, expires_seconds);
-	}
-}
-
 static void _tf_ssb_on_broadcast_listener_recv(uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf, const struct sockaddr* addr, unsigned flags)
 {
 	if (nread <= 0)
@@ -3235,19 +3084,18 @@ static void _tf_ssb_on_broadcast_listener_recv(uv_udp_t* handle, ssize_t nread,
 	char* entry = strtok_r(buf->base, k_delim, &state);
 	while (entry)
 	{
-		tf_ssb_broadcast_t broadcast = { .origin = k_tf_ssb_broadcast_origin_discovery };
+		tf_ssb_broadcast_t broadcast = { 0 };
 		if (_tf_ssb_parse_broadcast(entry, &broadcast))
 		{
-			_tf_ssb_add_broadcast(ssb, &broadcast, k_udp_discovery_expires_seconds);
+			_tf_ssb_add_broadcast(ssb, &broadcast);
 		}
 		entry = strtok_r(NULL, k_delim, &state);
 	}
 	tf_free(buf->base);
 }
 
-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)
 {
 	time_t now = time(NULL);
 	tf_ssb_broadcast_t* next = NULL;
@@ -3257,7 +3105,7 @@ void tf_ssb_visit_broadcasts(tf_ssb_t* ssb,
 		if (node->mtime - now < 60)
 		{
 			tf_trace_begin(ssb->trace, "broadcast");
-			callback(node->host, &node->addr, node->origin, node->tunnel_connection, node->pub, user_data);
+			callback(node->host, &node->addr, node->tunnel_connection, node->pub, user_data);
 			tf_trace_end(ssb->trace);
 		}
 	}
@@ -3270,7 +3118,7 @@ static void _tf_ssb_broadcast_cleanup_timer(uv_timer_t* timer)
 	time_t now = time(NULL);
 	for (tf_ssb_broadcast_t** it = &ssb->broadcasts; *it;)
 	{
-		if (!(*it)->tunnel_connection && now > (*it)->expires_at)
+		if (!(*it)->tunnel_connection && (*it)->mtime < now - 10)
 		{
 			tf_ssb_broadcast_t* node = *it;
 			*it = node->next;
@@ -3683,11 +3531,10 @@ void tf_ssb_notify_blob_want_added(tf_ssb_t* ssb, const char* id)
 void tf_ssb_connection_add_room_attendant(tf_ssb_connection_t* connection, const char* id)
 {
 	tf_ssb_broadcast_t broadcast = {
-		.origin = k_tf_ssb_broadcast_origin_room,
 		.tunnel_connection = connection,
 	};
 	tf_ssb_id_str_to_bin(broadcast.pub, id);
-	_tf_ssb_add_broadcast(connection->ssb, &broadcast, 0);
+	_tf_ssb_add_broadcast(connection->ssb, &broadcast);
 }
 
 void tf_ssb_connection_remove_room_attendant(tf_ssb_connection_t* connection, const char* id)
@@ -4068,26 +3915,6 @@ const char* tf_ssb_get_room_name(tf_ssb_t* ssb)
 	return ssb->room_name;
 }
 
-bool tf_ssb_is_replicator(tf_ssb_t* ssb)
-{
-	return ssb->is_replicator;
-}
-
-void tf_ssb_set_is_replicator(tf_ssb_t* ssb, bool is_replicator)
-{
-	ssb->is_replicator = is_replicator;
-}
-
-bool tf_ssb_is_peer_exchange(tf_ssb_t* ssb)
-{
-	return ssb->is_peer_exchange;
-}
-
-void tf_ssb_set_is_peer_exchange(tf_ssb_t* ssb, bool is_peer_exchange)
-{
-	ssb->is_peer_exchange = is_peer_exchange;
-}
-
 void tf_ssb_set_room_name(tf_ssb_t* ssb, const char* room_name)
 {
 	tf_free(ssb->room_name);
@@ -4097,9 +3924,6 @@ void tf_ssb_set_room_name(tf_ssb_t* ssb, const char* room_name)
 typedef struct _update_settings_t
 {
 	bool is_room;
-	bool is_replicator;
-	bool is_peer_exchange;
-	char seeds_host[256];
 	char room_name[1024];
 } update_settings_t;
 
@@ -4156,10 +3980,7 @@ static void _tf_ssb_update_settings_work(tf_ssb_t* ssb, void* user_data)
 {
 	update_settings_t* update = user_data;
 	update->is_room = _get_global_setting_bool(ssb, "room", true);
-	update->is_replicator = _get_global_setting_bool(ssb, "replicator", true);
-	update->is_peer_exchange = _get_global_setting_bool(ssb, "peer_exchange", true);
 	_get_global_setting_string(ssb, "room_name", update->room_name, sizeof(update->room_name));
-	_get_global_setting_string(ssb, "seeds_host", update->seeds_host, sizeof(update->seeds_host));
 }
 
 static void _tf_ssb_update_settings_after_work(tf_ssb_t* ssb, int result, void* user_data)
@@ -4167,9 +3988,6 @@ static void _tf_ssb_update_settings_after_work(tf_ssb_t* ssb, int result, void*
 	update_settings_t* update = user_data;
 	tf_ssb_set_is_room(ssb, update->is_room);
 	tf_ssb_set_room_name(ssb, update->room_name);
-	tf_ssb_set_is_peer_exchange(ssb, update->is_peer_exchange);
-	tf_ssb_set_is_replicator(ssb, update->is_replicator);
-	snprintf(ssb->seeds_host, sizeof(ssb->seeds_host), "%s", update->seeds_host);
 	_tf_ssb_start_update_settings(ssb);
 	tf_free(update);
 }

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,"
@@ -1645,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];
@@ -1663,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)
 	{
@@ -1672,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);
@@ -1679,70 +1681,47 @@ 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;
+	bool result = false;
-	sqlite3_stmt* statement;
+	JSContext* context = tf_ssb_get_context(ssb);
-	if (sqlite3_prepare(db, "SELECT json_extract(value, '$.' || ?) FROM properties WHERE id = 'core' AND key = 'settings'", -1, &statement, NULL) == SQLITE_OK)
+	JSValue users_array = JS_UNDEFINED;
+
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+	sqlite3_stmt* statement = NULL;
+	if (sqlite3_prepare(db, "SELECT value FROM properties WHERE id = 'auth' AND key = 'users'", -1, &statement, NULL) == SQLITE_OK)
 	{
-		if (sqlite3_bind_text(statement, 1, name, -1, NULL) == SQLITE_OK)
+		if (sqlite3_step(statement) == SQLITE_ROW)
 		{
-			if (sqlite3_step(statement) == SQLITE_ROW && sqlite3_column_type(statement, 0) != SQLITE_NULL)
+			users_array = JS_ParseJSON(context, (const char*)sqlite3_column_text(statement, 0), sqlite3_column_bytes(statement, 0), NULL);
-			{
-				result = sqlite3_column_int(statement, 0) != 0;
-			}
 		}
 		sqlite3_finalize(statement);
 	}
-	else
+	if (JS_IsUndefined(users_array))
 	{
-		tf_printf("prepare failed: %s\n", sqlite3_errmsg(db));
+		users_array = JS_NewArray(context);
 	}
-	return result;
+	int length = tf_util_get_length(context, users_array);
-}
+	JS_SetPropertyUint32(context, users_array, length, JS_NewString(context, name));
 
-bool tf_ssb_db_register_account(uv_loop_t* loop, sqlite3* db, JSContext* context, const char* name, const char* password)
+	JSValue json = JS_JSONStringify(context, users_array, JS_NULL, JS_NULL);
-{
+	JS_FreeValue(context, users_array);
-	bool result = false;
+	size_t value_length = 0;
-	JSValue users_array = JS_UNDEFINED;
+	const char* value = JS_ToCStringLen(context, &value_length, json);
-
+	if (sqlite3_prepare(db, "INSERT OR REPLACE INTO properties (id, key, value) VALUES ('auth', 'users', ?)", -1, &statement, NULL) == SQLITE_OK)
-	bool registration_allowed = _tf_ssb_db_get_global_setting_bool(db, "account_registration", true);
-	if (registration_allowed)
 	{
-		sqlite3_stmt* statement = NULL;
+		if (sqlite3_bind_text(statement, 1, value, value_length, NULL) == SQLITE_OK)
-		if (sqlite3_prepare(db, "SELECT value FROM properties WHERE id = 'auth' AND key = 'users'", -1, &statement, NULL) == SQLITE_OK)
 		{
-			if (sqlite3_step(statement) == SQLITE_ROW)
+			tf_printf("added user to properties\n");
-			{
+			result = sqlite3_step(statement) == SQLITE_DONE;
-				users_array = JS_ParseJSON(context, (const char*)sqlite3_column_text(statement, 0), sqlite3_column_bytes(statement, 0), NULL);
-			}
-			sqlite3_finalize(statement);
 		}
-		if (JS_IsUndefined(users_array))
+		sqlite3_finalize(statement);
-		{
-			users_array = JS_NewArray(context);
-		}
-		int length = tf_util_get_length(context, users_array);
-		JS_SetPropertyUint32(context, users_array, length, JS_NewString(context, name));
-
-		JSValue json = JS_JSONStringify(context, users_array, JS_NULL, JS_NULL);
-		JS_FreeValue(context, users_array);
-		size_t value_length = 0;
-		const char* value = JS_ToCStringLen(context, &value_length, json);
-		if (sqlite3_prepare(db, "INSERT OR REPLACE INTO properties (id, key, value) VALUES ('auth', 'users', ?)", -1, &statement, NULL) == SQLITE_OK)
-		{
-			if (sqlite3_bind_text(statement, 1, value, value_length, NULL) == SQLITE_OK)
-			{
-				tf_printf("added user to properties\n");
-				result = sqlite3_step(statement) == SQLITE_DONE;
-			}
-			sqlite3_finalize(statement);
-		}
-		JS_FreeCString(context, value);
-		JS_FreeValue(context, json);
 	}
+	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;
 }
 
@@ -1946,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.
@@ -416,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.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.
 */
@@ -311,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.
@@ -364,13 +342,6 @@ void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address);
 */
 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.
@@ -993,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.

src/ssb.import.c

@@ -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);
 	}

src/ssb.js.c

@@ -381,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);
 }
 
@@ -453,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)
@@ -637,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);
@@ -657,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)
@@ -800,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));
 }
 
@@ -1477,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)));

src/ssb.rpc.c

@@ -19,7 +19,6 @@
 #endif
 
 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);
-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)
@@ -108,12 +107,6 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 	{
 		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;
-	}
 
 	tf_ssb_connection_add_request(connection, -request_number, "blobs.get", _tf_ssb_rpc_blobs_get_callback, NULL, NULL, NULL);
 	JSContext* context = tf_ssb_connection_get_context(connection);
@@ -148,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)
@@ -282,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);
@@ -605,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;
 	}
@@ -901,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);
@@ -1137,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;
 	}
 
@@ -1209,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);
 }
@@ -1224,24 +1166,21 @@ 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);
-			JSValue message = JS_NewObject(context);
+		JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "blobs"));
-			JSValue name = JS_NewArray(context);
+		JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "createWants"));
-			JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "blobs"));
+		JS_SetPropertyStr(context, message, "name", name);
-			JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "createWants"));
+		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "source"));
-			JS_SetPropertyStr(context, message, "name", name);
+		JS_SetPropertyStr(context, message, "args", JS_NewArray(context));
-			JS_SetPropertyStr(context, message, "type", JS_NewString(context, "source"));
+		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",
-			JS_SetPropertyStr(context, message, "args", JS_NewArray(context));
+			message, _tf_ssb_rpc_connection_blobs_createWants_callback, NULL, NULL);
-			tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, tf_ssb_connection_next_request_number(connection), "blobs.createWants",
+		JS_FreeValue(context, message);
-				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);
@@ -1250,15 +1189,7 @@ 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_ebt_replicate(connection);
-			{
-				_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)
@@ -1372,142 +1303,6 @@ 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);
@@ -1521,5 +1316,4 @@ void tf_ssb_rpc_register(tf_ssb_t* ssb)
 	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, (const char*[]) { "createHistoryStream", NULL }, _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, (const char*[]) { "peers", "exchange", NULL }, _tf_ssb_rpc_peers_exchange, NULL, NULL); /* ASYNC */
 }

src/ssb.tests.c

@@ -250,51 +250,22 @@ void tf_ssb_test_ssb(const tf_test_options_t* options)
 	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);
@@ -322,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");
@@ -348,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");
@@ -364,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)++;
@@ -788,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 };
@@ -911,73 +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);
-	tf_ssb_connect(ssb2, "127.0.0.1", 12347, id0bin);
-
-	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);
-}
-
 #endif

src/ssb.tests.h

@@ -53,10 +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);
-
 /** @} */

src/task.c

@@ -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 (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/tests.c

@@ -915,7 +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_printf("Tests completed.\n");
 #endif
 }

src/util.js.c

@@ -211,7 +211,6 @@ static JSValue _util_print(JSContext* context, JSValueConst this_val, int argc,
 bool tf_util_report_error(JSContext* context, JSValue value)
 {
 	bool is_error = false;
-	tf_task_t* task = tf_task_get(context);
 	if (JS_IsError(context, value))
 	{
 		const char* string = JS_ToCString(context, value);
@@ -227,11 +226,13 @@ bool tf_util_report_error(JSContext* context, JSValue value)
 		}
 		JS_FreeValue(context, stack);
 
+		tf_task_t* task = tf_task_get(context);
 		tf_task_send_error_to_parent(task, value);
 		is_error = true;
 	}
 	else if (JS_IsException(value))
 	{
+		tf_task_t* task = tf_task_get(context);
 		if (!tf_task_send_error_to_parent(task, value))
 		{
 			JSValue exception = JS_GetException(context);
@@ -240,7 +241,6 @@ bool tf_util_report_error(JSContext* context, JSValue value)
 		}
 		is_error = true;
 	}
-	tf_task_check_jobs(task);
 	return is_error;
 }
 

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.23-wip"
+#define VERSION_NUMBER "0.0.22-wip"
-#define VERSION_NAME "Me upon my pony on my boat."
+#define VERSION_NAME "This looks like a good place."

tools/autotest.py

@@ -25,30 +25,6 @@ try:
 	#options.add_argument('--headless')
 	driver = webdriver.Firefox(options = options, service = service)
 	wait = WebDriverWait(driver, 10)
-
-	driver.get('http://localhost:8888')
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'login').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'name').send_keys('adminuser')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'password').send_keys('admin_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'confirm').send_keys('admin_password')
-	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'loginButton').click()
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.LINK_TEXT, 'identity')))
-	driver.switch_to.default_content()
-
-	driver.get('http://localhost:8888/~core/admin/')
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
-	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
-	wait.until(expected_conditions.presence_of_element_located((By.ID, 'gs_room_name'))).send_keys('test room')
-	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//*[@id="gs_room_name"]/following-sibling::button'))).click()
-	driver.switch_to.alert.accept()
-	driver.switch_to.default_content()
-
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'identity').click()
-	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.ID, 'logout').click()
-
 	driver.get('http://localhost:8888')
 	driver.find_element(By.TAG_NAME, 'tf-navigation').shadow_root.find_element(By.LINK_TEXT, 'login').click()
 	driver.find_element(By.TAG_NAME, 'tf-auth').shadow_root.find_element(By.ID, 'register_label').click()
@@ -106,6 +82,13 @@ try:
 	driver.switch_to.frame(wait.until(expected_conditions.presence_of_element_located((By.ID, 'document'))))
 	id1 = wait.until(expected_conditions.presence_of_element_located((By.TAG_NAME, 'li'))).text.split(' ')[-1]
 
+	driver.get('http://localhost:8888/~core/admin/')
+	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
+	driver.switch_to.frame(driver.find_element(By.ID, 'document'))
+	wait.until(expected_conditions.presence_of_element_located((By.ID, 'gs_room_name'))).send_keys('test room')
+	wait.until(expected_conditions.presence_of_element_located((By.XPATH, '//*[@id="gs_room_name"]/following-sibling::button'))).click()
+	driver.switch_to.alert.accept()
+
 	driver.get('http://localhost:8888')
 	wait.until(expected_conditions.presence_of_element_located((By.ID, 'document')))
 	driver.switch_to.frame(driver.find_element(By.ID, 'document'))

tools/ssl-android

@@ -3,6 +3,7 @@
 if [ -z $ANDROID_NDK_ROOT ]; then
 	ANDROID_NDK_ROOT=~/Android/Sdk/ndk/26.1.10909125
 fi
+OPENSSL_VERSION=3.3.1
 
 API_LEVEL=24
 
@@ -10,7 +11,7 @@ BUILD_DIR=out/openssl_android_build
 
 BUILD_TARGETS="x86_64 x86 arm64-v8a armeabi-v7a"
 
-WORK_DIR=out/openssl-android
+WORK_DIR=out/openssl-${OPENSSL_VERSION}-android
 rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR
 
@@ -79,9 +80,9 @@ build_the_thing() {
     pwd
     echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
     ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
-    make -s clean && \
+    make clean && \
-    make -s build_generated && \
+    make build_generated && \
-    make -s libcrypto.a libssl.a || exit 128
+    make libcrypto.a libssl.a || exit 128
 }
 
 for build_target in $BUILD_TARGETS

tools/ssl-ios

@@ -1,12 +1,14 @@
 #!/bin/bash
 
+OPENSSL_VERSION=3.3.1
+
 API_LEVEL=28
 
 BUILD_DIR=out/openssl_ios_build
 
 BUILD_TARGETS="ios64-xcrun iossimulator-xcrun"
 
-WORK_DIR=out/openssl-ios
+WORK_DIR=out/openssl-${OPENSSL_VERSION}-ios
 rm -rf $WORK_DIR
 cp -af deps/openssl_src/ $WORK_DIR
 

tools/ssl-mingw64

@@ -1,12 +1,14 @@
 #!/bin/bash
 
+OPENSSL_VERSION=3.3.1
+
 API_LEVEL=24
 
 BUILD_DIR=out/openssl_mingw64_build
 
 BUILD_TARGETS="mingw64"
 
-WORK_DIR=out/openssl-mingw64
+WORK_DIR=out/openssl-${OPENSSL_VERSION}-mingw64
 rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR
 
@@ -63,9 +65,9 @@ build_the_thing() {
         -DOPENSSL_SMALL_FOOTPRINT"
     echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
     ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
-    make -s clean && \
+    make clean && \
-    make -s build_generated && \
+    make build_generated && \
-    make -s libcrypto.a libssl.a || exit 128
+    make libcrypto.a libssl.a || exit 128
 }
 
 for build_target in $BUILD_TARGETS

tools/update-lit.sh

@@ -1,4 +1,4 @@
-VERSION=3.2.0
+VERSION=3.1.4
 wget https://cdn.jsdelivr.net/gh/lit/dist@$VERSION/all/lit-all.min.js -O deps/lit/lit-all.min.js
 wget https://cdn.jsdelivr.net/gh/lit/dist@$VERSION/all/lit-all.min.js.map -O deps/lit/lit-all.min.js.map
 cp -fv deps/lit/* apps/blog/