aws-appsync-subscription-link 3.1.2 → 3.2.0-alpha.da776601

package/jest.config.js

@@ -1,6 +1,10 @@
 module.exports = {
     transform: {
-        "^.+\\.tsx?$": "ts-jest"
+        "^.+\\.tsx?$": ["ts-jest", {
+            tsconfig: {
+                target: "es2017"
+            }
+        }]
     },
     testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
     collectCoverageFrom: [

package/lib/index.js

@@ -11,8 +11,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSubscriptionHandshakeLink = exports.CONTROL_EVENTS_KEY = void 0;
 var subscription_handshake_link_1 = require("./subscription-handshake-link");
-exports.CONTROL_EVENTS_KEY = subscription_handshake_link_1.CONTROL_EVENTS_KEY;
+Object.defineProperty(exports, "CONTROL_EVENTS_KEY", { enumerable: true, get: function () { return subscription_handshake_link_1.CONTROL_EVENTS_KEY; } });
 var core_1 = require("@apollo/client/core");
 var http_1 = require("@apollo/client/link/http");
 var utilities_1 = require("@apollo/client/utilities");
@@ -22,7 +23,7 @@ function createSubscriptionHandshakeLink(infoOrUrl, theResultsFetcherLink) {
     var resultsFetcherLink, subscriptionLinks;
     if (typeof infoOrUrl === "string") {
         resultsFetcherLink =
-            theResultsFetcherLink || http_1.createHttpLink({ uri: infoOrUrl });
+            theResultsFetcherLink || (0, http_1.createHttpLink)({ uri: infoOrUrl });
         subscriptionLinks = core_1.ApolloLink.from([
             new non_terminating_link_1.NonTerminatingLink("controlMessages", {
                 link: new core_1.ApolloLink(function (operation, _forward) {
@@ -43,12 +44,12 @@ function createSubscriptionHandshakeLink(infoOrUrl, theResultsFetcherLink) {
     }
     else {
         var url = infoOrUrl.url;
-        resultsFetcherLink = theResultsFetcherLink || http_1.createHttpLink({ uri: url });
+        resultsFetcherLink = theResultsFetcherLink || (0, http_1.createHttpLink)({ uri: url });
         subscriptionLinks = new realtime_subscription_handshake_link_1.AppSyncRealTimeSubscriptionHandshakeLink(infoOrUrl);
     }
     return core_1.ApolloLink.split(function (operation) {
         var query = operation.query;
-        var _a = utilities_1.getMainDefinition(query), kind = _a.kind, graphqlOperation = _a.operation;
+        var _a = (0, utilities_1.getMainDefinition)(query), kind = _a.kind, graphqlOperation = _a.operation;
         var isSubscription = kind === "OperationDefinition" && graphqlOperation === "subscription";
         return isSubscription;
     }, subscriptionLinks, resultsFetcherLink);

package/lib/non-terminating-http-link.d.ts

@@ -2,8 +2,8 @@
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { HttpOptions } from '@apollo/client/link/http';
+import { HttpLink } from '@apollo/client/link/http';
 import { NonTerminatingLink } from './non-terminating-link';
 export declare class NonTerminatingHttpLink extends NonTerminatingLink {
-    constructor(contextKey: string, options: HttpOptions);
+    constructor(contextKey: string, options: HttpLink.Options);
 }

package/lib/non-terminating-http-link.js

@@ -3,16 +3,19 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NonTerminatingHttpLink = void 0;
 /*!
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -22,10 +25,8 @@ var non_terminating_link_1 = require("./non-terminating-link");
 var NonTerminatingHttpLink = /** @class */ (function (_super) {
     __extends(NonTerminatingHttpLink, _super);
     function NonTerminatingHttpLink(contextKey, options) {
-        var _this = this;
-        var link = http_1.createHttpLink(options);
-        _this = _super.call(this, contextKey, { link: link }) || this;
-        return _this;
+        var link = (0, http_1.createHttpLink)(options);
+        return _super.call(this, contextKey, { link: link }) || this;
     }
     return NonTerminatingHttpLink;
 }(non_terminating_link_1.NonTerminatingLink));

package/lib/non-terminating-link.d.ts

@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ApolloLink } from '@apollo/client/core';
-import type { NextLink, FetchResult } from '@apollo/client/core';
-import type { Observable } from 'zen-observable-ts';
+import type { FetchResult } from '@apollo/client/core';
+import type { Observable } from 'rxjs';
 export declare class NonTerminatingLink extends ApolloLink {
     private contextKey;
     private link;
     constructor(contextKey: string, { link }: {
         link: ApolloLink;
     });
-    request(operation: any, forward?: NextLink): Observable<FetchResult>;
+    request(operation: any, forward?: ApolloLink.ForwardFunction): Observable<FetchResult>;
 }

package/lib/non-terminating-link.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -38,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -60,6 +62,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.NonTerminatingLink = void 0;
 /*!
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -77,14 +80,14 @@ var NonTerminatingLink = /** @class */ (function (_super) {
     }
     NonTerminatingLink.prototype.request = function (operation, forward) {
         var _this = this;
-        return (context_1.setContext(function (_request, prevContext) { return __awaiter(_this, void 0, void 0, function () {
+        return ((0, context_1.setContext)(function (_request, prevContext) { return __awaiter(_this, void 0, void 0, function () {
             var result;
             var _a;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, new Promise(function (resolve, reject) {
-                            _this.link.request(operation).subscribe({
+                            _this.link.request(operation, forward).subscribe({
                                 next: resolve,
                                 error: reject,
                             });

package/lib/observable-compat.d.ts

@@ -0,0 +1 @@
+export declare let Observable: any;

package/lib/observable-compat.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+try {
+    // Try Apollo Client's Observable first (v3)
+    var apolloClient = require("@apollo/client/core");
+    exports.Observable = apolloClient.Observable;
+}
+catch (e) {
+    try {
+        // Fallback to rxjs (v4)
+        var rxjs = require("rxjs");
+        exports.Observable = rxjs.Observable;
+    }
+    catch (e2) {
+        // Final fallback to zen-observable
+        var zenObservable = require("zen-observable-ts");
+        exports.Observable = zenObservable.default || zenObservable;
+    }
+}

package/lib/realtime-subscription-handshake-link.d.ts

@@ -2,7 +2,7 @@
  * Copyright 2017-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ApolloLink, Observable, Operation, FetchResult } from "@apollo/client/core";
+import { ApolloLink, Observable, Operation } from "@apollo/client/core";
 import { AppSyncRealTimeSubscriptionConfig } from "./types";
 export declare const CONTROL_EVENTS_KEY = "@@controlEvents";
 export declare class AppSyncRealTimeSubscriptionHandshakeLink extends ApolloLink {
@@ -17,7 +17,7 @@ export declare class AppSyncRealTimeSubscriptionHandshakeLink extends ApolloLink
     private promiseArray;
     constructor({ url: theUrl, region: theRegion, auth: theAuth, keepAliveTimeoutMs }: AppSyncRealTimeSubscriptionConfig);
     private isCustomDomain;
-    request(operation: Operation): Observable<FetchResult<Record<string, any>, Record<string, any>, Record<string, any>>>;
+    request(operation: Operation): Observable<import("graphql").FormattedExecutionResult<Record<string, any>, Record<string, any>>>;
     private _verifySubscriptionAlreadyStarted;
     private _sendUnsubscriptionMessage;
     private _removeSubscriptionObserver;

package/lib/realtime-subscription-handshake-link.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -38,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -60,11 +62,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppSyncRealTimeSubscriptionHandshakeLink = exports.CONTROL_EVENTS_KEY = void 0;
 /*!
  * Copyright 2017-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 var core_1 = require("@apollo/client/core");
+var operators_1 = require("rxjs/operators");
 var utils_1 = require("./utils");
 var aws_appsync_auth_link_1 = require("aws-appsync-auth-link");
 var graphql_1 = require("graphql");
@@ -114,7 +118,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         _this.keepAliveTimeout = keepAliveTimeoutMs;
         if (_this.keepAliveTimeout < SERVER_KEEP_ALIVE_TIMEOUT) {
             var configName = 'keepAliveTimeoutMs';
-            throw new Error(configName + " must be greater than or equal to " + SERVER_KEEP_ALIVE_TIMEOUT + " (" + _this.keepAliveTimeout + " used).");
+            throw new Error("".concat(configName, " must be greater than or equal to ").concat(SERVER_KEEP_ALIVE_TIMEOUT, " (").concat(_this.keepAliveTimeout, " used)."));
         }
         return _this;
     }
@@ -126,9 +130,9 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         var _a;
         var _this = this;
         var query = operation.query, variables = operation.variables;
-        var _b = operation.getContext(), _c = _b.controlMessages, _d = exports.CONTROL_EVENTS_KEY, controlEvents = (_c === void 0 ? (_a = {},
+        var _b = operation.getContext(), _c = _b.controlMessages, _d = _c === void 0 ? (_a = {},
             _a[exports.CONTROL_EVENTS_KEY] = undefined,
-            _a) : _c)[_d], headers = _b.headers;
+            _a) : _c, _e = exports.CONTROL_EVENTS_KEY, controlEvents = _d[_e], headers = _b.headers;
         return new core_1.Observable(function (observer) {
             if (!_this.url) {
                 observer.error({
@@ -139,7 +143,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                 observer.complete();
             }
             else {
-                var subscriptionId_1 = uuid_1.v4();
+                var subscriptionId_1 = (0, uuid_1.v4)();
                 var token = _this.auth.type === aws_appsync_auth_link_1.AUTH_TYPE.AMAZON_COGNITO_USER_POOLS ||
                     _this.auth.type === aws_appsync_auth_link_1.AUTH_TYPE.OPENID_CONNECT
                     ? _this.auth.jwtToken
@@ -148,7 +152,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                 var options = {
                     appSyncGraphqlEndpoint: _this.url,
                     authenticationType: _this.auth.type,
-                    query: graphql_1.print(query),
+                    query: (0, graphql_1.print)(query),
                     region: _this.region,
                     graphql_headers: function () { return (headers); },
                     variables: variables,
@@ -183,11 +187,11 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                     });
                 }); };
             }
-        }).filter(function (data) {
-            var _a = data.extensions, _b = (_a === void 0 ? {} : _a).controlMsgType, controlMsgType = _b === void 0 ? undefined : _b;
+        }).pipe((0, operators_1.filter)(function (data) {
+            var _a = data.extensions, _b = _a === void 0 ? {} : _a, _c = _b.controlMsgType, controlMsgType = _c === void 0 ? undefined : _c;
             var isControlMsg = typeof controlMsgType !== "undefined";
             return controlEvents === true || !isControlMsg;
-        });
+        }));
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._verifySubscriptionAlreadyStarted = function (subscriptionId) {
         return __awaiter(this, void 0, void 0, function () {
@@ -328,7 +332,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                         _d = err_1.message, message = _d === void 0 ? "" : _d;
                         observer.error({
                             errors: [
-                                __assign({}, new graphql_1.GraphQLError("Connection failed: " + message))
+                                __assign({}, new graphql_1.GraphQLError("Connection failed: ".concat(message)))
                             ]
                         });
                         observer.complete();
@@ -339,7 +343,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                         }
                         return [2 /*return*/];
                     case 5:
-                        _e = this.subscriptionObserverMap.get(subscriptionId), subscriptionFailedCallback = _e.subscriptionFailedCallback, subscriptionReadyCallback = _e.subscriptionReadyCallback;
+                        _e = this.subscriptionObserverMap.get(subscriptionId) || {}, subscriptionFailedCallback = _e.subscriptionFailedCallback, subscriptionReadyCallback = _e.subscriptionReadyCallback;
                         // This must be done before sending the message in order to be listening immediately
                         this.subscriptionObserverMap.set(subscriptionId, {
                             observer: observer,
@@ -404,7 +408,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                         discoverableEndpoint = discoverableEndpoint
                             .replace("https://", "wss://")
                             .replace('http://', 'ws://');
-                        awsRealTimeUrl = discoverableEndpoint + "?header=" + headerQs + "&payload=" + payloadQs;
+                        awsRealTimeUrl = "".concat(discoverableEndpoint, "?header=").concat(headerQs, "&payload=").concat(payloadQs);
                         return [4 /*yield*/, this._initializeRetryableHandshake({ awsRealTimeUrl: awsRealTimeUrl })];
                     case 3:
                         _c.sent();
@@ -451,7 +455,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                         };
                         handler = headerHandler[authenticationType];
                         if (typeof handler !== "function") {
-                            logger("Authentication type " + authenticationType + " not supported");
+                            logger("Authentication type ".concat(authenticationType, " not supported"));
                             return [2 /*return*/, {}];
                         }
                         host = url.parse(appSyncGraphqlEndpoint).host;
@@ -476,24 +480,25 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._awsRealTimeAuthorizationHeader = function (_a) {
         var host = _a.host, token = _a.token, graphql_headers = _a.graphql_headers;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, _c, _d;
+            var _b, _c;
+            var _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        _b = {};
+                        _d = {};
                         if (!(typeof token === "function")) return [3 /*break*/, 2];
                         return [4 /*yield*/, token.call(undefined)];
                     case 1:
-                        _c = _e.sent();
+                        _b = _e.sent();
                         return [3 /*break*/, 4];
                     case 2: return [4 /*yield*/, token];
                     case 3:
-                        _c = _e.sent();
+                        _b = _e.sent();
                         _e.label = 4;
                     case 4:
-                        _d = [(_b.Authorization = _c, _b.host = host, _b)];
+                        _c = [(_d.Authorization = _b, _d.host = host, _d)];
                         return [4 /*yield*/, graphql_headers()];
-                    case 5: return [2 /*return*/, __assign.apply(void 0, _d.concat([(_e.sent())]))];
+                    case 5: return [2 /*return*/, __assign.apply(void 0, _c.concat([(_e.sent())]))];
                 }
             });
         });
@@ -546,7 +551,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                             session_token: sessionToken
                         };
                         request = {
-                            url: "" + appSyncGraphqlEndpoint + canonicalUri,
+                            url: "".concat(appSyncGraphqlEndpoint).concat(canonicalUri),
                             body: payload,
                             method: "POST",
                             headers: __assign({}, APPSYNC_REALTIME_HEADERS)
@@ -564,7 +569,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                 switch (_b.label) {
                     case 0:
                         logger("Initializaling retryable Handshake");
-                        return [4 /*yield*/, retry_1.jitteredExponentialRetry(this._initializeHandshake.bind(this), [
+                        return [4 /*yield*/, (0, retry_1.jitteredExponentialRetry)(this._initializeHandshake.bind(this), [
                                 { awsRealTimeUrl: awsRealTimeUrl }
                             ])];
                     case 1:
@@ -582,7 +587,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        logger("Initializing handshake " + awsRealTimeUrl);
+                        logger("Initializing handshake ".concat(awsRealTimeUrl));
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 4, , 5]);
@@ -608,17 +613,17 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                 return new Promise(function (res, rej) {
                                     var ackOk = false;
                                     _this.awsRealTimeSocket.onerror = function (error) {
-                                        logger("WebSocket closed " + JSON.stringify(error));
+                                        logger("WebSocket closed ".concat(JSON.stringify(error)));
                                     };
                                     _this.awsRealTimeSocket.onclose = function (event) {
-                                        logger("WebSocket closed " + event.reason);
+                                        logger("WebSocket closed ".concat(event.reason));
                                         rej(new Error(JSON.stringify(event)));
                                     };
                                     _this.awsRealTimeSocket.onmessage = function (message) {
                                         var _a;
-                                        logger("subscription message from AWS AppSyncRealTime: " + message.data + " ");
+                                        logger("subscription message from AWS AppSyncRealTime: ".concat(message.data, " "));
                                         var data = JSON.parse(message.data);
-                                        var type = data.type, _b = data.payload, _c = (_b === void 0 ? {} : _b).connectionTimeoutMs, connectionTimeoutMs = _c === void 0 ? DEFAULT_KEEP_ALIVE_TIMEOUT : _c;
+                                        var type = data.type, _b = data.payload, _c = _b === void 0 ? {} : _b, _d = _c.connectionTimeoutMs, connectionTimeoutMs = _d === void 0 ? DEFAULT_KEEP_ALIVE_TIMEOUT : _d;
                                         if (type === types_1.MESSAGE_TYPES.GQL_CONNECTION_ACK) {
                                             ackOk = true;
                                             _this.keepAliveTimeout = (_a = _this.keepAliveTimeout) !== null && _a !== void 0 ? _a : connectionTimeoutMs;
@@ -628,14 +633,14 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                                 _this._errorDisconnect(types_1.CONTROL_MSG.CONNECTION_CLOSED);
                                             };
                                             _this.awsRealTimeSocket.onclose = function (event) {
-                                                logger("WebSocket closed " + event.reason);
+                                                logger("WebSocket closed ".concat(event.reason));
                                                 _this._errorDisconnect(types_1.CONTROL_MSG.CONNECTION_CLOSED);
                                             };
                                             res("Cool, connected to AWS AppSyncRealTime");
                                             return;
                                         }
                                         if (type === types_1.MESSAGE_TYPES.GQL_CONNECTION_ERROR) {
-                                            var _d = data.payload, _e = (_d === void 0 ? {} : _d).errors, _f = (_e === void 0 ? [] : _e)[0], _g = _f === void 0 ? {} : _f, _h = _g.errorType, errorType = _h === void 0 ? "" : _h, _j = _g.errorCode, errorCode = _j === void 0 ? 0 : _j;
+                                            var _e = data.payload, _f = _e === void 0 ? {} : _e, _g = _f.errors, _h = _g === void 0 ? [] : _g, _j = _h[0], _k = _j === void 0 ? {} : _j, _l = _k.errorType, errorType = _l === void 0 ? "" : _l, _m = _k.errorCode, errorCode = _m === void 0 ? 0 : _m;
                                             rej({ errorType: errorType, errorCode: errorCode });
                                         }
                                     };
@@ -645,7 +650,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                     _this.awsRealTimeSocket.send(JSON.stringify(gqlInit));
                                     function checkAckOk() {
                                         if (!ackOk) {
-                                            rej(new Error("Connection timeout: ack from AWSRealTime was not received on " + CONNECTION_INIT_TIMEOUT + " ms"));
+                                            rej(new Error("Connection timeout: ack from AWSRealTime was not received on ".concat(CONNECTION_INIT_TIMEOUT, " ms")));
                                         }
                                     }
                                     setTimeout(checkAckOk.bind(_this), CONNECTION_INIT_TIMEOUT);
@@ -674,7 +679,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         });
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._handleIncomingSubscriptionMessage = function (message) {
-        logger("subscription message from AWS AppSync RealTime: " + message.data);
+        logger("subscription message from AWS AppSync RealTime: ".concat(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, _g = _c.startAckTimeoutId, startAckTimeoutId = _g === void 0 ? 0 : _g, _h = _c.subscriptionReadyCallback, subscriptionReadyCallback = _h === void 0 ? null : _h, _j = _c.subscriptionFailedCallback, subscriptionFailedCallback = _j === void 0 ? null : _j;
         logger({ id: id, observer: observer, query: query, variables: variables });
@@ -683,12 +688,12 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                 observer.next(payload);
             }
             else {
-                logger("observer not found for id: " + id);
+                logger("observer not found for id: ".concat(id));
             }
             return;
         }
         if (type === types_1.MESSAGE_TYPES.GQL_START_ACK) {
-            logger("subscription ready for " + JSON.stringify({ query: query, variables: variables }));
+            logger("subscription ready for ".concat(JSON.stringify({ query: query, variables: variables })));
             if (typeof subscriptionReadyCallback === "function") {
                 subscriptionReadyCallback();
             }
@@ -702,7 +707,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                 });
             }
             else {
-                logger("observer not found for id: " + id);
+                logger("observer not found for id: ".concat(id));
             }
             var subscriptionState = types_1.SUBSCRIPTION_STATUS.CONNECTED;
             this.subscriptionObserverMap.set(id, {
@@ -736,13 +741,13 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
             if (observer) {
                 observer.error({
                     errors: [
-                        __assign({}, new graphql_1.GraphQLError("Connection failed: " + JSON.stringify(payload)))
+                        __assign({}, new graphql_1.GraphQLError("Connection failed: ".concat(JSON.stringify(payload))))
                     ]
                 });
                 observer.complete();
             }
             else {
-                logger("observer not found for id: " + id);
+                logger("observer not found for id: ".concat(id));
             }
             if (typeof subscriptionFailedCallback === "function") {
                 subscriptionFailedCallback();
@@ -750,7 +755,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         }
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._errorDisconnect = function (msg) {
-        logger("Disconnect error: " + msg);
+        logger("Disconnect error: ".concat(msg));
         this.subscriptionObserverMap.forEach(function (_a) {
             var observer = _a.observer;
             if (observer && !observer.closed) {
@@ -779,7 +784,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         if (observer && !observer.closed) {
             observer.error({
                 errors: [
-                    __assign({}, new graphql_1.GraphQLError("Subscription timeout " + JSON.stringify({ query: query, variables: variables })))
+                    __assign({}, new graphql_1.GraphQLError("Subscription timeout ".concat(JSON.stringify({ query: query, variables: variables }))))
                 ]
             });
             // Cleanup will be automatically executed

package/lib/subscription-handshake-link.d.ts

@@ -4,7 +4,7 @@
  */
 import { ApolloLink, Observable, Operation, FetchResult } from "@apollo/client/core";
 import * as ZenObservable from 'zen-observable-ts';
-declare type MqttConnectionInfo = {
+type MqttConnectionInfo = {
     client: string;
     url: string;
     topics: string[];

package/lib/subscription-handshake-link.js

@@ -3,10 +3,12 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -38,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -71,11 +73,14 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscriptionHandshakeLink = exports.CONTROL_EVENTS_KEY = void 0;
 /*!
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 var core_1 = require("@apollo/client/core");
+var errors_1 = require("@apollo/client/errors");
+var operators_1 = require("rxjs/operators");
 var utils_1 = require("./utils");
 var Paho = require("./vendor/paho-mqtt");
 var utilities_1 = require("@apollo/client/utilities");
@@ -108,15 +113,11 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
     SubscriptionHandshakeLink.prototype.request = function (operation) {
         var _a;
         var _this = this;
-        var _b = operation.getContext(), _c = this.subsInfoContextKey, subsInfo = _b[_c], _d = _b.controlMessages, _e = exports.CONTROL_EVENTS_KEY, controlEvents = (_d === void 0 ? (_a = {}, _a[exports.CONTROL_EVENTS_KEY] = undefined, _a) : _d)[_e];
-        var _f = subsInfo.extensions, _g = (_f === void 0 ? { subscription: { newSubscriptions: {}, mqttConnections: [] } } : _f).subscription, newSubscriptions = _g.newSubscriptions, mqttConnections = _g.mqttConnections, _h = subsInfo.errors, errors = _h === void 0 ? [] : _h;
+        var _b = operation.getContext(), _c = this.subsInfoContextKey, subsInfo = _b[_c], _d = _b.controlMessages, _e = _d === void 0 ? (_a = {}, _a[exports.CONTROL_EVENTS_KEY] = undefined, _a) : _d, _f = exports.CONTROL_EVENTS_KEY, controlEvents = _e[_f];
+        var _g = subsInfo.extensions, _h = _g === void 0 ? { subscription: { newSubscriptions: {}, mqttConnections: [] } } : _g, _j = _h.subscription, newSubscriptions = _j.newSubscriptions, mqttConnections = _j.mqttConnections, _k = subsInfo.errors, errors = _k === void 0 ? [] : _k;
         if (errors && errors.length) {
             return new core_1.Observable(function (observer) {
-                observer.error(new core_1.ApolloError({
-                    errorMessage: 'Error during subscription handshake',
-                    extraInfo: { errors: errors },
-                    graphQLErrors: errors
-                }));
+                observer.error(new errors_1.CombinedGraphQLErrors({ errors: errors, data: null }));
                 return function () { };
             });
         }
@@ -169,11 +170,11 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
                     return observers.size > 0;
                 }));
             };
-        }).filter(function (data) {
-            var _a = data.extensions, _b = (_a === void 0 ? {} : _a).controlMsgType, controlMsgType = _b === void 0 ? undefined : _b;
+        }).pipe((0, operators_1.filter)(function (data) {
+            var _a = data.extensions, _b = _a === void 0 ? {} : _a, _c = _b.controlMsgType, controlMsgType = _c === void 0 ? undefined : _c;
             var isControlMsg = typeof controlMsgType !== 'undefined';
             return controlEvents === true || !isControlMsg;
-        });
+        }));
     };
     SubscriptionHandshakeLink.prototype.connectNewClients = function (connectionInfo, observer, operation) {
         return __awaiter(this, void 0, void 0, function () {
@@ -181,7 +182,7 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 query = operation.query;
-                selectionNames = utilities_1.getMainDefinition(query).selectionSet.selections.map(function (_a) {
+                selectionNames = (0, utilities_1.getMainDefinition)(query).selectionSet.selections.map(function (_a) {
                     var value = _a.name.value;
                     return value;
                 });

package/lib/types/index.d.ts

@@ -67,15 +67,15 @@ export declare enum CONTROL_MSG {
     TIMEOUT_DISCONNECT = "Timeout disconnect",
     SUBSCRIPTION_ACK = "Subscription ack"
 }
-export declare type UrlInfo = {
+export type UrlInfo = {
     url: string;
     auth: AuthOptions;
     region: string;
 };
-export declare type AppSyncRealTimeSubscriptionConfig = UrlInfo & {
+export type AppSyncRealTimeSubscriptionConfig = UrlInfo & {
     keepAliveTimeoutMs?: number;
 };
-export declare type ObserverQuery = {
+export type ObserverQuery = {
     observer: ZenObservable.SubscriptionObserver<any>;
     query: string;
     variables: object;
@@ -84,4 +84,4 @@ export declare type ObserverQuery = {
     subscriptionFailedCallback?: Function;
     startAckTimeoutId?: number;
 };
-export declare type DelayFunction = (attempt: number, args?: any[], error?: Error) => number | false;
+export type DelayFunction = (attempt: number, args?: any[], error?: Error) => number | false;

package/lib/types/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CONTROL_MSG = exports.MESSAGE_TYPES = exports.SOCKET_STATUS = exports.SUBSCRIPTION_STATUS = void 0;
 //#region Subscription link enums
 var SUBSCRIPTION_STATUS;
 (function (SUBSCRIPTION_STATUS) {

package/lib/utils/apollo-compat.d.ts

@@ -0,0 +1,4 @@
+import { Observable as ApolloObservable } from '@apollo/client/core';
+export type CompatibleObservable<T> = ApolloObservable<T>;
+export declare const Observable: typeof ApolloObservable;
+export declare function isApolloClientV4(): boolean;