@aws-amplify/pubsub 6.0.1-api-v6-models.9351bcf.0 → 6.0.1-api-v6-models.891fe0d.0

package/lib/Providers/MqttOverWS.js

@@ -3,25 +3,25 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MqttOverWS = exports.mqttTopicMatch = void 0;
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 // @ts-ignore
-var Paho = tslib_1.__importStar(require("../vendor/paho-mqtt"));
-var rxjs_1 = require("rxjs");
-var PubSub_1 = require("./PubSub");
-var PubSub_2 = require("../types/PubSub");
-var core_1 = require("@aws-amplify/core");
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var ConnectionStateMonitor_1 = require("../utils/ConnectionStateMonitor");
-var ReconnectionMonitor_1 = require("../utils/ReconnectionMonitor");
-var constants_1 = require("./constants");
-var logger = new core_1.ConsoleLogger('MqttOverWS');
+const Paho = tslib_1.__importStar(require("../vendor/paho-mqtt"));
+const rxjs_1 = require("rxjs");
+const PubSub_1 = require("./PubSub");
+const PubSub_2 = require("../types/PubSub");
+const core_1 = require("@aws-amplify/core");
+const utils_1 = require("@aws-amplify/core/internals/utils");
+const ConnectionStateMonitor_1 = require("../utils/ConnectionStateMonitor");
+const ReconnectionMonitor_1 = require("../utils/ReconnectionMonitor");
+const constants_1 = require("./constants");
+const logger = new core_1.ConsoleLogger('MqttOverWS');
 function mqttTopicMatch(filter, topic) {
-    var filterArray = filter.split('/');
-    var length = filterArray.length;
-    var topicArray = topic.split('/');
-    for (var i = 0; i < length; ++i) {
-        var left = filterArray[i];
-        var right = topicArray[i];
+    const filterArray = filter.split('/');
+    const length = filterArray.length;
+    const topicArray = topic.split('/');
+    for (let i = 0; i < length; ++i) {
+        const left = filterArray[i];
+        const right = topicArray[i];
         if (left === '#')
             return topicArray.length >= length;
         if (left !== '+' && left !== right)
@@ -30,369 +30,245 @@ function mqttTopicMatch(filter, topic) {
     return length === topicArray.length;
 }
 exports.mqttTopicMatch = mqttTopicMatch;
-var ClientsQueue = /** @class */ (function () {
-    function ClientsQueue() {
+class ClientsQueue {
+    constructor() {
         this.promises = new Map();
     }
-    ClientsQueue.prototype.get = function (clientId, clientFactory) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cachedPromise, newPromise;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                cachedPromise = this.promises.get(clientId);
-                if (cachedPromise)
-                    return [2 /*return*/, cachedPromise];
-                if (clientFactory) {
-                    newPromise = clientFactory(clientId);
-                    this.promises.set(clientId, newPromise);
-                    newPromise.catch(function () { return _this.promises.delete(clientId); });
-                    return [2 /*return*/, newPromise];
-                }
-                return [2 /*return*/, undefined];
-            });
-        });
-    };
-    Object.defineProperty(ClientsQueue.prototype, "allClients", {
-        get: function () {
-            return Array.from(this.promises.keys());
-        },
-        enumerable: false,
-        configurable: true
-    });
-    ClientsQueue.prototype.remove = function (clientId) {
+    async get(clientId, clientFactory) {
+        const cachedPromise = this.promises.get(clientId);
+        if (cachedPromise)
+            return cachedPromise;
+        if (clientFactory) {
+            const newPromise = clientFactory(clientId);
+            this.promises.set(clientId, newPromise);
+            newPromise.catch(() => this.promises.delete(clientId));
+            return newPromise;
+        }
+        return undefined;
+    }
+    get allClients() {
+        return Array.from(this.promises.keys());
+    }
+    remove(clientId) {
         this.promises.delete(clientId);
-    };
-    return ClientsQueue;
-}());
-var dispatchPubSubEvent = function (payload) {
+    }
+}
+const dispatchPubSubEvent = (payload) => {
     core_1.Hub.dispatch('pubsub', payload, 'PubSub', constants_1.AMPLIFY_SYMBOL);
 };
-var topicSymbol = typeof Symbol !== 'undefined' ? Symbol('topic') : '@@topic';
-var MqttOverWS = /** @class */ (function (_super) {
-    tslib_1.__extends(MqttOverWS, _super);
-    function MqttOverWS(options) {
-        if (options === void 0) { options = {}; }
-        var _this = _super.call(this, tslib_1.__assign(tslib_1.__assign({}, options), { clientId: options.clientId || (0, utils_1.amplifyUuid)() })) || this;
-        _this._clientsQueue = new ClientsQueue();
-        _this.connectionStateMonitor = new ConnectionStateMonitor_1.ConnectionStateMonitor();
-        _this.reconnectionMonitor = new ReconnectionMonitor_1.ReconnectionMonitor();
-        _this._topicObservers = new Map();
-        _this._clientIdObservers = new Map();
+const topicSymbol = typeof Symbol !== 'undefined' ? Symbol('topic') : '@@topic';
+class MqttOverWS extends PubSub_1.AbstractPubSub {
+    constructor(options = {}) {
+        super({ ...options, clientId: options.clientId || (0, utils_1.amplifyUuid)() });
+        this._clientsQueue = new ClientsQueue();
+        this.connectionStateMonitor = new ConnectionStateMonitor_1.ConnectionStateMonitor();
+        this.reconnectionMonitor = new ReconnectionMonitor_1.ReconnectionMonitor();
+        this._topicObservers = new Map();
+        this._clientIdObservers = new Map();
         // Monitor the connection health state and pass changes along to Hub
-        _this.connectionStateMonitor.connectionStateObservable.subscribe(function (connectionStateChange) {
+        this.connectionStateMonitor.connectionStateObservable.subscribe(connectionStateChange => {
             dispatchPubSubEvent({
                 event: constants_1.CONNECTION_STATE_CHANGE,
                 data: {
-                    provider: _this,
+                    provider: this,
                     connectionState: connectionStateChange,
                 },
-                message: "Connection state is ".concat(connectionStateChange),
+                message: `Connection state is ${connectionStateChange}`,
             });
-            _this.connectionState = connectionStateChange;
+            this.connectionState = connectionStateChange;
             // Trigger reconnection when the connection is disrupted
             if (connectionStateChange === PubSub_2.ConnectionState.ConnectionDisrupted) {
-                _this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.START_RECONNECT);
+                this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.START_RECONNECT);
             }
             else if (connectionStateChange !== PubSub_2.ConnectionState.Connecting) {
                 // Trigger connected to halt reconnection attempts
-                _this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.HALT_RECONNECT);
+                this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.HALT_RECONNECT);
             }
         });
-        return _this;
     }
-    Object.defineProperty(MqttOverWS.prototype, "clientId", {
-        get: function () {
-            return this.options.clientId;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(MqttOverWS.prototype, "endpoint", {
-        get: function () {
-            return Promise.resolve(this.options.endpoint);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(MqttOverWS.prototype, "clientsQueue", {
-        get: function () {
-            return this._clientsQueue;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(MqttOverWS.prototype, "isSSLEnabled", {
-        get: function () {
-            return !this.options['aws_appsync_dangerously_connect_to_http_endpoint_for_testing'];
-        },
-        enumerable: false,
-        configurable: true
-    });
-    MqttOverWS.prototype.onDisconnect = function (_a) {
-        var clientId = _a.clientId, errorCode = _a.errorCode, args = tslib_1.__rest(_a, ["clientId", "errorCode"]);
+    get clientId() {
+        return this.options.clientId;
+    }
+    get endpoint() {
+        return Promise.resolve(this.options.endpoint);
+    }
+    get clientsQueue() {
+        return this._clientsQueue;
+    }
+    get isSSLEnabled() {
+        return !this.options['aws_appsync_dangerously_connect_to_http_endpoint_for_testing'];
+    }
+    onDisconnect({ clientId, errorCode, ...args }) {
         if (errorCode !== 0) {
-            logger.warn(clientId, JSON.stringify(tslib_1.__assign({ errorCode: errorCode }, args), null, 2));
+            logger.warn(clientId, JSON.stringify({ errorCode, ...args }, null, 2));
             if (!clientId) {
                 return;
             }
-            var clientIdObservers = this._clientIdObservers.get(clientId);
+            const clientIdObservers = this._clientIdObservers.get(clientId);
             if (!clientIdObservers) {
                 return;
             }
             this.disconnect(clientId);
         }
-    };
-    MqttOverWS.prototype.newClient = function (_a) {
-        var url = _a.url, clientId = _a.clientId;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var client, connected;
-            var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        logger.debug('Creating new MQTT client', clientId);
-                        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.OPENING_CONNECTION);
-                        client = new Paho.Client(url, clientId);
-                        client.onMessageArrived = function (_a) {
-                            var topic = _a.destinationName, msg = _a.payloadString;
-                            _this._onMessage(topic, msg);
-                        };
-                        client.onConnectionLost = function (_a) {
-                            var errorCode = _a.errorCode, args = tslib_1.__rest(_a, ["errorCode"]);
-                            _this.onDisconnect(tslib_1.__assign({ clientId: clientId, errorCode: errorCode }, args));
-                            _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
-                        };
-                        return [4 /*yield*/, new Promise(function (resolve, reject) {
-                                client.connect({
-                                    useSSL: _this.isSSLEnabled,
-                                    mqttVersion: 3,
-                                    onSuccess: function () { return resolve(true); },
-                                    onFailure: function () {
-                                        if (clientId)
-                                            _this._clientsQueue.remove(clientId);
-                                        _this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
-                                        resolve(false);
-                                    },
-                                });
-                            })];
-                    case 1:
-                        connected = _b.sent();
-                        if (connected) {
-                            this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_ESTABLISHED);
-                        }
-                        return [2 /*return*/, client];
-                }
-            });
-        });
-    };
-    MqttOverWS.prototype.connect = function (clientId, options) {
-        if (options === void 0) { options = {}; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.clientsQueue.get(clientId, function (clientId) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var client;
-                            return tslib_1.__generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.newClient(tslib_1.__assign(tslib_1.__assign({}, options), { clientId: clientId }))];
-                                    case 1:
-                                        client = _a.sent();
-                                        if (client) {
-                                            // Once connected, subscribe to all topics registered observers
-                                            this._topicObservers.forEach(function (_value, key) {
-                                                client.subscribe(key);
-                                            });
-                                        }
-                                        return [2 /*return*/, client];
-                                }
-                            });
-                        }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    MqttOverWS.prototype.disconnect = function (clientId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var client;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.clientsQueue.get(clientId)];
-                    case 1:
-                        client = _a.sent();
-                        if (client && client.isConnected()) {
-                            client.disconnect();
-                        }
-                        this.clientsQueue.remove(clientId);
-                        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
-                        return [2 /*return*/];
-                }
+    }
+    async newClient({ url, clientId }) {
+        logger.debug('Creating new MQTT client', clientId);
+        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.OPENING_CONNECTION);
+        // @ts-ignore
+        const client = new Paho.Client(url, clientId);
+        client.onMessageArrived = ({ destinationName: topic, payloadString: msg, }) => {
+            this._onMessage(topic, msg);
+        };
+        client.onConnectionLost = ({ errorCode, ...args }) => {
+            this.onDisconnect({ clientId, errorCode, ...args });
+            this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
+        };
+        const connected = await new Promise((resolve, reject) => {
+            client.connect({
+                useSSL: this.isSSLEnabled,
+                mqttVersion: 3,
+                onSuccess: () => resolve(true),
+                onFailure: () => {
+                    if (clientId)
+                        this._clientsQueue.remove(clientId);
+                    this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
+                    resolve(false);
+                },
             });
         });
-    };
-    MqttOverWS.prototype.publish = function (topics, msg) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var targetTopics, message, client;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        targetTopics = [].concat(topics);
-                        message = JSON.stringify(msg);
-                        return [4 /*yield*/, this.clientsQueue.get(this.clientId)];
-                    case 1:
-                        client = _a.sent();
-                        if (client) {
-                            logger.debug('Publishing to topic(s)', targetTopics.join(','), message);
-                            targetTopics.forEach(function (topic) { return client.send(topic, message); });
-                        }
-                        else {
-                            logger.debug('Publishing to topic(s) failed', targetTopics.join(','), message);
-                        }
-                        return [2 /*return*/];
-                }
-            });
+        if (connected) {
+            this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_ESTABLISHED);
+        }
+        return client;
+    }
+    async connect(clientId, options = {}) {
+        return await this.clientsQueue.get(clientId, async (clientId) => {
+            const client = await this.newClient({ ...options, clientId });
+            if (client) {
+                // Once connected, subscribe to all topics registered observers
+                this._topicObservers.forEach((_value, key) => {
+                    client.subscribe(key);
+                });
+            }
+            return client;
         });
-    };
-    MqttOverWS.prototype._onMessage = function (topic, msg) {
+    }
+    async disconnect(clientId) {
+        const client = await this.clientsQueue.get(clientId);
+        if (client && client.isConnected()) {
+            client.disconnect();
+        }
+        this.clientsQueue.remove(clientId);
+        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
+    }
+    async publish({ topics, message }) {
+        const targetTopics = [].concat(topics);
+        const msg = JSON.stringify(message);
+        const client = await this.clientsQueue.get(this.clientId);
+        if (client) {
+            logger.debug('Publishing to topic(s)', targetTopics.join(','), message);
+            targetTopics.forEach(topic => client.send(topic, msg));
+        }
+        else {
+            logger.debug('Publishing to topic(s) failed', targetTopics.join(','), message);
+        }
+    }
+    _onMessage(topic, msg) {
         try {
-            var matchedTopicObservers_1 = [];
-            this._topicObservers.forEach(function (observerForTopic, observerTopic) {
+            const matchedTopicObservers = [];
+            this._topicObservers.forEach((observerForTopic, observerTopic) => {
                 if (mqttTopicMatch(observerTopic, topic)) {
-                    matchedTopicObservers_1.push(observerForTopic);
+                    matchedTopicObservers.push(observerForTopic);
                 }
             });
-            var parsedMessage_1 = JSON.parse(msg);
-            if (typeof parsedMessage_1 === 'object') {
+            const parsedMessage = JSON.parse(msg);
+            if (typeof parsedMessage === 'object') {
                 // @ts-ignore
-                parsedMessage_1[topicSymbol] = topic;
+                parsedMessage[topicSymbol] = topic;
             }
-            matchedTopicObservers_1.forEach(function (observersForTopic) {
-                observersForTopic.forEach(function (observer) { return observer.next(parsedMessage_1); });
+            matchedTopicObservers.forEach(observersForTopic => {
+                observersForTopic.forEach(observer => observer.next(parsedMessage));
             });
         }
         catch (error) {
             logger.warn('Error handling message', error, msg);
         }
-    };
-    MqttOverWS.prototype.subscribe = function (topics, options) {
-        var _this = this;
-        if (options === void 0) { options = {}; }
-        var targetTopics = [].concat(topics);
+    }
+    subscribe({ topics, options = {}, }) {
+        const targetTopics = [].concat(topics);
         logger.debug('Subscribing to topic(s)', targetTopics.join(','));
-        var reconnectSubscription;
-        return new rxjs_1.Observable(function (observer) {
-            targetTopics.forEach(function (topic) {
+        let reconnectSubscription;
+        return new rxjs_1.Observable(observer => {
+            targetTopics.forEach(topic => {
                 // this._topicObservers is used to notify the observers according to the topic received on the message
-                var observersForTopic = _this._topicObservers.get(topic);
+                let observersForTopic = this._topicObservers.get(topic);
                 if (!observersForTopic) {
                     observersForTopic = new Set();
-                    _this._topicObservers.set(topic, observersForTopic);
+                    this._topicObservers.set(topic, observersForTopic);
                 }
                 observersForTopic.add(observer);
             });
-            var _a = options.clientId, clientId = _a === void 0 ? _this.clientId : _a;
+            const { clientId = this.clientId } = options;
             // this._clientIdObservers is used to close observers when client gets disconnected
-            var observersForClientId = _this._clientIdObservers.get(clientId);
+            let observersForClientId = this._clientIdObservers.get(clientId);
             if (!observersForClientId) {
                 observersForClientId = new Set();
             }
             if (observersForClientId) {
                 observersForClientId.add(observer);
-                _this._clientIdObservers.set(clientId, observersForClientId);
+                this._clientIdObservers.set(clientId, observersForClientId);
             }
-            (function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var getClient;
-                var _this = this;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            getClient = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var _a, url, _b, client_1, e_1;
-                                return tslib_1.__generator(this, function (_c) {
-                                    switch (_c.label) {
-                                        case 0:
-                                            _c.trys.push([0, 5, , 6]);
-                                            _a = options.url;
-                                            if (!(_a === void 0)) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this.endpoint];
-                                        case 1:
-                                            _b = _c.sent();
-                                            return [3 /*break*/, 3];
-                                        case 2:
-                                            _b = _a;
-                                            _c.label = 3;
-                                        case 3:
-                                            url = _b;
-                                            return [4 /*yield*/, this.connect(clientId, { url: url })];
-                                        case 4:
-                                            client_1 = _c.sent();
-                                            if (client_1 !== undefined) {
-                                                targetTopics.forEach(function (topic) {
-                                                    client_1.subscribe(topic);
-                                                });
-                                            }
-                                            return [3 /*break*/, 6];
-                                        case 5:
-                                            e_1 = _c.sent();
-                                            logger.debug('Error forming connection', e_1);
-                                            return [3 /*break*/, 6];
-                                        case 6: return [2 /*return*/];
-                                    }
-                                });
-                            }); };
-                            // Establish the initial connection
-                            return [4 /*yield*/, getClient()];
-                        case 1:
-                            // Establish the initial connection
-                            _a.sent();
-                            // Add an observable to the reconnection list to manage reconnection for this subscription
-                            reconnectSubscription = new rxjs_1.Observable(function (observer) {
-                                _this.reconnectionMonitor.addObserver(observer);
-                            }).subscribe(function () {
-                                getClient();
+            (async () => {
+                const getClient = async () => {
+                    try {
+                        const { url = await this.endpoint } = options;
+                        const client = await this.connect(clientId, { url });
+                        if (client !== undefined) {
+                            targetTopics.forEach(topic => {
+                                client.subscribe(topic);
                             });
-                            return [2 /*return*/];
+                        }
                     }
-                });
-            }); })();
-            return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var client;
-                var _this = this;
-                var _a, _b;
-                return tslib_1.__generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0: return [4 /*yield*/, this.clientsQueue.get(clientId)];
-                        case 1:
-                            client = _c.sent();
-                            reconnectSubscription === null || reconnectSubscription === void 0 ? void 0 : reconnectSubscription.unsubscribe();
-                            if (client) {
-                                (_a = this._clientIdObservers.get(clientId)) === null || _a === void 0 ? void 0 : _a.delete(observer);
-                                // No more observers per client => client not needed anymore
-                                if (((_b = this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
-                                    this.disconnect(clientId);
-                                    this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSING_CONNECTION);
-                                    this._clientIdObservers.delete(clientId);
-                                }
-                                targetTopics.forEach(function (topic) {
-                                    var observersForTopic = _this._topicObservers.get(topic) ||
-                                        new Set();
-                                    observersForTopic.delete(observer);
-                                    // if no observers exists for the topic, topic should be removed
-                                    if (observersForTopic.size === 0) {
-                                        _this._topicObservers.delete(topic);
-                                        if (client.isConnected()) {
-                                            client.unsubscribe(topic);
-                                        }
-                                    }
-                                });
-                            }
-                            return [2 /*return*/, null];
+                    catch (e) {
+                        logger.debug('Error forming connection', e);
                     }
+                };
+                // Establish the initial connection
+                await getClient();
+                // Add an observable to the reconnection list to manage reconnection for this subscription
+                reconnectSubscription = new rxjs_1.Observable(observer => {
+                    this.reconnectionMonitor.addObserver(observer);
+                }).subscribe(() => {
+                    getClient();
                 });
-            }); };
+            })();
+            return async () => {
+                const client = await this.clientsQueue.get(clientId);
+                reconnectSubscription?.unsubscribe();
+                if (client) {
+                    this._clientIdObservers.get(clientId)?.delete(observer);
+                    // No more observers per client => client not needed anymore
+                    if (this._clientIdObservers.get(clientId)?.size === 0) {
+                        this.disconnect(clientId);
+                        this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSING_CONNECTION);
+                        this._clientIdObservers.delete(clientId);
+                    }
+                    targetTopics.forEach(topic => {
+                        const observersForTopic = this._topicObservers.get(topic) ||
+                            new Set();
+                        observersForTopic.delete(observer);
+                        // if no observers exists for the topic, topic should be removed
+                        if (observersForTopic.size === 0) {
+                            this._topicObservers.delete(topic);
+                            if (client.isConnected()) {
+                                client.unsubscribe(topic);
+                            }
+                        }
+                    });
+                }
+                return null;
+            };
         });
-    };
-    return MqttOverWS;
-}(PubSub_1.AbstractPubSub));
+    }
+}
 exports.MqttOverWS = MqttOverWS;

package/lib/Providers/PubSub.d.ts

@@ -1,12 +1,11 @@
 import { Observable } from 'rxjs';
-import { PubSubBase, PubSubOptions, PubSubContent } from '../types/PubSub';
-import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
+import { PubSubBase, PubSubOptions, PubSubContent, PublishInput, SubscribeInput } from '../types/PubSub';
 export declare abstract class AbstractPubSub<T extends PubSubOptions> implements PubSubBase {
     private _config;
     constructor(options: T);
     configure(config: T): T;
     protected get options(): T;
     abstract newClient(clientOptions: T): Promise<any>;
-    abstract publish(topics: string[] | string, msg: PubSubContent, options?: T): void;
-    abstract subscribe(topics: string[] | string, options?: T, customUserAgentDetails?: CustomUserAgentDetails): Observable<PubSubContent>;
+    abstract publish(input: PublishInput): void;
+    abstract subscribe(input: SubscribeInput): Observable<PubSubContent>;
 }

package/lib/Providers/PubSub.js

@@ -1,25 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractPubSub = void 0;
-var tslib_1 = require("tslib");
-var core_1 = require("@aws-amplify/core");
-var logger = new core_1.ConsoleLogger('AbstractPubSubProvider');
-var AbstractPubSub = /** @class */ (function () {
-    function AbstractPubSub(options) {
+const core_1 = require("@aws-amplify/core");
+const logger = new core_1.ConsoleLogger('AbstractPubSubProvider');
+class AbstractPubSub {
+    constructor(options) {
         this._config = options;
     }
-    AbstractPubSub.prototype.configure = function (config) {
-        this._config = tslib_1.__assign(tslib_1.__assign({}, config), this._config);
-        logger.debug("configure", this._config);
+    configure(config) {
+        this._config = { ...config, ...this._config };
+        logger.debug(`configure`, this._config);
         return this.options;
-    };
-    Object.defineProperty(AbstractPubSub.prototype, "options", {
-        get: function () {
-            return tslib_1.__assign({}, this._config);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return AbstractPubSub;
-}());
+    }
+    get options() {
+        return { ...this._config };
+    }
+}
 exports.AbstractPubSub = AbstractPubSub;