Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat(startup): cache public assets and enable iOS release service workers (#878)
Gener1fc671a17d8a
diff --git a/.github/workflows/mobile-release.yml b/.github/workflows/mobile-release.ymlindex 0336b4e44..27a8d59a8 100644--- a/.github/workflows/mobile-release.yml+++ b/.github/workflows/mobile-release.yml@@ -130,6 +130,7 @@ jobs:unset IOS_CERTIFICATE IOS_CERTIFICATE_PASSWORDpnpm tauri ios build \--export-method app-store-connect \+ --config src-tauri/tauri.ios.release.conf.json \--config "{\"bundle\":{\"iOS\":{\"bundleVersion\":\"${GITHUB_RUN_NUMBER}\"}}}"- name: Locate and verify IPA@@ -160,6 +161,7 @@ jobs:entitlements = plistlib.load(entitlements_file)assert info["CFBundleIdentifier"] == "ai.alook.ios"+ assert info["WKAppBoundDomains"] == ["localhost", "alook.ai"]assert info["CFBundleURLTypes"] == [{"CFBundleURLName": "ai.alook", "CFBundleURLSchemes": ["ai.alook"]}]diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex ad5df3523..36ff5e6c8 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -545,6 +545,9 @@ importers:'@playwright/test':specifier: ^1.63.0version: 1.63.0+ '@serwist/turbopack':+ specifier: 9.5.13+ version: 9.5.13(@swc/[email protected])([email protected])([email protected])([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected]))([email protected])([email protected])'@tailwindcss/node':specifier: ^4.3.3version: 4.3.3@@ -578,6 +581,12 @@ importers:'@types/react-dom':specifier: ^19.3.0version: 19.3.0(@types/[email protected])+ esbuild:+ specifier: 0.28.2+ version: 0.28.2+ esbuild-wasm:+ specifier: 0.28.2+ version: 0.28.2eslint:specifier: ^9version: 9.39.5([email protected])@@ -602,6 +611,9 @@ importers:remark-parse:specifier: ^11.0.0version: 11.0.0+ serwist:+ specifier: 9.5.13+ version: 9.5.13([email protected])([email protected])tailwindcss:specifier: ^4version: 4.3.3@@ -3481,6 +3493,48 @@ packages:resolution: {integrity: sha512-zCKpyDIWKHwtervNK2ZlaK8mMV7gVUijAgFeJStH+CU/imcdquizV3pFLlSQYRswG+Lbyd6CT/LGRh3IbtkCFw==}engines: {node: '>=8'}+ '@serwist/[email protected]':+ resolution: {integrity: sha512-3seu43B26paWNKixMJTJWXBJx8c07e+WZvPOUH5V/AByYfAoL4TKh9vMri8zukyj52shDyChs2Qjji5NObprMQ==}+ engines: {node: '>=18.0.0'}+ peerDependencies:+ typescript: '>=5.0.0'+ peerDependenciesMeta:+ typescript:+ optional: true++ '@serwist/[email protected]':+ resolution: {integrity: sha512-7QfoFoXdU+HL7mUHwnnSYmJMK0vJo1WEyr+7jIXfgPkdEvol4BlrgWg1PrbGqWqLZkud5IhMiQm7gbfx7N44MQ==}+ engines: {node: '>=18.0.0'}+ peerDependencies:+ esbuild: '>=0.25.0 <1.0.0'+ esbuild-wasm: '>=0.25.0 <1.0.0'+ next: '>=14.0.0'+ react: '>=18.0.0'+ typescript: '>=5.0.0'+ peerDependenciesMeta:+ esbuild:+ optional: true+ esbuild-wasm:+ optional: true+ typescript:+ optional: true++ '@serwist/[email protected]':+ resolution: {integrity: sha512-jJJSvl0pSc6udJ7pN2u0oduOfQqSY6oJNjbIc82YcVnkpzj1O+qFHYdrR6tu9bspa30Nc8ZVV+VncOcyguvk5w==}+ peerDependencies:+ browserslist: '>=4'+ peerDependenciesMeta:+ browserslist:+ optional: true++ '@serwist/[email protected]':+ resolution: {integrity: sha512-1xOBy3Cpe1qZ33GwQSeQk8fyklYc7wZsYzpmHq37RowRMaHvrKQkUFTUoZPyQG5YWwmvDbFVgOGba7UbXNhHfQ==}+ peerDependencies:+ typescript: '>=5.0.0'+ peerDependenciesMeta:+ typescript:+ optional: true+'@shadcn/[email protected]':resolution: {integrity: sha512-eMF6tPNi9SWZgPvqBvPQFhJN7gV9PcjRdF3kPiiWo5yZJocWqVgxFuspCHrOij3bIJ797NIGZ+j/v7AiXfA6qg==}engines: {node: '>=20.18.1'}@@ -3766,9 +3820,102 @@ packages:peerDependencies:react: ^18.0.0 || ^19.0.0+ '@swc/[email protected]':+ resolution: {integrity: sha512-JrMH2h7ohd4mOIneNRx/diqTmCDSdWfp9uOdQ8VJ2V2CA7jOJ1jWb+qp8RoZLqgiVmwDDC7eySKB1kbvZ+jVXQ==}+ engines: {node: '>=10'}+ cpu: [arm64]+ os: [darwin]++ '@swc/[email protected]':+ resolution: {integrity: sha512-HauZMRxpOImRxgY6GXjw5gbD8ts2NcPZuLMM8htY8Mic7j1Izt/lxkXrKYUwqyU56YLwQZ4dHRT+6jFHkztcag==}+ engines: {node: '>=10'}+ cpu: [x64]+ os: [darwin]++ '@swc/[email protected]':+ resolution: {integrity: sha512-tUSojGIythnHJKrElDM9OvuhBnK+FF39eM9iIBgj9kdfbAm6PhAM7dKbaSDcnX2gOLG2slkasjD0Z8m/YUlzOA==}+ engines: {node: '>=10'}+ cpu: [arm]+ os: [linux]++ '@swc/[email protected]':+ resolution: {integrity: sha512-qS3bk/ezRrLXGn1b764S/EG3/oKj6uRhnTNRAALpnuu8d9I0YwSiUkQghnX7lOH9X/yRr+qrFI3R0wAruO47Tg==}+ engines: {node: '>=10'}+ cpu: [arm64]+ os: [linux]+ libc: [glibc]++ '@swc/[email protected]':+ resolution: {integrity: sha512-aeoYoG6fQsOS3mFOuTKvnJo1aaaxYNI0aRRlhdHaGP4q1YQx4XOc5Hkd35IFduWCBG3eZl3fPTjRuYvxpl7eTA==}+ engines: {node: '>=10'}+ cpu: [arm64]+ os: [linux]+ libc: [musl]++ '@swc/[email protected]':+ resolution: {integrity: sha512-eEFoueZXWZ2S1lsqL8Ve2C8RjhzH9+Ktj8U4IGTUQL6CNG04+VhQiYQWJOf5xfVBU6I+PbH80yvsYegqZOOSZQ==}+ engines: {node: '>=10'}+ cpu: [ppc64]+ os: [linux]+ libc: [glibc]++ '@swc/[email protected]':+ resolution: {integrity: sha512-K0q1ReVXL3d5bzBgZxS+yJq5q2xRjg4k2XXGj9yiCEpE5ZqJGQ4Gtk1sRrk8W2lo3KY0DCJD3Myt6x2SMvGArQ==}+ engines: {node: '>=10'}+ cpu: [s390x]+ os: [linux]+ libc: [glibc]++ '@swc/[email protected]':+ resolution: {integrity: sha512-Qvpihw30irhIjy2f91BR1pamcJBCgf8hmr9XWenztAX1YLkneRkkTB/PFGWQubhaBqQhY2uZKViMj/xV61uMBQ==}+ engines: {node: '>=10'}+ cpu: [x64]+ os: [linux]+ libc: [glibc]++ '@swc/[email protected]':+ resolution: {integrity: sha512-iCGxHbh3Cq5vqRvCPlw3XkkDz4RlkPSyQwfFKbOKTMj5tiEuojY/rLmf4BMfI9Z8yPJTf9VB07t3NbKInoC97g==}+ engines: {node: '>=10'}+ cpu: [x64]+ os: [linux]+ libc: [musl]++ '@swc/[email protected]':+ resolution: {integrity: sha512-iOabn6cd+hg3cnoKlAC8j3Yufv8nQHBVU5OIDX8dCPA95PjAZ0B0TlDn9sWivk8ezo/cLJux7p9n0B9vRej+1Q==}+ engines: {node: '>=10'}+ cpu: [arm64]+ os: [win32]++ '@swc/[email protected]':+ resolution: {integrity: sha512-+1b/3xBNuVbpnJIZUCAaSdscOPYRWq85eohKx44y/3qbPp56UMiCJWBiWtyr7K5F1nf1JENXm2IBSEJaLgWq6Q==}+ engines: {node: '>=10'}+ cpu: [ia32]+ os: [win32]++ '@swc/[email protected]':+ resolution: {integrity: sha512-6kEJhYshk7OVoVIWryiHqjCNuwZeOlPTS6et+bKV/WhtHs8fLA01wyTLrQGi+4ultgRe/o0M4b25K/KKdvl0dQ==}+ engines: {node: '>=10'}+ cpu: [x64]+ os: [win32]++ '@swc/[email protected]':+ resolution: {integrity: sha512-k4uUsIMS0IwOKVsrQs48IZK75O4roV3FnuJEdL7ES+DFESftdgvz73QBqN3VUAbUmUr78We4tzG0kgYj36M22Q==}+ engines: {node: '>=10'}+ peerDependencies:+ '@swc/helpers': '>=0.5.17'+ peerDependenciesMeta:+ '@swc/helpers':+ optional: true++ '@swc/[email protected]':+ resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}+'@swc/[email protected]':resolution: {integrity: sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==}+ '@swc/[email protected]':+ resolution: {integrity: sha512-V6Mnml8v09QALx6K0elJ7o9K/MkVDtW3t6L+7Ou/JcWtb3xwId2AH4FeOceySd2JaO87IMw4+6vSZxLm34LPbw==}+'@tailwindcss/[email protected]':resolution: {integrity: sha512-/T8IKEsf9VTU6tLjgC7+sv2mOPtQxzE2jMw7u4Tt40Tx+QSZxpzh95/H6cMKoja9XuW7iMdLJYBB0o9G1CaAgg==}@@ -5332,6 +5479,10 @@ packages:resolution: {integrity: sha512-R2rze/hDX30uul4NZoIZ76ImSJLFxn/1/ZxtKC1L77y2X1k+yYu1joKbAtMA2Fg3hZrTOiw0I5mwVMo0cf250w==}engines: {node: '>= 6'}+ resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}+ engines: {node: '>=4.0.0'}+resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}engines: {node: '>= 0.6'}@@ -6010,6 +6161,11 @@ packages:resolution: {integrity: sha512-8Ja+rNJ0Lt56Pcf3TAmpBZjmx8ZcK5Ts4cAzIOjsjevg9oSXJnl6SUQ2EevU8tv3h6ZLWmoKL5H4fgWvdvfETw==}+ resolution: {integrity: sha512-GccVwhv3mmOUVQHCQm2Ox/rby8n/EqUwvZxE6Pjfikrq/lWw9g9WX/u9EykWnpot3Ko6j426DgQdea2xWKIAQA==}+ engines: {node: '>=18'}+ hasBin: true+resolution: {integrity: sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==}engines: {node: '>=18'}@@ -6528,6 +6684,10 @@ packages:engines: {node: 20 || >=22}hasBin: true+ resolution: {integrity: sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==}+ engines: {node: 18 || 20 || >=22}+resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting [email protected]@@ -7175,6 +7335,9 @@ packages:engines: {node: ^20.19.0 || >=22.12.0}hasBin: true+ resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}+resolution: {integrity: sha512-hHaB8C/rfzDDtr/t8YZwxAuPJTT0zHyaPoVzcXwDYhYNAgH/4sIfVhi/XLLIY+bL/FqaIJnjATDbi8ObSELmxg==}engines: {node: '>=22.0.0'}@@ -8312,6 +8475,10 @@ packages:resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}+ resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}+ engines: {node: ^14.13.1 || >=16.0.0}+resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}@@ -8774,6 +8941,14 @@ packages:resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==}engines: {node: '>= 18'}+ resolution: {integrity: sha512-ZpskCei2d5Zcljeb6QvYP94pV5xY3GCdbOk0hOzMSEPFOqJDwJvMpQq7i1r/psuR1WQCsKX6p7UpLle6sTPYjw==}+ peerDependencies:+ typescript: '>=5.0.0'+ peerDependenciesMeta:+ typescript:+ optional: true+resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}@@ -8940,6 +9115,10 @@ packages:resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}engines: {node: '>= 12'}+ resolution: {integrity: sha512-d8EqvL+k/SOXCreS/SUzg2ciyHqBBLcN/yuRjFsbvVhHTE2pgei7oAhmPM7kWFbkX6OSMQfUq4KbkF3au9lhYQ==}+ engines: {node: '>= 12'}+resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}@@ -12645,11 +12824,11 @@ snapshots:'@sentry/utils': 7.120.4localforage: 1.10.0- '@sentry/[email protected](@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))':+ '@sentry/[email protected](@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))':dependencies:'@sentry/conventions': 0.16.0'@sentry/core': 10.75.3- '@sentry/opentelemetry': 10.75.3(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))+ '@sentry/opentelemetry': 10.75.3(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))import-in-the-middle: 3.5.2optionalDependencies:'@opentelemetry/api': 1.9.1@@ -12665,8 +12844,8 @@ snapshots:'@opentelemetry/sdk-trace-base': 2.11.0(@opentelemetry/[email protected])'@sentry/conventions': 0.16.0'@sentry/core': 10.75.3- '@sentry/node-core': 10.75.3(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))- '@sentry/opentelemetry': 10.75.3(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))+ '@sentry/node-core': 10.75.3(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))+ '@sentry/opentelemetry': 10.75.3(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))'@sentry/server-utils': 10.75.3import-in-the-middle: 3.5.2transitivePeerDependencies:@@ -12682,7 +12861,7 @@ snapshots:'@sentry/types': 7.120.4'@sentry/utils': 7.120.4- '@sentry/[email protected](@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))':+ '@sentry/[email protected](@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))':dependencies:'@opentelemetry/api': 1.9.1'@opentelemetry/core': 2.11.0(@opentelemetry/[email protected])@@ -12701,6 +12880,53 @@ snapshots:dependencies:'@sentry/types': 7.120.4+ dependencies:+ '@serwist/utils': 9.5.13([email protected])+ common-tags: 1.8.2+ glob: 13.0.6+ pretty-bytes: 6.1.1+ source-map: 0.8.0+ type-fest: 5.10.0+ zod: 4.6.5+ optionalDependencies:+ typescript: 6.0.3+ transitivePeerDependencies:+ - browserslist++ '@serwist/[email protected](@swc/[email protected])([email protected])([email protected])([email protected](@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected]))([email protected])([email protected])':+ dependencies:+ '@serwist/build': 9.5.13([email protected])([email protected])+ '@serwist/utils': 9.5.13([email protected])+ '@serwist/window': 9.5.13([email protected])([email protected])+ '@swc/core': 1.16.13(@swc/[email protected])+ browserslist: 4.29.3+ kolorist: 1.8.0+ next: 16.3.8(@babel/[email protected])(@opentelemetry/[email protected])(@playwright/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])+ react: 19.3.0+ semver: 7.8.5+ serwist: 9.5.13([email protected])([email protected])+ zod: 4.6.5+ optionalDependencies:+ esbuild: 0.28.2+ esbuild-wasm: 0.28.2+ typescript: 6.0.3+ transitivePeerDependencies:+ - '@swc/helpers'++ '@serwist/[email protected]([email protected])':+ optionalDependencies:+ browserslist: 4.29.3++ dependencies:+ '@types/trusted-types': 2.0.7+ serwist: 9.5.13([email protected])([email protected])+ optionalDependencies:+ typescript: 6.0.3+ transitivePeerDependencies:+ - browserslist+'@shadcn/[email protected]([email protected])':dependencies:'@babel/core': 7.29.7@@ -13070,10 +13296,71 @@ snapshots:mermaid: 11.17.2react: 19.3.0+ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected]':+ optional: true++ '@swc/[email protected](@swc/[email protected])':+ dependencies:+ '@swc/counter': 0.1.3+ '@swc/types': 0.1.28+ optionalDependencies:+ '@swc/core-darwin-arm64': 1.16.13+ '@swc/core-darwin-x64': 1.16.13+ '@swc/core-linux-arm-gnueabihf': 1.16.13+ '@swc/core-linux-arm64-gnu': 1.16.13+ '@swc/core-linux-arm64-musl': 1.16.13+ '@swc/core-linux-ppc64-gnu': 1.16.13+ '@swc/core-linux-s390x-gnu': 1.16.13+ '@swc/core-linux-x64-gnu': 1.16.13+ '@swc/core-linux-x64-musl': 1.16.13+ '@swc/core-win32-arm64-msvc': 1.16.13+ '@swc/core-win32-ia32-msvc': 1.16.13+ '@swc/core-win32-x64-msvc': 1.16.13+ '@swc/helpers': 0.5.23++ '@swc/[email protected]': {}+'@swc/[email protected]':dependencies:tslib: 2.8.1+ '@swc/[email protected]':+ dependencies:+ '@swc/counter': 0.1.3+'@tailwindcss/[email protected]':dependencies:'@jridgewell/remapping': 2.3.5@@ -13761,8 +14048,7 @@ snapshots:'@types/[email protected]':optional: true- '@types/[email protected]':- optional: true+ '@types/[email protected]': {}'@types/[email protected]': {}@@ -14654,6 +14940,8 @@ snapshots:array-timsort: 1.0.3esprima: 4.0.1+ [email protected]: {}+dependencies:mime-db: 1.54.0@@ -15329,6 +15617,8 @@ snapshots:esast-util-from-estree: 2.0.0vfile-message: 4.0.3+ [email protected]: {}+optionalDependencies:'@esbuild/aix-ppc64': 0.25.4@@ -16107,6 +16397,12 @@ snapshots:package-json-from-dist: 1.0.1path-scurry: 2.0.2+ dependencies:+ minimatch: 10.2.6+ minipass: 7.1.3+ path-scurry: 2.0.2+dependencies:fs.realpath: 1.0.0@@ -16845,6 +17141,8 @@ snapshots:yaml: 2.9.0zod: 4.4.3+ [email protected]: {}+@@ -18406,6 +18704,8 @@ snapshots:+ [email protected]: {}+dependencies:ansi-regex: 5.0.1@@ -19130,6 +19430,15 @@ snapshots:transitivePeerDependencies:- supports-color+ dependencies:+ '@serwist/utils': 9.5.13([email protected])+ idb: 8.0.3+ optionalDependencies:+ typescript: 6.0.3+ transitivePeerDependencies:+ - browserslist+@@ -19498,6 +19807,8 @@ snapshots:+ [email protected]: {}+diff --git a/scripts/ci/tauri-startup.test.ts b/scripts/ci/tauri-startup.test.tsnew file mode 100644index 000000000..cd3958ce5--- /dev/null+++ b/scripts/ci/tauri-startup.test.ts@@ -0,0 +1,76 @@+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"+import { tmpdir } from "node:os"+import { resolve } from "node:path"+import { spawnSync } from "node:child_process"+import { describe, expect, it } from "vitest"+import { prepareIosDevelopmentPlist } from "../../src/desktop/scripts/ios-dev.mjs"++const root = resolve(import.meta.dirname, "../..")+const tauriRoot = resolve(root, "src/desktop/src-tauri")+const read = (path: string) => readFileSync(resolve(tauriRoot, path), "utf8")+const base = JSON.parse(read("tauri.conf.json"))+const release = JSON.parse(read("tauri.ios.release.conf.json"))+const development = JSON.parse(read("tauri.dev.conf.json"))++describe("Tauri startup release separation", () => {+ it("retains the complete main window and bounds only the release overlay", () => {+ expect(release.app.windows).toEqual(base.app.windows.map((window: object) => ({+ ...window,+ limitNavigationsToAppBoundDomains: true,+ })))+ expect(release.bundle.iOS.infoPlist).toBe("Info.ios.release.plist")+ expect(base.app.windows.every((window: Record<string, unknown>) => !window.limitNavigationsToAppBoundDomains)).toBe(true)+ expect(development.app.windows).toBeUndefined()+ expect(development.bundle?.iOS?.infoPlist).toBeUndefined()+ expect(existsSync(resolve(tauriRoot, "Info.ios.plist"))).toBe(false)+ const plist = read("Info.ios.release.plist")+ expect([...plist.matchAll(/<string>([^<]+)<\/string>/g)].map(match => match[1])).toEqual(["localhost", "alook.ai"])+ })++ it("loads the release overlay and checks the actual IPA without dropping build version", () => {+ const workflow = readFileSync(resolve(root, ".github/workflows/mobile-release.yml"), "utf8")+ expect(workflow).toContain("--config src-tauri/tauri.ios.release.conf.json")+ expect(workflow).toContain('assert info["WKAppBoundDomains"] == ["localhost", "alook.ai"]')+ expect(workflow).toContain('bundleVersion\\\":\\\"${GITHUB_RUN_NUMBER}')+ const pkg = JSON.parse(readFileSync(resolve(root, "src/desktop/package.json"), "utf8"))+ expect(pkg.scripts.ios).toBe("node scripts/ios-dev.mjs --config src-tauri/tauri.dev.conf.json")+ })++ it("pins the host and every local native plugin to the same Tauri release", () => {+ for (const path of ["Cargo.toml", ...["file-save", "mobile-share-image", "mobile-push"].map(plugin => `plugins/${plugin}/Cargo.toml`)]) {+ expect(read(path)).toContain('version = "=2.12.1"')+ expect(read(path)).not.toContain('version = "=2.11.2"')+ }+ })++ it("does not require a generated plist on a fresh development checkout", () => {+ expect(prepareIosDevelopmentPlist(resolve(tauriRoot, "nonexistent-test.plist"))).toBe(false)+ })++ it.runIf(process.platform === "darwin")("removes a stale release key and preserves unrelated generated plist values", () => {+ const directory = mkdtempSync(resolve(tmpdir(), "alook-startup-plist-"))+ const path = resolve(directory, "Info.plist")+ try {+ writeFileSync(path, read("Info.ios.release.plist").replace("</dict>", '<key>CFBundleIdentifier</key><string>ai.alook.ios</string><key>LSRequiresIPhoneOS</key><true/><key>NSPhotoLibraryAddUsageDescription</key><string>Allow save</string></dict>'))+ expect(prepareIosDevelopmentPlist(path)).toBe(true)+ expect(prepareIosDevelopmentPlist(path)).toBe(false)+ expect(spawnSync("/usr/libexec/PlistBuddy", ["-c", "Print :WKAppBoundDomains", path]).status).not.toBe(0)+ expect(spawnSync("/usr/libexec/PlistBuddy", ["-c", "Print :CFBundleIdentifier", path], { encoding: "utf8" }).stdout.trim()).toBe("ai.alook.ios")+ expect(spawnSync("/usr/libexec/PlistBuddy", ["-c", "Print :LSRequiresIPhoneOS", path], { encoding: "utf8" }).stdout.trim()).toBe("true")+ expect(spawnSync("/usr/libexec/PlistBuddy", ["-c", "Print :NSPhotoLibraryAddUsageDescription", path], { encoding: "utf8" }).stdout.trim()).toBe("Allow save")+ } finally {+ rmSync(directory, { recursive: true, force: true })+ }+ })++ it.runIf(process.platform === "darwin")("fails closed on a malformed generated plist", () => {+ const directory = mkdtempSync(resolve(tmpdir(), "alook-startup-plist-invalid-"))+ try {+ const path = resolve(directory, "Info.plist")+ writeFileSync(path, "not a plist")+ expect(() => prepareIosDevelopmentPlist(path)).toThrow()+ } finally {+ rmSync(directory, { recursive: true, force: true })+ }+ })+})diff --git a/src/desktop/package.json b/src/desktop/package.jsonindex 329fda551..0ae97ceb9 100644--- a/src/desktop/package.json+++ b/src/desktop/package.json@@ -6,7 +6,7 @@"dev": "tauri dev --config src-tauri/tauri.dev.conf.json","build": "sh scripts/build.sh","tauri": "tauri",- "ios": "tauri ios dev --config src-tauri/tauri.dev.conf.json",+ "ios": "node scripts/ios-dev.mjs --config src-tauri/tauri.dev.conf.json","android": "tauri android dev --config src-tauri/tauri.dev.conf.json"},"devDependencies": {diff --git a/src/desktop/scripts/ios-dev.mjs b/src/desktop/scripts/ios-dev.mjsnew file mode 100644index 000000000..5a6de4098--- /dev/null+++ b/src/desktop/scripts/ios-dev.mjs@@ -0,0 +1,30 @@+import { existsSync } from "node:fs"+import { resolve } from "node:path"+import { spawnSync } from "node:child_process"+import { fileURLToPath, pathToFileURL } from "node:url"++export function prepareIosDevelopmentPlist(plistPath) {+ if (!existsSync(plistPath)) return false+ const tool = "/usr/libexec/PlistBuddy"+ const result = spawnSync(tool, ["-c", "Print :WKAppBoundDomains", plistPath], { encoding: "utf8" })+ if (result.error) throw result.error+ if (result.status !== 0) {+ if (/Does Not Exist/.test(result.stderr)) return false+ throw new Error(result.stderr || "Could not inspect iOS development plist")+ }+ const removal = spawnSync(tool, ["-c", "Delete :WKAppBoundDomains", plistPath], { encoding: "utf8" })+ if (removal.error) throw removal.error+ if (removal.status !== 0) throw new Error(removal.stderr || "Could not remove release App-Bound domains")+ return true+}++if (process.argv[1] && pathToFileURL(resolve(process.argv[1])).href === import.meta.url) {+ const desktopRoot = fileURLToPath(new URL("../", import.meta.url))+ prepareIosDevelopmentPlist(resolve(desktopRoot, "src-tauri/gen/apple/alook-desktop_iOS/Info.plist"))+ const result = spawnSync("pnpm", ["tauri", "ios", "dev", ...process.argv.slice(2)], {+ cwd: desktopRoot,+ stdio: "inherit",+ })+ if (result.error) throw result.error+ process.exitCode = result.status ?? 1+}diff --git a/src/desktop/src-tauri/Cargo.lock b/src/desktop/src-tauri/Cargo.lockindex 4d3098762..9a0c3c205 100644--- a/src/desktop/src-tauri/Cargo.lock+++ b/src/desktop/src-tauri/Cargo.lock@@ -19,15 +19,15 @@ dependencies = [[[package]]name = "alloc-no-stdlib"-version = "2.0.4"+version = "3.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"+checksum = "c2fb6cfd47bf496ff64095c20eaba0c201404ee38714d4142fcfa1dc334fcc7a"[[package]]name = "alloc-stdlib"-version = "0.2.2"+version = "0.3.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"+checksum = "0b5c1865780388bfa186411ab5f247819487fc4864c6e9c3106611fa347586e1"dependencies = ["alloc-no-stdlib",]@@ -68,8 +68,8 @@ dependencies = ["unicode-normalization","url","webkit2gtk",- "webview2-com",- "windows",+ "webview2-com 0.38.2",+ "windows 0.61.3",][[package]]@@ -358,9 +358,9 @@ dependencies = [[[package]]name = "brotli"-version = "8.0.3"+version = "9.0.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610"+checksum = "f8b851b75c23ca7873623d612fe49bd1989aeb03d08fb9432187eb253d3d4c6b"dependencies = ["alloc-no-stdlib","alloc-stdlib",@@ -369,9 +369,9 @@ dependencies = [[[package]]name = "brotli-decompressor"-version = "5.0.1"+version = "6.0.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924"+checksum = "941cd9bd4ddab83cb46fa5a2d428f1c857b24ac78cb876cf7beb710840934bd7"dependencies = ["alloc-no-stdlib","alloc-stdlib",@@ -478,12 +478,13 @@ dependencies = [[[package]]name = "cargo_toml"-version = "0.22.3"+version = "1.0.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"+checksum = "82f4b26e751e711a5302649417f2da046dce6391b2ea30a4820f37462314f0b9"dependencies = [+ "semver","serde",- "toml 0.9.12+spec-1.1.0",+ "toml 1.1.2+spec-1.1.0",][[package]]@@ -513,6 +514,17 @@ dependencies = ["uuid",]+[[package]]+name = "cfb"+version = "0.14.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3"+dependencies = [+ "fnv",+ "uuid",+ "web-time",+]+[[package]]name = "cfg-expr"version = "0.15.8"@@ -700,9 +712,9 @@ dependencies = [[[package]]name = "cssparser"-version = "0.36.0"+version = "0.37.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2"+checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98"dependencies = ["cssparser-macros","dtoa-short",@@ -713,9 +725,9 @@ dependencies = [[[package]]name = "cssparser-macros"-version = "0.6.1"+version = "0.7.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"+checksum = "d045de693cb712d0b22c6a64be5b953f67b3ce00ab5ad3dd5d8b441886ab8e1a"dependencies = ["quote","syn 2.0.117",@@ -723,19 +735,9 @@ dependencies = [[[package]]name = "ctor"-version = "0.8.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98"-dependencies = [- "ctor-proc-macro",- "dtor",-]--[[package]]-name = "ctor-proc-macro"-version = "0.0.7"+version = "1.0.13"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"+checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d"[[package]]name = "darling"@@ -843,6 +845,15 @@ dependencies = ["dirs-sys",]+[[package]]+name = "dirs"+version = "7.0.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "8d57d423b3c82e89b9a24ca3091fee61f456a26edbd28d26c65906f4bc1dcd8f"+dependencies = [+ "dirs-sys",+]+[[package]]name = "dirs-sys"version = "0.5.0"@@ -912,9 +923,9 @@ dependencies = [[[package]]name = "dom_query"-version = "0.27.0"+version = "0.28.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89"+checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc"dependencies = ["bit-set","cssparser",@@ -955,21 +966,6 @@ dependencies = ["dtoa",]-[[package]]-name = "dtor"-version = "0.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4"-dependencies = [- "dtor-proc-macro",-]--[[package]]-name = "dtor-proc-macro"-version = "0.0.6"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"-[[package]]name = "dunce"version = "1.0.5"@@ -1651,9 +1647,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"[[package]]name = "html5ever"-version = "0.38.0"+version = "0.39.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"dependencies = ["log","markup5ever",@@ -1948,7 +1944,16 @@ version = "0.19.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"dependencies = [- "cfb",+ "cfb 0.7.3",+]++[[package]]+name = "infer"+version = "0.22.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "f4200d433cbd5178df7797c9c2e75b348b728e39631cf14520d1e2fc424201f4"+dependencies = [+ "cfb 0.14.0",][[package]]@@ -2093,21 +2098,21 @@ dependencies = [[[package]]name = "json-patch"-version = "3.0.1"+version = "4.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"+checksum = "7421438de105a0827e44fadd05377727847d717c80ce29a229f85fd04c427b72"dependencies = ["jsonptr","serde","serde_json",- "thiserror 1.0.69",+ "thiserror 2.0.18",][[package]]name = "jsonptr"-version = "0.6.3"+version = "0.7.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"+checksum = "a5a3cc660ba5d72bce0b3bb295bf20847ccbb40fd423f3f05b61273672e561fe"dependencies = ["serde","serde_json",@@ -2115,13 +2120,12 @@ dependencies = [[[package]]name = "keyboard-types"-version = "0.7.0"+version = "0.8.3"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"+checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"dependencies = ["bitflags 2.12.1","serde",- "unicode-segmentation",][[package]]@@ -2229,9 +2233,9 @@ dependencies = [[[package]]name = "markup5ever"-version = "0.38.0"+version = "0.39.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"+checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"dependencies = ["log","tendril",@@ -2298,9 +2302,9 @@ dependencies = [[[package]]name = "muda"-version = "0.19.2"+version = "0.20.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "47a2e3dff89cd322c66647942668faee0a2b1f88ea6cbb4d374b4a8d7e92528c"+checksum = "cca139e57da4383727f189e43e66e84fa372347027fc996f9f1a007ec0a37996"dependencies = ["crossbeam-channel","dpi",@@ -2332,6 +2336,12 @@ dependencies = ["thiserror 1.0.69",]+[[package]]+name = "ndk-context"+version = "0.1.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"+[[package]]name = "ndk-sys"version = "0.6.0+11769913"@@ -3483,9 +3493,9 @@ dependencies = [[[package]]name = "selectors"-version = "0.36.1"+version = "0.38.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"+checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d"dependencies = ["bitflags 2.12.1","cssparser",@@ -3837,9 +3847,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"[[package]]name = "swift-rs"-version = "1.0.7"+version = "1.0.8"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7"+checksum = "e45c444e496845d3f2a351146bff59aae4975b2280238df1dfaa0c7d1846f38e"dependencies = ["base64 0.21.7","serde",@@ -3902,9 +3912,9 @@ dependencies = [[[package]]name = "tao"-version = "0.35.3"+version = "0.37.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"+checksum = "f37f381f4e048e6cdf038b5705f8cf14ad108279d46eb968140a7b291aba9400"dependencies = ["bitflags 2.12.1","block2",@@ -3922,29 +3932,29 @@ dependencies = ["libc","log","ndk",+ "ndk-context","ndk-sys","objc2","objc2-app-kit","objc2-foundation","objc2-ui-kit",- "once_cell","parking_lot","percent-encoding","raw-window-handle","tao-macros","unicode-segmentation","url",- "windows",- "windows-core 0.61.2",+ "windows 0.62.2",+ "windows-core 0.62.2","windows-version","x11-dl",][[package]]name = "tao-macros"-version = "0.1.3"+version = "0.1.4"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"+checksum = "5f7eeb6d99155545da6150a1795945f16ac9c178deb2a5f2e74d776107bd5849"dependencies = ["proc-macro2","quote",@@ -3970,14 +3980,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"[[package]]name = "tauri"-version = "2.11.2"+version = "2.12.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "437404997acf375d85f1177afa7e11bb971f274ed6a7b83a2a3e339015f4cc28"+checksum = "ed99ee9694a2deb776d91cae48ac7411ddfc89ecae2f9b5041111d8c88f2ace9"dependencies = ["anyhow","bytes","cookie",- "dirs",+ "dirs 7.0.0","dunce","embed_plist","getrandom 0.3.4",@@ -4015,20 +4025,20 @@ dependencies = ["tray-icon","url","webkit2gtk",- "webview2-com",+ "webview2-com 0.39.1","window-vibrancy",- "windows",+ "windows 0.62.2",][[package]]name = "tauri-build"-version = "2.6.2"+version = "2.7.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "4aa1f9055fc23919a54e4e125052bed16ed04aef0487086e758fe01a67b451c7"+checksum = "59563ca5b331fd97f27ee9672ec8d36d33bb3c9e2c9f6710a1a5687256052e45"dependencies = ["anyhow","cargo_toml",- "dirs",+ "dirs 7.0.0","glob","heck 0.5.0","json-patch",@@ -4043,16 +4053,16 @@ dependencies = [[[package]]name = "tauri-codegen"-version = "2.6.2"+version = "2.7.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e4a0319528a025a38c4078e7dae2c446f4e63620ddb0659a643ede1cb38f90e9"+checksum = "e50213e463086ecc283d7e9f51c30cc0fd304ad457425158018be26dbf0d0a80"dependencies = ["base64 0.22.1","brotli","ico","json-patch","plist",- "png 0.17.16",+ "png 0.18.1","proc-macro2","quote","semver",@@ -4070,9 +4080,9 @@ dependencies = [[[package]]name = "tauri-macros"-version = "2.6.2"+version = "2.7.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "ae6cb4e3896c21d2f6da5b31251d2faea0153bba56ed0e970f918115dbee4924"+checksum = "8129fb43bb6e0d6b73ad3315cd172beaab17cd28899c594b1b32c80edbbfd99c"dependencies = ["heck 0.5.0","proc-macro2",@@ -4243,7 +4253,7 @@ dependencies = ["tauri-plugin","thiserror 2.0.18","url",- "windows",+ "windows 0.61.3","zbus",]@@ -4287,11 +4297,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "806d9dac662c2e4594ff03c647a552f2c9bd544e7d0f683ec58f872f952ce4af"dependencies = ["base64 0.22.1",- "dirs",+ "dirs 6.0.0","flate2","futures-util","http",- "infer",+ "infer 0.19.0","log","minisign-verify","osakit",@@ -4315,9 +4325,9 @@ dependencies = [[[package]]name = "tauri-runtime"-version = "2.11.2"+version = "2.12.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "48222d7116c8807eaa6fe2f372e023fae125084e61e6eca6d70b7961cdf129ef"+checksum = "c2a57a2a9b8c8b7fc00d35b510fe808ded7f9f1b44fc1cdda6aee38632ea5413"dependencies = ["cookie","dpi",@@ -4334,15 +4344,15 @@ dependencies = ["thiserror 2.0.18","url","webkit2gtk",- "webview2-com",- "windows",+ "webview2-com 0.39.1",+ "windows 0.62.2",][[package]]name = "tauri-runtime-wry"-version = "2.11.2"+version = "2.12.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b83849ee63ecb27a8e8d0fe51915ca215076914aca43f96db1179f0f415f6cd9"+checksum = "7f9e7e0c9f80a5130773cfabb6df4dc924518fb1b2c923726966804634b57d22"dependencies = ["gtk","http",@@ -4359,16 +4369,16 @@ dependencies = ["tauri-utils","url","webkit2gtk",- "webview2-com",- "windows",+ "webview2-com 0.39.1",+ "windows 0.62.2","wry",][[package]]name = "tauri-utils"-version = "2.9.2"+version = "2.10.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "092379df9a707631978e6c56b1bc2401d387f01e2d4a3c123360d167bbb9aa95"+checksum = "2ff55a614843b9a3f010f211df637c94df2607175b8d0f6e0f4a7c19e18621ee"dependencies = ["anyhow","brotli",@@ -4378,7 +4388,7 @@ dependencies = ["dunce","glob","http",- "infer",+ "infer 0.22.0","json-patch","log","memchr",@@ -4421,7 +4431,7 @@ checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9"dependencies = ["quick-xml 0.37.5","thiserror 2.0.18",- "windows",+ "windows 0.61.3","windows-version",]@@ -4628,21 +4638,6 @@ dependencies = ["toml_edit 0.20.2",]-[[package]]-name = "toml"-version = "0.9.12+spec-1.1.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"-dependencies = [- "indexmap 2.14.0",- "serde_core",- "serde_spanned 1.1.1",- "toml_datetime 0.7.5+spec-1.1.0",- "toml_parser",- "toml_writer",- "winnow 0.7.15",-]-[[package]]name = "toml"version = "1.1.2+spec-1.1.0"@@ -4667,15 +4662,6 @@ dependencies = ["serde",]-[[package]]-name = "toml_datetime"-version = "0.7.5+spec-1.1.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"-dependencies = [- "serde_core",-]-[[package]]name = "toml_datetime"version = "1.1.1+spec-1.1.0"@@ -4814,12 +4800,12 @@ dependencies = [[[package]]name = "tray-icon"-version = "0.23.1"+version = "0.25.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "15edbb0d80583e85ee8df283410038e17314df5cba30da2087a54a85216c0773"+checksum = "b2b9c52859a94554803ccd4a24b98f74148ebc73b90676d783f3490b1bff9d72"dependencies = ["crossbeam-channel",- "dirs",+ "dirs 7.0.0","libappindicator","muda","objc2",@@ -4874,47 +4860,6 @@ dependencies = ["windows-sys 0.61.2",]-[[package]]-name = "unic-char-property"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"-dependencies = [- "unic-char-range",-]--[[package]]-name = "unic-char-range"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"--[[package]]-name = "unic-common"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"--[[package]]-name = "unic-ucd-ident"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"-dependencies = [- "unic-char-property",- "unic-char-range",- "unic-ucd-version",-]--[[package]]-name = "unic-ucd-version"-version = "0.9.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"-dependencies = [- "unic-common",-]-[[package]]name = "unicode-ident"version = "1.0.24"@@ -4963,13 +4908,13 @@ dependencies = [[[package]]name = "urlpattern"-version = "0.3.0"+version = "0.6.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"+checksum = "df16f50ef4cc145211879a3867ba757076b25dfee812040dcb0658bd9ae7904b"dependencies = [+ "icu_properties","regex","serde",- "unic-ucd-ident","url",]@@ -5254,6 +5199,16 @@ dependencies = ["wasm-bindgen",]+[[package]]+name = "web-time"+version = "1.1.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"+dependencies = [+ "js-sys",+ "wasm-bindgen",+]+[[package]]name = "web_atoms"version = "0.2.4"@@ -5326,13 +5281,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"dependencies = ["webview2-com-macros",- "webview2-com-sys",- "windows",+ "webview2-com-sys 0.38.2",+ "windows 0.61.3","windows-core 0.61.2","windows-implement","windows-interface",]+[[package]]+name = "webview2-com"+version = "0.39.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3f89fca7a704cee10dcb3654c1dbb8941d1783132f1917358af75bec37a7d7e6"+dependencies = [+ "webview2-com-macros",+ "webview2-com-sys 0.39.1",+ "windows 0.62.2",+ "windows-core 0.62.2",+]+[[package]]name = "webview2-com-macros"version = "0.8.1"@@ -5351,10 +5318,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"dependencies = ["thiserror 2.0.18",- "windows",+ "windows 0.61.3","windows-core 0.61.2",]+[[package]]+name = "webview2-com-sys"+version = "0.39.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b3a07132775117d6065853d9d1178157b8c90e228de47129d6bce2c7edebedfb"+dependencies = [+ "thiserror 2.0.18",+ "windows 0.62.2",+ "windows-core 0.62.2",+]+[[package]]name = "weezl"version = "0.1.12"@@ -5394,16 +5372,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"[[package]]name = "window-vibrancy"-version = "0.6.0"+version = "0.8.1"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"+checksum = "111e51caca442cafd9bab396628ac4d814880eaea4e63dfd76a12e9f342b5580"dependencies = ["objc2","objc2-app-kit","objc2-core-foundation","objc2-foundation",+ "objc2-quartz-core","raw-window-handle",- "windows-sys 0.59.0",+ "windows-sys 0.61.2","windows-version",]@@ -5413,11 +5392,23 @@ version = "0.61.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"dependencies = [- "windows-collections",+ "windows-collections 0.2.0","windows-core 0.61.2",- "windows-future",+ "windows-future 0.2.1","windows-link 0.1.3",- "windows-numerics",+ "windows-numerics 0.2.0",+]++[[package]]+name = "windows"+version = "0.62.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"+dependencies = [+ "windows-collections 0.3.2",+ "windows-core 0.62.2",+ "windows-future 0.3.2",+ "windows-numerics 0.3.1",][[package]]@@ -5429,6 +5420,15 @@ dependencies = ["windows-core 0.61.2",]+[[package]]+name = "windows-collections"+version = "0.3.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"+dependencies = [+ "windows-core 0.62.2",+]+[[package]]name = "windows-core"version = "0.61.2"@@ -5463,7 +5463,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"dependencies = ["windows-core 0.61.2","windows-link 0.1.3",- "windows-threading",+ "windows-threading 0.1.0",+]++[[package]]+name = "windows-future"+version = "0.3.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"+dependencies = [+ "windows-core 0.62.2",+ "windows-link 0.2.1",+ "windows-threading 0.2.1",][[package]]@@ -5510,6 +5521,16 @@ dependencies = ["windows-link 0.1.3",]+[[package]]+name = "windows-numerics"+version = "0.3.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"+dependencies = [+ "windows-core 0.62.2",+ "windows-link 0.2.1",+]+[[package]]name = "windows-registry"version = "0.5.3"@@ -5659,6 +5680,15 @@ dependencies = ["windows-link 0.1.3",]+[[package]]+name = "windows-threading"+version = "0.2.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"+dependencies = [+ "windows-link 0.2.1",+]+[[package]]name = "windows-version"version = "0.1.7"@@ -5815,12 +5845,6 @@ dependencies = ["memchr",]-[[package]]-name = "winnow"-version = "0.7.15"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"-[[package]]name = "winnow"version = "1.0.3"@@ -5960,15 +5984,15 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"[[package]]name = "wry"-version = "0.55.1"+version = "0.57.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"+checksum = "a819957a01b3119af85e638a38d242af76dbc87d130dca67bfd0441072e21ff0"dependencies = ["base64 0.22.1","block2","cookie","crossbeam-channel",- "dirs",+ "dirs 7.0.0","dom_query","dpi","dunce",@@ -5995,9 +6019,9 @@ dependencies = ["url","webkit2gtk","webkit2gtk-sys",- "webview2-com",- "windows",- "windows-core 0.61.2",+ "webview2-com 0.39.1",+ "windows 0.62.2",+ "windows-core 0.62.2","windows-version","x11-dl",]diff --git a/src/desktop/src-tauri/Cargo.toml b/src/desktop/src-tauri/Cargo.tomlindex 08c2026f2..e27603d86 100644--- a/src/desktop/src-tauri/Cargo.toml+++ b/src/desktop/src-tauri/Cargo.toml@@ -12,7 +12,7 @@ crate-type = ["lib", "cdylib", "staticlib"]tauri-build = { version = "2", features = [] }[dependencies]-tauri = { version = "=2.11.2", features = ["tray-icon", "image-png", "macos-private-api"] }+tauri = { version = "=2.12.1", features = ["tray-icon", "image-png", "macos-private-api"] }serde = { version = "1", features = ["derive"] }serde_json = "1"tauri-plugin-opener = "2"diff --git a/src/desktop/src-tauri/Info.ios.release.plist b/src/desktop/src-tauri/Info.ios.release.plistnew file mode 100644index 000000000..9b641c468--- /dev/null+++ b/src/desktop/src-tauri/Info.ios.release.plist@@ -0,0 +1,11 @@+<?xml version="1.0" encoding="UTF-8"?>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">+<plist version="1.0">+<dict>+ <key>WKAppBoundDomains</key>+ <array>+ <string>localhost</string>+ <string>alook.ai</string>+ </array>+</dict>+</plist>diff --git a/src/desktop/src-tauri/plugins/file-save/Cargo.toml b/src/desktop/src-tauri/plugins/file-save/Cargo.tomlindex f6a81f143..2f44781b8 100644--- a/src/desktop/src-tauri/plugins/file-save/Cargo.toml+++ b/src/desktop/src-tauri/plugins/file-save/Cargo.toml@@ -9,8 +9,8 @@ tauri-plugin = { version = "2", features = ["build"] }[dependencies]serde = { version = "1", features = ["derive"] }-tauri = { version = "=2.11.2", default-features = false }+tauri = { version = "=2.12.1", default-features = false }serde_json = "1"[target.'cfg(target_os = "ios")'.dependencies]-tauri = { version = "=2.11.2", features = ["wry"], default-features = false }+tauri = { version = "=2.12.1", features = ["wry"], default-features = false }diff --git a/src/desktop/src-tauri/plugins/mobile-push/Cargo.toml b/src/desktop/src-tauri/plugins/mobile-push/Cargo.tomlindex 6a48d9c5b..2b4b2cddd 100644--- a/src/desktop/src-tauri/plugins/mobile-push/Cargo.toml+++ b/src/desktop/src-tauri/plugins/mobile-push/Cargo.toml@@ -9,8 +9,8 @@ tauri-plugin = { version = "2", features = ["build"] }[dependencies]serde = { version = "1", features = ["derive"] }-tauri = { version = "=2.11.2", default-features = false }+tauri = { version = "=2.12.1", default-features = false }thiserror = "2"[target.'cfg(target_os = "ios")'.dependencies]-tauri = { version = "=2.11.2", features = ["wry"], default-features = false }+tauri = { version = "=2.12.1", features = ["wry"], default-features = false }diff --git a/src/desktop/src-tauri/plugins/mobile-share-image/Cargo.toml b/src/desktop/src-tauri/plugins/mobile-share-image/Cargo.tomlindex e7cc362bb..b2bd3dab7 100644--- a/src/desktop/src-tauri/plugins/mobile-share-image/Cargo.toml+++ b/src/desktop/src-tauri/plugins/mobile-share-image/Cargo.toml@@ -9,8 +9,8 @@ tauri-plugin = { version = "2", features = ["build"] }[dependencies]serde = { version = "1", features = ["derive"] }-tauri = { version = "=2.11.2", default-features = false }+tauri = { version = "=2.12.1", default-features = false }thiserror = "2"[target.'cfg(target_os = "ios")'.dependencies]-tauri = { version = "=2.11.2", features = ["wry"], default-features = false }+tauri = { version = "=2.12.1", features = ["wry"], default-features = false }diff --git a/src/desktop/src-tauri/src/webview_recovery.rs b/src/desktop/src-tauri/src/webview_recovery.rsindex 7b6293a4e..b36c25cc6 100644--- a/src/desktop/src-tauri/src/webview_recovery.rs+++ b/src/desktop/src-tauri/src/webview_recovery.rs@@ -566,12 +566,12 @@ mod tests {let candidate = registry.unwrap().path()- .join("wry-0.55.1/src/android/kotlin/RustWebViewClient.kt");+ .join("wry-0.57.0/src/android/kotlin/RustWebViewClient.kt");if candidate.is_file() {return fs::read_to_string(candidate).unwrap();}}- panic!("locked Wry 0.55.1 source not found")+ panic!("locked Wry 0.57.0 source not found")}#[test]@@ -1013,7 +1013,7 @@ mod tests {assert!(helper.contains("return recoveryUrl(currentUrl)"));let lock = include_str!("../Cargo.lock");- assert!(lock.contains("name = \"wry\"\nversion = \"0.55.1\""));+ assert!(lock.contains("name = \"wry\"\nversion = \"0.57.0\""));let wry = wry_android_client_source();assert!(wry.contains("request: WebResourceRequest"));assert!(wry.contains("request.isForMainFrame"));diff --git a/src/desktop/src-tauri/tauri.ios.release.conf.json b/src/desktop/src-tauri/tauri.ios.release.conf.jsonnew file mode 100644index 000000000..39a05db9f--- /dev/null+++ b/src/desktop/src-tauri/tauri.ios.release.conf.json@@ -0,0 +1,30 @@+{+ "$schema": "./gen/schemas/ios-schema.json",+ "app": {+ "windows": [+ {+ "label": "main",+ "title": "Alook",+ "dragDropEnabled": false,+ "width": 1200,+ "height": 800,+ "minWidth": 800,+ "minHeight": 600,+ "center": true,+ "visible": false,+ "titleBarStyle": "Overlay",+ "hiddenTitle": true,+ "trafficLightPosition": {+ "x": 16,+ "y": 21+ },+ "limitNavigationsToAppBoundDomains": true+ }+ ]+ },+ "bundle": {+ "iOS": {+ "infoPlist": "Info.ios.release.plist"+ }+ }+}diff --git a/src/web/.gitignore b/src/web/.gitignoreindex 237c494cd..5469bdf85 100644--- a/src/web/.gitignore+++ b/src/web/.gitignore@@ -34,6 +34,7 @@ src/test/e2e-ui/.auth//blog/public/icon-192.png/blog/public/fonts//out/+/public/sw.js# production/builddiff --git a/src/web/knip.json b/src/web/knip.jsonindex 57132b215..2f8451c63 100644--- a/src/web/knip.json+++ b/src/web/knip.json@@ -1,6 +1,7 @@{"$schema": "https://unpkg.com/knip@6/schema.json","entry": [+ "src/app/sw.ts","src/app/**/page.tsx","src/app/**/layout.tsx","src/app/**/route.ts",diff --git a/src/web/next.config.ts b/src/web/next.config.tsindex 8d367600e..a5ed3e9cb 100644--- a/src/web/next.config.ts+++ b/src/web/next.config.ts@@ -1,6 +1,7 @@import type { NextConfig } from "next";import path from "node:path";import { readFileSync } from "node:fs";+import { withSerwist } from "@serwist/turbopack";const pkg = JSON.parse(readFileSync(path.resolve(__dirname, "package.json"), "utf-8"));const daemonPkg = JSON.parse(readFileSync(path.resolve(__dirname, "../daemon/package.json"), "utf-8"));@@ -20,7 +21,7 @@ const nextConfig: NextConfig = {},};-export default nextConfig;+export default withSerwist(nextConfig);// Enable calling `getCloudflareContext()` in `next dev`.// See https://opennext.js.org/cloudflare/bindings#local-access-to-bindings.diff --git a/src/web/package.json b/src/web/package.jsonindex 18b747757..6d837a680 100644--- a/src/web/package.json+++ b/src/web/package.json@@ -8,7 +8,7 @@"dev:blog": "node ../../scripts/dev-with-wrangler-registry.mjs ../../.wrangler/registry next dev blog --hostname 127.0.0.1 --port 3002","dev:auth": "wrangler dev --config auth/wrangler.toml","dev:zones:worker": "node scripts/dev-zones.mjs --worker",- "build": "next build",+ "build": "next build && tsx scripts/stage-service-worker.ts","build:blog:next": "tsx blog/scripts/stage-shared-assets.ts && next build blog && tsx blog/scripts/prepare-open-next-standalone.ts","build:blog": "tsx blog/scripts/stage-shared-assets.ts && opennextjs-cloudflare build --config blog/wrangler.toml --openNextConfigPath blog/open-next.config.ts","build:auth": "wrangler deploy --dry-run --config auth/wrangler.toml --outdir dist",@@ -137,6 +137,7 @@"@cloudflare/vitest-plugin": "1.3.5","@lhci/cli": "^0.15.1","@playwright/test": "^1.63.0",+ "@serwist/turbopack": "9.5.13","@tailwindcss/node": "^4.3.3","@tailwindcss/postcss": "^4","@tanstack/react-query-devtools": "5.104.0",@@ -148,6 +149,8 @@"@types/node": "^25","@types/react": "^19.3.0","@types/react-dom": "^19.3.0",+ "esbuild": "0.28.2",+ "esbuild-wasm": "0.28.2","eslint": "^9","eslint-config-next": "16.3.8","eslint-plugin-tailwind-canonical-classes": "^1.4.1",@@ -156,6 +159,7 @@"knip": "^6.32.2","react-scan": "0.5.7","remark-parse": "^11.0.0",+ "serwist": "9.5.13","tailwindcss": "^4","tsx": "^4.23.15","typescript": "^6.0.3",diff --git a/src/web/public/_headers b/src/web/public/_headersindex 327de43a8..aeadefd9f 100644--- a/src/web/public/_headers+++ b/src/web/public/_headers@@ -1,6 +1,12 @@/_next/static/*Cache-Control: public, max-age=31536000, immutable+/sw.js+ Cache-Control: no-cache+ Service-Worker-Allowed: /+ Content-Type: application/javascript+ X-Content-Type-Options: nosniff+/landing/*Cache-Control: public, max-age=300, must-revalidatediff --git a/src/web/scripts/stage-service-worker.test.ts b/src/web/scripts/stage-service-worker.test.tsnew file mode 100644index 000000000..ad739fbbb--- /dev/null+++ b/src/web/scripts/stage-service-worker.test.ts@@ -0,0 +1,45 @@+import { mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs"+import { tmpdir } from "node:os"+import { resolve } from "node:path"+import { afterEach, describe, expect, it } from "vitest"+import { stageServiceWorker } from "./stage-service-worker"++const temporaryRoots: string[] = []+afterEach(() => {+ for (const root of temporaryRoots.splice(0)) rmSync(root, { recursive: true, force: true })+})++function fixture() {+ const root = mkdtempSync(resolve(tmpdir(), "alook-stage-sw-"))+ temporaryRoots.push(root)+ mkdirSync(resolve(root, ".next/server/app/serwist"), { recursive: true })+ mkdirSync(resolve(root, "public"))+ const meta = { status: 200, headers: { "content-type": "application/javascript", "service-worker-allowed": "/", "cache-control": "no-cache" } }+ writeFileSync(resolve(root, ".next/server/app/serwist/sw.js.meta"), JSON.stringify(meta))+ writeFileSync(resolve(root, ".next/server/app/serwist/sw.js.body"), "self.buildVersion='current';")+ writeFileSync(resolve(root, "public/sw.js"), "self.buildVersion='old';")+ return { root, meta }+}++describe("public SW static staging", () => {+ it("replaces the previous public script with the exact generated bytes", () => {+ const { root } = fixture()+ stageServiceWorker(root)+ expect(readFileSync(resolve(root, "public/sw.js"))).toEqual(readFileSync(resolve(root, ".next/server/app/serwist/sw.js.body")))+ })++ it.each(["status", "content-type", "service-worker-allowed", "cache-control"])("rejects invalid %s metadata without publishing it", field => {+ const { root, meta } = fixture()+ if (field === "status") meta.status = 500+ else meta.headers[field as keyof typeof meta.headers] = "invalid"+ writeFileSync(resolve(root, ".next/server/app/serwist/sw.js.meta"), JSON.stringify(meta))+ expect(() => stageServiceWorker(root)).toThrow("Generated public service worker metadata is invalid")+ expect(readFileSync(resolve(root, "public/sw.js"), "utf8")).toBe("self.buildVersion='old';")+ })++ it("fails rather than reusing a stale script when the current build is absent", () => {+ const { root } = fixture()+ rmSync(resolve(root, ".next/server/app/serwist/sw.js.body"))+ expect(() => stageServiceWorker(root)).toThrow()+ })+})diff --git a/src/web/scripts/stage-service-worker.ts b/src/web/scripts/stage-service-worker.tsnew file mode 100644index 000000000..14eb03ceb--- /dev/null+++ b/src/web/scripts/stage-service-worker.ts@@ -0,0 +1,18 @@+import { copyFileSync, mkdirSync, readFileSync } from "node:fs"+import { resolve } from "node:path"+import { fileURLToPath } from "node:url"++export function stageServiceWorker(webRoot: string): void {+ const source = resolve(webRoot, ".next/server/app/serwist/sw.js.body")+ const metadata = JSON.parse(readFileSync(resolve(webRoot, ".next/server/app/serwist/sw.js.meta"), "utf8"))+ if (metadata.status !== 200 || metadata.headers["content-type"] !== "application/javascript"+ || metadata.headers["service-worker-allowed"] !== "/" || metadata.headers["cache-control"] !== "no-cache") {+ throw new Error("Generated public service worker metadata is invalid")+ }+ mkdirSync(resolve(webRoot, "public"), { recursive: true })+ copyFileSync(source, resolve(webRoot, "public/sw.js"))+}++if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {+ stageServiceWorker(fileURLToPath(new URL("../", import.meta.url)))+}diff --git a/src/web/src/app/layout.tsx b/src/web/src/app/layout.tsxindex 95b275287..82989bb68 100644--- a/src/web/src/app/layout.tsx+++ b/src/web/src/app/layout.tsx@@ -8,6 +8,7 @@ import { TooltipProvider } from "@/components/ui/tooltip";import { MockNetworkBanner } from "@/components/mock-network-banner";import { TauriThemeSync } from "@/components/tauri-theme-sync";import { ThemeColorSync } from "@/components/theme-color-sync";+import { ServiceWorkerRegistration } from "@/components/service-worker-registration";import { siteMetadata, siteStructuredData, siteViewport } from "@/lib/seo/site-metadata";import { communityShellLayoutBootstrapScript } from "@/components/community/shell/shell-frame-geometry";import { caveat, dmMono, dmSans, instrumentSerif, literata, vt323 } from "./fonts";@@ -40,6 +41,7 @@ export default function RootLayout({className="min-h-full flex flex-col"><MockNetworkBanner />+ <ServiceWorkerRegistration /><scripttype="application/ld+json"dangerouslySetInnerHTML={{diff --git a/src/web/src/app/serwist/[path]/route.test.ts b/src/web/src/app/serwist/[path]/route.test.tsnew file mode 100644index 000000000..818d54034--- /dev/null+++ b/src/web/src/app/serwist/[path]/route.test.ts@@ -0,0 +1,115 @@+import { beforeEach, describe, expect, it, vi } from "vitest"+import type { createSerwistRoute } from "@serwist/turbopack"++const mocks = vi.hoisted(() => ({+ createRoute: vi.fn(),+ generateStaticParams: vi.fn(),+ GET: vi.fn(),+}))+vi.mock("@serwist/turbopack", () => ({ createSerwistRoute: mocks.createRoute }))++type RouteOptions = Parameters<typeof createSerwistRoute>[0]++async function loadRoute() {+ const route = await import("./route")+ const options = mocks.createRoute.mock.calls[0][0] as RouteOptions+ return { route, options }+}++describe("public service worker route", () => {+ beforeEach(() => {+ vi.resetModules()+ mocks.createRoute.mockReset().mockReturnValue({+ generateStaticParams: mocks.generateStaticParams,+ GET: mocks.GET,+ })+ mocks.generateStaticParams.mockReset()+ mocks.GET.mockReset()+ })++ it("builds a classic worker from only explicit public asset globs", async () => {+ const { options } = await loadRoute()+ expect(options.swSrc).toBe("src/app/sw.ts")+ expect(options.useNativeEsbuild).toBe(true)+ expect(options.globPatterns).toEqual([+ ".next/static/chunks/**/*.{js,css}",+ ".next/static/media/*.{woff,woff2}",+ "public/alook.svg",+ "public/official-server-badge-flat.svg",+ "public/apple-touch-icon.png",+ "public/icon-192.png",+ "public/icon-512.png",+ ])+ expect(options.maximumFileSizeToCacheInBytes).toBe(10 * 1024 * 1024)+ expect(options.esbuildOptions).toEqual({+ format: "iife", sourcemap: false,+ define: { "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV) },+ })+ })++ it("filters the generated manifest without adding account or unknown assets", async () => {+ const { options } = await loadRoute()+ const urls = [+ ".next/static/chunks/app-a.js",+ ".next/static/chunks/styles-a.css",+ ".next/static/media/font-a.woff2",+ "public/alook.svg",+ "public/official-server-badge-flat.svg",+ "public/apple-touch-icon.png",+ "public/icon-192.png",+ "public/icon-512.png",+ ]+ const publicEntries = urls.map((url, i) => ({ url, revision: `public-${i}` }))+ const excluded = [+ "public/sw.js", "public/unknown.png", "public/avatar.png",+ ".next/server/app/c.html", ".next/server/app/c.rsc",+ "/c", "/c?_rsc=private", "/api/community/users/me/profile",+ "/api/community/servers/server-a/avatar?v=1", "/api/files/private-a",+ "https://other.test/_next/static/chunks/app-a.js",+ ".next/static/chunks/app-a.js?account=a",+ ].map((url, i) => ({ url, revision: `excluded-${i}` }))+ const transform = options.manifestTransforms![0]+ const result = await transform([...publicEntries, ...excluded])+ expect(result).toEqual({ manifest: publicEntries, warnings: [] })+ expect(result.manifest[0]).toBe(publicEntries[0])+ })++ it("retains generated static params and route restrictions", async () => {+ const { route } = await loadRoute()+ const params = [{ path: "sw.js" }]+ mocks.generateStaticParams.mockResolvedValue(params)+ expect(route.generateStaticParams).toBe(mocks.generateStaticParams)+ expect(await route.generateStaticParams()).toBe(params)+ expect(route.dynamic).toBe("force-static")+ expect(route.dynamicParams).toBe(false)+ expect(route.revalidate).toBe(false)+ })++ it("preserves generated worker bytes and root scope with revalidation headers", async () => {+ const { route } = await loadRoute()+ const request = new Request("https://alook.test/serwist/sw.js")+ const context = { params: Promise.resolve({ path: "sw.js" }) }+ const generated = new Response("self.__SW_PUBLIC_TEST = true", {+ headers: { "Content-Type": "application/javascript", "Service-Worker-Allowed": "/", "Cache-Control": "public, max-age=3600" },+ })+ mocks.GET.mockResolvedValue(generated)+ const response = await route.GET(request, context)+ expect(mocks.GET).toHaveBeenCalledWith(request, context)+ expect(response).toBe(generated)+ expect(response.status).toBe(200)+ expect(response.headers.get("Content-Type")).toBe("application/javascript")+ expect(response.headers.get("Service-Worker-Allowed")).toBe("/")+ expect(response.headers.get("Cache-Control")).toBe("no-cache")+ expect(response.headers.get("X-Content-Type-Options")).toBe("nosniff")+ expect(await response.text()).toBe("self.__SW_PUBLIC_TEST = true")+ })++ it("propagates generated route failures without a successful worker substitute", async () => {+ const { route } = await loadRoute()+ const error = new Error("worker generation failed")+ mocks.GET.mockRejectedValue(error)+ await expect(route.GET(new Request("https://alook.test/serwist/sw.js"), {+ params: Promise.resolve({ path: "sw.js" }),+ })).rejects.toBe(error)+ })+})diff --git a/src/web/src/app/serwist/[path]/route.ts b/src/web/src/app/serwist/[path]/route.tsnew file mode 100644index 000000000..f8b851e85--- /dev/null+++ b/src/web/src/app/serwist/[path]/route.ts@@ -0,0 +1,37 @@+import { createSerwistRoute } from "@serwist/turbopack"+import { isPublicAssetPath } from "@/lib/service-worker/public-cache"++const serviceWorkerRoute = createSerwistRoute({+ swSrc: "src/app/sw.ts",+ useNativeEsbuild: true,+ globPatterns: [+ ".next/static/chunks/**/*.{js,css}",+ ".next/static/media/*.{woff,woff2}",+ "public/alook.svg",+ "public/official-server-badge-flat.svg",+ "public/apple-touch-icon.png",+ "public/icon-192.png",+ "public/icon-512.png",+ ],+ maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,+ manifestTransforms: [async entries => ({+ manifest: entries.filter(entry => isPublicAssetPath(+ entry.url.replace(/^\.next\//, "/_next/").replace(/^public\//, "/"),+ )),+ warnings: [],+ })],+ esbuildOptions: { format: "iife", sourcemap: false, define: { "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV) } },+})++export const generateStaticParams = serviceWorkerRoute.generateStaticParams++export async function GET(request: Request, context: { params: Promise<{ path: string }> }) {+ const response = await serviceWorkerRoute.GET(request, context)+ response.headers.set("Cache-Control", "no-cache")+ response.headers.set("X-Content-Type-Options", "nosniff")+ return response+}++export const dynamic = "force-static"+export const dynamicParams = false+export const revalidate = falsediff --git a/src/web/src/app/sw.test.ts b/src/web/src/app/sw.test.tsnew file mode 100644index 000000000..f5ec7080d--- /dev/null+++ b/src/web/src/app/sw.test.ts@@ -0,0 +1,159 @@+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"+import type { PrecacheEntry, Route, Serwist } from "serwist"++type WorkerOptions = ConstructorParameters<typeof Serwist>[0]++const boundary = vi.hoisted(() => ({+ options: [] as WorkerOptions[],+ routes: [] as Route[],+ match: vi.fn(),+ listeners: vi.fn(),+}))++vi.mock("serwist", async importOriginal => {+ const actual = await importOriginal<typeof import("serwist")>()+ return {+ ...actual,+ Serwist: class {+ routes: Map<"GET", Route[]>++ constructor(options: WorkerOptions) {+ const route = new actual.Route(boundary.match, async () => new Response("public bytes"))+ this.routes = new Map([["GET", [route]]])+ boundary.options.push(options)+ boundary.routes.push(route)+ }++ addEventListeners() {+ boundary.listeners(this.routes)+ }+ },+ }+})++const origin = "https://alook.ai"+const asset = "/_next/static/chunks/public-a.js"+const manifest: PrecacheEntry[] = [{ url: asset, revision: "revision-a" }]+const params = { cacheKey: `${origin}${asset}?__SW_REVISION__=revision-a` }+const request = (path = asset, init?: RequestInit) => new Request(new URL(path, origin), init)+const event = () => new Event("fetch") as FetchEvent+const matchOptions = (req: Request) => ({ request: req, url: new URL(req.url), sameOrigin: new URL(req.url).origin === origin, event: event() })+const response = (headers?: HeadersInit, status = 200) => new Response("public bytes", {+ status,+ headers: { "Cache-Control": "public, max-age=31536000, immutable", "Content-Type": "application/javascript", ...headers },+})++async function loadWorker(entries: PrecacheEntry[] | undefined = manifest) {+ vi.stubGlobal("self", { __SW_MANIFEST: entries, location: { origin } })+ await import("./sw")+ expect(boundary.options).toHaveLength(1)+ expect(boundary.routes).toHaveLength(1)+ return { options: boundary.options[0], route: boundary.routes[0] }+}++describe("public service worker entry", () => {+ beforeEach(() => {+ vi.resetModules()+ boundary.options.length = 0+ boundary.routes.length = 0+ boundary.match.mockReset().mockReturnValue(params)+ boundary.listeners.mockReset()+ })++ afterEach(() => vi.unstubAllGlobals())++ it("hands the injected manifest to the public precache without broad runtime caching", async () => {+ const { options } = await loadWorker()+ expect(options.precacheEntries).toBe(manifest)+ expect(options).toMatchObject({+ cacheId: "alook-public-v1",+ clientsClaim: true,+ precacheOptions: {+ cacheName: "alook-public-precache-v1",+ cleanURLs: false,+ directoryIndex: null,+ ignoreURLParametersMatching: [],+ },+ })+ expect(options.precacheOptions?.plugins).toHaveLength(1)+ expect(options).not.toHaveProperty("runtimeCaching")+ expect(options).not.toHaveProperty("skipWaiting")+ })++ it("does not invent a manifest when injection is absent", async () => {+ vi.stubGlobal("self", { __SW_MANIFEST: undefined, location: { origin } })+ await import("./sw")+ expect(boundary.options[0].precacheEntries).toBeUndefined()+ })++ it("installs the request guard before attaching listeners and preserves revision parameters", async () => {+ boundary.listeners.mockImplementation((routes: Map<"GET", Route[]>) => {+ const route = routes.get("GET")![0]+ expect(route.match(matchOptions(request(asset, { headers: { Authorization: "test" } })))).toBe(false)+ expect(route.match(matchOptions(request()))).toBe(params)+ })+ const { route } = await loadWorker()+ expect(boundary.listeners).toHaveBeenCalledOnce()+ expect(boundary.match).toHaveBeenCalledOnce()+ expect(route.match(matchOptions(request()))).toBe(params)+ })++ it("rejects private, RSC, credential, navigation, write, query and cross-origin requests", async () => {+ const { route } = await loadWorker()+ const navigation = request()+ Object.defineProperty(navigation, "mode", { value: "navigate" })+ const document = request()+ Object.defineProperty(document, "destination", { value: "document" })+ const rejected = [+ request("/api/auth/get-session"),+ request("/c"),+ request(asset, { headers: { RSC: "1" } }),+ request(asset, { headers: { Cookie: "session=test" } }),+ request(asset, { headers: { Authorization: "test" } }),+ request(asset, { method: "POST" }),+ request(`${asset}?_rsc=account`),+ request(`https://other.example${asset}`),+ navigation,+ document,+ ]+ for (const req of rejected) expect(route.match(matchOptions(req))).toBe(false)+ expect(boundary.match).not.toHaveBeenCalled()+ })++ it("downloads public precache assets anonymously and rejects redirects", async () => {+ const { options } = await loadWorker()+ const original = request(asset, { credentials: "include", redirect: "follow" })+ const plugin = options.precacheOptions!.plugins![0]+ const anonymous = await plugin.requestWillFetch!({ request: original, event: event() })+ expect(anonymous).not.toBe(original)+ expect(anonymous.url).toBe(original.url)+ expect(anonymous.method).toBe("GET")+ expect(anonymous.credentials).toBe("omit")+ expect(anonymous.redirect).toBe("error")+ expect(original.credentials).toBe("include")+ expect(original.redirect).toBe("follow")+ })++ it("writes only explicitly public asset responses through the installed plugin", async () => {+ const { options } = await loadWorker()+ const plugin = options.precacheOptions!.plugins![0]+ const publicResponse = response()+ expect(await plugin.cacheWillUpdate!({ request: request(), response: publicResponse, event: event() })).toBe(publicResponse)+ const rejected = [+ response({ "Cache-Control": "private, max-age=600" }),+ response({ "Cache-Control": "public, no-store" }),+ response({ "Set-Cookie": "session=test" }),+ response({ Vary: "Cookie" }),+ response({ "Content-Type": "text/html" }),+ response({ "Content-Type": "text/x-component" }),+ response({}, 404),+ ]+ const redirected = response()+ Object.defineProperty(redirected, "redirected", { value: true })+ rejected.push(redirected)+ for (const res of rejected) {+ expect(await plugin.cacheWillUpdate!({ request: request(), response: res, event: event() })).toBeNull()+ }+ expect(await plugin.cacheWillUpdate!({ request: request("/api/community/files/attachment"), response: publicResponse, event: event() })).toBeNull()+ })+})diff --git a/src/web/src/app/sw.ts b/src/web/src/app/sw.tsnew file mode 100644index 000000000..b1a91f8c9--- /dev/null+++ b/src/web/src/app/sw.ts@@ -0,0 +1,31 @@+/// <reference lib="webworker" />+import type { PrecacheEntry, SerwistGlobalConfig } from "serwist"+import { Serwist } from "serwist"+import { isPublicAssetResponse, restrictPublicPrecacheRoutes } from "../lib/service-worker/public-cache"++declare global {+ interface WorkerGlobalScope extends SerwistGlobalConfig {+ __SW_MANIFEST: (PrecacheEntry | string)[] | undefined+ }+}++declare const self: ServiceWorkerGlobalScope++const serwist = new Serwist({+ precacheEntries: self.__SW_MANIFEST,+ cacheId: "alook-public-v1",+ clientsClaim: true,+ precacheOptions: {+ cacheName: "alook-public-precache-v1",+ cleanURLs: false,+ directoryIndex: null,+ ignoreURLParametersMatching: [],+ plugins: [{+ requestWillFetch: async ({ request }) => new Request(request, { credentials: "omit", redirect: "error" }),+ cacheWillUpdate: async ({ request, response }) => isPublicAssetResponse(request, response) ? response : null,+ }],+ },+})++restrictPublicPrecacheRoutes(serwist, self.location.origin)+serwist.addEventListeners()diff --git a/src/web/src/components/service-worker-registration.dom.test.tsx b/src/web/src/components/service-worker-registration.dom.test.tsxnew file mode 100644index 000000000..f4460f4f4--- /dev/null+++ b/src/web/src/components/service-worker-registration.dom.test.tsx@@ -0,0 +1,52 @@+import { act, render, screen } from "@/test/react-dom-harness"+import { afterEach, describe, expect, it, vi } from "vitest"+import { ServiceWorkerRegistration } from "./service-worker-registration"++afterEach(() => {+ vi.unstubAllEnvs()+ vi.unstubAllGlobals()+ vi.restoreAllMocks()+})++async function mount() {+ await act(async () => {+ render(<><ServiceWorkerRegistration /><span>Online app content</span></>)+ })+}++describe("public asset service worker registration", () => {+ it("registers the production script with root scope and no HTTP update cache", async () => {+ vi.stubEnv("NODE_ENV", "production")+ const register = vi.fn().mockResolvedValue({})+ vi.stubGlobal("navigator", { serviceWorker: { register } })+ await mount()+ expect(register).toHaveBeenCalledWith("/sw.js", { scope: "/", updateViaCache: "none" })+ })++ it("does not install a worker in development", async () => {+ vi.stubEnv("NODE_ENV", "development")+ const register = vi.fn()+ vi.stubGlobal("navigator", { serviceWorker: { register } })+ await mount()+ expect(register).not.toHaveBeenCalled()+ })++ it("keeps rendering when service workers are unsupported", async () => {+ vi.stubEnv("NODE_ENV", "production")+ vi.stubGlobal("navigator", {})+ await mount()+ expect(screen.getByText("Online app content")).toBeVisible()+ })++ it.each(["rejection", "security getter"])("keeps the online app after a %s failure", async failure => {+ vi.stubEnv("NODE_ENV", "production")+ const warn = vi.spyOn(console, "warn").mockImplementation(() => {})+ const navigator = failure === "rejection"+ ? { serviceWorker: { register: vi.fn().mockRejectedValue(new Error("unavailable")) } }+ : Object.defineProperty({}, "serviceWorker", { get() { throw new Error("denied") } })+ vi.stubGlobal("navigator", navigator)+ await mount()+ expect(warn).toHaveBeenCalledWith("Public asset service worker registration unavailable")+ expect(screen.getByText("Online app content")).toBeVisible()+ })+})diff --git a/src/web/src/components/service-worker-registration.tsx b/src/web/src/components/service-worker-registration.tsxnew file mode 100644index 000000000..a0a19c0e7--- /dev/null+++ b/src/web/src/components/service-worker-registration.tsx@@ -0,0 +1,16 @@+"use client"++import { useEffect } from "react"++export function ServiceWorkerRegistration() {+ useEffect(() => {+ if (process.env.NODE_ENV !== "production" || !("serviceWorker" in navigator)) return+ const register = async () => {+ await navigator.serviceWorker.register("/sw.js", { scope: "/", updateViaCache: "none" })+ }+ void register().catch(() => {+ console.warn("Public asset service worker registration unavailable")+ })+ }, [])+ return null+}diff --git a/src/web/src/lib/service-worker/public-cache.test.ts b/src/web/src/lib/service-worker/public-cache.test.tsnew file mode 100644index 000000000..0f5ccc9fa--- /dev/null+++ b/src/web/src/lib/service-worker/public-cache.test.ts@@ -0,0 +1,90 @@+import { describe, expect, it } from "vitest"+import { isPublicAssetPath, isPublicAssetRequest, isPublicAssetResponse, restrictPublicPrecacheRoutes } from "./public-cache"+import { Route } from "serwist"++const origin = "https://alook.ai"+const script = "/_next/static/chunks/abcd1234.js"+const request = (path = script, init?: RequestInit) => new Request(new URL(path, origin), init)+const response = (headers?: HeadersInit, status = 200) => new Response("public bytes", {+ status,+ headers: { "Cache-Control": "public, max-age=31536000, immutable", "Content-Type": "application/javascript", ...headers },+})++describe("public service worker cache boundary", () => {+ it.each([script, "/_next/static/chunks/styles123.css", "/_next/static/media/font123.woff2", "/alook.svg", "/official-server-badge-flat.svg", "/apple-touch-icon.png", "/icon-192.png", "/icon-512.png"])("allows a public asset: %s", path => {+ expect(isPublicAssetPath(path)).toBe(true)+ expect(isPublicAssetRequest(request(path), origin)).toBe(true)+ })++ it.each(["/c", "/c/channels/server/channel", "/sign-in", "/api/community/servers/icon", "/api/community/files/attachment", "/api/auth/get-session", "/_next/image", "/_next/static/chunks/code.js.map", "/_next/static/chunks/data.json", "/landing/unknown.svg", "/unknown.png", "/serwist/sw.js", "/sw.js"])("excludes private and unknown paths: %s", path => {+ expect(isPublicAssetPath(path)).toBe(false)+ expect(isPublicAssetRequest(request(path), origin)).toBe(false)+ expect(isPublicAssetResponse(request(path), response())).toBe(false)+ })++ it.each([+ { Authorization: "Bearer test" },+ { Cookie: "session=test" },+ { RSC: "1" },+ { "Next-Router-State-Tree": "[]" },+ { "Next-Router-Prefetch": "1" },+ { Accept: "text/x-component" },+ ])("does not intercept a credential or RSC request: %j", headers => {+ expect(isPublicAssetRequest(request(script, { headers }), origin)).toBe(false)+ })++ it("excludes writes, cross-origin assets, navigation and all query variants", () => {+ expect(isPublicAssetRequest(request(script, { method: "POST" }), origin)).toBe(false)+ expect(isPublicAssetRequest(request(script, { method: "HEAD" }), origin)).toBe(false)+ expect(isPublicAssetRequest(request(`https://other.example${script}`), origin)).toBe(false)+ for (const query of ["?_rsc=one", "?utm_source=one", "?download=one", "?__SW_REVISION__=one"]) {+ expect(isPublicAssetRequest(request(`${script}${query}`), origin)).toBe(false)+ }+ const document = request(script)+ Object.defineProperty(document, "destination", { value: "document" })+ expect(isPublicAssetRequest(document, origin)).toBe(false)+ const navigation = request(script)+ Object.defineProperty(navigation, "mode", { value: "navigate" })+ expect(isPublicAssetRequest(navigation, origin)).toBe(false)+ })++ it.each([+ { "Cache-Control": "private, max-age=600" },+ { "Cache-Control": "public, no-store" },+ { "Cache-Control": "public, no-cache" },+ { "Cache-Control": "max-age=600" },+ { "Set-Cookie": "session=test" },+ { Vary: "Accept-Encoding, Cookie" },+ { Vary: "Authorization" },+ { Vary: "RSC, Next-Router-State-Tree" },+ { Vary: "*" },+ { "Content-Type": "text/html" },+ { "Content-Type": "text/x-component" },+ { "Content-Type": "application/json" },+ ])("rejects unsafe responses even on a public path: %j", headers => {+ expect(isPublicAssetResponse(request(), response(headers))).toBe(false)+ })++ it("rejects errors and redirects and requires the correct asset content type", () => {+ expect(isPublicAssetResponse(request(), response())).toBe(true)+ expect(isPublicAssetResponse(request(), response({}, 404))).toBe(false)+ const redirected = response()+ Object.defineProperty(redirected, "redirected", { value: true })+ expect(isPublicAssetResponse(request(), redirected)).toBe(false)+ for (const [path, type] of [["/_next/static/chunks/abc.css", "text/css"], ["/_next/static/media/font.woff2", "font/woff2"], ["/alook.svg", "image/svg+xml"], ["/icon-192.png", "image/png"]]) {+ expect(isPublicAssetResponse(request(path), response({ "Content-Type": `${type}; charset=utf-8`, Vary: "Accept-Encoding" }))).toBe(true)+ expect(isPublicAssetResponse(request(path), response({ "Content-Type": "text/html" }))).toBe(false)+ }+ })++ it("guards Serwist's actual route match while retaining its revision parameters", () => {+ const params = { cacheKey: `${origin}${script}?__SW_REVISION__=revision` }+ const route = new Route(() => params, () => Promise.resolve(response()))+ restrictPublicPrecacheRoutes({ routes: new Map([["GET", [route]]]) }, origin)+ const options = (req: Request) => ({ request: req, url: new URL(req.url), sameOrigin: true, event: new Event("fetch") as FetchEvent })+ expect(route.match(options(request()))).toEqual(params)+ expect(route.match(options(request(script, { headers: { Authorization: "test" } })))).toBe(false)+ expect(route.match(options(request("/api/auth/get-session")))).toBe(false)+ expect(route.match(options(request(`${script}?_rsc=value`)))).toBe(false)+ })+})diff --git a/src/web/src/lib/service-worker/public-cache.ts b/src/web/src/lib/service-worker/public-cache.tsnew file mode 100644index 000000000..ff7f3a80d--- /dev/null+++ b/src/web/src/lib/service-worker/public-cache.ts@@ -0,0 +1,55 @@+import type { Serwist } from "serwist"++const publicIcons = new Set([+ "/alook.svg",+ "/official-server-badge-flat.svg",+ "/apple-touch-icon.png",+ "/icon-192.png",+ "/icon-512.png",+])++export function isPublicAssetPath(pathname: string): boolean {+ return publicIcons.has(pathname) || /^\/_next\/static\/(?:chunks|media)\/[a-zA-Z0-9_./-]+\.(?:js|css|woff2?)$/.test(pathname)+}++export function isPublicAssetRequest(request: Request, origin: string): boolean {+ const url = new URL(request.url)+ return request.method === "GET"+ && url.origin === origin+ && !url.search+ && isPublicAssetPath(url.pathname)+ && request.mode !== "navigate"+ && request.destination !== "document"+ && !request.headers.has("Authorization")+ && !request.headers.has("Cookie")+ && !request.headers.has("RSC")+ && !request.headers.has("Next-Router-State-Tree")+ && !request.headers.has("Next-Router-Prefetch")+ && !request.headers.get("Accept")?.includes("text/x-component")+}++export function isPublicAssetResponse(request: Request, response: Response): boolean {+ const pathname = new URL(request.url).pathname+ const cacheControl = response.headers.get("Cache-Control") ?? ""+ const vary = response.headers.get("Vary") ?? ""+ const type = response.headers.get("Content-Type")?.split(";", 1)[0].trim().toLowerCase()+ if (!isPublicAssetPath(pathname) || response.status !== 200 || response.redirected+ || !/(?:^|,)\s*public\s*(?:,|$)/i.test(cacheControl)+ || /(?:^|,)\s*(?:private|no-store|no-cache)\b/i.test(cacheControl)+ || response.headers.has("Set-Cookie")+ || /(?:^|,)\s*(?:\*|cookie|authorization|rsc|next-router[^,]*)\s*(?:,|$)/i.test(vary)) return false+ if (pathname.endsWith(".js")) return type === "application/javascript" || type === "text/javascript"+ if (pathname.endsWith(".css")) return type === "text/css"+ if (/\.woff2?$/.test(pathname)) return type === "font/woff" || type === "font/woff2" || type === "application/font-woff" || type === "application/octet-stream"+ if (pathname.endsWith(".svg")) return type === "image/svg+xml"+ return type === "image/png"+}++export function restrictPublicPrecacheRoutes(serwist: Pick<Serwist, "routes">, origin: string): void {+ for (const routes of serwist.routes.values()) {+ for (const route of routes) {+ const match = route.match+ route.match = options => isPublicAssetRequest(options.request, origin) ? match(options) : false+ }+ }+}