@naanlang/naan 1.5.0 → 1.7.0

package/lib/env_node.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2024 by Richard C. Zulch
+ * Copyright (c) 2017-2026 by Richard C. Zulch
  *
  */
 
@@ -49,6 +49,7 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     if (typeof(options) != 'object')
         options = { };
     var repl = require('repl');
+    const { Transform } = require('node:stream');
     var replServer;
     var process = require('process');
     var Naan = require('./core/naanlib');
@@ -62,8 +63,16 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     if (outEnable && process.env["RUNKIT_ENDPOINT_URL"])
         useConsoleOut = true;                                               // use console.log for output in RunKit
     var dontSaveUntilWorking;                                               // true when state loaded, must be reset to save state again
+    var dontSave;                                                           // true to avoid saving, i.e. in debugger
     var prefs = { };
 
+    // kpMode
+    // 0: normal (readline & echo)
+    // 1: readline, but echo CR only
+    // 2: readline, but don't echo
+    // 3: raw, no echo or readline, but key-events
+    var kpMode = 0;
+
     //==========================================================================
     // API
     //--------------------------------------------------------------------------
@@ -112,7 +121,27 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     
     if (process.stdin.isTTY)
     {                                                                       // must have TTY for local REPL
-        replServer = repl.start({ prompt: '', eval: myEval});
+        const replOutputStream = new Transform({
+            writableObjectMode: true,
+            readableObjectMode: true,
+            transform(chunk, encoding, callback) {
+                if (kpMode > 0) {
+                    const str = chunk.toString();
+                    if (kpMode != 1 || str != "\r\n")
+                        return callback();                                  // output goes to the bit bucket
+                }
+                return callback(null, chunk);                               // normal output
+            }
+        });
+        replOutputStream.pipe(process.stdout);                              // output filter for raw and no-echo
+
+        replServer = repl.start({
+            prompt: '',
+            eval: myEval,
+            input: process.stdin,
+            output: replOutputStream,
+            terminal: true
+        });
     
         replServer.on('line', function(cmd) {                               // process raw command line
             if (options.replDisable)
@@ -122,7 +151,21 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
                 naanlib.textLine(cmd + "\n");
             }
         });
-    
+
+        const origListenersData = process.stdin.listeners('data');
+        process.stdin.removeAllListeners('data');
+
+        process.stdin.on('data', (data) => {
+            if (kpMode == 3) {
+                servSelf.ioctl_event("raw-key", {                           // raw mode
+                    key: data.toString(),
+                    origin: 0                                               // assume keystroke
+                });
+                return;
+            }
+            origListenersData.forEach(listener => listener(data));
+        });
+
         //
         // Hook the ^C interrupt
         //
@@ -131,8 +174,10 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
             if (options.replDisable) {
                 console.log("^C");
                 process.exit();
-            } else
+            } else {
+                setKpMode(0);
                 naanlib.escape();
+            }
         };
 
         //
@@ -142,6 +187,17 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         replServer.on('exit', function() {
             process.exit();
         });
+
+        //
+        // Process resize notifications
+        //
+    
+        process.stdout.on('resize', () => {
+            servSelf.ioctl_event("term-resize", {
+                cols: process.stdout.columns,
+                rows: process.stdout.rows
+            });
+        });
     }
 
     //
@@ -177,6 +233,43 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
             textToRemoteTerm(text);
         }
     });
+    
+    //
+    // setKpMode
+    //
+
+    function setKpMode(mode) {
+        if (!replServer)
+            return;
+        kpMode = mode;
+        process.stdin.resume();
+    }
+
+    //
+    // repl_keystroke
+    //
+
+    function repl_keystroke(str) {
+        if (replServer)
+            replServer.write(str, null);
+    }
+
+    //
+    // repl_ioctl
+    //
+    
+    this.repl_ioctl = function repl_ioctl(op, arg) {
+        if (op == "sane")
+            setKpMode(0);
+        else if (op == "raw")
+            setKpMode(arg ? 3 : 0);
+        else if (op == "keystroke")
+            repl_keystroke(arg);
+        else if (op == "echo") {
+            if (arg >= 0 && arg <= 2)
+                setKpMode(arg);
+        }
+    };
 
 
     //==========================================================================
@@ -196,7 +289,7 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     //
     // Detach
     //
-    // Detach the terminal from the interpreter.
+    // Detach the terminal from our interpreter.
     //
 
     this.Detach = function(tops) {
@@ -211,26 +304,6 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     // messages are originating from the interpreter itself, so that it does not call itself back
     // recursively. That would be Very Bad™.
     //
-
-    var replyHook;
-    this.OnReplyHook = function OnReplyHook(proc) {
-        replyHook = proc;
-        return (proc);
-    };
-
-    this.ReplyMessage = function ReplyMessage(data) {
-        if (replyHook)
-            setTimeout(function() {
-                replyHook(data);
-            }, 1);
-        if (termops)
-        {
-            setTimeout(function () {
-                termops.messageout(data);
-            }, 1);
-        }
-        return (data);
-    };
     
     var nodeListener;
     this.OnMessage = function OnMessage(proc) {
@@ -242,7 +315,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         if (termops)
         {
             setTimeout(function () {
-                termops.debugout(data);
+                if (termops)
+                    termops.debugout(data);
             }, 1);
         }
         return (data);
@@ -277,6 +351,10 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
                 naanlib.textLine(msg.text);                                 // keyboard text from terminal
             }, 1);
         }
+        else if (msg.id == "typed")
+        {
+            echoTyped(msg.text);
+        }
         else if (msg.id == "targetin")
         {
             setTimeout(function () {
@@ -291,6 +369,12 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
                     debugListener(msg.data);                                // received a debugger message
             }, 1);
         }
+        else if (msg.id == "attached")
+            servSelf.ioctl_event("term-attach", msg.guid);
+        else if (msg.id == "detached")
+            servSelf.ioctl_event("term-detach", msg.guid);
+        else if (msg.id == "ioctl-event")
+            servSelf.ioctl_event(msg.msg, msg.arg);
     };
     
     // textToRemoteTerm
@@ -301,7 +385,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         if (termops)
         {
             setTimeout(function () {
-                termops.textout(text);
+                if (termops)
+                    termops.textout(text);
             }, 1);
         }
     }
@@ -323,6 +408,68 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         }
     }, 1000);
     
+    //==========================================================================
+    // ioctl terminal control
+    //--------------------------------------------------------------------------
+
+    //
+    // ioctl_event
+    //
+    // Events incoming from terminal.
+    //
+
+    this.ioctl_event = function ioctl_event(msg, arg) {
+        if (listeners[msg])
+            listeners[msg].forEach(function(proc) {
+                setTimeout(function () {
+                    proc(msg, arg);
+                }, 1);
+            });
+    };
+
+    //
+    // ioctl_add_listener
+    // ioctl_remove_listener
+    //
+    // Add a listener for a terminal event.
+    //
+
+    var listeners = { };
+
+    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) {
+        setTimeout(function () {
+            servSelf.repl_ioctl(op, arg);
+            if (termops)
+                termops.ioctl(op, arg);
+        }, 1);
+    };
 
     //==========================================================================
     // State load/save
@@ -352,6 +499,16 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         dontSaveUntilWorking = false;
     };
 
+    //
+    // Saving
+    //
+    // Turn state saving on or off; on by default.
+    //
+
+    this.Saving = function Saving(onOff) {
+        dontSave = !onOff;
+    };
+
     // MakeState
     //
     // Save our state into a new object.
@@ -359,6 +516,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
     this.MakeState = function MakeState() {
         if (dontSaveUntilWorking)
             return (false);                                                 // didn't get far enough to call Working()
+        if (dontSave)
+            return (false);                                                 // not saving right now
         var statedoc = {};
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;

package/lib/env_nodeworker.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2024 by Richard C. Zulch
+ * Copyright (c) 2019-2026 by Richard C. Zulch
  *
  */
 
@@ -63,6 +63,7 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
         workSelf.anaan = naanlib.js.n;
         naanlib.js.t = workSelf;
         naanlib.js.k = threads;
+        var workerMetadata = { };
     
     
         //==========================================================================
@@ -84,12 +85,79 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
         this.textCommand = function textCommand(cmd) {                      // send a command
             naanlib.textLine(cmd);
         };
+            
+        this.metadata = function metadata() {                               // our creation metadata
+            return (workerMetadata);
+        };
+
+        this.msgPort = msgPort;                                             // our msgPort
+
+        //==========================================================================
+        // ioctl terminal control
+        //--------------------------------------------------------------------------
+
+        //
+        // ioctl_event
+        //
+        // Events incoming from terminal.
+        //
+    
+        workSelf.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.
+        //
+    
+        var listeners = { };
+    
+        workSelf.ioctl_add_listener = function ioctl_add_listener(msg, proc) {
+            if (typeof(msg) != "string" || typeof(proc) != "function")
+                return (false);
+            workSelf.ioctl_remove_listener(msg, proc);
+            if (!listeners[msg])
+                listeners[msg] = [];
+            listeners[msg].push(proc);
+            return (true);
+        };
+    
+        workSelf.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.)
+        //
+    
+        workSelf.ioctl = function ioctl(op, arg) {
+            msgPort.postMessage({
+                id: "ioctl",
+                op: op,
+                arg: arg
+            });
+            return (undefined);
+        };
     
         //==========================================================================
         // NodeJS Worker Terminal Interface
         //--------------------------------------------------------------------------
-    
+
         naanlib.onText(function(text, level) {
             if (level)
                 msgPort.postMessage({
@@ -103,7 +171,7 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                     text: text
                 });
         });
-    
+
         setInterval(function() {
             var samples = naanlib.status(1);
             if (samples.length > 0)
@@ -114,34 +182,6 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                     }
                 });
         }, 1000);
-        
-        workSelf.ReplyMessage = function ReplyMessage(data) {
-            msgPort.postMessage({                                           // worker is sending a message
-                id: "targetout",
-                data: data
-            });
-            return (data);
-        };
-        
-        var workerListener;
-        workSelf.OnMessage = function OnMessage(proc) {
-            workerListener = proc;
-            return (proc);
-        };
-
-        workSelf.DispatchMessage = function DispatchMessage(data) {
-            msgPort.postMessage({                                           // target is sending a message
-                id: "targetsend",
-                data: data
-            });
-            return (data);
-        };
-    
-        var targetReceiver;
-        workSelf.OnReceive = function OnReceive(proc) {
-            targetReceiver = proc;
-            return (proc);
-        };
 
         workSelf.ReplyDebugger = function ReplyDebugger(data) {
             msgPort.postMessage({                                           // target is sending debug data
@@ -150,22 +190,24 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
             });
             return (data);
         };
-    
+
         var debugListener;
         workSelf.OnDebugger = function OnDebugger(proc) {
             debugListener = proc;
             return (proc);
         };
-    
+
         msgPort.on("message", function(msg) {
             if (msg.id == "interrupt")
                 naanlib.escape();                                           // interrupt request from terminal
             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
                 workSelf.workerID = msg.workerID;
-                workSelf.workerGUID = msg.workerGUID;
+                workerMetadata = msg.metadata || { };
                 if (typeof(__dirname) !== "undefined")
                     naanlib.js.h = naanlib.js.d;                            // set host directory path
                 if (msg.dirpath)
@@ -182,21 +224,17 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
             }
             else if (msg.id == "import")
                 importScripts(msg.script);                                  // load a JavaScript
-            else if (msg.id == "targetin")
-            {
-                if (workerListener)
-                    workerListener(msg.data);                               // worker received a message
-            }
             else if (msg.id == "debugin")
             {
                 if (debugListener)
                     debugListener(msg.data);                                // target received a message
             }
-            else if (msg.id == "targetreceive")
-            {
-                if (targetReceiver)
-                    targetReceiver(msg.data);
-            }
+            else if (msg.id == "attached")
+                workSelf.ioctl_event("term-attach", msg.guid);
+            else if (msg.id == "detached")
+                workSelf.ioctl_event("term-detach", msg.guid);
+            else if (msg.id == "ioctl-event")
+                workSelf.ioctl_event(msg.msg, msg.arg);
         });
         
         naanlib.banner();

package/lib/node_server_init.nlg

@@ -0,0 +1,149 @@
+/*
+ * node_server_init.nlg
+ * Naanide
+ *
+ * Loaded automatically for Node.js before REPL turned over to the user.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2020-2026 by Richard C. Zulch
+ *
+ */
+
+loglevel(3);
+
+
+/*
+ * Debugging & Tools
+ *
+ */
+
+if !module.owner.list.running.components.debugnub {
+    require("naanlib:frameworks/common/repltools.nlg").ImportReplTools()
+    require("naanlib:frameworks/running/debugnub.nlg").DebugNub()
+};
+
+App.shell = require("naanlib:frameworks/node/shell.nlg").ShellConnect({
+    cwd: js.d
+})
+
+
+/*
+ * versionCheck
+ *
+ * Ensure that Node is at least as new as the specified version.
+ *
+ */
+
+function versionCheck(minver, local rxver, curver) {
+    rxver = RegExp("([0-9]+)[.]([0-9]+)[.]([0-9]+)")
+    minver = minver.match(rxver).map(function(x){Number.parseInt(x)})
+    curver = js.g.process.version.match(rxver).map(function(x){Number.parseInt(x)})
+    minver[1] < curver[1] || minver[1] == curver[1] && (minver[2] < curver[2] || minver[2] == curver[2] && minver[3] <= curver[3])
+};
+
+
+/*
+ * saveState
+ *
+ * Save our state soon. This saves in a future to avoid stack problems. Returns a nonce.
+ *
+ */
+
+function saveState() {
+    future(function() {
+        js.t.Working()
+        js.save()
+    }, 0)
+};
+
+
+/*
+ * startup
+ *
+ * This is the normal NaanIDE startup code. The scenarios are as follows:
+ * 1. Start new server at available port and launch browser tab             // default behavior
+ * 2. Start new server with intialization file that launches browser
+ * 3. Start new server at fixed port and launch browser tab
+ * 4. Start new server at fixed port with initialization file
+ * 5. Connect to existing server at fixed port and evaluate remote expression, then quit
+ *
+ * This uses the Naan symbol NaanStartParams as:
+ *  {
+ *      naanpath:   <string>                    // path to the naan library
+ *      serverPort: <integer>                   // defined if the command line specified a port
+ *      guid:       <string>                    // server secret
+ *      cmd_mod:    <string>                    // name of a command to execute
+ *      cmd_path:   <string>                    // path to command's module
+ *      cmd_args:   [<string>]                  // arguments to the command
+ *  }
+ *
+ */
+
+closure startup(local error, api, exists, oururl) {
+    if !versionCheck("16.20.2") {
+        debuglog("NaanIDE: NodeJS too old; version 16.20.2 required.")
+        js.g.process.exit(2)
+    }
+    if !dictionary(NaanStartParams) {
+        debuglog("NaanIDE: startup parameters missing.")
+        js.g.process.exit(3)
+    }
+
+    App.imp = require("naanlib:frameworks/service/imp.nlg").Imp({
+        name: "NaanIDE Server"
+        type: "Server IMP"
+    })
+    require("naanlib:frameworks/running/remote_res.nlg")
+        .RemoteResponder(App.imp.us.instanceID, {                           // make our server remotable
+        name: "NaanIDE Server"
+        type: "Node Remote"
+    })
+    App.exec = require("naanlib:frameworks/node/worker.nlg").CurBot({
+        name: "NaanIDE Server"
+        type: "NaaN Server"
+    })
+
+    App.api = undefined
+    App.naanpath = NaanStartParams.naanpath
+    App.nidecon = require("lib/nidecon").NideCon({
+        fixedPort: NaanStartParams.serverPort
+        guid: NaanStartParams.guid
+        statics: [
+            list("", NaanStartParams.naanpath)
+        ]
+    })
+    if NaanStartParams.cmd_mod {
+        `(error) = App.nidecon.runCommand(NaanStartParams.cmd_mod, NaanStartParams.cmd_path, NaanStartParams.cmd_args)
+        saveState().wait()                                                  // wait so we don't exit too soon
+        if error {
+            if error.memo != ""
+                ErrorDebuglog("NaanIDE: command failed", error)
+            if error.exit
+                js.g.process.exit(error.exit)                               // fatal error
+        }
+    }
+    else if js.expr
+        saveState().wait()
+    else {
+        `(error, api, exists) = App.nidecon.startServer()
+        if exists {
+            `(error, oururl) = App.nidecon.connectServer()
+            if error {
+                ErrorDebuglog("NaanIDE: server at port ${NaanStartParams.serverPort} not responding", error)
+                js.g.process.exit(1)
+            }
+            debuglog("existing server access:", oururl)
+            return
+        } else if error {
+            ErrorDebuglog("NaanIDE: can't start server:", error)
+            js.g.process.exit(1)
+        }
+        debuglog("server access:", api.oururl)
+        Naan.runtimelib.curdriver().setOptions({prompt:true})
+        saveState()
+        `(error) = App.nidecon.launchBrowser()
+        if error
+            ErrorDebuglog("NaanIDE: can't launch browser:", error)
+    }
+}();