@vrplatform/log 1.0.6 → 1.0.8

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.
Files changed (13) hide show
  1. package/build/main/common.d.ts +13 -1
  2. package/build/main/common.js +11 -3
  3. package/build/main/common.js.map +1 -1
  4. package/build/main/index.js +7 -3
  5. package/build/main/index.js.map +1 -1
  6. package/build/module/common.d.ts +13 -1
  7. package/build/module/common.js +11 -3
  8. package/build/module/common.js.map +1 -1
  9. package/build/module/index.js +7 -3
  10. package/build/module/index.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/common.ts +26 -6
  13. package/src/index.ts +6 -3
package/build/main/common.d.ts CHANGED
@@ -12,7 +12,19 @@ export declare const requestHeadersToCapture: string[];
12
12
  export declare function getCorrelationId(request?: RequestLike): string | undefined;
13
13
  export declare function isDev(request?: RequestLike, env?: Record<string, any>): any;
14
14
  export declare function mergeFn<TFn extends (...args: any[]) => any, TObj extends Record<string, unknown>>(fn: TFn, obj: TObj): TFn & TObj;
15
+ export type RequestContext = {
16
+ url?: {
17
+ pathname: string;
18
+ search: string;
19
+ host: string;
20
+ full: string;
21
+ };
22
+ headers?: Record<string, any>;
23
+ method?: string;
24
+ cloudflare?: Record<string, string>;
25
+ body?: any;
26
+ };
15
27
  export declare function requestToContext(request?: RequestLike & {
16
28
  cf?: any;
17
29
  body?: any;
18
- }, body?: any): {};
30
+ }, body?: any): RequestContext;
package/build/main/common.js CHANGED
@@ -62,15 +62,23 @@ function requestToContext(request, body) {
62
62
  }
63
63
  }
64
64
  const context = {
65
- url: request?.url,
66
65
  headers: getHeaderMap(request?.headers),
67
66
  method: request?.method,
68
67
  cloudflare: cf,
69
68
  body: body || undefined,
70
69
  };
71
- if (context.headers['x-workflow-id'])
70
+ if (request?.url) {
71
+ const url = new URL(request.url);
72
+ context.url = {
73
+ pathname: url.pathname,
74
+ search: url.search,
75
+ host: url.host,
76
+ full: request.url,
77
+ };
78
+ }
79
+ if (context.headers?.['x-workflow-id'])
72
80
  context.workflowId = context.headers['x-workflow-id'];
73
- if (context.headers['x-activity-attempt'])
81
+ if (context.headers?.['x-activity-attempt'])
74
82
  context.activityAttempt = context.headers['x-activity-attempt'];
75
83
  return context;
76
84
  }
package/build/main/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":";;;AAEA,UAAU;AACG,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,kBAAkB,GAAG,eAAe,CAAC;AACrC,QAAA,iBAAiB,GAAG,cAAc,CAAC;AACnC,QAAA,qBAAqB,GAAG,kBAAkB,CAAC;AAC3C,QAAA,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACO,QAAA,oBAAoB,GAAG,kBAAkB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAClC,QAAA,iBAAiB,GAAG,eAAe,CAAC;AACpC,QAAA,OAAO,GAAG,KAAK,CAAC;AAEhB,QAAA,uBAAuB,GAAG,CAAC,YAAY,CAAC,CAAC;AAEtD,SAAgB,gBAAgB,CAAC,OAAqB;IACpD,IAAI,CAAC,OAAO,EAAE,OAAO;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,CACL,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6BAAqB,CAAC;QAC1C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACxC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACvC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACrC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACvC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACrC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACpC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QACjC,SAAS,CACV,CAAC;AACJ,CAAC;AAdD,4CAcC;AAED,SAAgB,KAAK,CAAC,OAAqB,EAAE,GAAyB;IACpE,OAAO,GAAG,EAAE,YAAY,IAAI,OAAO,EAAE,GAAG,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAC5E,CAAC;AAFD,sBAEC;AAED,SAAgB,OAAO,CAGrB,EAAO,EAAE,GAAS;IAClB,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC;AALD,0BAKC;AAED,SAAS,YAAY,CACnB,OAAwB;AACxB,2BAA2B;;IAE3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,EAAE;QAC3D,IAAI,SAAS,EAAE,CAAC;YACd,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,WAAW,CAAC;QAC7C,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAgB,gBAAgB,CAC9B,OAAgD,EAChD,IAAU;IAEV,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,EAAE,GAA4B,EAAE,CAAC;IACvC,IAAI,OAAO,EAAE,EAAE,EAAE,CAAC;QAChB,oDAAoD;QACpD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACtD,IAAI,GAAG,KAAK,eAAe,IAAI,GAAG,KAAK,0BAA0B,EAAE,CAAC;gBAClE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG;QACd,GAAG,EAAE,OAAO,EAAE,GAAG;QACjB,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC;QACvC,MAAM,EAAE,OAAO,EAAE,MAAM;QACvB,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,IAAI,IAAI,SAAS;KACxB,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;QACjC,OAAe,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACjE,IAAI,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC;QACtC,OAAe,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,4CA4BC"}
1
+ {"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
package/build/main/index.js CHANGED
@@ -51,13 +51,17 @@ function useLog({ name, request, body, env, correlationId: cid, version, executi
51
51
  const raw = typeof logRequest === 'function'
52
52
  ? logRequest((0, common_1.requestToContext)(request, body))
53
53
  : (0, common_1.requestToContext)(request, body);
54
- axiom.info('Request', raw);
54
+ const url = request ? new URL(request.url) : undefined;
55
+ if (url)
56
+ axiom.info(`Request to ${request?.method}:${url.pathname || '-'}`, raw);
57
+ else
58
+ axiom.info('Request', raw);
55
59
  }
56
60
  axiom.respond = async (res) => {
57
61
  const temp = await (typeof res === 'function' ? res() : res);
58
62
  let response = undefined;
59
63
  if (temp instanceof Response) {
60
- axiom?.info('Response', {
64
+ axiom?.info(`Response ${response.status}`, {
61
65
  response: {
62
66
  body: temp
63
67
  .clone()
@@ -72,7 +76,7 @@ function useLog({ name, request, body, env, correlationId: cid, version, executi
72
76
  response = temp;
73
77
  }
74
78
  else {
75
- axiom?.info('Response', {
79
+ axiom?.info(`Response ${response.status || 200}`, {
76
80
  response: temp,
77
81
  });
78
82
  response = new Response(typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body, {
package/build/main/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
package/build/module/common.d.ts CHANGED
@@ -12,7 +12,19 @@ export declare const requestHeadersToCapture: string[];
12
12
  export declare function getCorrelationId(request?: RequestLike): string | undefined;
13
13
  export declare function isDev(request?: RequestLike, env?: Record<string, any>): any;
14
14
  export declare function mergeFn<TFn extends (...args: any[]) => any, TObj extends Record<string, unknown>>(fn: TFn, obj: TObj): TFn & TObj;
15
+ export type RequestContext = {
16
+ url?: {
17
+ pathname: string;
18
+ search: string;
19
+ host: string;
20
+ full: string;
21
+ };
22
+ headers?: Record<string, any>;
23
+ method?: string;
24
+ cloudflare?: Record<string, string>;
25
+ body?: any;
26
+ };
15
27
  export declare function requestToContext(request?: RequestLike & {
16
28
  cf?: any;
17
29
  body?: any;
18
- }, body?: any): {};
30
+ }, body?: any): RequestContext;
package/build/module/common.js CHANGED
@@ -56,15 +56,23 @@ export function requestToContext(request, body) {
56
56
  }
57
57
  }
58
58
  const context = {
59
- url: request?.url,
60
59
  headers: getHeaderMap(request?.headers),
61
60
  method: request?.method,
62
61
  cloudflare: cf,
63
62
  body: body || undefined,
64
63
  };
65
- if (context.headers['x-workflow-id'])
64
+ if (request?.url) {
65
+ const url = new URL(request.url);
66
+ context.url = {
67
+ pathname: url.pathname,
68
+ search: url.search,
69
+ host: url.host,
70
+ full: request.url,
71
+ };
72
+ }
73
+ if (context.headers?.['x-workflow-id'])
66
74
  context.workflowId = context.headers['x-workflow-id'];
67
- if (context.headers['x-activity-attempt'])
75
+ if (context.headers?.['x-activity-attempt'])
68
76
  context.activityAttempt = context.headers['x-activity-attempt'];
69
77
  return context;
70
78
  }
package/build/module/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
package/build/module/index.js CHANGED
@@ -34,13 +34,17 @@ export function useLog({ name, request, body, env, correlationId: cid, version,
34
34
  const raw = typeof logRequest === 'function'
35
35
  ? logRequest(requestToContext(request, body))
36
36
  : requestToContext(request, body);
37
- axiom.info('Request', raw);
37
+ const url = request ? new URL(request.url) : undefined;
38
+ if (url)
39
+ axiom.info(`Request to ${request?.method}:${url.pathname || '-'}`, raw);
40
+ else
41
+ axiom.info('Request', raw);
38
42
  }
39
43
  axiom.respond = async (res) => {
40
44
  const temp = await (typeof res === 'function' ? res() : res);
41
45
  let response = undefined;
42
46
  if (temp instanceof Response) {
43
- axiom?.info('Response', {
47
+ axiom?.info(`Response ${response.status}`, {
44
48
  response: {
45
49
  body: temp
46
50
  .clone()
@@ -55,7 +59,7 @@ export function useLog({ name, request, body, env, correlationId: cid, version,
55
59
  response = temp;
56
60
  }
57
61
  else {
58
- axiom?.info('Response', {
62
+ axiom?.info(`Response ${response.status || 200}`, {
59
63
  response: temp,
60
64
  });
61
65
  response = new Response(typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body, {
package/build/module/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vrplatform/log",
3
- "version": "1.0.6",
3
+ "version": "1.0.8",
4
4
  "main": "src/index.ts",
5
5
  "publishConfig": {
6
6
  "access": "public",
package/src/common.ts CHANGED
@@ -58,10 +58,22 @@ function getHeaderMap(
58
58
  }, {});
59
59
  }
60
60
 
61
+ export type RequestContext = {
62
+ url?: {
63
+ pathname: string;
64
+ search: string;
65
+ host: string;
66
+ full: string;
67
+ };
68
+ headers?: Record<string, any>;
69
+ method?: string;
70
+ cloudflare?: Record<string, string>;
71
+ body?: any;
72
+ };
61
73
  export function requestToContext(
62
74
  request?: RequestLike & { cf?: any; body?: any },
63
75
  body?: any
64
- ) {
76
+ ): RequestContext {
65
77
  if (!request) return {};
66
78
 
67
79
  const cf: Record<string, unknown> = {};
@@ -73,17 +85,25 @@ export function requestToContext(
73
85
  }
74
86
  }
75
87
  }
76
- const context = {
77
- url: request?.url,
88
+ const context: RequestContext = {
78
89
  headers: getHeaderMap(request?.headers),
79
90
  method: request?.method,
80
- cloudflare: cf,
91
+ cloudflare: cf as any,
81
92
  body: body || undefined,
82
93
  };
94
+ if (request?.url) {
95
+ const url = new URL(request.url);
96
+ context.url = {
97
+ pathname: url.pathname,
98
+ search: url.search,
99
+ host: url.host,
100
+ full: request.url,
101
+ };
102
+ }
83
103
 
84
- if (context.headers['x-workflow-id'])
104
+ if (context.headers?.['x-workflow-id'])
85
105
  (context as any).workflowId = context.headers['x-workflow-id'];
86
- if (context.headers['x-activity-attempt'])
106
+ if (context.headers?.['x-activity-attempt'])
87
107
  (context as any).activityAttempt = context.headers['x-activity-attempt'];
88
108
  return context;
89
109
  }
package/src/index.ts CHANGED
@@ -78,7 +78,10 @@ export function useLog({
78
78
  typeof logRequest === 'function'
79
79
  ? logRequest(requestToContext(request, body))
80
80
  : requestToContext(request, body);
81
- axiom.info('Request', raw);
81
+ const url = request ? new URL(request.url) : undefined;
82
+ if (url)
83
+ axiom.info(`Request to ${request?.method}:${url.pathname || '-'}`, raw);
84
+ else axiom.info('Request', raw);
82
85
  }
83
86
 
84
87
  axiom.respond = async (res) => {
@@ -86,7 +89,7 @@ export function useLog({
86
89
 
87
90
  let response: Response = undefined!;
88
91
  if (temp instanceof Response) {
89
- axiom?.info('Response', {
92
+ axiom?.info(`Response ${response.status}`, {
90
93
  response: {
91
94
  body: temp
92
95
  .clone()
@@ -100,7 +103,7 @@ export function useLog({
100
103
  });
101
104
  response = temp;
102
105
  } else {
103
- axiom?.info('Response', {
106
+ axiom?.info(`Response ${response.status || 200}`, {
104
107
  response: temp,
105
108
  });
106
109
  response = new Response(