@naanlang/naan 1.4.4 → 1.6.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

@@ -5,7 +5,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2024 by Richard C. Zulch
+ * Copyright (c) 2021-2024,2026 by Richard C. Zulch
  *
  */
 
@@ -47,7 +47,7 @@ closure HttpsApiRequest(url, options,
     // 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
+        if member(error.status, `(408, 429, 500, 502, 503, 504)) {          // retriable errors
             retryAfter = headers["retry-after"]
             if retryAfter {
                 retryms = toint(retryAfter) * 1000

package/frameworks/browser/sworker.js

@@ -32,11 +32,11 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2024 by Richard C. Zulch
+ * Copyright (c) 2020-2026 by Richard C. Zulch
  *
  */
 
-var CurrentCacheName = "Naanlang-1.4.4+1";
+var CurrentCacheName = "Naanlang-1.6.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.4+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.4.4+1") {
+        console.log("[1.6.0+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.6.0+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.4.4+1] update pending for", sourceId);
+                console.log("[1.6.0+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.4.4+1"
+                    version: "1.6.0+1"
                 });
-                console.log("[1.4.4+1] update sent for:", sourceId);
+                console.log("[1.6.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.4+1] attempting skipWaiting");
+                console.log("[1.6.0+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.4.4+1] terminated");
+                console.log("[1.6.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.4+1] msg received:", msg.text);
+                console.log("[1.6.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.4+1",
+                text: "port received by 1.6.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.4+1] requesting new msgport for", client.id);
+            console.log("[1.6.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.4+1] source gone:", sourceId);
+                console.log("[1.6.0+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.4.4+1] client gone:", clientId);
+                console.log("[1.6.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.4+1] deleting old cache:', cacheName);
+                        console.log('[1.6.0+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.4.4+1] claiming clients');
+            console.log('[1.6.0+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.4.4+1] clients claimed');
+            console.log('[1.6.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.4+1",
+                version: "1.6.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.4+1] install");
+    console.log("[1.6.0+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.4.4+1] activate");
+    console.log("[1.6.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.4+1] matching clients:', urls.join(', '));
+        console.log('[1.6.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.4+1"
+                version: "1.6.0+1"
             });
         }
         upgradeMsgPorts = false;
@@ -410,8 +410,8 @@ self.addEventListener('fetch', function(event) {
     event.respondWith(
         caches.match(event.request).then(function(response)
         {
-            if (response && response.status != 299)
-                return (response);
+            if (response && response.status != 299 && response.status < 400)
+                return (response);                                          // shouldn't have been cached
             if (terminated)
                 return (new Response(undefined, {
                     status: 299,
@@ -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") !== "3a2321ac98091606ee7cf5cc8919f70c"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "c38a11f669f27ff2730818e613d0671c"
                 || 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.4+1] fetch failed", request.url, e);
+                    console.log("[1.6.0+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -464,6 +464,8 @@ self.addEventListener('fetch', function(event) {
             }
             return (promise.then(function(response) {
                 if (!nocache) {
+                    if (!response || !response.ok || response.type === 'error')
+                        return (response);                                  // don't cache bad responses
                     var responseClone = response.clone();
                     caches.open(CurrentCacheName).then(function(cache) {
                         cache.put(request, responseClone);