@naanlang/naan 1.0.6 → 1.0.8

package/frameworks/browser/browser.nlg

@@ -6,11 +6,92 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
 
+/*
+ * FileReader
+ *
+ *     Read file(s) from the browser's host machine. This is passed a File object and returns a
+ * nearly-standard (error, blob, size) tuple. If progress is specified then this function is called
+ * with a percentage of completion from zero to 100 if available, or true otherwise. The progress
+ * callback is called with "false" when completed, with or without success
+ *
+ */
+
+closure FileReader(file, progress, local pending, freader, result) {
+    pending = new(nonce)
+    freader = xnew(window.FileReader)
+    freader.addEventListener("load", function(event, local blob) {
+        blob = xnew(window.Blob, [freader.result], {
+            type: file.type
+        })
+        pending.signal(list(false, blob, event.total))
+    })
+    freader.addEventListener("error", function(error) {
+        pending.signal(list(error))
+    })
+    freader.AddEventListener("progress", function(event) {
+        if event.lengthComputable && event.total
+            progress(toint((event.loaded * 100) / event.total))
+        else
+            progress(true)
+    })
+    freader.readAsArrayBuffer(file)
+    result = pending.wait()
+    progress(false)
+    result
+};
+
+
+/*
+ * FileDownload
+ *
+ *     Download a file from the browser, returning a standard error tuple.
+ *
+ */
+
+closure FileDownload(file, progress, local error, blob, sizez, url, link) {
+    `(error, blob, size) = FileReader(file, progress)
+    if error
+        list(error)
+    else {
+        url = window.URL.createObjectURL(blob)
+        link = document.createElement("a")
+        link.href = url
+        link.download = file.name
+        link.click()
+        window.URL.revokeObjectURL(url)
+        list(false, file.name)
+    }
+};
+
+
+/*
+ * 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
  *
@@ -20,11 +101,19 @@
  */
 
 function brorInit(local manifest) {
-    manifest = `(brorInit)
+    manifest = `(FileReader, FileDownload, Platform, brorInit)
 
     Naan.module.build(module.id, "browser", function(modobj, compobj) {
         require("../common").LiveImport()
         compobj.manifest = manifest
-        runningExecutors = require("../running/executors.nlg")
+        modobj.exports.FileReader = FileReader
+        modobj.exports.FileDownload = FileDownload
+        modobj.exports.Platform = Platform
+
+        function brorReload() {
+            window = js.w
+            document = window.document
+        }()
+        module.reload = brorReload
     })
 } ();

package/frameworks/browser/https_request.nlg

@@ -72,7 +72,7 @@ closure HttpsApiRequest(url, options,
     //
     // perform the fetch and return when complete
     //
-    `(error, response) = await(js.w.fetch(urlq, fetchOptions))
+    `(error, response) = await(window.fetch(urlq, fetchOptions))
     if error
         return (list(Error("HttpsApiRequest fetch failed:", error, url)))
     contentType = response.headers.get("content-type")
@@ -113,7 +113,7 @@ function https_browserInit(local manifest) {
     manifest = `(HttpsApiRequest, https_browserInit)
 
     Naan.module.build(module.id, "https_request", function(modobj, compobj) {
-        require("./browser.nlg")
+        require("browser.nlg")
         compobj.manifest = manifest
         modobj.exports.HttpsApiRequest = HttpsApiRequest
     })

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.6-2";
+var CurrentCacheName = "Naanlang-1.0.8+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.6-2] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.6-2")
+        console.log("[1.0.8+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.8+1")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.6-2"
+                version: "1.0.8+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.6-2] msg received:", msg.text);
+                console.log("[1.0.8+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.6-2",
+                text: "port received by 1.0.8+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.6-2] requesting new msgport for", client.id);
+            console.log("[1.0.8+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.6-2] source gone:", sourceId);
+                console.log("[1.0.8+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.6-2] client gone:", clientId);
+                console.log("[1.0.8+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.6-2] deleting old cache:', cacheName);
+                        console.log('[1.0.8+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.6-2] claiming clients');
+            console.log('[1.0.8+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.6-2",
+                version: "1.0.8+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.6-2] install");
+    console.log("[1.0.8+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.search.length !== 0 && url.searchParams.get("naanver") !== "09e820a5a47c4b099bacaa5d8a7d3f7a"
                 || 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.6-2] fetch failed", e);
+                    console.log("[1.0.8+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.6-2] activate");
+    console.log("[1.0.8+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.6-2] matching clients:', urls.join(', '));
+        console.log('[1.0.8+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/browser/terminals.nlg

@@ -21,7 +21,7 @@
 closure TermHost(track, api, name, workerID, options,
     local target, nlregex, clientID, serverID)
 {
-    target = runningExecutors.ExecutorBase(track, "Host", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Host", name)
     clientID = "DebugWorkers"
     serverID = "Workers"
     nlregex = RegExp("\\n", "g")
@@ -35,7 +35,7 @@ closure TermHost(track, api, name, workerID, options,
     closure connect(local pending) {
         if target.ws
             return
-        target.ws = xnew(js.w.WebSocket,"ws://".concat(js.w.location.host)) // ### use api parameter
+        target.ws = xnew(window.WebSocket,"ws://".concat(window.location.host)) // ### use api parameter
         pending = new(nonce)
     
         // onopen
@@ -52,7 +52,7 @@ closure TermHost(track, api, name, workerID, options,
         
         target.ws.onmessage = function onmessage(e, message, local msg) {
             try {
-                message = new(js.w.JSON.parse(e.data))
+                message = new(window.JSON.parse(e.data))
             } catch {
                 if true {
                     debuglog("can't decode incoming ws message:", exception)
@@ -169,7 +169,7 @@ closure TermHost(track, api, name, workerID, options,
     //     Send a message to the worker controller.
 
     target.sendControl = function sendControl(workerOp, payload) {
-        target.ws.send(js.w.JSON.stringify({
+        target.ws.send(window.JSON.stringify({
             guid: api.guid
             clientID: clientID
             serverID: serverID
@@ -368,23 +368,23 @@ closure TermLocal(track, name, workerID, options,
         options = new(options)
     else
         options = { }
-    target = runningExecutors.ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     nlregex = RegExp("\\n", "g")
     target.workerID = workerID
     target.msgQueue = []
     if workerID == "NaanIDE-Debug" {
-        target.worker = js.w.open(js.w.location.href, "_blank")
+        target.worker = window.open(window.location.href, "_blank")
         target.worker.addEventListener("beforeunload", function(e) {        // our target is closing
             destroy()
         })
-        js.w.addEventListener("beforeunload", function(e) {                 // we are closing
+        window.addEventListener("beforeunload", function(e) {               // we are closing
             // ### tell target we are closing (if needed)
         })
-        listener = js.w
+        listener = window
     } else {
-        if not js.w.Worker
+        if not window.Worker
             return (list(Error("Local environment does not support workers")))
-        target.worker = xnew(js.w.Worker, "env_webworker.js")
+        target.worker = xnew(window.Worker, "env_webworker.js")
         listener = target.worker
     }
 
@@ -460,6 +460,8 @@ closure TermLocal(track, name, workerID, options,
             target.statusCB(target, msg.status)
         else if msg.id == "debugout"
             target.debugger.debugData(target, msg.data)
+        else if msg.id == "download"
+            FileDownload(xnew(window.File, msg.bits, msg.name, msg.options))
         else if msg.id == "loaded" {
             if !target.started
                 target.worker.postMessage({
@@ -610,7 +612,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         track.update(target)
         return (target)
     }
-    target = runningExecutors.ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     target.name = name
     target.title = title
     target.workerID = workerID
@@ -778,7 +780,7 @@ closure termInstallVirtualWatcher(track, naancont) {
         }
     }
     
-    runningExecutors.TaskOnMessageHook(watchVsites)
+    require("../running/executors.nlg").TaskOnMessageHook(watchVsites)
 };
 
 

package/frameworks/browser/workers.nlg

@@ -29,7 +29,7 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
     closure updateReg(local mchan) {
         if !serv.sw
             return
-        mchan = xnew(js.w.MessageChannel)
+        mchan = xnew(window.MessageChannel)
         serv.msgport = mchan.port2
         serv.msgport.onmessage = workerMsg.proc
         serv.sw.postMessage({
@@ -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"
@@ -112,13 +113,13 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
         serv.scope = scope
         if !scope
             return (makeResult(Error("service worker scope required")))
-        if !js.w.navigator.serviceWorker
+        if !window.navigator.serviceWorker
             return (makeResult(Error("service workers not supported")))
-        js.w.navigator.serviceWorker.addEventListener("message", function(event) {
+        window.navigator.serviceWorker.addEventListener("message", function(event) {
             if event.data.msg == "Naan_need_fetch_port"
                 updateReg()
         })
-        await(js.w.navigator.serviceWorker.register("sworker.js", { scope: scope }).then(function (reg) {
+        await(window.navigator.serviceWorker.register("sworker.js", { scope: scope }).then(function (reg) {
             return (reg.update())
         }).then(function (reg) {
             serv.reg = reg
@@ -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"
             })
@@ -211,7 +218,7 @@ closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
             }
             
             // read resource
-            filepath = xnew(js.w.URL, data.request.url).pathname
+            filepath = xnew(window.URL, data.request.url).pathname
             filepath = DecodeURIComponent(filepath)                         // "/run/<scope>/path..."
             filepath = filepath.slice(4)                                    // "/<scope>/path..."
             error = true                                                    // stays true iff not in scope
@@ -308,7 +315,7 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
     trope = findTrackedScope(track, scope)
     if trope
         return (list(false, trope))
-    trope = runningExecutors.ExecutorBase(track, "ServiceWorkers", scope)
+    trope = require("../running/executors.nlg").ExecutorBase(track, "ServiceWorkers", scope)
     serviceWorker.register(scope, closure(filepath, scope, init,
         local options, mimeType, error, data) {
         mimeType = {

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
         }
     }

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
  *
  */
 
@@ -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
  *
@@ -143,7 +164,7 @@ function JsonStringify(data) {
 jsScripts = { };                                                            // script values become false on reload
  
 function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
-    if jsScripts[jsScripts]
+    if jsScripts[libpath]
         return                                                              // already loaded
     if libpath.startsWith("/")
         fpath = libpath
@@ -155,10 +176,10 @@ function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
     } else if js.w {                                                        // load in browser context
         pending = new(nonce)
         scriptTag = js.w.document.createElement("script")
-        scriptTag.src = js.w.location.origin.concat(fpath)
+        scriptTag.src = js.w.location.origin.concat(fpath, requireQuery())
         scriptTag.onload = function (event) {
             jsScripts[libpath] = js.w[globalID]
-            pending.signal(JSZipLib)
+            pending.signal(js.w[globalID])
             true
         }
         scriptTag.onerror = function (event) {
@@ -303,7 +324,8 @@ JSONparse = false;
 Uint8ArrayFromString = false;
 
 function comrInit(local manifest) {
-    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, 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
@@ -418,7 +440,9 @@ function comrInit(local manifest) {
                 }
                 //
                 // MD5 functions
-                JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
+                if symbol(NideBuild) {                                      // execute if we are not building
+                    JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
+                }
                 //
                 // hasMD5 in hex
                 HashMD5 = function browserMD5(data, raw) {
@@ -474,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")
@@ -532,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

@@ -567,7 +567,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // 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 == "\\"
+        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))
@@ -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)
+				}
+			)
+		}
     }
 
     //

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
     }