filefive 1.8.0 → 2.0.1

package/dist/commands/saveConnection.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSettings = getSettings;
 exports.default = default_1;
-const Local_1 = require("../Local");
 const URI_1 = require("../utils/URI");
-const Local_2 = require("../Local");
+const Local_1 = require("../Local");
 const ramda_1 = require("ramda");
-const promises_1 = require("node:fs/promises");
 const Password_1 = __importDefault(require("../Password"));
 function getSettings(settings) {
     return {
@@ -20,8 +18,8 @@ function getSettings(settings) {
     };
 }
 async function default_1(path, settings) {
-    const content = (0, Local_2.stat)(path) ? await (0, Local_1.read)(path) : null;
-    if ((0, Local_2.stat)(path) && !content) {
+    const content = (0, Local_1.stat)(path) ? await (0, Local_1.read)(path) : null;
+    if ((0, Local_1.stat)(path) && !content) {
         throw new Error(`Cant read connection file: ${path} ${typeof content}`);
     }
     let config = content ? JSON.parse(content) : {};
@@ -48,5 +46,5 @@ async function default_1(path, settings) {
     if (!config) {
         throw new Error(`Save invalid config into ${path}`);
     }
-    await (0, promises_1.writeFile)(path, JSON.stringify(config));
+    await (0, Local_1.write)(path, JSON.stringify(config));
 }

package/dist/commands/saveSettings.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const promises_1 = require("node:fs/promises");
+const Local_1 = require("../Local");
 const saveConnection_1 = require("./saveConnection");
 const ramda_1 = require("ramda");
 const _1 = require(".");
@@ -18,5 +18,5 @@ async function default_1(path, changes) {
         path: settings.path,
         sync: settings.sync
     };
-    await (0, promises_1.writeFile)(path, JSON.stringify(config));
+    await (0, Local_1.write)(path, JSON.stringify(config));
 }

package/dist/commands/settings.js

@@ -4,8 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const Local_1 = require("../Local");
 const Local_2 = require("../fs/Local");
 const connect_1 = require("./connect");
@@ -20,10 +19,12 @@ async function default_1(path) {
         config = JSON.parse(await (0, Local_1.read)(path));
     }
     catch (e) { }
+    const home = (0, Local_1.pwd)();
     const settings = {
-        home: (0, node_os_1.homedir)(),
-        settings: (0, node_path_1.join)((0, node_os_1.homedir)(), '.f5', 'settings.json'),
-        connections: (0, node_path_1.join)((0, node_os_1.homedir)(), '.f5', 'connections'),
+        isWin: (0, Local_1.isWin)(),
+        home,
+        settings: (0, posix_1.join)(home, '.f5', 'settings.json'),
+        connections: (0, posix_1.join)(home, '.f5', 'connections'),
         keybindings: keybindings_json_1.default,
         mode: config?.mode ?? 'system',
         theme: config?.theme ?? 'black',
@@ -32,7 +33,7 @@ async function default_1(path) {
         sizeFmt: config?.sizeFmt ?? '0.0 b',
         local: (0, connect_1.explorerSettings)(Local_2.ATTRIBUTES, config?.local),
         remote: (0, connect_1.explorerSettings)(Local_2.ATTRIBUTES, config?.remote),
-        path: config?.path ?? { local: (0, node_os_1.homedir)(), remote: (0, node_os_1.homedir)() },
+        path: config?.path ?? { local: home, remote: home },
         sync: config?.sync ?? null
     };
     if (settings.fileTheme) {

package/dist/commands/write.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const Connection_1 = __importDefault(require("../Connection"));
 const URI_1 = require("../utils/URI");
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const App_1 = __importDefault(require("../App"));
 async function default_1(file, content) {
     const { id, path } = (0, URI_1.parseURI)(file);
     await Connection_1.default.get(id).write(path, content);
     if (!(0, URI_1.isLocal)(file)) {
-        App_1.default.remoteWatcher.refresh((0, URI_1.createURI)(id, (0, node_path_1.dirname)(path)));
+        App_1.default.remoteWatcher.refresh((0, URI_1.createURI)(id, (0, posix_1.dirname)(path)));
     }
 }

package/dist/fs/Ftp.js

@@ -37,12 +37,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ATTRIBUTES = void 0;
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const node_os_1 = require("node:os");
 const promises_1 = require("node:fs/promises");
 const fs = __importStar(require("fs"));
 const ftp_1 = __importDefault(require("ftp"));
 const FileSystem_1 = require("../FileSystem");
+const Local_1 = require("../Local");
 // https://github.com/mscdex/node-ftp
 exports.ATTRIBUTES = [
     {
@@ -118,11 +119,11 @@ class Ftp extends FileSystem_1.FileSystem {
                         .filter(f => f.name != '.' && f.name != '..')
                         .map(f => {
                         let target = f.target;
-                        if (target && !(0, node_path_1.isAbsolute)(target)) {
-                            target = (0, node_path_1.normalize)((0, node_path_1.join)(dir, target));
+                        if (target && !(0, posix_1.isAbsolute)(target)) {
+                            target = (0, posix_1.normalize)((0, posix_1.join)(dir, target));
                         }
                         return {
-                            path: (0, node_path_1.join)(dir, f.name),
+                            path: (0, posix_1.join)(dir, f.name),
                             name: f.name,
                             dir: f.type == 'd',
                             size: f.size,
@@ -144,7 +145,7 @@ class Ftp extends FileSystem_1.FileSystem {
                     reject(err);
                 }
                 else {
-                    const dest = fs.createWriteStream(toLocal);
+                    const dest = fs.createWriteStream((0, Local_1.osify)(toLocal));
                     dest.on('finish', () => resolve());
                     source.pipe(dest);
                 }
@@ -154,7 +155,7 @@ class Ftp extends FileSystem_1.FileSystem {
     async put(fromLocal, toRemote) {
         await this.open();
         return new Promise((resolve, reject) => {
-            this.connection.put(fromLocal, toRemote, e => e ? reject(e) : resolve());
+            this.connection.put((0, Local_1.osify)(fromLocal), toRemote, e => e ? reject(e) : resolve());
         });
     }
     async rm(path, recursive) {
@@ -179,7 +180,7 @@ class Ftp extends FileSystem_1.FileSystem {
         return Promise.reject(new Error("FTP doesn't support remote duplication"));
     }
     async write(path, s) {
-        const tmp = (0, node_path_1.join)((0, node_os_1.tmpdir)(), (0, node_path_1.basename)(path));
+        const tmp = (0, posix_1.join)((0, node_os_1.tmpdir)(), (0, posix_1.basename)(path));
         await (0, promises_1.writeFile)(tmp, s);
         await this.put(tmp, path);
         (0, promises_1.rm)(tmp);

package/dist/fs/Local.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ATTRIBUTES = void 0;
 const promises_1 = require("node:fs/promises");
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const FileSystem_1 = require("../FileSystem");
 const Local_1 = require("../Local");
 const types_1 = require("../types");
@@ -45,24 +45,24 @@ class Local extends FileSystem_1.FileSystem {
         return (0, Local_1.del)(path);
     }
     async mkdir(path) {
-        await (0, promises_1.mkdir)(path, { recursive: true });
+        await (0, Local_1.mkDirRecursive)(path);
     }
     async rename(from, to) {
-        await (0, promises_1.rename)(from, to);
+        await (0, Local_1.move)(from, to);
     }
     async mv(from, to) {
         try {
             await (0, Local_1.del)(to);
         }
         catch (e) { }
-        await (0, promises_1.mkdir)((0, node_path_1.dirname)(to), { recursive: true });
-        await (0, promises_1.rename)(from, to);
+        await (0, Local_1.mkDirRecursive)((0, posix_1.dirname)(to));
+        await (0, Local_1.move)(from, to);
     }
     async cp(from, to, recursive) {
-        await (0, promises_1.cp)(from, to, { recursive, force: true });
+        await (0, promises_1.cp)((0, Local_1.osify)(from), (0, Local_1.osify)(to), { recursive, force: true });
     }
     async write(path, data) {
-        return (0, promises_1.writeFile)(path, data);
+        return (0, Local_1.write)(path, data);
     }
 }
 exports.default = Local;

package/dist/fs/S3.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ATTRIBUTES = void 0;
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const node_fs_1 = require("node:fs");
 const path_1 = require("../utils/path");
+const Local_1 = require("../Local");
 const FileSystem_1 = require("../FileSystem");
 const client_s3_1 = require("@aws-sdk/client-s3");
 // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3/
@@ -79,8 +80,8 @@ class S3 extends FileSystem_1.FileSystem {
         }));
         return [
             ...(output.CommonPrefixes ?? []).map(prefix => ({
-                path: (0, node_path_1.resolve)('/', parts[0], prefix.Prefix),
-                name: (0, node_path_1.basename)(prefix.Prefix),
+                path: (0, posix_1.resolve)('/', parts[0], prefix.Prefix),
+                name: (0, posix_1.basename)(prefix.Prefix),
                 dir: true,
                 size: 0,
                 modified: new Date()
@@ -88,8 +89,8 @@ class S3 extends FileSystem_1.FileSystem {
             ...(output.Contents ?? [])
                 .filter(({ Key }) => Key != target)
                 .map(item => ({
-                path: (0, node_path_1.resolve)('/', parts[0], item.Key),
-                name: (0, node_path_1.basename)(item.Key),
+                path: (0, posix_1.resolve)('/', parts[0], item.Key),
+                name: (0, posix_1.basename)(item.Key),
                 dir: false,
                 size: item.Size,
                 modified: new Date(item.LastModified)
@@ -104,7 +105,7 @@ class S3 extends FileSystem_1.FileSystem {
         }));
         if (output.Body) {
             const body = output.Body;
-            const writeStream = (0, node_fs_1.createWriteStream)(toLocal);
+            const writeStream = (0, node_fs_1.createWriteStream)((0, Local_1.osify)(toLocal));
             body.pipe(writeStream);
             return new Promise((resolve, reject) => {
                 writeStream.on('finish', resolve);
@@ -120,7 +121,7 @@ class S3 extends FileSystem_1.FileSystem {
             Key: parts.slice(1).join('/')
         }));
         const partSize = 5 * 1024 * 1024;
-        const fromStream = (0, node_fs_1.createReadStream)(fromLocal, { highWaterMark: partSize });
+        const fromStream = (0, node_fs_1.createReadStream)((0, Local_1.osify)(fromLocal), { highWaterMark: partSize });
         let buffer = [];
         let partNumber = 1;
         const uploadParts = [];
@@ -176,7 +177,7 @@ class S3 extends FileSystem_1.FileSystem {
         return this.mv(from, to);
     }
     async mv(from, to) {
-        const isDir = (await this.ls((0, node_path_1.dirname)(from))).find(({ path }) => path == from)?.dir ?? false;
+        const isDir = (await this.ls((0, posix_1.dirname)(from))).find(({ path }) => path == from)?.dir ?? false;
         await this.cp(from, to, isDir);
         const recursiveRm = async (path) => {
             await Promise.all((await this.ls(path)).map(f => f.dir ? recursiveRm(f.path) : this.rm(f.path, false)));
@@ -186,13 +187,13 @@ class S3 extends FileSystem_1.FileSystem {
     }
     async cp(from, to, recursive) {
         if (recursive) {
-            await Promise.all((await this.ls(from)).map(f => this.cp(f.path, (0, node_path_1.resolve)(to, f.name), f.dir)));
+            await Promise.all((await this.ls(from)).map(f => this.cp(f.path, (0, posix_1.resolve)(to, f.name), f.dir)));
         }
         else {
             const parts = (0, path_1.split)(from);
             await this.connection.send(new client_s3_1.CopyObjectCommand({
                 Bucket: parts[0],
-                CopySource: (0, node_path_1.resolve)(from) + (recursive ? '/' : ''),
+                CopySource: (0, posix_1.resolve)(from) + (recursive ? '/' : ''),
                 Key: (0, path_1.split)(to).slice(1).join('/') + (recursive ? '/' : '')
             }));
         }
@@ -213,7 +214,7 @@ class S3 extends FileSystem_1.FileSystem {
     async listBuckets() {
         const output = await this.connection.send(new client_s3_1.ListBucketsCommand({}));
         return (output.Buckets ?? []).map(bucket => ({
-            path: (0, node_path_1.join)('/', bucket.Name),
+            path: (0, posix_1.join)('/', bucket.Name),
             name: bucket.Name,
             dir: true,
             size: 0,

package/dist/fs/SFtp.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ATTRIBUTES = void 0;
-const node_path_1 = require("node:path");
+const posix_1 = require("node:path/posix");
 const ssh2_1 = require("ssh2");
 const FileSystem_1 = require("../FileSystem");
+const Local_1 = require("../Local");
 // https://github.com/mscdex/ssh2/blob/master/SFTP.md
 // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-4.3
 // see also https://github.com/theophilusx/ssh2-sftp-client
@@ -107,13 +108,13 @@ class SFtp extends FileSystem_1.FileSystem {
                 const files = [];
                 for (let f of list) {
                     if (f.attrs.isSymbolicLink()) {
-                        let target = await this.readlink((0, node_path_1.join)(dir, f.filename));
-                        if (!(0, node_path_1.isAbsolute)(target)) {
-                            target = (0, node_path_1.normalize)((0, node_path_1.join)(dir, target));
+                        let target = await this.readlink((0, posix_1.join)(dir, f.filename));
+                        if (!(0, posix_1.isAbsolute)(target)) {
+                            target = (0, posix_1.normalize)((0, posix_1.join)(dir, target));
                         }
                         const targetStat = await this.stat(target);
                         files.push({
-                            path: (0, node_path_1.join)(dir, f.filename),
+                            path: (0, posix_1.join)(dir, f.filename),
                             name: f.filename,
                             dir: f.attrs.isDirectory(),
                             size: targetStat.size,
@@ -126,7 +127,7 @@ class SFtp extends FileSystem_1.FileSystem {
                     }
                     else {
                         files.push({
-                            path: (0, node_path_1.join)(dir, f.filename),
+                            path: (0, posix_1.join)(dir, f.filename),
                             name: f.filename,
                             dir: f.attrs.isDirectory(),
                             size: f.attrs.size,
@@ -156,13 +157,13 @@ class SFtp extends FileSystem_1.FileSystem {
     async get(fromRemote, toLocal) {
         const sftp = await this.open();
         return new Promise((resolve, reject) => {
-            sftp.fastGet(fromRemote, toLocal, (e) => e ? reject(new Error(this.decodeError(e))) : resolve());
+            sftp.fastGet(fromRemote, (0, Local_1.osify)(toLocal), (e) => e ? reject(new Error(this.decodeError(e))) : resolve());
         });
     }
     async put(fromLocal, toRemote) {
         const sftp = await this.open();
         return new Promise((resolve, reject) => {
-            sftp.fastPut(fromLocal, toRemote, e => e ? reject(new Error(this.decodeError(e) + ` ${toRemote}`)) : resolve());
+            sftp.fastPut((0, Local_1.osify)(fromLocal), toRemote, e => e ? reject(new Error(this.decodeError(e) + ` ${toRemote}`)) : resolve());
         });
     }
     async rm(path, recursive) {
@@ -196,7 +197,7 @@ class SFtp extends FileSystem_1.FileSystem {
     }
     async mv(from, to) {
         await this.exec(`rm -Rf '${to}'`);
-        await this.exec(`mkdir -p '${(0, node_path_1.dirname)(to)}'`);
+        await this.exec(`mkdir -p '${(0, posix_1.dirname)(to)}'`);
         return this.exec(`mv -f '${from}' '${to}'`);
     }
     async cp(from, to, recursive) {
@@ -204,7 +205,7 @@ class SFtp extends FileSystem_1.FileSystem {
         if (recursive) {
             return this.exec(`cp -fR '${from}' '${to}'`);
         }
-        await this.exec(`mkdir -p '${(0, node_path_1.dirname)(to)}'`);
+        await this.exec(`mkdir -p '${(0, posix_1.dirname)(to)}'`);
         return this.exec(`cp -f '${from}' '${to}'`);
     }
     async write(path, s) {

package/dist/index.js

@@ -6,9 +6,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
 const multer_1 = __importDefault(require("multer"));
-const path_1 = require("path");
+const posix_1 = require("node:path/posix");
+const node_path_1 = __importDefault(require("node:path"));
 const node_os_1 = require("node:os");
-const promises_1 = require("node:fs/promises");
+const Local_1 = require("./Local");
 const App_1 = __importDefault(require("./App"));
 const ws_1 = require("ws");
 const open = import("open");
@@ -35,8 +36,7 @@ app.use(function (req, res, next) {
     next();
 });
 app.use(express_1.default.json());
-app.use(express_1.default.static((0, path_1.resolve)(__dirname, 'public')));
-app.use(express_1.default.static((0, path_1.resolve)(__dirname, '../dist/public')));
+app.use(express_1.default.static(node_path_1.default.resolve(__dirname, 'public')));
 const server = app.listen(port, async () => {
     console.log(`FileFive is up on http://localhost:${port}`);
     if (process.env.NODE_ENV !== 'development') {
@@ -60,12 +60,13 @@ const upload = (0, multer_1.default)({ dest: (0, node_os_1.tmpdir)() });
 app.post('/api/upload', upload.array('files'), async function (req, res) {
     if (Array.isArray(req.files)) {
         const src = [];
-        for (const { path, originalname } of req.files) {
-            const fnm = (0, path_1.join)((0, path_1.dirname)(path), originalname);
-            await (0, promises_1.rename)(path, fnm);
+        for (const { path: osPath, originalname } of req.files) {
+            const path = (0, Local_1.unosify)(osPath);
+            const fnm = (0, posix_1.join)((0, posix_1.dirname)(path), originalname);
+            await (0, Local_1.move)(path, fnm);
             src.push(fnm);
         }
-        commands_1.commands.copy(src.map(path => (0, URI_1.createURI)(types_1.LocalFileSystemID, path)), req.body['to'], true, null, null, null, () => src.forEach(path => (0, promises_1.rm)(path, { force: true })));
+        commands_1.commands.copy(src.map(path => (0, URI_1.createURI)(types_1.LocalFileSystemID, path)), req.body['to'], true, null, null, null, () => src.forEach(path => (0, Local_1.del)(path)));
     }
     res.json(true);
 });