@basthon/kernel-base 0.64.0 → 0.64.2

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.64.0";
+export declare const VERSION = "0.64.2";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "0.64.0";
+export const VERSION = "0.64.2";

package/lib/worker/kernel-main.d.ts

@@ -5,6 +5,7 @@ export declare class KernelMainBase<Type extends KernelWorkerBase> extends Kerne
     private _worker?;
     private _remote?;
     private _legacy;
+    private _sab?;
     constructor(options: any);
     /**
      * Is this a legacy worker? i.e. not runing in a worker.

package/lib/worker/kernel-main.js

@@ -28,6 +28,8 @@ export class KernelMainBase extends KernelBase {
         super(options);
         this._legacy = false;
         this._legacy = options?.legacy === true;
+        if (!this.isLegacy() && globalThis.crossOriginIsolated)
+            this._sab = new SharedArrayBuffer(1024);
     }
     /**
      * Is this a legacy worker? i.e. not runing in a worker.
@@ -98,6 +100,10 @@ export class KernelMainBase extends KernelBase {
         const proxy = wrap(proxyWorker);
         // setup the kernel worker
         await this.setupWorker();
+        if (this._sab != null) {
+            console.log("Using SharedArrayBuffer for synchronous worker communication.");
+            await this._remote?.setSAB(this._sab);
+        }
         // bind ports
         const port = await proxy[createEndpoint]();
         await this.remote?.setProxyPort(transfer(port, [port]));
@@ -139,12 +145,14 @@ export class KernelMainBase extends KernelBase {
                 this.dispatchEvent("eval.display", msg.data);
                 break;
             case "input":
-                const { prompt, password, data, sab } = msg.content;
+                const { prompt, password, data } = msg.content;
                 (async () => {
                     const res = (await this.inputAsync(prompt, password, data));
+                    if (this._sab == null)
+                        return;
                     const encodedRes = new TextEncoder().encode(res);
-                    new Uint8Array(sab).set(encodedRes.subarray(0, sab.byteLength));
-                    Atomics.notify(new Int32Array(sab), 0, 1);
+                    new Uint8Array(this._sab).set(encodedRes.subarray(0, this._sab.byteLength));
+                    Atomics.notify(new Int32Array(this._sab), 0, 1);
                 })();
                 break;
             default: // ignoring (probably a comlink message)

package/lib/worker/kernel-worker.d.ts

@@ -5,6 +5,8 @@ declare global {
         _remoteProxy: Remote<ProxyFetch>;
         basthon: KernelWorkerBase;
         _prompt: (p?: string, _d?: string) => string | null;
+        window?: DedicatedWorkerGlobalScope;
+        Canvas: typeof OffscreenCanvas | ((w: number, h: number) => HTMLCanvasElement);
     }
 }
 type ExecuteResult = {
@@ -19,11 +21,16 @@ declare class KernelWorkerBase {
     private _ready;
     protected __eval_data__: any;
     protected postMessage?: InstanceType<typeof MessagePort>["postMessage"];
+    private _sab?;
     constructor(options?: any);
     /**
      * Is this a legacy worker? i.e. not runing in a worker.
      */
     isLegacy(): boolean;
+    /**
+     * Set SharedArrayBuffer from main thread.
+     */
+    setSAB(sab: SharedArrayBuffer): void;
     protected _init(): Promise<void>;
     /**
      * Initialize the kernel. It is called by initWorker in KernelBase.
@@ -113,7 +120,7 @@ declare class KernelWorkerBase {
     private decodeSharedArrayBuffer;
     /**
      * Sync input that does not use the ugly prompt but send
-     * an eval.input event tho the main thread and wait for the response.
+     * an eval.input event to the main thread and wait for the response.
      */
     input(prompt: string | null | undefined, password?: boolean): string;
 }

package/lib/worker/kernel-worker.js

@@ -13,10 +13,24 @@ class KernelWorkerBase {
         mockFetch(this.isLegacy());
         // useful for ffi
         self.basthon = this;
+        // the window object is not available in a webworker...
+        if (self.window == null)
+            self.window = self;
+        // common way to create a canvas in worker and legacy mode
+        self.Canvas = !this.isLegacy()
+            ? globalThis.OffscreenCanvas
+            : function Canvas(width, height) {
+                const canvas = document.createElement("canvas");
+                if (width != null)
+                    canvas.width = width;
+                if (height != null)
+                    canvas.height = height;
+                return canvas;
+            };
         // global prompt redirected to our input
         if (self._prompt == null)
             self._prompt = globalThis.prompt;
-        globalThis.prompt = (prompt) => this.input(prompt);
+        globalThis.prompt = (p) => this.input(p);
     }
     /**
      * Is this a legacy worker? i.e. not runing in a worker.
@@ -24,6 +38,12 @@ class KernelWorkerBase {
     isLegacy() {
         return this._legacy;
     }
+    /**
+     * Set SharedArrayBuffer from main thread.
+     */
+    setSAB(sab) {
+        this._sab = sab;
+    }
     /*
      * Initialize the kernel. Should be overloaded.
      */
@@ -200,9 +220,10 @@ class KernelWorkerBase {
      */
     sleep(duration) {
         duration = duration * 1000; // to milliseconds
-        if (globalThis.crossOriginIsolated && !this.isLegacy()) {
-            const sab = new Int32Array(new SharedArrayBuffer(4));
-            Atomics.wait(sab, 0, 0, duration);
+        if (this._sab != null) {
+            // ensure value before waiting
+            Atomics.store(new Int32Array(this._sab), 0, 0);
+            Atomics.wait(new Int32Array(this._sab), 0, 0, duration);
             return;
         }
         else {
@@ -237,18 +258,19 @@ class KernelWorkerBase {
     }
     /**
      * Sync input that does not use the ugly prompt but send
-     * an eval.input event tho the main thread and wait for the response.
+     * an eval.input event to the main thread and wait for the response.
      */
     input(prompt, password = false) {
-        if (globalThis.crossOriginIsolated && !this.isLegacy()) {
+        if (this._sab != null) {
             const data = this.clone(this.__eval_data__);
-            const sab = new SharedArrayBuffer(1024);
             this.postMessage?.({
                 type: "input",
-                content: { data, prompt, password, sab },
+                content: { data, prompt, password },
             });
-            Atomics.wait(new Int32Array(sab), 0, 0);
-            return this.decodeSharedArrayBuffer(sab);
+            // ensure value before waiting
+            Atomics.store(new Int32Array(this._sab), 0, 0);
+            Atomics.wait(new Int32Array(this._sab), 0, 0);
+            return this.decodeSharedArrayBuffer(this._sab);
         }
         else {
             return self._prompt(prompt ?? "") ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/kernel-base",
-  "version": "0.64.0",
+  "version": "0.64.2",
   "description": "Basthon - Base Kernel",
   "homepage": "https://basthon.fr",
   "bugs": {
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1e6bb930f8b51e2a307179afcd9426d2672af4e3"
+  "gitHead": "69cabf8bc55521ec363d74e780f9998604bef012"
 }