apollo-link-timeout 5.0.4 → 5.1.0

package/README.md

@@ -3,15 +3,19 @@
 An [Apollo Link](https://www.apollographql.com/docs/link/) that aborts requests that aren't completed within a specified timeout period. Note that timeouts are enforced for query and mutation operations only (not subscriptions).
 
 ## Installation
-```
+
+```bash
 npm install apollo-link-timeout
 ```
+
 or
-```
+
+```bash
 yarn add apollo-link-timeout
 ```
 
 ## Usage
+
 ```javascript
 import ApolloLinkTimeout from 'apollo-link-timeout';
 import { createHttpLink } from 'apollo-link-http';
@@ -29,7 +33,7 @@ const apolloClient = new ApolloClient({ link: timeoutHttpLink });
 
 // use timeout-enabled Apollo client...
 
-// Override timeout from any query 
+// Override timeout from any query
 <Query
  query={SOME_QUERY}
  variables={{
@@ -41,4 +45,61 @@ const apolloClient = new ApolloClient({ link: timeoutHttpLink });
 // ...
 ```
 
+## API
+
+**`new ApolloLinkTimeout(timeout?, statusCode?)`**
+
+Creates a new TimeoutLink instance that aborts requests if the timeout expires before the response is received.
+
+**Parameters:**
+
+- `timeout` (optional): The timeout in milliseconds for the request. Defaults to 15000ms (15 seconds) if omitted.
+- `statusCode` (optional): The HTTP status code to return when a timeout occurs. Defaults to 408 (Request Timeout) if omitted.
+
+## Overriding Timeout Per Operation
+
+You can override the default timeout for individual operations by setting a `timeout` value in the operation context:
+
+```javascript
+// Override timeout in a query
+<Query
+  query={SOME_QUERY}
+  variables={{
+    someVar1: "foo",
+    someVar2: "bar",
+  }}
+  context={{ timeout: 3000 }} // 3 second timeout for this query
+>
+  // ...
+</Query>
+
+
+// Or when calling the client directly
+apolloClient.query({
+  query: SOME_QUERY,
+  context: { timeout: 5000 } // 5 second timeout
+});
+
+// Or via a prior link
+const link = new ApolloLink((operation, forward) => {
+  operation.setContext({ timeout: 5000 });
+});
+link.concat(timeoutLink);
+```
+
+The timeout resolution follows this priority: operation-level context timeout > link-level timeout > default (15000ms).
+
+## Disabling Timeout
+
+To disable the timeout for a specific operation, set the timeout to a negative value in the operation context:
+
+```javascript
+apolloClient.query({
+  query: SOME_QUERY,
+  context: { timeout: -1 } // Disable timeout for this query
+});
+```
+
+When a negative timeout is provided, the timeout link will be skipped and the operation will proceed without any timeout enforcement.
+
 See [Apollo documentation](https://www.apollographql.com/client) for information on using the Apollo client.

package/lib/cjs/TimeoutError.js

@@ -1,30 +1,11 @@
 "use strict";
-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 (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 });
-var TimeoutError = /** @class */ (function (_super) {
-    __extends(TimeoutError, _super);
-    function TimeoutError(message, timeout, statusCode) {
-        if (statusCode === void 0) { statusCode = 408; }
-        var _this = _super.call(this, message) || this;
-        _this.timeout = timeout;
-        _this.statusCode = statusCode;
-        return _this;
+class TimeoutError extends Error {
+    constructor(message, timeout, statusCode = 408) {
+        super(message);
+        this.timeout = timeout;
+        this.statusCode = statusCode;
     }
-    return TimeoutError;
-}(Error));
+}
 exports.default = TimeoutError;
 //# sourceMappingURL=TimeoutError.js.map

package/lib/cjs/TimeoutError.js.map

@@ -1 +1 @@
-{"version":3,"file":"TimeoutError.js","sourceRoot":"","sources":["../../src/TimeoutError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA;IAA0C,gCAAK;IAI7C,sBAAY,OAAe,EAAE,OAAe,EAAE,UAAwB;QAAxB,2BAAA,EAAA,gBAAwB;QAAtE,YACE,kBAAM,OAAO,CAAC,SAGf;QAFC,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IACH,mBAAC;AAAD,CAAC,AATD,CAA0C,KAAK,GAS9C"}
+{"version":3,"file":"TimeoutError.js","sourceRoot":"","sources":["../../src/TimeoutError.ts"],"names":[],"mappings":";;AAAA,MAAqB,YAAa,SAAQ,KAAK;IAI7C,YAAY,OAAe,EAAE,OAAe,EAAE,aAAqB,GAAG;QACpE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AATD,+BASC"}

package/lib/cjs/cjs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var timeoutLink_js_1 = require("./timeoutLink.js");
+const timeoutLink_js_1 = require("./timeoutLink.js");
 module.exports = timeoutLink_js_1.default;
 module.exports.default = timeoutLink_js_1.default;
 //# sourceMappingURL=cjs.js.map

package/lib/cjs/cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"cjs.js","sourceRoot":"","sources":["../../src/cjs.ts"],"names":[],"mappings":";;AAAA,mDAA2C;AAE3C,MAAM,CAAC,OAAO,GAAG,wBAAW,CAAC;AAC7B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,wBAAW,CAAC"}
+{"version":3,"file":"cjs.js","sourceRoot":"","sources":["../../src/cjs.ts"],"names":[],"mappings":";;AAAA,qDAA2C;AAE3C,MAAM,CAAC,OAAO,GAAG,wBAAW,CAAC;AAC7B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,wBAAW,CAAC"}

package/lib/cjs/timeoutLink.js

@@ -1,40 +1,13 @@
 "use strict";
-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 (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 __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // note, this import is modified when building for ESM via `script/fix_apollo_import.mjs`
-var core_1 = require("@apollo/client/core");
-var TimeoutError_js_1 = require("./TimeoutError.js");
-var DEFAULT_TIMEOUT = 15000;
+const core_1 = require("@apollo/client/core");
+const TimeoutError_js_1 = require("./TimeoutError.js");
+const DEFAULT_TIMEOUT = 15000;
 /**
  * Aborts the request if the timeout expires before the response is received.
  */
-var TimeoutLink = /** @class */ (function (_super) {
-    __extends(TimeoutLink, _super);
+class TimeoutLink extends core_1.ApolloLink {
     /**
      * Creates a new TimeoutLink instance.
      * Aborts the request if the timeout expires before the response is received.
@@ -42,48 +15,46 @@ var TimeoutLink = /** @class */ (function (_super) {
      * @param timeout - The timeout in milliseconds for the request. Default is 15000ms (15 seconds).
      * @param statusCode - The HTTP status code to return when a timeout occurs. Default is 408 (Request Timeout).
      */
-    function TimeoutLink(timeout, statusCode) {
-        var _this = _super.call(this) || this;
-        _this.timeout = timeout || DEFAULT_TIMEOUT;
-        _this.statusCode = statusCode;
-        return _this;
+    constructor(timeout, statusCode) {
+        super();
+        this.timeout = timeout || DEFAULT_TIMEOUT;
+        this.statusCode = statusCode;
     }
-    TimeoutLink.prototype.request = function (operation, forward) {
-        var _this = this;
-        var controller;
-        var ourController;
+    request(operation, forward) {
+        let controller;
+        let ourController;
         // override timeout from query context
-        var requestTimeout = operation.getContext().timeout || this.timeout;
-        var operationType = operation.query.definitions.find(function (def) { return def.kind === 'OperationDefinition'; }).operation;
+        const requestTimeout = operation.getContext().timeout || this.timeout;
+        const operationType = operation.query.definitions.find((def) => def.kind === 'OperationDefinition').operation;
         if (requestTimeout <= 0 || operationType === 'subscription') {
             return forward(operation); // skip this link if timeout is zero or it's a subscription request
         }
         // add abort controller and signal object to fetchOptions if they don't already exist
         if (typeof AbortController !== 'undefined') {
-            var context = operation.getContext();
-            var fetchOptions = context.fetchOptions || {};
+            const context = operation.getContext();
+            let fetchOptions = context.fetchOptions || {};
             ourController = new AbortController();
             controller = fetchOptions.controller || ourController;
-            fetchOptions = __assign(__assign({}, fetchOptions), { controller: controller, signal: controller.signal });
-            operation.setContext({ fetchOptions: fetchOptions });
+            fetchOptions = Object.assign(Object.assign({}, fetchOptions), { controller, signal: controller.signal });
+            operation.setContext({ fetchOptions });
         }
-        var chainObservable = forward(operation); // observable for remaining link chain
+        const chainObservable = forward(operation); // observable for remaining link chain
         // create local observable with timeout functionality (unsubscibe from chain observable and
         // return an error if the timeout expires before chain observable resolves)
-        var localObservable = new core_1.Observable(function (observer) {
-            var timer;
+        const localObservable = new core_1.Observable((observer) => {
+            let timer;
             // listen to chainObservable for result and pass to localObservable if received before timeout
-            var subscription = chainObservable.subscribe(function (result) {
+            const subscription = chainObservable.subscribe((result) => {
                 clearTimeout(timer);
                 observer.next(result);
                 observer.complete();
-            }, function (error) {
+            }, (error) => {
                 clearTimeout(timer);
                 observer.error(error);
                 observer.complete();
             });
             // if timeout expires before observable completes, abort call, unsubscribe, and return error
-            timer = setTimeout(function () {
+            timer = setTimeout(() => {
                 if (controller) {
                     if (controller.signal.aborted) {
                         // already aborted from somewhere else
@@ -93,33 +64,32 @@ var TimeoutLink = /** @class */ (function (_super) {
                     // if the AbortController in the operation context is one we created,
                     // it's now "used up", so we need to remove it to avoid blocking any
                     // future retry of the operation.
-                    var context = operation.getContext();
-                    var fetchOptions = context.fetchOptions || {};
+                    const context = operation.getContext();
+                    const fetchOptions = context.fetchOptions || {};
                     if (fetchOptions.controller === ourController && fetchOptions.signal === ourController.signal) {
-                        operation.setContext(__assign(__assign({}, fetchOptions), { controller: undefined, signal: undefined }));
+                        operation.setContext(Object.assign(Object.assign({}, fetchOptions), { controller: undefined, signal: undefined }));
                     }
                 }
-                observer.error(new TimeoutError_js_1.default('Timeout exceeded', requestTimeout, _this.statusCode));
+                observer.error(new TimeoutError_js_1.default('Timeout exceeded', requestTimeout, this.statusCode));
                 subscription.unsubscribe();
             }, requestTimeout);
-            var cancelTimeout = function () {
+            const cancelTimeout = () => {
                 clearTimeout(timer);
                 subscription.unsubscribe();
             };
-            var ctxRef = operation.getContext().timeoutRef;
+            const ctxRef = operation.getContext().timeoutRef;
             if (ctxRef) {
                 ctxRef({ unsubscribe: cancelTimeout });
             }
             // cancel timeout if aborted from somewhere else
-            controller.signal.addEventListener("abort", function () {
+            controller.signal.addEventListener("abort", () => {
                 cancelTimeout();
             }, { once: true });
             // this function is called when a client unsubscribes from localObservable
             return cancelTimeout;
         });
         return localObservable;
-    };
-    return TimeoutLink;
-}(core_1.ApolloLink));
+    }
+}
 exports.default = TimeoutLink;
 //# sourceMappingURL=timeoutLink.js.map

package/lib/cjs/timeoutLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeoutLink.js","sourceRoot":"","sources":["../../src/timeoutLink.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"timeoutLink.js","sourceRoot":"","sources":["../../src/timeoutLink.ts"],"names":[],"mappings":"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"}

package/lib/esm/TimeoutError.js

@@ -1,28 +1,8 @@
-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 (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 __());
-    };
-})();
-var TimeoutError = /** @class */ (function (_super) {
-    __extends(TimeoutError, _super);
-    function TimeoutError(message, timeout, statusCode) {
-        if (statusCode === void 0) { statusCode = 408; }
-        var _this = _super.call(this, message) || this;
-        _this.timeout = timeout;
-        _this.statusCode = statusCode;
-        return _this;
+export default class TimeoutError extends Error {
+    constructor(message, timeout, statusCode = 408) {
+        super(message);
+        this.timeout = timeout;
+        this.statusCode = statusCode;
     }
-    return TimeoutError;
-}(Error));
-export default TimeoutError;
+}
 //# sourceMappingURL=TimeoutError.js.map

package/lib/esm/TimeoutError.js.map

@@ -1 +1 @@
-{"version":3,"file":"TimeoutError.js","sourceRoot":"","sources":["../../src/TimeoutError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;IAA0C,gCAAK;IAI7C,sBAAY,OAAe,EAAE,OAAe,EAAE,UAAwB;QAAxB,2BAAA,EAAA,gBAAwB;QAAtE,YACE,kBAAM,OAAO,CAAC,SAGf;QAFC,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IACH,mBAAC;AAAD,CAAC,AATD,CAA0C,KAAK,GAS9C"}
+{"version":3,"file":"TimeoutError.js","sourceRoot":"","sources":["../../src/TimeoutError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK;IAI7C,YAAY,OAAe,EAAE,OAAe,EAAE,aAAqB,GAAG;QACpE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF"}

package/lib/esm/timeoutLink.js

@@ -1,38 +1,11 @@
-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 (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 __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 // note, this import is modified when building for ESM via `script/fix_apollo_import.mjs`
 import { ApolloLink, Observable } from '@apollo/client/core/index.js';
 import TimeoutError from './TimeoutError.js';
-var DEFAULT_TIMEOUT = 15000;
+const DEFAULT_TIMEOUT = 15000;
 /**
  * Aborts the request if the timeout expires before the response is received.
  */
-var TimeoutLink = /** @class */ (function (_super) {
-    __extends(TimeoutLink, _super);
+export default class TimeoutLink extends ApolloLink {
     /**
      * Creates a new TimeoutLink instance.
      * Aborts the request if the timeout expires before the response is received.
@@ -40,48 +13,46 @@ var TimeoutLink = /** @class */ (function (_super) {
      * @param timeout - The timeout in milliseconds for the request. Default is 15000ms (15 seconds).
      * @param statusCode - The HTTP status code to return when a timeout occurs. Default is 408 (Request Timeout).
      */
-    function TimeoutLink(timeout, statusCode) {
-        var _this = _super.call(this) || this;
-        _this.timeout = timeout || DEFAULT_TIMEOUT;
-        _this.statusCode = statusCode;
-        return _this;
+    constructor(timeout, statusCode) {
+        super();
+        this.timeout = timeout || DEFAULT_TIMEOUT;
+        this.statusCode = statusCode;
     }
-    TimeoutLink.prototype.request = function (operation, forward) {
-        var _this = this;
-        var controller;
-        var ourController;
+    request(operation, forward) {
+        let controller;
+        let ourController;
         // override timeout from query context
-        var requestTimeout = operation.getContext().timeout || this.timeout;
-        var operationType = operation.query.definitions.find(function (def) { return def.kind === 'OperationDefinition'; }).operation;
+        const requestTimeout = operation.getContext().timeout || this.timeout;
+        const operationType = operation.query.definitions.find((def) => def.kind === 'OperationDefinition').operation;
         if (requestTimeout <= 0 || operationType === 'subscription') {
             return forward(operation); // skip this link if timeout is zero or it's a subscription request
         }
         // add abort controller and signal object to fetchOptions if they don't already exist
         if (typeof AbortController !== 'undefined') {
-            var context = operation.getContext();
-            var fetchOptions = context.fetchOptions || {};
+            const context = operation.getContext();
+            let fetchOptions = context.fetchOptions || {};
             ourController = new AbortController();
             controller = fetchOptions.controller || ourController;
-            fetchOptions = __assign(__assign({}, fetchOptions), { controller: controller, signal: controller.signal });
-            operation.setContext({ fetchOptions: fetchOptions });
+            fetchOptions = Object.assign(Object.assign({}, fetchOptions), { controller, signal: controller.signal });
+            operation.setContext({ fetchOptions });
         }
-        var chainObservable = forward(operation); // observable for remaining link chain
+        const chainObservable = forward(operation); // observable for remaining link chain
         // create local observable with timeout functionality (unsubscibe from chain observable and
         // return an error if the timeout expires before chain observable resolves)
-        var localObservable = new Observable(function (observer) {
-            var timer;
+        const localObservable = new Observable((observer) => {
+            let timer;
             // listen to chainObservable for result and pass to localObservable if received before timeout
-            var subscription = chainObservable.subscribe(function (result) {
+            const subscription = chainObservable.subscribe((result) => {
                 clearTimeout(timer);
                 observer.next(result);
                 observer.complete();
-            }, function (error) {
+            }, (error) => {
                 clearTimeout(timer);
                 observer.error(error);
                 observer.complete();
             });
             // if timeout expires before observable completes, abort call, unsubscribe, and return error
-            timer = setTimeout(function () {
+            timer = setTimeout(() => {
                 if (controller) {
                     if (controller.signal.aborted) {
                         // already aborted from somewhere else
@@ -91,33 +62,31 @@ var TimeoutLink = /** @class */ (function (_super) {
                     // if the AbortController in the operation context is one we created,
                     // it's now "used up", so we need to remove it to avoid blocking any
                     // future retry of the operation.
-                    var context = operation.getContext();
-                    var fetchOptions = context.fetchOptions || {};
+                    const context = operation.getContext();
+                    const fetchOptions = context.fetchOptions || {};
                     if (fetchOptions.controller === ourController && fetchOptions.signal === ourController.signal) {
-                        operation.setContext(__assign(__assign({}, fetchOptions), { controller: undefined, signal: undefined }));
+                        operation.setContext(Object.assign(Object.assign({}, fetchOptions), { controller: undefined, signal: undefined }));
                     }
                 }
-                observer.error(new TimeoutError('Timeout exceeded', requestTimeout, _this.statusCode));
+                observer.error(new TimeoutError('Timeout exceeded', requestTimeout, this.statusCode));
                 subscription.unsubscribe();
             }, requestTimeout);
-            var cancelTimeout = function () {
+            const cancelTimeout = () => {
                 clearTimeout(timer);
                 subscription.unsubscribe();
             };
-            var ctxRef = operation.getContext().timeoutRef;
+            const ctxRef = operation.getContext().timeoutRef;
             if (ctxRef) {
                 ctxRef({ unsubscribe: cancelTimeout });
             }
             // cancel timeout if aborted from somewhere else
-            controller.signal.addEventListener("abort", function () {
+            controller.signal.addEventListener("abort", () => {
                 cancelTimeout();
             }, { once: true });
             // this function is called when a client unsubscribes from localObservable
             return cancelTimeout;
         });
         return localObservable;
-    };
-    return TimeoutLink;
-}(ApolloLink));
-export default TimeoutLink;
+    }
+}
 //# sourceMappingURL=timeoutLink.js.map

package/lib/esm/timeoutLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeoutLink.js","sourceRoot":"","sources":["../../src/timeoutLink.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"timeoutLink.js","sourceRoot":"","sources":["../../src/timeoutLink.ts"],"names":[],"mappings":"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"}

package/lib/types/timeoutLink.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="zen-observable" />
-import { ApolloLink, Observable, type Operation, type NextLink, type FetchResult } from '@apollo/client/core';
+import { ApolloLink, Observable, type Operation, type FetchResult } from '@apollo/client/core';
+type NextLink = (operation: Operation) => Observable<FetchResult>;
 /**
  * Aborts the request if the timeout expires before the response is received.
  */
@@ -16,3 +16,4 @@ export default class TimeoutLink extends ApolloLink {
     constructor(timeout?: number, statusCode?: number);
     request(operation: Operation, forward: NextLink): Observable<FetchResult>;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-link-timeout",
-  "version": "5.0.4",
+  "version": "5.1.0",
   "description": "Abort requests that take longer than a specified timeout period",
   "peerDependencies": {
     "@apollo/client": "^3.0.0"

package/src/timeoutLink.ts

@@ -1,8 +1,12 @@
 // note, this import is modified when building for ESM via `script/fix_apollo_import.mjs`
-import { ApolloLink, Observable, type Operation, type NextLink, type FetchResult } from '@apollo/client/core';
+import { ApolloLink, Observable, type Operation, type FetchResult } from '@apollo/client/core';
 import type { DefinitionNode } from 'graphql';
 import TimeoutError from './TimeoutError.js';
 
+// NextLink was removed from apollo-client in v4 and replaced by ApolloLink.ForwardFunction,
+// but to maintain compatibility with both v3 and v4, we re-declare it here.
+type NextLink = (operation: Operation) => Observable<FetchResult>;
+
 const DEFAULT_TIMEOUT: number = 15000;
 
 /**
@@ -56,17 +60,17 @@ export default class TimeoutLink extends ApolloLink {
 
     // create local observable with timeout functionality (unsubscibe from chain observable and
     // return an error if the timeout expires before chain observable resolves)
-    const localObservable = new Observable<FetchResult>(observer => {
+    const localObservable = new Observable<FetchResult>((observer) => {
       let timer: any;
 
       // listen to chainObservable for result and pass to localObservable if received before timeout
       const subscription = chainObservable.subscribe(
-        result => {
+        (result) => {
           clearTimeout(timer);
           observer.next(result);
           observer.complete();
         },
-        error => {
+        (error) => {
           clearTimeout(timer);
           observer.error(error);
           observer.complete();