@naanlang/naan 1.4.4 → 1.6.0

package/lib/browser/env_web.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2024 by Richard C. Zulch
+ * Copyright (c) 2017-2026 by Richard C. Zulch
  *
  */
 
@@ -69,6 +69,7 @@ exports.NaanControllerWeb = function() {
 
     var naanlib = new exports.Naanlib();
     var dontSaveUntilWorking;                                               // true when state loaded, must be reset to save state again
+    var dontSave;                                                           // true to avoid saving, i.e. in debugger
     var contSelf = this;                                                    // this is us, for access within nested functions
     exports.naancon = this;                                                 // access to this instance
     contSelf.anaan = naanlib.js.n;
@@ -93,8 +94,8 @@ exports.NaanControllerWeb = function() {
     function termTextOut(text, level) {
         if (!text)
             return;
-        if (termlist.length === 0) {
-            console.log(text);                                              // make sure we can see early errors
+        if (termlist.length === 0) {                                        // make sure we can see early errors
+            console.log(text.replace(/(?:\x1B[@-Z\\-_]|\x1B\[[0-?]*[ -/]*[@-~])/g, ''));
             if (!replqueue)
                 replqueue = [];
             replqueue.push({text:text, level:level});
@@ -137,7 +138,7 @@ exports.NaanControllerWeb = function() {
 
 
     //==========================================================================
-    // New Terminal Interface
+    // Direct Terminal Interface
     //--------------------------------------------------------------------------
 
     //
@@ -170,6 +171,7 @@ exports.NaanControllerWeb = function() {
         if (repdex < 0)
             termlist.push(terminal);
         takePending();                                                      // output all pending terminal messages
+        this.ioctl_event("term-attach", "");
     };
 
     //
@@ -184,6 +186,7 @@ exports.NaanControllerWeb = function() {
             termlist.splice(repdex, 1);
         if (termlist.length === 0)
             replstate = terminal.StateSave();                               // save ultimate repl state
+        this.ioctl_event("term-detach", "");
     };
 
     //
@@ -339,13 +342,14 @@ exports.NaanControllerWeb = function() {
     function ConsoleDebugTerminal() {
         var termSelf = this;
         //
-        // OnMessageOut
+        // OnMessage
         //
         this.OnMessage = function OnMessage(msg) {
+            var text = msg.text.replace(/(?:\x1B[@-Z\\-_]|\x1B\[[0-?]*[ -/]*[@-~])/g, '');
             if (msg.id == "debugtext")
-                console.log("dbug-" + msg.level + " " + msg.text);
+                console.log("dbug-" + msg.level + " " + text);
             else if (msg.id == "textout")
-                console.log(msg.text);
+                console.log(text);
         };
         //
         // cmd
@@ -391,25 +395,31 @@ exports.NaanControllerWeb = function() {
     exports.debug = debug;
 
     //==========================================================================
-    // Clone Debug Interface
+    // MessageTerminal
     //--------------------------------------------------------------------------
 
-    function CloneDebugTerminal()
+    function MessageTerminal(windest, origin)
     {
         var termSelf = this;
         //
         // listen for messages
         //
         window.addEventListener("message", function (event) {
-            if (event.origin !== window.origin)
+            if (origin && event.origin !== origin)
                 return;                                                     // only talk with our peers
             var msg = event.data;
+            if (msg.scope != "naan-env-web")
+                return;
             if (msg.id == "interrupt")
                 contSelf.Interrupt();
             else if (msg.id == "keyline")
                 contSelf.Return(msg.text, termSelf);                        // keyboard text from terminal
-            else if (msg.id == "start")
-                contSelf.Attach(term);                                      // opener is ready
+            else if (msg.id == "typed")
+                echoTyped(msg.text);
+            else if (msg.id == "attached")
+                contSelf.Attach(messageTerm);                               // start using the terminal
+            else if (msg.id == "detached")
+                contSelf.Detach(messageTerm);                               // done using the terminal
             else if (msg.id == "import")
             {                                                               // for workers
             }
@@ -423,13 +433,16 @@ exports.NaanControllerWeb = function() {
                 if (debugListener)
                     debugListener(msg.data);                                // target received a message
             }
+            else if (msg.id == "ioctl-event")
+                contSelf.ioctl_event(msg.msg, msg.arg);
         });
 
         //
         // report messages back to opener
         //
         termSelf.OnMessage = function OnMessage(msg) {
-            window.opener.postMessage(msg, window.origin);
+            msg.scope = "naan-env-web";
+            windest.postMessage(msg, origin);
             return (msg);
         };
 
@@ -437,7 +450,7 @@ exports.NaanControllerWeb = function() {
         // report messages back to opener
         //
         termSelf.OnMessageOut = function OnMessageOut(data) {
-            var msg = {                                                       // target is sending debug data
+            var msg = {                                                     // target is sending debug data
                 id: "targetout",
                 data: data
             };
@@ -448,7 +461,7 @@ exports.NaanControllerWeb = function() {
         // report debug messages back to opener
         //
         termSelf.OnDebugOut = function OnDebugOut(data) {
-            var msg = {                                                       // target is sending debug data
+            var msg = {                                                     // target is sending debug data
                 id: "debugout",
                 data: data
             };
@@ -459,14 +472,129 @@ exports.NaanControllerWeb = function() {
         // report status back to opener
         //
         termSelf.OnStatus = function OnStatus(status) {
-            var msg = {                                                       // target is sending debug data
+            var msg = {                                                     // target is sending debug data
                 id: "status",
                 status: status
             };
             return (termSelf.OnMessage(msg));
         };
+
+        //
+        // stub to ignore call
+        //
+        termSelf.StateSave = function StateSave() {
+            return (false);
+        };
+
+        //
+        // send ioctl back to terminal
+        //
+        termSelf.ioctl = function ioctl(op, arg) {
+            var msg = {
+                id: "ioctl",
+                op: op,
+                arg: arg
+            };
+            return (termSelf.OnMessage(msg));
+        };
+
+        listen_all.push(function(imsg, arg) {
+            var msg = {                                                     // target is sending ioctl event
+                id: "ioctl_event",
+                msg: imsg,
+                arg: arg
+            };
+            return (termSelf.OnMessage(msg));
+        });
     }
 
+    //==========================================================================
+    // ioctl terminal control
+    //--------------------------------------------------------------------------
+
+    var listen_all = [];
+    var listeners = { };
+    var ioctl_callback;
+
+    //
+    // ioctl_open
+    //
+    // A terminal controller is now open on our instance.
+    //
+
+    this.ioctl_open = function ioctl_open(callback) {
+        ioctl_callback = callback;
+        return (true);
+    };
+
+    //
+    // ioctl_close
+    //
+    // The terminal controller is no longer open on our instance.
+    //
+
+    this.ioctl_close = function ioctl_close() {
+        ioctl_callback = false;
+        return (true);
+    };
+
+    //
+    // ioctl_event
+    //
+    // Events incoming from terminal.
+    //
+
+    this.ioctl_event = function ioctl_event(msg, arg) {
+        listen_all.forEach(function(proc) {
+            proc(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.
+    //
+
+    this.ioctl_add_listener = function ioctl_add_listener(msg, proc) {
+        if (typeof(msg) != "string" || typeof(proc) != "function")
+            return (false);
+        this.ioctl_remove_listener(msg, proc);
+        if (!listeners[msg])
+            listeners[msg] = [];
+        listeners[msg].push(proc);
+        return (true);
+    };
+
+    this.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.)
+    //
+
+    this.ioctl = function ioctl(op, arg) {
+        if (ioctl_callback)
+            ioctl_callback(op, arg);
+        messageTerm.ioctl(op, arg);
+        return (true);
+    };
+
     //==========================================================================
     // Host Environment
     //--------------------------------------------------------------------------
@@ -501,6 +629,16 @@ exports.NaanControllerWeb = function() {
         dontSaveUntilWorking = false;
     };
 
+    //
+    // Saving
+    //
+    // Turn state saving on or off; on by default.
+    //
+
+    this.Saving = function Saving(onOff) {
+        dontSave = !onOff;
+    };
+
     window.document.addEventListener("visibilitychange", function (e) {
         virtualVisibilityChange();
         if (window.document.visibilityState == "hidden") {
@@ -514,7 +652,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.4.4+1";
+        statedoc.verstring = "1.6.0+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -532,7 +670,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.4.4+1"
+            || statedoc.verstring != "1.6.0+1"
             || !(naanstate = statedoc.naan))
         {
             localStorage.removeItem("NaanState_Hosted");
@@ -550,8 +688,12 @@ exports.NaanControllerWeb = function() {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
         }
-        if (querystrings["nosave"])
+        if (dontSave)
+            return (false);                                                 // not saving right now
+        if ("nosave" in querystrings)
             return (false);
+        if (window.opener)
+            return (false);                                                 // don't save running under NaanIDE
         var statedoc = makeState();
         var statestr = JSON.stringify(statedoc);
         try {
@@ -591,7 +733,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.4.4+1"
+                    title: vsiteName + " 1.6.0+1"
                 });
             }
         } catch (e) {
@@ -605,7 +747,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.4.4+1"
+                    title: vsiteName + " 1.6.0+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -621,7 +763,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteVisibilityChange",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.4.4+1",
+                    title: vsiteName + " 1.6.0+1",
                     hidden: window.document.visibilityState == "hidden",
                     window: window
                 });
@@ -631,13 +773,13 @@ exports.NaanControllerWeb = function() {
     }
 
     /*jshint sub:true */
-    if (querystrings["restart"] || !loadLocal())
+    if ("restart" in querystrings || !loadLocal())
     {                                                                       // don't load state or can't load state
         naanlib.banner();
         var hostpath = window.location.origin.concat(naanlib.js.r("path").dirname(window.location.pathname));
         naanlib.start({
-            cmd: 'App.version = "1.4.4+1";;\r\n'
-                + 'App.cache = "c0da8251995ca3b0d26c3c5513b98f41";;\r\n'
+            cmd: 'App.version = "1.6.0+1";;\r\n'
+                + 'App.cache = "b39f039cddbcaf1570ae6008ea3bbeb6";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });
@@ -655,11 +797,11 @@ exports.NaanControllerWeb = function() {
 
     if (window.opener) {
         virtualOpen();
-        var term = new CloneDebugTerminal();
-        term.OnMessage({
-            id: "loaded"
-        });
     }
+    var messageTerm = new MessageTerminal(window, window.origin);
+    messageTerm.OnMessage({
+        id: "loaded"
+    });
 };
 
 /*jshint sub:true */

package/lib/browser/env_webworker.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2024 by Richard C. Zulch
+ * Copyright (c) 2019-2026 by Richard C. Zulch
  *
  */
 
@@ -18,7 +18,6 @@
 
 importScripts(
     
-    "lib/core/naanlib.js"
 );
 
 
@@ -46,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
             });
@@ -69,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]
@@ -78,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
         });
@@ -92,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
         });
@@ -106,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
         });
@@ -120,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,
@@ -130,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
         });
@@ -137,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,
@@ -170,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"
     });
 };