@lazycatcloud/lzc-cli 1.1.7 → 1.1.8

package/lib/api.js

@@ -28,8 +28,11 @@ export default class API {
   // build boolean 是否构建app容器
   // pull boolean 是否从docker.io拉取image
   async install(zipPath, params) {
+    if (!fs.existsSync(zipPath)) {
+      throw `${zipPath} 不存在`
+    }
     const resp = await request(
-      `${this.host}/api/v1/app/install`,
+      `${this.host}/api/v1/app/install?id=${this.appId}`,
       {
         method: "POST",
         body: fs.createReadStream(zipPath),

package/lib/app/index.js

@@ -21,7 +21,7 @@ export function lpkProjectCommand(program) {
       builder: (args) => {
         args.option("o", {
           alias: "output",
-          describe: "输出文件夹",
+          describe: "输出文件",
           type: "string",
         });
       },
@@ -31,8 +31,9 @@ export function lpkProjectCommand(program) {
         // 正常的打包逻辑不需要 devshell
         lpk.onBeforeBuildPackage(async (options) => {
           delete options["devshell"];
+
           if (output) {
-            options["pkgout"] = output;
+            options["lpkPath"] = output;
           }
           return options;
         });

package/lib/app/lpk_build.js

@@ -168,9 +168,13 @@ export class LpkBuild {
       logger.warn("跳过执行 buildscript");
     }
 
-    const pkgout = path.resolve(this.pwd, this.options["pkgout"]);
-    if (!isDirExist(pkgout)) {
-      throw `${pkgout} 不存在`;
+    let packName = this.options["lpkPath"]
+
+    if (!packName) {
+      const pkgout = path.resolve(this.pwd, this.options["pkgout"]);
+      if (!isDirExist(pkgout)) {
+        throw `${pkgout} 不存在`;
+      }
     }
 
     const tempDir = fs.mkdtempSync(".lzc-cli-build");
@@ -202,6 +206,9 @@ export class LpkBuild {
 
     // 开始生成 manifest.yml
     let manifest = await this.getManifest();
+    if (process.env.LZC_VERSION) {
+      manifest.version = process.env.LZC_VERSION
+    }
     if (this.beforeDumpYamlFn.length > 0) {
       manifest = await this.beforeDumpYamlFn.reduce(async (prev, curr) => {
         return await curr(await prev, this.options);
@@ -217,8 +224,13 @@ export class LpkBuild {
         return prev;
       }, {});
     }
-    const packName = `${prefix}${manifest.package}-v${manifest.version}.lpk`;
-    const lpkPath = await archiveFolderTo(tempDir, path.join(pkgout, packName));
+
+
+    if (!packName) {
+      packName = `${prefix}${manifest.package}-v${manifest.version}.lpk`;
+    }
+
+    const lpkPath = await archiveFolderTo(tempDir, packName);
     logger.info(`输出lpk包 ${lpkPath.path}`);
 
     // remove temp file

package/lib/appstore/login.js

@@ -0,0 +1,134 @@
+import fetch from "node-fetch";
+import path from "path";
+import FormData from "form-data";
+import process from "process";
+import fs from "fs";
+import { APP_FOLDER, APP_CONFIG_FILE } from "../utils.js"
+
+const server = "https://account.lazycat.cloud"
+
+function genFormData(data) {
+  const form = new FormData();
+  for (const name in data) {
+    form.append(name, data[name]);
+  }
+  return form
+}
+
+function join(...params) {
+  var x = path.join(...params);
+  return x;
+}
+
+function Login(username, password) {
+  let form = genFormData({ username, password })
+  return fetch(join(server, "/api/login/signin"), {
+    method: "POST",
+    headers: {
+      "content-type": `multipart/form-data; boundary=${form.getBoundary()}`
+    },
+    body: form
+  }).then(async res => {
+    let bodyText = await res.text();
+    let body = JSON.parse(bodyText)
+    if (body.success) {
+      return Promise.resolve(body.data)
+    }
+    return Promise.reject(body.message)
+  }).then(data => {
+    setToken(username, password, data.token)
+  })
+}
+
+async function IsLogin() {
+  try {
+    let token = getToken()
+    if (!token) {
+      return false
+    }
+    return fetch(join(server, "/api/user/current"), {
+      method: "GET",
+      headers: {
+        "X-User-Token": token
+      },
+    }).then(async res => {
+      let bodyText = await res.text();
+      let body = JSON.parse(bodyText)
+      if (body.success) {
+        return token
+      }
+      console.log(body.message);
+      return false
+    })
+  } catch (e) {
+    console.log(e);
+  }
+
+  return false
+}
+
+async function AutoLogin() {
+  try {
+    let token = await IsLogin()
+    if (!!token) {
+      return true
+    }
+
+    console.log("token错误，尝试自动登录");
+    let obj = getLocalObj()
+    if (!!obj && !!obj.username && !!obj.password) {
+      let l = await Login(obj.username, obj.password)
+      return true
+    }
+  } catch (e) {
+    console.log(e);
+  }
+  removeToken()
+  throw "自动登录失败"
+}
+
+const TokenFile = "user.json"
+const encoding = "utf8"
+function setToken(username, password, token) {
+  let configHome = join(process.cwd(), APP_FOLDER, APP_CONFIG_FILE)
+  if (!fs.existsSync(configHome)) {
+    fs.mkdirSync(configHome, { recursive: true })
+  }
+  let tokenFile = join(configHome, TokenFile)
+  let content = JSON.stringify({ username, password, token })
+  fs.writeFileSync(tokenFile, content, {
+    encoding,
+    flag: "w",
+    mode: 0o666
+  })
+}
+
+function getToken() {
+  let tokenFile = join(process.cwd(), APP_FOLDER, APP_CONFIG_FILE, TokenFile)
+  let buf = fs.readFileSync(tokenFile, { encoding, flag: 'r' })
+  let obj = JSON.parse(buf)
+  if (!obj || !obj.token) {
+    throw "读取本地文件失败"
+  }
+  return obj.token
+}
+
+function getLocalObj() {
+  let tokenFile = join(process.cwd(), APP_FOLDER, APP_CONFIG_FILE, TokenFile)
+  let buf = fs.readFileSync(tokenFile, { encoding, flag: 'r' })
+  let obj = JSON.parse(buf)
+  if (!obj || !obj.token) {
+    throw "读取本地文件失败"
+  }
+  return obj
+}
+
+function removeToken() {
+  let tokenFile = join(process.cwd(), APP_FOLDER, APP_CONFIG_FILE, TokenFile)
+  return fs.rmSync(tokenFile)
+}
+
+export default {
+  Login,
+  AutoLogin
+}

package/lib/autologin.js

@@ -64,20 +64,18 @@ export async function tryAuthLogin(url) {
   try {
     if (!AutoLoginToken) {
       let _url = new URL(url);
-      let u = _url.host.split(".").reverse().slice(0, 3).reverse().join(".");
+      let u = "sdk."+_url.host.split(".").reverse().slice(0, 3).reverse().join(".");
 
-      console.log(`${u} 尝试自动登录...`);
+      console.log(`登陆到 ${u}`);
 
       let data = await fetchTokenAction(`${_url.protocol}//${u}`);
       let data2 = await fetchTokenActionAndRedirect(data.token, data.action);
 
       AutoLoginToken = data2.token;
-      console.log(`自动登录成功！`);
       return AutoLoginToken;
     }
   } catch (e) {
-    console.error(e);
-    console.log(`尝试自动登录失败，正在使用默认的登录方式...`);
+    console.log(`无法登陆`);
     AutoLoginFailed = true;
     return "";
   }

package/lib/box/index.js

@@ -71,7 +71,7 @@ export function boxCommand(box) {
         if (!defaultBoxName) {
           // 新创建的盒子在初始化的时候，盒子里面需要安装hc的组件，需要一点时间，
           // 所以这里并不对sdk url进行校验是否有效
-          await sdkEnv.setDefaultBoxName(answer.boxName, false);
+          await sdkEnv.setDefaultBoxName(answer.boxName);
         }
 
         let h = await initHportal();

package/lib/env.js

@@ -5,9 +5,6 @@ import {
   APP_CONFIG_FILE,
   GLOBAL_CONFIG_DIR,
   APP_FOLDER,
-  findAppIsInstalled,
-  checkSDKInstallStatus,
-  InstallSDK,
 } from "./utils.js";
 import { debuglog } from "util";
 import inquirer from "inquirer";
@@ -251,29 +248,20 @@ 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 request(`${this.sdkUrl}/api/v1/ping`);
+      if (resp.status != 200) throw new Error(chalk.red("debug.bridge服务未正常运行"));
+    } catch (e) {
+      console.log(chalk.yellow("检测到SDK尚未安装，请将盒子开启开发者模式"));
+      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);
   }
 
@@ -285,31 +273,6 @@ class SDKEnv {
     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;
-    }
-  }
-
   /**
    * 提示用户回答问题
    *

package/lib/utils.js

@@ -27,103 +27,6 @@ export const envsubstr = async (templateContents, args) => {
   const parse = await importDefault("envsub/js/envsub-parser.js");
   return parse(templateContents, args);
 };
-/**
- * 为盒子安装SDK应用
- * @param box_url 盒子入口地址
- **/
-async function InstallSDK(box_url) {
-  try {
-    let url = `${box_url}/api/app/apply?id=sdk`;
-    const resp = await request(url, { method: "post" });
-    if (resp.status != 200) {
-      throw new Error(
-        chalk.red(
-          `无法安装, 请确保 ${chalk.yellow(
-            new URL(url).origin
-          )} 可以访问或者在应用商店安装 sdk`
-        )
-      );
-    }
-  } catch (err) {
-    throw err;
-  }
-}
-/**
- * 检查SDK安装部署的状态
- * @param box_url 盒子入口地址
- **/
-async function checkSDKInstallStatus(box_url) {
-  const checkSDKstatus = async function (box_url) {
-    let url = `${box_url}/api/app/status?id=sdk`;
-    const resp = await request(url);
-    if (resp.status == 200) {
-      const status = await resp.json();
-      return status;
-    } else {
-      let text = await resp.text();
-      throw text;
-    }
-  };
-  const spinner = ora().start();
-  let { status, info } = await checkSDKstatus(box_url);
-  spinner.text = "部署进度";
-  switch (status) {
-    case "running":
-      console.log(chalk.yellow("应用正在运行中"));
-      break;
-    case "error":
-      spinner.stop();
-      console.log(status, info);
-      throw info.msg;
-    default:
-      try {
-        await desireStatusTimer(
-          (result) => {
-            spinner.text = "部署进度 " + result.status;
-            return result.status === "running";
-          },
-          () => {
-            return checkSDKstatus(box_url);
-          }
-        );
-      } catch (error) {
-        throw error;
-      } finally {
-        spinner.stop();
-      }
-      break;
-  }
-  spinner.stop();
-}
-
-/**
- * 获取所有已安装的app
- * @param box_url 盒子入口地址
- **/
-async function getInstalledApps(box_url) {
-  try {
-    let url = `${box_url}/api/app/dump`;
-    const resp = await request(url);
-    if (resp.status != 200) throw new Error(chalk.red("获取所有已安装App失败"));
-    return await resp.json();
-  } catch (e) {
-    console.log(e);
-  }
-}
-/**
- * 查找某个app是否已安装]
- * @param box_url 盒子入口地址
- * @param app_id app名
- * */
-async function findAppIsInstalled(box_url, app_id) {
-  const apps = await getInstalledApps(box_url);
-  for (let app in apps) {
-    if (app == app_id) {
-      return true;
-    }
-  }
-  return false;
-}
 
 /**
  * 确保文件夹存在
@@ -456,10 +359,6 @@ export {
   GitIgnore,
   isFileExist,
   urlHostname,
-  InstallSDK,
-  findAppIsInstalled,
-  getInstalledApps,
-  checkSDKInstallStatus,
   envTemplateFile,
   createTemplateFile,
   parse2CorrectName,

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "lazycat cloud developer kit",
   "scripts": {
-    "test": "mocha",
-    "publish": "npm publish --access public"
+    "test": "mocha"
   },
   "mocha": {
     "recursive": true,