@vrplatform/log 2.0.31 → 2.0.35
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/log/baselog.d.ts +9 -1
- package/build/main/log/baselog.js +11 -2
- package/build/main/log/baselog.js.map +1 -1
- package/build/main/log/index.d.ts +3 -1
- package/build/main/log/index.js +2 -2
- package/build/main/log/index.js.map +1 -1
- package/build/main/log/type.d.ts +1 -0
- package/build/module/log/baselog.d.ts +9 -1
- package/build/module/log/baselog.js +11 -2
- package/build/module/log/baselog.js.map +1 -1
- package/build/module/log/index.d.ts +3 -1
- package/build/module/log/index.js +2 -2
- package/build/module/log/index.js.map +1 -1
- package/build/module/log/type.d.ts +1 -0
- package/package.json +1 -1
- package/src/log/baselog.ts +24 -10
- package/src/log/index.ts +4 -2
- package/src/log/type.ts +2 -0
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
import type { BaseLog } from './type';
|
|
2
|
+
export type ConsoleLogFn = (arg: {
|
|
3
|
+
formatted: string;
|
|
4
|
+
message: string;
|
|
5
|
+
additionalContext: Record<string, any>;
|
|
6
|
+
level: string;
|
|
7
|
+
error?: Error;
|
|
8
|
+
}) => void;
|
|
9
|
+
export type ConsoleLog = boolean | 'color' | ConsoleLogFn;
|
|
2
10
|
export declare function createBaseLog({ token, orgId, dataset, consoleLog, }: {
|
|
3
11
|
token?: string;
|
|
4
12
|
orgId?: string;
|
|
5
13
|
dataset?: string;
|
|
6
|
-
consoleLog?:
|
|
14
|
+
consoleLog?: ConsoleLog;
|
|
7
15
|
}, { environment, workerId, app, version, context, type, correlationId, executionContext, }: {
|
|
8
16
|
correlationId?: string;
|
|
9
17
|
environment?: 'development' | 'production';
|
|
@@ -60,7 +60,16 @@ function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog,
|
|
|
60
60
|
lastMessageTimestamp = now;
|
|
61
61
|
error = message instanceof Error ? message : error;
|
|
62
62
|
message = message instanceof Error ? message.message : message;
|
|
63
|
-
|
|
63
|
+
const formatted = `[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`;
|
|
64
|
+
if (typeof consoleLog === 'function')
|
|
65
|
+
consoleLog({
|
|
66
|
+
formatted,
|
|
67
|
+
level,
|
|
68
|
+
message,
|
|
69
|
+
additionalContext,
|
|
70
|
+
error,
|
|
71
|
+
});
|
|
72
|
+
else if (consoleLog === 'color')
|
|
64
73
|
color_1.logger
|
|
65
74
|
.dim()
|
|
66
75
|
.append(`${diff}`)
|
|
@@ -78,7 +87,7 @@ function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog,
|
|
|
78
87
|
.append(message)
|
|
79
88
|
.log();
|
|
80
89
|
else
|
|
81
|
-
console.log(
|
|
90
|
+
console.log(formatted, additionalContext);
|
|
82
91
|
if (error)
|
|
83
92
|
console.error(error);
|
|
84
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["log/baselog.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["log/baselog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { type ConsoleLog } from './baselog';
|
|
1
2
|
import { requestToContext } from './common';
|
|
2
3
|
import { type LogBindings, type RequestLike, type WorkerLog } from './type';
|
|
3
4
|
export * from './common';
|
|
4
5
|
export * from './baselog';
|
|
5
6
|
export * from './type';
|
|
6
|
-
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext, }: {
|
|
7
|
+
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext, }: {
|
|
7
8
|
environment?: string;
|
|
8
9
|
name: string;
|
|
9
10
|
request?: RequestLike & {
|
|
@@ -16,6 +17,7 @@ export declare function useLog({ environment: _environment, name, request, body,
|
|
|
16
17
|
dataset?: string;
|
|
17
18
|
env?: LogBindings;
|
|
18
19
|
context?: Record<string, any>;
|
|
20
|
+
consoleLog?: ConsoleLog;
|
|
19
21
|
executionContext?: {
|
|
20
22
|
waitUntil(promise: Promise<any>): void;
|
|
21
23
|
};
|
package/build/main/log/index.js
CHANGED
|
@@ -21,7 +21,7 @@ const type_1 = require("./type");
|
|
|
21
21
|
__exportStar(require("./common"), exports);
|
|
22
22
|
__exportStar(require("./baselog"), exports);
|
|
23
23
|
__exportStar(require("./type"), exports);
|
|
24
|
-
function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext = {}, }) {
|
|
24
|
+
function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
|
|
25
25
|
const environment = _environment || (0, common_1.getEnvironment)(env);
|
|
26
26
|
// const colorLogs = env?.[LOG_ENV] === '*' || ;
|
|
27
27
|
const correlationId = cid || (0, common_1.getCorrelationId)(request); //const logger = nodeColorLog;
|
|
@@ -36,7 +36,7 @@ function useLog({ environment: _environment, name, request, body, env, correlati
|
|
|
36
36
|
orgId: env?.[type_1.AXIOM_ORG_ID_ENV],
|
|
37
37
|
dataset: _dataset || env?.[type_1.AXIOM_DATASET_ENV] || 'default',
|
|
38
38
|
// color log on development and if env is *
|
|
39
|
-
consoleLog: colorLog ? 'color' : consoleLog,
|
|
39
|
+
consoleLog: _consoleLog || (colorLog ? 'color' : consoleLog),
|
|
40
40
|
}, {
|
|
41
41
|
environment,
|
|
42
42
|
type: 'worker',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAkBA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"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"}
|
package/build/main/log/type.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
|
7
7
|
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
|
8
8
|
export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
9
9
|
export declare const LOG_ENV = "LOG";
|
|
10
|
+
export type LogLevel = 'info' | 'log' | 'error' | 'debug' | 'warn';
|
|
10
11
|
export type LogBindings = {
|
|
11
12
|
[LOG_ENV]?: string;
|
|
12
13
|
[AXIOM_AUTH_TOKEN_ENV]?: string;
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
import type { BaseLog } from './type';
|
|
2
|
+
export type ConsoleLogFn = (arg: {
|
|
3
|
+
formatted: string;
|
|
4
|
+
message: string;
|
|
5
|
+
additionalContext: Record<string, any>;
|
|
6
|
+
level: string;
|
|
7
|
+
error?: Error;
|
|
8
|
+
}) => void;
|
|
9
|
+
export type ConsoleLog = boolean | 'color' | ConsoleLogFn;
|
|
2
10
|
export declare function createBaseLog({ token, orgId, dataset, consoleLog, }: {
|
|
3
11
|
token?: string;
|
|
4
12
|
orgId?: string;
|
|
5
13
|
dataset?: string;
|
|
6
|
-
consoleLog?:
|
|
14
|
+
consoleLog?: ConsoleLog;
|
|
7
15
|
}, { environment, workerId, app, version, context, type, correlationId, executionContext, }: {
|
|
8
16
|
correlationId?: string;
|
|
9
17
|
environment?: 'development' | 'production';
|
|
@@ -57,7 +57,16 @@ export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, conso
|
|
|
57
57
|
lastMessageTimestamp = now;
|
|
58
58
|
error = message instanceof Error ? message : error;
|
|
59
59
|
message = message instanceof Error ? message.message : message;
|
|
60
|
-
|
|
60
|
+
const formatted = `[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`;
|
|
61
|
+
if (typeof consoleLog === 'function')
|
|
62
|
+
consoleLog({
|
|
63
|
+
formatted,
|
|
64
|
+
level,
|
|
65
|
+
message,
|
|
66
|
+
additionalContext,
|
|
67
|
+
error,
|
|
68
|
+
});
|
|
69
|
+
else if (consoleLog === 'color')
|
|
61
70
|
logger
|
|
62
71
|
.dim()
|
|
63
72
|
.append(`${diff}`)
|
|
@@ -75,7 +84,7 @@ export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, conso
|
|
|
75
84
|
.append(message)
|
|
76
85
|
.log();
|
|
77
86
|
else
|
|
78
|
-
console.log(
|
|
87
|
+
console.log(formatted, additionalContext);
|
|
79
88
|
if (error)
|
|
80
89
|
console.error(error);
|
|
81
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["log/baselog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG9D,IAAI,oBAAoB,GAAuB,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["log/baselog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { type ConsoleLog } from './baselog';
|
|
1
2
|
import { requestToContext } from './common';
|
|
2
3
|
import { type LogBindings, type RequestLike, type WorkerLog } from './type';
|
|
3
4
|
export * from './common';
|
|
4
5
|
export * from './baselog';
|
|
5
6
|
export * from './type';
|
|
6
|
-
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext, }: {
|
|
7
|
+
export declare function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext, }: {
|
|
7
8
|
environment?: string;
|
|
8
9
|
name: string;
|
|
9
10
|
request?: RequestLike & {
|
|
@@ -16,6 +17,7 @@ export declare function useLog({ environment: _environment, name, request, body,
|
|
|
16
17
|
dataset?: string;
|
|
17
18
|
env?: LogBindings;
|
|
18
19
|
context?: Record<string, any>;
|
|
20
|
+
consoleLog?: ConsoleLog;
|
|
19
21
|
executionContext?: {
|
|
20
22
|
waitUntil(promise: Promise<any>): void;
|
|
21
23
|
};
|
|
@@ -4,7 +4,7 @@ import { AXIOM_AUTH_TOKEN_ENV, AXIOM_DATASET_ENV, AXIOM_ORG_ID_ENV, LOG_ENV, TAS
|
|
|
4
4
|
export * from './common';
|
|
5
5
|
export * from './baselog';
|
|
6
6
|
export * from './type';
|
|
7
|
-
export function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext = {}, }) {
|
|
7
|
+
export function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, consoleLog: _consoleLog, dataset: _dataset, context: initialContext = {}, }) {
|
|
8
8
|
const environment = _environment || getEnvironment(env);
|
|
9
9
|
// const colorLogs = env?.[LOG_ENV] === '*' || ;
|
|
10
10
|
const correlationId = cid || getCorrelationId(request); //const logger = nodeColorLog;
|
|
@@ -19,7 +19,7 @@ export function useLog({ environment: _environment, name, request, body, env, co
|
|
|
19
19
|
orgId: env?.[AXIOM_ORG_ID_ENV],
|
|
20
20
|
dataset: _dataset || env?.[AXIOM_DATASET_ENV] || 'default',
|
|
21
21
|
// color log on development and if env is *
|
|
22
|
-
consoleLog: colorLog ? 'color' : consoleLog,
|
|
22
|
+
consoleLog: _consoleLog || (colorLog ? 'color' : consoleLog),
|
|
23
23
|
}, {
|
|
24
24
|
environment,
|
|
25
25
|
type: 'worker',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
|
7
7
|
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
|
8
8
|
export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
9
9
|
export declare const LOG_ENV = "LOG";
|
|
10
|
+
export type LogLevel = 'info' | 'log' | 'error' | 'debug' | 'warn';
|
|
10
11
|
export type LogBindings = {
|
|
11
12
|
[LOG_ENV]?: string;
|
|
12
13
|
[AXIOM_AUTH_TOKEN_ENV]?: string;
|
package/package.json
CHANGED
package/src/log/baselog.ts
CHANGED
|
@@ -2,10 +2,19 @@ import { Axiom } from '@axiomhq/js';
|
|
|
2
2
|
import { serializeError } from 'serialize-error';
|
|
3
3
|
import { logger } from './color';
|
|
4
4
|
import { getCorrelationId, requestToContext } from './common';
|
|
5
|
-
import type { BaseLog, ChildLogOptions, Log } from './type';
|
|
5
|
+
import type { BaseLog, ChildLogOptions, Log, LogLevel } from './type';
|
|
6
6
|
|
|
7
7
|
let lastMessageTimestamp: number | undefined = undefined;
|
|
8
8
|
|
|
9
|
+
export type ConsoleLogFn = (arg: {
|
|
10
|
+
formatted: string;
|
|
11
|
+
message: string;
|
|
12
|
+
additionalContext: Record<string, any>;
|
|
13
|
+
level: string;
|
|
14
|
+
error?: Error;
|
|
15
|
+
}) => void;
|
|
16
|
+
export type ConsoleLog = boolean | 'color' | ConsoleLogFn;
|
|
17
|
+
|
|
9
18
|
export function createBaseLog(
|
|
10
19
|
{
|
|
11
20
|
token,
|
|
@@ -16,7 +25,7 @@ export function createBaseLog(
|
|
|
16
25
|
token?: string;
|
|
17
26
|
orgId?: string;
|
|
18
27
|
dataset?: string;
|
|
19
|
-
consoleLog?:
|
|
28
|
+
consoleLog?: ConsoleLog;
|
|
20
29
|
},
|
|
21
30
|
{
|
|
22
31
|
environment,
|
|
@@ -63,7 +72,7 @@ export function createBaseLog(
|
|
|
63
72
|
: undefined;
|
|
64
73
|
|
|
65
74
|
function ingest(
|
|
66
|
-
level:
|
|
75
|
+
level: LogLevel,
|
|
67
76
|
message: string,
|
|
68
77
|
additionalFields: Record<string, any> = {}
|
|
69
78
|
) {
|
|
@@ -82,7 +91,7 @@ export function createBaseLog(
|
|
|
82
91
|
childContext.request = requestToContext(arg.request);
|
|
83
92
|
}
|
|
84
93
|
const baseLog = (
|
|
85
|
-
level:
|
|
94
|
+
level: LogLevel,
|
|
86
95
|
message: any,
|
|
87
96
|
additionalContext: Record<string, any> = {},
|
|
88
97
|
error?: Error
|
|
@@ -110,7 +119,16 @@ export function createBaseLog(
|
|
|
110
119
|
|
|
111
120
|
error = message instanceof Error ? message : error;
|
|
112
121
|
message = message instanceof Error ? message.message : message;
|
|
113
|
-
|
|
122
|
+
const formatted = `[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`;
|
|
123
|
+
if (typeof consoleLog === 'function')
|
|
124
|
+
consoleLog({
|
|
125
|
+
formatted,
|
|
126
|
+
level,
|
|
127
|
+
message,
|
|
128
|
+
additionalContext,
|
|
129
|
+
error,
|
|
130
|
+
});
|
|
131
|
+
else if (consoleLog === 'color')
|
|
114
132
|
logger
|
|
115
133
|
.dim()
|
|
116
134
|
.append(`${diff}`)
|
|
@@ -127,11 +145,7 @@ export function createBaseLog(
|
|
|
127
145
|
.reset()
|
|
128
146
|
.append(message)
|
|
129
147
|
.log();
|
|
130
|
-
else
|
|
131
|
-
console.log(
|
|
132
|
-
`[${lev}] [${name}]${cid ? ` [${cid}]` : ''} ${message}`,
|
|
133
|
-
additionalContext
|
|
134
|
-
);
|
|
148
|
+
else console.log(formatted, additionalContext);
|
|
135
149
|
|
|
136
150
|
if (error) console.error(error);
|
|
137
151
|
}
|
package/src/log/index.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createBaseLog } from './baselog';
|
|
1
|
+
import { type ConsoleLog, createBaseLog } from './baselog';
|
|
2
2
|
import { getCorrelationId, getEnvironment, requestToContext } from './common';
|
|
3
3
|
import {
|
|
4
4
|
AXIOM_AUTH_TOKEN_ENV,
|
|
@@ -26,6 +26,7 @@ export function useLog({
|
|
|
26
26
|
version,
|
|
27
27
|
executionContext,
|
|
28
28
|
logRequest,
|
|
29
|
+
consoleLog: _consoleLog,
|
|
29
30
|
dataset: _dataset,
|
|
30
31
|
context: initialContext = {},
|
|
31
32
|
}: {
|
|
@@ -39,6 +40,7 @@ export function useLog({
|
|
|
39
40
|
dataset?: string;
|
|
40
41
|
env?: LogBindings;
|
|
41
42
|
context?: Record<string, any>;
|
|
43
|
+
consoleLog?: ConsoleLog;
|
|
42
44
|
executionContext?: {
|
|
43
45
|
waitUntil(promise: Promise<any>): void;
|
|
44
46
|
};
|
|
@@ -61,7 +63,7 @@ export function useLog({
|
|
|
61
63
|
orgId: env?.[AXIOM_ORG_ID_ENV],
|
|
62
64
|
dataset: _dataset || env?.[AXIOM_DATASET_ENV] || 'default',
|
|
63
65
|
// color log on development and if env is *
|
|
64
|
-
consoleLog: colorLog ? 'color' : consoleLog,
|
|
66
|
+
consoleLog: _consoleLog || (colorLog ? 'color' : consoleLog),
|
|
65
67
|
},
|
|
66
68
|
{
|
|
67
69
|
environment,
|
package/src/log/type.ts
CHANGED
|
@@ -11,6 +11,8 @@ export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
|
11
11
|
export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
12
12
|
export const LOG_ENV = 'LOG';
|
|
13
13
|
|
|
14
|
+
export type LogLevel = 'info' | 'log' | 'error' | 'debug' | 'warn';
|
|
15
|
+
|
|
14
16
|
export type LogBindings = {
|
|
15
17
|
[LOG_ENV]?: string;
|
|
16
18
|
[AXIOM_AUTH_TOKEN_ENV]?: string;
|