@servora/proto-utils 0.1.4 → 0.1.6

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.
@@ -0,0 +1,27 @@
1
+ export type ApiErrorKind = "http" | "network" | "timeout";
2
+ export declare class ApiError extends Error {
3
+ readonly kind: ApiErrorKind;
4
+ readonly httpStatus?: number;
5
+ readonly responseBody?: unknown;
6
+ readonly service: string;
7
+ readonly method: string;
8
+ constructor(options: {
9
+ kind: ApiErrorKind;
10
+ message: string;
11
+ httpStatus?: number;
12
+ responseBody?: unknown;
13
+ service: string;
14
+ method: string;
15
+ cause?: unknown;
16
+ });
17
+ }
18
+ export interface KratosErrorBody {
19
+ code: number;
20
+ reason: string;
21
+ message: string;
22
+ metadata?: Record<string, string>;
23
+ }
24
+ export declare function parseKratosErrorBody(value: unknown): KratosErrorBody | null;
25
+ export declare function parseKratosError(error: ApiError): KratosErrorBody | null;
26
+ export declare function isKratosReason(error: ApiError, reason: string): boolean;
27
+ //# sourceMappingURL=errors.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;AAE1D,qBAAa,QAAS,SAAQ,KAAK;IACjC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,OAAO,EAAE;QACnB,IAAI,EAAE,YAAY,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CASF;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAoBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAiB3E;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI,CAGxE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAEvE"}
package/dist/errors.js ADDED
@@ -0,0 +1,59 @@
1
+ export class ApiError extends Error {
2
+ kind;
3
+ httpStatus;
4
+ responseBody;
5
+ service;
6
+ method;
7
+ constructor(options) {
8
+ super(options.message, { cause: options.cause });
9
+ this.name = "ApiError";
10
+ this.kind = options.kind;
11
+ this.httpStatus = options.httpStatus;
12
+ this.responseBody = options.responseBody;
13
+ this.service = options.service;
14
+ this.method = options.method;
15
+ }
16
+ }
17
+ function isRecord(value) {
18
+ return typeof value === "object" && value !== null && !Array.isArray(value);
19
+ }
20
+ function isStringRecord(value) {
21
+ if (!isRecord(value))
22
+ return false;
23
+ for (const key in value) {
24
+ if (Object.prototype.hasOwnProperty.call(value, key) &&
25
+ typeof value[key] !== "string") {
26
+ return false;
27
+ }
28
+ }
29
+ return true;
30
+ }
31
+ export function parseKratosErrorBody(value) {
32
+ try {
33
+ if (!isRecord(value))
34
+ return null;
35
+ if (!Number.isInteger(value.code))
36
+ return null;
37
+ if (typeof value.reason !== "string")
38
+ return null;
39
+ if (typeof value.message !== "string")
40
+ return null;
41
+ if (Object.prototype.hasOwnProperty.call(value, "metadata") &&
42
+ !isStringRecord(value.metadata)) {
43
+ return null;
44
+ }
45
+ return value;
46
+ }
47
+ catch {
48
+ return null;
49
+ }
50
+ }
51
+ export function parseKratosError(error) {
52
+ if (error.kind !== "http")
53
+ return null;
54
+ return parseKratosErrorBody(error.responseBody);
55
+ }
56
+ export function isKratosReason(error, reason) {
57
+ return parseKratosError(error)?.reason === reason;
58
+ }
59
+ //# sourceMappingURL=errors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAS,SAAQ,KAAK;IACxB,IAAI,CAAe;IACnB,UAAU,CAAU;IACpB,YAAY,CAAW;IACvB,OAAO,CAAS;IAChB,MAAM,CAAS;IAExB,YAAY,OAQX;QACC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;CACF;AASD,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEnC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IACE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC;YAChD,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,QAAQ,EAC9B,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,IAAI,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC/C,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAClD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACnD,IACE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC;YACvD,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAC/B,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAmC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAe;IAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,oBAAoB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAe,EAAE,MAAc;IAC5D,OAAO,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;AACpD,CAAC"}
@@ -0,0 +1,14 @@
1
+ import type { CrudErrorReason as CrudErrorReasonType } from './index.js';
2
+ export type CrudErrorReason = CrudErrorReasonType;
3
+ export declare const CrudErrorReason: {
4
+ readonly CRUD_ERROR_REASON_UNSPECIFIED: "CRUD_ERROR_REASON_UNSPECIFIED";
5
+ readonly CRUD_ERROR_REASON_INVALID_RESOURCE_NAME: "CRUD_ERROR_REASON_INVALID_RESOURCE_NAME";
6
+ readonly CRUD_ERROR_REASON_INVALID_PAGE_TOKEN: "CRUD_ERROR_REASON_INVALID_PAGE_TOKEN";
7
+ readonly CRUD_ERROR_REASON_INVALID_FILTER: "CRUD_ERROR_REASON_INVALID_FILTER";
8
+ readonly CRUD_ERROR_REASON_INVALID_ORDER_BY: "CRUD_ERROR_REASON_INVALID_ORDER_BY";
9
+ readonly CRUD_ERROR_REASON_INVALID_FIELD_MASK: "CRUD_ERROR_REASON_INVALID_FIELD_MASK";
10
+ readonly CRUD_ERROR_REASON_INVALID_FIELD_VALUE: "CRUD_ERROR_REASON_INVALID_FIELD_VALUE";
11
+ readonly CRUD_ERROR_REASON_INTERNAL: "CRUD_ERROR_REASON_INTERNAL";
12
+ };
13
+ export declare function isCrudErrorReason(value: unknown): value is CrudErrorReason;
14
+ //# sourceMappingURL=errors.errors.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.errors.d.ts","sourceRoot":"","sources":["../../../../../src/gen/servora/crud/v1/errors.errors.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,IAAI,mBAAmB,EACvC,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,eAAe,GAAG,mBAAmB,CAAC;AAElD,eAAO,MAAM,eAAe;;;;;;;;;CAW3B,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAK1E"}
@@ -0,0 +1,16 @@
1
+ // Code generated by protoc-gen-go-errors. DO NOT EDIT.
2
+ export const CrudErrorReason = {
3
+ CRUD_ERROR_REASON_UNSPECIFIED: 'CRUD_ERROR_REASON_UNSPECIFIED',
4
+ CRUD_ERROR_REASON_INVALID_RESOURCE_NAME: 'CRUD_ERROR_REASON_INVALID_RESOURCE_NAME',
5
+ CRUD_ERROR_REASON_INVALID_PAGE_TOKEN: 'CRUD_ERROR_REASON_INVALID_PAGE_TOKEN',
6
+ CRUD_ERROR_REASON_INVALID_FILTER: 'CRUD_ERROR_REASON_INVALID_FILTER',
7
+ CRUD_ERROR_REASON_INVALID_ORDER_BY: 'CRUD_ERROR_REASON_INVALID_ORDER_BY',
8
+ CRUD_ERROR_REASON_INVALID_FIELD_MASK: 'CRUD_ERROR_REASON_INVALID_FIELD_MASK',
9
+ CRUD_ERROR_REASON_INVALID_FIELD_VALUE: 'CRUD_ERROR_REASON_INVALID_FIELD_VALUE',
10
+ CRUD_ERROR_REASON_INTERNAL: 'CRUD_ERROR_REASON_INTERNAL',
11
+ };
12
+ export function isCrudErrorReason(value) {
13
+ return (typeof value === 'string' &&
14
+ Object.prototype.hasOwnProperty.call(CrudErrorReason, value));
15
+ }
16
+ //# sourceMappingURL=errors.errors.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.errors.js","sourceRoot":"","sources":["../../../../../src/gen/servora/crud/v1/errors.errors.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAQvD,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,6BAA6B,EAAE,+BAA+B;IAC9D,uCAAuC,EAAE,yCAAyC;IAClF,oCAAoC,EAAE,sCAAsC;IAC5E,gCAAgC,EAAE,kCAAkC;IACpE,kCAAkC,EAAE,oCAAoC;IACxE,oCAAoC,EAAE,sCAAsC;IAC5E,qCAAqC,EAAE,uCAAuC;IAC9E,0BAA0B,EAAE,4BAA4B;CAGzD,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAC7D,CAAC;AACJ,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export * from "./client/index.js";
1
+ export {};
2
2
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC"}
package/dist/index.js CHANGED
@@ -1,2 +1,2 @@
1
- export * from "./client/index.js";
1
+ export {};
2
2
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@servora/proto-utils",
3
- "version": "0.1.4",
4
- "description": "Servora Proto 工具:CRUD 查询、FieldMask、HTTP client、Kratos 错误解析",
3
+ "version": "0.1.6",
4
+ "description": "Servora Proto 工具:CRUD 查询、FieldMask、ProtoJSON 与 Kratos 错误解析",
5
5
  "type": "module",
6
6
  "exports": {
7
7
  ".": {
@@ -12,29 +12,17 @@
12
12
  "types": "./dist/crud/index.d.ts",
13
13
  "import": "./dist/crud/index.js"
14
14
  },
15
- "./client": {
16
- "types": "./dist/client/index.d.ts",
17
- "import": "./dist/client/index.js"
18
- },
19
- "./client/request": {
20
- "types": "./dist/client/request.d.ts",
21
- "import": "./dist/client/request.js"
22
- },
23
- "./client/errors": {
24
- "types": "./dist/client/errors.d.ts",
25
- "import": "./dist/client/errors.js"
26
- },
27
15
  "./proto/*": {
28
16
  "types": "./dist/gen/*/index.d.ts",
29
17
  "import": "./dist/gen/*/index.js"
30
18
  },
31
- "./request": {
32
- "types": "./dist/client/request.d.ts",
33
- "import": "./dist/client/request.js"
19
+ "./error-reasons/*": {
20
+ "types": "./dist/gen/*.errors.d.ts",
21
+ "import": "./dist/gen/*.errors.js"
34
22
  },
35
23
  "./errors": {
36
- "types": "./dist/client/errors.d.ts",
37
- "import": "./dist/client/errors.js"
24
+ "types": "./dist/errors.d.ts",
25
+ "import": "./dist/errors.js"
38
26
  }
39
27
  },
40
28
  "files": [
@@ -46,7 +34,8 @@
46
34
  "build": "tsc -p tsconfig.build.json",
47
35
  "clean": "rm -rf dist",
48
36
  "typecheck": "tsc --noEmit",
49
- "test": "pnpm run build && node --test test/*.test.mjs",
37
+ "typecheck:test": "tsc -p test/tsconfig.json",
38
+ "test": "pnpm run build && pnpm run typecheck:test && node --test test/*.test.mjs",
50
39
  "prepublishOnly": "npm run clean && npm run build"
51
40
  },
52
41
  "repository": {
@@ -60,9 +49,6 @@
60
49
  },
61
50
  "license": "MIT",
62
51
  "sideEffects": false,
63
- "dependencies": {
64
- "ofetch": "^1.5.1"
65
- },
66
52
  "devDependencies": {
67
53
  "typescript": "^5.7.2"
68
54
  }
File without changes
package/src/errors.ts ADDED
@@ -0,0 +1,80 @@
1
+ export type ApiErrorKind = "http" | "network" | "timeout";
2
+
3
+ export class ApiError extends Error {
4
+ readonly kind: ApiErrorKind;
5
+ readonly httpStatus?: number;
6
+ readonly responseBody?: unknown;
7
+ readonly service: string;
8
+ readonly method: string;
9
+
10
+ constructor(options: {
11
+ kind: ApiErrorKind;
12
+ message: string;
13
+ httpStatus?: number;
14
+ responseBody?: unknown;
15
+ service: string;
16
+ method: string;
17
+ cause?: unknown;
18
+ }) {
19
+ super(options.message, { cause: options.cause });
20
+ this.name = "ApiError";
21
+ this.kind = options.kind;
22
+ this.httpStatus = options.httpStatus;
23
+ this.responseBody = options.responseBody;
24
+ this.service = options.service;
25
+ this.method = options.method;
26
+ }
27
+ }
28
+
29
+ export interface KratosErrorBody {
30
+ code: number;
31
+ reason: string;
32
+ message: string;
33
+ metadata?: Record<string, string>;
34
+ }
35
+
36
+ function isRecord(value: unknown): value is Record<string, unknown> {
37
+ return typeof value === "object" && value !== null && !Array.isArray(value);
38
+ }
39
+
40
+ function isStringRecord(value: unknown): value is Record<string, string> {
41
+ if (!isRecord(value)) return false;
42
+
43
+ for (const key in value) {
44
+ if (
45
+ Object.prototype.hasOwnProperty.call(value, key) &&
46
+ typeof value[key] !== "string"
47
+ ) {
48
+ return false;
49
+ }
50
+ }
51
+ return true;
52
+ }
53
+
54
+ export function parseKratosErrorBody(value: unknown): KratosErrorBody | null {
55
+ try {
56
+ if (!isRecord(value)) return null;
57
+ if (!Number.isInteger(value.code)) return null;
58
+ if (typeof value.reason !== "string") return null;
59
+ if (typeof value.message !== "string") return null;
60
+ if (
61
+ Object.prototype.hasOwnProperty.call(value, "metadata") &&
62
+ !isStringRecord(value.metadata)
63
+ ) {
64
+ return null;
65
+ }
66
+
67
+ return value as unknown as KratosErrorBody;
68
+ } catch {
69
+ return null;
70
+ }
71
+ }
72
+
73
+ export function parseKratosError(error: ApiError): KratosErrorBody | null {
74
+ if (error.kind !== "http") return null;
75
+ return parseKratosErrorBody(error.responseBody);
76
+ }
77
+
78
+ export function isKratosReason(error: ApiError, reason: string): boolean {
79
+ return parseKratosError(error)?.reason === reason;
80
+ }
@@ -0,0 +1,27 @@
1
+ // Code generated by protoc-gen-go-errors. DO NOT EDIT.
2
+
3
+ import type {
4
+ CrudErrorReason as CrudErrorReasonType,
5
+ } from './index.js';
6
+
7
+ export type CrudErrorReason = CrudErrorReasonType;
8
+
9
+ export const CrudErrorReason = {
10
+ CRUD_ERROR_REASON_UNSPECIFIED: 'CRUD_ERROR_REASON_UNSPECIFIED',
11
+ CRUD_ERROR_REASON_INVALID_RESOURCE_NAME: 'CRUD_ERROR_REASON_INVALID_RESOURCE_NAME',
12
+ CRUD_ERROR_REASON_INVALID_PAGE_TOKEN: 'CRUD_ERROR_REASON_INVALID_PAGE_TOKEN',
13
+ CRUD_ERROR_REASON_INVALID_FILTER: 'CRUD_ERROR_REASON_INVALID_FILTER',
14
+ CRUD_ERROR_REASON_INVALID_ORDER_BY: 'CRUD_ERROR_REASON_INVALID_ORDER_BY',
15
+ CRUD_ERROR_REASON_INVALID_FIELD_MASK: 'CRUD_ERROR_REASON_INVALID_FIELD_MASK',
16
+ CRUD_ERROR_REASON_INVALID_FIELD_VALUE: 'CRUD_ERROR_REASON_INVALID_FIELD_VALUE',
17
+ CRUD_ERROR_REASON_INTERNAL: 'CRUD_ERROR_REASON_INTERNAL',
18
+ } as const satisfies {
19
+ readonly [K in CrudErrorReasonType]: K;
20
+ };
21
+
22
+ export function isCrudErrorReason(value: unknown): value is CrudErrorReason {
23
+ return (
24
+ typeof value === 'string' &&
25
+ Object.prototype.hasOwnProperty.call(CrudErrorReason, value)
26
+ );
27
+ }
package/src/index.ts CHANGED
@@ -1 +1 @@
1
- export * from "./client/index.js";
1
+ export {};
@@ -1,32 +0,0 @@
1
- /**
2
- * Kratos 错误解析工具
3
- *
4
- * Kratos 统一错误格式:{ code, reason, message, metadata? }
5
- * 所有使用 protoc-gen-go-errors 生成的服务均输出此格式。
6
- */
7
- import type { ApiError } from "./request.js";
8
- export interface KratosErrorBody {
9
- code: number;
10
- reason: string;
11
- message: string;
12
- metadata?: Record<string, string>;
13
- }
14
- /**
15
- * 从 ApiError 中提取 Kratos 结构化错误体。
16
- * 非 HTTP 错误、或响应体不符合格式时返回 null。
17
- */
18
- export declare function parseKratosError(err: ApiError): KratosErrorBody | null;
19
- /**
20
- * 判断 ApiError 是否为指定的 Kratos reason。
21
- *
22
- * @example
23
- * if (isKratosReason(err, 'EMAIL_NOT_VERIFIED')) { ... }
24
- */
25
- export declare function isKratosReason(err: ApiError, reason: string): boolean;
26
- /**
27
- * 提取用户可读的错误消息,含 network / timeout 降级处理。
28
- *
29
- * @param fallback 当无法提取有效消息时的兜底文案,默认 '操作失败'
30
- */
31
- export declare function kratosMessage(err: ApiError, fallback?: string): string;
32
- //# sourceMappingURL=errors.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/client/errors.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI,CAUtE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAErE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,SAAS,GAAG,MAAM,CAOtE"}
@@ -1,37 +0,0 @@
1
- /**
2
- * 从 ApiError 中提取 Kratos 结构化错误体。
3
- * 非 HTTP 错误、或响应体不符合格式时返回 null。
4
- */
5
- export function parseKratosError(err) {
6
- if (err.kind !== "http" || !err.responseBody)
7
- return null;
8
- const body = err.responseBody;
9
- if (typeof body.code !== "number" ||
10
- typeof body.reason !== "string" ||
11
- typeof body.message !== "string")
12
- return null;
13
- return body;
14
- }
15
- /**
16
- * 判断 ApiError 是否为指定的 Kratos reason。
17
- *
18
- * @example
19
- * if (isKratosReason(err, 'EMAIL_NOT_VERIFIED')) { ... }
20
- */
21
- export function isKratosReason(err, reason) {
22
- return parseKratosError(err)?.reason === reason;
23
- }
24
- /**
25
- * 提取用户可读的错误消息,含 network / timeout 降级处理。
26
- *
27
- * @param fallback 当无法提取有效消息时的兜底文案,默认 '操作失败'
28
- */
29
- export function kratosMessage(err, fallback = "操作失败") {
30
- if (err.kind === "network")
31
- return "网络连接失败,请检查网络设置";
32
- if (err.kind === "timeout")
33
- return "请求超时,请稍后重试";
34
- return (parseKratosError(err)?.message ??
35
- (err.httpStatus ? `请求失败(HTTP ${err.httpStatus})` : fallback));
36
- }
37
- //# sourceMappingURL=errors.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/client/errors.ts"],"names":[],"mappings":"AAeA;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAa;IAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAC1D,MAAM,IAAI,GAAG,GAAG,CAAC,YAAuC,CAAC;IACzD,IACE,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;QAC7B,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;QAC/B,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;QAEhC,OAAO,IAAI,CAAC;IACd,OAAO,IAAkC,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,GAAa,EAAE,MAAc;IAC1D,OAAO,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,GAAa,EAAE,QAAQ,GAAG,MAAM;IAC5D,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,gBAAgB,CAAC;IACpD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,YAAY,CAAC;IAChD,OAAO,CACL,gBAAgB,CAAC,GAAG,CAAC,EAAE,OAAO;QAC9B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC7D,CAAC;AACJ,CAAC"}
@@ -1,3 +0,0 @@
1
- export * from "./errors.js";
2
- export * from "./request.js";
3
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
@@ -1,3 +0,0 @@
1
- export * from "./errors.js";
2
- export * from "./request.js";
3
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
@@ -1,54 +0,0 @@
1
- /**
2
- * @servora/proto-utils/client — 通用 HTTP 请求处理器
3
- *
4
- * 为 proto 生成的 TypeScript client 提供标准 RequestHandler 实现,包含:
5
- * - Bearer token 自动注入
6
- * - Token 自动刷新(单例防重复)
7
- * - 结构化 ApiError(区分 http / network / timeout)
8
- * - 全局 onError 回调(延迟到宏任务,避免与 toast.promise 竞态)
9
- *
10
- * 消费方通过 @servora/proto-utils 使用本实现,ofetch 由本包依赖提供。
11
- */
12
- export type RequestType = {
13
- path: string;
14
- method: string;
15
- body: string | null;
16
- };
17
- export type RequestMeta = {
18
- service: string;
19
- method: string;
20
- };
21
- export type RequestHandler = <T = unknown>(request: RequestType, meta: RequestMeta) => Promise<T>;
22
- export interface TokenStore {
23
- getAccessToken: () => string | null;
24
- getRefreshToken: () => string | null;
25
- setTokens: (accessToken: string, refreshToken: string) => void;
26
- clear: () => void;
27
- }
28
- export interface RequestHandlerOptions {
29
- baseUrl?: string;
30
- tokenStore?: TokenStore;
31
- contextHeaders?: (meta: RequestMeta) => Record<string, string>;
32
- timeoutMs?: number;
33
- onError?: (error: ApiError, meta: RequestMeta) => void;
34
- autoRefreshToken?: boolean;
35
- }
36
- export type ApiErrorKind = "http" | "network" | "timeout";
37
- export declare class ApiError extends Error {
38
- readonly kind: ApiErrorKind;
39
- readonly httpStatus?: number;
40
- readonly responseBody?: unknown;
41
- readonly service: string;
42
- readonly method: string;
43
- constructor(opts: {
44
- kind: ApiErrorKind;
45
- message: string;
46
- httpStatus?: number;
47
- responseBody?: unknown;
48
- service: string;
49
- method: string;
50
- cause?: unknown;
51
- });
52
- }
53
- export declare function createRequestHandler(options?: RequestHandlerOptions): RequestHandler;
54
- //# sourceMappingURL=request.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/client/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,OAAO,EACvC,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,WAAW,KACd,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhB,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACpC,eAAe,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACvD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;AAE1D,qBAAa,QAAS,SAAQ,KAAK;IACjC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,IAAI,EAAE;QAChB,IAAI,EAAE,YAAY,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CASF;AASD,wBAAgB,oBAAoB,CAClC,OAAO,GAAE,qBAA0B,GAClC,cAAc,CAqJhB"}
@@ -1,150 +0,0 @@
1
- /**
2
- * @servora/proto-utils/client — 通用 HTTP 请求处理器
3
- *
4
- * 为 proto 生成的 TypeScript client 提供标准 RequestHandler 实现,包含:
5
- * - Bearer token 自动注入
6
- * - Token 自动刷新(单例防重复)
7
- * - 结构化 ApiError(区分 http / network / timeout)
8
- * - 全局 onError 回调(延迟到宏任务,避免与 toast.promise 竞态)
9
- *
10
- * 消费方通过 @servora/proto-utils 使用本实现,ofetch 由本包依赖提供。
11
- */
12
- import { ofetch } from "ofetch";
13
- export class ApiError extends Error {
14
- kind;
15
- httpStatus;
16
- responseBody;
17
- service;
18
- method;
19
- constructor(opts) {
20
- super(opts.message, { cause: opts.cause });
21
- this.name = "ApiError";
22
- this.kind = opts.kind;
23
- this.httpStatus = opts.httpStatus;
24
- this.responseBody = opts.responseBody;
25
- this.service = opts.service;
26
- this.method = opts.method;
27
- }
28
- }
29
- function ensureLeadingSlash(path) {
30
- return path.startsWith("/") ? path : `/${path}`;
31
- }
32
- const REFRESH_PATH = "/v1/auth/refresh-token";
33
- const AUTH_PATH_PREFIX = "/v1/auth/";
34
- export function createRequestHandler(options = {}) {
35
- const { baseUrl = "", tokenStore, contextHeaders, timeoutMs = 30_000, onError, autoRefreshToken = false, } = options;
36
- let refreshPromise = null;
37
- async function tryRefreshToken() {
38
- if (!tokenStore)
39
- return false;
40
- const refreshToken = tokenStore.getRefreshToken();
41
- if (!refreshToken)
42
- return false;
43
- if (refreshPromise)
44
- return refreshPromise;
45
- refreshPromise = (async () => {
46
- try {
47
- const data = await ofetch(REFRESH_PATH, {
48
- baseURL: baseUrl,
49
- method: "POST",
50
- body: { refreshToken },
51
- timeout: timeoutMs,
52
- });
53
- tokenStore.setTokens(data.accessToken, data.refreshToken);
54
- return true;
55
- }
56
- catch {
57
- tokenStore.clear();
58
- return false;
59
- }
60
- finally {
61
- refreshPromise = null;
62
- }
63
- })();
64
- return refreshPromise;
65
- }
66
- async function doRequest(request, meta, isRetry = false) {
67
- const headers = {
68
- Accept: "application/json",
69
- };
70
- if (request.body) {
71
- headers["Content-Type"] = "application/json";
72
- }
73
- if (tokenStore) {
74
- const token = tokenStore.getAccessToken();
75
- if (token) {
76
- headers.Authorization = `Bearer ${token}`;
77
- }
78
- }
79
- if (contextHeaders) {
80
- Object.assign(headers, contextHeaders(meta));
81
- }
82
- const fetchOptions = {
83
- baseURL: baseUrl,
84
- method: request.method,
85
- headers,
86
- responseType: "json",
87
- timeout: timeoutMs,
88
- };
89
- if (request.body) {
90
- fetchOptions.body = request.body;
91
- }
92
- const normalizedPath = ensureLeadingSlash(request.path);
93
- try {
94
- return await ofetch(normalizedPath, fetchOptions);
95
- }
96
- catch (err) {
97
- const fetchError = err != null && typeof err === "object"
98
- ? err
99
- : {};
100
- const response = fetchError.response;
101
- if (response) {
102
- const status = response.status;
103
- const body = response._data;
104
- const apiErr = new ApiError({
105
- kind: "http",
106
- message: `HTTP ${status} on ${meta.service}.${meta.method}`,
107
- httpStatus: status,
108
- responseBody: body,
109
- service: meta.service,
110
- method: meta.method,
111
- cause: err,
112
- });
113
- if (autoRefreshToken &&
114
- status === 401 &&
115
- !isRetry &&
116
- !normalizedPath.startsWith(AUTH_PATH_PREFIX)) {
117
- const refreshed = await tryRefreshToken();
118
- if (refreshed) {
119
- return doRequest(request, meta, true);
120
- }
121
- }
122
- // 延迟到宏任务再调 onError,让 promise 链先跑完(含 toast.promise 的 _mark),
123
- // 避免全局 handler 与 sonner.promise error callback 同时弹出双重 toast。
124
- if (onError) {
125
- const _err = apiErr;
126
- setTimeout(() => onError(_err, meta), 0);
127
- }
128
- throw apiErr;
129
- }
130
- const rawMessage = typeof fetchError.message === "string" ? fetchError.message : "";
131
- const kind = rawMessage.toLowerCase().includes("timeout")
132
- ? "timeout"
133
- : "network";
134
- const apiErr = new ApiError({
135
- kind,
136
- message: `${kind} error on ${meta.service}.${meta.method}: ${rawMessage}`,
137
- service: meta.service,
138
- method: meta.method,
139
- cause: err,
140
- });
141
- if (onError) {
142
- const _err = apiErr;
143
- setTimeout(() => onError(_err, meta), 0);
144
- }
145
- throw apiErr;
146
- }
147
- }
148
- return doRequest;
149
- }
150
- //# sourceMappingURL=request.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/client/request.ts"],"names":[],"mappings":"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"}
@@ -1,54 +0,0 @@
1
- /**
2
- * Kratos 错误解析工具
3
- *
4
- * Kratos 统一错误格式:{ code, reason, message, metadata? }
5
- * 所有使用 protoc-gen-go-errors 生成的服务均输出此格式。
6
- */
7
- import type { ApiError } from "./request.js";
8
-
9
- export interface KratosErrorBody {
10
- code: number;
11
- reason: string;
12
- message: string;
13
- metadata?: Record<string, string>;
14
- }
15
-
16
- /**
17
- * 从 ApiError 中提取 Kratos 结构化错误体。
18
- * 非 HTTP 错误、或响应体不符合格式时返回 null。
19
- */
20
- export function parseKratosError(err: ApiError): KratosErrorBody | null {
21
- if (err.kind !== "http" || !err.responseBody) return null;
22
- const body = err.responseBody as Record<string, unknown>;
23
- if (
24
- typeof body.code !== "number" ||
25
- typeof body.reason !== "string" ||
26
- typeof body.message !== "string"
27
- )
28
- return null;
29
- return body as unknown as KratosErrorBody;
30
- }
31
-
32
- /**
33
- * 判断 ApiError 是否为指定的 Kratos reason。
34
- *
35
- * @example
36
- * if (isKratosReason(err, 'EMAIL_NOT_VERIFIED')) { ... }
37
- */
38
- export function isKratosReason(err: ApiError, reason: string): boolean {
39
- return parseKratosError(err)?.reason === reason;
40
- }
41
-
42
- /**
43
- * 提取用户可读的错误消息,含 network / timeout 降级处理。
44
- *
45
- * @param fallback 当无法提取有效消息时的兜底文案,默认 '操作失败'
46
- */
47
- export function kratosMessage(err: ApiError, fallback = "操作失败"): string {
48
- if (err.kind === "network") return "网络连接失败,请检查网络设置";
49
- if (err.kind === "timeout") return "请求超时,请稍后重试";
50
- return (
51
- parseKratosError(err)?.message ??
52
- (err.httpStatus ? `请求失败(HTTP ${err.httpStatus})` : fallback)
53
- );
54
- }
@@ -1,2 +0,0 @@
1
- export * from "./errors.js";
2
- export * from "./request.js";
@@ -1,234 +0,0 @@
1
- /**
2
- * @servora/proto-utils/client — 通用 HTTP 请求处理器
3
- *
4
- * 为 proto 生成的 TypeScript client 提供标准 RequestHandler 实现,包含:
5
- * - Bearer token 自动注入
6
- * - Token 自动刷新(单例防重复)
7
- * - 结构化 ApiError(区分 http / network / timeout)
8
- * - 全局 onError 回调(延迟到宏任务,避免与 toast.promise 竞态)
9
- *
10
- * 消费方通过 @servora/proto-utils 使用本实现,ofetch 由本包依赖提供。
11
- */
12
-
13
- import type { FetchOptions } from "ofetch";
14
- import { ofetch } from "ofetch";
15
-
16
- export type RequestType = {
17
- path: string;
18
- method: string;
19
- body: string | null;
20
- };
21
-
22
- export type RequestMeta = {
23
- service: string;
24
- method: string;
25
- };
26
-
27
- export type RequestHandler = <T = unknown>(
28
- request: RequestType,
29
- meta: RequestMeta,
30
- ) => Promise<T>;
31
-
32
- export interface TokenStore {
33
- getAccessToken: () => string | null;
34
- getRefreshToken: () => string | null;
35
- setTokens: (accessToken: string, refreshToken: string) => void;
36
- clear: () => void;
37
- }
38
-
39
- export interface RequestHandlerOptions {
40
- baseUrl?: string;
41
- tokenStore?: TokenStore;
42
- contextHeaders?: (meta: RequestMeta) => Record<string, string>;
43
- timeoutMs?: number;
44
- onError?: (error: ApiError, meta: RequestMeta) => void;
45
- autoRefreshToken?: boolean;
46
- }
47
-
48
- export type ApiErrorKind = "http" | "network" | "timeout";
49
-
50
- export class ApiError extends Error {
51
- readonly kind: ApiErrorKind;
52
- readonly httpStatus?: number;
53
- readonly responseBody?: unknown;
54
- readonly service: string;
55
- readonly method: string;
56
-
57
- constructor(opts: {
58
- kind: ApiErrorKind;
59
- message: string;
60
- httpStatus?: number;
61
- responseBody?: unknown;
62
- service: string;
63
- method: string;
64
- cause?: unknown;
65
- }) {
66
- super(opts.message, { cause: opts.cause });
67
- this.name = "ApiError";
68
- this.kind = opts.kind;
69
- this.httpStatus = opts.httpStatus;
70
- this.responseBody = opts.responseBody;
71
- this.service = opts.service;
72
- this.method = opts.method;
73
- }
74
- }
75
-
76
- function ensureLeadingSlash(path: string): string {
77
- return path.startsWith("/") ? path : `/${path}`;
78
- }
79
-
80
- const REFRESH_PATH = "/v1/auth/refresh-token";
81
- const AUTH_PATH_PREFIX = "/v1/auth/";
82
-
83
- export function createRequestHandler(
84
- options: RequestHandlerOptions = {},
85
- ): RequestHandler {
86
- const {
87
- baseUrl = "",
88
- tokenStore,
89
- contextHeaders,
90
- timeoutMs = 30_000,
91
- onError,
92
- autoRefreshToken = false,
93
- } = options;
94
-
95
- let refreshPromise: Promise<boolean> | null = null;
96
-
97
- async function tryRefreshToken(): Promise<boolean> {
98
- if (!tokenStore) return false;
99
- const refreshToken = tokenStore.getRefreshToken();
100
- if (!refreshToken) return false;
101
-
102
- if (refreshPromise) return refreshPromise;
103
-
104
- refreshPromise = (async () => {
105
- try {
106
- const data = await ofetch<{
107
- accessToken: string;
108
- refreshToken: string;
109
- }>(REFRESH_PATH, {
110
- baseURL: baseUrl,
111
- method: "POST",
112
- body: { refreshToken },
113
- timeout: timeoutMs,
114
- });
115
- tokenStore.setTokens(data.accessToken, data.refreshToken);
116
- return true;
117
- } catch {
118
- tokenStore.clear();
119
- return false;
120
- } finally {
121
- refreshPromise = null;
122
- }
123
- })();
124
-
125
- return refreshPromise;
126
- }
127
-
128
- async function doRequest<T = unknown>(
129
- request: RequestType,
130
- meta: RequestMeta,
131
- isRetry = false,
132
- ): Promise<T> {
133
- const headers: Record<string, string> = {
134
- Accept: "application/json",
135
- };
136
-
137
- if (request.body) {
138
- headers["Content-Type"] = "application/json";
139
- }
140
-
141
- if (tokenStore) {
142
- const token = tokenStore.getAccessToken();
143
- if (token) {
144
- headers.Authorization = `Bearer ${token}`;
145
- }
146
- }
147
-
148
- if (contextHeaders) {
149
- Object.assign(headers, contextHeaders(meta));
150
- }
151
-
152
- const fetchOptions: FetchOptions<"json", T> = {
153
- baseURL: baseUrl,
154
- method: request.method as FetchOptions["method"],
155
- headers,
156
- responseType: "json",
157
- timeout: timeoutMs,
158
- };
159
-
160
- if (request.body) {
161
- fetchOptions.body = request.body;
162
- }
163
-
164
- const normalizedPath = ensureLeadingSlash(request.path);
165
-
166
- try {
167
- return await ofetch<T>(normalizedPath, fetchOptions);
168
- } catch (err: unknown) {
169
- const fetchError =
170
- err != null && typeof err === "object"
171
- ? (err as Record<string, unknown>)
172
- : {};
173
- const response = fetchError.response as
174
- | { status: number; _data?: unknown }
175
- | undefined;
176
-
177
- if (response) {
178
- const status = response.status;
179
- const body = response._data;
180
-
181
- const apiErr = new ApiError({
182
- kind: "http",
183
- message: `HTTP ${status} on ${meta.service}.${meta.method}`,
184
- httpStatus: status,
185
- responseBody: body,
186
- service: meta.service,
187
- method: meta.method,
188
- cause: err,
189
- });
190
-
191
- if (
192
- autoRefreshToken &&
193
- status === 401 &&
194
- !isRetry &&
195
- !normalizedPath.startsWith(AUTH_PATH_PREFIX)
196
- ) {
197
- const refreshed = await tryRefreshToken();
198
- if (refreshed) {
199
- return doRequest<T>(request, meta, true);
200
- }
201
- }
202
-
203
- // 延迟到宏任务再调 onError,让 promise 链先跑完(含 toast.promise 的 _mark),
204
- // 避免全局 handler 与 sonner.promise error callback 同时弹出双重 toast。
205
- if (onError) {
206
- const _err = apiErr;
207
- setTimeout(() => onError(_err, meta), 0);
208
- }
209
- throw apiErr;
210
- }
211
-
212
- const rawMessage =
213
- typeof fetchError.message === "string" ? fetchError.message : "";
214
- const kind: ApiErrorKind = rawMessage.toLowerCase().includes("timeout")
215
- ? "timeout"
216
- : "network";
217
-
218
- const apiErr = new ApiError({
219
- kind,
220
- message: `${kind} error on ${meta.service}.${meta.method}: ${rawMessage}`,
221
- service: meta.service,
222
- method: meta.method,
223
- cause: err,
224
- });
225
- if (onError) {
226
- const _err = apiErr;
227
- setTimeout(() => onError(_err, meta), 0);
228
- }
229
- throw apiErr;
230
- }
231
- }
232
-
233
- return doRequest;
234
- }