@naanlang/naan 1.4.3 → 1.5.0

package/frameworks/browser/browser.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
@@ -33,7 +33,7 @@ closure FileReader(file, progress, local pending, freader, result) {
     freader.addEventListener("error", function(error) {
         pending.signal(list(error))
     })
-    freader.AddEventListener("progress", function(event) {
+    freader.addEventListener("progress", function(event) {
         if event.lengthComputable && event.total
             progress(toint((event.loaded * 100) / event.total))
         else

package/frameworks/browser/https_request.nlg

@@ -25,6 +25,7 @@
  *      range:          <string>                // sets range header
  *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
  *      keepalive:      <boolean>               // true to send data at unload
+ *      retrier:        <function>              // retry selected failures
  *      debug:          <boolean>               // log errors and status results
  *  }
  *
@@ -39,11 +40,35 @@
  */
 
 closure HttpsApiRequest(url, options,
-    local urlq, fetchOptions, putdata, item, error, response, 
+    local delayf, urlq, fetchOptions, putdata, item, error, response, 
         contentType, content, headers) {
-    global(window)
-    if !options
-        options = { }
+    global(window, common)
+    //
+    // defRetrier -- backoff and retry selected errors
+    //
+    function defRetrier(error, headers, local retryAfter, retryms, waitms) {
+        if member(error.status, `(408, 500, 502, 503, 504)) {               // retriable errors
+            retryAfter = headers["retry-after"]
+            if retryAfter {
+                retryms = toint(retryAfter) * 1000
+                if !retryms
+                    retryms = Date(retryAfter).getTime() - Date.now()
+                if retryms < 0
+                    retryms = false
+            }
+            if !delayf
+                delayf = common.ExbackFactory(12,30)                        // 12s max backoff, 30s deadline
+            waitms = delayf()
+            if !waitms || waitms < retryms
+                waitms = retryms
+            if options.debug
+                debuglog("HttpsApiRequest.defRetrier: wait ${waitms} msec using retry-after ${retryAfter}")
+            if waitms                                                       // return false to give up
+                sleep(waitms)                                               // return true from sleep to retry
+        }
+    }
+
+    options = merge({ retrier: defRetrier }, options)
     if options.query
         urlq = url.concat(EncodeQuery("?", options.query))
     else
@@ -92,16 +117,23 @@ closure HttpsApiRequest(url, options,
                 debuglog("HttpsApiRequest error:", url, "error:", error)
             return (list(Error("HttpsApiRequest fetch failed:", error, url)))
         }
+        headers = { }
+        response.headers.forEach(function(value, key) {
+            headers[key.toLowerCase()] = value
+        })
         if response.status < 200 || response.status >= 299 {                // 299 is "cancelled"
             if options.debug
                 debuglog("HttpsApiRequest status:", url, response.statusCode)
             error = Error("HttpsApiRequest status:", url, response.status, {
                 status: response.status
             })
-            if options.retrier(error)
+            if options.retrier(error, headers)
                 continue                                                    // optional retry/delay logic
             else
-                return (list(error, false, { status: response.status }))
+                return (list(error, false, {
+                    headers: headers
+                    status: response.status
+                }))
         } else
             break
     }
@@ -125,10 +157,6 @@ closure HttpsApiRequest(url, options,
         `(error, content) = await(response.arrayBuffer())
     else
         `(error, content) = await(response.text())
-    headers = { }
-    response.headers.forEach(function(value, key) {
-        headers[key.toLowerCase()] = value
-    })
     list(error, content, {
         headers: headers
         status: response.status
@@ -149,6 +177,7 @@ function https_browserInit(local manifest) {
 
     Naan.module.build(module.id, "https_request", function(modobj, compobj) {
         require("browser.nlg")
+        common = require("../common/utils.nlg")
         compobj.manifest = manifest
         modobj.exports.HttpsApiRequest = HttpsApiRequest
     })

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.4.3+1";
+var CurrentCacheName = "Naanlang-1.5.0+1";
 
 
 //
@@ -92,18 +92,18 @@ var terminated;                                 // flag that this service worker
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.4.3+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.4.3+1") {
+        console.log("[1.5.0+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.5.0+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.4.3+1] update pending for", sourceId);
+                console.log("[1.5.0+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.4.3+1"
+                    version: "1.5.0+1"
                 });
-                console.log("[1.4.3+1] update sent for:", sourceId);
+                console.log("[1.5.0+1] update sent for:", sourceId);
             }
         }
         Reaper();                                                           // clean up obsolete info
@@ -134,10 +134,10 @@ var terminated;                                 // flag that this service worker
         msgport.onmessage = function(msg) {
             msg = msg.data;
             if (msg.id == "skipWaiting") {                                  // try to activate this SW now
-                console.log("[1.4.3+1] attempting skipWaiting");
+                console.log("[1.5.0+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.4.3+1] terminated");
+                console.log("[1.5.0+1] terminated");
                 terminate();
             } else if (msg.id == "abortURL") {                              // abort an I/O transaction
                 var href = new URL(msg.url).href;
@@ -150,7 +150,7 @@ var terminated;                                 // flag that this service worker
             } else if (msg.id == "response")                                // response from fetch request
                 processResponse(msg);
             else if (msg.id == "text")                                      // just log some text
-                console.log("[1.4.3+1] msg received:", msg.text);
+                console.log("[1.5.0+1] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -161,7 +161,7 @@ var terminated;                                 // flag that this service worker
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.4.3+1",
+                text: "port received by 1.5.0+1",
             });
             */
         if (--pending === 0)
@@ -178,7 +178,7 @@ var terminated;                                 // flag that this service worker
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.4.3+1] requesting new msgport for", client.id);
+            console.log("[1.5.0+1] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
@@ -224,12 +224,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.4.3+1] source gone:", sourceId);
+                console.log("[1.5.0+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.4.3+1] client gone:", clientId);
+                console.log("[1.5.0+1] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -263,16 +263,16 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.4.3+1] deleting old cache:', cacheName);
+                        console.log('[1.5.0+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.4.3+1] claiming clients');
+            console.log('[1.5.0+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.4.3+1] clients claimed');
+            console.log('[1.5.0+1] clients claimed');
             return (Promise.resolve(true));
         });
     return (promise);
@@ -315,7 +315,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.4.3+1",
+                version: "1.5.0+1",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -363,7 +363,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.4.3+1] install");
+    console.log("[1.5.0+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.4.3+1] activate");
+    console.log("[1.5.0+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.4.3+1] matching clients:', urls.join(', '));
+        console.log('[1.5.0+1] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches().then(function() {
         for (var sourceId in upgradeMsgPorts) {
             upgradeMsgPorts[sourceId].postMessage({                         // notify new version available
                 id: "upgrade",
-                version: "1.4.3+1"
+                version: "1.5.0+1"
             });
         }
         upgradeMsgPorts = false;
@@ -421,7 +421,7 @@ self.addEventListener('fetch', function(event) {
             var promise;
             var url = new URL(request.url);
             var nocache = request.method != "GET"
-                || url.search.length !== 0 && url.searchParams.get("naanver") !== "3b6364f71856e32f6cb8edae0e67bbc2"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "1df9163d801364d0cae89b149cc24ef5"
                 || request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -455,7 +455,7 @@ self.addEventListener('fetch', function(event) {
                             statusText: "Request Cancelled"
                         }));
                     }
-                    console.log("[1.4.3+1] fetch failed", request.url, e);
+                    console.log("[1.5.0+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"

package/frameworks/browser/terminals.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2024 by Richard C. Zulch
+ * Copyright (c) 2019-2025 by Richard C. Zulch
  *
  */
 
@@ -48,8 +48,8 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
     nlregex = RegExp("\\n", "g")
     target.workerID = options.workerID
     target.msgQueue = []
-    target.dispatcher = call(options.dispatcher, function(reply) { reply })
-        
+    target.dispatcher = call(options.dispatcher)
+
     // findWorker
     //
     function findWorker(testID, local instance) {
@@ -135,19 +135,20 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
 
         // dispatcher
         // Respond to a host request while preserving context to permit reply routing
-        closure dispatcher(message, local reply) {
-            reply = target.dispatcher(message.payload.data)
-            target.ws.send(window.JSON.stringify({
-                guid: api.guid
-                clientID: message.clientID
-                serverID: message.serverID
-                workerID: message.workerID
-                respOp: "msgout"
-                payload: {
-                    id: "targetout",
-                    data: reply
-                }
-            }))
+        closure dispatcher(message) {
+            target.dispatcher(message.payload.data, function(reply) {
+                target.ws.send(window.JSON.stringify({
+                    guid: api.guid
+                    clientID: message.clientID
+                    serverID: message.serverID
+                    workerID: message.workerID
+                    respOp: "msgout"
+                    payload: {
+                        id: "targetout",
+                        data: reply
+                    }
+                }))
+            })
         }
 
         // onerror
@@ -334,6 +335,7 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
     //
     
     target.debugWrite = function(text, level) {
+        text = text.replaceAll("\n", "\r\n")
         if (level >= 5)
             target.term.WriteLn(text, target.term.Cyan)                     // cyan for builtin logging
         else if (level >= 4)
@@ -560,7 +562,7 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
             msg.data._guid = target.guid
             js.t.DispatchMessage(msg.data)
         }
-     }
+    }
     
     //
     // target.DebugCmd
@@ -596,6 +598,7 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
     //
     
     target.debugWrite = function(text, level) {
+        text = text.replaceAll("\n", "\r\n")
         if (level >= 5)
             target.term.WriteLn(text, target.term.Cyan)                     // cyan for builtin logging
         else if (level >= 4)
@@ -761,14 +764,18 @@ closure WorkerToMain(local nideRunning, track) {
 /*
  * findIDEtarget
  *
- *     Find a target for our IDE that matches the specified name, workerID, and naancont.
+ *     Find a target for our IDE that matches the specified name, workerID, and naancont. Either the
+ * title or the naancont must match. The title will match but not the naancont if the window was
+ * closed/reloaded but we didn't get notified because browsers are annoying that way. Alternatively
+ * the naancont will match but not the title if we have updated the version.
  *
  */
 
-closure findIDEtarget(track, name, workerID, naancont, local target) {
+closure findIDEtarget(track, name, workerID, title, naancont, local target) {
     global()
     for target in track.enumlist()
-        if target.name == name && target.workerID == workerID && (!target.naancont || target.naancont === naancont)
+        if target.name == name && target.workerID == workerID
+            && (target.title == title || !target.naancont || target.naancont === naancont)
             return (target)
     false
 };
@@ -785,8 +792,10 @@ closure findIDEtarget(track, name, workerID, naancont, local target) {
 
 closure termIDE(track, name, workerID, naancont, title, local target, connected) {
     global(js, gWorkers)
-    target = findIDEtarget(track, name, workerID, naancont)
+    target = findIDEtarget(track, name, workerID, title, naancont)
     if target {                                                             // new naancont on existing target
+        if target.naancont && naancont !== target.naancont
+            target.targetClose()
         target.updateController(naancont)
         target.title = title
         track.update(target)
@@ -931,7 +940,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
     //
     //     Mark the target window as closed.
     //
-    function targetClose(local conn) {
+    target.targetClose = function targetClose(local conn) {
         for conn in connected {
             conn.db.detach(target)
             conn.WriteLn("\x1b[90m\x1b[3m".concat("\ntarget closed", "\x1b[0m"))
@@ -1009,12 +1018,12 @@ closure termInstallVirtualWatcher(track, naancont) {
             target.attention()
         }
         else if msg.op == "VsiteClose" {
-            target = findIDEtarget(track, msg.name, "NaanVsite", msg.naancont)
+            target = findIDEtarget(track, msg.name, "NaanVsite", msg.title, msg.naancont)
             if target
                 target.updateController()
         }
         else if msg.op == "VsiteVisibilityChange" {
-            target = findIDEtarget(track, msg.name, "NaanVsite", msg.naancont)
+            target = findIDEtarget(track, msg.name, "NaanVsite", msg.title, msg.naancont)
             if target
                 target.setCheckStatus(msg.hidden, msg.window)
         }

package/frameworks/client/apiclient.nlg

@@ -2,41 +2,50 @@
  * apiclient.nlg
  * Naanlib/frameworks/client
  *
- *     Access to Nide API with browser HTTP client.
+ *     Access to Nide API with specified HTTP client.
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2024 by Richard C. Zulch
+ * Copyright (c) 2017-2025 by Richard C. Zulch
  *
  */
 
 
 /*
- * NideAPIclient
+ * APIClient
  *
- *     Make an API client object for browsers.
+ *     Make an API client object.
+ *
+ * Options:
+ *  {
+ *      url:            <string>                // hostname or URL of the remote server
+ *      guid:           <string>                // shared secret for access to remote server
+ *      instanceID:     <string>                // optional UUID for our client; can be persisted by caller
+ *  }
  *
  */
 
-closure NideAPIclient(url, guid, apiRequester, local client) {
-    global()
+closure APIClient(options, local client, url, guid) {
+    global(App)
     client = new(object, this)
+    url = options.url
     if !url.match(RegExp("^https?:\/\/", "i"))
         url = "http://${url}"                                               // a protocol is required
     if url.slice(-1) != "/"
         url = url.concat("/")                                               // must end in "/"
     client.url = url
-    client.guid = guid
+    client.guid = options.guid
+    client.instanceID = options.instanceID || UUID()                        // our client's unique ID
     client.notifyAfter = 0
-    client.instanceID = UUID()                                              // our client's unique ID
+    client.requester = clirRequester()
 
     // clientRequest() - append our guid to the headers
 
-    closure clientRequest(url, options) {
-        options = merge(options)
-        if guid
-            options.headers = [list("x-naanlang-api-guid", guid)]
-        apiRequester(url, options)
+    closure clientRequest(url, reqops) {
+        reqops = merge(reqops)
+        if options.guid
+            reqops.headers = [list("x-naanlang-api-guid", options.guid)]
+        client.requester(url, reqops)
     }
 
     //
@@ -57,7 +66,7 @@ closure NideAPIclient(url, guid, apiRequester, local client) {
             timeout: timeoutms
             after: client.notifyAfter
         })
-        `(error, content, extra) = clientRequest(url.concat(query))
+        `(error, content, extra) = clientRequest(url.concat(query), { retrier: false }) // don't retry inside
         if (error || extra.status != 200)
             cbStatus()
         else if (length(content) == 0)
@@ -76,8 +85,12 @@ closure NideAPIclient(url, guid, apiRequester, local client) {
     // get
     //
 
-    client.get = closure get(path, options, local error, content, extra) {
-        `(error, content, extra) = clientRequest(url.concat(path))
+    client.get = closure get(path, options, local requrl, error, content, extra) {
+        if App.cache
+            requrl = url.concat(EncodeQuery(path.concat("?"), { naanver: App.cache }))
+        else
+            requrl = url.concat(path)
+        `(error, content, extra) = clientRequest(requrl)
         if !error && extra.status != 200
             error = Error("readFile failed: ".concat(extra.status), {
                     status: extra.status
@@ -153,12 +166,12 @@ closure NideAPIclient(url, guid, apiRequester, local client) {
 
 function apicInit(local manifest) {
 
-    manifest = `(NideAPIclient, apicInit)
+    manifest = `(APIClient, apicInit)
 
     Naan.module.build(module.id, "apiclient", function(modobj, compobj) {
         Naan.module.require("./client.nlg")
         compobj.manifest = manifest
-        modobj.exports.NideAPIclient = NideAPIclient
+        modobj.exports.APIClient = APIClient
     })
 
 } ();

package/frameworks/client/client.nlg

@@ -6,11 +6,31 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
 
+/*
+ * clirRequester
+ *
+ *     Return an appropriate HttpsRequestApi client based on our environment.
+ *
+ */
+
+clirRequestApi = false;
+
+function clirRequester() {
+    if !clirRequestApi {
+        if js.w
+            clirRequestApi = require("naanlib:frameworks/browser/https_request.nlg").HttpsApiRequest
+        else
+            clirRequestApi = require("naanlib:frameworks/node/https_request.nlg").HttpsApiRequest
+    }
+    clirRequestApi
+};
+
+
 /*
  * clirInit
  *
@@ -20,7 +40,7 @@
  */
 
 function clirInit(local manifest) {
-    manifest = `(clirInit)
+    manifest = `(clirRequester, clirInit)
 
     Naan.module.build(module.id, "client", function(modobj, compobj) {
         require("../common/").LiveImport()

package/frameworks/client/psm_client.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2024 by Richard C. Zulch
+ * Copyright (c) 2019-2025 by Richard C. Zulch
  *
  */
 
@@ -633,8 +633,17 @@ closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
                 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 !api {                                                   // create API to remote server
+                    connector.apis[creds.urlName] = api = APIClient({
+                        url: creds.urlName
+                        guid: creds.authSecret
+                        instanceID: creds.instanceID
+                    })
+                    if creds.instanceID != api.instanceID {                 // update our client instanceID
+                        creds.instanceID = api.instanceID
+                        `(error) = connector.vault.updateResource(resID, creds)
+                    }
+                }
             }
         }
         if error

package/frameworks/node/filesystem.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2022 by Richard C. Zulch
+ * Copyright (c) 2017-2025 by Richard C. Zulch
  *
  */
 
@@ -1041,6 +1041,8 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         cmdargs.push(options.pattern)
         cmdargs.push(JSpath.resolve(rootpath, localpath))
         execOptions = { cmdargs: cmdargs }
+        if js.g.process.platform == "win32"                                 // to make "-i" work on Windows
+            execOptions.spawnops = { env: merge(js.g.process.env, { LC_ALL: 'en_US.UTF-8' }) }
         result = []
         lineRE = RegExp("([^:]*):([0-9]+):(.*)$")                           // <path>:<line-number>:<matching-text-line>
         if integer(options.maxCount)
@@ -1075,7 +1077,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     // has completed. Options are:
     //  {
     //      cmdargs:            -- array of string arguments to the command (see below)
-    //      execops:            -- optional exec options like cwd
+    //      spawnops:           -- optional spawn options like cwd
     //      errproc:            -- callback for stderr output lines, or false
     //      errLE:              -- string or RegExp for stderr line ending
     //      outproc:            -- optional callback for stdout output lines
@@ -1100,7 +1102,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
     //
 
     files.execLines = closure execLines(cmdname, options, callback, 
-        local output, execops, spawn, linerErr, linerOut) {
+        local output, spawnops, spawn, linerErr, linerOut) {
         if !callback
             return (syncAdapter(execLines, cmdname, options))
         if !string(cmdname) || cmdname == ""
@@ -1109,11 +1111,11 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
             output = options.output
         else
             output = {}
-        if options.execops
-            execops = options.execops
+        if options.spawnops
+            spawnops = options.spawnops
         else
-            execops = { }
-        spawn = nodecp.spawn(cmdname, options.cmdargs, execops)
+            spawnops = { }
+        spawn = nodecp.spawn(cmdname, options.cmdargs, spawnops)
 
         // completed
         // execute callback only once