@vrplatform/log 1.0.5 → 1.0.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.
- package/build/main/baselog.js +7 -3
- package/build/main/baselog.js.map +1 -1
- package/build/main/common.d.ts +1 -14
- package/build/main/common.js +15 -9
- package/build/main/common.js.map +1 -1
- package/build/main/index.d.ts +4 -2
- package/build/main/index.js +30 -20
- package/build/main/index.js.map +1 -1
- package/build/main/type.d.ts +1 -1
- package/build/module/baselog.js +7 -3
- package/build/module/baselog.js.map +1 -1
- package/build/module/common.d.ts +1 -14
- package/build/module/common.js +14 -7
- package/build/module/common.js.map +1 -1
- package/build/module/index.d.ts +4 -2
- package/build/module/index.js +30 -20
- package/build/module/index.js.map +1 -1
- package/build/module/type.d.ts +1 -1
- package/package.json +8 -13
- package/src/baselog.ts +17 -3
- package/src/common.ts +15 -10
- package/src/index.ts +39 -27
- package/src/type.ts +4 -1
package/build/main/baselog.js
CHANGED
|
@@ -54,7 +54,7 @@ function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog,
|
|
|
54
54
|
if (arg.request) {
|
|
55
55
|
childContext.request = (0, common_1.requestToContext)(arg.request);
|
|
56
56
|
}
|
|
57
|
-
const baseLog = (level, message, additionalContext = {}) => {
|
|
57
|
+
const baseLog = (level, message, additionalContext = {}, error) => {
|
|
58
58
|
const cid = arg.correlationId ||
|
|
59
59
|
correlationId ||
|
|
60
60
|
childContext?.correlationId ||
|
|
@@ -71,6 +71,8 @@ function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog,
|
|
|
71
71
|
const now = Date.now();
|
|
72
72
|
const diff = (lastMessageTimestamp ? `${now - lastMessageTimestamp}ms ` : '').padEnd(6, ' ');
|
|
73
73
|
lastMessageTimestamp = now;
|
|
74
|
+
error = message instanceof Error ? message : error;
|
|
75
|
+
message = message instanceof Error ? message.message : message;
|
|
74
76
|
if (consoleLog === 'color')
|
|
75
77
|
color_1.logger
|
|
76
78
|
.dim()
|
|
@@ -89,7 +91,9 @@ function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog,
|
|
|
89
91
|
.append(message)
|
|
90
92
|
.log();
|
|
91
93
|
else
|
|
92
|
-
console.log(`[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}
|
|
94
|
+
console.log(`[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`, additionalContext);
|
|
95
|
+
if (error)
|
|
96
|
+
console.error(error);
|
|
93
97
|
}
|
|
94
98
|
};
|
|
95
99
|
return {
|
|
@@ -111,7 +115,7 @@ function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog,
|
|
|
111
115
|
? message
|
|
112
116
|
: error?.message || error?.name || 'Error';
|
|
113
117
|
const e = typeof message === 'string' ? error : message;
|
|
114
|
-
return baseLog('error', m, e instanceof Error ? (0, serialize_error_1.serializeError)(e) : e);
|
|
118
|
+
return baseLog('error', m, e instanceof Error ? (0, serialize_error_1.serializeError)(e) : e, e);
|
|
115
119
|
},
|
|
116
120
|
debug: (message, data) => baseLog('debug', message, data),
|
|
117
121
|
warn: (message, data) => baseLog('warn', message, data),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["baselog.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAA8D;AAE9D,yCAAuB;AACvB,oCAAoC;AACpC,qDAAiD;AACjD,mCAAiC;AAEjC,IAAI,oBAAoB,GAAuB,SAAS,CAAC;AAEzD,SAAgB,aAAa,CAC3B,EACE,KAAK,EACL,KAAK,GAAG,iBAAiB,EACzB,OAAO,EACP,UAAU,GAMX,EACD,EACE,WAAW,EACX,QAAQ,EACR,GAAG,EACH,OAAO,EACP,OAAO,EACP,IAAI,EACJ,aAAa,EACb,gBAAgB,GAYjB;IAED,MAAM,UAAU,GAAwB;QACtC,IAAI,EAAE,IAAI,IAAI,QAAQ;QACtB,WAAW,EAAE,WAAW,IAAI,YAAY;QACxC,MAAM,EAAE;YACN,EAAE,EAAE,QAAQ,IAAI,SAAS;YACzB,GAAG,EAAE,GAAG,IAAI,SAAS;YACrB,OAAO,EAAE,OAAO,IAAI,SAAS;YAC7B,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAClC;QACD,GAAG,OAAO;KACX,CAAC;IAEF,MAAM,KAAK,GAAG,KAAK;QACjB,CAAC,CAAC,IAAI,UAAK,CAAC;YACR,KAAK;YACL,KAAK;YACL,OAAO,KAAI,CAAC;SACb,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEd,SAAS,MAAM,CACb,KAAkD,EAClD,OAAe,EACf,mBAAwC,EAAE;QAE1C,KAAK,EAAE,MAAM,CAAC,OAAQ,EAAE;YACtB,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,KAAK;YACL,OAAO;YACP,GAAG,UAAU;YACb,GAAG,gBAAgB;SACpB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,aAAa,CAAC,MAAuB,EAAE;QAC9C,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,YAAY,CAAC,OAAO,GAAG,IAAA,yBAAgB,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,OAAO,GAAG,CACd,KAAa,EACb,OAAY,EACZ,oBAAyC,EAAE,EAC3C,EAAE;YACF,MAAM,GAAG,GACP,GAAG,CAAC,aAAa;gBACjB,aAAa;gBACb,YAAY,EAAE,aAAa;gBAC3B,iBAAiB,EAAE,aAAa;gBAChC,aAAa,CAAC;YAChB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE;gBACrB,GAAG,YAAY;gBACf,GAAG,iBAAiB;gBACpB,aAAa,EAAE,GAAG;aACnB,CAAC,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBACnD,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBAEhC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,CACX,oBAAoB,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,oBAAoB,KAAK,CAAC,CAAC,CAAC,EAAE,CAC/D,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACjB,oBAAoB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["baselog.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAA8D;AAE9D,yCAAuB;AACvB,oCAAoC;AACpC,qDAAiD;AACjD,mCAAiC;AAEjC,IAAI,oBAAoB,GAAuB,SAAS,CAAC;AAEzD,SAAgB,aAAa,CAC3B,EACE,KAAK,EACL,KAAK,GAAG,iBAAiB,EACzB,OAAO,EACP,UAAU,GAMX,EACD,EACE,WAAW,EACX,QAAQ,EACR,GAAG,EACH,OAAO,EACP,OAAO,EACP,IAAI,EACJ,aAAa,EACb,gBAAgB,GAYjB;IAED,MAAM,UAAU,GAAwB;QACtC,IAAI,EAAE,IAAI,IAAI,QAAQ;QACtB,WAAW,EAAE,WAAW,IAAI,YAAY;QACxC,MAAM,EAAE;YACN,EAAE,EAAE,QAAQ,IAAI,SAAS;YACzB,GAAG,EAAE,GAAG,IAAI,SAAS;YACrB,OAAO,EAAE,OAAO,IAAI,SAAS;YAC7B,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAClC;QACD,GAAG,OAAO;KACX,CAAC;IAEF,MAAM,KAAK,GAAG,KAAK;QACjB,CAAC,CAAC,IAAI,UAAK,CAAC;YACR,KAAK;YACL,KAAK;YACL,OAAO,KAAI,CAAC;SACb,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEd,SAAS,MAAM,CACb,KAAkD,EAClD,OAAe,EACf,mBAAwC,EAAE;QAE1C,KAAK,EAAE,MAAM,CAAC,OAAQ,EAAE;YACtB,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,KAAK;YACL,OAAO;YACP,GAAG,UAAU;YACb,GAAG,gBAAgB;SACpB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,aAAa,CAAC,MAAuB,EAAE;QAC9C,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,YAAY,CAAC,OAAO,GAAG,IAAA,yBAAgB,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,OAAO,GAAG,CACd,KAAa,EACb,OAAY,EACZ,oBAAyC,EAAE,EAC3C,KAAa,EACb,EAAE;YACF,MAAM,GAAG,GACP,GAAG,CAAC,aAAa;gBACjB,aAAa;gBACb,YAAY,EAAE,aAAa;gBAC3B,iBAAiB,EAAE,aAAa;gBAChC,aAAa,CAAC;YAChB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE;gBACrB,GAAG,YAAY;gBACf,GAAG,iBAAiB;gBACpB,aAAa,EAAE,GAAG;aACnB,CAAC,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBACnD,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBAEhC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,CACX,oBAAoB,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,oBAAoB,KAAK,CAAC,CAAC,CAAC,EAAE,CAC/D,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACjB,oBAAoB,GAAG,GAAG,CAAC;gBAE3B,KAAK,GAAG,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;gBACnD,OAAO,GAAG,OAAO,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC/D,IAAI,UAAU,KAAK,OAAO;oBACxB,cAAM;yBACH,GAAG,EAAE;yBACL,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;yBACjB,KAAK,EAAE;yBACP,KAAK,CAAC,OAAO,CAAC;yBACd,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC;yBACpB,KAAK,EAAE;yBACP,IAAI,EAAE;yBACN,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;yBACjB,KAAK,EAAE;yBACP,KAAK,CAAC,MAAM,CAAC;yBACb,IAAI,EAAE;yBACN,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;yBAC9B,KAAK,EAAE;yBACP,MAAM,CAAC,OAAO,CAAC;yBACf,GAAG,EAAE,CAAC;;oBAET,OAAO,CAAC,GAAG,CACT,IAAI,GAAG,MAAM,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,OAAO,EAAE,EACxD,iBAAiB,CAClB,CAAC;gBAEJ,IAAI,KAAK;oBAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;QACF,OAAO;YACL,UAAU,CAAC,GAAG;gBACZ,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;oBACtB,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;YACD,KAAK,EAAE,CAAC,EACN,aAAa,EACb,IAAI,EACJ,OAAO,EACP,OAAO,GAAG,EAAE,GACI,EAAE,EAAE,CACpB,aAAa,CAAC;gBACZ,aAAa,EACX,aAAa;oBACb,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBACjD,SAAS;gBACX,IAAI;gBACJ,OAAO;gBACP,OAAO,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,EAAE;aACzC,CAAC;YACJ,KAAK,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBACxB,MAAM,CAAC,GACL,OAAO,OAAO,KAAK,QAAQ;oBACzB,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,EAAE,IAAI,IAAI,OAAO,CAAC;gBAC/C,MAAM,CAAC,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;gBACxD,OAAO,OAAO,CACZ,OAAO,EACP,CAAC,EACD,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,IAAA,gCAAc,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC1C,CAAC,CACF,CAAC;YACJ,CAAC;YACD,KAAK,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC;YACzD,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC;YACvD,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC;SACxD,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,EAAoB,CAAC;IAClD,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE;QACnB,IAAI,gBAAgB,IAAI,KAAK,EAAE,CAAC;YAC9B,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AA9KD,sCA8KC"}
|
package/build/main/common.d.ts
CHANGED
|
@@ -12,20 +12,7 @@ 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 declare function getHeaderMap(headers: any | undefined, allowlist?: string[]): any;
|
|
16
15
|
export declare function requestToContext(request?: RequestLike & {
|
|
17
16
|
cf?: any;
|
|
18
17
|
body?: any;
|
|
19
|
-
}, body?: any): {
|
|
20
|
-
url?: undefined;
|
|
21
|
-
headers?: undefined;
|
|
22
|
-
method?: undefined;
|
|
23
|
-
cloudflare?: undefined;
|
|
24
|
-
body?: undefined;
|
|
25
|
-
} | {
|
|
26
|
-
url: string;
|
|
27
|
-
headers: any;
|
|
28
|
-
method: string;
|
|
29
|
-
cloudflare: Record<string, unknown>;
|
|
30
|
-
body: any;
|
|
31
|
-
};
|
|
18
|
+
}, body?: any): {};
|
package/build/main/common.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.requestToContext = exports.
|
|
3
|
+
exports.requestToContext = exports.mergeFn = exports.isDev = exports.getCorrelationId = exports.requestHeadersToCapture = exports.LOG_ENV = exports.AXIOM_DATASET_ENV = exports.AXIOM_ORG_ID_ENV = exports.AXIOM_AUTH_TOKEN_ENV = exports.VERIFICATION_HEADER = exports.CORRELATION_ID_HEADER = exports.TASK_QUEUE_HEADER = exports.WORKFLOW_ID_HEADER = exports.CONNECTION_ID_HEADER = void 0;
|
|
4
4
|
// Headers
|
|
5
5
|
exports.CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
6
6
|
exports.WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
@@ -36,18 +36,19 @@ function mergeFn(fn, obj) {
|
|
|
36
36
|
return Object.assign(fn, obj);
|
|
37
37
|
}
|
|
38
38
|
exports.mergeFn = mergeFn;
|
|
39
|
-
function getHeaderMap(headers
|
|
40
|
-
|
|
39
|
+
function getHeaderMap(headers
|
|
40
|
+
// allowlist: string[] = []
|
|
41
|
+
) {
|
|
42
|
+
if (!headers) {
|
|
41
43
|
return {};
|
|
42
44
|
}
|
|
43
45
|
return [...headers].reduce((acc, [headerKey, headerValue]) => {
|
|
44
|
-
if (
|
|
45
|
-
acc[headerKey] = headerValue;
|
|
46
|
+
if (headerKey) {
|
|
47
|
+
acc[headerKey.toLowerCase()] = headerValue;
|
|
46
48
|
}
|
|
47
49
|
return acc;
|
|
48
50
|
}, {});
|
|
49
51
|
}
|
|
50
|
-
exports.getHeaderMap = getHeaderMap;
|
|
51
52
|
function requestToContext(request, body) {
|
|
52
53
|
if (!request)
|
|
53
54
|
return {};
|
|
@@ -60,13 +61,18 @@ function requestToContext(request, body) {
|
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
|
-
|
|
64
|
+
const context = {
|
|
64
65
|
url: request?.url,
|
|
65
|
-
headers: getHeaderMap(request?.headers
|
|
66
|
+
headers: getHeaderMap(request?.headers),
|
|
66
67
|
method: request?.method,
|
|
67
68
|
cloudflare: cf,
|
|
68
|
-
body: body ||
|
|
69
|
+
body: body || undefined,
|
|
69
70
|
};
|
|
71
|
+
if (context.headers['x-workflow-id'])
|
|
72
|
+
context.workflowId = context.headers['x-workflow-id'];
|
|
73
|
+
if (context.headers['x-activity-attempt'])
|
|
74
|
+
context.activityAttempt = context.headers['x-activity-attempt'];
|
|
75
|
+
return context;
|
|
70
76
|
}
|
|
71
77
|
exports.requestToContext = requestToContext;
|
|
72
78
|
//# sourceMappingURL=common.js.map
|
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,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
|
package/build/main/index.d.ts
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
|
+
import { requestToContext } from './common';
|
|
1
2
|
import type { RequestLike, WorkerLog } from './type';
|
|
2
3
|
export * from './common';
|
|
3
4
|
export * from './baselog';
|
|
4
5
|
export * from './type';
|
|
5
|
-
export declare function useLog({ name, request, body, env,
|
|
6
|
+
export declare function useLog({ name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext, }: {
|
|
6
7
|
name: string;
|
|
7
8
|
request?: RequestLike & {
|
|
8
9
|
cf?: any;
|
|
9
10
|
};
|
|
11
|
+
logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
|
|
10
12
|
body?: any;
|
|
11
|
-
showStackTrace?: boolean;
|
|
12
13
|
correlationId?: string;
|
|
13
14
|
version?: string;
|
|
14
15
|
dataset?: string;
|
|
15
16
|
env?: Record<string, any>;
|
|
17
|
+
context?: Record<string, any>;
|
|
16
18
|
executionContext?: {
|
|
17
19
|
waitUntil(promise: Promise<any>): void;
|
|
18
20
|
};
|
package/build/main/index.js
CHANGED
|
@@ -20,11 +20,9 @@ const common_1 = require("./common");
|
|
|
20
20
|
__exportStar(require("./common"), exports);
|
|
21
21
|
__exportStar(require("./baselog"), exports);
|
|
22
22
|
__exportStar(require("./type"), exports);
|
|
23
|
-
function useLog({ name, request, body, env,
|
|
23
|
+
function useLog({ name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext = {}, }) {
|
|
24
24
|
const dev = (0, common_1.isDev)(request, env);
|
|
25
25
|
const colorLogs = env?.[common_1.LOG_ENV] === '*' || dev;
|
|
26
|
-
if (showStackTrace === undefined)
|
|
27
|
-
showStackTrace = dev;
|
|
28
26
|
const correlationId = cid || (0, common_1.getCorrelationId)(request); //const logger = nodeColorLog;
|
|
29
27
|
const axiomToken = env?.[common_1.AXIOM_AUTH_TOKEN_ENV];
|
|
30
28
|
const axiom = (0, baselog_1.createBaseLog)({
|
|
@@ -41,6 +39,7 @@ function useLog({ name, request, body, env, showStackTrace, correlationId: cid,
|
|
|
41
39
|
version: version || 'default',
|
|
42
40
|
correlationId,
|
|
43
41
|
context: {
|
|
42
|
+
...initialContext,
|
|
44
43
|
rootCorrelationId: correlationId,
|
|
45
44
|
correlationId,
|
|
46
45
|
taskQueue: request?.headers?.get(common_1.TASK_QUEUE_HEADER) || undefined,
|
|
@@ -48,31 +47,42 @@ function useLog({ name, request, body, env, showStackTrace, correlationId: cid,
|
|
|
48
47
|
child: undefined,
|
|
49
48
|
},
|
|
50
49
|
});
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
if (logRequest !== false) {
|
|
51
|
+
const raw = typeof logRequest === 'function'
|
|
52
|
+
? logRequest((0, common_1.requestToContext)(request, body))
|
|
53
|
+
: (0, common_1.requestToContext)(request, body);
|
|
54
|
+
axiom.info('Request', raw);
|
|
55
|
+
}
|
|
54
56
|
axiom.respond = async (res) => {
|
|
55
57
|
const temp = await (typeof res === 'function' ? res() : res);
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
let response = undefined;
|
|
59
|
+
if (temp instanceof Response) {
|
|
60
|
+
axiom?.info('Response', {
|
|
61
|
+
response: {
|
|
62
|
+
body: temp
|
|
63
|
+
.clone()
|
|
64
|
+
.json()
|
|
65
|
+
.catch(() => undefined),
|
|
66
|
+
response: temp,
|
|
67
|
+
status: temp.status,
|
|
68
|
+
statusText: temp.statusText,
|
|
69
|
+
headers: temp.headers,
|
|
70
|
+
},
|
|
71
|
+
});
|
|
72
|
+
response = temp;
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
axiom?.info('Response', {
|
|
59
76
|
response: temp,
|
|
77
|
+
});
|
|
78
|
+
response = new Response(typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body, {
|
|
60
79
|
status: temp.status,
|
|
61
80
|
statusText: temp.statusText,
|
|
62
81
|
headers: temp.headers,
|
|
63
|
-
}
|
|
64
|
-
: temp;
|
|
65
|
-
const resp = response ||
|
|
66
|
-
new Response(typeof arg.body === 'object' ? JSON.stringify(arg.body) : arg.body, {
|
|
67
|
-
status: arg.status,
|
|
68
|
-
statusText: arg.statusText,
|
|
69
|
-
headers: arg.headers,
|
|
70
82
|
});
|
|
71
|
-
|
|
72
|
-
response,
|
|
73
|
-
});
|
|
83
|
+
}
|
|
74
84
|
await axiom?.flush();
|
|
75
|
-
return
|
|
85
|
+
return response;
|
|
76
86
|
};
|
|
77
87
|
return axiom;
|
|
78
88
|
}
|
package/build/main/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,qCAUkB;AAGlB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AAEvB,SAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,qCAUkB;AAGlB,2CAAyB;AACzB,4CAA0B;AAC1B,yCAAuB;AAEvB,SAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,aAAa,EAAE,GAAG,EAClB,OAAO,EACP,gBAAgB,EAChB,UAAU,EACV,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,cAAc,GAAG,EAAE,GAc7B;IACC,MAAM,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,gBAAO,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC;IAChD,MAAM,aAAa,GAAG,GAAG,IAAI,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC,8BAA8B;IAEtF,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,6BAAoB,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,IAAA,uBAAa,EACzB;QACE,KAAK,EAAE,UAAU;QACjB,KAAK,EAAE,GAAG,EAAE,CAAC,yBAAgB,CAAC;QAC9B,OAAO,EAAE,QAAQ,IAAI,GAAG,EAAE,CAAC,0BAAiB,CAAC,IAAI,SAAS;QAC1D,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK;KACxC,EACD;QACE,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY;QAC/C,IAAI,EAAE,QAAQ;QACd,gBAAgB;QAChB,QAAQ,EAAE,GAAG,EAAE,YAAY,IAAI,IAAI,IAAI,SAAS;QAChD,GAAG,EAAE,IAAI,IAAI,SAAS;QACtB,OAAO,EAAE,OAAO,IAAI,SAAS;QAC7B,aAAa;QACb,OAAO,EAAE;YACP,GAAG,cAAc;YACjB,iBAAiB,EAAE,aAAa;YAChC,aAAa;YACb,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,0BAAiB,CAAC,IAAI,SAAS;YAChE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,2BAAkB,CAAC,IAAI,SAAS;YAClE,KAAK,EAAE,SAA0B;SAClC;KACF,CACW,CAAC;IAEf,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GACP,OAAO,UAAU,KAAK,UAAU;YAC9B,CAAC,CAAC,UAAU,CAAC,IAAA,yBAAgB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC,CAAC,IAAA,yBAAgB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAE7D,IAAI,QAAQ,GAAa,SAAU,CAAC;QACpC,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;YAC7B,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;gBACtB,QAAQ,EAAE;oBACR,IAAI,EAAE,IAAI;yBACP,KAAK,EAAE;yBACP,IAAI,EAAE;yBACN,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;oBACzB,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB;aACF,CAAC,CAAC;YACH,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;gBACtB,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,QAAQ,GAAG,IAAI,QAAQ,CACrB,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EACrE;gBACE,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CACF,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,EAAE,KAAK,EAAE,CAAC;QAErB,OAAO,QAAS,CAAC;IACnB,CAAC,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AArGD,wBAqGC"}
|
package/build/main/type.d.ts
CHANGED
package/build/module/baselog.js
CHANGED
|
@@ -37,7 +37,7 @@ export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, conso
|
|
|
37
37
|
if (arg.request) {
|
|
38
38
|
childContext.request = requestToContext(arg.request);
|
|
39
39
|
}
|
|
40
|
-
const baseLog = (level, message, additionalContext = {}) => {
|
|
40
|
+
const baseLog = (level, message, additionalContext = {}, error) => {
|
|
41
41
|
const cid = arg.correlationId ||
|
|
42
42
|
correlationId ||
|
|
43
43
|
childContext?.correlationId ||
|
|
@@ -54,6 +54,8 @@ export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, conso
|
|
|
54
54
|
const now = Date.now();
|
|
55
55
|
const diff = (lastMessageTimestamp ? `${now - lastMessageTimestamp}ms ` : '').padEnd(6, ' ');
|
|
56
56
|
lastMessageTimestamp = now;
|
|
57
|
+
error = message instanceof Error ? message : error;
|
|
58
|
+
message = message instanceof Error ? message.message : message;
|
|
57
59
|
if (consoleLog === 'color')
|
|
58
60
|
logger
|
|
59
61
|
.dim()
|
|
@@ -72,7 +74,9 @@ export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, conso
|
|
|
72
74
|
.append(message)
|
|
73
75
|
.log();
|
|
74
76
|
else
|
|
75
|
-
console.log(`[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}
|
|
77
|
+
console.log(`[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`, additionalContext);
|
|
78
|
+
if (error)
|
|
79
|
+
console.error(error);
|
|
76
80
|
}
|
|
77
81
|
};
|
|
78
82
|
return {
|
|
@@ -94,7 +98,7 @@ export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, conso
|
|
|
94
98
|
? message
|
|
95
99
|
: error?.message || error?.name || 'Error';
|
|
96
100
|
const e = typeof message === 'string' ? error : message;
|
|
97
|
-
return baseLog('error', m, e instanceof Error ? serializeError(e) : e);
|
|
101
|
+
return baseLog('error', m, e instanceof Error ? serializeError(e) : e, e);
|
|
98
102
|
},
|
|
99
103
|
debug: (message, data) => baseLog('debug', message, data),
|
|
100
104
|
warn: (message, data) => baseLog('warn', message, data),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["baselog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE9D,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,IAAI,oBAAoB,GAAuB,SAAS,CAAC;AAEzD,MAAM,UAAU,aAAa,CAC3B,EACE,KAAK,EACL,KAAK,GAAG,iBAAiB,EACzB,OAAO,EACP,UAAU,GAMX,EACD,EACE,WAAW,EACX,QAAQ,EACR,GAAG,EACH,OAAO,EACP,OAAO,EACP,IAAI,EACJ,aAAa,EACb,gBAAgB,GAYjB;IAED,MAAM,UAAU,GAAwB;QACtC,IAAI,EAAE,IAAI,IAAI,QAAQ;QACtB,WAAW,EAAE,WAAW,IAAI,YAAY;QACxC,MAAM,EAAE;YACN,EAAE,EAAE,QAAQ,IAAI,SAAS;YACzB,GAAG,EAAE,GAAG,IAAI,SAAS;YACrB,OAAO,EAAE,OAAO,IAAI,SAAS;YAC7B,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAClC;QACD,GAAG,OAAO;KACX,CAAC;IAEF,MAAM,KAAK,GAAG,KAAK;QACjB,CAAC,CAAC,IAAI,KAAK,CAAC;YACR,KAAK;YACL,KAAK;YACL,OAAO,KAAI,CAAC;SACb,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEd,SAAS,MAAM,CACb,KAAkD,EAClD,OAAe,EACf,mBAAwC,EAAE;QAE1C,KAAK,EAAE,MAAM,CAAC,OAAQ,EAAE;YACtB,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,KAAK;YACL,OAAO;YACP,GAAG,UAAU;YACb,GAAG,gBAAgB;SACpB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,aAAa,CAAC,MAAuB,EAAE;QAC9C,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,YAAY,CAAC,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC;QACD,MAAM,OAAO,GAAG,CACd,KAAa,EACb,OAAY,EACZ,oBAAyC,EAAE,EAC3C,EAAE;YACF,MAAM,GAAG,GACP,GAAG,CAAC,aAAa;gBACjB,aAAa;gBACb,YAAY,EAAE,aAAa;gBAC3B,iBAAiB,EAAE,aAAa;gBAChC,aAAa,CAAC;YAChB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE;gBACrB,GAAG,YAAY;gBACf,GAAG,iBAAiB;gBACpB,aAAa,EAAE,GAAG;aACnB,CAAC,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBACnD,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBAEhC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,CACX,oBAAoB,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,oBAAoB,KAAK,CAAC,CAAC,CAAC,EAAE,CAC/D,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACjB,oBAAoB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["baselog.ts"],"names":[],"mappings":"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"}
|
package/build/module/common.d.ts
CHANGED
|
@@ -12,20 +12,7 @@ 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 declare function getHeaderMap(headers: any | undefined, allowlist?: string[]): any;
|
|
16
15
|
export declare function requestToContext(request?: RequestLike & {
|
|
17
16
|
cf?: any;
|
|
18
17
|
body?: any;
|
|
19
|
-
}, body?: any): {
|
|
20
|
-
url?: undefined;
|
|
21
|
-
headers?: undefined;
|
|
22
|
-
method?: undefined;
|
|
23
|
-
cloudflare?: undefined;
|
|
24
|
-
body?: undefined;
|
|
25
|
-
} | {
|
|
26
|
-
url: string;
|
|
27
|
-
headers: any;
|
|
28
|
-
method: string;
|
|
29
|
-
cloudflare: Record<string, unknown>;
|
|
30
|
-
body: any;
|
|
31
|
-
};
|
|
18
|
+
}, body?: any): {};
|
package/build/module/common.js
CHANGED
|
@@ -30,13 +30,15 @@ export function isDev(request, env) {
|
|
|
30
30
|
export function mergeFn(fn, obj) {
|
|
31
31
|
return Object.assign(fn, obj);
|
|
32
32
|
}
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
function getHeaderMap(headers
|
|
34
|
+
// allowlist: string[] = []
|
|
35
|
+
) {
|
|
36
|
+
if (!headers) {
|
|
35
37
|
return {};
|
|
36
38
|
}
|
|
37
39
|
return [...headers].reduce((acc, [headerKey, headerValue]) => {
|
|
38
|
-
if (
|
|
39
|
-
acc[headerKey] = headerValue;
|
|
40
|
+
if (headerKey) {
|
|
41
|
+
acc[headerKey.toLowerCase()] = headerValue;
|
|
40
42
|
}
|
|
41
43
|
return acc;
|
|
42
44
|
}, {});
|
|
@@ -53,12 +55,17 @@ export function requestToContext(request, body) {
|
|
|
53
55
|
}
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
|
-
|
|
58
|
+
const context = {
|
|
57
59
|
url: request?.url,
|
|
58
|
-
headers: getHeaderMap(request?.headers
|
|
60
|
+
headers: getHeaderMap(request?.headers),
|
|
59
61
|
method: request?.method,
|
|
60
62
|
cloudflare: cf,
|
|
61
|
-
body: body ||
|
|
63
|
+
body: body || undefined,
|
|
62
64
|
};
|
|
65
|
+
if (context.headers['x-workflow-id'])
|
|
66
|
+
context.workflowId = context.headers['x-workflow-id'];
|
|
67
|
+
if (context.headers['x-activity-attempt'])
|
|
68
|
+
context.activityAttempt = context.headers['x-activity-attempt'];
|
|
69
|
+
return context;
|
|
63
70
|
}
|
|
64
71
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"AAEA,UAAU;AACV,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAExD,MAAM;AACN,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AACvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC;AAE7B,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,YAAY,CAAC,CAAC;AAEtD,MAAM,UAAU,gBAAgB,CAAC,OAAqB;IACpD,IAAI,CAAC,OAAO,EAAE,OAAO;QAAE,OAAO,SAAS,CAAC;IACxC,OAAO,CACL,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,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;AAED,MAAM,UAAU,KAAK,CAAC,OAAqB,EAAE,GAAyB;IACpE,OAAO,GAAG,EAAE,YAAY,IAAI,OAAO,EAAE,GAAG,EAAE,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,OAAO,CAGrB,EAAO,EAAE,GAAS;IAClB,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
|
package/build/module/index.d.ts
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
|
+
import { requestToContext } from './common';
|
|
1
2
|
import type { RequestLike, WorkerLog } from './type';
|
|
2
3
|
export * from './common';
|
|
3
4
|
export * from './baselog';
|
|
4
5
|
export * from './type';
|
|
5
|
-
export declare function useLog({ name, request, body, env,
|
|
6
|
+
export declare function useLog({ name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext, }: {
|
|
6
7
|
name: string;
|
|
7
8
|
request?: RequestLike & {
|
|
8
9
|
cf?: any;
|
|
9
10
|
};
|
|
11
|
+
logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
|
|
10
12
|
body?: any;
|
|
11
|
-
showStackTrace?: boolean;
|
|
12
13
|
correlationId?: string;
|
|
13
14
|
version?: string;
|
|
14
15
|
dataset?: string;
|
|
15
16
|
env?: Record<string, any>;
|
|
17
|
+
context?: Record<string, any>;
|
|
16
18
|
executionContext?: {
|
|
17
19
|
waitUntil(promise: Promise<any>): void;
|
|
18
20
|
};
|
package/build/module/index.js
CHANGED
|
@@ -3,11 +3,9 @@ import { AXIOM_AUTH_TOKEN_ENV, AXIOM_DATASET_ENV, AXIOM_ORG_ID_ENV, LOG_ENV, TAS
|
|
|
3
3
|
export * from './common';
|
|
4
4
|
export * from './baselog';
|
|
5
5
|
export * from './type';
|
|
6
|
-
export function useLog({ name, request, body, env,
|
|
6
|
+
export function useLog({ name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext = {}, }) {
|
|
7
7
|
const dev = isDev(request, env);
|
|
8
8
|
const colorLogs = env?.[LOG_ENV] === '*' || dev;
|
|
9
|
-
if (showStackTrace === undefined)
|
|
10
|
-
showStackTrace = dev;
|
|
11
9
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
12
10
|
const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
|
|
13
11
|
const axiom = createBaseLog({
|
|
@@ -24,6 +22,7 @@ export function useLog({ name, request, body, env, showStackTrace, correlationId
|
|
|
24
22
|
version: version || 'default',
|
|
25
23
|
correlationId,
|
|
26
24
|
context: {
|
|
25
|
+
...initialContext,
|
|
27
26
|
rootCorrelationId: correlationId,
|
|
28
27
|
correlationId,
|
|
29
28
|
taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
|
|
@@ -31,31 +30,42 @@ export function useLog({ name, request, body, env, showStackTrace, correlationId
|
|
|
31
30
|
child: undefined,
|
|
32
31
|
},
|
|
33
32
|
});
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
if (logRequest !== false) {
|
|
34
|
+
const raw = typeof logRequest === 'function'
|
|
35
|
+
? logRequest(requestToContext(request, body))
|
|
36
|
+
: requestToContext(request, body);
|
|
37
|
+
axiom.info('Request', raw);
|
|
38
|
+
}
|
|
37
39
|
axiom.respond = async (res) => {
|
|
38
40
|
const temp = await (typeof res === 'function' ? res() : res);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
let response = undefined;
|
|
42
|
+
if (temp instanceof Response) {
|
|
43
|
+
axiom?.info('Response', {
|
|
44
|
+
response: {
|
|
45
|
+
body: temp
|
|
46
|
+
.clone()
|
|
47
|
+
.json()
|
|
48
|
+
.catch(() => undefined),
|
|
49
|
+
response: temp,
|
|
50
|
+
status: temp.status,
|
|
51
|
+
statusText: temp.statusText,
|
|
52
|
+
headers: temp.headers,
|
|
53
|
+
},
|
|
54
|
+
});
|
|
55
|
+
response = temp;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
axiom?.info('Response', {
|
|
42
59
|
response: temp,
|
|
60
|
+
});
|
|
61
|
+
response = new Response(typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body, {
|
|
43
62
|
status: temp.status,
|
|
44
63
|
statusText: temp.statusText,
|
|
45
64
|
headers: temp.headers,
|
|
46
|
-
}
|
|
47
|
-
: temp;
|
|
48
|
-
const resp = response ||
|
|
49
|
-
new Response(typeof arg.body === 'object' ? JSON.stringify(arg.body) : arg.body, {
|
|
50
|
-
status: arg.status,
|
|
51
|
-
statusText: arg.statusText,
|
|
52
|
-
headers: arg.headers,
|
|
53
65
|
});
|
|
54
|
-
|
|
55
|
-
response,
|
|
56
|
-
});
|
|
66
|
+
}
|
|
57
67
|
await axiom?.flush();
|
|
58
|
-
return
|
|
68
|
+
return response;
|
|
59
69
|
};
|
|
60
70
|
return axiom;
|
|
61
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,OAAO,EACP,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,EACL,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAGlB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,MAAM,UAAU,MAAM,CAAC,EACrB,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EACH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/build/module/type.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,21 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vrplatform/log",
|
|
3
|
-
"version": "1.0.
|
|
4
|
-
"main": "
|
|
3
|
+
"version": "1.0.6",
|
|
4
|
+
"main": "src/index.ts",
|
|
5
5
|
"publishConfig": {
|
|
6
|
-
"access": "public"
|
|
6
|
+
"access": "public",
|
|
7
|
+
"main": "build/main/index.js",
|
|
8
|
+
"typings": "build/main/index.d.ts",
|
|
9
|
+
"module": "build/module/index.js"
|
|
7
10
|
},
|
|
8
11
|
"description": "Finalytic cf",
|
|
9
12
|
"repository": "https://github.com/finalytic/ecosystem",
|
|
10
13
|
"license": "UNLICENSED",
|
|
11
14
|
"keywords": [],
|
|
12
|
-
"files": [
|
|
13
|
-
"build/main",
|
|
14
|
-
"build/module",
|
|
15
|
-
"src",
|
|
16
|
-
"!**/*.spec.*",
|
|
17
|
-
"LICENSE"
|
|
18
|
-
],
|
|
19
15
|
"scripts": {
|
|
20
16
|
"pub": "bun run build && pnpm publish --no-git-checks",
|
|
21
17
|
"build": "bun build:main & bun build:module",
|
|
@@ -23,6 +19,5 @@
|
|
|
23
19
|
"build:module": "tsc -b tsconfig.esm.json",
|
|
24
20
|
"typecheck": "tsc --noEmit"
|
|
25
21
|
},
|
|
26
|
-
"
|
|
27
|
-
|
|
28
|
-
}
|
|
22
|
+
"files": ["build/main", "build/module", "src", "!**/*.spec.*", "LICENSE"]
|
|
23
|
+
}
|
package/src/baselog.ts
CHANGED
|
@@ -83,7 +83,8 @@ export function createBaseLog(
|
|
|
83
83
|
const baseLog = (
|
|
84
84
|
level: string,
|
|
85
85
|
message: any,
|
|
86
|
-
additionalContext: Record<string, any> = {}
|
|
86
|
+
additionalContext: Record<string, any> = {},
|
|
87
|
+
error?: Error
|
|
87
88
|
) => {
|
|
88
89
|
const cid =
|
|
89
90
|
arg.correlationId ||
|
|
@@ -105,6 +106,9 @@ export function createBaseLog(
|
|
|
105
106
|
lastMessageTimestamp ? `${now - lastMessageTimestamp}ms ` : ''
|
|
106
107
|
).padEnd(6, ' ');
|
|
107
108
|
lastMessageTimestamp = now;
|
|
109
|
+
|
|
110
|
+
error = message instanceof Error ? message : error;
|
|
111
|
+
message = message instanceof Error ? message.message : message;
|
|
108
112
|
if (consoleLog === 'color')
|
|
109
113
|
logger
|
|
110
114
|
.dim()
|
|
@@ -123,7 +127,12 @@ export function createBaseLog(
|
|
|
123
127
|
.append(message)
|
|
124
128
|
.log();
|
|
125
129
|
else
|
|
126
|
-
console.log(
|
|
130
|
+
console.log(
|
|
131
|
+
`[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`,
|
|
132
|
+
additionalContext
|
|
133
|
+
);
|
|
134
|
+
|
|
135
|
+
if (error) console.error(error);
|
|
127
136
|
}
|
|
128
137
|
};
|
|
129
138
|
return {
|
|
@@ -153,7 +162,12 @@ export function createBaseLog(
|
|
|
153
162
|
? message
|
|
154
163
|
: error?.message || error?.name || 'Error';
|
|
155
164
|
const e = typeof message === 'string' ? error : message;
|
|
156
|
-
return baseLog(
|
|
165
|
+
return baseLog(
|
|
166
|
+
'error',
|
|
167
|
+
m,
|
|
168
|
+
e instanceof Error ? serializeError(e) : e,
|
|
169
|
+
e
|
|
170
|
+
);
|
|
157
171
|
},
|
|
158
172
|
debug: (message, data) => baseLog('debug', message, data),
|
|
159
173
|
warn: (message, data) => baseLog('warn', message, data),
|
package/src/common.ts
CHANGED
|
@@ -42,19 +42,18 @@ export function mergeFn<
|
|
|
42
42
|
return Object.assign(fn, obj);
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
|
|
46
|
-
headers: any | undefined
|
|
47
|
-
allowlist: string[] = []
|
|
45
|
+
function getHeaderMap(
|
|
46
|
+
headers: any | undefined
|
|
47
|
+
// allowlist: string[] = []
|
|
48
48
|
) {
|
|
49
|
-
if (!
|
|
49
|
+
if (!headers) {
|
|
50
50
|
return {};
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
return [...headers].reduce((acc, [headerKey, headerValue]) => {
|
|
54
|
-
if (
|
|
55
|
-
acc[headerKey] = headerValue;
|
|
54
|
+
if (headerKey) {
|
|
55
|
+
acc[headerKey.toLowerCase()] = headerValue;
|
|
56
56
|
}
|
|
57
|
-
|
|
58
57
|
return acc;
|
|
59
58
|
}, {});
|
|
60
59
|
}
|
|
@@ -74,11 +73,17 @@ export function requestToContext(
|
|
|
74
73
|
}
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
|
-
|
|
76
|
+
const context = {
|
|
78
77
|
url: request?.url,
|
|
79
|
-
headers: getHeaderMap(request?.headers
|
|
78
|
+
headers: getHeaderMap(request?.headers),
|
|
80
79
|
method: request?.method,
|
|
81
80
|
cloudflare: cf,
|
|
82
|
-
body: body ||
|
|
81
|
+
body: body || undefined,
|
|
83
82
|
};
|
|
83
|
+
|
|
84
|
+
if (context.headers['x-workflow-id'])
|
|
85
|
+
(context as any).workflowId = context.headers['x-workflow-id'];
|
|
86
|
+
if (context.headers['x-activity-attempt'])
|
|
87
|
+
(context as any).activityAttempt = context.headers['x-activity-attempt'];
|
|
88
|
+
return context;
|
|
84
89
|
}
|
package/src/index.ts
CHANGED
|
@@ -21,27 +21,28 @@ export function useLog({
|
|
|
21
21
|
request,
|
|
22
22
|
body,
|
|
23
23
|
env,
|
|
24
|
-
showStackTrace,
|
|
25
24
|
correlationId: cid,
|
|
26
25
|
version,
|
|
27
26
|
executionContext,
|
|
27
|
+
logRequest,
|
|
28
28
|
dataset: _dataset,
|
|
29
|
+
context: initialContext = {},
|
|
29
30
|
}: {
|
|
30
31
|
name: string;
|
|
31
32
|
request?: RequestLike & { cf?: any };
|
|
33
|
+
logRequest?: boolean | ((raw: ReturnType<typeof requestToContext>) => any);
|
|
32
34
|
body?: any;
|
|
33
|
-
showStackTrace?: boolean;
|
|
34
35
|
correlationId?: string;
|
|
35
36
|
version?: string;
|
|
36
37
|
dataset?: string;
|
|
37
38
|
env?: Record<string, any>;
|
|
39
|
+
context?: Record<string, any>;
|
|
38
40
|
executionContext?: {
|
|
39
41
|
waitUntil(promise: Promise<any>): void;
|
|
40
42
|
};
|
|
41
43
|
}): WorkerLog {
|
|
42
44
|
const dev = isDev(request, env);
|
|
43
45
|
const colorLogs = env?.[LOG_ENV] === '*' || dev;
|
|
44
|
-
if (showStackTrace === undefined) showStackTrace = dev;
|
|
45
46
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
46
47
|
|
|
47
48
|
const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
|
|
@@ -62,6 +63,7 @@ export function useLog({
|
|
|
62
63
|
version: version || 'default',
|
|
63
64
|
correlationId,
|
|
64
65
|
context: {
|
|
66
|
+
...initialContext,
|
|
65
67
|
rootCorrelationId: correlationId,
|
|
66
68
|
correlationId,
|
|
67
69
|
taskQueue: request?.headers?.get(TASK_QUEUE_HEADER) || undefined,
|
|
@@ -71,38 +73,48 @@ export function useLog({
|
|
|
71
73
|
}
|
|
72
74
|
) as WorkerLog;
|
|
73
75
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
76
|
+
if (logRequest !== false) {
|
|
77
|
+
const raw =
|
|
78
|
+
typeof logRequest === 'function'
|
|
79
|
+
? logRequest(requestToContext(request, body))
|
|
80
|
+
: requestToContext(request, body);
|
|
81
|
+
axiom.info('Request', raw);
|
|
82
|
+
}
|
|
77
83
|
|
|
78
84
|
axiom.respond = async (res) => {
|
|
79
85
|
const temp = await (typeof res === 'function' ? res() : res);
|
|
80
86
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
87
|
+
let response: Response = undefined!;
|
|
88
|
+
if (temp instanceof Response) {
|
|
89
|
+
axiom?.info('Response', {
|
|
90
|
+
response: {
|
|
91
|
+
body: temp
|
|
92
|
+
.clone()
|
|
93
|
+
.json()
|
|
94
|
+
.catch(() => undefined),
|
|
95
|
+
response: temp,
|
|
96
|
+
status: temp.status,
|
|
97
|
+
statusText: temp.statusText,
|
|
98
|
+
headers: temp.headers,
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
response = temp;
|
|
102
|
+
} else {
|
|
103
|
+
axiom?.info('Response', {
|
|
104
|
+
response: temp,
|
|
105
|
+
});
|
|
106
|
+
response = new Response(
|
|
107
|
+
typeof temp.body === 'object' ? JSON.stringify(temp.body) : temp.body,
|
|
95
108
|
{
|
|
96
|
-
status:
|
|
97
|
-
statusText:
|
|
98
|
-
headers:
|
|
109
|
+
status: temp.status,
|
|
110
|
+
statusText: temp.statusText,
|
|
111
|
+
headers: temp.headers,
|
|
99
112
|
}
|
|
100
113
|
);
|
|
101
|
-
|
|
102
|
-
response,
|
|
103
|
-
});
|
|
114
|
+
}
|
|
104
115
|
await axiom?.flush();
|
|
105
|
-
|
|
116
|
+
|
|
117
|
+
return response!;
|
|
106
118
|
};
|
|
107
119
|
return axiom;
|
|
108
120
|
}
|