@lynx-js/web-worker-runtime 0.15.7 → 0.16.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @lynx-js/web-worker-runtime
 
+## 0.16.0
+
+### Minor Changes
+
+- refactor: provide the mts a real globalThis ([#1589](https://github.com/lynx-family/lynx-stack/pull/1589))
+
+  Before this change, We create a function wrapper and a fake globalThis for Javascript code.
+
+  This caused some issues.
+
+  After this change, we will create an iframe for createing an isolated Javascript context.
+
+  This means the globalThis will be the real one.
+
+### Patch Changes
+
+- fix: the SystemInfo in bts should be assigned to the globalThis ([#1599](https://github.com/lynx-family/lynx-stack/pull/1599))
+
+- Updated dependencies [[`1a32dd8`](https://github.com/lynx-family/lynx-stack/commit/1a32dd886fe736c95639f67028cf7685377d9769), [`bb53d9a`](https://github.com/lynx-family/lynx-stack/commit/bb53d9a035f607e7c89952098d4ed77877a2e3c1), [`1a32dd8`](https://github.com/lynx-family/lynx-stack/commit/1a32dd886fe736c95639f67028cf7685377d9769), [`c1f8715`](https://github.com/lynx-family/lynx-stack/commit/c1f8715a81b2e69ff46fc363013626db4468c209)]:
+  - @lynx-js/web-mainthread-apis@0.16.0
+  - @lynx-js/web-constants@0.16.0
+  - @lynx-js/offscreen-document@0.1.4
+  - @lynx-js/web-worker-rpc@0.16.0
+
 ## 0.15.7
 
 ### Patch Changes

package/dist/backgroundThread/background-apis/createNativeApp.js

@@ -1,4 +1,4 @@
-import { callLepusMethodEndpoint, setNativePropsEndpoint, triggerComponentEventEndpoint, selectComponentEndpoint, systemInfo, I18nResource, reportErrorEndpoint, globalDisallowedVars, } from '@lynx-js/web-constants';
+import { callLepusMethodEndpoint, setNativePropsEndpoint, triggerComponentEventEndpoint, selectComponentEndpoint, I18nResource, reportErrorEndpoint, } from '@lynx-js/web-constants';
 import { createInvokeUIMethod } from './crossThreadHandlers/createInvokeUIMethod.js';
 import { registerPublicComponentEventHandler } from './crossThreadHandlers/registerPublicComponentEventHandler.js';
 import { registerGlobalExposureEventHandler } from './crossThreadHandlers/registerGlobalExposureEventHandler.js';
@@ -14,7 +14,7 @@ import { createGetPathInfo } from './crossThreadHandlers/createGetPathInfo.js';
 let nativeAppCount = 0;
 const sharedData = {};
 export async function createNativeApp(config) {
-    const { mainThreadRpc, uiThreadRpc, template, nativeModulesMap, timingSystem, browserConfig, } = config;
+    const { mainThreadRpc, uiThreadRpc, template, nativeModulesMap, timingSystem, } = config;
     const performanceApis = createPerformanceApis(timingSystem);
     const callLepusMethod = mainThreadRpc.createCallbackify(callLepusMethodEndpoint, 2);
     const setNativeProps = uiThreadRpc.createCall(setNativePropsEndpoint);
@@ -23,33 +23,7 @@ export async function createNativeApp(config) {
     const reportError = uiThreadRpc.createCall(reportErrorEndpoint);
     const createBundleInitReturnObj = () => {
         const entry = globalThis.module.exports;
-        return {
-            init: (lynxCoreInject) => {
-                lynxCoreInject.tt.lynxCoreInject = lynxCoreInject;
-                lynxCoreInject.tt.globalThis ??= new Proxy(lynxCoreInject, {
-                    get(target, prop) {
-                        if (typeof prop === 'string' && globalDisallowedVars.includes(prop)) {
-                            return undefined;
-                        }
-                        // @ts-expect-error
-                        return target[prop] ?? globalThis[prop];
-                    },
-                    set(target, prop, value) {
-                        // @ts-expect-error
-                        target[prop] = value;
-                        return true;
-                    },
-                    ownKeys(target) {
-                        return Reflect.ownKeys(target).filter((key) => key !== 'globalThis');
-                    },
-                });
-                Object.assign(lynxCoreInject.tt, {
-                    SystemInfo: { ...systemInfo, ...browserConfig },
-                });
-                const ret = entry?.(lynxCoreInject.tt);
-                return ret;
-            },
-        };
+        return entry;
     };
     const i18nResource = new I18nResource();
     let release = '';

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export interface WorkerStartMessage {
     mode: 'main' | 'background';
     toPeerThread: MessagePort;
     toUIThread: MessagePort;
+    systemInfo?: Record<string, any>;
 }

package/dist/index.js

@@ -2,11 +2,18 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 import { startBackgroundThread } from './backgroundThread/index.js';
-import { startMainThreadWorker } from './mainThread/startMainThread.js';
-globalThis.onmessage = (ev) => {
-    const { mode, toPeerThread, toUIThread } = ev
+globalThis.onmessage = async (ev) => {
+    const { mode, toPeerThread, toUIThread, systemInfo } = ev
         .data;
+    if (!globalThis.SystemInfo) {
+        globalThis.SystemInfo = systemInfo;
+    }
     if (mode === 'main') {
+        const { startMainThreadWorker } = await import(
+        /* webpackChunkName: "web-worker-runtime-main-thread" */
+        /* webpackMode: "lazy-once" */
+        /* webpackPreload: true */
+        './mainThread/startMainThread.js');
         startMainThreadWorker(toUIThread, toPeerThread);
     }
     else {

package/dist/mainThread/startMainThread.js

@@ -7,8 +7,34 @@ import { createMarkTimingInternal } from './crossThreadHandlers/createMainthread
 import { OffscreenDocument } from '@lynx-js/offscreen-document/webworker';
 import { _onEvent } from '@lynx-js/offscreen-document/webworker';
 import { registerUpdateDataHandler } from './crossThreadHandlers/registerUpdateDataHandler.js';
+const { prepareMainThreadAPIs } = await import(
+/* webpackChunkName: "web-core-main-thread-apis" */
+/* webpackMode: "lazy-once" */
+/* webpackPreload: true */
+/* webpackPrefetch: true */
+/* webpackFetchPriority: "high" */
+'@lynx-js/web-mainthread-apis');
+function loadScriptSync(url) {
+    importScripts(url);
+    return globalThis.module?.exports;
+}
+function loadScript(url) {
+    return new Promise((resolve, reject) => {
+        fetch(url)
+            .then(() => {
+            importScripts(url);
+            resolve(globalThis.module?.exports);
+        }).catch(reject);
+    });
+}
+function createCurrentWorkerRealm() {
+    return {
+        globalWindow: globalThis,
+        loadScript,
+        loadScriptSync,
+    };
+}
 export async function startMainThreadWorker(uiThreadPort, backgroundThreadPort) {
-    const { prepareMainThreadAPIs } = await import('@lynx-js/web-mainthread-apis');
     const uiThreadRpc = new Rpc(uiThreadPort, 'main-to-ui');
     const backgroundThreadRpc = new Rpc(backgroundThreadPort, 'main-to-bg');
     const { markTimingInternal, flushMarkTimingInternal } = createMarkTimingInternal(backgroundThreadRpc);
@@ -20,14 +46,19 @@ export async function startMainThreadWorker(uiThreadPort, backgroundThreadPort)
             options,
         ]);
     };
-    const docu = new OffscreenDocument({
+    const document = new OffscreenDocument({
         onCommit: uiFlush,
     });
+    Object.assign(globalThis, {
+        document,
+    });
+    const mtsRealm = createCurrentWorkerRealm();
     const i18nResources = new I18nResources();
-    uiThreadRpc.registerHandler(postOffscreenEventEndpoint, docu[_onEvent]);
+    uiThreadRpc.registerHandler(postOffscreenEventEndpoint, document[_onEvent]);
     const sendMultiThreadExposureChangedEndpoint = uiThreadRpc.createCall(multiThreadExposureChangedEndpoint);
-    const { startMainThread } = prepareMainThreadAPIs(backgroundThreadRpc, docu, docu.createElement.bind(docu), (exposureChangedElementUniqueIds) => {
-        docu.commit();
+    const { startMainThread } = prepareMainThreadAPIs(backgroundThreadRpc, document, // rootDom
+    document, mtsRealm, (exposureChangedElementUniqueIds) => {
+        document.commit();
         sendMultiThreadExposureChangedEndpoint(exposureChangedElementUniqueIds
             .map(e => e.getAttribute(lynxUniqueIdAttribute))
             .filter(id => id !== null));
@@ -35,10 +66,9 @@ export async function startMainThreadWorker(uiThreadPort, backgroundThreadPort)
         i18nResources.setData(initI18nResources);
         return i18nResources;
     });
-    uiThreadRpc.registerHandler(mainThreadStartEndpoint, (config) => {
-        startMainThread(config).then((runtime) => {
-            registerUpdateDataHandler(uiThreadRpc, runtime);
-        });
+    uiThreadRpc.registerHandler(mainThreadStartEndpoint, async (config) => {
+        await startMainThread(config);
+        registerUpdateDataHandler(uiThreadRpc, globalThis);
     });
     uiThreadRpc?.registerHandler(updateI18nResourcesEndpoint, data => {
         i18nResources.setData(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/web-worker-runtime",
-  "version": "0.15.7",
+  "version": "0.16.0",
   "private": false,
   "description": "",
   "keywords": [],
@@ -22,10 +22,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@lynx-js/offscreen-document": "0.1.3",
-    "@lynx-js/web-constants": "0.15.7",
-    "@lynx-js/web-mainthread-apis": "0.15.7",
-    "@lynx-js/web-worker-rpc": "0.15.7"
+    "@lynx-js/web-mainthread-apis": "0.16.0",
+    "@lynx-js/offscreen-document": "0.1.4",
+    "@lynx-js/web-constants": "0.16.0",
+    "@lynx-js/web-worker-rpc": "0.16.0"
   },
   "devDependencies": {
     "@lynx-js/lynx-core": "0.1.3"