@naanlang/naan 1.0.9 → 1.0.11

package/frameworks/browser/sworker.js

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

package/frameworks/common/common.nlg

@@ -176,7 +176,7 @@ 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, requireQuery())
+        scriptTag.src = JSpath.dirname(js.w.location.href).concat(fpath, requireQuery())
         scriptTag.onload = function (event) {
             jsScripts[libpath] = js.w[globalID]
             pending.signal(js.w[globalID])

package/frameworks/common/utils.nlg

@@ -0,0 +1,77 @@
+/*
+ * utils.nlg
+ * naanlib/frameworks/common/utils
+ *
+ *     Platform-independent utility functions.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2023 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * DictCompare
+ *
+ * Compare two dictionaries and report differences in a dictionary with the following structure of
+ * differences from aa to bb:
+ * {
+ *      added:      [<item>,<item>...<item>]
+ *      changed:    [<item>,<item>...<item>]
+ *      deleted:    [<item>,<item>...<item>]
+ * }
+ *
+ * >  DictCompare({a:3,b:2,c:5,f:8},{g:0,a:3,b:4,e:7,f:9});
+ * $: {
+ *      changed: ["b", "f"],
+ *      deleted: ["c"],
+ *      added  : ["e", "g"] }
+ *
+ */
+
+function DictCompare(aa, bb, local output, keysa, keysb, ka, kb, comp) {
+    function compare(ka, kb) { ka <=> kb }
+    function added(key) { output.added.push(key) || output.added = [key] }
+    function changed(key) { output.changed.push(key) || output.changed = [key] }
+    function deleted(key) { output.deleted.push(key) || output.deleted = [key] }
+
+    output = { }
+    keysa = aa.*.toarray.sort(compare).reverse()
+    keysb = bb.*.toarray.sort(compare).reverse()
+    ka = keysa.pop()
+    kb = keysb.pop()
+    while ka || kb {
+        comp = ka <=> kb
+        if comp < 0
+            deleted(ka)
+        else if comp > 0
+            added(kb)
+        else if aa[ka] != bb[ka]
+            changed(ka)
+        if comp <= 0
+            ka = keysa.pop()
+        if comp >= 0
+            kb = keysb.pop()
+    }
+    output
+};
+
+
+/*
+ * utilsInit
+ *
+ *     Initialize the component.
+ *
+ */
+
+function utilsInit(local manifest) {
+    manifest = `(DictCompare, utilsInit)
+
+    Naan.module.build(module.id, "utils", function(modobj, compobj) {
+        require("./common.nlg")
+        compobj.manifest = manifest
+        module.exports.DictCompare = DictCompare
+        updateExports()
+    })
+} ();

package/frameworks/node/filesystem.nlg

@@ -767,7 +767,7 @@ closure Filesystem(rootpath, local files, badCreatePathRegEx) {
         }
         output = []
         debuglog("dirSearch begins", localpath)
-        asyncArray(localpaths, 10, closure(localpath, index, elements, local error, direnum, node, lines, line) {
+        asyncArray(localpaths, 10, closure(localpath, local error, direnum, node, lines, line) {
             `(error, direnum) = dirList(localpath, { })
             if direnum.children
                 for node in direnum.children

package/frameworks/node/https_request.nlg

@@ -5,7 +5,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2022 by Richard C. Zulch
+ * Copyright (c) 2021-2023 by Richard C. Zulch
  *
  */
 
@@ -23,12 +23,15 @@
  *      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
+ *      auth:           <string>                // username:password string
+ *      cacert:         <data>                  // ca for verifying peer
  *      debug:          <boolean>               // log errors and status results
  *  }
  *
  */
 
-closure HttpsApiRequest(url, options, local urlq, reqOptions, putdata, item, pending, chunks, request) {
+closure HttpsApiRequest(url, options,
+    local urlq, reqOptions, putdata, item, xurl, pending, chunks, request) {
     if options.query
         urlq = url.concat(EncodeQuery("?", options.query))
     else
@@ -58,6 +61,20 @@ closure HttpsApiRequest(url, options, local urlq, reqOptions, putdata, item, pen
     if array(options.headers)
         for item in options.headers
             reqOptions.headers[item.0] = item.1
+    if options.auth
+        reqOptions.auth = options.auth
+    if options.cacert
+        reqOptions.ca = options.cacert
+    if options.allowSelfSigned {
+        xurl = nodeUrl.parse(url)
+        reqOptions.agent = xnew(nodeHttps.Agent({
+            host: xurl.hostname
+            port: xurl.port
+            path: xurl.path
+            rejectUnauthorized: false
+            ca: [ selfSignedRootCaPemCrtBuffer ]
+        }))
+    }
     pending = new(nonce)
     chunks = []
     request = nodeHttps.request(url, reqOptions, closure (response) {

package/frameworks/node/node.nlg

@@ -76,6 +76,7 @@ function nodrInit(local manifest) {
             os = js.r("os")
             stream = js.r("stream")
             nodeHttps = js.r("https")
+            nodeUrl= js.r("url")
         }()
         module.reload = nodrReload
     })

package/frameworks/project/projects.nlg

@@ -296,7 +296,7 @@ closure projConnector(projman, projtype, local connector, watch) {
  *
  * Nide.proj/
  *      nide_cliser.cfg                 - JSON definition of the project (see below)
- *      NaanIDE_version.txt             - [default] substitution file defining 1.0.9+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.0.11+1 etc.
  *      NaanIDE_version_builds.txt      - [default] contains current build number as decimal string
  *      build/                          - [optional] default build output location
  *      NaanIDE.lic                     - [optional] defines Zulch Laboratories, Inc. and other license info
@@ -574,7 +574,9 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         if error
             return (list(error))
         rules = procon.configDict."build-rules"[stage]
-        if !rules
+        if rules.inherit
+            rules = js.o.assign(procon.configDict."build-rules"[rules.inherit], rules)
+        else if !rules
             rules = procon.configDict.build                                 // fallback to old config structure
         rules = new(rules)
         if !rules["no-common"]

package/frameworks/running/debugnub.nlg

@@ -19,15 +19,15 @@
  */
 
 closure DebugNub(local nub, debug, paused) {
+    if debugNub !== `debugNub {                                             // multiple load attempt
+        debuglog("DebugNub: a debugNub already exsts; there can be only one")
+        return (false)
+    }
     debug = module.owner.list.Util.exports.DebugController()
     if !debug {                                                             // no debugger support in worker
         debuglog("DebugNub: no debugger support in this execution instance")
         return (false)
     }
-    if debugNub !== `debugNub {                                             // multiple load attempt
-        debuglog("DebugNub: a debugNub already exsts; there can be only one")
-        return (false)
-    }
     nub = new(object, this)
     debugNub = nub                                                          // access from taskDispatcher
     nub.codemgr = CodeManager()

package/frameworks/storage/file_manager.nlg

@@ -385,7 +385,7 @@ closure FileManager(fs, options, local files, watch, opqueue, willgit, hadgit) {
         else if files.fs.dirSearch
             processGrep(files.fs.dirSearch)
         else {
-            asyncArray(files.nodes, 5, closure(node, index, elements, local error, lines) {
+            asyncArray(files.nodes, 5, closure(node, local error, lines) {
                 ++fileCount
                 `(error, lines) = files.fs.readLines(node, config)
                 if error

package/frameworks/storage/psm.nlg

@@ -276,7 +276,7 @@ closure MakePSMutil(fs, local util) {
         //
         // Pass 1 - Get info on all source files, and make destination directories
         //
-        asyncArray(sources, 10, closure mklist(entry, index, elements,
+        asyncArray(sources, 10, closure mklist(entry,
             local srcpath, destpath, epath, error, stat, folder, node) {
             srcpath = fs.path.join(inpath, entry)
             destpath = outfs.path.join(outpath, entry)
@@ -308,7 +308,7 @@ closure MakePSMutil(fs, local util) {
         // Pass 2 - erase extraneous files and folders from destination
         //
         if options.erase {
-            asyncArray(keys(folders).toarray, 10, closure eraser(destpath, index, elements
+            asyncArray(keys(folders).toarray, 10, closure eraser(destpath
                 local error, outfolder, folder, namesin, removes, delopt) {
                 `(error, outfolder) = outfs.dirList(destpath)               // existing files in our destination
                 if error
@@ -336,7 +336,7 @@ closure MakePSMutil(fs, local util) {
         //
         // Pass 3 - copy files and links
         //
-        asyncArray(copies, 10, closure cpfiles(entry, index, elements, 
+        asyncArray(copies, 10, closure cpfiles(entry, 
             local error, data, dest, instat, outstat) {
             `(error, instat) = fs.info(entry.source, fsopt)
             if !error {

package/lib/browser/env_web.js

@@ -356,6 +356,12 @@ exports.NaanControllerWeb = function() {
         this.int = function int() {
             contSelf.Interrupt();
         };
+        //
+        // StateSave
+        //
+        this.StateSave = function StateSave() {
+            return (false);
+        };
     }
     
     //
@@ -520,7 +526,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.9+1";
+        statedoc.verstring = "1.0.11+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -538,7 +544,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.9+1")
+            || statedoc.verstring != "1.0.11+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -564,8 +570,8 @@ exports.NaanControllerWeb = function() {
             if ("localStorage" in window && window["localStorage"] !== null)
             {
                 localStorage.removeItem("NaanState_Hosted");
-                if (localStorage.setItem("NaanState_Hosted", statestr) !== undefined)
-                    return (true);
+                localStorage.setItem("NaanState_Hosted", statestr);
+                return (true);
             }
         } catch(e) {
             console.log("save state failed: " + "(" + e + ")");
@@ -597,7 +603,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.9+1"
+                    title: vsiteName + " 1.0.11+1"
                 });
             }
         } catch (e) {
@@ -611,7 +617,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.9+1"
+                    title: vsiteName + " 1.0.11+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -626,8 +632,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.0.9+1";;\r\n'
-                + 'App.cache = "56a3661c1caa5c6ed3781ffcad84acf4";;\r\n'
+            cmd: 'App.version = "1.0.11+1";;\r\n'
+                + 'App.cache = "8fdb7eef8a4a62fd4137803988319a3c";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });