@naanlang/naan 1.2.0 → 1.2.1

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.2.0+1";
+var CurrentCacheName = "Naanlang-1.2.1+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.2.0+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.2.0+1") {
+        console.log("[1.2.1+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.2.1+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.2.0+1] update pending for", sourceId);
+                console.log("[1.2.1+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.2.0+1"
+                    version: "1.2.1+1"
                 });
-                console.log("[1.2.0+1] update sent for:", sourceId);
+                console.log("[1.2.1+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.2.0+1] attempting skipWaiting");
+                console.log("[1.2.1+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.2.0+1] terminated");
+                console.log("[1.2.1+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.2.0+1] msg received:", msg.text);
+                console.log("[1.2.1+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.2.0+1",
+                text: "port received by 1.2.1+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.2.0+1] requesting new msgport for", client.id);
+            console.log("[1.2.1+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.2.0+1] source gone:", sourceId);
+                console.log("[1.2.1+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.2.0+1] client gone:", clientId);
+                console.log("[1.2.1+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.2.0+1] deleting old cache:', cacheName);
+                        console.log('[1.2.1+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.2.0+1] claiming clients');
+            console.log('[1.2.1+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.2.0+1] clients claimed');
+            console.log('[1.2.1+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.2.0+1",
+                version: "1.2.1+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.2.0+1] install");
+    console.log("[1.2.1+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.2.0+1] activate");
+    console.log("[1.2.1+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.2.0+1] matching clients:', urls.join(', '));
+        console.log('[1.2.1+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.2.0+1"
+                version: "1.2.1+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") !== "d20959c47030d94a5b0694e7b9df2dc1"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "ecffb6bced5a08a6d2fdd188410b1b50"
                 || 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.2.0+1] fetch failed", request.url, e);
+                    console.log("[1.2.1+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"

package/frameworks/browser/terminals.nlg

@@ -55,13 +55,17 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
 
     // connect
     // Connect with the host if not already connected.
-    closure connect(local host, pending) {
+    closure connect(local host, url, pending) {
         if target.ws
             return(list(false, { connected: true }))
         host = xnew(window.URL, api.url).host
         if !host || host == ""
             return(list(Error("invalid URL ${api.url}")))
-        target.ws = xnew(window.WebSocket,"ws://${host}")
+        if window.location.protocol == "https:"
+            url = "wss://${host}"
+        else
+            url = "ws://${host}"
+        target.ws = xnew(window.WebSocket, url)
         pending = new(nonce)
 
         // onopen
@@ -98,8 +102,10 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
                 if msg.id == "spawned" || msg.id == "workerlist" || msg.id == "termination"
                     return (hostWorkerUpdate(msg))
                 if msg.id != "targetout" {
-                    if msg.id == "status"
+                    if msg.id == "status" {
                         target.lastStatus = milliseconds()
+                        target.execSetStatus(msg.status)
+                    }
                     if target.msgQueue {
                         if msg.id != "status"
                             target.msgQueue.push(msg)
@@ -455,8 +461,10 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
             destroy()
             return }
         else if msg.id != "targetout" && msg.id != "loaded" {
-            if msg.id == "status"
+            if msg.id == "status" {
                 target.lastStatus = milliseconds()
+                target.execSetStatus(msg.status)
+            }
             if target.msgQueue {
                 if msg.id != "status"
                     target.msgQueue.push(msg)
@@ -468,6 +476,7 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
     // The worker had an error.
     
     target.worker.addEventListener("error", function(e) {
+        debuglog("TermLocal worker error:", e.message)
         target.execClosed(Error("instance error", e.message))
     })
 
@@ -720,6 +729,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         }
     
         function onstatus(status) {
+            target.execSetStatus(status)
             statusCB(target, status)
         }
     

package/frameworks/browser/ws_client.nlg

@@ -37,10 +37,14 @@ closure WebSocket(options, local wsock) {
     //
     // Connect with the host if not already connected, returning a result tuple.
     //
-    wsock.connect = closure connect(local pending) {
+    wsock.connect = closure connect(local url, pending) {
         if wsock.ws
             return (list(false, { open: true }))
-        wsock.ws = xnew(window.WebSocket, "ws://${options.host}")
+        if window.location.protocol == "https:"
+            url = "wss://${options.host}"
+        else
+            url = "ws://${options.host}"
+        wsock.ws = xnew(window.WebSocket, url)
         pending = new(nonce)
     
         // onopen

package/frameworks/client/psm_client.nlg

@@ -667,13 +667,13 @@ closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
 
 
 /*
- * psmcMakeClientPSM
+ * MakeClientPSM
  *
  *     Return a new client PSM with our known connectors.
  *
  */
 
-function psmcMakeClientPSM(api, dbname, local importPSM) {
+function MakeClientPSM(api, dbname, local importPSM) {
     global(App)
     importPSM = require("../storage/psm.nlg")
     App.psm = importPSM.MakePSM(dbname).1
@@ -694,12 +694,12 @@ function psmcMakeClientPSM(api, dbname, local importPSM) {
 
 function psmcInit(local manifest) {
 
-    manifest = `(psmcFsView, psmcFsConnector, psmcMakeClientPSM, psmcInit)
+    manifest = `(psmcFsView, psmcFsConnector, MakeClientPSM, psmcInit)
 
     Naan.module.build(module.id, "psm_client", function(modobj, compobj) {
         require("./client.nlg")
         compobj.manifest = manifest
-        modobj.exports.MakeClientPSM = psmcMakeClientPSM
+        modobj.exports.MakeClientPSM = MakeClientPSM
     })
 
 } ();

package/frameworks/client/relaycon.nlg

@@ -35,6 +35,7 @@ wsMod;;                                         // websocket module
  *          workerID: <string>                  // worker on server (server destinations only)
  *      }
  *      startup: <dictionary>                   // worker spawn init (server destinations only)
+ *      wss: <boolean>                          // true to use secure connection
  *      debug: <boolean>                        // debug logging
  *  }
  *
@@ -74,6 +75,7 @@ closure RelayCon(host, secret, options, local relay, nlregex)
         relay.guid = secret
         relay.host = host                                                   // e.g. "localhost:8009"
         relay.wscon = wsMod.WebSocket(host, {
+            wss: options.wss || undefined
             onopen: onopen
             onmessage: onmessage
             onerror: onerror

package/frameworks/common/common.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -193,8 +193,14 @@ closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
     else
         fpath = "/".concat(libpath)
     if js.s.importScripts && tostring(js.s.importScripts) == "[Function importScripts]" {
-        js.s.importScripts(fpath)                                           // load in worker context
-        jsScripts[libpath] = js.s[globalID]
+        fpath = JSpath.dirname(js.w.location.href).concat(fpath)
+        try {
+            js.s.importScripts(fpath)                                       // load in worker context
+            jsScripts[libpath] = js.s[globalID]
+        } catch {
+            debuglog("JsLoadScript:", libpath, "failed", exception)
+            js.s.console.log("JsLoadScript:", libpath, "failed", exception) // ensure visibility in JS console
+        }
     } else if js.w {                                                        // load in browser context
         pending = new(nonce)
         scriptTag = js.w.document.createElement("script")
@@ -205,7 +211,7 @@ closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
             true
         }
         scriptTag.onerror = function (event) {
-            debuglog("jsScriptLoader:", libpath, "not found")
+            debuglog("JsLoadScript:", libpath, "not found")
             pending.signal(false)
             true
         }

package/frameworks/node/ws_client.nlg

@@ -20,6 +20,7 @@
  *
  * Options:
  *  {
+ *      wss:        <boolean>                   // true to use secure connection
  *      onopen:     <proc>(e)                   // connection has opened
  *      onmessage:  <proc>(e, message)          // message received
  *      onerror:    <proc>(e)                   // error occurred
@@ -37,13 +38,17 @@ closure WebSocket(host, options, local wsock) {
     //
     // Connect with the host if not already connected, returning a result tuple.
     //
-    wsock.connect = closure connect(local pending, error, ws) {
+    wsock.connect = closure connect(local error, ws, url, pending) {
         if wsock.ws
             return (list(false, { open: true }))
         `(error, ws) = await(js.i("ws"))
         if error
             return (list(error))
-        wsock.ws = xnew(ws.default, "ws://${host}")
+        if options.wss
+            url = "wss://${host}"
+        else
+            url = "ws://${host}"
+        wsock.ws = xnew(ws.default, url)
         pending = new(nonce)
 
         // onopen

package/frameworks/project/build.nlg

@@ -118,7 +118,7 @@
  *          ]
  *      }
  *
- * build = Builder(rulesDict, operation, fs, srcpath, destpath)             // create a builder object
+ * build = Builder(rulesDict, operation, fs, srcpath, destpath, track)      // create a builder object
  * build.increment()                                                        // increment the build counter
  * build.make()                                                             // run the build
  * build.clean()                                                            // clear all output folders
@@ -140,7 +140,7 @@
  *
  */
 
-closure Builder(rules, operation, fs, srcpath, destpath, local build, group, newgroup) {
+closure Builder(rules, operation, fs, srcpath, destpath, track, local build, group, newgroup) {
     build = new(object, this)
     build.srcpath = srcpath
     build.destpath = destpath
@@ -393,7 +393,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
     closure zip(files, options, local result) {
         if !build.zipper
-            build.zipper = ExecutorParallel({                               // create worker for zipping
+            build.zipper = ExecutorParallel(track, {                        // create worker for zipping
                 maxcount: 1                                                 // stupid Zip lib can't do more than one
                 basename: "zip"
                 initeval: `(false, (zip1))
@@ -529,7 +529,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
     closure parseAndPack(text, fpath, options, local result) {
         if !build.parallel
-            build.parallel = ExecutorParallel({                             // create worker pool
+            build.parallel = ExecutorParallel(track, {                      // create worker pool
                 basename: "build"
                 initeval: `(false, (parseAndPack1))
             }) 
@@ -1190,7 +1190,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Run the current build product by spawning a new worker.
     //
-    build.runSpawn = function runSpawn(track local error, maintext, executor, vpath, site) {
+    build.runSpawn = function runSpawn(local error, maintext, executor, vpath, site) {
         `(error, maintext) = fs.readFile(JSpath.join(build.destpath, build.runway.main))
         if error
             error = Error("Builder: cannot read main file", error)
@@ -1228,7 +1228,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Run the current build product by opening a new window.
     //
-    build.runWindow = function runWindow(track
+    build.runWindow = function runWindow(
         local title, main, url, features, vpath, error, window, site) {
         if !js.w
             return (list(Error('Run method "window" requires browser host')))
@@ -1260,13 +1260,13 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     // Run the current build product, which would be after the make call. Returns a standard result
     // tuple.
     //
-    build.run = function run(track) {
+    build.run = function run() {
         if build.runway.open
             fs.shellOpen(JSpath.join(build.destpath, build.runway.open), build.runway.args)
         else if build.runway.spawn
-            build.runSpawn(track)
+            build.runSpawn()
         else if build.runway.window
-            build.runWindow(track)
+            build.runWindow()
         else
             list(false, { ok: true })
     }
@@ -1276,7 +1276,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Refresh after updating the v-site, returning true iff an existing vsite was found.
     //
-    build.refresh = function refresh(track local url_origin, found) {
+    build.refresh = function refresh(local url_origin, found) {
         if build.runway."v-site" {
             url_origin = js.w.location.origin.concat("/run", build.runway."v-site")
             for target in track.enumlist() {

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.2.0+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.2.1+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
@@ -614,7 +614,7 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         rules.typeID = procon.where_typeID
         if !rules.operation
             rules.operation = "debug"
-        `(error, builder) = Builder(rules, rules.operation, fs, "", buildpath)
+        `(error, builder) = Builder(rules, rules.operation, fs, "", buildpath, projman.track)
         if error
             return (list(error))
         procon.builder = builder
@@ -628,10 +628,10 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
             buildnum: buildnum
         })
         if !error {
-            if builder.refresh(projman.track)
+            if builder.refresh()
                 buildonly = !buildonly                                      // reverse if refresh
             if !buildonly
-                `(error) = builder.run(projman.track)
+                `(error) = builder.run()
         }
         builder.destroy()
         procon.builder = false
@@ -662,7 +662,9 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         publish = rules.publish
         where = procon.localDict.publish[stage].where
         if !rules || !where
-            return (list(Error("no project publish location configured")))
+            return (list(Error("no project publish location set")))
+        if !publish.input || !publish.sources || !publish.output
+            return (list(Error("project configuration has no publish instructions")))
         if publish.cacheControl
             outOptions = {
                 cacheControl: publish.cacheControl