@naanlang/naan 1.0.2 → 1.0.5

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

package/frameworks/node/psm_server.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2022 by Richard C. Zulch
  *
  */
 
@@ -27,12 +27,18 @@ closure psmsFsView(rootpath, local view, gitter) {
     view = view.1
     
     // inherited
+    //  --  view.folderPath(folderid, callback)
     //  --  view.winDrives(callback)
     //  --  view.testHidden(path, callback)
     //  --  view.readLines(path, options, callback)
     //  --  view.readFile(path, options, callback)
     //  --  view.writeFile(path, data, options, callback)
-    //  --  view.info(path, callback)
+    //  --  view.readlink(path, options, callback)
+    //  --  view.symlink(target, path, options, callback)
+    //  --  view.info(path, options, callback)
+    //  --  view.setInfo(path, info, callback)
+    //  --  view.setOwnerGroup(path, uid, gid, callback)
+    //  --  view.setMode(path, mode, callback)
     //  --  view.setTimes(path, atime, mtime, callback)
     //  --  view.dirList(path, options, callback)
     //  --  view.mkdir(path, callback)
@@ -81,16 +87,27 @@ closure psmsFsView(rootpath, local view, gitter) {
             }
             res.send(new(array, result))
         }
-                 
+                                 
+        // op: folderPath
+        function folderPathApi() {
+            res.send(new(array, view.folderPath(req.query.folderid)))
+        }
+ 
         // op: readLines
         function readLinesApi() {
             res.send(new(array, view.readLines(path, req.query)))
         }
 
         // op: readFile
-        function readFileApi(local options) {
+        function readFileApi(local error, localpath, options) {
+            `(error, localpath) = view.localPath(path)
+            if error {
+                res.send(new(array, list(error)))
+                return
+            }
             options = {
-                dotfiles: "allow" }
+                dotfiles: "allow"
+            }
             if req.query.encoding == "binary"
                 options.headers = {
                     "Content-Type": "application/octet-stream"
@@ -99,7 +116,7 @@ closure psmsFsView(rootpath, local view, gitter) {
                 options.headers = {                                         // ### is this always the right default?
                     "Content-Type": "text/html; charset=UTF-8"
                 }
-            res.sendFile(path, options, function (err, local status) {
+            res.sendFile(localpath, options, function (err, local status) {
                 if err {
                     if err.code == "ENOENT"
                         status = 404
@@ -118,7 +135,18 @@ closure psmsFsView(rootpath, local view, gitter) {
                 options.encoding = req.query.encoding
             res.send(new(array, view.writeFile(path, req.body, options)))
         }
- 
+
+        // op: readlink
+        function readlinkApi() {
+            res.send(new(array, view.readlink(path)))
+        }
+
+        // op: symlink
+        function symlinkApi(local options) {
+            options = { }
+            res.send(new(array, view.symlink(req.query.target, path, options)))
+        }
+
         // op: delete
         function deleteApi(local options) {
             options = {  }
@@ -130,8 +158,26 @@ closure psmsFsView(rootpath, local view, gitter) {
         }
 
         // op: info
-        function infoApi() {
-            res.send(new(array, view.info(path)))
+        function infoApi(local options) {
+            options - { }
+            if req.query.follow
+                options.follow = req.query.follow
+            res.send(new(array, view.info(path, options)))
+        }
+
+        // op: setInfo
+        function setInfoApi() {
+            res.send(new(array, view.setInfo(path, req.body)))
+        }
+
+        // op: setOwnerGroup
+        function setOwnerGroupApi() {
+            res.send(new(array, view.setOwnerGroup(path, req.query.uid, req.query.gid)))
+        }
+
+        // op: setMode
+        function setModeApi() {
+            res.send(new(array, view.setMode(path, req.query.mode)))
         }
 
         // op: setTimes
@@ -141,8 +187,8 @@ closure psmsFsView(rootpath, local view, gitter) {
 
         // op: dirList
         function dirListApi(local options) {
-            if req.query.head
-                options = { head: true }
+            if req.query.stat
+                options = { stat: true }
             res.send(new(array, view.dirList(path, options)))
         }
         
@@ -153,7 +199,7 @@ closure psmsFsView(rootpath, local view, gitter) {
         
         // op: tree
         function treeApi() {
-            res.send(new(array, view.tree(path, req.query.depthlimit)))
+            res.send(new(array, view.tree(path, toint(req.query.depthlimit))))
         }
                 
         // op: dirSearch
@@ -216,11 +262,17 @@ closure psmsFsView(rootpath, local view, gitter) {
 
         proc = {
             pathOp:         pathOpApi
+            folderPath:     folderPathApi
             readFile:       readFileApi
             readLines:      readLinesApi
             writeFile:      writeFileApi
+            readlink:       readlinkApi
+            symlink:        symlinkApi
             delete:         deleteApi
             info:           infoApi
+            setInfo:        setInfoApi
+            setOwnerGroup:  setOwnerGroupApi
+            setMode:        setModeApi
             setTimes:       setTimesApi
             dirList:        dirListApi
             mkdir:          mkdirApi
@@ -263,38 +315,38 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
     connector.vault = psm.vault(connClassID)
     connector.label = "Naan IDE Server"
     watch = psm.watchable(connector)
-    
-    // hashResourceID
-    //
-    // Make a stable hash based on the resource credentials that we can persist or share between
-    // different domains accessing the same resource.
-    connector.hashResourceID = function hashResourceID(resource, local ident) {
-        ident = resource.urlName
-        if resource.label
-            ident = ident.concat(resource.label)
-        HashSHA256(ident)
-    }
-    
+
     // findResource
     //
-    // Find a resource with the specified contents, returning the resID or false. The loose criteria
-    // is: if added, would the specified contents be redundant to an existing resource?
+    // Find a resource with the specified contents, returning the resID or false.
     connector.findResource = function findResource(resource, local resID, creds) {
         for resID in listResources().1 {
             creds = access(resID).1
-            if resource.urlName == creds.urlName
-                && (!resource.label || resource.label == creds.label)
+            if ((!resource.urlName || resource.urlName == creds.urlName)
+                && (!resource.label || resource.label == creds.label))
                 return (resID)
         }
         false
     }
 
-    // addResource
+    // writeResource
     //
-    // Add credentials for a named resource. This is just a stub at the moment
-
-    connector.addResource = function addResource(resource, local creds, errors, error, resID, data) {
+    // Add or update credentials for a named resource. If no resID is specified this adds a new
+    // resource; otherwise it updates an existing one. The resource is a dictionary comprising these
+    // keys:
+    //      label       - [optional] label we use for this resource
+    //      urlName     - URL (e.g. "http://host.com/node/fsapi")
+    //      authSecret  - access-control token for this URL
+    //      hidden      - [optional] don't enumerate to user
+    //      locked      - [optional] don't allow user delete
+    //
+    // The return value is an (error, resID) tuple. Error, if non-false, is a dictionary of field
+    // keys and error diagnostic strings.
+    connector.writeResource = function writeResource(resource, resID,
+        local creds, errors, error, data, change) {
+        // badField - test for a bad string
         function badField(str) { !string(str) || str.trim().length == 0 }
+
         creds = { urlName: resource.urlName }
         errors = { }
         if resource.label
@@ -303,6 +355,8 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
             creds.label = resource.urlName
         if badField(creds.label)
             errors.label = "invalid label"
+        else if !resID && findResource({ label: creds.label })
+            errors.label = "duplicate name"
         if badField(resource.urlName)
             errors.urlName = "required field"
         if length(errors) > 0
@@ -312,14 +366,36 @@ closure psmsFsConnector(psm, api, local connClassID, connector, watch) {
                 creds.hidden = resource.hidden
             if resource.locked
                 creds.locked = resource.locked
-            resID =  hashResourceID(resource)
-            `(error, data) = connector.vault.addResource(resID, creds)
+            if resID {
+                `(error, data) = connector.vault.updateResource(resID, creds)
+                change = { changed: [resID] }
+            } else {
+                resID = UUID()
+                `(error, data) = connector.vault.addResource(resID, creds)
+                change = { added: [resID] }
+            }
             if data {
-                watch.notify(connClassID, { added: [resID] })
-                data = resID } }
+                watch.notify(connClassID, change)
+                data = resID
+            }
+        }
         list(error, data)
     }
-        
+
+    // addResource
+    //
+    // Add a new resource, returning a standard error tuple per writeResource.
+    connector.addResource = function addResource(resource) {
+        writeResource(resource)
+    }
+
+    // updateResource
+    //
+    // Update an existing resource, returning a standard error tuple per writeResource.
+    connector.updateResource = function updateResource(resID, resource) {
+        writeResource(resource, resID)
+    }
+
     // getResource
     //
     // Get credentials for a named resource, matching the dictionary semantics of addResource. The

package/frameworks/project/build.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2022 by Richard C. Zulch
  *
  */
 
@@ -267,15 +267,20 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // applySubstitutions
     //
-    // Apply substitutions from readSubstitutionFile to string, returning a new string.
+    // Apply substitutions from readSubstitutionFile to string, returning a tuple of the resulting
+    // text and the number of substitution patterns actually used from the supplied dictionary.
     //
-    function applySubstitutions(text, subs) {
-        text.replace(RegExp("[$][-A-Za-z0-9_./()\\\\]+[$]", "g"), function(match) {
-            if subs[match.slice(1,-1)]
-                { }
+    function applySubstitutions(text, subs, local subbed) {
+        subbed = { }
+        list(text.replace(RegExp("[$][-A-Za-z0-9_./()\\\\]+[$]", "g"), function(match, local subst) {
+            subst = subs[match.slice(1,-1)]
+            if subst {
+                subbed[match] = true
+                subst
+            }
             else
                 match
-        })
+        }), length(subbed))
     }
     
     //
@@ -573,7 +578,7 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
     //
     // Handling the catenates is a bit tricky. One set of buildrules can have multiple catentates,
     // distinguished by having a unique writepath derived from the destfile parameter. All groups
-    // having the same writepath contribute to a single catenate, with the sources ordere first by
+    // having the same writepath contribute to a single catenate, with the sources ordered first by
     // group number (low to high) and then order in the source list, first to last. If any component
     // contributing to a catenate is out-of-date with respect to it then they are all built and
     // combined into the single output file. This computes a set of ordering integers for the parts
@@ -649,13 +654,13 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                             outfile = JSpath.join(outdirpath, group.destfile)
                         else
                             outfile = JSpath.join(outdirpath, source)
-                        fs.info(infile, function(error, instat, local listing, addgroup, file) {
+                        fs.info(infile, false, function(error, instat, local listing, addgroup, file) {
                             if error
                                 build.errorlist.push(error)
                             else if instat.type != "directory"
                                 addEntry(infile, outfile, instat, sdex)     // add execution entry if needed
                             else {                                          // add a new group for directory source
-                                `(error, listing) = fs.dirList(infile, { head: true })
+                                `(error, listing) = fs.dirList(infile, { stat: true })
                                 if error
                                     build.errorlist.push(error)
                                 else {
@@ -754,19 +759,20 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     entry.zip = true
                     if !entry.writepath.toLowerCase().endsWith(".zip")
                         entry.writepath = entry.writepath.concat(".zip")    // always ends with .zip
+                    outfile = entry.writepath
                 }
                 if entry.catenate || entry.zip {
                     entry.catorder = group.groupno * sourcemax + sdex       // order of groups then sources
                     if build.testats[outfile] && instat.mtimeMs < build.testats[outfile].mtimeMs
                         instat = build.testats[outfile]                     // make source at least as recent as template
-                } else
+                } else if !entry.unzip
                     entry.writepath = outfile
                 ++pending.active
                 if destcheck {                                              // destcheck is special target for determining if task needed
                     entry.destcheck = JSpath.join(outdirpath, destcheck.pop())
-                    fs.info(entry.destcheck, addIfOutOfDate)
+                    fs.info(entry.destcheck, false, addIfOutOfDate)
                 } else
-                    fs.info(outfile, addIfOutOfDate)
+                    fs.info(outfile, false, addIfOutOfDate)
                     
                 function addIfOutOfDate(error, outstat, local entryop) {
                     if error || toint(instat.mtimeMs) > toint(outstat.mtimeMs) {
@@ -861,9 +867,8 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     if error
                         build.errorlist.push(error)
                     else if content.startsWith("$$")                        // prefix to cause version substitution
-                        build.templates[writepath] = applySubstitutions(content.slice(2), verFileDefs)
-                    else
-                        build.templates[writepath] = content
+                        `(content) = applySubstitutions(content.slice(2), verFileDefs)
+                    build.templates[writepath] = content
                 }
             } ()
         }
@@ -890,13 +895,21 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                     `(error, result) = fs.unzip(entry.readpath, entry.writepath)   // unzip source into destination
                     if !error && entry.destcheck
                         fs.touch(entry.destcheck)                           // show we completed
-                } else if entry.copy
-                    `(error, result) = fs.copy(entry.readpath, entry.writepath, { overwrite: true })     // copy file from source into destination
+                } else if entry.copy {
+                    `(error, result) = fs.util.deepcopy(entry.readpath, false, fs, dirpath, {
+                        erase: true                                         // not really needed
+                        overwrite: true                                     // overwrite files
+                        force: true                                         // ignore modify date
+                        preserve: true                                      // preserve attributes
+                    })
+                    if error                                                // deepcopy returns a list of errors
+                        error = error.0                                     // but we're only doing one item
+                }
                 else if ((`(error, content) = fs.readFile(entry.readpath)) && !error) {
                     if entry.license
-                        content = applySubstitutions(content, licFileDefs)
+                        `(content) = applySubstitutions(content, licFileDefs)
                     if entry.version
-                        content = applySubstitutions(content, verFileDefs)
+                        `(content) = applySubstitutions(content, verFileDefs)
                     if entry.naanpack
                         `(error, content) = parseAndPack(content, entry.readpath, { naanpack: true })
                     else if entry.jspack
@@ -962,11 +975,15 @@ closure Builder(rules, operation, fs, srcpath, destpath, local build, group, new
                         docat = true
                 }
                 if docat {                                                  // catenate the files
-                    if template
-                        content = applySubstitutions(template, catsub)
+                    if template {
+                        `(content, result) = applySubstitutions(template, catsub)
+                        if length(catsub) != result
+                            build.errorlist.push(Error("Matched ", result, " of ", length(catsub),
+                                "substitutions in template:", build.tepaths[writepath]))
+                    }
                     else
                         content = catenates[writepath].map(function(entry){entry.content}).join("\n")
-                    if zip {
+                    if dozip {
                         zipmap = { }
                         zipmap[JSpath.basename(writepath)] = content
                         `(error, content) = zip(zipmap)                     // compress the catenated file

package/frameworks/project/proj_cliser.nlg

@@ -27,7 +27,7 @@ closure proj_cliserInstance(projman, where, projID, local project) {
     project.name = where.name
     project.where = where
     project.projID = projID
-    project.config = projConfig(projman, where)
+    project.config = projConfig(projman, where, projID)
     
     // create
     //
@@ -63,8 +63,16 @@ closure proj_cliserInstance(projman, where, projID, local project) {
     //
     //     Run the project by building and then launching.
     //
-    project.run = closure run(buildonly) {
-        project.config.run(buildonly)
+    project.run = closure run(stage, buildonly) {
+        project.config.run(stage, buildonly)
+    }
+
+    // publish
+    //
+    //     Publish the project according to the stage.
+    //
+    project.publish = closure publish(stage) {
+        project.config.publish(stage)
     }
 
     // close()

package/frameworks/project/proj_console.nlg

@@ -27,7 +27,7 @@ closure proj_consoleInstance(projman, where, projID, local project) {
     project.name = where.name
     project.where = where
     project.projID = projID
-    project.config = projConfig(projman, where)
+    project.config = projConfig(projman, where, projID)
     project.runPageDebug = true                                             // switch to Debug page on run
 
     // create
@@ -60,9 +60,18 @@ closure proj_consoleInstance(projman, where, projID, local project) {
 
     // run
     //
-    // Run the project by building and then launching.
-    project.run = closure run(buildonly) {
-        project.config.run(buildonly)
+    //     Run the project by building and then launching.
+    //
+    project.run = closure run(stage, buildonly) {
+        project.config.run(stage, buildonly)
+    }
+
+    // publish
+    //
+    //     Publish the project according to the stage.
+    //
+    project.publish = closure publish(stage) {
+        project.config.publish(stage)
     }
 
     // close

package/frameworks/project/proj_folder.nlg

@@ -61,11 +61,20 @@ closure proj_folderInstance(projman, where, projID, local project) {
     // run
     //
     // Run the project by building and then launching.
-    project.run = closure run(buildonly) {
+    project.run = closure run(stage, buildonly) {
         debuglog("folder run project stub")
         list(false, { ok: true })
     }
 
+    // publish
+    //
+    //     Publish the project according to the stage.
+    //
+    project.publish = closure publish(stage) {
+        debuglog("folder publish project stub")
+        list(false, { ok: true })
+    }
+
     // close
     //
     // Close the project, releasing resources.

package/frameworks/project/proj_lambda.nlg

@@ -27,7 +27,7 @@ closure proj_lambdaInstance(projman, where, projID, local project) {
     project.name = where.name
     project.where = where
     project.projID = projID
-    project.config = projConfig(projman, where)
+    project.config = projConfig(projman, where, projID)
     project.runPageDebug = true                                             // switch to Debug page on run
 
     // create
@@ -60,9 +60,18 @@ closure proj_lambdaInstance(projman, where, projID, local project) {
 
     // run
     //
-    // Run the project by building and then launching.
-    project.run = closure run(buildonly) {
-        project.config.run(buildonly)
+    //     Run the project by building and then launching.
+    //
+    project.run = closure run(stage, buildonly) {
+        project.config.run(stage, buildonly)
+    }
+
+    // publish
+    //
+    //     Publish the project according to the stage.
+    //
+    project.publish = closure publish(stage) {
+        project.config.publish(stage)
     }
 
     // close

package/frameworks/project/proj_static.nlg

@@ -26,7 +26,7 @@ closure proj_staticInstance(projman, where, projID, local project) {
     project.name = where.name
     project.where = where
     project.projID = projID
-    project.config = projConfig(projman, where)
+    project.config = projConfig(projman, where, projID)
     
     // create
     //
@@ -62,8 +62,16 @@ closure proj_staticInstance(projman, where, projID, local project) {
     //
     //     Run the project by building and then launching.
     //
-    project.run = closure run(buildonly) {
-        project.config.run(buildonly)
+    project.run = closure run(stage, buildonly) {
+        project.config.run(stage, buildonly)
+    }
+
+    // publish
+    //
+    //     Publish the project according to the stage.
+    //
+    project.publish = closure publish(stage) {
+        project.config.publish(stage)
     }
 
     // close()