filefive 1.4.1 → 1.5.0

package/dist/Connection.js

@@ -36,6 +36,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_fs_1 = require("node:fs");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
 const ReferenceCountMap_1 = __importDefault(require("./utils/ReferenceCountMap"));
 const types_1 = require("./types");
 const URI_1 = require("./utils/URI");
@@ -49,14 +52,22 @@ class default_1 {
     static initialize() {
         this.shared.set(types_1.LocalFileSystemID, new Local_1.default);
     }
-    static async open(scheme, user, host, port, password) {
+    static async open(scheme, user, host, port, password, privatekey) {
         const id = (0, URI_1.connectionID)(scheme, user, host, port);
         const attrs = (scheme == 'sftp') ? SFtp_1.ATTRIBUTES : Ftp_1.ATTRIBUTES;
         if (this.shared.inc(id)) {
             return attrs;
         }
-        this.credentials.set(id, password);
-        const conn = await this.create(id, scheme, user, host, port);
+        if (privatekey) {
+            if (privatekey.startsWith('~')) {
+                privatekey = (0, node_path_1.join)((0, node_os_1.homedir)(), privatekey.substring(1));
+            }
+            this.credentials.set(id, ['key', (0, node_fs_1.readFileSync)(privatekey)]);
+        }
+        else {
+            this.credentials.set(id, ['password', password]);
+        }
+        const conn = await this.create(id);
         await conn.open();
         this.shared.set(id, conn);
         return attrs;
@@ -105,7 +116,7 @@ class default_1 {
                     const poolId = (0, uniqid_1.default)();
                     try {
                         const onClose = () => this.pools.get(id)?.delete(poolId);
-                        const fs = await this.createFromId(id, onClose);
+                        const fs = await this.create(id, onClose);
                         await fs.open();
                         this.pools.get(id).set(poolId, { fs, idle: false });
                         resolve([fs, poolId]);
@@ -159,28 +170,30 @@ class default_1 {
     static getLimit(id) {
         return this.limits.has(id) ? this.limits.get(id) : 1024; // for vsftpd max_per_ip in /etc/vsftpd.conf
     }
-    static async create(id, scheme, user, host, port, onClose = () => { }) {
+    static async create(id, onClose = () => { }) {
         if (options_1.default.log) {
-            return new log_1.LogFS(id, await this.createFS(scheme, user, host, port, this.credentials.get(id), onClose));
+            return new log_1.LogFS(id, await this.createFS(id, onClose));
         }
-        return this.createFS(scheme, user, host, port, this.credentials.get(id), onClose);
+        return this.createFS(id, onClose);
     }
-    static async createFS(scheme, user, host, port, password, onClose) {
+    static async createFS(id, onClose) {
+        const { scheme, user, host, port } = (0, URI_1.parseURI)(id);
+        if (!this.credentials.has(id)) {
+            onClose?.();
+            return;
+        }
+        const [authType, credential] = this.credentials.get(id);
         switch (scheme) {
             case 'sftp': {
-                return new SFtp_1.default(host, user, password, port, error => log_1.default.error('SFTP error:', error), onClose);
+                return new SFtp_1.default(host, user, authType == 'password' ? credential : '', authType == 'key' ? credential : null, port, error => log_1.default.error('SFTP error:', error), onClose);
             }
             case 'ftp': {
-                return new Ftp_1.default(host, user, password, port, error => log_1.default.error('FTP error:', error), onClose);
+                return new Ftp_1.default(host, user, credential, port, error => log_1.default.error('FTP error:', error), onClose);
             }
             default:
                 throw new Error(`Unsupported scheme ${scheme}`);
         }
     }
-    static async createFromId(id, onClose = () => { }) {
-        const { scheme, user, host, port } = (0, URI_1.parseURI)(id);
-        return this.create(id, scheme, user, host, port, onClose);
-    }
 }
 default_1.numOfStartups = 0;
 default_1.maxStartups = 7; // for SFTP see MaxStartups in /etc/ssh/sshd_config

package/dist/commands/connect.js

@@ -56,17 +56,19 @@ async function default_1(file, onError) {
     }
     const id = (0, URI_1.connectionID)(config.scheme, config.user, config.host, config.port);
     let password = '';
-    try {
-        password = await Password_1.default.get(id);
-    }
-    catch (e) {
-        return false;
-    }
-    if (!password) {
-        return false;
+    if (!config.privatekey) {
+        try {
+            password = await Password_1.default.get(id);
+        }
+        catch (e) {
+            return false;
+        }
+        if (!password) {
+            return false;
+        }
     }
     try {
-        const attributes = await Connection_1.default.open(config.scheme, config.user, config.host, config.port, password);
+        const attributes = await Connection_1.default.open(config.scheme, config.user, config.host, config.port, password, config.privatekey);
         const pwd = await Connection_1.default.get(id).pwd();
         const settings = {
             name: (0, path_1.parse)(file).name,

package/dist/commands/saveConnection.js

@@ -29,7 +29,7 @@ async function default_1(path, settings) {
         const id = (0, URI_1.connectionID)(settings.scheme, settings.user, settings.host, settings.port);
         config = { ...config, ...(0, ramda_1.omit)(['password', 'savePassword'], settings) };
         Password_1.default.delete(id, true);
-        if (settings.password.length) {
+        if (settings.password && !settings.privatekey) {
             Password_1.default.set(id, settings.password, true, settings.savePassword);
         }
     }

package/dist/fs/SFtp.js

@@ -30,11 +30,12 @@ exports.ATTRIBUTES = [
     }
 ];
 class SFtp extends FileSystem_1.FileSystem {
-    constructor(host, user, password, port = 22, onError, onClose = () => { }) {
+    constructor(host, user, password, privateKey = null, port = 22, onError, onClose = () => { }) {
         super();
         this.host = host;
         this.user = user;
         this.password = password;
+        this.privateKey = privateKey;
         this.port = port;
         this.onError = onError;
         this.onClose = onClose;
@@ -74,8 +75,10 @@ class SFtp extends FileSystem_1.FileSystem {
             this.connection.connect({
                 host: this.host,
                 username: this.user,
-                password: this.password,
                 port: this.port,
+                ...(this.privateKey ?
+                    { privateKey: this.privateKey } :
+                    { password: this.password })
                 // debug: s => console.log('DEBUG', s)
             });
         }