aws-appsync-subscription-link 2.2.5 → 3.0.9

package/CHANGELOG.md

@@ -3,35 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-<a name="2.2.5"></a>
-## [2.2.5](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@2.2.4...aws-appsync-subscription-link@2.2.5) (2021-09-24)
+<a name="3.0.9"></a>
+## [3.0.9](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.8...aws-appsync-subscription-link@3.0.9) (2021-09-24)
+
+
+### Bug Fixes
+
+* add type fix to subscription link to fix 'prepare' script ([#669](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/669)) ([c5202dc](https://github.com/awslabs/aws-mobile-appsync-sdk-js/commit/c5202dc))
+* **aws-appsync-subscription-link:** graphql header refactor to fix IAM-based auth ([#619](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/619)) ([#671](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/671)) ([dbf4959](https://github.com/awslabs/aws-mobile-appsync-sdk-js/commit/dbf4959))
+* remove aws-sdk V2; import aws-sdk V3 packages ([#637](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/637)); refactor auth-link, signer, and types ([0996740](https://github.com/awslabs/aws-mobile-appsync-sdk-js/commit/0996740))
+
+
+
+
+<a name="3.0.8"></a>
+## [3.0.8](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.7...aws-appsync-subscription-link@3.0.8) (2021-07-28)
 
 
 
 
 **Note:** Version bump only for package aws-appsync-subscription-link
 
-<a name="2.2.4"></a>
-## [2.2.4](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@2.2.3...aws-appsync-subscription-link@2.2.4) (2021-09-24)
+<a name="3.0.7"></a>
+## [3.0.7](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.6...aws-appsync-subscription-link@3.0.7) (2021-07-09)
 
 
-### Bug Fixes
 
-* add type fixes to fix 'prepare' scripts ([#670](https://github.com/awslabs/aws-mobile-appsync-sdk-js/issues/670)) ([bf5676a](https://github.com/awslabs/aws-mobile-appsync-sdk-js/commit/bf5676a))
+
+**Note:** Version bump only for package aws-appsync-subscription-link
+
+<a name="3.0.6"></a>
+## [3.0.6](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.5...aws-appsync-subscription-link@3.0.6) (2021-02-12)
+
+
 
 
+**Note:** Version bump only for package aws-appsync-subscription-link
+
+<a name="3.0.5"></a>
+## [3.0.5](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.4...aws-appsync-subscription-link@3.0.5) (2021-01-26)
 
 
-<a name="2.2.3"></a>
-## [2.2.3](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@2.2.2...aws-appsync-subscription-link@2.2.3) (2021-07-28)
+
+
+**Note:** Version bump only for package aws-appsync-subscription-link
+
+<a name="3.0.4"></a>
+## [3.0.4](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.3...aws-appsync-subscription-link@3.0.4) (2021-01-08)
 
 
 
 
 **Note:** Version bump only for package aws-appsync-subscription-link
 
-<a name="2.2.2"></a>
-## [2.2.2](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@2.2.1...aws-appsync-subscription-link@2.2.2) (2021-07-09)
+<a name="3.0.3"></a>
+## [3.0.3](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@3.0.2...aws-appsync-subscription-link@3.0.3) (2020-10-01)
+
+
+### Bug Fixes
+
+* Add apollo-utilities dependency to subscription link ([3eeb77e](https://github.com/awslabs/aws-mobile-appsync-sdk-js/commit/3eeb77e))
+
+
+
+
+<a name="3.0.2"></a>
+## [3.0.2](https://github.com/awslabs/aws-mobile-appsync-sdk-js/compare/aws-appsync-subscription-link@2.2.1...aws-appsync-subscription-link@3.0.2) (2020-10-01)
 
 
 

package/__tests__/link/realtime-subscription-handshake-link-test.ts

@@ -1,13 +1,12 @@
 import { AUTH_TYPE } from "aws-appsync-auth-link";
-import { execute } from "apollo-link";
+import { execute } from "@apollo/client/core";
 import gql from 'graphql-tag';
 import { AppSyncRealTimeSubscriptionHandshakeLink } from '../../src/realtime-subscription-handshake-link';
 
 const query = gql`subscription { someSubscription { aField } }`
 
 class myWebSocket implements WebSocket {
-    binaryType: BinaryType; 
-    bufferedAmount: number;
+    binaryType: BinaryType; bufferedAmount: number;
     extensions: string;
     onclose: (this: WebSocket, ev: CloseEvent) => any;
     onerror: (this: WebSocket, ev: Event) => any;

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { CONTROL_EVENTS_KEY } from "./subscription-handshake-link";
-import { ApolloLink } from "apollo-link";
+import { ApolloLink } from "@apollo/client/core";
 import { UrlInfo } from "./types";
 declare function createSubscriptionHandshakeLink(args: UrlInfo, resultsFetcherLink?: ApolloLink): ApolloLink;
 declare function createSubscriptionHandshakeLink(url: string, resultsFetcherLink?: ApolloLink): ApolloLink;

package/lib/index.js

@@ -13,20 +13,20 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var subscription_handshake_link_1 = require("./subscription-handshake-link");
 exports.CONTROL_EVENTS_KEY = subscription_handshake_link_1.CONTROL_EVENTS_KEY;
-var apollo_link_1 = require("apollo-link");
-var apollo_link_http_1 = require("apollo-link-http");
-var apollo_utilities_1 = require("apollo-utilities");
+var core_1 = require("@apollo/client/core");
+var http_1 = require("@apollo/client/link/http");
+var utilities_1 = require("@apollo/client/utilities");
 var non_terminating_link_1 = require("./non-terminating-link");
 var realtime_subscription_handshake_link_1 = require("./realtime-subscription-handshake-link");
 function createSubscriptionHandshakeLink(infoOrUrl, theResultsFetcherLink) {
     var resultsFetcherLink, subscriptionLinks;
     if (typeof infoOrUrl === "string") {
         resultsFetcherLink =
-            theResultsFetcherLink || apollo_link_http_1.createHttpLink({ uri: infoOrUrl });
-        subscriptionLinks = apollo_link_1.ApolloLink.from([
+            theResultsFetcherLink || http_1.createHttpLink({ uri: infoOrUrl });
+        subscriptionLinks = core_1.ApolloLink.from([
             new non_terminating_link_1.NonTerminatingLink("controlMessages", {
-                link: new apollo_link_1.ApolloLink(function (operation, _forward) {
-                    return new apollo_link_1.Observable(function (observer) {
+                link: new core_1.ApolloLink(function (operation, _forward) {
+                    return new core_1.Observable(function (observer) {
                         var _a;
                         var _b = operation, _c = _b.variables, _d = subscription_handshake_link_1.CONTROL_EVENTS_KEY, controlEvents = _c[_d], variables = __rest(_c, [typeof _d === "symbol" ? _d : _d + ""]);
                         if (typeof controlEvents !== "undefined") {
@@ -43,12 +43,12 @@ function createSubscriptionHandshakeLink(infoOrUrl, theResultsFetcherLink) {
     }
     else {
         var url = infoOrUrl.url;
-        resultsFetcherLink = theResultsFetcherLink || apollo_link_http_1.createHttpLink({ uri: url });
+        resultsFetcherLink = theResultsFetcherLink || http_1.createHttpLink({ uri: url });
         subscriptionLinks = new realtime_subscription_handshake_link_1.AppSyncRealTimeSubscriptionHandshakeLink(infoOrUrl);
     }
-    return apollo_link_1.ApolloLink.split(function (operation) {
+    return core_1.ApolloLink.split(function (operation) {
         var query = operation.query;
-        var _a = apollo_utilities_1.getMainDefinition(query), kind = _a.kind, graphqlOperation = _a.operation;
+        var _a = 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 { FetchOptions } from 'apollo-link-http';
+import { HttpOptions } from '@apollo/client/link/http';
 import { NonTerminatingLink } from './non-terminating-link';
 export declare class NonTerminatingHttpLink extends NonTerminatingLink {
-    constructor(contextKey: string, options: FetchOptions);
+    constructor(contextKey: string, options: HttpOptions);
 }

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

@@ -17,13 +17,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-var apollo_link_http_1 = require("apollo-link-http");
+var http_1 = require("@apollo/client/link/http");
 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 = apollo_link_http_1.createHttpLink(options);
+        var link = http_1.createHttpLink(options);
         _this = _super.call(this, contextKey, { link: link }) || this;
         return _this;
     }

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

@@ -2,14 +2,14 @@
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ApolloLink, NextLink } from 'apollo-link';
+import { ApolloLink } from '@apollo/client/core';
+import type { NextLink, FetchResult } from '@apollo/client/core';
+import type { Observable } from 'zen-observable-ts';
 export declare class NonTerminatingLink extends ApolloLink {
     private contextKey;
     private link;
     constructor(contextKey: string, { link }: {
         link: ApolloLink;
     });
-    request(operation: any, forward?: NextLink): import("apollo-link").Observable<import("apollo-link").FetchResult<{
-        [key: string]: any;
-    }, Record<string, any>, Record<string, any>>>;
+    request(operation: any, forward?: NextLink): Observable<FetchResult>;
 }

package/lib/non-terminating-link.js

@@ -64,8 +64,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-var apollo_link_1 = require("apollo-link");
-var apollo_link_context_1 = require("apollo-link-context");
+var core_1 = require("@apollo/client/core");
+var context_1 = require("@apollo/client/link/context");
 var NonTerminatingLink = /** @class */ (function (_super) {
     __extends(NonTerminatingLink, _super);
     function NonTerminatingLink(contextKey, _a) {
@@ -77,7 +77,7 @@ var NonTerminatingLink = /** @class */ (function (_super) {
     }
     NonTerminatingLink.prototype.request = function (operation, forward) {
         var _this = this;
-        return apollo_link_context_1.setContext(function (_request, prevContext) { return __awaiter(_this, void 0, void 0, function () {
+        return (context_1.setContext(function (_request, prevContext) { return __awaiter(_this, void 0, void 0, function () {
             var result;
             var _a;
             var _this = this;
@@ -94,8 +94,8 @@ var NonTerminatingLink = /** @class */ (function (_super) {
                         return [2 /*return*/, __assign(__assign({}, prevContext), (_a = {}, _a[this.contextKey] = result, _a))];
                 }
             });
-        }); }).request(operation, forward);
+        }); })).request(operation, forward);
     };
     return NonTerminatingLink;
-}(apollo_link_1.ApolloLink));
+}(core_1.ApolloLink));
 exports.NonTerminatingLink = NonTerminatingLink;

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

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

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

@@ -64,7 +64,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-var apollo_link_1 = require("apollo-link");
+var core_1 = require("@apollo/client/core");
 var utils_1 = require("./utils");
 var aws_appsync_auth_link_1 = require("aws-appsync-auth-link");
 var graphql_1 = require("graphql");
@@ -114,7 +114,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         var _b = operation.getContext(), _c = _b.controlMessages, _d = exports.CONTROL_EVENTS_KEY, controlEvents = (_c === void 0 ? (_a = {},
             _a[exports.CONTROL_EVENTS_KEY] = undefined,
             _a) : _c)[_d], headers = _b.headers;
-        return new apollo_link_1.Observable(function (observer) {
+        return new core_1.Observable(function (observer) {
             if (!_this.url) {
                 observer.error({
                     errors: [
@@ -245,11 +245,11 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._startSubscriptionWithAWSAppSyncRealTime = function (_a) {
         var options = _a.options, observer = _a.observer, subscriptionId = _a.subscriptionId;
         return __awaiter(this, void 0, void 0, function () {
-            var appSyncGraphqlEndpoint, authenticationType, query, variables, apiKey, region, _b, graphql_headers, credentials, token, subscriptionState, data, dataString, headerObj, _c, _d, subscriptionMessage, stringToAWSRealTime, err_1, _e, message, subscriptionFailedCallback_1, _f, subscriptionFailedCallback, subscriptionReadyCallback;
-            var _g;
+            var appSyncGraphqlEndpoint, authenticationType, query, variables, apiKey, region, _b, graphql_headers, credentials, token, subscriptionState, data, dataString, headerObj, _c, subscriptionMessage, stringToAWSRealTime, err_1, _d, message, subscriptionFailedCallback_1, _e, subscriptionFailedCallback, subscriptionReadyCallback;
+            var _f;
             var _this = this;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            return __generator(this, function (_g) {
+                switch (_g.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, credentials = options.credentials, token = options.token;
                         subscriptionState = types_1.SUBSCRIPTION_STATUS.PENDING;
@@ -275,13 +275,11 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                 canonicalUri: "",
                                 region: region,
                                 credentials: credentials,
-                                token: token
+                                token: token,
+                                graphql_headers: graphql_headers
                             })];
                     case 1:
-                        _d = [__assign.apply(void 0, _c.concat([(_h.sent())]))];
-                        return [4 /*yield*/, graphql_headers()];
-                    case 2:
-                        headerObj = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_h.sent())])), (_g = {}, _g[aws_appsync_auth_link_1.USER_AGENT_HEADER] = aws_appsync_auth_link_1.USER_AGENT, _g)]);
+                        headerObj = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_g.sent())])), (_f = {}, _f[aws_appsync_auth_link_1.USER_AGENT_HEADER] = aws_appsync_auth_link_1.USER_AGENT, _f)]);
                         subscriptionMessage = {
                             id: subscriptionId,
                             payload: {
@@ -293,9 +291,9 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                             type: types_1.MESSAGE_TYPES.GQL_START
                         };
                         stringToAWSRealTime = JSON.stringify(subscriptionMessage);
-                        _h.label = 3;
-                    case 3:
-                        _h.trys.push([3, 5, , 6]);
+                        _g.label = 2;
+                    case 2:
+                        _g.trys.push([2, 4, , 5]);
                         return [4 /*yield*/, this._initializeWebSocketConnection({
                                 apiKey: apiKey,
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
@@ -304,12 +302,12 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                 credentials: credentials,
                                 token: token
                             })];
+                    case 3:
+                        _g.sent();
+                        return [3 /*break*/, 5];
                     case 4:
-                        _h.sent();
-                        return [3 /*break*/, 6];
-                    case 5:
-                        err_1 = _h.sent();
-                        _e = err_1.message, message = _e === void 0 ? "" : _e;
+                        err_1 = _g.sent();
+                        _d = err_1.message, message = _d === void 0 ? "" : _d;
                         observer.error({
                             errors: [
                                 __assign({}, new graphql_1.GraphQLError("Connection failed: " + message))
@@ -322,8 +320,8 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                             subscriptionFailedCallback_1();
                         }
                         return [2 /*return*/];
-                    case 6:
-                        _f = this.subscriptionObserverMap.get(subscriptionId), subscriptionFailedCallback = _f.subscriptionFailedCallback, subscriptionReadyCallback = _f.subscriptionReadyCallback;
+                    case 5:
+                        _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,
@@ -372,7 +370,8 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
                                 region: region,
                                 credentials: credentials,
-                                token: token
+                                token: token,
+                                graphql_headers: function () { }
                             })];
                     case 2:
                         headerString = _b.apply(_a, [_c.sent()]);
@@ -410,7 +409,7 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         }); });
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._awsRealTimeHeaderBasedAuth = function (_a) {
-        var authenticationType = _a.authenticationType, payload = _a.payload, canonicalUri = _a.canonicalUri, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, apiKey = _a.apiKey, region = _a.region, credentials = _a.credentials, token = _a.token;
+        var authenticationType = _a.authenticationType, payload = _a.payload, canonicalUri = _a.canonicalUri, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, apiKey = _a.apiKey, region = _a.region, credentials = _a.credentials, token = _a.token, graphql_headers = _a.graphql_headers;
         return __awaiter(this, void 0, void 0, function () {
             var headerHandler, handler, host, result;
             return __generator(this, function (_b) {
@@ -437,7 +436,8 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
                                 region: region,
                                 host: host,
                                 credentials: credentials,
-                                token: token
+                                token: token,
+                                graphql_headers: graphql_headers
                             })];
                     case 1:
                         result = _b.sent();
@@ -447,41 +447,43 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
         });
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._awsRealTimeAuthorizationHeader = function (_a) {
-        var host = _a.host, token = _a.token;
+        var host = _a.host, token = _a.token, graphql_headers = _a.graphql_headers;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _b, _c, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         _b = {};
                         if (!(typeof token === "function")) return [3 /*break*/, 2];
                         return [4 /*yield*/, token.call(undefined)];
                     case 1:
-                        _c = _d.sent();
+                        _c = _e.sent();
                         return [3 /*break*/, 4];
                     case 2: return [4 /*yield*/, token];
                     case 3:
-                        _c = _d.sent();
-                        _d.label = 4;
-                    case 4: return [2 /*return*/, (_b.Authorization = _c,
-                            _b.host = host,
-                            _b)];
+                        _c = _e.sent();
+                        _e.label = 4;
+                    case 4:
+                        _d = [(_b.Authorization = _c, _b.host = host, _b)];
+                        return [4 /*yield*/, graphql_headers()];
+                    case 5: return [2 /*return*/, __assign.apply(void 0, _d.concat([(_e.sent())]))];
                 }
             });
         });
     };
     AppSyncRealTimeSubscriptionHandshakeLink.prototype._awsRealTimeApiKeyHeader = function (_a) {
-        var apiKey = _a.apiKey, host = _a.host;
+        var apiKey = _a.apiKey, host = _a.host, graphql_headers = _a.graphql_headers;
         return __awaiter(this, void 0, void 0, function () {
-            var dt, dtStr;
-            return __generator(this, function (_b) {
-                dt = new Date();
-                dtStr = dt.toISOString().replace(/[:\-]|\.\d{3}/g, "");
-                return [2 /*return*/, {
-                        host: host,
-                        "x-amz-date": dtStr,
-                        "x-api-key": apiKey
-                    }];
+            var dt, dtStr, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        dt = new Date();
+                        dtStr = dt.toISOString().replace(/[:\-]|\.\d{3}/g, "");
+                        _b = [{ host: host, "x-amz-date": dtStr, "x-api-key": apiKey }];
+                        return [4 /*yield*/, graphql_headers()];
+                    case 1: return [2 /*return*/, __assign.apply(void 0, _b.concat([(_c.sent())]))];
+                }
             });
         });
     };
@@ -763,5 +765,5 @@ var AppSyncRealTimeSubscriptionHandshakeLink = /** @class */ (function (_super)
             .replace("gogi-beta", "grt-beta");
     };
     return AppSyncRealTimeSubscriptionHandshakeLink;
-}(apollo_link_1.ApolloLink));
+}(core_1.ApolloLink));
 exports.AppSyncRealTimeSubscriptionHandshakeLink = AppSyncRealTimeSubscriptionHandshakeLink;

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

@@ -1,9 +1,8 @@
-/// <reference types="zen-observable" />
 /*!
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ApolloLink, Observable, Operation, FetchResult } from "apollo-link";
+import { ApolloLink, Observable, Operation, FetchResult } from "@apollo/client/core";
 declare type MqttConnectionInfo = {
     client: string;
     url: string;
@@ -15,7 +14,7 @@ export declare class SubscriptionHandshakeLink extends ApolloLink {
     private topicObservers;
     private clientObservers;
     constructor(subsInfoContextKey: any);
-    request(operation: Operation): Observable<any>;
+    request(operation: Operation): Observable<unknown>;
     connectNewClients(connectionInfo: MqttConnectionInfo[], observer: ZenObservable.Observer<FetchResult>, operation: Operation): Promise<any[]>;
     connectNewClient(connectionInfo: MqttConnectionInfo, observer: ZenObservable.Observer<FetchResult>, selectionNames: string[]): Promise<any>;
     subscribeToTopics<T>(client: any, topics: string[], observer: ZenObservable.Observer<T>): Promise<unknown[]>;

package/lib/subscription-handshake-link.js

@@ -75,11 +75,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-var apollo_link_1 = require("apollo-link");
+var core_1 = require("@apollo/client/core");
 var utils_1 = require("./utils");
 var Paho = require("./vendor/paho-mqtt");
-var apollo_client_1 = require("apollo-client");
-var apollo_utilities_1 = require("apollo-utilities");
+var utilities_1 = require("@apollo/client/utilities");
 var logger = utils_1.rootLogger.extend('subscriptions');
 var mqttLogger = logger.extend('mqtt');
 exports.CONTROL_EVENTS_KEY = '@@controlEvents';
@@ -112,8 +111,8 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
         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;
         if (errors && errors.length) {
-            return new apollo_link_1.Observable(function (observer) {
-                observer.error(new apollo_client_1.ApolloError({
+            return new core_1.Observable(function (observer) {
+                observer.error(new core_1.ApolloError({
                     errorMessage: 'Error during subscription handshake',
                     extraInfo: { errors: errors },
                     graphQLErrors: errors
@@ -124,7 +123,7 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
         var newSubscriptionTopics = Object.keys(newSubscriptions).map(function (subKey) { return newSubscriptions[subKey].topic; });
         var existingTopicsWithObserver = new Set(newSubscriptionTopics.filter(function (t) { return _this.topicObservers.has(t); }));
         var newTopics = new Set(newSubscriptionTopics.filter(function (t) { return !existingTopicsWithObserver.has(t); }));
-        return new apollo_link_1.Observable(function (observer) {
+        return new core_1.Observable(function (observer) {
             existingTopicsWithObserver.forEach(function (t) {
                 _this.topicObservers.get(t).add(observer);
                 var anObserver = Array.from(_this.topicObservers.get(t)).find(function () { return true; });
@@ -182,7 +181,7 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 query = operation.query;
-                selectionNames = apollo_utilities_1.getMainDefinition(query).selectionSet.selections.map(function (_a) {
+                selectionNames = utilities_1.getMainDefinition(query).selectionSet.selections.map(function (_a) {
                     var value = _a.name.value;
                     return value;
                 });
@@ -269,5 +268,5 @@ var SubscriptionHandshakeLink = /** @class */ (function (_super) {
         });
     };
     return SubscriptionHandshakeLink;
-}(apollo_link_1.ApolloLink));
+}(core_1.ApolloLink));
 exports.SubscriptionHandshakeLink = SubscriptionHandshakeLink;

package/lib/types/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="zen-observable" />
 import { AuthOptions } from "aws-appsync-auth-link";
 export declare enum SUBSCRIPTION_STATUS {
     PENDING = 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-appsync-subscription-link",
-  "version": "2.2.5",
+  "version": "3.0.9",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "description": "AWS Mobile AppSync SDK for JavaScript",
@@ -19,18 +19,15 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "apollo-link": "1.2.5",
-    "apollo-link-context": "1.0.11",
-    "apollo-link-http": "1.5.8",
-    "apollo-link-retry": "2.2.7",
-    "aws-appsync-auth-link": "^2.0.6",
+    "aws-appsync-auth-link": "^3.0.7",
     "debug": "2.6.9",
     "url": "^0.11.0"
   },
   "devDependencies": {
+    "@apollo/client": "^3.2.0",
     "@redux-offline/redux-offline": "2.5.2-native.0"
   },
   "peerDependencies": {
-    "apollo-client": "2.x"
+    "@apollo/client": "3.x"
   }
 }