@lazycatcloud/lzc-cli 1.1.7 → 1.1.9

package/lib/env.js

@@ -5,18 +5,14 @@ import {
   APP_CONFIG_FILE,
   GLOBAL_CONFIG_DIR,
   APP_FOLDER,
-  findAppIsInstalled,
-  checkSDKInstallStatus,
-  InstallSDK,
 } from "./utils.js";
-import { debuglog } from "util";
 import inquirer from "inquirer";
 import chalk from "chalk";
-import { request } from "./autologin.js";
-const debug = debuglog("lib/env");
+import logger from "loglevel";
+import fetch from "node-fetch";
 
 const GLOBAL_CONFIG_NAME = "box-config.json";
-const permitGlobalEnv = [
+const allPermitEnv = [
   {
     name: "DEFAULT_BOXNAME",
     type: "input",
@@ -27,91 +23,6 @@ const permitGlobalEnv = [
   },
 ];
 
-const _permitLocalEnv = [
-  {
-    name: "APP_ID",
-    type: "input",
-    message: "应用名称",
-  },
-  {
-    name: "APP_DESCRIPTION",
-    type: "input",
-    message: "应用描述",
-  },
-  {
-    name: "BUILD_CONTEXT",
-    message: "",
-    type: "input",
-  },
-  {
-    name: "DEV_CONTEXT",
-    message: "",
-    type: "input",
-  },
-  {
-    name: "APP_VERSION",
-    message: "应用版本号",
-    type: "input",
-  },
-  {
-    name: "HTTP_SERVICE_PORT",
-    message: "服务暴露端口",
-    type: "input",
-    validate: (input) => {
-      if (!/^[^0]\d+$/.test(input)) {
-        return "端口必须为数字";
-      }
-      return true;
-    },
-  },
-];
-
-const permitLocalEnv = _permitLocalEnv.concat(permitGlobalEnv);
-
-const allPermits = _permitLocalEnv.concat(permitGlobalEnv);
-
-const controller = new AbortController();
-
-/**
- * 检查URL是否能被ping通
- * @param url 要检查的URL
- * @param suffix 可选，与URL拼接的后缀
- **/
-async function checkURL(url, suffix = "") {
-  const timeout = setTimeout(() => {
-    controller.abort();
-  }, 5000);
-
-  try {
-    const resp = await request(url + suffix, { signal: controller.signal });
-    if (resp.status != 200) {
-      // 设备可以访问 (client 有正常连接), 但是sdk 这个服务无法访问
-      throw new Error(
-        chalk.red(
-          `无法连接 sdk 服务, 请确保 ${chalk.yellow(
-            new URL(url).origin
-          )} 可以访问或者在应用商店安装 sdk`
-        )
-      );
-    }
-  } catch (error) {
-    switch (error.name) {
-      case "FetchError":
-        console.log(chalk.red("盒子入口地址有误，请核对后再试"));
-        process.exit();
-      default:
-        throw error;
-    }
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
-const allPermitEnv = permitGlobalEnv
-  .concat(permitLocalEnv)
-  .map((e) => e.name)
-  .filter((value, index, self) => self.indexOf(value) == index);
-
 class Env {
   constructor(cwd) {
     // 只加载
@@ -135,7 +46,7 @@ class Env {
       this.localEnv = JSON.parse(fs.readFileSync(this.localEnvPath));
       this.existance.local = true;
     } catch (e) {
-      debug("local env fail to fetch %s", e.message);
+      logger.debug("local env fail to fetch ", e.message);
       this.localEnv = {};
     }
 
@@ -170,7 +81,7 @@ class Env {
 
   stringify() {
     let content = "";
-    Object.keys(this.all).forEach((key) => {
+    Object.keys(this.allEnv).forEach((key) => {
       content += `${key}="${this.allEnv[key]}"\n`;
     });
     return content.trimEnd();
@@ -224,7 +135,7 @@ class Env {
       this.globalEnv = JSON.parse(fs.readFileSync(this.globalEnvPath));
       this.existance.global = true;
     } catch (e) {
-      debug("global env fail to fetch %s", e.message);
+      logger.debug("global env fail to fetch ", e.message);
       this.globalEnv = {};
     }
   }
@@ -251,63 +162,33 @@ class SDKEnv {
   }
 
   async ensure() {
-    if (this.sdkUrl) {
-      try {
-        // 另一种是SDK尚未安装，不过会被catch捕获掉，并安装sdk
-        await this.checkConnection(this.sdkUrl);
-      } catch (e) {
-        // sdk未安装
-        await this.installSDK(this.sdkUrl);
-      }
-    } else {
-      await this.setDefaultBoxName();
+    try {
+      const resp = await fetch(`${this.sdkUrl}/api/v1/ping`);
+      if (resp.status != 200)
+        throw new Error(chalk.red("debug.bridge服务未正常运行"));
+    } catch (e) {
+      logger.error(e);
+      console.log(
+        chalk.yellow(
+          `检测到SDK尚未安装，请将盒子"${env.get(
+            "DEFAULT_BOXNAME"
+          )}"开启开发者模式`
+        )
+      );
+      process.exit(-1);
     }
   }
 
-  async setDefaultBoxName(boxname = "", ensureSDK = true) {
+  async setDefaultBoxName(boxname = "") {
     if (!boxname) {
       boxname = await this._promptAnswers();
     }
     let url = this.buildSdkUrl(boxname);
-
-    if (ensureSDK) {
-      await this.installSDK(url);
-    }
-
     env.set({ DEFAULT_BOXNAME: boxname }, true);
   }
 
   buildSdkUrl(boxname) {
-    return `https://sdk.${boxname}.heiyu.space`;
-  }
-
-  async checkConnection(host) {
-    return await checkURL(host, "/api/v1/ping");
-  }
-
-  /**
-   * 确保sdk已安装
-   * @param need_answer {boolean} 是否需要询问用户地址
-   */
-  async installSDK(sdkURL) {
-    // 无法直接从环境变量拿到SDK_URL，就让用户输入
-    debug(sdkURL);
-
-    let boxURL = sdkURL.replace("sdk.", "");
-
-    try {
-      if (await findAppIsInstalled(boxURL, "sdk")) {
-        return;
-      }
-
-      console.log(chalk.yellow("检测到SDK尚未安装，开始安装SDK"));
-      await InstallSDK(boxURL);
-      console.log(chalk.green("SDK安装完成，开始部署SDK"));
-
-      await checkSDKInstallStatus(boxURL);
-    } catch (e) {
-      throw e;
-    }
+    return `http://sdk.${boxname}.heiyu.space`;
   }
 
   /**
@@ -316,7 +197,7 @@ class SDKEnv {
    */
   async _promptAnswers() {
     const answers = await inquirer.prompt(
-      permitGlobalEnv.filter((a) => a.name == "DEFAULT_BOXNAME")
+      allPermitEnv.filter((a) => a.name == "DEFAULT_BOXNAME")
     );
     return answers["DEFAULT_BOXNAME"];
   }

package/lib/key.js

@@ -83,6 +83,7 @@ export default class Key {
               key: fs.readFileSync(pair["private"]),
             },
           ],
+          keepaliveInterval: 5000,
         });
     });
   }

package/lib/sdk.js

@@ -7,6 +7,14 @@ import { Client } from "ssh2";
 import Key from "./key.js";
 import logger from "loglevel";
 
+const sshDebug = function () {
+  if (process.env["SSH2_DEBUG"]) {
+    return logger.debug;
+  } else {
+    return function () {};
+  }
+};
+
 export async function connectOptions(host) {
   const pairs = await new Key().getKeyPair();
   return {
@@ -27,6 +35,8 @@ export async function connectOptions(host) {
         agent: process.env.SSH_AUTH_SOCK,
       },
     ],
+    keepaliveInterval: 5000, // 5s
+    debug: sshDebug(),
   };
 }
 
@@ -123,28 +133,3 @@ export class SSHClient {
     );
   }
 }
-
-export async function dockerPullLzcAppsImage(host) {
-  logger.warn("* 更新lzcapp镜像, 未来可能会移除此操作");
-  const opts = await connectOptions(host);
-  const client = new SSHClient(opts);
-  await client.connect();
-  try {
-    const stream = await client.exec(
-      "docker pull registry.lazycat.cloud/lzc/lzcapp:0.1"
-    );
-
-    return new Promise((resolve, reject) => {
-      stream.stdout.pipe(process.stdout);
-      stream.stderr.pipe(process.stdout);
-      stream.on("close", () => {
-        client.close();
-        resolve();
-      });
-      stream.on("error", (e) => reject(e));
-    });
-  } catch (e) {
-    client.close();
-    throw e;
-  }
-}