filefive 2.0.2 → 3.0.0

package/dist/queues/Duplicate.js

@@ -7,7 +7,7 @@ const Copy_1 = __importDefault(require("./Copy"));
 const types_1 = require("../types");
 class DuplicateQueue extends Copy_1.default {
     constructor(connId, src, dest, filter, onState, onConflict, onError, onComplete, watcher) {
-        super(connId, src, dest, filter, null, onState, onConflict, onError, onComplete, watcher, false);
+        super(connId, src, dest, filter, undefined, onState, onConflict, onError, onComplete, watcher, false);
         this.newNames = new Map();
         this.resolve({ type: types_1.QueueActionType.Rename }, true);
     }

package/dist/queues/Queue.js

@@ -23,7 +23,7 @@ const lsRemote = (connId) => {
             const [conn, close] = await Connection_1.default.transmit(connId);
             conn.ls(path)
                 .then(resove)
-                .catch(() => resove(null))
+                .catch(() => resove([]))
                 .finally(() => close());
         });
         cache.set(path, list);
@@ -90,10 +90,10 @@ class TransmitQueue {
     }
     async enqueue(paths, dest) {
         const ls = this.ls(this.from);
-        let matchFilter = (file) => true;
+        let matchesFilter = (file) => true;
         if (this.filter) {
-            const re = (0, filter_1.filterRegExp)(this.filter);
-            matchFilter = (file) => {
+            const nameMatchesFilter = (0, filter_1.buildFilterPredicate)(this.filter);
+            matchesFilter = (file) => {
                 if (this.filter.ignored === true && 'git_i' in file.attributes) {
                     return false;
                 }
@@ -104,11 +104,7 @@ class TransmitQueue {
                         'git_c' in file.attributes)) {
                     return false;
                 }
-                if (!re) {
-                    return true;
-                }
-                const found = re.exec(file.name);
-                return this.filter?.invert ?? false ? found === null : found !== null;
+                return nameMatchesFilter(file.name);
             };
         }
         paths = paths.map(posix_1.normalize).filter(path => !paths.find(ancestor => path.startsWith(ancestor + posix_1.sep)));
@@ -120,10 +116,10 @@ class TransmitQueue {
             const from = (await ls(parent))?.find((0, ramda_1.whereEq)({ path }));
             if (from) {
                 if (from.dir) {
-                    return Promise.all((await ls(from.path))?.map(child => add(child.path, to, [...dirs, (0, posix_1.basename)(path)])));
+                    return Promise.all((await ls(from.path))?.map(child => add(child.path, to, [...dirs, (0, posix_1.basename)(path)])) ?? []);
                 }
                 else {
-                    if (matchFilter(from)) {
+                    if (matchesFilter(from)) {
                         this.queue.push({ from, to, dirs });
                         this.totalCnt++;
                         this.totalSize += from.size;
@@ -131,7 +127,9 @@ class TransmitQueue {
                 }
             }
         };
-        await Promise.all(paths.map(path => add(path, dest, this.fromRoot ? (0, posix_1.dirname)(path).substring(this.fromRoot.length + 1).split('/') : [])));
+        await Promise.all(paths.map(path => add(path, dest, this.fromRoot
+            ? (0, posix_1.dirname)(path).substring(this.fromRoot.length + 1).split('/')
+            : [])));
     }
     stop() {
         if (!this.stopped) {
@@ -197,7 +195,7 @@ class TransmitQueue {
     putOnHold(src, dirs, to, dest) {
         this.pending.push({ src, dirs, to, dest });
         if (this.pending.length == 1) {
-            this.onConflict(src, dest);
+            setTimeout(() => this.onConflict(src, dest));
         }
     }
     ls(connId) {
@@ -214,7 +212,7 @@ class TransmitQueue {
             return (path) => Promise.resolve((0, Local_1.stat)(path));
         }
         const ls = this.ls(connId);
-        return async (path) => (await ls((0, posix_1.dirname)(path)))?.find((0, ramda_1.whereEq)({ path }));
+        return async (path) => (await ls((0, posix_1.dirname)(path)))?.find((0, ramda_1.whereEq)({ path })) ?? null;
     }
     async rename(name, dir) {
         let { name: oldName, ext } = (0, posix_1.parse)(name);

package/dist/queues/Remove.js

@@ -19,7 +19,9 @@ class RemoveQueue {
         this.stopped = false;
     }
     async create() {
-        const paths = this.paths.map(posix_1.normalize).filter(path => !this.paths.find(ancestor => path.startsWith(ancestor + posix_1.sep)));
+        const paths = this.paths
+            .map(posix_1.normalize)
+            .filter(path => !this.paths.find(ancestor => path.startsWith(ancestor + posix_1.sep)));
         let totalCnt = 0;
         let doneCnt = 0;
         const ls = (0, Queue_1.lsRemote)(this.connId);

package/dist/transformers/git.js

@@ -1,27 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+exports.getRoot = getRoot;
+exports.getStatuses = getStatuses;
+exports.getIgnoredList = getIgnoredList;
 const node_util_1 = require("node:util");
 const node_child_process_1 = require("node:child_process");
 const posix_1 = require("node:path/posix");
 const types_1 = require("../types");
 const Local_1 = require("../Local");
 const ramda_1 = require("ramda");
+const run = (0, node_util_1.promisify)(node_child_process_1.execFile);
 async function default_1(path, files) {
-    const run = (0, node_util_1.promisify)(node_child_process_1.execFile);
     try {
-        let { stdout: repoRoot } = await run('git', ['rev-parse', '--show-toplevel'], { cwd: (0, Local_1.osify)(path) });
-        repoRoot = (0, Local_1.unosify)(repoRoot.trim());
-        const { stdout: statuses } = await run('git', ['status', '-z', '.'], { cwd: (0, Local_1.osify)(path) });
-        const [inRoot, inSubfolders] = (0, ramda_1.partition)(([p]) => (0, posix_1.dirname)(p) == path, (0, Local_1.unosify)(statuses)
-            .replace(/\0$/, '')
-            .split('\0')
-            .map(s => [(0, posix_1.join)(repoRoot, s.substring(3)), s.substring(0, 2)])
-            .map(([path, status]) => [path.replace(/\/$/, ''), status]));
+        const repoRoot = await getRoot(path);
+        const ignored = await getIgnoredList(path);
+        if (ignored === null) {
+            files.forEach(f => f[types_1.FileAttrsAttr][GitStatus.Ignored] = statusNames[GitStatus.Ignored]);
+        }
+        else {
+            ignored.forEach(path => {
+                const f = files.find(f => f.path == path);
+                f && (f[types_1.FileAttrsAttr][GitStatus.Ignored] = statusNames[GitStatus.Ignored]);
+            });
+        }
+        const [inRoot, inSubfolders] = (0, ramda_1.partition)(([p]) => (0, posix_1.dirname)(p) == path, await getStatuses(path, repoRoot));
         if (inSubfolders.length == 1 && inSubfolders[0][0] == path && inSubfolders[0][1].includes('?')) {
             files.forEach(f => {
-                const status = f.dir ? GitStatus.Contains : GitStatus.Untracked;
-                f[types_1.FileAttrsAttr][status] = statusNames[status];
+                if (!(GitStatus.Ignored in f[types_1.FileAttrsAttr])) {
+                    const status = f.dir ? GitStatus.Contains : GitStatus.Untracked;
+                    f[types_1.FileAttrsAttr][status] = statusNames[status];
+                }
             });
         }
         else {
@@ -33,33 +42,50 @@ async function default_1(path, files) {
             ].forEach(([path, status]) => {
                 const f = files.find(f => f.path == path);
                 if (f) {
-                    if (f.dir) {
-                        status = GitStatus.Contains;
+                    if (!(GitStatus.Ignored in f[types_1.FileAttrsAttr])) {
+                        if (f.dir) {
+                            status = GitStatus.Contains;
+                        }
+                        f[types_1.FileAttrsAttr][status] = status ? (statusNames[status] ?? '') : '';
                     }
-                    f[types_1.FileAttrsAttr][status] = status ? (statusNames[status] ?? '') : '';
                 }
             });
         }
-        const { stdout: ignored } = await run('git', ['ls-files', '--others', '--ignored', '--exclude-standard', '--directory', '-z'], { cwd: (0, Local_1.osify)(path) });
-        if (ignored == './\0') {
-            files.forEach(f => f[types_1.FileAttrsAttr][GitStatus.Ignored] = statusNames[GitStatus.Ignored]);
-        }
-        else {
-            (0, Local_1.unosify)(ignored)
-                .replace(/\0$/, '')
-                .split('\0')
-                .map(s => (0, posix_1.join)(path, s.replace(/\/$/, '')))
-                .forEach(path => {
-                const f = files.find(f => f.path == path);
-                f && (f[types_1.FileAttrsAttr][GitStatus.Ignored] = statusNames[GitStatus.Ignored]);
-            });
-        }
     }
     catch {
         // either path is not in git repo or no git installed
     }
     return files;
 }
+async function getRoot(path) {
+    const { stdout: repoRoot } = await run('git', ['rev-parse', '--show-toplevel'], { cwd: (0, Local_1.osify)(path) });
+    return (0, Local_1.unosify)(repoRoot.trim());
+}
+async function getStatuses(path, repoRoot) {
+    const { stdout: statuses } = await run('git', ['status', '-z', '.'], { cwd: (0, Local_1.osify)(path) });
+    return statuses.length
+        ? statuses
+            .replace(/\0$/, '')
+            .split('\0')
+            .map(s => [(0, posix_1.join)(repoRoot, s.substring(3)), s.substring(0, 2)])
+            .map(([path, status]) => [path.replace(/\/$/, ''), status])
+        : [];
+}
+async function getIgnoredList(path) {
+    try {
+        const { stdout: ignored } = await run('git', ['ls-files', '--others', '--ignored', '--exclude-standard', '--directory', '-z'], { cwd: (0, Local_1.osify)(path) });
+        if (ignored == './\0') {
+            return null;
+        }
+        return ignored
+            .replace(/\0$/, '')
+            .split('\0')
+            .map(s => (0, posix_1.join)(path, s.replace(/\/$/, '')));
+    }
+    catch (e) {
+        return null; // deep in ignored subfolders
+    }
+}
 var GitStatus;
 (function (GitStatus) {
     GitStatus["Untracked"] = "git_u";

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FailureType = exports.QueueActionType = exports.QueueEventType = exports.QueueType = exports.SortOrder = exports.FileAttrsAttr = exports.FileState = exports.FileStateAttr = exports.LocalFileSystemID = void 0;
+exports.MirrorEventType = exports.FailureType = exports.QueueActionType = exports.QueueEventType = exports.QueueType = exports.SortOrder = exports.FileAttrsAttr = exports.FileState = exports.FileStateAttr = exports.LocalFileSystemID = void 0;
 exports.LocalFileSystemID = 'file://';
 exports.FileStateAttr = Symbol.for('state');
 var FileState;
@@ -45,4 +45,12 @@ var FailureType;
     FailureType["RemoteError"] = "remote-error";
     FailureType["APIError"] = "api-error";
     FailureType["Warning"] = "warning";
+    FailureType["Info"] = "info";
+    FailureType["UpdateAvailable"] = "update-available";
 })(FailureType || (exports.FailureType = FailureType = {}));
+var MirrorEventType;
+(function (MirrorEventType) {
+    MirrorEventType["Create"] = "create";
+    MirrorEventType["Syncing"] = "syncing";
+    MirrorEventType["Complete"] = "complete";
+})(MirrorEventType || (exports.MirrorEventType = MirrorEventType = {}));

package/dist/utils/ReferenceCountMap.js

@@ -52,9 +52,9 @@ class default_1 {
         if (!this.entries.has(from)) {
             return;
         }
-        this.entries.has(to) ?
-            this.entries.get(to).count += this.entries.get(from).count :
-            this.entries.set(to, this.entries.get(from));
+        this.entries.has(to)
+            ? this.entries.get(to).count += this.entries.get(from).count
+            : this.entries.set(to, this.entries.get(from));
         this.entries.delete(from);
     }
 }

package/dist/utils/URI.js

@@ -24,7 +24,7 @@ function connectionID(scheme, user, host, port) {
 // https://jsdom.github.io/whatwg-url/#url=bmF0czovL2xvY2FsaG9zdDo0MjAwLw==&base=ZmlsZTovLy8=
 function parseURI(uri) {
     const { protocol, pathname, username, hostname, port: p } = new whatwg_url_1.URL(uri);
-    const port = p ? parseInt(p) : defaultPort(protocol.slice(0, -1));
+    const port = p ? parseInt(p) : defaultPort(protocol.slice(0, -1)) ?? 0;
     return {
         id: connectionID(protocol.slice(0, -1), username, hostname, port),
         scheme: protocol.slice(0, -1),
@@ -36,6 +36,9 @@ function parseURI(uri) {
 }
 function createURI(id, path) {
     const u = (0, whatwg_url_1.parseURL)(id);
+    if (!u) {
+        throw new Error(`Invalid URL: ${id}`);
+    }
     u.path = path;
     if (!u.port) {
         u.port = defaultPort(u.scheme);
@@ -50,6 +53,5 @@ function defaultPort(protocol) {
         case 'http': return 80;
         case 'https': return 443;
     }
-    console.error(`Default port for ${protocol} is not defined`);
-    return null;
+    throw new Error(`Defaul port for protocol ${protocol} is not defined`);
 }

package/dist/utils/filter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterRegExp = filterRegExp;
+exports.buildFilterPredicate = buildFilterPredicate;
 function escapeRegExp(s) {
     let re = s.replace(/[/\-\\^$+.()|[\]{}]/g, '\\$&');
     re = re.replaceAll('*', '.*');
@@ -22,3 +23,33 @@ function filterRegExp(settings) {
         return null;
     }
 }
+const tmpRe = new RegExp('^(?:' +
+    String.raw `.*~|` +
+    String.raw `.*\.(?:tmp|temp|bak|old|orig|save|swp|swo|swn|part|crdownload|download|dmp|core)|` +
+    String.raw `[._].*\.sw[a-z]|` +
+    String.raw `.*\.un~|` +
+    String.raw `\.#.*|` +
+    String.raw `#.*#|` +
+    String.raw `\.~.*#|` +
+    String.raw `\.goutputstream-.*|` +
+    String.raw `\._.*|\.DS_Store|\.Trashes|\.Spotlight-V100|\.fseventsd|\.TemporaryItems|\.DocumentRevisions-V100|Thumbs\.db|ehthumbs\.db|` +
+    String.raw `core(?:\..*)?` +
+    ')$');
+function buildFilterPredicate(settings) {
+    const nameRe = filterRegExp(settings);
+    return (name) => {
+        if (settings.hidden
+            && name.startsWith('.')) {
+            return false;
+        }
+        if (settings.temporary
+            && tmpRe.test(name)) {
+            return false;
+        }
+        if (!nameRe) {
+            return true;
+        }
+        const matched = nameRe.test(name);
+        return settings.invert ? !matched : matched;
+    };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "filefive",
   "description": "SFTP/FTP/Amazon S3 client and dual-panel file manager for macOS and Linux",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "license": "GPL-3.0",
   "author": "Max Miroshnikov",
   "bin": {
@@ -28,47 +28,50 @@
     "bin/"
   ],
   "scripts": {
-    "dev": "NODE_ENV=development nodemon src/index.ts",
+    "dev": "NODE_ENV=development nodemon --exec tsx src/index.ts",
     "build": "./scripts/build.sh",
     "start": "node dist/index.js",
     "test": "jest tests",
     "lint": "eslint",
-    "publish": "tsc -p . && npm publish"
+    "publish": "tsc -p . && npm publish",
+    "checkupdates": "npx npm-check-updates",
+    "up": "npx npm-check-updates -u && yarn install"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1002.0",
-    "chalk": "^5.6.2",
-    "commander": "^14.0.3",
+    "@aws-sdk/client-s3": "^3.1100.0",
+    "chalk": "^6.0.0",
+    "commander": "^15.0.0",
     "express": "^5.2.1",
     "ftp": "^0.3.10",
-    "multer": "^2.1.1",
+    "multer": "^2.2.0",
     "open": "^11.0.0",
+    "p-limit": "^7.3.2",
     "ramda": "^0.32.0",
     "rxjs": "^7.8.2",
     "ssh2": "^1.17.0",
     "trash": "^10.1.1",
-    "whatwg-url": "^16.0.1",
-    "ws": "^8.19.0"
+    "whatwg-url": "^17.1.0",
+    "ws": "^8.21.1"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@types/express": "^5.0.6",
     "@types/ftp": "^0.3.36",
     "@types/jest": "^30.0.0",
-    "@types/multer": "^2.0.0",
-    "@types/node": "^25.3.3",
-    "@types/ramda": "^0.31.1",
+    "@types/multer": "^2.2.0",
+    "@types/node": "^26.1.2",
+    "@types/ramda": "^0.32.0",
     "@types/ssh2": "^1.15.5",
     "@types/whatwg-url": "^13.0.0",
     "@types/ws": "^8.18.1",
-    "dotenv": "^17.3.1",
-    "eslint": "^10.0.2",
-    "jest": "^30.2.0",
+    "dotenv": "^17.4.2",
+    "eslint": "^10.8.0",
+    "jest": "^30.4.2",
     "nodemon": "^3.1.14",
-    "ts-jest": "^29.4.6",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.1"
+    "ts-jest": "^29.4.12",
+    "tsx": "^4.23.1",
+    "typescript": "^7.0.2",
+    "typescript-eslint": "^8.65.0"
   },
   "nodemonConfig": {
     "ignore": [