@naanlang/naan 1.3.0 → 1.3.1

package/frameworks/browser/sworker.js

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

package/frameworks/common/common.nlg

@@ -19,6 +19,7 @@
  */
 
 function EncodeQuery(prefix, items, local result, item) {
+    global()
     result = []
     for item in items
         result.push(EncodeURIComponent(item).concat("=", EncodeURIComponent(items[item])))
@@ -38,6 +39,7 @@ function EncodeQuery(prefix, items, local result, item) {
  */
 
 function DecodeQuery(text, local output, rpreg, qarr, item, pair) {
+    global()
     output = {}
     rpreg = RegExp("\\+", "g")
     qarr = text.split("&")
@@ -62,6 +64,7 @@ function DecodeQuery(text, local output, rpreg, qarr, item, pair) {
  */
 
 function ContentTypeFromFileExt(filepath, local mimeType, encoding) {
+    global(JSpath)
     mimeType = {
         "css":  "text/css",
         "csv":  "text/csv",
@@ -103,6 +106,7 @@ function ContentTypeFromFileExt(filepath, local mimeType, encoding) {
  */
  
 function UUID(local rando) {
+    global(RandomBytes)
     if !RandomBytes
         return (false)
     rando = RandomBytes(36)                                                 // length of UUID
@@ -128,6 +132,7 @@ function UUID(local rando) {
  */
 
 function VersionCheck(testv, refv, local rxver, test, ref) {
+    global()
     rxver = RegExp("([0-9]+)[.]([0-9]+)[.]([0-9]+)-?[A-Za-z_]*[+]?([0-9]+)")
     function numerify(x){ Number.parseInt(x) }
     test = testv.match(rxver).map(numerify.proc)
@@ -147,6 +152,7 @@ function VersionCheck(testv, refv, local rxver, test, ref) {
  */
 
 function JsonParse(data) {
+    global(exception)
     try {
         data = JSONparse(data)
         list(false, data)
@@ -165,6 +171,7 @@ function JsonParse(data) {
  */
 
 function JsonStringify(data) {
+    global(exception)
     try {
         data = JSONstringify(data)
         list(false, data)
@@ -185,15 +192,18 @@ function JsonStringify(data) {
 
 jsScripts = { };                                                            // script values become false on reload
  
-closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
+closure JsLoadScript(libpath, globalID, local savens, fpath, hostpath, pending, scriptTag) {
+    global(jsScripts, js, JSpath)
     if jsScripts[libpath]
         return                                                              // already loaded
+    savens = nsactive()
     if libpath.startsWith("/")
         fpath = libpath
     else
         fpath = "/".concat(libpath)
+    hostpath = js.w.location.origin.concat(JSpath.dirname(js.w.location.pathname))
     if js.s.importScripts && tostring(js.s.importScripts) == "[Function importScripts]" {
-        fpath = JSpath.dirname(js.w.location.href).concat(fpath)
+        fpath = hostpath.concat(fpath)
         try {
             js.s.importScripts(fpath)                                       // load in worker context
             jsScripts[libpath] = js.s[globalID]
@@ -204,7 +214,7 @@ closure 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 = JSpath.dirname(js.w.location.href).concat(fpath, requireQuery())
+        scriptTag.src = hostpath.concat(fpath, requireQuery())
         scriptTag.onload = function (event) {
             jsScripts[libpath] = js.w[globalID]
             pending.signal(js.w[globalID])
@@ -219,6 +229,7 @@ closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
         pending.wait()
     } else if js.g
         jsScripts[libpath] = js.r(libpath)                                  // load in NodeJS context
+    nsactive(savens)
     jsScripts[libpath]
 };
 
@@ -234,6 +245,7 @@ closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
  */
 
 macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
+    global()
     modobj = car(nsrights().lookup("module"))
     functionKeys = eval(functionKeys)
     componentPath = eval(componentPath)
@@ -281,6 +293,7 @@ macro LoadComponentOnDemand(functionKeys, componentPath, local modobj, key) {
  */
 
 macro LiveExport() {
+    global()
     closure (exporterMod, local importList) {
         importList = []
         //

package/frameworks/node/apiserver.nlg

@@ -16,6 +16,17 @@
  *
  *     Make an API server object.
  *
+ * Options:
+ *  {
+ *      name:           <string>                // server name (default "NaanServer")
+ *      abspath:        <string>                // absolute pathname for web root
+ *      relpath:        <string>                // web root pth relative to js.d
+ *      fixedPort:      <number>                // fixed
+ *      basePort:       <number>                // starting point for search
+ *      gateway:        <string>                // websocket gateway URL
+ *      statics:        [<string>, ...]         // search paths for static content
+ *  }
+ *
  */
 
 closure APIServer(options, local server, chroot) {
@@ -30,7 +41,10 @@ closure APIServer(options, local server, chroot) {
         relpath: ""
         name: "NaanServer"
     }, options)
-    chroot = JSpath.join(js.d, options.relpath)
+    if options.abspath
+        chroot = options.abspath
+    else
+        chroot = JSpath.join(js.d, options.relpath)
     server.root = chroot
 
     // updatePort

package/frameworks/project/build.nlg

@@ -1298,6 +1298,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
     //
     build.increment = closure increment(newnum, local error, filecon, buildnum) {
         build.buildnum = undefined
+        if !build.buildnopath
+            return (list(false, { version: false }))
         `(error, filecon) = fs.readFile(build.buildnopath)
         if !error
             buildnum = toint(filecon.trim())

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.3.0+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.3.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

package/lib/browser/env_web.js

@@ -536,7 +536,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.3.0+1";
+        statedoc.verstring = "1.3.1+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -554,7 +554,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.3.0+1")
+            || statedoc.verstring != "1.3.1+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -613,7 +613,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.3.0+1"
+                    title: vsiteName + " 1.3.1+1"
                 });
             }
         } catch (e) {
@@ -627,7 +627,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.3.0+1"
+                    title: vsiteName + " 1.3.1+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -640,10 +640,10 @@ exports.NaanControllerWeb = function() {
     if (querystrings["restart"] || !loadLocal())
     {                                                                       // don't load state or can't load state
         naanlib.banner();
-        var hostpath = naanlib.js.r("path").dirname(window.location.href);
+        var hostpath = window.location.origin.concat(naanlib.js.r("path").dirname(window.location.pathname));
         naanlib.start({
-            cmd: 'App.version = "1.3.0+1";;\r\n'
-                + 'App.cache = "49a9b89fb804111a36026df163e15009";;\r\n'
+            cmd: 'App.version = "1.3.1+1";;\r\n'
+                + 'App.cache = "1f0eccb08fd1a57ede0bd91dc0e934cc";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });