@naanlang/naan 1.6.0 → 1.7.0

package/lib/env_node.js

@@ -304,27 +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 () {
-                if (termops)
-                    termops.messageout(data);
-            }, 1);
-        }
-        return (data);
-    };
     
     var nodeListener;
     this.OnMessage = function OnMessage(proc) {
@@ -390,8 +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")
-            this.ioctl_event(msg.msg, msg.arg);
+            servSelf.ioctl_event(msg.msg, msg.arg);
     };
     
     // textToRemoteTerm

package/lib/env_nodeworker.js

@@ -157,7 +157,7 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
         //==========================================================================
         // NodeJS Worker Terminal Interface
         //--------------------------------------------------------------------------
-    
+
         naanlib.onText(function(text, level) {
             if (level)
                 msgPort.postMessage({
@@ -171,7 +171,7 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
                     text: text
                 });
         });
-    
+
         setInterval(function() {
             var samples = naanlib.status(1);
             if (samples.length > 0)
@@ -182,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
@@ -218,13 +190,13 @@ 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
@@ -235,7 +207,6 @@ exports.NaanWorkerActivate = function NaanWorkerActivate(cbReady) {
             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
@@ -253,21 +224,15 @@ 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);
         });

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)
+    }
+}();

package/lib/node_worker.js

@@ -0,0 +1,36 @@
+/*
+ * node_worker.js
+ * naanide
+ *
+ *     Start a Naanide worker.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2017-2026 by Richard C. Zulch
+ *
+ */
+
+"use strict";
+
+
+/*
+ * Begin
+ *
+ */
+
+var workerData = require('node:worker_threads').workerData || { };          // passed from creator
+var jspath = require("path");
+var naanpath = jspath.resolve(require.resolve('@naanlang/naan'), '../../../');
+var envpath = jspath.resolve(naanpath, 'lib/env_nodeworker.js');
+var naanenv = require(envpath);
+
+naanenv.NaanWorkerActivate(function(naanworker) {
+    naanworker.setRequire(require);                                         // require relative to this file
+    naanworker.setImport(function(m) { return (import(m)); });              // import relative to this file
+    
+    naanworker.textCommand(""
+        + `App.naanpath = '${ naanpath.replace(/\\/g, "\\\\") }';;`         // path/to/our naan library
+        + "App.rootpath = js.d;;"                                           // path/to/our package.json
+        + "Naan.module.defineLoc('naanlib', App.naanpath);;"                // defines "naanlib:" prefix for require
+        + "Naan.module.nodeparse('lib/node_worker_init.nlg');;\n");         // Naan initialization
+});

package/lib/node_worker_init.nlg

@@ -0,0 +1,43 @@
+/*
+ * nide_worker_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);
+chns("Start");
+
+
+/*
+ * Debugging & Tools
+ *
+ */
+
+function init(local metadata) {
+    sprint()                                                                // no interruptions
+    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
+    })
+    metadata = new(js.t.metadata())
+    App.mainInstanceID = metadata.mainInstanceID
+    App.imp = require("naanlib:frameworks/service/imp.nlg").Imp({
+        name: metadata.name
+        type: "node-worker"
+    })
+    require("naanlib:frameworks/service/nubnode.nlg").NodeWorkerNub(App.imp, {
+        name: App.imp.us.name
+    })
+    if metadata.maintext
+        textparse(metadata.maintext)
+}();

package/package.json

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

package/plugins/openSearch/openSearch.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2023 by Richard C. Zulch
+ * Copyright (c) 2023-2026 by Richard C. Zulch
  *
  */
 
@@ -53,6 +53,7 @@ closure openSearchIndex(prosc, indexName, ioptions, local osin) {
     osin = new(object, this)
     if symbol(indexName)
         indexName = indexName.tostring()
+    osin.name = indexName
     osin.analyzers = {                                                      // map names, language to analyzer
         english: "english"
         hashtag: "hashtag"
@@ -335,7 +336,7 @@ closure openSearchIndex(prosc, indexName, ioptions, local osin) {
                 `(error, data) = prosc.request(indexName.concat("/_bulk"), {
                     method: "POST"
                     putdata: docs
-                    contentType: "application/json"
+                    contentType: "application/x-ndjson"
                 })
             if data
                 data = data.items.map(function(item) {

package/plugins/openSearch/os_dynamo.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2023-2025 by Richard C. Zulch
+ * Copyright (c) 2023-2026 by Richard C. Zulch
  *
  */
 
@@ -41,6 +41,7 @@
 
 closure OSDynIndexer(index, table, options,
     local dbOptions, scanPending, indexPending, updatePending, output, error, records, data, ids) {
+    global()
     if !options.converter
         return (Error("OSDynIndexer: options.converter is required"))
     dbOptions = {
@@ -78,7 +79,7 @@ closure OSDynIndexer(index, table, options,
     //
     // Batch index documents into OpenSearch, returning a nonce signaled with ids array.
     //
-    closure batchIndex(records, local pending) {
+    closure batchIndex(records, local pending, docs) {
         pending = new(nonce)
         docs = asyncArray(records, 10, closure(record) {
             options.converter(record)

package/plugins/serviceAws/aws_cloudwatchlogs.nlg

@@ -18,7 +18,7 @@
  *
  */
 
-closure CloudWatchLogs(local cwlogs) {
+closure CloudWatchLogs(local cwlogs, delayf, backoffMS) {
     global(awsSDK)
     cwlogs = new(object, this)
 
@@ -35,7 +35,42 @@ closure CloudWatchLogs(local cwlogs) {
         })
         list(false, { ok: true })
     }
+
+    // retrier
+    //
+    //     Perform exponential backoff when throttled, returning true for retry or false otherwise.
+    //
+    function retrier(error, local waitms, newbo) {
+        if !error
+            delayf = false
+        else if error.name == "ThrottlingException" {                       // retriable errors
+            if backoffMS > milliseconds() {
+                debuglog("DynaTable.retrier: existing backoff", backoffMS - milliseconds(), "msec")
+                return (true)                                               // use existing backoff
+            }
+            if !delayf
+                delayf = ExbackFactory(6,60)                                // 6s max backoff, 60s deadline
+            waitms = delayf()
+            debuglog("DynaTable.retrier: new backoff:", waitms, "msec")
+            if waitms {                                                     // returns false for no retry
+                newbo = milliseconds() + waitms                             // tick when proceeding is allowed
+                if !(backoffMS > newbo)
+                    backoffMS = newbo
+                true
+            }
+        }
+    }
     
+    // delayer
+    //
+    //     Delay until the current backoff is complete.
+    //
+    function delayer(local waitms) {
+        waitms = backoffMS - milliseconds()
+        if waitms > 0
+            sleep(waitms + waitms * Math.random()/2)
+    }
+
     //
     // cwlQueryPager
     //
@@ -46,7 +81,14 @@ closure CloudWatchLogs(local cwlogs) {
         if !remaining
             remaining = 10                                              // default retrieve limit
         params.limit = remaining
-        QueryPager(cwlogs.aws, procname, params, function(data, local processed) {
+        delayer()
+        QueryPager(cwlogs.aws, procname, params, function(error, data, local processed) {
+            if error {
+                if !retrier(error)
+                    return (false)
+                delayer()
+                return (true)
+            }
             processed = doneCB(data)
             if processed
                 remaining -= processed