@naanlang/naan 1.0.13 → 1.0.14

package/frameworks/browser/https_request.nlg

@@ -26,6 +26,14 @@
  *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
  *  }
  *
+ * The return is a result tuple comprising:
+ *      (<error>,                               -- false on success
+ *      <content>,                              -- returned data
+ *      {
+ *          status:     <integer>               -- http response status
+ *          headers:    <array>                 -- headers if available
+ *      })
+ *
  */
 
 closure HttpsApiRequest(url, options,
@@ -81,7 +89,7 @@ closure HttpsApiRequest(url, options,
     if response.status < 200 || response.status >= 300
         return (list(Error("HttpsApiRequest status:", url, response.status, {
             status: response.status
-        })))
+        }), false, { status: response.status }))
     if contentType.startsWith("application/json") {
         `(error, content) = await(response.text())
         if !error

package/frameworks/browser/sworker.js

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

package/frameworks/node/https_request.nlg

@@ -1,5 +1,5 @@
 /*
- * https_node.nlg
+ * https_request.nlg
  *
  *     Https operations for NodeJS.
  *
@@ -24,10 +24,25 @@
  *      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
+ *      cacert:         <data>                  // deprecated: ca for verifying peer
+ *      ssl: {
+ *          ca:         <data>                  // replacemenet certificate authority or self-signed cert
+ *          cert:       <data>
+ *          key:        <data>
+ *          passphrase: <data>                  // optional
+ *      }
+ *      allowSelfSigned: <boolean>              // allow a self-signed certificate at the servera
  *      debug:          <boolean>               // log errors and status results
  *  }
  *
+ * The return is a result tuple comprising:
+ *      (<error>,                               -- false on success
+ *      <content>,                              -- returned data
+ *      {
+ *          status:     <integer>               -- http response status
+ *          headers:    <array>                 -- headers if available
+ *      })
+ *
  */
 
 closure HttpsApiRequest(url, options,
@@ -63,8 +78,6 @@ closure HttpsApiRequest(url, options,
             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({
@@ -72,8 +85,17 @@ closure HttpsApiRequest(url, options,
             port: xurl.port
             path: xurl.path
             rejectUnauthorized: false
-            ca: [ selfSignedRootCaPemCrtBuffer ]
+            // keepAlive: false
+            ca: options.ssl.ca || options.cacert || [ selfSignedRootCaPemCrtBuffer ]
+            cert: options.ssl.cert || undefined
+            key: options.ssl.key || undefined
+            passphrase: options.ssl.passphrase || undefined
         }))
+    } else {
+        reqOptions.ca = options.ssl.ca || options.cacert || undefined
+        reqOptions.cert = options.ssl.cert || undefined
+        reqOptions.key = options.ssl.key || undefined
+        reqOptions.passphrase = options.ssl.passphrase || undefined
     }
     pending = new(nonce)
     chunks = []
@@ -88,7 +110,7 @@ closure HttpsApiRequest(url, options,
                     debuglog("HttpsApiRequest status:", url, response.statusCode, "message:", content)
                 pending.signal(list(Error("HttpsApiRequest statusCode:", url, response.statusCode, {
                     status: response.statusCode
-                })))
+                }), false, { status: response.statusCode }))
                 return
             }
             if response.complete {

package/frameworks/project/build.nlg

@@ -994,7 +994,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                         `(error, content) = parseAndPack(content, entry.readpath, { jspack: true })
                     else if entry.syntax
                         `(error) = parseAndPack(content, entry.readpath, { syntax: true })
-                    if entry.minimize {
+                    if !error && entry.minimize {
                         `(error, content) = build.uglify.minify(
                             new(dictionary, list(cons(entry.readpath, content))), {
                             mangle: { eval: true }
@@ -1005,25 +1005,26 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                         else if entry.minprefix
                             content = entry.minprefix.concat(content)
                     }
-                    if !error {
-                        if entry.catcount {
-                            if !catenates[entry.writepath]
-                                catenates[entry.writepath] = new(Array(entry.catcount))
+                    if entry.catcount {
+                        if !catenates[entry.writepath]
+                            catenates[entry.writepath] = new(Array(entry.catcount))
+                        if error
+                            entry.error = error
+                        else
                             entry.content = content
-                            catenates[entry.writepath][entry.catindex] = entry
-                            if catReady(entry.writepath) {
-                                `(error, result) = writeCatenate(entry.writepath)
-                                if error
-                                    build.errorlist.push(error)
-                                catenates[entry.writepath].0.done.signal(error)
-                            }
+                        catenates[entry.writepath][entry.catindex] = entry
+                        if catReady(entry.writepath) {
+                            `(error, result) = writeCatenate(entry.writepath)
+                            if error
+                                build.errorlist.push(error)
+                            catenates[entry.writepath].0.done.signal(error)
                         }
-                        else {
+                    }
+                    else {
+                        if !error
                             `(error, result) = fs.writeFile(entry.writepath, content)
-                            entry.done.signal(error)
-                        }
-                    } else
                         entry.done.signal(error)
+                    }
                 }
                 if error
                     build.errorlist.push(error)
@@ -1050,7 +1051,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
         //
         function catReady(writepath, local entry) {
             for entry in catenates[writepath]
-                if !entry.content
+                if !entry.content && !entry.error
                     return (false)
             true
         }

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

@@ -526,7 +526,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.13+1";
+        statedoc.verstring = "1.0.14+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -544,7 +544,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.13+1")
+            || statedoc.verstring != "1.0.14+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -603,7 +603,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteOpen",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.13+1"
+                    title: vsiteName + " 1.0.14+1"
                 });
             }
         } catch (e) {
@@ -617,7 +617,7 @@ exports.NaanControllerWeb = function() {
                     op: "VsiteClose",
                     name: vsiteName,
                     naancont: contSelf,
-                    title: vsiteName + " 1.0.13+1"
+                    title: vsiteName + " 1.0.14+1"
                 });
                 termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
             }
@@ -632,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.13+1";;\r\n'
-                + 'App.cache = "038425c77a7e6c88922606c4de1c9559";;\r\n'
+            cmd: 'App.version = "1.0.14+1";;\r\n'
+                + 'App.cache = "7d35a97d7bea57c619edd042aaf5b648";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });