@naanlang/naan 1.7.0 → 1.7.2

package/frameworks/running/executors.nlg

@@ -23,13 +23,21 @@ closure ExecutorBase(track, type, name, local exec) {
     exec.type = type
     exec.name = name
     exec.contexts = { }
-    
+
     // execReset
     //
     // Initialize remote communications for a new or restarted instance.
     //
-    exec.execReset = function execReset() {
+    exec.execReset = function execReset(error, local xid, pending) {
+        if !error
+            error = Error("execReset")
+        for `(xid, pending) in exec.pending {
+            pending.signal(list(error))
+            exec.pending[xid] = undefined
+        }
         exec.pending = { }
+        exec.inst_ready = false
+        exec.inst_error = undefined
         exec.nextSendID = toint(RandomBytes(3))                             // keep our sequence code unique for shared servers
     }
     execReset()
@@ -52,7 +60,7 @@ closure ExecutorBase(track, type, name, local exec) {
             pending.signal(Error("execSend failed", error))
         pending
     }
-    
+
     // execReceived
     //
     // The specified message was received from the instance, so signal it.
@@ -81,7 +89,7 @@ closure ExecutorBase(track, type, name, local exec) {
         exec.pending[data.xid] = undefined
         pending.signal(list(false, data))
     }
-    
+
     // execSetStatus
     //
     // Received a status update from the instance. This makes a copy of the specified dictionary for
@@ -93,7 +101,7 @@ closure ExecutorBase(track, type, name, local exec) {
     exec.execSetStatus = function execSetStatus(status) {
         exec.xstatus = new(status)                                          // for GC (!)
     }
-    
+
     // execFailed
     //
     // Communication has failed.
@@ -103,19 +111,15 @@ closure ExecutorBase(track, type, name, local exec) {
         for `(xid, pending) in exec.pending
             pending.signal(list(error))
     }
-    
+
     // execClosed
     //
-    //
     // Note that the connection has closed, so signal all the waiters.
     //
-    exec.execClosed = closure execClosed(error, local xid, pending) {
-        for `(xid, pending) in exec.pending {
-            pending.signal(list(error))
-            exec.pending[xid] = undefined
-        }
+    exec.execClosed = closure execClosed(error) {
+        execReset(error)
     }
-        
+
     // context
     //
     // Return a context object for the instance, or an error, in a result tuple. The optional state
@@ -157,7 +161,7 @@ closure ExecutorBase(track, type, name, local exec) {
     exec.attention = function attention() {
         track.attention(exec)
     }
-    
+
     // finis
     exec
 };
@@ -220,6 +224,8 @@ closure ExecutorContext(exec, state, coder, local context, util) {
     // an optional tuple of symbols to retrieve after evaluation.
     //
     context.eval = closure evalf(expr, put, get, local roots, pkg, data, pending, result) {
+        if !exec.inst_ready
+            return (list(Error("execution context closed")))
         if tuple(put)
             roots = cons(`expr, put)
         else
@@ -288,6 +294,8 @@ closure ExecutorContext(exec, state, coder, local context, util) {
     // The procedure must be specified as a symbol or string.
     //
     context.rpc = closure rpc(proc, args, local data, pending, result) {
+        if !exec.inst_ready
+            return (list(Error("execution context closed")))
         data = {
             contextID: state.contextID
             proc: proc
@@ -611,7 +619,7 @@ closure ExecutorTracker(local xtrak) {
     }
 
     // add
-    // Add an execution instance at the specified location.
+    // Add an execution instance.
 
     xtrak.add = closure add(executor, local instance) {
         instance = new(nonce)

package/frameworks/running/instances.nlg

@@ -41,6 +41,7 @@
 closure InTop(track, options, local intop, nlregex, str, error) {
     global(App)
     intop = ExecutorBase(track, options.type, options.name)
+    intop.verbose = false
     intop.workerID = options.workerID || undefined
     intop.msgQueue = []
     nlregex = RegExp("\\n", "g")
@@ -101,7 +102,7 @@ closure InTop(track, options, local intop, nlregex, str, error) {
     // Received an unknown destination notice from the other side.
     //
     intop.impUnknown = function impUnknown(unknownID, sourceID, gateway) {
-        if !gateway
+        if !gateway && intop.verbose
             debuglog("InTop.impUnknownID:", unknownID, "sourceID:", sourceID)
     }
 
@@ -263,8 +264,12 @@ closure InTop(track, options, local intop, nlregex, str, error) {
     //     A terminal was attached.
     //
     intop.termAttach = function termAttach(repl, db, notify, local msg) {
+        if !repl {
+            debuglog("termAttach false repl")
+            return (false)
+        }
         if !intop.msgQueue
-            return (list(Error("already attached")))
+            return (intop)                                                  // already attached
         intop.sender(intop.botDestID, {
             id: "attached",
             guid: intop.instanceID
@@ -294,7 +299,7 @@ closure InTop(track, options, local intop, nlregex, str, error) {
     //
     intop.termDetach = function termDetach() {
         if intop.msgQueue
-            return (list(Error("already detached")))
+            return                                                          // already detached
         intop.term.SetNotify()
         intop.msgQueue = []
         intop.debugger.detach(intop)
@@ -310,20 +315,17 @@ closure InTop(track, options, local intop, nlregex, str, error) {
 
     // close
     //
-    //     Close our access to the worker.
+    //     Close our access to the worker, but it can be reopened.
     //
     intop.close = function close() {
-        if !intop.instanceID
+        if !intop.botDestID
             return
         intop.sender(intop.botDestID, {
             id: "unsubscribe"
         })
-        intop.execClosed(Error("instance closed"))
-        track.delete(intop)
-        termDetach()
-        sleep(10)
+        intop.botDestID = false
         App.imp.unregister(intop.instanceID)
-        intop.instanceID = false
+        intop.sender = false
     }
 
     // destroy
@@ -334,11 +336,17 @@ closure InTop(track, options, local intop, nlregex, str, error) {
         if intop.destroyed
             return
         intop.destroyed = true
+        intop.execClosed(Error("instance closed"))
         intop.sender(intop.botDestID, {
             id: "destroy",
             guid: intop.instanceID
         })
-        close()
+        track.delete(intop)
+        termDetach()
+        sleep(10)
+        App.imp.unregister(intop.instanceID)
+        intop.sender = false
+        intop.cleanup()                                                     // child classes release resources
     }
 
     // open
@@ -348,24 +356,27 @@ closure InTop(track, options, local intop, nlregex, str, error) {
     intop.open = closure open(inbotID) {
         if intop.destroyed
             return (list(Error("InTop already destroyed")))
-        if intop.instanceID {
-            if inbotID != intop.botDestID
-                return (list(Error("InTop already open")))
-        } else
-            intop.instanceID = UUID()
+        if intop.botDestID == inbotID
+            return (list(false, { reopen: true }))
+        if intop.botDestID
+            close()
         intop.botDestID = inbotID
-        intop.sender = App.imp.register(intop, {
-            name: options.name
-            type: options.type
-            instanceID: intop.instanceID
-            services: [ "naan-executor" ]
-        })
+        if !intop.instanceID {
+            intop.instanceID = App.imp.getUUID("InTop(${options.name}) instanceID")
+            track.add(intop)
+        }
+        if !intop.sender
+            intop.sender = App.imp.register(intop, {
+                name: options.name
+                type: options.type
+                instanceID: intop.instanceID
+                services: [ "naan-executor" ]
+            })
         `(error) = intop.sender(intop.botDestID, {
             id: "subscribe"
         })
         if error
             return(list(error))
-        track.add(intop)
         list(false, { ok: true })
     }
 

package/frameworks/running/remote_req.nlg

@@ -35,7 +35,8 @@ closure RemoteRequester(destID, options, local track)
     //
     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

package/frameworks/running/remote_res.nlg

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

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,8 +398,10 @@ 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
@@ -453,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
@@ -463,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
@@ -526,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] = {

package/frameworks/service/nubnode.nlg

@@ -29,7 +29,7 @@ closure NodeWorkerNub(imp, options, local nownub) {
         type: "node-worker-nub"
     }, options)
     nownub = new(object, this)
-    nownub.instanceID = imp.us.instanceID || UUID()
+    nownub.instanceID = imp.us.instanceID || imp.getUUID("NodeWorkerNub(${options.name}) instanceID")
     nownub.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher(false, false, "NodeWorkerNub")
 
     // impReceive
@@ -88,10 +88,10 @@ closure NodeWorkerNub(imp, options, local nownub) {
 
     // 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))
     })
 
@@ -106,7 +106,7 @@ 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 })

package/frameworks/service/nubweb.nlg

@@ -29,7 +29,7 @@ closure WebWorkerNub(imp, options, local wonub) {
         type: "web-worker-nub"
     }, options)
     wonub = new(object, this)
-    wonub.instanceID = imp.us.instanceID || UUID()
+    wonub.instanceID = imp.us.instanceID || imp.getUUID("WebWorkerNub(${options.name}) instanceID")
     wonub.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher(false, false, "WebWorkerNub")
 
     // impReceive
@@ -75,12 +75,12 @@ closure WebWorkerNub(imp, options, local wonub) {
 
     // 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
@@ -94,7 +94,7 @@ 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 })

package/lib/browser/env_web.js

@@ -624,7 +624,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.7.0+1";
+        statedoc.verstring = "1.7.2+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -642,7 +642,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.7.0+1"
+            || statedoc.verstring != "1.7.2+1"
             || !(naanstate = statedoc.naan))
         {
             localStorage.removeItem("NaanState_Hosted");
@@ -705,7 +705,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.7.0+1"
+                    title: vsiteName + " 1.7.2+1"
                 });
             }
         } catch (e) {
@@ -719,9 +719,8 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.7.0+1"
+                    title: vsiteName + " 1.7.2+1"
                 });
-                termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
         } catch (e) {
         }
@@ -735,7 +734,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteVisibilityChange",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.7.0+1",
+                    title: vsiteName + " 1.7.2+1",
                     hidden: window.document.visibilityState == "hidden",
                     window: window
                 });
@@ -750,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.7.0+1";;\r\n'
-                + 'App.cache = "1bae92ceb3cc5eb47f6dbe8e40ceeb9f";;\r\n'
+            cmd: 'App.version = "1.7.2+1";;\r\n'
+                + 'App.cache = "9e8f87aa915943862be39d701927fbd1";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });