@naanlang/naan 1.0.7 → 1.0.9

package/frameworks/browser/browser.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
@@ -53,7 +53,7 @@ closure FileReader(file, progress, local pending, freader, result) {
  *
  */
 
-closure FileDownload(file, progress, local error, blob, sizez, url, link) {
+closure FileDownload(file, progress, local error, blob, size, url, link) {
     `(error, blob, size) = FileReader(file, progress)
     if error
         list(error)
@@ -69,6 +69,29 @@ closure FileDownload(file, progress, local error, blob, sizez, url, link) {
 };
 
 
+/*
+ * Platform
+ *
+ *     Return a string identifying the platform our browser is running on, or false if unknown.
+ *
+ */
+
+function Platform(local agent, patterns, key, rx) {
+    agent = window.navigator.userAgent.toLowerCase()
+    patterns = {
+        macos: RegExp("macintosh|macintel|macppc|mac68k|macos")
+        windows: RegExp("win32|win64|windows|wince")
+        ios: RegExp("iphone|ipad|ipod")
+        android: RegExp("android")
+        linux: RegExp("linux")
+    }
+    for `(key, rx) in patterns
+        if rx.test(agent)
+            return (key)
+    false
+};
+
+
 /*
  * brorInit
  *
@@ -78,13 +101,14 @@ closure FileDownload(file, progress, local error, blob, sizez, url, link) {
  */
 
 function brorInit(local manifest) {
-    manifest = `(FileReader, FileDownload, brorInit)
+    manifest = `(FileReader, FileDownload, Platform, brorInit)
 
     Naan.module.build(module.id, "browser", function(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest
         modobj.exports.FileReader = FileReader
         modobj.exports.FileDownload = FileDownload
+        modobj.exports.Platform = Platform
 
         function brorReload() {
             window = js.w

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.7+2";
+var CurrentCacheName = "Naanlang-1.0.9+1";
 
 
 //
@@ -89,11 +89,11 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.0.7+2] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.7+2")
+        console.log("[1.0.9+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.9+1")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.7+2"
+                version: "1.0.9+1"
             });
         Reaper();                                                           // clean up obsolete info
         
@@ -107,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.7+2] msg received:", msg.text);
+                console.log("[1.0.9+1] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -118,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.7+2",
+                text: "port received by 1.0.9+1",
             });
             */
         if (--pending === 0)
@@ -135,7 +135,7 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.7+2] requesting new msgport for", client.id);
+            console.log("[1.0.9+1] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -181,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.7+2] source gone:", sourceId);
+                console.log("[1.0.9+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.7+2] client gone:", clientId);
+                console.log("[1.0.9+1] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -220,13 +220,13 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.0.7+2] deleting old cache:', cacheName);
+                        console.log('[1.0.9+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.7+2] claiming clients');
+            console.log('[1.0.9+1] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -269,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.7+2",
+                version: "1.0.9+1",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -317,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.7+2] install");
+    console.log("[1.0.9+1] install");
     self.skipWaiting();
 });
 
@@ -339,7 +339,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(event.request.url);
             var nocache = event.request.method != "GET"
-                || url.search.length !== 0 && url.searchParams.get("naanver") !== "cb-1.0.7+2"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "47cb512242b15eae60df6f89500e5ca4"
                 || event.request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -356,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.7+2] fetch failed", e);
+                    console.log("[1.0.9+1] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -385,14 +385,14 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.7+2] activate");
+    console.log("[1.0.9+1] activate");
     self.clients.matchAll({                                                 // for debugging, list controlled clients           
         includeUncontrolled: true
     }).then(function(clientList) {
         var urls = clientList.map(function(client) {
             return (client.url);
         });
-        console.log('[1.0.7+2] matching clients:', urls.join(', '));
+        console.log('[1.0.9+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/browser/terminals.nlg

@@ -650,7 +650,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
             naancont.Interrupt(inbound)
         }
 
-        function onreturn(local text) {
+        function onreturn() {
             naancont.Return(term.TakeText(), inbound)
         }
     

package/frameworks/browser/workers.nlg

@@ -56,6 +56,7 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
             })
         } else if msg.id == "upgrade" {
             if serv.upgrade != msg.version {
+                debuglog("service worker upgrade:", serv.upgrade, "to", msg.version)
                 serv.upgrade = msg.version                                  // only report once
                 callback(false, {
                     message: "upgrade"
@@ -134,6 +135,12 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
                 serv.sw = serv.reg.installing                               // worker version was updated
                 updateReg()
             })
+            reg.addEventListener("statechange", function() {
+                debuglog("service worker state change:", serv.reg.state)
+            })
+            reg.addEventListener("controllerchange", function() {
+                debuglog("service worker controller change:", serv.upgrade)
+            })
             result = makeResult(false, {
                 message: "opened"
             })
@@ -304,7 +311,7 @@ closure findTrackedScope(track, scope, local exec) {
  *
  */
 
-closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
+closure TrackedScope(track, scope, fs, rootpath, local trope) {
     trope = findTrackedScope(track, scope)
     if trope
         return (list(false, trope))

package/frameworks/client/psm_client.nlg

@@ -63,6 +63,7 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
                 pathmod = JSpath.win32
             else
                 pathmod = JSpath.posix
+            view.path.sep = pathmod.sep
             false
         }
     }
@@ -306,7 +307,7 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // optionally deleting the files in the existing location. If options.move is true then we
     // delete the source after the copy.
     
-    view.copy = closure copy(srcpath, dest, options, callback, local parameters) {
+    view.copy = closure copy(srcpath, dest, options, callback) {
         if options
             options = new(options)
         else

package/frameworks/common/common.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2022 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
@@ -80,7 +80,7 @@ function ContentTypeFromFileExt(filepath, local mimeType, encoding) {
  *
  */
  
-function UUID(local rando, cc) {
+function UUID(local rando) {
     if !RandomBytes
         return (false)
     rando = RandomBytes(36)                                                 // length of UUID
@@ -96,6 +96,27 @@ function UUID(local rando, cc) {
 };
 
 
+/*
+ * VersionCheck
+ *
+ *     Check if the test version is new enough compared to the reference version. This returns false
+ * if the test version is out of date, or the difference between the build numbers otherwise, which
+ * is positive if the test is larger than the reference.
+ *
+ */
+
+function VersionCheck(testv, refv, local rxver, test, ref) {
+    rxver = RegExp("([0-9]+)[.]([0-9]+)[.]([0-9]+)-?[A-Za-z_]*[+]?([0-9]+)")
+    function numerify(x){ Number.parseInt(x) }
+    test = testv.match(rxver).map(numerify.proc)
+    ref = refv.match(rxver).map(numerify.proc)
+    if test.1 == ref.1 && test.2 == ref.2 && test.3 == ref.3
+        test.4 - ref.4                                                      // build number difference
+    else
+        false
+};
+
+
 /*
  * JsonParse
  *
@@ -303,8 +324,8 @@ JSONparse = false;
 Uint8ArrayFromString = false;
 
 function comrInit(local manifest) {
-    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, JsonParse, JsonStringify, JsLoadScript,
-        LoadComponentOnDemand, LiveExport, comrInit)
+    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, VersionCheck, JsonParse, JsonStringify,
+        JsLoadScript, LoadComponentOnDemand, LiveExport, comrInit)
 
     Naan.module.build(module.id, "common", closure(modobj, compobj) {
         compobj.manifest = manifest
@@ -477,12 +498,18 @@ function comrInit(local manifest) {
                 //
                 // binary to Base64
                 EncodeBase64 = function nodejsEncodeBase64(data) {
-                    wsg.Buffer.from(data, "binary").toString("base64")
+                    if data
+                        wsg.Buffer.from(data, "binary").toString("base64")
+                    else
+                        ""
                 }
                 //
                 // Base64 to binary
                 DecodeBase64 = function nodejsDecodeBase64(data) {
-                    wsg.Buffer.from(data, "base64").toString("binary")
+                    if data
+                        wsg.Buffer.from(data, "base64").toString("binary")
+                    else
+                        xnew(wsg.Buffer, "")                                // empty buffer
                 }
                 if !crypto
                     crypto = js.r("crypto")
@@ -535,6 +562,7 @@ function comrInit(local manifest) {
             modobj.exports.JSONparse = JSONparse
             modobj.exports.JsonStringify = JsonStringify
             modobj.exports.JsonParse = JsonParse
+            modobj.exports.VersionCheck = VersionCheck
             modobj.exports.Uint8ArrayFromString = Uint8ArrayFromString
             modobj.exports.EncodeBase64url = EncodeBase64url
             modobj.exports.DecodeBase64url = DecodeBase64url

package/frameworks/node/filesystem.nlg

@@ -566,8 +566,8 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // Return array of files in a directory if it exists. If options.stat is true then this reads 
     // info for each file as well.
 
-    files.dirList = closure dirList(path, options, callback, local error, localpath, output, nodelist, file) {
-        if path == "" && js.g.process.platform == "win32" && rootpath == "\\"
+    files.dirList = closure dirList(path, options, callback, local error, localpath, output, file) {
+        if js.g.process.platform == "win32" && rootpath == "\\" && (path == "" || path == "\\")
             return (files.winDrives(callback))                              // top level is drive letters in Windows
         if !callback
             return (syncAdapter(dirList, path, options))
@@ -608,7 +608,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         `(error, localpath) = localPath(path)
         if error
             return (asyncResult(callback, error))
-        fs.mkdir(localpath, { recursive: true }, function(errmkdir, local result) {
+        fs.mkdir(localpath, { recursive: true }, function(errmkdir) {
             if errmkdir.code == "EEXIST"
                 fs.stat(localpath, function(errstat, stat) {
                     if errstat || !stat.isDirectory()
@@ -807,7 +807,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //      overwrite:  <boolean>           -- overwrite existing file, if any
     // }
     
-    files.copy = closure copy(srcpath, dest, options, callback, local error, localsrc, localdest, pending) {
+    files.copy = closure copy(srcpath, dest, options, callback, local error, localsrc, localdest) {
         if !callback
             return (syncAdapter(copy, srcpath, dest, options))
         `(error, localsrc) = localPath(srcpath)
@@ -867,31 +867,37 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         if !callback
             return (syncAdapter(reveal, path))
 
-        function addpath(path, local error, localpath) {
-            `(error, localpath) = localPath(path)
-            if error
-                errors.push(error)
-            else
-                pathargs.push("file://localhost".concat(localpath))
-        }
-    
-        errors = []
-        pathargs = ["-R", "--"]                                             // reveal, then stop using '-' for ags
-        if array(path)
-            for item in path
-                addpath(item)
-        else
-            addpath(path)
-        nodecp.execFile("open",
-            pathargs,                                                       // command-line options
-            { },                                                            // execution options
-            function(err, stdout, stderr) {
-                if err
-                    callback(Error("open failed", err, stderr))
-                else
-                    callback(false, errors)
-            }
-        )
+		if js.g.process.platform == "win32" {                               // ### windows only allows one path
+			nodecp.exec('explorer.exe /select,"'.concat(path, '"'), function(err, stdout, stderr) {
+			    callback(false, { ok: true })                               // reports failure even if it works
+			})
+		} else {
+			function addpath(path, local error, localpath) {
+				`(error, localpath) = localPath(path)
+				if error
+					errors.push(error)
+				else
+					pathargs.push("file://localhost".concat(localpath))
+			}
+
+			errors = []
+			pathargs = ["-R", "--"]                                         // reveal, then stop using '-' for ags
+			if array(path)
+				for item in path
+					addpath(item)
+			else
+				addpath(path)
+			nodecp.execFile("open",
+				pathargs,                                                   // command-line options
+				{ },                                                        // execution options
+				function(err, stdout, stderr) {
+					if err
+						callback(Error("open failed", err, stderr))
+					else
+						callback(false, errors)
+				}
+			)
+		}
     }
 
     //
@@ -900,7 +906,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // Execute the uglifyjs utility on the specified source, returning the result as a standard
     // tuple: `(error, minified)
     //
-    files.minimize = closure minimize(input, callback, local child, stdinStream) {
+    files.minimize = closure minimize(input, callback, local child) {
         if !callback
             return (syncAdapter(minimize, input))
         debuglog("==> Warning: files.minimize is deprecated")
@@ -1006,7 +1012,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //      ignoreBinary:                       -- ignore binary files
     //
     files.grepLines = closure grepLines(path, options, callback,
-        local error, localpath, cmdargs, item, execOptions, grep, result, lineRE, maxcount) {
+        local error, localpath, cmdargs, item, execOptions, result, lineRE, maxcount) {
         if !callback
             return (syncAdapter(grepLines, path, options))
         `(error, localpath) = localPath(path)
@@ -1093,7 +1099,8 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //  
     //
 
-    files.execLines = closure execLines(cmdname, options, callback, local output, arg, execops, spawn, linerErr, linerOut) {
+    files.execLines = closure execLines(cmdname, options, callback, 
+        local output, execops, spawn, linerErr, linerOut) {
         if !callback
             return (syncAdapter(execLines, cmdname, options))
         if !string(cmdname) || cmdname == ""
@@ -1118,7 +1125,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         // kill
         // terminate the command
         function kill() {
-            grep.kill()
+            spawn.kill()
             completed(false, output) }                                      // the official end will never come
 
         //

package/frameworks/node/gitter.nlg

@@ -76,10 +76,15 @@ closure Gitter(fs, local gitt) {
     // Compute the bridge path to an absolute repopath (which can point inside a repo) from the
     // phyiscal repo root. If these are the same, or an error occurs, then the result is "".
     //
-    function bridgePath(repopath, local top) {
-        top = repoRoot(repopath).1
-        if top && repopath.startsWith(top) && repopath.length > top.length
-           top = repopath.slice(top.length+1).concat(fs.path.sep)           // move leading "/" of bridge path to trailing
+    function bridgePath(repopath, local above) {
+		above = repoRoot(repopath).1
+		if above
+			above = fs.path.normalize(above)
+        if above && repopath.startsWith(above) && repopath.length > above.length {
+            above = fs.path.relative(above, repopath).split(fs.path.sep).join("/")
+            if above != ""
+                above = above.concat("/")
+        }
         else
             ""                                                              // we are looking at the root, or an error
     }

package/frameworks/node/https_request.nlg

@@ -23,6 +23,7 @@
  *      contentType:    <string>                // sets Content-Type header, otherwise auto-determined
  *      range:          <string>                // sets range header
  *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
+ *      debug:          <boolean>               // log errors and status results
  *  }
  *
  */
@@ -52,25 +53,27 @@ closure HttpsApiRequest(url, options, local urlq, reqOptions, putdata, item, pen
             if error
                 return (list(Error("HttpsApiRequest encode:", url)))
         }
-        fetchOptions.body = putdata
+        reqOptions.body = putdata
     }
     if array(options.headers)
         for item in options.headers
             reqOptions.headers[item.0] = item.1
     pending = new(nonce)
     chunks = []
-    request = nodeHttps.request(url, reqOptions, function (response) {
-        if response.statusCode < 200 || response.statusCode >= 300 {
-            pending.signal(list(Error("HttpsApiRequest statusCode:", url, response.statusCode, {
-                status: response.statusCode
-            })))
-            return
-        }
+    request = nodeHttps.request(url, reqOptions, closure (response) {
         response.on("data", function (chunk) {
             chunks.push(chunk)
         })
         response.on("end", function (local content, error) {
-            content = Buffer.concat(chunks)
+            content = js.g.Buffer.concat(chunks)
+            if response.statusCode < 200 || response.statusCode >= 300 {
+                if options.debug
+                    debuglog("HttpsApiRequest status:", url, response.statusCode, "message:", content)
+                pending.signal(list(Error("HttpsApiRequest statusCode:", url, response.statusCode, {
+                    status: response.statusCode
+                })))
+                return
+            }
             if response.complete {
                 if response.headers["content-type"].startsWith("application/json") {
                     `(error, content) = JsonParse(content.toString())
@@ -86,16 +89,18 @@ closure HttpsApiRequest(url, options, local urlq, reqOptions, putdata, item, pen
                 }
             }
             else
-                error = Error("HttpsApiRequest terminated prematurely:", url)
+                error = Error("HttpsApiRequest terminated prematurely:", url, response.statusCode)
             pending.signal(list(error, content))
         })
     })
-    request.on("error", function(error) {
+    request.on("error", function hre(error) {
+        if options.debug
+            debuglog("HttpsApiRequest error:", url, "error:", error)
         error = Error("HttpsApiRequest failed:", url, error)
         pending.signal(list(error))
     })
-    if data
-        request.write(data)
+    if putdata
+        request.write(putdata)
     request.end()
     pending.wait()
 };
@@ -109,7 +114,7 @@ closure HttpsApiRequest(url, options, local urlq, reqOptions, putdata, item, pen
  */
 
 function https_nodeInit(local manifest) {
-    manifest = `(HttpsGetJson, HttpsPutJson, https_nodeInit)
+    manifest = `(HttpsApiRequest, https_nodeInit)
 
     Naan.module.build(module.id, "https_request", function(modobj, compobj) {
         require("./node.nlg")

package/frameworks/node/psm_server.nlg

@@ -59,7 +59,7 @@ closure psmsFsView(rootpath, local view, gitter) {
     //
     // Entry point for API requests.
     
-    view.api = closure api(req, res, local path, proc, result) {
+    view.api = closure api(req, res, local path, proc) {
         if not string(req.query.path) {
             res.status(400).send("invalid path")
             return }
@@ -78,7 +78,7 @@ closure psmsFsView(rootpath, local view, gitter) {
         }
 
         // op: pathOp
-        function pathOpApi(local selector, local result) {
+        function pathOpApi(local selector, result) {
             try {
                 result = list(false, xapply(JSpath, req.query.selector, totuple(js.g.JSON.parse(req.query.arglist))))
             } catch {
@@ -489,7 +489,7 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
     //
     // Connect to the specified service. The first argument is the rootpath, which is required.
     //
-    connector.connect = function connect(resID, service, args, local error, creds, api) {
+    connector.connect = function connect(resID, service, args, local error, creds) {
         `(error, creds) = connector.access(resID)
         if !error {
             if creds == "HostFS"