@naanlang/naan 1.1.0 → 1.2.0

package/frameworks/client/psm_client.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2022 by Richard C. Zulch
+ * Copyright (c) 2019-2024 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure psmcFsView(api, rootpath, local view, pathmod) {
+    global(JSpath)
     view = new(object, this)
     view.api = api
     view.rootpath = rootpath
@@ -154,6 +155,8 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Read a file at the specified path
     
     view.readFile = function readFile(path, options, callback) {
+        if !path
+            throw("psmcFsView.readFile: path is false")
         psmRemote(path, "readFile", options, false, callback)
     }
 
@@ -354,7 +357,9 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Tell the shell to open the specified file.
     
     view.shellOpen = function shellOpen(path, args, callback) {
-        psmRemote(path, "shellOpen", { args: args }, false, callback)
+        if args
+            args = { args: args }
+        psmRemote(path, "shellOpen", args, false, callback)
     }
 
     // grepLines
@@ -424,11 +429,14 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
  *
  */
 
-closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
+closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
+    global()
     connClassID = "NodeFS"
     connector = new(object, this)
     connector.psm = psm
-    connector.api = nicc.api
+    connector.apis = {
+        HostFS: api
+    }
     connector.vault = psm.vault(connClassID)
     connector.label = "Naan-Server"
     watch = psm.watchable(connector)
@@ -563,7 +571,7 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
     // listResources
     //
     // List saved resources in our database
-    connector.listResources = function listResources(local error, original) {
+    connector.listResources = function listResources(local error, output, original) {
         `(error, output) = connector.vault.listResources()
         if error
             return (list(error))                                            // can't access our saved resources
@@ -579,14 +587,14 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
     connector.info = function info(resID, local info, error, creds) {
         info = {
             classID: connClassID
-            type: "remote filesystem"
-            services: ["NideFS", "NideHostAPI"]
+            type: "remote server"
+            services: ["NideFS", "NideHostAPI", "NideTerminal"]
         }
         if resID == "Host" {
             info.name = "Host"
             info.type = "host filesystem"
             info.locked = true
-            info.where = nicc.api.url
+            info.where = api.url
             info.access = "HostFS"
         } else {
             `(error, creds) = connector.vault.accessResource(resID)
@@ -620,14 +628,26 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
         `(error, creds) = connector.access(resID)
         if !error {
             if creds == "HostFS"
-                api = connector.api
-            else
-                api = MakeNideAPIclient(creds.urlName, creds.authSecret)    // API to remote NodeJS filesystem
+                api = connector.apis[creds]
+            else {
+                api = connector.apis[creds.urlName]
+                if !api                                                     // get API to remote server
+                    connector.apis[creds.urlName] = api = NideAPIclient(creds.urlName, creds.authSecret)
+            }
         }
         if error
             list(error)
-        else if service == "NideExecutor"
-            require("../browser/terminals.nlg").TermHost(nicc.track, api, args.0, args.1)                       // host executor, args: (name, workerID)
+        else if service == "NideTerminal" {
+            if !App.nide.track
+                return (list(Error("NideTerminal not supported in this environment")))
+            list(false, App.nide.track.spawn(App.nide.registerRemote(api),
+                args.0,                                                     // terminal display name
+                args.1))                                                    // options:
+                    // {
+                    //      workerID: "NideServer"  -- for main thread; other strings for worker threads
+                    //      type: "My Remotes"      -- display name of terminal group; e.g. URL
+                    // }
+        }
         else if service == "NideHostAPI"
             list(false, api)                                                // connect to the Host API
         else if service == "NideFS" {
@@ -653,11 +673,12 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
  *
  */
 
-function psmcMakeClientPSM(nicc, dbname, local importPSM) {
+function psmcMakeClientPSM(api, dbname, local importPSM) {
+    global(App)
     importPSM = require("../storage/psm.nlg")
     App.psm = importPSM.MakePSM(dbname).1
     if App.psm {
-        psmcFsConnector(App.psm, nicc)                                      // HostFS access
+        psmcFsConnector(App.psm, api)                                       // HostFS access
         require("../storage/dbt_pouch.nlg").DbConnector(App.psm)            // Pouch databases as filesystems
     }
     App.psm

package/frameworks/node/https_request.nlg

@@ -105,7 +105,7 @@ closure httpsApiReqOnce(url, options,
         })
         response.on("end", function (local content, error, headers) {
             content = js.g.Buffer.concat(chunks)
-            if response.statusCode < 200 || response.statusCode >= 300 {
+            if response.statusCode < 200 || response.statusCode >= 299 {    // 299 is "cancelled"
                 if options.debug
                     debuglog("HttpsApiRequest status:", url, response.statusCode, "message:", content)
                 pending.signal(list(Error("HttpsApiRequest statusCode:", url, response.statusCode, {
@@ -132,6 +132,7 @@ closure httpsApiReqOnce(url, options,
             pending.signal(list(error, content, {
                 headers: response.headers
                 status: response.statusCode
+                contentType: response.headers["content-type"]
             }))
         })
     })

package/frameworks/node/psm_server.nlg

@@ -450,8 +450,8 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
     connector.info = function info(resID, local info, error, creds) {
         info = {
             classID: connClassID
-            type: "remote filesystem"
-            services: ["NideFS", "NideHostAPI"]
+            type: "remote server"
+            services: ["NideFS", "NideHostAPI", "NideTerminal"]
         }
         if resID == "Host" {
             info.name = "Host"

package/frameworks/project/build.nlg

@@ -1195,7 +1195,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
         if error
             error = Error("Builder: cannot read main file", error)
         else {
-            `(error, executor) = track.spawn(build.runway.spawn.0, "${rules.name} ${build.version}", "Run-${build.buildnum}", {
+            `(error, executor) = track.spawn(build.runway.spawn.0, "${rules.name} ${build.version}", {
+                workerID: "Run-${build.buildnum}"
                 startup: {
                     initcmds: maintext
                     dirpath: fs.path.resolve(fs.path.sep, fs.rootpath, build.destpath)

package/frameworks/project/projects.nlg

@@ -296,7 +296,7 @@ closure projConnector(projman, projtype, local connector, watch) {
  *
  * Nide.proj/
  *      nide_cliser.cfg                 - JSON definition of the project (see below)
- *      NaanIDE_version.txt             - [default] substitution file defining 1.1.0+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.2.0+1 etc.
  *      NaanIDE_version_builds.txt      - [default] contains current build number as decimal string
  *      build/                          - [optional] default build output location
  *      NaanIDE.lic                     - [optional] defines Zulch Laboratories, Inc. and other license info

package/frameworks/running/executors.nlg

@@ -5,7 +5,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -18,6 +18,7 @@
  */
 
 closure ExecutorBase(track, type, name, local exec) {
+    global()
     exec = new(object, this)
     exec.type = type
     exec.name = name
@@ -76,7 +77,7 @@ 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) {
+    exec.execClosed = closure execClosed(error, local xid, pending) {
         for `(xid, pending) in exec.pending {
             pending.signal(list(error))
             pending[xid] = undefined
@@ -135,6 +136,7 @@ closure ExecutorBase(track, type, name, local exec) {
  */
 
 closure ExecutorContext(exec, contextID, local context, util) {
+    global(apply)
     context = new(object, this)
     util = modlist().Util.exports
 
@@ -212,12 +214,13 @@ closure ExecutorContext(exec, contextID, local context, util) {
             applyf(eval(proc), eargs)
         } (pop(args), reverse(args))
     }
+
     // 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, result) {
+    context.rpc = closure rpc(proc, args, local data, pending, result) {
         data = {
             contextID: contextID
             proc: proc
@@ -268,6 +271,7 @@ closure ExecutorContext(exec, contextID, local context, util) {
  */
 
 closure ExecutorParallel(options, local maxcount, basename, parallel, exqueue, crValue) {
+    global()
     maxcount = options.maxcount
     if !maxcount
         maxcount = 4                                                        // default is 4 workers
@@ -294,7 +298,7 @@ closure ExecutorParallel(options, local maxcount, basename, parallel, exqueue, c
             return (false)
         parallel.workers[workdex] = false                                   // reserve our spot
         name = basename.concat("-", workdex+1)
-        worker = App.nide.track.spawn("Local", name, "ExecutorParallel")
+        worker = App.nide.track.spawn("Local", name, "ExecutorParallel")    // ### App.nide.track.spawn may not exist
         if worker.0 {                                                       // ### wasting space on workers list
             debuglog("execParallel: cannot spawn worker:", ErrorString(worker.0))
             return (false)
@@ -444,6 +448,7 @@ closure ExecutorParallel(options, local maxcount, basename, parallel, exqueue, c
  */
 
 closure ExecutorTracker(local xtrak) {
+    global()
     xtrak = new(object, this)
     xtrak.instances = []
     xtrak.watchers = []
@@ -494,7 +499,7 @@ closure ExecutorTracker(local xtrak) {
     // enumlist
     // Enumerate the list of executors.
     
-    xtrak.enumlist = function enumlist(local results) {
+    xtrak.enumlist = function enumlist(local results, instance) {
         results = []
         for instance in xtrak.instances
             results.push(instance.executor)
@@ -552,6 +557,7 @@ closure ExecutorTracker(local xtrak) {
  */
 
 closure execLambda(track, url, name, workerID, local target, nlregex, clientID, serverID) {
+    global()
     target = ExecutorBase(track, "Lambda", name)
     clientID = "DebugWorkers"
     serverID = "Workers"
@@ -800,7 +806,6 @@ closure execLambda(track, url, name, workerID, local target, nlregex, clientID,
  */
 
 function execInit(local manifest) {
-
     manifest = `(ExecutorBase, ExecutorContext, ExecutorParallel, ExecutorTracker, execLambda, execInit)
 
     Naan.module.build(module.id, "executors", function(modobj, compobj) {

package/frameworks/running/taskexec.nlg

@@ -5,7 +5,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2024 by Richard C. Zulch
  *
  */
 
@@ -20,10 +20,11 @@
  */
 
 closure TaskDispatcher(replier, local contexts, gohome, util) {
+    global()
     contexts = { }
     gohome = makeActivator()
     util = modlist().Util.exports
-    closure(data, local reply, restorens, expr, roots, proc, args, result) {
+    closure(data, local reply, restorens, context, expr, roots, proc, args, result) {
         reply = {
             xmsg: "error"
             xid: data.xid

package/frameworks/storage/psm.nlg

@@ -20,6 +20,7 @@
  */
 
 closure MakePSMutil(fs, local util) {
+    global()
     util = new(object, this)
     util.fs = fs
 
@@ -310,7 +311,7 @@ closure MakePSMutil(fs, local util) {
         //
         if options.erase {
             asyncArray(keys(folders).toarray, 10, closure eraser(destpath
-                local error, outfolder, folder, namesin, removes, delopt) {
+                local error, outfolder, folder, namesin, node, removes, delopt) {
                 `(error, outfolder) = outfs.dirList(destpath)               // existing files in our destination
                 if error
                     return

package/frameworks/storage/psm_dbtables.nlg

@@ -45,6 +45,14 @@ closure FSview(table, rootpath, local view) {
     view.rootpath = rootpath
     view.path = JSpath.posix                                                // for view.path.join(), etc.
 
+    // dirPath
+    //
+    // True iff the path is a dirpath. If the path is empty this checks the rootpath.
+    
+    function dirPath(path) {
+        path.slice(-1) == "/" || path == "" && rootpath.slice(-1) == "/"
+    }
+
     // dirName
     //
     // Return the directory portion of the specified path.
@@ -163,7 +171,7 @@ closure FSview(table, rootpath, local view) {
         else
             proc = view.table.get
         `(error, data) = proc(path)
-        if error && error.status == 404 && path.slice(-1) != "/"
+        if error && error.status == 404 && !dirPath(path)
             `(error, data) = proc(path.concat("/"))
         callback(error, data)
     }
@@ -200,7 +208,7 @@ closure FSview(table, rootpath, local view) {
                         birthtime: nowstr
                     }
                 }
-                if path.slice(-1) == "/"
+                if dirPath(path)
                     metadata.finfo.type = "directory"
                 else
                     metadata.finfo.type = "file"
@@ -268,7 +276,7 @@ closure FSview(table, rootpath, local view) {
             return (asyncResult(callback, false, { created: false }))       // root always already exists
         if checkPath(path, callback)
             return
-        if path.slice(-1) != "/"
+        if !dirPath(path)
             path = path.concat("/")
         view.table.get(path, function(error, data, local pathdirs, buildpath, item) {
             if !error
@@ -286,7 +294,7 @@ closure FSview(table, rootpath, local view) {
                                 name: "conflict"
                                 path: buildpath
                             })))
-                    if buildpath.slice(-1) != "/"
+                    if !dirPath(buildpath)
                         buildpath = buildpath.concat("/")
                     `(error, data) = view.table.head(buildpath)             // get desired directory
                     if error.status == 404
@@ -311,7 +319,7 @@ closure FSview(table, rootpath, local view) {
         if dest.indexOf("/") < 0
             newpath = dirName(srcpath).concat(dest)                         // renaming within same directory
         else {
-            if dest.slice(-1) == "/"                                        // moving to new directory location:
+            if dirPath(dest)                                                // moving to new directory location:
                 newpath = dest.concat(baseName(srcpath))                    //      new path is new pathname
             else {                                                          // moving and renaming:
                 newpath = dest                                              //      new path is new pathname
@@ -361,7 +369,7 @@ closure FSview(table, rootpath, local view) {
     //
     closure copyDirectory(srcpath, dest, options,
         local error, nodes, data, destpath, errors, docpath, newpath, srcroot, item) {
-        if srcpath.slice(-1) != "/"
+        if !dirPath(srcpath)
             srcpath = srcpath.concat("/")                                   // normalize source as directory
         `(error, nodes) = view.table.records({ prefix: srcpath })           // each item has key/_id/_rev, not doc
         if error
@@ -380,13 +388,13 @@ closure FSview(table, rootpath, local view) {
             destpath = dirName(srcpath).concat(dest)                        // new directory name in same parent directory
             dest = dirName(srcpath) }                                       // dest is new parent pathname
         else {
-            if dest.slice(-1) == "/"
+            if dirPath(dest)
                 destpath = dest.concat(baseName(srcpath))                   // same name; new location
             else {
                 destpath = dest                                             // new full pathname
                 dest = dirName(dest) }                                      // dest is new parent pathname
         }
-        if destpath != "" && destpath.slice(-1) != "/"
+        if destpath != "" && !dirPath(destpath)
             destpath = destpath.concat("/")                                 // get actual path of new directory
         //
         // Change srcpath to destpath for all records. Note that dest is the name of our new parent
@@ -489,13 +497,13 @@ closure FSview(table, rootpath, local view) {
                     finfo.length = data.length
                 else if data._length
                     finfo.length = data._length
-                if finfo.length
+                if dirPath(path)
+                    finfo.type = "directory"
+                else if finfo.length
                     finfo.type = "file" }
             else if path == "" {
                 error = false                                               // we were asked for info on superoot
                 finfo = {
-                    md5: HashMD5("")
-                    length: 0
                     type: "directory"
                 } }
             callback(error, finfo)
@@ -553,7 +561,7 @@ closure FSview(table, rootpath, local view) {
             return
         if !content
             return (asyncResult(callback, Error("content required")))
-        if path.slice(-1) == "/"
+        if dirPath(path)
             return (asyncResult(callback, Error("cannot write to a directory", { path: path })))
         if !validName(path, true)
             return (asyncResult(callback, Error("invalid filename", { path: path })))
@@ -631,7 +639,7 @@ closure FSview(table, rootpath, local view) {
                     name: "forbidden"
                     path: path
                 })))
-            if path.slice(-1) != "/"
+            if !dirPath(path)
                 path = path.concat("/")                                     // avoid deleting longer filenames with same parent and prefix
             `(error, data) = dbDirRecords(path, true)
             if error
@@ -739,6 +747,8 @@ closure FSview(table, rootpath, local view) {
             prefix: path
             deep: true
         }
+        if name == "" && rootpath != ""
+            name = rootpath.split("/").slice(0,-1).pop() || ""
         treedict = {
             name: name
             data: {

package/lib/browser/env_web.js

@@ -526,7 +526,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.1.0+1";
+        statedoc.verstring = "1.2.0+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -544,7 +544,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.1.0+1")
+            || statedoc.verstring != "1.2.0+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -603,7 +603,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.1.0+1"
+                    title: vsiteName + " 1.2.0+1"
                 });
             }
         } catch (e) {
@@ -617,7 +617,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.1.0+1"
+                    title: vsiteName + " 1.2.0+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -632,8 +632,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.1.0+1";;\r\n'
-                + 'App.cache = "241e1d15dfb0de008135e2de76886ccc";;\r\n'
+            cmd: 'App.version = "1.2.0+1";;\r\n'
+                + 'App.cache = "9659b00cb48debdc9726030789336e68";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });