@naanlang/naan 1.0.2 → 1.0.5

package/frameworks/browser/terminals.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2022 by Richard C. Zulch
  *
  */
 
@@ -77,7 +77,7 @@ closure TermHost(track, api, name, workerID, options,
                     if !target.written
                         target.term.WriteLn("(reconnected)")
                 }, 1000).run()
-            else
+            else if message.respOp
                 debuglog("unknown host response message:", message.respOp)
         }
         
@@ -170,6 +170,7 @@ closure TermHost(track, api, name, workerID, options,
 
     target.sendControl = function sendControl(workerOp, payload) {
         target.ws.send(js.w.JSON.stringify({
+            guid: api.guid
             clientID: clientID
             serverID: serverID
             workerID: target.workerID
@@ -355,7 +356,7 @@ closure TermHost(track, api, name, workerID, options,
  */
 
 closure TermLocal(track, name, workerID, options,
-    local target, nlregex)
+    local target, nlregex, listener)
 {
     if workerID == "NaanIDE" {
         if !js.t
@@ -363,8 +364,6 @@ closure TermLocal(track, name, workerID, options,
         termInstallVirtualWatcher(track, js.t)
         return (termIDE(track, name, workerID, js.t))                       // connect to IDE execution instance itself
     }
-    if not js.w.Worker
-        return (list(Error("Local environment does not support workers")))
     if dictionary(options)
         options = new(options)
     else
@@ -372,13 +371,27 @@ closure TermLocal(track, name, workerID, options,
     target = runningExecutors.ExecutorBase(track, "Local", name)
     nlregex = RegExp("\\n", "g")
     target.workerID = workerID
-    target.worker = xnew(js.w.Worker, "env_webworker.js")
     target.msgQueue = []
+    if workerID == "NaanIDE-Debug" {
+        target.worker = js.w.open(js.w.location.href, "_blank")
+        target.worker.addEventListener("beforeunload", function(e) {        // our target is closing
+            destroy()
+        })
+        js.w.addEventListener("beforeunload", function(e) {                 // we are closing
+            // ### tell target we are closing (if needed)
+        })
+        listener = js.w
+    } else {
+        if not js.w.Worker
+            return (list(Error("Local environment does not support workers")))
+        target.worker = xnew(js.w.Worker, "env_webworker.js")
+        listener = target.worker
+    }
 
     // onmessage
     // A message was received from the worker.
     
-    target.worker.onmessage = function(e, msg) {
+    listener.addEventListener("message", function(e, msg) {
         msg = new(e.data)
         if msg.id != "targetout" && msg.id != "loaded" {
             if msg.id == "status"
@@ -388,14 +401,14 @@ closure TermLocal(track, name, workerID, options,
                     target.msgQueue.push(msg)
                 return  } }
         target.doMessage(msg)
-    }
+    })
 
     // onerror
     // The worker had an error.
     
-    target.worker.onerror = function(e) {
+    target.worker.addEventListener("error", function(e) {
         target.execClosed(Error("instance error", e.message))
-    }
+    })
 
     //
     // oninterrupt
@@ -589,14 +602,17 @@ closure findIDEtarget(track, name, workerID, naancont, local target) {
  *
  */
 
-closure termIDE(track, name, workerID, naancont, local target, connected) {
+closure termIDE(track, name, workerID, naancont, title, local target, connected) {
     target = findIDEtarget(track, name, workerID, naancont)
     if target {                                                             // new naancont on existing target
         target.updateController(naancont)
+        target.title = title
+        track.update(target)
         return (target)
     }
     target = runningExecutors.ExecutorBase(track, "Local", name)
     target.name = name
+    target.title = title
     target.workerID = workerID
     target.naancont = naancont
     connected = []
@@ -743,7 +759,6 @@ closure termIDE(track, name, workerID, naancont, local target, connected) {
 /*
  * termInstallVirtualWatcher
  *
- * column positioning:                          //                          //                      !
  *     Install a persistent watcher to note when virtual terminals come and go, and manage their
  * execution target lifetimes.
  *
@@ -753,7 +768,7 @@ closure termInstallVirtualWatcher(track, naancont) {
 
     function watchVsites(msg, local error, target) {
         if msg.op == "VsiteOpen" {
-            `(error, target) = termIDE(track, msg.name, "NaanVsite", msg.naancont)
+            `(error, target) = termIDE(track, msg.name, "NaanVsite", msg.naancont, msg.title)
             target.attention()
         }
         else if msg.op == "VsiteClose" {

package/frameworks/browser/workers.nlg

@@ -18,7 +18,7 @@
  *
  */
 
-closure ServiceWorker(local serv, callback) {
+closure ServiceWorker(pubID, pubVersion, local serv, callback) {
     serv = new(object, this)
 
     //
@@ -32,7 +32,11 @@ closure ServiceWorker(local serv, callback) {
         mchan = xnew(js.w.MessageChannel)
         serv.msgport = mchan.port2
         serv.msgport.onmessage = workerMsg.proc
-        serv.sw.postMessage({ hereIsYourPort: mchan.port1 }, [mchan.port1])
+        serv.sw.postMessage({
+            hereIsYourPort: mchan.port1
+            hereIsMyID: pubID
+            hereIsMyVersion: pubVersion
+        }, [mchan.port1])
     }
     
     //
@@ -50,7 +54,16 @@ closure ServiceWorker(local serv, callback) {
                 request: msg.request
                 version: msg.version
             })
-        } else if msg.id == "text"
+        } else if msg.id == "upgrade" {
+            if serv.upgrade != msg.version {
+                serv.upgrade = msg.version                                  // only report once
+                callback(false, {
+                    message: "upgrade"
+                    version: msg.version
+                })
+            }
+        }
+        else if msg.id == "text"
             debuglog("sw[".concat(serv.scope, "]: "), msg.text)             // handy remote debug capability
     }
     
@@ -174,10 +187,10 @@ closure ServiceWorker(local serv, callback) {
  *
  */
 
-closure ScopedServiceWorker(local scoper, result) {
+closure ScopedServiceWorker(pubID, pubVersion, callback, local scoper, result) {
     scoper = new(object, ScopedServiceWorker)
     scoper.scopes = {}
-    scoper.serv = ServiceWorker()
+    scoper.serv = ServiceWorker(pubID, pubVersion)
     result = scoper.serv.register("/", closure(error, data, local response, filepath, scope) {
         if data.message == "fetch" {
             response = {
@@ -201,7 +214,7 @@ closure ScopedServiceWorker(local scoper, result) {
             filepath = xnew(js.w.URL, data.request.url).pathname
             filepath = DecodeURIComponent(filepath)                         // "/run/<scope>/path..."
             filepath = filepath.slice(4)                                    // "/<scope>/path..."
-            error = true
+            error = true                                                    // stays true iff not in scope
             for scope in scoper.scopes {
                 if filepath.startsWith(scope) {
                     filepath = filepath.slice(scope.length+1)               // remove scope including "/"
@@ -209,8 +222,6 @@ closure ScopedServiceWorker(local scoper, result) {
                     break
                 }
             }
-            if error === true
-                debuglog("ScopedServiceWorker: couldn't find scope", scope, "in", totuple(scoper.scopes))
 
             // read resource failed
             if error {
@@ -226,7 +237,8 @@ closure ScopedServiceWorker(local scoper, result) {
             response.body = data
             scoper.serv.msgport.postMessage(response)
             return
-        }
+        } else if data.message == "upgrade"
+            callback(data.version)
     })
     if result.0 {
         ErrorDebuglog("ScopedServiceWorker failed", result)
@@ -302,6 +314,7 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
         mimeType = {
             "css":  "text/css",
             "csv":  "text/csv",
+            "gif":  "image/gif",
             "htm":  "text/html",
             "html": "text/html",
             "ico":  "image/x-icon",
@@ -353,12 +366,14 @@ closure TrackedScope(track, scope, fs, rootpath, local trope, result) {
 /*
  * TrackServiceWorkers
  *
- *     Configure service workers to be tracked in the execution tracker.
+ *     Configure service workers to be tracked in the execution tracker. The pubID identifies us as
+ * the publisher for this service worker, and the version allows it to clear its cache when versions
+ * change.
  *
  */
 
-closure TrackServiceWorkers(track, local error) {
-    `(error, serviceWorker) = ScopedServiceWorker()
+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")

package/frameworks/client/apiclient.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2021 by Richard C. Zulch
+ * Copyright (c) 2017-2022 by Richard C. Zulch
  *
  */
 
@@ -20,9 +20,10 @@
  *
  */
 
-closure MakeNideAPIclient(url, local client) {
+closure MakeNideAPIclient(url, guid, local client) {
     client = new(object, this)
     client.url = url
+    client.guid = guid
     client.notifyAfter = 0
 
     // clientRequest() - general request routine
@@ -51,6 +52,8 @@ closure MakeNideAPIclient(url, local client) {
             request.responseType = options.responseType
         if options.contentType
             request.setRequestHeader("Content-Type", options.contentType)
+        if guid
+            request.setRequestHeader("x-naanlang-api-guid", guid)
         request.send(options.putdata)
     }
 
@@ -117,7 +120,7 @@ closure MakeNideAPIclient(url, local client) {
     // Otherwise if communication failed then the result is:
     //      callback(<error>).
 
-    client.psmRemote = closure psmRemote(options, data, callback, local query, method, reqOptions) {
+    client.psmRemote = closure psmRemote(options, data, callback, local query, method, reqOptions, error) {
         query = EncodeQuery("/psm/?", options)
         if data
             method = "PUT"
@@ -131,6 +134,16 @@ closure MakeNideAPIclient(url, local client) {
                 reqOptions.contentType = "application/octet-stream"         // we are sending binary data
             else
                 reqOptions.responseType = "arraybuffer"                     // we are requesting binary data
+        } else if options.encoding == "json" {
+            if data {
+                reqOptions.contentType = "application/json;charset=UTF-8"   // we are sending JSON
+                `(error, data) = JsonStringify(data)
+                if error
+                    return (callback(Error("psmRemote failed:", error)))
+                reqOptions.putdata = data
+            }
+            else
+                reqOptions.responseType = "application/json"                // we are requesting JSON
         }
         clientRequest(method, url.concat(query), reqOptions, function (error, req, event, local data) {
             if !error && req.status != 200
@@ -172,7 +185,7 @@ closure MakeNideAPIclient(url, local client) {
 
 function apicInit(local manifest) {
 
-    manifest = `(apic, apicInit)
+    manifest = `(MakeNideAPIclient, apicInit)
 
     Naan.module.build(module.id, "apiclient", function(modobj, compobj) {
         Naan.module.require("./client.nlg")