@naanlang/naan 1.1.0 → 1.2.1

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
     })
 
 } ();

package/frameworks/client/psm_client.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2022 by Richard C. Zulch
+ * Copyright (c) 2019-2024 by Richard C. Zulch
  *
  */
 
@@ -19,6 +19,7 @@
  */
 
 closure psmcFsView(api, rootpath, local view, pathmod) {
+    global(JSpath)
     view = new(object, this)
     view.api = api
     view.rootpath = rootpath
@@ -154,6 +155,8 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Read a file at the specified path
     
     view.readFile = function readFile(path, options, callback) {
+        if !path
+            throw("psmcFsView.readFile: path is false")
         psmRemote(path, "readFile", options, false, callback)
     }
 
@@ -354,7 +357,9 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
     // Tell the shell to open the specified file.
     
     view.shellOpen = function shellOpen(path, args, callback) {
-        psmRemote(path, "shellOpen", { args: args }, false, callback)
+        if args
+            args = { args: args }
+        psmRemote(path, "shellOpen", args, false, callback)
     }
 
     // grepLines
@@ -424,11 +429,14 @@ closure psmcFsView(api, rootpath, local view, pathmod) {
  *
  */
 
-closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
+closure psmcFsConnector(psm, api, local connClassID, connector, watch) {
+    global()
     connClassID = "NodeFS"
     connector = new(object, this)
     connector.psm = psm
-    connector.api = nicc.api
+    connector.apis = {
+        HostFS: api
+    }
     connector.vault = psm.vault(connClassID)
     connector.label = "Naan-Server"
     watch = psm.watchable(connector)
@@ -563,7 +571,7 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
     // listResources
     //
     // List saved resources in our database
-    connector.listResources = function listResources(local error, original) {
+    connector.listResources = function listResources(local error, output, original) {
         `(error, output) = connector.vault.listResources()
         if error
             return (list(error))                                            // can't access our saved resources
@@ -579,14 +587,14 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
     connector.info = function info(resID, local info, error, creds) {
         info = {
             classID: connClassID
-            type: "remote filesystem"
-            services: ["NideFS", "NideHostAPI"]
+            type: "remote server"
+            services: ["NideFS", "NideHostAPI", "NideTerminal"]
         }
         if resID == "Host" {
             info.name = "Host"
             info.type = "host filesystem"
             info.locked = true
-            info.where = nicc.api.url
+            info.where = api.url
             info.access = "HostFS"
         } else {
             `(error, creds) = connector.vault.accessResource(resID)
@@ -620,14 +628,26 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
         `(error, creds) = connector.access(resID)
         if !error {
             if creds == "HostFS"
-                api = connector.api
-            else
-                api = MakeNideAPIclient(creds.urlName, creds.authSecret)    // API to remote NodeJS filesystem
+                api = connector.apis[creds]
+            else {
+                api = connector.apis[creds.urlName]
+                if !api                                                     // get API to remote server
+                    connector.apis[creds.urlName] = api = NideAPIclient(creds.urlName, creds.authSecret)
+            }
         }
         if error
             list(error)
-        else if service == "NideExecutor"
-            require("../browser/terminals.nlg").TermHost(nicc.track, api, args.0, args.1)                       // host executor, args: (name, workerID)
+        else if service == "NideTerminal" {
+            if !App.nide.track
+                return (list(Error("NideTerminal not supported in this environment")))
+            list(false, App.nide.track.spawn(App.nide.registerRemote(api),
+                args.0,                                                     // terminal display name
+                args.1))                                                    // options:
+                    // {
+                    //      workerID: "NideServer"  -- for main thread; other strings for worker threads
+                    //      type: "My Remotes"      -- display name of terminal group; e.g. URL
+                    // }
+        }
         else if service == "NideHostAPI"
             list(false, api)                                                // connect to the Host API
         else if service == "NideFS" {
@@ -647,17 +667,18 @@ closure psmcFsConnector(psm, nicc, local connClassID, connector, watch) {
 
 
 /*
- * psmcMakeClientPSM
+ * MakeClientPSM
  *
  *     Return a new client PSM with our known connectors.
  *
  */
 
-function psmcMakeClientPSM(nicc, dbname, local importPSM) {
+function MakeClientPSM(api, dbname, local importPSM) {
+    global(App)
     importPSM = require("../storage/psm.nlg")
     App.psm = importPSM.MakePSM(dbname).1
     if App.psm {
-        psmcFsConnector(App.psm, nicc)                                      // HostFS access
+        psmcFsConnector(App.psm, api)                                       // HostFS access
         require("../storage/dbt_pouch.nlg").DbConnector(App.psm)            // Pouch databases as filesystems
     }
     App.psm
@@ -673,12 +694,12 @@ function psmcMakeClientPSM(nicc, dbname, local importPSM) {
 
 function psmcInit(local manifest) {
 
-    manifest = `(psmcFsView, psmcFsConnector, psmcMakeClientPSM, psmcInit)
+    manifest = `(psmcFsView, psmcFsConnector, MakeClientPSM, psmcInit)
 
     Naan.module.build(module.id, "psm_client", function(modobj, compobj) {
         require("./client.nlg")
         compobj.manifest = manifest
-        modobj.exports.MakeClientPSM = psmcMakeClientPSM
+        modobj.exports.MakeClientPSM = MakeClientPSM
     })
 
 } ();

package/frameworks/client/relaycon.nlg

@@ -35,6 +35,7 @@ wsMod;;                                         // websocket module
  *          workerID: <string>                  // worker on server (server destinations only)
  *      }
  *      startup: <dictionary>                   // worker spawn init (server destinations only)
+ *      wss: <boolean>                          // true to use secure connection
  *      debug: <boolean>                        // debug logging
  *  }
  *
@@ -74,6 +75,7 @@ closure RelayCon(host, secret, options, local relay, nlregex)
         relay.guid = secret
         relay.host = host                                                   // e.g. "localhost:8009"
         relay.wscon = wsMod.WebSocket(host, {
+            wss: options.wss || undefined
             onopen: onopen
             onmessage: onmessage
             onerror: onerror

package/frameworks/common/common.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2023 by Richard C. Zulch
+ * Copyright (c) 2020-2024 by Richard C. Zulch
  *
  */
 
@@ -193,8 +193,14 @@ closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
     else
         fpath = "/".concat(libpath)
     if js.s.importScripts && tostring(js.s.importScripts) == "[Function importScripts]" {
-        js.s.importScripts(fpath)                                           // load in worker context
-        jsScripts[libpath] = js.s[globalID]
+        fpath = JSpath.dirname(js.w.location.href).concat(fpath)
+        try {
+            js.s.importScripts(fpath)                                       // load in worker context
+            jsScripts[libpath] = js.s[globalID]
+        } catch {
+            debuglog("JsLoadScript:", libpath, "failed", exception)
+            js.s.console.log("JsLoadScript:", libpath, "failed", exception) // ensure visibility in JS console
+        }
     } else if js.w {                                                        // load in browser context
         pending = new(nonce)
         scriptTag = js.w.document.createElement("script")
@@ -205,7 +211,7 @@ closure JsLoadScript(libpath, globalID, local scriptTag, fpath) {
             true
         }
         scriptTag.onerror = function (event) {
-            debuglog("jsScriptLoader:", libpath, "not found")
+            debuglog("JsLoadScript:", libpath, "not found")
             pending.signal(false)
             true
         }

package/frameworks/node/https_request.nlg

@@ -105,7 +105,7 @@ closure httpsApiReqOnce(url, options,
         })
         response.on("end", function (local content, error, headers) {
             content = js.g.Buffer.concat(chunks)
-            if response.statusCode < 200 || response.statusCode >= 300 {
+            if response.statusCode < 200 || response.statusCode >= 299 {    // 299 is "cancelled"
                 if options.debug
                     debuglog("HttpsApiRequest status:", url, response.statusCode, "message:", content)
                 pending.signal(list(Error("HttpsApiRequest statusCode:", url, response.statusCode, {
@@ -132,6 +132,7 @@ closure httpsApiReqOnce(url, options,
             pending.signal(list(error, content, {
                 headers: response.headers
                 status: response.statusCode
+                contentType: response.headers["content-type"]
             }))
         })
     })

package/frameworks/node/psm_server.nlg

@@ -450,8 +450,8 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
     connector.info = function info(resID, local info, error, creds) {
         info = {
             classID: connClassID
-            type: "remote filesystem"
-            services: ["NideFS", "NideHostAPI"]
+            type: "remote server"
+            services: ["NideFS", "NideHostAPI", "NideTerminal"]
         }
         if resID == "Host" {
             info.name = "Host"

package/frameworks/node/ws_client.nlg

@@ -20,6 +20,7 @@
  *
  * Options:
  *  {
+ *      wss:        <boolean>                   // true to use secure connection
  *      onopen:     <proc>(e)                   // connection has opened
  *      onmessage:  <proc>(e, message)          // message received
  *      onerror:    <proc>(e)                   // error occurred
@@ -37,13 +38,17 @@ closure WebSocket(host, options, local wsock) {
     //
     // Connect with the host if not already connected, returning a result tuple.
     //
-    wsock.connect = closure connect(local pending, error, ws) {
+    wsock.connect = closure connect(local error, ws, url, pending) {
         if wsock.ws
             return (list(false, { open: true }))
         `(error, ws) = await(js.i("ws"))
         if error
             return (list(error))
-        wsock.ws = xnew(ws.default, "ws://${host}")
+        if options.wss
+            url = "wss://${host}"
+        else
+            url = "ws://${host}"
+        wsock.ws = xnew(ws.default, url)
         pending = new(nonce)
 
         // onopen

package/frameworks/project/build.nlg

@@ -118,7 +118,7 @@
  *          ]
  *      }
  *
- * build = Builder(rulesDict, operation, fs, srcpath, destpath)             // create a builder object
+ * build = Builder(rulesDict, operation, fs, srcpath, destpath, track)      // create a builder object
  * build.increment()                                                        // increment the build counter
  * build.make()                                                             // run the build
  * build.clean()                                                            // clear all output folders
@@ -140,7 +140,7 @@
  *
  */
 
-closure Builder(rules, operation, fs, srcpath, destpath, local build, group, newgroup) {
+closure Builder(rules, operation, fs, srcpath, destpath, track, local build, group, newgroup) {
     build = new(object, this)
     build.srcpath = srcpath
     build.destpath = destpath
@@ -393,7 +393,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
     closure zip(files, options, local result) {
         if !build.zipper
-            build.zipper = ExecutorParallel({                               // create worker for zipping
+            build.zipper = ExecutorParallel(track, {                        // create worker for zipping
                 maxcount: 1                                                 // stupid Zip lib can't do more than one
                 basename: "zip"
                 initeval: `(false, (zip1))
@@ -529,7 +529,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
 
     closure parseAndPack(text, fpath, options, local result) {
         if !build.parallel
-            build.parallel = ExecutorParallel({                             // create worker pool
+            build.parallel = ExecutorParallel(track, {                      // create worker pool
                 basename: "build"
                 initeval: `(false, (parseAndPack1))
             }) 
@@ -1190,12 +1190,13 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Run the current build product by spawning a new worker.
     //
-    build.runSpawn = function runSpawn(track local error, maintext, executor, vpath, site) {
+    build.runSpawn = function runSpawn(local error, maintext, executor, vpath, site) {
         `(error, maintext) = fs.readFile(JSpath.join(build.destpath, build.runway.main))
         if error
             error = Error("Builder: cannot read main file", error)
         else {
-            `(error, executor) = track.spawn(build.runway.spawn.0, "${rules.name} ${build.version}", "Run-${build.buildnum}", {
+            `(error, executor) = track.spawn(build.runway.spawn.0, "${rules.name} ${build.version}", {
+                workerID: "Run-${build.buildnum}"
                 startup: {
                     initcmds: maintext
                     dirpath: fs.path.resolve(fs.path.sep, fs.rootpath, build.destpath)
@@ -1227,7 +1228,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Run the current build product by opening a new window.
     //
-    build.runWindow = function runWindow(track
+    build.runWindow = function runWindow(
         local title, main, url, features, vpath, error, window, site) {
         if !js.w
             return (list(Error('Run method "window" requires browser host')))
@@ -1259,13 +1260,13 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     // Run the current build product, which would be after the make call. Returns a standard result
     // tuple.
     //
-    build.run = function run(track) {
+    build.run = function run() {
         if build.runway.open
             fs.shellOpen(JSpath.join(build.destpath, build.runway.open), build.runway.args)
         else if build.runway.spawn
-            build.runSpawn(track)
+            build.runSpawn()
         else if build.runway.window
-            build.runWindow(track)
+            build.runWindow()
         else
             list(false, { ok: true })
     }
@@ -1275,7 +1276,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Refresh after updating the v-site, returning true iff an existing vsite was found.
     //
-    build.refresh = function refresh(track local url_origin, found) {
+    build.refresh = function refresh(local url_origin, found) {
         if build.runway."v-site" {
             url_origin = js.w.location.origin.concat("/run", build.runway."v-site")
             for target in track.enumlist() {

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.1.0+1 etc.
+ *      NaanIDE_version.txt             - [default] substitution file defining 1.2.1+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
@@ -614,7 +614,7 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         rules.typeID = procon.where_typeID
         if !rules.operation
             rules.operation = "debug"
-        `(error, builder) = Builder(rules, rules.operation, fs, "", buildpath)
+        `(error, builder) = Builder(rules, rules.operation, fs, "", buildpath, projman.track)
         if error
             return (list(error))
         procon.builder = builder
@@ -628,10 +628,10 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
             buildnum: buildnum
         })
         if !error {
-            if builder.refresh(projman.track)
+            if builder.refresh()
                 buildonly = !buildonly                                      // reverse if refresh
             if !buildonly
-                `(error) = builder.run(projman.track)
+                `(error) = builder.run()
         }
         builder.destroy()
         procon.builder = false
@@ -662,7 +662,9 @@ closure projConfig(projman, where, projID, local procon, fs, configpath) {
         publish = rules.publish
         where = procon.localDict.publish[stage].where
         if !rules || !where
-            return (list(Error("no project publish location configured")))
+            return (list(Error("no project publish location set")))
+        if !publish.input || !publish.sources || !publish.output
+            return (list(Error("project configuration has no publish instructions")))
         if publish.cacheControl
             outOptions = {
                 cacheControl: publish.cacheControl