@lazycatcloud/lzc-cli 1.3.12 → 1.3.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,145 +1,139 @@
1
- import { request, autoLogin } from "./login.js"
2
- import logger from "loglevel"
3
- import FormData from "form-data"
4
- import fs from "node:fs"
5
- import inquirer from "inquirer"
6
- import path from "node:path"
7
- import {
8
- isFileExist,
9
- isPngWithFile,
10
- unzipSync,
11
- loadFromYaml,
12
- isValidPackageName,
13
- getLanguageForLocale
14
- } from "../utils.js"
15
- import { appStoreServerUrl } from "./env.js"
1
+ import { request, autoLogin } from './login.js';
2
+ import logger from 'loglevel';
3
+ import FormData from 'form-data';
4
+ import fs from 'node:fs';
5
+ import inquirer from 'inquirer';
6
+ import path from 'node:path';
7
+ import { isFileExist, isPngWithFile, unzipSync, loadFromYaml, isValidPackageName, getLanguageForLocale } from '../utils.js';
8
+ import { t } from '../i18n/index.js';
9
+ import { appStoreServerUrl } from './env.js';
16
10
 
17
11
  async function askChangeLog(locale) {
18
- const noEmpty = (value) => value != ""
19
- return await inquirer.prompt([
20
- {
21
- name: "changelog",
22
- type: "editor",
23
- message: `填写 changelog 内容 (${locale})`,
24
- validate: noEmpty
25
- }
26
- ])
12
+ const noEmpty = (value) => value != '';
13
+ return await inquirer.prompt([
14
+ {
15
+ name: 'changelog',
16
+ type: 'editor',
17
+ message: t('lzc_cli.lib.publish.ask_changelog_prompt', `填写 changelog 内容 ({{ locale }})`, { locale }),
18
+ validate: noEmpty,
19
+ },
20
+ ]);
27
21
  }
28
22
 
29
- async function getCategories(baseUrl, locale = "zh") {
30
- const response = await request(`${baseUrl}/app/category?size=100`, {
31
- method: "GET"
32
- })
33
- const langKey = getLanguageForLocale(locale)
34
- const { items: data } = await response.json()
35
- console.log("data", data)
36
- return data
37
- .sort((a, b) => a.index - b.index)
38
- .map((cat) => {
39
- let localize_name = (cat?.localize_name ?? {})[langKey] ?? undefined
40
- return {
41
- name: localize_name ?? cat.name,
42
- value: cat.id
43
- }
44
- })
23
+ async function getCategories(baseUrl, locale = 'zh') {
24
+ const response = await request(`${baseUrl}/app/category?size=100`, {
25
+ method: 'GET',
26
+ });
27
+ const langKey = getLanguageForLocale(locale);
28
+ const { items: data } = await response.json();
29
+ console.log('data', data);
30
+ return data
31
+ .sort((a, b) => a.index - b.index)
32
+ .map((cat) => {
33
+ let localize_name = (cat?.localize_name ?? {})[langKey] ?? undefined;
34
+ return {
35
+ name: localize_name ?? cat.name,
36
+ value: cat.id,
37
+ };
38
+ });
45
39
  }
46
40
 
47
41
  async function askPublishAppInfo(baseUrl, manifest, locale) {
48
- // 获取分类列表
49
- // const categories = await getCategories(baseUrl, locale)
50
- const langKey = getLanguageForLocale(locale)
42
+ // 获取分类列表
43
+ // const categories = await getCategories(baseUrl, locale)
44
+ const langKey = getLanguageForLocale(locale);
51
45
 
52
- const questions = [
53
- {
54
- type: "input",
55
- name: "name",
56
- message: "请输入应用名称:",
57
- default: manifest["name"],
58
- validate: (input) => (input.trim() !== "" ? true : "应用名称不能为空")
59
- },
60
- {
61
- type: "input",
62
- name: "package",
63
- message: "请输入应用包标识符:",
64
- default: manifest["package"],
65
- validate: (input) =>
66
- isValidPackageName(input)
67
- ? true
68
- : "应用包标识符不符合规范,建议使用反向域名表示法"
69
- },
70
- // {
71
- // type: "input",
72
- // name: "description",
73
- // message: "请输入应用描述:",
74
- // default: manifest["description"] || ""
75
- // },
76
- // {
77
- // type: "input",
78
- // name: "brief",
79
- // message: "请输入应用简介(简单的概述):",
80
- // default: ""
81
- // },
82
- // 开发者暂时不能配置应用分类
83
- // {
84
- // type: "checkbox",
85
- // name: "category",
86
- // message: "请选择应用分类:",
87
- // choices: categories,
88
- // validate: (input) => (input.length > 0 ? true : "请至少选择一个分类")
89
- // },
90
- // {
91
- // type: "input",
92
- // name: "keywords",
93
- // message: "请输入关键词(用逗号分隔):",
94
- // default: ""
95
- // },
96
- {
97
- type: "input",
98
- name: "source",
99
- message: "请输入应用来源(原创应用可不填):",
100
- default: manifest["homepage"] || ""
101
- },
102
- {
103
- type: "input",
104
- name: "author",
105
- message: "请输入作者名称(原创应用可不填):",
106
- default: manifest["author"] || ""
107
- }
108
- ]
46
+ const questions = [
47
+ {
48
+ type: 'input',
49
+ name: 'name',
50
+ message: t('lzc_cli.lib.publish.ask_publish_app_info_name_prompt', '请输入应用名称:'),
51
+ default: manifest['name'],
52
+ validate: (input) => (input.trim() !== '' ? true : t('lzc_cli.lib.publish.ask_publish_app_info_name_validate', '应用名称不能为空')),
53
+ },
54
+ {
55
+ type: 'input',
56
+ name: 'package',
57
+ message: t('lzc_cli.lib.publish.ask_publish_app_info_package_prompt', '请输入应用包标识符:'),
58
+ default: manifest['package'],
59
+ validate: (input) =>
60
+ isValidPackageName(input) ? true : t('lzc_cli.lib.publish.ask_publish_app_info_package_validate', '应用包标识符不符合规范,建议使用反向域名表示法'),
61
+ },
62
+ // {
63
+ // type: "input",
64
+ // name: "description",
65
+ // message: "请输入应用描述:",
66
+ // default: manifest["description"] || ""
67
+ // },
68
+ // {
69
+ // type: "input",
70
+ // name: "brief",
71
+ // message: "请输入应用简介(简单的概述):",
72
+ // default: ""
73
+ // },
74
+ // 开发者暂时不能配置应用分类
75
+ // {
76
+ // type: "checkbox",
77
+ // name: "category",
78
+ // message: "请选择应用分类:",
79
+ // choices: categories,
80
+ // validate: (input) => (input.length > 0 ? true : "请至少选择一个分类")
81
+ // },
82
+ // {
83
+ // type: "input",
84
+ // name: "keywords",
85
+ // message: "请输入关键词(用逗号分隔):",
86
+ // default: ""
87
+ // },
88
+ {
89
+ type: 'input',
90
+ name: 'source',
91
+ message: t('lzc_cli.lib.publish.ask_publish_app_info_source_prompt', '请输入应用来源(原创应用可不填):'),
92
+ default: manifest['homepage'] || '',
93
+ },
94
+ {
95
+ type: 'input',
96
+ name: 'author',
97
+ message: t('lzc_cli.lib.publish.ask_publish_app_info_author_prompt', '请输入作者名称(原创应用可不填):'),
98
+ default: manifest['author'] || '',
99
+ },
100
+ ];
109
101
 
110
- const answers = await inquirer.prompt(questions)
111
- return {
112
- language: langKey, // 应用主要语言(后续需要做成可以让用户选择)
113
- ...answers
114
- }
102
+ const answers = await inquirer.prompt(questions);
103
+ return {
104
+ language: langKey, // 应用主要语言(后续需要做成可以让用户选择)
105
+ ...answers,
106
+ };
115
107
  }
116
108
 
117
109
  async function askWhetherCreateLPK(baseUrl, manifest, locale) {
118
- const answers = await inquirer.prompt([
119
- {
120
- name: "continue",
121
- type: "input",
122
- message:
123
- "检测到您当前的应用,还没有在懒猫微服中创建,是否使用当前的安装包中的信息进行创建? [y/n]",
124
- default: "y"
125
- }
126
- ])
127
- if (answers.continue.toLowerCase() === "y") {
128
- const appInfo = await askPublishAppInfo(baseUrl, manifest, locale)
129
- const crateAppRes = await request(`${baseUrl}/app/create`, {
130
- method: "POST",
131
- body: JSON.stringify({
132
- package: appInfo.package,
133
- language: appInfo.language,
134
- name: appInfo.name,
135
- source: appInfo.source,
136
- source_author: appInfo.author
137
- })
138
- })
139
- logger.debug("create app res: ", await crateAppRes.text())
140
- logger.info(`创建 ${manifest["package"]} 应用成功!`)
141
- } else {
142
- logger.info(`当前想发布的应用没有在 '懒猫微服的开发者中心' 创建,请按照以下步骤创建:
110
+ const answers = await inquirer.prompt([
111
+ {
112
+ name: 'continue',
113
+ type: 'input',
114
+ message: t('lzc_cli.lib.publish.ask_whether_create_lpk_continue_prompt', '检测到您当前的应用,还没有在懒猫微服中创建,是否使用当前的安装包中的信息进行创建? [y/n]'),
115
+ default: 'y',
116
+ },
117
+ ]);
118
+ if (answers.continue.toLowerCase() === 'y') {
119
+ const appInfo = await askPublishAppInfo(baseUrl, manifest, locale);
120
+ const crateAppRes = await request(`${baseUrl}/app/create`, {
121
+ method: 'POST',
122
+ body: JSON.stringify({
123
+ package: appInfo.package,
124
+ language: appInfo.language,
125
+ name: appInfo.name,
126
+ source: appInfo.source,
127
+ source_author: appInfo.author,
128
+ }),
129
+ });
130
+ logger.debug('create app res: ', await crateAppRes.text());
131
+ logger.info(t('lzc_cli.lib.publish.ask_whether_create_lpk_success_tips', `创建 {{ package }} 应用成功!`, { package: manifest['package'], interpolation: { escapeValue: false } }));
132
+ } else {
133
+ logger.info(
134
+ t(
135
+ 'lzc_cli.lib.publish.ask_whether_create_lpk_fail_tips',
136
+ `当前想发布的应用没有在 '懒猫微服的开发者中心' 创建,请按照以下步骤创建:
143
137
 
144
138
  1. 浏览器打开 https://developer.lazycat.cloud/manage
145
139
  2. 登录您的开发者帐号
@@ -147,149 +141,155 @@ async function askWhetherCreateLPK(baseUrl, manifest, locale) {
147
141
  4. 点击 '新增',根据您的应用信息进行填写
148
142
  5. 填写完成后,点击创建即可
149
143
  6. 创建成功后,您可以通过 'lzc-cli appstore publish' 来发布应用了
150
- `)
151
- process.exit(1)
152
- }
144
+ `,
145
+ ),
146
+ );
147
+ process.exit(1);
148
+ }
153
149
  }
154
150
 
155
151
  export class Publish {
156
- constructor(baseUrl = `${appStoreServerUrl}/api/v3/developer`) {
157
- this.baseUrl = baseUrl
158
- }
152
+ constructor(baseUrl = `${appStoreServerUrl}/api/v3/developer`) {
153
+ this.baseUrl = baseUrl;
154
+ }
159
155
 
160
- /**
161
- * @param {string} raw
162
- */
163
- static isJSON(raw) {
164
- const ml = raw.length
165
- if (ml <= 1) return false
166
- return raw[0] == "{" && raw[ml - 1] == "}"
167
- }
156
+ /**
157
+ * @param {string} raw
158
+ */
159
+ static isJSON(raw) {
160
+ const ml = raw.length;
161
+ if (ml <= 1) return false;
162
+ return raw[0] == '{' && raw[ml - 1] == '}';
163
+ }
168
164
 
169
- static preCheck(pkgPath) {
170
- const tempDir = fs.mkdtempSync(".lzc-cli-publish")
171
- try {
172
- unzipSync(pkgPath, tempDir, ["devshell", "icon.png"])
173
- if (isFileExist(path.join(tempDir, "devshell"))) {
174
- logger.error(
175
- "不能发布一个devshell的版本,请重新使用 `lzc-cli project build` 构建"
176
- )
177
- return false
178
- }
179
- const tempIcon = path.join(tempDir, "icon.png")
180
- if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
181
- logger.error("icon 必须存在且要求是 png 格式")
182
- return false
183
- }
184
- return true
185
- } finally {
186
- fs.rmSync(tempDir, { recursive: true })
187
- }
188
- }
165
+ static preCheck(pkgPath) {
166
+ const tempDir = fs.mkdtempSync('.lzc-cli-publish');
167
+ try {
168
+ unzipSync(pkgPath, tempDir, ['devshell', 'icon.png']);
169
+ if (isFileExist(path.join(tempDir, 'devshell'))) {
170
+ logger.error(t('lzc_cli.lib.publish.pre_check_fail_tips', '不能发布一个devshell的版本,请重新使用 `lzc-cli project build` 构建'));
171
+ return false;
172
+ }
173
+ const tempIcon = path.join(tempDir, 'icon.png');
174
+ if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
175
+ logger.error(t('lzc_cli.lib.publish.pre_check_icon_not_exist_tips', 'icon 必须存在且要求是 png 格式'));
176
+ return false;
177
+ }
178
+ return true;
179
+ } finally {
180
+ fs.rmSync(tempDir, { recursive: true });
181
+ }
182
+ }
189
183
 
190
- async checkAppIdExist(pkgPath) {
191
- const tempDir = fs.mkdtempSync(".lzc-cli-publish")
192
- try {
193
- unzipSync(pkgPath, tempDir, ["manifest.yml"])
194
- const manifest = loadFromYaml(path.join(tempDir, "manifest.yml"))
195
- const checkUrl =
196
- this.baseUrl + `/app/check/exist?package=${manifest["package"]}`
197
- const res = await request(checkUrl, { method: "GET" })
198
- if (res.status >= 400) {
199
- logger.error("检测应用是否存在出错, 错误状态码为: ", res.status)
200
- logger.error(await res.json())
201
- return { manifest, appIdExisted: true } // 默认认为已经存在
202
- } else {
203
- const { exist = false } = await res.json()
204
- logger.debug(`check appId[${manifest["package"]}] exist: ${exist}`)
205
- return { manifest, appIdExisted: exist }
206
- }
207
- } finally {
208
- fs.rmSync(tempDir, { recursive: true })
209
- }
210
- }
184
+ async checkAppIdExist(pkgPath) {
185
+ const tempDir = fs.mkdtempSync('.lzc-cli-publish');
186
+ try {
187
+ unzipSync(pkgPath, tempDir, ['manifest.yml']);
188
+ const manifest = loadFromYaml(path.join(tempDir, 'manifest.yml'));
189
+ const checkUrl = this.baseUrl + `/app/check/exist?package=${manifest['package']}`;
190
+ const res = await request(checkUrl, { method: 'GET' });
191
+ if (res.status >= 400) {
192
+ logger.error(t('lzc_cli.lib.publish.check_app_id_exist_fail_tips', '检测应用是否存在出错, 错误状态码为: '), res.status);
193
+ logger.error(await res.json());
194
+ return { manifest, appIdExisted: true }; // 默认认为已经存在
195
+ } else {
196
+ const { exist = false } = await res.json();
197
+ logger.debug(`check appId[${manifest['package']}] exist: ${exist}`);
198
+ return { manifest, appIdExisted: exist };
199
+ }
200
+ } finally {
201
+ fs.rmSync(tempDir, { recursive: true });
202
+ }
203
+ }
211
204
 
212
- /**
213
- * @param {string} pkgPath
214
- * @param {string} changelog
215
- * @param {string} locale
216
- */
217
- async publish(pkgPath, changelog, locale = "zh") {
218
- if (!Publish.preCheck(pkgPath)) return
205
+ /**
206
+ * @param {string} pkgPath
207
+ * @param {string} changelog
208
+ * @param {string} currentLocale
209
+ */
210
+ async publish(pkgPath, changelogs, currentLocale = 'zh') {
211
+ if (!Publish.preCheck(pkgPath)) return;
219
212
 
220
- const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath)
221
- if (!appIdExisted) {
222
- await askWhetherCreateLPK(this.baseUrl, manifest, locale)
223
- }
213
+ const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath);
214
+ if (!appIdExisted) {
215
+ await askWhetherCreateLPK(this.baseUrl, manifest, locale);
216
+ }
224
217
 
225
- await autoLogin()
218
+ await autoLogin();
226
219
 
227
- logger.info("正在提交审核...")
228
- const form = new FormData()
229
- form.append("file", fs.createReadStream(pkgPath))
220
+ logger.info(t('lzc_cli.lib.publish.publish_pending_tips', '正在提交审核...'));
221
+ const form = new FormData();
222
+ form.append('file', fs.createReadStream(pkgPath));
230
223
 
231
- const uploadURL = this.baseUrl + "/app/lpk/upload"
232
- logger.debug("upload url is", uploadURL)
224
+ const uploadURL = this.baseUrl + '/app/lpk/upload';
225
+ logger.debug('upload url is', uploadURL);
233
226
 
234
- const res = await request(uploadURL, {
235
- method: "POST",
236
- body: form
237
- })
238
- const text = (await res.text()).trim()
239
- if (!Publish.isJSON(text)) {
240
- logger.info("upload lpk fail", text)
241
- throw new Error(text)
242
- }
243
- const lpkInfo = await JSON.parse(text)
244
- logger.debug("upload lpk response", lpkInfo)
245
- if (res.status >= 400) {
246
- logger.error(`LPK 文件上传失败,err: ${lpkInfo?.message ?? lpkInfo}`)
247
- throw new Error(lpkInfo?.message ?? lpkInfo)
248
- }
227
+ const res = await request(uploadURL, {
228
+ method: 'POST',
229
+ body: form,
230
+ });
231
+ const text = (await res.text()).trim();
232
+ if (!Publish.isJSON(text)) {
233
+ logger.info('upload lpk fail', text);
234
+ throw new Error(text);
235
+ }
236
+ const lpkInfo = await JSON.parse(text);
237
+ logger.debug('upload lpk response', lpkInfo);
238
+ if (res.status >= 400) {
239
+ logger.error(
240
+ t('lzc_cli.lib.publish.publish_lpk_fail_tips', `LPK 文件上传失败,err: {{ message }}`, {
241
+ message: lpkInfo?.message ?? lpkInfo,
242
+ interpolation: { escapeValue: false }
243
+ }),
244
+ );
245
+ throw new Error(lpkInfo?.message ?? lpkInfo);
246
+ }
249
247
 
250
- // 填写更新日志
251
- if (!changelog) {
252
- const answer = await askChangeLog(locale)
253
- changelog = answer.changelog
254
- }
255
- changelog = changelog.trim() // clean space ^:)
248
+ // 填写更新日志
249
+ if (!changelogs || Object.keys(changelogs).length < 1) {
250
+ const answer = await askChangeLog(currentLocale);
251
+ let changelog = answer.changelog;
252
+ changelog = changelog.trim(); // clean space ^:)
256
253
 
257
- const sendURL = this.baseUrl + `/app/${lpkInfo.package}/review/create`
258
- logger.debug("publish url is", sendURL)
254
+ // changelogs 本地化
255
+ const langKey = getLanguageForLocale(currentLocale);
256
+ changelogs[langKey] = changelog
257
+ }
258
+ logger.debug('publish changelogs is', changelogs);
259
259
 
260
- const formData = {
261
- version: {
262
- // supportPC: lpkInfo.supportPC,
263
- // supportMobile: lpkInfo.supportMobile,
264
- package: lpkInfo.package,
265
- name: lpkInfo.version,
266
- icon_path: lpkInfo.iconPath,
267
- pkg_path: lpkInfo.url,
268
- unsupported_platforms: lpkInfo.unsupportedPlatforms,
269
- min_os_version: lpkInfo.minOsVersion,
270
- changelogs: {}
271
- }
272
- }
273
- // changelogs 本地化
274
- const langKey = getLanguageForLocale(locale)
275
- formData.version.changelogs[langKey] = changelog
260
+ const sendURL = this.baseUrl + `/app/${lpkInfo.package}/review/create`;
261
+ logger.debug('publish url is', sendURL);
276
262
 
277
- logger.debug("form data is", formData)
263
+ const formData = {
264
+ version: {
265
+ // supportPC: lpkInfo.supportPC,
266
+ // supportMobile: lpkInfo.supportMobile,
267
+ package: lpkInfo.package,
268
+ name: lpkInfo.version,
269
+ icon_path: lpkInfo.iconPath,
270
+ pkg_path: lpkInfo.url,
271
+ unsupported_platforms: lpkInfo.unsupportedPlatforms,
272
+ min_os_version: lpkInfo.minOsVersion,
273
+ changelogs,
274
+ },
275
+ };
278
276
 
279
- const publishRes = await request(sendURL, {
280
- method: "POST",
281
- body: JSON.stringify(formData)
282
- })
277
+ logger.debug('form data is', formData);
283
278
 
284
- const publishResMsg = (await publishRes.text()).trim()
285
- if (publishRes.status > 399) {
286
- logger.error("发布应用出错,错误状态码为: ", publishRes.status)
287
- logger.error(publishResMsg)
288
- throw new Error(publishResMsg)
289
- }
279
+ const publishRes = await request(sendURL, {
280
+ method: 'POST',
281
+ body: JSON.stringify(formData),
282
+ });
290
283
 
291
- logger.info("应用提交成功! 请等待审核结果")
292
- logger.debug("publish response", publishResMsg)
293
- return publishRes
294
- }
284
+ const publishResMsg = (await publishRes.text()).trim();
285
+ if (publishRes.status > 399) {
286
+ logger.error(t('lzc_cli.lib.publish.publish_fail_tips', '发布应用出错,错误状态码为: '), publishRes.status);
287
+ logger.error(publishResMsg);
288
+ throw new Error(publishResMsg);
289
+ }
290
+
291
+ logger.info(t('lzc_cli.lib.publish.publish_done_tips', '应用提交成功! 请等待审核结果'));
292
+ logger.debug('publish response', publishResMsg);
293
+ return publishRes;
294
+ }
295
295
  }