Maybe CI android??

No longer need this test.
Clean up connections that don't handshake in time.
2024-09-10 20:20:40 -04:00 · 2024-09-09 15:57:43 -04:00 · 2024-09-09 15:25:10 -04:00 · 2024-09-04 20:24:32 -04:00 · 2024-09-04 20:11:28 -04:00 · 2024-09-04 20:07:26 -04:00
16 changed files with 181 additions and 143 deletions
--- a/.fdroid.yml
+++ b/.fdroid.yml
@ -1,40 +0,0 @@
-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
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -10,6 +10,20 @@ jobs:
        uses: actions/checkout@v4
        with:
          submodules: true
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'termurin'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages:
+          - tools
+          - platform-tools
+          - build-tools;34.0.0
+          - platforms;android-34
+          - ndk;r26d
      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64
      - run: make all -j`nproc` docs
      - run: docker build .
--- a/39
+++ b/39
@ -3,9 +3,9 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules

-VERSION_CODE := 26
-VERSION_NUMBER := 0.0.22
-VERSION_NAME := Get born soon.
+VERSION_CODE := 27
+VERSION_NUMBER := 0.0.23-wip
+VERSION_NAME := Me upon my pony on my boat.

 SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
@ -842,7 +842,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)))
+RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f -not -name '.*')))

 out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release
@ -1066,14 +1066,27 @@ $(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

-dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk
-	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
+tarball:
+	@echo [archive] out/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
-	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
+	@mkdir -p out/tildefriends-$(VERSION_NUMBER)
 	@git ls-files --recurse-submodules | tar -c -T- | tar -x -C out/tildefriends-$(VERSION_NUMBER)
 	@tar \
 		--exclude=apps/welcome* \
@ -1090,9 +1103,15 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien
 		--exclude=deps/sqlite/shell.c \
 		--exclude=deps/zlib/contrib/vstudio \
 		--exclude=deps/zlib/doc \
-		-caf dist/tildefriends-$(VERSION_NUMBER).tar.xz \
+		-caf out/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"
@ -1101,8 +1120,12 @@ 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
--- a/apps/admin/script.js
+++ b/apps/admin/script.js
@ -28,7 +28,10 @@ function global_settings_set(key, value) {
 }

 function title_case(name) {
-	return name.split('_').map(x => x.charAt(0).toUpperCase() + x.substring(1)).join(' ');
+	return name
+		.split('_')
+		.map((x) => x.charAt(0).toUpperCase() + x.substring(1))
+		.join(' ');
 }

 window.addEventListener('load', function () {
--- a/core/core.js
+++ b/core/core.js
@ -77,7 +77,8 @@ const k_global_settings = {
 	peer_exchange: {
 		type: 'boolean',
 		default_value: false,
-		description: 'Enable discovery of, sharing of, and connecting to internet peer strangers, including announcing this instance.',
+		description:
+			'Enable discovery of, sharing of, and connecting to internet peer strangers, including announcing this instance.',
 	},
 	account_registration: {
 		type: 'boolean',
@ -1350,8 +1351,4 @@ function storePermission(user, packageOwner, packageName, permission, allow) {
 	}
 }

-export {
-	gGlobalSettings as globalSettings,
-	invoke,
-	getSessionProcessBlob,
-};
+export {gGlobalSettings as globalSettings, invoke, getSessionProcessBlob};
--- a/default.nix
+++ b/default.nix
@ -28,7 +28,7 @@ pkgs.stdenv.mkDerivation rec {
    owner = "cory";
    repo = "tildefriends";
    rev = "v${version}";
-    hash = "sha256-0x4LJXtMUxBsWEOoWAaQlStTfvqUf4Qs/5vJZ2EvBpY=";
+    hash = "sha256-Su+y++zVXmYNbwfhCP6w5e36oxW5fkURPFzFLjbyFEI=";
    fetchSubmodules = true;
  };

--- a/deps/codemirror/cm6.js
+++ b/deps/codemirror/cm6.js
--- a/deps/codemirror_src/package-lock.json
+++ b/deps/codemirror_src/package-lock.json
@ -37,9 +37,9 @@
      }
    },
    "node_modules/@codemirror/commands": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
-      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.1.tgz",
+      "integrity": "sha512-iBfKbyIoXS1FGdsKcZmnrxmbc8VcbMrSgD7AVrsnX+WyAYjmUDWvE93dt5D874qS4CCVu4O1JpbagHdXbbLiOw==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/language": "^6.0.0",
@ -371,9 +371,9 @@
      }
    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
-      "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
+      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
      "cpu": [
        "arm"
      ],
@ -384,9 +384,9 @@
      ]
    },
    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
-      "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
+      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
      "cpu": [
        "arm64"
      ],
@ -397,9 +397,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
-      "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
+      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
      "cpu": [
        "arm64"
      ],
@ -410,9 +410,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
-      "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
+      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
      "cpu": [
        "x64"
      ],
@ -423,9 +423,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
-      "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
+      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
      "cpu": [
        "arm"
      ],
@ -436,9 +436,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
-      "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
+      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
      "cpu": [
        "arm"
      ],
@ -449,9 +449,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
-      "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
+      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
      "cpu": [
        "arm64"
      ],
@ -462,9 +462,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
-      "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
+      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
      "cpu": [
        "arm64"
      ],
@ -475,9 +475,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
-      "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
+      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
      "cpu": [
        "ppc64"
      ],
@ -488,9 +488,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
-      "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
+      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
      "cpu": [
        "riscv64"
      ],
@ -501,9 +501,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
-      "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
+      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
      "cpu": [
        "s390x"
      ],
@ -514,9 +514,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
-      "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
      "cpu": [
        "x64"
      ],
@ -527,9 +527,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
-      "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
+      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
      "cpu": [
        "x64"
      ],
@ -540,9 +540,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
-      "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
+      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
      "cpu": [
        "arm64"
      ],
@ -553,9 +553,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
-      "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
+      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
      "cpu": [
        "ia32"
      ],
@ -566,9 +566,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
-      "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
+      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
      "cpu": [
        "x64"
      ],
@ -782,9 +782,9 @@
      }
    },
    "node_modules/rollup": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
-      "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
+      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
      "license": "MIT",
      "dependencies": {
        "@types/estree": "1.0.5"
@ -797,22 +797,22 @@
        "npm": ">=8.0.0"
      },
      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.0",
-        "@rollup/rollup-android-arm64": "4.21.0",
-        "@rollup/rollup-darwin-arm64": "4.21.0",
-        "@rollup/rollup-darwin-x64": "4.21.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.0",
-        "@rollup/rollup-linux-arm64-musl": "4.21.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.0",
-        "@rollup/rollup-linux-x64-gnu": "4.21.0",
-        "@rollup/rollup-linux-x64-musl": "4.21.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.0",
-        "@rollup/rollup-win32-x64-msvc": "4.21.0",
+        "@rollup/rollup-android-arm-eabi": "4.21.2",
+        "@rollup/rollup-android-arm64": "4.21.2",
+        "@rollup/rollup-darwin-arm64": "4.21.2",
+        "@rollup/rollup-darwin-x64": "4.21.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
+        "@rollup/rollup-linux-arm64-musl": "4.21.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
+        "@rollup/rollup-linux-x64-gnu": "4.21.2",
+        "@rollup/rollup-linux-x64-musl": "4.21.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
+        "@rollup/rollup-win32-x64-msvc": "4.21.2",
        "fsevents": "~2.3.2"
      }
    },
--- a/deps/openssl_src
+++ b/deps/openssl_src
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="26"
-	android:versionName="0.0.22">
+	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
--- a/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
+++ b/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
@ -165,6 +165,8 @@ 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 + ")");
@ -458,4 +460,12 @@ 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());
+		}
+	}
 }
--- a/src/ssb.c
+++ b/src/ssb.c
@ -80,6 +80,7 @@ enum
 	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;
@ -294,6 +295,7 @@ 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;
@ -1258,6 +1260,10 @@ 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);
 }

@ -1486,6 +1492,10 @@ 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);
 }

@ -1931,8 +1941,13 @@ 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->ref_count == 0)
+	if (JS_IsUndefined(connection->object) && !connection->async.data && !connection->tcp.data && !connection->connect.data && !connection->handshake_timer.data &&
+		connection->ref_count == 0)
 	{
 		tf_free(connection->message_requests);
 		connection->message_requests = NULL;
@ -1956,7 +1971,7 @@ static void _tf_ssb_connection_on_close(uv_handle_t* handle)
 {
 	tf_ssb_connection_t* connection = handle->data;
 	handle->data = NULL;
-	if (connection)
+	if (connection && connection->closing)
 	{
 		_tf_ssb_connection_destroy(connection, "handle closed");
 	}
@ -2643,6 +2658,15 @@ 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)
@ -2677,6 +2701,10 @@ 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 };
@ -2737,6 +2765,10 @@ 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));
@ -2859,6 +2891,10 @@ 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)
@ -2870,10 +2906,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)
--- a/src/version.h
+++ b/src/version.h
@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.22"
-#define VERSION_NAME "Get born soon."
+#define VERSION_NUMBER "0.0.23-wip"
+#define VERSION_NAME "Me upon my pony on my boat."
--- a/tools/ssl-android
+++ b/tools/ssl-android
@ -3,7 +3,6 @@
 if [ -z $ANDROID_NDK_ROOT ]; then
 	ANDROID_NDK_ROOT=~/Android/Sdk/ndk/26.1.10909125
 fi
-OPENSSL_VERSION=3.3.1

 API_LEVEL=24

@ -11,7 +10,7 @@ BUILD_DIR=out/openssl_android_build

 BUILD_TARGETS="x86_64 x86 arm64-v8a armeabi-v7a"

-WORK_DIR=out/openssl-${OPENSSL_VERSION}-android
+WORK_DIR=out/openssl-android
 rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR

--- a/tools/ssl-ios
+++ b/tools/ssl-ios
@ -1,14 +1,12 @@
 #!/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-${OPENSSL_VERSION}-ios
+WORK_DIR=out/openssl-ios
 rm -rf $WORK_DIR
 cp -af deps/openssl_src/ $WORK_DIR

--- a/tools/ssl-mingw64
+++ b/tools/ssl-mingw64
@ -1,14 +1,12 @@
 #!/bin/bash

-OPENSSL_VERSION=3.3.1
-
 API_LEVEL=24

 BUILD_DIR=out/openssl_mingw64_build

 BUILD_TARGETS="mingw64"

-WORK_DIR=out/openssl-${OPENSSL_VERSION}-mingw64
+WORK_DIR=out/openssl-mingw64
 rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR
Author	SHA1	Message	Date
Cory McWilliams	b55aaa1d18	Maybe CI android??	2024-09-10 20:20:40 -04:00
Cory McWilliams	34e19505bd	No longer need this test.	2024-09-09 15:57:43 -04:00
Cory McWilliams	6e06ec0904	Clean up connections that don't handshake in time. All checks were successful Build Tilde Friends / Build-All (push) Successful in 11m26s Details	2024-09-09 15:25:10 -04:00
Cory McWilliams	a5814074fe	OpenSSL 3.3.2. All checks were successful Build Tilde Friends / Build-All (push) Successful in 7m26s Details	2024-09-04 20:24:32 -04:00
Cory McWilliams	d7479df5a2	Latest CodeMirror. All checks were successful Build Tilde Friends / Build-All (push) Successful in 8m23s Details	2024-09-04 20:11:28 -04:00
Cory McWilliams	34508aa0ae	dist slightly more in parallel. Exclude dotfiles from data.zip. Some checks failed Build Tilde Friends / Build-All (push) Has been cancelled Details	2024-09-04 20:07:26 -04:00
Cory McWilliams	ae096b2c9c	Try harder to make webview localStorage work on different versions. I suspect that's what #73 is about. All checks were successful Build Tilde Friends / Build-All (push) Successful in 7m43s Details	2024-09-04 12:50:12 -04:00
Cory McWilliams	95d036e34a	Build an AppImage. Why not? Some checks failed Build Tilde Friends / Build-All (push) Failing after 6m27s Details	2024-08-28 20:55:52 -04:00
Cory McWilliams	4af5e8ec42	I guess prettier says this, now. Some checks failed Build Tilde Friends / Build-All (push) Failing after 6m30s Details	2024-08-28 20:24:26 -04:00
Cory McWilliams	2a5f71bd5d	This now lives in the fdroiddata repository. Some checks failed Build Tilde Friends / Build-All (push) Failing after 7m26s Details	2024-08-28 19:59:49 -04:00
Cory McWilliams	97fb63dda1	Actually 0.0.23-wip.	2024-08-28 19:59:34 -04:00
Cory McWilliams	87d42e3b3b	0.0.23-wip again. Let's gooooo. Some checks failed Build Tilde Friends / Build-All (push) Failing after 7m45s Details	2024-08-28 19:49:36 -04:00
Cory McWilliams	0394129a4c	nix => 0.0.22 again. Some checks are pending Build Tilde Friends / Build-All (push) Waiting to run Details	2024-08-28 19:42:31 -04:00