@vrplatform/log 2.0.0-alpha.22 → 2.0.0-alpha.24
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 +0 -1
- package/build/main/log/baselog.js +1 -16
- package/build/main/log/baselog.js.map +1 -1
- package/build/main/log/common.d.ts +1 -10
- package/build/main/log/common.js +3 -13
- package/build/main/log/common.js.map +1 -1
- package/build/main/log/index.d.ts +2 -2
- package/build/main/log/index.js +7 -6
- package/build/main/log/index.js.map +1 -1
- package/build/main/log/type.d.ts +18 -0
- package/build/main/log/type.js +12 -0
- package/build/main/log/type.js.map +1 -1
- package/build/main/tracking/index.d.ts +7 -6
- package/build/main/tracking/index.js +1 -17
- package/build/main/tracking/index.js.map +1 -1
- package/build/module/log/baselog.d.ts +0 -1
- package/build/module/log/baselog.js +1 -2
- package/build/module/log/baselog.js.map +1 -1
- package/build/module/log/common.d.ts +1 -10
- package/build/module/log/common.js +1 -11
- package/build/module/log/common.js.map +1 -1
- package/build/module/log/index.d.ts +2 -2
- package/build/module/log/index.js +2 -1
- package/build/module/log/index.js.map +1 -1
- package/build/module/log/type.d.ts +18 -0
- package/build/module/log/type.js +11 -1
- package/build/module/log/type.js.map +1 -1
- package/build/module/tracking/index.d.ts +7 -6
- package/build/module/tracking/index.js +1 -17
- package/build/module/tracking/index.js.map +1 -1
- package/package.json +1 -1
- package/src/log/baselog.ts +2 -3
- package/src/log/common.ts +1 -14
- package/src/log/index.ts +6 -6
- package/src/log/type.ts +23 -0
- package/src/tracking/index.ts +8 -23
|
@@ -1,25 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
3
|
exports.createBaseLog = createBaseLog;
|
|
18
|
-
const common_1 = require("./common");
|
|
19
|
-
__exportStar(require("./type"), exports);
|
|
20
4
|
const js_1 = require("@axiomhq/js");
|
|
21
5
|
const serialize_error_1 = require("serialize-error");
|
|
22
6
|
const color_1 = require("./color");
|
|
7
|
+
const common_1 = require("./common");
|
|
23
8
|
let lastMessageTimestamp = undefined;
|
|
24
9
|
function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog, }, { environment, workerId, app, version, context, type, correlationId, executionContext, }) {
|
|
25
10
|
const baseFields = {
|
|
@@ -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,13 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
|
|
3
|
-
export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
|
|
4
|
-
export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
|
|
5
|
-
export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
|
|
6
|
-
export declare const VERIFICATION_HEADER = "X-Verification-Key";
|
|
7
|
-
export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
8
|
-
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
|
9
|
-
export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
10
|
-
export declare const LOG_ENV = "LOG";
|
|
1
|
+
import { type RequestLike } from './type';
|
|
11
2
|
export declare const requestHeadersToCapture: string[];
|
|
12
3
|
export declare function getCorrelationId(request?: RequestLike): string | undefined;
|
|
13
4
|
export declare function getEnvironment(env?: Record<string, any>): any;
|
package/build/main/log/common.js
CHANGED
|
@@ -1,25 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.requestHeadersToCapture =
|
|
3
|
+
exports.requestHeadersToCapture = void 0;
|
|
4
4
|
exports.getCorrelationId = getCorrelationId;
|
|
5
5
|
exports.getEnvironment = getEnvironment;
|
|
6
6
|
exports.requestToContext = requestToContext;
|
|
7
|
-
|
|
8
|
-
exports.CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
9
|
-
exports.WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
10
|
-
exports.TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
11
|
-
exports.CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
12
|
-
exports.VERIFICATION_HEADER = 'X-Verification-Key';
|
|
13
|
-
// Env
|
|
14
|
-
exports.AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
15
|
-
exports.AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
16
|
-
exports.AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
17
|
-
exports.LOG_ENV = 'LOG';
|
|
7
|
+
const type_1 = require("./type");
|
|
18
8
|
exports.requestHeadersToCapture = ['user-agent'];
|
|
19
9
|
function getCorrelationId(request) {
|
|
20
10
|
if (!request?.headers)
|
|
21
11
|
return undefined;
|
|
22
|
-
return (request.headers.get(
|
|
12
|
+
return (request.headers.get(type_1.CORRELATION_ID_HEADER) ||
|
|
23
13
|
request.headers.get('fi-correlation-id') ||
|
|
24
14
|
request.headers.get('x-correlation-id') ||
|
|
25
15
|
request.headers.get('correlation-id') ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { requestToContext } from './common';
|
|
2
|
-
import type
|
|
2
|
+
import { type LogBindings, type RequestLike, type WorkerLog } from './type';
|
|
3
3
|
export * from './common';
|
|
4
4
|
export * from './baselog';
|
|
5
5
|
export * from './type';
|
|
@@ -14,7 +14,7 @@ export declare function useLog({ environment: _environment, name, request, body,
|
|
|
14
14
|
correlationId?: string;
|
|
15
15
|
version?: string;
|
|
16
16
|
dataset?: string;
|
|
17
|
-
env?:
|
|
17
|
+
env?: LogBindings;
|
|
18
18
|
context?: Record<string, any>;
|
|
19
19
|
executionContext?: {
|
|
20
20
|
waitUntil(promise: Promise<any>): void;
|
package/build/main/log/index.js
CHANGED
|
@@ -17,18 +17,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
exports.useLog = useLog;
|
|
18
18
|
const baselog_1 = require("./baselog");
|
|
19
19
|
const common_1 = require("./common");
|
|
20
|
+
const type_1 = require("./type");
|
|
20
21
|
__exportStar(require("./common"), exports);
|
|
21
22
|
__exportStar(require("./baselog"), exports);
|
|
22
23
|
__exportStar(require("./type"), exports);
|
|
23
24
|
function useLog({ environment: _environment, name, request, body, env, correlationId: cid, version, executionContext, logRequest, dataset: _dataset, context: initialContext = {}, }) {
|
|
24
25
|
const environment = _environment || (0, common_1.getEnvironment)(env);
|
|
25
|
-
const colorLogs = env?.[
|
|
26
|
+
const colorLogs = env?.[type_1.LOG_ENV] === '*' || environment === 'development';
|
|
26
27
|
const correlationId = cid || (0, common_1.getCorrelationId)(request); //const logger = nodeColorLog;
|
|
27
|
-
const axiomToken = env?.[
|
|
28
|
+
const axiomToken = env?.[type_1.AXIOM_AUTH_TOKEN_ENV];
|
|
28
29
|
const axiom = (0, baselog_1.createBaseLog)({
|
|
29
30
|
token: axiomToken,
|
|
30
|
-
orgId: env?.[
|
|
31
|
-
dataset: _dataset || env?.[
|
|
31
|
+
orgId: env?.[type_1.AXIOM_ORG_ID_ENV],
|
|
32
|
+
dataset: _dataset || env?.[type_1.AXIOM_DATASET_ENV] || 'default',
|
|
32
33
|
consoleLog: colorLogs ? 'color' : false,
|
|
33
34
|
}, {
|
|
34
35
|
environment,
|
|
@@ -42,8 +43,8 @@ function useLog({ environment: _environment, name, request, body, env, correlati
|
|
|
42
43
|
...initialContext,
|
|
43
44
|
rootCorrelationId: correlationId,
|
|
44
45
|
correlationId,
|
|
45
|
-
taskQueue: request?.headers?.get(
|
|
46
|
-
workflowId: request?.headers?.get(
|
|
46
|
+
taskQueue: request?.headers?.get(type_1.TASK_QUEUE_HEADER) || undefined,
|
|
47
|
+
workflowId: request?.headers?.get(type_1.WORKFLOW_ID_HEADER) || undefined,
|
|
47
48
|
child: undefined,
|
|
48
49
|
},
|
|
49
50
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAkBA,wBA4GC;AA9HD,uCAA0C;AAC1C,
|
|
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
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
|
|
2
|
+
export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
|
|
3
|
+
export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
|
|
4
|
+
export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
|
|
5
|
+
export declare const VERIFICATION_HEADER = "X-Verification-Key";
|
|
6
|
+
export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
7
|
+
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
|
8
|
+
export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
9
|
+
export declare const LOG_ENV = "LOG";
|
|
10
|
+
export type LogBindings = {
|
|
11
|
+
[LOG_ENV]?: string;
|
|
12
|
+
[AXIOM_AUTH_TOKEN_ENV]?: string;
|
|
13
|
+
[AXIOM_ORG_ID_ENV]?: string;
|
|
14
|
+
[AXIOM_DATASET_ENV]?: string;
|
|
15
|
+
NODE_ENV?: string;
|
|
16
|
+
IS_LOCAL_DEV?: string;
|
|
17
|
+
MACHINE_NAME?: string;
|
|
18
|
+
};
|
|
1
19
|
export type LogFn = (message: any, additionalContext?: Record<string, any>) => void;
|
|
2
20
|
export type Log = {
|
|
3
21
|
error: LogFn;
|
package/build/main/log/type.js
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
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
|
+
// Headers
|
|
5
|
+
exports.CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
6
|
+
exports.WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
7
|
+
exports.TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
8
|
+
exports.CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
9
|
+
exports.VERIFICATION_HEADER = 'X-Verification-Key';
|
|
10
|
+
// Env
|
|
11
|
+
exports.AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
12
|
+
exports.AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
13
|
+
exports.AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
14
|
+
exports.LOG_ENV = 'LOG';
|
|
3
15
|
//# sourceMappingURL=type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":";;;AAAA,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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Analytics } from '@june-so/analytics-node';
|
|
2
2
|
import { PostHog } from 'posthog-node';
|
|
3
|
-
import { type WorkerLog } from '../log';
|
|
3
|
+
import { type LogBindings, type WorkerLog } from '../log';
|
|
4
4
|
import { useIntercom } from './intercom';
|
|
5
5
|
export declare const isTest: (userId: string, groupId?: string, userEmail?: string) => boolean | "" | undefined;
|
|
6
6
|
export declare const convertKeysToSnakeCase: (obj?: Record<string, any>) => Record<string, any>;
|
|
@@ -15,9 +15,10 @@ type TaxStatementEvent = 'tax_statement_preview_opened' | 'tax_statement_downloa
|
|
|
15
15
|
type GLOwnerStatementEvent = 'gl_owner_statement_preview_opened' | 'gl_owner_statement_downloaded';
|
|
16
16
|
type HyperlineEvent = 'hyperline_invoice_ready' | 'hyperline_invoice_settled' | 'hyperline_trial_started' | 'hyperline_trial_ended' | 'hyperline_subscription_activated' | 'hyperline_subscription_cancelled' | 'hyperline_subscription_created' | 'hyperline_subscription_errored' | 'hyperline_subscription_paused' | 'hyperline_subscription_voided' | 'hyperline_subscription_charged' | 'hyperline_customer_created' | 'hyperline_customer_updated' | 'hyperline_payment_method_created' | 'hyperline_payment_method_errored' | 'hyperline_payment_method_deleted';
|
|
17
17
|
type ListingEvent = 'listing_activated' | 'listing_deactivated';
|
|
18
|
+
type ReportEvent = 'listings_reported';
|
|
18
19
|
type UserEvent = 'update_refresh_accepted' | 'owner_statement_opened';
|
|
19
20
|
type TestEvent = 'test_event' | 'test_error';
|
|
20
|
-
export type TrackingEvent = AuthEvent | TeamEvent | ConnectionEvent | OwnershipEvent | OwnerEvent | SetupEvent | AutomationEvent | TaxStatementEvent | GLOwnerStatementEvent | HyperlineEvent | UserEvent | ListingEvent | TestEvent;
|
|
21
|
+
export type TrackingEvent = AuthEvent | TeamEvent | ConnectionEvent | OwnershipEvent | OwnerEvent | SetupEvent | AutomationEvent | TaxStatementEvent | GLOwnerStatementEvent | HyperlineEvent | UserEvent | ListingEvent | ReportEvent | TestEvent;
|
|
21
22
|
export type TrackingProps = {
|
|
22
23
|
name: string;
|
|
23
24
|
dataset: string;
|
|
@@ -25,7 +26,7 @@ export type TrackingProps = {
|
|
|
25
26
|
INTERCOM_TOKEN?: string;
|
|
26
27
|
JUNESO_TOKEN?: string;
|
|
27
28
|
POSTHOG_TOKEN?: string;
|
|
28
|
-
};
|
|
29
|
+
} & LogBindings;
|
|
29
30
|
debugging?: boolean;
|
|
30
31
|
};
|
|
31
32
|
export type Tracking = ReturnType<typeof useTracking>;
|
|
@@ -36,13 +37,13 @@ type TrackProps = OptionalUser<{
|
|
|
36
37
|
}>;
|
|
37
38
|
type IdentifyProps = {
|
|
38
39
|
userId: string;
|
|
39
|
-
traits: Record<string,
|
|
40
|
+
traits: Record<string, string | number | boolean | null | undefined>;
|
|
40
41
|
disableGeoip?: boolean;
|
|
41
42
|
timestamp?: Date;
|
|
42
43
|
};
|
|
43
44
|
type GroupProps = OptionalUser<{
|
|
44
45
|
groupId: string;
|
|
45
|
-
traits?: Record<string,
|
|
46
|
+
traits?: Record<string, string | number | boolean | null | undefined>;
|
|
46
47
|
timestamp?: Date;
|
|
47
48
|
}>;
|
|
48
49
|
type OptionalUser<T> = T & ({
|
|
@@ -52,7 +53,7 @@ type OptionalUser<T> = T & ({
|
|
|
52
53
|
userId?: string;
|
|
53
54
|
anonymousId: string;
|
|
54
55
|
});
|
|
55
|
-
export declare const useTracking: ({ dataset, env, name
|
|
56
|
+
export declare const useTracking: ({ dataset, env, name }: TrackingProps, isDev?: boolean) => {
|
|
56
57
|
track: (props: TrackProps) => Promise<void>;
|
|
57
58
|
identify: (props: IdentifyProps) => Promise<void>;
|
|
58
59
|
group: (props: GroupProps) => Promise<void>;
|
|
@@ -40,23 +40,7 @@ const convertKeysToSnakeCase = (obj) => {
|
|
|
40
40
|
return result;
|
|
41
41
|
};
|
|
42
42
|
exports.convertKeysToSnakeCase = convertKeysToSnakeCase;
|
|
43
|
-
const useTracking = ({ dataset, env, name
|
|
44
|
-
if (debugging) {
|
|
45
|
-
const log = {
|
|
46
|
-
...console,
|
|
47
|
-
child: () => log,
|
|
48
|
-
addContext: (data) => console.log(data),
|
|
49
|
-
flush: () => Promise.resolve(),
|
|
50
|
-
respond: () => Promise.resolve(new Response()),
|
|
51
|
-
};
|
|
52
|
-
return {
|
|
53
|
-
track: async (props) => console.log('track', props),
|
|
54
|
-
identify: async (props) => console.log('identify', props),
|
|
55
|
-
group: async (props) => console.log('group', props),
|
|
56
|
-
shutdown: () => Promise.resolve(),
|
|
57
|
-
log,
|
|
58
|
-
};
|
|
59
|
-
}
|
|
43
|
+
const useTracking = ({ dataset, env, name }, isDev) => {
|
|
60
44
|
const log = (0, log_1.useLog)({ name, dataset, env });
|
|
61
45
|
const intercom = env.INTERCOM_TOKEN
|
|
62
46
|
? (0, intercom_1.useIntercom)(env.INTERCOM_TOKEN, log)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":";;;AAAA,4DAAoD;AACpD,+CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { getCorrelationId, requestToContext } from './common';
|
|
2
|
-
export * from './type';
|
|
3
1
|
import { Axiom } from '@axiomhq/js';
|
|
4
2
|
import { serializeError } from 'serialize-error';
|
|
5
3
|
import { logger } from './color';
|
|
4
|
+
import { getCorrelationId, requestToContext } from './common';
|
|
6
5
|
let lastMessageTimestamp = undefined;
|
|
7
6
|
export function createBaseLog({ token, orgId = 'vrplatform-mv6k', dataset, consoleLog, }, { environment, workerId, app, version, context, type, correlationId, executionContext, }) {
|
|
8
7
|
const baseFields = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["log/baselog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"baselog.js","sourceRoot":"src/","sources":["log/baselog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
|
|
3
|
-
export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
|
|
4
|
-
export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
|
|
5
|
-
export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
|
|
6
|
-
export declare const VERIFICATION_HEADER = "X-Verification-Key";
|
|
7
|
-
export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
8
|
-
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
|
9
|
-
export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
10
|
-
export declare const LOG_ENV = "LOG";
|
|
1
|
+
import { type RequestLike } from './type';
|
|
11
2
|
export declare const requestHeadersToCapture: string[];
|
|
12
3
|
export declare function getCorrelationId(request?: RequestLike): string | undefined;
|
|
13
4
|
export declare function getEnvironment(env?: Record<string, any>): any;
|
|
@@ -1,14 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
export const CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
3
|
-
export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
4
|
-
export const TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
5
|
-
export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
6
|
-
export const VERIFICATION_HEADER = 'X-Verification-Key';
|
|
7
|
-
// Env
|
|
8
|
-
export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
9
|
-
export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
10
|
-
export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
11
|
-
export const LOG_ENV = 'LOG';
|
|
1
|
+
import { CORRELATION_ID_HEADER } from './type';
|
|
12
2
|
export const requestHeadersToCapture = ['user-agent'];
|
|
13
3
|
export function getCorrelationId(request) {
|
|
14
4
|
if (!request?.headers)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"src/","sources":["log/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { requestToContext } from './common';
|
|
2
|
-
import type
|
|
2
|
+
import { type LogBindings, type RequestLike, type WorkerLog } from './type';
|
|
3
3
|
export * from './common';
|
|
4
4
|
export * from './baselog';
|
|
5
5
|
export * from './type';
|
|
@@ -14,7 +14,7 @@ export declare function useLog({ environment: _environment, name, request, body,
|
|
|
14
14
|
correlationId?: string;
|
|
15
15
|
version?: string;
|
|
16
16
|
dataset?: string;
|
|
17
|
-
env?:
|
|
17
|
+
env?: LogBindings;
|
|
18
18
|
context?: Record<string, any>;
|
|
19
19
|
executionContext?: {
|
|
20
20
|
waitUntil(promise: Promise<any>): void;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createBaseLog } from './baselog';
|
|
2
|
-
import {
|
|
2
|
+
import { getCorrelationId, getEnvironment, requestToContext } from './common';
|
|
3
|
+
import { AXIOM_AUTH_TOKEN_ENV, AXIOM_DATASET_ENV, AXIOM_ORG_ID_ENV, LOG_ENV, TASK_QUEUE_HEADER, WORKFLOW_ID_HEADER, } from './type';
|
|
3
4
|
export * from './common';
|
|
4
5
|
export * from './baselog';
|
|
5
6
|
export * from './type';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["log/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
export declare const CONNECTION_ID_HEADER = "X-Connection-ID";
|
|
2
|
+
export declare const WORKFLOW_ID_HEADER = "X-Workflow-ID";
|
|
3
|
+
export declare const TASK_QUEUE_HEADER = "X-Task-Queue";
|
|
4
|
+
export declare const CORRELATION_ID_HEADER = "X-Correlation-ID";
|
|
5
|
+
export declare const VERIFICATION_HEADER = "X-Verification-Key";
|
|
6
|
+
export declare const AXIOM_AUTH_TOKEN_ENV = "AXIOM_AUTH_TOKEN";
|
|
7
|
+
export declare const AXIOM_ORG_ID_ENV = "AXIOM_ORG_ID";
|
|
8
|
+
export declare const AXIOM_DATASET_ENV = "AXIOM_DATASET";
|
|
9
|
+
export declare const LOG_ENV = "LOG";
|
|
10
|
+
export type LogBindings = {
|
|
11
|
+
[LOG_ENV]?: string;
|
|
12
|
+
[AXIOM_AUTH_TOKEN_ENV]?: string;
|
|
13
|
+
[AXIOM_ORG_ID_ENV]?: string;
|
|
14
|
+
[AXIOM_DATASET_ENV]?: string;
|
|
15
|
+
NODE_ENV?: string;
|
|
16
|
+
IS_LOCAL_DEV?: string;
|
|
17
|
+
MACHINE_NAME?: string;
|
|
18
|
+
};
|
|
1
19
|
export type LogFn = (message: any, additionalContext?: Record<string, any>) => void;
|
|
2
20
|
export type Log = {
|
|
3
21
|
error: LogFn;
|
package/build/module/log/type.js
CHANGED
|
@@ -1,2 +1,12 @@
|
|
|
1
|
-
|
|
1
|
+
// Headers
|
|
2
|
+
export const CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
3
|
+
export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
4
|
+
export const TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
5
|
+
export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
6
|
+
export const VERIFICATION_HEADER = 'X-Verification-Key';
|
|
7
|
+
// Env
|
|
8
|
+
export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
9
|
+
export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
10
|
+
export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
11
|
+
export const LOG_ENV = 'LOG';
|
|
2
12
|
//# sourceMappingURL=type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"src/","sources":["log/type.ts"],"names":[],"mappings":"AAAA,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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Analytics } from '@june-so/analytics-node';
|
|
2
2
|
import { PostHog } from 'posthog-node';
|
|
3
|
-
import { type WorkerLog } from '../log';
|
|
3
|
+
import { type LogBindings, type WorkerLog } from '../log';
|
|
4
4
|
import { useIntercom } from './intercom';
|
|
5
5
|
export declare const isTest: (userId: string, groupId?: string, userEmail?: string) => boolean | "" | undefined;
|
|
6
6
|
export declare const convertKeysToSnakeCase: (obj?: Record<string, any>) => Record<string, any>;
|
|
@@ -15,9 +15,10 @@ type TaxStatementEvent = 'tax_statement_preview_opened' | 'tax_statement_downloa
|
|
|
15
15
|
type GLOwnerStatementEvent = 'gl_owner_statement_preview_opened' | 'gl_owner_statement_downloaded';
|
|
16
16
|
type HyperlineEvent = 'hyperline_invoice_ready' | 'hyperline_invoice_settled' | 'hyperline_trial_started' | 'hyperline_trial_ended' | 'hyperline_subscription_activated' | 'hyperline_subscription_cancelled' | 'hyperline_subscription_created' | 'hyperline_subscription_errored' | 'hyperline_subscription_paused' | 'hyperline_subscription_voided' | 'hyperline_subscription_charged' | 'hyperline_customer_created' | 'hyperline_customer_updated' | 'hyperline_payment_method_created' | 'hyperline_payment_method_errored' | 'hyperline_payment_method_deleted';
|
|
17
17
|
type ListingEvent = 'listing_activated' | 'listing_deactivated';
|
|
18
|
+
type ReportEvent = 'listings_reported';
|
|
18
19
|
type UserEvent = 'update_refresh_accepted' | 'owner_statement_opened';
|
|
19
20
|
type TestEvent = 'test_event' | 'test_error';
|
|
20
|
-
export type TrackingEvent = AuthEvent | TeamEvent | ConnectionEvent | OwnershipEvent | OwnerEvent | SetupEvent | AutomationEvent | TaxStatementEvent | GLOwnerStatementEvent | HyperlineEvent | UserEvent | ListingEvent | TestEvent;
|
|
21
|
+
export type TrackingEvent = AuthEvent | TeamEvent | ConnectionEvent | OwnershipEvent | OwnerEvent | SetupEvent | AutomationEvent | TaxStatementEvent | GLOwnerStatementEvent | HyperlineEvent | UserEvent | ListingEvent | ReportEvent | TestEvent;
|
|
21
22
|
export type TrackingProps = {
|
|
22
23
|
name: string;
|
|
23
24
|
dataset: string;
|
|
@@ -25,7 +26,7 @@ export type TrackingProps = {
|
|
|
25
26
|
INTERCOM_TOKEN?: string;
|
|
26
27
|
JUNESO_TOKEN?: string;
|
|
27
28
|
POSTHOG_TOKEN?: string;
|
|
28
|
-
};
|
|
29
|
+
} & LogBindings;
|
|
29
30
|
debugging?: boolean;
|
|
30
31
|
};
|
|
31
32
|
export type Tracking = ReturnType<typeof useTracking>;
|
|
@@ -36,13 +37,13 @@ type TrackProps = OptionalUser<{
|
|
|
36
37
|
}>;
|
|
37
38
|
type IdentifyProps = {
|
|
38
39
|
userId: string;
|
|
39
|
-
traits: Record<string,
|
|
40
|
+
traits: Record<string, string | number | boolean | null | undefined>;
|
|
40
41
|
disableGeoip?: boolean;
|
|
41
42
|
timestamp?: Date;
|
|
42
43
|
};
|
|
43
44
|
type GroupProps = OptionalUser<{
|
|
44
45
|
groupId: string;
|
|
45
|
-
traits?: Record<string,
|
|
46
|
+
traits?: Record<string, string | number | boolean | null | undefined>;
|
|
46
47
|
timestamp?: Date;
|
|
47
48
|
}>;
|
|
48
49
|
type OptionalUser<T> = T & ({
|
|
@@ -52,7 +53,7 @@ type OptionalUser<T> = T & ({
|
|
|
52
53
|
userId?: string;
|
|
53
54
|
anonymousId: string;
|
|
54
55
|
});
|
|
55
|
-
export declare const useTracking: ({ dataset, env, name
|
|
56
|
+
export declare const useTracking: ({ dataset, env, name }: TrackingProps, isDev?: boolean) => {
|
|
56
57
|
track: (props: TrackProps) => Promise<void>;
|
|
57
58
|
identify: (props: IdentifyProps) => Promise<void>;
|
|
58
59
|
group: (props: GroupProps) => Promise<void>;
|
|
@@ -35,23 +35,7 @@ export const convertKeysToSnakeCase = (obj) => {
|
|
|
35
35
|
}
|
|
36
36
|
return result;
|
|
37
37
|
};
|
|
38
|
-
export const useTracking = ({ dataset, env, name
|
|
39
|
-
if (debugging) {
|
|
40
|
-
const log = {
|
|
41
|
-
...console,
|
|
42
|
-
child: () => log,
|
|
43
|
-
addContext: (data) => console.log(data),
|
|
44
|
-
flush: () => Promise.resolve(),
|
|
45
|
-
respond: () => Promise.resolve(new Response()),
|
|
46
|
-
};
|
|
47
|
-
return {
|
|
48
|
-
track: async (props) => console.log('track', props),
|
|
49
|
-
identify: async (props) => console.log('identify', props),
|
|
50
|
-
group: async (props) => console.log('group', props),
|
|
51
|
-
shutdown: () => Promise.resolve(),
|
|
52
|
-
log,
|
|
53
|
-
};
|
|
54
|
-
}
|
|
38
|
+
export const useTracking = ({ dataset, env, name }, isDev) => {
|
|
55
39
|
const log = useLog({ name, dataset, env });
|
|
56
40
|
const intercom = env.INTERCOM_TOKEN
|
|
57
41
|
? useIntercom(env.INTERCOM_TOKEN, log)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/log/baselog.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { getCorrelationId, requestToContext } from './common';
|
|
2
|
-
import type { BaseLog, ChildLogOptions, Log } from './type';
|
|
3
|
-
export * from './type';
|
|
4
1
|
import { Axiom } from '@axiomhq/js';
|
|
5
2
|
import { serializeError } from 'serialize-error';
|
|
6
3
|
import { logger } from './color';
|
|
4
|
+
import { getCorrelationId, requestToContext } from './common';
|
|
5
|
+
import type { BaseLog, ChildLogOptions, Log } from './type';
|
|
7
6
|
|
|
8
7
|
let lastMessageTimestamp: number | undefined = undefined;
|
|
9
8
|
|
package/src/log/common.ts
CHANGED
|
@@ -1,17 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
|
|
3
|
-
// Headers
|
|
4
|
-
export const CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
5
|
-
export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
6
|
-
export const TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
7
|
-
export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
8
|
-
export const VERIFICATION_HEADER = 'X-Verification-Key';
|
|
9
|
-
|
|
10
|
-
// Env
|
|
11
|
-
export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
12
|
-
export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
13
|
-
export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
14
|
-
export const LOG_ENV = 'LOG';
|
|
1
|
+
import { CORRELATION_ID_HEADER, type RequestLike } from './type';
|
|
15
2
|
|
|
16
3
|
export const requestHeadersToCapture = ['user-agent'];
|
|
17
4
|
|
package/src/log/index.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { createBaseLog } from './baselog';
|
|
2
|
+
import { getCorrelationId, getEnvironment, requestToContext } from './common';
|
|
2
3
|
import {
|
|
3
4
|
AXIOM_AUTH_TOKEN_ENV,
|
|
4
5
|
AXIOM_DATASET_ENV,
|
|
5
6
|
AXIOM_ORG_ID_ENV,
|
|
6
7
|
LOG_ENV,
|
|
8
|
+
type LogBindings,
|
|
9
|
+
type RequestLike,
|
|
7
10
|
TASK_QUEUE_HEADER,
|
|
8
11
|
WORKFLOW_ID_HEADER,
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
requestToContext,
|
|
12
|
-
} from './common';
|
|
13
|
-
import type { RequestLike, WorkerLog } from './type';
|
|
12
|
+
type WorkerLog,
|
|
13
|
+
} from './type';
|
|
14
14
|
|
|
15
15
|
export * from './common';
|
|
16
16
|
export * from './baselog';
|
|
@@ -37,7 +37,7 @@ export function useLog({
|
|
|
37
37
|
correlationId?: string;
|
|
38
38
|
version?: string;
|
|
39
39
|
dataset?: string;
|
|
40
|
-
env?:
|
|
40
|
+
env?: LogBindings;
|
|
41
41
|
context?: Record<string, any>;
|
|
42
42
|
executionContext?: {
|
|
43
43
|
waitUntil(promise: Promise<any>): void;
|
package/src/log/type.ts
CHANGED
|
@@ -1,3 +1,26 @@
|
|
|
1
|
+
// Headers
|
|
2
|
+
export const CONNECTION_ID_HEADER = 'X-Connection-ID';
|
|
3
|
+
export const WORKFLOW_ID_HEADER = 'X-Workflow-ID';
|
|
4
|
+
export const TASK_QUEUE_HEADER = 'X-Task-Queue';
|
|
5
|
+
export const CORRELATION_ID_HEADER = 'X-Correlation-ID';
|
|
6
|
+
export const VERIFICATION_HEADER = 'X-Verification-Key';
|
|
7
|
+
|
|
8
|
+
// Env
|
|
9
|
+
export const AXIOM_AUTH_TOKEN_ENV = 'AXIOM_AUTH_TOKEN';
|
|
10
|
+
export const AXIOM_ORG_ID_ENV = 'AXIOM_ORG_ID';
|
|
11
|
+
export const AXIOM_DATASET_ENV = 'AXIOM_DATASET';
|
|
12
|
+
export const LOG_ENV = 'LOG';
|
|
13
|
+
|
|
14
|
+
export type LogBindings = {
|
|
15
|
+
[LOG_ENV]?: string;
|
|
16
|
+
[AXIOM_AUTH_TOKEN_ENV]?: string;
|
|
17
|
+
[AXIOM_ORG_ID_ENV]?: string;
|
|
18
|
+
[AXIOM_DATASET_ENV]?: string;
|
|
19
|
+
NODE_ENV?: string;
|
|
20
|
+
IS_LOCAL_DEV?: string;
|
|
21
|
+
MACHINE_NAME?: string;
|
|
22
|
+
};
|
|
23
|
+
|
|
1
24
|
export type LogFn = (
|
|
2
25
|
message: any,
|
|
3
26
|
additionalContext?: Record<string, any>
|
package/src/tracking/index.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Analytics } from '@june-so/analytics-node';
|
|
2
2
|
import { PostHog } from 'posthog-node';
|
|
3
|
-
import { type WorkerLog, useLog } from '../log';
|
|
3
|
+
import { type LogBindings, type WorkerLog, useLog } from '../log';
|
|
4
4
|
import { useIntercom } from './intercom';
|
|
5
5
|
|
|
6
6
|
const E2E_TEST_USERS = {
|
|
@@ -122,6 +122,8 @@ type HyperlineEvent =
|
|
|
122
122
|
|
|
123
123
|
type ListingEvent = 'listing_activated' | 'listing_deactivated';
|
|
124
124
|
|
|
125
|
+
type ReportEvent = 'listings_reported';
|
|
126
|
+
|
|
125
127
|
type UserEvent = 'update_refresh_accepted' | 'owner_statement_opened';
|
|
126
128
|
|
|
127
129
|
type TestEvent = 'test_event' | 'test_error';
|
|
@@ -139,6 +141,7 @@ export type TrackingEvent =
|
|
|
139
141
|
| HyperlineEvent
|
|
140
142
|
| UserEvent
|
|
141
143
|
| ListingEvent
|
|
144
|
+
| ReportEvent
|
|
142
145
|
| TestEvent;
|
|
143
146
|
|
|
144
147
|
export type TrackingProps = {
|
|
@@ -148,7 +151,7 @@ export type TrackingProps = {
|
|
|
148
151
|
INTERCOM_TOKEN?: string;
|
|
149
152
|
JUNESO_TOKEN?: string;
|
|
150
153
|
POSTHOG_TOKEN?: string;
|
|
151
|
-
};
|
|
154
|
+
} & LogBindings;
|
|
152
155
|
debugging?: boolean;
|
|
153
156
|
};
|
|
154
157
|
export type Tracking = ReturnType<typeof useTracking>;
|
|
@@ -160,13 +163,13 @@ type TrackProps = OptionalUser<{
|
|
|
160
163
|
}>;
|
|
161
164
|
type IdentifyProps = {
|
|
162
165
|
userId: string;
|
|
163
|
-
traits: Record<string,
|
|
166
|
+
traits: Record<string, string | number | boolean | null | undefined>;
|
|
164
167
|
disableGeoip?: boolean;
|
|
165
168
|
timestamp?: Date;
|
|
166
169
|
};
|
|
167
170
|
type GroupProps = OptionalUser<{
|
|
168
171
|
groupId: string;
|
|
169
|
-
traits?: Record<string,
|
|
172
|
+
traits?: Record<string, string | number | boolean | null | undefined>;
|
|
170
173
|
timestamp?: Date;
|
|
171
174
|
}>;
|
|
172
175
|
type OptionalUser<T> = T &
|
|
@@ -179,7 +182,7 @@ type OptionalUser<T> = T &
|
|
|
179
182
|
);
|
|
180
183
|
|
|
181
184
|
export const useTracking = (
|
|
182
|
-
{ dataset, env, name
|
|
185
|
+
{ dataset, env, name }: TrackingProps,
|
|
183
186
|
isDev?: boolean
|
|
184
187
|
): {
|
|
185
188
|
track: (props: TrackProps) => Promise<void>;
|
|
@@ -191,24 +194,6 @@ export const useTracking = (
|
|
|
191
194
|
intercom?: ReturnType<typeof useIntercom>;
|
|
192
195
|
posthog?: PostHog;
|
|
193
196
|
} => {
|
|
194
|
-
if (debugging) {
|
|
195
|
-
const log = {
|
|
196
|
-
...console,
|
|
197
|
-
child: () => log,
|
|
198
|
-
addContext: (data: Record<string, any>) => console.log(data),
|
|
199
|
-
flush: () => Promise.resolve(),
|
|
200
|
-
respond: () => Promise.resolve(new Response()),
|
|
201
|
-
};
|
|
202
|
-
|
|
203
|
-
return {
|
|
204
|
-
track: async (props: TrackProps) => console.log('track', props),
|
|
205
|
-
identify: async (props: IdentifyProps) => console.log('identify', props),
|
|
206
|
-
group: async (props: GroupProps) => console.log('group', props),
|
|
207
|
-
shutdown: () => Promise.resolve(),
|
|
208
|
-
log,
|
|
209
|
-
};
|
|
210
|
-
}
|
|
211
|
-
|
|
212
197
|
const log = useLog({ name, dataset, env });
|
|
213
198
|
const intercom = env.INTERCOM_TOKEN
|
|
214
199
|
? useIntercom(env.INTERCOM_TOKEN, log)
|