@abhiseck/zssh 1.1.0 → 1.2.0

package/dist/commands/add.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCommand = addCommand;
 const chalk_1 = __importDefault(require("chalk"));
 const inquirer_1 = __importDefault(require("inquirer"));
-const uuid_1 = require("uuid");
 async function addCommand(configManager) {
     console.log(chalk_1.default.blue("Adding new SSH connection..."));
     const answers = await inquirer_1.default.prompt([
@@ -60,8 +59,12 @@ async function addCommand(configManager) {
             message: "Description (optional):",
         },
     ]);
+    const connections = configManager.getConnections();
+    const nextId = connections.length > 0
+        ? (Math.max(...connections.map((c) => parseInt(c.id) || 0)) + 1).toString()
+        : "1";
     const connection = {
-        id: (0, uuid_1.v4)().split("-")[0], // Short ID
+        id: nextId,
         alias: answers.alias,
         host: answers.host,
         port: parseInt(answers.port),

package/dist/commands/connect.js

@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectCommand = connectCommand;
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const ssh2_1 = require("ssh2");
 async function isSshpassInstalled() {
     return new Promise((resolve) => {
         const isWin = process.platform === "win32";
@@ -29,7 +33,50 @@ async function connectCommand(configManager, idOrAlias) {
     }
     // Identity file
     if (conn.privateKeyPath) {
-        args.push("-i", conn.privateKeyPath);
+        let keyPath = conn.privateKeyPath;
+        if (keyPath.toLowerCase().endsWith(".ppk")) {
+            try {
+                let realPath = keyPath;
+                if (realPath.startsWith("~/")) {
+                    realPath = path_1.default.join(os_1.default.homedir(), realPath.slice(2));
+                }
+                const keyData = fs_1.default.readFileSync(realPath);
+                const parsedKeys = ssh2_1.utils.parseKey(keyData);
+                if (parsedKeys instanceof Error) {
+                    console.log(chalk_1.default.red(`Failed to parse PPK file: ${parsedKeys.message}`));
+                    return;
+                }
+                const parsedKey = Array.isArray(parsedKeys)
+                    ? parsedKeys[0]
+                    : parsedKeys;
+                const tempKeyPath = path_1.default.join(os_1.default.tmpdir(), `sshc_key_${conn.id}.pem`);
+                fs_1.default.writeFileSync(tempKeyPath, parsedKey.getPrivatePEM(), {
+                    mode: 0o600,
+                });
+                keyPath = tempKeyPath;
+                const cleanUp = () => {
+                    try {
+                        if (fs_1.default.existsSync(tempKeyPath))
+                            fs_1.default.unlinkSync(tempKeyPath);
+                    }
+                    catch (e) { }
+                };
+                process.on("exit", cleanUp);
+                process.on("SIGINT", () => {
+                    cleanUp();
+                    process.exit(0);
+                });
+                process.on("SIGTERM", () => {
+                    cleanUp();
+                    process.exit(0);
+                });
+            }
+            catch (err) {
+                console.log(chalk_1.default.red(`Error processing PPK file: ${err.message}`));
+                return;
+            }
+        }
+        args.push("-i", keyPath);
     }
     // Destination
     args.push(`${conn.username}@${conn.host}`);

package/dist/commands/list.js

@@ -19,6 +19,7 @@ async function listCommand(configManager) {
             chalk_1.default.cyan("Host"),
             chalk_1.default.cyan("User"),
             chalk_1.default.cyan("Port"),
+            chalk_1.default.cyan("Description"),
         ],
         style: { head: [], border: [] },
     });
@@ -29,6 +30,7 @@ async function listCommand(configManager) {
             conn.host,
             conn.username,
             conn.port,
+            conn.description || "",
         ]);
     });
     console.log(table.toString());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abhiseck/zssh",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/commands/add.ts

@@ -1,6 +1,5 @@
 import chalk from "chalk";
 import inquirer from "inquirer";
-import { v4 as uuidv4 } from "uuid";
 import { ConfigManager } from "../lib/config";
 import { SSHConnection } from "../lib/types";
 
@@ -60,8 +59,16 @@ export async function addCommand(configManager: ConfigManager) {
     },
   ]);
 
+  const connections = configManager.getConnections();
+  const nextId =
+    connections.length > 0
+      ? (
+          Math.max(...connections.map((c) => parseInt(c.id) || 0)) + 1
+        ).toString()
+      : "1";
+
   const connection: SSHConnection = {
-    id: uuidv4().split("-")[0], // Short ID
+    id: nextId,
     alias: answers.alias,
     host: answers.host,
     port: parseInt(answers.port),

package/src/commands/connect.ts

@@ -1,5 +1,9 @@
 import chalk from "chalk";
 import { exec, spawn } from "child_process";
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { utils } from "ssh2";
 import { ConfigManager } from "../lib/config";
 
 async function isSshpassInstalled(): Promise<boolean> {
@@ -39,7 +43,53 @@ export async function connectCommand(
 
   // Identity file
   if (conn.privateKeyPath) {
-    args.push("-i", conn.privateKeyPath);
+    let keyPath = conn.privateKeyPath;
+    if (keyPath.toLowerCase().endsWith(".ppk")) {
+      try {
+        let realPath = keyPath;
+        if (realPath.startsWith("~/")) {
+          realPath = path.join(os.homedir(), realPath.slice(2));
+        }
+        const keyData = fs.readFileSync(realPath);
+        const parsedKeys = utils.parseKey(keyData);
+
+        if (parsedKeys instanceof Error) {
+          console.log(
+            chalk.red(`Failed to parse PPK file: ${parsedKeys.message}`),
+          );
+          return;
+        }
+
+        const parsedKey = Array.isArray(parsedKeys)
+          ? parsedKeys[0]
+          : parsedKeys;
+        const tempKeyPath = path.join(os.tmpdir(), `sshc_key_${conn.id}.pem`);
+
+        fs.writeFileSync(tempKeyPath, parsedKey.getPrivatePEM(), {
+          mode: 0o600,
+        });
+        keyPath = tempKeyPath;
+
+        const cleanUp = () => {
+          try {
+            if (fs.existsSync(tempKeyPath)) fs.unlinkSync(tempKeyPath);
+          } catch (e) {}
+        };
+        process.on("exit", cleanUp);
+        process.on("SIGINT", () => {
+          cleanUp();
+          process.exit(0);
+        });
+        process.on("SIGTERM", () => {
+          cleanUp();
+          process.exit(0);
+        });
+      } catch (err: any) {
+        console.log(chalk.red(`Error processing PPK file: ${err.message}`));
+        return;
+      }
+    }
+    args.push("-i", keyPath);
   }
 
   // Destination

package/src/commands/list.ts

@@ -19,6 +19,7 @@ export async function listCommand(configManager: ConfigManager) {
       chalk.cyan("Host"),
       chalk.cyan("User"),
       chalk.cyan("Port"),
+      chalk.cyan("Description"),
     ],
     style: { head: [], border: [] },
   });
@@ -30,6 +31,7 @@ export async function listCommand(configManager: ConfigManager) {
       conn.host,
       conn.username,
       conn.port,
+      conn.description || "",
     ]);
   });
 

package/test-ppk.js

@@ -0,0 +1,4 @@
+const fs = require('fs');
+const { utils } = require('ssh2');
+// just check if utils.parseKey exists 
+console.log(typeof utils.parseKey);