miniprogram

saqqdy · saqqdy · commit 8c6436b06c0b · 2024-05-09T15:25:11.000+08:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/monorepo",
 	"description": "这是一个git工作流工具",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"packageManager": "pnpm@9.1.0",
 	"main": "index.js",
 	"files": [
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/api",
 	"description": "gitmars api",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/api/src/miniprogram/clients.ts b/packages/api/src/miniprogram/clients.ts
@@ -0,0 +1,30 @@
+import { get } from '../request/miniprogram'
+
+const URL_PREFIX = '/api/component/clients'
+
+export interface GetClientsConfig {
+	appID: string
+	extJson: string
+	config: string
+	createTime: string
+	updateTime: string
+	id: string
+}
+/**
+ * get clients config by appID
+ *
+ * @param appID - miniprogram appID
+ * @returns data
+ */
+export async function getClientsConfig(appID: string) {
+	return get<GetClientsConfig>({
+		url: `${URL_PREFIX}/configuration/getConfig`,
+		data: {
+			appID
+		}
+	})
+}
+
+export default {
+	getClientsConfig
+}
diff --git a/packages/api/src/miniprogram/index.ts b/packages/api/src/miniprogram/index.ts
@@ -1,3 +1,4 @@
 export * from './authorization'
 export * from './mpManage'
 export * from './ticket'
+export * from './clients'
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/build",
 	"description": "gitmars build",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/cache",
 	"description": "gitmars cache",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/core",
 	"description": "gitmars核心程序",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/docs",
 	"description": "gitmars文档库",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"files": [
 		"dist",
diff --git a/packages/git/package.json b/packages/git/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/git",
 	"description": "gitmars git",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json
@@ -2,7 +2,7 @@
 	"name": "gitmars",
 	"description": "这是一个git工作流工具",
 	"type": "module",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"bin": {
 		"gitm": "lib/gitm.mjs"
diff --git a/packages/gitmars/src/gitm-miniprogram.ts b/packages/gitmars/src/gitm-miniprogram.ts
@@ -5,11 +5,13 @@ import { Separator, confirm, input, select } from '@inquirer/prompts'
 import chalk from 'chalk'
 import dayjs from 'dayjs'
 import to from 'await-to-done'
+import { base64ToArrayBuffer } from 'js-cool'
 import { createArgs, printQrcode, readQrcode } from '@gitmars/utils'
 import {
 	bindTester,
 	getAuditStatus,
 	getAuthorizerListWithAllDetail,
+	getClientsConfig,
 	getPreAuthQrCode,
 	getTrialQrCode,
 	unbindTester,
@@ -42,6 +44,7 @@ program.action(async (miniprogram: string, opt: GitmMiniprogramOption): Promise<
 		// get auth qrcode
 		const authUrl = await getPreAuthQrCode()
 		await printQrcode(authUrl)
+		process.exit(0)
 	} else if (!miniprogram) {
 		const [, list = []] = await to(
 			getAuthorizerListWithAllDetail({ limit: 500 }).then(({ list }) => {
@@ -104,7 +107,13 @@ program.action(async (miniprogram: string, opt: GitmMiniprogramOption): Promise<
 		const [, data] = await to(getAuditStatus(miniprogram))
 		if (data) {
 			const colorList = ['bgGreen', 'bgRed', 'bgBlack', 'bgBlack', 'bgYellow'] as const
-			const tag = ['审核成功', '审核被拒绝', '审核中', '已撤回', '审核延后'][data.status]
+			const tag = [
+				t('Audit Successful'),
+				t('Audit Rejected'),
+				t('Audit in Progress'),
+				t('Withdrawn'),
+				t('Audit Delayed')
+			][data.status]
 			let txt = chalk[colorList[data.status]](tag)
 			if ([1, 4].includes(data.status) && data.reason) txt += ': ' + data.reason
 			if (data.time) txt += '\n' + dayjs(data.time).format('YYYY-MM-DD HH:mm')
@@ -125,13 +134,10 @@ program.action(async (miniprogram: string, opt: GitmMiniprogramOption): Promise<
 		//
 	} else if (action === 'trial_qrcode') {
 		const [, path = ''] = await to(
-			input({
-				message: t('Enter path of miniprogram'),
-				transformer: val => val.trim()
-			}).then(val => val.trim())
+			getClientsConfig(miniprogram).then(({ config }) => JSON.parse(config).path)
 		)
 		const [, codeImage = ''] = await to(getTrialQrCode({ path, authorizer_appid: miniprogram }))
-		printQrcode(await readQrcode(codeImage))
+		printQrcode(await readQrcode(base64ToArrayBuffer(codeImage)))
 	} else if (action === 'bind_tester') {
 		const [, wechatid = ''] = await to(
 			input({
diff --git a/packages/gitmars/src/locales/zh-CN.ts b/packages/gitmars/src/locales/zh-CN.ts
@@ -450,7 +450,11 @@ export default {
 	'Bind Tester': '绑定体验者',
 	'Unbind Tester': '解绑体验者',
 	'Name of miniprogram, used for fuzzy searches': '小程序名称，用于模糊搜索',
-	'Enter path of miniprogram': '输入小程序路径',
+	'Audit Successful': '审核成功',
+	'Audit Rejected': '审核被拒绝',
+	'Audit in Progress': '审核中',
+	Withdrawn: '已撤回',
+	'Audit Delayed': '审核延后',
 	'Confirm undo audit': '是否确认撤回审核',
 	'Enter wechat account': '输入微信号',
 	'Implementation success': '执行成功',
diff --git a/packages/go/package.json b/packages/go/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/go",
 	"description": "gitmars go",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/hook/package.json b/packages/hook/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/hook",
 	"description": "gitmars hook",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/utils",
 	"description": "gitmars utils",
-	"version": "7.0.0-beta.31",
+	"version": "7.0.0-beta.32",
 	"private": false,
 	"main": "./dist/index.cjs.js",
 	"module": "./dist/index.esm-bundler.js",
diff --git a/packages/utils/src/qrcode.ts b/packages/utils/src/qrcode.ts
@@ -10,7 +10,7 @@ const { t } = lang
  *
  * @param imagePath - image path
  */
-export async function readQrcode(imagePath: string): Promise<string> {
+export async function readQrcode(imagePath: any): Promise<string> {
 	return new Promise((resolve, reject) => {
 		Jimp.read(imagePath, function (err, image) {
 			if (err) {
diff --git a/scripts/publish.ts b/scripts/publish.ts
@@ -13,8 +13,7 @@ export const ROOT = join(__dirname, '..')
 export const PACKAGE = join(ROOT, 'packages')
 
 const REGISTRY_URL = 'https://registry.npmjs.org'
-const jsonMap: Record<string, any> = {}
-let command = `pnpm --registry=${REGISTRY_URL} publish -r --access public`
+let command = `npm --registry=${REGISTRY_URL} publish --access public`
 if (IS_DRY_RUN) command += ' --dry-run'
 
 if (version.includes('rc')) command += ' --tag release'
@@ -25,58 +24,55 @@ else if (IS_TEST) {
 	process.exit(0)
 }
 
-transformPkgJson()
-
-to(
-	promisify(exec)(command, {
-		cwd: ROOT,
-		timeout: 30000
-	})
-)
-	.then(([err]) => {
-		err && console.error(err)
-	})
-	.finally(() => transformPkgJson(true))
-
-function transformPkgJson(isFallback = false) {
-	for (const { name } of packages) {
+;(async () => {
+	for await (const { name } of packages) {
 		const dirName = name.replace(/\./g, sep)
 		const cwd = name === 'monorepo' ? ROOT : join(PACKAGE, dirName)
 		const PKG_FILE = join(cwd, 'package.json')
-		if (!isFallback) {
-			jsonMap[name] = readJSONSync(PKG_FILE)!
-			const newPkgJson = clone(jsonMap[name])
-			for (const { pkgName: pkg } of packages) {
-				if (
-					pkg in ((newPkgJson.dependencies as Record<string, unknown>) || {}) &&
-					newPkgJson.dependencies[pkg].includes('workspace')
-				) {
-					newPkgJson.dependencies[pkg] = version
-				}
-				if (
-					pkg in ((newPkgJson.devDependencies as Record<string, unknown>) || {}) &&
-					newPkgJson.devDependencies[pkg].includes('workspace')
-				) {
-					newPkgJson.devDependencies[pkg] = version
-				}
-				if (
-					pkg in ((newPkgJson.peerDependencies as Record<string, unknown>) || {}) &&
-					newPkgJson.peerDependencies[pkg].includes('workspace')
-				) {
-					newPkgJson.peerDependencies[pkg] = version
-				}
+
+		const pkgJson: Record<string, any> = readJSONSync(PKG_FILE)!
+		const newPkgJson = clone(pkgJson)
+		for (const { pkgName: pkg } of packages) {
+			if (
+				pkg in ((newPkgJson.dependencies as Record<string, unknown>) || {}) &&
+				newPkgJson.dependencies[pkg].includes('workspace')
+			) {
+				newPkgJson.dependencies[pkg] = version
+			}
+			if (
+				pkg in ((newPkgJson.devDependencies as Record<string, unknown>) || {}) &&
+				newPkgJson.devDependencies[pkg].includes('workspace')
+			) {
+				newPkgJson.devDependencies[pkg] = version
+			}
+			if (
+				pkg in ((newPkgJson.peerDependencies as Record<string, unknown>) || {}) &&
+				newPkgJson.peerDependencies[pkg].includes('workspace')
+			) {
+				newPkgJson.peerDependencies[pkg] = version
 			}
-			writeJSONSync(PKG_FILE, newPkgJson, {
-				encoding: 'utf8'
-			})
-		} else {
-			writeJSONSync(PKG_FILE, jsonMap[name], {
-				encoding: 'utf8'
-			})
 		}
-		execSync(`npx prettier --write ${PKG_FILE}`, {
-			stdio: 'inherit',
-			cwd: ROOT
+		writeJSONSync(PKG_FILE, newPkgJson, {
+			encoding: 'utf8'
 		})
+
+		to(
+			promisify(exec)(command, {
+				cwd,
+				timeout: 30000
+			})
+		)
+			.then(([err]: any) => {
+				err && console.error(err.stderr!)
+			})
+			.finally(() => {
+				writeJSONSync(PKG_FILE, pkgJson, {
+					encoding: 'utf8'
+				})
+				execSync(`npx prettier --write ${PKG_FILE}`, {
+					stdio: 'inherit',
+					cwd
+				})
+			})
 	}
-}
+})()

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/monorepo",`
`3`	`3`	`"description": "这是一个git工作流工具",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"packageManager": "[email protected]",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/api",`
`3`	`3`	`"description": "gitmars api",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/build",`
`3`	`3`	`"description": "gitmars build",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/cache",`
`3`	`3`	`"description": "gitmars cache",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/core",`
`3`	`3`	`"description": "gitmars核心程序",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/docs",`
`3`	`3`	`"description": "gitmars文档库",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"private": false,`
`6`	`6`	`"files": [`
`7`	`7`	`"dist",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@gitmars/git",`
`3`	`3`	`"description": "gitmars git",`
`4`		`- "version": "7.0.0-beta.31",`
	`4`	`+ "version": "7.0.0-beta.32",`
`5`	`5`	`"private": false,`
`6`	`6`	`"main": "./dist/index.cjs.js",`
`7`	`7`	`"module": "./dist/index.esm-bundler.js",`