@naanlang/naan 1.0.16 → 1.1.0

package/frameworks/browser/https_request.nlg

@@ -1,11 +1,11 @@
 /*
- * https_browser.nlg
+ * https_request.nlg
  *
  *     Https operations for the browser.
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2021-2023 by Richard C. Zulch
+ * Copyright (c) 2021-2024 by Richard C. Zulch
  *
  */
 
@@ -24,6 +24,7 @@
  *      encoding:       <string>                // "binary" to receive binary data as arrayBuffer
  *      range:          <string>                // sets range header
  *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
+ *      debug:          <boolean>               // log errors and status results
  *  }
  *
  * The return is a result tuple comprising:
@@ -82,14 +83,27 @@ closure HttpsApiRequest(url, options,
     //
     // perform the fetch and return when complete
     //
-    `(error, response) = await(window.fetch(urlq, fetchOptions))
-    if error
-        return (list(Error("HttpsApiRequest fetch failed:", error, url)))
+    loop {                                                                  // loop for retries
+        `(error, response) = await(window.fetch(urlq, fetchOptions))
+        if error {
+            if options.debug
+                debuglog("HttpsApiRequest error:", url, "error:", error)
+            return (list(Error("HttpsApiRequest fetch failed:", error, url)))
+        }
+        if response.status < 200 || response.status >= 300 {
+            if options.debug
+                debuglog("HttpsApiRequest status:", url, response.statusCode)
+            error = Error("HttpsApiRequest status:", url, response.status, {
+                status: response.status
+            })
+            if options.retrier(error)
+                continue                                                    // optional retry/delay logic
+            else
+                return (list(error, false, { status: response.status }))
+        } else
+            break
+    }
     contentType = response.headers.get("content-type")
-    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

@@ -32,11 +32,11 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.16+1";
+var CurrentCacheName = "Naanlang-1.1.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.0.16+1] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.16+1") {
+        console.log("[1.1.0+1] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.1.0+1") {
             if (upgradeMsgPorts) {                                          // if not activated
-                console.log("[1.0.16+1] update pending for", sourceId);
+                console.log("[1.1.0+1] update pending for", sourceId);
                 upgradeMsgPorts[sourceId] = msgport;
             }
             else {
                 msgport.postMessage({                                       // notify new version available
                     id: "upgrade",
-                    version: "1.0.16+1"
+                    version: "1.1.0+1"
                 });
-                console.log("[1.0.16+1] update sent for:", sourceId);
+                console.log("[1.1.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.0.16+1] attempting skipWaiting");
+                console.log("[1.1.0+1] attempting skipWaiting");
                 self.skipWaiting();
             } else if (msg.id == "terminate") {                             // termiante this SW now
-                console.log("[1.0.16+1] terminated");
+                console.log("[1.1.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.0.16+1] msg received:", msg.text);
+                console.log("[1.1.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.0.16+1",
+                text: "port received by 1.1.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.0.16+1] requesting new msgport for", client.id);
+            console.log("[1.1.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.0.16+1] source gone:", sourceId);
+                console.log("[1.1.0+1] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.16+1] client gone:", clientId);
+                console.log("[1.1.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.0.16+1] deleting old cache:', cacheName);
+                        console.log('[1.1.0+1] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.16+1] claiming clients');
+            console.log('[1.1.0+1] claiming clients');
             return (self.clients.claim());
         }).then(function() {
-            console.log('[1.0.16+1] clients claimed');
+            console.log('[1.1.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.0.16+1",
+                version: "1.1.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.0.16+1] install");
+    console.log("[1.1.0+1] install");
     self.skipWaiting();
 });
 
@@ -376,20 +376,20 @@ self.addEventListener('install', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.16+1] activate");
+    console.log("[1.1.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.0.16+1] matching clients:', urls.join(', '));
+        console.log('[1.1.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.0.16+1"
+                version: "1.1.0+1"
             });
         }
         upgradeMsgPorts = false;
@@ -410,7 +410,7 @@ self.addEventListener('fetch', function(event) {
     event.respondWith(
         caches.match(event.request).then(function(response)
         {
-            if (response)
+            if (response && response.status != 299)
                 return (response);
             if (terminated)
                 return (new Response(undefined, {
@@ -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") !== "b2535090f4e111466794eea676c7d7aa"
+                || url.search.length !== 0 && url.searchParams.get("naanver") !== "0edbbbd718a57553ff0a5c178f4dd389"
                 || request.headers.get('range');
             if (url.pathname.startsWith("/run/")) {
                 nocache = true;
@@ -449,12 +449,13 @@ self.addEventListener('fetch', function(event) {
                         return (item !== abortItem);
                     });
                     if (abortItem.aborted) {
+                        nocache = true;                                     // don't cache the 299!
                         return (new Response(undefined, {
                             status: 299,
                             statusText: "Request Cancelled"
                         }));
                     }
-                    console.log("[1.0.16+1] fetch failed", request.url, e);
+                    console.log("[1.1.0+1] fetch failed", request.url, e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"

package/frameworks/browser/terminals.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2022 by Richard C. Zulch
+ * Copyright (c) 2019-2024 by Richard C. Zulch
  *
  */
 
@@ -21,6 +21,7 @@
 closure TermHost(track, api, name, workerID, options,
     local target, nlregex, clientID, serverID)
 {
+    global(window)
     target = require("../running/executors.nlg").ExecutorBase(track, "Host", name)
     clientID = "DebugWorkers"
     serverID = "Workers"
@@ -29,22 +30,33 @@ closure TermHost(track, api, name, workerID, options,
         workerID = "myDebugWorker"
     target.workerID = workerID
     target.msgQueue = []
+    target.dispatcher = call(options.dispatcher, function(reply) { reply })
     
     // connect
     // Connect with the host if not already connected.
     closure connect(local pending) {
         if target.ws
             return
-        target.ws = xnew(window.WebSocket,"ws://".concat(window.location.host)) // ### use api parameter
+        target.ws = xnew(window.WebSocket,"ws://${window.location.host}")
         pending = new(nonce)
-    
+
         // onopen
         // The WebSocket connection is now open.
-        target.ws.onopen = function onopen(e, local spawner) {
-            pending.signal(list(false, { ok: true }))
-            spawner = new(options.startup)
+        target.ws.onopen = function onopen(e, local info, spawner) {
+            info = {
+                name: name
+                workerID: workerID
+            }
+            if options.dispatcher
+                info.destID = api.instanceID                                // valid destination for relay
+            target.ws.send(window.JSON.stringify({
+                guid: api.guid
+                init: info
+            }))
+            spawner = new(options.startup) || { }
             spawner.name = name
             sendControl("spawn", spawner)
+            pending.signal(list(false, { ok: true }))
         }
 
         // onmessage
@@ -77,10 +89,29 @@ closure TermHost(track, api, name, workerID, options,
                     if !target.written
                         target.term.WriteLn("(reconnected)")
                 }, 1000).run()
-            else if message.respOp
-                debuglog("unknown host response message:", message.respOp)
+            else if message.workerOp == "msgin" && message.payload.id == "targetin"
+                dispatcher(message)                                         // request from Host
+            else if message.respOp || message.id
+                debuglog("unknown host response message:", message.respOp || message.id)
         }
-        
+
+        // dispatcher
+        // Respond to a host request while preserving context to permit reply routing
+        closure dispatcher(message, local reply) {
+            reply = target.dispatcher(message.payload.data)
+            target.ws.send(window.JSON.stringify({
+                guid: api.guid
+                clientID: message.clientID
+                serverID: message.serverID
+                workerID: message.workerID
+                respOp: "msgout"
+                payload: {
+                    id: "targetout",
+                    data: reply
+                }
+            }))
+        }
+
         // onerror
         // An error occurred on the WebSocket connection.
         target.ws.onerror = function onerror(e) {
@@ -91,7 +122,8 @@ closure TermHost(track, api, name, workerID, options,
         // onclose
         // The WebSocket connection was closed.
         target.ws.onclose = function onclose(e) {
-            debuglog("ws close:", e.code, e.reason)
+            if e.code != 1000 && e.code != 1001 && e.code != 1005 && e.code != 1006
+                debuglog("ws close:", e.code, e.reason)
             target.execClosed(Error("socket closed", e.code, e.reason))
             target.ws = false
         }
@@ -104,7 +136,7 @@ closure TermHost(track, api, name, workerID, options,
     //
     //     New workers created/discovered on this host.
     //
-    function hostWorkerUpdate(msg, local localID) {
+    function hostWorkerUpdate(msg, local localID, worker) {
     
         // findWorker
         //
@@ -123,9 +155,9 @@ closure TermHost(track, api, name, workerID, options,
         else if msg.id == "termination"
             track.delete(findWorker(msg.workerID))
         else {
-            for localID in msg.workerIDs
+            for `(localID, worker) in msg.workers
                 if !findWorker(localID)
-                    TermHost(track, api, localID, localID)
+                    TermHost(track, api, worker.name, localID)
         }
     }
         
@@ -243,12 +275,15 @@ closure TermHost(track, api, name, workerID, options,
     //     Post a message to the target.
     //
 
-    target.PostMessage = function PostMessage(data) {
-        connect()
+    target.PostMessage = function PostMessage(data, local result) {
+        result = connect()
+        if result.0
+            return (result)
         send({                                                              // send data to worker
             id: "targetin",
             data: data
         })
+        list(false, { posted: true })
     }
     
     //
@@ -358,6 +393,7 @@ closure TermHost(track, api, name, workerID, options,
 closure TermLocal(track, name, workerID, options,
     local target, nlregex, listener)
 {
+    global(js, window)
     if workerID == "NaanIDE" {
         if !js.t
             return (list(Error("Cannot access Local IDE executor")))
@@ -500,6 +536,7 @@ closure TermLocal(track, name, workerID, options,
             id: "targetin",
             data: data
         })
+        list(false, { posted: true })
     }
     
     //
@@ -591,6 +628,7 @@ closure TermLocal(track, name, workerID, options,
  */
 
 closure findIDEtarget(track, name, workerID, naancont, local target) {
+    global()
     for target in track.enumlist()
         if target.name == name && target.workerID == workerID && (!target.naancont || target.naancont === naancont)
             return (target)
@@ -608,6 +646,7 @@ closure findIDEtarget(track, name, workerID, naancont, local target) {
  */
 
 closure termIDE(track, name, workerID, naancont, title, local target, connected) {
+    global()
     target = findIDEtarget(track, name, workerID, naancont)
     if target {                                                             // new naancont on existing target
         target.updateController(naancont)
@@ -640,6 +679,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
 
     target.PostMessage = function PostMessage(data) {
         naancont.DispatchMessage(data)
+        list(false, { posted: true })
     }
 
     // termAttach
@@ -770,6 +810,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
  */
 
 closure termInstallVirtualWatcher(track, naancont) {
+    global()
 
     function watchVsites(msg, local error, target) {
         if msg.op == "VsiteOpen" {

package/frameworks/browser/ws_client.nlg

@@ -0,0 +1,124 @@
+/*
+ * ws_client.nlg
+ *
+ *     WebSocket client operations for the browser.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2023 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * WebSocket
+ *
+ * Create a WebSocket client connection object using the existing HTTPS connection.
+ *
+ * Options:
+ *  {
+ *      host:       <string>                    // host:port
+ *      onopen:     <proc>(e)                   // connection has opened
+ *      onmessage:  <proc>(e, message)          // message received
+ *      onerror:    <proc>(e)                   // error occurred
+ *      onclose:    <proc>(e)                   // connection has closed
+ *  }
+ *
+ */
+
+closure WebSocket(options, local wsock) {
+    global(window)
+    wsock = new(object, this)
+    options = new(options) || { }
+    if !options.host
+        options.host = window.location.host
+
+    // connect
+    //
+    // Connect with the host if not already connected, returning a result tuple.
+    //
+    wsock.connect = closure connect(local pending) {
+        if wsock.ws
+            return (list(false, { open: true }))
+        wsock.ws = xnew(window.WebSocket, "ws://${options.host}")
+        pending = new(nonce)
+    
+        // onopen
+        // The WebSocket connection is now open.
+        wsock.ws.onopen = closure onopen(e, local spawner) {
+            pending.signal(list(false, { ok: true }))
+            options.onopen(e)
+        }
+
+        // onmessage
+        // A message was received from the worker via WebSockets.
+        wsock.ws.onmessage = closure onmessage(e, message) {
+            try {
+                message = new(JSONparse(e.data))
+            } catch {
+                debuglog("can't decode incoming ws message:", exception)
+                options.onerror(Error("can't decode incoming message:", exception))
+                return
+            }
+            options.onmessage(e, message)
+        }
+        
+        // onerror
+        // An error occurred on the WebSocket connection.
+        wsock.ws.onerror = closure onerror(e, local error) {
+            error = Error("websocket failed", e)
+            options.onerror(e, error)
+            pending.signal(list(error))                                     // ensure connect completes
+        }
+        
+        // onclose
+        // The WebSocket connection was closed.
+        wsock.ws.onclose = closure onclose(e) {
+            options.onclose(e, e.code, e.reason)
+            pending.signal(list(Error("connection closed")))                // ensure connect completes
+            wsock.ws = false
+        }
+        
+        pending.wait()
+    }
+  
+    // send
+    //
+    //     Send a message dictionary.
+    //
+    wsock.send = function send(message) {
+        wsock.ws.send(JSONstringify(message))
+    }
+        
+    // close
+    //
+    //     Close the connection.
+    //
+    wsock.close = function close(reason) {
+        if !reason
+            reason = 1000                                                   // normal close
+        wsock.ws.close(reason)
+    }
+
+    // finis
+
+    wsock
+};
+
+
+/*
+ * ws_clientInit
+ *
+ *     Initialize WebSocket client operations for browsers.
+ *
+ */
+
+function ws_clientInit(local manifest) {
+    manifest = `(WebSocket, ws_clientInit)
+
+    Naan.module.build(module.id, "ws_client", function(modobj, compobj) {
+        require("browser.nlg")
+        compobj.manifest = manifest
+        modobj.exports.WebSocket = WebSocket
+    })
+}();

package/frameworks/client/apiclient.nlg

@@ -2,11 +2,11 @@
  * apiclient.nlg
  * Naanlib/frameworks/client
  *
- *     Access to Nide API with HTTP client.
+ *     Access to Nide API with browser HTTP client.
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2022 by Richard C. Zulch
+ * Copyright (c) 2017-2023 by Richard C. Zulch
  *
  */
 
@@ -25,6 +25,7 @@ closure MakeNideAPIclient(url, guid, local client) {
     client.url = url
     client.guid = guid
     client.notifyAfter = 0
+    client.instanceID = UUID()                                              // our client's unique ID
 
     // clientRequest() - general request routine
 

package/frameworks/client/psm_client.nlg

@@ -114,7 +114,7 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // that a transient error will give a bad path, but that will be detected downstream.
 
     view.path = new(object, this)
-    view.path[".undefined"] = function path args {
+    view.path@[".undefined"] = function path args {
         if !pathmod
             pathInit()
         xapply(pathmod, args.0, args.-1)