@aomex/async-trace 1.6.0 → 1.7.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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,17 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [1.7.0](https://github.com/aomex/aomex/compare/v1.6.0...v1.7.0) (2024-07-13)
7
+
8
+
9
+ ### Features
10
+
11
+ * **async-trace:** traceMiddleware的记录回调函数增加ctx参数 ([7fbf5db](https://github.com/aomex/aomex/commit/7fbf5db76e6bf425c5d390bd1ede47c6d03600dc))
12
+
13
+
14
+
15
+
16
+
6
17
  # [1.6.0](https://github.com/aomex/aomex/compare/v1.5.1...v1.6.0) (2024-07-05)
7
18
 
8
19
 
package/dist/index.d.ts CHANGED
@@ -48,7 +48,7 @@ interface AsyncTraceMiddlewareProps {
48
48
  /**
49
49
  * 追踪中间件从开始到结束的总链路
50
50
  */
51
- declare const traceMiddleware: (label: string, callback?: (record: AsyncTraceRecord) => any) => _aomex_core.MixinMiddleware<AsyncTraceMiddlewareProps>;
51
+ declare const traceMiddleware: (label: string, callback?: (record: AsyncTraceRecord, ctx: any) => any) => _aomex_core.MixinMiddleware<AsyncTraceMiddlewareProps>;
52
52
 
53
53
  /**
54
54
  * 追踪类的方法或静态方法的链路
package/dist/index.js CHANGED
@@ -61,7 +61,7 @@ var traceMiddleware = (label, callback) => {
61
61
  } finally {
62
62
  const record = asyncTrace.getRecord(traceId);
63
63
  ctx.asyncTrace = { record };
64
- await callback?.(record);
64
+ await callback?.(record, ctx);
65
65
  }
66
66
  });
67
67
  };
@@ -80,7 +80,7 @@ var traceMethod = (label, callback) => {
80
80
  }
81
81
  );
82
82
  } finally {
83
- callback?.(asyncTrace.getRecord(traceId));
83
+ await callback?.(asyncTrace.getRecord(traceId));
84
84
  }
85
85
  };
86
86
  };
@@ -95,8 +95,7 @@ var traceBlock = async (label, logic, callback) => {
95
95
  return logic();
96
96
  });
97
97
  } finally {
98
- const record = asyncTrace.getRecord(traceId);
99
- await callback?.(record);
98
+ await callback?.(asyncTrace.getRecord(traceId));
100
99
  }
101
100
  };
102
101
  export {
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/async-trace.ts","../src/trace-middleware.ts","../src/trace-method.ts","../src/trace-block.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\n\nexport interface AsyncTraceRecord {\n id: string;\n /**\n * 标签\n */\n label: string;\n /**\n * 开始时间,毫秒时间戳\n */\n start: number;\n /**\n * 结束时间,毫秒时间戳\n */\n end: number;\n /**\n * 时间周期,毫秒\n */\n delta: number;\n /**\n * 父链路\n */\n parent?: string;\n /**\n * 子链路\n */\n children: AsyncTraceRecord[];\n}\n\nclass AsyncTrace {\n public records: AsyncTraceRecord[] = [];\n\n protected readonly storage = new AsyncLocalStorage<string>();\n protected idSequence = 0;\n\n run<T>(label: string, callback: (id: string) => Promise<T>): Promise<T> {\n const parent = this.storage.getStore();\n\n if (++this.idSequence >= Number.MAX_SAFE_INTEGER) {\n this.idSequence = 0;\n }\n\n return new Promise<T>((resolve, reject) => {\n const start = Date.now();\n const id = start + '.' + this.idSequence;\n\n this.storage.run(id, async () => {\n const done = () => {\n const end = Date.now();\n this.records.push({\n id,\n start,\n end,\n delta: end - start,\n label,\n parent,\n children: this.records.filter((item) => item.parent === id),\n });\n this.records = this.records.filter((item) => item.parent !== id);\n };\n\n try {\n const result = await callback(id);\n done();\n resolve(result);\n } catch (e) {\n done();\n reject(e);\n }\n });\n });\n }\n\n getRecord(id: string) {\n const index = this.records.findIndex((item) => item.id === id);\n const record = this.records[index];\n if (record && !record.parent) {\n this.records.splice(index, 1);\n }\n return record!;\n }\n}\n\nexport const asyncTrace = new AsyncTrace();\n","import { middleware } from '@aomex/core';\nimport { asyncTrace, type AsyncTraceRecord } from './async-trace';\n\nexport interface AsyncTraceMiddlewareProps {\n /**\n * 链路追踪记录,仅在中间件后面的任务结束后才会生成\n */\n readonly asyncTrace?: { record: AsyncTraceRecord };\n}\n\n/**\n * 追踪中间件从开始到结束的总链路\n */\nexport const traceMiddleware = (\n label: string,\n callback?: (record: AsyncTraceRecord) => any,\n) => {\n return middleware.mixin<AsyncTraceMiddlewareProps>(async (ctx, next) => {\n let traceId!: string;\n try {\n await asyncTrace.run(label, async (id) => {\n traceId = id;\n await next();\n });\n } finally {\n const record = asyncTrace.getRecord(traceId);\n ctx.asyncTrace = { record };\n await callback?.(record);\n }\n });\n};\n","import { asyncTrace, type AsyncTraceRecord } from './async-trace';\n\n/**\n * 追踪类的方法或静态方法的链路\n * ```typescript\n * class MyService {\n * .@traceMethod('label')\n * async getData() {\n * return [];\n * }\n * }\n * ```\n */\nexport const traceMethod = <T, P extends (...args: any[]) => Promise<T>>(\n label?: string | ((...args: Parameters<P>) => string),\n callback?: (record: AsyncTraceRecord) => any,\n) => {\n return (originalMethod: P, context: ClassMethodDecoratorContext) => {\n return async function (this: object, ...args: Parameters<P>): Promise<any> {\n let traceId!: string;\n try {\n return await asyncTrace.run<T>(\n label === undefined\n ? `${this.constructor.name}.${String(context.name)}()`\n : typeof label === 'string'\n ? label\n : label(...args),\n (id) => {\n traceId = id;\n return originalMethod.apply(this, args);\n },\n );\n } finally {\n callback?.(asyncTrace.getRecord(traceId));\n }\n };\n };\n};\n","import { asyncTrace, type AsyncTraceRecord } from './async-trace';\n\n/**\n * 追踪代码段的链路\n * ```typescript\n * const result = await traceBlock('foo', async () => {\n * await ...\n * return 'bar';\n * }, (record)=> {\n * console.log(record); // { label: 'foo', delta: 123, ... }\n * });\n *\n * console.log(result); // 'bar'\n * ```\n */\nexport const traceBlock = async <T>(\n label: string,\n logic: () => Promise<T>,\n callback?: (record: AsyncTraceRecord) => any,\n): Promise<T> => {\n let traceId!: string;\n try {\n return await asyncTrace.run<T>(label, (id) => {\n traceId = id;\n return logic();\n });\n } finally {\n const record = asyncTrace.getRecord(traceId)!;\n await callback?.(record);\n }\n};\n"],"mappings":";AAAA,SAAS,yBAAyB;AA8BlC,IAAM,aAAN,MAAiB;AAAA,EACR,UAA8B,CAAC;AAAA,EAEnB,UAAU,IAAI,kBAA0B;AAAA,EACjD,aAAa;AAAA,EAEvB,IAAO,OAAe,UAAkD;AACtE,UAAM,SAAS,KAAK,QAAQ,SAAS;AAErC,QAAI,EAAE,KAAK,cAAc,OAAO,kBAAkB;AAChD,WAAK,aAAa;AAAA,IACpB;AAEA,WAAO,IAAI,QAAW,CAAC,SAAS,WAAW;AACzC,YAAM,QAAQ,KAAK,IAAI;AACvB,YAAM,KAAK,QAAQ,MAAM,KAAK;AAE9B,WAAK,QAAQ,IAAI,IAAI,YAAY;AAC/B,cAAM,OAAO,MAAM;AACjB,gBAAM,MAAM,KAAK,IAAI;AACrB,eAAK,QAAQ,KAAK;AAAA,YAChB;AAAA,YACA;AAAA,YACA;AAAA,YACA,OAAO,MAAM;AAAA,YACb;AAAA,YACA;AAAA,YACA,UAAU,KAAK,QAAQ,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;AAAA,UAC5D,CAAC;AACD,eAAK,UAAU,KAAK,QAAQ,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;AAAA,QACjE;AAEA,YAAI;AACF,gBAAM,SAAS,MAAM,SAAS,EAAE;AAChC,eAAK;AACL,kBAAQ,MAAM;AAAA,QAChB,SAAS,GAAG;AACV,eAAK;AACL,iBAAO,CAAC;AAAA,QACV;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,UAAU,IAAY;AACpB,UAAM,QAAQ,KAAK,QAAQ,UAAU,CAAC,SAAS,KAAK,OAAO,EAAE;AAC7D,UAAM,SAAS,KAAK,QAAQ,KAAK;AACjC,QAAI,UAAU,CAAC,OAAO,QAAQ;AAC5B,WAAK,QAAQ,OAAO,OAAO,CAAC;AAAA,IAC9B;AACA,WAAO;AAAA,EACT;AACF;AAEO,IAAM,aAAa,IAAI,WAAW;;;ACpFzC,SAAS,kBAAkB;AAapB,IAAM,kBAAkB,CAC7B,OACA,aACG;AACH,SAAO,WAAW,MAAiC,OAAO,KAAK,SAAS;AACtE,QAAI;AACJ,QAAI;AACF,YAAM,WAAW,IAAI,OAAO,OAAO,OAAO;AACxC,kBAAU;AACV,cAAM,KAAK;AAAA,MACb,CAAC;AAAA,IACH,UAAE;AACA,YAAM,SAAS,WAAW,UAAU,OAAO;AAC3C,UAAI,aAAa,EAAE,OAAO;AAC1B,YAAM,WAAW,MAAM;AAAA,IACzB;AAAA,EACF,CAAC;AACH;;;ACjBO,IAAM,cAAc,CACzB,OACA,aACG;AACH,SAAO,CAAC,gBAAmB,YAAyC;AAClE,WAAO,kBAAiC,MAAmC;AACzE,UAAI;AACJ,UAAI;AACF,eAAO,MAAM,WAAW;AAAA,UACtB,UAAU,SACN,GAAG,KAAK,YAAY,IAAI,IAAI,OAAO,QAAQ,IAAI,CAAC,OAChD,OAAO,UAAU,WACf,QACA,MAAM,GAAG,IAAI;AAAA,UACnB,CAAC,OAAO;AACN,sBAAU;AACV,mBAAO,eAAe,MAAM,MAAM,IAAI;AAAA,UACxC;AAAA,QACF;AAAA,MACF,UAAE;AACA,mBAAW,WAAW,UAAU,OAAO,CAAC;AAAA,MAC1C;AAAA,IACF;AAAA,EACF;AACF;;;ACtBO,IAAM,aAAa,OACxB,OACA,OACA,aACe;AACf,MAAI;AACJ,MAAI;AACF,WAAO,MAAM,WAAW,IAAO,OAAO,CAAC,OAAO;AAC5C,gBAAU;AACV,aAAO,MAAM;AAAA,IACf,CAAC;AAAA,EACH,UAAE;AACA,UAAM,SAAS,WAAW,UAAU,OAAO;AAC3C,UAAM,WAAW,MAAM;AAAA,EACzB;AACF;","names":[]}
1
+ {"version":3,"sources":["../src/async-trace.ts","../src/trace-middleware.ts","../src/trace-method.ts","../src/trace-block.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\n\nexport interface AsyncTraceRecord {\n id: string;\n /**\n * 标签\n */\n label: string;\n /**\n * 开始时间,毫秒时间戳\n */\n start: number;\n /**\n * 结束时间,毫秒时间戳\n */\n end: number;\n /**\n * 时间周期,毫秒\n */\n delta: number;\n /**\n * 父链路\n */\n parent?: string;\n /**\n * 子链路\n */\n children: AsyncTraceRecord[];\n}\n\nclass AsyncTrace {\n public records: AsyncTraceRecord[] = [];\n\n protected readonly storage = new AsyncLocalStorage<string>();\n protected idSequence = 0;\n\n run<T>(label: string, callback: (id: string) => Promise<T>): Promise<T> {\n const parent = this.storage.getStore();\n\n if (++this.idSequence >= Number.MAX_SAFE_INTEGER) {\n this.idSequence = 0;\n }\n\n return new Promise<T>((resolve, reject) => {\n const start = Date.now();\n const id = start + '.' + this.idSequence;\n\n this.storage.run(id, async () => {\n const done = () => {\n const end = Date.now();\n this.records.push({\n id,\n start,\n end,\n delta: end - start,\n label,\n parent,\n children: this.records.filter((item) => item.parent === id),\n });\n this.records = this.records.filter((item) => item.parent !== id);\n };\n\n try {\n const result = await callback(id);\n done();\n resolve(result);\n } catch (e) {\n done();\n reject(e);\n }\n });\n });\n }\n\n getRecord(id: string) {\n const index = this.records.findIndex((item) => item.id === id);\n const record = this.records[index];\n if (record && !record.parent) {\n this.records.splice(index, 1);\n }\n return record!;\n }\n}\n\nexport const asyncTrace = new AsyncTrace();\n","import { middleware } from '@aomex/core';\nimport { asyncTrace, type AsyncTraceRecord } from './async-trace';\n\nexport interface AsyncTraceMiddlewareProps {\n /**\n * 链路追踪记录,仅在中间件后面的任务结束后才会生成\n */\n readonly asyncTrace?: { record: AsyncTraceRecord };\n}\n\n/**\n * 追踪中间件从开始到结束的总链路\n */\nexport const traceMiddleware = (\n label: string,\n callback?: (record: AsyncTraceRecord, ctx: any) => any,\n) => {\n return middleware.mixin<AsyncTraceMiddlewareProps>(async (ctx, next) => {\n let traceId!: string;\n try {\n await asyncTrace.run(label, async (id) => {\n traceId = id;\n await next();\n });\n } finally {\n const record = asyncTrace.getRecord(traceId);\n ctx.asyncTrace = { record };\n await callback?.(record, ctx);\n }\n });\n};\n","import { asyncTrace, type AsyncTraceRecord } from './async-trace';\n\n/**\n * 追踪类的方法或静态方法的链路\n * ```typescript\n * class MyService {\n * .@traceMethod('label')\n * async getData() {\n * return [];\n * }\n * }\n * ```\n */\nexport const traceMethod = <T, P extends (...args: any[]) => Promise<T>>(\n label?: string | ((...args: Parameters<P>) => string),\n callback?: (record: AsyncTraceRecord) => any,\n) => {\n return (originalMethod: P, context: ClassMethodDecoratorContext) => {\n return async function (this: object, ...args: Parameters<P>): Promise<any> {\n let traceId!: string;\n try {\n return await asyncTrace.run<T>(\n label === undefined\n ? `${this.constructor.name}.${String(context.name)}()`\n : typeof label === 'string'\n ? label\n : label(...args),\n (id) => {\n traceId = id;\n return originalMethod.apply(this, args);\n },\n );\n } finally {\n await callback?.(asyncTrace.getRecord(traceId));\n }\n };\n };\n};\n","import { asyncTrace, type AsyncTraceRecord } from './async-trace';\n\n/**\n * 追踪代码段的链路\n * ```typescript\n * const result = await traceBlock('foo', async () => {\n * await ...\n * return 'bar';\n * }, (record)=> {\n * console.log(record); // { label: 'foo', delta: 123, ... }\n * });\n *\n * console.log(result); // 'bar'\n * ```\n */\nexport const traceBlock = async <T>(\n label: string,\n logic: () => Promise<T>,\n callback?: (record: AsyncTraceRecord) => any,\n): Promise<T> => {\n let traceId!: string;\n try {\n return await asyncTrace.run<T>(label, (id) => {\n traceId = id;\n return logic();\n });\n } finally {\n await callback?.(asyncTrace.getRecord(traceId));\n }\n};\n"],"mappings":";AAAA,SAAS,yBAAyB;AA8BlC,IAAM,aAAN,MAAiB;AAAA,EACR,UAA8B,CAAC;AAAA,EAEnB,UAAU,IAAI,kBAA0B;AAAA,EACjD,aAAa;AAAA,EAEvB,IAAO,OAAe,UAAkD;AACtE,UAAM,SAAS,KAAK,QAAQ,SAAS;AAErC,QAAI,EAAE,KAAK,cAAc,OAAO,kBAAkB;AAChD,WAAK,aAAa;AAAA,IACpB;AAEA,WAAO,IAAI,QAAW,CAAC,SAAS,WAAW;AACzC,YAAM,QAAQ,KAAK,IAAI;AACvB,YAAM,KAAK,QAAQ,MAAM,KAAK;AAE9B,WAAK,QAAQ,IAAI,IAAI,YAAY;AAC/B,cAAM,OAAO,MAAM;AACjB,gBAAM,MAAM,KAAK,IAAI;AACrB,eAAK,QAAQ,KAAK;AAAA,YAChB;AAAA,YACA;AAAA,YACA;AAAA,YACA,OAAO,MAAM;AAAA,YACb;AAAA,YACA;AAAA,YACA,UAAU,KAAK,QAAQ,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;AAAA,UAC5D,CAAC;AACD,eAAK,UAAU,KAAK,QAAQ,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;AAAA,QACjE;AAEA,YAAI;AACF,gBAAM,SAAS,MAAM,SAAS,EAAE;AAChC,eAAK;AACL,kBAAQ,MAAM;AAAA,QAChB,SAAS,GAAG;AACV,eAAK;AACL,iBAAO,CAAC;AAAA,QACV;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAAA,EAEA,UAAU,IAAY;AACpB,UAAM,QAAQ,KAAK,QAAQ,UAAU,CAAC,SAAS,KAAK,OAAO,EAAE;AAC7D,UAAM,SAAS,KAAK,QAAQ,KAAK;AACjC,QAAI,UAAU,CAAC,OAAO,QAAQ;AAC5B,WAAK,QAAQ,OAAO,OAAO,CAAC;AAAA,IAC9B;AACA,WAAO;AAAA,EACT;AACF;AAEO,IAAM,aAAa,IAAI,WAAW;;;ACpFzC,SAAS,kBAAkB;AAapB,IAAM,kBAAkB,CAC7B,OACA,aACG;AACH,SAAO,WAAW,MAAiC,OAAO,KAAK,SAAS;AACtE,QAAI;AACJ,QAAI;AACF,YAAM,WAAW,IAAI,OAAO,OAAO,OAAO;AACxC,kBAAU;AACV,cAAM,KAAK;AAAA,MACb,CAAC;AAAA,IACH,UAAE;AACA,YAAM,SAAS,WAAW,UAAU,OAAO;AAC3C,UAAI,aAAa,EAAE,OAAO;AAC1B,YAAM,WAAW,QAAQ,GAAG;AAAA,IAC9B;AAAA,EACF,CAAC;AACH;;;ACjBO,IAAM,cAAc,CACzB,OACA,aACG;AACH,SAAO,CAAC,gBAAmB,YAAyC;AAClE,WAAO,kBAAiC,MAAmC;AACzE,UAAI;AACJ,UAAI;AACF,eAAO,MAAM,WAAW;AAAA,UACtB,UAAU,SACN,GAAG,KAAK,YAAY,IAAI,IAAI,OAAO,QAAQ,IAAI,CAAC,OAChD,OAAO,UAAU,WACf,QACA,MAAM,GAAG,IAAI;AAAA,UACnB,CAAC,OAAO;AACN,sBAAU;AACV,mBAAO,eAAe,MAAM,MAAM,IAAI;AAAA,UACxC;AAAA,QACF;AAAA,MACF,UAAE;AACA,cAAM,WAAW,WAAW,UAAU,OAAO,CAAC;AAAA,MAChD;AAAA,IACF;AAAA,EACF;AACF;;;ACtBO,IAAM,aAAa,OACxB,OACA,OACA,aACe;AACf,MAAI;AACJ,MAAI;AACF,WAAO,MAAM,WAAW,IAAO,OAAO,CAAC,OAAO;AAC5C,gBAAU;AACV,aAAO,MAAM;AAAA,IACf,CAAC;AAAA,EACH,UAAE;AACA,UAAM,WAAW,WAAW,UAAU,OAAO,CAAC;AAAA,EAChD;AACF;","names":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aomex/async-trace",
3
- "version": "1.6.0",
3
+ "version": "1.7.0",
4
4
  "description": "异步逻辑链路追踪",
5
5
  "repository": "git@github.com:aomex/aomex.git",
6
6
  "homepage": "https://aomex.js.org",
@@ -32,7 +32,10 @@
32
32
  "@aomex/core": "^1.0.0"
33
33
  },
34
34
  "devDependencies": {
35
- "@aomex/core": "^1.6.0"
35
+ "@aomex/console": "^1.7.0",
36
+ "@aomex/core": "^1.7.0",
37
+ "@aomex/internal-tools": "^1.7.0",
38
+ "@aomex/web": "^1.7.0"
36
39
  },
37
40
  "scripts": {}
38
41
  }