@naanlang/naan 1.4.4 → 1.6.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) {
@@ -226,7 +319,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         if (termops)
         {
             setTimeout(function () {
-                termops.messageout(data);
+                if (termops)
+                    termops.messageout(data);
             }, 1);
         }
         return (data);
@@ -242,7 +336,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         if (termops)
         {
             setTimeout(function () {
-                termops.debugout(data);
+                if (termops)
+                    termops.debugout(data);
             }, 1);
         }
         return (data);
@@ -277,6 +372,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 +390,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
                     debugListener(msg.data);                                // received a debugger message
             }, 1);
         }
+        else if (msg.id == "ioctl-event")
+            this.ioctl_event(msg.msg, msg.arg);
     };
     
     // textToRemoteTerm
@@ -301,7 +402,8 @@ exports.NaanNodeREPL = function NaanNodeREPL(options) {
         if (termops)
         {
             setTimeout(function () {
-                termops.textout(text);
+                if (termops)
+                    termops.textout(text);
             }, 1);
         }
     }
@@ -323,6 +425,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 +516,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 +533,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,7 +85,74 @@ 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
@@ -162,10 +230,13 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                 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)
@@ -197,6 +268,8 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                 if (targetReceiver)
                     targetReceiver(msg.data);
             }
+            else if (msg.id == "ioctl-event")
+                workSelf.ioctl_event(msg.msg, msg.arg);
         });
         
         naanlib.banner();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@naanlang/naan",
-    "version": "1.4.4",
+    "version": "1.6.0",
     "author": "Richard C. Zulch",
     "description": "Naan™ software platform",
     "main": "./lib/core/naanlib.js",

package/plugins/serviceAws/aws_cloudwatchlogs.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2025 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure CloudWatchLogs(local cwlogs) {
+    global(awsSDK)
     cwlogs = new(object, this)
 
     //

package/plugins/serviceAws/aws_dynamo.nlg

@@ -1040,6 +1040,7 @@ closure DynaTable(dyna, tablename, options, local table) {
         params = {
             TableName: tablename
         }
+        output = []
         if options.index
             params.IndexName = options.index
         if options.filter {

package/plugins/serviceAws/aws_s3.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure S3bucket(s3, name, bucketOptions, local bucket) {
+    global()
     bucket = new(object, this)
     bucket.name = name
 
@@ -83,8 +84,6 @@ closure S3bucket(s3, name, bucketOptions, local bucket) {
     //  }
     //
     bucket.put = closure put(key, data, options, local params, pending) {
-        if !contentType
-            contentType = "application/octet-stream"
         params = {
             Bucket: bucket.name
             Key: key
@@ -246,6 +245,7 @@ closure S3bucket(s3, name, bucketOptions, local bucket) {
  */
 
 closure S3(local s3) {
+    global(awsSDK)
     s3 = new(object, this)
 
     //

package/plugins/serviceAws/aws_sqs.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2023 by Richard C. Zulch
+ * Copyright (c) 2023-2025 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure SqsMQ(sqs, queueUrl, local sqsq) {
+    global()
     sqsq = new(object, this)
 
     //
@@ -55,6 +56,7 @@ closure SqsMQ(sqs, queueUrl, local sqsq) {
  */
 
 closure SQS(local sqs) {
+    global(awsSDK)
     sqs = new(object, this)
 
     //

package/plugins/serviceAws/aws_utils.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021 by Richard C. Zulch
+ * Copyright (c) 2021-2025 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure queryPager(apiobject, procname, params, xargs, doneCB, local pending, looping, result) {
+    global()
     if !apiobject[procname]
         return (list(Error("queryPager method undefined:", procname)))
     pending = new(nonce)
@@ -55,6 +56,7 @@ closure queryPager(apiobject, procname, params, xargs, doneCB, local pending, lo
  */
 
 function QueryPager args {
+    global()
     closure(local apiobject, procname, params, xargs, doneCB) {
         apiobject = pop(args)
         procname = pop(args)

package/plugins/serviceAws/dbt_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -22,6 +22,7 @@
  */
 
 closure dawsBucket(s3b, local bucket, s3) {
+    global(JSpath)
     bucket = new(object, this)
     s3 = s3b.s3
     bucket.name = s3b.bucketName
@@ -311,6 +312,7 @@ closure dawsBucket(s3b, local bucket, s3) {
  */
 
 closure dawsTable(database, path, tableOptions, local table) {
+    global(js, TextDecoder)
     table = new(object, this)
     table.type = database.type
     table.db = database
@@ -411,9 +413,10 @@ closure dawsTable(database, path, tableOptions, local table) {
 
     // add
     //
-    // Add a new record to the table with optional metadata. This will fail if the key already
-    // exists. The metadata is stored with the record and cannot be changed without calling update.
-    // Metadata keys cannot begin with underscore ("_").
+    // Add a new record to the table with options. This will fail if the key already exists. Optional
+    // metadata is stored with the record and cannot be changed without calling update. Metadata keys
+    // cannot begin with underscore ("_"). If optional cacheControl is not specified then the default
+    // tableOptions.cacheControl is used.
     //
     // The returned document, which can be used with update, has the following keys:
     //      key         - the key name of the record
@@ -421,26 +424,25 @@ closure dawsTable(database, path, tableOptions, local table) {
     //      md5         - the MD5 hash of the content
     //      <...>       - the various metadata keys
 
-    table.add = closure add(key, content, metadata, callback, local id, doc) {
+    table.add = closure add(key, content, options, callback, local id, doc) {
         if !callback
-            return (syncAdapter(add, key, content, metadata))
+            return (syncAdapter(add, key, content, options))
         id = makeID(key)
         if !string(id)
-            return (asyncResult(callback, id))                                 // error from makeID
-        if  metadata && !dictionary(metadata)
+            return (asyncResult(callback, id))                              // error from makeID
+        if  options.metadata && !dictionary(options.metadata)
             return (asyncResult(callback, Error("invalid arguments")))
-        if metadata
-            doc = new(metadata)                                             // start with metadata
+        if options.metadata
+            doc = new(options.metadata)                                     // start with metadata
         else
             doc = { }
         doc.key = key
         doc.id = id
         if content
             doc.content = content
-        metadata = metadata2s3(metadata)                                    // filter out any invalid metadata
         database.bucket.put(id, content, {
-            metadata: metadata
-            cacheControl: tableOptions.cacheControl
+            metadata: metadata2s3(options.metadata)                         // filter metadata for s3
+            cacheControl: options.cacheControl || tableOptions.cacheControl
         }, function(error, resp) {
             if error
                 error = Error("add failed", error, id, { status: error.status })
@@ -453,17 +455,17 @@ closure dawsTable(database, path, tableOptions, local table) {
 
     // update
     //
-    // Update a record in the table using the document previously returned by add or get.
+    // Update a record in the table using the document previously returned by add or get. Specify
+    // options to update those values, otherwise existing/default values are used.
 
-    table.update = closure update(doc, callback, local metadata) {
+    table.update = closure update(doc, options, callback) {
         if !callback
-            return (syncAdapter(update, doc))
+            return (syncAdapter(update, doc, options))
         if !doc._id || !doc._id.startsWith(table.s3prefix) || !doc._md5
             return (asyncResult(callback, Error("invalid argument")))
-        metadata = metadata2s3(doc)
         database.bucket.put(doc._id, doc.content, {
-            metadata: metadata
-            cacheControl: tableOptions.cacheControl
+            metadata: metadata2s3(options.metadata || doc)
+            cacheControl: options.cacheControl || tableOptions.cacheControl
         }, function(error, resp) {
             if error
                 error = Error("update failed", error, doc._id, { status: error.status })
@@ -519,7 +521,7 @@ closure dawsTable(database, path, tableOptions, local table) {
                     resp.content = readableStreamToArrayBuffer(resp.content)
                 else if jsTypedArray(resp.content)
                     resp.content = xnew(TextDecoder, "utf-8").decode(resp.content)
-                else if jsInstanceOf(resp.content, js.w.ReadableStream)
+                else if jsInstanceOf(resp.content, js.w.ReadableStream)     // for browsers only
                     resp.content = xnew(TextDecoder, "utf-8").decode(readableStreamToArrayBuffer(resp.content))
                 resp._id = id }
             callback(error, resp)

package/plugins/serviceAws/psm_aws.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure psmaConnector(psm, local connClassID, connector, watch) {
+    global(awsSDK)
     connClassID = "S3DB"
     require("./dbt_aws.nlg")
     connector = new(object, this)