diff --git a/package.json b/package.json index d9b7b274d..09bd1e264 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@dnd-kit/modifiers": "^9.0.0", "@dnd-kit/sortable": "^10.0.0", "@dnd-kit/utilities": "^3.2.2", + "acorn": "^8.16.0", "chardet": "^2.1.1", "cron": "^4.4.0", "crypto-js": "^4.2.0", @@ -44,6 +45,7 @@ "eventemitter3": "^5.0.1", "fast-xml-parser": "^5.5.8", "i18next": "^23.16.4", + "magic-string": "^0.30.21", "monaco-editor": "^0.52.2", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9668d48ea..280dc4761 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,6 +23,9 @@ importers: '@dnd-kit/utilities': specifier: ^3.2.2 version: 3.2.2(react@18.3.1) + acorn: + specifier: ^8.16.0 + version: 8.16.0 chardet: specifier: ^2.1.1 version: 2.1.1 @@ -53,6 +56,9 @@ importers: i18next: specifier: ^23.16.4 version: 23.16.4 + magic-string: + specifier: ^0.30.21 + version: 0.30.21 monaco-editor: specifier: ^0.52.2 version: 0.52.2 @@ -141,9 +147,6 @@ importers: '@vitest/coverage-v8': specifier: ^4.0.18 version: 4.0.18(vitest@4.0.18(@types/node@22.16.0)(jiti@2.6.1)(jsdom@26.1.0)(terser@5.43.1)(tsx@4.19.2)(yaml@2.8.3)) - acorn: - specifier: ^8.16.0 - version: 8.16.0 autoprefixer: specifier: ^10.4.21 version: 10.4.21(postcss@8.5.6) @@ -186,9 +189,6 @@ importers: jszip: specifier: ^3.10.1 version: 3.10.1 - magic-string: - specifier: ^0.30.21 - version: 0.30.21 mock-xmlhttprequest: specifier: ^8.4.1 version: 8.4.1 @@ -1002,67 +1002,56 @@ packages: resolution: {integrity: sha512-+xmiDGGaSfIIOXMzkhJ++Oa0Gwvl9oXUeIiwarsdRXSe27HUIvjbSIpPxvnNsRebsNdUo7uAiQVgBD1hVriwSQ==} cpu: [arm] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.44.2': resolution: {integrity: sha512-bDHvhzOfORk3wt8yxIra8N4k/N0MnKInCW5OGZaeDYa/hMrdPaJzo7CSkjKZqX4JFUWjUGm88lI6QJLCM7lDrA==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.44.2': resolution: {integrity: sha512-NMsDEsDiYghTbeZWEGnNi4F0hSbGnsuOG+VnNvxkKg0IGDvFh7UVpM/14mnMwxRxUf9AdAVJgHPvKXf6FpMB7A==} cpu: [arm64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.44.2': resolution: {integrity: sha512-lb5bxXnxXglVq+7imxykIp5xMq+idehfl+wOgiiix0191av84OqbjUED+PRC5OA8eFJYj5xAGcpAZ0pF2MnW+A==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-loongarch64-gnu@4.44.2': resolution: {integrity: sha512-Yl5Rdpf9pIc4GW1PmkUGHdMtbx0fBLE1//SxDmuf3X0dUC57+zMepow2LK0V21661cjXdTn8hO2tXDdAWAqE5g==} cpu: [loong64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-powerpc64le-gnu@4.44.2': resolution: {integrity: sha512-03vUDH+w55s680YYryyr78jsO1RWU9ocRMaeV2vMniJJW/6HhoTBwyyiiTPVHNWLnhsnwcQ0oH3S9JSBEKuyqw==} cpu: [ppc64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.44.2': resolution: {integrity: sha512-iYtAqBg5eEMG4dEfVlkqo05xMOk6y/JXIToRca2bAWuqjrJYJlx/I7+Z+4hSrsWU8GdJDFPL4ktV3dy4yBSrzg==} cpu: [riscv64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.44.2': resolution: {integrity: sha512-e6vEbgaaqz2yEHqtkPXa28fFuBGmUJ0N2dOJK8YUfijejInt9gfCSA7YDdJ4nYlv67JfP3+PSWFX4IVw/xRIPg==} cpu: [riscv64] os: [linux] - libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.44.2': resolution: {integrity: sha512-evFOtkmVdY3udE+0QKrV5wBx7bKI0iHz5yEVx5WqDJkxp9YQefy4Mpx3RajIVcM6o7jxTvVd/qpC1IXUhGc1Mw==} cpu: [s390x] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.44.2': resolution: {integrity: sha512-/bXb0bEsWMyEkIsUL2Yt5nFB5naLAwyOWMEviQfQY1x3l5WsLKgvZf66TM7UTfED6erckUVUJQ/jJ1FSpm3pRQ==} cpu: [x64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-musl@4.44.2': resolution: {integrity: sha512-3D3OB1vSSBXmkGEZR27uiMRNiwN08/RVAcBKwhUYPaiZ8bcvdeEwWPvbnXvvXHY+A/7xluzcN+kaiOFNiOZwWg==} cpu: [x64] os: [linux] - libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.44.2': resolution: {integrity: sha512-VfU0fsMK+rwdK8mwODqYeM2hDrF2WiHaSmCBrS7gColkQft95/8tphyzv2EupVxn3iE0FI78wzffoULH1G+dkw==} @@ -1093,25 +1082,21 @@ packages: resolution: {integrity: sha512-eQfcsaxhFrv5FmtaA7+O1F9/2yFDNIoPZzV/ZvqvFz5bBXVc4FAm/1fVpBg8Po/kX1h0chBc7Xkpry3cabFW8w==} cpu: [arm64] os: [linux] - libc: [glibc] '@rspack/binding-linux-arm64-musl@1.7.6': resolution: {integrity: sha512-DfQXKiyPIl7i1yECHy4eAkSmlUzzsSAbOjgMuKn7pudsWf483jg0UUYutNgXSlBjc/QSUp7906Cg8oty9OfwPA==} cpu: [arm64] os: [linux] - libc: [musl] '@rspack/binding-linux-x64-gnu@1.7.6': resolution: {integrity: sha512-NdA+2X3lk2GGrMMnTGyYTzM3pn+zNjaqXqlgKmFBXvjfZqzSsKq3pdD1KHZCd5QHN+Fwvoszj0JFsquEVhE1og==} cpu: [x64] os: [linux] - libc: [glibc] '@rspack/binding-linux-x64-musl@1.7.6': resolution: {integrity: sha512-rEy6MHKob02t/77YNgr6dREyJ0e0tv1X6Xsg8Z5E7rPXead06zefUbfazj4RELYySWnM38ovZyJAkPx/gOn3VA==} cpu: [x64] os: [linux] - libc: [musl] '@rspack/binding-wasm32-wasi@1.7.6': resolution: {integrity: sha512-YupOrz0daSG+YBbCIgpDgzfMM38YpChv+afZpaxx5Ml7xPeAZIIdgWmLHnQ2rts73N2M1NspAiBwV00Xx0N4Vg==} diff --git a/rspack.config.ts b/rspack.config.ts index 91969281c..691277ecb 100644 --- a/rspack.config.ts +++ b/rspack.config.ts @@ -52,6 +52,7 @@ export default { service_worker: `${src}/service_worker.ts`, offscreen: `${src}/offscreen.ts`, sandbox: `${src}/sandbox.ts`, + persistent_frame: `${src}/persistent_frame.ts`, content: `${src}/content.ts`, scripting: `${src}/scripting.ts`, inject: `${src}/inject.ts`, @@ -233,6 +234,13 @@ export default { minify: true, chunks: ["sandbox"], }), + new rspack.HtmlRspackPlugin({ + filename: `${dist}/ext/src/persistent_frame.html`, + template: `${src}/pages/persistent_frame.html`, + inject: "head", + minify: true, + chunks: ["persistent_frame"], + }), new ZipExecutionPlugin(), ].filter(Boolean), experiments: { diff --git a/src/pages/persistent_frame.html b/src/pages/persistent_frame.html new file mode 100644 index 000000000..bb5973e67 --- /dev/null +++ b/src/pages/persistent_frame.html @@ -0,0 +1,11 @@ + + + + + + persistent_frame + + +
+ + diff --git a/src/persistent_frame.ts b/src/persistent_frame.ts new file mode 100644 index 000000000..18d26945e --- /dev/null +++ b/src/persistent_frame.ts @@ -0,0 +1,44 @@ +// persistent_frame.ts +const WAKE_UP_INTERVAL = 2000; +const RUNNER_RATE = 496.75; +let waitState = 0; +let lastNow = 0; +if (typeof frameElement === "object" && frameElement) { + const cNode = document.createComment("0"); + let cVal = 0; + /** + * scheduler 用于 Service Worker 或 Event Page, Chrome 94+, Firefox 142+ + */ + //@ts-ignore + const scheduler_ = typeof scheduler !== "undefined" && typeof scheduler?.postTask === "function" ? scheduler : null; + const runner = (ts: number) => { + waitState = 1; + cVal = cVal > 8 ? 1 : cVal + 1; + cNode.data = `${cVal}`; + const now = ts; + if (now - lastNow > WAKE_UP_INTERVAL) { + lastNow = now; + chrome.storage.session.set({ persistentWakeup: `${now}` }); + document.title = `wakup at ${now}`; // debug + } + }; + window.addEventListener("message", (ev) => { + if (waitState === 2) { + if (typeof ev.data === "object" && ev.data?.myCustomAction === "waked-up") { + if (scheduler_) { + scheduler_.postTask(() => runner(Date.now()), { priority: "background", delay: RUNNER_RATE }); + } else { + runner(ev.timeStamp); + } + } + } + }); + const mutObserver = new MutationObserver(() => { + if (waitState === 1) { + waitState = 2; + window?.postMessage({ myCustomAction: "waked-up" }, "*"); + } + }); + mutObserver.observe(cNode, { characterData: true }); + runner(0); +} diff --git a/src/pkg/utils/persistent.ts b/src/pkg/utils/persistent.ts new file mode 100644 index 000000000..e6066b408 --- /dev/null +++ b/src/pkg/utils/persistent.ts @@ -0,0 +1,13 @@ +export const keepEventPageRunning = () => { + if (typeof frames !== "object") return; + if (typeof document === "undefined") return; + if (typeof document.documentElement === "undefined") return; + if (document.getElementById("persistent_frame")) return; + chrome.storage.session.onChanged.addListener((obj) => { + typeof obj.persistentWakeup !== "undefined"; + }); + const iframe = document.createElement("iframe"); + iframe.id = "persistent_frame"; + iframe.src = chrome.runtime.getURL("/src/persistent_frame.html"); + document.documentElement.appendChild(iframe); +}; diff --git a/src/service_worker.ts b/src/service_worker.ts index 407a27922..3e465b26c 100644 --- a/src/service_worker.ts +++ b/src/service_worker.ts @@ -8,9 +8,11 @@ import { MessageQueue } from "@Packages/message/message_queue"; import { ServiceWorkerMessageSend } from "@Packages/message/window_message"; import migrate, { migrateChromeStorage } from "./app/migrate"; import { cleanInvalidKeys } from "./app/repo/resource"; +import { keepEventPageRunning } from "@App/pkg/utils/persistent"; migrate(); migrateChromeStorage(); +keepEventPageRunning(); const OFFSCREEN_DOCUMENT_PATH = "src/offscreen.html";