@metamask/polling-controller 10.0.1 → 11.0.0

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.0.0]
+
+### Changed
+
+- **BREAKING**: `AbstractPollingController` now accepts a generic type parameter `PollingInput` which is polymorphic, unlike the previous monomorphic required input of a network client id ([#4752](https://github.com/MetaMask/core/pull/4752))
+- **BREAKING:** The `AbstractPollingController` method `startPollingByNetworkClientId` has been renamed to `startPolling` ([#4752](https://github.com/MetaMask/core/pull/4752))
+- **BREAKING:** The `AbstractPollingController` method `onPollingComplete` now returns the entire input object of type `PollingInput`, instead of a network client id ([#4752](https://github.com/MetaMask/core/pull/4752))
+
 ## [10.0.1]
 
 ### Fixed
@@ -187,7 +195,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@10.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@11.0.0...HEAD
+[11.0.0]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@10.0.1...@metamask/polling-controller@11.0.0
 [10.0.1]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@10.0.0...@metamask/polling-controller@10.0.1
 [10.0.0]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@9.0.1...@metamask/polling-controller@10.0.0
 [9.0.1]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@9.0.0...@metamask/polling-controller@9.0.1

package/dist/AbstractPollingController.cjs

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractPollingControllerBaseMixin = exports.getKey = void 0;
 const fast_json_stable_stringify_1 = __importDefault(require("fast-json-stable-stringify"));
 const uuid_1 = require("uuid");
-const getKey = (networkClientId, options) => `${networkClientId}:${(0, fast_json_stable_stringify_1.default)(options)}`;
+const getKey = (input) => (0, fast_json_stable_stringify_1.default)(input);
 exports.getKey = getKey;
 /**
  * AbstractPollingControllerBaseMixin
@@ -29,14 +29,14 @@ function AbstractPollingControllerBaseMixin(Base) {
             _AbstractPollingControllerBase_pollingTokenSets.set(this, new Map());
             _AbstractPollingControllerBase_callbacks.set(this, new Map());
         }
-        startPollingByNetworkClientId(networkClientId, options = {}) {
+        startPolling(input) {
             const pollToken = (0, uuid_1.v4)();
-            const key = (0, exports.getKey)(networkClientId, options);
+            const key = (0, exports.getKey)(input);
             const pollingTokenSet = __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").get(key) ?? new Set();
             pollingTokenSet.add(pollToken);
             __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").set(key, pollingTokenSet);
             if (pollingTokenSet.size === 1) {
-                this._startPollingByNetworkClientId(networkClientId, options);
+                this._startPolling(input);
             }
             return pollToken;
         }
@@ -67,14 +67,14 @@ function AbstractPollingControllerBaseMixin(Base) {
                 if (callbacks) {
                     for (const callback of callbacks) {
                         // eslint-disable-next-line n/callback-return
-                        callback(keyToDelete);
+                        callback(JSON.parse(keyToDelete));
                     }
                     callbacks.clear();
                 }
             }
         }
-        onPollingCompleteByNetworkClientId(networkClientId, callback, options = {}) {
-            const key = (0, exports.getKey)(networkClientId, options);
+        onPollingComplete(input, callback) {
+            const key = (0, exports.getKey)(input);
             const callbacks = __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").get(key) ?? new Set();
             callbacks.add(callback);
             __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").set(key, callbacks);

package/dist/AbstractPollingController.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPollingController.cjs","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\nimport stringify from 'fast-json-stable-stringify';\nimport { v4 as random } from 'uuid';\n\nimport type {\n  Constructor,\n  PollingTokenSetId,\n  IPollingController,\n} from './types';\n\nexport const getKey = (\n  networkClientId: NetworkClientId,\n  options: Json,\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n): PollingTokenSetId => `${networkClientId}:${stringify(options)}`;\n\n/**\n * AbstractPollingControllerBaseMixin\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function AbstractPollingControllerBaseMixin<TBase extends Constructor>(\n  Base: TBase,\n) {\n  abstract class AbstractPollingControllerBase\n    extends Base\n    implements IPollingController\n  {\n    readonly #pollingTokenSets: Map<PollingTokenSetId, Set<string>> = new Map();\n\n    #callbacks: Map<\n      PollingTokenSetId,\n      Set<(PollingTokenSetId: PollingTokenSetId) => void>\n    > = new Map();\n\n    abstract _executePoll(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ): Promise<void>;\n\n    abstract _startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ): void;\n\n    abstract _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n\n    startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json = {},\n    ): string {\n      const pollToken = random();\n      const key = getKey(networkClientId, options);\n      const pollingTokenSet =\n        this.#pollingTokenSets.get(key) ?? new Set<string>();\n      pollingTokenSet.add(pollToken);\n      this.#pollingTokenSets.set(key, pollingTokenSet);\n\n      if (pollingTokenSet.size === 1) {\n        this._startPollingByNetworkClientId(networkClientId, options);\n      }\n\n      return pollToken;\n    }\n\n    stopAllPolling() {\n      this.#pollingTokenSets.forEach((tokenSet, _key) => {\n        tokenSet.forEach((token) => {\n          this.stopPollingByPollingToken(token);\n        });\n      });\n    }\n\n    stopPollingByPollingToken(pollingToken: string) {\n      if (!pollingToken) {\n        throw new Error('pollingToken required');\n      }\n\n      let keyToDelete: PollingTokenSetId | null = null;\n      for (const [key, tokenSet] of this.#pollingTokenSets) {\n        if (tokenSet.delete(pollingToken)) {\n          if (tokenSet.size === 0) {\n            keyToDelete = key;\n          }\n          break;\n        }\n      }\n\n      if (keyToDelete) {\n        this._stopPollingByPollingTokenSetId(keyToDelete);\n        this.#pollingTokenSets.delete(keyToDelete);\n        const callbacks = this.#callbacks.get(keyToDelete);\n        if (callbacks) {\n          for (const callback of callbacks) {\n            // eslint-disable-next-line n/callback-return\n            callback(keyToDelete);\n          }\n          callbacks.clear();\n        }\n      }\n    }\n\n    onPollingCompleteByNetworkClientId(\n      networkClientId: NetworkClientId,\n      callback: (networkClientId: NetworkClientId) => void,\n      options: Json = {},\n    ) {\n      const key = getKey(networkClientId, options);\n      const callbacks = this.#callbacks.get(key) ?? new Set<typeof callback>();\n      callbacks.add(callback);\n      this.#callbacks.set(key, callbacks);\n    }\n  }\n  return AbstractPollingControllerBase;\n}\n"]}
+{"version":3,"file":"AbstractPollingController.cjs","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Json } from '@metamask/utils';\nimport stringify from 'fast-json-stable-stringify';\nimport { v4 as random } from 'uuid';\n\nimport type {\n  Constructor,\n  PollingTokenSetId,\n  IPollingController,\n} from './types';\n\nexport const getKey = <PollingInput>(input: PollingInput): PollingTokenSetId =>\n  stringify(input);\n\n/**\n * AbstractPollingControllerBaseMixin\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function AbstractPollingControllerBaseMixin<\n  TBase extends Constructor,\n  PollingInput extends Json,\n>(Base: TBase) {\n  abstract class AbstractPollingControllerBase\n    extends Base\n    implements IPollingController<PollingInput>\n  {\n    readonly #pollingTokenSets: Map<PollingTokenSetId, Set<string>> = new Map();\n\n    #callbacks: Map<PollingTokenSetId, Set<(input: PollingInput) => void>> =\n      new Map();\n\n    abstract _executePoll(input: PollingInput): Promise<void>;\n\n    abstract _startPolling(input: PollingInput): void;\n\n    abstract _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n\n    startPolling(input: PollingInput): string {\n      const pollToken = random();\n      const key = getKey(input);\n      const pollingTokenSet =\n        this.#pollingTokenSets.get(key) ?? new Set<string>();\n      pollingTokenSet.add(pollToken);\n      this.#pollingTokenSets.set(key, pollingTokenSet);\n\n      if (pollingTokenSet.size === 1) {\n        this._startPolling(input);\n      }\n\n      return pollToken;\n    }\n\n    stopAllPolling() {\n      this.#pollingTokenSets.forEach((tokenSet, _key) => {\n        tokenSet.forEach((token) => {\n          this.stopPollingByPollingToken(token);\n        });\n      });\n    }\n\n    stopPollingByPollingToken(pollingToken: string) {\n      if (!pollingToken) {\n        throw new Error('pollingToken required');\n      }\n\n      let keyToDelete: PollingTokenSetId | null = null;\n      for (const [key, tokenSet] of this.#pollingTokenSets) {\n        if (tokenSet.delete(pollingToken)) {\n          if (tokenSet.size === 0) {\n            keyToDelete = key;\n          }\n          break;\n        }\n      }\n\n      if (keyToDelete) {\n        this._stopPollingByPollingTokenSetId(keyToDelete);\n        this.#pollingTokenSets.delete(keyToDelete);\n        const callbacks = this.#callbacks.get(keyToDelete);\n        if (callbacks) {\n          for (const callback of callbacks) {\n            // eslint-disable-next-line n/callback-return\n            callback(JSON.parse(keyToDelete));\n          }\n          callbacks.clear();\n        }\n      }\n    }\n\n    onPollingComplete(\n      input: PollingInput,\n      callback: (input: PollingInput) => void,\n    ) {\n      const key = getKey(input);\n      const callbacks = this.#callbacks.get(key) ?? new Set<typeof callback>();\n      callbacks.add(callback);\n      this.#callbacks.set(key, callbacks);\n    }\n  }\n  return AbstractPollingControllerBase;\n}\n"]}

package/dist/AbstractPollingController.d.cts

@@ -1,22 +1,21 @@
-import type { NetworkClientId } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
 import type { Constructor, PollingTokenSetId } from "./types.cjs";
-export declare const getKey: (networkClientId: NetworkClientId, options: Json) => PollingTokenSetId;
+export declare const getKey: <PollingInput>(input: PollingInput) => PollingTokenSetId;
 /**
  * AbstractPollingControllerBaseMixin
  *
  * @param Base - The base class to mix onto.
  * @returns The composed class.
  */
-export declare function AbstractPollingControllerBaseMixin<TBase extends Constructor>(Base: TBase): (abstract new (...args: any[]) => {
-    readonly "__#786017@#pollingTokenSets": Map<PollingTokenSetId, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: NetworkClientId, options: Json): Promise<void>;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+export declare function AbstractPollingControllerBaseMixin<TBase extends Constructor, PollingInput extends Json>(Base: TBase): (abstract new (...args: any[]) => {
+    readonly "__#784834@#pollingTokenSets": Map<PollingTokenSetId, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    startPollingByNetworkClientId(networkClientId: NetworkClientId, options?: Json): string;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: NetworkClientId, callback: (networkClientId: NetworkClientId) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & TBase;
 //# sourceMappingURL=AbstractPollingController.d.cts.map

package/dist/AbstractPollingController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPollingController.d.cts","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAI5C,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EAElB,oBAAgB;AAEjB,eAAO,MAAM,MAAM,oBACA,eAAe,WACvB,IAAI,KAGZ,iBAA+D,CAAC;AAEnE;;;;;GAKG;AAGH,wBAAgB,kCAAkC,CAAC,KAAK,SAAS,WAAW,EAC1E,IAAI,EAAE,KAAK;4CAMmB,IAAI,iBAAiB,EAAE,IAAI,MAAM,CAAC,CAAC;yGAIf,IAAI;kCAIjC,eAAe,WACvB,IAAI,GACZ,QAAQ,IAAI,CAAC;oDAGG,eAAe,WACvB,IAAI,GACZ,IAAI;yCAEuC,iBAAiB,GAAG,IAAI;mDAGnD,eAAe,YACvB,IAAI,GACZ,MAAM;;4CAuB+B,MAAM;wDA8B3B,eAAe,8BACJ,eAAe,KAAK,IAAI,YAC3C,IAAI;WASlB"}
+{"version":3,"file":"AbstractPollingController.d.cts","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAI5C,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EAElB,oBAAgB;AAEjB,eAAO,MAAM,MAAM,yCAAwC,iBACzC,CAAC;AAEnB;;;;;GAKG;AAGH,wBAAgB,kCAAkC,CAChD,KAAK,SAAS,WAAW,EACzB,YAAY,SAAS,IAAI,EACzB,IAAI,EAAE,KAAK;4CAKmB,IAAI,iBAAiB,EAAE,IAAI,MAAM,CAAC,CAAC;oDAEhB,YAAY,KAAK,IAAI;wBAGvC,YAAY,GAAG,QAAQ,IAAI,CAAC;yBAE3B,YAAY,GAAG,IAAI;yCAEH,iBAAiB,GAAG,IAAI;wBAElD,YAAY,GAAG,MAAM;;4CAuBD,MAAM;6BA8BrC,YAAY,oBACD,YAAY,KAAK,IAAI;WAS5C"}

package/dist/AbstractPollingController.d.mts

@@ -1,22 +1,21 @@
-import type { NetworkClientId } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
 import type { Constructor, PollingTokenSetId } from "./types.mjs";
-export declare const getKey: (networkClientId: NetworkClientId, options: Json) => PollingTokenSetId;
+export declare const getKey: <PollingInput>(input: PollingInput) => PollingTokenSetId;
 /**
  * AbstractPollingControllerBaseMixin
  *
  * @param Base - The base class to mix onto.
  * @returns The composed class.
  */
-export declare function AbstractPollingControllerBaseMixin<TBase extends Constructor>(Base: TBase): (abstract new (...args: any[]) => {
-    readonly "__#786017@#pollingTokenSets": Map<PollingTokenSetId, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: NetworkClientId, options: Json): Promise<void>;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+export declare function AbstractPollingControllerBaseMixin<TBase extends Constructor, PollingInput extends Json>(Base: TBase): (abstract new (...args: any[]) => {
+    readonly "__#784834@#pollingTokenSets": Map<PollingTokenSetId, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    startPollingByNetworkClientId(networkClientId: NetworkClientId, options?: Json): string;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: NetworkClientId, callback: (networkClientId: NetworkClientId) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & TBase;
 //# sourceMappingURL=AbstractPollingController.d.mts.map

package/dist/AbstractPollingController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPollingController.d.mts","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAI5C,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EAElB,oBAAgB;AAEjB,eAAO,MAAM,MAAM,oBACA,eAAe,WACvB,IAAI,KAGZ,iBAA+D,CAAC;AAEnE;;;;;GAKG;AAGH,wBAAgB,kCAAkC,CAAC,KAAK,SAAS,WAAW,EAC1E,IAAI,EAAE,KAAK;4CAMmB,IAAI,iBAAiB,EAAE,IAAI,MAAM,CAAC,CAAC;yGAIf,IAAI;kCAIjC,eAAe,WACvB,IAAI,GACZ,QAAQ,IAAI,CAAC;oDAGG,eAAe,WACvB,IAAI,GACZ,IAAI;yCAEuC,iBAAiB,GAAG,IAAI;mDAGnD,eAAe,YACvB,IAAI,GACZ,MAAM;;4CAuB+B,MAAM;wDA8B3B,eAAe,8BACJ,eAAe,KAAK,IAAI,YAC3C,IAAI;WASlB"}
+{"version":3,"file":"AbstractPollingController.d.mts","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAI5C,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EAElB,oBAAgB;AAEjB,eAAO,MAAM,MAAM,yCAAwC,iBACzC,CAAC;AAEnB;;;;;GAKG;AAGH,wBAAgB,kCAAkC,CAChD,KAAK,SAAS,WAAW,EACzB,YAAY,SAAS,IAAI,EACzB,IAAI,EAAE,KAAK;4CAKmB,IAAI,iBAAiB,EAAE,IAAI,MAAM,CAAC,CAAC;oDAEhB,YAAY,KAAK,IAAI;wBAGvC,YAAY,GAAG,QAAQ,IAAI,CAAC;yBAE3B,YAAY,GAAG,IAAI;yCAEH,iBAAiB,GAAG,IAAI;wBAElD,YAAY,GAAG,MAAM;;4CAuBD,MAAM;6BA8BrC,YAAY,oBACD,YAAY,KAAK,IAAI;WAS5C"}

package/dist/AbstractPollingController.mjs

@@ -12,7 +12,7 @@ function $importDefault(module) {
 import $stringify from "fast-json-stable-stringify";
 const stringify = $importDefault($stringify);
 import { v4 as random } from "uuid";
-export const getKey = (networkClientId, options) => `${networkClientId}:${stringify(options)}`;
+export const getKey = (input) => stringify(input);
 /**
  * AbstractPollingControllerBaseMixin
  *
@@ -29,14 +29,14 @@ export function AbstractPollingControllerBaseMixin(Base) {
             _AbstractPollingControllerBase_pollingTokenSets.set(this, new Map());
             _AbstractPollingControllerBase_callbacks.set(this, new Map());
         }
-        startPollingByNetworkClientId(networkClientId, options = {}) {
+        startPolling(input) {
             const pollToken = random();
-            const key = getKey(networkClientId, options);
+            const key = getKey(input);
             const pollingTokenSet = __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").get(key) ?? new Set();
             pollingTokenSet.add(pollToken);
             __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").set(key, pollingTokenSet);
             if (pollingTokenSet.size === 1) {
-                this._startPollingByNetworkClientId(networkClientId, options);
+                this._startPolling(input);
             }
             return pollToken;
         }
@@ -67,14 +67,14 @@ export function AbstractPollingControllerBaseMixin(Base) {
                 if (callbacks) {
                     for (const callback of callbacks) {
                         // eslint-disable-next-line n/callback-return
-                        callback(keyToDelete);
+                        callback(JSON.parse(keyToDelete));
                     }
                     callbacks.clear();
                 }
             }
         }
-        onPollingCompleteByNetworkClientId(networkClientId, callback, options = {}) {
-            const key = getKey(networkClientId, options);
+        onPollingComplete(input, callback) {
+            const key = getKey(input);
             const callbacks = __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").get(key) ?? new Set();
             callbacks.add(callback);
             __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").set(key, callbacks);

package/dist/AbstractPollingController.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractPollingController.mjs","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\nimport stringify from 'fast-json-stable-stringify';\nimport { v4 as random } from 'uuid';\n\nimport type {\n  Constructor,\n  PollingTokenSetId,\n  IPollingController,\n} from './types';\n\nexport const getKey = (\n  networkClientId: NetworkClientId,\n  options: Json,\n  // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n  // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n): PollingTokenSetId => `${networkClientId}:${stringify(options)}`;\n\n/**\n * AbstractPollingControllerBaseMixin\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function AbstractPollingControllerBaseMixin<TBase extends Constructor>(\n  Base: TBase,\n) {\n  abstract class AbstractPollingControllerBase\n    extends Base\n    implements IPollingController\n  {\n    readonly #pollingTokenSets: Map<PollingTokenSetId, Set<string>> = new Map();\n\n    #callbacks: Map<\n      PollingTokenSetId,\n      Set<(PollingTokenSetId: PollingTokenSetId) => void>\n    > = new Map();\n\n    abstract _executePoll(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ): Promise<void>;\n\n    abstract _startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ): void;\n\n    abstract _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n\n    startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json = {},\n    ): string {\n      const pollToken = random();\n      const key = getKey(networkClientId, options);\n      const pollingTokenSet =\n        this.#pollingTokenSets.get(key) ?? new Set<string>();\n      pollingTokenSet.add(pollToken);\n      this.#pollingTokenSets.set(key, pollingTokenSet);\n\n      if (pollingTokenSet.size === 1) {\n        this._startPollingByNetworkClientId(networkClientId, options);\n      }\n\n      return pollToken;\n    }\n\n    stopAllPolling() {\n      this.#pollingTokenSets.forEach((tokenSet, _key) => {\n        tokenSet.forEach((token) => {\n          this.stopPollingByPollingToken(token);\n        });\n      });\n    }\n\n    stopPollingByPollingToken(pollingToken: string) {\n      if (!pollingToken) {\n        throw new Error('pollingToken required');\n      }\n\n      let keyToDelete: PollingTokenSetId | null = null;\n      for (const [key, tokenSet] of this.#pollingTokenSets) {\n        if (tokenSet.delete(pollingToken)) {\n          if (tokenSet.size === 0) {\n            keyToDelete = key;\n          }\n          break;\n        }\n      }\n\n      if (keyToDelete) {\n        this._stopPollingByPollingTokenSetId(keyToDelete);\n        this.#pollingTokenSets.delete(keyToDelete);\n        const callbacks = this.#callbacks.get(keyToDelete);\n        if (callbacks) {\n          for (const callback of callbacks) {\n            // eslint-disable-next-line n/callback-return\n            callback(keyToDelete);\n          }\n          callbacks.clear();\n        }\n      }\n    }\n\n    onPollingCompleteByNetworkClientId(\n      networkClientId: NetworkClientId,\n      callback: (networkClientId: NetworkClientId) => void,\n      options: Json = {},\n    ) {\n      const key = getKey(networkClientId, options);\n      const callbacks = this.#callbacks.get(key) ?? new Set<typeof callback>();\n      callbacks.add(callback);\n      this.#callbacks.set(key, callbacks);\n    }\n  }\n  return AbstractPollingControllerBase;\n}\n"]}
+{"version":3,"file":"AbstractPollingController.mjs","sourceRoot":"","sources":["../src/AbstractPollingController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Json } from '@metamask/utils';\nimport stringify from 'fast-json-stable-stringify';\nimport { v4 as random } from 'uuid';\n\nimport type {\n  Constructor,\n  PollingTokenSetId,\n  IPollingController,\n} from './types';\n\nexport const getKey = <PollingInput>(input: PollingInput): PollingTokenSetId =>\n  stringify(input);\n\n/**\n * AbstractPollingControllerBaseMixin\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function AbstractPollingControllerBaseMixin<\n  TBase extends Constructor,\n  PollingInput extends Json,\n>(Base: TBase) {\n  abstract class AbstractPollingControllerBase\n    extends Base\n    implements IPollingController<PollingInput>\n  {\n    readonly #pollingTokenSets: Map<PollingTokenSetId, Set<string>> = new Map();\n\n    #callbacks: Map<PollingTokenSetId, Set<(input: PollingInput) => void>> =\n      new Map();\n\n    abstract _executePoll(input: PollingInput): Promise<void>;\n\n    abstract _startPolling(input: PollingInput): void;\n\n    abstract _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n\n    startPolling(input: PollingInput): string {\n      const pollToken = random();\n      const key = getKey(input);\n      const pollingTokenSet =\n        this.#pollingTokenSets.get(key) ?? new Set<string>();\n      pollingTokenSet.add(pollToken);\n      this.#pollingTokenSets.set(key, pollingTokenSet);\n\n      if (pollingTokenSet.size === 1) {\n        this._startPolling(input);\n      }\n\n      return pollToken;\n    }\n\n    stopAllPolling() {\n      this.#pollingTokenSets.forEach((tokenSet, _key) => {\n        tokenSet.forEach((token) => {\n          this.stopPollingByPollingToken(token);\n        });\n      });\n    }\n\n    stopPollingByPollingToken(pollingToken: string) {\n      if (!pollingToken) {\n        throw new Error('pollingToken required');\n      }\n\n      let keyToDelete: PollingTokenSetId | null = null;\n      for (const [key, tokenSet] of this.#pollingTokenSets) {\n        if (tokenSet.delete(pollingToken)) {\n          if (tokenSet.size === 0) {\n            keyToDelete = key;\n          }\n          break;\n        }\n      }\n\n      if (keyToDelete) {\n        this._stopPollingByPollingTokenSetId(keyToDelete);\n        this.#pollingTokenSets.delete(keyToDelete);\n        const callbacks = this.#callbacks.get(keyToDelete);\n        if (callbacks) {\n          for (const callback of callbacks) {\n            // eslint-disable-next-line n/callback-return\n            callback(JSON.parse(keyToDelete));\n          }\n          callbacks.clear();\n        }\n      }\n    }\n\n    onPollingComplete(\n      input: PollingInput,\n      callback: (input: PollingInput) => void,\n    ) {\n      const key = getKey(input);\n      const callbacks = this.#callbacks.get(key) ?? new Set<typeof callback>();\n      callbacks.add(callback);\n      this.#callbacks.set(key, callbacks);\n    }\n  }\n  return AbstractPollingControllerBase;\n}\n"]}

package/dist/BlockTrackerPollingController.cjs

@@ -24,14 +24,14 @@ function BlockTrackerPollingControllerMixin(Base) {
             super(...arguments);
             _BlockTrackerPollingController_activeListeners.set(this, {});
         }
-        _startPollingByNetworkClientId(networkClientId, options) {
-            const key = (0, AbstractPollingController_1.getKey)(networkClientId, options);
+        _startPolling(input) {
+            const key = (0, AbstractPollingController_1.getKey)(input);
             if (__classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
                 return;
             }
-            const networkClient = this._getNetworkClientById(networkClientId);
+            const networkClient = this._getNetworkClientById(input.networkClientId);
             if (networkClient) {
-                const updateOnNewBlock = this._executePoll.bind(this, networkClientId, options);
+                const updateOnNewBlock = this._executePoll.bind(this, input);
                 // TODO: Either fix this lint violation or explain why it's necessary to ignore.
                 // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 networkClient.blockTracker.addListener('latest', updateOnNewBlock);
@@ -41,11 +41,11 @@ function BlockTrackerPollingControllerMixin(Base) {
                 throw new Error(
                 // TODO: Either fix this lint violation or explain why it's necessary to ignore.
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                `Unable to retrieve blockTracker for networkClientId ${networkClientId}`);
+                `Unable to retrieve blockTracker for networkClientId ${input.networkClientId}`);
             }
         }
         _stopPollingByPollingTokenSetId(key) {
-            const [networkClientId] = key.split(':');
+            const { networkClientId } = JSON.parse(key);
             const networkClient = this._getNetworkClientById(networkClientId);
             if (networkClient && __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
                 const listener = __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
@@ -63,7 +63,10 @@ function BlockTrackerPollingControllerMixin(Base) {
 }
 class Empty {
 }
-exports.BlockTrackerPollingControllerOnly = BlockTrackerPollingControllerMixin(Empty);
-exports.BlockTrackerPollingController = BlockTrackerPollingControllerMixin(base_controller_1.BaseController);
-exports.BlockTrackerPollingControllerV1 = BlockTrackerPollingControllerMixin(base_controller_1.BaseControllerV1);
+const BlockTrackerPollingControllerOnly = () => BlockTrackerPollingControllerMixin(Empty);
+exports.BlockTrackerPollingControllerOnly = BlockTrackerPollingControllerOnly;
+const BlockTrackerPollingController = () => BlockTrackerPollingControllerMixin(base_controller_1.BaseController);
+exports.BlockTrackerPollingController = BlockTrackerPollingController;
+const BlockTrackerPollingControllerV1 = () => BlockTrackerPollingControllerMixin(base_controller_1.BaseControllerV1);
+exports.BlockTrackerPollingControllerV1 = BlockTrackerPollingControllerV1;
 //# sourceMappingURL=BlockTrackerPollingController.cjs.map

package/dist/BlockTrackerPollingController.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"BlockTrackerPollingController.cjs","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":";;;;;;;;AAAA,+DAA6E;AAO7E,+EAGqC;AAGrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,kCAAkC,CACzC,IAAW;;IAEX,MAAe,6BAA8B,SAAQ,IAAA,8DAAkC,EACrF,IAAI,CACL;QAFD;;YAGE,yDAAqE,EAAE,EAAC;QAoD1E,CAAC;QA9CC,8BAA8B,CAC5B,eAAgC,EAChC,OAAa;YAEb,MAAM,GAAG,GAAG,IAAA,kCAAM,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAE7C,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO;aACR;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;YAClE,IAAI,aAAa,EAAE;gBACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAC7C,IAAI,EACJ,eAAe,EACf,OAAO,CACR,CAAC;gBACF,gFAAgF;gBAChF,kEAAkE;gBAClE,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACnE,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;aAC/C;iBAAM;gBACL,MAAM,IAAI,KAAK;gBACb,gFAAgF;gBAChF,4EAA4E;gBAC5E,uDAAuD,eAAe,EAAE,CACzE,CAAC;aACH;QACH,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAC9C,eAAkC,CACnC,CAAC;YAEF,IAAI,aAAa,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC/C,MAAM,QAAQ,GAAG,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE;oBACZ,gFAAgF;oBAChF,kEAAkE;oBAClE,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC9D,OAAO,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;iBACnC;aACF;QACH,CAAC;KACF;;IAED,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,MAAM,KAAK;CAAG;AAED,QAAA,iCAAiC,GAC5C,kCAAkC,CAAC,KAAK,CAAC,CAAC;AAC/B,QAAA,6BAA6B,GACxC,kCAAkC,CAAC,gCAAc,CAAC,CAAC;AACxC,QAAA,+BAA+B,GAC1C,kCAAkC,CAAC,kCAAgB,CAAC,CAAC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type {\n  NetworkClientId,\n  NetworkClient,\n} from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type { Constructor, PollingTokenSetId } from './types';\n\n/**\n * BlockTrackerPollingControllerMixin\n * A polling controller that polls using a block tracker.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction BlockTrackerPollingControllerMixin<TBase extends Constructor>(\n  Base: TBase,\n) {\n  abstract class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin(\n    Base,\n  ) {\n    #activeListeners: Record<string, (options: Json) => Promise<void>> = {};\n\n    abstract _getNetworkClientById(\n      networkClientId: NetworkClientId,\n    ): NetworkClient | undefined;\n\n    _startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ) {\n      const key = getKey(networkClientId, options);\n\n      if (this.#activeListeners[key]) {\n        return;\n      }\n\n      const networkClient = this._getNetworkClientById(networkClientId);\n      if (networkClient) {\n        const updateOnNewBlock = this._executePoll.bind(\n          this,\n          networkClientId,\n          options,\n        );\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        networkClient.blockTracker.addListener('latest', updateOnNewBlock);\n        this.#activeListeners[key] = updateOnNewBlock;\n      } else {\n        throw new Error(\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n          `Unable to retrieve blockTracker for networkClientId ${networkClientId}`,\n        );\n      }\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const [networkClientId] = key.split(':');\n      const networkClient = this._getNetworkClientById(\n        networkClientId as NetworkClientId,\n      );\n\n      if (networkClient && this.#activeListeners[key]) {\n        const listener = this.#activeListeners[key];\n        if (listener) {\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/no-misused-promises\n          networkClient.blockTracker.removeListener('latest', listener);\n          delete this.#activeListeners[key];\n        }\n      }\n    }\n  }\n\n  return BlockTrackerPollingController;\n}\n\nclass Empty {}\n\nexport const BlockTrackerPollingControllerOnly =\n  BlockTrackerPollingControllerMixin(Empty);\nexport const BlockTrackerPollingController =\n  BlockTrackerPollingControllerMixin(BaseController);\nexport const BlockTrackerPollingControllerV1 =\n  BlockTrackerPollingControllerMixin(BaseControllerV1);\n"]}
+{"version":3,"file":"BlockTrackerPollingController.cjs","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":";;;;;;;;AAAA,+DAA6E;AAO7E,+EAGqC;AAWrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,kCAAkC,CAGzC,IAAW;;IACX,MAAe,6BAA8B,SAAQ,IAAA,8DAAkC,EAGrF,IAAI,CAAC;QAHP;;YAIE,yDAAqE,EAAE,EAAC;QA6C1E,CAAC;QAvCC,aAAa,CAAC,KAAmB;YAC/B,MAAM,GAAG,GAAG,IAAA,kCAAM,EAAC,KAAK,CAAC,CAAC;YAE1B,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO;aACR;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxE,IAAI,aAAa,EAAE;gBACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC7D,gFAAgF;gBAChF,kEAAkE;gBAClE,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACnE,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;aAC/C;iBAAM;gBACL,MAAM,IAAI,KAAK;gBACb,gFAAgF;gBAChF,4EAA4E;gBAC5E,uDAAuD,KAAK,CAAC,eAAe,EAAE,CAC/E,CAAC;aACH;QACH,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAC9C,eAAkC,CACnC,CAAC;YAEF,IAAI,aAAa,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC/C,MAAM,QAAQ,GAAG,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE;oBACZ,gFAAgF;oBAChF,kEAAkE;oBAClE,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC9D,OAAO,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;iBACnC;aACF;QACH,CAAC;KACF;;IAED,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,MAAM,KAAK;CAAG;AAEP,MAAM,iCAAiC,GAAG,GAE7C,EAAE,CAAC,kCAAkC,CAA6B,KAAK,CAAC,CAAC;AAFhE,QAAA,iCAAiC,qCAE+B;AAEtE,MAAM,6BAA6B,GAAG,GAEzC,EAAE,CACJ,kCAAkC,CAChC,gCAAc,CACf,CAAC;AALS,QAAA,6BAA6B,iCAKtC;AAEG,MAAM,+BAA+B,GAAG,GAE3C,EAAE,CACJ,kCAAkC,CAChC,kCAAgB,CACjB,CAAC;AALS,QAAA,+BAA+B,mCAKxC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type {\n  NetworkClientId,\n  NetworkClient,\n} from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type { Constructor, PollingTokenSetId } from './types';\n\n/**\n * The minimum input required to start polling for a {@link BlockTrackerPollingController}.\n * Implementing classes may provide additional properties.\n */\nexport type BlockTrackerPollingInput = {\n  networkClientId: NetworkClientId;\n};\n\n/**\n * BlockTrackerPollingControllerMixin\n * A polling controller that polls using a block tracker.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction BlockTrackerPollingControllerMixin<\n  TBase extends Constructor,\n  PollingInput extends BlockTrackerPollingInput,\n>(Base: TBase) {\n  abstract class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin<\n    TBase,\n    PollingInput\n  >(Base) {\n    #activeListeners: Record<string, (options: Json) => Promise<void>> = {};\n\n    abstract _getNetworkClientById(\n      networkClientId: NetworkClientId,\n    ): NetworkClient | undefined;\n\n    _startPolling(input: PollingInput) {\n      const key = getKey(input);\n\n      if (this.#activeListeners[key]) {\n        return;\n      }\n\n      const networkClient = this._getNetworkClientById(input.networkClientId);\n      if (networkClient) {\n        const updateOnNewBlock = this._executePoll.bind(this, input);\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        networkClient.blockTracker.addListener('latest', updateOnNewBlock);\n        this.#activeListeners[key] = updateOnNewBlock;\n      } else {\n        throw new Error(\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n          `Unable to retrieve blockTracker for networkClientId ${input.networkClientId}`,\n        );\n      }\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const { networkClientId } = JSON.parse(key);\n      const networkClient = this._getNetworkClientById(\n        networkClientId as NetworkClientId,\n      );\n\n      if (networkClient && this.#activeListeners[key]) {\n        const listener = this.#activeListeners[key];\n        if (listener) {\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/no-misused-promises\n          networkClient.blockTracker.removeListener('latest', listener);\n          delete this.#activeListeners[key];\n        }\n      }\n    }\n  }\n\n  return BlockTrackerPollingController;\n}\n\nclass Empty {}\n\nexport const BlockTrackerPollingControllerOnly = <\n  PollingInput extends BlockTrackerPollingInput,\n>() => BlockTrackerPollingControllerMixin<typeof Empty, PollingInput>(Empty);\n\nexport const BlockTrackerPollingController = <\n  PollingInput extends BlockTrackerPollingInput,\n>() =>\n  BlockTrackerPollingControllerMixin<typeof BaseController, PollingInput>(\n    BaseController,\n  );\n\nexport const BlockTrackerPollingControllerV1 = <\n  PollingInput extends BlockTrackerPollingInput,\n>() =>\n  BlockTrackerPollingControllerMixin<typeof BaseControllerV1, PollingInput>(\n    BaseControllerV1,\n  );\n"]}

package/dist/BlockTrackerPollingController.d.cts

@@ -2,46 +2,53 @@ import { BaseController, BaseControllerV1 } from "@metamask/base-controller";
 import type { NetworkClientId, NetworkClient } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
 import type { PollingTokenSetId } from "./types.cjs";
+/**
+ * The minimum input required to start polling for a {@link BlockTrackerPollingController}.
+ * Implementing classes may provide additional properties.
+ */
+export type BlockTrackerPollingInput = {
+    networkClientId: NetworkClientId;
+};
 declare class Empty {
 }
-export declare const BlockTrackerPollingControllerOnly: (abstract new (...args: any[]) => {
-    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+export declare const BlockTrackerPollingControllerOnly: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
+    "__#784841@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof Empty;
-export declare const BlockTrackerPollingController: (abstract new (...args: any[]) => {
-    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+export declare const BlockTrackerPollingController: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
+    "__#784841@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseController;
-export declare const BlockTrackerPollingControllerV1: (abstract new (...args: any[]) => {
-    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+export declare const BlockTrackerPollingControllerV1: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
+    "__#784841@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseControllerV1;
 export {};
 //# sourceMappingURL=BlockTrackerPollingController.d.cts.map

package/dist/BlockTrackerPollingController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockTrackerPollingController.d.cts","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACd,qCAAqC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAAe,iBAAiB,EAAE,oBAAgB;AA0E9D,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,iCAAiC;2DA3DC,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;oDAGT,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;iBAwBf,CAAC;AAC5C,eAAO,MAAM,6BAA6B;2DA7DK,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;oDAGT,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;0BA0BN,CAAC;AACrD,eAAO,MAAM,+BAA+B;2DA/DG,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;oDAGT,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;4BA4BJ,CAAC"}
+{"version":3,"file":"BlockTrackerPollingController.d.cts","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACd,qCAAqC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAAe,iBAAiB,EAAE,oBAAgB;AAE9D;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAqEF,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,iCAAiC;2DApDC,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;;yCAyBS,iBAAiB;;;;;;;;iBAyBkB,CAAC;AAE7E,eAAO,MAAM,6BAA6B;2DAxDK,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;;yCAyBS,iBAAiB;;;;;;;;0BAgCvD,CAAC;AAEJ,eAAO,MAAM,+BAA+B;2DA/DG,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;;yCAyBS,iBAAiB;;;;;;;;4BAuCvD,CAAC"}

package/dist/BlockTrackerPollingController.d.mts

@@ -2,46 +2,53 @@ import { BaseController, BaseControllerV1 } from "@metamask/base-controller";
 import type { NetworkClientId, NetworkClient } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
 import type { PollingTokenSetId } from "./types.mjs";
+/**
+ * The minimum input required to start polling for a {@link BlockTrackerPollingController}.
+ * Implementing classes may provide additional properties.
+ */
+export type BlockTrackerPollingInput = {
+    networkClientId: NetworkClientId;
+};
 declare class Empty {
 }
-export declare const BlockTrackerPollingControllerOnly: (abstract new (...args: any[]) => {
-    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+export declare const BlockTrackerPollingControllerOnly: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
+    "__#784841@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof Empty;
-export declare const BlockTrackerPollingController: (abstract new (...args: any[]) => {
-    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+export declare const BlockTrackerPollingController: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
+    "__#784841@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseController;
-export declare const BlockTrackerPollingControllerV1: (abstract new (...args: any[]) => {
-    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+export declare const BlockTrackerPollingControllerV1: <PollingInput extends BlockTrackerPollingInput>() => (abstract new (...args: any[]) => {
+    "__#784841@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseControllerV1;
 export {};
 //# sourceMappingURL=BlockTrackerPollingController.d.mts.map

package/dist/BlockTrackerPollingController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockTrackerPollingController.d.mts","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACd,qCAAqC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAAe,iBAAiB,EAAE,oBAAgB;AA0E9D,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,iCAAiC;2DA3DC,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;oDAGT,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;iBAwBf,CAAC;AAC5C,eAAO,MAAM,6BAA6B;2DA7DK,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;oDAGT,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;0BA0BN,CAAC;AACrD,eAAO,MAAM,+BAA+B;2DA/DG,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;oDAGT,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;4BA4BJ,CAAC"}
+{"version":3,"file":"BlockTrackerPollingController.d.mts","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACd,qCAAqC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAAe,iBAAiB,EAAE,oBAAgB;AAE9D;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAqEF,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,iCAAiC;2DApDC,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;;yCAyBS,iBAAiB;;;;;;;;iBAyBkB,CAAC;AAE7E,eAAO,MAAM,6BAA6B;2DAxDK,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;;yCAyBS,iBAAiB;;;;;;;;0BAgCvD,CAAC;AAEJ,eAAO,MAAM,+BAA+B;2DA/DG,IAAI,KAAK,QAAQ,IAAI,CAAC;2CAG9C,eAAe,GAC/B,aAAa,GAAG,SAAS;;yCAyBS,iBAAiB;;;;;;;;4BAuCvD,CAAC"}

package/dist/BlockTrackerPollingController.mjs

@@ -21,14 +21,14 @@ function BlockTrackerPollingControllerMixin(Base) {
             super(...arguments);
             _BlockTrackerPollingController_activeListeners.set(this, {});
         }
-        _startPollingByNetworkClientId(networkClientId, options) {
-            const key = getKey(networkClientId, options);
+        _startPolling(input) {
+            const key = getKey(input);
             if (__classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
                 return;
             }
-            const networkClient = this._getNetworkClientById(networkClientId);
+            const networkClient = this._getNetworkClientById(input.networkClientId);
             if (networkClient) {
-                const updateOnNewBlock = this._executePoll.bind(this, networkClientId, options);
+                const updateOnNewBlock = this._executePoll.bind(this, input);
                 // TODO: Either fix this lint violation or explain why it's necessary to ignore.
                 // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 networkClient.blockTracker.addListener('latest', updateOnNewBlock);
@@ -38,11 +38,11 @@ function BlockTrackerPollingControllerMixin(Base) {
                 throw new Error(
                 // TODO: Either fix this lint violation or explain why it's necessary to ignore.
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                `Unable to retrieve blockTracker for networkClientId ${networkClientId}`);
+                `Unable to retrieve blockTracker for networkClientId ${input.networkClientId}`);
             }
         }
         _stopPollingByPollingTokenSetId(key) {
-            const [networkClientId] = key.split(':');
+            const { networkClientId } = JSON.parse(key);
             const networkClient = this._getNetworkClientById(networkClientId);
             if (networkClient && __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
                 const listener = __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
@@ -60,7 +60,7 @@ function BlockTrackerPollingControllerMixin(Base) {
 }
 class Empty {
 }
-export const BlockTrackerPollingControllerOnly = BlockTrackerPollingControllerMixin(Empty);
-export const BlockTrackerPollingController = BlockTrackerPollingControllerMixin(BaseController);
-export const BlockTrackerPollingControllerV1 = BlockTrackerPollingControllerMixin(BaseControllerV1);
+export const BlockTrackerPollingControllerOnly = () => BlockTrackerPollingControllerMixin(Empty);
+export const BlockTrackerPollingController = () => BlockTrackerPollingControllerMixin(BaseController);
+export const BlockTrackerPollingControllerV1 = () => BlockTrackerPollingControllerMixin(BaseControllerV1);
 //# sourceMappingURL=BlockTrackerPollingController.mjs.map

package/dist/BlockTrackerPollingController.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BlockTrackerPollingController.mjs","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAO7E,OAAO,EACL,kCAAkC,EAClC,MAAM,EACP,wCAAoC;AAGrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,kCAAkC,CACzC,IAAW;;IAEX,MAAe,6BAA8B,SAAQ,kCAAkC,CACrF,IAAI,CACL;QAFD;;YAGE,yDAAqE,EAAE,EAAC;QAoD1E,CAAC;QA9CC,8BAA8B,CAC5B,eAAgC,EAChC,OAAa;YAEb,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAE7C,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO;aACR;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;YAClE,IAAI,aAAa,EAAE;gBACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAC7C,IAAI,EACJ,eAAe,EACf,OAAO,CACR,CAAC;gBACF,gFAAgF;gBAChF,kEAAkE;gBAClE,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACnE,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;aAC/C;iBAAM;gBACL,MAAM,IAAI,KAAK;gBACb,gFAAgF;gBAChF,4EAA4E;gBAC5E,uDAAuD,eAAe,EAAE,CACzE,CAAC;aACH;QACH,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAC9C,eAAkC,CACnC,CAAC;YAEF,IAAI,aAAa,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC/C,MAAM,QAAQ,GAAG,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE;oBACZ,gFAAgF;oBAChF,kEAAkE;oBAClE,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC9D,OAAO,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;iBACnC;aACF;QACH,CAAC;KACF;;IAED,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,MAAM,KAAK;CAAG;AAEd,MAAM,CAAC,MAAM,iCAAiC,GAC5C,kCAAkC,CAAC,KAAK,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,6BAA6B,GACxC,kCAAkC,CAAC,cAAc,CAAC,CAAC;AACrD,MAAM,CAAC,MAAM,+BAA+B,GAC1C,kCAAkC,CAAC,gBAAgB,CAAC,CAAC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type {\n  NetworkClientId,\n  NetworkClient,\n} from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type { Constructor, PollingTokenSetId } from './types';\n\n/**\n * BlockTrackerPollingControllerMixin\n * A polling controller that polls using a block tracker.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction BlockTrackerPollingControllerMixin<TBase extends Constructor>(\n  Base: TBase,\n) {\n  abstract class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin(\n    Base,\n  ) {\n    #activeListeners: Record<string, (options: Json) => Promise<void>> = {};\n\n    abstract _getNetworkClientById(\n      networkClientId: NetworkClientId,\n    ): NetworkClient | undefined;\n\n    _startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ) {\n      const key = getKey(networkClientId, options);\n\n      if (this.#activeListeners[key]) {\n        return;\n      }\n\n      const networkClient = this._getNetworkClientById(networkClientId);\n      if (networkClient) {\n        const updateOnNewBlock = this._executePoll.bind(\n          this,\n          networkClientId,\n          options,\n        );\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        networkClient.blockTracker.addListener('latest', updateOnNewBlock);\n        this.#activeListeners[key] = updateOnNewBlock;\n      } else {\n        throw new Error(\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n          `Unable to retrieve blockTracker for networkClientId ${networkClientId}`,\n        );\n      }\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const [networkClientId] = key.split(':');\n      const networkClient = this._getNetworkClientById(\n        networkClientId as NetworkClientId,\n      );\n\n      if (networkClient && this.#activeListeners[key]) {\n        const listener = this.#activeListeners[key];\n        if (listener) {\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/no-misused-promises\n          networkClient.blockTracker.removeListener('latest', listener);\n          delete this.#activeListeners[key];\n        }\n      }\n    }\n  }\n\n  return BlockTrackerPollingController;\n}\n\nclass Empty {}\n\nexport const BlockTrackerPollingControllerOnly =\n  BlockTrackerPollingControllerMixin(Empty);\nexport const BlockTrackerPollingController =\n  BlockTrackerPollingControllerMixin(BaseController);\nexport const BlockTrackerPollingControllerV1 =\n  BlockTrackerPollingControllerMixin(BaseControllerV1);\n"]}
+{"version":3,"file":"BlockTrackerPollingController.mjs","sourceRoot":"","sources":["../src/BlockTrackerPollingController.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAO7E,OAAO,EACL,kCAAkC,EAClC,MAAM,EACP,wCAAoC;AAWrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,kCAAkC,CAGzC,IAAW;;IACX,MAAe,6BAA8B,SAAQ,kCAAkC,CAGrF,IAAI,CAAC;QAHP;;YAIE,yDAAqE,EAAE,EAAC;QA6C1E,CAAC;QAvCC,aAAa,CAAC,KAAmB;YAC/B,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAE1B,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO;aACR;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxE,IAAI,aAAa,EAAE;gBACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC7D,gFAAgF;gBAChF,kEAAkE;gBAClE,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACnE,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;aAC/C;iBAAM;gBACL,MAAM,IAAI,KAAK;gBACb,gFAAgF;gBAChF,4EAA4E;gBAC5E,uDAAuD,KAAK,CAAC,eAAe,EAAE,CAC/E,CAAC;aACH;QACH,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAC9C,eAAkC,CACnC,CAAC;YAEF,IAAI,aAAa,IAAI,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,EAAE;gBAC/C,MAAM,QAAQ,GAAG,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE;oBACZ,gFAAgF;oBAChF,kEAAkE;oBAClE,aAAa,CAAC,YAAY,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAC9D,OAAO,uBAAA,IAAI,sDAAiB,CAAC,GAAG,CAAC,CAAC;iBACnC;aACF;QACH,CAAC;KACF;;IAED,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,MAAM,KAAK;CAAG;AAEd,MAAM,CAAC,MAAM,iCAAiC,GAAG,GAE7C,EAAE,CAAC,kCAAkC,CAA6B,KAAK,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAEzC,EAAE,CACJ,kCAAkC,CAChC,cAAc,CACf,CAAC;AAEJ,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAE3C,EAAE,CACJ,kCAAkC,CAChC,gBAAgB,CACjB,CAAC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type {\n  NetworkClientId,\n  NetworkClient,\n} from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type { Constructor, PollingTokenSetId } from './types';\n\n/**\n * The minimum input required to start polling for a {@link BlockTrackerPollingController}.\n * Implementing classes may provide additional properties.\n */\nexport type BlockTrackerPollingInput = {\n  networkClientId: NetworkClientId;\n};\n\n/**\n * BlockTrackerPollingControllerMixin\n * A polling controller that polls using a block tracker.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction BlockTrackerPollingControllerMixin<\n  TBase extends Constructor,\n  PollingInput extends BlockTrackerPollingInput,\n>(Base: TBase) {\n  abstract class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin<\n    TBase,\n    PollingInput\n  >(Base) {\n    #activeListeners: Record<string, (options: Json) => Promise<void>> = {};\n\n    abstract _getNetworkClientById(\n      networkClientId: NetworkClientId,\n    ): NetworkClient | undefined;\n\n    _startPolling(input: PollingInput) {\n      const key = getKey(input);\n\n      if (this.#activeListeners[key]) {\n        return;\n      }\n\n      const networkClient = this._getNetworkClientById(input.networkClientId);\n      if (networkClient) {\n        const updateOnNewBlock = this._executePoll.bind(this, input);\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        networkClient.blockTracker.addListener('latest', updateOnNewBlock);\n        this.#activeListeners[key] = updateOnNewBlock;\n      } else {\n        throw new Error(\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n          `Unable to retrieve blockTracker for networkClientId ${input.networkClientId}`,\n        );\n      }\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const { networkClientId } = JSON.parse(key);\n      const networkClient = this._getNetworkClientById(\n        networkClientId as NetworkClientId,\n      );\n\n      if (networkClient && this.#activeListeners[key]) {\n        const listener = this.#activeListeners[key];\n        if (listener) {\n          // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n          // eslint-disable-next-line @typescript-eslint/no-misused-promises\n          networkClient.blockTracker.removeListener('latest', listener);\n          delete this.#activeListeners[key];\n        }\n      }\n    }\n  }\n\n  return BlockTrackerPollingController;\n}\n\nclass Empty {}\n\nexport const BlockTrackerPollingControllerOnly = <\n  PollingInput extends BlockTrackerPollingInput,\n>() => BlockTrackerPollingControllerMixin<typeof Empty, PollingInput>(Empty);\n\nexport const BlockTrackerPollingController = <\n  PollingInput extends BlockTrackerPollingInput,\n>() =>\n  BlockTrackerPollingControllerMixin<typeof BaseController, PollingInput>(\n    BaseController,\n  );\n\nexport const BlockTrackerPollingControllerV1 = <\n  PollingInput extends BlockTrackerPollingInput,\n>() =>\n  BlockTrackerPollingControllerMixin<typeof BaseControllerV1, PollingInput>(\n    BaseControllerV1,\n  );\n"]}

package/dist/StaticIntervalPollingController.cjs

@@ -37,11 +37,11 @@ function StaticIntervalPollingControllerMixin(Base) {
         getIntervalLength() {
             return __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalLength, "f");
         }
-        _startPollingByNetworkClientId(networkClientId, options) {
+        _startPolling(input) {
             if (!__classPrivateFieldGet(this, _StaticIntervalPollingController_intervalLength, "f")) {
                 throw new Error('intervalLength must be defined and greater than 0');
             }
-            const key = (0, AbstractPollingController_1.getKey)(networkClientId, options);
+            const key = (0, AbstractPollingController_1.getKey)(input);
             const existingInterval = __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalIds, "f")[key];
             this._stopPollingByPollingTokenSetId(key);
             // eslint-disable-next-line no-multi-assign
@@ -50,13 +50,13 @@ function StaticIntervalPollingControllerMixin(Base) {
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             async () => {
                 try {
-                    await this._executePoll(networkClientId, options);
+                    await this._executePoll(input);
                 }
                 catch (error) {
                     console.error(error);
                 }
                 if (intervalId === __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalIds, "f")[key]) {
-                    this._startPollingByNetworkClientId(networkClientId, options);
+                    this._startPolling(input);
                 }
             }, existingInterval ? __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalLength, "f") : 0));
         }
@@ -73,7 +73,10 @@ function StaticIntervalPollingControllerMixin(Base) {
 }
 class Empty {
 }
-exports.StaticIntervalPollingControllerOnly = StaticIntervalPollingControllerMixin(Empty);
-exports.StaticIntervalPollingController = StaticIntervalPollingControllerMixin(base_controller_1.BaseController);
-exports.StaticIntervalPollingControllerV1 = StaticIntervalPollingControllerMixin(base_controller_1.BaseControllerV1);
+const StaticIntervalPollingControllerOnly = () => StaticIntervalPollingControllerMixin(Empty);
+exports.StaticIntervalPollingControllerOnly = StaticIntervalPollingControllerOnly;
+const StaticIntervalPollingController = () => StaticIntervalPollingControllerMixin(base_controller_1.BaseController);
+exports.StaticIntervalPollingController = StaticIntervalPollingController;
+const StaticIntervalPollingControllerV1 = () => StaticIntervalPollingControllerMixin(base_controller_1.BaseControllerV1);
+exports.StaticIntervalPollingControllerV1 = StaticIntervalPollingControllerV1;
 //# sourceMappingURL=StaticIntervalPollingController.cjs.map

package/dist/StaticIntervalPollingController.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"StaticIntervalPollingController.cjs","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAI7E,+EAGqC;AAOrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,oCAAoC,CAC3C,IAAW;;IAEX,MAAe,+BACb,SAAQ,IAAA,8DAAkC,EAAC,IAAI,CAAC;QADlD;;YAIW,uDAA0D,EAAE,EAAC;YAEtE,0DAAsC,IAAI,EAAC;QA+C7C,CAAC;QA7CC,iBAAiB,CAAC,cAAsB;YACtC,uBAAA,IAAI,mDAAmB,cAAc,MAAA,CAAC;QACxC,CAAC;QAED,iBAAiB;YACf,OAAO,uBAAA,IAAI,uDAAgB,CAAC;QAC9B,CAAC;QAED,8BAA8B,CAC5B,eAAgC,EAChC,OAAa;YAEb,IAAI,CAAC,uBAAA,IAAI,uDAAgB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;aACtE;YAED,MAAM,GAAG,GAAG,IAAA,kCAAM,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,gBAAgB,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;YAE1C,2CAA2C;YAC3C,MAAM,UAAU,GAAG,CAAC,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,GAAG,UAAU;YACrD,gFAAgF;YAChF,kEAAkE;YAClE,KAAK,IAAI,EAAE;gBACT,IAAI;oBACF,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;iBACnD;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtB;gBACD,IAAI,UAAU,KAAK,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,EAAE;oBACzC,IAAI,CAAC,8BAA8B,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;iBAC/D;YACH,CAAC,EACD,gBAAgB,CAAC,CAAC,CAAC,uBAAA,IAAI,uDAAgB,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC,CAAC;QACL,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,UAAU,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,UAAU,EAAE;gBACd,YAAY,CAAC,UAAU,CAAC,CAAC;gBACzB,OAAO,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;aAC/B;QACH,CAAC;KACF;;IAED,OAAO,+BAA+B,CAAC;AACzC,CAAC;AAED,MAAM,KAAK;CAAG;AAED,QAAA,mCAAmC,GAC9C,oCAAoC,CAAC,KAAK,CAAC,CAAC;AACjC,QAAA,+BAA+B,GAC1C,oCAAoC,CAAC,gCAAc,CAAC,CAAC;AAC1C,QAAA,iCAAiC,GAC5C,oCAAoC,CAAC,kCAAgB,CAAC,CAAC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type {\n  Constructor,\n  IPollingController,\n  PollingTokenSetId,\n} from './types';\n\n/**\n * StaticIntervalPollingControllerMixin\n * A polling controller that polls on a static interval.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction StaticIntervalPollingControllerMixin<TBase extends Constructor>(\n  Base: TBase,\n) {\n  abstract class StaticIntervalPollingController\n    extends AbstractPollingControllerBaseMixin(Base)\n    implements IPollingController\n  {\n    readonly #intervalIds: Record<PollingTokenSetId, NodeJS.Timeout> = {};\n\n    #intervalLength: number | undefined = 1000;\n\n    setIntervalLength(intervalLength: number) {\n      this.#intervalLength = intervalLength;\n    }\n\n    getIntervalLength() {\n      return this.#intervalLength;\n    }\n\n    _startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ) {\n      if (!this.#intervalLength) {\n        throw new Error('intervalLength must be defined and greater than 0');\n      }\n\n      const key = getKey(networkClientId, options);\n      const existingInterval = this.#intervalIds[key];\n      this._stopPollingByPollingTokenSetId(key);\n\n      // eslint-disable-next-line no-multi-assign\n      const intervalId = (this.#intervalIds[key] = setTimeout(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        async () => {\n          try {\n            await this._executePoll(networkClientId, options);\n          } catch (error) {\n            console.error(error);\n          }\n          if (intervalId === this.#intervalIds[key]) {\n            this._startPollingByNetworkClientId(networkClientId, options);\n          }\n        },\n        existingInterval ? this.#intervalLength : 0,\n      ));\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const intervalId = this.#intervalIds[key];\n      if (intervalId) {\n        clearTimeout(intervalId);\n        delete this.#intervalIds[key];\n      }\n    }\n  }\n\n  return StaticIntervalPollingController;\n}\n\nclass Empty {}\n\nexport const StaticIntervalPollingControllerOnly =\n  StaticIntervalPollingControllerMixin(Empty);\nexport const StaticIntervalPollingController =\n  StaticIntervalPollingControllerMixin(BaseController);\nexport const StaticIntervalPollingControllerV1 =\n  StaticIntervalPollingControllerMixin(BaseControllerV1);\n"]}
+{"version":3,"file":"StaticIntervalPollingController.cjs","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA6E;AAG7E,+EAGqC;AAOrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,oCAAoC,CAG3C,IAAW;;IACX,MAAe,+BACb,SAAQ,IAAA,8DAAkC,EAAsB,IAAI,CAAC;QADvE;;YAIW,uDAA0D,EAAE,EAAC;YAEtE,0DAAsC,IAAI,EAAC;QA4C7C,CAAC;QA1CC,iBAAiB,CAAC,cAAsB;YACtC,uBAAA,IAAI,mDAAmB,cAAc,MAAA,CAAC;QACxC,CAAC;QAED,iBAAiB;YACf,OAAO,uBAAA,IAAI,uDAAgB,CAAC;QAC9B,CAAC;QAED,aAAa,CAAC,KAAmB;YAC/B,IAAI,CAAC,uBAAA,IAAI,uDAAgB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;aACtE;YAED,MAAM,GAAG,GAAG,IAAA,kCAAM,EAAC,KAAK,CAAC,CAAC;YAC1B,MAAM,gBAAgB,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;YAE1C,2CAA2C;YAC3C,MAAM,UAAU,GAAG,CAAC,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,GAAG,UAAU;YACrD,gFAAgF;YAChF,kEAAkE;YAClE,KAAK,IAAI,EAAE;gBACT,IAAI;oBACF,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;iBAChC;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtB;gBACD,IAAI,UAAU,KAAK,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,EAAE;oBACzC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;iBAC3B;YACH,CAAC,EACD,gBAAgB,CAAC,CAAC,CAAC,uBAAA,IAAI,uDAAgB,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC,CAAC;QACL,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,UAAU,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,UAAU,EAAE;gBACd,YAAY,CAAC,UAAU,CAAC,CAAC;gBACzB,OAAO,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;aAC/B;QACH,CAAC;KACF;;IAED,OAAO,+BAA+B,CAAC;AACzC,CAAC;AAED,MAAM,KAAK;CAAG;AAEP,MAAM,mCAAmC,GAAG,GAE/C,EAAE,CAAC,oCAAoC,CAA6B,KAAK,CAAC,CAAC;AAFlE,QAAA,mCAAmC,uCAE+B;AAExE,MAAM,+BAA+B,GAAG,GAA8B,EAAE,CAC7E,oCAAoC,CAClC,gCAAc,CACf,CAAC;AAHS,QAAA,+BAA+B,mCAGxC;AAEG,MAAM,iCAAiC,GAAG,GAE7C,EAAE,CACJ,oCAAoC,CAClC,kCAAgB,CACjB,CAAC;AALS,QAAA,iCAAiC,qCAK1C","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type {\n  Constructor,\n  IPollingController,\n  PollingTokenSetId,\n} from './types';\n\n/**\n * StaticIntervalPollingControllerMixin\n * A polling controller that polls on a static interval.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction StaticIntervalPollingControllerMixin<\n  TBase extends Constructor,\n  PollingInput extends Json,\n>(Base: TBase) {\n  abstract class StaticIntervalPollingController\n    extends AbstractPollingControllerBaseMixin<TBase, PollingInput>(Base)\n    implements IPollingController<PollingInput>\n  {\n    readonly #intervalIds: Record<PollingTokenSetId, NodeJS.Timeout> = {};\n\n    #intervalLength: number | undefined = 1000;\n\n    setIntervalLength(intervalLength: number) {\n      this.#intervalLength = intervalLength;\n    }\n\n    getIntervalLength() {\n      return this.#intervalLength;\n    }\n\n    _startPolling(input: PollingInput) {\n      if (!this.#intervalLength) {\n        throw new Error('intervalLength must be defined and greater than 0');\n      }\n\n      const key = getKey(input);\n      const existingInterval = this.#intervalIds[key];\n      this._stopPollingByPollingTokenSetId(key);\n\n      // eslint-disable-next-line no-multi-assign\n      const intervalId = (this.#intervalIds[key] = setTimeout(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        async () => {\n          try {\n            await this._executePoll(input);\n          } catch (error) {\n            console.error(error);\n          }\n          if (intervalId === this.#intervalIds[key]) {\n            this._startPolling(input);\n          }\n        },\n        existingInterval ? this.#intervalLength : 0,\n      ));\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const intervalId = this.#intervalIds[key];\n      if (intervalId) {\n        clearTimeout(intervalId);\n        delete this.#intervalIds[key];\n      }\n    }\n  }\n\n  return StaticIntervalPollingController;\n}\n\nclass Empty {}\n\nexport const StaticIntervalPollingControllerOnly = <\n  PollingInput extends Json,\n>() => StaticIntervalPollingControllerMixin<typeof Empty, PollingInput>(Empty);\n\nexport const StaticIntervalPollingController = <PollingInput extends Json>() =>\n  StaticIntervalPollingControllerMixin<typeof BaseController, PollingInput>(\n    BaseController,\n  );\n\nexport const StaticIntervalPollingControllerV1 = <\n  PollingInput extends Json,\n>() =>\n  StaticIntervalPollingControllerMixin<typeof BaseControllerV1, PollingInput>(\n    BaseControllerV1,\n  );\n"]}

package/dist/StaticIntervalPollingController.d.cts

@@ -1,53 +1,52 @@
 import { BaseController, BaseControllerV1 } from "@metamask/base-controller";
-import type { NetworkClientId } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
 import type { PollingTokenSetId } from "./types.cjs";
 declare class Empty {
 }
-export declare const StaticIntervalPollingControllerOnly: (abstract new (...args: any[]) => {
-    readonly "__#786019@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
-    "__#786019@#intervalLength": number | undefined;
+export declare const StaticIntervalPollingControllerOnly: <PollingInput extends Json>() => (abstract new (...args: any[]) => {
+    readonly "__#784842@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
+    "__#784842@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof Empty;
-export declare const StaticIntervalPollingController: (abstract new (...args: any[]) => {
-    readonly "__#786019@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
-    "__#786019@#intervalLength": number | undefined;
+export declare const StaticIntervalPollingController: <PollingInput extends Json>() => (abstract new (...args: any[]) => {
+    readonly "__#784842@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
+    "__#784842@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseController;
-export declare const StaticIntervalPollingControllerV1: (abstract new (...args: any[]) => {
-    readonly "__#786019@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
-    "__#786019@#intervalLength": number | undefined;
+export declare const StaticIntervalPollingControllerV1: <PollingInput extends Json>() => (abstract new (...args: any[]) => {
+    readonly "__#784842@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
+    "__#784842@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseControllerV1;
 export {};
 //# sourceMappingURL=StaticIntervalPollingController.d.cts.map

package/dist/StaticIntervalPollingController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticIntervalPollingController.d.cts","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAGV,iBAAiB,EAClB,oBAAgB;AAwEjB,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,mCAAmC;uCAxDrB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;oDASrB,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;iBAeb,CAAC;AAC9C,eAAO,MAAM,+BAA+B;uCA1DjB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;oDASrB,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;0BAiBJ,CAAC;AACvD,eAAO,MAAM,iCAAiC;uCA5DnB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;oDASrB,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;4BAmBF,CAAC"}
+{"version":3,"file":"StaticIntervalPollingController.d.cts","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAGV,iBAAiB,EAClB,oBAAgB;AAsEjB,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,mCAAmC;uCArDrB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;;yCAmCH,iBAAiB;;;;;;;;iBAgBoB,CAAC;AAE/E,eAAO,MAAM,+BAA+B;uCAzDjB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;;yCAmCH,iBAAiB;;;;;;;;0BAqBvD,CAAC;AAEJ,eAAO,MAAM,iCAAiC;uCA9DnB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;;yCAmCH,iBAAiB;;;;;;;;4BA4BvD,CAAC"}

package/dist/StaticIntervalPollingController.d.mts

@@ -1,53 +1,52 @@
 import { BaseController, BaseControllerV1 } from "@metamask/base-controller";
-import type { NetworkClientId } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
 import type { PollingTokenSetId } from "./types.mjs";
 declare class Empty {
 }
-export declare const StaticIntervalPollingControllerOnly: (abstract new (...args: any[]) => {
-    readonly "__#786019@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
-    "__#786019@#intervalLength": number | undefined;
+export declare const StaticIntervalPollingControllerOnly: <PollingInput extends Json>() => (abstract new (...args: any[]) => {
+    readonly "__#784842@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
+    "__#784842@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof Empty;
-export declare const StaticIntervalPollingController: (abstract new (...args: any[]) => {
-    readonly "__#786019@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
-    "__#786019@#intervalLength": number | undefined;
+export declare const StaticIntervalPollingController: <PollingInput extends Json>() => (abstract new (...args: any[]) => {
+    readonly "__#784842@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
+    "__#784842@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseController;
-export declare const StaticIntervalPollingControllerV1: (abstract new (...args: any[]) => {
-    readonly "__#786019@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
-    "__#786019@#intervalLength": number | undefined;
+export declare const StaticIntervalPollingControllerV1: <PollingInput extends Json>() => (abstract new (...args: any[]) => {
+    readonly "__#784842@#intervalIds": Record<PollingTokenSetId, NodeJS.Timeout>;
+    "__#784842@#intervalLength": number | undefined;
     setIntervalLength(intervalLength: number): void;
     getIntervalLength(): number | undefined;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#786017@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#786017@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
-    _executePoll(networkClientId: string, options: Json): Promise<void>;
-    startPollingByNetworkClientId(networkClientId: string, options?: Json): string;
+    readonly "__#784834@#pollingTokenSets": Map<string, Set<string>>;
+    "__#784834@#callbacks": Map<string, Set<(input: PollingInput) => void>>;
+    _executePoll(input: PollingInput): Promise<void>;
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
 }) & typeof BaseControllerV1;
 export {};
 //# sourceMappingURL=StaticIntervalPollingController.d.mts.map

package/dist/StaticIntervalPollingController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticIntervalPollingController.d.mts","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAGV,iBAAiB,EAClB,oBAAgB;AAwEjB,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,mCAAmC;uCAxDrB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;oDASrB,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;iBAeb,CAAC;AAC9C,eAAO,MAAM,+BAA+B;uCA1DjB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;oDASrB,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;0BAiBJ,CAAC;AACvD,eAAO,MAAM,iCAAiC;uCA5DnB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;oDASrB,eAAe,WACvB,IAAI;yCA4BsB,iBAAiB;;;;;;;;4BAmBF,CAAC"}
+{"version":3,"file":"StaticIntervalPollingController.d.mts","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAC7E,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAM5C,OAAO,KAAK,EAGV,iBAAiB,EAClB,oBAAgB;AAsEjB,cAAM,KAAK;CAAG;AAEd,eAAO,MAAM,mCAAmC;uCArDrB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;;yCAmCH,iBAAiB;;;;;;;;iBAgBoB,CAAC;AAE/E,eAAO,MAAM,+BAA+B;uCAzDjB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;;yCAmCH,iBAAiB;;;;;;;;0BAqBvD,CAAC;AAEJ,eAAO,MAAM,iCAAiC;uCA9DnB,OAAO,iBAAiB,EAAE,OAAO,OAAO,CAAC;iCAE/C,MAAM,GAAG,SAAS;sCAED,MAAM;;;yCAmCH,iBAAiB;;;;;;;;4BA4BvD,CAAC"}

package/dist/StaticIntervalPollingController.mjs

@@ -34,11 +34,11 @@ function StaticIntervalPollingControllerMixin(Base) {
         getIntervalLength() {
             return __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalLength, "f");
         }
-        _startPollingByNetworkClientId(networkClientId, options) {
+        _startPolling(input) {
             if (!__classPrivateFieldGet(this, _StaticIntervalPollingController_intervalLength, "f")) {
                 throw new Error('intervalLength must be defined and greater than 0');
             }
-            const key = getKey(networkClientId, options);
+            const key = getKey(input);
             const existingInterval = __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalIds, "f")[key];
             this._stopPollingByPollingTokenSetId(key);
             // eslint-disable-next-line no-multi-assign
@@ -47,13 +47,13 @@ function StaticIntervalPollingControllerMixin(Base) {
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             async () => {
                 try {
-                    await this._executePoll(networkClientId, options);
+                    await this._executePoll(input);
                 }
                 catch (error) {
                     console.error(error);
                 }
                 if (intervalId === __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalIds, "f")[key]) {
-                    this._startPollingByNetworkClientId(networkClientId, options);
+                    this._startPolling(input);
                 }
             }, existingInterval ? __classPrivateFieldGet(this, _StaticIntervalPollingController_intervalLength, "f") : 0));
         }
@@ -70,7 +70,7 @@ function StaticIntervalPollingControllerMixin(Base) {
 }
 class Empty {
 }
-export const StaticIntervalPollingControllerOnly = StaticIntervalPollingControllerMixin(Empty);
-export const StaticIntervalPollingController = StaticIntervalPollingControllerMixin(BaseController);
-export const StaticIntervalPollingControllerV1 = StaticIntervalPollingControllerMixin(BaseControllerV1);
+export const StaticIntervalPollingControllerOnly = () => StaticIntervalPollingControllerMixin(Empty);
+export const StaticIntervalPollingController = () => StaticIntervalPollingControllerMixin(BaseController);
+export const StaticIntervalPollingControllerV1 = () => StaticIntervalPollingControllerMixin(BaseControllerV1);
 //# sourceMappingURL=StaticIntervalPollingController.mjs.map

package/dist/StaticIntervalPollingController.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"StaticIntervalPollingController.mjs","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAI7E,OAAO,EACL,kCAAkC,EAClC,MAAM,EACP,wCAAoC;AAOrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,oCAAoC,CAC3C,IAAW;;IAEX,MAAe,+BACb,SAAQ,kCAAkC,CAAC,IAAI,CAAC;QADlD;;YAIW,uDAA0D,EAAE,EAAC;YAEtE,0DAAsC,IAAI,EAAC;QA+C7C,CAAC;QA7CC,iBAAiB,CAAC,cAAsB;YACtC,uBAAA,IAAI,mDAAmB,cAAc,MAAA,CAAC;QACxC,CAAC;QAED,iBAAiB;YACf,OAAO,uBAAA,IAAI,uDAAgB,CAAC;QAC9B,CAAC;QAED,8BAA8B,CAC5B,eAAgC,EAChC,OAAa;YAEb,IAAI,CAAC,uBAAA,IAAI,uDAAgB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;aACtE;YAED,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,gBAAgB,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;YAE1C,2CAA2C;YAC3C,MAAM,UAAU,GAAG,CAAC,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,GAAG,UAAU;YACrD,gFAAgF;YAChF,kEAAkE;YAClE,KAAK,IAAI,EAAE;gBACT,IAAI;oBACF,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;iBACnD;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtB;gBACD,IAAI,UAAU,KAAK,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,EAAE;oBACzC,IAAI,CAAC,8BAA8B,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;iBAC/D;YACH,CAAC,EACD,gBAAgB,CAAC,CAAC,CAAC,uBAAA,IAAI,uDAAgB,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC,CAAC;QACL,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,UAAU,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,UAAU,EAAE;gBACd,YAAY,CAAC,UAAU,CAAC,CAAC;gBACzB,OAAO,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;aAC/B;QACH,CAAC;KACF;;IAED,OAAO,+BAA+B,CAAC;AACzC,CAAC;AAED,MAAM,KAAK;CAAG;AAEd,MAAM,CAAC,MAAM,mCAAmC,GAC9C,oCAAoC,CAAC,KAAK,CAAC,CAAC;AAC9C,MAAM,CAAC,MAAM,+BAA+B,GAC1C,oCAAoC,CAAC,cAAc,CAAC,CAAC;AACvD,MAAM,CAAC,MAAM,iCAAiC,GAC5C,oCAAoC,CAAC,gBAAgB,CAAC,CAAC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type {\n  Constructor,\n  IPollingController,\n  PollingTokenSetId,\n} from './types';\n\n/**\n * StaticIntervalPollingControllerMixin\n * A polling controller that polls on a static interval.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction StaticIntervalPollingControllerMixin<TBase extends Constructor>(\n  Base: TBase,\n) {\n  abstract class StaticIntervalPollingController\n    extends AbstractPollingControllerBaseMixin(Base)\n    implements IPollingController\n  {\n    readonly #intervalIds: Record<PollingTokenSetId, NodeJS.Timeout> = {};\n\n    #intervalLength: number | undefined = 1000;\n\n    setIntervalLength(intervalLength: number) {\n      this.#intervalLength = intervalLength;\n    }\n\n    getIntervalLength() {\n      return this.#intervalLength;\n    }\n\n    _startPollingByNetworkClientId(\n      networkClientId: NetworkClientId,\n      options: Json,\n    ) {\n      if (!this.#intervalLength) {\n        throw new Error('intervalLength must be defined and greater than 0');\n      }\n\n      const key = getKey(networkClientId, options);\n      const existingInterval = this.#intervalIds[key];\n      this._stopPollingByPollingTokenSetId(key);\n\n      // eslint-disable-next-line no-multi-assign\n      const intervalId = (this.#intervalIds[key] = setTimeout(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        async () => {\n          try {\n            await this._executePoll(networkClientId, options);\n          } catch (error) {\n            console.error(error);\n          }\n          if (intervalId === this.#intervalIds[key]) {\n            this._startPollingByNetworkClientId(networkClientId, options);\n          }\n        },\n        existingInterval ? this.#intervalLength : 0,\n      ));\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const intervalId = this.#intervalIds[key];\n      if (intervalId) {\n        clearTimeout(intervalId);\n        delete this.#intervalIds[key];\n      }\n    }\n  }\n\n  return StaticIntervalPollingController;\n}\n\nclass Empty {}\n\nexport const StaticIntervalPollingControllerOnly =\n  StaticIntervalPollingControllerMixin(Empty);\nexport const StaticIntervalPollingController =\n  StaticIntervalPollingControllerMixin(BaseController);\nexport const StaticIntervalPollingControllerV1 =\n  StaticIntervalPollingControllerMixin(BaseControllerV1);\n"]}
+{"version":3,"file":"StaticIntervalPollingController.mjs","sourceRoot":"","sources":["../src/StaticIntervalPollingController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,kCAAkC;AAG7E,OAAO,EACL,kCAAkC,EAClC,MAAM,EACP,wCAAoC;AAOrC;;;;;;GAMG;AACH,gFAAgF;AAChF,gEAAgE;AAChE,SAAS,oCAAoC,CAG3C,IAAW;;IACX,MAAe,+BACb,SAAQ,kCAAkC,CAAsB,IAAI,CAAC;QADvE;;YAIW,uDAA0D,EAAE,EAAC;YAEtE,0DAAsC,IAAI,EAAC;QA4C7C,CAAC;QA1CC,iBAAiB,CAAC,cAAsB;YACtC,uBAAA,IAAI,mDAAmB,cAAc,MAAA,CAAC;QACxC,CAAC;QAED,iBAAiB;YACf,OAAO,uBAAA,IAAI,uDAAgB,CAAC;QAC9B,CAAC;QAED,aAAa,CAAC,KAAmB;YAC/B,IAAI,CAAC,uBAAA,IAAI,uDAAgB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;aACtE;YAED,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC1B,MAAM,gBAAgB,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;YAE1C,2CAA2C;YAC3C,MAAM,UAAU,GAAG,CAAC,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,GAAG,UAAU;YACrD,gFAAgF;YAChF,kEAAkE;YAClE,KAAK,IAAI,EAAE;gBACT,IAAI;oBACF,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;iBAChC;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtB;gBACD,IAAI,UAAU,KAAK,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,EAAE;oBACzC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;iBAC3B;YACH,CAAC,EACD,gBAAgB,CAAC,CAAC,CAAC,uBAAA,IAAI,uDAAgB,CAAC,CAAC,CAAC,CAAC,CAC5C,CAAC,CAAC;QACL,CAAC;QAED,+BAA+B,CAAC,GAAsB;YACpD,MAAM,UAAU,GAAG,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,UAAU,EAAE;gBACd,YAAY,CAAC,UAAU,CAAC,CAAC;gBACzB,OAAO,uBAAA,IAAI,oDAAa,CAAC,GAAG,CAAC,CAAC;aAC/B;QACH,CAAC;KACF;;IAED,OAAO,+BAA+B,CAAC;AACzC,CAAC;AAED,MAAM,KAAK;CAAG;AAEd,MAAM,CAAC,MAAM,mCAAmC,GAAG,GAE/C,EAAE,CAAC,oCAAoC,CAA6B,KAAK,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAA8B,EAAE,CAC7E,oCAAoC,CAClC,cAAc,CACf,CAAC;AAEJ,MAAM,CAAC,MAAM,iCAAiC,GAAG,GAE7C,EAAE,CACJ,oCAAoC,CAClC,gBAAgB,CACjB,CAAC","sourcesContent":["import { BaseController, BaseControllerV1 } from '@metamask/base-controller';\nimport type { Json } from '@metamask/utils';\n\nimport {\n  AbstractPollingControllerBaseMixin,\n  getKey,\n} from './AbstractPollingController';\nimport type {\n  Constructor,\n  IPollingController,\n  PollingTokenSetId,\n} from './types';\n\n/**\n * StaticIntervalPollingControllerMixin\n * A polling controller that polls on a static interval.\n *\n * @param Base - The base class to mix onto.\n * @returns The composed class.\n */\n// TODO: Either fix this lint violation or explain why it's necessary to ignore.\n// eslint-disable-next-line @typescript-eslint/naming-convention\nfunction StaticIntervalPollingControllerMixin<\n  TBase extends Constructor,\n  PollingInput extends Json,\n>(Base: TBase) {\n  abstract class StaticIntervalPollingController\n    extends AbstractPollingControllerBaseMixin<TBase, PollingInput>(Base)\n    implements IPollingController<PollingInput>\n  {\n    readonly #intervalIds: Record<PollingTokenSetId, NodeJS.Timeout> = {};\n\n    #intervalLength: number | undefined = 1000;\n\n    setIntervalLength(intervalLength: number) {\n      this.#intervalLength = intervalLength;\n    }\n\n    getIntervalLength() {\n      return this.#intervalLength;\n    }\n\n    _startPolling(input: PollingInput) {\n      if (!this.#intervalLength) {\n        throw new Error('intervalLength must be defined and greater than 0');\n      }\n\n      const key = getKey(input);\n      const existingInterval = this.#intervalIds[key];\n      this._stopPollingByPollingTokenSetId(key);\n\n      // eslint-disable-next-line no-multi-assign\n      const intervalId = (this.#intervalIds[key] = setTimeout(\n        // TODO: Either fix this lint violation or explain why it's necessary to ignore.\n        // eslint-disable-next-line @typescript-eslint/no-misused-promises\n        async () => {\n          try {\n            await this._executePoll(input);\n          } catch (error) {\n            console.error(error);\n          }\n          if (intervalId === this.#intervalIds[key]) {\n            this._startPolling(input);\n          }\n        },\n        existingInterval ? this.#intervalLength : 0,\n      ));\n    }\n\n    _stopPollingByPollingTokenSetId(key: PollingTokenSetId) {\n      const intervalId = this.#intervalIds[key];\n      if (intervalId) {\n        clearTimeout(intervalId);\n        delete this.#intervalIds[key];\n      }\n    }\n  }\n\n  return StaticIntervalPollingController;\n}\n\nclass Empty {}\n\nexport const StaticIntervalPollingControllerOnly = <\n  PollingInput extends Json,\n>() => StaticIntervalPollingControllerMixin<typeof Empty, PollingInput>(Empty);\n\nexport const StaticIntervalPollingController = <PollingInput extends Json>() =>\n  StaticIntervalPollingControllerMixin<typeof BaseController, PollingInput>(\n    BaseController,\n  );\n\nexport const StaticIntervalPollingControllerV1 = <\n  PollingInput extends Json,\n>() =>\n  StaticIntervalPollingControllerMixin<typeof BaseControllerV1, PollingInput>(\n    BaseControllerV1,\n  );\n"]}

package/dist/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nexport type PollingTokenSetId = `${NetworkClientId}:${string}`;\n\nexport type IPollingController = {\n  startPollingByNetworkClientId(\n    networkClientId: NetworkClientId,\n    options: Json,\n  ): string;\n\n  stopAllPolling(): void;\n\n  stopPollingByPollingToken(pollingToken: string): void;\n\n  onPollingCompleteByNetworkClientId(\n    networkClientId: NetworkClientId,\n    callback: (networkClientId: NetworkClientId) => void,\n    options: Json,\n  ): void;\n\n  _executePoll(networkClientId: NetworkClientId, options: Json): Promise<void>;\n  _startPollingByNetworkClientId(\n    networkClientId: NetworkClientId,\n    options: Json,\n  ): void;\n  _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n};\n\n/**\n * TypeScript enforces this type for mixin constructors.\n *\n * Removing the `any` type results in the following error:\n * 'A mixin class must have a constructor with a single rest parameter of type 'any[]'.ts(2545)'\n *\n * A potential future refactor that removes the mixin pattern may be able to fix this.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type Constructor = new (...args: any[]) => object;\n"]}
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Json } from '@metamask/utils';\n\nexport type PollingTokenSetId = string;\n\nexport type IPollingController<PollingInput extends Json> = {\n  startPolling(input: PollingInput): string;\n\n  stopAllPolling(): void;\n\n  stopPollingByPollingToken(pollingToken: string): void;\n\n  onPollingComplete(\n    input: PollingInput,\n    callback: (input: PollingInput) => void,\n  ): void;\n\n  _executePoll(input: PollingInput): Promise<void>;\n  _startPolling(input: PollingInput): void;\n  _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n};\n\n/**\n * TypeScript enforces this type for mixin constructors.\n *\n * Removing the `any` type results in the following error:\n * 'A mixin class must have a constructor with a single rest parameter of type 'any[]'.ts(2545)'\n *\n * A potential future refactor that removes the mixin pattern may be able to fix this.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type Constructor = new (...args: any[]) => object;\n"]}

package/dist/types.d.cts

@@ -1,13 +1,12 @@
-import type { NetworkClientId } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
-export type PollingTokenSetId = `${NetworkClientId}:${string}`;
-export type IPollingController = {
-    startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): string;
+export type PollingTokenSetId = string;
+export type IPollingController<PollingInput extends Json> = {
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: NetworkClientId, callback: (networkClientId: NetworkClientId) => void, options: Json): void;
-    _executePoll(networkClientId: NetworkClientId, options: Json): Promise<void>;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
+    _executePoll(input: PollingInput): Promise<void>;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
 };
 /**

package/dist/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAE5C,MAAM,MAAM,iBAAiB,GAAG,GAAG,eAAe,IAAI,MAAM,EAAE,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,6BAA6B,CAC3B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,IAAI,GACZ,MAAM,CAAC;IAEV,cAAc,IAAI,IAAI,CAAC;IAEvB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtD,kCAAkC,CAChC,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,IAAI,EACpD,OAAO,EAAE,IAAI,GACZ,IAAI,CAAC;IAER,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,8BAA8B,CAC5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,IAAI,GACZ,IAAI,CAAC;IACR,+BAA+B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF;;;;;;;GAOG;AAEH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAE5C,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEvC,MAAM,MAAM,kBAAkB,CAAC,YAAY,SAAS,IAAI,IAAI;IAC1D,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAAC;IAE1C,cAAc,IAAI,IAAI,CAAC;IAEvB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtD,iBAAiB,CACf,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GACtC,IAAI,CAAC;IAER,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,aAAa,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,+BAA+B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF;;;;;;;GAOG;AAEH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC"}

package/dist/types.d.mts

@@ -1,13 +1,12 @@
-import type { NetworkClientId } from "@metamask/network-controller";
 import type { Json } from "@metamask/utils";
-export type PollingTokenSetId = `${NetworkClientId}:${string}`;
-export type IPollingController = {
-    startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): string;
+export type PollingTokenSetId = string;
+export type IPollingController<PollingInput extends Json> = {
+    startPolling(input: PollingInput): string;
     stopAllPolling(): void;
     stopPollingByPollingToken(pollingToken: string): void;
-    onPollingCompleteByNetworkClientId(networkClientId: NetworkClientId, callback: (networkClientId: NetworkClientId) => void, options: Json): void;
-    _executePoll(networkClientId: NetworkClientId, options: Json): Promise<void>;
-    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
+    onPollingComplete(input: PollingInput, callback: (input: PollingInput) => void): void;
+    _executePoll(input: PollingInput): Promise<void>;
+    _startPolling(input: PollingInput): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
 };
 /**

package/dist/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAE5C,MAAM,MAAM,iBAAiB,GAAG,GAAG,eAAe,IAAI,MAAM,EAAE,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,6BAA6B,CAC3B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,IAAI,GACZ,MAAM,CAAC;IAEV,cAAc,IAAI,IAAI,CAAC;IAEvB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtD,kCAAkC,CAChC,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,IAAI,EACpD,OAAO,EAAE,IAAI,GACZ,IAAI,CAAC;IAER,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,8BAA8B,CAC5B,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,IAAI,GACZ,IAAI,CAAC;IACR,+BAA+B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF;;;;;;;GAOG;AAEH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAE5C,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEvC,MAAM,MAAM,kBAAkB,CAAC,YAAY,SAAS,IAAI,IAAI;IAC1D,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAAC;IAE1C,cAAc,IAAI,IAAI,CAAC;IAEvB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtD,iBAAiB,CACf,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GACtC,IAAI,CAAC;IAER,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,aAAa,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,+BAA+B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF;;;;;;;GAOG;AAEH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC"}

package/dist/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json } from '@metamask/utils';\n\nexport type PollingTokenSetId = `${NetworkClientId}:${string}`;\n\nexport type IPollingController = {\n  startPollingByNetworkClientId(\n    networkClientId: NetworkClientId,\n    options: Json,\n  ): string;\n\n  stopAllPolling(): void;\n\n  stopPollingByPollingToken(pollingToken: string): void;\n\n  onPollingCompleteByNetworkClientId(\n    networkClientId: NetworkClientId,\n    callback: (networkClientId: NetworkClientId) => void,\n    options: Json,\n  ): void;\n\n  _executePoll(networkClientId: NetworkClientId, options: Json): Promise<void>;\n  _startPollingByNetworkClientId(\n    networkClientId: NetworkClientId,\n    options: Json,\n  ): void;\n  _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n};\n\n/**\n * TypeScript enforces this type for mixin constructors.\n *\n * Removing the `any` type results in the following error:\n * 'A mixin class must have a constructor with a single rest parameter of type 'any[]'.ts(2545)'\n *\n * A potential future refactor that removes the mixin pattern may be able to fix this.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type Constructor = new (...args: any[]) => object;\n"]}
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Json } from '@metamask/utils';\n\nexport type PollingTokenSetId = string;\n\nexport type IPollingController<PollingInput extends Json> = {\n  startPolling(input: PollingInput): string;\n\n  stopAllPolling(): void;\n\n  stopPollingByPollingToken(pollingToken: string): void;\n\n  onPollingComplete(\n    input: PollingInput,\n    callback: (input: PollingInput) => void,\n  ): void;\n\n  _executePoll(input: PollingInput): Promise<void>;\n  _startPolling(input: PollingInput): void;\n  _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;\n};\n\n/**\n * TypeScript enforces this type for mixin constructors.\n *\n * Removing the `any` type results in the following error:\n * 'A mixin class must have a constructor with a single rest parameter of type 'any[]'.ts(2545)'\n *\n * A potential future refactor that removes the mixin pattern may be able to fix this.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type Constructor = new (...args: any[]) => object;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/polling-controller",
-  "version": "10.0.1",
+  "version": "11.0.0",
   "description": "Polling Controller is the base for controllers that polling by networkClientId",
   "keywords": [
     "MetaMask",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/network-controller": "^21.0.1",
+    "@metamask/network-controller": "^21.1.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",