@metamask/shield-controller 0.4.0 → 1.1.0

package/dist/polling-with-policy.cjs

@@ -0,0 +1,76 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _PollingWithCockatielPolicy_instances, _PollingWithCockatielPolicy_policy, _PollingWithCockatielPolicy_requestEntry, _PollingWithCockatielPolicy_addNewRequestEntry, _PollingWithCockatielPolicy_cleanup, _PollingWithCockatielPolicy_shouldRetry;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingWithCockatielPolicy = void 0;
+const controller_utils_1 = require("@metamask/controller-utils");
+const cockatiel_1 = require("cockatiel");
+class PollingWithCockatielPolicy {
+    constructor(policyOptions = {}) {
+        _PollingWithCockatielPolicy_instances.add(this);
+        _PollingWithCockatielPolicy_policy.set(this, void 0);
+        _PollingWithCockatielPolicy_requestEntry.set(this, new Map());
+        const retryFilterPolicy = (0, cockatiel_1.handleWhen)(__classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_shouldRetry));
+        __classPrivateFieldSet(this, _PollingWithCockatielPolicy_policy, (0, controller_utils_1.createServicePolicy)({
+            ...policyOptions,
+            retryFilterPolicy,
+        }), "f");
+    }
+    async start(requestId, requestFn) {
+        const abortController = __classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_addNewRequestEntry).call(this, requestId);
+        try {
+            const result = await __classPrivateFieldGet(this, _PollingWithCockatielPolicy_policy, "f").execute(async ({ signal }) => {
+                return requestFn(signal);
+            }, abortController.signal);
+            return result;
+        }
+        catch (error) {
+            if (abortController.signal.aborted) {
+                throw new Error('Request cancelled');
+            }
+            throw error;
+        }
+        finally {
+            // Only cleanup if this abort controller is still active. If a new request with the same
+            // requestId started while this one was running, it would have replaced with a new abort controller.
+            // We must not delete the new request's controller when this older request finishes.
+            if (abortController === __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").get(requestId)) {
+                __classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_cleanup).call(this, requestId);
+            }
+        }
+    }
+    abortPendingRequest(requestId) {
+        const abortController = __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").get(requestId);
+        abortController?.abort();
+        __classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_cleanup).call(this, requestId);
+    }
+}
+exports.PollingWithCockatielPolicy = PollingWithCockatielPolicy;
+_PollingWithCockatielPolicy_policy = new WeakMap(), _PollingWithCockatielPolicy_requestEntry = new WeakMap(), _PollingWithCockatielPolicy_instances = new WeakSet(), _PollingWithCockatielPolicy_addNewRequestEntry = function _PollingWithCockatielPolicy_addNewRequestEntry(requestId) {
+    // abort the previous request if it exists
+    this.abortPendingRequest(requestId);
+    // create a new abort controller for the new request
+    const abortController = new AbortController();
+    __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").set(requestId, abortController);
+    return abortController;
+}, _PollingWithCockatielPolicy_cleanup = function _PollingWithCockatielPolicy_cleanup(requestId) {
+    __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").delete(requestId);
+}, _PollingWithCockatielPolicy_shouldRetry = function _PollingWithCockatielPolicy_shouldRetry(error) {
+    if (error instanceof controller_utils_1.HttpError) {
+        // Note: we don't retry on 5xx errors, only on 4xx errors.
+        // but we won't retry on 400 coz it means that the request body is invalid.
+        return error.httpStatus > 400 && error.httpStatus < 500;
+    }
+    return false;
+};
+//# sourceMappingURL=polling-with-policy.cjs.map

package/dist/polling-with-policy.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"polling-with-policy.cjs","sourceRoot":"","sources":["../src/polling-with-policy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iEAKoC;AACpC,yCAAuC;AAMvC,MAAa,0BAA0B;IAKrC,YAAY,gBAA4C,EAAE;;QAJjD,qDAAuB;QAEvB,mDAAgB,IAAI,GAAG,EAA2B,EAAC;QAG1D,MAAM,iBAAiB,GAAG,IAAA,sBAAU,EAAC,uBAAA,IAAI,sFAAa,CAAC,CAAC;QACxD,uBAAA,IAAI,sCAAW,IAAA,sCAAmB,EAAC;YACjC,GAAG,aAAa;YAChB,iBAAiB;SAClB,CAAC,MAAA,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAa,SAAiB,EAAE,SAAgC;QACzE,MAAM,eAAe,GAAG,uBAAA,IAAI,6FAAoB,MAAxB,IAAI,EAAqB,SAAS,CAAC,CAAC;QAE5D,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,0CAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YACD,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,wFAAwF;YACxF,oGAAoG;YACpG,oFAAoF;YACpF,IAAI,eAAe,KAAK,uBAAA,IAAI,gDAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBACzD,uBAAA,IAAI,kFAAS,MAAb,IAAI,EAAU,SAAS,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAED,mBAAmB,CAAC,SAAiB;QACnC,MAAM,eAAe,GAAG,uBAAA,IAAI,gDAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1D,eAAe,EAAE,KAAK,EAAE,CAAC;QACzB,uBAAA,IAAI,kFAAS,MAAb,IAAI,EAAU,SAAS,CAAC,CAAC;IAC3B,CAAC;CAwBF;AAhED,gEAgEC;8QAtBqB,SAAiB;IACnC,0CAA0C;IAC1C,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAEpC,oDAAoD;IACpD,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,uBAAA,IAAI,gDAAc,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACnD,OAAO,eAAe,CAAC;AACzB,CAAC,qFAEQ,SAAiB;IACxB,uBAAA,IAAI,gDAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AACvC,CAAC,6FAEY,KAAY;IACvB,IAAI,KAAK,YAAY,4BAAS,EAAE;QAC9B,0DAA0D;QAC1D,2EAA2E;QAC3E,OAAO,KAAK,CAAC,UAAU,GAAG,GAAG,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;KACzD;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import {\n  createServicePolicy,\n  HttpError,\n  type CreateServicePolicyOptions,\n  type ServicePolicy,\n} from '@metamask/controller-utils';\nimport { handleWhen } from 'cockatiel';\n\nexport type RequestFn<ReturnType> = (\n  signal: AbortSignal,\n) => Promise<ReturnType>;\n\nexport class PollingWithCockatielPolicy {\n  readonly #policy: ServicePolicy;\n\n  readonly #requestEntry = new Map<string, AbortController>();\n\n  constructor(policyOptions: CreateServicePolicyOptions = {}) {\n    const retryFilterPolicy = handleWhen(this.#shouldRetry);\n    this.#policy = createServicePolicy({\n      ...policyOptions,\n      retryFilterPolicy,\n    });\n  }\n\n  async start<ReturnType>(requestId: string, requestFn: RequestFn<ReturnType>) {\n    const abortController = this.#addNewRequestEntry(requestId);\n\n    try {\n      const result = await this.#policy.execute(async ({ signal }) => {\n        return requestFn(signal);\n      }, abortController.signal);\n      return result;\n    } catch (error) {\n      if (abortController.signal.aborted) {\n        throw new Error('Request cancelled');\n      }\n      throw error;\n    } finally {\n      // Only cleanup if this abort controller is still active. If a new request with the same\n      // requestId started while this one was running, it would have replaced with a new abort controller.\n      // We must not delete the new request's controller when this older request finishes.\n      if (abortController === this.#requestEntry.get(requestId)) {\n        this.#cleanup(requestId);\n      }\n    }\n  }\n\n  abortPendingRequest(requestId: string) {\n    const abortController = this.#requestEntry.get(requestId);\n    abortController?.abort();\n    this.#cleanup(requestId);\n  }\n\n  #addNewRequestEntry(requestId: string) {\n    // abort the previous request if it exists\n    this.abortPendingRequest(requestId);\n\n    // create a new abort controller for the new request\n    const abortController = new AbortController();\n    this.#requestEntry.set(requestId, abortController);\n    return abortController;\n  }\n\n  #cleanup(requestId: string) {\n    this.#requestEntry.delete(requestId);\n  }\n\n  #shouldRetry(error: Error): boolean {\n    if (error instanceof HttpError) {\n      // Note: we don't retry on 5xx errors, only on 4xx errors.\n      // but we won't retry on 400 coz it means that the request body is invalid.\n      return error.httpStatus > 400 && error.httpStatus < 500;\n    }\n    return false;\n  }\n}\n"]}

package/dist/polling-with-policy.d.cts

@@ -0,0 +1,9 @@
+import { type CreateServicePolicyOptions } from "@metamask/controller-utils";
+export type RequestFn<ReturnType> = (signal: AbortSignal) => Promise<ReturnType>;
+export declare class PollingWithCockatielPolicy {
+    #private;
+    constructor(policyOptions?: CreateServicePolicyOptions);
+    start<ReturnType>(requestId: string, requestFn: RequestFn<ReturnType>): Promise<ReturnType>;
+    abortPendingRequest(requestId: string): void;
+}
+//# sourceMappingURL=polling-with-policy.d.cts.map

package/dist/polling-with-policy.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"polling-with-policy.d.cts","sourceRoot":"","sources":["../src/polling-with-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,0BAA0B,EAEhC,mCAAmC;AAGpC,MAAM,MAAM,SAAS,CAAC,UAAU,IAAI,CAClC,MAAM,EAAE,WAAW,KAChB,OAAO,CAAC,UAAU,CAAC,CAAC;AAEzB,qBAAa,0BAA0B;;gBAKzB,aAAa,GAAE,0BAA+B;IAQpD,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,UAAU,CAAC;IAuB3E,mBAAmB,CAAC,SAAS,EAAE,MAAM;CA4BtC"}

package/dist/polling-with-policy.d.mts

@@ -0,0 +1,9 @@
+import { type CreateServicePolicyOptions } from "@metamask/controller-utils";
+export type RequestFn<ReturnType> = (signal: AbortSignal) => Promise<ReturnType>;
+export declare class PollingWithCockatielPolicy {
+    #private;
+    constructor(policyOptions?: CreateServicePolicyOptions);
+    start<ReturnType>(requestId: string, requestFn: RequestFn<ReturnType>): Promise<ReturnType>;
+    abortPendingRequest(requestId: string): void;
+}
+//# sourceMappingURL=polling-with-policy.d.mts.map

package/dist/polling-with-policy.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"polling-with-policy.d.mts","sourceRoot":"","sources":["../src/polling-with-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,0BAA0B,EAEhC,mCAAmC;AAGpC,MAAM,MAAM,SAAS,CAAC,UAAU,IAAI,CAClC,MAAM,EAAE,WAAW,KAChB,OAAO,CAAC,UAAU,CAAC,CAAC;AAEzB,qBAAa,0BAA0B;;gBAKzB,aAAa,GAAE,0BAA+B;IAQpD,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,UAAU,CAAC;IAuB3E,mBAAmB,CAAC,SAAS,EAAE,MAAM;CA4BtC"}

package/dist/polling-with-policy.mjs

@@ -0,0 +1,72 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _PollingWithCockatielPolicy_instances, _PollingWithCockatielPolicy_policy, _PollingWithCockatielPolicy_requestEntry, _PollingWithCockatielPolicy_addNewRequestEntry, _PollingWithCockatielPolicy_cleanup, _PollingWithCockatielPolicy_shouldRetry;
+import { createServicePolicy, HttpError } from "@metamask/controller-utils";
+import { handleWhen } from "cockatiel";
+export class PollingWithCockatielPolicy {
+    constructor(policyOptions = {}) {
+        _PollingWithCockatielPolicy_instances.add(this);
+        _PollingWithCockatielPolicy_policy.set(this, void 0);
+        _PollingWithCockatielPolicy_requestEntry.set(this, new Map());
+        const retryFilterPolicy = handleWhen(__classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_shouldRetry));
+        __classPrivateFieldSet(this, _PollingWithCockatielPolicy_policy, createServicePolicy({
+            ...policyOptions,
+            retryFilterPolicy,
+        }), "f");
+    }
+    async start(requestId, requestFn) {
+        const abortController = __classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_addNewRequestEntry).call(this, requestId);
+        try {
+            const result = await __classPrivateFieldGet(this, _PollingWithCockatielPolicy_policy, "f").execute(async ({ signal }) => {
+                return requestFn(signal);
+            }, abortController.signal);
+            return result;
+        }
+        catch (error) {
+            if (abortController.signal.aborted) {
+                throw new Error('Request cancelled');
+            }
+            throw error;
+        }
+        finally {
+            // Only cleanup if this abort controller is still active. If a new request with the same
+            // requestId started while this one was running, it would have replaced with a new abort controller.
+            // We must not delete the new request's controller when this older request finishes.
+            if (abortController === __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").get(requestId)) {
+                __classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_cleanup).call(this, requestId);
+            }
+        }
+    }
+    abortPendingRequest(requestId) {
+        const abortController = __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").get(requestId);
+        abortController?.abort();
+        __classPrivateFieldGet(this, _PollingWithCockatielPolicy_instances, "m", _PollingWithCockatielPolicy_cleanup).call(this, requestId);
+    }
+}
+_PollingWithCockatielPolicy_policy = new WeakMap(), _PollingWithCockatielPolicy_requestEntry = new WeakMap(), _PollingWithCockatielPolicy_instances = new WeakSet(), _PollingWithCockatielPolicy_addNewRequestEntry = function _PollingWithCockatielPolicy_addNewRequestEntry(requestId) {
+    // abort the previous request if it exists
+    this.abortPendingRequest(requestId);
+    // create a new abort controller for the new request
+    const abortController = new AbortController();
+    __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").set(requestId, abortController);
+    return abortController;
+}, _PollingWithCockatielPolicy_cleanup = function _PollingWithCockatielPolicy_cleanup(requestId) {
+    __classPrivateFieldGet(this, _PollingWithCockatielPolicy_requestEntry, "f").delete(requestId);
+}, _PollingWithCockatielPolicy_shouldRetry = function _PollingWithCockatielPolicy_shouldRetry(error) {
+    if (error instanceof HttpError) {
+        // Note: we don't retry on 5xx errors, only on 4xx errors.
+        // but we won't retry on 400 coz it means that the request body is invalid.
+        return error.httpStatus > 400 && error.httpStatus < 500;
+    }
+    return false;
+};
+//# sourceMappingURL=polling-with-policy.mjs.map

package/dist/polling-with-policy.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"polling-with-policy.mjs","sourceRoot":"","sources":["../src/polling-with-policy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACL,mBAAmB,EACnB,SAAS,EAGV,mCAAmC;AACpC,OAAO,EAAE,UAAU,EAAE,kBAAkB;AAMvC,MAAM,OAAO,0BAA0B;IAKrC,YAAY,gBAA4C,EAAE;;QAJjD,qDAAuB;QAEvB,mDAAgB,IAAI,GAAG,EAA2B,EAAC;QAG1D,MAAM,iBAAiB,GAAG,UAAU,CAAC,uBAAA,IAAI,sFAAa,CAAC,CAAC;QACxD,uBAAA,IAAI,sCAAW,mBAAmB,CAAC;YACjC,GAAG,aAAa;YAChB,iBAAiB;SAClB,CAAC,MAAA,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAa,SAAiB,EAAE,SAAgC;QACzE,MAAM,eAAe,GAAG,uBAAA,IAAI,6FAAoB,MAAxB,IAAI,EAAqB,SAAS,CAAC,CAAC;QAE5D,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,uBAAA,IAAI,0CAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;YAC3B,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YACD,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,wFAAwF;YACxF,oGAAoG;YACpG,oFAAoF;YACpF,IAAI,eAAe,KAAK,uBAAA,IAAI,gDAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBACzD,uBAAA,IAAI,kFAAS,MAAb,IAAI,EAAU,SAAS,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAED,mBAAmB,CAAC,SAAiB;QACnC,MAAM,eAAe,GAAG,uBAAA,IAAI,gDAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1D,eAAe,EAAE,KAAK,EAAE,CAAC;QACzB,uBAAA,IAAI,kFAAS,MAAb,IAAI,EAAU,SAAS,CAAC,CAAC;IAC3B,CAAC;CAwBF;8QAtBqB,SAAiB;IACnC,0CAA0C;IAC1C,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAEpC,oDAAoD;IACpD,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,uBAAA,IAAI,gDAAc,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IACnD,OAAO,eAAe,CAAC;AACzB,CAAC,qFAEQ,SAAiB;IACxB,uBAAA,IAAI,gDAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AACvC,CAAC,6FAEY,KAAY;IACvB,IAAI,KAAK,YAAY,SAAS,EAAE;QAC9B,0DAA0D;QAC1D,2EAA2E;QAC3E,OAAO,KAAK,CAAC,UAAU,GAAG,GAAG,IAAI,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;KACzD;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import {\n  createServicePolicy,\n  HttpError,\n  type CreateServicePolicyOptions,\n  type ServicePolicy,\n} from '@metamask/controller-utils';\nimport { handleWhen } from 'cockatiel';\n\nexport type RequestFn<ReturnType> = (\n  signal: AbortSignal,\n) => Promise<ReturnType>;\n\nexport class PollingWithCockatielPolicy {\n  readonly #policy: ServicePolicy;\n\n  readonly #requestEntry = new Map<string, AbortController>();\n\n  constructor(policyOptions: CreateServicePolicyOptions = {}) {\n    const retryFilterPolicy = handleWhen(this.#shouldRetry);\n    this.#policy = createServicePolicy({\n      ...policyOptions,\n      retryFilterPolicy,\n    });\n  }\n\n  async start<ReturnType>(requestId: string, requestFn: RequestFn<ReturnType>) {\n    const abortController = this.#addNewRequestEntry(requestId);\n\n    try {\n      const result = await this.#policy.execute(async ({ signal }) => {\n        return requestFn(signal);\n      }, abortController.signal);\n      return result;\n    } catch (error) {\n      if (abortController.signal.aborted) {\n        throw new Error('Request cancelled');\n      }\n      throw error;\n    } finally {\n      // Only cleanup if this abort controller is still active. If a new request with the same\n      // requestId started while this one was running, it would have replaced with a new abort controller.\n      // We must not delete the new request's controller when this older request finishes.\n      if (abortController === this.#requestEntry.get(requestId)) {\n        this.#cleanup(requestId);\n      }\n    }\n  }\n\n  abortPendingRequest(requestId: string) {\n    const abortController = this.#requestEntry.get(requestId);\n    abortController?.abort();\n    this.#cleanup(requestId);\n  }\n\n  #addNewRequestEntry(requestId: string) {\n    // abort the previous request if it exists\n    this.abortPendingRequest(requestId);\n\n    // create a new abort controller for the new request\n    const abortController = new AbortController();\n    this.#requestEntry.set(requestId, abortController);\n    return abortController;\n  }\n\n  #cleanup(requestId: string) {\n    this.#requestEntry.delete(requestId);\n  }\n\n  #shouldRetry(error: Error): boolean {\n    if (error instanceof HttpError) {\n      // Note: we don't retry on 5xx errors, only on 4xx errors.\n      // but we won't retry on 400 coz it means that the request body is invalid.\n      return error.httpStatus > 400 && error.httpStatus < 500;\n    }\n    return false;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/shield-controller",
-  "version": "0.4.0",
+  "version": "1.1.0",
   "description": "Controller handling shield transaction coverage logic",
   "keywords": [
     "MetaMask",
@@ -47,16 +47,19 @@
     "since-latest-release": "../../scripts/since-latest-release.sh"
   },
   "dependencies": {
-    "@metamask/base-controller": "^8.4.2",
-    "@metamask/utils": "^11.8.1"
+    "@metamask/base-controller": "^9.0.0",
+    "@metamask/controller-utils": "^11.14.1",
+    "@metamask/messenger": "^0.3.0",
+    "@metamask/utils": "^11.8.1",
+    "cockatiel": "^3.1.2"
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.9",
     "@lavamoat/allow-scripts": "^3.0.4",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/signature-controller": "^34.0.1",
-    "@metamask/transaction-controller": "^60.9.0",
+    "@metamask/signature-controller": "^35.0.0",
+    "@metamask/transaction-controller": "^61.0.0",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
@@ -69,8 +72,8 @@
     "uuid": "^8.3.2"
   },
   "peerDependencies": {
-    "@metamask/signature-controller": "^34.0.0",
-    "@metamask/transaction-controller": "^60.0.0"
+    "@metamask/signature-controller": "^35.0.0",
+    "@metamask/transaction-controller": "^61.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"