@naanlang/naan 1.6.0 → 1.7.0

package/frameworks/browser/sworker.js

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

package/frameworks/browser/terminals.nlg

@@ -10,93 +10,24 @@
  *
  */
 
-/*
- * globals
- *
- */
-
-gWorkers;
-
-
-/*
- * ioctl terminal control and events
- *
- * Example "raw" mode:
- *
-    // rawTest
-    // echo typed keystrokes in BOLD until Control-C stops it.
-    //
-    closure rawTest(local dokey) {
-        dokey = xnew(function(msg, arg) {
-            if arg.key == "\x03" {
-                js.t.ioctl("raw", false)
-                js.t.ioctl_remove_listener("raw-key", dokey)
-            }
-            else
-                print("\x1b[1m${arg.key}\x1b[22m")
-        })
-        js.t.ioctl_add_listener("raw-key", dokey)
-        js.t.ioctl("raw", true)
-    };
-    
-    rawTest();
- *
- *
- * Example echo control:
- *
-    js.t.ioctl("echo", 0)                       // no echo at all
-    js.t.ioctl("echo", 1)                       // echo newlines (best for hiding REPL commands)
-    js.t.ioctl("echo", 2)                       // normal echo
-
-    js.t.ioctl("sane")                          // restore echo and raw
- *
- *
- * Example simulated keystrokes:
- *
-    future(function(){ js.t.ioctl("keystroke", "joe") }, 10);               // "joe" in keyboard buffer
- *
- *
- * Example terminal resize notification:
- *
-    doresize = xnew(function(msg, dim) { printline("(${dim.cols}, ${dim.rows})")})
-    js.t.ioctl_add_listener("term-resize", doresize);
- *
- *
- * Example terminal connection notification:
- *
-    // add removable listener:
-    listener = xnew(function(msg,arg) { debuglog("listener:", msg, arg) });
-    js.t.ioctl_add_listener("term-attach", listener);
-    js.t.ioctl_add_listener("term-detach", listener);
-
-    // remove the listeners:
-    js.t.ioctl_remove_listener("term-attach", listener);
-    js.t.ioctl_remove_listener("term-detach", listener);
- *
- * Note that js.t.ioctl(...) controls the *terminal* even if attached to a different instance. But
- * ioctl event listeners are attached to an *instance* regardless of what terminal is connected.
- * But in general it does the "right thing" for multiple terminals on a single instance, and when
- * switching among instances.
- *
- */
-
 
 /*
  * TermHost
  *
- *     Make an Nide API Server debugger target.
+ *     Make a debugger target on our Host NaanIDE Server or a remote one.
  *
  * Options:
  *  {
- *      type: <string>                          // target category, e.g. "Host", "api.yyy.com"
- *      workerID: <string>                      // kind of worker in server subsystem
- *      startup: <dictionary>                   // startup options
+ *      serverID:     <string>                  // target server if not our Host
+ *      type:       <string>                    // target category, e.g. "Remote", "api.yyy.com"
+ *      workerID:   <string>                    // kind of worker in server subsystem
+ *      startup:    <dictionary>                // startup options
  *  }
  *
  */
 
 closure TermHost(track, name, options,
-    local relay, error, destID, target, xc)
+    local relay, error, serverID, targetID, target, xc)
 {
     global(App)
 
@@ -105,15 +36,20 @@ closure TermHost(track, name, options,
     // Find the host instance name/type, or create new remote worker. The default for no name/type is
     // the server itself.
     //
-    function findHostInstance(relay, name, type, local error, found, dest, worker) {
-        `(error, found) = relay.clients()
-        if !error {
-            dest = found.find(function(item) { item.name == "NaanIDE Server" && item.type == "Server IMP" })
-            if !dest
-                error = Error("cannot locate host")
+    function findHostInstance(relay, name, type,
+        local error, found, dest, worker) {
+        if !serverID {
+            `(error, found) = relay.clients()
+            if !error {
+                dest = found.find(function(item) { item.name == "NaanIDE Server" && item.type == "Server IMP" })
+                if dest
+                    serverID = dest.destID
+                else
+                    error = Error("cannot locate host")
+            }
         }
         if !error
-            `(error, found) = relay.clients(dest.destID)
+            `(error, found) = relay.clients(serverID)
         if !error {
             if name && type {
                 dest = found.find(function(item) { item.name == name && item.type == type })
@@ -143,6 +79,7 @@ closure TermHost(track, name, options,
                     name: name
                     type: options.type
                     startup: options.startup
+                    rootPath: options.rootPath || undefined
                     topOriginID: App.imp.us.instanceID
                 })
             if error
@@ -162,10 +99,11 @@ closure TermHost(track, name, options,
         return (list(false, target))                                        // already exists
 
     relay = require("naanlib:frameworks/client/relaycon.nlg").RelayCon(App.imp)
+    serverID = options.serverID
     if options.workerID == "NideServer"                                     // server main thread
-        `(error, destID) = findHostInstance(relay)
+        `(error, targetID) = findHostInstance(relay)
     else
-        `(error, destID) = findHostInstance(relay, name, options.type)
+        `(error, targetID) = findHostInstance(relay, name, options.type)
     relay.close()
     if error
         return (list(error))
@@ -174,9 +112,10 @@ closure TermHost(track, name, options,
         name: name
         type: options.type
     })
-    target.workerID = options.workerID
+    target.serverID = serverID                                              // server instanceID
+    target.workerID = options.workerID                                      // worker on server instanceID
 
-    `(error) = target.open(destID)
+    `(error) = target.open(targetID)
     if error
         return (list(Error("cannot create InTop", error)))
 
@@ -201,11 +140,9 @@ closure TermHost(track, name, options,
  *
  */
 
-closure TermLocal(track, name, options, local target, worker, inbot, error)
+closure TermLocal(track, name, options, local target, worker, wowbot, error)
 {
-    global(js, window, gWorkers)
-    if !dictionary(gWorkers)
-        gWorkers = {}
+    global(js, window)
     options = merge({
         type: "Local"
     }, options)
@@ -221,7 +158,7 @@ closure TermLocal(track, name, options, local target, worker, inbot, error)
         return (list(false, target))                                        // already exists
 
     worker = xnew(window.Worker, "env_webworker.js")
-    inbot = NubBot(worker, {
+    wowbot = WowBot(worker, {
         name: name
         type: options.workerID
         startup: options.startup
@@ -231,7 +168,7 @@ closure TermLocal(track, name, options, local target, worker, inbot, error)
         type: options.type
         workerID: options.workerID
     })
-    `(error) = target.open(inbot.instanceID)
+    `(error) = target.open(wowbot.instanceID)
     if error
         return (list(Error("cannot create InTop", error)))
 
@@ -271,7 +208,7 @@ closure findIDEtarget(track, name, workerID, title, naancont, local target) {
  */
 
 closure termIDE(track, name, workerID, naancont, title, local target, connected) {
-    global(js, gWorkers)
+    global(js)
     target = findIDEtarget(track, name, workerID, title, naancont)
     if target {                                                             // new naancont on existing target
         if target.naancont && naancont !== target.naancont
@@ -282,23 +219,23 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         return (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
     naancont.ioctl_open(ioctl_callback.proc)
     connected = []
-    
-    // replyHook
+
+    // PostMessage
     //
-    //     Intercept the ReplyMessage function to see if we should handle it.
+    // Process a message through the dispatcher.
     //
-    function replyHook(data) {
-        if data._guid
-            gWorkers[data._guid].worker.postMessage({
-                id: "targetreceive"
-                data: data
-            })
+    target.PostMessage = function PostMessage(data) {
+        target.dispatcher(data, function(reply) {
+             target.execReceived(reply)
+        })
+        list(false, { posted: true })
     }
 
     // ioctl_callback
@@ -323,15 +260,6 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         naancont.DispatchDebugger(data)
     }
 
-    // target.PostMessage
-    //
-    //     Post a message to the target, ourselves.
-    //
-    target.PostMessage = function PostMessage(data) {
-        naancont.DispatchMessage(data)
-        list(false, { posted: true })
-    }
-
     // termAttach
     //
     // Create a closure for an attaching terminal.
@@ -350,11 +278,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
     
         function onstatus(status) {
             target.execSetStatus(status)
-            statusCB(target, status)
-        }
-    
-        function onmessageout(data) {
-            target.execReceived(data)
+            notify.execStatus(target, status)
         }
     
         function ondebugout(data) {
@@ -399,7 +323,6 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
                 OnMessage: jsterm.OnMessage
                 StateSave: jsterm.StateSave
                 OnStatus: onstatus.proc
-                OnMessageOut: onmessageout.proc
                 OnDebugOut: ondebugout.proc
             })
             naancont.Attach(inbound)
@@ -516,7 +439,6 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
         track.delete(target)
     }
 
-    js.t.OnReplyHook(replyHook.proc)
     track.add(target)
 
     // finis
@@ -534,7 +456,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
  */
 
 closure termInstallVirtualWatcher(track, naancont) {
-    global()
+    global(js)
 
     function watchVsites(msg, local error, target) {
         if msg.op == "VsiteOpen" {
@@ -553,7 +475,7 @@ closure termInstallVirtualWatcher(track, naancont) {
         }
     }
     
-    require("../running/executors.nlg").TaskOnMessageHook(watchVsites)
+    js.t.OnMessage(watchVsites.proc)
 };
 
 
@@ -653,8 +575,8 @@ closure relayTab(destID, local comMod, relay, error, found, dest, xc, reterm, or
     if error
         return (list(Error("cannot get remote terminal", error)))
     originID = App.imp.us.instanceID
-    `(error, inbot) = xc.evalq(InBot(window, {
-        name: "inbot"
+    `(error, inbot) = xc.evalq(MewBot(window, {
+        name: "mewbot"
         type: reterm.workerID
         topOriginID: originID
     }), `(reterm, originID))

package/frameworks/browser/worker.nlg

@@ -2,7 +2,7 @@
  * worker.nlg
  * Naanlib/frameworks/browser
  *
- * Manage NaaN instances.
+ * Manage web-based 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
@@ -24,7 +24,8 @@
  *
  * 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.
+ * notifications/responses. This runs in the main thread and communicates with the worker via the
+ * standard JS messaging interface.
  *
  * Options:
  *  {
@@ -32,7 +33,6 @@
  *      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
  *  }
  *
@@ -148,10 +148,10 @@ closure InBot(worker, options, local inbot)
                     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
+                        maintext: options.startup.maintext.concat("\n")
                     }
                 })
             inbot.started = true
@@ -164,10 +164,14 @@ closure InBot(worker, options, local inbot)
     // The worker had an error.
     //
     inbot.worker.addEventListener("error", function(e) {
-        debuglog("worker error:", e.message)
+        debuglog("worker error:", e.message, "in", e.filename, "at", e.lineno)
         notifyAll({
             id: "error"
-            data: e.message
+            data: {
+                message: e.message
+                filename: e.filename
+                lineno: e.lineno
+            }
         })
         inbot.worker = false
         destroy()
@@ -185,13 +189,11 @@ closure InBot(worker, options, local inbot)
         notifyAll({
             id: "terminated"
         })
-        inbot.impconn.close()
+        inbot.impconn.destroy()
         inbot.impconn = false
         App.imp.unregister(inbot.instanceID)
     }
 
-    // register our connects *after* the receivers are configured above
-
     // finis
 
     inbot
@@ -199,41 +201,77 @@ closure InBot(worker, options, local inbot)
 
 
 /*
- * NubBot
+ * MewBot
+ *
+ * Create a remote InBot interface for the Main WEb browser thread.
+ *
+ */
+
+closure MewBot(exec, options, local mewbot, inbot_impReceive)
+{
+    global(App)
+    mewbot = InBot(exec, options)
+    mewbot.dispatcher = require("naanlib:frameworks/running/taskexec.nlg").TaskDispatcher()
+    inbot_impReceive = mewbot.impReceive
+
+    // impReceive
+    //
+    // Received a message from InTop.
+    //
+    mewbot.impReceive = function impReceive(message, sourceID) {
+        if message.id == "targetin"
+            mewbot.dispatcher(message.data, function(reply) {
+                mewbot.sender(sourceID, {
+                    id: "targetout",
+                    data: reply
+                })
+            })
+        else
+            inbot_impReceive(message, sourceID)
+    }
+
+    // finis
+
+    mewbot
+}
+
+
+/*
+ * WowBot
  *
- * Create a remote interface like InBot, but also provide messaging support for WebWorkerNub inside
- * the worker.
+ * Create a remote InBot interface for WebWorkerNub running in the worker. This forwards remoting
+ * messages to the worker so they can be handled in the correct place.
  *
  */
 
-closure NubBot(worker, options, local nubbot)
+closure WowBot(worker, options, local wowbot)
 {
     global(App)
-    nubbot = InBot(worker, options)
+    wowbot = 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
+        if info.ourID == wowbot.instanceID {
+            wowbot.workerDestID = info.destID                               // handshake completed
+            wowbot.notifyAll({                                              // send to tops
                 id: "workerDestID"
-                workerDestID: nubbot.workerDestID
+                workerDestID: wowbot.workerDestID
             })
         }
     })
 
-    nubbot.impconn = App.imp.responder(function(data) {
-        nubbot.worker.postMessage({                                         // send to worker
-            scope: "naan-imp-web"                                           // scoped for WorkerNub
+    wowbot.impconn = App.imp.responder(function(data) {
+        wowbot.worker.postMessage({                                         // send IMP messages to worker
+            scope: "naan-imp-web"                                           // scoped for WebWorkerNub
             data: data
         })
         list(false, { sent: true })
     }, {
-        ourID: nubbot.instanceID
+        ourID: wowbot.instanceID
     })
 
     // finis
 
-    nubbot
+    wowbot
 };
 
 
@@ -245,11 +283,13 @@ closure NubBot(worker, options, local nubbot)
  */
 
 function workInit(local manifest) {
-    manifest = `(InBot, NubBot, workInit)
+    manifest = `(InBot, MewBot, WowBot, workInit)
 
     Naan.module.build(module.id, "worker", function(modobj, compobj) {
         require("./browser.nlg")
         compobj.manifest = manifest
         modobj.exports.InBot = InBot
+        modobj.exports.MewBot = MewBot
+        modobj.exports.WowBot = WowBot
     })
 } ();

package/frameworks/browser/workers.nlg

@@ -314,7 +314,7 @@ closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
     //
     //     Destroy the service worker.
     
-    worker.destroy = function destroy() {
+    scoper.destroy = function destroy() {
         scoper.serv.unregister()
         scoper.serv = false
     }