@wireio/shared 1.0.3 → 1.0.4
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/lib/logging/InternalLogger.d.ts +4 -1
- package/lib/logging/InternalLogger.d.ts.map +1 -1
- package/lib/logging/InternalLogger.js +19 -4
- package/lib/logging/InternalLogger.js.map +1 -1
- package/lib/logging/LogRecord.d.ts +7 -4
- package/lib/logging/LogRecord.d.ts.map +1 -1
- package/lib/logging/Logger.d.ts +8 -4
- package/lib/logging/Logger.d.ts.map +1 -1
- package/lib/logging/Logger.js +32 -7
- package/lib/logging/Logger.js.map +1 -1
- package/lib/logging/LoggingManager.d.ts +4 -1
- package/lib/logging/LoggingManager.d.ts.map +1 -1
- package/lib/logging/LoggingManager.js +7 -0
- package/lib/logging/LoggingManager.js.map +1 -1
- package/lib/logging/appenders/aws-firehose/AWSFirehoseAppender.d.ts +3 -2
- package/lib/logging/appenders/aws-firehose/AWSFirehoseAppender.d.ts.map +1 -1
- package/lib/logging/appenders/aws-firehose/AWSFirehoseAppender.js +13 -10
- package/lib/logging/appenders/aws-firehose/AWSFirehoseAppender.js.map +1 -1
- package/lib/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.d.ts +2 -0
- package/lib/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.d.ts.map +1 -1
- package/lib/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.js +7 -3
- package/lib/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,2 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { LevelKind } from "./Level.js";
|
|
2
|
+
import type { Logger } from "./Logger.js";
|
|
3
|
+
export declare function getInternalLogger(): Logger;
|
|
4
|
+
export declare function setInternalLoggerThresholdLevel(level: LevelKind): void;
|
|
2
5
|
//# sourceMappingURL=InternalLogger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalLogger.d.ts","sourceRoot":"","sources":["../../src/logging/InternalLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"InternalLogger.d.ts","sourceRoot":"","sources":["../../src/logging/InternalLogger.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,SAAS,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AAOxD,wBAAgB,iBAAiB,IAAI,MAAM,CAY1C;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAEtE"}
|
|
@@ -1,6 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
import { ConsoleAppender } from "./appenders/ConsoleAppender.js";
|
|
2
|
+
import { Level } from "./Level.js";
|
|
3
|
+
import { getLoggingManager } from "./LoggingManager.js";
|
|
4
|
+
const INTERNAL_CATEGORY = "INTERNAL";
|
|
5
|
+
let internalLogger = null;
|
|
6
|
+
export function getInternalLogger() {
|
|
7
|
+
if (!internalLogger) {
|
|
8
|
+
internalLogger = getLoggingManager().getLogger(INTERNAL_CATEGORY, {
|
|
9
|
+
categoryInterpolator: (inCategory, options) => INTERNAL_CATEGORY,
|
|
10
|
+
overrideAppenders: [new ConsoleAppender()]
|
|
11
|
+
});
|
|
12
|
+
internalLogger.setOverrideLevel(Level.fatal);
|
|
13
|
+
}
|
|
14
|
+
return internalLogger;
|
|
5
15
|
}
|
|
16
|
+
export function setInternalLoggerThresholdLevel(level) {
|
|
17
|
+
getInternalLogger().setOverrideLevel(level);
|
|
18
|
+
}
|
|
19
|
+
;
|
|
20
|
+
window.setInternalLoggerThresholdLevel = setInternalLoggerThresholdLevel;
|
|
6
21
|
//# sourceMappingURL=InternalLogger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalLogger.js","sourceRoot":"","sources":["../../src/logging/InternalLogger.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"InternalLogger.js","sourceRoot":"","sources":["../../src/logging/InternalLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,KAAK,EAAa,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,iBAAiB,GAAG,UAAU,CAAA;AAEpC,IAAI,cAAc,GAAW,IAAI,CAAA;AAEjC,MAAM,UAAU,iBAAiB;IAC/B,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,cAAc,GAAG,iBAAiB,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE;YAChE,oBAAoB,EAAE,CACpB,UAAkB,EAClB,OAAuB,EACvB,EAAE,CAAC,iBAAiB;YACtB,iBAAiB,EAAE,CAAC,IAAI,eAAe,EAAE,CAAC;SAC3C,CAAC,CAAA;QACF,cAAc,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC9C,CAAC;IACD,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAAgB;IAC9D,iBAAiB,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;AAC7C,CAAC;AAED,CAAC;AAAC,MAAc,CAAC,+BAA+B,GAAG,+BAA+B,CAAA"}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import type { LevelKind } from "./Level";
|
|
2
|
-
export interface
|
|
2
|
+
export interface LogMetadata<Data extends {} = any> {
|
|
3
|
+
url?: string;
|
|
4
|
+
env?: string;
|
|
5
|
+
app?: string;
|
|
6
|
+
data?: Data;
|
|
7
|
+
}
|
|
8
|
+
export interface LogRecord<Data extends {} = any> extends LogMetadata<Data> {
|
|
3
9
|
timestamp: number;
|
|
4
10
|
category: string;
|
|
5
11
|
level: LevelKind;
|
|
6
12
|
message: string;
|
|
7
13
|
args?: any[];
|
|
8
|
-
data?: Data;
|
|
9
14
|
tags?: string[];
|
|
10
|
-
url?: string;
|
|
11
|
-
env?: string;
|
|
12
15
|
event?: string;
|
|
13
16
|
errorMessage?: string;
|
|
14
17
|
errorStack?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogRecord.d.ts","sourceRoot":"","sources":["../../src/logging/LogRecord.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LogRecord.d.ts","sourceRoot":"","sources":["../../src/logging/LogRecord.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,WAAW,WAAW,CAAC,IAAI,SAAS,EAAE,GAAG,GAAG;IAChD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,IAAI,CAAA;CACZ;AAED,MAAM,WAAW,SAAS,CAAC,IAAI,SAAS,EAAE,GAAG,GAAG,CAAE,SAAQ,WAAW,CAAC,IAAI,CAAC;IACzE,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,SAAS,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB"}
|
package/lib/logging/Logger.d.ts
CHANGED
|
@@ -1,22 +1,25 @@
|
|
|
1
1
|
import { LevelKind } from "./Level.js";
|
|
2
2
|
import type { LoggingManager } from "./LoggingManager.js";
|
|
3
|
-
import type { LogRecord } from "./LogRecord.js";
|
|
3
|
+
import type { LogMetadata, LogRecord } from "./LogRecord.js";
|
|
4
|
+
import type { Appender } from "./Appender.js";
|
|
4
5
|
export interface LoggerOptions {
|
|
5
6
|
categoryInterpolator: CategoryInterpolator;
|
|
7
|
+
overrideAppenders: Array<Appender<LogRecord>>;
|
|
6
8
|
}
|
|
7
9
|
export type CategoryInterpolator = (inCategory: string, options?: LoggerOptions) => string;
|
|
8
10
|
export declare const filenameCategoryInterpolator: CategoryInterpolator;
|
|
9
11
|
export declare const defaultLoggerOptions: LoggerOptions;
|
|
10
12
|
export declare function toLogRecord(logger: Logger, levelOrRecord: LevelKind | LogRecord, args: any[]): {
|
|
11
13
|
timestamp: number;
|
|
14
|
+
url?: string;
|
|
15
|
+
env?: string;
|
|
16
|
+
app?: string;
|
|
17
|
+
data?: any;
|
|
12
18
|
category: string;
|
|
13
19
|
level: LevelKind;
|
|
14
20
|
message: string;
|
|
15
21
|
args?: any[];
|
|
16
|
-
data?: any;
|
|
17
22
|
tags?: string[];
|
|
18
|
-
url?: string;
|
|
19
|
-
env?: string;
|
|
20
23
|
event?: string;
|
|
21
24
|
errorMessage?: string;
|
|
22
25
|
errorStack?: string;
|
|
@@ -39,6 +42,7 @@ export declare class Logger {
|
|
|
39
42
|
*/
|
|
40
43
|
log(record: LogRecord): void;
|
|
41
44
|
log(level: LevelKind, message: string, ...args: any[]): void;
|
|
45
|
+
log(level: LevelKind, metadata: LogMetadata, message: string, ...args: any[]): void;
|
|
42
46
|
/**
|
|
43
47
|
* Factory for the log
|
|
44
48
|
* level functions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/logging/Logger.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAmB,MAAM,YAAY,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/logging/Logger.ts"],"names":[],"mappings":"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"}
|
package/lib/logging/Logger.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { assert, getValue, isString, isDefined, isFunction, isNumber } from "../guards/index.js";
|
|
2
2
|
import { Option } from "prelude-ts";
|
|
3
|
-
import { pick } from "lodash";
|
|
3
|
+
import { isObject, pick } from "lodash";
|
|
4
4
|
import { LevelThresholds } from "./Level.js";
|
|
5
5
|
import { isLogLevelKind } from "./util.js";
|
|
6
6
|
export const filenameCategoryInterpolator = (filename) => {
|
|
@@ -13,9 +13,22 @@ export const filenameCategoryInterpolator = (filename) => {
|
|
|
13
13
|
return category;
|
|
14
14
|
};
|
|
15
15
|
export const defaultLoggerOptions = {
|
|
16
|
-
categoryInterpolator: filenameCategoryInterpolator
|
|
16
|
+
categoryInterpolator: filenameCategoryInterpolator,
|
|
17
|
+
overrideAppenders: []
|
|
17
18
|
};
|
|
18
19
|
export function toLogRecord(logger, levelOrRecord, args) {
|
|
20
|
+
const globalMetadata = logger.manager.globalMetadata;
|
|
21
|
+
let metadata = {
|
|
22
|
+
...globalMetadata
|
|
23
|
+
};
|
|
24
|
+
if (isString(levelOrRecord) && isObject(args[0])) {
|
|
25
|
+
metadata = { ...metadata, ...args.shift() };
|
|
26
|
+
}
|
|
27
|
+
if (globalMetadata?.data)
|
|
28
|
+
metadata.data = {
|
|
29
|
+
...globalMetadata.data,
|
|
30
|
+
...metadata.data
|
|
31
|
+
};
|
|
19
32
|
const errRecord = Option.ofNullable(args.find((arg) => (isString(arg?.message) && !!arg.stack) || arg instanceof Error)).match({
|
|
20
33
|
Some: (err) => ({
|
|
21
34
|
errorMessage: getValue(() => err.message),
|
|
@@ -32,11 +45,19 @@ export function toLogRecord(logger, levelOrRecord, args) {
|
|
|
32
45
|
args: args.slice(1)
|
|
33
46
|
}
|
|
34
47
|
: levelOrRecord;
|
|
35
|
-
|
|
48
|
+
const record = {
|
|
36
49
|
...recordBase,
|
|
37
50
|
...errRecord,
|
|
51
|
+
...metadata,
|
|
38
52
|
timestamp: isNumber(recordBase.timestamp) && recordBase.timestamp > 0 ? recordBase.timestamp : Date.now(),
|
|
39
53
|
};
|
|
54
|
+
if (metadata.data) {
|
|
55
|
+
record.data = {
|
|
56
|
+
...metadata.data,
|
|
57
|
+
...(recordBase.data ?? {})
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
return record;
|
|
40
61
|
}
|
|
41
62
|
export class Logger {
|
|
42
63
|
manager;
|
|
@@ -65,7 +86,12 @@ export class Logger {
|
|
|
65
86
|
}
|
|
66
87
|
log(levelOrRecord, ...args) {
|
|
67
88
|
const record = toLogRecord(this, levelOrRecord, args);
|
|
68
|
-
this.
|
|
89
|
+
if (this.options.overrideAppenders.length) {
|
|
90
|
+
this.options.overrideAppenders.forEach((appender) => appender.append(record));
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
this.manager.fire(record);
|
|
94
|
+
}
|
|
69
95
|
}
|
|
70
96
|
/**
|
|
71
97
|
* Factory for the log
|
|
@@ -94,10 +120,9 @@ export class Logger {
|
|
|
94
120
|
return () => {
|
|
95
121
|
const { rootThreshold } = this.manager;
|
|
96
122
|
const globalOverrideThreshold = this.manager.determineThresholdOverride(this.category);
|
|
97
|
-
const categoryThresholds = [
|
|
123
|
+
const categoryThresholds = isNumber(this.overrideThreshold) ? [this.overrideThreshold] : [
|
|
98
124
|
globalOverrideThreshold,
|
|
99
|
-
rootThreshold
|
|
100
|
-
this.overrideThreshold
|
|
125
|
+
rootThreshold
|
|
101
126
|
].filter(isNumber);
|
|
102
127
|
const categoryThreshold = Math.min(...categoryThresholds);
|
|
103
128
|
const recordThreshold = LevelThresholds[level];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/logging/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAChG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/logging/Logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { Appender } from "./Appender.js";
|
|
2
2
|
import { LevelKind } from "./Level.js";
|
|
3
3
|
import { Logger, LoggerOptions } from "./Logger.js";
|
|
4
|
-
import type { LogRecord } from "./LogRecord.js";
|
|
4
|
+
import type { LogMetadata, LogRecord } from "./LogRecord.js";
|
|
5
5
|
import { LogContext } from "./context/index.js";
|
|
6
6
|
export type CategoryMatch = RegExp | string;
|
|
7
7
|
export type ThresholdOverride = [match: CategoryMatch, level: LevelKind];
|
|
8
8
|
export interface LoggingManagerState<Record extends LogRecord> {
|
|
9
9
|
rootLevel: LevelKind;
|
|
10
|
+
globalMetadata?: LogMetadata;
|
|
10
11
|
appenders: Array<Appender<Record>>;
|
|
11
12
|
thresholdOverrides: Array<ThresholdOverride>;
|
|
12
13
|
}
|
|
@@ -19,6 +20,8 @@ export declare class LoggingManager<Record extends LogRecord = any> {
|
|
|
19
20
|
private readonly loggers;
|
|
20
21
|
private readonly state;
|
|
21
22
|
get rootLevel(): LevelKind;
|
|
23
|
+
get globalMetadata(): LogMetadata;
|
|
24
|
+
set globalMetadata(newMetadata: LogMetadata);
|
|
22
25
|
set rootLevel(newRootLevel: LevelKind);
|
|
23
26
|
get rootThreshold(): number;
|
|
24
27
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingManager.d.ts","sourceRoot":"","sources":["../../src/logging/LoggingManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAS,SAAS,EAAmB,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"LoggingManager.d.ts","sourceRoot":"","sources":["../../src/logging/LoggingManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,12 +22,19 @@ export class LoggingManager {
|
|
|
22
22
|
loggers = new Map();
|
|
23
23
|
state = {
|
|
24
24
|
appenders: [],
|
|
25
|
+
globalMetadata: {},
|
|
25
26
|
rootLevel: Level.info,
|
|
26
27
|
thresholdOverrides: kEnvThresholdOverrides
|
|
27
28
|
};
|
|
28
29
|
get rootLevel() {
|
|
29
30
|
return this.state.rootLevel;
|
|
30
31
|
}
|
|
32
|
+
get globalMetadata() {
|
|
33
|
+
return this.state.globalMetadata;
|
|
34
|
+
}
|
|
35
|
+
set globalMetadata(newMetadata) {
|
|
36
|
+
this.state.globalMetadata = newMetadata ?? {};
|
|
37
|
+
}
|
|
31
38
|
set rootLevel(newRootLevel) {
|
|
32
39
|
this.state.rootLevel = newRootLevel;
|
|
33
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingManager.js","sourceRoot":"","sources":["../../src/logging/LoggingManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,KAAK,EAAa,eAAe,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAc,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"LoggingManager.js","sourceRoot":"","sources":["../../src/logging/LoggingManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAAE,KAAK,EAAa,eAAe,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAA;AAEnD,OAAO,EAAc,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAiB7C,SAAS,8BAA8B,CACrC,KAAa,EACb,QAAmB,OAAO;IAE1B,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAsB,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;KAClH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACvB,GAAG,CAAC,8BAA8B,CAAC;KACnC,SAAS,CAAC,EAAE,CAAC,CAAA;AAEhB;;GAEG;AACH,MAAM,OAAO,cAAc;IACR,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEnC,KAAK,GAAgC;QACpD,SAAS,EAAE,EAAE;QACb,cAAc,EAAE,EAAE;QAClB,SAAS,EAAE,KAAK,CAAC,IAAI;QACrB,kBAAkB,EAAE,sBAAsB;KAC3C,CAAA;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;IAC7B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAA;IAClC,CAAC;IAED,IAAI,cAAc,CAAC,WAAwB;QACzC,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,WAAW,IAAI,EAAE,CAAA;IAC/C,CAAC;IAED,IAAI,SAAS,CAAC,YAAuB;QACnC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAA;IACrC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACxC,CAAC;IAED;;;;OAIG;IACH,IAAI,SAAS;QACX,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;aAC3C,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;aAC3C,SAAS,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;YAChD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;OAEG;IACH,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAA;IACtC,CAAC;IAED;;;;OAIG;IACH,IAAI,kBAAkB,CAAC,YAAgC;QACrD,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,YAAY,CAAA;IAC9C,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,GAAG,YAA0D;QACxE,wEAAwE;QACxE,sCAAsC;QACtC,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;QAChD,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAA;QAC9B,mBAAmB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;QAElD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,GAAG,YAA0D;QACxE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;QACnD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACH,uBAAuB;QACrB,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAA;QACxC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,qBAAqB,CAAC,GAAG,SAAmC;QAC1D,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAA;QAChD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,qBAAqB,CAAC,GAAG,SAAmC;QAC1D,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAA;QAChD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACH,4BAA4B,CAAC,QAAgB;QAC3C,OAAO,mBAAmB,CAAC,cAAc,EAAE,CAAC,MAAM,CAChD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CACpD,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,0BAA0B,CAAC,QAAgB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC;QAE5D,iCAAiC;QAC/B,iBAAiB,GAAG,MAAM,CAAC,UAAU,CACnC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CACvC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,KAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CACxE,CACF;aACE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACX,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAc,CAAC,CAAC;aAC/C,SAAS,EAAE;QACd,mCAAmC;QACnC,iBAAiB,GAAG,QAAQ;aACzB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC7C,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAC/D,+CAA+C;QAC/C,QAAQ,GAAG,MAAM,CAAC,UAAU,CAC1B,CAAC,GAAG,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAC3D;aACE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACvB,GAAG,CAAC,GAAG,CAAC;aACR,SAAS,EAAE,CAAA;QAEhB,OAAO,QAAkB,CAAA;IAC3B,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,QAAmB;QAC9B,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,CAAC,MAAyB;QAC5B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,EACzB,QAAQ,GAAG,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,EACtD,gBAAgB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EACrD,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,gBAAgB,CAAC,CAAA;QAEtD,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAgB,CAAC,CAAC,CAAA;IACpE,CAAC;IAED;;;;;;;OAOG;IACH,SAAS,CACP,kBAA0B,EAC1B,YAAoC,EAAE;QAEtC,MAAM,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAA;QAExE,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;aAC/B,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC7C,SAAS,CAAC,GAAG,EAAE;YACd,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YAClD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAClC,OAAO,MAAM,CAAA;QACf,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAmC;QAC3C,IAAI,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,OAAO,EAAE,kBAAkB,EAAE,CAAC;YAChC,IAAI,CAAC,qBAAqB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAA;QAC3D,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;QACE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,OAAO,CAAgB;IAEtC;;;;;;OAMG;IACH,MAAM,CAAC,GAAG,CACR,UAAyC,IAAI;QAE7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,EAAU,CAAA;QAC7C,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACjC,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,cAAc,CAAC,GAAG,EAAE,CAAA;AAC7B,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/E,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,EAAE,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;SAChG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QACnC,cAAc,EAAE,iBAAiB,EAAE;KACpC,CAAC,CAAC,CAAA;AACP,CAAC"}
|
|
@@ -2,11 +2,12 @@ import AWSFirehoseCredentialManager from "./AWSFirehoseCredentialManager.js";
|
|
|
2
2
|
import { LogRecord } from "../../LogRecord.js";
|
|
3
3
|
import { Appender } from "../../Appender.js";
|
|
4
4
|
export declare class AWSFirehoseAppender<Record extends LogRecord = LogRecord> implements Appender<Record> {
|
|
5
|
-
readonly
|
|
5
|
+
readonly credentialEndpointUrl: string;
|
|
6
6
|
private pendingRecords;
|
|
7
7
|
private flushDeferred;
|
|
8
8
|
private flushIntervalMs;
|
|
9
|
-
|
|
9
|
+
readonly credentialManager: AWSFirehoseCredentialManager;
|
|
10
|
+
constructor(credentialEndpointUrl: string);
|
|
10
11
|
append(record: Record): void;
|
|
11
12
|
/**
|
|
12
13
|
* Create the firehose client and return
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSFirehoseAppender.d.ts","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseAppender.ts"],"names":[],"mappings":"AASA,OAAO,4BAA4B,MAAM,mCAAmC,CAAA;AAK5E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"AWSFirehoseAppender.d.ts","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseAppender.ts"],"names":[],"mappings":"AASA,OAAO,4BAA4B,MAAM,mCAAmC,CAAA;AAK5E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAM5C,qBAAa,mBAAmB,CAAC,MAAM,SAAS,SAAS,GAAG,SAAS,CACnE,YAAW,QAAQ,CAAC,MAAM,CAAC;aAQT,qBAAqB,EAAE,MAAM;IAP/C,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,eAAe,CAAQ;IAE/B,SAAgB,iBAAiB,EAAE,4BAA4B,CAAA;gBAG7C,qBAAqB,EAAE,MAAM;IAc/C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAoB5B;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IAsBnB;;;;OAIG;YACW,KAAK;CA+EpB;AAED,eAAe,mBAAmB,CAAA"}
|
|
@@ -5,15 +5,17 @@ import { getInternalLogger } from "../../InternalLogger.js";
|
|
|
5
5
|
import { pick } from "lodash";
|
|
6
6
|
import { Deferred } from "../../../helpers/index.js";
|
|
7
7
|
const LogQueueMaxRecords = 10000;
|
|
8
|
-
const log = getInternalLogger(
|
|
8
|
+
const log = getInternalLogger();
|
|
9
9
|
export class AWSFirehoseAppender {
|
|
10
|
-
|
|
10
|
+
credentialEndpointUrl;
|
|
11
11
|
pendingRecords = Array();
|
|
12
12
|
flushDeferred;
|
|
13
13
|
flushIntervalMs = 1000;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
credentialManager;
|
|
15
|
+
constructor(credentialEndpointUrl) {
|
|
16
|
+
this.credentialEndpointUrl = credentialEndpointUrl;
|
|
17
|
+
this.credentialManager = new AWSFirehoseCredentialManager(credentialEndpointUrl);
|
|
18
|
+
this.credentialManager.on("received", () => {
|
|
17
19
|
log.info("Credentials received, initializing firehose client");
|
|
18
20
|
if (!this.pendingRecords.length || !!this.flushDeferred) {
|
|
19
21
|
log.debug("Nothing to flush upon credential receipt OR flush already in progress");
|
|
@@ -31,11 +33,11 @@ export class AWSFirehoseAppender {
|
|
|
31
33
|
this.pendingRecords.splice(0, Math.abs(removeCount));
|
|
32
34
|
}
|
|
33
35
|
this.pendingRecords.push({
|
|
34
|
-
...record,
|
|
35
|
-
app: "web",
|
|
36
36
|
timestamp: Date.now(),
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
...record,
|
|
38
|
+
app: record.app?.length > 0 ? record.app : "UNKNOWN",
|
|
39
|
+
env: record.env?.length > 0 ? record.env : "UNKNOWN",
|
|
40
|
+
url: typeof window === "undefined" ? "local://" : window.location.href,
|
|
39
41
|
});
|
|
40
42
|
this.flush();
|
|
41
43
|
}
|
|
@@ -90,7 +92,8 @@ export class AWSFirehoseAppender {
|
|
|
90
92
|
try {
|
|
91
93
|
while (this.pendingRecords.length) {
|
|
92
94
|
const chunkSize = Math.min(this.pendingRecords.length, 10), records = this.pendingRecords.splice(0, chunkSize), recordJsons = records.map(record => JSON.stringify(record));
|
|
93
|
-
|
|
95
|
+
if (log.isDebugEnabled())
|
|
96
|
+
log.debug("Records", records);
|
|
94
97
|
const textEncoder = new TextEncoder(), batch = recordJsons.map(jsonStr => ({
|
|
95
98
|
Data: textEncoder.encode(jsonStr)
|
|
96
99
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSFirehoseAppender.js","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseAppender.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAuB,MAAM,0BAA0B,CAAA;AACrG,OAAO,EAEL,qBAAqB,GACtB,MAAM,qBAAqB,CAAA;AAG5B,OAAO,4BAA4B,MAAM,mCAAmC,CAAA;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,OAAO,
|
|
1
|
+
{"version":3,"file":"AWSFirehoseAppender.js","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseAppender.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,10 @@ export interface AWSFirehoseCredentialManagerEventMap {
|
|
|
12
12
|
expired: () => void;
|
|
13
13
|
}
|
|
14
14
|
export declare class AWSFirehoseCredentialManager extends EventEmitter3<AWSFirehoseCredentialManagerEventMap> {
|
|
15
|
+
readonly credentialEndpointUrl: string;
|
|
15
16
|
private refreshTimer;
|
|
16
17
|
private loadDeferred;
|
|
18
|
+
constructor(credentialEndpointUrl: string);
|
|
17
19
|
forceUpdateCredentials(): void;
|
|
18
20
|
getCredentials(): AWSCredentials;
|
|
19
21
|
hasCredentials(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSFirehoseCredentialManager.d.ts","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.ts"],"names":[],"mappings":"AAGA,OAAO,aAAa,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"AWSFirehoseCredentialManager.d.ts","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.ts"],"names":[],"mappings":"AAGA,OAAO,aAAa,MAAM,eAAe,CAAA;AAMzC,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,oCAAoC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB;AAED,qBAAa,4BAA6B,SAAQ,aAAa,CAAC,oCAAoC,CAAC;aAMjF,qBAAqB,EAAE,MAAM;IAJ/C,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,YAAY,CAAkC;gBAGpC,qBAAqB,EAAE,MAAM;IAK/C,sBAAsB,IAAI,IAAI;IAS9B,cAAc,IAAI,cAAc;IAmBhC,cAAc,IAAI,OAAO;YAIX,IAAI;IAyBlB,eAAe,CAAC,aAAa,EAAE,cAAc,GAAG,MAAM,GAAG,IAAI;IA4B7D,aAAa,IAAI,MAAM;IAIvB,SAAS,IAAI,MAAM;IAInB,OAAO,IAAI,IAAI;CAMhB;AAGD,eAAe,4BAA4B,CAAA"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { Deferred } from "../../../helpers/index.js";
|
|
2
2
|
import { getInternalLogger } from "../../InternalLogger.js";
|
|
3
3
|
import EventEmitter3 from "eventemitter3";
|
|
4
|
-
const API_BASE = "https://log-ingest.shared.wire-dev.com";
|
|
5
4
|
const CRED_BUFFER_PADDING_MS = 3 * 60 * 1000; // 3 minutes
|
|
6
|
-
const log = getInternalLogger(
|
|
5
|
+
const log = getInternalLogger();
|
|
7
6
|
export class AWSFirehoseCredentialManager extends EventEmitter3 {
|
|
7
|
+
credentialEndpointUrl;
|
|
8
8
|
refreshTimer = null;
|
|
9
9
|
loadDeferred = null;
|
|
10
|
+
constructor(credentialEndpointUrl) {
|
|
11
|
+
super();
|
|
12
|
+
this.credentialEndpointUrl = credentialEndpointUrl;
|
|
13
|
+
}
|
|
10
14
|
forceUpdateCredentials() {
|
|
11
15
|
if (this.loadDeferred && !this.loadDeferred.isSettled()) {
|
|
12
16
|
this.loadDeferred.reject(new Error("force update"));
|
|
@@ -37,7 +41,7 @@ export class AWSFirehoseCredentialManager extends EventEmitter3 {
|
|
|
37
41
|
return this.loadDeferred.promise;
|
|
38
42
|
const deferred = this.loadDeferred = new Deferred();
|
|
39
43
|
try {
|
|
40
|
-
const r = await fetch(
|
|
44
|
+
const r = await fetch(this.credentialEndpointUrl, {
|
|
41
45
|
method: "GET",
|
|
42
46
|
credentials: "include",
|
|
43
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSFirehoseCredentialManager.js","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,aAAa,MAAM,eAAe,CAAA;AAEzC,MAAM,
|
|
1
|
+
{"version":3,"file":"AWSFirehoseCredentialManager.js","sourceRoot":"","sources":["../../../../src/logging/appenders/aws-firehose/AWSFirehoseCredentialManager.ts"],"names":[],"mappings":"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"}
|