@basthon/kernel-base 0.64.3 → 0.64.4

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.64.3";
+export declare const VERSION = "0.64.4";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "0.64.3";
+export const VERSION = "0.64.4";

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

@@ -46,7 +46,7 @@ export declare class KernelMainBase<Type extends KernelWorkerBase> extends Kerne
         data: any;
         type: string;
         content: any;
-    }): void;
+    }): Promise<void>;
     evalAsync(code: string, outCallback: (_: string) => void, errCallback: (_: string) => void, data?: any): Promise<any>;
     /**
      * Put a file on the local (emulated) filesystem.

package/lib/worker/kernel-main.js

@@ -128,7 +128,7 @@ export class KernelMainBase extends KernelBase {
     /**
      * Process messages from worker (if any).
      */
-    processWorkerMessage(msg) {
+    async processWorkerMessage(msg) {
         switch (msg.type) {
             case "stream":
                 const { stream, text } = msg.content;
@@ -142,18 +142,27 @@ export class KernelMainBase extends KernelBase {
                 this.download(content, filename);
                 break;
             case "display":
+                if (msg.data?.display_type === "dom-node") {
+                    // we should be in legacy mode here
+                    if (!this.isLegacy())
+                        throw new Error("internal error");
+                    const id = msg.data?.content;
+                    //@ts-ignore
+                    msg.data.content = await self.basthon?.popDOMNode(id);
+                }
                 this.dispatchEvent("eval.display", msg.data);
                 break;
+            case "clear_output":
+                this.dispatchEvent("eval.clear-output", msg.data);
+                break;
             case "input":
                 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(this._sab).set(encodedRes.subarray(0, this._sab.byteLength));
-                    Atomics.notify(new Int32Array(this._sab), 0, 1);
-                })();
+                const res = (await this.inputAsync(prompt, password, data));
+                if (this._sab == null)
+                    return;
+                const encodedRes = new TextEncoder().encode(res);
+                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

@@ -22,6 +22,7 @@ declare class KernelWorkerBase {
     protected __eval_data__: any;
     protected postMessage?: InstanceType<typeof MessagePort>["postMessage"];
     private _sab?;
+    private _domNodeBus?;
     constructor(options?: any);
     /**
      * Is this a legacy worker? i.e. not runing in a worker.
@@ -69,6 +70,15 @@ declare class KernelWorkerBase {
      * Display an element like a canvas, ... in the frontend.
      */
     display(element: any): void;
+    /**
+     * Clear the current output.
+     */
+    clearOutput(wait: boolean): void;
+    /**
+     * Pop a DOM node from domNodeBus
+     * (used to transfer HTMLElement from main thread to worker thread in legacy mode)
+     */
+    popDOMNode(id: number): any;
     /**
      * Evaluate code and return an object with mime type keys and string value.
      * To be overloaded.

package/lib/worker/kernel-worker.js

@@ -1,6 +1,7 @@
 import { PromiseDelegate } from "promise-delegate";
 import { NotImplementedError, mockFetch } from "../commons";
 import { wrap } from "comlink";
+import { DOMNodeBus } from "./worker-utils";
 class KernelWorkerBase {
     constructor(options) {
         this._ready = new PromiseDelegate();
@@ -31,6 +32,10 @@ class KernelWorkerBase {
         if (self._prompt == null)
             self._prompt = globalThis.prompt;
         globalThis.prompt = (p) => this.input(p);
+        // DOM node bus in legacy mode
+        // (to transfer elements from worker to main thread, they are the same!)
+        if (this.isLegacy())
+            this._domNodeBus = new DOMNodeBus();
     }
     /**
      * Is this a legacy worker? i.e. not runing in a worker.
@@ -137,11 +142,33 @@ class KernelWorkerBase {
                 .then((blob) => this.displayBlob(blob, data));
         }
         else {
-            data["display_type"] = "multiple";
-            data["content"] = element;
+            // in legacy mode, send HTML elements via DOM node bus
+            if (this.isLegacy() && element instanceof HTMLElement) {
+                data["display_type"] = "dom-node";
+                data["content"] = this._domNodeBus?.push?.(element);
+            }
+            else {
+                data["display_type"] = "multiple";
+                data["content"] = element;
+            }
             this.postMessage?.({ data, type: "display" });
         }
     }
+    /**
+     * Clear the current output.
+     */
+    clearOutput(wait) {
+        const data = this.clone(this.__eval_data__);
+        data["content"] = { wait };
+        this.postMessage?.({ data, type: "clear_output" });
+    }
+    /**
+     * Pop a DOM node from domNodeBus
+     * (used to transfer HTMLElement from main thread to worker thread in legacy mode)
+     */
+    popDOMNode(id) {
+        return this._domNodeBus?.pop(id);
+    }
     /**
      * Evaluate code and return an object with mime type keys and string value.
      * To be overloaded.

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

@@ -4,3 +4,17 @@ declare global {
     }
 }
 export declare const expose: (kwc: any) => void;
+/**
+ * DOM node exchanger (Bus) to bypass stringifying
+ * messages between frontend and kernel that prevents DOMNode sharing.
+ */
+export declare class DOMNodeBus extends Map<number, any> {
+    /**
+     * Push an object to the bus and get back an id to later pop it.
+     */
+    push(obj: any): number;
+    /**
+     * Remove an object from the bus from its id.
+     */
+    pop(id: number): any;
+}

package/lib/worker/worker-utils.js

@@ -19,3 +19,28 @@ export const expose = (kwc) => {
         self._commPort = undefined; // no more needed
     }
 };
+/**
+ * DOM node exchanger (Bus) to bypass stringifying
+ * messages between frontend and kernel that prevents DOMNode sharing.
+ */
+export class DOMNodeBus extends Map {
+    /**
+     * Push an object to the bus and get back an id to later pop it.
+     */
+    push(obj) {
+        let id = 0;
+        for (; id < this.size; id++)
+            if (!this.has(id))
+                break;
+        this.set(id, obj);
+        return id;
+    }
+    /**
+     * Remove an object from the bus from its id.
+     */
+    pop(id) {
+        const res = this.get(id);
+        this.delete(id);
+        return res;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/kernel-base",
-  "version": "0.64.3",
+  "version": "0.64.4",
   "description": "Basthon - Base Kernel",
   "homepage": "https://basthon.fr",
   "bugs": {
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ef45edbf7dcdde8400ffc6ec89cd2d513b8776ee"
+  "gitHead": "ac29889e2ccaf40fa7a85d835f7e6d0d1836dad0"
 }