@naanlang/naan 1.0.7 → 1.0.9

package/frameworks/storage/dbt_pouch.nlg

@@ -7,7 +7,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2017-2021 by Richard C. Zulch
+ * Copyright (c) 2017-2023 by Richard C. Zulch
  *
  */
 

package/frameworks/storage/psm.nlg

@@ -248,8 +248,8 @@ closure MakePSMutil(fs, local util) {
     //      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)
+    //      idmode:     <boolean>           -- preserve id/mode where possible
+    //      times:      <boolean>           -- preserve time where possible
     // }
     //
     // Limitations:
@@ -336,7 +336,8 @@ closure MakePSMutil(fs, local util) {
         //
         // Pass 3 - copy files and links
         //
-        asyncArray(copies, 10, closure cpfiles(entry, index, elements, local error, data, instat, outstat) {
+        asyncArray(copies, 10, closure cpfiles(entry, index, elements, 
+            local error, data, dest, instat, outstat) {
             `(error, instat) = fs.info(entry.source, fsopt)
             if !error {
                 `(error, outstat) = outfs.info(entry.dest)
@@ -348,6 +349,13 @@ closure MakePSMutil(fs, local util) {
                     error = Error("deepcopy: can't overwrite", entry.dest)
                 else if instat.type == "symlink" && !options.follow {
                     `(error, data) = fs.readlink(entry.source)
+                    if !error {
+                        `(error, dest) = outfs.readlink(entry.dest)         // get destination to compare links
+                        if dest == data
+                            return                                          // symlink unchanged
+                        outfs.delete(entry.dest)
+                        error = false                                       // ignore any destination errors
+                    }
                     if !error
                         `(error, data) = outfs.symlink(data, entry.dest)
                 }
@@ -355,8 +363,16 @@ closure MakePSMutil(fs, local util) {
                     `(error, data) = fs.readFile(entry.source, { encoding: "binary"})
                     if !error
                         `(error, data) = outfs.writeFile(entry.dest, data, { encoding: "binary"})
-                    if !error && options.preserve
+                    if !error && (options.idmode || options.times) {
+                        if !options.idmode
+                            instat.mode = instat.uid = instat.gid = false
+                        if !options.times {
+                            instat.mtimeMs = instat.mtime = false
+                            instat.nodejs_stat.mtimeMs = instat.nodejs_stat.mtime = false
+                            instat.nodejs_stat.atimeMs = instat.nodejs_stat.atime = false
+                        }
                         `(error) = outfs.setInfo(entry.dest, instat)
+                    }
                 }
             }
             if error
@@ -380,7 +396,7 @@ closure MakePSMutil(fs, local util) {
  *
  */
 
-closure MakePSM(dbname, local psm) {
+closure MakePSM(dbname) {
     ResourceManager(dbname, "PSM_locations/")
 };
 

package/frameworks/storage/psm_dbtables.nlg

@@ -6,7 +6,7 @@
  *
  * column positioning:                          //                          //                      !
  *
- * Copyright (c) 2020-2021 by Richard C. Zulch
+ * Copyright (c) 2020-2023 by Richard C. Zulch
  *
  */
 
@@ -36,7 +36,7 @@
  *
  */
 
-closure FSview(table, rootpath, local view, error) {
+closure FSview(table, rootpath, local view) {
     if !table
         return (list(Error("invalid arguments")))
     view = new(object, this)
@@ -676,7 +676,7 @@ closure FSview(table, rootpath, local view, error) {
             }
             children: []
         }
-        dbDirRecords(path, false, function(error, data, local item, result, slashdex, offset, finfo) {
+        dbDirRecords(path, false, function(error, data, local item, slashdex, offset, finfo) {
             if error
                 return (callback(error))
             if data.rows.length == 0 && path != ""
@@ -716,7 +716,7 @@ closure FSview(table, rootpath, local view, error) {
     //
     // Read a directory at the specified path
     
-    view.readir = closure readir(path, callback, local name, dirdict) {
+    view.readir = closure readir(path, callback) {
         dirList(path, { stat: true }, callback)
     }
 

package/frameworks/storage/resources.nlg

@@ -181,9 +181,10 @@ closure ResourceManager(dbname, prefix, local reman, watch, result) {
     //
     // Return an array of labels for the registered connectors.
     reman.labels = function labels(local classID, labels) {
+        debuglog("ResourceManager.labels is broken")
         labels = []
         for remanID in reman.conns.*
-            labels.push(reman.conns[classID].label)
+            labels.push(reman.conns[classID].label)                         // ### classID?
         labels
     }
         
@@ -329,7 +330,7 @@ closure ResourceTracker(reman, local retor, watch) {
     //
     // Update credentials for accessing a resource, returning the added credential record.
     
-    retor.updateResource = function updateResource(resID, resource, local error, classI) {
+    retor.updateResource = function updateResource(resID, resource, local error, classID) {
         `(error, classID) = resourceClassID(resID)
         if error
             list(error)

package/lib/browser/env_web.js

@@ -311,11 +311,73 @@ exports.NaanControllerWeb = function() {
     this.VsiteRefresh = function VsiteRefresh(url_origin) {
         if (vsiteName && window.location.href.startsWith(url_origin)) {
             window.location.reload();                                       // we have changed underneath
+            window.scroll(0,0);                                             // Chrome 106 had flood pants 🤓
             return (true);
         }
         return (false);
     };
 
+    //==========================================================================
+    // Browser Console Terminal
+    //--------------------------------------------------------------------------
+    
+    // Commands:
+    //      Naanlang.debug(<text>)          -- command line text entry
+    //      Naanlang.int()                  -- interrupt and enter debugger
+    //      Naanlang.detach()               -- close the console terminal
+
+    var conDebTerm;
+
+    //
+    // ConsoleDebugTerminal
+    //
+    function ConsoleDebugTerminal() {
+        var termSelf = this;
+        //
+        // OnMessageOut
+        //
+        this.OnMessage = function OnMessage(msg) {
+            if (msg.id == "debugtext")
+                console.log("dbug-" + msg.level + " " + msg.text);
+            else if (msg.id == "textout")
+                console.log(msg.text);
+        };
+        //
+        // cmd
+        //
+        this.cmd = function cmd(keys) {
+            keys = keys.trim();
+            contSelf.Return(keys + "\n", termSelf);
+            return (keys);
+        };
+        //
+        // int
+        //
+        this.int = function int() {
+            contSelf.Interrupt();
+        };
+    }
+    
+    //
+    // debug
+    //
+    function debug(text) {
+        if (!conDebTerm) {
+            conDebTerm = new ConsoleDebugTerminal();
+            contSelf.Attach(conDebTerm);
+        }
+        exports.debug = conDebTerm.cmd;
+        exports.int = conDebTerm.int;
+        exports.detach = function() {
+            contSelf.Detach(conDebTerm);
+            exports.debug = debug;
+            exports.int = undefined;
+            exports.detach = undefined;
+            conDebTerm = false;
+        };
+        return (conDebTerm.cmd(text));
+    }
+    exports.debug = debug;
 
     //==========================================================================
     // Clone Debug Interface
@@ -458,7 +520,7 @@ exports.NaanControllerWeb = function() {
         statedoc.curversion = kStateCurrentVersion;
         statedoc.firstver = kStateFirstVersion;
         statedoc.licensee = "MIT-License";
-        statedoc.verstring = "1.0.7+1";
+        statedoc.verstring = "1.0.9+1";
         statedoc.date = new Date().toISOString();
         statedoc.prefs = prefs;
         statedoc.naan = naanlib.saveState(false);                           // true to optimize, which is a bit slower
@@ -476,7 +538,7 @@ exports.NaanControllerWeb = function() {
             || statedoc.firstver > kStateCurrentVersion
             || statedoc.curversion < kStateFirstVersion
             || statedoc.licensee != "MIT-License"
-            || statedoc.verstring != "1.0.7+1")
+            || statedoc.verstring != "1.0.9+1")
         {
             localStorage.removeItem("NaanState_Hosted");
             return (false);
@@ -528,27 +590,34 @@ exports.NaanControllerWeb = function() {
     }
         
     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.7+1"
-            });
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                vsiteName = window.document.title;                          // consistent name at open and close
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteOpen",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " 1.0.9+1"
+                });
+            }
+        } catch (e) {
+        }
     }
     
     function virtualClose() {
-        if (window.opener && window.opener.Naanlang) {
-            window.opener.Naanlang.naancon.DispatchMessage({
-                op: "VsiteClose",
-                name: vsiteName,
-                naancont: contSelf,
-                title: vsiteName + " 1.0.7+1"
-            });
-            vsiteName = false;                                              // window is going away
-            termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+        try {
+            if (window.opener && window.opener.Naanlang) {
+                window.opener.Naanlang.naancon.DispatchMessage({
+                    op: "VsiteClose",
+                    name: vsiteName,
+                    naancont: contSelf,
+                    title: vsiteName + " 1.0.9+1"
+                });
+                termTextOut("\x1b[90m\x1b[3m".concat("\nwindow closed", "\x1b[0m\n"));
+            }
+        } catch (e) {
         }
+        vsiteName = false;                                                  // window is going away
     }
 
     /*jshint sub:true */
@@ -557,8 +626,8 @@ exports.NaanControllerWeb = function() {
         naanlib.banner();
         var hostpath = naanlib.js.r("path").dirname(window.location.href);
         naanlib.start({
-            cmd: 'App.version = "1.0.7+1";;\r\n'
-                + 'App.cache = "cb-1.0.7+1";;\r\n'
+            cmd: 'App.version = "1.0.9+1";;\r\n'
+                + 'App.cache = "56a3661c1caa5c6ed3781ffcad84acf4";;\r\n'
                 + 'Naan.module.requireQuery({ naanver: App.cache });;\r\n'
                 + 'Naan.module.webparse("naan_init.nlg", "' + hostpath + '", { naanver: App.cache });;\r\n'
         });