apollo-link-timeout 5.0.1 → 5.0.3

package/lib/cjs/TimeoutError.js

@@ -0,0 +1,30 @@
+"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;
+    }
+    return TimeoutError;
+}(Error));
+exports.default = TimeoutError;
+//# sourceMappingURL=TimeoutError.js.map

package/lib/cjs/TimeoutError.js.map

@@ -0,0 +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"}

package/lib/cjs/cjs.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var 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

@@ -0,0 +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"}

package/lib/cjs/package.json

@@ -0,0 +1 @@
+{"type": "commonjs"}

package/lib/cjs/timeoutLink.js

@@ -0,0 +1,125 @@
+"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;
+/**
+ * Aborts the request if the timeout expires before the response is received.
+ */
+var TimeoutLink = /** @class */ (function (_super) {
+    __extends(TimeoutLink, _super);
+    /**
+     * Creates a new TimeoutLink instance.
+     * Aborts the request if the timeout expires before the response is received.
+     *
+     * @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;
+    }
+    TimeoutLink.prototype.request = function (operation, forward) {
+        var _this = this;
+        var controller;
+        var 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;
+        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 || {};
+            ourController = new AbortController();
+            controller = fetchOptions.controller || ourController;
+            fetchOptions = __assign(__assign({}, fetchOptions), { controller: controller, signal: controller.signal });
+            operation.setContext({ fetchOptions: fetchOptions });
+        }
+        var 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;
+            // listen to chainObservable for result and pass to localObservable if received before timeout
+            var subscription = chainObservable.subscribe(function (result) {
+                clearTimeout(timer);
+                observer.next(result);
+                observer.complete();
+            }, function (error) {
+                clearTimeout(timer);
+                observer.error(error);
+                observer.complete();
+            });
+            // if timeout expires before observable completes, abort call, unsubscribe, and return error
+            timer = setTimeout(function () {
+                if (controller) {
+                    if (controller.signal.aborted) {
+                        // already aborted from somewhere else
+                        return;
+                    }
+                    controller.abort(); // abort fetch operation
+                    // 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 || {};
+                    if (fetchOptions.controller === ourController && fetchOptions.signal === ourController.signal) {
+                        operation.setContext(__assign(__assign({}, fetchOptions), { controller: undefined, signal: undefined }));
+                    }
+                }
+                observer.error(new TimeoutError_js_1.default('Timeout exceeded', requestTimeout, _this.statusCode));
+                subscription.unsubscribe();
+            }, requestTimeout);
+            var cancelTimeout = function () {
+                clearTimeout(timer);
+                subscription.unsubscribe();
+            };
+            var ctxRef = operation.getContext().timeoutRef;
+            if (ctxRef) {
+                ctxRef({ unsubscribe: cancelTimeout });
+            }
+            // cancel timeout if aborted from somewhere else
+            controller.signal.addEventListener("abort", function () {
+                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

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

package/lib/esm/TimeoutError.js

@@ -0,0 +1,28 @@
+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;
+    }
+    return TimeoutError;
+}(Error));
+export default TimeoutError;
+//# sourceMappingURL=TimeoutError.js.map

package/lib/esm/TimeoutError.js.map

@@ -0,0 +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"}

package/lib/esm/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/lib/esm/timeoutLink.js

@@ -0,0 +1,123 @@
+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;
+/**
+ * Aborts the request if the timeout expires before the response is received.
+ */
+var TimeoutLink = /** @class */ (function (_super) {
+    __extends(TimeoutLink, _super);
+    /**
+     * Creates a new TimeoutLink instance.
+     * Aborts the request if the timeout expires before the response is received.
+     *
+     * @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;
+    }
+    TimeoutLink.prototype.request = function (operation, forward) {
+        var _this = this;
+        var controller;
+        var 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;
+        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 || {};
+            ourController = new AbortController();
+            controller = fetchOptions.controller || ourController;
+            fetchOptions = __assign(__assign({}, fetchOptions), { controller: controller, signal: controller.signal });
+            operation.setContext({ fetchOptions: fetchOptions });
+        }
+        var 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;
+            // listen to chainObservable for result and pass to localObservable if received before timeout
+            var subscription = chainObservable.subscribe(function (result) {
+                clearTimeout(timer);
+                observer.next(result);
+                observer.complete();
+            }, function (error) {
+                clearTimeout(timer);
+                observer.error(error);
+                observer.complete();
+            });
+            // if timeout expires before observable completes, abort call, unsubscribe, and return error
+            timer = setTimeout(function () {
+                if (controller) {
+                    if (controller.signal.aborted) {
+                        // already aborted from somewhere else
+                        return;
+                    }
+                    controller.abort(); // abort fetch operation
+                    // 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 || {};
+                    if (fetchOptions.controller === ourController && fetchOptions.signal === ourController.signal) {
+                        operation.setContext(__assign(__assign({}, fetchOptions), { controller: undefined, signal: undefined }));
+                    }
+                }
+                observer.error(new TimeoutError('Timeout exceeded', requestTimeout, _this.statusCode));
+                subscription.unsubscribe();
+            }, requestTimeout);
+            var cancelTimeout = function () {
+                clearTimeout(timer);
+                subscription.unsubscribe();
+            };
+            var ctxRef = operation.getContext().timeoutRef;
+            if (ctxRef) {
+                ctxRef({ unsubscribe: cancelTimeout });
+            }
+            // cancel timeout if aborted from somewhere else
+            controller.signal.addEventListener("abort", function () {
+                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

@@ -0,0 +1 @@
+{"version":3,"file":"timeoutLink.js","sourceRoot":"","sources":["../../src/timeoutLink.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yFAAyF;AACzF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAmD,MAAM,qBAAqB,CAAC;AAE9G,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAE7C,IAAM,eAAe,GAAW,KAAK,CAAC;AAEtC;;GAEG;AACH;IAAyC,+BAAU;IAIjD;;;;;;OAMG;IACH,qBAAY,OAAgB,EAAE,UAAmB;QAAjD,YACE,iBAAO,SAGR;QAFC,KAAI,CAAC,OAAO,GAAG,OAAO,IAAI,eAAe,CAAC;QAC1C,KAAI,CAAC,UAAU,GAAG,UAAU,CAAC;;IAC/B,CAAC;IAEM,6BAAO,GAAd,UAAe,SAAoB,EAAE,OAAiB;QAAtD,iBA4FC;QA3FC,IAAI,UAA2B,CAAC;QAChC,IAAI,aAA8B,CAAC;QAEnC,sCAAsC;QACtC,IAAM,cAAc,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAEtE,IAAM,aAAa,GAAI,SAAS,CAAC,KAAK,CAAC,WAAmB,CAAC,IAAI,CAC7D,UAAC,GAAmB,IAAK,OAAA,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAlC,CAAkC,CAC5D,CAAC,SAAS,CAAC;QAEZ,IAAI,cAAc,IAAI,CAAC,IAAI,aAAa,KAAK,cAAc,EAAE;YAC3D,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,mEAAmE;SAC/F;QAED,qFAAqF;QACrF,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE;YAC1C,IAAM,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;YACvC,IAAI,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;YAE9C,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC;YACtC,UAAU,GAAG,YAAY,CAAC,UAAU,IAAI,aAAa,CAAC;YAEtD,YAAY,yBAAQ,YAAY,KAAE,UAAU,YAAA,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAE,CAAC;YAC1E,SAAS,CAAC,UAAU,CAAC,EAAE,YAAY,cAAA,EAAE,CAAC,CAAC;SACxC;QAED,IAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,sCAAsC;QAElF,2FAA2F;QAC3F,2EAA2E;QAC3E,IAAM,eAAe,GAAG,IAAI,UAAU,CAAc,UAAA,QAAQ;YAC1D,IAAI,KAAU,CAAC;YAEf,8FAA8F;YAC9F,IAAM,YAAY,GAAG,eAAe,CAAC,SAAS,CAC5C,UAAA,MAAM;gBACJ,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACtB,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACtB,CAAC,EACD,UAAA,KAAK;gBACH,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtB,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACtB,CAAC,CACF,CAAC;YAEF,4FAA4F;YAC5F,KAAK,GAAG,UAAU,CAAC;gBACjB,IAAI,UAAU,EAAE;oBACd,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE;wBAC7B,sCAAsC;wBACtC,OAAO;qBACR;oBAED,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,wBAAwB;oBAE5C,qEAAqE;oBACrE,oEAAoE;oBACpE,iCAAiC;oBACjC,IAAM,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC;oBACvC,IAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;oBAChD,IAAG,YAAY,CAAC,UAAU,KAAK,aAAa,IAAI,YAAY,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE;wBAC3F,SAAS,CAAC,UAAU,uBAAM,YAAY,KAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,IAAG,CAAC;qBACtF;iBACF;gBAED,QAAQ,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,kBAAkB,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACtF,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,CAAC,EAAE,cAAc,CAAC,CAAC;YAEnB,IAAM,aAAa,GAAG;gBACpB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,CAAC,CAAC;YAEF,IAAM,MAAM,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC;YACjD,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC;aACxC;YAED,gDAAgD;YAChD,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE;gBAC1C,aAAa,EAAE,CAAC;YAClB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAEnB,0EAA0E;YAC1E,OAAO,aAAa,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC;IACzB,CAAC;IACH,kBAAC;AAAD,CAAC,AA9GD,CAAyC,UAAU,GA8GlD"}

package/lib/types/TimeoutError.d.ts

@@ -0,0 +1,5 @@
+export default class TimeoutError extends Error {
+    timeout: number;
+    statusCode: number;
+    constructor(message: string, timeout: number, statusCode?: number);
+}

package/lib/types/cjs.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/types/timeoutLink.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="zen-observable" />
+import { ApolloLink, Observable, type Operation, type NextLink, type FetchResult } from '@apollo/client/core';
+/**
+ * Aborts the request if the timeout expires before the response is received.
+ */
+export default class TimeoutLink extends ApolloLink {
+    private timeout;
+    private statusCode?;
+    /**
+     * Creates a new TimeoutLink instance.
+     * Aborts the request if the timeout expires before the response is received.
+     *
+     * @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).
+     */
+    constructor(timeout?: number, statusCode?: number);
+    request(operation: Operation, forward: NextLink): Observable<FetchResult>;
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "apollo-link-timeout",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "Abort requests that take longer than a specified timeout period",
   "peerDependencies": {
     "@apollo/client": "^3.0.0"
   },
   "devDependencies": {
-    "@apollo/client": "^3.1.3",
+    "@apollo/client": "^3.13.9",
     "@types/jest": "^23.1.1",
     "@types/node": "^10.3.4",
     "graphql": "^15.3.0",
@@ -60,7 +60,7 @@
   "jest": {
     "globals": {
       "ts-jest": {
-          "useESM": true
+        "useESM": true
       }
     },
     "moduleFileExtensions": [
@@ -72,13 +72,17 @@
     "moduleNameMapper": {
       "(.+)\\.js": "$1"
     },
-    "testEnvironment": "jsdom",
+    "testEnvironment": "./__tests__/fixedEnvironment.js",
+    "transformIgnorePatterns": [
+      "__tests__/fixedEnvironment.js",
+      "/node_modules/"
+    ],
     "testPathIgnorePatterns": [
       "__tests__/integration/",
       "/node_modules/",
       "/lib/"
     ],
-    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx)$",
     "transform": {
       ".(ts|tsx)": "ts-jest"
     }

package/src/timeoutLink.ts

@@ -1,5 +1,5 @@
 // note, this import is modified when building for ESM via `script/fix_apollo_import.mjs`
-import { ApolloLink, Observable, type Operation, type NextLink } from '@apollo/client/core';
+import { ApolloLink, Observable, type Operation, type NextLink, type FetchResult } from '@apollo/client/core';
 import type { DefinitionNode } from 'graphql';
 import TimeoutError from './TimeoutError.js';
 
@@ -25,13 +25,21 @@ export default class TimeoutLink extends ApolloLink {
     this.statusCode = statusCode;
   }
 
-  public request(operation: Operation, forward: NextLink) {
+  public request(operation: Operation, forward: NextLink): Observable<FetchResult> {
     let controller: AbortController;
     let ourController: AbortController;
 
     // override timeout from query context
     const requestTimeout = operation.getContext().timeout || this.timeout;
 
+    const operationType = (operation.query.definitions as any).find(
+      (def: DefinitionNode) => 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') {
       const context = operation.getContext();
@@ -46,17 +54,9 @@ export default class TimeoutLink extends ApolloLink {
 
     const chainObservable = forward(operation); // observable for remaining link chain
 
-    const operationType = (operation.query.definitions as any).find(
-      (def: DefinitionNode) => def.kind === 'OperationDefinition'
-    ).operation;
-
-    if (requestTimeout <= 0 || operationType === 'subscription') {
-      return chainObservable; // skip this link if timeout is zero or it's a subscription request
-    }
-
     // 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(observer => {
+    const localObservable = new Observable<FetchResult>(observer => {
       let timer: any;
 
       // listen to chainObservable for result and pass to localObservable if received before timeout