@basthon/kernel-javascript 0.62.21 → 0.62.22

package/lib/comlink-worker.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/comlink-worker.js

@@ -0,0 +1,3 @@
+import { expose } from "comlink";
+import { JavaScriptKernelWorker } from "./worker";
+expose(JavaScriptKernelWorker);

package/lib/index.d.ts

@@ -1 +1 @@
-export * from './kernel';
+export * from "./kernel";

package/lib/index.js

@@ -1 +1 @@
-export * from './kernel';
+export * from "./kernel";

package/lib/kernel.d.ts

@@ -1,18 +1,11 @@
-import { KernelBase } from '@basthon/kernel-base';
-export declare class KernelJavaScript extends KernelBase {
-    private _context;
+import { KernelMainBase } from "@basthon/kernel-base/worker";
+import { JavaScriptKernelWorker } from "./worker";
+export declare class JavaScriptKernel extends KernelMainBase<JavaScriptKernelWorker> {
     constructor(options: any);
+    protected newWorker(): Worker;
     language(): string;
     languageName(): string;
     moduleExts(): string[];
-    launch(): Promise<void>;
-    eval(code: string): any;
-    evalAsync(code: string, outCallback: (_: string) => void, errCallback: (_: string) => void, data?: any): Promise<any>;
     ps1(): string;
     ps2(): string;
-    restart(): void;
-    more(source: string): boolean;
-    complete(code: string): [string[], number] | [];
-    putFile(filename: string, content: ArrayBuffer): Promise<void>;
-    putModule(filename: string, content: ArrayBuffer): Promise<void>;
 }

package/lib/kernel.js

@@ -1,86 +1,28 @@
-import { KernelBase } from '@basthon/kernel-base';
-export class KernelJavaScript extends KernelBase {
+import { KernelMainBase } from "@basthon/kernel-base/worker";
+export class JavaScriptKernel extends KernelMainBase {
     constructor(options) {
         super(options);
-        this._context = {
-            Basthon: undefined,
-            Jupyter: undefined,
-            window: undefined,
-        };
-        this._execution_count = 0;
     }
-    language() { return "javascript"; }
-    ;
-    languageName() { return "Javascript"; }
-    ;
-    moduleExts() { return ['js']; }
-    ;
-    async launch() { }
-    ;
-    eval(code) {
-        try {
-            // using context to hide several global variables
-            return window.eval(`with(Basthon._context) { ${code} }`);
-        }
-        catch (e) {
-            if (e instanceof SyntaxError)
-                return (new Function(`with(this) { ${code} }`)).call(this._context);
-            throw e;
-        }
+    newWorker() {
+        return new Worker(new URL("./comlink-worker.js", import.meta.url), {
+            type: "module",
+            //@ts-ignore
+            sandboxed: true, // removing this line will cause security issues
+        });
     }
-    ;
-    async evalAsync(code, outCallback, errCallback, data = null) {
-        // force interactivity in all modes
-        data.interactive = true;
-        // backup
-        const console_log = console.log;
-        const console_error = console.error;
-        console.log = outCallback;
-        console.error = errCallback;
-        this._execution_count++;
-        // evaluation
-        let result = undefined;
-        try {
-            result = this.eval(code);
-        }
-        catch (e) {
-            console.error(`Uncaught ${e.name || ""}: ${e === null || e === void 0 ? void 0 : e.message}`);
-        }
-        // restoration
-        console.log = console_log;
-        console.error = console_error;
-        // return result
-        if (typeof result !== 'undefined')
-            result = { 'text/plain': JSON.stringify(result) };
-        return [result, this._execution_count];
+    language() {
+        return "javascript";
     }
-    ;
-    ps1() { return " js> "; }
-    ;
-    ps2() { return "...> "; }
-    ;
-    restart() { this._execution_count = 0; }
-    ;
-    more(source) { return false; }
-    ;
-    complete(code) { return []; }
-    ;
-    async putFile(filename, content) {
-        console.error(`Fichier ${filename} not added since putFile has no mean in the JS context.`);
+    languageName() {
+        return "Javascript";
     }
-    ;
-    async putModule(filename, content) {
-        content = new Uint8Array(content);
-        const ext = filename.split('.').pop();
-        switch (ext) {
-            case 'js':
-                let decoder = new TextDecoder("utf-8");
-                const _content = decoder.decode(content);
-                this.eval(_content);
-                break;
-            default:
-                throw { message: "Only '.js' files supported." };
-        }
+    moduleExts() {
+        return ["js"];
+    }
+    ps1() {
+        return " js> ";
+    }
+    ps2() {
+        return "...> ";
     }
-    ;
 }

package/lib/worker.d.ts

@@ -0,0 +1,17 @@
+import { KernelWorkerBase } from "@basthon/kernel-base/worker";
+declare global {
+    interface DedicatedWorkerGlobalScope {
+        jsoo_runtime?: any;
+        window?: any;
+        Canvas: typeof OffscreenCanvas;
+    }
+}
+export declare class JavaScriptKernelWorker extends KernelWorkerBase {
+    constructor(options?: any);
+    protected _init(): Promise<void>;
+    protected _eval(data: any, code: string): Promise<any>;
+    putFile(filename: string, content: ArrayBuffer): void;
+    putModule(filename: string, content: ArrayBuffer): Promise<void>;
+    complete(code: string): Promise<[string[], number] | []>;
+    more(code: string): Promise<boolean>;
+}

package/lib/worker.js

@@ -0,0 +1,58 @@
+import objectInspect from "object-inspect";
+import { KernelWorkerBase } from "@basthon/kernel-base/worker";
+export class JavaScriptKernelWorker extends KernelWorkerBase {
+    constructor(options) {
+        // do not forget to call the parent constructor
+        super(options);
+        // the window object is not available in a webworker...
+        self.window = self;
+        self.Canvas = globalThis.OffscreenCanvas;
+    }
+    /*
+     * Initialize the kernel.
+     */
+    async _init() {
+        console.info = (...args) => console.log(...args);
+        console.warn = (...args) => console.error(...args);
+        globalThis.addEventListener("error", (e) => console.error(e.toString()));
+    }
+    async _eval(data, code) {
+        console.log = (...args) => {
+            this.sendStdoutStream(data, args.join(" ") + "\n");
+        };
+        console.error = (...args) => {
+            this.sendStderrStream(data, args.join(" ") + "\n");
+        };
+        const result = await globalThis.eval(code); // if a promise is returned, wait for it
+        return typeof result === "undefined"
+            ? undefined
+            : { "text/plain": objectInspect(result) };
+    }
+    putFile(filename, content) {
+        console.error(`Fichier ${filename} not added since putFile has no mean in the JS context.`);
+    }
+    async putModule(filename, content) {
+        content = new Uint8Array(content);
+        const ext = filename.split(".").pop();
+        switch (ext) {
+            case "js":
+                let decoder = new TextDecoder("utf-8");
+                const _content = decoder.decode(content);
+                await globalThis.eval(_content);
+                break;
+            default:
+                throw { message: "Only '.js' files supported." };
+        }
+    }
+    async complete(code) {
+        // basic completion based on global object
+        const vars = Object.getOwnPropertyNames(self);
+        const words = code.match(/(\w+)$/) ?? [];
+        const word = words[0] ?? "";
+        const matches = vars.filter((v) => v.startsWith(word));
+        return [matches, code.length - word.length];
+    }
+    async more(code) {
+        return false;
+    }
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@basthon/kernel-javascript",
-  "version": "0.62.21",
+  "version": "0.62.22",
   "description": "Basthon - JavaScript Kernel",
   "homepage": "https://basthon.fr",
   "bugs": {
-    "url": "https://framagit.org/basthon/basthon-kernel/issues"
+    "url": "https://forge.apps.education.fr/basthon/basthon-kernel/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://framagit.org/basthon/basthon-kernel.git"
+    "url": "https://forge.apps.education.fr/basthon/basthon-kernel.git"
   },
   "license": "GPL-3.0-or-later",
   "author": "Romain Casati",
@@ -21,19 +21,20 @@
     "lib"
   ],
   "scripts": {
-    "build": "gulp all",
+    "build": "tsc",
     "clean": "rm -rf lib/"
   },
   "dependencies": {
-    "@basthon/kernel-base": "0.62.21"
+    "@basthon/kernel-base": "0.62.22",
+    "comlink": "^4.4.1",
+    "object-inspect": "^1.13.1"
   },
   "devDependencies": {
-    "gulp": "^4.0.2",
-    "gulp-typescript": "^6.0.0-alpha.1",
-    "typescript": "~4.4.4"
+    "@types/object-inspect": "^1.13.0",
+    "typescript": "^5.4.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "59343558e9ae17fbb08eda1e81a36b182e572d05"
+  "gitHead": "1dd6225a7caf14cbee203687cac611495f5b18d4"
 }