@vrplatform/log 1.0.0 → 1.0.2
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/common.d.ts +1 -1
- package/build/main/common.js +2 -2
- package/build/main/common.js.map +1 -1
- package/build/main/index.js +4 -3
- package/build/main/index.js.map +1 -1
- package/build/module/common.d.ts +1 -1
- package/build/module/common.js +2 -2
- package/build/module/common.js.map +1 -1
- package/build/module/index.js +4 -3
- package/build/module/index.js.map +1 -1
- package/package.json +12 -4
- package/src/common.ts +2 -2
- package/src/index.ts +4 -3
package/build/main/common.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
|
10
10
|
export declare const LOG_ENV = "LOG";
|
|
11
11
|
export declare const requestHeadersToCapture: string[];
|
|
12
12
|
export declare function getCorrelationId(request?: RequestLike): string | undefined;
|
|
13
|
-
export declare function isDev(request?: RequestLike):
|
|
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
15
|
export declare function getHeaderMap(headers: any | undefined, allowlist?: string[]): any;
|
|
16
16
|
export declare function requestToContext(request?: RequestLike & {
|
package/build/main/common.js
CHANGED
|
@@ -28,8 +28,8 @@ function getCorrelationId(request) {
|
|
|
28
28
|
undefined);
|
|
29
29
|
}
|
|
30
30
|
exports.getCorrelationId = getCorrelationId;
|
|
31
|
-
function isDev(request) {
|
|
32
|
-
return request?.url?.startsWith('http://localhost:');
|
|
31
|
+
function isDev(request, env) {
|
|
32
|
+
return env?.IS_LOCAL_DEV || request?.url?.startsWith('http://localhost:');
|
|
33
33
|
}
|
|
34
34
|
exports.isDev = isDev;
|
|
35
35
|
function mergeFn(fn, obj) {
|
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;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
|
package/build/main/index.js
CHANGED
|
@@ -21,9 +21,10 @@ __exportStar(require("./common"), exports);
|
|
|
21
21
|
__exportStar(require("./baselog"), exports);
|
|
22
22
|
__exportStar(require("./type"), exports);
|
|
23
23
|
function useLog({ name, request, body, env, showStackTrace, correlationId: cid, version, executionContext, dataset: _dataset, }) {
|
|
24
|
-
const
|
|
24
|
+
const dev = (0, common_1.isDev)(request, env);
|
|
25
|
+
const colorLogs = env?.[common_1.LOG_ENV] === '*' || dev;
|
|
25
26
|
if (showStackTrace === undefined)
|
|
26
|
-
showStackTrace =
|
|
27
|
+
showStackTrace = dev;
|
|
27
28
|
const correlationId = cid || (0, common_1.getCorrelationId)(request); //const logger = nodeColorLog;
|
|
28
29
|
const axiomToken = env?.[common_1.AXIOM_AUTH_TOKEN_ENV];
|
|
29
30
|
const axiom = (0, baselog_1.createBaseLog)({
|
|
@@ -32,7 +33,7 @@ function useLog({ name, request, body, env, showStackTrace, correlationId: cid,
|
|
|
32
33
|
dataset: _dataset || env?.[common_1.AXIOM_DATASET_ENV] || 'default',
|
|
33
34
|
consoleLog: colorLogs ? 'color' : false,
|
|
34
35
|
}, {
|
|
35
|
-
environment:
|
|
36
|
+
environment: dev ? 'development' : 'production',
|
|
36
37
|
type: 'worker',
|
|
37
38
|
executionContext,
|
|
38
39
|
workerId: env?.MACHINE_NAME || name || 'default',
|
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,cAAc,EACd,aAAa,EAAE,GAAG,EAClB,OAAO,EACP,gBAAgB,EAChB,OAAO,EAAE,QAAQ,GAalB;IACC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,gBAAO,CAAC,KAAK,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/build/module/common.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
|
10
10
|
export declare const LOG_ENV = "LOG";
|
|
11
11
|
export declare const requestHeadersToCapture: string[];
|
|
12
12
|
export declare function getCorrelationId(request?: RequestLike): string | undefined;
|
|
13
|
-
export declare function isDev(request?: RequestLike):
|
|
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
15
|
export declare function getHeaderMap(headers: any | undefined, allowlist?: string[]): any;
|
|
16
16
|
export declare function requestToContext(request?: RequestLike & {
|
package/build/module/common.js
CHANGED
|
@@ -24,8 +24,8 @@ export function getCorrelationId(request) {
|
|
|
24
24
|
request.headers.get('request-id') ||
|
|
25
25
|
undefined);
|
|
26
26
|
}
|
|
27
|
-
export function isDev(request) {
|
|
28
|
-
return request?.url?.startsWith('http://localhost:');
|
|
27
|
+
export function isDev(request, env) {
|
|
28
|
+
return env?.IS_LOCAL_DEV || request?.url?.startsWith('http://localhost:');
|
|
29
29
|
}
|
|
30
30
|
export function mergeFn(fn, obj) {
|
|
31
31
|
return Object.assign(fn, obj);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["common.ts"],"names":[],"mappings":"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"}
|
package/build/module/index.js
CHANGED
|
@@ -4,9 +4,10 @@ export * from './common';
|
|
|
4
4
|
export * from './baselog';
|
|
5
5
|
export * from './type';
|
|
6
6
|
export function useLog({ name, request, body, env, showStackTrace, correlationId: cid, version, executionContext, dataset: _dataset, }) {
|
|
7
|
-
const
|
|
7
|
+
const dev = isDev(request, env);
|
|
8
|
+
const colorLogs = env?.[LOG_ENV] === '*' || dev;
|
|
8
9
|
if (showStackTrace === undefined)
|
|
9
|
-
showStackTrace =
|
|
10
|
+
showStackTrace = dev;
|
|
10
11
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
11
12
|
const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
|
|
12
13
|
const axiom = createBaseLog({
|
|
@@ -15,7 +16,7 @@ export function useLog({ name, request, body, env, showStackTrace, correlationId
|
|
|
15
16
|
dataset: _dataset || env?.[AXIOM_DATASET_ENV] || 'default',
|
|
16
17
|
consoleLog: colorLogs ? 'color' : false,
|
|
17
18
|
}, {
|
|
18
|
-
environment:
|
|
19
|
+
environment: dev ? 'development' : 'production',
|
|
19
20
|
type: 'worker',
|
|
20
21
|
executionContext,
|
|
21
22
|
workerId: env?.MACHINE_NAME || name || 'default',
|
|
@@ -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,cAAc,EACd,aAAa,EAAE,GAAG,EAClB,OAAO,EACP,gBAAgB,EAChB,OAAO,EAAE,QAAQ,GAalB;IACC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vrplatform/log",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.2",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
7
|
"description": "Finalytic cf",
|
|
8
|
-
"main": "
|
|
8
|
+
"main": "build/main/index.js",
|
|
9
9
|
"publish": {
|
|
10
10
|
"main": "build/main/index.js",
|
|
11
11
|
"typings": "build/main/index.d.ts",
|
|
@@ -14,11 +14,19 @@
|
|
|
14
14
|
"repository": "https://github.com/finalytic/ecosystem",
|
|
15
15
|
"license": "UNLICENSED",
|
|
16
16
|
"keywords": [],
|
|
17
|
+
"files": [
|
|
18
|
+
"build/main",
|
|
19
|
+
"build/module",
|
|
20
|
+
"src",
|
|
21
|
+
"!**/*.spec.*",
|
|
22
|
+
"LICENSE"
|
|
23
|
+
],
|
|
17
24
|
"scripts": {
|
|
18
25
|
"build": "bun build:main & bun build:module",
|
|
19
26
|
"build:main": "tsc -b tsconfig.main.json",
|
|
20
27
|
"build:module": "tsc -b tsconfig.esm.json",
|
|
21
28
|
"typecheck": "tsc --noEmit"
|
|
22
29
|
},
|
|
23
|
-
"
|
|
24
|
-
|
|
30
|
+
"typings": "build/main/index.d.ts",
|
|
31
|
+
"module": "build/module/index.js"
|
|
32
|
+
}
|
package/src/common.ts
CHANGED
|
@@ -31,8 +31,8 @@ export function getCorrelationId(request?: RequestLike) {
|
|
|
31
31
|
);
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
export function isDev(request?: RequestLike) {
|
|
35
|
-
return request?.url?.startsWith('http://localhost:');
|
|
34
|
+
export function isDev(request?: RequestLike, env?: Record<string, any>) {
|
|
35
|
+
return env?.IS_LOCAL_DEV || request?.url?.startsWith('http://localhost:');
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
export function mergeFn<
|
package/src/index.ts
CHANGED
|
@@ -39,8 +39,9 @@ export function useLog({
|
|
|
39
39
|
waitUntil(promise: Promise<any>): void;
|
|
40
40
|
};
|
|
41
41
|
}): WorkerLog {
|
|
42
|
-
const
|
|
43
|
-
|
|
42
|
+
const dev = isDev(request, env);
|
|
43
|
+
const colorLogs = env?.[LOG_ENV] === '*' || dev;
|
|
44
|
+
if (showStackTrace === undefined) showStackTrace = dev;
|
|
44
45
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
45
46
|
|
|
46
47
|
const axiomToken = env?.[AXIOM_AUTH_TOKEN_ENV];
|
|
@@ -53,7 +54,7 @@ export function useLog({
|
|
|
53
54
|
consoleLog: colorLogs ? 'color' : false,
|
|
54
55
|
},
|
|
55
56
|
{
|
|
56
|
-
environment:
|
|
57
|
+
environment: dev ? 'development' : 'production',
|
|
57
58
|
type: 'worker',
|
|
58
59
|
executionContext,
|
|
59
60
|
workerId: env?.MACHINE_NAME || name || 'default',
|