@naanlang/naan 1.4.4 → 1.6.0

package/frameworks/browser/worker.nlg

@@ -0,0 +1,255 @@
+/*
+ * worker.nlg
+ * Naanlib/frameworks/browser
+ *
+ * Manage NaaN instances.
+ *
+ * NaaN instances are managed by a top/bottom pair of of objects. InBot (INstance BOTtom) objects
+ * reside in the same JavaScript environment (node/browser) as their worker and communicate with the
+ * appropriate env_xxx.js adapter for NaaN in that environment.
+ *
+ * Zero or more InTop objects connect to each InBot object via the IMP network, providing remote
+ * evaluation and terminal access services. Each InTop supports only one terminal simultaneously, but
+ * they can be attached and detached at any time.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2026 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * InBot
+ *
+ * Create a remote interface for a single execution instance, returning the object. This provides
+ * instance access to zero or more InTops via IMP connections. The tops subscribe to receive
+ * notifications/responses.
+ *
+ * Options:
+ *  {
+ *      name:       <string>                    // target name, e.g. "Play"
+ *      type:       <string>                    // target category, e.g. "Local"
+ *      startup:    <dictionary>                // startup options
+ *      workerID:   <string>                    // initialize worker with this
+ *      workerGUID: <string>                    // initialize worker with this
+ *      topOriginID:  <string>                  // so top can route to us through IMP
+ *  }
+ *
+ */
+
+closure InBot(worker, options, local inbot)
+{
+    global(App)
+    inbot = new(object, this)
+    inbot.topsubs = []
+    options = merge({
+        type: "Local"
+    }, options)
+    inbot.workerID = options.workerID
+    inbot.worker = worker
+
+    inbot.instanceID = UUID()
+    inbot.sender = App.imp.register(inbot, {
+        name: options.name
+        type: options.type
+        instanceID: inbot.instanceID
+        services: ["naan-worker"]
+    })
+
+    // If this InBot is created remotely then we need to send a message from our new instanceID
+    // to the InTop origin so that it can send messages to us. The intermediate gateways save the
+    // route to allow replies.
+    if options.topOriginID && options.topOriginID != App.imp.us.instanceID
+        inbot.sender(options.topOriginID)                                   // create route top->bottom
+
+    // subscribe
+    //
+    // Add an InTop to our subscribers if not already known.
+    //
+    function subscribe(destID) {
+        if !inbot.topsubs.find(function(item) { item == destID }) {
+            inbot.topsubs.push(destID)
+            if inbot.workerDestID
+                inbot.sender(destID, {
+                    id: "workerDestID"
+                    workerDestID: inbot.workerDestID
+                })
+        }
+    }
+
+    // unsubscribe
+    //
+    // Remove an InTop from our subscribers if present.
+    //
+    function unsubscribe(destID) {
+        inbot.topsubs = inbot.topsubs.filter(function(item) { item != destID })
+    }
+
+    // notifyAll
+    //
+    // Send the message to all our subscribers.
+    //
+    inbot.notifyAll = function notifyAll(message, exceptID, local topDestID) {
+        for topDestID in inbot.topsubs
+            if topDestID != exceptID
+                inbot.sender(topDestID, message)
+    }
+
+    // impUnknown
+    //
+    // Received an unknown destination notice from the other side.
+    //
+    inbot.impUnknown = function impUnknown(unknownID, sourceID, gateway) {
+        if inbot.topsubs[unknownID] {                                       // did not have courtesy to unsubscribe!
+            unsubscribe(unknownID)
+            return
+        }
+        if !gateway
+            debuglog("InBot.impUnknownID:", unknownID, "sourceID:", sourceID)
+    }
+
+    // impReceive
+    //
+    // Received a message from InTop.
+    //
+    inbot.impReceive = function impReceive(message, sourceID) {
+        if message.id == "destroy"
+            destroy()                                                       // told to destroy worker
+        else if message.id == "subscribe"
+            subscribe(sourceID)
+        else if message.id == "unsubscribe"
+            unsubscribe(sourceID)
+        else if message.id == "typed"
+            notifyAll(message, sourceID)
+        else {                                                              // relay to worker
+            message.scope = "naan-env-web"
+            inbot.worker.postMessage(message)
+        }
+    }
+
+    // onmessage
+    //
+    // A message was received from the worker.
+    //
+    inbot.worker.addEventListener("message", function(e, local msg) {
+        msg = new(e.data)
+        if msg.scope == "naan-imp-web" {
+            inbot.impconn.dispatch(msg.data)
+            return
+        }
+        if msg.scope != "naan-env-web"
+            return
+        if msg.id == "loaded" {
+            if !inbot.started
+                inbot.worker.postMessage({
+                    scope: "naan-env-web"
+                    id: "start",
+                    state: false                                            // resume state, if we have any
+                    altcmd: options.startup.initcmds
+                    workerID: options.workerID
+                    workerGUID: options.workerGUID
+                    metadata: {
+                        mainInstanceID: App.imp.us.instanceID
+                        name: options.name
+                    }
+                })
+            inbot.started = true
+        }
+        notifyAll(msg)
+    })
+
+    // onerror
+    //
+    // The worker had an error.
+    //
+    inbot.worker.addEventListener("error", function(e) {
+        debuglog("worker error:", e.message)
+        notifyAll({
+            id: "error"
+            data: e.message
+        })
+        inbot.worker = false
+        destroy()
+    })
+    
+    // destroy
+    //
+    // Ensure the worker is destroyed and notify everyone.
+    //
+    inbot.destroy = function destroy() {
+        if inbot.worker {
+            inbot.worker.terminate()                                        // kill without saving
+            inbot.worker = false
+        }
+        notifyAll({
+            id: "terminated"
+        })
+        inbot.impconn.close()
+        inbot.impconn = false
+        App.imp.unregister(inbot.instanceID)
+    }
+
+    // register our connects *after* the receivers are configured above
+
+    // finis
+
+    inbot
+};
+
+
+/*
+ * NubBot
+ *
+ * Create a remote interface like InBot, but also provide messaging support for WebWorkerNub inside
+ * the worker.
+ *
+ */
+
+closure NubBot(worker, options, local nubbot)
+{
+    global(App)
+    nubbot = InBot(worker, options)
+
+    App.imp.addEventListener("active", function(event, info) {
+        if info.ourID == nubbot.instanceID {
+            nubbot.workerDestID = info.destID                               // handshake completed
+            nubbot.notifyAll({                                              // send to tops
+                id: "workerDestID"
+                workerDestID: nubbot.workerDestID
+            })
+        }
+    })
+
+    nubbot.impconn = App.imp.responder(function(data) {
+        nubbot.worker.postMessage({                                         // send to worker
+            scope: "naan-imp-web"                                           // scoped for WorkerNub
+            data: data
+        })
+        list(false, { sent: true })
+    }, {
+        ourID: nubbot.instanceID
+    })
+
+    // finis
+
+    nubbot
+};
+
+
+/*
+ * workInit
+ *
+ * Initialize the component.
+ *
+ */
+
+function workInit(local manifest) {
+    manifest = `(InBot, NubBot, workInit)
+
+    Naan.module.build(module.id, "worker", function(modobj, compobj) {
+        require("./browser.nlg")
+        compobj.manifest = manifest
+        modobj.exports.InBot = InBot
+    })
+} ();

package/frameworks/browser/workers.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2026 by Richard C. Zulch
  *
  */
 
@@ -427,22 +427,22 @@ closure TrackServiceWorkers(track, pubID, pubVersion, callback, local error) {
     `(error, serviceWorker) = ScopedServiceWorker(pubID, pubVersion, callback)
     if error
         ErrorDebugLog("TrackServiceWorkers: cannot load service worker", error)
-    track.register(TrackedScope, "V-Site")
+    track.register("V-Site", TrackedScope)
     serviceWorker
 };
 
 
 /*
- * workInit
+ * worksInit
  *
  *     Initialize the debugger page.
  *
  */
 
-function workInit(local manifest) {
+function worksInit(local manifest) {
 
     manifest = `(ServiceWorker, ScopedServiceWorker, findTrackedScope, TrackedScope,
-        TrackServiceWorkers, workInit)
+        TrackServiceWorkers, worksInit)
 
     Naan.module.build(module.id, "workers", function(modobj, compobj) {
         require("./browser.nlg")

package/frameworks/browser/ws_client.nlg

@@ -5,7 +5,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2023-2024 by Richard C. Zulch
+ * Copyright (c) 2023-2026 by Richard C. Zulch
  *
  */
 
@@ -13,11 +13,14 @@
 /*
  * WebSocket
  *
- * Create a WebSocket client connection object using the existing HTTPS connection.
+ * Create a WebSocket client connection object.
+ *
+ * Optional, default Host:
+ *      host:       <string>                    // host:port
  *
  * Options:
  *  {
- *      host:       <string>                    // host:port
+ *      wss:        <boolean>                   // true to use secure connection
  *      onopen:     <proc>(e)                   // connection has opened
  *      onmessage:  <proc>(e, message)          // message received
  *      onerror:    <proc>(e)                   // error occurred
@@ -28,12 +31,14 @@
  *
  */
 
-closure WebSocket(options, local wsock) {
+closure WebSocket(host, options, local wsock) {
     global(window)
     wsock = new(object, this)
     options = new(options) || { }
-    if !options.host
-        options.host = window.location.host
+    if !host {
+        host = window.location.host
+        options.wss = window.location.protocol == "https:"
+    }
 
     // connect
     //
@@ -42,10 +47,10 @@ closure WebSocket(options, local wsock) {
     wsock.connect = closure connect(local url, pending) {
         if wsock.ws
             return (list(false, { open: true }))
-        if window.location.protocol == "https:"
-            url = "wss://${options.host}${options.querys||''}"
+        if options.wss
+            url = "wss://${host}${options.querys||''}"
         else
-            url = "ws://${options.host}${options.query||''}"
+            url = "ws://${host}${options.query||''}"
         wsock.ws = xnew(window.WebSocket, url)
         pending = new(nonce)
     
@@ -58,7 +63,7 @@ closure WebSocket(options, local wsock) {
 
         // onmessage
         // A message was received from the worker via WebSockets.
-        wsock.ws.onmessage = closure onmessage(e, message) {
+        wsock.ws.onmessage = closure onmessage(e, local message) {
             try {
                 message = new(JSONparse(e.data))
             } catch {

package/frameworks/client/apiclient.nlg

@@ -2,41 +2,70 @@
  * apiclient.nlg
  * Naanlib/frameworks/client
  *
- *     Access to Nide API with browser HTTP client.
+ * Access to Nide API with specified HTTP client.
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2024 by Richard C. Zulch
+ * Copyright (c) 2017-2026 by Richard C. Zulch
  *
  */
 
 
+// Globals
+
+serviceMod;;
+
+
 /*
- * NideAPIclient
+ * APIClient
+ *
+ * Make an API client object.
  *
- *     Make an API client object for browsers.
+ * Options:
+ *  {
+ *      url:            <string>                // hostname or URL of the remote server
+ *      guid:           <string>                // shared secret for access to remote server
+ *  }
  *
  */
 
-closure NideAPIclient(url, guid, apiRequester, local client) {
-    global()
+closure APIClient(imp, options, local client, url, guid) {
+    global(App, serviceMod)
     client = new(object, this)
+    options = merge({
+    }, options)
+    url = options.url
     if !url.match(RegExp("^https?:\/\/", "i"))
         url = "http://${url}"                                               // a protocol is required
     if url.slice(-1) != "/"
         url = url.concat("/")                                               // must end in "/"
     client.url = url
-    client.guid = guid
+    options.url = url
+    client.guid = options.guid
     client.notifyAfter = 0
-    client.instanceID = UUID()                                              // our client's unique ID
+    client.requester = clirRequester()
+
+    //
+    // wsopen
+    //
+
+    client.wsopen = function wsopen(error) {
+        if !client.wesc {
+            client.wesc = WebSocketClient(options, imp)
+            `(error) = client.wesc.connect()
+            if error
+                ErrorDebuglog("APIClient: cannot connect to", url)
+        }
+    }
+    wsopen()
 
     // clientRequest() - append our guid to the headers
 
-    closure clientRequest(url, options) {
-        options = merge(options)
-        if guid
-            options.headers = [list("x-naanlang-api-guid", guid)]
-        apiRequester(url, options)
+    closure clientRequest(url, reqops) {
+        reqops = merge(reqops)
+        if options.guid
+            reqops.headers = [list("x-naanlang-api-guid", options.guid)]
+        client.requester(url, reqops)
     }
 
     //
@@ -57,7 +86,7 @@ closure NideAPIclient(url, guid, apiRequester, local client) {
             timeout: timeoutms
             after: client.notifyAfter
         })
-        `(error, content, extra) = clientRequest(url.concat(query))
+        `(error, content, extra) = clientRequest(url.concat(query), { retrier: false }) // don't retry inside
         if (error || extra.status != 200)
             cbStatus()
         else if (length(content) == 0)
@@ -76,8 +105,12 @@ closure NideAPIclient(url, guid, apiRequester, local client) {
     // get
     //
 
-    client.get = closure get(path, options, local error, content, extra) {
-        `(error, content, extra) = clientRequest(url.concat(path))
+    client.get = closure get(path, options, local requrl, error, content, extra) {
+        if App.cache
+            requrl = url.concat(EncodeQuery(path.concat("?"), { naanver: App.cache }))
+        else
+            requrl = url.concat(path)
+        `(error, content, extra) = clientRequest(requrl)
         if !error && extra.status != 200
             error = Error("readFile failed: ".concat(extra.status), {
                     status: extra.status
@@ -139,26 +172,178 @@ closure NideAPIclient(url, guid, apiRequester, local client) {
         else
             callback(error, content)
     }
+    
+    // destroy
+    //
+    // Close down the client and release all resources.
+    //
+    client.destroy = closure destroy() {
+        debuglog("client destroy websocket")
+        client.wesc.destroy()
+        client.wesc = false
+    }
 
     client
 };
 
 
+/* 
+ * WebSocketClient
+ *
+ * WebSocket client for websocket communications with a server. The Instance Messaage Processor (IMP)
+ * handles routing between instances using intermediaries.
+ *
+ * Options:
+ *  {
+ *      url:            <string>                // hostname or URL of the remote server
+ *      guid:           <string>                // shared secret for access to remote server
+ *      instanceID:     <string>                // UUID for our client; can be persisted by caller
+ *  }
+ *
+ */
+
+closure WebSocketClient(options, imp, local wesc, ws) {
+    global(js)
+    wesc = new(object, this)
+
+    // connect
+    //
+    // Establish a websocket connection with the host.
+    //
+    wesc.connect = closure connect(local url, pending) {
+        if ws && !wesc.fatal
+            return(list(false, { connected: true }))
+        if wesc.fatal
+            debuglog("WebSocketClient reopen")
+        wesc.fatal = false
+        try {
+            url = xnew(js.w.URL, options.url)
+        } catch {
+            return(list(Error("invalid URL ${options.url}", exception)))
+        }
+        if url.protocol == "https:"
+            url.protocol = "wss:"
+        else
+            url.protocol = "ws:"
+        ws = xnew(js.w.WebSocket, url.href)
+        pending = new(nonce)
+    
+        // onopen
+        // The WebSocket connection is now open.
+        ws.onopen = function onopen(e, local error) {
+            wesc.impconn = imp.requester(function(data) {
+                if wesc.fatal                                               // raw send function
+                    return (list(wesc.fatal))
+                ws.send(js.w.JSON.stringify(data))
+                list(false, { sent: true })
+            }, {
+                secret: options.guid
+                label: "api-server"
+                wesc: wesc
+            })
+            if error
+                pending.signal(list(error))
+            else
+                pending.signal(list(false, { ok: true }))
+        }
+    
+        // onmessage
+        // A message was received via WebSockets.
+        ws.onmessage = function onmessage(e, local error, message) {
+            `(error, message) = JsonParse(e.data)
+            if !error {
+                message = new(message)
+                if wesc.impconn.dispatch(message)
+                    return
+            }
+            debuglog("socket message:", e.data)
+        }
+    
+        // onerror
+        // An error occurred on the WebSocket connection.
+        // This can happen in normal operation when the connection times out.
+        ws.onerror = function onerror(e) {
+            if !wesc.fatal
+                wesc.fatal = Error("websocket failed", e)
+            pending.signal(list(wesc.fatal))
+        }
+        
+        // onclose
+        // The WebSocket connection was closed.
+        ws.onclose = function onclose(e) {
+            // if e.code != 1000 && e.code != 1001 && e.code != 1005 && e.code != 1006
+                debuglog("WebSocketClient: closed:", e.code, e.reason)
+            ws = false
+            if !wesc.fatal
+                wesc.fatal = Error("websocket closed", e.code, e.reason)
+            pending.signal(list(wesc.fatal))
+            wesc.impconn.close({
+                code: e.code
+                reason: e.reason
+            })
+            wesc.impconn = false
+        }
+
+        pending.wait()
+    }
+    
+    // close
+    //
+    // Close the connection, but can be opened again with connect().
+    //
+    wesc.close = function close() {
+        if !ws
+            return
+        ws.close(1000)                                                      // 1000: normal close
+    }
+    
+    // destroy
+    //
+    // Destroy the connection permanently.
+    //
+    wesc.destroy = function destroy() {
+        close()
+    }
+
+    // send
+    //
+    // Send a message.
+    //
+    wesc.send = closure send(data) {
+        if wesc.fatal
+            return (wesc.fatal)
+        wesc.impconn.send(data)
+    }
+
+    // sendRaw
+    //
+    // Send a message with reconnect but no routing.
+    //
+    wesc.sendRaw = closure sendRaw(data) {
+        ws.send(data)
+    }
+
+    // finis
+    wesc
+};
+
+
 /*
  * apicInit
  *
- *     Initialize the apic component.
+ * Initialize the apiclient component.
  *
  */
 
 function apicInit(local manifest) {
 
-    manifest = `(NideAPIclient, apicInit)
+    manifest = `(APIClient, WebSocketClient, apicInit)
 
     Naan.module.build(module.id, "apiclient", function(modobj, compobj) {
         Naan.module.require("./client.nlg")
+        serviceMod = Naan.module.require("naanlib:frameworks/service/imp.nlg")
         compobj.manifest = manifest
-        modobj.exports.NideAPIclient = NideAPIclient
+        modobj.exports.APIClient = APIClient
     })
 
 } ();

package/frameworks/client/client.nlg

@@ -6,11 +6,31 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2025 by Richard C. Zulch
  *
  */
 
 
+/*
+ * clirRequester
+ *
+ *     Return an appropriate HttpsRequestApi client based on our environment.
+ *
+ */
+
+clirRequestApi = false;
+
+function clirRequester() {
+    if !clirRequestApi {
+        if js.w
+            clirRequestApi = require("naanlib:frameworks/browser/https_request.nlg").HttpsApiRequest
+        else
+            clirRequestApi = require("naanlib:frameworks/node/https_request.nlg").HttpsApiRequest
+    }
+    clirRequestApi
+};
+
+
 /*
  * clirInit
  *
@@ -20,7 +40,7 @@
  */
 
 function clirInit(local manifest) {
-    manifest = `(clirInit)
+    manifest = `(clirRequester, clirInit)
 
     Naan.module.build(module.id, "client", function(modobj, compobj) {
         require("../common/").LiveImport()