@naanlang/naan 1.7.0 → 1.7.2

package/frameworks/browser/sworker.js

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

package/frameworks/browser/terminals.nlg

@@ -132,10 +132,12 @@ closure TermHost(track, name, options,
  *
  * Options:
  *  {
- *      workerID: <string>                      // kind of worker in server subsystem
+ *      workerID:   <string>                    // kind of worker in server subsystem
  *                                              // "NaanIDE" for local IDE
- *      startup: <dictionary>                   // startup options
- *      type: <string>                          // (rare) target category, e.g. "Local"
+ *      startup:    <dictionary>                // startup options
+ *      type:       <string>                    // (rare) target category, e.g. "Local"
+ *      worker:     <xobject>                   // existing worker or window
+ *      naancont:   <xobject>                   // NaaN controller if vsite
  *  }
  *
  */
@@ -153,11 +155,17 @@ closure TermLocal(track, name, options, local target, worker, wowbot, error)
         return (termIDE(track, name, options.workerID, js.t))               // connect to IDE execution instance itself
     }
 
-    target = findIDEtarget(track, name, options.workerID)
-    if target
-        return (list(false, target))                                        // already exists
+    target = findIDEtarget(track, name, options.workerID, options.title, options.naancont)
+    if target {                                                             // new naancont on existing target
+        target.updateController(options)
+        track.update(target)
+        return (list(false, target))
+    }
 
-    worker = xnew(window.Worker, "env_webworker.js")
+    if options.worker
+        worker = options.worker
+    else
+        worker = xnew(window.Worker, "env_webworker.js")
     wowbot = WowBot(worker, {
         name: name
         type: options.workerID
@@ -172,6 +180,91 @@ closure TermLocal(track, name, options, local target, worker, wowbot, error)
     if error
         return (list(Error("cannot create InTop", error)))
 
+    target.title = options.title
+    target.naancont = options.naancont
+
+    // updateController
+    //
+    //     Our controller was replaced, meaning the window changed.
+    //
+    target.updateController = function updateController(newops) {
+        target.execReset()
+        target.statusPoll = false
+        wowbot.close()
+        if defined(newops, `worker) {
+            if worker
+                target.impReceive({
+                    id: "textout"
+                    text: "\x1b[90m\x1b[3m".concat("\ntarget replaced", "\x1b[0m\n")
+                })
+            worker = newops.worker
+        }
+        if defined(newops, `title)
+            target.title = newops.title
+        if defined(newops, `naancont)
+            target.naancont = newops.naancont
+        wowbot = WowBot(worker, {
+            name: name
+            type: options.workerID
+            startup: options.startup
+        })
+        target.open(wowbot.instanceID)
+    }
+
+    // targetClose
+    //
+    //     Mark the target window as closed.
+    //
+    target.targetClose = function targetClose() {
+        worker = false
+        target.execReset()
+        target.cleanup()
+        target.impReceive({
+            id: "textout"
+            text: "\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n")
+        })
+        target.close()
+    }
+
+    // cleanup
+    //
+    //     InTop is destroying our worker.
+    //
+    target.cleanup = function cleanup() {
+        target.statusPoll = false
+        target.naancont = false
+    }
+
+    // setCheckStatus
+    //
+    //     Begin or end checking status on the worker to see if stopped responding. The challenge
+    // here is that we open vsite windows in the main thread, but there is no reliable event to learn
+    // when they are closed. The solution is to poll the window.closed variable, which is reliable.
+    // to learn more quickly if the window as closed, the child may also inform us, but this is not
+    // entirely reliable--just quick if accurate.
+    //
+    target.setCheckStatus = closure setCheckStatus(hidden, window) {
+        if !target.statusPoll
+            target.statusPoll = future(function childWindowClosePoll() {
+                while target.statusPoll {
+                    if window.closed {
+                        targetClose()
+                        target.statusPoll = false
+                        break
+                    } else
+                        sleep(1000)                                     // check 1x/second
+                }
+            }, 10)                                                      // start after 10 msec
+    }
+
+    // vsiteRefresh
+    //
+    //     The vsite upon which we are based has changed.
+    //
+    target.vsiteRefresh = function vsiteRefresh(url_origin) {
+        target.naancont.VsiteRefresh(url_origin)
+    }
+
     // finis
 
     list(false, target)
@@ -203,27 +296,21 @@ closure findIDEtarget(track, name, workerID, title, naancont, local target) {
  *
  *     Make an IDE debugger target. The Naan controller in this case, env_web.js, iterates through
  * all connected terminals so we just have to provide unique connection object for it to talk with.
- * This is used for both the IDE itself as well as any additional virtual website windows.
+ * This is used for just the IDE itself.
  *
  */
 
-closure termIDE(track, name, workerID, naancont, title, local target, connected) {
+closure termIDE(track, name, workerID, naancont, local target, connected) {
     global(js)
-    target = findIDEtarget(track, name, workerID, title, naancont)
-    if target {                                                             // new naancont on existing target
-        if target.naancont && naancont !== target.naancont
-            target.targetClose()
-        target.updateController(naancont)
-        target.title = title
-        track.update(target)
-        return (target)
-    }
+    target = findIDEtarget(track, name, workerID)
+    if target
+        return (list(false, target))
     target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
     target.dispatcher = require("../running/taskexec.nlg").TaskDispatcher(false, false, "termIDE")
     target.name = name
-    target.title = title
     target.workerID = workerID
     target.naancont = naancont
+    target.jsterms = new(weakmap)
     naancont.ioctl_open(ioctl_callback.proc)
     connected = []
 
@@ -265,8 +352,11 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
     // Create a closure for an attaching terminal.
     //
     target.termAttach = closure termAttach(term, db, notify, local connection, jsterm, inbound) {
-        connection = new(object, this)
         jsterm = term.jsAcquire()                                           // termIDE must be direct
+        if target.jsterms[jsterm]
+            return                                                          // return existing connection
+        connection = new(object, this)
+        target.jsterms[jsterm] = connection
 
         function oninterrupt() {
             naancont.Interrupt(inbound)
@@ -301,10 +391,13 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         }
 
         connection.termDetach = function termDetach() {                     // disconnect the terminal
+            if !target.jsterms[jsterm]
+                return                                                      // already released
             db.detach(target)
             if inbound
                 naancont.Detach(inbound)
             connected = connected.filter(function(conn) { conn !== connection })
+            target.jsterms[jsterm] = undefined
             term.jsRelease()
         }
 
@@ -362,74 +455,6 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         connection
     }
     
-    // updateController
-    //
-    //     Update the naan controller on this target, which means updating for all the terminals.
-    //
-    target.updateController = function updateController(newnc, local conn) {
-        naancont.ioctl_close()
-        naancont = newnc
-        naancont.ioctl_open(ioctl_callback.proc)
-        target.naancont = newnc
-        for conn in connected {
-            if naancont {
-                naancont.Attach(conn.inbound)                               // tell the controller about terminals
-                conn.db.attach(target)                                      // re-attach since remote changed
-                conn.termActive()
-            } else
-                conn.db.detach(target)                                      // nothing left to debug
-        }
-        target.execReset()                                                  // reset our parent class
-    }
-
-    // targetClose
-    //
-    //     Mark the target window as closed.
-    //
-    target.targetClose = function targetClose(local conn) {
-        for conn in connected {
-            conn.db.detach(target)
-            conn.WriteLn("\x1b[90m\x1b[3m".concat("\ntarget closed", "\x1b[0m"))
-        }
-        target.execReset()
-        naancont.ioctl_close()
-        target.naancont = naancont = false
-    }
-
-    // setCheckStatus
-    //
-    //     Begin or end checking status on the worker to see if stopped responding. The challenge
-    // here is that we open vsite windows in the main thread, but there is no reliable event to learn
-    // when they are closed. The solution is to start checking if the window is closed after it gets
-    // a visibilityChange event to hidden. This terminates when the window gets marked closed or when
-    // it becomes visible again--which is quite unlikely unless someone uses the explicit hide/show
-    // window methods.
-    //
-    target.setCheckStatus = closure setCheckStatus(hidden, window) {
-        if hidden {
-            if !target.statusPoll
-                target.statusPoll = future(function() {
-                    while target.statusPoll {
-                        if window.closed {
-                            targetClose()
-                            target.statusPoll = false
-                            break
-                        } else
-                            sleep(100)                                      // check 10x/second
-                    }
-                }, 10)                                                      // start after 10 msec
-        } else
-            target.statusPoll = false
-    }
-
-    // vsiteRefresh
-    //
-    //     The vsite upon which we are based has changed.
-    //
-    target.vsiteRefresh = function vsiteRefresh(url_origin) {
-        naancont.VsiteRefresh(url_origin)
-    }
-    
     // destroy
     //
     //     Destroy the execution instance.
@@ -460,13 +485,15 @@ closure termInstallVirtualWatcher(track, naancont) {
 
     function watchVsites(msg, local error, target) {
         if msg.op == "VsiteOpen" {
-            `(error, target) = termIDE(track, msg.name, "NaanVsite", msg.naancont, msg.title)
+            `(error, target) = TermLocal(track, msg.name, {
+                workerID: "NaanVsite", worker: msg.window, title: msg.title, naancont: msg.naancont
+            })
             target.attention()
         }
         else if msg.op == "VsiteClose" {
             target = findIDEtarget(track, msg.name, "NaanVsite", msg.title, msg.naancont)
             if target
-                target.updateController()
+                target.updateController({ naancont: false })                // allow re-use of instance
         }
         else if msg.op == "VsiteVisibilityChange" {
             target = findIDEtarget(track, msg.name, "NaanVsite", msg.title, msg.naancont)

package/frameworks/browser/worker.nlg

@@ -49,7 +49,7 @@ closure InBot(worker, options, local inbot)
     inbot.workerID = options.workerID
     inbot.worker = worker
 
-    inbot.instanceID = UUID()
+    inbot.instanceID = App.imp.getUUID("InBot(${options.name}) instanceID")
     inbot.sender = App.imp.register(inbot, {
         name: options.name
         type: options.type
@@ -133,9 +133,9 @@ closure InBot(worker, options, local inbot)
     // 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)
+        msg = e.data
+        if msg.scope == "naan-imp-out" {
+            inbot.impconn.dispatch(new(msg.data))
             return
         }
         if msg.scope != "naan-env-web"
@@ -177,6 +177,16 @@ closure InBot(worker, options, local inbot)
         destroy()
     })
     
+    // close
+    //
+    // Close and remove our IMP resources, but leave the worker alone.
+    //
+    inbot.close = function close() {
+        inbot.impconn.destroy()
+        inbot.impconn = false
+        App.imp.unregister(inbot.instanceID)
+    }
+
     // destroy
     //
     // Ensure the worker is destroyed and notify everyone.
@@ -189,9 +199,7 @@ closure InBot(worker, options, local inbot)
         notifyAll({
             id: "terminated"
         })
-        inbot.impconn.destroy()
-        inbot.impconn = false
-        App.imp.unregister(inbot.instanceID)
+        close()
     }
 
     // finis
@@ -261,7 +269,7 @@ closure WowBot(worker, options, local wowbot)
 
     wowbot.impconn = App.imp.responder(function(data) {
         wowbot.worker.postMessage({                                         // send IMP messages to worker
-            scope: "naan-imp-web"                                           // scoped for WebWorkerNub
+            scope: "naan-imp-in"                                            // scoped for WebWorkerNub
             data: data
         })
         list(false, { sent: true })

package/frameworks/browser/workers.nlg

@@ -151,7 +151,18 @@ closure ServiceWorker(pubID, pubVersion, local serv, callback) {
             message: "opened"
         })
     }
-    
+
+    // update
+    //
+    // Go get the latest version of the service worker and update if changed.
+    //
+    serv.update = closure update(local err, reg) {
+        `(err, reg) = await(serv.reg.update())
+        if err
+            return (list(Error("service worker update failed", err)))
+        list(false, reg)
+    }
+
     // reload
     //
     // If a sevice worker is waiting, then terminate the old one and activate the new one -- which

package/frameworks/browser/ws_client.nlg

@@ -13,107 +13,43 @@
 /*
  * WebSocket
  *
- * Create a WebSocket client connection object.
+ * Create a WebSocket client connection object, returning a tuple.
  *
- * Optional, default Host:
- *      host:       <string>                    // host:port
+ * Required:
+ *      urlstr:     <string>
  *
  * Options:
  *  {
  *      wss:        <boolean>                   // true to use secure connection
+ *      query:      <string>                    // query string starting with ?
  *      onopen:     <proc>(e)                   // connection has opened
  *      onmessage:  <proc>(e, message)          // message received
  *      onerror:    <proc>(e)                   // error occurred
  *      onclose:    <proc>(e)                   // connection has closed
- *      query:      <string>                    // query string starting with ? for insecure connections
- *      querys:     <string>                    // query string starting with ? for secure connections
  *  }
  *
  */
 
-closure WebSocket(host, options, local wsock) {
-    global(window)
-    wsock = new(object, this)
-    options = new(options) || { }
-    if !host {
-        host = window.location.host
-        options.wss = window.location.protocol == "https:"
+closure WebSocket(urlstr, options, local url, ws) {
+    try {
+        url = xnew(js.w.URL, urlstr)
+    } catch {
+        return (list(Error("invalid URL ${urlstr}", exception)))
     }
-
-    // connect
-    //
-    // Connect with the host if not already connected, returning a result tuple.
-    //
-    wsock.connect = closure connect(local url, pending) {
-        if wsock.ws
-            return (list(false, { open: true }))
-        if options.wss
-            url = "wss://${host}${options.querys||''}"
-        else
-            url = "ws://${host}${options.query||''}"
-        wsock.ws = xnew(window.WebSocket, url)
-        pending = new(nonce)
-    
-        // onopen
-        // The WebSocket connection is now open.
-        wsock.ws.onopen = closure onopen(e) {
-            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, local 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
+    options = merge({
+        query: url.search || ''
+        wss: url.protocol == "https:"
+    }, options)
+    if options.wss
+        url = "wss://${url.host}${options.query}"
+    else
+        url = "ws://${url.host}${options.query}"
+    ws = xnew(window.WebSocket, url)
+    ws.onopen = options.onopen
+    ws.onmessage = options.onmessage
+    ws.onerror = options.onerror
+    ws.onclose = options.onclose
+    list(false, ws)
 };