@naanlang/naan 1.6.0 → 1.7.1

package/frameworks/running/remote_req.nlg

@@ -24,22 +24,19 @@
  *
  */
 
-function RemoteRequester(destID, options, local track)
+closure RemoteRequester(destID, options, local track)
 {
     global(App)
-    options = merge({
-        name: "Remote Eval"
-        type: "RemoteRequester"
-    }, options)
 
     // remoteReq
     //
     // Executes on our worker thread to return an execution instance that can be used to create a
     // proxy for remote evaluation.
     //
-    closure remoteReq(track, name, options, local target) {
+    closure remoteReq(track, name, local target) {
         target = ExecutorBase(false, "proxy", options.name)
-        target.instanceID = UUID()
+        target.instanceID = App.imp.getUUID("RemoteRequester(${options.name}) instanceID")
+
     
         target.sender = App.imp.register(target, {
             name: options.name
@@ -94,8 +91,8 @@ function RemoteRequester(destID, options, local track)
     }
 
     options = merge({
-        name: "RemoteRequester"
-        proxy: "proxy"
+        name: "Remote Eval"
+        type: "Remote Requester"
     }, options)
     track = ExecutorTracker()
     track.register(options.type, remoteReq)

package/frameworks/running/remote_res.nlg

@@ -32,8 +32,8 @@ closure RemoteResponder(destID, options, local remo, name)
         type: "Remote Responder"
     }, options)
     remo = ExecutorBase(App.nide.track, "remote-responder", name)
-    remo.dispatcher = TaskDispatcher()
-    remo.instanceID = destID || UUID()
+    remo.dispatcher = TaskDispatcher(false, false, "RemoteResponder")
+    remo.instanceID = destID || App.imp.getUUID("RemoteResponder(${options.name}) instanceID")
     remo.sender = App.imp.register(remo, {
         name: options.name
         type: options.type

package/frameworks/running/sourcecode.nlg

@@ -25,7 +25,6 @@
 closure CodeManager(options,  local coman, cache)
 {
     coman = modlist().CLI.exports.Utils(options)
-    coman.independent = new(nonce)                                          // caches are ephemeral
 
     // composite
     //
@@ -70,6 +69,8 @@ closure CodeManager(options,  local coman, cache)
         else
             modname = "<".concat(sym.namespace.tostring, ">")               // create independent module
         compname = "<".concat(sym, ">")                                     // create independent component
+        if !coman.independent
+            coman.independent = new(nonce)                                  // ephemeral cache
         coman.independent[modname.concat(":-:", compname)] = CodeComposite(coman, sym, modname, compname)
     }
     
@@ -114,7 +115,7 @@ closure CodeManager(options,  local coman, cache)
     coman.cacheAdd = function cacheAdd(cocode, manifest, local item, mandefs) {
         for item in manifest
             push(item.proc, mandefs)
-        cacne = new(nonce)
+        cache = new(nonce)
         cache.modname = cocode.modname
         cache.compname = cocode.compname
         cache.mandefs = mandefs

package/frameworks/running/taskexec.nlg

@@ -13,18 +13,18 @@
 /*
  * TaskDispatcher
  *
- *     Create a dispatcher for remote evaluation. The replier argument is a function that accepts
- * outgoing messages. The return value is a closure that processes incomming messages. This code is
- * a peer to ExecutorContext in executors.nlg.
+ * Create a dispatcher for remote evaluation. The return value is a closure that processes incoming
+ * messages. All arguments optional. This code is a peer to ExecutorContext in executors.nlg.
  *
  */
 
-closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
+closure TaskDispatcher(replier, coder, name, local contexts, gohome, util) {
     global()
     contexts = { }
     gohome = makeActivator()
     util = modlist().Util.exports
-    
+    name = name || ""
+
     // ContextCoder
     //
     // A context-specific coder allowing remote-initiated communication.
@@ -49,7 +49,7 @@ closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
                     contextID: contextID
                 }, contexts[contextID].coder)
                 if error {
-                    ErrorDebuglog("TaskDispatcher.ContextCoder failed:", error)
+                    ErrorDebuglog("Remoter(${name}).ContextCoder failed:", error)
                     exec = false
                     return (list(error))
                 }
@@ -74,7 +74,7 @@ closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
             xmsg: "error"
             xid: data.xid
             _guid: data._guid || undefined
-            error: "unknown operation"
+            error: "Remoter(${name}): unknown operation"
         }
         try {
             restorens = makeActivator()
@@ -108,9 +108,9 @@ closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
                 //
                 context = contexts[data.contextID]
                 if !context
-                    reply.error = "unknown context"
+                    reply.error = "Remoter(${name}): unknown context"
                 else if !context.namespace
-                    reply.error = "namespace missing"
+                    reply.error = "Remoter(${name}): namespace missing"
                 else {
                     context.activator()
                     reply.xmsg = "evaluated"
@@ -152,9 +152,9 @@ closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
                 //
                 context = contexts[data.contextID]
                 if !context
-                    reply.error = "unknown context"
+                    reply.error = "Remoter(${name}): unknown context"
                 else if !context.namespace
-                    reply.error = "namespace missing"
+                    reply.error = "Remoter(${name}): namespace missing"
                 else {
                     context.activator()
                     reply.xmsg = "executed"
@@ -183,7 +183,7 @@ closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
                     result = exception.toarray.map(function(x){tostring(x)}).join(" - ")
                 else
                     result = tostring(exception)
-                reply.error = "exception: ".concat(result)
+                reply.error = "Remoter(${name}) exception: ${result}"
             }
         } finally {
             restorens()
@@ -193,46 +193,6 @@ closure TaskDispatcher(replier, coder, local contexts, gohome, util) {
 };
 
 
-/*
- * TaskExecutor
- *
- *     Install an executor for remote evaluation in worker threads. This uses the OnMessage protocol
- * available in the env_xxx.js Naan controllers. The return value is false if OnMessage is not there
- * or true on success.
- *
- */
-
-closure TaskExecutor() {
-
-    // taskInstall
-    // Install the TaskDispatcher, and reload on state load.
-    //
-    function taskInstall() {
-        if !js.t.OnMessage
-            return (false)                                                  // false if not a worker
-        js.t.OnMessage(TaskDispatcher(js.t.ReplyMessage))
-    }()
-    LoadNotify(taskInstall)
-
-    // finis
-
-    true
-};
-
-
-/*
- * TaskOnMessageHook
- *
- *     OK, this is a kludge, but you call this function to specify a handler proc when a message
- * comes in that we don't understand.
- *
- */
-
-function TaskOnMessageHook(hook) {
-    onMessageHook = hook
-};
-
-
 /*
  * taxInit
  *
@@ -241,14 +201,11 @@ function TaskOnMessageHook(hook) {
  */
 
 function taxInit(local manifest) {
-
-    manifest = `(TaskDispatcher, TaskExecutor, TaskOnMessageHook, taxInit)
+    manifest = `(TaskDispatcher, TaskOnMessageHook, taxInit)
 
     Naan.module.build(module.id, "taskexec", function(modobj, compobj) {
-        require("./running.nlg").LiveImport()
+        require("./running.nlg")
         compobj.manifest = manifest
         modobj.exports.TaskDispatcher = TaskDispatcher
-        modobj.exports.TaskExecutor = TaskExecutor
-        modobj.exports.TaskOnMessageHook = TaskOnMessageHook
     })
 } ();

package/frameworks/service/imp.nlg

@@ -35,8 +35,11 @@ closure Imp(us, local imp) {
         name: "imp-generic"
         type: "imp-type"
     }, us)
+    imp.verbose = false
     if !us.instanceID
-        us.instanceID = UUID()
+        us.instanceID = getUUID("Imp(${imp.us.name}) instanceID")
+    else if imp.verbose >= 1
+        debuglog("useUUID ${us.instanceID} for: Imp(${imp.us.name}) instanceID")
     imp.direct = { }                                                        // direct-connected destinations
     imp.pipes = { }                                                         // piped connections to destinations
     imp.gateways = { }                                                      // routing gateways for next hop
@@ -395,17 +398,21 @@ closure Imp(us, local imp) {
         function open() {
             dest.handshake.reset()
             dest.state = `connected
-            future(function() {
-                wait()
+            future(function(local error, newdid) {
+                `(error, newdid) = wait()
+                if error
+                    return                                                  // didn't succeed (yet)
                 info.destID = destID
                 info.defaultID = dest.defaultID || undefined
                 info.name = dest.name
                 info.type = dest.type
                 info.meta = dest.meta
+                dest.conn.dispatchEvent("active", info)
                 imp.dispatchEvent("active", info)
             }, 0)
             if initiator
                 send_hello(destID)                                          // start the handshake
+            dest.conn.dispatchEvent("opening", info)
             imp.dispatchEvent("opening", info)
         }
 
@@ -415,6 +422,7 @@ closure Imp(us, local imp) {
             dest.state = `closed
             if !initiator
                 dest.destID = undefined                                     // ### reset for non-persistent clients
+            dest.conn.dispatchEvent("closed", info)
             imp.dispatchEvent("closed", info)
         }
 
@@ -423,6 +431,7 @@ closure Imp(us, local imp) {
             if dest.state != `closed
                 close()
             imp.pipes[destID] = undefined
+            dest.conn.dispatchEvent("destroyed", info)
             imp.dispatchEvent("destroyed", info)
         }
 
@@ -449,7 +458,7 @@ closure Imp(us, local imp) {
             dest.info.services = [ service ]
         destID = info.destID
         if !destID {
-            destID = UUID()                                                 // temporary destID to be updated
+            destID = getUUID("imp temporary for requester")                 // temporary destID to be updated
             dest.idsymbol = quote(destID)
         }
         imp.pipes[destID] = dest
@@ -459,6 +468,18 @@ closure Imp(us, local imp) {
         dest.conn
     }
 
+    // getUUID
+    //
+    // Get a UUID for the specified purpose, which is just a comment. This makes it easy to log
+    // UUID assignments for debugging.
+    //
+    imp.getUUID = function getUUID(purpose, local uuid) {
+        uuid = UUID()
+        if imp.verbose >= 1
+            debuglog("getUUID ${uuid} for: ${purpose}")
+        uuid
+    }
+
     // requester
     //
     // Start a requester connection and initiate the handshake. The IMP will use the specified
@@ -522,7 +543,7 @@ closure Imp(us, local imp) {
             debuglog("Imp.register: info.meta must be a dictionary if specified")
         instanceID = info.instanceID
         if !string(instanceID) || imp.direct[instanceID] {
-            instanceID = UUID()
+            instanceID = getUUID("imp.register(${info.name}) auto-assignment")
             debuglog("Imp.register: instanceID ${info.instanceID} invalid or in use - replaced with ${instanceID}")
         }
         imp.direct[info.instanceID] = {
@@ -651,12 +672,23 @@ closure ImpConn(dispatcher, sender, wait, open, close, destroy,
     global()
     impco = new(object, this)
 
+    // reopen
+    //
+    // Reopen the connection with a delay to let events process.
+    //
+    impco.reopen = closure reopen() {
+        close()
+        sleep(10)
+        open()
+    }
+
     impco.dispatch = dispatcher.proc
     impco.send = sender.proc
     impco.wait = wait.proc
     impco.open = open.proc
     impco.close = close.proc
     impco.destroy = destroy.proc
+    Events(impco)
 
     // finis
 

package/frameworks/service/nubnode.nlg

@@ -29,14 +29,14 @@ closure NodeWorkerNub(imp, options, local nownub) {
         type: "node-worker-nub"
     }, options)
     nownub = new(object, this)
-    nownub.instanceID = imp.us.instanceID || UUID()
-    nownub.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher()
+    nownub.instanceID = imp.us.instanceID || imp.getUUID("NodeWorkerNub(${options.name}) instanceID")
+    nownub.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher(false, false, "NodeWorkerNub")
 
     // impReceive
     //
     // Receive a remote request and reply to it.
     //
-    nownub.impReceive = function impReceive(message, sourceID) {
+    nownub.impReceive = closure impReceive(message, sourceID) {
         if message.id == "targetin"
             nownub.dispatcher(message.data, function(reply) {
                 nownub.sender(sourceID, {
@@ -45,7 +45,7 @@ closure NodeWorkerNub(imp, options, local nownub) {
                 })
             })
     }
-            
+
     // impUnknown
     //
     // Received an unknown destination notice from the other side.
@@ -55,12 +55,43 @@ closure NodeWorkerNub(imp, options, local nownub) {
             debuglog("NodeWorkerNub.impUnknownID:", unknownID, "sourceID:", sourceID)
     }
 
+    // mainContext
+    //
+    // Convenience method to get the main thread and its remote context.
+    //
+    nownub.mainContext = function mainContext(local error, mtx, ctx) {
+        if !(mtx = nownub.mtx) {
+            `(error, mtx) = require("../running/remote_req.nlg").MainThread()
+            if error
+                return (list(error))
+            nownub.mtx = mtx
+        }
+        `(error, ctx) = mtx.context()
+        if error
+            list(error)
+        else
+            list(false, ctx, mtx)
+    }
+
+    // execProxy
+    //
+    // Get a proxy object for our executor on the main thread.
+    //
+    nownub.execProxy = closure execProxy(error, ctx, execID, exec) {
+        `(error, ctx) = mainContext()
+        if !error
+            `(error, execID) = ctx.eval(subatq(App.imp.pipes.destID.info.ourID, [list(`destID, nownub.instanceID)]))
+        if !error
+            `(error, exec) = ctx.eval(subatq(App.imp.direct.execID.obj, [list(`execID, execID)]))
+        list(error, exec)
+    }
+
     // message event
     //
-    // Incoming data.
+    // Incoming data to the worker.
     //
     js.t.msgPort.on("message", function(msg) {
-        if msg.id == "naan-imp-node"
+        if msg.id == "naan-imp-in"
             nownub.impconn.dispatch(new(msg.data))
     })
 
@@ -75,14 +106,14 @@ closure NodeWorkerNub(imp, options, local nownub) {
     })
     nownub.impconn = imp.requester(function(data) {
         js.t.msgPort.postMessage({                                          // send to main
-            id: "naan-imp-node",
+            id: "naan-imp-out"
             data: data
         })
         list(false, { sent: true })
     })
 
     // finis
-    
+
     App.workerNub = nownub
 };
 

package/frameworks/service/nubweb.nlg

@@ -29,14 +29,14 @@ closure WebWorkerNub(imp, options, local wonub) {
         type: "web-worker-nub"
     }, options)
     wonub = new(object, this)
-    wonub.instanceID = imp.us.instanceID || UUID()
-    wonub.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher()
+    wonub.instanceID = imp.us.instanceID || imp.getUUID("WebWorkerNub(${options.name}) instanceID")
+    wonub.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher(false, false, "WebWorkerNub")
 
     // impReceive
     //
     // Receive a remote request and reply to it.
     //
-    wonub.impReceive = function impReceive(message, sourceID) {
+    wonub.impReceive = closure impReceive(message, sourceID) {
         if message.id == "targetin"
             wonub.dispatcher(message.data, function(reply) {
                 wonub.sender(sourceID, {
@@ -45,7 +45,7 @@ closure WebWorkerNub(imp, options, local wonub) {
                 })
             })
     }
-            
+
     // impUnknown
     //
     // Received an unknown destination notice from the other side.
@@ -55,14 +55,32 @@ closure WebWorkerNub(imp, options, local wonub) {
             debuglog("WebWorkerNub.impUnknownID:", unknownID, "sourceID:", sourceID)
     }
 
+    // mainContext
+    //
+    // Convenience method to get the main thread and its remote context.
+    //
+    wonub.mainContext = function mainContext(local error, mtx, ctx) {
+        if !(mtx = wonub.mtx) {
+            `(error, mtx) = require("../running/remote_req.nlg").MainThread()
+            if error
+                return (list(error))
+            wonub.mtx = mtx
+        }
+        `(error, ctx) = mtx.context()
+        if error
+            list(error)
+        else
+            list(false, ctx, mtx)
+    }
+
     // message event
     //
-    // Incoming data.
+    // Incoming data to the worker.
     //
     js.w.addEventListener("message", function message(e, local msg) {
-        msg = new(e.data)
-        if msg.scope == "naan-imp-web"
-            wonub.impconn.dispatch(msg.data)
+        msg = e.data
+        if msg.scope == "naan-imp-in"
+            wonub.impconn.dispatch(new(msg.data))
     })
 
     // register our connects *after* the receivers are configured above
@@ -76,14 +94,14 @@ closure WebWorkerNub(imp, options, local wonub) {
     })
     wonub.impconn = imp.requester(function(data) {
         js.w.postMessage({                                                  // send to main
-            scope: "naan-imp-web",
+            scope: "naan-imp-out"
             data: data
         })
         list(false, { sent: true })
     })
 
     // finis
-    
+
     App.workerNub = wonub
 };
 

package/frameworks/storage/file_manager.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2026 by Richard C. Zulch
  *
  */
 
@@ -31,6 +31,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
     watch = commonWatching.Watchable()
     files.watch = watch.watch                                               // watch for file changes
     files.unWatch = watch.unwatch                                           // stop watching for file changes
+    hadgit = { }
 
     // compareNodes
     //
@@ -460,7 +461,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
                 unknownFiles = []
                 unknownFileStatus = {}
                 delgit = hadgit
-                hadgit = {}
+                hadgit = { }
                 willgit = false
                 for item in statlist {
                     hadgit[item.path] = 1

package/lib/browser/env_web.js

@@ -171,7 +171,7 @@ exports.NaanControllerWeb = function() {
         if (repdex < 0)
             termlist.push(terminal);
         takePending();                                                      // output all pending terminal messages
-        this.ioctl_event("term-attach", "");
+        this.ioctl_event("term-attach", terminal.guid);
     };
 
     //
@@ -186,7 +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", "");
+        this.ioctl_event("term-detach", terminal.guid);
     };
 
     //
@@ -220,24 +220,6 @@ exports.NaanControllerWeb = function() {
         }, 1);
     };
 
-    var replyHook;
-    this.OnReplyHook = function OnReplyHook(proc) {
-        replyHook = proc;
-        return (proc);
-    };
-
-    this.ReplyMessage = function ReplyMessage(data) {                       // "remote" -> "local"
-        if (replyHook)
-            setTimeout(function() {
-                replyHook(data);
-            }, 1);
-        termlist.forEach(function(term) {
-            if (term.OnMessageOut)
-                term.OnMessageOut(data);
-        });
-        return (data);
-    };
-
     var nideListener;
     this.OnMessage = function OnMessage(proc) {
         nideListener = proc;
@@ -425,6 +407,7 @@ exports.NaanControllerWeb = function() {
             }
             else if (msg.id == "targetin")
             {
+                console.log("env_web targetin");
                 if (nideListener)
                     nideListener(msg.data);                                 // target received a message
             }
@@ -446,17 +429,6 @@ exports.NaanControllerWeb = function() {
             return (msg);
         };
 
-        //
-        // report messages back to opener
-        //
-        termSelf.OnMessageOut = function OnMessageOut(data) {
-            var msg = {                                                     // target is sending debug data
-                id: "targetout",
-                data: data
-            };
-            return (termSelf.OnMessage(msg));
-        };
-
         //
         // report debug messages back to opener
         //
@@ -652,7 +624,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.6.0+1";
+        statedoc.verstring = "1.7.1+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -670,7 +642,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.6.0+1"
+            || statedoc.verstring != "1.7.1+1"
             || !(naanstate = statedoc.naan))
         {
             localStorage.removeItem("NaanState_Hosted");
@@ -733,7 +705,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.6.0+1"
+                    title: vsiteName + " 1.7.1+1"
                 });
             }
         } catch (e) {
@@ -747,9 +719,8 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.6.0+1"
+                    title: vsiteName + " 1.7.1+1"
                 });
-                termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
         } catch (e) {
         }
@@ -763,7 +734,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteVisibilityChange",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.6.0+1",
+                    title: vsiteName + " 1.7.1+1",
                     hidden: window.document.visibilityState == "hidden",
                     window: window
                 });
@@ -778,8 +749,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = window.location.origin.concat(naanlib.js.r("path").dirname(window.location.pathname));
         naanlib.start({
-            cmd: 'App.version = "1.6.0+1";;\r\n'
-                + 'App.cache = "b39f039cddbcaf1570ae6008ea3bbeb6";;\r\n'
+            cmd: 'App.version = "1.7.1+1";;\r\n'
+                + 'App.cache = "b173565c63a43f623fb769868912eb9d";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });