@naanlang/naan 1.1.0 → 1.2.0

package/frameworks/browser/https_request.nlg

@@ -90,7 +90,7 @@ closure HttpsApiRequest(url, options,
                 debuglog("HttpsApiRequest error:", url, "error:", error)
             return (list(Error("HttpsApiRequest fetch failed:", error, url)))
         }
-        if response.status < 200 || response.status >= 300 {
+        if response.status < 200 || response.status >= 299 {                // 299 is "cancelled"
             if options.debug
                 debuglog("HttpsApiRequest status:", url, response.statusCode)
             error = Error("HttpsApiRequest status:", url, response.status, {
@@ -104,7 +104,8 @@ closure HttpsApiRequest(url, options,
             break
     }
     contentType = response.headers.get("content-type")
-    if contentType.startsWith("application/json") {
+    if contentType.startsWith("application/json")
+        || contentType.startsWith("application/octet-stream") && options.encoding == "json" {
         `(error, content) = await(response.text())
         if !error
             `(error, content) = JsonParse(content)
@@ -129,6 +130,7 @@ closure HttpsApiRequest(url, options,
     list(error, content, {
         headers: headers
         status: response.status
+        contentType: contentType
     })
 };
 

package/frameworks/browser/sworker.js

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

package/frameworks/browser/terminals.nlg

@@ -14,30 +14,54 @@
 /*
  * TermHost
  *
- *     Make a host debugger target.
+ *     Make an Nide API Server debugger target.
+ *
+ * Options:
+ *  {
+ *      type: <string>                          // target category, e.g. "Host", "api.yyy.com"
+ *      workerID: <string>                      // kind of worker in server subsystem
+ *      dispatcher: <tuple>                     // dispatcher function for incoming messages
+ *      startup: <dictionary>                   // startup options
+ *      clientID: <string>                      // (rare) our identification on client
+ *      serverID: <string>                      // (rare) server subsystem for us
+ *  }
  *
  */
 
-closure TermHost(track, api, name, workerID, options,
-    local target, nlregex, clientID, serverID)
+closure TermHost(track, api, name, options, local target, nlregex, xtarg)
 {
     global(window)
-    target = require("../running/executors.nlg").ExecutorBase(track, "Host", name)
-    clientID = "DebugWorkers"
-    serverID = "Workers"
+    options = merge({
+        type: "Host"
+        workerID: "myDebugWorker"
+        clientID: "DebugWorkers"
+        serverID: "Workers"
+    }, options)
+    target = require("../running/executors.nlg").ExecutorBase(track, options.type, name)
     nlregex = RegExp("\\n", "g")
-    if !workerID
-        workerID = "myDebugWorker"
-    target.workerID = workerID
+    target.workerID = options.workerID
     target.msgQueue = []
     target.dispatcher = call(options.dispatcher, function(reply) { reply })
-    
+        
+    // findWorker
+    //
+    function findWorker(testID, local instance) {
+        for instance in track.instances {
+            if instance.executor.hostWorkerMatch(api, testID)
+                return (instance.executor)
+        }
+        false
+    }
+
     // connect
     // Connect with the host if not already connected.
-    closure connect(local pending) {
+    closure connect(local host, pending) {
         if target.ws
-            return
-        target.ws = xnew(window.WebSocket,"ws://${window.location.host}")
+            return(list(false, { connected: true }))
+        host = xnew(window.URL, api.url).host
+        if !host || host == ""
+            return(list(Error("invalid URL ${api.url}")))
+        target.ws = xnew(window.WebSocket,"ws://${host}")
         pending = new(nonce)
 
         // onopen
@@ -45,7 +69,7 @@ closure TermHost(track, api, name, workerID, options,
         target.ws.onopen = function onopen(e, local info, spawner) {
             info = {
                 name: name
-                workerID: workerID
+                workerID: target.workerID
             }
             if options.dispatcher
                 info.destID = api.instanceID                                // valid destination for relay
@@ -61,7 +85,6 @@ closure TermHost(track, api, name, workerID, options,
 
         // onmessage
         // A message was received from the worker via WebSockets.
-        
         target.ws.onmessage = function onmessage(e, message, local msg) {
             try {
                 message = new(window.JSON.parse(e.data))
@@ -137,27 +160,16 @@ closure TermHost(track, api, name, workerID, options,
     //     New workers created/discovered on this host.
     //
     function hostWorkerUpdate(msg, local localID, worker) {
-    
-        // findWorker
-        //
-        function findWorker(testID, local instance) {
-            for instance in track.instances {
-                if instance.executor.hostWorkerMatch(api, testID)
-                    return (instance.executor)
-            }
-            false
-        }
-
         if msg.id == "spawned" {
             if !findWorker(msg.workerID)
-                TermHost(track, api, msg.name, msg.workerID)
+                TermHost(track, api, msg.name, { type: options.type, workerID: msg.workerID })
         }
         else if msg.id == "termination"
             track.delete(findWorker(msg.workerID))
-        else {
+        else if msg.id == "workerlist" {
             for `(localID, worker) in msg.workers
                 if !findWorker(localID)
-                    TermHost(track, api, worker.name, localID)
+                    TermHost(track, api, worker.name, { type: options.type, workerID: localID })
         }
     }
         
@@ -167,7 +179,7 @@ closure TermHost(track, api, name, workerID, options,
     //     True iff the specified information matches us.
     //
     target.hostWorkerMatch = function hostWorkerMatch(testApi, testID) {
-        testApi === api && testID == workerID
+        testApi === api && testID == target.workerID
     }
 
     //
@@ -203,8 +215,8 @@ closure TermHost(track, api, name, workerID, options,
     target.sendControl = function sendControl(workerOp, payload) {
         target.ws.send(window.JSON.stringify({
             guid: api.guid
-            clientID: clientID
-            serverID: serverID
+            clientID: options.clientID
+            serverID: options.serverID
             workerID: target.workerID
             workerOp: workerOp
             payload: payload
@@ -374,6 +386,9 @@ closure TermHost(track, api, name, workerID, options,
         target.ws.close(1000)                                               // 1000: normal close
     }
 
+    xtarg = findWorker(target.workerID)
+    if xtarg
+        return (list(false, xtarg))                                         // already exists
     track.add(target)
     connect()                                                               // connect right away to start receiving messages
 
@@ -388,27 +403,34 @@ closure TermHost(track, api, name, workerID, options,
  *
  *     Make a local debugger target, returning a standard (error, object) tuple.
  *
+ * Options:
+ *  {
+ *      workerID: <string>                      // kind of worker in server subsystem
+ *                                              // "NaanIDE" for local IDE
+ *                                              // "NaanIDE-Debug" for browser debug target
+ *      startup: <dictionary>                   // startup options
+ *      type: <string>                          // (rare) target category, e.g. "Local"
+ *  }
+ *
  */
 
-closure TermLocal(track, name, workerID, options,
-    local target, nlregex, listener)
+closure TermLocal(track, name, options, local target, nlregex, listener)
 {
     global(js, window)
-    if workerID == "NaanIDE" {
+    options = merge({
+        type: "Local"
+    }, options)
+    if options.workerID == "NaanIDE" {
         if !js.t
             return (list(Error("Cannot access Local IDE executor")))
         termInstallVirtualWatcher(track, js.t)
-        return (termIDE(track, name, workerID, js.t))                       // connect to IDE execution instance itself
+        return (termIDE(track, name, options.workerID, js.t))               // connect to IDE execution instance itself
     }
-    if dictionary(options)
-        options = new(options)
-    else
-        options = { }
-    target = require("../running/executors.nlg").ExecutorBase(track, "Local", name)
+    target = require("../running/executors.nlg").ExecutorBase(track, options.type, name)
     nlregex = RegExp("\\n", "g")
-    target.workerID = workerID
+    target.workerID = options.workerID
     target.msgQueue = []
-    if workerID == "NaanIDE-Debug" {
+    if options.workerID == "NaanIDE-Debug" {
         target.worker = window.open(window.location.href, "_blank")
         target.worker.addEventListener("beforeunload", function(e) {        // our target is closing
             destroy()

package/frameworks/client/apiclient.nlg

@@ -6,171 +6,136 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2023 by Richard C. Zulch
+ * Copyright (c) 2017-2024 by Richard C. Zulch
  *
  */
 
 
 /*
- * MakeNideAPIclient
- *
- *     Make a DAS API client object for browsers. This client API handles a single project at a
- * time, from load() to close().
+ * NideAPIclient
  *
+ *     Make an API client object for browsers.
  *
  */
 
-closure MakeNideAPIclient(url, guid, local client) {
+closure NideAPIclient(url, guid, apiRequester, local client) {
+    global()
     client = new(object, this)
+    if !url.match(RegExp("^https?:\/\/", "i"))
+        url = "http://${url}"
     client.url = url
     client.guid = guid
     client.notifyAfter = 0
     client.instanceID = UUID()                                              // our client's unique ID
 
-    // clientRequest() - general request routine
-
-    closure clientRequest(method, path, options, cbReq, local request) {
-        request = xnew(js.w.XMLHttpRequest)
-        request.addEventListener("load", function (event) {
-            cbReq(false, request, event)
-        })
-
-        request.addEventListener("error", function reqFailed(event, local errtext) {
-            if request.status == 0
-                errtext = "connectivity"
-            else
-                errtext = "request failed"
-            error = Error(errtext, {
-                status: request.status
-                method: method
-                path: path
-            })
-            cbReq(error, request, event)
-        })
+    // clientRequest() - append our guid to the headers
 
-        request.open(method, path)
-        if options.responseType
-            request.responseType = options.responseType
-        if options.contentType
-            request.setRequestHeader("Content-Type", options.contentType)
+    closure clientRequest(url, options) {
+        options = merge(options)
         if guid
-            request.setRequestHeader("x-naanlang-api-guid", guid)
-        request.send(options.putdata)
+            options.headers = [list("x-naanlang-api-guid", guid)]
+        apiRequester(url, options)
     }
 
     //
     // docs()
     //
 
-    client.docs = closure docs() {
-        clientRequest("GET", url.concat("/"), false, function (error, req, event) {
-            printline(req.responseText)
-        })
+    client.docs = closure docs(local error, content, extra) {
+        `(error, content, extra) = clientRequest(url.concat("/"))
+        printline(content)
     }
 
     //
     // status(callback, timeoutMS)
     //
 
-    client.status = closure status(cbStatus, timeoutms, local query, options, queued) {
-        options = new(dictionary)
-        options.timeout = timeoutms
-        options.after = client.notifyAfter
-        query = EncodeQuery("/status/?", options)
-        clientRequest("GET", url.concat(query), false, function (error, req, event) {
-            if (error || req.status != 200)
-                cbStatus()
-            else if (length(req.responseText) == 0)
-                cbStatus([])
-            else {
-                queued = new(JSONparse(req.responseText))
-                queued.forEach(function(item,index,array) {
-                    if client.notifyAfter < item.stamp
-                        client.notifyAfter = item.stamp
-                })
-                cbStatus(queued)
-            }
+    client.status = closure status(cbStatus, timeoutms, local query, error, content, extra, queued) {
+        query = EncodeQuery("/status/?", {
+            timeout: timeoutms
+            after: client.notifyAfter
         })
+        `(error, content, extra) = clientRequest(url.concat(query))
+        if (error || extra.status != 200)
+            cbStatus()
+        else if (length(content) == 0)
+            cbStatus([])
+        else {
+            queued = new(content)
+            queued.forEach(function(item, index, array) {
+                if client.notifyAfter < item.stamp
+                    client.notifyAfter = item.stamp
+            })
+            cbStatus(queued)
+        }
     }
 
     //
     // get
     //
 
-    client.get = closure get(path, cbRead) {
-        options.path = filepath
-        clientRequest("GET", url.concat("/", path), false, cbRead)
+    client.get = closure get(path, options, local error, content, extra) {
+        `(error, content, extra) = clientRequest(url.concat("/", path))
+        if !error && extra.status != 200
+            error = Error("readFile failed: ".concat(extra.status), {
+                    status: extra.status
+                })
+        if error
+            list(error)
+        else
+            list(error, content, extra)
     }
 
     //
-    // readFile(filepath, cbRead)
+    // readFile(filepath, options)
     //
 
-    client.readFile = closure readFile(filepath, cbRead, local query, options) {
-        options = new(dictionary)
-        options.path = filepath
-        query = EncodeQuery("/readfile/?", options)
-        clientRequest("GET", url.concat(query), false, cbRead)
+    client.readFile = closure readFile(filepath, options, local query, error, content, extra) {
+        query = EncodeQuery("/readfile/?", {
+            path: filepath
+        })
+        `(error, content, extra) = clientRequest(url.concat(query), options)
+        if !error && extra.status != 200
+            error = Error("readFile failed: ".concat(extra.status), {
+                    status: extra.status
+                })
+        if error
+            list(error)
+        else
+            list(error, content, extra)
     }
 
     //
     // psmRemote(options, data, callback)
     //
-    // Perform an operation and call back when done. If the communication works then the result is:
-    //      callback(false, (remote_error, remote_data)).
-    // Otherwise if communication failed then the result is:
-    //      callback(<error>).
+    // Perform an operation and call back when done.
 
-    client.psmRemote = closure psmRemote(options, data, callback, local query, method, reqOptions, error) {
+    client.psmRemote = closure psmRemote(options, data, callback, 
+        local query, reqOptions, error, content, extra) {
         query = EncodeQuery("/psm/?", options)
-        if data
-            method = "PUT"
-        else
-            method = "GET"
         reqOptions = {
             putdata: data
         }
-        if options.encoding == "binary" {
-            if data
-                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
-                error = Error("NodeFS request failed: ".concat(req.status), {
-                    status: req.status
-                    method: method
-                    query: query
-                    })
+        if !data
+            reqOptions.encoding = options.encoding                          // expected response format
+        else if options.encoding == "binary"
+            reqOptions.contentType = "application/octet-stream"             // we are sending binary data
+        else if options.encoding == "json" {
+            reqOptions.contentType = "application/json;charset=UTF-8"       // we are sending JSON
+            `(error, data) = JsonStringify(data)
             if error
-                callback(error)
-            else {
-                if req.getResponseHeader("content-type").startsWith("application/json")
-                    try {                                                   // attempt to decode JSON response
-                        data = new(JSONparse(req.responseText))
-                        if array(data) {
-                            data = totuple(data)
-                            error = data.0
-                            data = data.1 }
-                    } catch {
-                        if true
-                            data = req.responseText                         // just return text on failure
-                    }
-                else
-                    data = req.response                                     // e.g. when reading binary content
-                callback(error, data) }
-        })
+                return (callback(Error("psmRemote encoding failed:", error)))
+            reqOptions.putdata = data
+        }
+        `(error, content, extra) = clientRequest(url.concat(query), reqOptions)
+        if !error && extra.status != 200
+            error = Error("NodeFS request failed: ".concat(extra.status), {
+                    status: extra.status
+                })
+        if error
+            callback(error)
+        else
+            callback(error, content)
     }
 
     client
@@ -186,12 +151,12 @@ closure MakeNideAPIclient(url, guid, local client) {
 
 function apicInit(local manifest) {
 
-    manifest = `(MakeNideAPIclient, apicInit)
+    manifest = `(NideAPIclient, apicInit)
 
     Naan.module.build(module.id, "apiclient", function(modobj, compobj) {
         Naan.module.require("./client.nlg")
         compobj.manifest = manifest
-        modobj.exports.MakeNideAPIclient = MakeNideAPIclient
+        modobj.exports.NideAPIclient = NideAPIclient
     })
 
 } ();