@naanlang/naan 1.3.1 → 1.4.0

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.1+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.1+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.1+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.1+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.1+1";;\r\n'
-                + 'App.cache = "1f0eccb08fd1a57ede0bd91dc0e934cc";;\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,