@aws-amplify/pubsub 4.2.10-cloud-logging.7 → 4.2.10-cloud-logging.8
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/CHANGELOG.md +24 -49
- package/dist/aws-amplify-pubsub.js +238 -202
- package/dist/aws-amplify-pubsub.js.map +1 -1
- package/dist/aws-amplify-pubsub.min.js +2 -2
- package/dist/aws-amplify-pubsub.min.js.map +1 -1
- package/lib/Providers/AWSAppSyncProvider.d.ts +3 -0
- package/lib/Providers/AWSAppSyncProvider.js +3 -0
- package/lib/Providers/AWSAppSyncProvider.js.map +1 -1
- package/lib/Providers/AWSAppSyncRealTimeProvider.d.ts +19 -4
- package/lib/Providers/AWSAppSyncRealTimeProvider.js +174 -154
- package/lib/Providers/AWSAppSyncRealTimeProvider.js.map +1 -1
- package/lib/Providers/AWSIotProvider.d.ts +6 -1
- package/lib/Providers/AWSIotProvider.js +3 -2
- package/lib/Providers/AWSIotProvider.js.map +1 -1
- package/lib/Providers/MqttOverWSProvider.d.ts +14 -11
- package/lib/Providers/MqttOverWSProvider.js +17 -10
- package/lib/Providers/MqttOverWSProvider.js.map +1 -1
- package/lib/Providers/PubSubProvider.d.ts +7 -7
- package/lib/Providers/PubSubProvider.js.map +1 -1
- package/lib/PubSub.d.ts +6 -6
- package/lib/PubSub.js +2 -2
- package/lib/PubSub.js.map +1 -1
- package/lib/types/Provider.d.ts +3 -3
- package/lib/types/PubSub.d.ts +5 -1
- package/lib-esm/Providers/AWSAppSyncProvider.d.ts +3 -0
- package/lib-esm/Providers/AWSAppSyncProvider.js +3 -0
- package/lib-esm/Providers/AWSAppSyncProvider.js.map +1 -1
- package/lib-esm/Providers/AWSAppSyncRealTimeProvider.d.ts +19 -4
- package/lib-esm/Providers/AWSAppSyncRealTimeProvider.js +174 -154
- package/lib-esm/Providers/AWSAppSyncRealTimeProvider.js.map +1 -1
- package/lib-esm/Providers/AWSIotProvider.d.ts +6 -1
- package/lib-esm/Providers/AWSIotProvider.js +3 -2
- package/lib-esm/Providers/AWSIotProvider.js.map +1 -1
- package/lib-esm/Providers/MqttOverWSProvider.d.ts +14 -11
- package/lib-esm/Providers/MqttOverWSProvider.js +17 -10
- package/lib-esm/Providers/MqttOverWSProvider.js.map +1 -1
- package/lib-esm/Providers/PubSubProvider.d.ts +7 -7
- package/lib-esm/Providers/PubSubProvider.js.map +1 -1
- package/lib-esm/PubSub.d.ts +6 -6
- package/lib-esm/PubSub.js +2 -2
- package/lib-esm/PubSub.js.map +1 -1
- package/lib-esm/types/Provider.d.ts +3 -3
- package/lib-esm/types/PubSub.d.ts +5 -1
- package/package.json +5 -5
- package/src/Providers/AWSAppSyncProvider.ts +27 -26
- package/src/Providers/AWSAppSyncRealTimeProvider.ts +247 -191
- package/src/Providers/AWSIotProvider.ts +10 -1
- package/src/Providers/MqttOverWSProvider.ts +52 -33
- package/src/Providers/PubSubProvider.ts +8 -8
- package/src/PubSub.ts +10 -10
- package/src/types/Provider.ts +3 -7
- package/src/types/PubSub.ts +6 -1
|
@@ -1,5 +1,10 @@
|
|
|
1
|
-
import { MqttOverWSProvider } from './MqttOverWSProvider';
|
|
1
|
+
import { MqttOverWSProvider, MqttProviderOptions } from './MqttOverWSProvider';
|
|
2
|
+
export interface AWSIoTProviderOptions extends MqttProviderOptions {
|
|
3
|
+
aws_pubsub_region?: string;
|
|
4
|
+
aws_pubsub_endpoint?: string;
|
|
5
|
+
}
|
|
2
6
|
export declare class AWSIoTProvider extends MqttOverWSProvider {
|
|
7
|
+
constructor(options?: AWSIoTProviderOptions);
|
|
3
8
|
protected get region(): any;
|
|
4
9
|
getProviderName(): string;
|
|
5
10
|
protected get endpoint(): Promise<string>;
|
|
@@ -64,8 +64,9 @@ import { Signer, Credentials } from '@aws-amplify/core';
|
|
|
64
64
|
var SERVICE_NAME = 'iotdevicegateway';
|
|
65
65
|
var AWSIoTProvider = /** @class */ (function (_super) {
|
|
66
66
|
__extends(AWSIoTProvider, _super);
|
|
67
|
-
function AWSIoTProvider() {
|
|
68
|
-
|
|
67
|
+
function AWSIoTProvider(options) {
|
|
68
|
+
if (options === void 0) { options = {}; }
|
|
69
|
+
return _super.call(this, options) || this;
|
|
69
70
|
}
|
|
70
71
|
Object.defineProperty(AWSIoTProvider.prototype, "region", {
|
|
71
72
|
get: function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSIotProvider.js","sourceRoot":"","sources":["../../src/Providers/AWSIotProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"AWSIotProvider.js","sourceRoot":"","sources":["../../src/Providers/AWSIotProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,kBAAkB,EAAuB,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExD,IAAM,YAAY,GAAG,kBAAkB,CAAC;AAOxC;IAAoC,kCAAkB;IACrD,wBAAY,OAAmC;QAAnC,wBAAA,EAAA,YAAmC;eAC9C,kBAAM,OAAO,CAAC;IACf,CAAC;IAED,sBAAc,kCAAM;aAApB;YACC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACvC,CAAC;;;OAAA;IAEM,wCAAe,GAAtB;QACC,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,sBAAc,oCAAQ;aAAtB;YAAA,iBAsBC;YArBA,OAAO,CAAC;;;;;4BACD,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC;4BAE5C,WAAW,GAAG;gCACnB,OAAO,EAAE,YAAY;gCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;6BACnB,CAAC;4BAKE,qBAAM,WAAW,CAAC,GAAG,EAAE,EAAA;;4BAJrB,KAIF,SAAuB,EAHb,UAAU,iBAAA,EACN,UAAU,qBAAA,EACb,aAAa,kBAAA;4BAGtB,MAAM,GAAG,MAAM,CAAC,OAAO,CAC5B,QAAQ,EACR,EAAE,UAAU,YAAA,EAAE,UAAU,YAAA,EAAE,aAAa,eAAA,EAAE,EACzC,WAAW,CACX,CAAC;4BAEF,sBAAO,MAAM,EAAC;;;iBACd,CAAC,EAAE,CAAC;QACN,CAAC;;;OAAA;IACF,qBAAC;AAAD,CAAC,AApCD,CAAoC,kBAAkB,GAoCrD"}
|
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import Observable from 'zen-observable-ts';
|
|
2
2
|
import { AbstractPubSubProvider } from './PubSubProvider';
|
|
3
|
-
import {
|
|
3
|
+
import { ProviderOptions, SubscriptionObserver } from '../types';
|
|
4
4
|
export declare function mqttTopicMatch(filter: string, topic: string): boolean;
|
|
5
|
-
export interface
|
|
5
|
+
export interface MqttProviderOptions extends ProviderOptions {
|
|
6
6
|
clientId?: string;
|
|
7
7
|
url?: string;
|
|
8
8
|
}
|
|
9
|
+
/**
|
|
10
|
+
* @deprecated Migrated to MqttProviderOptions
|
|
11
|
+
*/
|
|
12
|
+
export declare type MqttProvidertOptions = MqttProviderOptions;
|
|
9
13
|
declare class ClientsQueue {
|
|
10
14
|
private promises;
|
|
11
|
-
get(clientId: string, clientFactory
|
|
15
|
+
get(clientId: string, clientFactory?: (input: string) => Promise<any>): Promise<any>;
|
|
12
16
|
get allClients(): string[];
|
|
13
|
-
remove(clientId:
|
|
17
|
+
remove(clientId: string): void;
|
|
14
18
|
}
|
|
15
19
|
export declare class MqttOverWSProvider extends AbstractPubSubProvider {
|
|
16
20
|
private _clientsQueue;
|
|
17
|
-
constructor(options?:
|
|
21
|
+
constructor(options?: MqttProviderOptions);
|
|
18
22
|
protected get clientId(): any;
|
|
19
23
|
protected get endpoint(): any;
|
|
20
24
|
protected get clientsQueue(): ClientsQueue;
|
|
@@ -22,17 +26,16 @@ export declare class MqttOverWSProvider extends AbstractPubSubProvider {
|
|
|
22
26
|
protected getTopicForValue(value: any): any;
|
|
23
27
|
getProviderName(): string;
|
|
24
28
|
onDisconnect({ clientId, errorCode, ...args }: {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
errorCode: any;
|
|
29
|
+
clientId?: string;
|
|
30
|
+
errorCode?: number;
|
|
28
31
|
}): void;
|
|
29
|
-
newClient({ url, clientId
|
|
30
|
-
protected connect(clientId: string, options?:
|
|
32
|
+
newClient({ url, clientId }: MqttProviderOptions): Promise<any>;
|
|
33
|
+
protected connect(clientId: string, options?: MqttProviderOptions): Promise<any>;
|
|
31
34
|
protected disconnect(clientId: string): Promise<void>;
|
|
32
35
|
publish(topics: string[] | string, msg: any): Promise<void>;
|
|
33
36
|
protected _topicObservers: Map<string, Set<SubscriptionObserver<any>>>;
|
|
34
37
|
protected _clientIdObservers: Map<string, Set<SubscriptionObserver<any>>>;
|
|
35
38
|
private _onMessage;
|
|
36
|
-
subscribe(topics: string[] | string, options?:
|
|
39
|
+
subscribe(topics: string[] | string, options?: MqttProviderOptions): Observable<any>;
|
|
37
40
|
}
|
|
38
41
|
export {};
|
|
@@ -107,15 +107,18 @@ var ClientsQueue = /** @class */ (function () {
|
|
|
107
107
|
}
|
|
108
108
|
ClientsQueue.prototype.get = function (clientId, clientFactory) {
|
|
109
109
|
return __awaiter(this, void 0, void 0, function () {
|
|
110
|
-
var
|
|
110
|
+
var cachedPromise, newPromise;
|
|
111
111
|
return __generator(this, function (_a) {
|
|
112
|
-
|
|
113
|
-
if (
|
|
114
|
-
return [2 /*return*/,
|
|
112
|
+
cachedPromise = this.promises.get(clientId);
|
|
113
|
+
if (cachedPromise) {
|
|
114
|
+
return [2 /*return*/, cachedPromise];
|
|
115
115
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
116
|
+
if (clientFactory) {
|
|
117
|
+
newPromise = clientFactory(clientId);
|
|
118
|
+
this.promises.set(clientId, newPromise);
|
|
119
|
+
return [2 /*return*/, newPromise];
|
|
120
|
+
}
|
|
121
|
+
return [2 /*return*/, undefined];
|
|
119
122
|
});
|
|
120
123
|
});
|
|
121
124
|
};
|
|
@@ -183,6 +186,9 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
183
186
|
if (errorCode !== 0) {
|
|
184
187
|
logger.warn(clientId, JSON.stringify(__assign({ errorCode: errorCode }, args), null, 2));
|
|
185
188
|
var topicsToDelete_1 = [];
|
|
189
|
+
if (!clientId) {
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
186
192
|
var clientIdObservers = this._clientIdObservers.get(clientId);
|
|
187
193
|
if (!clientIdObservers) {
|
|
188
194
|
return;
|
|
@@ -258,7 +264,7 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
258
264
|
var client;
|
|
259
265
|
return __generator(this, function (_a) {
|
|
260
266
|
switch (_a.label) {
|
|
261
|
-
case 0: return [4 /*yield*/, this.clientsQueue.get(clientId
|
|
267
|
+
case 0: return [4 /*yield*/, this.clientsQueue.get(clientId)];
|
|
262
268
|
case 1:
|
|
263
269
|
client = _a.sent();
|
|
264
270
|
if (client && client.isConnected()) {
|
|
@@ -371,11 +377,12 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
371
377
|
});
|
|
372
378
|
}); })();
|
|
373
379
|
return function () {
|
|
380
|
+
var _a, _b;
|
|
374
381
|
logger.debug('Unsubscribing from topic(s)', targetTopics.join(','));
|
|
375
382
|
if (client) {
|
|
376
|
-
_this._clientIdObservers.get(clientId).delete(observer);
|
|
383
|
+
(_a = _this._clientIdObservers.get(clientId)) === null || _a === void 0 ? void 0 : _a.delete(observer);
|
|
377
384
|
// No more observers per client => client not needed anymore
|
|
378
|
-
if (_this._clientIdObservers.get(clientId).size === 0) {
|
|
385
|
+
if (((_b = _this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
|
|
379
386
|
_this.disconnect(clientId);
|
|
380
387
|
_this._clientIdObservers.delete(clientId);
|
|
381
388
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MqttOverWSProvider.js","sourceRoot":"","sources":["../../src/Providers/MqttOverWSProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE5D,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAEhD,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,KAAa;IAC3D,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,IAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IAClC,IAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE;QAChC,IAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,IAAI,KAAK,GAAG;YAAE,OAAO,UAAU,CAAC,MAAM,IAAI,MAAM,CAAC;QACrD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;KACjD;IACD,OAAO,MAAM,KAAK,UAAU,CAAC,MAAM,CAAC;AACrC,CAAC;
|
|
1
|
+
{"version":3,"file":"MqttOverWSProvider.js","sourceRoot":"","sources":["../../src/Providers/MqttOverWSProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import Observable from 'zen-observable-ts';
|
|
2
|
-
import { PubSubProvider,
|
|
2
|
+
import { PubSubProvider, ProviderOptions } from '../types';
|
|
3
3
|
export declare abstract class AbstractPubSubProvider implements PubSubProvider {
|
|
4
4
|
private _config;
|
|
5
|
-
constructor(options?:
|
|
6
|
-
configure(config?:
|
|
5
|
+
constructor(options?: ProviderOptions);
|
|
6
|
+
configure(config?: ProviderOptions): ProviderOptions;
|
|
7
7
|
getCategory(): string;
|
|
8
8
|
abstract getProviderName(): string;
|
|
9
|
-
protected get options():
|
|
10
|
-
abstract newClient(clientOptions:
|
|
11
|
-
abstract publish(topics: string[] | string, msg: any, options?:
|
|
12
|
-
abstract subscribe(topics: string[] | string, options?:
|
|
9
|
+
protected get options(): ProviderOptions;
|
|
10
|
+
abstract newClient(clientOptions: ProviderOptions): Promise<any>;
|
|
11
|
+
abstract publish(topics: string[] | string, msg: any, options?: ProviderOptions): void;
|
|
12
|
+
abstract subscribe(topics: string[] | string, options?: ProviderOptions): Observable<any>;
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubProvider.js","sourceRoot":"","sources":["../../src/Providers/PubSubProvider.ts"],"names":[],"mappings":";;;;;;;;;;;AAcA,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE5D,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEpD;IAGC,gCAAY,
|
|
1
|
+
{"version":3,"file":"PubSubProvider.js","sourceRoot":"","sources":["../../src/Providers/PubSubProvider.ts"],"names":[],"mappings":";;;;;;;;;;;AAcA,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE5D,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEpD;IAGC,gCAAY,OAA6B;QAA7B,wBAAA,EAAA,YAA6B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,0CAAS,GAAT,UAAU,MAA4B;QAA5B,uBAAA,EAAA,WAA4B;QACrC,IAAI,CAAC,OAAO,yBAAQ,MAAM,GAAK,IAAI,CAAC,OAAO,CAAE,CAAC;QAE9C,MAAM,CAAC,KAAK,CAAC,eAAa,IAAI,CAAC,eAAe,EAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAElE,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,4CAAW,GAAX;QACC,OAAO,QAAQ,CAAC;IACjB,CAAC;IAID,sBAAc,2CAAO;aAArB;YACC,oBAAY,IAAI,CAAC,OAAO,EAAG;QAC5B,CAAC;;;OAAA;IAcF,6BAAC;AAAD,CAAC,AArCD,IAqCC"}
|
package/lib-esm/PubSub.d.ts
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import Observable from 'zen-observable-ts';
|
|
2
|
-
import { PubSubProvider, PubSubOptions,
|
|
2
|
+
import { PubSubProvider, PubSubOptions, ProviderOptions } from './types';
|
|
3
3
|
export declare class PubSubClass {
|
|
4
4
|
private _options;
|
|
5
5
|
private _pluggables;
|
|
6
6
|
/**
|
|
7
7
|
* Internal instance of AWSAppSyncProvider used by the API category to subscribe to AppSync
|
|
8
8
|
*/
|
|
9
|
-
private _awsAppSyncProvider
|
|
9
|
+
private _awsAppSyncProvider?;
|
|
10
10
|
/**
|
|
11
11
|
* Internal instance of AWSAppSyncRealTimeProvider used by the API category to subscribe to AppSync
|
|
12
12
|
*/
|
|
13
|
-
private _awsAppSyncRealTimeProvider
|
|
13
|
+
private _awsAppSyncRealTimeProvider?;
|
|
14
14
|
/**
|
|
15
15
|
* Lazy instantiate AWSAppSyncProvider when it is required by the API category
|
|
16
16
|
*/
|
|
@@ -24,7 +24,7 @@ export declare class PubSubClass {
|
|
|
24
24
|
*
|
|
25
25
|
* @param {PubSubOptions} options - Configuration object for PubSub
|
|
26
26
|
*/
|
|
27
|
-
constructor(options
|
|
27
|
+
constructor(options?: PubSubOptions);
|
|
28
28
|
getModuleName(): string;
|
|
29
29
|
/**
|
|
30
30
|
* Configure PubSub part with configurations
|
|
@@ -45,7 +45,7 @@ export declare class PubSubClass {
|
|
|
45
45
|
removePluggable(providerName: string): void;
|
|
46
46
|
private getProviderByName;
|
|
47
47
|
private getProviders;
|
|
48
|
-
publish(topics: string[] | string, msg: any, options?:
|
|
49
|
-
subscribe(topics: string[] | string, options?:
|
|
48
|
+
publish(topics: string[] | string, msg: any, options?: ProviderOptions): Promise<void[]>;
|
|
49
|
+
subscribe(topics: string[] | string, options?: ProviderOptions): Observable<any>;
|
|
50
50
|
}
|
|
51
51
|
export declare const PubSub: PubSubClass;
|
package/lib-esm/PubSub.js
CHANGED
|
@@ -59,7 +59,7 @@ var PubSubClass = /** @class */ (function () {
|
|
|
59
59
|
* @param {PubSubOptions} options - Configuration object for PubSub
|
|
60
60
|
*/
|
|
61
61
|
function PubSubClass(options) {
|
|
62
|
-
this._options = options;
|
|
62
|
+
this._options = options !== null && options !== void 0 ? options : {};
|
|
63
63
|
logger.debug('PubSub Options', this._options);
|
|
64
64
|
this._pluggables = [];
|
|
65
65
|
this.subscribe = this.subscribe.bind(this);
|
|
@@ -188,6 +188,6 @@ var PubSubClass = /** @class */ (function () {
|
|
|
188
188
|
return PubSubClass;
|
|
189
189
|
}());
|
|
190
190
|
export { PubSubClass };
|
|
191
|
-
export var PubSub = new PubSubClass(
|
|
191
|
+
export var PubSub = new PubSubClass();
|
|
192
192
|
Amplify.register(PubSub);
|
|
193
193
|
//# sourceMappingURL=PubSub.js.map
|
package/lib-esm/PubSub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSub.js","sourceRoot":"","sources":["../src/PubSub.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,gCAAgC;AAChC,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EACN,OAAO,EACP,aAAa,EACb,aAAa,IAAI,MAAM,EACvB,oCAAoC,EACpC,6CAA6C,GAC7C,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAErE,IAAA,+BAAM,CAAqB;AACnC,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC;AAEpC;IAqCC;;;;OAIG;IACH,qBAAY,
|
|
1
|
+
{"version":3,"file":"PubSub.js","sourceRoot":"","sources":["../src/PubSub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import Observable from 'zen-observable-ts';
|
|
2
|
-
import {
|
|
2
|
+
import { ProviderOptions } from './PubSub';
|
|
3
3
|
export interface PubSubProvider {
|
|
4
4
|
configure(config: object): object;
|
|
5
5
|
getCategory(): string;
|
|
6
6
|
getProviderName(): string;
|
|
7
|
-
publish(topics: string[] | string, msg: any, options?:
|
|
8
|
-
subscribe(topics: string[] | string, options?:
|
|
7
|
+
publish(topics: string[] | string, msg: any, options?: ProviderOptions): void;
|
|
8
|
+
subscribe(topics: string[] | string, options?: ProviderOptions): Observable<any>;
|
|
9
9
|
}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
export interface PubSubOptions {
|
|
2
2
|
[key: string]: any;
|
|
3
3
|
}
|
|
4
|
-
export interface
|
|
4
|
+
export interface ProviderOptions {
|
|
5
5
|
[key: string]: any;
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated Migrated to ProviderOptions
|
|
9
|
+
*/
|
|
10
|
+
export declare type ProvidertOptions = ProviderOptions;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/pubsub",
|
|
3
|
-
"version": "4.2.10-cloud-logging.
|
|
3
|
+
"version": "4.2.10-cloud-logging.8+11dcd61fe",
|
|
4
4
|
"description": "Pubsub category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -45,9 +45,9 @@
|
|
|
45
45
|
"cpx": "^1.5.0"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@aws-amplify/auth": "4.4.3-cloud-logging.
|
|
49
|
-
"@aws-amplify/cache": "4.0.36-cloud-logging.
|
|
50
|
-
"@aws-amplify/core": "4.4.1-cloud-logging.
|
|
48
|
+
"@aws-amplify/auth": "4.4.3-cloud-logging.8+11dcd61fe",
|
|
49
|
+
"@aws-amplify/cache": "4.0.36-cloud-logging.8+11dcd61fe",
|
|
50
|
+
"@aws-amplify/core": "4.4.1-cloud-logging.8+11dcd61fe",
|
|
51
51
|
"graphql": "15.8.0",
|
|
52
52
|
"paho-mqtt": "^1.1.0",
|
|
53
53
|
"uuid": "^3.2.1",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
"lib-esm"
|
|
98
98
|
]
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "11dcd61fe007a89b807fed5577458db598e1b52b"
|
|
101
101
|
}
|
|
@@ -18,6 +18,9 @@ import { MqttOverWSProvider } from './MqttOverWSProvider';
|
|
|
18
18
|
|
|
19
19
|
const logger = new Logger('AWSAppSyncProvider');
|
|
20
20
|
|
|
21
|
+
/**
|
|
22
|
+
* @deprecated Unused, all usecases have migrated to AWSAppSyncRealtimeProvider
|
|
23
|
+
*/
|
|
21
24
|
export class AWSAppSyncProvider extends MqttOverWSProvider {
|
|
22
25
|
protected get endpoint() {
|
|
23
26
|
throw new Error('Not supported');
|
|
@@ -96,9 +99,9 @@ export class AWSAppSyncProvider extends MqttOverWSProvider {
|
|
|
96
99
|
const { mqttConnections = [], newSubscriptions } = options;
|
|
97
100
|
|
|
98
101
|
// creates a map of {"topic": "alias"}
|
|
99
|
-
const newAliases = Object.entries(
|
|
100
|
-
|
|
101
|
-
)
|
|
102
|
+
const newAliases = Object.entries(newSubscriptions).map(
|
|
103
|
+
([alias, v]: [string, { topic: string }]) => [v.topic, alias]
|
|
104
|
+
);
|
|
102
105
|
|
|
103
106
|
// Merge new aliases with old ones
|
|
104
107
|
this._topicAlias = new Map([
|
|
@@ -107,31 +110,29 @@ export class AWSAppSyncProvider extends MqttOverWSProvider {
|
|
|
107
110
|
]);
|
|
108
111
|
|
|
109
112
|
// group by urls
|
|
110
|
-
const map: [
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
113
|
+
const map: [string, { url: string; topics: Set<string> }][] =
|
|
114
|
+
Object.entries(
|
|
115
|
+
targetTopics.reduce((acc, elem) => {
|
|
116
|
+
const connectionInfoForTopic = mqttConnections.find(
|
|
117
|
+
c => c.topics.indexOf(elem) > -1
|
|
118
|
+
);
|
|
119
|
+
|
|
120
|
+
if (connectionInfoForTopic) {
|
|
121
|
+
const { client: clientId, url } = connectionInfoForTopic;
|
|
122
|
+
|
|
123
|
+
if (!acc[clientId]) {
|
|
124
|
+
acc[clientId] = {
|
|
125
|
+
url,
|
|
126
|
+
topics: new Set(),
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
acc[clientId].topics.add(elem);
|
|
127
131
|
}
|
|
128
132
|
|
|
129
|
-
acc
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
return acc;
|
|
133
|
-
}, {})
|
|
134
|
-
);
|
|
133
|
+
return acc;
|
|
134
|
+
}, {})
|
|
135
|
+
);
|
|
135
136
|
|
|
136
137
|
// reconnect everything we have in the map
|
|
137
138
|
await Promise.all(
|