@naanlang/naan 1.0.4 → 1.0.5

package/frameworks/browser/https_request.nlg

@@ -0,0 +1,120 @@
+/*
+ * https_browser.nlg
+ *
+ *     Https operations for the browser.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2021-2022 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * HttpsApiRequest
+ *
+ * Perform an API request from the browser. This operates the same as HttpsApiRequest for NodeJS.
+ *
+ * Options:
+ *  {
+ *      method:         <string>                // HTTP method (defaults to GET/PUT)
+ *      query:          <dictionary>            // query variables added to the URL
+ *      putdata:        <data>                  // data to put
+ *      contentType:    <string>                // sets Content-Type header, otherwise auto-determined
+ *      encoding:       <string>                // "binary" to receive binary data as arrayBuffer
+ *      range:          <string>                // sets range header
+ *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
+ *  }
+ *
+ */
+
+closure HttpsApiRequest(url, options,
+    local urlq, fetchOptions, putdata, error, response, contentType, content) {
+    if !options
+        options = { }
+    if options.query
+        urlq = url.concat(EncodeQuery("?", options.query))
+    else
+        urlq = url
+    putdata = options.putdata
+    fetchOptions = {
+        mode: 'cors'
+        cache: 'no-cache'
+        credentials: 'same-origin'
+        headers: { }
+        redirect: 'follow'
+        referrerPolicy: 'no-referrer'
+    }
+    if options.method
+        fetchOptions.method = options.method
+    else if putdata
+        fetchOptions.method = "POST"
+    else
+        fetchOptions.method = "GET"
+    if putdata {
+        if options.contentType
+            fetchOptions.headers['Content-Type'] = options.contentType
+        else if jsTypedArray(options.putdata)
+            fetchOptions.headers['Content-Type'] = "application/octet-stream"
+        else if member(typeof(options.putdata), `(dictionary, array, xobject)) {
+            fetchOptions.headers['Content-Type'] = "application/json"
+            `(error, putdata) = JsonStringify(options.putdata)
+            if error
+                return (list(Error("HttpsApiRequest encode:", url)))
+        }
+        fetchOptions.body = putdata
+    }
+    if options.range
+        fetchOptions.headers.Range = options.range
+    if array(options.headers)
+        for item in options.headers
+            fetchOptions.headers[item.0] = item.1
+    //
+    // perform the fetch and return when complete
+    //
+    `(error, response) = await(js.w.fetch(urlq, fetchOptions))
+    if error
+        return (list(Error("HttpsApiRequest fetch failed:", error, url)))
+    contentType = response.headers.get("content-type")
+    if response.status < 200 || response.status >= 300
+        return (list(Error("HttpsApiRequest status:", url, response.status, {
+            status: response.status
+        })))
+    if contentType.startsWith("application/json") {
+        `(error, content) = await(response.text())
+        if !error
+            `(error, content) = JsonParse(content)
+            if error
+                error = Error("HttpsApiRequest decode:", url, error)
+            else
+                content = new(content)
+            if array(content) {                                             // deencapsulate to get API result
+                content = totuple(content)
+                error = content.0
+                content = content.1
+            }
+    }
+    else if options.encoding == "binary"
+        `(error, content) = await(response.arrayBuffer())
+    else
+        `(error, content) = await(response.text())
+    list(error, content)
+};
+
+
+/*
+ * https_browserInit
+ *
+ * Initialize HTTPS request operations for browsers.
+ *
+ */
+
+function https_browserInit(local manifest) {
+    manifest = `(HttpsApiRequest, https_browserInit)
+
+    Naan.module.build(module.id, "https_request", function(modobj, compobj) {
+        require("./browser.nlg")
+        compobj.manifest = manifest
+        modobj.exports.HttpsApiRequest = HttpsApiRequest
+    })
+}();

package/frameworks/browser/sworker.js

@@ -36,7 +36,7 @@
  *
  */
 
-var CurrentCacheName = "Naanlang-1.0.4-2";
+var CurrentCacheName = "Naanlang-1.0.5-2";
 
 
 //
@@ -74,8 +74,8 @@ var waitingForInit = [];                        // initialization functions, or
             return;                                                         // already done
         var waiters = waitingForInit;
         waitingForInit = false;                                             // no more waiters allowed
-        for (var waiter in waiters)
-            waiter();                                                       // call each waiter
+        for (var wdex in waiters)
+            waiters[wdex]();                                                // call each waiter
     }
 
     // self.onmessage events
@@ -89,11 +89,11 @@ var waitingForInit = [];                        // initialization functions, or
         var pubVersion = event.data.hereIsMyVersion;
         var sourceId = event.source.id;                                     // client id of sender of message
         msgPorts[sourceId] = msgport;
-        console.log("[1.0.4-2] received new msgport for", sourceId, pubID, "-", pubVersion);
-        if (pubVersion != "1.0.4-2")
+        console.log("[1.0.5-2] received new msgport for", sourceId, pubID, "-", pubVersion);
+        if (pubVersion != "1.0.5-2")
             msgport.postMessage({                                           // notify new version available
                 id: "upgrade",
-                version: "1.0.4-2"
+                version: "1.0.5-2"
             });
         Reaper();                                                           // clean up obsolete info
         
@@ -107,7 +107,7 @@ var waitingForInit = [];                        // initialization functions, or
             if (msg.id == "response")
                 processResponse(msg);
             else if (msg.id == "text")
-                console.log("[1.0.4-2] msg received:", msg.text);
+                console.log("[1.0.5-2] msg received:", msg.text);
         };
         
         // send text to IDE log
@@ -118,7 +118,7 @@ var waitingForInit = [];                        // initialization functions, or
             // don't clutter the log
             msgport.postMessage({
                 id: "text",
-                text: "port received by 1.0.4-2",
+                text: "port received by 1.0.5-2",
             });
             */
         if (--pending === 0)
@@ -135,13 +135,13 @@ var waitingForInit = [];                        // initialization functions, or
         includeUncontrolled: true
     }).then(function(clientList) {
         clientList.every(function(client) {
-            console.log("[1.0.4-2] requesting new msgport for", client.id);
+            console.log("[1.0.5-2] requesting new msgport for", client.id);
             ++pending;
             client.postMessage({                                            // tell client(s) we need this fetch source
                 msg: "Naan_need_fetch_port",
             });
         });
-        setTimeout(doneInit, 1000);                                         // release fetches
+        setTimeout(doneInit, 10000);                                        // release fetches
     });
 
     // processResponse
@@ -181,12 +181,12 @@ function Reaper() {
             clients[clientList[clidex].id] = clientList[clidex];
         for (var sourceId in msgPorts)
             if (!clients[sourceId]) {
-                console.log("[1.0.4-2] source gone:", sourceId);
+                console.log("[1.0.5-2] source gone:", sourceId);
                 delete msgPorts[sourceId];                                  // no longer a source
             }
         for (var clientId in fetchPorts)
             if (!clients[clientId]) {
-                console.log("[1.0.4-2] client gone:", clientId);
+                console.log("[1.0.5-2] client gone:", clientId);
                 delete fetchPorts[clientId];                                // no longer a client
             }
         for (var fqdex = 0; fqdex < fetchQueue.length; ++fqdex) {
@@ -220,13 +220,13 @@ function ClearCaches() {
             return (Promise.all(
                 cacheNames.map(function(cacheName) {
                     if (cacheName != CurrentCacheName) {
-                        console.log('[1.0.4-2] deleting old cache:', cacheName);
+                        console.log('[1.0.5-2] deleting old cache:', cacheName);
                         return (caches.delete(cacheName));
                     }
                 })
             ));
         }).then(function() {                                                // claim all clients
-            console.log('[1.0.4-2] claiming clients');
+            console.log('[1.0.5-2] claiming clients');
             return (self.clients.claim());
         });
     return (promise);
@@ -269,7 +269,7 @@ function GetClientResponse(event, urlpath) {
             msgport.postMessage({
                 id: "fetch",
                 seq: seqno,
-                version: "1.0.4-2",
+                version: "1.0.5-2",
                 request: {
                     method: event.request.method,
                     url: event.request.url
@@ -317,7 +317,7 @@ function GetClientResponse(event, urlpath) {
  */
 
 self.addEventListener('install', function(event) {
-    console.log("[1.0.4-2] install");
+    console.log("[1.0.5-2] install");
     self.skipWaiting();
 });
 
@@ -356,7 +356,7 @@ self.addEventListener('fetch', function(event) {
             }
             else
                 promise = fetch(event.request).catch(function (e) {
-                    console.log("[1.0.4-2] fetch failed", e);
+                    console.log("[1.0.5-2] fetch failed", e);
                     return (new Response(undefined, {
                         status: 404,
                         statusText: "Fetch Failed"
@@ -385,14 +385,14 @@ self.addEventListener('fetch', function(event) {
  */
 
 self.addEventListener('activate', function(event) {
-    console.log("[1.0.4-2] activate");
+    console.log("[1.0.5-2] 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.0.4-2] matching clients:', urls.join(', '));
+        console.log('[1.0.5-2] matching clients:', urls.join(', '));
     });
     var promise = ClearCaches();
     if (event.waitUntil)

package/frameworks/browser/terminals.nlg

@@ -602,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 = []
@@ -756,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.
  *
@@ -766,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

@@ -314,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",

package/frameworks/client/psm_client.nlg

@@ -39,7 +39,13 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
             depthlimit: 0
         }
         api.psmRemote(params, false, function(error, tree) {
-            view.fsdata = tree.data
+            if error
+                debuglog("psmcFsView.data: can't get initial filesystem data:", ErrorString(error))
+            else {
+                view.fsdata = tree.data
+                if rootpath == ""
+                    rootpath = tree.data.pathsep
+            }
             callback(error, tree.data)
         })
     }

package/frameworks/common/common.nlg

@@ -30,6 +30,49 @@ function EncodeQuery(prefix, items, local result, item) {
 };
 
 
+/*
+ * ContentTypeFromFileExt
+ *
+ *     Given a filename with extension, return a tuple of the recommended contentType and encoding
+ * for that type of data: `(contentType, encoding). Currently the encoding is false for text and
+ * "binary" for everything else.
+ *
+ */
+
+function ContentTypeFromFileExt(filepath, local mimeType, encoding) {
+    mimeType = {
+        "css":  "text/css",
+        "csv":  "text/csv",
+        "gif":  "image/gif",
+        "htm":  "text/html",
+        "html": "text/html",
+        "ico":  "image/x-icon",
+        "ics":  "application/octet-stream",
+        "jpeg": "image/jpeg",
+        "jpg":  "image/jpeg",
+        "js":   "text/javascript",
+        "json": "application/json",
+        "mov":  "video/mp4",
+        "mp3":  "audio/mpeg",
+        "mp4":  "video/mp4",
+        "nlg":  "text/plain",
+        "npk":  "application/json",
+        "ogg":  "video/ogg",
+        "svg":  "image/svg+xml",
+        "text": "text/plain",
+        "txt":  "text/plain",
+        "zip":  "application/octet-stream"
+    }[JSpath.extname(filepath).substring(1)]
+    if !mimeType
+        mimeType = "application/octet-stream"
+    if mimeType.startsWith("text/")
+        mimeType = mimeType.concat("; charset=UTF-8")
+    else
+        encoding = "binary"
+    list(mimeType, encoding)
+};
+
+
 /*
  * UUID
  *
@@ -125,11 +168,8 @@ function JsLoadScript(libpath, globalID, local scriptTag, fpath) {
         }
         js.w.document.body.appendChild(scriptTag)
         pending.wait()
-    } else if js.g {
-        if !libpath.startsWith("/")
-            fpath = "./".concat(libpath)
-        jsScripts[libpath] = js.r(fpath)                                    // load in NodeJS context
-    }
+    } else if js.g
+        jsScripts[libpath] = js.r(libpath)                                  // load in NodeJS context
     jsScripts[libpath]
 };
 
@@ -260,13 +300,15 @@ EncodeBase64 = false;
 DecodeBase64 = false;
 JSONstringify = false;
 JSONparse = false;
+Uint8ArrayFromString = false;
 
 function comrInit(local manifest) {
-    manifest = `(EncodeQuery, UUID, JsLoadScript, LoadComponentOnDemand, LiveExport, comrInit)
+    manifest = `(EncodeQuery, ContentTypeFromFileExt, UUID, JsLoadScript, LoadComponentOnDemand, LiveExport, comrInit)
 
-    Naan.module.build(module.id, "nideCommon", closure(modobj, compobj) {
+    Naan.module.build(module.id, "common", closure(modobj, compobj) {
         compobj.manifest = manifest
         modobj.exports.EncodeQuery = EncodeQuery
+        modobj.exports.ContentTypeFromFileExt = ContentTypeFromFileExt
         modobj.exports.UUID = UUID
         modobj.exports.JsLoadScript = JsLoadScript
         modobj.exports.LoadComponentOnDemand = LoadComponentOnDemand
@@ -291,14 +333,18 @@ function comrInit(local manifest) {
             EncodeURIComponent = wsg.encodeURIComponent
             DecodeURIComponent = wsg.decodeURIComponent
             //
-            // everywhere: Base65
-            EncodeBase64 = wsg.btoa
-            DecodeBase64 = wsg.atob
-            //
             // everywhere: JSON
             JSONstringify = wsg.JSON.stringify
             JSONparse = wsg.JSON.parse
             //
+            // everywhere: Uint8ArrayFromString
+            //
+            Uint8ArrayFromString = function uint8ArrayFromString(data) {
+                wsg.Uint8Array.from(Array.from(data).map(function(letter) {
+                    letter.charCodeAt(0)
+                }))
+            }
+            //
             // binaryFrom - convert arbitrary item to binary buffer or text.
             //
             function binaryFrom(data) {
@@ -327,18 +373,6 @@ function comrInit(local manifest) {
                     result
             }
             //
-            // base64Format - create base 64 string from binary array
-            //
-            function base64Format(data, local blob, reader, pending, result) {
-                blob = xnew(wsg.Blob, [data])
-                reader = xnew(wsg.FileReader)
-                pending = new(nonce)
-                reader.onload = function(event) { pending.signal(event.target.result) }
-                reader.readAsDataURL(blob)
-                result = pending.wait()
-                result.slice(37)
-            }
-            //
             // DecodeBase64url - decode base64url to original string
             // See https://en.wikipedia.org/wiki/Base64 for details on variants
             //
@@ -350,6 +384,31 @@ function comrInit(local manifest) {
             // For browser windows and web workers
             //
             if js.w || js.s {
+                //
+                // base64Format - create base 64 string from binary array
+                //
+                function browserBase64Format(data, local blob, reader, pending, result) {
+                    blob = xnew(wsg.Blob, [data])
+                    reader = xnew(wsg.FileReader)
+                    pending = new(nonce)
+                    reader.onload = function(event) { pending.signal(event.target.result) }
+                    reader.readAsDataURL(blob)
+                    result = pending.wait()
+                    result.slice(37)
+                }
+                //
+                // binary to Base64
+                EncodeBase64 = function browserEncodeBase64(data) {
+                    if xobject(data)
+                        browserBase64Format(data)
+                    else
+                        wsg.btoa(data)
+                }
+                //
+                // Base64 to binary
+                DecodeBase64 = function browserDecodeBase64(data) {
+                    wsg.atob(data)
+                }
                 //
                 // MD5 functions
                 JsLoadScript("frameworks/browser/spark-md5/spark-md5.min.js", "SparkMD5")
@@ -373,7 +432,7 @@ function comrInit(local manifest) {
                         throw(Error("crypto functions unavailable"))
                     data = binaryFrom(data)
                     if string(data)
-                        data = xnew(TextEncoder).encode(data)
+                        data = Uint8ArrayFromString(data)
                     `(error, result) = await(wsg.crypto.subtle.digest(algo, data))
                     if error
                         throw(Error("crypto digest failed", error))
@@ -392,7 +451,7 @@ function comrInit(local manifest) {
                 //
                 // HashSHA-256 in base64
                 HashSHA256_base64 = function browserSHA256_base64(data) {
-                    base64Format(browserDigest(data, "SHA-256"))
+                    browserBase64Format(browserDigest(data, "SHA-256"))
                 }
                //
                 // random bytes as UInt8Array - use toint() for integer
@@ -405,6 +464,16 @@ function comrInit(local manifest) {
             // For NodeJS
             //
             if js.g {
+                //
+                // binary to Base64
+                EncodeBase64 = function nodejsEncodeBase64(data) {
+                    wsg.Buffer.from(data, "binary").toString("base64")
+                }
+                //
+                // Base64 to binary
+                DecodeBase64 = function nodejsDecodeBase64(data) {
+                    wsg.Buffer.from(data, "base64").toString("binary")
+                }
                 if !crypto
                     crypto = js.r("crypto")
                 if crypto {
@@ -456,6 +525,7 @@ function comrInit(local manifest) {
             modobj.exports.JSONparse = JSONparse
             modobj.exports.JsonStringify = JsonStringify
             modobj.exports.JsonParse = JsonParse
+            modobj.exports.Uint8ArrayFromString = Uint8ArrayFromString
             modobj.exports.DecodeBase64url = DecodeBase64url
             modobj.exports.HashMD5 = HashMD5
             modobj.exports.HashMD5_base64 = HashMD5_base64

package/frameworks/common/preferences.nlg

@@ -125,6 +125,7 @@ function prefsInit(local manifest) {
     Naan.module.build(module.id, "preferences", function(modobj, compobj) {
         require("../common/common.nlg")
         compobj.manifest = manifest
+        updateExports()
     })
 
     module.exports.Preferences = Preferences

package/frameworks/common/watching.nlg

@@ -93,5 +93,6 @@ function wachInit(local manifest) {
         require("./common.nlg")
         compobj.manifest = manifest
         module.exports.Watchable = Watchable
+        updateExports()
     })
 } ();

package/frameworks/node/https_request.nlg

@@ -0,0 +1,119 @@
+/*
+ * https_node.nlg
+ *
+ *     Https operations for NodeJS.
+ *
+ * column positioning:                          //                          //                      !
+ *
+ * Copyright (c) 2021-2022 by Richard C. Zulch
+ *
+ */
+
+
+/*
+ * HttpsApiRequest
+ *
+ * Perform an API request from in NodeJS. This operates the same as HttpsApiRequest for browsers.
+ *
+ * Options:
+ *  {
+ *      method:         <string>                // HTTP method (defaults to GET/PUT)
+ *      query:          <dictionary>            // query variables added to the URL
+ *      putdata:        <data>                  // data to put
+ *      contentType:    <string>                // sets Content-Type header, otherwise auto-determined
+ *      range:          <string>                // sets range header
+ *      headers:        [`(key, value)]         // add header(s) to the request, overriding defaults
+ *  }
+ *
+ */
+
+closure HttpsApiRequest(url, options, local urlq, reqOptions, putdata, item, pending, chunks, request) {
+    if options.query
+        urlq = url.concat(EncodeQuery("?", options.query))
+    else
+        urlq = url
+    putdata = options.putdata
+    reqOptions = { }
+    if options.method
+        reqOptions.method = options.method
+    else if putdata
+        reqOptions.method = "POST"
+    else
+        reqOptions.method = "GET"
+    reqOptions.headers = { }
+    if putdata {
+        if options.contentType
+            reqOptions.headers['Content-Type'] = options.contentType
+        else if jsTypedArray(options.putdata)
+            reqOptions.headers['Content-Type'] = "application/octet-stream"
+        else if member(typeof(options.putdata), `(dictionary, array, xobject)) {
+            reqOptions.headers['Content-Type'] = "application/json"
+            `(error, putdata) = JsonStringify(options.putdata)
+            if error
+                return (list(Error("HttpsApiRequest encode:", url)))
+        }
+        fetchOptions.body = putdata
+    }
+    if array(options.headers)
+        for item in options.headers
+            reqOptions.headers[item.0] = item.1
+    pending = new(nonce)
+    chunks = []
+    request = nodeHttps.request(url, reqOptions, function (response) {
+        if response.statusCode < 200 || response.statusCode >= 300 {
+            pending.signal(list(Error("HttpsApiRequest statusCode:", url, response.statusCode, {
+                status: response.statusCode
+            })))
+            return
+        }
+        response.on("data", function (chunk) {
+            chunks.push(chunk)
+        })
+        response.on("end", function (local content, error) {
+            content = Buffer.concat(chunks)
+            if response.complete {
+                if response.headers["content-type"].startsWith("application/json") {
+                    `(error, content) = JsonParse(content.toString())
+                    if error
+                        error = Error("HttpsApiRequest decode:", url, error)
+                    else
+                        content = new(content)
+                    if array(content) {                                     // deencapsulate to get API result
+                        content = totuple(content)
+                        error = content.0
+                        content = content.1
+                    }
+                }
+            }
+            else
+                error = Error("HttpsApiRequest terminated prematurely:", url)
+            pending.signal(list(error, content))
+        })
+    })
+    request.on("error", function(error) {
+        error = Error("HttpsApiRequest failed:", url, error)
+        pending.signal(list(error))
+    })
+    if data
+        request.write(data)
+    request.end()
+    pending.wait()
+};
+
+
+/*
+ * https_nodeInit
+ *
+ * Initialize HTTPS request operations for NodeJS.
+ *
+ */
+
+function https_nodeInit(local manifest) {
+    manifest = `(HttpsGetJson, HttpsPutJson, https_nodeInit)
+
+    Naan.module.build(module.id, "https_request", function(modobj, compobj) {
+        require("./node.nlg")
+        compobj.manifest = manifest
+        modobj.exports.HttpsApiRequest = HttpsApiRequest
+    })
+}();

package/frameworks/node/node.nlg

@@ -75,6 +75,7 @@ function nodrInit(local manifest) {
             fs = js.r("fs")
             os = js.r("os")
             stream = js.r("stream")
+            nodeHttps = js.r("https")
         }()
         module.reload = nodrReload
     })