@lazycatcloud/lzc-cli 1.3.12 → 1.3.13

package/lib/appstore/login.js

@@ -1,176 +1,179 @@
-import fetch from "node-fetch"
-import path from "path"
-import url from "url"
-import logger from "loglevel"
-import env from "../config/env.js"
-import inquirer from "inquirer"
-import { accountServerUrl } from "./env.js"
+import fetch from 'node-fetch';
+import path from 'path';
+import url from 'url';
+import logger from 'loglevel';
+import env from '../config/env.js';
+import inquirer from 'inquirer';
+import { accountServerUrl } from './env.js';
+import { t } from '../i18n/index.js';
 
 function join(...params) {
-  let x = ""
-  try {
-    // fix: url path join failed for windows
-    const u = new url.URL(params[0])
-    params.splice(0, 1)
-    u.pathname = path.posix.join(u.pathname, ...params)
-    x = u.toString()
-  } catch (error) {
-    console.warn(error)
-    x = path.join(...params)
-  }
-  return x
+	let x = '';
+	try {
+		// fix: url path join failed for windows
+		const u = new url.URL(params[0]);
+		params.splice(0, 1);
+		u.pathname = path.posix.join(u.pathname, ...params);
+		x = u.toString();
+	} catch (error) {
+		console.warn(error);
+		x = path.join(...params);
+	}
+	return x;
 }
 
 async function login(username, password) {
-  return fetch(join(accountServerUrl, "/api/login/signin"), {
-    method: "POST",
-    body: new URLSearchParams({
-      username: username,
-      password: password
-    })
-  })
-    .then(async (res) => {
-      let bodyText = await res.text()
-      try {
-        let body = JSON.parse(bodyText)
-        if (body.success) {
-          return Promise.resolve(body.data)
-        }
-        throw body
-      } catch (error) {
-        error.responseStatus = res.status
-        error.responseBody = bodyText
-        return Promise.reject(error)
-      }
-    })
-    .then((data) => {
-      env.set({ token: data.token }, true)
-      logger.info("登录成功!")
-    })
+	return fetch(join(accountServerUrl, '/api/login/signin'), {
+		method: 'POST',
+		body: new URLSearchParams({
+			username: username,
+			password: password,
+		}),
+	})
+		.then(async (res) => {
+			let bodyText = await res.text();
+			try {
+				let body = JSON.parse(bodyText);
+				if (body.success) {
+					return Promise.resolve(body.data);
+				}
+				throw body;
+			} catch (error) {
+				error.responseStatus = res.status;
+				error.responseBody = bodyText;
+				return Promise.reject(error);
+			}
+		})
+		.then((data) => {
+			env.set({ token: data.token }, true);
+			logger.info(t('lzc_cli.lib.appstore.login.login_success_tips', '登录成功!'));
+		});
 }
 
 async function isLogin() {
-  try {
-    let token = env.get("token")
-    if (!token) {
-      return false
-    }
-    return fetch(join(accountServerUrl, "/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
-      }
-      logger.debug(body.message)
-      return false
-    })
-  } catch (e) {
-    logger.trace(e)
-    return false
-  }
+	try {
+		let token = env.get('token');
+		if (!token) {
+			return false;
+		}
+		return fetch(join(accountServerUrl, '/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;
+			}
+			logger.debug(body.message);
+			return false;
+		});
+	} catch (e) {
+		logger.trace(e);
+		return false;
+	}
 }
 
 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
-    }
-  ])
+	const noEmpty = (value) => value != '';
+	return await inquirer.prompt([
+		{
+			type: 'input',
+			name: 'username',
+			message: t('lzc_cli.lib.login.ask_user_info_username_prompt', '请输入登录用户名'),
+			validate: noEmpty,
+		},
+		{
+			type: 'password',
+			mask: '*',
+			name: 'password',
+			message: t('lzc_cli.lib.login.ask_user_info_password_prompt', '请输入登录密码'),
+			validate: noEmpty,
+		},
+	]);
 }
 
 async function interactiveLogin() {
-  try {
-    let info = await askUserInfo()
-    await login(info.username, info.password)
-  } catch (e) {
-    logger.debug("login error: ", e)
-    if (e?.errorCode == 0 || e?.message == "密码错误") {
-      logger.error("帐号或者密码错误，请重新输入!")
-    } else {
-      logger.error(`登录失败，${e?.message ?? e}`)
-    }
-    return interactiveLogin()
-  }
+	try {
+		let info = await askUserInfo();
+		await login(info.username, info.password);
+	} catch (e) {
+		logger.debug('login error: ', e);
+		if (e?.errorCode == 0 || e?.message == '密码错误') {
+			logger.error(t('lzc_cli.lib.login.interactive_login_user_passwd_error_tips', '帐号或者密码错误，请重新输入!'));
+		} else {
+			logger.error(
+				t('lzc_cli.lib.login.interactive_login_fail_tips', `登录失败，{{message}}`, {
+					message: e?.message ?? e,
+				}),
+			);
+		}
+		return interactiveLogin();
+	}
 }
 
 function tipsFirstLogin() {
-  let token = env.get("token")
-  if (!token) {
-    // 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
-    logger.info(
-      "请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage"
-    )
-  }
+	let token = env.get('token');
+	if (!token) {
+		// 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
+		logger.info(t('lzc_cli.lib.login.tips_first_login_tips', '请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage'));
+	}
 }
 
 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
-    }
-  } else {
-    tipsFirstLogin()
-  }
-  await interactiveLogin()
+	let token = await isLogin();
+	if (token) {
+		const questions = [
+			{
+				name: 'relogin',
+				type: 'input',
+				default: 'n',
+				message: t('lzc_cli.lib.login.re_login_message_prompt', '检测到已经登录，是否重新登录(y/n):'),
+			},
+		];
+		const answers = await inquirer.prompt(questions);
+		if (answers.relogin.toLowerCase() === 'n') {
+			logger.info(`token: ${token}`);
+			return;
+		}
+	} else {
+		tipsFirstLogin();
+	}
+	await interactiveLogin();
 }
 
 export async function autoLogin() {
-  let token = await isLogin()
-  if (token) {
-    logger.debug("appstore 已经登录")
-    return
-  } else {
-    tipsFirstLogin()
-  }
+	let token = await isLogin();
+	if (token) {
+		logger.debug(t('lzc_cli.lib.login.auto_login_success', 'appstore 已经登录'));
+		return;
+	} else {
+		tipsFirstLogin();
+	}
 
-  logger.debug("token错误，尝试自动登录")
-  await interactiveLogin()
+	logger.debug(t('lzc_cli.lib.login.auto_login_interactive_login', 'token错误，尝试自动登录'));
+	await interactiveLogin();
 }
 
 export async function request(url, options = {}) {
-  await autoLogin()
+	await autoLogin();
 
-  const token = env.get("token")
+	const token = env.get('token');
 
-  let headers = {
-    "X-User-Token": token,
-    cookie: `userToken=${token}`
-  }
-  if (options.headers) {
-    headers = Object.assign({}, options.headers, headers)
-  }
+	let headers = {
+		'X-User-Token': token,
+		cookie: `userToken=${token}`,
+	};
+	if (options.headers) {
+		headers = Object.assign({}, options.headers, headers);
+	}
 
-  // logger.debug("token", token)
+	// logger.debug("token", token)
 
-  options = Object.assign({}, options, { headers })
-  logger.trace(`fetch ${url}`, options)
+	options = Object.assign({}, options, { headers });
+	logger.trace(`fetch ${url}`, options);
 
-  return fetch(url, options)
+	return fetch(url, options);
 }

package/lib/appstore/prePublish.js

@@ -1,115 +1,116 @@
-import { request, autoLogin } from "./login.js"
-import logger from "loglevel"
-import FormData from "form-data"
-import fs from "node:fs"
-import inquirer from "inquirer"
-import path from "node:path"
-import { isFileExist, isPngWithFile, unzipSync } from "../utils.js"
-import env from "../config/env.js"
-import { Publish } from "./publish.js"
+import { request, autoLogin } from './login.js';
+import logger from 'loglevel';
+import FormData from 'form-data';
+import fs from 'node:fs';
+import inquirer from 'inquirer';
+// import path from 'node:path';
+// import { isFileExist, isPngWithFile, unzipSync } from "../utils.js"
+import env from '../config/env.js';
+import { t } from '../i18n/index.js';
+import { Publish } from './publish.js';
 
 async function askChangeLog() {
-  const noEmpty = (value) => value != ""
-  return await inquirer.prompt([
-    {
-      name: "changelog",
-      type: "editor",
-      message: "填写 changelog 内容",
-      validate: noEmpty
-    }
-  ])
+	const noEmpty = (value) => value != '';
+	return await inquirer.prompt([
+		{
+			name: 'changelog',
+			type: 'editor',
+			message: t('lzc_cli.lib.pre_publish.ask_changelog_prompt', '填写 changelog 内容'),
+			validate: noEmpty,
+		},
+	]);
 }
 
 async function askGroup(choices) {
-  return (
-    await inquirer.prompt([
-      {
-        name: "type",
-        message: "选择内测组",
-        type: "list",
-        choices
-      }
-    ])
-  )["type"]
+	return (
+		await inquirer.prompt([
+			{
+				name: 'type',
+				message: t('lzc_cli.lib.pre_publish.ask_group_prompt', '选择内测组'),
+				type: 'list',
+				choices,
+			},
+		])
+	)['type'];
 }
 
 export class PrePublish {
-  constructor(baseUrl = "https://testflight.lazycat.cloud/api") {
-    this.baseUrl = baseUrl
-  }
+	constructor(baseUrl = 'https://testflight.lazycat.cloud/api') {
+		this.baseUrl = baseUrl;
+	}
 
-  async getDict() {
-    const url = this.baseUrl + "/groups/dict"
-    const token = env.get("token")
-    const res = await request(url, {
-      method: "GET",
-      headers: {
-        Authorization: `Bearer ${token}`
-      }
-    })
-    const text = (await res.text()).trim()
-    if (!Publish.isJSON(text)) {
-      logger.error(`parse error: dict resp text not is json`)
-      return
-    }
-    const respJson = await JSON.parse(text)
-    return respJson.data || []
-  }
+	async getDict() {
+		const url = this.baseUrl + '/groups/dict';
+		const token = env.get('token');
+		const res = await request(url, {
+			method: 'GET',
+			headers: {
+				Authorization: `Bearer ${token}`,
+			},
+		});
+		const text = (await res.text()).trim();
+		if (!Publish.isJSON(text)) {
+			logger.error(`parse error: dict resp text not is json`);
+			return;
+		}
+		const respJson = await JSON.parse(text);
+		return respJson.data || [];
+	}
 
-  async upload(groupId, changelog, pkgPath) {
-    const form = new FormData()
-    form.append("type", "Lpk")
-    form.append("changelog", changelog)
-    form.append("file", fs.createReadStream(pkgPath))
+	async upload(groupId, changelog, pkgPath) {
+		const form = new FormData();
+		form.append('type', 'Lpk');
+		form.append('changelog', changelog);
+		form.append('file', fs.createReadStream(pkgPath));
 
-    const url = this.baseUrl + `/group/${groupId}/upload`
-    const token = env.get("token")
-    const res = await request(url, {
-      method: "POST",
-      body: form,
-      headers: {
-        Authorization: `Bearer ${token}`
-      }
-    })
-    const text = (await res.text()).trim()
-    if (!Publish.isJSON(text)) {
-      logger.error(`parse error: upload resp text not is json`, text)
-      return
-    }
-    const respJson = await JSON.parse(text)
-    logger.debug("upload lpk response", respJson)
-    return respJson
-  }
+		const url = this.baseUrl + `/group/${groupId}/upload`;
+		const token = env.get('token');
+		const res = await request(url, {
+			method: 'POST',
+			body: form,
+			headers: {
+				Authorization: `Bearer ${token}`,
+			},
+		});
+		const text = (await res.text()).trim();
+		if (!Publish.isJSON(text)) {
+			logger.error(`parse error: upload resp text not is json`, text);
+			return;
+		}
+		const respJson = await JSON.parse(text);
+		logger.debug('upload lpk response', respJson);
+		return respJson;
+	}
 
-  /**
-   * @param {string} pkgPath
-   * @param {string} changelog
-   */
-  async publish(pkgPath, changelog, gid) {
-    if (!Publish.preCheck(pkgPath)) return
+	/**
+	 * @param {string} pkgPath
+	 * @param {string} changelog
+	 */
+	async publish(pkgPath, changelog, gid) {
+		if (!Publish.preCheck(pkgPath)) return;
 
-    await autoLogin()
+		await autoLogin();
 
-    if (!gid) {
-      const groups = await this.getDict()
-      const groupName = await askGroup(groups.map((it) => it.name))
-      gid = groups.find((it) => it.name == groupName)?.id
-    }
-    if (!gid) {
-      logger.error("请选择内测组")
-      return
-    }
-    if (!changelog) {
-      const answer = await askChangeLog()
-      changelog = answer.changelog
-    }
-    changelog = changelog.trim() // clean space ^:)
-    logger.info("正在提交内测...")
-    const resp = await this.upload(gid, changelog, pkgPath)
-    if (resp.success) {
-      logger.info("应用提交成功! 请在内测工具中查看")
-    } else {
-      logger.error(`应用提交失败: ${resp.msg}`)
-    }
-  }
+		if (!gid) {
+			const groups = await this.getDict();
+			const groupName = await askGroup(groups.map((it) => it.name));
+			gid = groups.find((it) => it.name == groupName)?.id;
+		}
+		if (!gid) {
+			logger.error(t('lzc_cli.lib.pre_publish.publish_gid_not_exist_tips', '请选择内测组'));
+			return;
+		}
+		if (!changelog) {
+			const answer = await askChangeLog();
+			changelog = answer.changelog;
+		}
+		changelog = changelog.trim(); // clean space ^:)
+		logger.info(t('lzc_cli.lib.pre_publish.publish_pending_tips', '正在提交内测...'));
+		const resp = await this.upload(gid, changelog, pkgPath);
+		if (resp.success) {
+			logger.info(t('lzc_cli.lib.pre_publish.publish_done_tips', '应用提交成功! 请在内测工具中查看'));
+		} else {
+			logger.error(t('lzc_cli.lib.pre_publish.publish_fail_tips', `应用提交失败: {{message}}`, { message: resp.msg }));
+		}
+	}
 }