@metamask/polling-controller 10.0.0 → 10.0.1

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.0.1]
+
+### Fixed
+
+- Produce and export ESM-compatible TypeScript type declaration files in addition to CommonJS-compatible declaration files ([#4648](https://github.com/MetaMask/core/pull/4648))
+  - Previously, this package shipped with only one variant of type declaration
+    files, and these files were only CommonJS-compatible, and the `exports`
+    field in `package.json` linked to these files. This is an anti-pattern and
+    was rightfully flagged by the
+    ["Are the Types Wrong?"](https://arethetypeswrong.github.io/) tool as
+    ["masquerading as CJS"](https://github.com/arethetypeswrong/arethetypeswrong.github.io/blob/main/docs/problems/FalseCJS.md).
+    All of the ATTW checks now pass.
+- Remove chunk files ([#4648](https://github.com/MetaMask/core/pull/4648)).
+  - Previously, the build tool we used to generate JavaScript files extracted
+    common code to "chunk" files. While this was intended to make this package
+    more tree-shakeable, it also made debugging more difficult for our
+    development teams. These chunk files are no longer present.
+
 ## [10.0.0]
 
 ### Changed
@@ -169,7 +187,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.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@10.0.1...HEAD
+[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
 [9.0.0]: https://github.com/MetaMask/core/compare/@metamask/polling-controller@8.0.0...@metamask/polling-controller@9.0.0

package/dist/AbstractPollingController.cjs

@@ -0,0 +1,87 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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)}`;
+exports.getKey = getKey;
+/**
+ * AbstractPollingControllerBaseMixin
+ *
+ * @param Base - The base class to mix onto.
+ * @returns The composed class.
+ */
+// TODO: Either fix this lint violation or explain why it's necessary to ignore.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+function AbstractPollingControllerBaseMixin(Base) {
+    var _AbstractPollingControllerBase_pollingTokenSets, _AbstractPollingControllerBase_callbacks;
+    class AbstractPollingControllerBase extends Base {
+        constructor() {
+            super(...arguments);
+            _AbstractPollingControllerBase_pollingTokenSets.set(this, new Map());
+            _AbstractPollingControllerBase_callbacks.set(this, new Map());
+        }
+        startPollingByNetworkClientId(networkClientId, options = {}) {
+            const pollToken = (0, uuid_1.v4)();
+            const key = (0, exports.getKey)(networkClientId, options);
+            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);
+            }
+            return pollToken;
+        }
+        stopAllPolling() {
+            __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").forEach((tokenSet, _key) => {
+                tokenSet.forEach((token) => {
+                    this.stopPollingByPollingToken(token);
+                });
+            });
+        }
+        stopPollingByPollingToken(pollingToken) {
+            if (!pollingToken) {
+                throw new Error('pollingToken required');
+            }
+            let keyToDelete = null;
+            for (const [key, tokenSet] of __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f")) {
+                if (tokenSet.delete(pollingToken)) {
+                    if (tokenSet.size === 0) {
+                        keyToDelete = key;
+                    }
+                    break;
+                }
+            }
+            if (keyToDelete) {
+                this._stopPollingByPollingTokenSetId(keyToDelete);
+                __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").delete(keyToDelete);
+                const callbacks = __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").get(keyToDelete);
+                if (callbacks) {
+                    for (const callback of callbacks) {
+                        // eslint-disable-next-line n/callback-return
+                        callback(keyToDelete);
+                    }
+                    callbacks.clear();
+                }
+            }
+        }
+        onPollingCompleteByNetworkClientId(networkClientId, callback, options = {}) {
+            const key = (0, exports.getKey)(networkClientId, options);
+            const callbacks = __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").get(key) ?? new Set();
+            callbacks.add(callback);
+            __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").set(key, callbacks);
+        }
+    }
+    _AbstractPollingControllerBase_pollingTokenSets = new WeakMap(), _AbstractPollingControllerBase_callbacks = new WeakMap();
+    return AbstractPollingControllerBase;
+}
+exports.AbstractPollingControllerBaseMixin = AbstractPollingControllerBaseMixin;
+//# sourceMappingURL=AbstractPollingController.cjs.map

package/dist/AbstractPollingController.cjs.map

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

package/dist/{types/AbstractPollingController.d.ts → AbstractPollingController.d.cts}

@@ -1,6 +1,6 @@
-import type { NetworkClientId } from '@metamask/network-controller';
-import type { Json } from '@metamask/utils';
-import type { Constructor, PollingTokenSetId } from './types';
+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;
 /**
  * AbstractPollingControllerBaseMixin
@@ -9,8 +9,8 @@ export declare const getKey: (networkClientId: NetworkClientId, options: Json) =
  * @returns The composed class.
  */
 export declare function AbstractPollingControllerBaseMixin<TBase extends Constructor>(Base: TBase): (abstract new (...args: any[]) => {
-    readonly "__#103046@#pollingTokenSets": Map<PollingTokenSetId, Set<string>>;
-    "__#103046@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => void>>;
+    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;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
@@ -19,4 +19,4 @@ export declare function AbstractPollingControllerBaseMixin<TBase extends Constru
     stopPollingByPollingToken(pollingToken: string): void;
     onPollingCompleteByNetworkClientId(networkClientId: NetworkClientId, callback: (networkClientId: NetworkClientId) => void, options?: Json): void;
 }) & TBase;
-//# sourceMappingURL=AbstractPollingController.d.ts.map
+//# sourceMappingURL=AbstractPollingController.d.cts.map

package/dist/AbstractPollingController.d.cts.map

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

package/dist/AbstractPollingController.d.mts

@@ -0,0 +1,22 @@
+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;
+/**
+ * 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;
+    _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
+    startPollingByNetworkClientId(networkClientId: NetworkClientId, options?: Json): string;
+    stopAllPolling(): void;
+    stopPollingByPollingToken(pollingToken: string): void;
+    onPollingCompleteByNetworkClientId(networkClientId: NetworkClientId, callback: (networkClientId: NetworkClientId) => void, options?: Json): void;
+}) & TBase;
+//# sourceMappingURL=AbstractPollingController.d.mts.map

package/dist/AbstractPollingController.d.mts.map

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

package/dist/AbstractPollingController.mjs

@@ -1,9 +1,86 @@
-import {
-  AbstractPollingControllerBaseMixin,
-  getKey
-} from "./chunk-E2WT3D73.mjs";
-export {
-  AbstractPollingControllerBaseMixin,
-  getKey
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+function $importDefault(module) {
+    if (module?.__esModule) {
+        return module.default;
+    }
+    return 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)}`;
+/**
+ * AbstractPollingControllerBaseMixin
+ *
+ * @param Base - The base class to mix onto.
+ * @returns The composed class.
+ */
+// TODO: Either fix this lint violation or explain why it's necessary to ignore.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export function AbstractPollingControllerBaseMixin(Base) {
+    var _AbstractPollingControllerBase_pollingTokenSets, _AbstractPollingControllerBase_callbacks;
+    class AbstractPollingControllerBase extends Base {
+        constructor() {
+            super(...arguments);
+            _AbstractPollingControllerBase_pollingTokenSets.set(this, new Map());
+            _AbstractPollingControllerBase_callbacks.set(this, new Map());
+        }
+        startPollingByNetworkClientId(networkClientId, options = {}) {
+            const pollToken = random();
+            const key = getKey(networkClientId, options);
+            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);
+            }
+            return pollToken;
+        }
+        stopAllPolling() {
+            __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").forEach((tokenSet, _key) => {
+                tokenSet.forEach((token) => {
+                    this.stopPollingByPollingToken(token);
+                });
+            });
+        }
+        stopPollingByPollingToken(pollingToken) {
+            if (!pollingToken) {
+                throw new Error('pollingToken required');
+            }
+            let keyToDelete = null;
+            for (const [key, tokenSet] of __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f")) {
+                if (tokenSet.delete(pollingToken)) {
+                    if (tokenSet.size === 0) {
+                        keyToDelete = key;
+                    }
+                    break;
+                }
+            }
+            if (keyToDelete) {
+                this._stopPollingByPollingTokenSetId(keyToDelete);
+                __classPrivateFieldGet(this, _AbstractPollingControllerBase_pollingTokenSets, "f").delete(keyToDelete);
+                const callbacks = __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").get(keyToDelete);
+                if (callbacks) {
+                    for (const callback of callbacks) {
+                        // eslint-disable-next-line n/callback-return
+                        callback(keyToDelete);
+                    }
+                    callbacks.clear();
+                }
+            }
+        }
+        onPollingCompleteByNetworkClientId(networkClientId, callback, options = {}) {
+            const key = getKey(networkClientId, options);
+            const callbacks = __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").get(key) ?? new Set();
+            callbacks.add(callback);
+            __classPrivateFieldGet(this, _AbstractPollingControllerBase_callbacks, "f").set(key, callbacks);
+        }
+    }
+    _AbstractPollingControllerBase_pollingTokenSets = new WeakMap(), _AbstractPollingControllerBase_callbacks = new WeakMap();
+    return AbstractPollingControllerBase;
+}
 //# sourceMappingURL=AbstractPollingController.mjs.map

package/dist/AbstractPollingController.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
+{"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"]}

package/dist/BlockTrackerPollingController.cjs

@@ -0,0 +1,69 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockTrackerPollingControllerV1 = exports.BlockTrackerPollingController = exports.BlockTrackerPollingControllerOnly = void 0;
+const base_controller_1 = require("@metamask/base-controller");
+const AbstractPollingController_1 = require("./AbstractPollingController.cjs");
+/**
+ * BlockTrackerPollingControllerMixin
+ * A polling controller that polls using a block tracker.
+ *
+ * @param Base - The base class to mix onto.
+ * @returns The composed class.
+ */
+// TODO: Either fix this lint violation or explain why it's necessary to ignore.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+function BlockTrackerPollingControllerMixin(Base) {
+    var _BlockTrackerPollingController_activeListeners;
+    class BlockTrackerPollingController extends (0, AbstractPollingController_1.AbstractPollingControllerBaseMixin)(Base) {
+        constructor() {
+            super(...arguments);
+            _BlockTrackerPollingController_activeListeners.set(this, {});
+        }
+        _startPollingByNetworkClientId(networkClientId, options) {
+            const key = (0, AbstractPollingController_1.getKey)(networkClientId, options);
+            if (__classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
+                return;
+            }
+            const networkClient = this._getNetworkClientById(networkClientId);
+            if (networkClient) {
+                const updateOnNewBlock = this._executePoll.bind(this, networkClientId, options);
+                // 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);
+                __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key] = updateOnNewBlock;
+            }
+            else {
+                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}`);
+            }
+        }
+        _stopPollingByPollingTokenSetId(key) {
+            const [networkClientId] = key.split(':');
+            const networkClient = this._getNetworkClientById(networkClientId);
+            if (networkClient && __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
+                const listener = __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
+                if (listener) {
+                    // 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.removeListener('latest', listener);
+                    delete __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
+                }
+            }
+        }
+    }
+    _BlockTrackerPollingController_activeListeners = new WeakMap();
+    return BlockTrackerPollingController;
+}
+class Empty {
+}
+exports.BlockTrackerPollingControllerOnly = BlockTrackerPollingControllerMixin(Empty);
+exports.BlockTrackerPollingController = BlockTrackerPollingControllerMixin(base_controller_1.BaseController);
+exports.BlockTrackerPollingControllerV1 = BlockTrackerPollingControllerMixin(base_controller_1.BaseControllerV1);
+//# sourceMappingURL=BlockTrackerPollingController.cjs.map

package/dist/BlockTrackerPollingController.cjs.map

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

package/dist/{types/BlockTrackerPollingController.d.ts → BlockTrackerPollingController.d.cts}

@@ -1,16 +1,16 @@
-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';
+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";
 declare class Empty {
 }
 export declare const BlockTrackerPollingControllerOnly: (abstract new (...args: any[]) => {
-    "__#103047@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
     _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#103046@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#103046@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => 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;
     stopAllPolling(): void;
@@ -18,12 +18,12 @@ export declare const BlockTrackerPollingControllerOnly: (abstract new (...args:
     onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
 }) & typeof Empty;
 export declare const BlockTrackerPollingController: (abstract new (...args: any[]) => {
-    "__#103047@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
     _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#103046@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#103046@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => 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;
     stopAllPolling(): void;
@@ -31,12 +31,12 @@ export declare const BlockTrackerPollingController: (abstract new (...args: any[
     onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
 }) & typeof BaseController;
 export declare const BlockTrackerPollingControllerV1: (abstract new (...args: any[]) => {
-    "__#103047@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
     _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
     _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): void;
     _stopPollingByPollingTokenSetId(key: PollingTokenSetId): void;
-    readonly "__#103046@#pollingTokenSets": Map<`${string}:${string}`, Set<string>>;
-    "__#103046@#callbacks": Map<`${string}:${string}`, Set<(PollingTokenSetId: `${string}:${string}`) => 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;
     stopAllPolling(): void;
@@ -44,4 +44,4 @@ export declare const BlockTrackerPollingControllerV1: (abstract new (...args: an
     onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
 }) & typeof BaseControllerV1;
 export {};
-//# sourceMappingURL=BlockTrackerPollingController.d.ts.map
+//# sourceMappingURL=BlockTrackerPollingController.d.cts.map

package/dist/BlockTrackerPollingController.d.cts.map

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

package/dist/BlockTrackerPollingController.d.mts

@@ -0,0 +1,47 @@
+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";
+declare class Empty {
+}
+export declare const BlockTrackerPollingControllerOnly: (abstract new (...args: any[]) => {
+    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
+    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): 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;
+    stopAllPolling(): void;
+    stopPollingByPollingToken(pollingToken: string): void;
+    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+}) & typeof Empty;
+export declare const BlockTrackerPollingController: (abstract new (...args: any[]) => {
+    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
+    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): 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;
+    stopAllPolling(): void;
+    stopPollingByPollingToken(pollingToken: string): void;
+    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+}) & typeof BaseController;
+export declare const BlockTrackerPollingControllerV1: (abstract new (...args: any[]) => {
+    "__#786018@#activeListeners": Record<string, (options: Json) => Promise<void>>;
+    _getNetworkClientById(networkClientId: NetworkClientId): NetworkClient | undefined;
+    _startPollingByNetworkClientId(networkClientId: NetworkClientId, options: Json): 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;
+    stopAllPolling(): void;
+    stopPollingByPollingToken(pollingToken: string): void;
+    onPollingCompleteByNetworkClientId(networkClientId: string, callback: (networkClientId: string) => void, options?: Json): void;
+}) & typeof BaseControllerV1;
+export {};
+//# sourceMappingURL=BlockTrackerPollingController.d.mts.map

package/dist/BlockTrackerPollingController.d.mts.map

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

package/dist/BlockTrackerPollingController.mjs

@@ -1,12 +1,66 @@
-import {
-  BlockTrackerPollingController,
-  BlockTrackerPollingControllerOnly,
-  BlockTrackerPollingControllerV1
-} from "./chunk-YETJAOVF.mjs";
-import "./chunk-E2WT3D73.mjs";
-export {
-  BlockTrackerPollingController,
-  BlockTrackerPollingControllerOnly,
-  BlockTrackerPollingControllerV1
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
+import { BaseController, BaseControllerV1 } from "@metamask/base-controller";
+import { AbstractPollingControllerBaseMixin, getKey } from "./AbstractPollingController.mjs";
+/**
+ * BlockTrackerPollingControllerMixin
+ * A polling controller that polls using a block tracker.
+ *
+ * @param Base - The base class to mix onto.
+ * @returns The composed class.
+ */
+// TODO: Either fix this lint violation or explain why it's necessary to ignore.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+function BlockTrackerPollingControllerMixin(Base) {
+    var _BlockTrackerPollingController_activeListeners;
+    class BlockTrackerPollingController extends AbstractPollingControllerBaseMixin(Base) {
+        constructor() {
+            super(...arguments);
+            _BlockTrackerPollingController_activeListeners.set(this, {});
+        }
+        _startPollingByNetworkClientId(networkClientId, options) {
+            const key = getKey(networkClientId, options);
+            if (__classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
+                return;
+            }
+            const networkClient = this._getNetworkClientById(networkClientId);
+            if (networkClient) {
+                const updateOnNewBlock = this._executePoll.bind(this, networkClientId, options);
+                // 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);
+                __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key] = updateOnNewBlock;
+            }
+            else {
+                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}`);
+            }
+        }
+        _stopPollingByPollingTokenSetId(key) {
+            const [networkClientId] = key.split(':');
+            const networkClient = this._getNetworkClientById(networkClientId);
+            if (networkClient && __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key]) {
+                const listener = __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
+                if (listener) {
+                    // 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.removeListener('latest', listener);
+                    delete __classPrivateFieldGet(this, _BlockTrackerPollingController_activeListeners, "f")[key];
+                }
+            }
+        }
+    }
+    _BlockTrackerPollingController_activeListeners = new WeakMap();
+    return BlockTrackerPollingController;
+}
+class Empty {
+}
+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,"sources":[],"sourcesContent":[],"mappings":"","names":[]}
+{"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"]}