@naanlang/naan 1.3.2 → 1.4.1

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.3.2+1";
+var CurrentCacheName = "Naanlang-1.4.1+1";
 
 
 //
@@ -92,18 +92,18 @@ var terminated;                                 // flag that this service worker
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.3.2+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.3.2+1") {
+        console.log("[1.4.1+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.4.1+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.3.2+1] update pending for", sourceId);
+                console.log("[1.4.1+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.3.2+1"
+                    version: "1.4.1+1"
                 });
-                console.log("[1.3.2+1] update sent for:", sourceId);
+                console.log("[1.4.1+1] update sent for:", sourceId);
             }
         }
         Reaper();                                                           // clean up obsolete info
@@ -134,10 +134,10 @@ var terminated;                                 // flag that this service worker
         msgport.onmessage = function(msg) {
             msg = msg.data;
             if (msg.id == "skipWaiting") {                                  // try to activate this SW now
-                console.log("[1.3.2+1] attempting skipWaiting");
+                console.log("[1.4.1+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.3.2+1] terminated");
+                console.log("[1.4.1+1] terminated");
                 terminate();
             } else if (msg.id == "abortURL") {                              // abort an I/O transaction
                 var href = new URL(msg.url).href;
@@ -150,7 +150,7 @@ var terminated;                                 // flag that this service worker
             } else if (msg.id == "response")                                // response from fetch request
                 processResponse(msg);
             else if (msg.id == "text")                                      // just log some text
-                console.log("[1.3.2+1] msg received:", msg.text);
+                console.log("[1.4.1+1] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -161,7 +161,7 @@ var terminated;                                 // flag that this service worker
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.3.2+1",
+                text: "port received by 1.4.1+1",
             });
             */
         if (--pending === 0)
@@ -178,7 +178,7 @@ var terminated;                                 // flag that this service worker
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.3.2+1] requesting new msgport for", client.id);
+            console.log("[1.4.1+1] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -224,12 +224,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.3.2+1] source gone:", sourceId);
+                console.log("[1.4.1+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.3.2+1] client gone:", clientId);
+                console.log("[1.4.1+1] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -263,16 +263,16 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.3.2+1] deleting old cache:', cacheName);
+                        console.log('[1.4.1+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.3.2+1] claiming clients');
+            console.log('[1.4.1+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.3.2+1] clients claimed');
+            console.log('[1.4.1+1] clients claimed');
             return (Promise.resolve(true));
         });
     return (promise);
@@ -315,7 +315,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.3.2+1",
+                version: "1.4.1+1",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -363,7 +363,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.3.2+1] install");
+    console.log("[1.4.1+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.3.2+1] activate");
+    console.log("[1.4.1+1] activate");
     self.clients.matchAll({                                                 // for debugging, list controlled clients           
         includeUncontrolled: true
     }).then(function(clientList) {
         var urls = clientList.map(function(client) {
             return (client.url);
         });
-        console.log('[1.3.2+1] matching clients:', urls.join(', '));
+        console.log('[1.4.1+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches().then(function() {
         for (var sourceId in upgradeMsgPorts) {
             upgradeMsgPorts[sourceId].postMessage({                         // notify new version available
                 id: "upgrade",
-                version: "1.3.2+1"
+                version: "1.4.1+1"
             });
         }
         upgradeMsgPorts = false;
@@ -421,7 +421,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(request.url);
             var nocache = request.method != "GET"
-                || url.search.length !== 0 && url.searchParams.get("naanver") !== "7ea12b22a1787cca6650606cb36818d6"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "348dfbc247edf982d7b9f50b51d55de4"
                 || request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -455,7 +455,7 @@ self.addEventListener('fetch', function(event) {
                             statusText: "Request Cancelled"
                         }));
                     }
-                    console.log("[1.3.2+1] fetch failed", request.url, e);
+                    console.log("[1.4.1+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"

package/frameworks/browser/terminals.nlg

@@ -15,7 +15,7 @@
  *
  */
 
-workers;
+gWorkers;
 
 
 /*
@@ -431,9 +431,9 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
 
 closure TermLocal(track, name, options, local target, nlregex, listener)
 {
-    global(js, window, workers)
-    if !dictionary(workers)
-        workers = {}
+    global(js, window, gWorkers)
+    if !dictionary(gWorkers)
+        gWorkers = {}
     options = merge({
         type: "Local"
     }, options)
@@ -456,14 +456,15 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
             // ### tell target we are closing (if needed)
         })
         listener = window
+        target.guid = 1
     } else {
         if not window.Worker
             return (list(Error("Local environment does not support workers")))
         target.worker = xnew(window.Worker, "env_webworker.js")
         listener = target.worker
         target.guid = UUID()
-        workers[target.guid] = target
     }
+    gWorkers[target.guid] = target
 
     // onmessage
     // A message was received from the worker.
@@ -551,6 +552,8 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
                     id: "start",
                     state: false                                            // resume state, if we have any
                     altcmd: options.startup.initcmds
+                    workerID: target.workerID
+                    workerGUID: target.guid
                 })
             target.started = true
         } else if msg.id == "targetsend" {
@@ -667,10 +670,21 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
 };
 
 
+/*
+ * WorkerConnect
+ *
+ *     Return the existing web worker for a workerGUID, or false if it does not exist.
+ *
+ */
+
+function WorkerConnect(workerGUID) {
+    gWorkers[workerGUID]
+};
+
+
 /*
  * termMainProxy
  *
- * column positioning:                          //                          //                      !
  *     Make a browser proxy representing the main thread. This runs inside the worker and allows it
  * to do remote execution with Main.
  *
@@ -736,7 +750,7 @@ closure WorkerToMain(local nideRunning, track) {
         error = Error("WorkerToMain only available in browser workers")
         return (list(error))
     }
-    nideRunning = require("frameworks/running/executors.nlg")
+    nideRunning = require("naanlib:frameworks/running/executors.nlg")
     track = nideRunning.ExecutorTracker()
     track.register(mainProxy, "proxy")
     track.spawn("proxy")                                                    // returns result tuple
@@ -769,7 +783,7 @@ closure findIDEtarget(track, name, workerID, naancont, local target) {
  */
 
 closure termIDE(track, name, workerID, naancont, title, local target, connected) {
-    global(workers)
+    global(js, gWorkers)
     target = findIDEtarget(track, name, workerID, naancont)
     if target {                                                             // new naancont on existing target
         target.updateController(naancont)
@@ -790,7 +804,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
     //
     function replyHook(data) {
         if data._guid
-            workers[data._guid].worker.postMessage({
+            gWorkers[data._guid].worker.postMessage({
                 id: "targetreceive"
                 data: data
             })
@@ -969,14 +983,15 @@ closure termInstallVirtualWatcher(track, naancont) {
  */
 
 function termInit(local manifest) {
-    manifest = `(TermHost, TermLocal, termMainProxy, WorkerToMain, findIDEtarget, termIDE,
-        termInstallVirtualWatcher, termInit)
+    manifest = `(TermHost, TermLocal, WorkerConnect, termMainProxy, WorkerToMain, findIDEtarget,
+        termIDE, termInstallVirtualWatcher, termInit)
 
     Naan.module.build(module.id, "terminals", function(modobj, compobj) {
         require("./browser.nlg")
         compobj.manifest = manifest
         modobj.exports.TermLocal = TermLocal
         modobj.exports.TermHost = TermHost
+        modobj.exports.WorkerConnect = WorkerConnect
         modobj.exports.WorkerToMain = WorkerToMain
     })
 } ();

package/frameworks/browser/ws_client.nlg

@@ -51,7 +51,7 @@ closure WebSocket(options, local wsock) {
     
         // onopen
         // The WebSocket connection is now open.
-        wsock.ws.onopen = closure onopen(e, local spawner) {
+        wsock.ws.onopen = closure onopen(e) {
             pending.signal(list(false, { ok: true }))
             options.onopen(e)
         }

package/frameworks/client/psm_client.nlg

@@ -430,7 +430,7 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
  */
 
 closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
-    global()
+    global(App)
     connClassID = "NodeFS"
     connector = new(object, this)
     connector.psm = psm
@@ -625,6 +625,8 @@ closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
     //
     // Connect to the specified service.
     connector.connect = function connect(resID, service, args, local error, creds, api, rootpath) {
+        if !resID || args && !tuple(args)
+            return (list(Error("invalid arguments")))
         `(error, creds) = connector.access(resID)
         if !error {
             if creds == "HostFS"

package/frameworks/client/relaycon.nlg

@@ -43,7 +43,7 @@ wsMod;;                                         // websocket module
 
 closure RelayCon(host, secret, options, local relay, nlregex)
 {
-    global(execsMod, wsMod)
+    global(App, execsMod, wsMod)
     relay = new(object, this)
     options = merge({
         name: "NaanIDE Server"
@@ -85,7 +85,7 @@ closure RelayCon(host, secret, options, local relay, nlregex)
         })
         result = relay.wscon.connect()
         if !result.0
-            sendControl("spawn", { name: "NaanIDE Server" })                // ensure worker is connected
+            sendControl("spawn", { name: options.name })                    // ensure worker is connected
         else if options.debug
             ErrorDebuglog("WebSocket connect failed:", result.0)
         result
@@ -301,6 +301,7 @@ function hocoInit(local manifest) {
     manifest = `(RelayCon, hocoInit)
 
     Naan.module.build(module.id, "relaycon", function(modobj, compobj) {
+        require("./client.nlg")
         execsMod = require("../running/executors.nlg")
         if js.w
             wsMod = require("../browser/ws_client.nlg")

package/frameworks/common/common.nlg

@@ -247,7 +247,9 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
     componentPath = eval(componentPath)
     if name(functionKeys)
         functionKeys = list(functionKeys)
-    for key in functionKeys
+    for key in functionKeys {
+        if modobj.exports[key]
+            continue                                                        // already defined
         closure (key, path, local exproc) {
             function loadComponent args {                                   // called when exported function first called
                 exproc = require(path)[key]
@@ -257,6 +259,7 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
             }
             modobj.exports[key] = loadComponent
         } (key, componentPath)
+    }
     true
 };
 
@@ -274,7 +277,7 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
  * LiveImport() function to a module's exports.
  *
  * To use LiveImport, call from the importing module as follows:
- *     require("frameworks/common/common.nlg").LiveImport(<fixproc>);
+ *     require("naanlib:frameworks/common/common.nlg").LiveImport(<fixproc>);
  * The optional <fixproc> is called after the imports in case the foreign module wants to fix up
  * anything after the import:
  *     fixproc(exporterMod);

package/frameworks/common/preferences.nlg

@@ -88,7 +88,7 @@ closure Preferences(nicc, dbname, local prefs, error, data) {
         folder = "plugins/"
         path = folder.concat("plugins.cfg")
         pending = new(nonce)
-        nicc.api.readFile(path, function(error, req, event, local config) {
+        nicc.api.readFile(path, function(error, req, event) {
             if error
                 ErrorDebuglog("Can't read ".concat(path), error)
             else

package/frameworks/node/apiserver.nlg

@@ -30,7 +30,7 @@
  */
 
 closure APIServer(options, local server, chroot) {
-    global(JSpath, js, bodyParser, express, psmServerMod, workerMod)
+    global(App, JSpath, js, bodyParser, express, psmServerMod, workerMod)
     apisLoadLibs()
     server = new(object, this)
     server.app = express()
@@ -116,7 +116,7 @@ closure APIServer(options, local server, chroot) {
             return (list(error))
         }
         server.hostfs = hostfs
-        workerMod.WorkerController(server)
+        server.workco = workerMod.WorkerController(server)
         list(false, port)
     }
 
@@ -550,7 +550,7 @@ closure WebSocketServer(server, local websocks) {
  */
 
 closure WesCon(server, websocks, socket, request, local wescon) {
-    global()
+    global(js)
     wescon = new(object, this)
     wescon.socket = socket
     wescon.info = {

package/frameworks/node/filesystem.nlg

@@ -1137,6 +1137,11 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         })
         spawn.on("close", function(code) {
             output.exitCode = code                                          // zero on success; null on killed
+            completed(false, output)
+        })
+        spawn.on("exit", function(code, signal) {
+            output.exitCode = code                                          // if exited
+            output.signalName = signal                                      // if terminated
         })
         spawn.stderr.on("error", function(err) {
             completed(Error("stderr stream failed:", err))
@@ -1155,8 +1160,6 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
                 call(options.errproc, output)
             if linerOut
                 linerErr = false                                            // let end-of-out do the completion
-            else
-                completed(false, output)
         })
         linerErr.on("readable", function (local line) {
             if options.errproc
@@ -1179,8 +1182,6 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
                 call(options.outproc)
             if linerErr
                 linerOut = false                                            // let end-of-err do the completion
-            else
-                completed(false, output)
         })
         linerOut.on("readable", function (local line) {
             if options.outproc

package/frameworks/node/psm_server.nlg

@@ -525,7 +525,7 @@ function MakeServerPSM(api, name, local importPSM, error, path, psm) {
     if !error {
         App.psm = psm
         psmsFsConnector(App.psm, api)
-        require("frameworks/storage/dbt_pouch.nlg").DbConnector(App.psm)    // Pouch databases as filesystems
+        require("naanlib:frameworks/storage/dbt_pouch.nlg").DbConnector(App.psm)    // Pouch databases as filesystems
     } else
         ErrorDebuglog("Cannot create PSM", error)
     App.psm

package/frameworks/node/shell.nlg

@@ -0,0 +1,134 @@
+/*
+ * shell.nlg
+ * Naanlib/frameworks/node
+ *
+ * Shell access and utilities for the host OS.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2024 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * ShellConnect
+ *
+ * Executing this installs itself in the current dialect to provide a REPL shell escape, returning a
+ * standard result tuple. This sends lines starting with ! to the shell with "bash -c". The result is
+ * output as text and also assigned to the $$ variable in the active namespace.
+ *
+ * Options:
+ * {
+ *      fs:     <filesystem>                    // optional: the filesystem object to use
+ *      cwd:    <string>                        // optional: Current Working Directory
+ *      derive: <string>                        // optional: dialect to derive from, or "" for no !
+ * }
+ *
+ */
+
+closure ShellConnect(options, local shob, error, fs, xparser, shelly) {
+    global(js, compress)
+    shob = new(object, this)
+
+    // readline
+    // read one line of text from the source
+    function readline(source, local cc, output) {
+        output = ""
+        while cc = source.readchar() {
+            output = output.concat(cc)
+            if cc == "\n"
+                break }
+        output
+    }
+
+    // exec
+    //
+    // Execute a shell command with optional current-working-directory.
+    //
+    shob.exec = closure exec(cmd, args, cwd, local pending, report, xlparams) {
+        pending = new(nonce)
+        report = {
+            stdout: []
+            stderr: []
+        }
+        xlparams = {
+            cmdargs: args
+            outproc: function(output, liner, kill, local line) {
+                while line = liner.read() {
+                    report.stdout.push(line)
+                    printline("\x1b[33m${line}\x1b[0m")                     // amber for stdout
+                }
+            }
+            errproc: function(output, liner, kill, local line) {
+                while line = liner.read() {
+                    report.stderr.push(line)
+                    printline("\x1b[36m${line}\x1b[0m")                     // cyan for stderr
+                }
+            }
+        }
+        if cwd
+            xlparams.execops = { cwd: cwd }
+        else if options.cwd
+            xlparams.execops = { cwd: options.cwd }
+        fs.execLines(cmd, xlparams, function(error, result) {
+        	evalactive(list(`assign, `(compress, "$$"), report))            // assign to $$ in active namespace
+            pending.signal(list(error, merge(result, report)))
+        })
+        pending.wait()
+    }
+
+    // shellparser
+    // intercept command-line parsing and look for a !shell escape
+    function shellparser(source, grammar, operators, local token) {
+        token = source.tokenread()
+        if token.atom == `! {
+            source.tokenlast(true)                                          // "consume" the ! token
+            text = readline(source)
+            source.tokenpush({                                              // don't show any output
+                atom: `;;
+                loc: tuple(0, text.length)
+            })
+            exec("bash", ["-c", text], js.d)                                // default directory: js.d
+	    }
+        else {
+            source.tokenpush(token)
+            xparser(source, grammar, operators)
+        }
+    }
+
+    if options.fs
+        fs = options.fs
+    else
+        `(error, fs) = Filesystem("")                                       // error not possible
+    if options.derive != "" {                                               // install hook
+        if string(options.derive)
+            shelly = Dialect.derive(options.derive)
+        else
+            shelly = Dialect
+        xparser = shelly.parser
+        shelly.parser = shellparser
+    }
+
+    // finis
+    shob
+};
+
+
+/*
+ * shInit
+ *
+ *     Initialize the node module.
+ *
+ *
+ */
+
+function shInit(local manifest) {
+    manifest = `(ShellConnect, shInit)
+
+    Naan.module.build(module.id, "shell", function(modobj, compobj) {
+        require("./filesystem.nlg")
+        compobj.manifest = manifest
+        modobj.exports.ShellConnect = ShellConnect
+    })
+} ();