@naanlang/naan 1.3.2 → 1.4.0

package/frameworks/browser/sworker.js

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

package/frameworks/browser/terminals.nlg

@@ -15,7 +15,7 @@
  *
  */
 
-workers;
+gWorkers;
 
 
 /*
@@ -431,9 +431,9 @@ closure TermHost(track, api, name, options, local target, nlregex, xtarg)
 
 closure TermLocal(track, name, options, local target, nlregex, listener)
 {
-    global(js, window, workers)
-    if !dictionary(workers)
-        workers = {}
+    global(js, window, gWorkers)
+    if !dictionary(gWorkers)
+        gWorkers = {}
     options = merge({
         type: "Local"
     }, options)
@@ -456,14 +456,15 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
             // ### tell target we are closing (if needed)
         })
         listener = window
+        target.guid = 1
     } else {
         if not window.Worker
             return (list(Error("Local environment does not support workers")))
         target.worker = xnew(window.Worker, "env_webworker.js")
         listener = target.worker
         target.guid = UUID()
-        workers[target.guid] = target
     }
+    gWorkers[target.guid] = target
 
     // onmessage
     // A message was received from the worker.
@@ -551,6 +552,8 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
                     id: "start",
                     state: false                                            // resume state, if we have any
                     altcmd: options.startup.initcmds
+                    workerID: target.workerID
+                    workerGUID: target.guid
                 })
             target.started = true
         } else if msg.id == "targetsend" {
@@ -667,10 +670,21 @@ closure TermLocal(track, name, options, local target, nlregex, listener)
 };
 
 
+/*
+ * WorkerConnect
+ *
+ *     Return the existing web worker for a workerGUID, or false if it does not exist.
+ *
+ */
+
+function WorkerConnect(workerGUID) {
+    gWorkers[workerGUID]
+};
+
+
 /*
  * termMainProxy
  *
- * column positioning:                          //                          //                      !
  *     Make a browser proxy representing the main thread. This runs inside the worker and allows it
  * to do remote execution with Main.
  *
@@ -769,7 +783,7 @@ closure findIDEtarget(track, name, workerID, naancont, local target) {
  */
 
 closure termIDE(track, name, workerID, naancont, title, local target, connected) {
-    global(workers)
+    global(js, gWorkers)
     target = findIDEtarget(track, name, workerID, naancont)
     if target {                                                             // new naancont on existing target
         target.updateController(naancont)
@@ -790,7 +804,7 @@ closure termIDE(track, name, workerID, naancont, title, local target, connected)
     //
     function replyHook(data) {
         if data._guid
-            workers[data._guid].worker.postMessage({
+            gWorkers[data._guid].worker.postMessage({
                 id: "targetreceive"
                 data: data
             })
@@ -969,14 +983,15 @@ closure termInstallVirtualWatcher(track, naancont) {
  */
 
 function termInit(local manifest) {
-    manifest = `(TermHost, TermLocal, termMainProxy, WorkerToMain, findIDEtarget, termIDE,
-        termInstallVirtualWatcher, termInit)
+    manifest = `(TermHost, TermLocal, WorkerConnect, termMainProxy, WorkerToMain, findIDEtarget,
+        termIDE, termInstallVirtualWatcher, termInit)
 
     Naan.module.build(module.id, "terminals", function(modobj, compobj) {
         require("./browser.nlg")
         compobj.manifest = manifest
         modobj.exports.TermLocal = TermLocal
         modobj.exports.TermHost = TermHost
+        modobj.exports.WorkerConnect = WorkerConnect
         modobj.exports.WorkerToMain = WorkerToMain
     })
 } ();

package/frameworks/browser/ws_client.nlg

@@ -51,7 +51,7 @@ closure WebSocket(options, local wsock) {
     
         // onopen
         // The WebSocket connection is now open.
-        wsock.ws.onopen = closure onopen(e, local spawner) {
+        wsock.ws.onopen = closure onopen(e) {
             pending.signal(list(false, { ok: true }))
             options.onopen(e)
         }

package/frameworks/client/psm_client.nlg

@@ -430,7 +430,7 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
  */
 
 closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
-    global()
+    global(App)
     connClassID = "NodeFS"
     connector = new(object, this)
     connector.psm = psm

package/frameworks/client/relaycon.nlg

@@ -43,7 +43,7 @@ wsMod;;                                         // websocket module
 
 closure RelayCon(host, secret, options, local relay, nlregex)
 {
-    global(execsMod, wsMod)
+    global(App, execsMod, wsMod)
     relay = new(object, this)
     options = merge({
         name: "NaanIDE Server"
@@ -301,6 +301,7 @@ function hocoInit(local manifest) {
     manifest = `(RelayCon, hocoInit)
 
     Naan.module.build(module.id, "relaycon", function(modobj, compobj) {
+        require("./client.nlg")
         execsMod = require("../running/executors.nlg")
         if js.w
             wsMod = require("../browser/ws_client.nlg")

package/frameworks/common/preferences.nlg

@@ -88,7 +88,7 @@ closure Preferences(nicc, dbname, local prefs, error, data) {
         folder = "plugins/"
         path = folder.concat("plugins.cfg")
         pending = new(nonce)
-        nicc.api.readFile(path, function(error, req, event, local config) {
+        nicc.api.readFile(path, function(error, req, event) {
             if error
                 ErrorDebuglog("Can't read ".concat(path), error)
             else

package/frameworks/node/apiserver.nlg

@@ -30,7 +30,7 @@
  */
 
 closure APIServer(options, local server, chroot) {
-    global(JSpath, js, bodyParser, express, psmServerMod, workerMod)
+    global(App, JSpath, js, bodyParser, express, psmServerMod, workerMod)
     apisLoadLibs()
     server = new(object, this)
     server.app = express()
@@ -116,7 +116,7 @@ closure APIServer(options, local server, chroot) {
             return (list(error))
         }
         server.hostfs = hostfs
-        workerMod.WorkerController(server)
+        server.workco = workerMod.WorkerController(server)
         list(false, port)
     }
 
@@ -550,7 +550,7 @@ closure WebSocketServer(server, local websocks) {
  */
 
 closure WesCon(server, websocks, socket, request, local wescon) {
-    global()
+    global(js)
     wescon = new(object, this)
     wescon.socket = socket
     wescon.info = {

package/frameworks/node/worker.nlg

@@ -10,6 +10,13 @@
  *
  */
 
+/*
+ * globals
+ *
+ */
+
+gWorkers;
+
 
 /*
  * workCurrent
@@ -19,8 +26,8 @@
  */
 
 closure workCurrent(workco, workerID, startup, local current) {
-    global()
-    current = new(object, this)
+    global(js)
+    current = require("../running/executors.nlg").ExecutorBase(workco, workerID, startup.name)
     current.workerID = workerID
     current.name = startup.name
     current.links = []
@@ -94,6 +101,7 @@ closure workCurrent(workco, workerID, startup, local current) {
     function ONmessageOut(data) {
         if data._guid
             return                                                          // already replied
+        current.execReceived(data)
         sendAll({
             id: "targetout",
             data: data
@@ -153,7 +161,17 @@ closure workCurrent(workco, workerID, startup, local current) {
         if current.links.length == 0
             current.host.Detach(current.termif)                             // attached while one link is active
     }
-    
+
+    //
+    // target.PostMessage
+    //
+    //     Post a message to the main thread.
+    //
+    current.PostMessage = function PostMessage(data) {
+        js.t.DispatchMessage(data)
+        list(false, { posted: true })
+    }
+
     //
     // msgin
     //
@@ -188,6 +206,18 @@ closure workCurrent(workco, workerID, startup, local current) {
 };
 
 
+/*
+ * WorkerConnect
+ *
+ *     Return the existing web worker for a workerGUID, or false if it does not exist.
+ *
+ */
+
+function WorkerConnect(workerGUID) {
+    gWorkers[workerGUID]
+}
+
+
 /*
  * workMainProxy
  *
@@ -270,13 +300,14 @@ closure WorkerToMain(local nideRunning, track) {
  *
  */
 
-closure workThread(workco, workerID, startup, local worker, options, subChannel, deathWatcher) {
-    global(threads, JSpath)
-    worker = new(object, this)
+closure workThread(workco, workerID, startup, guid
+    local worker, options, subChannel, deathWatcher) {
+    global(js, threads, JSpath)
+    worker = require("../running/executors.nlg").ExecutorBase(workco, workerID, startup.name)
     worker.name = startup.name
     worker.workerID = workerID
     worker.links = []
-    worker.guid = UUID()
+    worker.guid = guid || UUID()
 
     // create our worker thread
 
@@ -346,6 +377,8 @@ closure workThread(workco, workerID, startup, local worker, options, subChannel,
                 state: false                                                // resume state, if we have any
                 altcmd: false
                 dirpath: js.d
+                workerID: workerID
+                workerGUID: worker.guid
             }
             if startup.initcmds
                 startmsg.altcmd = startup.initcmds.concat("\n")
@@ -364,6 +397,8 @@ closure workThread(workco, workerID, startup, local worker, options, subChannel,
         else {
             if msg.id == "status"
                 worker.lastStatus = milliseconds()
+            else if msg.id == "targetout"
+                worker.execReceived(msg.data)
             sendAll(msg) }                                                  // default is just return message to the client
     })
     
@@ -401,6 +436,19 @@ closure workThread(workco, workerID, startup, local worker, options, subChannel,
         removeLink(link)
     }
 
+    //
+    // PostMessage
+    //
+    //     Post a message to the main thread.
+    //
+    worker.PostMessage = function PostMessage(data) {
+        worker.msgport.postMessage({                                        // send data to worker
+            id: "targetin",
+            data: data
+        })
+        list(false, { posted: true })
+    }
+
     //
     // msgin
     //
@@ -498,7 +546,7 @@ closure workLink(workco, conn, worker, sender, local link) {
  */
 
 closure workController(api, local workco) {
-    global()
+    global(gWorkers)
     workco = new(object, this)
     workco.serverID = "Workers"                                             // our serverID, used for communications
     workco.workers = { }                                                    // dictionary of workers by workerID
@@ -559,12 +607,47 @@ closure workController(api, local workco) {
         workco.workers[workerID] = undefined                                // it's like this worker has never been
     }
 
-    //
+    // spawn
+    //
+    //     Spawn a new worker with the specified configuration dictionary and optional GUID.
+    //
+    workco.spawn = closure spawn(workerID, config, guid, local worker) {
+        if !dictionary(gWorkers)
+            gWorkers = {}
+        worker = workco.workers[workerID]
+        if !worker {                                                        // create worker if needed
+            if workerID == "NideServer"
+                worker = workco.current = workCurrent(workco, workerID, config)
+            else
+                worker = workThread(workco, workerID, config, guid)
+            workco.uworkers[worker.guid] = worker
+            workco.workers[workerID] = worker
+            gWorkers[worker.guid] = worker }
+        if workerID == "NideServer"
+            workco.current.vitalUpdate({
+                id: "workerlist",                                           // send the initial list of workers
+                workers: let(workers, workerID, worker) {
+                    workers = { }
+                    for `(workerID, worker) in workco.workers
+                        workers[workerID] = {
+                            name: worker.name
+                        }
+                    workers
+                }()
+            })
+        else {
+            worker.vitalWatch(termination)
+            workco.current.vitalUpdate({
+                id: "spawned",                                              // note a new worker thread
+                name: config.name
+                workerID: workerID
+            }) }
+    }
+
     // wsReceive
     //
     //     Process a message from the websocket API.
     //
-
     workco.wsReceive = function wsReceive(message, conn, local worker, link, error) {
         if !message.workerID
             error = Error("workerID required", message.workerOp)
@@ -576,50 +659,25 @@ closure workController(api, local workco) {
                 if worker && message.payload {
                     if !link
                         makeLink(message, conn)                             // make sure we have a link for responses
-                    worker.msgin(message.payload)                           // send message to worker
-                    return } }
+                    worker.msgin(message.payload) }                         // send message to worker
+                return }
             else if message.workerOp == "echo" {
                 if worker && message.payload {
                     if !link
                         makeLink(message, conn)                             // make sure we have a link for responses
-                    worker.echo(message.payload, link)                      // echo message to other links
-                    return } }
+                    worker.echo(message.payload, link) }                    // echo message to other links
+                return }
             else if message.workerOp == "spawn" {
-                if !worker {                                                // create worker if needed
-                    if message.workerID == "NideServer"
-                        worker = workco.current = workCurrent(workco, message.workerID, message.payload)
-                    else
-                        worker = workThread(workco, message.workerID, message.payload)
-                    workco.uworkers[worker.guid] = worker
-                    workco.workers[message.workerID] = worker }
+                spawn(message.workerID, message.payload, message.workerGUID)
                 if !link
                     makeLink(message, conn)                                 // make sure we have a link for responses
-                if message.workerID == "NideServer"
-                    workco.current.vitalUpdate({
-                        id: "workerlist",                                   // send the initial list of workers
-                        workers: let(workers, workerID, worker) {
-                            workers = { }
-                            for `(workerID, worker) in workco.workers
-                                workers[workerID] = {
-                                    name: worker.name
-                                }
-                            workers
-                        }()
-                    })
-                else {
-                    worker.vitalWatch(termination)
-                    workco.current.vitalUpdate({
-                        id: "spawned",                                      // note a new worker thread
-                        name: message.payload.name
-                        workerID: message.workerID
-                    }) }
                 return }
             else if message.workerOp == "terminate" {
                 if worker {
                     if !link
                         makeLink(message, conn)                             // make sure we have a link for responses
-                    worker.terminate()                                      // echo message to other links
-                    return } }
+                    worker.terminate() }                                    // echo message to other links
+                return }
             error = Error("invalid parameters", message.workerOp, message.workerID)
         }
         ErrorDebuglog("workController.wsReceive error:", error)
@@ -663,13 +721,13 @@ closure workController(api, local workco) {
  */
 
 function workInit(local manifest) {
-    manifest = `(workCurrent, workMainProxy, WorkerToMain, workThread, workLink, workController,
-        workInit)
-
+    manifest = `(workCurrent, WorkerConnect, workMainProxy, WorkerToMain, workThread, workLink,
+        workController, workInit)
     Naan.module.build(module.id, "worker", function(modobj, compobj) {
         require("./node.nlg")
         compobj.manifest = manifest
         modobj.exports.WorkerController = workController
+        modobj.exports.WorkerConnect = WorkerConnect
         modobj.exports.WorkerToMain = WorkerToMain
     })
 }();

package/frameworks/project/build.nlg

@@ -1067,7 +1067,6 @@ closure Builder(rules, operation, fs, srcpath, destpath, track, local build, gro
         //
         function writeCatenate(writepath,
             local template, entry, content, catsub, dozip, docat, fsoptions, zipmap, error, result) {
-            debuglog("writeCatenate", writepath)
             template = build.templates[writepath]                       // optional in some cases ### should warn in others
             catsub = { }
             for entry in catenates[writepath] {                         // error check and substitution build

package/frameworks/project/projects.nlg

@@ -296,7 +296,7 @@ closure projConnector(projman, projtype, local connector, watch) {
  *
  * Nide.proj/
  *      nide_cliser.cfg                 - JSON definition of the project (see below)
- *      NaanIDE_version.txt             - [default] substitution file defining 1.3.2+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.4.0+1 etc.
  *      NaanIDE_version_builds.txt      - [default] contains current build number as decimal string
  *      build/                          - [optional] default build output location
  *      NaanIDE.lic                     - [optional] defines Zulch Laboratories, Inc. and other license info