filefive 1.8.0 → 2.0.0

package/dist/queues/Copy.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const Queue_1 = __importDefault(require("./Queue"));
 const types_1 = require("../types");
 const URI_1 = require("../utils/URI");
@@ -19,7 +19,7 @@ class CopyQueue extends Queue_1.default {
         if (this.move) { // No filter
             const stat = this.stat(this.from);
             await Promise.all(paths
-                .filter(path => path != dest && (0, node_path_1.dirname)(path) != dest)
+                .filter(path => path != dest && (0, posix_1.dirname)(path) != dest)
                 .map(async (path) => {
                 const from = await stat(path);
                 if (from) {
@@ -44,12 +44,12 @@ class CopyQueue extends Queue_1.default {
         try {
             let p;
             if (this.move) {
-                p = fs.mv(from.path, (0, node_path_1.join)(to, ...dirs, from.name));
-                const parent = (0, node_path_1.dirname)(from.path);
+                p = fs.mv(from.path, (0, posix_1.join)(to, ...dirs, from.name));
+                const parent = (0, posix_1.dirname)(from.path);
                 this.touched.set(parent, [...(this.touched.get(parent) ?? []), p]);
             }
             else {
-                p = fs.cp(from.path, (0, node_path_1.join)(to, ...dirs, from.name), from.dir);
+                p = fs.cp(from.path, (0, posix_1.join)(to, ...dirs, from.name), from.dir);
             }
             await p;
             this.touched.set(to, [...(this.touched.get(to) ?? []), p]);

package/dist/queues/Download.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const Queue_1 = __importDefault(require("./Queue"));
 const types_1 = require("../types");
 const Local_1 = require("../Local");
@@ -16,7 +16,7 @@ class DownloadQueue extends Queue_1.default {
         if (this.stopped) {
             return;
         }
-        const dest = (0, node_path_1.join)(to, ...dirs, from.name);
+        const dest = (0, posix_1.join)(to, ...dirs, from.name);
         await (0, Local_1.touch)(dest);
         try {
             await fs.get(from.path, dest);

package/dist/queues/Queue.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queues = exports.lsRemote = void 0;
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const types_1 = require("../types");
 const rxjs_1 = require("rxjs");
 const ramda_1 = require("ramda");
@@ -61,7 +61,7 @@ class TransmitQueue {
         const stat = this.stat(this.to);
         this.processing = this.queue$.subscribe(async ({ from, dirs, to, action }) => {
             const a = action ?? this.action;
-            const existing = await stat((0, node_path_1.join)(to, ...dirs, from.name));
+            const existing = await stat((0, posix_1.join)(to, ...dirs, from.name));
             if (existing) {
                 if (a) {
                     if (a.type == types_1.QueueActionType.Skip) {
@@ -111,16 +111,16 @@ class TransmitQueue {
                 return this.filter?.invert ?? false ? found === null : found !== null;
             };
         }
-        paths = paths.map(node_path_1.normalize).filter(path => !paths.find(ancestor => path.startsWith(ancestor + node_path_1.sep)));
+        paths = paths.map(posix_1.normalize).filter(path => !paths.find(ancestor => path.startsWith(ancestor + posix_1.sep)));
         const add = async (path, to, dirs = []) => {
             if (this.stopped) {
                 return;
             }
-            const parent = (0, node_path_1.dirname)(path);
+            const parent = (0, posix_1.dirname)(path);
             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, node_path_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)) {
@@ -131,7 +131,7 @@ class TransmitQueue {
                 }
             }
         };
-        await Promise.all(paths.map(path => add(path, dest, this.fromRoot ? (0, node_path_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) {
@@ -188,7 +188,7 @@ class TransmitQueue {
                 break;
             }
             case types_1.QueueActionType.Rename: {
-                from.name = await this.rename(from.name, (0, node_path_1.join)(to, ...dirs));
+                from.name = await this.rename(from.name, (0, posix_1.join)(to, ...dirs));
                 await transmit(from, dirs, to);
                 break;
             }
@@ -214,10 +214,10 @@ class TransmitQueue {
             return (path) => Promise.resolve((0, Local_1.stat)(path));
         }
         const ls = this.ls(connId);
-        return async (path) => (await ls((0, node_path_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 }));
     }
     async rename(name, dir) {
-        let { name: oldName, ext } = (0, node_path_1.parse)(name);
+        let { name: oldName, ext } = (0, posix_1.parse)(name);
         const parts = oldName.match(/^(.+) copy ?(\d*)$/);
         oldName = (parts && parts.length > 2) ? parts[1] : oldName;
         let counter = (parts && parts.length > 2) ? (parts[2] ? parseInt(parts[2]) + 1 : 1) : 1;

package/dist/queues/Remove.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const Connection_1 = __importDefault(require("../Connection"));
 const URI_1 = require("../utils/URI");
 const Queue_1 = require("./Queue");
@@ -19,13 +19,13 @@ class RemoveQueue {
         this.stopped = false;
     }
     async create() {
-        const paths = this.paths.map(node_path_1.normalize).filter(path => !this.paths.find(ancestor => path.startsWith(ancestor + node_path_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);
         const add = async (path, tree) => {
-            const parent = (0, node_path_1.dirname)(path);
-            const file = (await ls(parent))?.find(f => f.name == (0, node_path_1.basename)(path));
+            const parent = (0, posix_1.dirname)(path);
+            const file = (await ls(parent))?.find(f => f.name == (0, posix_1.basename)(path));
             if (!file) {
                 return tree;
             }

package/dist/queues/Upload.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const Queue_1 = __importDefault(require("./Queue"));
 const types_1 = require("../types");
 const Local_1 = require("../Local");
@@ -25,7 +25,7 @@ class UploadQueue extends Queue_1.default {
         try {
             let targetDir = to;
             for (const dir of dirs) {
-                targetDir = (0, node_path_1.join)(targetDir, dir);
+                targetDir = (0, posix_1.join)(targetDir, dir);
                 if (this.touched.has(targetDir)) {
                     await this.touched.get(targetDir);
                 }
@@ -42,7 +42,7 @@ class UploadQueue extends Queue_1.default {
                 }
             }
             if (!this.stopped) {
-                await fs.put(from.path, (0, node_path_1.join)(targetDir, from.name));
+                await fs.put(from.path, (0, posix_1.join)(targetDir, from.name));
             }
         }
         catch (error) {

package/dist/transformers/git.js

@@ -3,19 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const node_util_1 = require("node:util");
 const node_child_process_1 = require("node:child_process");
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const types_1 = require("../types");
+const Local_1 = require("../Local");
 const ramda_1 = require("ramda");
 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: path });
-        repoRoot = repoRoot.trim();
-        const { stdout: statuses } = await run('git', ['status', '-z', '.'], { cwd: path });
-        const [inRoot, inSubfolders] = (0, ramda_1.partition)(([p]) => (0, node_path_1.dirname)(p) == path, statuses
+        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, node_path_1.join)(repoRoot, s.substring(3)), s.substring(0, 2)])
+            .map(s => [(0, posix_1.join)(repoRoot, s.substring(3)), s.substring(0, 2)])
             .map(([path, status]) => [path.replace(/\/$/, ''), status]));
         if (inSubfolders.length == 1 && inSubfolders[0][0] == path && inSubfolders[0][1].includes('?')) {
             files.forEach(f => {
@@ -28,7 +29,7 @@ async function default_1(path, files) {
             [...inRoot
                     .map(([path, s]) => [path, getStatusCode(s)])
                     .filter(([, status]) => status),
-                ...[...new Set(inSubfolders.map(([p]) => topDir.exec(p.substring(path.length + 1))?.[1]).filter(s => s))].map(dir => [(0, node_path_1.join)(path, dir), GitStatus.Contains])
+                ...[...new Set(inSubfolders.map(([p]) => topDir.exec(p.substring(path.length + 1))?.[1]).filter(s => s))].map(dir => [(0, posix_1.join)(path, dir), GitStatus.Contains])
             ].forEach(([path, status]) => {
                 const f = files.find(f => f.path == path);
                 if (f) {
@@ -39,15 +40,15 @@ async function default_1(path, files) {
                 }
             });
         }
-        const { stdout: ignored } = await run('git', ['ls-files', '--others', '--ignored', '--exclude-standard', '--directory', '-z'], { cwd: path });
+        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 {
-            ignored
+            (0, Local_1.unosify)(ignored)
                 .replace(/\0$/, '')
                 .split('\0')
-                .map(s => (0, node_path_1.join)(path, s.replace(/\/$/, '')))
+                .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]);

package/dist/utils/os.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.winToUnix = winToUnix;
+exports.unixToWin = unixToWin;
+function winToUnix(path) {
+    return '/' + path.replace(/\\/g, '/');
+}
+function unixToWin(path) {
+    path = path.replace(/^\//, '').replace(/\//g, '\\');
+    if (!path) {
+        path = '\\';
+    }
+    else if (path.match(/^[a-zA-Z]:$/)) {
+        path += '\\';
+    }
+    return path;
+}

package/dist/utils/path.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.split = split;
-const path_1 = require("path");
+const posix_1 = require("node:path/posix");
 function split(path) {
     const parts = [];
-    while (path && path != path_1.sep && path != '.') {
-        parts.push((0, path_1.basename)(path));
-        path = (0, path_1.dirname)(path);
+    while (path && path != '/' && path != '.') {
+        parts.push((0, posix_1.basename)(path));
+        path = (0, posix_1.dirname)(path);
     }
     return parts.reverse();
 }

package/dist/win.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDrives = getDrives;
+const node_fs_1 = require("node:fs");
+let drives = null;
+function getDrives() {
+    if (drives !== null) {
+        return drives;
+    }
+    drives = [];
+    for (let i = 65; i <= 90; i++) { // A: to Z:
+        const drive = String.fromCharCode(i) + ':\\';
+        try {
+            (0, node_fs_1.accessSync)(drive, node_fs_1.constants.F_OK);
+            drives.push(drive);
+        }
+        catch (err) { }
+    }
+    return drives;
+}

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": "1.8.0",
+  "version": "2.0.0",
   "license": "GPL-3.0",
   "author": "Max Miroshnikov",
   "bin": {
@@ -36,39 +36,39 @@
     "publish": "tsc -p . && npm publish"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.962.0",
+    "@aws-sdk/client-s3": "^3.1002.0",
     "chalk": "^5.6.2",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "express": "^5.2.1",
     "ftp": "^0.3.10",
-    "multer": "^2.0.2",
+    "multer": "^2.1.1",
     "open": "^11.0.0",
     "ramda": "^0.32.0",
     "rxjs": "^7.8.2",
     "ssh2": "^1.17.0",
-    "trash": "^10.0.1",
-    "whatwg-url": "^15.1.0",
-    "ws": "^8.18.3"
+    "trash": "^10.1.1",
+    "whatwg-url": "^16.0.1",
+    "ws": "^8.19.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.2",
+    "@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.0.3",
+    "@types/node": "^25.3.3",
     "@types/ramda": "^0.31.1",
     "@types/ssh2": "^1.15.5",
     "@types/whatwg-url": "^13.0.0",
     "@types/ws": "^8.18.1",
-    "dotenv": "^17.2.3",
-    "eslint": "^9.39.2",
+    "dotenv": "^17.3.1",
+    "eslint": "^10.0.2",
     "jest": "^30.2.0",
-    "nodemon": "^3.1.11",
+    "nodemon": "^3.1.14",
     "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.51.0"
+    "typescript-eslint": "^8.56.1"
   },
   "nodemonConfig": {
     "ignore": [