@naanlang/naan 1.3.2 → 1.4.0

package/frameworks/running/executors.nlg

@@ -24,19 +24,20 @@ closure ExecutorBase(track, type, name, local exec) {
     exec.name = name
     
     // execReset
+    //
     // Initialize remote communications for a new or restarted instance.
-    
+    //
     exec.execReset = function execReset() {
         exec.pending = { }
         exec.nextSendID = toint(RandomBytes(3))                             // keep our sequence code unique for shared servers
-        exec.nextContextID = 1
     }
     execReset()
 
     // execSend
+    //
     // Send a message to the running instance and return a nonce to wait on. If data is not a
     // dictionary then it is ignored.
-    
+    //
     exec.execSend = closure execSend(msg, data, local pending, error) {
         if !dictionary(data)
             data = { }
@@ -52,8 +53,9 @@ closure ExecutorBase(track, type, name, local exec) {
     }
     
     // execReceived
+    //
     // The specified message was received from the instance, so signal it.
-    
+    //
     exec.execReceived = closure execReceived(data, local pending) {
         pending = exec.pending[data.xid]
         if !pending {                                                       // not waiting on message
@@ -68,15 +70,17 @@ closure ExecutorBase(track, type, name, local exec) {
     }
     
     // execSetStatus
+    //
     // Received a status update from the instance.
-    
+    //
     exec.execSetStatus = function execSetStatus(status) {
         exec.xstatus = status
     }
     
     // execFailed
+    //
     // Communication has failed.
-    
+    //
     exec.execFailed = closure execFailed(error, local xid, pending) {
         exec.pending.error = error
         for `(xid, pending) in exec.pending
@@ -84,8 +88,10 @@ closure ExecutorBase(track, type, name, local exec) {
     }
     
     // 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))
@@ -94,10 +100,13 @@ closure ExecutorBase(track, type, name, local exec) {
     }
         
     // context
-    // Return a context object for the instance, or an error, in a result tuple. Currently this does
-    // not ever reclaim old contexts on the instance end of things, but it should. ###
-
-    exec.context = closure context(local error, retries, ms, delta, excon) {
+    //
+    // Return a context object for the instance, or an error, in a result tuple. The optional state
+    // dictionary argument initializes the context with the state of a previous one to facilitate
+    // persistent reconnection. Currently this does not ever reclaim old contexts on the instance
+    // end of things, but it should. ###
+    //
+    exec.context = closure context(state, local error, retries, ms, delta, excon) {
         retries = 0
         ms = milliseconds()
         delta = 1
@@ -114,13 +123,14 @@ closure ExecutorBase(track, type, name, local exec) {
             sleep(delta)
             if delta < 100
                 delta *= 2 }
-        excon = ExecutorContext(exec, exec.nextContextID++)
+        excon = ExecutorContext(exec, state)
         excon.register()
     }
 
     // attention
+    //
     // Focus the UI on this instance because something needs attention.
-
+    //
     exec.attention = function attention() {
         track.attention(exec)
     }
@@ -141,20 +151,37 @@ closure ExecutorBase(track, type, name, local exec) {
  * ability to track namespace changes as the result of evaluating an expression. They do not override
  * normal namespace protections. The contexts exposed here preserve the active namespace after the
  * expression is evaluated.
+ *     The optional state argument preserves the context state so that it can be restored for
+ * resuming persistent connections.
  *
  */
 
-closure ExecutorContext(exec, contextID, local context, util) {
+closure ExecutorContext(exec, state, local context, coder, util) {
     global(apply)
     context = new(object, this)
+    if !state || !state.contextID
+        state = {
+            contextID: UUID()
+        }
+    context.state = state
+    coder = packageCoder(evalf)
     util = modlist().Util.exports
 
+    // getState
+    //
+    // Get context state for future initialization
+    //
+    context.getState = function getState() {
+        context.state
+    }
+
     // register
+    //
     // Register or re-register our context with the worker.
-
+    //
     context.register = closure register(local pending, result) {
         pending = exec.execSend("register", {
-            contextID: contextID
+            contextID: state.contextID
         })
         result = pending.wait()
         if result.1
@@ -164,10 +191,11 @@ closure ExecutorContext(exec, contextID, local context, util) {
     }
     
     // eval
+    //
     // Evaluate the specified expression in the current worker context. The optional put argument
     // if non-false is a tuple of symbols that should be transfered to the remote end, while get is
     // an optional tuple of symbols to retrieve after evaluation.
-
+    //
     context.eval = closure evalf(expr, put, get, local roots, pkg, data, pending, result) {
         if tuple(put)
             roots = cons(`expr, put)
@@ -175,9 +203,11 @@ closure ExecutorContext(exec, contextID, local context, util) {
             roots = `(expr)
         pkg = util.pkgSave(`expr, roots, {
             nsignore: true
-            comments: true })
+            comments: true
+            objectEncoder: coder.encodeObject
+        })
         data = {
-            contextID: contextID
+            contextID: state.contextID
             expr: pkg }
         if tuple(get)
             data.get = get
@@ -190,22 +220,25 @@ closure ExecutorContext(exec, contextID, local context, util) {
                 localroots: false
                 intern: false
                 execute: false
+                objectDecoder: coder.decodeObject
             })))
         else
             result
     }
-    
+
     // evalq
+    //
     // Evaluate the specified QUOTED expression in the current worker context.
-    
+    //
     context.evalq = macro evalq(expr, put, get) {
         evalf(expr, eval(put), eval(get))
     }
-                
+
     // apply
+    //
     // Apply list of arguments to the specified procure evaluated remotely. If the procedure is a
     // not a tuple then this uses the tuple definition if there is one.
-    
+    //
     context.apply = closure applyf(proc, args, put, get) {
         if !tuple(proc) && tuple(proc.proc)
             proc = proc.proc
@@ -213,9 +246,10 @@ closure ExecutorContext(exec, contextID, local context, util) {
     }
 
     // call
+    //
     // Call the specified function remotely using local arguments:
     //      context.call(proc, args...)
-    
+    //
     context.call = macro callf args {
         closure (proc, arglist, local eargs) {
             while arglist
@@ -225,13 +259,14 @@ closure ExecutorContext(exec, contextID, local context, util) {
     }
 
     // rpc
+    //
     // Execute a remote procedure call without package translation, to reduce overhead. This will not
     // properly transfer Naan-specific types like symbols, and the results will be native JavaScript.
     // The procedure must be specified as a symbol or string.
-    
+    //
     context.rpc = closure rpc(proc, args, local data, pending, result) {
         data = {
-            contextID: contextID
+            contextID: state.contextID
             proc: proc
             args: args }
         pending = exec.execSend("rpc", data)
@@ -647,7 +682,7 @@ closure ExecutorTracker(local xtrak) {
  */
 
 closure execLambda(track, url, name, workerID, local target, nlregex, clientID, serverID) {
-    global()
+    global(js)
     target = ExecutorBase(track, "Lambda", name)
     clientID = "DebugWorkers"
     serverID = "Workers"
@@ -896,7 +931,8 @@ closure execLambda(track, url, name, workerID, local target, nlregex, clientID,
  */
 
 function execInit(local manifest) {
-    manifest = `(ExecutorBase, ExecutorContext, ExecutorParallel, ExecutorTracker, execLambda, execInit)
+    manifest = `(ExecutorBase, ExecutorContext, ExecutorParallel, ExecutorTracker, execLambda,
+        execInit)
 
     Naan.module.build(module.id, "executors", function(modobj, compobj) {
         require("./running.nlg")

package/frameworks/running/running.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2024 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 function rootproc(procdef, local parent) {
+    global()
     loop {                                                                  // can only find out proc
         parent = procdef.1@\.parent
         if !parent
@@ -38,6 +39,7 @@ function rootproc(procdef, local parent) {
  */
 
 function baseproc(procdef) {
+    global()
     if procdef.1@\.base.proc
         { }
     else
@@ -58,6 +60,7 @@ function baseproc(procdef) {
  */
 
 function pathmatch(parent, path, local segment, nth, child) {
+    global()
     if empty(path)
         return (parent)
     segment = pop(path)
@@ -83,6 +86,7 @@ function pathmatch(parent, path, local segment, nth, child) {
  */
 
 function procpath(procdef, local path, segment, parent, peers, nth, peer) {
+    global()
     loop {
         segment = procdef.1
         parent = segment@\.parent
@@ -114,6 +118,7 @@ function procpath(procdef, local path, segment, parent, peers, nth, peer) {
  */
 
 function procname(name, local parent) {
+    global()
     parent = name@\.parent
     name = tostring(name)
     if parent
@@ -136,6 +141,7 @@ function procname(name, local parent) {
  */
     
 function procstring(procdef, options, local name, output, parm) {
+    global()
     if options.fullname || !defined(options, `fullname)
         name = procname(procdef.1)                                          // default is full name
     else
@@ -156,6 +162,82 @@ function procstring(procdef, options, local name, output, parm) {
 }
 
 
+/*
+ * packageCoder
+ *
+ *     Encode and decode objects for the NaaN packager to establish proxies for remote access.
+ *
+ */
+
+closure packageCoder(evalf, local coder) {
+    global()
+    coder = new(object, this)
+    coder.wmapEncoding = new(weakmap)
+    coder.mapDecoding = { }
+
+    // encodeObject
+    //
+    // Encode an object into the ident dictionary so that the remote end can create a proxy.
+    //
+    coder.encodeObject = closure encodeObject(obj, local objectID) {
+        if coder.wmapEncoding[obj]
+            { }
+        else {
+            objectID = UUID()
+            coder.mapDecoding[objectID] = obj
+            coder.wmapEncoding[obj] = {
+                name: obj@\.closure || undefined
+                objectID: objectID
+            }
+        }
+    }
+
+    // decodeObject
+    //
+    // Decode the ident dictionary into a proxy object allowing method invocation.
+    //
+    coder.decodeObject = closure decodeObject(ident, local x, obj) {
+        if coder.mapDecoding[ident.objectID]
+            { }
+        else if ident.name {
+            putproc(ident.name, false)
+            obj = coder.mapDecoding[ident.objectID] = closure(nn, objectID) {
+                call(enclose(list(`closure, nn, list(`local, `x),
+                    quote(x=new(object, nn)),
+                    quote(x@\.tostring = function() { "{proxy ${nn}}" }),
+                    quote(x@\.undefined = closure undef args {
+                        let (result) {
+                            result = evalf(list(`\.execute\-method, objectID, args))
+                            if result.0
+                                throw("remoting failure: ${ErrorString(result.0)}")
+                            else
+                                result.1
+                        } ()
+                    }), `x)))
+            } (ident.name, ident.objectID)
+            coder.wmapEncoding[obj] = ident
+            obj
+        } else
+            coder.mapDecoding[ident.objectID] = new(object)
+    }
+    
+    // invokeMethod
+    //
+    // Invoke a local object method from the remote proxy, returning a result tuple.
+    //
+    coder.invokeMethod = closure invokeMethod(objectID, args, local obj) {
+        obj = coder.mapDecoding[objectID]
+        if obj
+            list(false, eval(list(deref, obj, pop(args), args)))
+        else
+            list(Error("object ${objectID} not found"))
+    }
+
+    // finis
+    coder
+};
+
+
 /*
  * runnInit
  *
@@ -164,8 +246,8 @@ function procstring(procdef, options, local name, output, parm) {
  */
 
 function runnInit(local manifest) {
-    manifest = `(rootproc, baseproc, pathmatch, procpath, procname, procstring, runnInit)
-
+    manifest = `(rootproc, baseproc, pathmatch, procpath, procname, procstring, packageCoder,
+        runnInit)
     Naan.module.build(module.id, "running", closure(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest

package/frameworks/running/taskexec.nlg

@@ -19,12 +19,27 @@
  *
  */
 
-closure TaskDispatcher(replier, local contexts, gohome, util) {
+closure TaskDispatcher(replier, local contexts, gohome, coder, util) {
     global()
     contexts = { }
     gohome = makeActivator()
+    coder = packageCoder(evalf)
     util = modlist().Util.exports
-    closure(data, local reply, restorens, context, expr, roots, proc, args, result) {
+
+    // sendEval
+    //
+    // Send an evaluation request to the original execution context.
+    //
+    closure evalf(expr) {
+        debuglog("TaskDispatcher doesn't yet implement reverse proxy objects")
+        list(Error("### reverse object proxy not implemented"))
+    }
+
+    // dispatcher
+    //
+    // Return a new task dispatcher.
+    //
+    closure dispatcher(data, local reply, restorens, context, expr, roots, proc, args, result) {
         reply = {
             xmsg: "error"
             xid: data.xid
@@ -70,10 +85,14 @@ closure TaskDispatcher(replier, local contexts, gohome, util) {
                         intern: true                                        // intern symbols
                         localroots: true                                    // make roots local if needed to intern
                         execute: true                                       // execute auto-running procedures
+                        objectDecoder: coder.decodeObject
                     })
                     expr = caar(expr)
+                    if expr.0 == `\.execute\-method
+                        expr = coder.invokeMethod(expr.1, expr.2)           // object method, args
+                    else
+                        expr = evalactive(expr)                             // evaluate expression
                     reply.error = undefined
-                    expr = evalactive(expr)
                     if data.get
                         roots = new(data.get).map(function(sym){            // new() to get symbol from compress
                             compress(sym)
@@ -84,7 +103,8 @@ closure TaskDispatcher(replier, local contexts, gohome, util) {
                         roots = `(expr)
                     reply.result = util.pkgSave(`expr, roots, {
                         nsignore: true                                      // don't report namespace errors
-                        comments: true })                                   // include comments
+                        comments: true
+                        objectEncoder: coder.encodeObject})                 // include comments
                     if context.namespace !== nsactive().0
                     {                                                       // evaluation changed namespace
                         context.namespace = nsactive().0

package/frameworks/storage/dbt_pouch.nlg

@@ -508,7 +508,7 @@ closure ListBrowserDBs(local pending, output, item) {
  */
 
 closure DbConnector(psm, local connClassID, connector, watch) {
-    global()
+    global(js)
     connClassID = "PouchDB"
     connector = new(object, this)
     connector.psm = psm

package/frameworks/storage/psm.nlg

@@ -260,6 +260,16 @@ closure MakePSMutil(fs, local util) {
 
     util.deepcopy = closure deepcopy(inpath, sources, outfs, outpath, options, callback,
         local errors, copies, fsopt, folders) {
+        
+        // fixpath
+        // Fix the path to match the destination.
+        function fixpath(path) {
+            if fs.path.sep == outfs.path.sep
+                path
+            else
+                path.replaceAll(fs.path.sep, outfs.path.sep)
+        }
+
         if !callback
             return (syncAdapter(deepcopy, inpath, sources, outfs, outpath, options))
         if sources && !array(sources) || !string(inpath) || !string(outpath)
@@ -281,7 +291,7 @@ closure MakePSMutil(fs, local util) {
         asyncArray(sources, 10, closure mklist(entry,
             local srcpath, destpath, epath, error, stat, folder, node) {
             srcpath = fs.path.join(inpath, entry)
-            destpath = outfs.path.join(outpath, entry)
+            destpath = fixpath(outfs.path.join(outpath, entry))
             if destpath == "."
                 destpath = ""                                               // joined empty strings
             `(error, stat) = fs.info(srcpath, fsopt)

package/lib/browser/env_web.js

@@ -536,7 +536,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.3.2+1";
+        statedoc.verstring = "1.4.0+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -554,7 +554,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.3.2+1")
+            || statedoc.verstring != "1.4.0+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -613,7 +613,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.3.2+1"
+                    title: vsiteName + " 1.4.0+1"
                 });
             }
         } catch (e) {
@@ -627,7 +627,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.3.2+1"
+                    title: vsiteName + " 1.4.0+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -642,8 +642,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.3.2+1";;\r\n'
-                + 'App.cache = "a8f6e5b80d3b14e762d56efbef3ae771";;\r\n'
+            cmd: 'App.version = "1.4.0+1";;\r\n'
+                + 'App.cache = "233c1fed240ea5c0dd1c14562f30021b";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });

package/lib/browser/env_webworker.js

@@ -145,6 +145,8 @@ exports.NaanControllerWebWorker = function NaanControllerWebWorker() {
             naanlib.textLine(msg.text);                                     // keyboard text from terminal
         else if (msg.id == "start")
         {                                                                   // start execution with optional state
+            targSelf.workerID = msg.workerID;
+            targSelf.workerGUID = msg.workerGUID;
             naanlib.banner();
             naanlib.start({
                 state: msg.state,