@lazycatcloud/lzc-cli 1.1.0 → 1.1.1

package/lib/env.js

@@ -1,7 +1,7 @@
 import path from "path";
 import fs from "fs";
 import os from "os";
-import { ensureDir, APP_CONFIG_FILE } from "./utils.js";
+import { ensureDir, APP_CONFIG_FILE, GLOBAL_CONFIG_DIR } from "./utils.js";
 
 const GLOBAL_CONFIG_NAME = "box-config.json";
 
@@ -22,8 +22,7 @@ class Env {
   constructor(cwd) {
     this.envPath = path.join(cwd, APP_CONFIG_FILE);
     this.globalEnvPath = path.join(
-      os.homedir(),
-      ".config/lazycat",
+      GLOBAL_CONFIG_DIR,
       GLOBAL_CONFIG_NAME
     );
     this.load();

package/lib/key.js

@@ -1,12 +1,12 @@
 import inquirer from "inquirer";
 import glob from "fast-glob";
 import path from "path";
-import os from "os";
 import { Client } from "ssh2";
 import process from "process";
 import fs from "fs";
 import execa from "execa";
 import API from "./api.js";
+import { GLOBAL_CONFIG_DIR } from "./utils.js";
 
 const KEY_NAME = "lzc_box_key";
 
@@ -18,7 +18,7 @@ export default class Key {
   }
 
   async generate() {
-    const privateKeyFile = path.join(os.homedir(), "/.ssh/", KEY_NAME);
+    const privateKeyFile = path.join(GLOBAL_CONFIG_DIR, KEY_NAME);
     await execa(
       "ssh-keygen",
       ["-t", "ed25519", "-P", "", "-f", privateKeyFile],
@@ -85,28 +85,14 @@ export default class Key {
   }
 
   async getKeyPair() {
-    const results = await glob(path.join(os.homedir(), `/.ssh/${KEY_NAME}*`));
+    const results = await glob(path.join(GLOBAL_CONFIG_DIR, `/${KEY_NAME}*`));
     if (results.length != 2) {
-      // create key pair
-      const answers = await inquirer.prompt([
-        {
-          name: "generate",
-          message: "未发现ssh秘钥, 是否生成?",
-          type: "confirm",
-          default: true,
-        },
-      ]);
-
-      if (answers.generate) {
-        return await this.generate();
-      } else {
-        process.exit(1);
-      }
+      return await this.generate();
     }
 
     return {
-      private: path.join(os.homedir(), "/.ssh/", KEY_NAME),
-      public: path.join(os.homedir(), `/.ssh/${KEY_NAME}.pub`),
+      private: path.join(GLOBAL_CONFIG_DIR, KEY_NAME),
+      public: path.join(GLOBAL_CONFIG_DIR, `${KEY_NAME}.pub`),
     };
   }
 }

package/lib/utils.js

@@ -19,6 +19,7 @@ const META_MARK = "x-lazycat-app";
 const APP_FOLDER = ".lazycat";
 const APP_CONFIG_FILE = "app-config";
 const APP_SDK_HOSTNAME = "box";
+export const GLOBAL_CONFIG_DIR = path.join(os.homedir(), "/.config/lazycat")
 
 export const envsubstr = async (templateContents, args) => {
   const parse = await importDefault("envsub/js/envsub-parser.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"