@naanlang/naan 1.0.2 → 1.0.5

package/frameworks/storage/psm.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2022 by Richard C. Zulch
  *
  */
 
@@ -75,7 +75,7 @@ closure MakePSMutil(fs, local util) {
         } (tree, inpath.split(tree.data.pathsep).reverse())
         if !treedir
             return (callback(Error("treeDirUpdate: can't find directory within tree", inpath)))
-        `(error, files) = fs.dirList(dirpath, { head: true })
+        `(error, files) = fs.dirList(dirpath, { stat: true })
         if error
             return (callback(error))
         //
@@ -238,46 +238,126 @@ closure MakePSMutil(fs, local util) {
     //
     // Perform a deep copy of an array of sources from the current filesystem and specified inpath to
     // the outfs filesystem and specified outpath. The input path is used to find the source files,
-    // however it is not added to the output. The result is a standard error tuple, where the errors
-    // are an array if  any occur.
+    // however it is not added to the output. If the source array is false then the file or directory
+    // at the input path is copied to the destination. The result is a standard error tuple, where 
+    // the errors are an array if any occur.
+    //
+    // Supported options are:
+    // {
+    //      overwrite:  <boolean>           -- overwrite existing files
+    //      erase:      <boolean>           -- remove extraneous files in destination folders
+    //      force:      <boolean>           -- copy files even if older (default is only copy if new/newer)
+    //      follow:     <boolean>           -- follow links instead of treating them as files
+    //      preserve:   <boolean>           -- preserve file info where possible
+    //                                         (e.g. mtime/atime/mode/uid/gid on NodeJS)
+    // }
+    //
+    // Limitations:
+    //  - this does not copy info about source folders to destination folders
+    //    (it would need to make destination folder writable, then update after files copied)
 
-    util.deepcopy = closure deepcopy(inpath, sources, outfs, outpath, options, callback, local errors, copies) {
+    util.deepcopy = closure deepcopy(inpath, sources, outfs, outpath, options, callback,
+        local errors, copies, fsopt, folders) {
         if !callback
             return (syncAdapter(deepcopy, inpath, sources, outfs, outpath, options))
-        if !array(sources) || !string(inpath) || !string(outpath)
+        if sources && !array(sources) || !string(inpath) || !string(outpath)
             return (callback(Error("deepcopy: invalid arguments")))
+        if options.follow
+            fsopt = { follow: true }
         errors = []
         copies = []
-        sources = new(sources)                                              // don't modify the original!
-        asyncArray(sources, 10, closure mklist(entry, index, elements, local srcpath, destpath, error, folder, node) {
+        folders = { }
+        if sources
+            sources = new(sources)                                          // don't modify the original!
+        else {
+            sources = [fs.path.basename(inpath)]                            // copy inpath itself
+            inpath = fs.path.dirname(inpath)
+        }
+        //
+        // Pass 1 - Get info on all source files, and make destination directories
+        //
+        asyncArray(sources, 10, closure mklist(entry, index, elements,
+            local srcpath, destpath, epath, error, stat, folder, node) {
             srcpath = fs.path.join(inpath, entry)
-            `(error, folder) = fs.dirList(srcpath)
-            if error && error.code != "ENOTDIR"
-                return (errors.push(error))
-            destpath = outfs.path.join(outpath, entry)                      // "." if both empty strings
-            if !error {
-                if destpath != "."
-                    `(error, node) = outfs.mkdir(destpath)                  // may already exist but we don't care
-                if error
-                    return (errors.push(error))                             // don't do children if we can't form destination
-                for node in folder.children
-                    sources.push(fs.path.join(entry, node.name))            // omit inpath from sources
-            }
-            else
-                copies.push({                                               // copy the file 
+            destpath = outfs.path.join(outpath, entry)
+            if destpath == "."
+                destpath = ""                                               // joined empty strings
+            `(error, stat) = fs.info(srcpath, fsopt)
+            if stat.type != "directory" && (!options.follow || stat.type != "symlink") {
+                copies.push({                                               // copy file or symlink 
                     source: srcpath
                     dest: destpath
                 })
+                return (list(false, { ok: true }))                          // generic success not used
+            }
+            `(error, folder) = fs.dirList(srcpath)
+            if error
+                return (errors.push(error))
+            if destpath == ""
+                epath = ""
+            else
+                epath = outfs.path.join(destpath, outfs.path.sep)           // canonical name
+            folders[epath] = folder                                         // sources for this folder
+            `(error, node) = outfs.mkdir(destpath)                          // may already exist but we don't care
+            if error
+                return (errors.push(error))                                 // don't do children if we can't form destination
+            for node in folder.children
+                sources.push(fs.path.join(entry, node.name))                // add more sources, without inpath
         }).wait()
+        //
+        // Pass 2 - erase extraneous files and folders from destination
+        //
+        if options.erase {
+            asyncArray(keys(folders).toarray, 10, closure eraser(destpath, index, elements
+                local error, outfolder, folder, namesin, removes, delopt) {
+                `(error, outfolder) = outfs.dirList(destpath)               // existing files in our destination
+                if error
+                    return
+                folder = folders[destpath]                                  // our source folders, if any
+                namesin = { }
+                for node in folder.children                                 // make list of top-level dest names
+                    namesin[node.name] = true
+                removes = []
+                for node in outfolder.children
+                    if !namesin[node.name] {
+                        if node.info.type == "directory"
+                            delopt = { recursive: true }                    // deleting a directory
+                        else
+                            delopt = false                                  // deleting a file
+                        removes.push(list(outfs.path.join(destpath, node.name), delopt))
+                    }
+                asyncArray(removes, 10, closure cleardest(delitem, local error, data) {
+                    `(error, data) = outfs.delete(delitem.0, delitem.1)
+                    if error
+                        errors.push(Error("deepcopy: can't remove", error))
+                }).wait()
+            }).wait()
+        }
+        //
+        // Pass 3 - copy files and links
+        //
         asyncArray(copies, 10, closure cpfiles(entry, index, elements, local error, data, instat, outstat) {
-            `(error, instat) = fs.info(entry.source)
+            `(error, instat) = fs.info(entry.source, fsopt)
             if !error {
                 `(error, outstat) = outfs.info(entry.dest)
-                if !error && (instat.md5 && instat.md5 == outstat.md5 || instat.mtimeMs <= outstat.mtimeMs)
-                    return                                                  // file unchanged
-                `(error, data) = fs.readFile(entry.source, { encoding: "binary"})
-                if !error
-                    `(error, data) = outfs.writeFile(entry.dest, data, { encoding: "binary"})
+                if !error &&
+                    (instat.md5 && instat.md5 == outstat.md5
+                    || !options.force && instat.mtimeMs <= outstat.mtimeMs)
+                    return                                                  // file "unchanged"
+                if !error && !options.overwrite
+                    error = Error("deepcopy: can't overwrite", entry.dest)
+                else if instat.type == "symlink" && !options.follow {
+                    `(error, data) = fs.readlink(entry.source)
+                    if !error
+                        `(error, data) = outfs.symlink(data, entry.dest)
+                }
+                else {
+                    `(error, data) = fs.readFile(entry.source, { encoding: "binary"})
+                    if !error
+                        `(error, data) = outfs.writeFile(entry.dest, data, { encoding: "binary"})
+                    if !error && options.preserve
+                        `(error) = outfs.setInfo(entry.dest, instat)
+                }
             }
             if error
                 errors.push(error)

package/frameworks/storage/psm_dbtables.nlg

@@ -287,7 +287,7 @@ closure FSview(table, rootpath, local view, error) {
                             })))
                     if buildpath.slice(-1) != "/"
                         buildpath = buildpath.concat("/")
-                    `(error, data) = view.table.get(buildpath)              // get desired directory
+                    `(error, data) = view.table.head(buildpath)             // get desired directory
                     if error.status == 404
                         `(error, data) = dbWriteRecord(buildpath)           // create desired directory
                     if error
@@ -684,8 +684,12 @@ closure FSview(table, rootpath, local view, error) {
                     if !finfo
                         finfo = { }
                     name = item.key.slice(offset)
-                    if name.slice(-1) == "/"
+                    if name.slice(-1) == "/" {
                         name = name.slice(0,-1)                             // remove trailing "/" from directory
+                        if !finfo.type
+                            finfo.type = "directory"
+                    } else if !finfo.type
+                        finfo.type = "file"                                 // everything is a file in UNIX
                     if item.doc._md5
                         finfo.md5 = item.doc._md5
                     if item.doc._length
@@ -703,7 +707,7 @@ closure FSview(table, rootpath, local view, error) {
     // Read a directory at the specified path
     
     view.readir = closure readir(path, callback, local name, dirdict) {
-        dirList(path, { head: true }, callback)
+        dirList(path, { stat: true }, callback)
     }
 
     // tree

package/frameworks/storage/resources.nlg

@@ -11,7 +11,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2019-2021 by Richard C. Zulch
+ * Copyright (c) 2019-2022 by Richard C. Zulch
  *
  */
 
@@ -38,6 +38,21 @@ closure rsrcVault(db, tablename, local vault) {
         vault.table.add(resID, data)
     }
     
+    // updateResource
+    //
+    // Update credentials for accessing a resource, returning the added credential record.
+    
+    vault.updateResource = function updateResource(resID, data, local error, existing) {
+        `(error, existing) = vault.table.get(resID)
+        if error
+            data = false
+        else {
+            existing.content = data
+            `(error, existing) = vault.table.update(existing)
+        }
+        list(error, data)
+    }
+
     // deleteResource
     //
     // Delete resource credentials.
@@ -111,8 +126,9 @@ closure rsrcVault(db, tablename, local vault) {
  *      conn.uifields()                         - entry fields for add this kind of resource in UI
  *      conn.findResource(resource)             - find a resource by content, returning resID or false
  *      conn.addResource(resource)              - add the resource dict and return `(error, resID)
- *      conn.info(resID)                        - return `(error, infoDictionary) tuple
+ *      conn.updateResource(resID, resource)    - update a resource
  *      conn.deleteResource(resID)              - delete the specified resource, returning a tuple
+ *      conn.info(resID)                        - return `(error, infoDictionary) tuple
  *      conn.connect(resID, serviceID, args)    - connect to resource and return object
  *
  */
@@ -309,6 +325,18 @@ closure ResourceTracker(reman, local retor, watch) {
             reman.conns[classID].addResource(resource)
     }
     
+    // updateResource
+    //
+    // Update credentials for accessing a resource, returning the added credential record.
+    
+    retor.updateResource = function updateResource(resID, resource, local error, classI) {
+        `(error, classID) = resourceClassID(resID)
+        if error
+            list(error)
+        else
+            reman.conns[classID].updateResource(resID, resource)
+    }
+
     // getResource
     //
     // Get a resource for the resID as a standard result tuple.

package/lib/browser/env_web.js

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2021 by Richard C. Zulch
+ * Copyright (c) 2017-2022 by Richard C. Zulch
  *
  */
 
@@ -74,15 +74,19 @@ exports.NaanControllerWeb = function() {
     //
  
     var naanlib = new exports.Naanlib();
+    var dontSaveUntilWorking;                                               // true when state loaded, must be reset to save state again
     var contSelf = this;                                                    // this is us, for access within nested functions
     exports.naancon = this;                                                 // access to this instance
     contSelf.anaan = naanlib.js.n;
     naanlib.js.t = contSelf;
+    naanlib.js.q = querystrings;
     var replstate;                                                          // latest known state of the REPL
     var naanstate;                                                          // desired state for the interpreter
     var replqueue;                                                          // text destined for terminal when opened
     var termlist = [];                                                      // list of terminals currently attached
+    contSelf.termlist = termlist;
     var prefs = { };
+    var vsiteName;
 
     //
     // termTextOut
@@ -149,8 +153,15 @@ exports.NaanControllerWeb = function() {
     //
     
     this.StateGet = function StateGet() {
-        if (termlist.length > 0)
-            replstate = termlist[0].StateSave();                            // restore current buffer state to new terminal
+        termlist.every(function(term) {
+            var state;
+            if (term.StateSave && (state = term.StateSave()))
+            {                                                               // update the state if we can
+                replstate = state;
+                return (false);
+            }
+            return (true);                                                  // keep searching
+        });
         return (replstate);
     };
 
@@ -204,14 +215,14 @@ exports.NaanControllerWeb = function() {
             if (term !== terminal)
                 term.OnMessage({                                            // send text to other terminals
                     id: "textout",
-                    text: text + "\r\n"
+                    text: "\x1b[90m\x1b[3m" + text + "\x1b[0m" + "\r\n"
                 });
         });
         window.setTimeout(function () {
-            naanlib.textLine(text)
+            naanlib.textLine(text);
         }, 1);
     };
-                
+
     this.ReplyMessage = function ReplyMessage(data) {                       // "remote" -> "local"
         termlist.forEach(function(term) {
             if (term.OnMessageOut)
@@ -229,9 +240,9 @@ exports.NaanControllerWeb = function() {
     this.DispatchMessage = function DispatchMessage(data) {                 // "local" -> "remote"
         if (nideListener)
             setTimeout(function() {
-                nideListener(data)
+                nideListener(data);
             }, 1);
-    }
+    };
 
     this.ReplyDebugger = function ReplyDebugger(data) {                     // "remote" -> "local"
         termlist.forEach(function(term) {
@@ -250,9 +261,9 @@ exports.NaanControllerWeb = function() {
     this.DispatchDebugger = function DispatchDebugger(data) {               // "local" -> "remote"
         if (debugListener)
             setTimeout(function() {
-                debugListener(data)
+                debugListener(data);
             }, 1);
-    }
+    };
 
     //
     // Status
@@ -290,7 +301,95 @@ exports.NaanControllerWeb = function() {
     this.Dimensions = function Dimensions(rows, cols) {
         console.log("Naan terminal dimensions now (" + rows + ", " + cols + ")");
     };
+    
+    //
+    // VsiteRefresh
+    //
+    // Check if our underlying data has changed, and reload if needed.
+    //
+    
+    this.VsiteRefresh = function VsiteRefresh(url_origin) {
+        if (window.location.href.startsWith(url_origin))
+            window.location.reload();                                       // we have changed underneath
+    };
+
+
+    //==========================================================================
+    // Clone Debug Interface
+    //--------------------------------------------------------------------------
+
+    function CloneDebugTerminal()
+    {
+        var termSelf = this;
+        //
+        // listen for messages
+        //
+        window.addEventListener("message", function (event) {
+            if (event.origin !== window.origin)
+                return;                                                     // only talk with our peers
+            var msg = event.data;
+            if (msg.id == "interrupt")
+                contSelf.Interrupt();
+            else if (msg.id == "keyline")
+                contSelf.Return(msg.text, termSelf);                        // keyboard text from terminal
+            else if (msg.id == "start")
+                contSelf.Attach(term);                                      // opener is ready
+            else if (msg.id == "import")
+            {                                                               // for workers
+            }
+            else if (msg.id == "targetin")
+            {
+                if (nideListener)
+                    nideListener(msg.data);                                 // target received a message
+            }
+            else if (msg.id == "debugin")
+            {
+                if (debugListener)
+                    debugListener(msg.data);                                // target received a message
+            }
+        });
+        
+        //
+        // report messages back to opener
+        //
+        termSelf.OnMessage = function OnMessage(msg) {
+            window.opener.postMessage(msg, window.origin);
+            return (msg);
+        };
+                
+        //
+        // report messages back to opener
+        //
+        termSelf.OnMessageOut = function OnMessageOut(data) {
+            var msg = {                                                       // target is sending debug data
+                id: "targetout",
+                data: data
+            };
+            return (termSelf.OnMessage(msg));
+        };
 
+        //
+        // report debug messages back to opener
+        //
+        termSelf.OnDebugOut = function OnDebugOut(data) {
+            var msg = {                                                       // target is sending debug data
+                id: "debugout",
+                data: data
+            };
+            return (termSelf.OnMessage(msg));
+        };
+        
+        //
+        // report status back to opener
+        //
+        termSelf.OnStatus = function OnStatus(status) {
+            var msg = {                                                       // target is sending debug data
+                id: "status",
+                status: status
+            };
+            return (termSelf.OnMessage(msg));
+        };
+    }
  
     //==========================================================================
     // Host Environment
@@ -299,7 +398,7 @@ exports.NaanControllerWeb = function() {
     //
     // SavePref
     //
-    // Save a persistent preference objectc that can be retrieved in the future.
+    // Save a persistent preference object that can be retrieved in the future.
     //
     
     this.SavePref = function SavePref(key, value) {
@@ -315,6 +414,16 @@ exports.NaanControllerWeb = function() {
     this.LoadPref = function LoadPref(key) {
         return (prefs[key]);
     };
+    
+    //
+    // Working
+    //
+    // The application is working, so it is safe to save state.
+    //
+    
+    this.Working = function Working() {
+        dontSaveUntilWorking = false;
+    };
  
     var saveEvent = new Event("NaanSave");
  
@@ -333,6 +442,7 @@ exports.NaanControllerWeb = function() {
     window.addEventListener("unload", function (e) {
         window.dispatchEvent(saveEvent);
         saveLocal();
+        virtualClose();
     });
  
     window.addEventListener("beforeunload", function (e) {
@@ -345,14 +455,14 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.2-1";
+        statedoc.verstring = "1.0.5-1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
-        statedoc.naan = naanlib.saveState(true);                            // true to optimize, which is a bit slower
+        statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
         termlist.forEach(function(term) {
             if (!replstate || term.termwin)
                 replstate = term.StateSave();                               // state with separate window, otherwise any state
-        })
+        });
         if (replstate)
             statedoc.replstate = replstate;
         return (statedoc);
@@ -363,8 +473,11 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.2-1")
+            || statedoc.verstring != "1.0.5-1")
+        {
+            localStorage.removeItem("NaanState_Hosted");
             return (false);
+        }
         naanstate = statedoc.naan;
         replstate = statedoc.replstate;                                     // get terminal state, if any
         if (typeof(statedoc.prefs) == "object")
@@ -374,6 +487,10 @@ exports.NaanControllerWeb = function() {
  
     function saveLocal() {
         /*jshint sub:true */
+        if (dontSaveUntilWorking) {                                         // saved state is problematic
+            localStorage.removeItem("NaanState_Hosted");
+            return (false);
+        }
         if (querystrings["nosave"])
             return (false);
         var statedoc = makeState();
@@ -381,8 +498,8 @@ exports.NaanControllerWeb = function() {
         try {
             if ("localStorage" in window && window["localStorage"] !== null)
             {
-                localStorage.removeItem("NaanState_Nide");
-                if (localStorage.setItem("NaanState_Nide", statestr) !== undefined)
+                localStorage.removeItem("NaanState_Hosted");
+                if (localStorage.setItem("NaanState_Hosted", statestr) !== undefined)
                     return (true);
             }
         } catch(e) {
@@ -396,7 +513,8 @@ exports.NaanControllerWeb = function() {
             /*jshint sub:true */
             if ("localStorage" in window && window["localStorage"] !== null)
             {
-                var statestr = localStorage.getItem("NaanState_Nide");
+                var statestr = localStorage.getItem("NaanState_Hosted");
+                dontSaveUntilWorking = true;
                 if (statestr)
                     return (loadState(JSON.parse(statestr)));
             }
@@ -405,7 +523,30 @@ exports.NaanControllerWeb = function() {
         }
         return (false);
     }
+        
+    function virtualOpen() {
+        vsiteName = window.document.title;                                  // consistent name at open and close
+        if (window.opener && window.opener.Naanlang)
+            window.opener.Naanlang.naancon.DispatchMessage({
+                op: "VsiteOpen",
+                name: vsiteName,
+                naancont: contSelf,
+                title: vsiteName + " 1.0.5-1"
+            });
+    }
     
+    function virtualClose() {
+        if (window.opener && window.opener.Naanlang) {
+            window.opener.Naanlang.naancon.DispatchMessage({
+                op: "VsiteClose",
+                name: vsiteName,
+                naancont: contSelf,
+                title: vsiteName + " 1.0.5-1"
+            });
+            termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+        }
+    }
+
     /*jshint sub:true */
     if (querystrings["restart"] || !loadLocal())
     {                                                                       // don't load state or can't load state
@@ -419,8 +560,17 @@ exports.NaanControllerWeb = function() {
             naanlib.banner();
             naanlib.textLine("print();;\n");
         }
-        naanlib.start({
-            state: naanstate
+        if (!naanlib.start({ state: naanstate })) {                         // state loading failed
+            localStorage.removeItem("NaanState_Hosted");
+            window.location.reload();
+        }
+    }
+
+    if (window.opener) {
+        virtualOpen();
+        var term = new CloneDebugTerminal();
+        term.OnMessage({
+            id: "loaded"
         });
     }
 };

package/lib/browser/env_webworker.js

@@ -17,7 +17,7 @@
  */
 
 importScripts(
-                                                           // remove "_omit" for debugging
+    
     "lib/core/naanlib.js"
 );
 

package/lib/browser/require.js

@@ -1183,7 +1183,7 @@ exports.require = function require(modpath) {
         resolve: function resolve() {
             var resolvedPath = '';
             var resolvedAbsolute = false;
-            var cwd;
+            var cwd = "";                                                   // more or less the current dir
     
             for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
                 var path;