@naanlang/naan 1.5.0 → 1.6.0

package/lib/browser/env_webworker.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2025 by Richard C. Zulch
+ * Copyright (c) 2019-2026 by Richard C. Zulch
  *
  */
 
@@ -45,20 +45,27 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
     var targSelf = this;                                                    // this is us, for access within nested functions
     targSelf.anaan = naanlib.js.n;
     naanlib.js.t = targSelf;
-    
+    var workerMetadata = { };
+
     //
     // Communications
     //
 
+    targSelf.metadata = function metadata() {                               // our creation metadata
+        return (workerMetadata);
+    };
+
     naanlib.onText(function(text, level) {
         if (level)
             postMessage({
+                scope: "naan-env-web",
                 id: "debugtext",
                 text: text,
                 level: level
             });
         else
             postMessage({
+                scope: "naan-env-web",
                 id: "textout",
                 text: text
             });
@@ -68,6 +75,7 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
         var samples = naanlib.status(1);
         if (samples.length > 0)
             postMessage({                                                   // periodic worker status
+                scope: "naan-env-web",
                 id: "status",
                 status: {
                     sample: samples[0]
@@ -77,6 +85,7 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
 
     targSelf.ReplyMessage = function ReplyMessage(data) {
         postMessage({                                                       // target is sending a message
+            scope: "naan-env-web",
             id: "targetout",
             data: data
         });
@@ -91,6 +100,7 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
 
     this.DispatchMessage = function DispatchMessage(data) {
         postMessage({                                                       // target is sending a message
+            scope: "naan-env-web",
             id: "targetsend",
             data: data
         });
@@ -105,6 +115,7 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
 
     targSelf.ReplyDebugger = function ReplyDebugger(data) {
         postMessage({                                                       // target is sending debug data
+            scope: "naan-env-web",
             id: "debugout",
             data: data
         });
@@ -119,6 +130,7 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
 
     targSelf.Download = function Download(bits, name, options) {
         postMessage({                                                       // tell browser host to download a file
+            scope: "naan-env-web",
             id: "download",
             bits: bits,
             name: name,
@@ -129,6 +141,7 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
 
     targSelf.Terminate = function Terminate(result) {
         postMessage({                                                       // terminate this worker from worker
+            scope: "naan-env-web",
             id: "termination",
             result: result
         });
@@ -136,16 +149,21 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
         return (result);
     };
 
-    onmessage = function(e) {
+    addEventListener("message", function(e) {
         var msg = e.data;
+        if (msg.scope != "naan-env-web")
+            return;
         if (msg.id == "interrupt")
             naanlib.escape();
         else if (msg.id == "keyline")
             naanlib.textLine(msg.text);                                     // keyboard text from terminal
+        else if (msg.id == "typed")
+            echoTyped(msg.text);
         else if (msg.id == "start")
         {                                                                   // start execution with optional state
             targSelf.workerID = msg.workerID;
             targSelf.workerGUID = msg.workerGUID;
+            workerMetadata = msg.metadata || { };
             naanlib.banner();
             naanlib.start({
                 state: msg.state,
@@ -169,13 +187,82 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
             if (targetReceiver)
                 targetReceiver(msg.data);
         }
+        else if (msg.id == "attached")
+            targSelf.ioctl_event("term-attach", msg.guid);
+        else if (msg.id == "detached")
+            targSelf.ioctl_event("term-detach", msg.guid);
+        else if (msg.id == "ioctl-event")
+            targSelf.ioctl_event(msg.msg, msg.arg);
+    });
+
+    //==========================================================================
+    // ioctl terminal control
+    //--------------------------------------------------------------------------
+
+    var listeners = { };
+
+    //
+    // ioctl_event
+    //
+    // Events incoming from terminal.
+    //
+
+    targSelf.ioctl_event = function ioctl_event(msg, arg) {
+        if (listeners[msg])
+            listeners[msg].forEach(function(proc) {
+                proc(msg, arg);
+            });
     };
-    
+
+    //
+    // ioctl_add_listener
+    // ioctl_remove_listener
+    //
+    // Add a listener for a terminal event.
+    //
+
+    targSelf.ioctl_add_listener = function ioctl_add_listener(msg, proc) {
+        if (typeof(msg) != "string" || typeof(proc) != "function")
+            return (false);
+        targSelf.ioctl_remove_listener(msg, proc);
+        if (!listeners[msg])
+            listeners[msg] = [];
+        listeners[msg].push(proc);
+        return (true);
+    };
+
+    targSelf.ioctl_remove_listener = function ioctl_remove_listener(msg, proc) {
+        if (typeof(msg) != "string" || typeof(proc) != "function")
+            return (false);
+        if (listeners[msg]) {
+            var index = listeners[msg].indexOf(proc);
+            if (index >= 0)
+                listeners[msg].splice(index, 1);
+        }
+        return (true);
+    };
+
+    //
+    // ioctl
+    //
+    // Control of terminals (and their controller.)
+    //
+
+    targSelf.ioctl = function ioctl(op, arg) {
+        postMessage({
+            scope: "naan-env-web",
+            id: "ioctl",
+            op: op,
+            arg: arg
+        });
+    };
+
     //
     // Initialization complete
     //
 
     postMessage({
+        scope: "naan-env-web",
         id: "loaded"
     });
 };