@aws-amplify/pubsub 4.2.9-unstable.9 → 4.2.10-cloud-logging.8

package/lib/Providers/AWSAppSyncRealTimeProvider.js

@@ -109,8 +109,7 @@ var auth_1 = __importDefault(require("@aws-amplify/auth"));
 var PubSubProvider_1 = require("./PubSubProvider");
 var index_1 = require("../index");
 var logger = new core_1.Logger('AWSAppSyncRealTimeProvider');
-var AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' &&
-    typeof Symbol.for === 'function'
+var AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
     ? Symbol.for('amplify_default')
     : '@@amplify_default');
 var dispatchApiEvent = function (event, data, message) {
@@ -231,9 +230,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype.subscribe = function (_topics, options) {
         var _this = this;
-        var appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint;
+        var appSyncGraphqlEndpoint = options === null || options === void 0 ? void 0 : options.appSyncGraphqlEndpoint;
         return new zen_observable_ts_1.default(function (observer) {
-            if (!appSyncGraphqlEndpoint) {
+            if (!options || !appSyncGraphqlEndpoint) {
                 observer.error({
                     errors: [
                         __assign({}, new graphql_1.GraphQLError("Subscribe only available for AWS AppSync endpoint")),
@@ -302,14 +301,15 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     });
     AWSAppSyncRealTimeProvider.prototype._startSubscriptionWithAWSAppSyncRealTime = function (_a) {
         var options = _a.options, observer = _a.observer, subscriptionId = _a.subscriptionId;
+        var _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var appSyncGraphqlEndpoint, authenticationType, query, variables, apiKey, region, _b, graphql_headers, _c, additionalHeaders, subscriptionState, data, dataString, headerObj, _d, _e, subscriptionMessage, stringToAWSRealTime, err_2, _f, message, subscriptionFailedCallback_1, _g, subscriptionFailedCallback, subscriptionReadyCallback;
-            var _h;
+            var appSyncGraphqlEndpoint, authenticationType, query, variables, apiKey, region, _d, graphql_headers, _e, additionalHeaders, subscriptionState, data, dataString, headerObj, _f, _g, subscriptionMessage, stringToAWSRealTime, err_2, message, subscriptionFailedCallback_1, _h, subscriptionFailedCallback, subscriptionReadyCallback;
+            var _j;
             var _this = this;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
-                        appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint, authenticationType = options.authenticationType, query = options.query, variables = options.variables, apiKey = options.apiKey, region = options.region, _b = options.graphql_headers, graphql_headers = _b === void 0 ? function () { return ({}); } : _b, _c = options.additionalHeaders, additionalHeaders = _c === void 0 ? {} : _c;
+                        appSyncGraphqlEndpoint = options.appSyncGraphqlEndpoint, authenticationType = options.authenticationType, query = options.query, variables = options.variables, apiKey = options.apiKey, region = options.region, _d = options.graphql_headers, graphql_headers = _d === void 0 ? function () { return ({}); } : _d, _e = options.additionalHeaders, additionalHeaders = _e === void 0 ? {} : _e;
                         subscriptionState = SUBSCRIPTION_STATUS.PENDING;
                         data = {
                             query: query,
@@ -318,13 +318,13 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         // Having a subscription id map will make it simple to forward messages received
                         this.subscriptionObserverMap.set(subscriptionId, {
                             observer: observer,
-                            query: query,
-                            variables: variables,
+                            query: query !== null && query !== void 0 ? query : '',
+                            variables: variables !== null && variables !== void 0 ? variables : {},
                             subscriptionState: subscriptionState,
-                            startAckTimeoutId: null,
+                            startAckTimeoutId: undefined,
                         });
                         dataString = JSON.stringify(data);
-                        _d = [{}];
+                        _f = [{}];
                         return [4 /*yield*/, this._awsRealTimeHeaderBasedAuth({
                                 apiKey: apiKey,
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
@@ -335,10 +335,10 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                 additionalHeaders: additionalHeaders,
                             })];
                     case 1:
-                        _e = [__assign.apply(void 0, _d.concat([(_j.sent())]))];
+                        _g = [__assign.apply(void 0, _f.concat([(_k.sent())]))];
                         return [4 /*yield*/, graphql_headers()];
                     case 2:
-                        headerObj = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_j.sent())])), additionalHeaders]), (_h = {}, _h[core_1.USER_AGENT_HEADER] = core_1.Constants.userAgent, _h)]);
+                        headerObj = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), additionalHeaders]), (_j = {}, _j[core_1.USER_AGENT_HEADER] = core_1.Constants.userAgent, _j)]);
                         subscriptionMessage = {
                             id: subscriptionId,
                             payload: {
@@ -350,9 +350,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                             type: MESSAGE_TYPES.GQL_START,
                         };
                         stringToAWSRealTime = JSON.stringify(subscriptionMessage);
-                        _j.label = 3;
+                        _k.label = 3;
                     case 3:
-                        _j.trys.push([3, 5, , 6]);
+                        _k.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, this._initializeWebSocketConnection({
                                 apiKey: apiKey,
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
@@ -361,12 +361,12 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                 additionalHeaders: additionalHeaders,
                             })];
                     case 4:
-                        _j.sent();
+                        _k.sent();
                         return [3 /*break*/, 6];
                     case 5:
-                        err_2 = _j.sent();
+                        err_2 = _k.sent();
                         logger.debug({ err: err_2 });
-                        _f = err_2.message, message = _f === void 0 ? '' : _f;
+                        message = (_b = err_2['message']) !== null && _b !== void 0 ? _b : '';
                         observer.error({
                             errors: [
                                 __assign({}, new graphql_1.GraphQLError(index_1.CONTROL_MSG.CONNECTION_FAILED + ": " + message)),
@@ -380,13 +380,13 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         }
                         return [2 /*return*/];
                     case 6:
-                        _g = this.subscriptionObserverMap.get(subscriptionId), subscriptionFailedCallback = _g.subscriptionFailedCallback, subscriptionReadyCallback = _g.subscriptionReadyCallback;
+                        _h = (_c = this.subscriptionObserverMap.get(subscriptionId)) !== null && _c !== void 0 ? _c : {}, subscriptionFailedCallback = _h.subscriptionFailedCallback, subscriptionReadyCallback = _h.subscriptionReadyCallback;
                         // This must be done before sending the message in order to be listening immediately
                         this.subscriptionObserverMap.set(subscriptionId, {
                             observer: observer,
                             subscriptionState: subscriptionState,
-                            variables: variables,
-                            query: query,
+                            query: query !== null && query !== void 0 ? query : '',
+                            variables: variables !== null && variables !== void 0 ? variables : {},
                             subscriptionReadyCallback: subscriptionReadyCallback,
                             subscriptionFailedCallback: subscriptionFailedCallback,
                             startAckTimeoutId: setTimeout(function () {
@@ -404,23 +404,26 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     // Waiting that subscription has been connected before trying to unsubscribe
     AWSAppSyncRealTimeProvider.prototype._waitForSubscriptionToBeConnected = function (subscriptionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var subscriptionState;
+            var subscriptionObserver, subscriptionState;
             var _this = this;
             return __generator(this, function (_a) {
-                subscriptionState = this.subscriptionObserverMap.get(subscriptionId).subscriptionState;
-                // This in case unsubscribe is invoked before sending start subscription message
-                if (subscriptionState === SUBSCRIPTION_STATUS.PENDING) {
-                    return [2 /*return*/, new Promise(function (res, rej) {
-                            var _a = _this.subscriptionObserverMap.get(subscriptionId), observer = _a.observer, subscriptionState = _a.subscriptionState, variables = _a.variables, query = _a.query;
-                            _this.subscriptionObserverMap.set(subscriptionId, {
-                                observer: observer,
-                                subscriptionState: subscriptionState,
-                                variables: variables,
-                                query: query,
-                                subscriptionReadyCallback: res,
-                                subscriptionFailedCallback: rej,
-                            });
-                        })];
+                subscriptionObserver = this.subscriptionObserverMap.get(subscriptionId);
+                if (subscriptionObserver) {
+                    subscriptionState = subscriptionObserver.subscriptionState;
+                    // This in case unsubscribe is invoked before sending start subscription message
+                    if (subscriptionState === SUBSCRIPTION_STATUS.PENDING) {
+                        return [2 /*return*/, new Promise(function (res, rej) {
+                                var observer = subscriptionObserver.observer, subscriptionState = subscriptionObserver.subscriptionState, variables = subscriptionObserver.variables, query = subscriptionObserver.query;
+                                _this.subscriptionObserverMap.set(subscriptionId, {
+                                    observer: observer,
+                                    subscriptionState: subscriptionState,
+                                    variables: variables,
+                                    query: query,
+                                    subscriptionReadyCallback: res,
+                                    subscriptionFailedCallback: rej,
+                                });
+                            })];
+                    }
                 }
                 return [2 /*return*/];
             });
@@ -465,21 +468,32 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         }
         else {
             logger.debug('closing WebSocket...');
-            clearTimeout(this.keepAliveTimeoutId);
+            if (this.keepAliveTimeoutId)
+                clearTimeout(this.keepAliveTimeoutId);
             var tempSocket = this.awsRealTimeSocket;
             // Cleaning callbacks to avoid race condition, socket still exists
-            tempSocket.onclose = undefined;
-            tempSocket.onerror = undefined;
+            tempSocket.onclose = null;
+            tempSocket.onerror = null;
             tempSocket.close(1000);
-            this.awsRealTimeSocket = null;
+            this.awsRealTimeSocket = undefined;
             this.socketStatus = SOCKET_STATUS.CLOSED;
         }
     };
     AWSAppSyncRealTimeProvider.prototype._handleIncomingSubscriptionMessage = function (message) {
-        logger.debug("subscription message from AWS AppSync RealTime: " + message.data);
+        if (message.data && message.data === '{"type":"ka"}') {
+            logger.verbose("subscription message from AWS AppSync RealTime: " + message.data);
+        }
+        else {
+            logger.debug("subscription message from AWS AppSync RealTime: " + message.data);
+        }
         var _a = JSON.parse(message.data), _b = _a.id, id = _b === void 0 ? '' : _b, payload = _a.payload, type = _a.type;
         var _c = this.subscriptionObserverMap.get(id) || {}, _d = _c.observer, observer = _d === void 0 ? null : _d, _e = _c.query, query = _e === void 0 ? '' : _e, _f = _c.variables, variables = _f === void 0 ? {} : _f, startAckTimeoutId = _c.startAckTimeoutId, subscriptionReadyCallback = _c.subscriptionReadyCallback, subscriptionFailedCallback = _c.subscriptionFailedCallback;
-        logger.debug({ id: id, observer: observer, query: query, variables: variables });
+        if (!id && !observer && !query && Object.keys(variables).length === 0) {
+            logger.verbose({ id: id, observer: observer, query: query, variables: variables });
+        }
+        else {
+            logger.debug({ id: id, observer: observer, query: query, variables: variables });
+        }
         if (type === MESSAGE_TYPES.GQL_DATA && payload && payload.data) {
             if (observer) {
                 observer.next(payload);
@@ -494,46 +508,53 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
             if (typeof subscriptionReadyCallback === 'function') {
                 subscriptionReadyCallback();
             }
-            clearTimeout(startAckTimeoutId);
+            if (startAckTimeoutId)
+                clearTimeout(startAckTimeoutId);
             dispatchApiEvent(index_1.CONTROL_MSG.SUBSCRIPTION_ACK, { query: query, variables: variables }, 'Connection established for subscription');
             var subscriptionState = SUBSCRIPTION_STATUS.CONNECTED;
-            this.subscriptionObserverMap.set(id, {
-                observer: observer,
-                query: query,
-                variables: variables,
-                startAckTimeoutId: null,
-                subscriptionState: subscriptionState,
-                subscriptionReadyCallback: subscriptionReadyCallback,
-                subscriptionFailedCallback: subscriptionFailedCallback,
-            });
+            if (observer) {
+                this.subscriptionObserverMap.set(id, {
+                    observer: observer,
+                    query: query,
+                    variables: variables,
+                    startAckTimeoutId: undefined,
+                    subscriptionState: subscriptionState,
+                    subscriptionReadyCallback: subscriptionReadyCallback,
+                    subscriptionFailedCallback: subscriptionFailedCallback,
+                });
+            }
             // TODO: emit event on hub but it requires to store the id first
             return;
         }
         if (type === MESSAGE_TYPES.GQL_CONNECTION_KEEP_ALIVE) {
-            clearTimeout(this.keepAliveTimeoutId);
+            if (this.keepAliveTimeoutId)
+                clearTimeout(this.keepAliveTimeoutId);
             this.keepAliveTimeoutId = setTimeout(this._errorDisconnect.bind(this, index_1.CONTROL_MSG.TIMEOUT_DISCONNECT), this.keepAliveTimeout);
             return;
         }
         if (type === MESSAGE_TYPES.GQL_ERROR) {
             var subscriptionState = SUBSCRIPTION_STATUS.FAILED;
-            this.subscriptionObserverMap.set(id, {
-                observer: observer,
-                query: query,
-                variables: variables,
-                startAckTimeoutId: startAckTimeoutId,
-                subscriptionReadyCallback: subscriptionReadyCallback,
-                subscriptionFailedCallback: subscriptionFailedCallback,
-                subscriptionState: subscriptionState,
-            });
-            observer.error({
-                errors: [
-                    __assign({}, new graphql_1.GraphQLError(index_1.CONTROL_MSG.CONNECTION_FAILED + ": " + JSON.stringify(payload))),
-                ],
-            });
-            clearTimeout(startAckTimeoutId);
-            observer.complete();
-            if (typeof subscriptionFailedCallback === 'function') {
-                subscriptionFailedCallback();
+            if (observer) {
+                this.subscriptionObserverMap.set(id, {
+                    observer: observer,
+                    query: query,
+                    variables: variables,
+                    startAckTimeoutId: startAckTimeoutId,
+                    subscriptionReadyCallback: subscriptionReadyCallback,
+                    subscriptionFailedCallback: subscriptionFailedCallback,
+                    subscriptionState: subscriptionState,
+                });
+                observer.error({
+                    errors: [
+                        __assign({}, new graphql_1.GraphQLError(index_1.CONTROL_MSG.CONNECTION_FAILED + ": " + JSON.stringify(payload))),
+                    ],
+                });
+                if (startAckTimeoutId)
+                    clearTimeout(startAckTimeoutId);
+                observer.complete();
+                if (typeof subscriptionFailedCallback === 'function') {
+                    subscriptionFailedCallback();
+                }
             }
         }
     };
@@ -554,29 +575,32 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
         this.socketStatus = SOCKET_STATUS.CLOSED;
     };
     AWSAppSyncRealTimeProvider.prototype._timeoutStartSubscriptionAck = function (subscriptionId) {
-        var _a = this.subscriptionObserverMap.get(subscriptionId) || {}, observer = _a.observer, query = _a.query, variables = _a.variables;
-        if (!observer) {
-            return;
-        }
-        this.subscriptionObserverMap.set(subscriptionId, {
-            observer: observer,
-            query: query,
-            variables: variables,
-            subscriptionState: SUBSCRIPTION_STATUS.FAILED,
-        });
-        if (observer && !observer.closed) {
-            observer.error({
-                errors: [
-                    __assign({}, new graphql_1.GraphQLError("Subscription timeout " + JSON.stringify({
-                        query: query,
-                        variables: variables,
-                    }))),
-                ],
+        var subscriptionObserver = this.subscriptionObserverMap.get(subscriptionId);
+        if (subscriptionObserver) {
+            var observer = subscriptionObserver.observer, query = subscriptionObserver.query, variables = subscriptionObserver.variables;
+            if (!observer) {
+                return;
+            }
+            this.subscriptionObserverMap.set(subscriptionId, {
+                observer: observer,
+                query: query,
+                variables: variables,
+                subscriptionState: SUBSCRIPTION_STATUS.FAILED,
             });
-            // Cleanup will be automatically executed
-            observer.complete();
+            if (observer && !observer.closed) {
+                observer.error({
+                    errors: [
+                        __assign({}, new graphql_1.GraphQLError("Subscription timeout " + JSON.stringify({
+                            query: query,
+                            variables: variables,
+                        }))),
+                    ],
+                });
+                // Cleanup will be automatically executed
+                observer.complete();
+            }
+            logger.debug('timeoutStartSubscription', JSON.stringify({ query: query, variables: variables }));
         }
-        logger.debug('timeoutStartSubscription', JSON.stringify({ query: query, variables: variables }));
     };
     AWSAppSyncRealTimeProvider.prototype._initializeWebSocketConnection = function (_a) {
         var _this = this;
@@ -610,19 +634,22 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         headerString = _b.apply(_a, [_c.sent()]);
                         headerQs = buffer_1.Buffer.from(headerString).toString('base64');
                         payloadQs = buffer_1.Buffer.from(payloadString).toString('base64');
-                        discoverableEndpoint = appSyncGraphqlEndpoint;
+                        discoverableEndpoint = appSyncGraphqlEndpoint !== null && appSyncGraphqlEndpoint !== void 0 ? appSyncGraphqlEndpoint : '';
                         if (this.isCustomDomain(discoverableEndpoint)) {
-                            discoverableEndpoint = discoverableEndpoint.concat(customDomainPath);
+                            discoverableEndpoint =
+                                discoverableEndpoint.concat(customDomainPath);
                         }
                         else {
-                            discoverableEndpoint = discoverableEndpoint.replace('appsync-api', 'appsync-realtime-api').replace('gogi-beta', 'grt-beta');
+                            discoverableEndpoint = discoverableEndpoint
+                                .replace('appsync-api', 'appsync-realtime-api')
+                                .replace('gogi-beta', 'grt-beta');
                         }
                         protocol = this.isSSLEnabled ? 'wss://' : 'ws://';
                         discoverableEndpoint = discoverableEndpoint
                             .replace('https://', protocol)
                             .replace('http://', protocol);
                         awsRealTimeUrl = discoverableEndpoint + "?header=" + headerQs + "&payload=" + payloadQs;
-                        return [4 /*yield*/, this._initializeRetryableHandshake({ awsRealTimeUrl: awsRealTimeUrl })];
+                        return [4 /*yield*/, this._initializeRetryableHandshake(awsRealTimeUrl)];
                     case 3:
                         _c.sent();
                         this.promiseArray.forEach(function (_a) {
@@ -644,7 +671,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                             this.awsRealTimeSocket.readyState === WebSocket.OPEN) {
                             this.awsRealTimeSocket.close(3001);
                         }
-                        this.awsRealTimeSocket = null;
+                        this.awsRealTimeSocket = undefined;
                         this.socketStatus = SOCKET_STATUS.CLOSED;
                         return [3 /*break*/, 5];
                     case 5: return [2 /*return*/];
@@ -652,25 +679,23 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
             });
         }); });
     };
-    AWSAppSyncRealTimeProvider.prototype._initializeRetryableHandshake = function (_a) {
-        var awsRealTimeUrl = _a.awsRealTimeUrl;
+    AWSAppSyncRealTimeProvider.prototype._initializeRetryableHandshake = function (awsRealTimeUrl) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         logger.debug("Initializaling retryable Handshake");
-                        return [4 /*yield*/, core_1.jitteredExponentialRetry(this._initializeHandshake.bind(this), [{ awsRealTimeUrl: awsRealTimeUrl }], MAX_DELAY_MS)];
+                        return [4 /*yield*/, core_1.jitteredExponentialRetry(this._initializeHandshake.bind(this), [awsRealTimeUrl], MAX_DELAY_MS)];
                     case 1:
-                        _b.sent();
+                        _a.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
-    AWSAppSyncRealTimeProvider.prototype._initializeHandshake = function (_a) {
-        var awsRealTimeUrl = _a.awsRealTimeUrl;
+    AWSAppSyncRealTimeProvider.prototype._initializeHandshake = function (awsRealTimeUrl) {
         return __awaiter(this, void 0, void 0, function () {
-            var err_4, errorType, errorCode;
+            var err_4, _a, errorType, errorCode;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -699,48 +724,53 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         // Step 2: wait for ack from AWS AppSyncReaTime after sending init
                         return [4 /*yield*/, (function () {
                                 return new Promise(function (res, rej) {
-                                    var ackOk = false;
-                                    _this.awsRealTimeSocket.onerror = function (error) {
-                                        logger.debug("WebSocket error " + JSON.stringify(error));
-                                    };
-                                    _this.awsRealTimeSocket.onclose = function (event) {
-                                        logger.debug("WebSocket closed " + event.reason);
-                                        rej(new Error(JSON.stringify(event)));
-                                    };
-                                    _this.awsRealTimeSocket.onmessage = function (message) {
-                                        logger.debug("subscription message from AWS AppSyncRealTime: " + message.data + " ");
-                                        var data = JSON.parse(message.data);
-                                        var type = data.type, _a = data.payload, _b = (_a === void 0 ? {} : _a).connectionTimeoutMs, connectionTimeoutMs = _b === void 0 ? DEFAULT_KEEP_ALIVE_TIMEOUT : _b;
-                                        if (type === MESSAGE_TYPES.GQL_CONNECTION_ACK) {
-                                            ackOk = true;
-                                            _this.keepAliveTimeout = connectionTimeoutMs;
-                                            _this.awsRealTimeSocket.onmessage = _this._handleIncomingSubscriptionMessage.bind(_this);
-                                            _this.awsRealTimeSocket.onerror = function (err) {
-                                                logger.debug(err);
-                                                _this._errorDisconnect(index_1.CONTROL_MSG.CONNECTION_CLOSED);
-                                            };
-                                            _this.awsRealTimeSocket.onclose = function (event) {
-                                                logger.debug("WebSocket closed " + event.reason);
-                                                _this._errorDisconnect(index_1.CONTROL_MSG.CONNECTION_CLOSED);
-                                            };
-                                            res('Cool, connected to AWS AppSyncRealTime');
-                                            return;
-                                        }
-                                        if (type === MESSAGE_TYPES.GQL_CONNECTION_ERROR) {
-                                            var _c = data.payload, _d = (_c === void 0 ? {} : _c).errors, _e = __read(_d === void 0 ? [] : _d, 1), _f = _e[0], _g = _f === void 0 ? {} : _f, _h = _g.errorType, errorType = _h === void 0 ? '' : _h, _j = _g.errorCode, errorCode = _j === void 0 ? 0 : _j;
-                                            rej({ errorType: errorType, errorCode: errorCode });
-                                        }
-                                    };
-                                    var gqlInit = {
-                                        type: MESSAGE_TYPES.GQL_CONNECTION_INIT,
-                                    };
-                                    _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
-                                    function checkAckOk() {
+                                    if (_this.awsRealTimeSocket) {
+                                        var ackOk_1 = false;
+                                        _this.awsRealTimeSocket.onerror = function (error) {
+                                            logger.debug("WebSocket error " + JSON.stringify(error));
+                                        };
+                                        _this.awsRealTimeSocket.onclose = function (event) {
+                                            logger.debug("WebSocket closed " + event.reason);
+                                            rej(new Error(JSON.stringify(event)));
+                                        };
+                                        _this.awsRealTimeSocket.onmessage = function (message) {
+                                            logger.debug("subscription message from AWS AppSyncRealTime: " + message.data + " ");
+                                            var data = JSON.parse(message.data);
+                                            var type = data.type, _a = data.payload, _b = (_a === void 0 ? {} : _a).connectionTimeoutMs, connectionTimeoutMs = _b === void 0 ? DEFAULT_KEEP_ALIVE_TIMEOUT : _b;
+                                            if (type === MESSAGE_TYPES.GQL_CONNECTION_ACK) {
+                                                ackOk_1 = true;
+                                                if (_this.awsRealTimeSocket) {
+                                                    _this.keepAliveTimeout = connectionTimeoutMs;
+                                                    _this.awsRealTimeSocket.onmessage =
+                                                        _this._handleIncomingSubscriptionMessage.bind(_this);
+                                                    _this.awsRealTimeSocket.onerror = function (err) {
+                                                        logger.debug(err);
+                                                        _this._errorDisconnect(index_1.CONTROL_MSG.CONNECTION_CLOSED);
+                                                    };
+                                                    _this.awsRealTimeSocket.onclose = function (event) {
+                                                        logger.debug("WebSocket closed " + event.reason);
+                                                        _this._errorDisconnect(index_1.CONTROL_MSG.CONNECTION_CLOSED);
+                                                    };
+                                                }
+                                                res('Cool, connected to AWS AppSyncRealTime');
+                                                return;
+                                            }
+                                            if (type === MESSAGE_TYPES.GQL_CONNECTION_ERROR) {
+                                                var _c = data.payload, _d = (_c === void 0 ? {} : _c).errors, _e = __read(_d === void 0 ? [] : _d, 1), _f = _e[0], _g = _f === void 0 ? {} : _f, _h = _g.errorType, errorType = _h === void 0 ? '' : _h, _j = _g.errorCode, errorCode = _j === void 0 ? 0 : _j;
+                                                rej({ errorType: errorType, errorCode: errorCode });
+                                            }
+                                        };
+                                        var gqlInit = {
+                                            type: MESSAGE_TYPES.GQL_CONNECTION_INIT,
+                                        };
+                                        _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
+                                        setTimeout(checkAckOk.bind(_this, ackOk_1), CONNECTION_INIT_TIMEOUT);
+                                    }
+                                    function checkAckOk(ackOk) {
                                         if (!ackOk) {
                                             rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + CONNECTION_INIT_TIMEOUT + " ms"));
                                         }
                                     }
-                                    setTimeout(checkAckOk.bind(_this), CONNECTION_INIT_TIMEOUT);
                                 });
                             })()];
                     case 3:
@@ -749,7 +779,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         return [3 /*break*/, 5];
                     case 4:
                         err_4 = _b.sent();
-                        errorType = err_4.errorType, errorCode = err_4.errorCode;
+                        _a = err_4, errorType = _a.errorType, errorCode = _a.errorCode;
                         if (NON_RETRYABLE_CODES.includes(errorCode)) {
                             throw new core_1.NonRetryableError(errorType);
                         }
@@ -779,12 +809,12 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                             AMAZON_COGNITO_USER_POOLS: this._awsRealTimeCUPHeader.bind(this),
                             AWS_LAMBDA: this._customAuthHeader,
                         };
+                        if (!(!authenticationType || !headerHandler[authenticationType])) return [3 /*break*/, 1];
+                        logger.debug("Authentication type " + authenticationType + " not supported");
+                        return [2 /*return*/, ''];
+                    case 1:
                         handler = headerHandler[authenticationType];
-                        if (typeof handler !== 'function') {
-                            logger.debug("Authentication type " + authenticationType + " not supported");
-                            return [2 /*return*/, ''];
-                        }
-                        host = url.parse(appSyncGraphqlEndpoint).host;
+                        host = url.parse(appSyncGraphqlEndpoint !== null && appSyncGraphqlEndpoint !== void 0 ? appSyncGraphqlEndpoint : '').host;
                         return [4 /*yield*/, handler({
                                 payload: payload,
                                 canonicalUri: canonicalUri,
@@ -794,7 +824,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                                 host: host,
                                 additionalHeaders: additionalHeaders,
                             })];
-                    case 1:
+                    case 2:
                         result = _b.sent();
                         return [2 /*return*/, result];
                 }
@@ -881,11 +911,14 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
                         if (!credentialsOK) {
                             throw new Error('No credentials');
                         }
-                        return [4 /*yield*/, core_1.Credentials.get().then(function (credentials) { return ({
-                                secret_key: credentials.secretAccessKey,
-                                access_key: credentials.accessKeyId,
-                                session_token: credentials.sessionToken,
-                            }); })];
+                        return [4 /*yield*/, core_1.Credentials.get().then(function (credentials) {
+                                var _a = credentials, secretAccessKey = _a.secretAccessKey, accessKeyId = _a.accessKeyId, sessionToken = _a.sessionToken;
+                                return {
+                                    secret_key: secretAccessKey,
+                                    access_key: accessKeyId,
+                                    session_token: sessionToken,
+                                };
+                            })];
                     case 2:
                         creds = _b.sent();
                         request = {
@@ -902,7 +935,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function (_super) {
     };
     AWSAppSyncRealTimeProvider.prototype._customAuthHeader = function (_a) {
         var host = _a.host, additionalHeaders = _a.additionalHeaders;
-        if (!additionalHeaders.Authorization) {
+        if (!additionalHeaders || !additionalHeaders['Authorization']) {
             throw new Error('No auth token specified');
         }
         return {