@naanlang/naan 1.0.3 → 1.0.6

package/frameworks/browser/https_request.nlg

@@ -0,0 +1,120 @@
+/*
+ * https_browser.nlg
+ *
+ *     Https operations for the browser.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2021-2022 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * HttpsApiRequest
+ *
+ * Perform an API request from the browser. This operates the same as HttpsApiRequest for NodeJS.
+ *
+ * Options:
+ *  {
+ *      method:         <string>                // HTTP method (defaults to GET/PUT)
+ *      query:          <dictionary>            // query variables added to the URL
+ *      putdata:        <data>                  // data to put
+ *      contentType:    <string>                // sets Content-Type header, otherwise auto-determined
+ *      encoding:       <string>                // "binary" to receive binary data as arrayBuffer
+ *      range:          <string>                // sets range header
+ *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
+ *  }
+ *
+ */
+
+closure HttpsApiRequest(url, options,
+    local urlq, fetchOptions, putdata, error, response, contentType, content) {
+    if !options
+        options = { }
+    if options.query
+        urlq = url.concat(EncodeQuery("?", options.query))
+    else
+        urlq = url
+    putdata = options.putdata
+    fetchOptions = {
+        mode: 'cors'
+        cache: 'no-cache'
+        credentials: 'same-origin'
+        headers: { }
+        redirect: 'follow'
+        referrerPolicy: 'no-referrer'
+    }
+    if options.method
+        fetchOptions.method = options.method
+    else if putdata
+        fetchOptions.method = "POST"
+    else
+        fetchOptions.method = "GET"
+    if putdata {
+        if options.contentType
+            fetchOptions.headers['Content-Type'] = options.contentType
+        else if jsTypedArray(options.putdata)
+            fetchOptions.headers['Content-Type'] = "application/octet-stream"
+        else if member(typeof(options.putdata), `(dictionary, array, xobject)) {
+            fetchOptions.headers['Content-Type'] = "application/json"
+            `(error, putdata) = JsonStringify(options.putdata)
+            if error
+                return (list(Error("HttpsApiRequest encode:", url)))
+        }
+        fetchOptions.body = putdata
+    }
+    if options.range
+        fetchOptions.headers.Range = options.range
+    if array(options.headers)
+        for item in options.headers
+            fetchOptions.headers[item.0] = item.1
+    //
+    // perform the fetch and return when complete
+    //
+    `(error, response) = await(js.w.fetch(urlq, fetchOptions))
+    if error
+        return (list(Error("HttpsApiRequest fetch failed:", error, url)))
+    contentType = response.headers.get("content-type")
+    if response.status < 200 || response.status >= 300
+        return (list(Error("HttpsApiRequest status:", url, response.status, {
+            status: response.status
+        })))
+    if contentType.startsWith("application/json") {
+        `(error, content) = await(response.text())
+        if !error
+            `(error, content) = JsonParse(content)
+            if error
+                error = Error("HttpsApiRequest decode:", url, error)
+            else
+                content = new(content)
+            if array(content) {                                             // deencapsulate to get API result
+                content = totuple(content)
+                error = content.0
+                content = content.1
+            }
+    }
+    else if options.encoding == "binary"
+        `(error, content) = await(response.arrayBuffer())
+    else
+        `(error, content) = await(response.text())
+    list(error, content)
+};
+
+
+/*
+ * https_browserInit
+ *
+ * Initialize HTTPS request operations for browsers.
+ *
+ */
+
+function https_browserInit(local manifest) {
+    manifest = `(HttpsApiRequest, https_browserInit)
+
+    Naan.module.build(module.id, "https_request", function(modobj, compobj) {
+        require("./browser.nlg")
+        compobj.manifest = manifest
+        modobj.exports.HttpsApiRequest = HttpsApiRequest
+    })
+}();

package/frameworks/browser/sworker.js

@@ -27,10 +27,8 @@
  * knowledge of which ones are responding. If a request takes longer than a second to respond then
  * this executes a validate operation, which eliminates any clients that have gone away and rejects
  * their pending operations.
- *     One potential problem is stale caches, where a new publisher (e.g. NaanIDE) or new version
- * arises but this worker is still serving old data. The solution is that every publisher provides 
- * its ID and version along with the mesage port. If that is different from the previous version then
- * the old caches are cleared and data re-fetched.
+ *     One potential problem is stale caches. When an older version is discovered then we notify the
+ * client and invalidate the old cache.
  *
  * column positioning:                          //                          //                      !
  *
@@ -38,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang 1.0.3-1";
+var CurrentCacheName = "Naanlang-1.0.6-2";
 
 
 //
@@ -76,8 +74,8 @@ var waitingForInit = [];                        // initialization functions, or
             return;                                                         // already done
         var waiters = waitingForInit;
         waitingForInit = false;                                             // no more waiters allowed
-        for (var waiter in waiters)
-            waiter();                                                       // call each waiter
+        for (var wdex in waiters)
+            waiters[wdex]();                                                // call each waiter
     }
 
     // self.onmessage events
@@ -91,18 +89,13 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        var newCacheName = "Naanlang".concat("-", pubID, "-", pubVersion);
-        console.log("[1.0.3-1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (CurrentCacheName != newCacheName) {
-            for (var srcid in msgPorts)
-                msgPorts[srcid].postMessage({
-                    id: "upgrade",
-                    previous: "1.0.3-1",
-                    version: pubVersion
-                });
-        }
-        ClearCaches(newCacheName)
-            .then(Reaper);                                                  // clean up obsolete info
+        console.log("[1.0.6-2] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.6-2")
+            msgport.postMessage({                                           // notify new version available
+                id: "upgrade",
+                version: "1.0.6-2"
+            });
+        Reaper();                                                           // clean up obsolete info
         
         // msgport.onmessage events
         //
@@ -114,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.3-1] msg received:", msg.text);
+                console.log("[1.0.6-2] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -125,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.3-1",
+                text: "port received by 1.0.6-2",
             });
             */
         if (--pending === 0)
@@ -142,13 +135,13 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.3-1] requesting new msgport for", client.id);
+            console.log("[1.0.6-2] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
             });
         });
-        setTimeout(doneInit, 1000);                                         // release fetches
+        setTimeout(doneInit, 10000);                                        // release fetches
     });
 
     // processResponse
@@ -188,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.3-1] source gone:", sourceId);
+                console.log("[1.0.6-2] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.3-1] client gone:", clientId);
+                console.log("[1.0.6-2] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -218,25 +211,22 @@ function Reaper() {
 /*
  * ClearCaches
  *
- * Clear obsolete caches in favor of the new name, returning a promise.
+ * Clear obsolete caches, returning a promise.
  *
  */
 
-function ClearCaches(newCacheName) {
-    if (CurrentCacheName == newCacheName)
-        return (Promise.resolve());                                         // no change
-    CurrentCacheName = newCacheName;
+function ClearCaches() {
     var promise = caches.keys().then(function(cacheNames) {                 // delete old cache entries
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
-                    if (cacheName !== CurrentCacheName) {
-                        console.log('[1.0.3-1] deleting old cache:', cacheName);
+                    if (cacheName != CurrentCacheName) {
+                        console.log('[1.0.6-2] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.3-1] claiming clients for version', CurrentCacheName);
+            console.log('[1.0.6-2] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -279,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.3-1",
+                version: "1.0.6-2",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -327,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.3-1] install");
+    console.log("[1.0.6-2] install");
     self.skipWaiting();
 });
 
@@ -366,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.3-1] fetch failed", e);
+                    console.log("[1.0.6-2] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -395,16 +385,16 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.3-1] activate");
+    console.log("[1.0.6-2] 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.3-1] matching clients:', urls.join(', '));
+        console.log('[1.0.6-2] matching clients:', urls.join(', '));
     });
-    var promise = ClearCaches(CurrentCacheName);
+    var promise = ClearCaches();
     if (event.waitUntil)
         event.waitUntil(promise);
 });

package/frameworks/browser/terminals.nlg

@@ -77,7 +77,7 @@ closure TermHost(track, api, name, workerID, options,
                     if !target.written
                         target.term.WriteLn("(reconnected)")
                 }, 1000).run()
-            else
+            else if message.respOp
                 debuglog("unknown host response message:", message.respOp)
         }
         
@@ -602,14 +602,17 @@ closure findIDEtarget(track, name, workerID, naancont, local target) {
  *
  */
 
-closure termIDE(track, name, workerID, naancont, local target, connected) {
+closure termIDE(track, name, workerID, naancont, title, local target, connected) {
     target = findIDEtarget(track, name, workerID, naancont)
     if target {                                                             // new naancont on existing target
         target.updateController(naancont)
+        target.title = title
+        track.update(target)
         return (target)
     }
     target = runningExecutors.ExecutorBase(track, "Local", name)
     target.name = name
+    target.title = title
     target.workerID = workerID
     target.naancont = naancont
     connected = []
@@ -756,7 +759,6 @@ closure termIDE(track, name, workerID, naancont, local target, connected) {
 /*
  * termInstallVirtualWatcher
  *
- * column positioning:                          //                          //                      !
  *     Install a persistent watcher to note when virtual terminals come and go, and manage their
  * execution target lifetimes.
  *
@@ -766,7 +768,7 @@ closure termInstallVirtualWatcher(track, naancont) {
 
     function watchVsites(msg, local error, target) {
         if msg.op == "VsiteOpen" {
-            `(error, target) = termIDE(track, msg.name, "NaanVsite", msg.naancont)
+            `(error, target) = termIDE(track, msg.name, "NaanVsite", msg.naancont, msg.title)
             target.attention()
         }
         else if msg.op == "VsiteClose" {

package/frameworks/browser/workers.nlg

@@ -55,8 +55,13 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
                 version: msg.version
             })
         } else if msg.id == "upgrade" {
-            if msg.version != msg.previous                                  // same version: new install
-                debuglog("service worker version upgrade to:", msg.version, "from", msg.previous)
+            if serv.upgrade != msg.version {
+                serv.upgrade = msg.version                                  // only report once
+                callback(false, {
+                    message: "upgrade"
+                    version: msg.version
+                })
+            }
         }
         else if msg.id == "text"
             debuglog("sw[".concat(serv.scope, "]: "), msg.text)             // handy remote debug capability
@@ -182,7 +187,7 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
  *
  */
 
-closure ScopedServiceWorker(pubID, pubVersion, local scoper, result) {
+closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
     scoper = new(object, ScopedServiceWorker)
     scoper.scopes = {}
     scoper.serv = ServiceWorker(pubID, pubVersion)
@@ -232,7 +237,8 @@ closure ScopedServiceWorker(pubID, pubVersion, local scoper, result) {
             response.body = data
             scoper.serv.msgport.postMessage(response)
             return
-        }
+        } else if data.message == "upgrade"
+            callback(data.version)
     })
     if result.0 {
         ErrorDebuglog("ScopedServiceWorker failed", result)
@@ -308,6 +314,7 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
         mimeType = {
             "css":  "text/css",
             "csv":  "text/csv",
+            "gif":  "image/gif",
             "htm":  "text/html",
             "html": "text/html",
             "ico":  "image/x-icon",
@@ -365,8 +372,8 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
  *
  */
 
-closure TrackServiceWorkers(track, pubID, pubVersion, local error) {
-    `(error, serviceWorker) = ScopedServiceWorker(pubID, pubVersion)
+closure TrackServiceWorkers(track, pubID, pubVersion, callback, local error) {
+    `(error, serviceWorker) = ScopedServiceWorker(pubID, pubVersion, callback)
     if error
         ErrorDebugLog("TrackServiceWorkers: cannot load service worker", error)
     track.register(TrackedScope, "V-Site")

package/frameworks/client/apiclient.nlg

@@ -37,7 +37,7 @@ closure MakeNideAPIclient(url, guid, local client) {
         request.addEventListener("error", function reqFailed(event, local errtext) {
             if request.status == 0
                 errtext = "connectivity"
-            ellse
+            else
                 errtext = "request failed"
             error = Error(errtext, {
                 status: request.status

package/frameworks/client/psm_client.nlg

@@ -22,6 +22,50 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     view = new(object, this)
     view.api = api
     view.rootpath = rootpath
+    
+    // data
+    //
+    // Return the filesystem data, i.e. the tree data field. The minimum information is:
+    //      platform    -- e.g. "darwin" or "win32"
+    //      semantics   -- e.g. "win32" or "posix"
+    //      pathsep     -- e.g. / or \
+
+    view.data = closure data(callback) {
+        if !callback
+            return (syncAdapter(data))
+        params = {
+            path: ""
+            op: "tree"
+            depthlimit: 0
+        }
+        api.psmRemote(params, false, function(error, tree) {
+            if error
+                debuglog("psmcFsView.data: can't get initial filesystem data:", ErrorString(error))
+            else {
+                view.fsdata = tree.data
+                if rootpath == ""
+                    rootpath = tree.data.pathsep
+            }
+            callback(error, tree.data)
+        })
+    }
+    
+    // pathInit
+    //
+    // Initialize our path module for the applicable path type.
+    
+    closure pathInit(local result) {
+        result = view.data()
+        if result.0
+            pathmod = false
+        else {
+            if view.fsdata.pathsep == "\\"
+                pathmod = JSpath.win32
+            else
+                pathmod = JSpath.posix
+            false
+        }
+    }
 
     // psmRemote
     //
@@ -30,10 +74,14 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     closure psmRemote(path, op, options, putdata, callback, local params, item) {
         if !callback
             return (syncAdapter(psmRemote, path, op, options, putdata))
+        if !pathmod && pathInit()
+            return                                                          // failed to initialize path module
         if !string(path)
             return (asyncResult(callback, Error("invalid path:", typeof(path))))
+        if rootpath != ""
+            path = pathmod.resolve(rootpath, path)
         params = {
-            path: JSpath.resolve(rootpath, path)
+            path: path
             op: op
         }
         for item in options
@@ -59,47 +107,39 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
 
     // path
     //
-    // The path sub-object remotes calls to the NodeJS path module.
+    // Redirect path calls to module chosen for filesystem semantics. It is possible for this to fail
+    // on first connection to the filesystem, in which case we return false for the path result.
+    // Throwing an error would complicate our callers and testing. This way there's a small chance
+    // that a transient error will give a bad path, but that will be detected downstream.
 
     view.path = new(object, this)
-    view.path[".undefined"] = closure path args {
-        closure (selector, arglist, local error, info) {
-            if !pathmod {
-                `(error, data) = view.data()
-                if error
-                    return (list(error))
-                if info.pathsep == "\\"
-                    pathmod = JSpath.win32
-                else
-                    pathmod = JSpath.posix
-            }
-            xapply(pathmod, selector, arglist)
-        } (args.0, args.-1)
+    view.path[".undefined"] = function path args {
+        if !pathmod
+            pathInit()
+        xapply(pathmod, args.0, args.-1)
     }
     
-    // data
+    // folderPath
     //
-    // Return the filesystem data, i.e. the tree data field. The minimum information is:
-    //      platform    -- e.g. "darwin" or "win32"
-    //      semantics   -- e.g. "win32" or "posix"
-    //      pathsep     -- e.g. / or \
-
-    view.data = closure data(callback) {
-        if !callback
-            return (syncAdapter(data))
-        psmRemote("", "tree", { depthlimit: 0 }, false, function(error, tree) {
-            view.fsdata = tree.data
-            callback(error, tree.data)
-        })
+    // Return the path of the specified special folder:
+    //      "HomeDir"
+    //      "TempDir"
+    //      "PackageDir"
+    // The returned path is relative to our root if within it, or absolute otherwise.
+    
+    view.folderPath = function folderPath(folderID, callback) {
+        psmRemote("", "folderPath", {
+            folderid: folderID
+        }, false, callback)
     }
                
     // readLines
     //
     // Read a lines of a file at the specified path with options:
-    //      matchRE:        -- JavaScript regex
-    //      ignoreCase:     -- ignore case during match
-    //      invert:         -- return lines that DO NOT match the regex
-    //      returnText:     -- return text of matched lines
+    //      matchRE:                            -- JavaScript regex
+    //      ignoreCase:                         -- ignore case during match
+    //      invert:                             -- return lines that DO NOT match the regex
+    //      returnText:                         -- return text of matched lines
     // When using a matchRE, the return value is an array of [ lineNumber, text ] pairs if
     // returnText is specified, or just an array of one-based line numbers otherwise.
     //
@@ -248,6 +288,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Search the specified file or recursive directory.
     
     view.dirSearch = function dirSearch(path, options, callback) {
+        if options.excludeDirs {
+            options = new(options)
+            options.excludeDirs = JSONstringify(options.excludeDirs)
+        }
         psmRemote(path, "dirSearch", options, false, callback)
     }
 
@@ -317,6 +361,10 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Grep the specified file or recursive directory.
     
     view.grepLines = function grepLines(path, options, callback) {
+        if options.excludeDirs {
+            options = new(options)
+            options.excludeDirs = JSONstringify(options.excludeDirs)
+        }
         psmRemote(path, "grepLines", options, false, callback)
     }