Skip to content

Commit 1b2c580

Browse files
Merge pull request #50 from cristiammercado/develop
Improvements and updates
2 parents 8337619 + 26e5553 commit 1b2c580

File tree

9 files changed

+3296
-3543
lines changed

9 files changed

+3296
-3543
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2.1
22

33
orbs:
4-
node: circleci/node@5.1.1
5-
browser-tools: circleci/[email protected].6
4+
node: circleci/node@5.2.0
5+
browser-tools: circleci/[email protected].8
66

77
jobs:
88
build:

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021-2023 Cristiam Mercado
3+
Copyright (c) 2021-2024 Cristiam Mercado
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ RxJS-based message/event bus service for Angular apps inspired by [NgRadio](http
1313

1414
| Angular version | ng-event-bus version |
1515
|-----------------|----------------------|
16-
| 17.x | 6.0.x |
16+
| 18.x | 7.x.x |
17+
| 17.x | 6.x.x |
1718
| 16.x | 5.1.x |
1819
| 15.x | 5.0.x |
1920
| 15.x | 5.0.x |

dist/ng-event-bus/esm2022/lib/ng-event-bus.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ export class NgEventBus {
7474
return this.eventBus.asObservable().pipe(filter((event) => this.keyMatch(event.key, key)), map((event) => event.metadata));
7575
}
7676
}
77-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmctZXZlbnQtYnVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvbmctZXZlbnQtYnVzL3NyYy9saWIvbmctZXZlbnQtYnVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBYyxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDM0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUc3QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXZDOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxVQUFVO0lBV3JCOztPQUVHO0lBQ0g7UUFSQTs7V0FFRztRQUNLLGNBQVMsR0FBVyxHQUFHLENBQUM7UUFNOUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLE9BQU8sRUFBb0IsQ0FBQztJQUNsRCxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNJLFFBQVEsQ0FBQyxHQUFXLEVBQUUsUUFBZ0I7UUFDM0MsTUFBTSxDQUFDLEdBQVcsR0FBRyxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxHQUFXLElBQUksQ0FBQztRQUV4QixNQUFNLFNBQVMsR0FBRyxDQUFDLEVBQVUsRUFBRSxDQUFTLEVBQVcsRUFBRSxDQUFDLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUUzRSxNQUFNLEdBQUcsR0FBVyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ25DLE1BQU0sSUFBSSxHQUFhLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdEMsTUFBTSxJQUFJLEdBQWEsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUUzQyxNQUFNLElBQUksR0FBVyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2pDLE1BQU0sSUFBSSxHQUFXLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDakMsTUFBTSxHQUFHLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFekMsS0FBSyxJQUFJLENBQUMsR0FBVyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUNwQyxNQUFNLEVBQUUsR0FBVyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0IsTUFBTSxFQUFFLEdBQVcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBRTNCLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQUU7Z0JBQzFDLE9BQU8sSUFBSSxDQUFDO2FBQ2I7WUFFRCxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRTtnQkFDdEIsT0FBTyxLQUFLLENBQUM7YUFDZDtTQUNGO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksSUFBSSxDQUFJLEdBQVcsRUFBRSxJQUFRO1FBQ2xDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1lBQ3RCLE1BQU0sSUFBSSxLQUFLLENBQUMsc0RBQXNELENBQUMsQ0FBQztTQUN6RTtRQUVELE1BQU0sUUFBUSxHQUFnQixJQUFJLFFBQVEsQ0FBSSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFekQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksRUFBRSxDQUFJLEdBQVc7UUFDdEIsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLFlBQVksRUFBRSxDQUFDLElBQUksQ0FDdEMsTUFBTSxDQUFDLENBQUMsS0FBdUIsRUFBVyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQzNFLEdBQUcsQ0FBQyxDQUFDLEtBQXVCLEVBQWUsRUFBRSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FDOUQsQ0FBQztJQUNKLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE9ic2VydmFibGUsIFN1YmplY3QgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGZpbHRlciwgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQgeyBJRXZlbnRCdXNNZXNzYWdlIH0gZnJvbSAnLi9pLWV2ZW50LWJ1cy1tZXNzYWdlJztcbmltcG9ydCB7IE1ldGFEYXRhIH0gZnJvbSAnLi9tZXRhLWRhdGEnO1xuXG4vKipcbiAqIE1haW4gbGlicmFyeSBjbGFzcy5cbiAqXG4gKiBAYXV0aG9yIENyaXN0aWFtIE1lcmNhZG9cbiAqIEBzaW5jZSAyLjAuMFxuICogQHZlcnNpb24gNi4wLjBcbiAqL1xuZXhwb3J0IGNsYXNzIE5nRXZlbnRCdXMge1xuICAvKipcbiAgICogTWFpbiBvYnNlcnZhYmxlIHRvIG11bHRpY2FzdCB0byBhbGwgb2JzZXJ2ZXJzLlxuICAgKi9cbiAgcHJpdmF0ZSBldmVudEJ1czogU3ViamVjdDxJRXZlbnRCdXNNZXNzYWdlPjtcblxuICAvKipcbiAgICogS2V5IG1lc3NhZ2Ugc2VwYXJhdG9yLlxuICAgKi9cbiAgcHJpdmF0ZSBzZXBhcmF0b3I6IHN0cmluZyA9ICc6JztcblxuICAvKipcbiAgICogQ29uc3RydWN0b3IgZm9yIHRoaXMgY2xhc3M6IEluaXRpYWxpemVzIGV2ZW50IGJ1cy5cbiAgICovXG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIHRoaXMuZXZlbnRCdXMgPSBuZXcgU3ViamVjdDxJRXZlbnRCdXNNZXNzYWdlPigpO1xuICB9XG5cbiAgLyoqXG4gICAqIFZhbGlkYXRlcyBrZXkgbWF0Y2hpbmcuXG4gICAqXG4gICAqIEBwYXJhbSBrZXkgS2V5IHRvIGlkZW50aWZ5IHRoZSBtZXNzYWdlL2V2ZW50LlxuICAgKiBAcGFyYW0gd2lsZGNhcmQgV2lsZGNhcmQgcmVjZWl2ZWQgZnJvbSBvbiBtZXRob2QuXG4gICAqXG4gICAqIEByZXR1cm4gdHJ1ZSBpZiBrZXkgbWF0Y2hlcywgZmFsc2Ugb3RoZXJ3aXNlLlxuICAgKi9cbiAgcHVibGljIGtleU1hdGNoKGtleTogc3RyaW5nLCB3aWxkY2FyZDogc3RyaW5nKTogYm9vbGVhbiB7XG4gICAgY29uc3Qgdzogc3RyaW5nID0gJyonO1xuICAgIGNvbnN0IHd3OiBzdHJpbmcgPSAnKionO1xuXG4gICAgY29uc3QgcGFydE1hdGNoID0gKHdsOiBzdHJpbmcsIGs6IHN0cmluZyk6IGJvb2xlYW4gPT4gd2wgPT09IHcgfHwgd2wgPT09IGs7XG5cbiAgICBjb25zdCBzZXA6IHN0cmluZyA9IHRoaXMuc2VwYXJhdG9yO1xuICAgIGNvbnN0IGtBcnI6IHN0cmluZ1tdID0ga2V5LnNwbGl0KHNlcCk7XG4gICAgY29uc3Qgd0Fycjogc3RyaW5nW10gPSB3aWxkY2FyZC5zcGxpdChzZXApO1xuXG4gICAgY29uc3Qga0xlbjogbnVtYmVyID0ga0Fyci5sZW5ndGg7XG4gICAgY29uc3Qgd0xlbjogbnVtYmVyID0gd0Fyci5sZW5ndGg7XG4gICAgY29uc3QgbWF4OiBudW1iZXIgPSBNYXRoLm1heChrTGVuLCB3TGVuKTtcblxuICAgIGZvciAobGV0IGk6IG51bWJlciA9IDA7IGkgPCBtYXg7IGkrKykge1xuICAgICAgY29uc3QgY0s6IHN0cmluZyA9IGtBcnJbaV07XG4gICAgICBjb25zdCBjVzogc3RyaW5nID0gd0FycltpXTtcblxuICAgICAgaWYgKGNXID09PSB3dyAmJiB0eXBlb2YgY0sgIT09ICd1bmRlZmluZWQnKSB7XG4gICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgfVxuXG4gICAgICBpZiAoIXBhcnRNYXRjaChjVywgY0spKSB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIC8qKlxuICAgKiBQdWJsaXNoIGEgbWVzc2FnZS9ldmVudCB0byBldmVudCBidXMuXG4gICAqXG4gICAqIEBwYXJhbSAga2V5IEtleSB0byBpZGVudGlmeSB0aGUgbWVzc2FnZS9ldmVudC5cbiAgICogQHBhcmFtICBbZGF0YV0gT3B0aW9uYWw6IEFkZGl0aW9uYWwgZGF0YSBzZW50IHdpdGggdGhlIG1lc3NhZ2UvZXZlbnQuXG4gICAqIEB0aHJvd3Mge0Vycm9yfSBrZXkgcGFyYW1ldGVyIG11c3QgYmUgYSBzdHJpbmcgYW5kIG11c3Qgbm90IGJlIGVtcHR5LlxuICAgKi9cbiAgcHVibGljIGNhc3Q8VD4oa2V5OiBzdHJpbmcsIGRhdGE/OiBUKTogdm9pZCB7XG4gICAgaWYgKCFrZXkudHJpbSgpLmxlbmd0aCkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdrZXkgcGFyYW1ldGVyIG11c3QgYmUgYSBzdHJpbmcgYW5kIG11c3Qgbm90IGJlIGVtcHR5Jyk7XG4gICAgfVxuXG4gICAgY29uc3QgbWV0YWRhdGE6IE1ldGFEYXRhPFQ+ID0gbmV3IE1ldGFEYXRhPFQ+KGtleSwgZGF0YSk7XG5cbiAgICB0aGlzLmV2ZW50QnVzLm5leHQoeyBrZXksIG1ldGFkYXRhIH0pO1xuICB9XG5cbiAgLyoqXG4gICAqIFJldHVybnMgYW4gb2JzZXJ2YWJsZSB5b3UgY2FuIHN1YnNjcmliZSB0byBsaXN0ZW4gbWVzc2FnZXMvZXZlbnRzLlxuICAgKlxuICAgKiBAcGFyYW0ga2V5IEtleSB0byBpZGVudGlmeSB0aGUgbWVzc2FnZS9ldmVudC5cbiAgICpcbiAgICogQHJldHVybiBPYnNlcnZhYmxlIHlvdSBjYW4gc3Vic2NyaWJlIHRvIGxpc3RlbiBtZXNzYWdlcy9ldmVudHMuXG4gICAqL1xuICBwdWJsaWMgb248VD4oa2V5OiBzdHJpbmcpOiBPYnNlcnZhYmxlPE1ldGFEYXRhPFQ+PiB7XG4gICAgcmV0dXJuIHRoaXMuZXZlbnRCdXMuYXNPYnNlcnZhYmxlKCkucGlwZShcbiAgICAgIGZpbHRlcigoZXZlbnQ6IElFdmVudEJ1c01lc3NhZ2UpOiBib29sZWFuID0+IHRoaXMua2V5TWF0Y2goZXZlbnQua2V5LCBrZXkpKSxcbiAgICAgIG1hcCgoZXZlbnQ6IElFdmVudEJ1c01lc3NhZ2UpOiBNZXRhRGF0YTxUPiA9PiBldmVudC5tZXRhZGF0YSlcbiAgICApO1xuICB9XG59XG4iXX0=
77+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmctZXZlbnQtYnVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvbmctZXZlbnQtYnVzL3NyYy9saWIvbmctZXZlbnQtYnVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBYyxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDM0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUc3QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXZDOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxVQUFVO0lBV3JCOztPQUVHO0lBQ0g7UUFSQTs7V0FFRztRQUNLLGNBQVMsR0FBVyxHQUFHLENBQUM7UUFNOUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLE9BQU8sRUFBb0IsQ0FBQztJQUNsRCxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNJLFFBQVEsQ0FBQyxHQUFXLEVBQUUsUUFBZ0I7UUFDM0MsTUFBTSxDQUFDLEdBQVcsR0FBRyxDQUFDO1FBQ3RCLE1BQU0sRUFBRSxHQUFXLElBQUksQ0FBQztRQUV4QixNQUFNLFNBQVMsR0FBRyxDQUFDLEVBQVUsRUFBRSxDQUFTLEVBQVcsRUFBRSxDQUFDLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUUzRSxNQUFNLEdBQUcsR0FBVyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ25DLE1BQU0sSUFBSSxHQUFhLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdEMsTUFBTSxJQUFJLEdBQWEsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUUzQyxNQUFNLElBQUksR0FBVyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ2pDLE1BQU0sSUFBSSxHQUFXLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDakMsTUFBTSxHQUFHLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFekMsS0FBSyxJQUFJLENBQUMsR0FBVyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ3JDLE1BQU0sRUFBRSxHQUFXLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQixNQUFNLEVBQUUsR0FBVyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFFM0IsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRSxDQUFDO2dCQUMzQyxPQUFPLElBQUksQ0FBQztZQUNkLENBQUM7WUFFRCxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDO2dCQUN2QixPQUFPLEtBQUssQ0FBQztZQUNmLENBQUM7UUFDSCxDQUFDO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksSUFBSSxDQUFJLEdBQVcsRUFBRSxJQUFRO1FBQ2xDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyxzREFBc0QsQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBZ0IsSUFBSSxRQUFRLENBQUksR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXpELElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVEOzs7Ozs7T0FNRztJQUNJLEVBQUUsQ0FBSSxHQUFXO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQ3RDLE1BQU0sQ0FBQyxDQUFDLEtBQXVCLEVBQVcsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxFQUMzRSxHQUFHLENBQUMsQ0FBQyxLQUF1QixFQUFlLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQzlELENBQUM7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPYnNlcnZhYmxlLCBTdWJqZWN0IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBmaWx0ZXIsIG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHsgSUV2ZW50QnVzTWVzc2FnZSB9IGZyb20gJy4vaS1ldmVudC1idXMtbWVzc2FnZSc7XG5pbXBvcnQgeyBNZXRhRGF0YSB9IGZyb20gJy4vbWV0YS1kYXRhJztcblxuLyoqXG4gKiBNYWluIGxpYnJhcnkgY2xhc3MuXG4gKlxuICogQGF1dGhvciBDcmlzdGlhbSBNZXJjYWRvXG4gKiBAc2luY2UgMi4wLjBcbiAqIEB2ZXJzaW9uIDYuMC4wXG4gKi9cbmV4cG9ydCBjbGFzcyBOZ0V2ZW50QnVzIHtcbiAgLyoqXG4gICAqIE1haW4gb2JzZXJ2YWJsZSB0byBtdWx0aWNhc3QgdG8gYWxsIG9ic2VydmVycy5cbiAgICovXG4gIHByaXZhdGUgZXZlbnRCdXM6IFN1YmplY3Q8SUV2ZW50QnVzTWVzc2FnZT47XG5cbiAgLyoqXG4gICAqIEtleSBtZXNzYWdlIHNlcGFyYXRvci5cbiAgICovXG4gIHByaXZhdGUgc2VwYXJhdG9yOiBzdHJpbmcgPSAnOic7XG5cbiAgLyoqXG4gICAqIENvbnN0cnVjdG9yIGZvciB0aGlzIGNsYXNzOiBJbml0aWFsaXplcyBldmVudCBidXMuXG4gICAqL1xuICBjb25zdHJ1Y3RvcigpIHtcbiAgICB0aGlzLmV2ZW50QnVzID0gbmV3IFN1YmplY3Q8SUV2ZW50QnVzTWVzc2FnZT4oKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBWYWxpZGF0ZXMga2V5IG1hdGNoaW5nLlxuICAgKlxuICAgKiBAcGFyYW0ga2V5IEtleSB0byBpZGVudGlmeSB0aGUgbWVzc2FnZS9ldmVudC5cbiAgICogQHBhcmFtIHdpbGRjYXJkIFdpbGRjYXJkIHJlY2VpdmVkIGZyb20gb24gbWV0aG9kLlxuICAgKlxuICAgKiBAcmV0dXJuIHRydWUgaWYga2V5IG1hdGNoZXMsIGZhbHNlIG90aGVyd2lzZS5cbiAgICovXG4gIHB1YmxpYyBrZXlNYXRjaChrZXk6IHN0cmluZywgd2lsZGNhcmQ6IHN0cmluZyk6IGJvb2xlYW4ge1xuICAgIGNvbnN0IHc6IHN0cmluZyA9ICcqJztcbiAgICBjb25zdCB3dzogc3RyaW5nID0gJyoqJztcblxuICAgIGNvbnN0IHBhcnRNYXRjaCA9ICh3bDogc3RyaW5nLCBrOiBzdHJpbmcpOiBib29sZWFuID0+IHdsID09PSB3IHx8IHdsID09PSBrO1xuXG4gICAgY29uc3Qgc2VwOiBzdHJpbmcgPSB0aGlzLnNlcGFyYXRvcjtcbiAgICBjb25zdCBrQXJyOiBzdHJpbmdbXSA9IGtleS5zcGxpdChzZXApO1xuICAgIGNvbnN0IHdBcnI6IHN0cmluZ1tdID0gd2lsZGNhcmQuc3BsaXQoc2VwKTtcblxuICAgIGNvbnN0IGtMZW46IG51bWJlciA9IGtBcnIubGVuZ3RoO1xuICAgIGNvbnN0IHdMZW46IG51bWJlciA9IHdBcnIubGVuZ3RoO1xuICAgIGNvbnN0IG1heDogbnVtYmVyID0gTWF0aC5tYXgoa0xlbiwgd0xlbik7XG5cbiAgICBmb3IgKGxldCBpOiBudW1iZXIgPSAwOyBpIDwgbWF4OyBpKyspIHtcbiAgICAgIGNvbnN0IGNLOiBzdHJpbmcgPSBrQXJyW2ldO1xuICAgICAgY29uc3QgY1c6IHN0cmluZyA9IHdBcnJbaV07XG5cbiAgICAgIGlmIChjVyA9PT0gd3cgJiYgdHlwZW9mIGNLICE9PSAndW5kZWZpbmVkJykge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cblxuICAgICAgaWYgKCFwYXJ0TWF0Y2goY1csIGNLKSkge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICB9XG4gICAgfVxuXG4gICAgcmV0dXJuIHRydWU7XG4gIH1cblxuICAvKipcbiAgICogUHVibGlzaCBhIG1lc3NhZ2UvZXZlbnQgdG8gZXZlbnQgYnVzLlxuICAgKlxuICAgKiBAcGFyYW0gIGtleSBLZXkgdG8gaWRlbnRpZnkgdGhlIG1lc3NhZ2UvZXZlbnQuXG4gICAqIEBwYXJhbSAgW2RhdGFdIE9wdGlvbmFsOiBBZGRpdGlvbmFsIGRhdGEgc2VudCB3aXRoIHRoZSBtZXNzYWdlL2V2ZW50LlxuICAgKiBAdGhyb3dzIHtFcnJvcn0ga2V5IHBhcmFtZXRlciBtdXN0IGJlIGEgc3RyaW5nIGFuZCBtdXN0IG5vdCBiZSBlbXB0eS5cbiAgICovXG4gIHB1YmxpYyBjYXN0PFQ+KGtleTogc3RyaW5nLCBkYXRhPzogVCk6IHZvaWQge1xuICAgIGlmICgha2V5LnRyaW0oKS5sZW5ndGgpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcigna2V5IHBhcmFtZXRlciBtdXN0IGJlIGEgc3RyaW5nIGFuZCBtdXN0IG5vdCBiZSBlbXB0eScpO1xuICAgIH1cblxuICAgIGNvbnN0IG1ldGFkYXRhOiBNZXRhRGF0YTxUPiA9IG5ldyBNZXRhRGF0YTxUPihrZXksIGRhdGEpO1xuXG4gICAgdGhpcy5ldmVudEJ1cy5uZXh0KHsga2V5LCBtZXRhZGF0YSB9KTtcbiAgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm5zIGFuIG9ic2VydmFibGUgeW91IGNhbiBzdWJzY3JpYmUgdG8gbGlzdGVuIG1lc3NhZ2VzL2V2ZW50cy5cbiAgICpcbiAgICogQHBhcmFtIGtleSBLZXkgdG8gaWRlbnRpZnkgdGhlIG1lc3NhZ2UvZXZlbnQuXG4gICAqXG4gICAqIEByZXR1cm4gT2JzZXJ2YWJsZSB5b3UgY2FuIHN1YnNjcmliZSB0byBsaXN0ZW4gbWVzc2FnZXMvZXZlbnRzLlxuICAgKi9cbiAgcHVibGljIG9uPFQ+KGtleTogc3RyaW5nKTogT2JzZXJ2YWJsZTxNZXRhRGF0YTxUPj4ge1xuICAgIHJldHVybiB0aGlzLmV2ZW50QnVzLmFzT2JzZXJ2YWJsZSgpLnBpcGUoXG4gICAgICBmaWx0ZXIoKGV2ZW50OiBJRXZlbnRCdXNNZXNzYWdlKTogYm9vbGVhbiA9PiB0aGlzLmtleU1hdGNoKGV2ZW50LmtleSwga2V5KSksXG4gICAgICBtYXAoKGV2ZW50OiBJRXZlbnRCdXNNZXNzYWdlKTogTWV0YURhdGE8VD4gPT4gZXZlbnQubWV0YWRhdGEpXG4gICAgKTtcbiAgfVxufVxuIl19

0 commit comments

Comments
 (0)