diff --git a/.gitignore b/.gitignore index faf4046f4..394e18f95 100644 --- a/.gitignore +++ b/.gitignore @@ -124,6 +124,11 @@ plugins-local plugins-development apps/stage-pocket/ios/buildServer.json -.ghfs/ -.docs/superpowers apps/stage-tamagotchi/electron.vite.config.*.mjs +.docs/superpowers + +# Tools - ghfs +.ghfs/ + +# Tools - Obsidian +.obsidian/ diff --git a/patches/crossws@0.4.4.patch b/patches/crossws@0.4.4.patch new file mode 100644 index 000000000..bd165f0d1 --- /dev/null +++ b/patches/crossws@0.4.4.patch @@ -0,0 +1,14 @@ +diff --git a/dist/server/node.mjs b/dist/server/node.mjs +index 02a3dbbdf8487e25addd61cd85bc77e8e5ea1a55..010ebece41cacb7a1f43b336ab6dbe13d35f8b40 100644 +--- a/dist/server/node.mjs ++++ b/dist/server/node.mjs +@@ -13,6 +13,9 @@ function plugin(wsOpts) { + }); + const originalServe = server.serve; + server.serve = () => { ++ server.node?.server.on("error", (err) => { ++ console.error("[crossws] Server error:", err); ++ }); + server.node?.server.on("upgrade", (req, socket, head) => { + ws.handleUpgrade(req, socket, head, new NodeRequest({ + req, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f29dac3f..ae2645e54 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -311,6 +311,9 @@ patchedDependencies: '@mediapipe/tasks-vision': hash: 2014bd232d13f4bfac27f27d61105894bf54aca350379b2816fe05b6d3e27d66 path: patches/@mediapipe__tasks-vision.patch + crossws@0.4.4: + hash: 4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958 + path: patches/crossws@0.4.4.patch mineflayer-pathfinder: hash: 4bbfdca823ab48b74086e6e7d4b2f9baf5ee7c0ba9aee0c279b3c91c50bfd797 path: patches/mineflayer-pathfinder.patch @@ -1056,7 +1059,7 @@ importers: version: 11.3.0 '@moeru/eventa': specifier: 'catalog:' - version: 1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + version: 1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@moeru/std': specifier: 'catalog:' version: 0.1.0-beta.17 @@ -1125,10 +1128,10 @@ importers: version: 0.4.4 '@xsai-transformers/embed': specifier: ^0.0.11 - version: 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + version: 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@xsai-transformers/transcription': specifier: ^0.0.11 - version: 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + version: 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@xsai/generate-speech': specifier: 'catalog:' version: 0.4.0-beta.13 @@ -1396,7 +1399,7 @@ importers: version: 7.0.0 crossws: specifier: ^0.4.4 - version: 0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) + version: 0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) csstype: specifier: ^3.2.3 version: 3.2.3 @@ -1417,7 +1420,7 @@ importers: version: 5.0.0(vite@8.0.2(@types/node@24.12.0)(esbuild@0.27.2)(jiti@2.6.1)(less@4.6.4)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.3)) h3: specifier: ^2.0.1-rc.19 - version: 2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) + version: 2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) less: specifier: ^4.6.4 version: 4.6.4 @@ -2081,7 +2084,7 @@ importers: dependencies: '@moeru/eventa': specifier: 'catalog:' - version: 1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + version: 1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) builder-util-runtime: specifier: 'catalog:' version: 9.5.1 @@ -2127,7 +2130,7 @@ importers: dependencies: '@moeru/eventa': specifier: 'catalog:' - version: 1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + version: 1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@moeru/std': specifier: 'catalog:' version: 0.1.0-beta.17 @@ -2271,10 +2274,10 @@ importers: version: link:../server-shared crossws: specifier: ^0.4.4 - version: 0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) + version: 0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) h3: specifier: ^2.0.1-rc.19 - version: 2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) + version: 2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) nanoid: specifier: 'catalog:' version: 5.1.6 @@ -2301,7 +2304,7 @@ importers: version: link:../server-shared crossws: specifier: ^0.4.4 - version: 0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) + version: 0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) superjson: specifier: 'catalog:' version: 2.2.6 @@ -3421,7 +3424,7 @@ importers: version: 3.2.2 crossws: specifier: 'catalog:' - version: 0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) + version: 0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) es-toolkit: specifier: ^1.45.1 version: 1.45.1 @@ -3676,7 +3679,7 @@ importers: version: link:../../packages/server-sdk h3: specifier: ^2.0.1-rc.19 - version: 2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) + version: 2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) playwright: specifier: ^1.58.2 version: 1.58.2 @@ -20076,13 +20079,13 @@ snapshots: - supports-color - typescript - '@moeru/eventa@0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': + '@moeru/eventa@0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': dependencies: nanoid: 5.1.7 picomatch: 4.0.3 optionalDependencies: electron: 40.8.3 - h3: 2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) + h3: 2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) '@moeru/eventa@0.3.0(electron@41.0.3)': dependencies: @@ -20098,13 +20101,13 @@ snapshots: optionalDependencies: electron: 39.7.0 - '@moeru/eventa@1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': + '@moeru/eventa@1.0.0-beta.3(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': dependencies: nanoid: 5.1.7 picomatch: 4.0.3 optionalDependencies: electron: 40.8.3 - h3: 2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) + h3: 2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))) '@moeru/eventa@1.0.0-beta.3(electron@41.0.3)': dependencies: @@ -24255,13 +24258,13 @@ snapshots: dependencies: '@xsai/shared': 0.4.4 - '@xsai-transformers/embed@0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': + '@xsai-transformers/embed@0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': dependencies: '@huggingface/transformers': 3.8.1 - '@moeru/eventa': 0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + '@moeru/eventa': 0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@moeru/std': 0.1.0-beta.17 '@xsai-ext/shared-providers': 0.4.0-beta.12 - '@xsai-transformers/shared': 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + '@xsai-transformers/shared': 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@xsai/embed': 0.4.4 '@xsai/shared': 0.4.4 gpuu: 1.0.6 @@ -24283,10 +24286,10 @@ snapshots: - electron - h3 - '@xsai-transformers/shared@0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': + '@xsai-transformers/shared@0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': dependencies: '@huggingface/transformers': 3.8.1 - '@moeru/eventa': 0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + '@moeru/eventa': 0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@moeru/std': 0.1.0-beta.17 '@xsai-ext/shared-providers': 0.4.0-beta.12 '@xsai/shared': 0.4.4 @@ -24309,13 +24312,13 @@ snapshots: - h3 - web-worker - '@xsai-transformers/transcription@0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': + '@xsai-transformers/transcription@0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))))': dependencies: '@huggingface/transformers': 3.8.1 - '@moeru/eventa': 0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + '@moeru/eventa': 0.3.0(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@moeru/std': 0.1.0-beta.17 '@xsai-ext/shared-providers': 0.4.0-beta.12 - '@xsai-transformers/shared': 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) + '@xsai-transformers/shared': 0.0.11(electron@40.8.3)(h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)))) '@xsai/embed': 0.4.4 '@xsai/generate-transcription': 0.4.4 '@xsai/shared': 0.4.4 @@ -25350,7 +25353,7 @@ snapshots: dependencies: uncrypto: 0.1.3 - crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)): + crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)): optionalDependencies: srvx: 0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d) @@ -27256,12 +27259,12 @@ snapshots: ufo: 1.6.3 uncrypto: 0.1.3 - h3@2.0.1-rc.19(crossws@0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))): + h3@2.0.1-rc.19(crossws@0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d))): dependencies: rou3: 0.8.1 srvx: 0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d) optionalDependencies: - crossws: 0.4.4(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) + crossws: 0.4.4(patch_hash=4d79ec736d10d2a81a9e2a31b067d43f0b6665122267981e652ab9923d165958)(srvx@0.11.13(patch_hash=c761d25a70e22a0925c88fe91a9dd1c3153dd341d8fd4f260166678156c4df2d)) har-schema@2.0.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index e2945580e..17dd94158 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -19,8 +19,10 @@ overrides: safer-buffer: npm:@nolyfill/safer-buffer@^1.0.44 side-channel: npm:@nolyfill/side-channel@^1.0.44 string.prototype.matchall: npm:@nolyfill/string.prototype.matchall@^1.0.44 + patchedDependencies: '@mediapipe/tasks-vision': patches/@mediapipe__tasks-vision.patch + crossws@0.4.4: patches/crossws@0.4.4.patch mineflayer-pathfinder: patches/mineflayer-pathfinder.patch mineflayer@4.33.0: patches/mineflayer@4.33.0.patch pixi-live2d-display: patches/pixi-live2d-display.patch @@ -154,7 +156,6 @@ onlyBuiltDependencies: - spawn-sync - utf-8-validate - vue-demi - packageExtensions: '@formkit/auto-animate': peerDependencies: