@cloudcome/utils-uni 1.39.0 → 1.41.0

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.
@@ -8,12 +8,32 @@ type _CloudObjectThisAppendUser = {
8
8
  permission: string[];
9
9
  isAdmin: boolean;
10
10
  };
11
- type _CloudObjectThisAppend = {
12
- options: Required<CreateCloudObjectOptions>;
11
+ /**
12
+ * 云对象创建选项的运行时解析类型。
13
+ *
14
+ * 将 `CreateCloudObjectOptions` 中的内置字段设为必填(已应用默认值),
15
+ * 同时保留 `ExtraConfig` 扩展字段的原始可选性。
16
+ *
17
+ * @template ExtraConfig - 自定义扩展配置类型
18
+ */
19
+ type _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {
20
+ /** 是否需要用户登录态 */
21
+ requiredUser: boolean;
22
+ /** 是否仅在本地环境运行 */
23
+ onlyLocalEnv: boolean;
24
+ /** 最小支持版本 */
25
+ minVersion?: string;
26
+ /** 最大支持版本 */
27
+ maxVersion?: string;
28
+ /** 非响应模式,常用于钩子函数中 */
29
+ noRespond?: boolean;
30
+ };
31
+ type _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {
32
+ options: _ResolvedCreateCloudOptions<ExtraConfig>;
13
33
  user: _CloudObjectThisAppendUser;
14
34
  };
15
- export type CloudObjectContext = CloudObjectThis & _CloudObjectThisAppend;
16
- export type BuildCloudMethodCreatorOptions = {
35
+ export type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis & _CloudObjectThisAppend<ExtraConfig>;
36
+ export type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {
17
37
  /**
18
38
  * UniId 通用模块
19
39
  * 用于处理用户身份验证和权限管理
@@ -54,11 +74,12 @@ export type BuildCloudMethodCreatorOptions = {
54
74
  respondAppend?: (objectThis: CloudObjectThis) => AnyObject;
55
75
  /**
56
76
  * 所有云对象执行前钩子函数
57
- * @param context 云对象上下文,包含用户信息、选项等
77
+ * @param context 云对象上下文,包含用户信息、扩展配置选项等
78
+ * @param options 云对象创建选项,包含 requiredUser、onlyLocalEnv 及自定义扩展配置
58
79
  */
59
- onBefore?: (context: CloudObjectContext) => MaybePromise<unknown>;
80
+ onBefore?: (context: CloudObjectContext<ExtraConfig>, options: _ResolvedCreateCloudOptions<ExtraConfig>) => MaybePromise<unknown>;
60
81
  };
61
- export type CreateCloudObjectOptions = {
82
+ export type CreateCloudObjectOptions<ExtraConfig extends object = object> = ExtraConfig & {
62
83
  /**
63
84
  * 是否需要用户登录态
64
85
  * @default false
@@ -83,32 +104,9 @@ export type CreateCloudObjectOptions = {
83
104
  */
84
105
  noRespond?: boolean;
85
106
  };
86
- /**
87
- * 云对象方法创建器类型定义
88
- *
89
- * 用于定义云对象方法的创建函数类型,支持两种重载形式:
90
- * 1. 带输入验证的版本:接收schema、处理函数和选项
91
- * 2. 无输入参数的版本:仅接收处理函数和选项
92
- */
93
- export type CreateCloudMethod = {
94
- /**
95
- * 带输入验证的云对象方法创建器
96
- * @template S - Zod验证模式类型
97
- * @template O - 返回值类型
98
- * @param schema - Zod验证模式,用于验证输入数据
99
- * @param fn - 业务逻辑处理函数,接收上下文和验证后的输入数据
100
- * @param options - 云对象创建选项
101
- * @returns 云对象方法函数
102
- */
103
- <S extends ZodObject, O>(schema: S, fn: (context: CloudObjectContext, input: z.infer<S>) => MaybePromise<O>, options?: CreateCloudObjectOptions): CloudMethod<z.infer<S>, O>;
104
- /**
105
- * 无输入参数的云对象方法创建器
106
- * @template O - 返回值类型
107
- * @param fn - 业务逻辑处理函数,仅接收上下文
108
- * @param options - 云对象创建选项
109
- * @returns 云对象方法函数
110
- */
111
- <O>(fn: (context: CloudObjectContext) => MaybePromise<O>, options?: CreateCloudObjectOptions): CloudMethod<void, O>;
107
+ export type CreateCloudMethod<ExtraConfig extends object = object> = {
108
+ <S extends ZodObject, O>(schema: S, fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>, options?: CreateCloudObjectOptions<ExtraConfig>): CloudMethod<z.infer<S>, O>;
109
+ <O>(fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>, options?: CreateCloudObjectOptions<ExtraConfig>): CloudMethod<void, O>;
112
110
  };
113
111
  /**
114
112
  * 构建云对象方法创建器
@@ -126,5 +124,5 @@ export type CreateCloudMethod = {
126
124
  * return { message: 'Hello ' + context.user.id };
127
125
  * }, { requiredUser: true });
128
126
  */
129
- export declare function buildCloudMethodCreator(options?: BuildCloudMethodCreatorOptions): CreateCloudMethod;
127
+ export declare function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(options?: BuildCloudMethodCreatorOptions<ExtraConfig>): CreateCloudMethod<ExtraConfig>;
130
128
  export {};
package/dist/cloud.cjs CHANGED
@@ -128,7 +128,7 @@ function buildCloudMethodCreator(options) {
128
128
  };
129
129
  const context = Object.assign(this, append);
130
130
  if (createOptions.requiredUser && !user.id) throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);
131
- await buildOptions.onBefore(context);
131
+ await buildOptions.onBefore(context, createOptions);
132
132
  if ((0, _cloudcome_utils_core_type.isFunction)(arg0)) return await arg0(context);
133
133
  const parsed = arg0.safeParse(input);
134
134
  if (!parsed.success) {
@@ -1 +1 @@
1
- {"version":3,"file":"cloud.cjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number | string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/**\n * 解析云模块输出结果\n *\n * 该函数用于处理云模块的输出,如果输出中包含错误码,则抛出相应的错误;\n * 否则返回去除错误码和错误信息后的数据部分。\n *\n * @template O - 输出数据的类型\n * @param output - 云模块的输出结果,包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n *\n * @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n *\n * @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n */\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' | 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\n/**\n * 执行云对象方法并标准化响应格式\n *\n * @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param append - 要附加到响应中的额外数据\n * @returns 标准化的云对象响应对象\n *\n * @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { extra: 'data' });\n * ```\n */\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n append?: AnyObject,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...append,\n };\n } catch (err) {\n console.error('respondCloudObject error');\n console.error(err);\n\n const err2 = errorNormalize(err as UniError);\n\n return {\n errCode: err2.errCode || -1,\n errMsg: err2.errMsg || err2.message || '',\n // @ts-expect-error\n data: null,\n ...append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\ntype _CloudObjectThisAppend = {\n options: Required<CreateCloudObjectOptions>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext = CloudObjectThis & _CloudObjectThisAppend;\n\nexport type BuildCloudMethodCreatorOptions = {\n /**\n * UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供,将在云对象执行前验证用户身份\n */\n uniIdCommonModule?: UniIdCommonModule;\n\n /**\n * 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n */\n requiredUserErrCode?: number | string;\n\n /**\n * 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n */\n requiredUserErrMsg?: string;\n\n /**\n * 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n */\n onlyLocalEnvErrMsg?: string;\n\n /**\n * 版本不匹配错误消息\n * @default '应用版本过低'\n */\n appVersionTooLowErrMsg?: string;\n\n /**\n * 应用版本过高错误消息\n * @default '应用版本过高'\n */\n appVersionTooHighErrMsg?: string;\n\n /**\n * 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n */\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /**\n * 所有云对象执行前钩子函数\n * @param context 云对象上下文,包含用户信息、选项等\n */\n onBefore?: (context: CloudObjectContext) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions = {\n /**\n * 是否需要用户登录态\n * @default false\n */\n requiredUser?: boolean;\n\n /**\n * 是否仅在本地环境运行\n * @default false\n */\n onlyLocalEnv?: boolean;\n\n /**\n * 最小支持版本\n */\n minVersion?: string;\n\n /**\n * 最大支持版本\n */\n maxVersion?: string;\n\n /**\n * 非响应模式,常用于钩子函数中,如 _before, _after 等,\n * 文档:https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n */\n noRespond?: boolean;\n};\n\n/**\n * 云对象方法创建器类型定义\n *\n * 用于定义云对象方法的创建函数类型,支持两种重载形式:\n * 1. 带输入验证的版本:接收schema、处理函数和选项\n * 2. 无输入参数的版本:仅接收处理函数和选项\n */\nexport type CreateCloudMethod = {\n /**\n * 带输入验证的云对象方法创建器\n * @template S - Zod验证模式类型\n * @template O - 返回值类型\n * @param schema - Zod验证模式,用于验证输入数据\n * @param fn - 业务逻辑处理函数,接收上下文和验证后的输入数据\n * @param options - 云对象创建选项\n * @returns 云对象方法函数\n */\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions,\n ): CloudMethod<z.infer<S>, O>;\n\n /**\n * 无输入参数的云对象方法创建器\n * @template O - 返回值类型\n * @param fn - 业务逻辑处理函数,仅接收上下文\n * @param options - 云对象创建选项\n * @returns 云对象方法函数\n */\n <O>(fn: (context: CloudObjectContext) => MaybePromise<O>, options?: CreateCloudObjectOptions): CloudMethod<void, O>;\n};\n\n/**\n * 构建云对象方法创建器\n *\n * 该函数用于创建云对象方法的工厂函数,支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n *\n * @param options 构建选项,用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n *\n * @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n */\nexport function buildCloudMethodCreator(options?: BuildCloudMethodCreatorOptions) {\n const buildOptions = objectDefaults(options || {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod = (arg0, arg1, arg2) => {\n // 确定选项来源:如果arg0是函数,则选项在arg1;否则在arg2\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n\n // 设置默认选项值\n const createOptions = objectDefaults(optionsSource || {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as Required<CreateCloudObjectOptions>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n // 构建附加的上下文信息,包括用户身份和权限信息\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext;\n\n // 如果需要用户登录态但用户未登录,则抛出错误\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n // 执行前钩子函数\n await buildOptions.onBefore(context);\n\n // 无入参函数调用\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n // 有入参函数调用 - 验证输入数据\n const parsed = arg0.safeParse(input);\n\n // 输入验证失败处理\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n // 处理自定义验证错误\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n // 执行业务逻辑函数,传入上下文和验证后的数据\n return await arg1(context, parsed.data);\n };\n\n // 如果设置了非响应模式,则直接执行方法,不返回响应\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n // 处理云对象方法响应逻辑,包括错误捕获和统一响应格式\n return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));\n };\n };\n\n return createCloudMethod;\n}\n\n/**\n * 解析并附加用户信息到云对象上下文\n *\n * 该函数用于验证用户身份并获取用户权限信息,将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败,则返回默认的空用户信息\n *\n * @param objectThis 云对象上下文,包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例,用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n *\n * @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n *\n * @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n */\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n // 验证用户token,忽略验证过程中的错误\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n if (!user) return appendUser;\n\n // 解析验证结果,忽略解析过程中的错误\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid || '';\n appendUser.role = userData.role || [];\n appendUser.permission = userData.permission || [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/**\n * HTTP 请求配置选项\n */\nexport type RequestOptions = {\n /**\n * 请求 URL 地址\n */\n url: string;\n\n /**\n * URL 查询参数,会自动拼接到 url 后面\n */\n query?: Record<string, string>;\n\n /**\n * HTTP 请求方法\n * @default 'GET'\n */\n method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS';\n\n /**\n * 请求头\n */\n headers?: Record<string, string>;\n\n /**\n * 请求体数据\n */\n data?: AnyObject;\n\n /**\n * 返回数据格式\n * @default 'json'\n */\n dataType?: string;\n\n /**\n * 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n */\n contentType?: string;\n\n /**\n * 请求超时时间,单位毫秒\n * @default 10000\n */\n timeout?: number;\n};\n\n/**\n * 发起 HTTP 请求\n *\n * 基于 uniCloud.httpclient 发起 HTTP 请求,支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n *\n * @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n *\n * @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n *\n * // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n *\n * // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"cloud.cjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number | string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/**\n * 解析云模块输出结果\n *\n * 该函数用于处理云模块的输出,如果输出中包含错误码,则抛出相应的错误;\n * 否则返回去除错误码和错误信息后的数据部分。\n *\n * @template O - 输出数据的类型\n * @param output - 云模块的输出结果,包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n *\n * @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n *\n * @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n */\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' | 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\n/**\n * 执行云对象方法并标准化响应格式\n *\n * @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param append - 要附加到响应中的额外数据\n * @returns 标准化的云对象响应对象\n *\n * @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { extra: 'data' });\n * ```\n */\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n append?: AnyObject,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...append,\n };\n } catch (err) {\n console.error('respondCloudObject error');\n console.error(err);\n\n const err2 = errorNormalize(err as UniError);\n\n return {\n errCode: err2.errCode || -1,\n errMsg: err2.errMsg || err2.message || '',\n // @ts-expect-error\n data: null,\n ...append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\n/**\n * 云对象创建选项的运行时解析类型。\n *\n * 将 `CreateCloudObjectOptions` 中的内置字段设为必填(已应用默认值),\n * 同时保留 `ExtraConfig` 扩展字段的原始可选性。\n *\n * @template ExtraConfig - 自定义扩展配置类型\n */\ntype _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {\n /** 是否需要用户登录态 */\n requiredUser: boolean;\n /** 是否仅在本地环境运行 */\n onlyLocalEnv: boolean;\n /** 最小支持版本 */\n minVersion?: string;\n /** 最大支持版本 */\n maxVersion?: string;\n /** 非响应模式,常用于钩子函数中 */\n noRespond?: boolean;\n};\n\ntype _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {\n options: _ResolvedCreateCloudOptions<ExtraConfig>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis &\n _CloudObjectThisAppend<ExtraConfig>;\n\nexport type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {\n /**\n * UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供,将在云对象执行前验证用户身份\n */\n uniIdCommonModule?: UniIdCommonModule;\n\n /**\n * 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n */\n requiredUserErrCode?: number | string;\n\n /**\n * 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n */\n requiredUserErrMsg?: string;\n\n /**\n * 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n */\n onlyLocalEnvErrMsg?: string;\n\n /**\n * 版本不匹配错误消息\n * @default '应用版本过低'\n */\n appVersionTooLowErrMsg?: string;\n\n /**\n * 应用版本过高错误消息\n * @default '应用版本过高'\n */\n appVersionTooHighErrMsg?: string;\n\n /**\n * 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n */\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /**\n * 所有云对象执行前钩子函数\n * @param context 云对象上下文,包含用户信息、扩展配置选项等\n * @param options 云对象创建选项,包含 requiredUser、onlyLocalEnv 及自定义扩展配置\n */\n onBefore?: (\n context: CloudObjectContext<ExtraConfig>,\n options: _ResolvedCreateCloudOptions<ExtraConfig>,\n ) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions<ExtraConfig extends object = object> = ExtraConfig & {\n /**\n * 是否需要用户登录态\n * @default false\n */\n requiredUser?: boolean;\n\n /**\n * 是否仅在本地环境运行\n * @default false\n */\n onlyLocalEnv?: boolean;\n\n /**\n * 最小支持版本\n */\n minVersion?: string;\n\n /**\n * 最大支持版本\n */\n maxVersion?: string;\n\n /**\n * 非响应模式,常用于钩子函数中,如 _before, _after 等,\n * 文档:https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n */\n noRespond?: boolean;\n};\n\nexport type CreateCloudMethod<ExtraConfig extends object = object> = {\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<z.infer<S>, O>;\n\n <O>(\n fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<void, O>;\n};\n\n/**\n * 构建云对象方法创建器\n *\n * 该函数用于创建云对象方法的工厂函数,支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n *\n * @param options 构建选项,用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n *\n * @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n */\nexport function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(\n options?: BuildCloudMethodCreatorOptions<ExtraConfig>,\n) {\n const buildOptions = objectDefaults(options || {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod<ExtraConfig> = (arg0, arg1, arg2) => {\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions<ExtraConfig> | undefined;\n const createOptions = objectDefaults(optionsSource || {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as _ResolvedCreateCloudOptions<ExtraConfig>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend<ExtraConfig> = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext<ExtraConfig>;\n\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n await buildOptions.onBefore(context, createOptions);\n\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n const parsed = arg0.safeParse(input);\n\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n return await arg1(context, parsed.data);\n };\n\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));\n };\n };\n\n return createCloudMethod;\n}\n\n/**\n * 解析并附加用户信息到云对象上下文\n *\n * 该函数用于验证用户身份并获取用户权限信息,将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败,则返回默认的空用户信息\n *\n * @param objectThis 云对象上下文,包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例,用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n *\n * @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n *\n * @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n */\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n if (!user) return appendUser;\n\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid || '';\n appendUser.role = userData.role || [];\n appendUser.permission = userData.permission || [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/**\n * HTTP 请求配置选项\n */\nexport type RequestOptions = {\n /**\n * 请求 URL 地址\n */\n url: string;\n\n /**\n * URL 查询参数,会自动拼接到 url 后面\n */\n query?: Record<string, string>;\n\n /**\n * HTTP 请求方法\n * @default 'GET'\n */\n method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS';\n\n /**\n * 请求头\n */\n headers?: Record<string, string>;\n\n /**\n * 请求体数据\n */\n data?: AnyObject;\n\n /**\n * 返回数据格式\n * @default 'json'\n */\n dataType?: string;\n\n /**\n * 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n */\n contentType?: string;\n\n /**\n * 请求超时时间,单位毫秒\n * @default 10000\n */\n timeout?: number;\n};\n\n/**\n * 发起 HTTP 请求\n *\n * 基于 uniCloud.httpclient 发起 HTTP 请求,支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n *\n * @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n *\n * @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n *\n * // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n *\n * // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":"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"}
package/dist/cloud.mjs CHANGED
@@ -127,7 +127,7 @@ function buildCloudMethodCreator(options) {
127
127
  };
128
128
  const context = Object.assign(this, append);
129
129
  if (createOptions.requiredUser && !user.id) throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);
130
- await buildOptions.onBefore(context);
130
+ await buildOptions.onBefore(context, createOptions);
131
131
  if (isFunction(arg0)) return await arg0(context);
132
132
  const parsed = arg0.safeParse(input);
133
133
  if (!parsed.success) {
@@ -1 +1 @@
1
- {"version":3,"file":"cloud.mjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number | string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/**\n * 解析云模块输出结果\n *\n * 该函数用于处理云模块的输出,如果输出中包含错误码,则抛出相应的错误;\n * 否则返回去除错误码和错误信息后的数据部分。\n *\n * @template O - 输出数据的类型\n * @param output - 云模块的输出结果,包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n *\n * @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n *\n * @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n */\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' | 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\n/**\n * 执行云对象方法并标准化响应格式\n *\n * @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param append - 要附加到响应中的额外数据\n * @returns 标准化的云对象响应对象\n *\n * @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { extra: 'data' });\n * ```\n */\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n append?: AnyObject,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...append,\n };\n } catch (err) {\n console.error('respondCloudObject error');\n console.error(err);\n\n const err2 = errorNormalize(err as UniError);\n\n return {\n errCode: err2.errCode || -1,\n errMsg: err2.errMsg || err2.message || '',\n // @ts-expect-error\n data: null,\n ...append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\ntype _CloudObjectThisAppend = {\n options: Required<CreateCloudObjectOptions>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext = CloudObjectThis & _CloudObjectThisAppend;\n\nexport type BuildCloudMethodCreatorOptions = {\n /**\n * UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供,将在云对象执行前验证用户身份\n */\n uniIdCommonModule?: UniIdCommonModule;\n\n /**\n * 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n */\n requiredUserErrCode?: number | string;\n\n /**\n * 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n */\n requiredUserErrMsg?: string;\n\n /**\n * 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n */\n onlyLocalEnvErrMsg?: string;\n\n /**\n * 版本不匹配错误消息\n * @default '应用版本过低'\n */\n appVersionTooLowErrMsg?: string;\n\n /**\n * 应用版本过高错误消息\n * @default '应用版本过高'\n */\n appVersionTooHighErrMsg?: string;\n\n /**\n * 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n */\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /**\n * 所有云对象执行前钩子函数\n * @param context 云对象上下文,包含用户信息、选项等\n */\n onBefore?: (context: CloudObjectContext) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions = {\n /**\n * 是否需要用户登录态\n * @default false\n */\n requiredUser?: boolean;\n\n /**\n * 是否仅在本地环境运行\n * @default false\n */\n onlyLocalEnv?: boolean;\n\n /**\n * 最小支持版本\n */\n minVersion?: string;\n\n /**\n * 最大支持版本\n */\n maxVersion?: string;\n\n /**\n * 非响应模式,常用于钩子函数中,如 _before, _after 等,\n * 文档:https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n */\n noRespond?: boolean;\n};\n\n/**\n * 云对象方法创建器类型定义\n *\n * 用于定义云对象方法的创建函数类型,支持两种重载形式:\n * 1. 带输入验证的版本:接收schema、处理函数和选项\n * 2. 无输入参数的版本:仅接收处理函数和选项\n */\nexport type CreateCloudMethod = {\n /**\n * 带输入验证的云对象方法创建器\n * @template S - Zod验证模式类型\n * @template O - 返回值类型\n * @param schema - Zod验证模式,用于验证输入数据\n * @param fn - 业务逻辑处理函数,接收上下文和验证后的输入数据\n * @param options - 云对象创建选项\n * @returns 云对象方法函数\n */\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions,\n ): CloudMethod<z.infer<S>, O>;\n\n /**\n * 无输入参数的云对象方法创建器\n * @template O - 返回值类型\n * @param fn - 业务逻辑处理函数,仅接收上下文\n * @param options - 云对象创建选项\n * @returns 云对象方法函数\n */\n <O>(fn: (context: CloudObjectContext) => MaybePromise<O>, options?: CreateCloudObjectOptions): CloudMethod<void, O>;\n};\n\n/**\n * 构建云对象方法创建器\n *\n * 该函数用于创建云对象方法的工厂函数,支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n *\n * @param options 构建选项,用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n *\n * @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n */\nexport function buildCloudMethodCreator(options?: BuildCloudMethodCreatorOptions) {\n const buildOptions = objectDefaults(options || {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod = (arg0, arg1, arg2) => {\n // 确定选项来源:如果arg0是函数,则选项在arg1;否则在arg2\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions | undefined;\n\n // 设置默认选项值\n const createOptions = objectDefaults(optionsSource || {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as Required<CreateCloudObjectOptions>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n // 构建附加的上下文信息,包括用户身份和权限信息\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext;\n\n // 如果需要用户登录态但用户未登录,则抛出错误\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n // 执行前钩子函数\n await buildOptions.onBefore(context);\n\n // 无入参函数调用\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n // 有入参函数调用 - 验证输入数据\n const parsed = arg0.safeParse(input);\n\n // 输入验证失败处理\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n // 处理自定义验证错误\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n // 执行业务逻辑函数,传入上下文和验证后的数据\n return await arg1(context, parsed.data);\n };\n\n // 如果设置了非响应模式,则直接执行方法,不返回响应\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n // 处理云对象方法响应逻辑,包括错误捕获和统一响应格式\n return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));\n };\n };\n\n return createCloudMethod;\n}\n\n/**\n * 解析并附加用户信息到云对象上下文\n *\n * 该函数用于验证用户身份并获取用户权限信息,将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败,则返回默认的空用户信息\n *\n * @param objectThis 云对象上下文,包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例,用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n *\n * @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n *\n * @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n */\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n // 验证用户token,忽略验证过程中的错误\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n if (!user) return appendUser;\n\n // 解析验证结果,忽略解析过程中的错误\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid || '';\n appendUser.role = userData.role || [];\n appendUser.permission = userData.permission || [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/**\n * HTTP 请求配置选项\n */\nexport type RequestOptions = {\n /**\n * 请求 URL 地址\n */\n url: string;\n\n /**\n * URL 查询参数,会自动拼接到 url 后面\n */\n query?: Record<string, string>;\n\n /**\n * HTTP 请求方法\n * @default 'GET'\n */\n method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS';\n\n /**\n * 请求头\n */\n headers?: Record<string, string>;\n\n /**\n * 请求体数据\n */\n data?: AnyObject;\n\n /**\n * 返回数据格式\n * @default 'json'\n */\n dataType?: string;\n\n /**\n * 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n */\n contentType?: string;\n\n /**\n * 请求超时时间,单位毫秒\n * @default 10000\n */\n timeout?: number;\n};\n\n/**\n * 发起 HTTP 请求\n *\n * 基于 uniCloud.httpclient 发起 HTTP 请求,支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n *\n * @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n *\n * @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n *\n * // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n *\n * // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":";;;;;;;;AAEA,SAAgB,uBAAuB,SAAiB,MAAwB;CAC9E,OAAO,YAAY,IAAI,MAAM,OAAO,GAAG;EACrC,SAAS;EACT,QAAQ;CACV,CAAC;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACsBA,SAAgB,uBACd,QACA,uBAAuB,IACQ;CAC/B,IAAI,OAAO,SACT,MAAM,uBAAuB,OAAO,UAAU,sBAAsB,OAAO,OAAO;CAEpF,OAAO,WAAW,QAAQ,CAAC,WAAW,QAAQ,CAAC;AACjD;;;;;;;;;;;;;;;;;;ACjBA,eAAsB,mBACpB,IACA,QAC+B;CAC/B,IAAI;EAGF,OAAO;GACL,SAAS;GACT,QAAQ;GACR,MAAA,MALiB,GAAG;GAMpB,GAAG;EACL;CACF,SAAS,KAAK;EACZ,QAAQ,MAAM,0BAA0B;EACxC,QAAQ,MAAM,GAAG;EAEjB,MAAM,OAAO,eAAe,GAAe;EAE3C,OAAO;GACL,SAAS,KAAK,WAAW;GACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;GAEvC,MAAM;GACN,GAAG;EACL;CACF;AACF;;;;;;;;;;;;;;;;;;;ACgHA,SAAgB,wBAAwB,SAA0C;CAChF,MAAM,eAAe,eAAe,WAAW,CAAC,GAAG;EACjD,qBAAqB;EACrB,oBAAoB;EACpB,oBAAoB;EACpB,wBAAwB;EACxB,yBAAyB;EACzB,sBAAsB,CAAC;EACvB,gBAAgB,CAAC;CACnB,CAAC;CAGD,MAAM,qBAAwC,MAAM,MAAM,SAAS;EAKjE,MAAM,gBAAgB,gBAHC,WAAW,IAAI,IAAI,OAAO,SAGK,CAAC,GAAG;GACxD,cAAc;GACd,cAAc;EAChB,CAAC;EAED,OAAO,eAAuC,OAAO;GACnD,MAAM,cAAc,YAAY;IAC9B,MAAM,EAAE,eAAe,KAAK,aAAa;IAEzC,IAAI,cAAc,gBAAgB,eAAe,SAC/C,MAAM,uBAAuB,aAAa,kBAAkB;IAG9D,MAAM,EAAE,eAAe,KAAK,cAAc;IAE1C,IAAI,cAAc,cAAc,eAAe,YAAY,cAAc,UAAU,IAAI,GACrF,MAAM,uBAAuB,aAAa,sBAAsB;IAGlE,IAAI,cAAc,cAAc,eAAe,YAAY,cAAc,UAAU,IAAI,GACrF,MAAM,uBAAuB,aAAa,uBAAuB;IAInE,MAAM,OAAO,MAAM,iBAAiB,MAAM,SAAS,iBAAiB;IACpE,MAAM,SAAiC;KACrC,SAAS;KACH;IACR;IACA,MAAM,UAAU,OAAO,OAAO,MAAM,MAAM;IAG1C,IAAI,cAAc,gBAAgB,CAAC,KAAK,IACtC,MAAM,uBAAuB,aAAa,oBAAoB,aAAa,mBAAmB;IAIhG,MAAM,aAAa,SAAS,OAAO;IAGnC,IAAI,WAAW,IAAI,GACjB,OAAO,MAAM,KAAK,OAAO;IAI3B,MAAM,SAAS,KAAK,UAAU,KAAK;IAGnC,IAAI,CAAC,OAAO,SAAS;KACnB,QAAQ,IAAI,OAAO,MAAM,MAAM;KAE/B,MAAM,SAAS,OAAO,OAAO,SAAS;KAGtC,IAAI,QAAQ,SAAS,UAAU,MAAM,OAAO;KAC5C,MAAM,IAAI,MAAM,SAAS;IAC3B;IAGA,OAAO,MAAM,KAAK,SAAS,OAAO,IAAI;GACxC;GAGA,IAAI,cAAc,WAChB,OAAO,MAAM,YAAY;GAI3B,OAAO,MAAM,mBAAmB,aAAa,aAAa,cAAc,IAAI,CAAC;EAC/E;CACF;CAEA,OAAO;AACT;;;;;;;;;;;;;;;;;;;;;AAsBA,eAAe,iBACb,YACA,mBACqC;CACrC,MAAM,aAAyC;EAC7C,IAAI;EACJ,MAAM,CAAC;EACP,YAAY,CAAC;EACb,SAAS;CACX;CAEA,IAAI,CAAC,mBAAmB,OAAO;CAO/B,MAAM,CAAC,OAAO,QAAQ,MAAM,WALhB,kBAAkB,eAAe,EAC3C,YAAY,WAAW,cAAc,EACvC,CAGuC,EAAI,WAAW,WAAW,cAAc,KAAK,EAAE,CAAC;CACvF,IAAI,CAAC,MAAM,OAAO;CAGlB,MAAM,CAAC,OAAO,YAAY,iBAAiB,uBAAuB,IAAI,CAAC;CACvE,IAAI,CAAC,UAAU,OAAO;CAEtB,WAAW,KAAK,SAAS,OAAO;CAChC,WAAW,OAAO,SAAS,QAAQ,CAAC;CACpC,WAAW,aAAa,SAAS,cAAc,CAAC;CAChD,WAAW,UAAU,WAAW,KAAK,SAAS,OAAO,KAAK,WAAW,WAAW,WAAW;CAE3F,OAAO;AACT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACvNA,eAAsB,QAAW,SAAyB;CACxD,MAAM,EACJ,KACA,QAAQ,CAAC,GACT,SAAS,OACT,UAAU,CAAC,GACX,MACA,WAAW,QACX,cAAc,QACd,UAAU,QACR;CAEJ,MAAM,UAAU,GAAG,IAAI,GAAG,YAAY,KAAK;CAa3C,OAAO,MATW,SAAS,WAAW,QAAQ,SAAS;EACrD;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;AAGH"}
1
+ {"version":3,"file":"cloud.mjs","names":[],"sources":["../src/cloud/error.ts","../src/cloud/module.ts","../src/cloud/respond.ts","../src/cloud/method.ts","../src/cloud/request.ts"],"sourcesContent":["import { errorAssign } from '@cloudcome/utils-core/error';\n\nexport function createCloudObjectError(message: string, code?: number | string) {\n return errorAssign(new Error(message), {\n errCode: code,\n errMsg: message,\n });\n}\n","import { objectOmit } from '@cloudcome/utils-core/object';\nimport { createCloudObjectError } from './error';\nimport type { CloudModuleOutput } from './types';\n\n/**\n * 解析云模块输出结果\n *\n * 该函数用于处理云模块的输出,如果输出中包含错误码,则抛出相应的错误;\n * 否则返回去除错误码和错误信息后的数据部分。\n *\n * @template O - 输出数据的类型\n * @param output - 云模块的输出结果,包含errCode、errMsg和数据部分\n * @param fallbackErrorMessage - 当输出中没有错误信息时使用的默认错误消息\n * @returns 返回去除errCode和errMsg字段后的数据对象\n * @throws {CloudObjectError} 当output中存在errCode时抛出包含错误码和错误信息的异常\n *\n * @example\n * // 成功情况\n * const result = parseCloudModuleOutput({ value: 'success', errCode: 0, errMsg: '' });\n * // 返回: { value: 'success' }\n *\n * @example\n * // 错误情况\n * try {\n * parseCloudModuleOutput({ errCode: 404, errMsg: 'Not Found' });\n * } catch (error) {\n * // 抛出错误: CloudObjectError('Not Found', 404)\n * }\n */\nexport function parseCloudModuleOutput<O>(\n output: CloudModuleOutput<O>,\n fallbackErrorMessage = '',\n): Omit<O, 'errCode' | 'errMsg'> {\n if (output.errCode) {\n throw createCloudObjectError(output.errMsg || fallbackErrorMessage, output.errCode);\n }\n return objectOmit(output, ['errCode', 'errMsg']);\n}\n","import { errorNormalize } from '@cloudcome/utils-core/error';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport type { UniError } from '@/_types';\nimport type { CloudMethodOutput } from './types';\n\n/**\n * 执行云对象方法并标准化响应格式\n *\n * @template O - 函数返回值的类型\n * @param fn - 要执行的异步函数\n * @param append - 要附加到响应中的额外数据\n * @returns 标准化的云对象响应对象\n *\n * @example\n * ```typescript\n * const result = await respondCloudMethod(async () => {\n * return await getData();\n * }, { extra: 'data' });\n * ```\n */\nexport async function respondCloudMethod<O>(\n fn: () => MaybePromise<O>,\n append?: AnyObject,\n): Promise<CloudMethodOutput<O>> {\n try {\n const data = await fn();\n\n return {\n errCode: 0,\n errMsg: '',\n data,\n ...append,\n };\n } catch (err) {\n console.error('respondCloudObject error');\n console.error(err);\n\n const err2 = errorNormalize(err as UniError);\n\n return {\n errCode: err2.errCode || -1,\n errMsg: err2.errMsg || err2.message || '',\n // @ts-expect-error\n data: null,\n ...append,\n };\n }\n}\n","import { objectDefaults } from '@cloudcome/utils-core/object';\nimport { tryFlatten } from '@cloudcome/utils-core/try';\nimport { isFunction } from '@cloudcome/utils-core/type';\nimport type { MaybePromise } from '@cloudcome/utils-core/types';\nimport { versionCompare } from '@cloudcome/utils-core/version';\nimport type z from 'zod';\nimport type { ZodObject } from 'zod';\nimport { createCloudObjectError } from './error';\nimport { parseCloudModuleOutput } from './module';\nimport { respondCloudMethod } from './respond';\nimport type { CloudMethod, CloudObjectThis } from './types';\nimport type { UniIdCommonModule } from './uni-id';\n\ntype _CloudObjectThisAppendUser = {\n id: string;\n role: string[];\n permission: string[];\n isAdmin: boolean;\n};\n\n/**\n * 云对象创建选项的运行时解析类型。\n *\n * 将 `CreateCloudObjectOptions` 中的内置字段设为必填(已应用默认值),\n * 同时保留 `ExtraConfig` 扩展字段的原始可选性。\n *\n * @template ExtraConfig - 自定义扩展配置类型\n */\ntype _ResolvedCreateCloudOptions<ExtraConfig extends AnyObject = {}> = ExtraConfig & {\n /** 是否需要用户登录态 */\n requiredUser: boolean;\n /** 是否仅在本地环境运行 */\n onlyLocalEnv: boolean;\n /** 最小支持版本 */\n minVersion?: string;\n /** 最大支持版本 */\n maxVersion?: string;\n /** 非响应模式,常用于钩子函数中 */\n noRespond?: boolean;\n};\n\ntype _CloudObjectThisAppend<ExtraConfig extends AnyObject = {}> = {\n options: _ResolvedCreateCloudOptions<ExtraConfig>;\n user: _CloudObjectThisAppendUser;\n};\n\nexport type CloudObjectContext<ExtraConfig extends AnyObject = {}> = CloudObjectThis &\n _CloudObjectThisAppend<ExtraConfig>;\n\nexport type BuildCloudMethodCreatorOptions<ExtraConfig extends AnyObject = {}> = {\n /**\n * UniId 通用模块\n * 用于处理用户身份验证和权限管理\n * 如果提供,将在云对象执行前验证用户身份\n */\n uniIdCommonModule?: UniIdCommonModule;\n\n /**\n * 需要用户登录态的错误码\n * @default 'uni-id-check-token-failed'\n */\n requiredUserErrCode?: number | string;\n\n /**\n * 需要用户登录态的错误消息\n * @default '需要登录后才能进行此操作'\n */\n requiredUserErrMsg?: string;\n\n /**\n * 仅允许本地环境运行的错误消息\n * @default '运行环境不匹配'\n */\n onlyLocalEnvErrMsg?: string;\n\n /**\n * 版本不匹配错误消息\n * @default '应用版本过低'\n */\n appVersionTooLowErrMsg?: string;\n\n /**\n * 应用版本过高错误消息\n * @default '应用版本过高'\n */\n appVersionTooHighErrMsg?: string;\n\n /**\n * 响应附加数据函数\n * 用于在云对象响应中添加额外的上下文信息\n * @param objectThis 云对象上下文\n * @returns 返回要附加到响应中的数据对象\n */\n respondAppend?: (objectThis: CloudObjectThis) => AnyObject;\n\n /**\n * 所有云对象执行前钩子函数\n * @param context 云对象上下文,包含用户信息、扩展配置选项等\n * @param options 云对象创建选项,包含 requiredUser、onlyLocalEnv 及自定义扩展配置\n */\n onBefore?: (\n context: CloudObjectContext<ExtraConfig>,\n options: _ResolvedCreateCloudOptions<ExtraConfig>,\n ) => MaybePromise<unknown>;\n};\n\nexport type CreateCloudObjectOptions<ExtraConfig extends object = object> = ExtraConfig & {\n /**\n * 是否需要用户登录态\n * @default false\n */\n requiredUser?: boolean;\n\n /**\n * 是否仅在本地环境运行\n * @default false\n */\n onlyLocalEnv?: boolean;\n\n /**\n * 最小支持版本\n */\n minVersion?: string;\n\n /**\n * 最大支持版本\n */\n maxVersion?: string;\n\n /**\n * 非响应模式,常用于钩子函数中,如 _before, _after 等,\n * 文档:https://doc.dcloud.net.cn/uniCloud/cloud-obj.html#before-and-after\n */\n noRespond?: boolean;\n};\n\nexport type CreateCloudMethod<ExtraConfig extends object = object> = {\n <S extends ZodObject, O>(\n schema: S,\n fn: (context: CloudObjectContext<ExtraConfig>, input: z.infer<S>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<z.infer<S>, O>;\n\n <O>(\n fn: (context: CloudObjectContext<ExtraConfig>) => MaybePromise<O>,\n options?: CreateCloudObjectOptions<ExtraConfig>,\n ): CloudMethod<void, O>;\n};\n\n/**\n * 构建云对象方法创建器\n *\n * 该函数用于创建云对象方法的工厂函数,支持输入验证、用户身份验证、环境检查等功能。\n * 返回的创建器函数可以根据不同的配置创建云对象方法。\n *\n * @param options 构建选项,用于配置云对象方法创建器的行为\n * @returns 返回一个云对象方法创建器函数\n *\n * @example\n * // 创建一个需要用户登录的云对象方法\n * const createMethod = buildCloudMethodCreator({ uniIdCommonModule });\n * const myMethod = createMethod(async (context) => {\n * return { message: 'Hello ' + context.user.id };\n * }, { requiredUser: true });\n */\nexport function buildCloudMethodCreator<ExtraConfig extends AnyObject = {}>(\n options?: BuildCloudMethodCreatorOptions<ExtraConfig>,\n) {\n const buildOptions = objectDefaults(options || {}, {\n requiredUserErrCode: 'uni-id-check-token-failed',\n requiredUserErrMsg: '需要登录后才能进行此操作',\n onlyLocalEnvErrMsg: '运行环境不匹配',\n appVersionTooLowErrMsg: '应用版本过低',\n appVersionTooHighErrMsg: '应用版本过高',\n respondAppend: () => ({}),\n onBefore: () => {},\n }) as Required<BuildCloudMethodCreatorOptions>;\n\n // @ts-expect-error\n const createCloudMethod: CreateCloudMethod<ExtraConfig> = (arg0, arg1, arg2) => {\n const optionsSource = (isFunction(arg0) ? arg1 : arg2) as CreateCloudObjectOptions<ExtraConfig> | undefined;\n const createOptions = objectDefaults(optionsSource || {}, {\n requiredUser: false,\n onlyLocalEnv: false,\n }) as _ResolvedCreateCloudOptions<ExtraConfig>;\n\n return async function (this: CloudObjectThis, input) {\n const cloudMethod = async () => {\n const { runtimeEnv } = this.getCloudInfo();\n\n if (createOptions.onlyLocalEnv && runtimeEnv !== 'local') {\n throw createCloudObjectError(buildOptions.onlyLocalEnvErrMsg);\n }\n\n const { appVersion } = this.getClientInfo();\n\n if (createOptions.minVersion && versionCompare(appVersion, createOptions.minVersion) < 0) {\n throw createCloudObjectError(buildOptions.appVersionTooLowErrMsg);\n }\n\n if (createOptions.maxVersion && versionCompare(appVersion, createOptions.maxVersion) > 0) {\n throw createCloudObjectError(buildOptions.appVersionTooHighErrMsg);\n }\n\n const user = await _parseAppendUser(this, options?.uniIdCommonModule);\n const append: _CloudObjectThisAppend<ExtraConfig> = {\n options: createOptions,\n user: user,\n };\n const context = Object.assign(this, append) as CloudObjectContext<ExtraConfig>;\n\n if (createOptions.requiredUser && !user.id) {\n throw createCloudObjectError(buildOptions.requiredUserErrMsg, buildOptions.requiredUserErrCode);\n }\n\n await buildOptions.onBefore(context, createOptions);\n\n if (isFunction(arg0)) {\n return await arg0(context);\n }\n\n const parsed = arg0.safeParse(input);\n\n if (!parsed.success) {\n console.log(parsed.error.issues);\n\n const issue0 = parsed.error?.issues?.[0];\n\n if (issue0?.code === 'custom') throw issue0.message;\n throw new Error('请求数据不正确');\n }\n\n return await arg1(context, parsed.data);\n };\n\n if (createOptions.noRespond) {\n return await cloudMethod();\n }\n\n return await respondCloudMethod(cloudMethod, buildOptions.respondAppend(this));\n };\n };\n\n return createCloudMethod;\n}\n\n/**\n * 解析并附加用户信息到云对象上下文\n *\n * 该函数用于验证用户身份并获取用户权限信息,将结果附加到云对象上下文中的user字段\n * 如果未提供uniIdCommonModule或验证失败,则返回默认的空用户信息\n *\n * @param objectThis 云对象上下文,包含客户端信息和token等\n * @param uniIdCommonModule 可选的UniId通用模块实例,用于验证用户token\n * @returns 返回包含用户ID、角色、权限等信息的对象\n *\n * @example\n * // 成功验证用户身份\n * const user = await _parseAppendUser(this, uniIdModule);\n * // 返回: { id: 'user123', role: ['user'], permission: ['read'], isAdmin: false }\n *\n * @example\n * // 验证失败或未提供模块\n * const user = await _parseAppendUser(this);\n * // 返回: { id: '', role: [], permission: [], isAdmin: false }\n */\nasync function _parseAppendUser(\n objectThis: CloudObjectThis,\n uniIdCommonModule?: UniIdCommonModule,\n): Promise<_CloudObjectThisAppendUser> {\n const appendUser: _CloudObjectThisAppendUser = {\n id: '',\n role: [],\n permission: [],\n isAdmin: false,\n };\n\n if (!uniIdCommonModule) return appendUser;\n\n const uic = uniIdCommonModule.createInstance({\n clientInfo: objectThis.getClientInfo(),\n });\n\n const [_err1, user] = await tryFlatten(uic.checkToken(objectThis.getUniIdToken() || ''));\n if (!user) return appendUser;\n\n const [_err2, userData] = tryFlatten(() => parseCloudModuleOutput(user));\n if (!userData) return appendUser;\n\n appendUser.id = userData.uid || '';\n appendUser.role = userData.role || [];\n appendUser.permission = userData.permission || [];\n appendUser.isAdmin = appendUser.role.includes('admin') && appendUser.permission.length === 0;\n\n return appendUser;\n}\n","import { qsStringify } from '@cloudcome/utils-core/qs';\nimport type { AnyObject } from '@cloudcome/utils-core/types';\n\n/**\n * HTTP 请求配置选项\n */\nexport type RequestOptions = {\n /**\n * 请求 URL 地址\n */\n url: string;\n\n /**\n * URL 查询参数,会自动拼接到 url 后面\n */\n query?: Record<string, string>;\n\n /**\n * HTTP 请求方法\n * @default 'GET'\n */\n method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS';\n\n /**\n * 请求头\n */\n headers?: Record<string, string>;\n\n /**\n * 请求体数据\n */\n data?: AnyObject;\n\n /**\n * 返回数据格式\n * @default 'json'\n */\n dataType?: string;\n\n /**\n * 请求内容类型\n * - 'json': application/json\n * - 'form': application/x-www-form-urlencoded\n * @default 'json'\n */\n contentType?: string;\n\n /**\n * 请求超时时间,单位毫秒\n * @default 10000\n */\n timeout?: number;\n};\n\n/**\n * 发起 HTTP 请求\n *\n * 基于 uniCloud.httpclient 发起 HTTP 请求,支持 GET、POST、PUT、DELETE 等方法。\n * 查询参数会自动通过 qsStringify 拼接到 URL 上。\n *\n * @template T - 响应数据的类型\n * @param options 请求配置选项\n * @returns 包含 data、status、headers 的响应对象\n *\n * @example\n * ```ts\n * // GET 请求\n * const res = await request<{ name: string }>({\n * url: 'https://api.example.com/users/1',\n * })\n * console.log(res.data) // { name: 'Alice' }\n * console.log(res.status) // 200\n *\n * // POST 请求\n * const res = await request<{ id: string }>({\n * url: 'https://api.example.com/users',\n * method: 'POST',\n * data: { name: 'Alice', age: 25 },\n * })\n *\n * // 带查询参数\n * const res = await request<{ list: any[] }>({\n * url: 'https://api.example.com/users',\n * query: { page: '1', size: '10' },\n * })\n * ```\n */\nexport async function request<T>(options: RequestOptions) {\n const {\n url,\n query = {},\n method = 'GET',\n headers = {},\n data,\n dataType = 'json',\n contentType = 'json',\n timeout = 10000,\n } = options;\n\n const fullUrl = `${url}?${qsStringify(query)}`;\n\n // 使用uniCloud.httpclient发起请求\n // @ts-expect-error: uniCloud类型定义中可能缺少httpclient属性\n const res = await uniCloud.httpclient.request(fullUrl, {\n method,\n headers,\n data,\n dataType,\n contentType,\n timeout,\n });\n\n return res as { data: T; status: number; headers: Record<string, string> };\n}\n"],"mappings":";;;;;;;;AAEA,SAAgB,uBAAuB,SAAiB,MAAwB;CAC9E,OAAO,YAAY,IAAI,MAAM,OAAO,GAAG;EACrC,SAAS;EACT,QAAQ;CACV,CAAC;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACsBA,SAAgB,uBACd,QACA,uBAAuB,IACQ;CAC/B,IAAI,OAAO,SACT,MAAM,uBAAuB,OAAO,UAAU,sBAAsB,OAAO,OAAO;CAEpF,OAAO,WAAW,QAAQ,CAAC,WAAW,QAAQ,CAAC;AACjD;;;;;;;;;;;;;;;;;;ACjBA,eAAsB,mBACpB,IACA,QAC+B;CAC/B,IAAI;EAGF,OAAO;GACL,SAAS;GACT,QAAQ;GACR,MAAA,MALiB,GAAG;GAMpB,GAAG;EACL;CACF,SAAS,KAAK;EACZ,QAAQ,MAAM,0BAA0B;EACxC,QAAQ,MAAM,GAAG;EAEjB,MAAM,OAAO,eAAe,GAAe;EAE3C,OAAO;GACL,SAAS,KAAK,WAAW;GACzB,QAAQ,KAAK,UAAU,KAAK,WAAW;GAEvC,MAAM;GACN,GAAG;EACL;CACF;AACF;;;;;;;;;;;;;;;;;;;ACsHA,SAAgB,wBACd,SACA;CACA,MAAM,eAAe,eAAe,WAAW,CAAC,GAAG;EACjD,qBAAqB;EACrB,oBAAoB;EACpB,oBAAoB;EACpB,wBAAwB;EACxB,yBAAyB;EACzB,sBAAsB,CAAC;EACvB,gBAAgB,CAAC;CACnB,CAAC;CAGD,MAAM,qBAAqD,MAAM,MAAM,SAAS;EAE9E,MAAM,gBAAgB,gBADC,WAAW,IAAI,IAAI,OAAO,SACK,CAAC,GAAG;GACxD,cAAc;GACd,cAAc;EAChB,CAAC;EAED,OAAO,eAAuC,OAAO;GACnD,MAAM,cAAc,YAAY;IAC9B,MAAM,EAAE,eAAe,KAAK,aAAa;IAEzC,IAAI,cAAc,gBAAgB,eAAe,SAC/C,MAAM,uBAAuB,aAAa,kBAAkB;IAG9D,MAAM,EAAE,eAAe,KAAK,cAAc;IAE1C,IAAI,cAAc,cAAc,eAAe,YAAY,cAAc,UAAU,IAAI,GACrF,MAAM,uBAAuB,aAAa,sBAAsB;IAGlE,IAAI,cAAc,cAAc,eAAe,YAAY,cAAc,UAAU,IAAI,GACrF,MAAM,uBAAuB,aAAa,uBAAuB;IAGnE,MAAM,OAAO,MAAM,iBAAiB,MAAM,SAAS,iBAAiB;IACpE,MAAM,SAA8C;KAClD,SAAS;KACH;IACR;IACA,MAAM,UAAU,OAAO,OAAO,MAAM,MAAM;IAE1C,IAAI,cAAc,gBAAgB,CAAC,KAAK,IACtC,MAAM,uBAAuB,aAAa,oBAAoB,aAAa,mBAAmB;IAGhG,MAAM,aAAa,SAAS,SAAS,aAAa;IAElD,IAAI,WAAW,IAAI,GACjB,OAAO,MAAM,KAAK,OAAO;IAG3B,MAAM,SAAS,KAAK,UAAU,KAAK;IAEnC,IAAI,CAAC,OAAO,SAAS;KACnB,QAAQ,IAAI,OAAO,MAAM,MAAM;KAE/B,MAAM,SAAS,OAAO,OAAO,SAAS;KAEtC,IAAI,QAAQ,SAAS,UAAU,MAAM,OAAO;KAC5C,MAAM,IAAI,MAAM,SAAS;IAC3B;IAEA,OAAO,MAAM,KAAK,SAAS,OAAO,IAAI;GACxC;GAEA,IAAI,cAAc,WAChB,OAAO,MAAM,YAAY;GAG3B,OAAO,MAAM,mBAAmB,aAAa,aAAa,cAAc,IAAI,CAAC;EAC/E;CACF;CAEA,OAAO;AACT;;;;;;;;;;;;;;;;;;;;;AAsBA,eAAe,iBACb,YACA,mBACqC;CACrC,MAAM,aAAyC;EAC7C,IAAI;EACJ,MAAM,CAAC;EACP,YAAY,CAAC;EACb,SAAS;CACX;CAEA,IAAI,CAAC,mBAAmB,OAAO;CAM/B,MAAM,CAAC,OAAO,QAAQ,MAAM,WAJhB,kBAAkB,eAAe,EAC3C,YAAY,WAAW,cAAc,EACvC,CAEuC,EAAI,WAAW,WAAW,cAAc,KAAK,EAAE,CAAC;CACvF,IAAI,CAAC,MAAM,OAAO;CAElB,MAAM,CAAC,OAAO,YAAY,iBAAiB,uBAAuB,IAAI,CAAC;CACvE,IAAI,CAAC,UAAU,OAAO;CAEtB,WAAW,KAAK,SAAS,OAAO;CAChC,WAAW,OAAO,SAAS,QAAQ,CAAC;CACpC,WAAW,aAAa,SAAS,cAAc,CAAC;CAChD,WAAW,UAAU,WAAW,KAAK,SAAS,OAAO,KAAK,WAAW,WAAW,WAAW;CAE3F,OAAO;AACT;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AChNA,eAAsB,QAAW,SAAyB;CACxD,MAAM,EACJ,KACA,QAAQ,CAAC,GACT,SAAS,OACT,UAAU,CAAC,GACX,MACA,WAAW,QACX,cAAc,QACd,UAAU,QACR;CAEJ,MAAM,UAAU,GAAG,IAAI,GAAG,YAAY,KAAK;CAa3C,OAAO,MATW,SAAS,WAAW,QAAQ,SAAS;EACrD;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;AAGH"}
package/dist/index.cjs CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  /**
4
4
  * `@cloudcome/utils-uni` 版本号
5
5
  */
6
- var VERSION = "1.39.0";
6
+ var VERSION = "1.41.0";
7
7
  //#endregion
8
8
  exports.VERSION = VERSION;
9
9
 
package/dist/index.mjs CHANGED
@@ -2,7 +2,7 @@
2
2
  /**
3
3
  * `@cloudcome/utils-uni` 版本号
4
4
  */
5
- var VERSION = "1.39.0";
5
+ var VERSION = "1.41.0";
6
6
  //#endregion
7
7
  export { VERSION };
8
8
 
@@ -9,12 +9,11 @@ export type SendData<T> = {
9
9
  */
10
10
  userId: string;
11
11
  /**
12
- * 小程序环境
13
- * - `develop`: 开发版
12
+ * 小程序跳转环境
14
13
  * - `trial`: 体验版
15
- * - `release`: 正式版
14
+ * - `formal`: 正式版
16
15
  */
17
- clientEnv: 'develop' | 'trial' | 'release';
16
+ miniprogramState: 'trial' | 'formal';
18
17
  /**
19
18
  * 通知数据,key 对应模板字段(如 thing1, number1)
20
19
  */
@@ -70,7 +69,7 @@ export type BuildSendWeixinNoticeServiceOptions = {
70
69
  *
71
70
  * await sendNotice({
72
71
  * userId: 'user-123',
73
- * clientEnv: 'release',
72
+ * miniprogramState: 'formal',
74
73
  * payload: { thing1: '订单已发货', number1: 12345 },
75
74
  * page: '/pages/order/detail?id=12345',
76
75
  * })
@@ -12,16 +12,16 @@ export type BuildWeixinAccessTokenServiceOptions = {
12
12
  */
13
13
  appSecret: string;
14
14
  /**
15
- * 获取临时数据(用于缓存 access_token
15
+ * 查询缓存的 access_token
16
16
  * @returns 缓存的 access_token,无缓存时返回空字符串
17
17
  */
18
- getTempDataService: () => Promise<string>;
18
+ queryAccessToken: () => Promise<string>;
19
19
  /**
20
- * 设置临时数据(用于缓存 access_token
20
+ * 保存 access_token 到缓存
21
21
  * @param accessToken access_token 值
22
22
  * @param expiresIn 过期时间,单位毫秒
23
23
  */
24
- setTempDataService: (accessToken: string, expiresIn: number) => Promise<void>;
24
+ saveAccessToken: (accessToken: string, expiresIn: number) => Promise<void>;
25
25
  /**
26
26
  * 模拟请求函数,用于单元测试注入
27
27
  */
@@ -40,8 +40,8 @@ export type BuildWeixinAccessTokenServiceOptions = {
40
40
  * const getAccessToken = await buildWeixinAccessTokenService({
41
41
  * appId: 'wx123',
42
42
  * appSecret: 'secret',
43
- * getTempDataService: () => kv.get('token'),
44
- * setTempDataService: (token, ttl) => kv.set('token', token, ttl),
43
+ * queryAccessToken: () => kv.get('token'),
44
+ * saveAccessToken: (token, ttl) => kv.set('token', token, ttl),
45
45
  * })
46
46
  * const token = await getAccessToken()
47
47
  * ```
package/dist/weixin.cjs CHANGED
@@ -16,16 +16,16 @@ let _cloudcome_utils_core_try = require("@cloudcome/utils-core/try");
16
16
  * const getAccessToken = await buildWeixinAccessTokenService({
17
17
  * appId: 'wx123',
18
18
  * appSecret: 'secret',
19
- * getTempDataService: () => kv.get('token'),
20
- * setTempDataService: (token, ttl) => kv.set('token', token, ttl),
19
+ * queryAccessToken: () => kv.get('token'),
20
+ * saveAccessToken: (token, ttl) => kv.set('token', token, ttl),
21
21
  * })
22
22
  * const token = await getAccessToken()
23
23
  * ```
24
24
  */
25
25
  async function buildWeixinAccessTokenService(options) {
26
- const { appId, appSecret, _mockRequest, getTempDataService, setTempDataService } = options;
26
+ const { appId, appSecret, _mockRequest, queryAccessToken, saveAccessToken } = options;
27
27
  return async function getWeixinAccessTokenService() {
28
- let accessToken = await getTempDataService();
28
+ let accessToken = await queryAccessToken();
29
29
  if (accessToken) return accessToken;
30
30
  const { data: accessInfo } = await (_mockRequest || require_cloud.request)({
31
31
  url: "https://api.weixin.qq.com/cgi-bin/token",
@@ -38,8 +38,8 @@ async function buildWeixinAccessTokenService(options) {
38
38
  });
39
39
  if (!accessInfo.access_token) throw new Error(accessInfo.errmsg || "获取 access_token 失败");
40
40
  accessToken = accessInfo.access_token;
41
- const [err] = await (0, _cloudcome_utils_core_try.tryFlatten)(setTempDataService(accessToken, accessInfo.expires_in * 1e3));
42
- if (err) console.error("设置临时数据失败", err);
41
+ const [err] = await (0, _cloudcome_utils_core_try.tryFlatten)(saveAccessToken(accessToken, accessInfo.expires_in * 1e3));
42
+ if (err) console.error("保存 access_token 失败", err);
43
43
  return accessToken;
44
44
  };
45
45
  }
@@ -68,7 +68,7 @@ async function buildWeixinAccessTokenService(options) {
68
68
  *
69
69
  * await sendNotice({
70
70
  * userId: 'user-123',
71
- * clientEnv: 'release',
71
+ * miniprogramState: 'formal',
72
72
  * payload: { thing1: '订单已发货', number1: 12345 },
73
73
  * page: '/pages/order/detail?id=12345',
74
74
  * })
@@ -77,7 +77,7 @@ async function buildWeixinAccessTokenService(options) {
77
77
  function buildSendWeixinNoticeService(options) {
78
78
  const { templateId, getWeixinAccessTokenService, getUserWeixinOpenId, _mockRequest } = options;
79
79
  return async function sendWeixinNoticeService(sendData) {
80
- const { userId, page, payload } = sendData;
80
+ const { userId, page, payload, miniprogramState } = sendData;
81
81
  const wxOpenId = await getUserWeixinOpenId(userId);
82
82
  if (!wxOpenId) throw new Error("用户未绑定微信");
83
83
  const accessToken = await getWeixinAccessTokenService();
@@ -89,7 +89,7 @@ function buildSendWeixinNoticeService(options) {
89
89
  touser: wxOpenId,
90
90
  template_id: templateId,
91
91
  page: page.replace(/^\//, ""),
92
- miniprogram_state: sendData.clientEnv === "trial" ? "trial" : "formal",
92
+ miniprogram_state: miniprogramState,
93
93
  lang: "zh_CN",
94
94
  data: (0, _cloudcome_utils_core_object.objectMap)(payload, (val, key) => ({ value: _fixPayloadValue(key, val) }))
95
95
  }
@@ -1 +1 @@
1
- {"version":3,"file":"weixin.cjs","names":[],"sources":["../src/weixin/token.ts","../src/weixin/notice.ts"],"sourcesContent":["import { tryFlatten } from '@cloudcome/utils-core/try';\nimport { request } from '../cloud';\n\n/**\n * 构建微信 access_token 获取服务的选项\n */\nexport type BuildWeixinAccessTokenServiceOptions = {\n /**\n * 微信小程序应用ID\n */\n appId: string;\n\n /**\n * 微信小程序应用密钥\n */\n appSecret: string;\n\n /**\n * 获取临时数据(用于缓存 access_token)\n * @returns 缓存的 access_token,无缓存时返回空字符串\n */\n getTempDataService: () => Promise<string>;\n\n /**\n * 设置临时数据(用于缓存 access_token)\n * @param accessToken access_token 值\n * @param expiresIn 过期时间,单位毫秒\n */\n setTempDataService: (accessToken: string, expiresIn: number) => Promise<void>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信 access_token 获取服务。\n *\n * 自动处理缓存逻辑:优先从临时数据中获取,不存在时调用微信 API 获取并缓存。\n *\n * @param options - 构造选项\n * @returns 获取 access_token 的异步函数\n *\n * @example\n * ```ts\n * const getAccessToken = await buildWeixinAccessTokenService({\n * appId: 'wx123',\n * appSecret: 'secret',\n * getTempDataService: () => kv.get('token'),\n * setTempDataService: (token, ttl) => kv.set('token', token, ttl),\n * })\n * const token = await getAccessToken()\n * ```\n */\nexport async function buildWeixinAccessTokenService(options: BuildWeixinAccessTokenServiceOptions) {\n const { appId, appSecret, _mockRequest, getTempDataService, setTempDataService } = options;\n\n return async function getWeixinAccessTokenService() {\n let accessToken = await getTempDataService();\n if (accessToken) return accessToken;\n\n const { data: accessInfo } = await (_mockRequest || request)<{\n access_token: string;\n expires_in: number;\n errmsg: string;\n errcode: number;\n }>({\n url: 'https://api.weixin.qq.com/cgi-bin/token',\n method: 'GET',\n query: {\n grant_type: 'client_credential',\n appid: appId,\n secret: appSecret,\n },\n });\n\n if (!accessInfo.access_token) throw new Error(accessInfo.errmsg || '获取 access_token 失败');\n accessToken = accessInfo.access_token;\n\n const [err] = await tryFlatten(setTempDataService(accessToken, accessInfo.expires_in * 1000));\n if (err) console.error('设置临时数据失败', err);\n\n return accessToken;\n };\n}\n","import { request } from '@/cloud';\nimport { objectMap } from '@cloudcome/utils-core/object';\n\n/**\n * 发送微信订阅消息的数据结构\n * @template T - payload 字段类型,key 为模板字段名,value 为 string | number\n */\nexport type SendData<T> = {\n /**\n * 用户ID,用于查找对应的微信 openId\n */\n userId: string;\n\n /**\n * 小程序环境\n * - `develop`: 开发版\n * - `trial`: 体验版\n * - `release`: 正式版\n */\n clientEnv: 'develop' | 'trial' | 'release';\n\n /**\n * 通知数据,key 对应模板字段(如 thing1, number1)\n */\n payload: T;\n\n /**\n * 点击消息后跳转的页面路径,开头 `/` 会被自动移除\n */\n page: string;\n};\n\n/**\n * 构建微信订阅消息发送服务的选项\n */\nexport type BuildSendWeixinNoticeServiceOptions = {\n /**\n * 订阅消息模板ID\n */\n templateId: string;\n\n /**\n * 获取微信 access_token 的服务函数\n */\n getWeixinAccessTokenService: () => Promise<string>;\n\n /**\n * 根据用户ID获取微信 openId\n * @param userId - 用户ID\n * @returns 微信 openId,未绑定时返回空字符串\n */\n getUserWeixinOpenId: (userId: string) => Promise<string>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信订阅消息发送服务。\n *\n * 封装微信订阅消息发送逻辑,自动处理 access_token 获取、openId 查找、\n * 字段长度截断(thing 类型 20 字符,character_string 类型 32 字符)等。\n *\n * @template T - payload 字段类型\n * @param options - 构造选项\n * @returns 发送订阅消息的函数\n *\n * @example\n * ```ts\n * const sendNotice = buildSendWeixinNoticeService({\n * templateId: 'tmpl_abc123',\n * getWeixinAccessTokenService: getAccessToken,\n * getUserWeixinOpenId: async (userId) => {\n * const user = await db.collection('users').doc(userId).get()\n * return user.data?.openId\n * },\n * })\n *\n * await sendNotice({\n * userId: 'user-123',\n * clientEnv: 'release',\n * payload: { thing1: '订单已发货', number1: 12345 },\n * page: '/pages/order/detail?id=12345',\n * })\n * ```\n */\nexport function buildSendWeixinNoticeService<T extends Record<string, number | string>>(\n options: BuildSendWeixinNoticeServiceOptions,\n) {\n const { templateId, getWeixinAccessTokenService, getUserWeixinOpenId, _mockRequest } = options;\n\n return async function sendWeixinNoticeService(sendData: SendData<T>) {\n const { userId, page, payload } = sendData;\n const wxOpenId = await getUserWeixinOpenId(userId);\n if (!wxOpenId) throw new Error('用户未绑定微信');\n\n const accessToken = await getWeixinAccessTokenService();\n const { data } = await (_mockRequest || request)<{\n errcode: number;\n errmsg: string;\n }>({\n url: `https://api.weixin.qq.com/cgi-bin/message/subscribe/send`,\n method: 'POST',\n query: {\n access_token: accessToken,\n },\n data: {\n touser: wxOpenId,\n template_id: templateId,\n page: page.replace(/^\\//, ''),\n miniprogram_state: sendData.clientEnv === 'trial' ? 'trial' : 'formal',\n lang: 'zh_CN',\n data: objectMap(payload, (val, key) => ({\n value: _fixPayloadValue(key as string, val),\n })),\n },\n });\n\n if (data.errcode === 43101) return;\n\n if (data.errcode !== 0) throw new Error(data.errmsg || '发送失败,未知错误');\n };\n}\n\n/**\n * 修复通知 payload 字段值,根据微信模板字段类型自动截断。\n *\n * 截断规则:\n * - thing 类型:20 字符以内\n * - character_string 类型:32 字符以内\n * - 其他类型:不处理\n *\n * @param key - 模板字段 key(如 thing1, number1)\n * @param val - 字段值\n * @returns 修复后的值\n */\nfunction _fixPayloadValue(key: string, val: number | string) {\n if (key.startsWith('thing')) return _autoEllipsis(val.toString(), 20);\n if (key.startsWith('character_string')) return _autoEllipsis(val.toString(), 32);\n return val;\n}\n\n/**\n * 字符串超长时自动截断并添加省略号。\n *\n * @param val - 原始字符串\n * @param len - 最大长度\n * @returns 截断后的字符串\n */\nfunction _autoEllipsis(val: string, len: number) {\n return val.length > len ? `${val.slice(0, len - 3)}...` : val;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAuDA,eAAsB,8BAA8B,SAA+C;CACjG,MAAM,EAAE,OAAO,WAAW,cAAc,oBAAoB,uBAAuB;CAEnF,OAAO,eAAe,8BAA8B;EAClD,IAAI,cAAc,MAAM,mBAAmB;EAC3C,IAAI,aAAa,OAAO;EAExB,MAAM,EAAE,MAAM,eAAe,OAAO,gBAAgB,cAAA,SAKjD;GACD,KAAK;GACL,QAAQ;GACR,OAAO;IACL,YAAY;IACZ,OAAO;IACP,QAAQ;GACV;EACF,CAAC;EAED,IAAI,CAAC,WAAW,cAAc,MAAM,IAAI,MAAM,WAAW,UAAU,oBAAoB;EACvF,cAAc,WAAW;EAEzB,MAAM,CAAC,OAAO,OAAA,GAAA,0BAAA,YAAiB,mBAAmB,aAAa,WAAW,aAAa,GAAI,CAAC;EAC5F,IAAI,KAAK,QAAQ,MAAM,YAAY,GAAG;EAEtC,OAAO;CACT;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACGA,SAAgB,6BACd,SACA;CACA,MAAM,EAAE,YAAY,6BAA6B,qBAAqB,iBAAiB;CAEvF,OAAO,eAAe,wBAAwB,UAAuB;EACnE,MAAM,EAAE,QAAQ,MAAM,YAAY;EAClC,MAAM,WAAW,MAAM,oBAAoB,MAAM;EACjD,IAAI,CAAC,UAAU,MAAM,IAAI,MAAM,SAAS;EAExC,MAAM,cAAc,MAAM,4BAA4B;EACtD,MAAM,EAAE,SAAS,OAAO,gBAAgB,cAAA,SAGrC;GACD,KAAK;GACL,QAAQ;GACR,OAAO,EACL,cAAc,YAChB;GACA,MAAM;IACJ,QAAQ;IACR,aAAa;IACb,MAAM,KAAK,QAAQ,OAAO,EAAE;IAC5B,mBAAmB,SAAS,cAAc,UAAU,UAAU;IAC9D,MAAM;IACN,OAAA,GAAA,6BAAA,WAAgB,UAAU,KAAK,SAAS,EACtC,OAAO,iBAAiB,KAAe,GAAG,EAC5C,EAAE;GACJ;EACF,CAAC;EAED,IAAI,KAAK,YAAY,OAAO;EAE5B,IAAI,KAAK,YAAY,GAAG,MAAM,IAAI,MAAM,KAAK,UAAU,WAAW;CACpE;AACF;;;;;;;;;;;;;AAcA,SAAS,iBAAiB,KAAa,KAAsB;CAC3D,IAAI,IAAI,WAAW,OAAO,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CACpE,IAAI,IAAI,WAAW,kBAAkB,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CAC/E,OAAO;AACT;;;;;;;;AASA,SAAS,cAAc,KAAa,KAAa;CAC/C,OAAO,IAAI,SAAS,MAAM,GAAG,IAAI,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO;AAC5D"}
1
+ {"version":3,"file":"weixin.cjs","names":[],"sources":["../src/weixin/token.ts","../src/weixin/notice.ts"],"sourcesContent":["import { tryFlatten } from '@cloudcome/utils-core/try';\nimport { request } from '../cloud';\n\n/**\n * 构建微信 access_token 获取服务的选项\n */\nexport type BuildWeixinAccessTokenServiceOptions = {\n /**\n * 微信小程序应用ID\n */\n appId: string;\n\n /**\n * 微信小程序应用密钥\n */\n appSecret: string;\n\n /**\n * 查询缓存的 access_token\n * @returns 缓存的 access_token,无缓存时返回空字符串\n */\n queryAccessToken: () => Promise<string>;\n\n /**\n * 保存 access_token 到缓存\n * @param accessToken access_token 值\n * @param expiresIn 过期时间,单位毫秒\n */\n saveAccessToken: (accessToken: string, expiresIn: number) => Promise<void>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信 access_token 获取服务。\n *\n * 自动处理缓存逻辑:优先从临时数据中获取,不存在时调用微信 API 获取并缓存。\n *\n * @param options - 构造选项\n * @returns 获取 access_token 的异步函数\n *\n * @example\n * ```ts\n * const getAccessToken = await buildWeixinAccessTokenService({\n * appId: 'wx123',\n * appSecret: 'secret',\n * queryAccessToken: () => kv.get('token'),\n * saveAccessToken: (token, ttl) => kv.set('token', token, ttl),\n * })\n * const token = await getAccessToken()\n * ```\n */\nexport async function buildWeixinAccessTokenService(options: BuildWeixinAccessTokenServiceOptions) {\n const { appId, appSecret, _mockRequest, queryAccessToken, saveAccessToken } = options;\n\n return async function getWeixinAccessTokenService() {\n let accessToken = await queryAccessToken();\n if (accessToken) return accessToken;\n\n const { data: accessInfo } = await (_mockRequest || request)<{\n access_token: string;\n expires_in: number;\n errmsg: string;\n errcode: number;\n }>({\n url: 'https://api.weixin.qq.com/cgi-bin/token',\n method: 'GET',\n query: {\n grant_type: 'client_credential',\n appid: appId,\n secret: appSecret,\n },\n });\n\n if (!accessInfo.access_token) throw new Error(accessInfo.errmsg || '获取 access_token 失败');\n accessToken = accessInfo.access_token;\n\n const [err] = await tryFlatten(saveAccessToken(accessToken, accessInfo.expires_in * 1000));\n if (err) console.error('保存 access_token 失败', err);\n\n return accessToken;\n };\n}\n","import { request } from '@/cloud';\nimport { objectMap } from '@cloudcome/utils-core/object';\n\n/**\n * 发送微信订阅消息的数据结构\n * @template T - payload 字段类型,key 为模板字段名,value 为 string | number\n */\nexport type SendData<T> = {\n /**\n * 用户ID,用于查找对应的微信 openId\n */\n userId: string;\n\n /**\n * 小程序跳转环境\n * - `trial`: 体验版\n * - `formal`: 正式版\n */\n miniprogramState: 'trial' | 'formal';\n\n /**\n * 通知数据,key 对应模板字段(如 thing1, number1)\n */\n payload: T;\n\n /**\n * 点击消息后跳转的页面路径,开头 `/` 会被自动移除\n */\n page: string;\n};\n\n/**\n * 构建微信订阅消息发送服务的选项\n */\nexport type BuildSendWeixinNoticeServiceOptions = {\n /**\n * 订阅消息模板ID\n */\n templateId: string;\n\n /**\n * 获取微信 access_token 的服务函数\n */\n getWeixinAccessTokenService: () => Promise<string>;\n\n /**\n * 根据用户ID获取微信 openId\n * @param userId - 用户ID\n * @returns 微信 openId,未绑定时返回空字符串\n */\n getUserWeixinOpenId: (userId: string) => Promise<string>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信订阅消息发送服务。\n *\n * 封装微信订阅消息发送逻辑,自动处理 access_token 获取、openId 查找、\n * 字段长度截断(thing 类型 20 字符,character_string 类型 32 字符)等。\n *\n * @template T - payload 字段类型\n * @param options - 构造选项\n * @returns 发送订阅消息的函数\n *\n * @example\n * ```ts\n * const sendNotice = buildSendWeixinNoticeService({\n * templateId: 'tmpl_abc123',\n * getWeixinAccessTokenService: getAccessToken,\n * getUserWeixinOpenId: async (userId) => {\n * const user = await db.collection('users').doc(userId).get()\n * return user.data?.openId\n * },\n * })\n *\n * await sendNotice({\n * userId: 'user-123',\n * miniprogramState: 'formal',\n * payload: { thing1: '订单已发货', number1: 12345 },\n * page: '/pages/order/detail?id=12345',\n * })\n * ```\n */\nexport function buildSendWeixinNoticeService<T extends Record<string, number | string>>(\n options: BuildSendWeixinNoticeServiceOptions,\n) {\n const { templateId, getWeixinAccessTokenService, getUserWeixinOpenId, _mockRequest } = options;\n\n return async function sendWeixinNoticeService(sendData: SendData<T>) {\n const { userId, page, payload, miniprogramState } = sendData;\n const wxOpenId = await getUserWeixinOpenId(userId);\n if (!wxOpenId) throw new Error('用户未绑定微信');\n\n const accessToken = await getWeixinAccessTokenService();\n const { data } = await (_mockRequest || request)<{\n errcode: number;\n errmsg: string;\n }>({\n url: `https://api.weixin.qq.com/cgi-bin/message/subscribe/send`,\n method: 'POST',\n query: {\n access_token: accessToken,\n },\n data: {\n touser: wxOpenId,\n template_id: templateId,\n page: page.replace(/^\\//, ''),\n miniprogram_state: miniprogramState,\n lang: 'zh_CN',\n data: objectMap(payload, (val, key) => ({\n value: _fixPayloadValue(key as string, val),\n })),\n },\n });\n\n if (data.errcode === 43101) return;\n\n if (data.errcode !== 0) throw new Error(data.errmsg || '发送失败,未知错误');\n };\n}\n\n/**\n * 修复通知 payload 字段值,根据微信模板字段类型自动截断。\n *\n * 截断规则:\n * - thing 类型:20 字符以内\n * - character_string 类型:32 字符以内\n * - 其他类型:不处理\n *\n * @param key - 模板字段 key(如 thing1, number1)\n * @param val - 字段值\n * @returns 修复后的值\n */\nfunction _fixPayloadValue(key: string, val: number | string) {\n if (key.startsWith('thing')) return _autoEllipsis(val.toString(), 20);\n if (key.startsWith('character_string')) return _autoEllipsis(val.toString(), 32);\n return val;\n}\n\n/**\n * 字符串超长时自动截断并添加省略号。\n *\n * @param val - 原始字符串\n * @param len - 最大长度\n * @returns 截断后的字符串\n */\nfunction _autoEllipsis(val: string, len: number) {\n return val.length > len ? `${val.slice(0, len - 3)}...` : val;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAuDA,eAAsB,8BAA8B,SAA+C;CACjG,MAAM,EAAE,OAAO,WAAW,cAAc,kBAAkB,oBAAoB;CAE9E,OAAO,eAAe,8BAA8B;EAClD,IAAI,cAAc,MAAM,iBAAiB;EACzC,IAAI,aAAa,OAAO;EAExB,MAAM,EAAE,MAAM,eAAe,OAAO,gBAAgB,cAAA,SAKjD;GACD,KAAK;GACL,QAAQ;GACR,OAAO;IACL,YAAY;IACZ,OAAO;IACP,QAAQ;GACV;EACF,CAAC;EAED,IAAI,CAAC,WAAW,cAAc,MAAM,IAAI,MAAM,WAAW,UAAU,oBAAoB;EACvF,cAAc,WAAW;EAEzB,MAAM,CAAC,OAAO,OAAA,GAAA,0BAAA,YAAiB,gBAAgB,aAAa,WAAW,aAAa,GAAI,CAAC;EACzF,IAAI,KAAK,QAAQ,MAAM,sBAAsB,GAAG;EAEhD,OAAO;CACT;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACEA,SAAgB,6BACd,SACA;CACA,MAAM,EAAE,YAAY,6BAA6B,qBAAqB,iBAAiB;CAEvF,OAAO,eAAe,wBAAwB,UAAuB;EACnE,MAAM,EAAE,QAAQ,MAAM,SAAS,qBAAqB;EACpD,MAAM,WAAW,MAAM,oBAAoB,MAAM;EACjD,IAAI,CAAC,UAAU,MAAM,IAAI,MAAM,SAAS;EAExC,MAAM,cAAc,MAAM,4BAA4B;EACtD,MAAM,EAAE,SAAS,OAAO,gBAAgB,cAAA,SAGrC;GACD,KAAK;GACL,QAAQ;GACR,OAAO,EACL,cAAc,YAChB;GACA,MAAM;IACJ,QAAQ;IACR,aAAa;IACb,MAAM,KAAK,QAAQ,OAAO,EAAE;IAC5B,mBAAmB;IACnB,MAAM;IACN,OAAA,GAAA,6BAAA,WAAgB,UAAU,KAAK,SAAS,EACtC,OAAO,iBAAiB,KAAe,GAAG,EAC5C,EAAE;GACJ;EACF,CAAC;EAED,IAAI,KAAK,YAAY,OAAO;EAE5B,IAAI,KAAK,YAAY,GAAG,MAAM,IAAI,MAAM,KAAK,UAAU,WAAW;CACpE;AACF;;;;;;;;;;;;;AAcA,SAAS,iBAAiB,KAAa,KAAsB;CAC3D,IAAI,IAAI,WAAW,OAAO,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CACpE,IAAI,IAAI,WAAW,kBAAkB,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CAC/E,OAAO;AACT;;;;;;;;AASA,SAAS,cAAc,KAAa,KAAa;CAC/C,OAAO,IAAI,SAAS,MAAM,GAAG,IAAI,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO;AAC5D"}
package/dist/weixin.mjs CHANGED
@@ -15,16 +15,16 @@ import { tryFlatten } from "@cloudcome/utils-core/try";
15
15
  * const getAccessToken = await buildWeixinAccessTokenService({
16
16
  * appId: 'wx123',
17
17
  * appSecret: 'secret',
18
- * getTempDataService: () => kv.get('token'),
19
- * setTempDataService: (token, ttl) => kv.set('token', token, ttl),
18
+ * queryAccessToken: () => kv.get('token'),
19
+ * saveAccessToken: (token, ttl) => kv.set('token', token, ttl),
20
20
  * })
21
21
  * const token = await getAccessToken()
22
22
  * ```
23
23
  */
24
24
  async function buildWeixinAccessTokenService(options) {
25
- const { appId, appSecret, _mockRequest, getTempDataService, setTempDataService } = options;
25
+ const { appId, appSecret, _mockRequest, queryAccessToken, saveAccessToken } = options;
26
26
  return async function getWeixinAccessTokenService() {
27
- let accessToken = await getTempDataService();
27
+ let accessToken = await queryAccessToken();
28
28
  if (accessToken) return accessToken;
29
29
  const { data: accessInfo } = await (_mockRequest || request)({
30
30
  url: "https://api.weixin.qq.com/cgi-bin/token",
@@ -37,8 +37,8 @@ async function buildWeixinAccessTokenService(options) {
37
37
  });
38
38
  if (!accessInfo.access_token) throw new Error(accessInfo.errmsg || "获取 access_token 失败");
39
39
  accessToken = accessInfo.access_token;
40
- const [err] = await tryFlatten(setTempDataService(accessToken, accessInfo.expires_in * 1e3));
41
- if (err) console.error("设置临时数据失败", err);
40
+ const [err] = await tryFlatten(saveAccessToken(accessToken, accessInfo.expires_in * 1e3));
41
+ if (err) console.error("保存 access_token 失败", err);
42
42
  return accessToken;
43
43
  };
44
44
  }
@@ -67,7 +67,7 @@ async function buildWeixinAccessTokenService(options) {
67
67
  *
68
68
  * await sendNotice({
69
69
  * userId: 'user-123',
70
- * clientEnv: 'release',
70
+ * miniprogramState: 'formal',
71
71
  * payload: { thing1: '订单已发货', number1: 12345 },
72
72
  * page: '/pages/order/detail?id=12345',
73
73
  * })
@@ -76,7 +76,7 @@ async function buildWeixinAccessTokenService(options) {
76
76
  function buildSendWeixinNoticeService(options) {
77
77
  const { templateId, getWeixinAccessTokenService, getUserWeixinOpenId, _mockRequest } = options;
78
78
  return async function sendWeixinNoticeService(sendData) {
79
- const { userId, page, payload } = sendData;
79
+ const { userId, page, payload, miniprogramState } = sendData;
80
80
  const wxOpenId = await getUserWeixinOpenId(userId);
81
81
  if (!wxOpenId) throw new Error("用户未绑定微信");
82
82
  const accessToken = await getWeixinAccessTokenService();
@@ -88,7 +88,7 @@ function buildSendWeixinNoticeService(options) {
88
88
  touser: wxOpenId,
89
89
  template_id: templateId,
90
90
  page: page.replace(/^\//, ""),
91
- miniprogram_state: sendData.clientEnv === "trial" ? "trial" : "formal",
91
+ miniprogram_state: miniprogramState,
92
92
  lang: "zh_CN",
93
93
  data: objectMap(payload, (val, key) => ({ value: _fixPayloadValue(key, val) }))
94
94
  }
@@ -1 +1 @@
1
- {"version":3,"file":"weixin.mjs","names":[],"sources":["../src/weixin/token.ts","../src/weixin/notice.ts"],"sourcesContent":["import { tryFlatten } from '@cloudcome/utils-core/try';\nimport { request } from '../cloud';\n\n/**\n * 构建微信 access_token 获取服务的选项\n */\nexport type BuildWeixinAccessTokenServiceOptions = {\n /**\n * 微信小程序应用ID\n */\n appId: string;\n\n /**\n * 微信小程序应用密钥\n */\n appSecret: string;\n\n /**\n * 获取临时数据(用于缓存 access_token)\n * @returns 缓存的 access_token,无缓存时返回空字符串\n */\n getTempDataService: () => Promise<string>;\n\n /**\n * 设置临时数据(用于缓存 access_token)\n * @param accessToken access_token 值\n * @param expiresIn 过期时间,单位毫秒\n */\n setTempDataService: (accessToken: string, expiresIn: number) => Promise<void>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信 access_token 获取服务。\n *\n * 自动处理缓存逻辑:优先从临时数据中获取,不存在时调用微信 API 获取并缓存。\n *\n * @param options - 构造选项\n * @returns 获取 access_token 的异步函数\n *\n * @example\n * ```ts\n * const getAccessToken = await buildWeixinAccessTokenService({\n * appId: 'wx123',\n * appSecret: 'secret',\n * getTempDataService: () => kv.get('token'),\n * setTempDataService: (token, ttl) => kv.set('token', token, ttl),\n * })\n * const token = await getAccessToken()\n * ```\n */\nexport async function buildWeixinAccessTokenService(options: BuildWeixinAccessTokenServiceOptions) {\n const { appId, appSecret, _mockRequest, getTempDataService, setTempDataService } = options;\n\n return async function getWeixinAccessTokenService() {\n let accessToken = await getTempDataService();\n if (accessToken) return accessToken;\n\n const { data: accessInfo } = await (_mockRequest || request)<{\n access_token: string;\n expires_in: number;\n errmsg: string;\n errcode: number;\n }>({\n url: 'https://api.weixin.qq.com/cgi-bin/token',\n method: 'GET',\n query: {\n grant_type: 'client_credential',\n appid: appId,\n secret: appSecret,\n },\n });\n\n if (!accessInfo.access_token) throw new Error(accessInfo.errmsg || '获取 access_token 失败');\n accessToken = accessInfo.access_token;\n\n const [err] = await tryFlatten(setTempDataService(accessToken, accessInfo.expires_in * 1000));\n if (err) console.error('设置临时数据失败', err);\n\n return accessToken;\n };\n}\n","import { request } from '@/cloud';\nimport { objectMap } from '@cloudcome/utils-core/object';\n\n/**\n * 发送微信订阅消息的数据结构\n * @template T - payload 字段类型,key 为模板字段名,value 为 string | number\n */\nexport type SendData<T> = {\n /**\n * 用户ID,用于查找对应的微信 openId\n */\n userId: string;\n\n /**\n * 小程序环境\n * - `develop`: 开发版\n * - `trial`: 体验版\n * - `release`: 正式版\n */\n clientEnv: 'develop' | 'trial' | 'release';\n\n /**\n * 通知数据,key 对应模板字段(如 thing1, number1)\n */\n payload: T;\n\n /**\n * 点击消息后跳转的页面路径,开头 `/` 会被自动移除\n */\n page: string;\n};\n\n/**\n * 构建微信订阅消息发送服务的选项\n */\nexport type BuildSendWeixinNoticeServiceOptions = {\n /**\n * 订阅消息模板ID\n */\n templateId: string;\n\n /**\n * 获取微信 access_token 的服务函数\n */\n getWeixinAccessTokenService: () => Promise<string>;\n\n /**\n * 根据用户ID获取微信 openId\n * @param userId - 用户ID\n * @returns 微信 openId,未绑定时返回空字符串\n */\n getUserWeixinOpenId: (userId: string) => Promise<string>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信订阅消息发送服务。\n *\n * 封装微信订阅消息发送逻辑,自动处理 access_token 获取、openId 查找、\n * 字段长度截断(thing 类型 20 字符,character_string 类型 32 字符)等。\n *\n * @template T - payload 字段类型\n * @param options - 构造选项\n * @returns 发送订阅消息的函数\n *\n * @example\n * ```ts\n * const sendNotice = buildSendWeixinNoticeService({\n * templateId: 'tmpl_abc123',\n * getWeixinAccessTokenService: getAccessToken,\n * getUserWeixinOpenId: async (userId) => {\n * const user = await db.collection('users').doc(userId).get()\n * return user.data?.openId\n * },\n * })\n *\n * await sendNotice({\n * userId: 'user-123',\n * clientEnv: 'release',\n * payload: { thing1: '订单已发货', number1: 12345 },\n * page: '/pages/order/detail?id=12345',\n * })\n * ```\n */\nexport function buildSendWeixinNoticeService<T extends Record<string, number | string>>(\n options: BuildSendWeixinNoticeServiceOptions,\n) {\n const { templateId, getWeixinAccessTokenService, getUserWeixinOpenId, _mockRequest } = options;\n\n return async function sendWeixinNoticeService(sendData: SendData<T>) {\n const { userId, page, payload } = sendData;\n const wxOpenId = await getUserWeixinOpenId(userId);\n if (!wxOpenId) throw new Error('用户未绑定微信');\n\n const accessToken = await getWeixinAccessTokenService();\n const { data } = await (_mockRequest || request)<{\n errcode: number;\n errmsg: string;\n }>({\n url: `https://api.weixin.qq.com/cgi-bin/message/subscribe/send`,\n method: 'POST',\n query: {\n access_token: accessToken,\n },\n data: {\n touser: wxOpenId,\n template_id: templateId,\n page: page.replace(/^\\//, ''),\n miniprogram_state: sendData.clientEnv === 'trial' ? 'trial' : 'formal',\n lang: 'zh_CN',\n data: objectMap(payload, (val, key) => ({\n value: _fixPayloadValue(key as string, val),\n })),\n },\n });\n\n if (data.errcode === 43101) return;\n\n if (data.errcode !== 0) throw new Error(data.errmsg || '发送失败,未知错误');\n };\n}\n\n/**\n * 修复通知 payload 字段值,根据微信模板字段类型自动截断。\n *\n * 截断规则:\n * - thing 类型:20 字符以内\n * - character_string 类型:32 字符以内\n * - 其他类型:不处理\n *\n * @param key - 模板字段 key(如 thing1, number1)\n * @param val - 字段值\n * @returns 修复后的值\n */\nfunction _fixPayloadValue(key: string, val: number | string) {\n if (key.startsWith('thing')) return _autoEllipsis(val.toString(), 20);\n if (key.startsWith('character_string')) return _autoEllipsis(val.toString(), 32);\n return val;\n}\n\n/**\n * 字符串超长时自动截断并添加省略号。\n *\n * @param val - 原始字符串\n * @param len - 最大长度\n * @returns 截断后的字符串\n */\nfunction _autoEllipsis(val: string, len: number) {\n return val.length > len ? `${val.slice(0, len - 3)}...` : val;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAuDA,eAAsB,8BAA8B,SAA+C;CACjG,MAAM,EAAE,OAAO,WAAW,cAAc,oBAAoB,uBAAuB;CAEnF,OAAO,eAAe,8BAA8B;EAClD,IAAI,cAAc,MAAM,mBAAmB;EAC3C,IAAI,aAAa,OAAO;EAExB,MAAM,EAAE,MAAM,eAAe,OAAO,gBAAgB,SAKjD;GACD,KAAK;GACL,QAAQ;GACR,OAAO;IACL,YAAY;IACZ,OAAO;IACP,QAAQ;GACV;EACF,CAAC;EAED,IAAI,CAAC,WAAW,cAAc,MAAM,IAAI,MAAM,WAAW,UAAU,oBAAoB;EACvF,cAAc,WAAW;EAEzB,MAAM,CAAC,OAAO,MAAM,WAAW,mBAAmB,aAAa,WAAW,aAAa,GAAI,CAAC;EAC5F,IAAI,KAAK,QAAQ,MAAM,YAAY,GAAG;EAEtC,OAAO;CACT;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACGA,SAAgB,6BACd,SACA;CACA,MAAM,EAAE,YAAY,6BAA6B,qBAAqB,iBAAiB;CAEvF,OAAO,eAAe,wBAAwB,UAAuB;EACnE,MAAM,EAAE,QAAQ,MAAM,YAAY;EAClC,MAAM,WAAW,MAAM,oBAAoB,MAAM;EACjD,IAAI,CAAC,UAAU,MAAM,IAAI,MAAM,SAAS;EAExC,MAAM,cAAc,MAAM,4BAA4B;EACtD,MAAM,EAAE,SAAS,OAAO,gBAAgB,SAGrC;GACD,KAAK;GACL,QAAQ;GACR,OAAO,EACL,cAAc,YAChB;GACA,MAAM;IACJ,QAAQ;IACR,aAAa;IACb,MAAM,KAAK,QAAQ,OAAO,EAAE;IAC5B,mBAAmB,SAAS,cAAc,UAAU,UAAU;IAC9D,MAAM;IACN,MAAM,UAAU,UAAU,KAAK,SAAS,EACtC,OAAO,iBAAiB,KAAe,GAAG,EAC5C,EAAE;GACJ;EACF,CAAC;EAED,IAAI,KAAK,YAAY,OAAO;EAE5B,IAAI,KAAK,YAAY,GAAG,MAAM,IAAI,MAAM,KAAK,UAAU,WAAW;CACpE;AACF;;;;;;;;;;;;;AAcA,SAAS,iBAAiB,KAAa,KAAsB;CAC3D,IAAI,IAAI,WAAW,OAAO,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CACpE,IAAI,IAAI,WAAW,kBAAkB,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CAC/E,OAAO;AACT;;;;;;;;AASA,SAAS,cAAc,KAAa,KAAa;CAC/C,OAAO,IAAI,SAAS,MAAM,GAAG,IAAI,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO;AAC5D"}
1
+ {"version":3,"file":"weixin.mjs","names":[],"sources":["../src/weixin/token.ts","../src/weixin/notice.ts"],"sourcesContent":["import { tryFlatten } from '@cloudcome/utils-core/try';\nimport { request } from '../cloud';\n\n/**\n * 构建微信 access_token 获取服务的选项\n */\nexport type BuildWeixinAccessTokenServiceOptions = {\n /**\n * 微信小程序应用ID\n */\n appId: string;\n\n /**\n * 微信小程序应用密钥\n */\n appSecret: string;\n\n /**\n * 查询缓存的 access_token\n * @returns 缓存的 access_token,无缓存时返回空字符串\n */\n queryAccessToken: () => Promise<string>;\n\n /**\n * 保存 access_token 到缓存\n * @param accessToken access_token 值\n * @param expiresIn 过期时间,单位毫秒\n */\n saveAccessToken: (accessToken: string, expiresIn: number) => Promise<void>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信 access_token 获取服务。\n *\n * 自动处理缓存逻辑:优先从临时数据中获取,不存在时调用微信 API 获取并缓存。\n *\n * @param options - 构造选项\n * @returns 获取 access_token 的异步函数\n *\n * @example\n * ```ts\n * const getAccessToken = await buildWeixinAccessTokenService({\n * appId: 'wx123',\n * appSecret: 'secret',\n * queryAccessToken: () => kv.get('token'),\n * saveAccessToken: (token, ttl) => kv.set('token', token, ttl),\n * })\n * const token = await getAccessToken()\n * ```\n */\nexport async function buildWeixinAccessTokenService(options: BuildWeixinAccessTokenServiceOptions) {\n const { appId, appSecret, _mockRequest, queryAccessToken, saveAccessToken } = options;\n\n return async function getWeixinAccessTokenService() {\n let accessToken = await queryAccessToken();\n if (accessToken) return accessToken;\n\n const { data: accessInfo } = await (_mockRequest || request)<{\n access_token: string;\n expires_in: number;\n errmsg: string;\n errcode: number;\n }>({\n url: 'https://api.weixin.qq.com/cgi-bin/token',\n method: 'GET',\n query: {\n grant_type: 'client_credential',\n appid: appId,\n secret: appSecret,\n },\n });\n\n if (!accessInfo.access_token) throw new Error(accessInfo.errmsg || '获取 access_token 失败');\n accessToken = accessInfo.access_token;\n\n const [err] = await tryFlatten(saveAccessToken(accessToken, accessInfo.expires_in * 1000));\n if (err) console.error('保存 access_token 失败', err);\n\n return accessToken;\n };\n}\n","import { request } from '@/cloud';\nimport { objectMap } from '@cloudcome/utils-core/object';\n\n/**\n * 发送微信订阅消息的数据结构\n * @template T - payload 字段类型,key 为模板字段名,value 为 string | number\n */\nexport type SendData<T> = {\n /**\n * 用户ID,用于查找对应的微信 openId\n */\n userId: string;\n\n /**\n * 小程序跳转环境\n * - `trial`: 体验版\n * - `formal`: 正式版\n */\n miniprogramState: 'trial' | 'formal';\n\n /**\n * 通知数据,key 对应模板字段(如 thing1, number1)\n */\n payload: T;\n\n /**\n * 点击消息后跳转的页面路径,开头 `/` 会被自动移除\n */\n page: string;\n};\n\n/**\n * 构建微信订阅消息发送服务的选项\n */\nexport type BuildSendWeixinNoticeServiceOptions = {\n /**\n * 订阅消息模板ID\n */\n templateId: string;\n\n /**\n * 获取微信 access_token 的服务函数\n */\n getWeixinAccessTokenService: () => Promise<string>;\n\n /**\n * 根据用户ID获取微信 openId\n * @param userId - 用户ID\n * @returns 微信 openId,未绑定时返回空字符串\n */\n getUserWeixinOpenId: (userId: string) => Promise<string>;\n\n /**\n * 模拟请求函数,用于单元测试注入\n */\n _mockRequest?: typeof request;\n};\n\n/**\n * 构建微信订阅消息发送服务。\n *\n * 封装微信订阅消息发送逻辑,自动处理 access_token 获取、openId 查找、\n * 字段长度截断(thing 类型 20 字符,character_string 类型 32 字符)等。\n *\n * @template T - payload 字段类型\n * @param options - 构造选项\n * @returns 发送订阅消息的函数\n *\n * @example\n * ```ts\n * const sendNotice = buildSendWeixinNoticeService({\n * templateId: 'tmpl_abc123',\n * getWeixinAccessTokenService: getAccessToken,\n * getUserWeixinOpenId: async (userId) => {\n * const user = await db.collection('users').doc(userId).get()\n * return user.data?.openId\n * },\n * })\n *\n * await sendNotice({\n * userId: 'user-123',\n * miniprogramState: 'formal',\n * payload: { thing1: '订单已发货', number1: 12345 },\n * page: '/pages/order/detail?id=12345',\n * })\n * ```\n */\nexport function buildSendWeixinNoticeService<T extends Record<string, number | string>>(\n options: BuildSendWeixinNoticeServiceOptions,\n) {\n const { templateId, getWeixinAccessTokenService, getUserWeixinOpenId, _mockRequest } = options;\n\n return async function sendWeixinNoticeService(sendData: SendData<T>) {\n const { userId, page, payload, miniprogramState } = sendData;\n const wxOpenId = await getUserWeixinOpenId(userId);\n if (!wxOpenId) throw new Error('用户未绑定微信');\n\n const accessToken = await getWeixinAccessTokenService();\n const { data } = await (_mockRequest || request)<{\n errcode: number;\n errmsg: string;\n }>({\n url: `https://api.weixin.qq.com/cgi-bin/message/subscribe/send`,\n method: 'POST',\n query: {\n access_token: accessToken,\n },\n data: {\n touser: wxOpenId,\n template_id: templateId,\n page: page.replace(/^\\//, ''),\n miniprogram_state: miniprogramState,\n lang: 'zh_CN',\n data: objectMap(payload, (val, key) => ({\n value: _fixPayloadValue(key as string, val),\n })),\n },\n });\n\n if (data.errcode === 43101) return;\n\n if (data.errcode !== 0) throw new Error(data.errmsg || '发送失败,未知错误');\n };\n}\n\n/**\n * 修复通知 payload 字段值,根据微信模板字段类型自动截断。\n *\n * 截断规则:\n * - thing 类型:20 字符以内\n * - character_string 类型:32 字符以内\n * - 其他类型:不处理\n *\n * @param key - 模板字段 key(如 thing1, number1)\n * @param val - 字段值\n * @returns 修复后的值\n */\nfunction _fixPayloadValue(key: string, val: number | string) {\n if (key.startsWith('thing')) return _autoEllipsis(val.toString(), 20);\n if (key.startsWith('character_string')) return _autoEllipsis(val.toString(), 32);\n return val;\n}\n\n/**\n * 字符串超长时自动截断并添加省略号。\n *\n * @param val - 原始字符串\n * @param len - 最大长度\n * @returns 截断后的字符串\n */\nfunction _autoEllipsis(val: string, len: number) {\n return val.length > len ? `${val.slice(0, len - 3)}...` : val;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAuDA,eAAsB,8BAA8B,SAA+C;CACjG,MAAM,EAAE,OAAO,WAAW,cAAc,kBAAkB,oBAAoB;CAE9E,OAAO,eAAe,8BAA8B;EAClD,IAAI,cAAc,MAAM,iBAAiB;EACzC,IAAI,aAAa,OAAO;EAExB,MAAM,EAAE,MAAM,eAAe,OAAO,gBAAgB,SAKjD;GACD,KAAK;GACL,QAAQ;GACR,OAAO;IACL,YAAY;IACZ,OAAO;IACP,QAAQ;GACV;EACF,CAAC;EAED,IAAI,CAAC,WAAW,cAAc,MAAM,IAAI,MAAM,WAAW,UAAU,oBAAoB;EACvF,cAAc,WAAW;EAEzB,MAAM,CAAC,OAAO,MAAM,WAAW,gBAAgB,aAAa,WAAW,aAAa,GAAI,CAAC;EACzF,IAAI,KAAK,QAAQ,MAAM,sBAAsB,GAAG;EAEhD,OAAO;CACT;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACEA,SAAgB,6BACd,SACA;CACA,MAAM,EAAE,YAAY,6BAA6B,qBAAqB,iBAAiB;CAEvF,OAAO,eAAe,wBAAwB,UAAuB;EACnE,MAAM,EAAE,QAAQ,MAAM,SAAS,qBAAqB;EACpD,MAAM,WAAW,MAAM,oBAAoB,MAAM;EACjD,IAAI,CAAC,UAAU,MAAM,IAAI,MAAM,SAAS;EAExC,MAAM,cAAc,MAAM,4BAA4B;EACtD,MAAM,EAAE,SAAS,OAAO,gBAAgB,SAGrC;GACD,KAAK;GACL,QAAQ;GACR,OAAO,EACL,cAAc,YAChB;GACA,MAAM;IACJ,QAAQ;IACR,aAAa;IACb,MAAM,KAAK,QAAQ,OAAO,EAAE;IAC5B,mBAAmB;IACnB,MAAM;IACN,MAAM,UAAU,UAAU,KAAK,SAAS,EACtC,OAAO,iBAAiB,KAAe,GAAG,EAC5C,EAAE;GACJ;EACF,CAAC;EAED,IAAI,KAAK,YAAY,OAAO;EAE5B,IAAI,KAAK,YAAY,GAAG,MAAM,IAAI,MAAM,KAAK,UAAU,WAAW;CACpE;AACF;;;;;;;;;;;;;AAcA,SAAS,iBAAiB,KAAa,KAAsB;CAC3D,IAAI,IAAI,WAAW,OAAO,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CACpE,IAAI,IAAI,WAAW,kBAAkB,GAAG,OAAO,cAAc,IAAI,SAAS,GAAG,EAAE;CAC/E,OAAO;AACT;;;;;;;;AASA,SAAS,cAAc,KAAa,KAAa;CAC/C,OAAO,IAAI,SAAS,MAAM,GAAG,IAAI,MAAM,GAAG,MAAM,CAAC,EAAE,OAAO;AAC5D"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudcome/utils-uni",
3
- "version": "1.39.0",
3
+ "version": "1.41.0",
4
4
  "description": "cloudcome utils for uni-app",
5
5
  "main": "./dist/index.cjs",
6
6
  "module": "./dist/index.mjs",