@metamask-previews/phishing-controller 17.4.0-preview-eb263b0ee → 17.4.0-preview-5b293ee50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/CHANGELOG.md +22 -0
  2. package/dist/PhishingController.cjs +134 -337
  3. package/dist/PhishingController.cjs.map +1 -1
  4. package/dist/PhishingController.d.cts +7 -196
  5. package/dist/PhishingController.d.cts.map +1 -1
  6. package/dist/PhishingController.d.mts +7 -196
  7. package/dist/PhishingController.d.mts.map +1 -1
  8. package/dist/PhishingController.mjs +114 -335
  9. package/dist/PhishingController.mjs.map +1 -1
  10. package/dist/PhishingDataService-method-action-types.cjs +7 -0
  11. package/dist/PhishingDataService-method-action-types.cjs.map +1 -0
  12. package/dist/PhishingDataService-method-action-types.d.cts +121 -0
  13. package/dist/PhishingDataService-method-action-types.d.cts.map +1 -0
  14. package/dist/PhishingDataService-method-action-types.d.mts +121 -0
  15. package/dist/PhishingDataService-method-action-types.d.mts.map +1 -0
  16. package/dist/PhishingDataService-method-action-types.mjs +6 -0
  17. package/dist/PhishingDataService-method-action-types.mjs.map +1 -0
  18. package/dist/PhishingDataService.cjs +498 -0
  19. package/dist/PhishingDataService.cjs.map +1 -0
  20. package/dist/PhishingDataService.d.cts +211 -0
  21. package/dist/PhishingDataService.d.cts.map +1 -0
  22. package/dist/PhishingDataService.d.mts +211 -0
  23. package/dist/PhishingDataService.d.mts.map +1 -0
  24. package/dist/PhishingDataService.mjs +494 -0
  25. package/dist/PhishingDataService.mjs.map +1 -0
  26. package/dist/index.cjs +6 -1
  27. package/dist/index.cjs.map +1 -1
  28. package/dist/index.d.cts +5 -2
  29. package/dist/index.d.cts.map +1 -1
  30. package/dist/index.d.mts +5 -2
  31. package/dist/index.d.mts.map +1 -1
  32. package/dist/index.mjs +2 -1
  33. package/dist/index.mjs.map +1 -1
  34. package/dist/types.cjs +30 -1
  35. package/dist/types.cjs.map +1 -1
  36. package/dist/types.d.cts +155 -0
  37. package/dist/types.d.cts.map +1 -1
  38. package/dist/types.d.mts +155 -0
  39. package/dist/types.d.mts.map +1 -1
  40. package/dist/types.mjs +29 -0
  41. package/dist/types.mjs.map +1 -1
  42. package/dist/utils.cjs +3 -52
  43. package/dist/utils.cjs.map +1 -1
  44. package/dist/utils.d.cts +2 -32
  45. package/dist/utils.d.cts.map +1 -1
  46. package/dist/utils.d.mts +2 -32
  47. package/dist/utils.d.mts.map +1 -1
  48. package/dist/utils.mjs +1 -48
  49. package/dist/utils.mjs.map +1 -1
  50. package/package.json +6 -1
  51. package/dist/CacheManager.cjs +0 -177
  52. package/dist/CacheManager.cjs.map +0 -1
  53. package/dist/CacheManager.d.cts +0 -104
  54. package/dist/CacheManager.d.cts.map +0 -1
  55. package/dist/CacheManager.d.mts +0 -104
  56. package/dist/CacheManager.d.mts.map +0 -1
  57. package/dist/CacheManager.mjs +0 -173
  58. package/dist/CacheManager.mjs.map +0 -1
@@ -10,73 +10,48 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
10
10
  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");
11
11
  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
12
12
  };
13
- var _PhishingController_instances, _PhishingController_detector, _PhishingController_stalelistRefreshInterval, _PhishingController_hotlistRefreshInterval, _PhishingController_c2DomainBlocklistRefreshInterval, _PhishingController_urlScanCache, _PhishingController_tokenScanCache, _PhishingController_addressScanCache, _PhishingController_knownRecipients, _PhishingController_transactionRecipients, _PhishingController_transactionRecipientsByTransactionId, _PhishingController_transactionRecipientCounts, _PhishingController_addressBookRecipients, _PhishingController_inProgressHotlistUpdate, _PhishingController_inProgressStalelistUpdate, _PhishingController_isProgressC2DomainBlocklistUpdate, _PhishingController_transactionControllerStateChangeHandler, _PhishingController_addressBookControllerStateChangeHandler, _PhishingController_subscribeToAddressBookControllerStateChange, _PhishingController_subscribeToTransactionControllerStateChange, _PhishingController_isTransactionPatch, _PhishingController_isSimulationDataPatch, _PhishingController_onTransactionControllerStateChange, _PhishingController_onAddressBookControllerStateChange, _PhishingController_getTokensFromTransaction, _PhishingController_scanTokensByChain, _PhishingController_hydrateKnownRecipients, _PhishingController_hydrateKnownRecipientsFromTransactionState, _PhishingController_hydrateKnownRecipientsFromAddressBookState, _PhishingController_setKnownRecipientsFromTransactionState, _PhishingController_updateKnownRecipientsFromTransactionPatches, _PhishingController_getTransactionFromPatchValue, _PhishingController_updateTransactionRecipients, _PhishingController_addTransactionRecipients, _PhishingController_removeTransactionRecipients, _PhishingController_setKnownRecipientsFromAddressBookState, _PhishingController_rebuildKnownRecipients, _PhishingController_getAddressBookRecipients, _PhishingController_getRecipientAddressesFromTransaction, _PhishingController_normalizeAddress, _PhishingController_fetchTokenScanBulkResults, _PhishingController_processBatch, _PhishingController_updateStalelist, _PhishingController_updateHotlist, _PhishingController_updateC2DomainBlocklist, _PhishingController_queryConfig;
13
+ var _PhishingController_instances, _PhishingController_detector, _PhishingController_stalelistRefreshInterval, _PhishingController_hotlistRefreshInterval, _PhishingController_c2DomainBlocklistRefreshInterval, _PhishingController_knownRecipients, _PhishingController_transactionRecipients, _PhishingController_transactionRecipientsByTransactionId, _PhishingController_transactionRecipientCounts, _PhishingController_addressBookRecipients, _PhishingController_inProgressHotlistUpdate, _PhishingController_inProgressStalelistUpdate, _PhishingController_isProgressC2DomainBlocklistUpdate, _PhishingController_transactionControllerStateChangeHandler, _PhishingController_addressBookControllerStateChangeHandler, _PhishingController_subscribeToAddressBookControllerStateChange, _PhishingController_subscribeToTransactionControllerStateChange, _PhishingController_isTransactionPatch, _PhishingController_isSimulationDataPatch, _PhishingController_onTransactionControllerStateChange, _PhishingController_onAddressBookControllerStateChange, _PhishingController_getTokensFromTransaction, _PhishingController_scanTokensByChain, _PhishingController_hydrateKnownRecipients, _PhishingController_hydrateKnownRecipientsFromTransactionState, _PhishingController_hydrateKnownRecipientsFromAddressBookState, _PhishingController_setKnownRecipientsFromTransactionState, _PhishingController_updateKnownRecipientsFromTransactionPatches, _PhishingController_getTransactionFromPatchValue, _PhishingController_updateTransactionRecipients, _PhishingController_addTransactionRecipients, _PhishingController_removeTransactionRecipients, _PhishingController_setKnownRecipientsFromAddressBookState, _PhishingController_rebuildKnownRecipients, _PhishingController_getAddressBookRecipients, _PhishingController_getRecipientAddressesFromTransaction, _PhishingController_normalizeAddress, _PhishingController_fetchTokenScanBulkResults, _PhishingController_processBatch, _PhishingController_updateStalelist, _PhishingController_updateHotlist, _PhishingController_updateC2DomainBlocklist, _PhishingController_safelyCallService, _PhishingController_callWithTimeout;
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.PhishingController = exports.phishingListKeyNameMap = exports.ListNames = exports.ListKeys = exports.C2_DOMAIN_BLOCKLIST_URL = exports.METAMASK_HOTLIST_DIFF_URL = exports.METAMASK_STALELIST_URL = exports.STALELIST_REFRESH_INTERVAL = exports.HOTLIST_REFRESH_INTERVAL = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL = exports.DEFAULT_ADDRESS_SCAN_CACHE_MAX_SIZE = exports.DEFAULT_ADDRESS_SCAN_CACHE_TTL = exports.DEFAULT_TOKEN_SCAN_CACHE_MAX_SIZE = exports.DEFAULT_TOKEN_SCAN_CACHE_TTL = exports.DEFAULT_URL_SCAN_CACHE_MAX_SIZE = exports.DEFAULT_URL_SCAN_CACHE_TTL = exports.APPROVALS_ENDPOINT = exports.ADDRESS_SCAN_ENDPOINT = exports.TOKEN_BULK_SCANNING_ENDPOINT = exports.SECURITY_ALERTS_BASE_URL = exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT = exports.PHISHING_DETECTION_SCAN_ENDPOINT = exports.PHISHING_DETECTION_BASE_URL = exports.C2_DOMAIN_BLOCKLIST_ENDPOINT = exports.CLIENT_SIDE_DETECION_BASE_URL = exports.METAMASK_HOTLIST_DIFF_FILE = exports.METAMASK_STALELIST_FILE = exports.PHISHING_CONFIG_BASE_URL = void 0;
15
+ exports.PhishingController = exports.STALELIST_REFRESH_INTERVAL = exports.HOTLIST_REFRESH_INTERVAL = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL = exports.phishingListKeyNameMap = exports.ListNames = exports.ListKeys = exports.C2_DOMAIN_BLOCKLIST_URL = exports.METAMASK_HOTLIST_DIFF_URL = exports.METAMASK_STALELIST_URL = exports.APPROVALS_ENDPOINT = exports.ADDRESS_SCAN_ENDPOINT = exports.TOKEN_BULK_SCANNING_ENDPOINT = exports.SECURITY_ALERTS_BASE_URL = exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT = exports.PHISHING_DETECTION_SCAN_ENDPOINT = exports.PHISHING_DETECTION_BASE_URL = exports.C2_DOMAIN_BLOCKLIST_ENDPOINT = exports.CLIENT_SIDE_DETECION_BASE_URL = exports.METAMASK_HOTLIST_DIFF_FILE = exports.METAMASK_STALELIST_FILE = exports.PHISHING_CONFIG_BASE_URL = void 0;
16
16
  const base_controller_1 = require("@metamask/base-controller");
17
17
  const controller_utils_1 = require("@metamask/controller-utils");
18
+ const utils_1 = require("@metamask/utils");
18
19
  const transaction_controller_1 = require("@metamask/transaction-controller");
19
20
  const punycode_js_1 = require("punycode/punycode.js");
20
21
  const address_poisoning_js_1 = require("./address-poisoning.cjs");
21
- const CacheManager_js_1 = require("./CacheManager.cjs");
22
22
  const PathTrie_js_1 = require("./PathTrie.cjs");
23
23
  const PhishingDetector_js_1 = require("./PhishingDetector.cjs");
24
24
  const types_js_1 = require("./types.cjs");
25
25
  const utils_js_1 = require("./utils.cjs");
26
- exports.PHISHING_CONFIG_BASE_URL = 'https://phishing-detection.api.cx.metamask.io';
27
- exports.METAMASK_STALELIST_FILE = '/v1/stalelist';
28
- exports.METAMASK_HOTLIST_DIFF_FILE = '/v2/diffsSince';
29
- exports.CLIENT_SIDE_DETECION_BASE_URL = 'https://client-side-detection.api.cx.metamask.io';
30
- exports.C2_DOMAIN_BLOCKLIST_ENDPOINT = '/v1/request-blocklist';
31
- exports.PHISHING_DETECTION_BASE_URL = 'https://dapp-scanning.api.cx.metamask.io';
32
- exports.PHISHING_DETECTION_SCAN_ENDPOINT = 'v2/scan';
33
- exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT = 'bulk-scan';
34
- exports.SECURITY_ALERTS_BASE_URL = 'https://security-alerts.api.cx.metamask.io';
35
- exports.TOKEN_BULK_SCANNING_ENDPOINT = '/token/scan-bulk';
36
- exports.ADDRESS_SCAN_ENDPOINT = '/address/evm/scan';
37
- exports.APPROVALS_ENDPOINT = '/address/evm/approvals';
38
- // Cache configuration defaults
39
- exports.DEFAULT_URL_SCAN_CACHE_TTL = 1 * 60; // 1 minute in seconds
40
- exports.DEFAULT_URL_SCAN_CACHE_MAX_SIZE = 250;
41
- exports.DEFAULT_TOKEN_SCAN_CACHE_TTL = 1 * 60; // 1 minute in seconds
42
- exports.DEFAULT_TOKEN_SCAN_CACHE_MAX_SIZE = 1000;
43
- exports.DEFAULT_ADDRESS_SCAN_CACHE_TTL = 1 * 60; // 1 minute in seconds
44
- exports.DEFAULT_ADDRESS_SCAN_CACHE_MAX_SIZE = 1000;
26
+ var PhishingDataService_js_1 = require("./PhishingDataService.cjs");
27
+ Object.defineProperty(exports, "PHISHING_CONFIG_BASE_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.PHISHING_CONFIG_BASE_URL; } });
28
+ Object.defineProperty(exports, "METAMASK_STALELIST_FILE", { enumerable: true, get: function () { return PhishingDataService_js_1.METAMASK_STALELIST_FILE; } });
29
+ Object.defineProperty(exports, "METAMASK_HOTLIST_DIFF_FILE", { enumerable: true, get: function () { return PhishingDataService_js_1.METAMASK_HOTLIST_DIFF_FILE; } });
30
+ Object.defineProperty(exports, "CLIENT_SIDE_DETECION_BASE_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.CLIENT_SIDE_DETECION_BASE_URL; } });
31
+ Object.defineProperty(exports, "C2_DOMAIN_BLOCKLIST_ENDPOINT", { enumerable: true, get: function () { return PhishingDataService_js_1.C2_DOMAIN_BLOCKLIST_ENDPOINT; } });
32
+ Object.defineProperty(exports, "PHISHING_DETECTION_BASE_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.PHISHING_DETECTION_BASE_URL; } });
33
+ Object.defineProperty(exports, "PHISHING_DETECTION_SCAN_ENDPOINT", { enumerable: true, get: function () { return PhishingDataService_js_1.PHISHING_DETECTION_SCAN_ENDPOINT; } });
34
+ Object.defineProperty(exports, "PHISHING_DETECTION_BULK_SCAN_ENDPOINT", { enumerable: true, get: function () { return PhishingDataService_js_1.PHISHING_DETECTION_BULK_SCAN_ENDPOINT; } });
35
+ Object.defineProperty(exports, "SECURITY_ALERTS_BASE_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.SECURITY_ALERTS_BASE_URL; } });
36
+ Object.defineProperty(exports, "TOKEN_BULK_SCANNING_ENDPOINT", { enumerable: true, get: function () { return PhishingDataService_js_1.TOKEN_BULK_SCANNING_ENDPOINT; } });
37
+ Object.defineProperty(exports, "ADDRESS_SCAN_ENDPOINT", { enumerable: true, get: function () { return PhishingDataService_js_1.ADDRESS_SCAN_ENDPOINT; } });
38
+ Object.defineProperty(exports, "APPROVALS_ENDPOINT", { enumerable: true, get: function () { return PhishingDataService_js_1.APPROVALS_ENDPOINT; } });
39
+ Object.defineProperty(exports, "METAMASK_STALELIST_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.METAMASK_STALELIST_URL; } });
40
+ Object.defineProperty(exports, "METAMASK_HOTLIST_DIFF_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.METAMASK_HOTLIST_DIFF_URL; } });
41
+ Object.defineProperty(exports, "C2_DOMAIN_BLOCKLIST_URL", { enumerable: true, get: function () { return PhishingDataService_js_1.C2_DOMAIN_BLOCKLIST_URL; } });
42
+ var types_js_2 = require("./types.cjs");
43
+ Object.defineProperty(exports, "ListKeys", { enumerable: true, get: function () { return types_js_2.ListKeys; } });
44
+ Object.defineProperty(exports, "ListNames", { enumerable: true, get: function () { return types_js_2.ListNames; } });
45
+ Object.defineProperty(exports, "phishingListKeyNameMap", { enumerable: true, get: function () { return types_js_2.phishingListKeyNameMap; } });
45
46
  exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL = 5 * 60; // 5 mins in seconds
46
47
  exports.HOTLIST_REFRESH_INTERVAL = 5 * 60; // 5 mins in seconds
47
48
  exports.STALELIST_REFRESH_INTERVAL = 30 * 24 * 60 * 60; // 30 days in seconds
48
- exports.METAMASK_STALELIST_URL = `${exports.PHISHING_CONFIG_BASE_URL}${exports.METAMASK_STALELIST_FILE}`;
49
- exports.METAMASK_HOTLIST_DIFF_URL = `${exports.PHISHING_CONFIG_BASE_URL}${exports.METAMASK_HOTLIST_DIFF_FILE}`;
50
- exports.C2_DOMAIN_BLOCKLIST_URL = `${exports.CLIENT_SIDE_DETECION_BASE_URL}${exports.C2_DOMAIN_BLOCKLIST_ENDPOINT}`;
51
- /**
52
- * Enum containing upstream data provider source list keys.
53
- * These are the keys denoting lists consumed by the upstream data provider.
54
- */
55
- var ListKeys;
56
- (function (ListKeys) {
57
- ListKeys["EthPhishingDetectConfig"] = "eth_phishing_detect_config";
58
- })(ListKeys || (exports.ListKeys = ListKeys = {}));
59
- /**
60
- * Enum containing downstream client attribution names.
61
- */
62
- var ListNames;
63
- (function (ListNames) {
64
- ListNames["MetaMask"] = "MetaMask";
65
- })(ListNames || (exports.ListNames = ListNames = {}));
66
- /**
67
- * Maps from downstream client attribution name
68
- * to list key sourced from upstream data provider.
69
- */
70
- const phishingListNameKeyMap = {
71
- [ListNames.MetaMask]: ListKeys.EthPhishingDetectConfig,
72
- };
73
- /**
74
- * Maps from list key sourced from upstream data
75
- * provider to downstream client attribution name.
76
- */
77
- exports.phishingListKeyNameMap = {
78
- [ListKeys.EthPhishingDetectConfig]: ListNames.MetaMask,
79
- };
49
+ // Request timeouts, in milliseconds.
50
+ const URL_SCAN_TIMEOUT = 8000;
51
+ const BULK_URL_SCAN_TIMEOUT = 15000;
52
+ const TOKEN_SCAN_TIMEOUT = 8000;
53
+ const ADDRESS_SCAN_TIMEOUT = 5000;
54
+ const APPROVALS_TIMEOUT = 5000;
80
55
  const controllerName = 'PhishingController';
81
56
  const metadata = {
82
57
  phishingLists: {
@@ -115,24 +90,6 @@ const metadata = {
115
90
  includeInDebugSnapshot: false,
116
91
  usedInUi: false,
117
92
  },
118
- urlScanCache: {
119
- includeInStateLogs: false,
120
- persist: true,
121
- includeInDebugSnapshot: false,
122
- usedInUi: true,
123
- },
124
- tokenScanCache: {
125
- includeInStateLogs: false,
126
- persist: true,
127
- includeInDebugSnapshot: false,
128
- usedInUi: true,
129
- },
130
- addressScanCache: {
131
- includeInStateLogs: false,
132
- persist: true,
133
- includeInDebugSnapshot: false,
134
- usedInUi: true,
135
- },
136
93
  };
137
94
  /**
138
95
  * Get a default empty state for the controller.
@@ -147,9 +104,6 @@ const getDefaultState = () => {
147
104
  hotlistLastFetched: 0,
148
105
  stalelistLastFetched: 0,
149
106
  c2DomainBlocklistLastFetched: 0,
150
- urlScanCache: {},
151
- tokenScanCache: {},
152
- addressScanCache: {},
153
107
  };
154
108
  };
155
109
  const MESSENGER_EXPOSED_METHODS = [
@@ -175,16 +129,10 @@ class PhishingController extends base_controller_1.BaseController {
175
129
  * @param config.stalelistRefreshInterval - Polling interval used to fetch stale list.
176
130
  * @param config.hotlistRefreshInterval - Polling interval used to fetch hotlist diff list.
177
131
  * @param config.c2DomainBlocklistRefreshInterval - Polling interval used to fetch c2 domain blocklist.
178
- * @param config.urlScanCacheTTL - Time to live in seconds for cached scan results.
179
- * @param config.urlScanCacheMaxSize - Maximum number of entries in the scan cache.
180
- * @param config.tokenScanCacheTTL - Time to live in seconds for cached token scan results.
181
- * @param config.tokenScanCacheMaxSize - Maximum number of entries in the token scan cache.
182
- * @param config.addressScanCacheTTL - Time to live in seconds for cached address scan results.
183
- * @param config.addressScanCacheMaxSize - Maximum number of entries in the address scan cache.
184
132
  * @param config.messenger - The controller restricted messenger.
185
133
  * @param config.state - Initial state to set on this controller.
186
134
  */
187
- constructor({ stalelistRefreshInterval = exports.STALELIST_REFRESH_INTERVAL, hotlistRefreshInterval = exports.HOTLIST_REFRESH_INTERVAL, c2DomainBlocklistRefreshInterval = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL, urlScanCacheTTL = exports.DEFAULT_URL_SCAN_CACHE_TTL, urlScanCacheMaxSize = exports.DEFAULT_URL_SCAN_CACHE_MAX_SIZE, tokenScanCacheTTL = exports.DEFAULT_TOKEN_SCAN_CACHE_TTL, tokenScanCacheMaxSize = exports.DEFAULT_TOKEN_SCAN_CACHE_MAX_SIZE, addressScanCacheTTL = exports.DEFAULT_ADDRESS_SCAN_CACHE_TTL, addressScanCacheMaxSize = exports.DEFAULT_ADDRESS_SCAN_CACHE_MAX_SIZE, messenger, state = {}, }) {
135
+ constructor({ stalelistRefreshInterval = exports.STALELIST_REFRESH_INTERVAL, hotlistRefreshInterval = exports.HOTLIST_REFRESH_INTERVAL, c2DomainBlocklistRefreshInterval = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL, messenger, state = {}, }) {
188
136
  super({
189
137
  name: controllerName,
190
138
  metadata,
@@ -201,9 +149,6 @@ class PhishingController extends base_controller_1.BaseController {
201
149
  _PhishingController_stalelistRefreshInterval.set(this, void 0);
202
150
  _PhishingController_hotlistRefreshInterval.set(this, void 0);
203
151
  _PhishingController_c2DomainBlocklistRefreshInterval.set(this, void 0);
204
- _PhishingController_urlScanCache.set(this, void 0);
205
- _PhishingController_tokenScanCache.set(this, void 0);
206
- _PhishingController_addressScanCache.set(this, void 0);
207
152
  _PhishingController_knownRecipients.set(this, void 0);
208
153
  _PhishingController_transactionRecipients.set(this, void 0);
209
154
  _PhishingController_transactionRecipientsByTransactionId.set(this, void 0);
@@ -234,39 +179,18 @@ class PhishingController extends base_controller_1.BaseController {
234
179
  * @returns The API response or null if there was an error.
235
180
  */
236
181
  _PhishingController_fetchTokenScanBulkResults.set(this, async (chain, tokens) => {
237
- const timeout = 8000; // 8 seconds
238
- const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
239
- const response = await fetch(`${exports.SECURITY_ALERTS_BASE_URL}${exports.TOKEN_BULK_SCANNING_ENDPOINT}`, {
240
- method: 'POST',
241
- headers: {
242
- Accept: 'application/json',
243
- 'Content-Type': 'application/json',
244
- },
245
- body: JSON.stringify({
246
- chain,
247
- tokens,
248
- }),
249
- });
250
- if (!response.ok) {
251
- return {
252
- error: `${response.status} ${response.statusText}`,
253
- status: response.status,
254
- statusText: response.statusText,
255
- };
256
- }
257
- const data = await response.json();
258
- return data;
259
- }, true, timeout);
260
- if (!apiResponse) {
261
- console.error(`Error scanning tokens: timeout of ${timeout}ms exceeded`);
262
- return null;
182
+ try {
183
+ return await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_callWithTimeout).call(this, this.messenger.call('PhishingDataService:bulkScanTokens', chain, tokens), TOKEN_SCAN_TIMEOUT);
263
184
  }
264
- if (apiResponse.error) {
265
- const { status, statusText } = apiResponse;
266
- console.warn(`Token bulk screening API error: ${status} ${statusText}`);
185
+ catch (error) {
186
+ if (error instanceof controller_utils_1.HttpError) {
187
+ console.warn(`Token bulk screening API error: ${error.message}`);
188
+ }
189
+ else {
190
+ console.error(`Error scanning tokens: ${(0, utils_1.getErrorMessage)(error)}`);
191
+ }
267
192
  return null;
268
193
  }
269
- return apiResponse;
270
194
  });
271
195
  /**
272
196
  * Get token approvals for an EVM address with security enrichments.
@@ -285,32 +209,12 @@ class PhishingController extends base_controller_1.BaseController {
285
209
  if (!chain || !(0, utils_js_1.isApprovalSupportedChain)(chain)) {
286
210
  return { approvals: [] };
287
211
  }
288
- const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
289
- const res = await fetch(`${exports.SECURITY_ALERTS_BASE_URL}${exports.APPROVALS_ENDPOINT}`, {
290
- method: 'POST',
291
- headers: {
292
- Accept: 'application/json',
293
- 'Content-Type': 'application/json',
294
- },
295
- body: JSON.stringify({
296
- chain,
297
- address: normalizedAddress,
298
- }),
299
- });
300
- if (!res.ok) {
301
- return { error: `${res.status} ${res.statusText}` };
302
- }
303
- const data = await res.json();
304
- return data;
305
- }, true, 5000);
306
- if (!apiResponse) {
307
- return { approvals: [] };
212
+ try {
213
+ return await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_callWithTimeout).call(this, this.messenger.call('PhishingDataService:getApprovals', chain, normalizedAddress), APPROVALS_TIMEOUT);
308
214
  }
309
- if (apiResponse.error ||
310
- !Array.isArray(apiResponse.approvals)) {
215
+ catch {
311
216
  return { approvals: [] };
312
217
  }
313
- return apiResponse;
314
218
  };
315
219
  /**
316
220
  * Process a batch of URLs (up to 50) for phishing detection.
@@ -319,45 +223,25 @@ class PhishingController extends base_controller_1.BaseController {
319
223
  * @returns The scan results and errors for this batch.
320
224
  */
321
225
  _PhishingController_processBatch.set(this, async (urls) => {
322
- const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
323
- const res = await fetch(`${exports.PHISHING_DETECTION_BASE_URL}/${exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT}`, {
324
- method: 'POST',
325
- headers: {
326
- Accept: 'application/json',
327
- 'Content-Type': 'application/json',
328
- },
329
- body: JSON.stringify({ urls }),
330
- });
331
- if (!res.ok) {
226
+ try {
227
+ return await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_callWithTimeout).call(this, this.messenger.call('PhishingDataService:bulkScanUrls', urls), BULK_URL_SCAN_TIMEOUT);
228
+ }
229
+ catch (error) {
230
+ if (error instanceof controller_utils_1.HttpError) {
332
231
  return {
333
- error: `${res.status} ${res.statusText}`,
334
- status: res.status,
335
- statusText: res.statusText,
232
+ results: {},
233
+ errors: {
234
+ api_error: [error.message],
235
+ },
336
236
  };
337
237
  }
338
- const data = await res.json();
339
- return data;
340
- }, true, 15000);
341
- // Handle timeout or network errors
342
- if (!apiResponse) {
343
- return {
344
- results: {},
345
- errors: {
346
- network_error: ['timeout of 15000ms exceeded'],
347
- },
348
- };
349
- }
350
- // Handle HTTP error responses
351
- if (apiResponse.error) {
352
- const { status, statusText } = apiResponse;
353
238
  return {
354
239
  results: {},
355
240
  errors: {
356
- api_error: [`${status} ${statusText}`],
241
+ network_error: [(0, utils_1.getErrorMessage)(error)],
357
242
  },
358
243
  };
359
244
  }
360
- return apiResponse;
361
245
  });
362
246
  __classPrivateFieldSet(this, _PhishingController_stalelistRefreshInterval, stalelistRefreshInterval, "f");
363
247
  __classPrivateFieldSet(this, _PhishingController_hotlistRefreshInterval, hotlistRefreshInterval, "f");
@@ -369,36 +253,6 @@ class PhishingController extends base_controller_1.BaseController {
369
253
  __classPrivateFieldSet(this, _PhishingController_addressBookRecipients, new Set(), "f");
370
254
  __classPrivateFieldSet(this, _PhishingController_transactionControllerStateChangeHandler, __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_onTransactionControllerStateChange).bind(this), "f");
371
255
  __classPrivateFieldSet(this, _PhishingController_addressBookControllerStateChangeHandler, __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_onAddressBookControllerStateChange).bind(this), "f");
372
- __classPrivateFieldSet(this, _PhishingController_urlScanCache, new CacheManager_js_1.CacheManager({
373
- cacheTTL: urlScanCacheTTL,
374
- maxCacheSize: urlScanCacheMaxSize,
375
- initialCache: this.state.urlScanCache,
376
- updateState: (cache) => {
377
- this.update((draftState) => {
378
- draftState.urlScanCache = cache;
379
- });
380
- },
381
- }), "f");
382
- __classPrivateFieldSet(this, _PhishingController_tokenScanCache, new CacheManager_js_1.CacheManager({
383
- cacheTTL: tokenScanCacheTTL,
384
- maxCacheSize: tokenScanCacheMaxSize,
385
- initialCache: this.state.tokenScanCache,
386
- updateState: (cache) => {
387
- this.update((draftState) => {
388
- draftState.tokenScanCache = cache;
389
- });
390
- },
391
- }), "f");
392
- __classPrivateFieldSet(this, _PhishingController_addressScanCache, new CacheManager_js_1.CacheManager({
393
- cacheTTL: addressScanCacheTTL,
394
- maxCacheSize: addressScanCacheMaxSize,
395
- initialCache: this.state.addressScanCache,
396
- updateState: (cache) => {
397
- this.update((draftState) => {
398
- draftState.addressScanCache = cache;
399
- });
400
- },
401
- }), "f");
402
256
  this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
403
257
  this.updatePhishingDetector();
404
258
  __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_hydrateKnownRecipients).call(this);
@@ -612,47 +466,21 @@ class PhishingController extends base_controller_1.BaseController {
612
466
  };
613
467
  }
614
468
  const [hostname] = (0, utils_js_1.getHostnameFromWebUrl)(url);
615
- const cachedResult = __classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").get(scanUrlParam);
616
- if (cachedResult) {
617
- return cachedResult;
618
- }
619
- const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
620
- const res = await fetch(`${exports.PHISHING_DETECTION_BASE_URL}/${exports.PHISHING_DETECTION_SCAN_ENDPOINT}?url=${encodeURIComponent(scanUrlParam)}`, {
621
- method: 'GET',
622
- headers: {
623
- Accept: 'application/json',
624
- },
625
- });
626
- if (!res.ok) {
627
- return {
628
- error: `${res.status} ${res.statusText}`,
629
- };
630
- }
631
- const data = await res.json();
632
- return data;
633
- }, true, 8000);
634
- // Need to do it this way because safelyExecuteWithTimeout returns undefined for both timeouts and errors.
635
- if (!apiResponse) {
636
- return {
637
- hostname: '',
638
- recommendedAction: types_js_1.RecommendedAction.None,
639
- fetchError: 'timeout of 8000ms exceeded',
640
- };
469
+ let scanResult;
470
+ try {
471
+ scanResult = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_callWithTimeout).call(this, this.messenger.call('PhishingDataService:scanUrl', scanUrlParam), URL_SCAN_TIMEOUT);
641
472
  }
642
- else if (apiResponse.error) {
473
+ catch (error) {
643
474
  return {
644
475
  hostname: '',
645
476
  recommendedAction: types_js_1.RecommendedAction.None,
646
- fetchError: apiResponse.error,
477
+ fetchError: (0, utils_1.getErrorMessage)(error),
647
478
  };
648
479
  }
649
- const scanResult = apiResponse;
650
- const result = {
480
+ return {
651
481
  hostname,
652
482
  recommendedAction: scanResult.recommendedAction,
653
483
  };
654
- __classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").set(scanUrlParam, result);
655
- return result;
656
484
  }
657
485
  /**
658
486
  * Scan multiple URLs for phishing in bulk. It will only scan the hostnames of the URLs.
@@ -685,8 +513,7 @@ class PhishingController extends base_controller_1.BaseController {
685
513
  results: {},
686
514
  errors: {},
687
515
  };
688
- // Extract hostnames from URLs and check for validity and length constraints
689
- const urlsToHostnames = {};
516
+ // Check URLs for validity and length constraints
690
517
  const urlsToFetch = [];
691
518
  for (const url of urls) {
692
519
  if (url.length > MAX_URL_LENGTH) {
@@ -695,22 +522,12 @@ class PhishingController extends base_controller_1.BaseController {
695
522
  ];
696
523
  continue;
697
524
  }
698
- const [hostname, ok] = (0, utils_js_1.getHostnameFromWebUrl)(url);
525
+ const [, ok] = (0, utils_js_1.getHostnameFromWebUrl)(url);
699
526
  if (!ok) {
700
527
  combinedResponse.errors[url] = ['url is not a valid web URL'];
701
528
  continue;
702
529
  }
703
- // Check if result is already in cache
704
- const cachedResult = __classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").get(hostname);
705
- if (cachedResult) {
706
- // Use cached result
707
- combinedResponse.results[url] = cachedResult;
708
- }
709
- else {
710
- // Add to list of URLs to fetch
711
- urlsToHostnames[url] = hostname;
712
- urlsToFetch.push(url);
713
- }
530
+ urlsToFetch.push(url);
714
531
  }
715
532
  // If there are URLs to fetch, process them in batches
716
533
  if (urlsToFetch.length > 0) {
@@ -724,12 +541,7 @@ class PhishingController extends base_controller_1.BaseController {
724
541
  const batchResults = await Promise.all(batches.map((batchUrls) => __classPrivateFieldGet(this, _PhishingController_processBatch, "f").call(this, batchUrls)));
725
542
  // Merge results and errors from all batches
726
543
  batchResults.forEach((batchResponse) => {
727
- // Add results to cache and combine with response
728
544
  Object.entries(batchResponse.results).forEach(([url, result]) => {
729
- const hostname = urlsToHostnames[url];
730
- if (hostname) {
731
- __classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").set(hostname, result);
732
- }
733
545
  combinedResponse.results[url] = result;
734
546
  });
735
547
  // Combine errors
@@ -766,56 +578,19 @@ class PhishingController extends base_controller_1.BaseController {
766
578
  label: '',
767
579
  };
768
580
  }
769
- const cacheKey = (0, utils_js_1.buildCacheKey)(normalizedChainId, normalizedAddress);
770
- const cachedResult = __classPrivateFieldGet(this, _PhishingController_addressScanCache, "f").get(cacheKey);
771
- if (cachedResult) {
772
- return {
773
- result_type: cachedResult.result_type,
774
- label: cachedResult.label,
775
- };
776
- }
777
- const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
778
- const res = await fetch(`${exports.SECURITY_ALERTS_BASE_URL}${exports.ADDRESS_SCAN_ENDPOINT}`, {
779
- method: 'POST',
780
- headers: {
781
- Accept: 'application/json',
782
- 'Content-Type': 'application/json',
783
- },
784
- body: JSON.stringify({
785
- chain,
786
- address: normalizedAddress,
787
- }),
788
- });
789
- if (!res.ok) {
790
- return {
791
- error: `${res.status} ${res.statusText}`,
792
- };
793
- }
794
- const data = await res.json();
795
- return data;
796
- }, true, 5000);
797
- if (!apiResponse) {
581
+ try {
582
+ const scanResult = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_callWithTimeout).call(this, this.messenger.call('PhishingDataService:scanAddress', chain, normalizedAddress), ADDRESS_SCAN_TIMEOUT);
798
583
  return {
799
- result_type: types_js_1.AddressScanResultType.ErrorResult,
800
- label: '',
584
+ result_type: scanResult.result_type,
585
+ label: scanResult.label,
801
586
  };
802
587
  }
803
- else if (apiResponse.error) {
588
+ catch {
804
589
  return {
805
590
  result_type: types_js_1.AddressScanResultType.ErrorResult,
806
591
  label: '',
807
592
  };
808
593
  }
809
- const scanResult = apiResponse;
810
- const result = {
811
- result_type: scanResult.result_type,
812
- label: scanResult.label,
813
- };
814
- __classPrivateFieldGet(this, _PhishingController_addressScanCache, "f").set(cacheKey, result);
815
- return {
816
- result_type: scanResult.result_type,
817
- label: scanResult.label,
818
- };
819
594
  }
820
595
  /**
821
596
  * Scan multiple tokens for malicious activity in bulk.
@@ -848,32 +623,20 @@ class PhishingController extends base_controller_1.BaseController {
848
623
  // EVM addresses are case-insensitive; non-EVM addresses (e.g. Solana
849
624
  // base58) are case-sensitive and must not be lowercased.
850
625
  const caseSensitive = !normalizedChainId.startsWith('0x');
851
- // Split tokens into cached results and tokens that need to be fetched
852
- const { cachedResults, tokensToFetch } = (0, utils_js_1.splitCacheHits)(__classPrivateFieldGet(this, _PhishingController_tokenScanCache, "f"), normalizedChainId, tokens, caseSensitive);
853
- const results = { ...cachedResults };
854
- // If there are tokens to fetch, call the bulk token scan API
855
- if (tokensToFetch.length > 0) {
856
- const apiResponse = await __classPrivateFieldGet(this, _PhishingController_fetchTokenScanBulkResults, "f").call(this, chain, tokensToFetch);
857
- if (apiResponse?.results) {
858
- // Process API results and update cache
859
- for (const tokenAddress of tokensToFetch) {
860
- const normalizedAddress = caseSensitive
861
- ? tokenAddress
862
- : tokenAddress.toLowerCase();
863
- const tokenResult = apiResponse.results[normalizedAddress];
864
- if (tokenResult?.result_type) {
865
- const result = {
866
- result_type: tokenResult.result_type,
867
- chain: tokenResult.chain || normalizedChainId,
868
- address: tokenResult.address || normalizedAddress,
869
- };
870
- // Update cache
871
- const cacheKey = (0, utils_js_1.buildCacheKey)(normalizedChainId, normalizedAddress, caseSensitive);
872
- __classPrivateFieldGet(this, _PhishingController_tokenScanCache, "f").set(cacheKey, {
873
- result_type: tokenResult.result_type,
874
- });
875
- results[normalizedAddress] = result;
876
- }
626
+ const normalizedTokens = caseSensitive
627
+ ? tokens
628
+ : tokens.map((tokenAddress) => tokenAddress.toLowerCase());
629
+ const results = {};
630
+ const apiResponse = await __classPrivateFieldGet(this, _PhishingController_fetchTokenScanBulkResults, "f").call(this, chain, normalizedTokens);
631
+ if (apiResponse?.results) {
632
+ for (const normalizedAddress of normalizedTokens) {
633
+ const tokenResult = apiResponse.results[normalizedAddress];
634
+ if (tokenResult?.result_type) {
635
+ results[normalizedAddress] = {
636
+ result_type: tokenResult.result_type,
637
+ chain: tokenResult.chain || normalizedChainId,
638
+ address: tokenResult.address || normalizedAddress,
639
+ };
877
640
  }
878
641
  }
879
642
  }
@@ -881,7 +644,7 @@ class PhishingController extends base_controller_1.BaseController {
881
644
  }
882
645
  }
883
646
  exports.PhishingController = PhishingController;
884
- _PhishingController_detector = new WeakMap(), _PhishingController_stalelistRefreshInterval = new WeakMap(), _PhishingController_hotlistRefreshInterval = new WeakMap(), _PhishingController_c2DomainBlocklistRefreshInterval = new WeakMap(), _PhishingController_urlScanCache = new WeakMap(), _PhishingController_tokenScanCache = new WeakMap(), _PhishingController_addressScanCache = new WeakMap(), _PhishingController_knownRecipients = new WeakMap(), _PhishingController_transactionRecipients = new WeakMap(), _PhishingController_transactionRecipientsByTransactionId = new WeakMap(), _PhishingController_transactionRecipientCounts = new WeakMap(), _PhishingController_addressBookRecipients = new WeakMap(), _PhishingController_inProgressHotlistUpdate = new WeakMap(), _PhishingController_inProgressStalelistUpdate = new WeakMap(), _PhishingController_isProgressC2DomainBlocklistUpdate = new WeakMap(), _PhishingController_transactionControllerStateChangeHandler = new WeakMap(), _PhishingController_addressBookControllerStateChangeHandler = new WeakMap(), _PhishingController_fetchTokenScanBulkResults = new WeakMap(), _PhishingController_processBatch = new WeakMap(), _PhishingController_instances = new WeakSet(), _PhishingController_subscribeToAddressBookControllerStateChange = function _PhishingController_subscribeToAddressBookControllerStateChange() {
647
+ _PhishingController_detector = new WeakMap(), _PhishingController_stalelistRefreshInterval = new WeakMap(), _PhishingController_hotlistRefreshInterval = new WeakMap(), _PhishingController_c2DomainBlocklistRefreshInterval = new WeakMap(), _PhishingController_knownRecipients = new WeakMap(), _PhishingController_transactionRecipients = new WeakMap(), _PhishingController_transactionRecipientsByTransactionId = new WeakMap(), _PhishingController_transactionRecipientCounts = new WeakMap(), _PhishingController_addressBookRecipients = new WeakMap(), _PhishingController_inProgressHotlistUpdate = new WeakMap(), _PhishingController_inProgressStalelistUpdate = new WeakMap(), _PhishingController_isProgressC2DomainBlocklistUpdate = new WeakMap(), _PhishingController_transactionControllerStateChangeHandler = new WeakMap(), _PhishingController_addressBookControllerStateChangeHandler = new WeakMap(), _PhishingController_fetchTokenScanBulkResults = new WeakMap(), _PhishingController_processBatch = new WeakMap(), _PhishingController_instances = new WeakSet(), _PhishingController_subscribeToAddressBookControllerStateChange = function _PhishingController_subscribeToAddressBookControllerStateChange() {
885
648
  this.messenger.subscribe(
886
649
  // eslint-disable-next-line no-restricted-syntax
887
650
  'AddressBookController:stateChange', __classPrivateFieldGet(this, _PhishingController_addressBookControllerStateChangeHandler, "f"));
@@ -1102,16 +865,17 @@ async function _PhishingController_updateStalelist() {
1102
865
  let hotlistDiffsResponse = null;
1103
866
  let c2DomainBlocklistResponse = null;
1104
867
  try {
1105
- const stalelistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, exports.METAMASK_STALELIST_URL);
1106
- const c2DomainBlocklistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, exports.C2_DOMAIN_BLOCKLIST_URL);
868
+ const stalelistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_safelyCallService).call(this, () => this.messenger.call('PhishingDataService:getStalelist'));
869
+ const c2DomainBlocklistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_safelyCallService).call(this, () => this.messenger.call('PhishingDataService:getC2DomainBlocklist'));
1107
870
  [stalelistResponse, c2DomainBlocklistResponse] = await Promise.all([
1108
871
  stalelistPromise,
1109
872
  c2DomainBlocklistPromise,
1110
873
  ]);
1111
874
  // Fetching hotlist diffs relies on having a lastUpdated timestamp to do `GET /v1/diffsSince/:timestamp`,
1112
875
  // so it doesn't make sense to call if there is not a timestamp to begin with.
1113
- if (stalelistResponse?.data && stalelistResponse.data.lastUpdated > 0) {
1114
- hotlistDiffsResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, `${exports.METAMASK_HOTLIST_DIFF_URL}/${stalelistResponse.data.lastUpdated}`);
876
+ const stalelistData = stalelistResponse?.data;
877
+ if (stalelistData && stalelistData.lastUpdated > 0) {
878
+ hotlistDiffsResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_safelyCallService).call(this, () => this.messenger.call('PhishingDataService:getHotlistDiffs', stalelistData.lastUpdated));
1115
879
  }
1116
880
  }
1117
881
  finally {
@@ -1140,9 +904,9 @@ async function _PhishingController_updateStalelist() {
1140
904
  c2DomainBlocklist: c2DomainBlocklistResponse
1141
905
  ? c2DomainBlocklistResponse.recentlyAdded
1142
906
  : [],
1143
- name: exports.phishingListKeyNameMap.eth_phishing_detect_config,
907
+ name: types_js_1.phishingListKeyNameMap.eth_phishing_detect_config,
1144
908
  };
1145
- const newMetaMaskListState = (0, utils_js_1.applyDiffs)(metamaskListState, hotlistDiffsResponse.data, ListKeys.EthPhishingDetectConfig);
909
+ const newMetaMaskListState = (0, utils_js_1.applyDiffs)(metamaskListState, hotlistDiffsResponse.data, types_js_1.ListKeys.EthPhishingDetectConfig);
1146
910
  this.update((draftState) => {
1147
911
  draftState.phishingLists = [newMetaMaskListState];
1148
912
  });
@@ -1161,7 +925,7 @@ async function _PhishingController_updateHotlist() {
1161
925
  return;
1162
926
  }
1163
927
  const lastDiffTimestamp = Math.max(...this.state.phishingLists.map(({ lastUpdated }) => lastUpdated));
1164
- hotlistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, `${exports.METAMASK_HOTLIST_DIFF_URL}/${lastDiffTimestamp}`);
928
+ hotlistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_safelyCallService).call(this, () => this.messenger.call('PhishingDataService:getHotlistDiffs', lastDiffTimestamp));
1165
929
  }
1166
930
  finally {
1167
931
  // Set `hotlistLastFetched` even for failed requests to prevent server from being overwhelmed with
@@ -1175,7 +939,7 @@ async function _PhishingController_updateHotlist() {
1175
939
  }
1176
940
  const hotlist = hotlistResponse.data;
1177
941
  const newPhishingLists = this.state.phishingLists.map((phishingList) => {
1178
- const updatedList = (0, utils_js_1.applyDiffs)(phishingList, hotlist, phishingListNameKeyMap[phishingList.name], [], []);
942
+ const updatedList = (0, utils_js_1.applyDiffs)(phishingList, hotlist, types_js_1.phishingListNameKeyMap[phishingList.name], [], []);
1179
943
  return updatedList;
1180
944
  });
1181
945
  this.update((draftState) => {
@@ -1190,7 +954,7 @@ async function _PhishingController_updateHotlist() {
1190
954
  * this function that prevents redundant configuration updates.
1191
955
  */
1192
956
  async function _PhishingController_updateC2DomainBlocklist() {
1193
- const c2DomainBlocklistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, `${exports.C2_DOMAIN_BLOCKLIST_URL}?timestamp=${(0, utils_js_1.roundToNearestMinute)(this.state.c2DomainBlocklistLastFetched)}`);
957
+ const c2DomainBlocklistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_safelyCallService).call(this, () => this.messenger.call('PhishingDataService:getC2DomainBlocklist', (0, utils_js_1.roundToNearestMinute)(this.state.c2DomainBlocklistLastFetched)));
1194
958
  if (!c2DomainBlocklistResponse) {
1195
959
  return;
1196
960
  }
@@ -1200,22 +964,55 @@ async function _PhishingController_updateC2DomainBlocklist() {
1200
964
  const recentlyAddedC2Domains = c2DomainBlocklistResponse.recentlyAdded;
1201
965
  const recentlyRemovedC2Domains = c2DomainBlocklistResponse.recentlyRemoved;
1202
966
  const newPhishingLists = this.state.phishingLists.map((phishingList) => {
1203
- const updatedList = (0, utils_js_1.applyDiffs)(phishingList, [], phishingListNameKeyMap[phishingList.name], recentlyAddedC2Domains, recentlyRemovedC2Domains);
967
+ const updatedList = (0, utils_js_1.applyDiffs)(phishingList, [], types_js_1.phishingListNameKeyMap[phishingList.name], recentlyAddedC2Domains, recentlyRemovedC2Domains);
1204
968
  return updatedList;
1205
969
  });
1206
970
  this.update((draftState) => {
1207
971
  draftState.phishingLists = newPhishingLists;
1208
972
  });
1209
973
  this.updatePhishingDetector();
1210
- }, _PhishingController_queryConfig = async function _PhishingController_queryConfig(input) {
1211
- const response = await (0, controller_utils_1.safelyExecute)(() => fetch(input, { cache: 'no-cache' }), true);
1212
- switch (response?.status) {
1213
- case 200: {
1214
- return await response.json();
1215
- }
1216
- default: {
1217
- return null;
1218
- }
974
+ }, _PhishingController_safelyCallService =
975
+ /**
976
+ * Calls the data service, returning `null` instead of throwing if the call
977
+ * fails for any reason (network error, non-2xx response, or malformed
978
+ * response).
979
+ *
980
+ * @param call - The service call to execute.
981
+ * @returns The result of the call, or `null` if it failed.
982
+ */
983
+ async function _PhishingController_safelyCallService(call) {
984
+ try {
985
+ return await call();
986
+ }
987
+ catch (error) {
988
+ console.error(error);
989
+ return null;
990
+ }
991
+ }, _PhishingController_callWithTimeout =
992
+ /**
993
+ * Awaits a promise, rejecting if it does not settle within the given
994
+ * timeout. On timeout, any eventual rejection of the original promise is
995
+ * suppressed to avoid unhandled rejections.
996
+ *
997
+ * @param promise - The promise to await.
998
+ * @param timeout - The timeout in milliseconds.
999
+ * @returns The result of the promise.
1000
+ */
1001
+ async function _PhishingController_callWithTimeout(promise, timeout) {
1002
+ let timer;
1003
+ try {
1004
+ return await Promise.race([
1005
+ promise,
1006
+ new Promise((_resolve, reject) => {
1007
+ timer = setTimeout(() => {
1008
+ promise.catch(() => undefined);
1009
+ reject(new Error(`timeout of ${timeout}ms exceeded`));
1010
+ }, timeout);
1011
+ }),
1012
+ ]);
1013
+ }
1014
+ finally {
1015
+ clearTimeout(timer);
1219
1016
  }
1220
1017
  };
1221
1018
  exports.default = PhishingController;