@onecx/accelerator 7.0.4 → 8.0.0-rc.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/package.json +3 -2
- package/src/index.d.ts +1 -0
- package/src/index.js +1 -0
- package/src/index.js.map +1 -1
- package/src/lib/declarations.d.ts +1 -3
- package/src/lib/declarations.js +1 -2
- package/src/lib/declarations.js.map +1 -1
- package/src/lib/topic/topic-publisher.d.ts +2 -1
- package/src/lib/topic/topic-publisher.js +6 -8
- package/src/lib/topic/topic-publisher.js.map +1 -1
- package/src/lib/topic/topic.d.ts +1 -4
- package/src/lib/topic/topic.js +10 -30
- package/src/lib/topic/topic.js.map +1 -1
- package/src/lib/utils/create-logger.utils.d.ts +42 -0
- package/src/lib/utils/create-logger.utils.js +40 -0
- package/src/lib/utils/create-logger.utils.js.map +1 -0
- package/src/lib/utils/gatherer.d.ts +1 -1
- package/src/lib/utils/gatherer.js +9 -11
- package/src/lib/utils/gatherer.js.map +1 -1
- package/src/lib/utils/logger.utils.d.ts +1 -0
- package/src/lib/utils/logger.utils.js +7 -0
- package/src/lib/utils/logger.utils.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onecx/accelerator",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0-rc.2",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
"tslib": "^2.6.3",
|
|
11
11
|
"rxjs": "^7.8.1",
|
|
12
12
|
"@nx/devkit": "^22.0.2",
|
|
13
|
-
"@onecx/nx-migration-utils": "^
|
|
13
|
+
"@onecx/nx-migration-utils": "^8.0.0-rc.2",
|
|
14
|
+
"debug": "^4.4.3"
|
|
14
15
|
},
|
|
15
16
|
"type": "commonjs",
|
|
16
17
|
"main": "./src/index.js",
|
package/src/index.d.ts
CHANGED
package/src/index.js
CHANGED
|
@@ -12,4 +12,5 @@ tslib_1.__exportStar(require("./lib/utils/is-test.utils"), exports);
|
|
|
12
12
|
tslib_1.__exportStar(require("./lib/utils/normalize-locales.utils"), exports);
|
|
13
13
|
tslib_1.__exportStar(require("./lib/utils/get-normalized-browser-locales.utils"), exports);
|
|
14
14
|
tslib_1.__exportStar(require("./lib/utils/gatherer"), exports);
|
|
15
|
+
tslib_1.__exportStar(require("./lib/utils/create-logger.utils"), exports);
|
|
15
16
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/accelerator/src/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC;AACjC,uEAA4C;AAC5C,mFAAwD;AACxD,qEAA0C;AAC1C,sEAA2C;AAC3C,iEAAsC;AACtC,iEAAsC;AACtC,oEAAyC;AACzC,8EAAmD;AACnD,2FAAgE;AAChE,+DAAoC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/accelerator/src/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC;AACjC,uEAA4C;AAC5C,mFAAwD;AACxD,qEAA0C;AAC1C,sEAA2C;AAC3C,iEAAsC;AACtC,iEAAsC;AACtC,oEAAyC;AACzC,8EAAmD;AACnD,2FAAgE;AAChE,+DAAoC;AACpC,0EAA+C"}
|
|
@@ -2,13 +2,11 @@ declare global {
|
|
|
2
2
|
interface Window {
|
|
3
3
|
'@onecx/accelerator': {
|
|
4
4
|
gatherer?: {
|
|
5
|
-
debug?: string[];
|
|
6
5
|
promises?: {
|
|
7
6
|
[id: number]: Promise<unknown>[];
|
|
8
7
|
};
|
|
9
8
|
};
|
|
10
9
|
topic?: {
|
|
11
|
-
debug?: string[];
|
|
12
10
|
statsEnabled?: boolean;
|
|
13
11
|
stats?: {
|
|
14
12
|
messagesPublished?: {
|
|
@@ -22,7 +20,7 @@ declare global {
|
|
|
22
20
|
[topicName: string]: number;
|
|
23
21
|
};
|
|
24
22
|
};
|
|
25
|
-
useBroadcastChannel?: boolean
|
|
23
|
+
useBroadcastChannel?: boolean;
|
|
26
24
|
initDate?: number;
|
|
27
25
|
tabId?: number;
|
|
28
26
|
};
|
package/src/lib/declarations.js
CHANGED
|
@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
window['@onecx/accelerator'] ??= {};
|
|
4
4
|
window['@onecx/accelerator'].gatherer ??= {};
|
|
5
5
|
window['@onecx/accelerator'].gatherer.promises ??= {};
|
|
6
|
-
window['@onecx/accelerator'].gatherer.debug ??= [];
|
|
7
6
|
window['@onecx/accelerator'].topic ??= {};
|
|
8
|
-
window['@onecx/accelerator'].topic.useBroadcastChannel ??=
|
|
7
|
+
window['@onecx/accelerator'].topic.useBroadcastChannel ??= true;
|
|
9
8
|
window['@onecx/accelerator'].topic.initDate ??= Date.now();
|
|
10
9
|
window['@onecx/accelerator'].topic.tabId = Math.ceil(globalThis.performance.now());
|
|
11
10
|
exports.default = globalThis;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../../../../libs/accelerator/src/lib/declarations.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"declarations.js","sourceRoot":"","sources":["../../../../../libs/accelerator/src/lib/declarations.ts"],"names":[],"mappings":";;AA0BA,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAA;AACnC,MAAM,CAAC,oBAAoB,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAA;AAC5C,MAAM,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,QAAQ,KAAK,EAAE,CAAA;AACrD,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,KAAK,EAAE,CAAA;AACzC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,mBAAmB,KAAK,IAAI,CAAA;AAC/D,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,GAAG,EAAE,CAAA;AAC1D,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAA;AAElF,kBAAe,UAAU,CAAA"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { TopicMessage } from './topic-message';
|
|
2
|
+
import { ComponentLogger } from '../utils/create-logger.utils';
|
|
2
3
|
export declare class TopicPublisher<T> {
|
|
3
4
|
name: string;
|
|
4
5
|
version: number;
|
|
5
6
|
protected publishPromiseResolver: Record<number, () => void>;
|
|
6
7
|
protected publishBroadcastChannel: BroadcastChannel | undefined;
|
|
7
|
-
protected
|
|
8
|
+
protected readonly baseLogger: ComponentLogger;
|
|
8
9
|
constructor(name: string, version: number);
|
|
9
10
|
publish(value: T): Promise<void>;
|
|
10
11
|
protected createBroadcastChannel(): void;
|
|
@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TopicPublisher = void 0;
|
|
4
4
|
const topic_data_message_1 = require("./topic-data-message");
|
|
5
5
|
const topic_resolve_message_1 = require("./topic-resolve-message");
|
|
6
|
+
const logger_utils_1 = require("../utils/logger.utils");
|
|
6
7
|
class TopicPublisher {
|
|
7
8
|
name;
|
|
8
9
|
version;
|
|
9
10
|
publishPromiseResolver = {};
|
|
10
11
|
publishBroadcastChannel;
|
|
11
|
-
|
|
12
|
+
baseLogger;
|
|
12
13
|
constructor(name, version) {
|
|
13
14
|
this.name = name;
|
|
14
15
|
this.version = version;
|
|
16
|
+
this.baseLogger = (0, logger_utils_1.createLogger)(`TopicPublisher:${this.name}`);
|
|
15
17
|
}
|
|
16
18
|
publish(value) {
|
|
17
19
|
const message = new topic_data_message_1.TopicDataMessage("TopicNext" /* TopicMessageType.TopicNext */, this.name, this.version, value);
|
|
@@ -29,23 +31,19 @@ class TopicPublisher {
|
|
|
29
31
|
}
|
|
30
32
|
if (window['@onecx/accelerator']?.topic?.useBroadcastChannel) {
|
|
31
33
|
if (typeof BroadcastChannel === 'undefined') {
|
|
32
|
-
|
|
34
|
+
this.baseLogger.info('BroadcastChannel not supported. Disabling BroadcastChannel for topic publisher');
|
|
33
35
|
window['@onecx/accelerator'] ??= {};
|
|
34
36
|
window['@onecx/accelerator'].topic ??= {};
|
|
35
37
|
window['@onecx/accelerator'].topic.useBroadcastChannel = false;
|
|
36
38
|
}
|
|
37
39
|
else {
|
|
38
|
-
this.publishBroadcastChannel = new BroadcastChannel(`Topic-${this.name}|${this.version}`);
|
|
39
|
-
this.publishBroadcastChannelV2 = new BroadcastChannel(`TopicV2-${this.name}|${this.version}-${window['@onecx/accelerator'].topic.tabId}`);
|
|
40
|
+
this.publishBroadcastChannel = new BroadcastChannel(`Topic-${this.name}|${this.version}-${window['@onecx/accelerator'].topic.tabId}`);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
44
|
sendMessage(message) {
|
|
44
45
|
this.createBroadcastChannel();
|
|
45
|
-
if (window['@onecx/accelerator']?.topic?.useBroadcastChannel
|
|
46
|
-
this.publishBroadcastChannelV2?.postMessage(message);
|
|
47
|
-
}
|
|
48
|
-
else if (window['@onecx/accelerator']?.topic?.useBroadcastChannel) {
|
|
46
|
+
if (window['@onecx/accelerator']?.topic?.useBroadcastChannel) {
|
|
49
47
|
this.publishBroadcastChannel?.postMessage(message);
|
|
50
48
|
}
|
|
51
49
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"topic-publisher.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/topic/topic-publisher.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AAGvD,mEAA6D;
|
|
1
|
+
{"version":3,"file":"topic-publisher.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/topic/topic-publisher.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AAGvD,mEAA6D;AAC7D,wDAAoD;AAIpD,MAAa,cAAc;IAMhB;IACA;IANC,sBAAsB,GAA+B,EAAE,CAAA;IACvD,uBAAuB,CAA8B;IAC5C,UAAU,CAAiB;IAE9C,YACS,IAAY,EACZ,OAAe;QADf,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAQ;QAEtB,IAAI,CAAC,UAAU,GAAG,IAAA,2BAAY,EAAC,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAC/D,CAAC;IAEM,OAAO,CAAC,KAAQ;QACrB,MAAM,OAAO,GAAG,IAAI,qCAAgB,+CAAgC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACnG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACzB,MAAM,cAAc,GAAG,IAAI,2CAAmB,qDAAgC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;QAClH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC5C,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAA;QACnD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;QAChC,OAAO,OAAO,CAAA;IAChB,CAAC;IAES,sBAAsB;QAC9B,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,OAAM;QACR,CAAC;QAED,IAAI,MAAM,CAAC,oBAAoB,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;YAC7D,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE,CAAC;gBAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAA;gBACtG,MAAM,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAA;gBACnC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,KAAK,EAAE,CAAA;gBACzC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAA;YAChE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,uBAAuB,GAAG,IAAI,gBAAgB,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;YACvI,CAAC;QACH,CAAC;IACH,CAAC;IAES,WAAW,CAAC,OAAqB;QACzC,IAAI,CAAC,sBAAsB,EAAE,CAAA;QAC7B,IAAI,MAAM,CAAC,oBAAoB,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;YAC7D,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;QACpD,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;QAClC,CAAC;IACH,CAAC;CACF;AAhDD,wCAgDC"}
|
package/src/lib/topic/topic.d.ts
CHANGED
|
@@ -3,13 +3,13 @@ import { TopicDataMessage } from './topic-data-message';
|
|
|
3
3
|
import { TopicPublisher } from './topic-publisher';
|
|
4
4
|
import '../declarations';
|
|
5
5
|
export declare class Topic<T> extends TopicPublisher<T> implements Subscribable<T> {
|
|
6
|
+
private readonly logger;
|
|
6
7
|
protected isInitializedPromise: Promise<void>;
|
|
7
8
|
protected data: BehaviorSubject<TopicDataMessage<T> | undefined>;
|
|
8
9
|
protected isInit: boolean;
|
|
9
10
|
private resolveInitPromise;
|
|
10
11
|
private readonly windowEventListener;
|
|
11
12
|
protected readonly readBroadcastChannel: BroadcastChannel | undefined;
|
|
12
|
-
protected readonly readBroadcastChannelV2: BroadcastChannel | undefined;
|
|
13
13
|
constructor(name: string, version: number, sendGetMessage?: boolean);
|
|
14
14
|
get isInitialized(): Promise<void>;
|
|
15
15
|
asObservable(): Observable<T>;
|
|
@@ -51,10 +51,7 @@ export declare class Topic<T> extends TopicPublisher<T> implements Subscribable<
|
|
|
51
51
|
destroy(): void;
|
|
52
52
|
private onWindowMessage;
|
|
53
53
|
private onBroadcastChannelMessage;
|
|
54
|
-
private onBroadcastChannelMessageV2;
|
|
55
54
|
private disableBroadcastChannel;
|
|
56
|
-
private isLogEnabled;
|
|
57
|
-
private disableBroadcastChannelV2;
|
|
58
55
|
private handleTopicResolveMessage;
|
|
59
56
|
private handleTopicGetMessage;
|
|
60
57
|
private handleTopicNextMessage;
|
package/src/lib/topic/topic.js
CHANGED
|
@@ -7,14 +7,15 @@ const topic_message_1 = require("./topic-message");
|
|
|
7
7
|
const topic_publisher_1 = require("./topic-publisher");
|
|
8
8
|
require("../declarations");
|
|
9
9
|
const logs_utils_1 = require("../utils/logs.utils");
|
|
10
|
+
const logger_utils_1 = require("../utils/logger.utils");
|
|
10
11
|
class Topic extends topic_publisher_1.TopicPublisher {
|
|
12
|
+
logger = (0, logger_utils_1.createLogger)(`Topic:${this.name}`);
|
|
11
13
|
isInitializedPromise;
|
|
12
14
|
data = new rxjs_1.BehaviorSubject(undefined);
|
|
13
15
|
isInit = false;
|
|
14
16
|
resolveInitPromise;
|
|
15
17
|
windowEventListener = (m) => this.onWindowMessage(m);
|
|
16
18
|
readBroadcastChannel;
|
|
17
|
-
readBroadcastChannelV2;
|
|
18
19
|
constructor(name, version, sendGetMessage = true) {
|
|
19
20
|
super(name, version);
|
|
20
21
|
window['@onecx/accelerator'] ??= {};
|
|
@@ -22,14 +23,13 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
22
23
|
window['@onecx/accelerator'].topic.initDate ??= Date.now();
|
|
23
24
|
if (window['@onecx/accelerator']?.topic?.useBroadcastChannel) {
|
|
24
25
|
if (typeof BroadcastChannel === 'undefined') {
|
|
25
|
-
|
|
26
|
+
this.logger.info('BroadcastChannel not supported. Disabling BroadcastChannel for topic');
|
|
26
27
|
window['@onecx/accelerator'] ??= {};
|
|
27
28
|
window['@onecx/accelerator'].topic ??= {};
|
|
28
29
|
window['@onecx/accelerator'].topic.useBroadcastChannel = false;
|
|
29
30
|
}
|
|
30
31
|
else {
|
|
31
|
-
this.readBroadcastChannel = new BroadcastChannel(`Topic-${this.name}|${this.version}`);
|
|
32
|
-
this.readBroadcastChannelV2 = new BroadcastChannel(`TopicV2-${this.name}|${this.version}-${window['@onecx/accelerator'].topic.tabId}`);
|
|
32
|
+
this.readBroadcastChannel = new BroadcastChannel(`Topic-${this.name}|${this.version}-${window['@onecx/accelerator'].topic.tabId}`);
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
if ((0, logs_utils_1.isStatsEnabled)()) {
|
|
@@ -40,7 +40,6 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
40
40
|
});
|
|
41
41
|
window.addEventListener('message', this.windowEventListener);
|
|
42
42
|
this.readBroadcastChannel?.addEventListener('message', (m) => this.onBroadcastChannelMessage(m));
|
|
43
|
-
this.readBroadcastChannelV2?.addEventListener('message', (m) => this.onBroadcastChannelMessageV2(m));
|
|
44
43
|
if (sendGetMessage) {
|
|
45
44
|
if (window['@onecx/accelerator'].topic.initDate &&
|
|
46
45
|
Date.now() - window['@onecx/accelerator'].topic.initDate < 2000) {
|
|
@@ -104,12 +103,10 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
104
103
|
window.removeEventListener('message', this.windowEventListener, true);
|
|
105
104
|
this.readBroadcastChannel?.close();
|
|
106
105
|
this.publishBroadcastChannel?.close();
|
|
107
|
-
this.readBroadcastChannelV2?.close();
|
|
108
|
-
this.publishBroadcastChannelV2?.close();
|
|
109
106
|
}
|
|
110
107
|
onWindowMessage(m) {
|
|
111
|
-
if (
|
|
112
|
-
|
|
108
|
+
if (m.data?.name === this.name && m.data?.version === this.version) {
|
|
109
|
+
this.logger.debug('received message via window', m.data);
|
|
113
110
|
}
|
|
114
111
|
switch (m.data.type) {
|
|
115
112
|
case "TopicNext" /* TopicMessageType.TopicNext */: {
|
|
@@ -134,13 +131,7 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
134
131
|
}
|
|
135
132
|
}
|
|
136
133
|
onBroadcastChannelMessage(m) {
|
|
137
|
-
this.
|
|
138
|
-
this.onBroadcastChannelMessageV2(m);
|
|
139
|
-
}
|
|
140
|
-
onBroadcastChannelMessageV2(m) {
|
|
141
|
-
if (this.isLogEnabled()) {
|
|
142
|
-
console.log('Topic', this.name, ':', this.version, 'received message', m.data);
|
|
143
|
-
}
|
|
134
|
+
this.logger.debug('received message', m.data);
|
|
144
135
|
switch (m.data.type) {
|
|
145
136
|
case "TopicNext" /* TopicMessageType.TopicNext */: {
|
|
146
137
|
this.handleTopicNextMessage(m);
|
|
@@ -162,21 +153,10 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
162
153
|
window['@onecx/accelerator'] ??= {};
|
|
163
154
|
window['@onecx/accelerator'].topic ??= {};
|
|
164
155
|
if (window['@onecx/accelerator'].topic.useBroadcastChannel === true) {
|
|
165
|
-
|
|
156
|
+
this.logger.info('Disabling BroadcastChannel for topic');
|
|
166
157
|
}
|
|
167
158
|
window['@onecx/accelerator'].topic.useBroadcastChannel = false;
|
|
168
159
|
}
|
|
169
|
-
isLogEnabled() {
|
|
170
|
-
return window['@onecx/accelerator']?.topic?.debug?.includes(this.name);
|
|
171
|
-
}
|
|
172
|
-
disableBroadcastChannelV2() {
|
|
173
|
-
window['@onecx/accelerator'] ??= {};
|
|
174
|
-
window['@onecx/accelerator'].topic ??= {};
|
|
175
|
-
if (window['@onecx/accelerator'].topic.useBroadcastChannel === "V2") {
|
|
176
|
-
console.log('Disabling BroadcastChannel V2 for topic');
|
|
177
|
-
}
|
|
178
|
-
window['@onecx/accelerator'].topic.useBroadcastChannel = true;
|
|
179
|
-
}
|
|
180
160
|
handleTopicResolveMessage(m) {
|
|
181
161
|
const publishPromiseResolver = this.publishPromiseResolver[m.data.resolveId];
|
|
182
162
|
if (publishPromiseResolver) {
|
|
@@ -187,7 +167,7 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
187
167
|
delete this.publishPromiseResolver[m.data.resolveId];
|
|
188
168
|
}
|
|
189
169
|
catch (error) {
|
|
190
|
-
|
|
170
|
+
this.logger.error('Error handling TopicResolveMessage:', error);
|
|
191
171
|
}
|
|
192
172
|
}
|
|
193
173
|
}
|
|
@@ -210,7 +190,7 @@ class Topic extends topic_publisher_1.TopicPublisher {
|
|
|
210
190
|
this.isInit &&
|
|
211
191
|
m.data.timestamp === this.data.value.timestamp &&
|
|
212
192
|
((m.data.id && !this.data.value.id) || (!m.data.id && this.data.value.id))) {
|
|
213
|
-
|
|
193
|
+
this.logger.warn('Message was dropped because of equal timestamps, because there was an old style message in the system. Please upgrade all libraries to the latest version.');
|
|
214
194
|
}
|
|
215
195
|
}
|
|
216
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"topic.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/topic/topic.ts"],"names":[],"mappings":";;;AAAA,8CAA4C;AAC5C,+BAQa;AAEb,mDAA8C;AAE9C,uDAAkD;AAElD,2BAAwB;AACxB,oDAA2E;
|
|
1
|
+
{"version":3,"file":"topic.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/topic/topic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { type Debugger } from "debug";
|
|
2
|
+
export type LogLevel = "debug" | "info" | "warn" | "error";
|
|
3
|
+
/**
|
|
4
|
+
* Logger for a single component.
|
|
5
|
+
*
|
|
6
|
+
* Each property is a `debug` instance with a namespace of the form:
|
|
7
|
+
* `<libName>:<location>:<level>`
|
|
8
|
+
*/
|
|
9
|
+
export interface ComponentLogger {
|
|
10
|
+
/** Logs with namespace `<libName>:<location>:debug`. */
|
|
11
|
+
debug: Debugger;
|
|
12
|
+
/** Logs with namespace `<libName>:<location>:info`. */
|
|
13
|
+
info: Debugger;
|
|
14
|
+
/** Logs with namespace `<libName>:<location>:warn`. */
|
|
15
|
+
warn: Debugger;
|
|
16
|
+
/** Logs with namespace `<libName>:<location>:error`. */
|
|
17
|
+
error: Debugger;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Function that creates a {@link ComponentLogger} for a given component name.
|
|
21
|
+
*
|
|
22
|
+
* @param location - Where the logger is used (e.g. component, service, directive, pipe, guard).
|
|
23
|
+
* @returns A logger whose namespaces include the location.
|
|
24
|
+
*
|
|
25
|
+
* @example
|
|
26
|
+
* ```ts
|
|
27
|
+
* const createLogger = createLoggerFactory("myLib");
|
|
28
|
+
* const log = createLogger("AuthPanel");
|
|
29
|
+
* log.warn("token missing");
|
|
30
|
+
* ```
|
|
31
|
+
*/
|
|
32
|
+
export type CreateLogger = (location: string) => ComponentLogger;
|
|
33
|
+
/**
|
|
34
|
+
* Creates a {@link CreateLogger} function for a given library name.
|
|
35
|
+
*
|
|
36
|
+
* Namespaces will follow the schema:
|
|
37
|
+
* `<libName>:<location>:<level>`
|
|
38
|
+
*
|
|
39
|
+
* @param libOrAppName - The library (or application) namespace prefix.
|
|
40
|
+
* @returns A function that creates component loggers.
|
|
41
|
+
*/
|
|
42
|
+
export declare function createLoggerFactory(libOrAppName: string): CreateLogger;
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createLoggerFactory = createLoggerFactory;
|
|
4
|
+
const debug_1 = require("debug");
|
|
5
|
+
// Bind debug.log to console.log for proper output
|
|
6
|
+
debug_1.default.log = console.log.bind(console);
|
|
7
|
+
/**
|
|
8
|
+
* Creates a {@link CreateLogger} function for a given library name.
|
|
9
|
+
*
|
|
10
|
+
* Namespaces will follow the schema:
|
|
11
|
+
* `<libName>:<location>:<level>`
|
|
12
|
+
*
|
|
13
|
+
* @param libOrAppName - The library (or application) namespace prefix.
|
|
14
|
+
* @returns A function that creates component loggers.
|
|
15
|
+
*/
|
|
16
|
+
function createLoggerFactory(libOrAppName) {
|
|
17
|
+
const prefix = libOrAppName.trim();
|
|
18
|
+
if (!prefix)
|
|
19
|
+
throw new Error("createLoggerFactory(libOrAppName): libOrAppName must be a non-empty string.");
|
|
20
|
+
/**
|
|
21
|
+
* Creates a logger for a specific location.
|
|
22
|
+
*
|
|
23
|
+
* Note: This function is produced by {@link createLoggerFactory}. Its TS-Doc is
|
|
24
|
+
* provided via the {@link CreateLogger} type so editors can show it in IntelliSense.
|
|
25
|
+
*/
|
|
26
|
+
const createLogger = (location) => {
|
|
27
|
+
const trimmedLocation = location.trim();
|
|
28
|
+
if (!trimmedLocation)
|
|
29
|
+
throw new Error("createLogger(location): location must be a non-empty string.");
|
|
30
|
+
const ns = (level) => `${prefix}:${trimmedLocation}:${level}`;
|
|
31
|
+
return {
|
|
32
|
+
debug: (0, debug_1.default)(ns("debug")),
|
|
33
|
+
info: (0, debug_1.default)(ns("info")),
|
|
34
|
+
warn: (0, debug_1.default)(ns("warn")),
|
|
35
|
+
error: (0, debug_1.default)(ns("error")),
|
|
36
|
+
};
|
|
37
|
+
};
|
|
38
|
+
return createLogger;
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=create-logger.utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-logger.utils.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/utils/create-logger.utils.ts"],"names":[],"mappings":";;AAmDA,kDAyBC;AA5ED,iCAA6C;AAuC7C,kDAAkD;AAClD,eAAK,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAEtC;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CAAC,YAAoB;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;IAE5G;;;;;OAKG;IACH,MAAM,YAAY,GAAiB,CAAC,QAAgB,EAAE,EAAE;QACtD,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAEtG,MAAM,EAAE,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,GAAG,MAAM,IAAI,eAAe,IAAI,KAAK,EAAE,CAAC;QAExE,OAAO;YACL,KAAK,EAAE,IAAA,eAAK,EAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACzB,IAAI,EAAE,IAAA,eAAK,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACvB,IAAI,EAAE,IAAA,eAAK,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YACvB,KAAK,EAAE,IAAA,eAAK,EAAC,EAAE,CAAC,OAAO,CAAC,CAAC;SAC1B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -3,6 +3,7 @@ import '../declarations';
|
|
|
3
3
|
* Implementation of the Scatter-Gather pattern.
|
|
4
4
|
*/
|
|
5
5
|
export declare class Gatherer<Request, Response> {
|
|
6
|
+
private readonly logger;
|
|
6
7
|
private static id;
|
|
7
8
|
private readonly topic;
|
|
8
9
|
private readonly ownIds;
|
|
@@ -13,6 +14,5 @@ export declare class Gatherer<Request, Response> {
|
|
|
13
14
|
gather(request: Request): Promise<Response[]>;
|
|
14
15
|
private logReceivedIfDebug;
|
|
15
16
|
private logAnsweredIfDebug;
|
|
16
|
-
private logIfDebug;
|
|
17
17
|
private isOwnerOfRequest;
|
|
18
18
|
}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Gatherer = void 0;
|
|
4
4
|
const topic_1 = require("../topic/topic");
|
|
5
|
+
const logger_utils_1 = require("./logger.utils");
|
|
5
6
|
require("../declarations");
|
|
6
7
|
/**
|
|
7
8
|
* Implementation of the Scatter-Gather pattern.
|
|
8
9
|
*/
|
|
9
10
|
class Gatherer {
|
|
11
|
+
logger;
|
|
10
12
|
static id = 0;
|
|
11
13
|
topic;
|
|
12
14
|
ownIds = new Set();
|
|
@@ -14,14 +16,15 @@ class Gatherer {
|
|
|
14
16
|
topicName;
|
|
15
17
|
constructor(name, version, callback) {
|
|
16
18
|
this.topicName = name;
|
|
17
|
-
this.
|
|
19
|
+
this.logger = (0, logger_utils_1.createLogger)(`Gatherer:${name}`);
|
|
20
|
+
this.logger.debug(`Gatherer ${name}: ${version} created`);
|
|
18
21
|
this.topic = new topic_1.Topic(name, version, false);
|
|
19
22
|
// Perform a callback every time a request is received in the topic.
|
|
20
23
|
this.topicSub = this.topic.subscribe((m) => {
|
|
21
24
|
if (!this.isOwnerOfRequest(m) && window['@onecx/accelerator']?.gatherer?.promises) {
|
|
22
25
|
this.logReceivedIfDebug(name, version, m);
|
|
23
26
|
if (!window['@onecx/accelerator'].gatherer.promises[m.id]) {
|
|
24
|
-
|
|
27
|
+
this.logger.warn('Expected an array of promises to gather for id ', m.id, ' but the id was not present');
|
|
25
28
|
return;
|
|
26
29
|
}
|
|
27
30
|
let resolve;
|
|
@@ -36,7 +39,7 @@ class Gatherer {
|
|
|
36
39
|
});
|
|
37
40
|
}
|
|
38
41
|
destroy() {
|
|
39
|
-
this.
|
|
42
|
+
this.logger.debug(`Gatherer ${this.topic.name}: ${this.topic.version} destroyed`);
|
|
40
43
|
this.topicSub?.unsubscribe();
|
|
41
44
|
this.topic.destroy();
|
|
42
45
|
for (const id of this.ownIds) {
|
|
@@ -63,20 +66,15 @@ class Gatherer {
|
|
|
63
66
|
delete window['@onecx/accelerator'].gatherer.promises[id];
|
|
64
67
|
this.ownIds.delete(id);
|
|
65
68
|
return Promise.all(promises).then((v) => {
|
|
66
|
-
this.
|
|
69
|
+
this.logger.debug('Finished gathering responses', v);
|
|
67
70
|
return v;
|
|
68
71
|
});
|
|
69
72
|
}
|
|
70
73
|
logReceivedIfDebug(name, version, m) {
|
|
71
|
-
this.
|
|
74
|
+
this.logger.debug('Gatherer ' + name + ': ' + version + ' received request ' + m.request);
|
|
72
75
|
}
|
|
73
76
|
logAnsweredIfDebug(name, version, m, response) {
|
|
74
|
-
this.
|
|
75
|
-
}
|
|
76
|
-
logIfDebug(name, ...args) {
|
|
77
|
-
if (window['@onecx/accelerator']?.gatherer?.debug?.includes(name)) {
|
|
78
|
-
console.log(...args);
|
|
79
|
-
}
|
|
77
|
+
this.logger.debug('Gatherer ' + name + ': ' + version + ' answered request ' + m.request + ' with response', response);
|
|
80
78
|
}
|
|
81
79
|
isOwnerOfRequest(m) {
|
|
82
80
|
return this.ownIds.has(m.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gatherer.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/utils/gatherer.ts"],"names":[],"mappings":";;;AACA,0CAAsC;AAEtC,2BAAwB;AAExB;;GAEG;AACH,MAAa,QAAQ;
|
|
1
|
+
{"version":3,"file":"gatherer.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/utils/gatherer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const createLogger: import("./create-logger.utils").CreateLogger;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createLogger = void 0;
|
|
4
|
+
// This file is not planned to be in the index.ts so it is private to this lib
|
|
5
|
+
const create_logger_utils_1 = require("./create-logger.utils");
|
|
6
|
+
exports.createLogger = (0, create_logger_utils_1.createLoggerFactory)('@onecx/accelerator');
|
|
7
|
+
//# sourceMappingURL=logger.utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.utils.js","sourceRoot":"","sources":["../../../../../../libs/accelerator/src/lib/utils/logger.utils.ts"],"names":[],"mappings":";;;AAAA,8EAA8E;AAC9E,+DAA2D;AAE9C,QAAA,YAAY,GAAG,IAAA,yCAAmB,EAAC,oBAAoB,CAAC,CAAA"}
|