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

package/lib/utils/ConnectionStateMonitor.js

@@ -3,10 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionStateMonitor = exports.CONNECTION_CHANGE = void 0;
-var tslib_1 = require("tslib");
-var rxjs_1 = require("rxjs");
-var PubSub_1 = require("../types/PubSub");
-var ReachabilityMonitor_1 = require("./ReachabilityMonitor");
+const rxjs_1 = require("rxjs");
+const PubSub_1 = require("../types/PubSub");
+const ReachabilityMonitor_1 = require("./ReachabilityMonitor");
 exports.CONNECTION_CHANGE = {
     KEEP_ALIVE_MISSED: { keepAliveState: 'unhealthy' },
     KEEP_ALIVE: { keepAliveState: 'healthy' },
@@ -24,9 +23,8 @@ exports.CONNECTION_CHANGE = {
     ONLINE: { networkState: 'connected' },
     OFFLINE: { networkState: 'disconnected' },
 };
-var ConnectionStateMonitor = /** @class */ (function () {
-    function ConnectionStateMonitor() {
-        var _this = this;
+class ConnectionStateMonitor {
+    constructor() {
         this._networkMonitoringSubscription = undefined;
         this._linkedConnectionState = {
             networkState: 'connected',
@@ -35,73 +33,61 @@ var ConnectionStateMonitor = /** @class */ (function () {
             keepAliveState: 'healthy',
         };
         // Attempt to update the state with the current actual network state
-        this._initialNetworkStateSubscription = (0, ReachabilityMonitor_1.ReachabilityMonitor)().subscribe(function (_a) {
-            var _b;
-            var online = _a.online;
-            _this.record(online ? exports.CONNECTION_CHANGE.ONLINE : exports.CONNECTION_CHANGE.OFFLINE);
-            (_b = _this._initialNetworkStateSubscription) === null || _b === void 0 ? void 0 : _b.unsubscribe();
+        this._initialNetworkStateSubscription = (0, ReachabilityMonitor_1.ReachabilityMonitor)().subscribe(({ online }) => {
+            this.record(online ? exports.CONNECTION_CHANGE.ONLINE : exports.CONNECTION_CHANGE.OFFLINE);
+            this._initialNetworkStateSubscription?.unsubscribe();
         });
         this._linkedConnectionStateObservable =
-            new rxjs_1.Observable(function (connectionStateObserver) {
-                connectionStateObserver.next(_this._linkedConnectionState);
-                _this._linkedConnectionStateObserver = connectionStateObserver;
+            new rxjs_1.Observable(connectionStateObserver => {
+                connectionStateObserver.next(this._linkedConnectionState);
+                this._linkedConnectionStateObserver = connectionStateObserver;
             });
     }
     /**
      * Turn network state monitoring on if it isn't on already
      */
-    ConnectionStateMonitor.prototype.enableNetworkMonitoring = function () {
-        var _this = this;
-        var _a;
+    enableNetworkMonitoring() {
         // If no initial network state was discovered, stop trying
-        (_a = this._initialNetworkStateSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        this._initialNetworkStateSubscription?.unsubscribe();
         // Maintain the network state based on the reachability monitor
         if (this._networkMonitoringSubscription === undefined) {
-            this._networkMonitoringSubscription = (0, ReachabilityMonitor_1.ReachabilityMonitor)().subscribe(function (_a) {
-                var online = _a.online;
-                _this.record(online ? exports.CONNECTION_CHANGE.ONLINE : exports.CONNECTION_CHANGE.OFFLINE);
+            this._networkMonitoringSubscription = (0, ReachabilityMonitor_1.ReachabilityMonitor)().subscribe(({ online }) => {
+                this.record(online ? exports.CONNECTION_CHANGE.ONLINE : exports.CONNECTION_CHANGE.OFFLINE);
             });
         }
-    };
+    }
     /**
      * Turn network state monitoring off if it isn't off already
      */
-    ConnectionStateMonitor.prototype.disableNetworkMonitoring = function () {
-        var _a;
-        (_a = this._networkMonitoringSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+    disableNetworkMonitoring() {
+        this._networkMonitoringSubscription?.unsubscribe();
         this._networkMonitoringSubscription = undefined;
-    };
-    Object.defineProperty(ConnectionStateMonitor.prototype, "connectionStateObservable", {
-        /**
-         * Get the observable that allows us to monitor the connection state
-         *
-         * @returns {Observable<ConnectionState>} - The observable that emits ConnectionState updates
-         */
-        get: function () {
-            var _this = this;
-            var previous;
-            // The linked state aggregates state changes to any of the network, connection,
-            // intendedConnection and keepAliveHealth. Some states will change these independent
-            // states without changing the overall connection state.
-            // After translating from linked states to ConnectionState, then remove any duplicates
-            return this._linkedConnectionStateObservable
-                .pipe((0, rxjs_1.map)(function (value) {
-                return _this.connectionStatesTranslator(value);
-            }))
-                .pipe((0, rxjs_1.filter)(function (current) {
-                var toInclude = current !== previous;
-                previous = current;
-                return toInclude;
-            }));
-        },
-        enumerable: false,
-        configurable: true
-    });
+    }
+    /**
+     * Get the observable that allows us to monitor the connection state
+     *
+     * @returns {Observable<ConnectionState>} - The observable that emits ConnectionState updates
+     */
+    get connectionStateObservable() {
+        let previous;
+        // The linked state aggregates state changes to any of the network, connection,
+        // intendedConnection and keepAliveHealth. Some states will change these independent
+        // states without changing the overall connection state.
+        // After translating from linked states to ConnectionState, then remove any duplicates
+        return this._linkedConnectionStateObservable
+            .pipe((0, rxjs_1.map)(value => {
+            return this.connectionStatesTranslator(value);
+        }))
+            .pipe((0, rxjs_1.filter)(current => {
+            const toInclude = current !== previous;
+            previous = current;
+            return toInclude;
+        }));
+    }
     /*
      * Updates local connection state and emits the full state to the observer.
      */
-    ConnectionStateMonitor.prototype.record = function (statusUpdates) {
-        var _a;
+    record(statusUpdates) {
         // Maintain the network monitor
         if (statusUpdates.intendedConnectionState === 'connected') {
             this.enableNetworkMonitoring();
@@ -110,15 +96,17 @@ var ConnectionStateMonitor = /** @class */ (function () {
             this.disableNetworkMonitoring();
         }
         // Maintain the socket state
-        var newSocketStatus = tslib_1.__assign(tslib_1.__assign({}, this._linkedConnectionState), statusUpdates);
-        this._linkedConnectionState = tslib_1.__assign({}, newSocketStatus);
-        (_a = this._linkedConnectionStateObserver) === null || _a === void 0 ? void 0 : _a.next(this._linkedConnectionState);
-    };
+        const newSocketStatus = {
+            ...this._linkedConnectionState,
+            ...statusUpdates,
+        };
+        this._linkedConnectionState = { ...newSocketStatus };
+        this._linkedConnectionStateObserver?.next(this._linkedConnectionState);
+    }
     /*
      * Translate the ConnectionState structure into a specific ConnectionState string literal union
      */
-    ConnectionStateMonitor.prototype.connectionStatesTranslator = function (_a) {
-        var connectionState = _a.connectionState, networkState = _a.networkState, intendedConnectionState = _a.intendedConnectionState, keepAliveState = _a.keepAliveState;
+    connectionStatesTranslator({ connectionState, networkState, intendedConnectionState, keepAliveState, }) {
         if (connectionState === 'connected' && networkState === 'disconnected')
             return PubSub_1.ConnectionState.ConnectedPendingNetwork;
         if (connectionState === 'connected' &&
@@ -139,7 +127,6 @@ var ConnectionStateMonitor = /** @class */ (function () {
         if (connectionState === 'disconnected')
             return PubSub_1.ConnectionState.Disconnected;
         return PubSub_1.ConnectionState.Connected;
-    };
-    return ConnectionStateMonitor;
-}());
+    }
+}
 exports.ConnectionStateMonitor = ConnectionStateMonitor;

package/lib/utils/ReachabilityMonitor/index.js

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReachabilityMonitor = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var ReachabilityMonitor = function () { return new utils_1.Reachability().networkMonitor(); };
+const utils_1 = require("@aws-amplify/core/internals/utils");
+const ReachabilityMonitor = () => new utils_1.Reachability().networkMonitor();
 exports.ReachabilityMonitor = ReachabilityMonitor;

package/lib/utils/ReachabilityMonitor/index.native.js

@@ -3,10 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReachabilityMonitor = void 0;
-var tslib_1 = require("tslib");
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var netinfo_1 = tslib_1.__importDefault(require("@react-native-community/netinfo"));
-var ReachabilityMonitor = function () {
-    return new utils_1.Reachability().networkMonitor(netinfo_1.default);
-};
+const tslib_1 = require("tslib");
+const utils_1 = require("@aws-amplify/core/internals/utils");
+const netinfo_1 = tslib_1.__importDefault(require("@react-native-community/netinfo"));
+const ReachabilityMonitor = () => new utils_1.Reachability().networkMonitor(netinfo_1.default);
 exports.ReachabilityMonitor = ReachabilityMonitor;

package/lib/utils/ReconnectionMonitor.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReconnectionMonitor = exports.ReconnectEvent = void 0;
-var constants_1 = require("../Providers/constants");
+const constants_1 = require("../Providers/constants");
 var ReconnectEvent;
 (function (ReconnectEvent) {
     ReconnectEvent["START_RECONNECT"] = "START_RECONNECT";
@@ -13,31 +13,30 @@ var ReconnectEvent;
  *   Attempting to reconnect only once creates unrecoverable states when the network state isn't
  *   supported by the browser, so this keeps retrying every minute until halted.
  */
-var ReconnectionMonitor = /** @class */ (function () {
-    function ReconnectionMonitor() {
+class ReconnectionMonitor {
+    constructor() {
         this.reconnectObservers = [];
     }
     /**
      * Add reconnect observer to the list of observers to alert on reconnect
      */
-    ReconnectionMonitor.prototype.addObserver = function (reconnectObserver) {
+    addObserver(reconnectObserver) {
         this.reconnectObservers.push(reconnectObserver);
-    };
+    }
     /**
      * Given a reconnect event, start the appropriate behavior
      */
-    ReconnectionMonitor.prototype.record = function (event) {
-        var _this = this;
+    record(event) {
         if (event === ReconnectEvent.START_RECONNECT) {
             // If the reconnection hasn't been started
             if (this.reconnectSetTimeoutId === undefined &&
                 this.reconnectIntervalId === undefined) {
-                this.reconnectSetTimeoutId = setTimeout(function () {
+                this.reconnectSetTimeoutId = setTimeout(() => {
                     // Reconnect now
-                    _this._triggerReconnect();
+                    this._triggerReconnect();
                     // Retry reconnect every periodically until it works
-                    _this.reconnectIntervalId = setInterval(function () {
-                        _this._triggerReconnect();
+                    this.reconnectIntervalId = setInterval(() => {
+                        this._triggerReconnect();
                     }, constants_1.RECONNECT_INTERVAL);
                 }, constants_1.RECONNECT_DELAY);
             }
@@ -52,22 +51,19 @@ var ReconnectionMonitor = /** @class */ (function () {
                 this.reconnectSetTimeoutId = undefined;
             }
         }
-    };
+    }
     /**
      * Complete all reconnect observers
      */
-    ReconnectionMonitor.prototype.close = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.complete) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    close() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.complete?.();
         });
-    };
-    ReconnectionMonitor.prototype._triggerReconnect = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.next) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    }
+    _triggerReconnect() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.next?.();
         });
-    };
-    return ReconnectionMonitor;
-}());
+    }
+}
 exports.ReconnectionMonitor = ReconnectionMonitor;

package/lib-esm/Providers/AWSIot.js

@@ -1,53 +1,30 @@
-import { __awaiter, __extends, __generator } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { MqttOverWS } from './MqttOverWS';
 import { Signer } from '@aws-amplify/core/internals/utils';
 import { fetchAuthSession } from '@aws-amplify/core';
-var SERVICE_NAME = 'iotdevicegateway';
-var AWSIoT = /** @class */ (function (_super) {
-    __extends(AWSIoT, _super);
-    function AWSIoT(options) {
-        if (options === void 0) { options = {}; }
-        return _super.call(this, options) || this;
+const SERVICE_NAME = 'iotdevicegateway';
+export class AWSIoT extends MqttOverWS {
+    constructor(options = {}) {
+        super(options);
     }
-    Object.defineProperty(AWSIoT.prototype, "region", {
-        get: function () {
-            var _a;
-            return (_a = this.options) === null || _a === void 0 ? void 0 : _a.region;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(AWSIoT.prototype, "endpoint", {
-        get: function () {
-            var _this = this;
-            return (function () { return __awaiter(_this, void 0, void 0, function () {
-                var endpoint, serviceInfo, session, _a, access_key, secret_key, session_token, result;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            endpoint = this.options.endpoint;
-                            serviceInfo = {
-                                service: SERVICE_NAME,
-                                region: this.region,
-                            };
-                            return [4 /*yield*/, fetchAuthSession()];
-                        case 1:
-                            session = _b.sent();
-                            if (!session.credentials) {
-                                throw new Error('No auth session credentials');
-                            }
-                            _a = session.credentials, access_key = _a.accessKeyId, secret_key = _a.secretAccessKey, session_token = _a.sessionToken;
-                            result = Signer.signUrl(endpoint, { access_key: access_key, secret_key: secret_key, session_token: session_token }, serviceInfo);
-                            return [2 /*return*/, result];
-                    }
-                });
-            }); })();
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return AWSIoT;
-}(MqttOverWS));
-export { AWSIoT };
+    get region() {
+        return this.options?.region;
+    }
+    get endpoint() {
+        return (async () => {
+            const endpoint = this.options.endpoint;
+            const serviceInfo = {
+                service: SERVICE_NAME,
+                region: this.region,
+            };
+            const session = await fetchAuthSession();
+            if (!session.credentials) {
+                throw new Error('No auth session credentials');
+            }
+            const { accessKeyId: access_key, secretAccessKey: secret_key, sessionToken: session_token, } = session.credentials;
+            const result = Signer.signUrl(endpoint, { access_key, secret_key, session_token }, serviceInfo);
+            return result;
+        })();
+    }
+}

package/lib-esm/Providers/MqttOverWS.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { AbstractPubSub } from './PubSub';
-import { PubSubContentObserver, PubSubContent, PubSubOptions } from '../types/PubSub';
+import { PubSubContentObserver, PubSubContent, PubSubOptions, PublishInput, SubscribeInput } from '../types/PubSub';
 export declare function mqttTopicMatch(filter: string, topic: string): boolean;
 export interface MqttOptions extends PubSubOptions {
     clientId?: string;
@@ -47,10 +47,12 @@ export declare class MqttOverWS extends AbstractPubSub<MqttOptions> {
     newClient({ url, clientId }: MqttOptions): Promise<PahoClient>;
     protected connect(clientId: string, options?: MqttOptions): Promise<PahoClient | undefined>;
     protected disconnect(clientId: string): Promise<void>;
-    publish(topics: string[] | string, msg: PubSubContent): Promise<void>;
+    publish({ topics, message }: PublishInput): Promise<void>;
     protected _topicObservers: Map<string, Set<PubSubContentObserver>>;
     protected _clientIdObservers: Map<string, Set<PubSubContentObserver>>;
     private _onMessage;
-    subscribe(topics: string[] | string, options?: MqttOptions): Observable<PubSubContent>;
+    subscribe({ topics, options, }: SubscribeInput & {
+        options?: MqttOptions;
+    }): Observable<PubSubContent>;
 }
 export {};