@lazycatcloud/lzc-cli 1.1.8 → 1.1.9

package/lib/appstore/login.js

@@ -1,134 +1,137 @@
 import fetch from "node-fetch";
 import path from "path";
+import logger from "loglevel";
+import env from "../env.js";
+import inquirer from "inquirer";
 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
-}
+const accountServerUrl = "https://account.lazycat.cloud";
 
 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"), {
+function login(username, password) {
+  const form = new FormData();
+  form.append("username", username);
+  form.append("password", password);
+
+  return fetch(join(accountServerUrl, "/api/login/signin"), {
     method: "POST",
     headers: {
-      "content-type": `multipart/form-data; boundary=${form.getBoundary()}`
+      "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)
+    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) => {
+      env.set({ token: data.token }, true);
+      logger.info("登录成功!");
+    });
 }
 
-async function IsLogin() {
+async function isLogin() {
   try {
-    let token = getToken()
+    let token = env.get("token");
     if (!token) {
-      return false
+      return false;
     }
-    return fetch(join(server, "/api/user/current"), {
+    return fetch(join(accountServerUrl, "/api/user/current"), {
       method: "GET",
       headers: {
-        "X-User-Token": token
+        "X-User-Token": token,
       },
-    }).then(async res => {
+    }).then(async (res) => {
       let bodyText = await res.text();
-      let body = JSON.parse(bodyText)
+      let body = JSON.parse(bodyText);
       if (body.success) {
-        return token
+        return token;
       }
-      console.log(body.message);
-      return false
-    })
+      logger.debug(body.message);
+      return false;
+    });
   } catch (e) {
-    console.log(e);
+    logger.trace(e);
+    return false;
   }
-
-  return false
 }
 
-async function AutoLogin() {
-  try {
-    let token = await IsLogin()
-    if (!!token) {
-      return true
-    }
+async function askUserInfo() {
+  const noEmpty = (value) => value != "";
+  return await inquirer.prompt([
+    {
+      type: "input",
+      name: "username",
+      message: "请输入登录用户名",
+      validate: noEmpty,
+    },
+    {
+      type: "password",
+      mask: "*",
+      name: "password",
+      message: "请输入登录密码",
+      validate: noEmpty,
+    },
+  ]);
+}
 
-    console.log("token错误，尝试自动登录");
-    let obj = getLocalObj()
-    if (!!obj && !!obj.username && !!obj.password) {
-      let l = await Login(obj.username, obj.password)
-      return true
+export async function reLogin() {
+  let token = await isLogin();
+  if (token) {
+    const questions = [
+      {
+        name: "relogin",
+        type: "input",
+        default: "n",
+        message: "检测到已经登录，是否重新登录(y/n):",
+      },
+    ];
+    const answers = await inquirer.prompt(questions);
+    if (answers.relogin.toLowerCase() === "n") {
+      logger.info(`token: ${token}`);
+      return;
     }
-  } 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
-  })
+  let info = await askUserInfo();
+  await login(info.username, info.password);
 }
 
-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 "读取本地文件失败"
+export async function autoLogin() {
+  let token = await isLogin();
+  if (token) {
+    logger.debug("appstore 已经登录");
+    return;
   }
-  return obj.token
+
+  logger.debug("token错误，尝试自动登录");
+  let info = await askUserInfo();
+  await login(info.username, info.password);
 }
 
-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 "读取本地文件失败"
+export async function request(url, options = {}) {
+  await autoLogin();
+
+  const token = env.get("token");
+
+  let headers = {
+    "X-User-Token": token,
+    cookie: `userToken=${token}`,
+  };
+  if (options.headers) {
+    headers = Object.assign({}, options.headers, headers);
   }
-  return obj
-}
 
-function removeToken() {
-  let tokenFile = join(process.cwd(), APP_FOLDER, APP_CONFIG_FILE, TokenFile)
-  return fs.rmSync(tokenFile)
-}
+  options = Object.assign({}, options, { headers });
+  logger.trace(`fetch ${url}`, options);
 
-export default {
-  Login,
-  AutoLogin
-}
+  return fetch(url, options);
+}

package/lib/appstore/publish.js

@@ -0,0 +1,62 @@
+import { request } from "./login.js";
+import logger from "loglevel";
+import FormData from "form-data";
+import fs from "node:fs";
+import inquirer from "inquirer";
+import { spawnSync } from "node:child_process";
+import path from "node:path";
+import { isFileExist } from "../utils.js";
+
+async function askChangeLog() {
+  const noEmpty = (value) => value != "";
+  return await inquirer.prompt([
+    {
+      name: "changelog",
+      type: "editor",
+      message: "填写 changelog 内容",
+      validate: noEmpty,
+    },
+  ]);
+}
+
+export class Publish {
+  constructor(baseUrl = "https://developer.lazycat.cloud/api/app") {
+    this.baseUrl = baseUrl;
+  }
+
+  async publish(pkgPath, changelog) {
+    const tempDir = fs.mkdtempSync(".lzc-cli-publish");
+    try {
+      spawnSync("unzip", ["-d", tempDir, pkgPath]);
+      if (isFileExist(path.join(tempDir, "devshell"))) {
+        throw "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建";
+      }
+    } finally {
+      fs.rmSync(tempDir, { recursive: true });
+    }
+
+    if (!changelog) {
+      const answer = await askChangeLog();
+      changelog = answer.changelog;
+    }
+
+    logger.info("正在发布...");
+    const form = new FormData();
+    form.append("files", fs.createReadStream(pkgPath));
+    form.append("changelog", changelog);
+
+    return request(this.baseUrl + "/update", {
+      method: "POST",
+      body: form,
+    }).then(async (res) => {
+      if (res.status != 200) {
+        logger.error(await res.text());
+        return;
+      }
+
+      logger.info("发布成功!");
+      logger.debug("publish response", await res.json());
+      return;
+    });
+  }
+}

package/lib/autologin.js

@@ -1,82 +1,4 @@
 import fetch from "node-fetch";
-
-// autologin.js 提供一个封装好的 fetch request 请求方法，通过这个中间件，可以不用考虑
-// auth:auto 所做的授权验证。
-let AutoLoginToken = "";
-let AutoLoginFailed = false;
-
-function fetchTokenAction(url) {
-  return fetch(url).then(async (res) => {
-    const body = await res.text();
-    const token = body.match(/name=\"token\" value=\"(.*?)\"/i)[1];
-    const action = body.match(/action=\"(.*?)\"/i)[1];
-
-    return { token, action };
-  });
-}
-
-function fetchTokenActionAndRedirect(dataToken, dataAction) {
-  return fetch(dataAction, {
-    method: "POST",
-    body: `token=${dataToken}`,
-    redirect: "follow",
-    headers: {
-      accept:
-        "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
-      "accept-language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7",
-      "content-type": "application/x-www-form-urlencoded",
-    },
-  }).then(async (res) => {
-    let body = await res.text();
-    const token = body.match(/name=\"token\" value=\"(.*?)\"/i)[1];
-    const action = body.match(/action=\"(.*?)\"/i)[1];
-    const redirect = body.match(/name=\"redirect\" value=\"(.*?)\"/i)[1];
-
-    return { token, action, redirect };
-  });
-}
-
 export async function request(url, options = {}) {
-  if (AutoLoginFailed) {
-    return fetch(url, options);
-  }
-
-  await tryAuthLogin(url);
-
-  if (!AutoLoginToken) {
-    return fetch(url, options);
-  }
-
-  let headers = { cookie: `HC-Auth-Token=${AutoLoginToken}` };
-  if (options.headers) {
-    headers = Object.assign({}, options.headers, headers);
-  }
-
-  options = Object.assign({}, options, { headers });
   return fetch(url, options);
 }
-
-export async function tryAuthLogin(url) {
-  if (!url.startsWith("http")) {
-    url = "https://" + url;
-  }
-
-  try {
-    if (!AutoLoginToken) {
-      let _url = new URL(url);
-      let u = "sdk."+_url.host.split(".").reverse().slice(0, 3).reverse().join(".");
-
-      console.log(`登陆到 ${u}`);
-
-      let data = await fetchTokenAction(`${_url.protocol}//${u}`);
-      let data2 = await fetchTokenActionAndRedirect(data.token, data.action);
-
-      AutoLoginToken = data2.token;
-      return AutoLoginToken;
-    }
-  } catch (e) {
-    console.log(`无法登陆`);
-    AutoLoginFailed = true;
-    return "";
-  }
-}