@metamask/connect-multichain 0.13.0 → 0.15.0

package/dist/node/cjs/connect-multichain.js

@@ -493,7 +493,7 @@ var init_multichain = __esm({
       }
       /**
        * Merges the given options into the current instance options.
-       * Only the mergeable keys are updated (api.supportedNetworks, versions, ui.*, mobile.*, transport.extensionId, debug).
+       * Only the mergeable keys are updated (api.supportedNetworks, analytics, versions, ui.*, mobile.*, transport.extensionId, debug).
        * The main thing to note is that the value for `dapp` is not merged as it does not make sense for
        * subsequent calls to `createMultichainClient` to have a different `dapp` value.
        * Used when createMultichainClient is called with an existing singleton.
@@ -501,23 +501,28 @@ var init_multichain = __esm({
        * @param partial - Options to merge/overwrite onto the current instance
        */
       mergeOptions(partial) {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
         const opts = this.options;
+        const analytics3 = __spreadValues(__spreadValues({}, opts.analytics), (_a2 = partial.analytics) != null ? _a2 : {});
+        if (((_b = opts.analytics) == null ? void 0 : _b.enabled) === false) {
+          analytics3.enabled = false;
+        }
         this.options = __spreadProps(__spreadValues({}, opts), {
           api: __spreadProps(__spreadValues({}, opts.api), {
-            supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_b = (_a2 = partial.api) == null ? void 0 : _a2.supportedNetworks) != null ? _b : {})
+            supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_d = (_c = partial.api) == null ? void 0 : _c.supportedNetworks) != null ? _d : {})
           }),
-          versions: __spreadValues(__spreadValues({}, opts.versions), (_c = partial.versions) != null ? _c : {}),
+          versions: __spreadValues(__spreadValues({}, opts.versions), (_e = partial.versions) != null ? _e : {}),
+          analytics: __spreadValues({}, analytics3),
           ui: __spreadProps(__spreadValues({}, opts.ui), {
-            headless: (_e = (_d = partial.ui) == null ? void 0 : _d.headless) != null ? _e : opts.ui.headless,
-            preferExtension: (_g = (_f = partial.ui) == null ? void 0 : _f.preferExtension) != null ? _g : opts.ui.preferExtension,
-            showInstallModal: (_i = (_h = partial.ui) == null ? void 0 : _h.showInstallModal) != null ? _i : opts.ui.showInstallModal
+            headless: (_g = (_f = partial.ui) == null ? void 0 : _f.headless) != null ? _g : opts.ui.headless,
+            preferExtension: (_i = (_h = partial.ui) == null ? void 0 : _h.preferExtension) != null ? _i : opts.ui.preferExtension,
+            showInstallModal: (_k = (_j = partial.ui) == null ? void 0 : _j.showInstallModal) != null ? _k : opts.ui.showInstallModal
           }),
-          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_j = partial.mobile) != null ? _j : {}),
-          transport: __spreadProps(__spreadValues({}, (_k = opts.transport) != null ? _k : {}), {
-            extensionId: (_n = (_l = partial.transport) == null ? void 0 : _l.extensionId) != null ? _n : (_m = opts.transport) == null ? void 0 : _m.extensionId
+          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_l = partial.mobile) != null ? _l : {}),
+          transport: __spreadProps(__spreadValues({}, (_m = opts.transport) != null ? _m : {}), {
+            extensionId: (_p = (_n = partial.transport) == null ? void 0 : _n.extensionId) != null ? _p : (_o = opts.transport) == null ? void 0 : _o.extensionId
           }),
-          debug: (_o = partial.debug) != null ? _o : opts.debug
+          debug: (_q = partial.debug) != null ? _q : opts.debug
         });
       }
     };
@@ -967,17 +972,94 @@ var init_utils = __esm({
 });
 
 // src/multichain/utils/analytics.ts
+function sanitiseErrorMessage(message) {
+  if (!message) {
+    return void 0;
+  }
+  let sanitised = message;
+  for (const { pattern, replacement } of SANITISE_PATTERNS) {
+    sanitised = sanitised.replace(pattern, replacement);
+  }
+  if (sanitised.length > ERROR_MESSAGE_SAMPLE_MAX_LENGTH) {
+    sanitised = `${sanitised.slice(0, ERROR_MESSAGE_SAMPLE_MAX_LENGTH - 1)}\u2026`;
+  }
+  return sanitised;
+}
+function getUnwrappedErrorDetails(error) {
+  var _a2, _b, _c, _d;
+  if (typeof error !== "object" || error === null) {
+    return { code: void 0, message: "" };
+  }
+  if (error instanceof RPCInvokeMethodErr) {
+    return {
+      code: (_a2 = error.rpcCode) != null ? _a2 : error.code,
+      message: (_c = (_b = error.rpcMessage) != null ? _b : error.message) != null ? _c : ""
+    };
+  }
+  const errorObj = error;
+  return {
+    code: errorObj.code,
+    message: (_d = errorObj.message) != null ? _d : ""
+  };
+}
 function isRejectionError(error) {
-  var _a2, _b;
   if (typeof error !== "object" || error === null) {
     return false;
   }
+  const { code, message } = getUnwrappedErrorDetails(error);
+  const errorMessage = message.toLowerCase();
+  return code === 4001 || errorMessage.includes("reject") || errorMessage.includes("denied") || errorMessage.includes("cancel") || // Narrow "user …" matches — bare "user" is too greedy (catches Account
+  // Abstraction errors like "user operation reverted").
+  errorMessage.includes("user rejected") || errorMessage.includes("user denied") || errorMessage.includes("user cancelled") || errorMessage.includes("user canceled");
+}
+function classifyFailureReason(error) {
+  var _a2, _b;
+  if (typeof error !== "object" || error === null) {
+    return "unknown";
+  }
   const errorObj = error;
-  const errorCode = errorObj.code;
-  const errorMessage = (_b = (_a2 = errorObj.message) == null ? void 0 : _a2.toLowerCase()) != null ? _b : "";
-  return errorCode === 4001 || // User rejected request (common EIP-1193 code)
-  errorCode === 4100 || // Unauthorized (common rejection code)
-  errorMessage.includes("reject") || errorMessage.includes("denied") || errorMessage.includes("cancel") || errorMessage.includes("user");
+  const errorName = (_a2 = errorObj.name) != null ? _a2 : "";
+  const errorMessageRaw = (_b = errorObj.message) != null ? _b : "";
+  const errorMessage = errorMessageRaw.toLowerCase();
+  const { code } = getUnwrappedErrorDetails(error);
+  if (typeof code === "number") {
+    if (code === -32601) {
+      return "wallet_method_unsupported";
+    }
+    if (code === -32602) {
+      return "wallet_invalid_params";
+    }
+    if (code === -32603) {
+      return "wallet_internal_error";
+    }
+    if (code <= -32e3 && code >= -32099) {
+      return "wallet_internal_error";
+    }
+    if (code === 4100) {
+      return "wallet_unauthorized";
+    }
+    if (code === 4200) {
+      return "wallet_method_unsupported";
+    }
+    if (code === 4902) {
+      return "unrecognized_chain";
+    }
+  }
+  if (errorName === "TransportTimeoutError" || errorMessageRaw === "Request timeout" || errorMessage.includes("timed out") || errorMessage.includes("timeout")) {
+    return "transport_timeout";
+  }
+  if (errorName === "TransportError" || errorMessage.includes("not connected") || errorMessage.includes("transport disconnect") || errorMessage.includes("connection lost") || errorMessage.includes("socket closed")) {
+    return "transport_disconnect";
+  }
+  return "unknown";
+}
+function extractErrorDiagnostics(error) {
+  const failureReason = classifyFailureReason(error);
+  const { code, message } = getUnwrappedErrorDetails(error);
+  const messageSample = sanitiseErrorMessage(message);
+  return __spreadValues(__spreadValues({
+    failure_reason: failureReason
+  }, typeof code === "number" ? { error_code: code } : {}), messageSample ? { error_message_sample: messageSample } : {});
 }
 function getBaseAnalyticsProperties(options, storage) {
   return __async(this, null, function* () {
@@ -993,26 +1075,61 @@ function getBaseAnalyticsProperties(options, storage) {
     };
   });
 }
-function getWalletActionAnalyticsProperties(options, storage, invokeOptions, transportType) {
+function getWalletActionAnalyticsProperties(options, storage, invokeOptions, transportType, extra) {
   return __async(this, null, function* () {
     var _a2;
     const dappId = getDappId(options.dapp);
     const anonId = yield storage.getAnonId();
-    return {
+    return __spreadValues(__spreadValues(__spreadValues({
       mmconnect_versions: (_a2 = options.versions) != null ? _a2 : {},
       dapp_id: dappId,
       method: invokeOptions.request.method,
       caip_chain_id: invokeOptions.scope,
       anon_id: anonId,
       transport_type: transportType
-    };
+    }, (extra == null ? void 0 : extra.failure_reason) ? { failure_reason: extra.failure_reason } : {}), typeof (extra == null ? void 0 : extra.error_code) === "number" ? { error_code: extra.error_code } : {}), (extra == null ? void 0 : extra.error_message_sample) ? { error_message_sample: extra.error_message_sample } : {});
   });
 }
+var ERROR_MESSAGE_SAMPLE_MAX_LENGTH, SANITISE_PATTERNS;
 var init_analytics = __esm({
   "src/multichain/utils/analytics.ts"() {
     "use strict";
     init_utils();
     init_domain();
+    ERROR_MESSAGE_SAMPLE_MAX_LENGTH = 200;
+    SANITISE_PATTERNS = [
+      // EVM-style 20-byte hex addresses (e.g. `0x` + 40 hex chars).
+      { pattern: /0x[a-fA-F0-9]{40}/gu, replacement: "<addr>" },
+      // Other long hex blobs: tx hashes, signatures, raw byte strings, large
+      // hex amounts. 16+ hex chars catches 32-byte hashes/signatures without
+      // snagging EVM method selectors (8 chars) or short hex codes.
+      { pattern: /(?:0x)?[a-fA-F0-9]{16,}/gu, replacement: "<hex>" },
+      // URLs of any scheme up to the first whitespace / quote / closing paren.
+      // Catches RPC endpoints, dapp deeplinks, query strings with secrets.
+      { pattern: /https?:\/\/[^\s"')]+/gu, replacement: "<url>" },
+      // Bech32 addresses: short HRP (1-10 lowercase chars) + `1` separator +
+      // ≥38 chars of Bech32 data alphabet `[ac-hj-np-z02-9]` (excludes the
+      // look-alike chars `b`, `i`, `o`, `1`). Covers Bitcoin SegWit
+      // (`bc1…`/`tb1…`) and Cosmos-SDK chains (`cosmos1…`, `osmo1…`,
+      // `juno1…`, `inj1…`, etc.) without enumerating every HRP. Runs before
+      // the Base58 pattern below — see header comment for why.
+      {
+        pattern: /\b[a-z]{1,10}1[ac-hj-np-z02-9]{38,}\b/gu,
+        replacement: "<addr>"
+      },
+      // Base58 tokens (32+ chars, Base58 alphabet `[1-9A-HJ-NP-Za-km-z]`).
+      // Covers Solana pubkeys (32-44 chars), Solana tx signatures (~88 chars),
+      // and Bitcoin Base58 addresses ≥32 chars. The 32-char floor and `\b`
+      // word boundary keep English words and shorter alphanumerics safe.
+      {
+        pattern: /\b[1-9A-HJ-NP-Za-km-z]{32,}\b/gu,
+        replacement: "<addr>"
+      },
+      // Long decimal numbers — token amounts, gas units, timestamps, lamports.
+      // 10+ digits catches typical chain quantities without affecting JSON-RPC
+      // codes (-32601, 4001, etc.) or short numeric IDs.
+      { pattern: /\d{10,}/gu, replacement: "<num>" }
+    ];
   }
 });
 
@@ -1402,13 +1519,24 @@ var init_mwp = __esm({
                     return resolveConnection();
                   });
                   this.dappClient.on("message", initialConnectionMessageHandler);
+                  const platformType = getPlatformType();
+                  const isQRCodeFlow = [
+                    "web-desktop" /* DesktopWeb */,
+                    "nodejs" /* NonBrowser */
+                  ].includes(platformType);
+                  const initialPayload = {
+                    name: MULTICHAIN_PROVIDER_STREAM_NAME,
+                    data: request
+                  };
                   dappClient.connect({
                     mode: "trusted",
-                    initialPayload: {
-                      name: MULTICHAIN_PROVIDER_STREAM_NAME,
-                      data: request
+                    initialPayload: isQRCodeFlow ? void 0 : initialPayload
+                  }).then(() => __async(this, null, function* () {
+                    if (isQRCodeFlow) {
+                      return dappClient.sendRequest(initialPayload);
                     }
-                  }).catch((error) => {
+                    return void 0;
+                  })).catch((error) => {
                     if (initialConnectionMessageHandler) {
                       this.dappClient.off(
                         "message",
@@ -2014,6 +2142,7 @@ __export(index_node_exports, {
   StoreAdapter: () => StoreAdapter,
   StoreClient: () => StoreClient,
   TransportType: () => TransportType,
+  classifyFailureReason: () => classifyFailureReason,
   createLogger: () => createLogger,
   createMultichainClient: () => createMultichainClient,
   enableDebug: () => enableDebug,
@@ -2158,6 +2287,17 @@ var import_analytics2 = require("@metamask/analytics");
 init_domain();
 init_utils();
 init_analytics();
+function toRPCInvokeMethodErr(error) {
+  var _a2;
+  if (error instanceof RPCInvokeMethodErr) {
+    return error;
+  }
+  const castError = error;
+  return new RPCInvokeMethodErr(
+    (_a2 = castError.message) != null ? _a2 : "Unknown error",
+    castError.code
+  );
+}
 var _RequestRouter_instances, withAnalyticsTracking_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, trackWalletActionRejected_fn;
 var RequestRouter = class {
   constructor(transport, rpcClient, config, transportType) {
@@ -2264,6 +2404,13 @@ _RequestRouter_instances = new WeakSet();
 withAnalyticsTracking_fn = function(options, execute) {
   return __async(this, null, function* () {
     var _a2;
+    if (((_a2 = this.config.analytics) == null ? void 0 : _a2.enabled) === false) {
+      try {
+        return yield execute();
+      } catch (error) {
+        throw toRPCInvokeMethodErr(error);
+      }
+    }
     yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRequested_fn).call(this, options);
     try {
       const result = yield execute();
@@ -2274,16 +2421,9 @@ withAnalyticsTracking_fn = function(options, execute) {
       if (isRejection) {
         yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRejected_fn).call(this, options);
       } else {
-        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options);
-      }
-      if (error instanceof RPCInvokeMethodErr) {
-        throw error;
+        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options, error);
       }
-      const castError = error;
-      throw new RPCInvokeMethodErr(
-        (_a2 = castError.message) != null ? _a2 : "Unknown error",
-        castError.code
-      );
+      throw toRPCInvokeMethodErr(error);
     }
   });
 };
@@ -2309,13 +2449,14 @@ trackWalletActionSucceeded_fn = function(options) {
     import_analytics2.analytics.track("mmconnect_wallet_action_succeeded", props);
   });
 };
-trackWalletActionFailed_fn = function(options) {
+trackWalletActionFailed_fn = function(options, error) {
   return __async(this, null, function* () {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
       options,
-      this.transportType
+      this.transportType,
+      extractErrorDiagnostics(error)
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_failed", props);
   });
@@ -2741,26 +2882,65 @@ walletInvokeMethod_fn = function(request) {
 init_utils();
 var logger2 = createLogger("metamask-sdk:core");
 var SINGLETON_KEY = "__METAMASK_CONNECT_MULTICHAIN_SINGLETON__";
+function normalizeAnalyticsOptions(analyticsOptions) {
+  var _a2;
+  return __spreadProps(__spreadValues({}, analyticsOptions != null ? analyticsOptions : {}), {
+    enabled: (_a2 = analyticsOptions == null ? void 0 : analyticsOptions.enabled) != null ? _a2 : true,
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    integrationType: (analyticsOptions == null ? void 0 : analyticsOptions.integrationType) || "direct"
+  });
+}
+function isAnalyticsEnabled(options) {
+  var _a2;
+  return ((_a2 = options.analytics) == null ? void 0 : _a2.enabled) !== false;
+}
+function setupAnalyticsGlobals(options, storage, setAnonId) {
+  return __async(this, null, function* () {
+    var _a2, _b;
+    if (!isAnalyticsEnabled(options)) {
+      setAnonId == null ? void 0 : setAnonId(void 0);
+      import_analytics4.analytics.disable();
+      return;
+    }
+    const platform = getPlatformType();
+    const isBrowser = platform === "in-app-browser" /* MetaMaskMobileWebview */ || platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */;
+    const isReactNative2 = platform === "react-native" /* ReactNative */;
+    if (!isBrowser && !isReactNative2) {
+      return;
+    }
+    const dappId = getDappId(options.dapp);
+    const anonId = yield storage.getAnonId();
+    setAnonId == null ? void 0 : setAnonId(anonId);
+    const { integrationType } = (_a2 = options.analytics) != null ? _a2 : {
+      integrationType: ""
+    };
+    import_analytics4.analytics.setGlobalProperty("mmconnect_versions", (_b = options.versions) != null ? _b : {});
+    import_analytics4.analytics.setGlobalProperty("dapp_id", dappId);
+    import_analytics4.analytics.setGlobalProperty("anon_id", anonId);
+    import_analytics4.analytics.setGlobalProperty("platform", platform);
+    if (integrationType) {
+      import_analytics4.analytics.setGlobalProperty("integration_types", [integrationType]);
+    }
+    import_analytics4.analytics.enable();
+  });
+}
 var _a, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _transportType, _listener, _anonId, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, buildConnectionMetadata_fn, init_fn2, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn, getCaipSession_fn, openConnectDeeplinkIfNeeded_fn;
 var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends MultichainCore {
   constructor(options) {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a2, _b, _c, _d;
     const withDappMetadata = setupDappMetadata(options);
-    const integrationType = ((_a2 = options.analytics) == null ? void 0 : _a2.integrationType) || "direct";
     const allOptions = __spreadProps(__spreadValues({}, withDappMetadata), {
       ui: __spreadProps(__spreadValues({}, withDappMetadata.ui), {
-        preferExtension: (_b = withDappMetadata.ui.preferExtension) != null ? _b : true,
-        showInstallModal: (_c = withDappMetadata.ui.showInstallModal) != null ? _c : false,
-        headless: (_d = withDappMetadata.ui.headless) != null ? _d : false
-      }),
-      analytics: __spreadProps(__spreadValues({}, (_e = options.analytics) != null ? _e : {}), {
-        integrationType
+        preferExtension: (_a2 = withDappMetadata.ui.preferExtension) != null ? _a2 : true,
+        showInstallModal: (_b = withDappMetadata.ui.showInstallModal) != null ? _b : false,
+        headless: (_c = withDappMetadata.ui.headless) != null ? _c : false
       }),
+      analytics: normalizeAnalyticsOptions(options.analytics),
       versions: __spreadValues({
         // typeof guard needed: Metro (React Native) bundles TS source directly,
         // bypassing the tsup build that substitutes __PACKAGE_VERSION__.
-        "connect-multichain": false ? "unknown" : "0.13.0"
-      }, (_f = options.versions) != null ? _f : {})
+        "connect-multichain": false ? "unknown" : "0.15.0"
+      }, (_d = options.versions) != null ? _d : {})
     });
     super(allOptions);
     __privateAdd(this, _MetaMaskConnectMultichain_instances);
@@ -2816,25 +2996,22 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   // Creates a singleton instance of MetaMaskConnectMultichain.
   // If the singleton already exists, it merges the incoming options with the
   // existing singleton options for the following keys: `api.supportedNetworks`,
-  // `versions`, `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note
-  // that the value for `dapp` is not merged as it does not make sense for
-  // subsequent calls to `createMultichainClient` to have a different `dapp` value.
+  // `analytics`, `versions`, `ui.*`, `mobile.*`, `transport.extensionId`,
+  // `debug`. Take note that the value for `dapp` is not merged as it does not
+  // make sense for subsequent calls to `createMultichainClient` to have a
+  // different `dapp` value.
   static create(options) {
     return __async(this, null, function* () {
-      var _a2, _b;
+      var _a2;
       const globalObject = getGlobalObject();
       const existing = globalObject[SINGLETON_KEY];
       if (existing) {
         const instance = yield existing;
         instance.mergeOptions(options);
-        import_analytics4.analytics.setGlobalProperty(
-          "mmconnect_versions",
-          (_a2 = instance.options.versions) != null ? _a2 : {}
-        );
-        if ((_b = options.analytics) == null ? void 0 : _b.integrationType) {
-          import_analytics4.analytics.setGlobalProperty("integration_types", [
-            options.analytics.integrationType
-          ]);
+        if (instance instanceof _MetaMaskConnectMultichain) {
+          yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(_a2);
+        } else {
+          yield setupAnalyticsGlobals(instance.options, instance.storage);
         }
         if (options.debug) {
           enableDebug("metamask-sdk:*");
@@ -2884,21 +3061,23 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       } else {
         transportType = "mwp" /* MWP */;
       }
-      try {
-        const baseProps = yield getBaseAnalyticsProperties(
-          this.options,
-          this.storage
-        );
-        const dappConfiguredChains = Object.keys(
-          this.options.api.supportedNetworks
-        );
-        import_analytics4.analytics.track("mmconnect_connection_initiated", __spreadProps(__spreadValues({}, baseProps), {
-          transport_type: transportType,
-          dapp_configured_chains: dappConfiguredChains,
-          dapp_requested_chains: scopes
-        }));
-      } catch (error) {
-        logger2("Error tracking connection_initiated event", error);
+      if (isAnalyticsEnabled(this.options)) {
+        try {
+          const baseProps = yield getBaseAnalyticsProperties(
+            this.options,
+            this.storage
+          );
+          const dappConfiguredChains = Object.keys(
+            this.options.api.supportedNetworks
+          );
+          import_analytics4.analytics.track("mmconnect_connection_initiated", __spreadProps(__spreadValues({}, baseProps), {
+            transport_type: transportType,
+            dapp_configured_chains: dappConfiguredChains,
+            dapp_requested_chains: scopes
+          }));
+        } catch (error) {
+          logger2("Error tracking connection_initiated event", error);
+        }
       }
       const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
       const { mergedScopes, mergedCaipAccountIds, mergedSessionProperties } = mergeRequestedSessionWithExisting(
@@ -3041,30 +3220,9 @@ _sdkInfo = new WeakMap();
 _MetaMaskConnectMultichain_instances = new WeakSet();
 setupAnalytics_fn = function() {
   return __async(this, null, function* () {
-    var _a2, _b;
-    const platform = getPlatformType();
-    const isBrowser = platform === "in-app-browser" /* MetaMaskMobileWebview */ || platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */;
-    const isReactNative2 = platform === "react-native" /* ReactNative */;
-    if (!isBrowser && !isReactNative2) {
-      return;
-    }
-    const dappId = getDappId(this.options.dapp);
-    const anonId = yield this.storage.getAnonId();
-    __privateSet(this, _anonId, anonId);
-    const { integrationType } = (_a2 = this.options.analytics) != null ? _a2 : {
-      integrationType: ""
-    };
-    import_analytics4.analytics.setGlobalProperty(
-      "mmconnect_versions",
-      (_b = this.options.versions) != null ? _b : {}
-    );
-    import_analytics4.analytics.setGlobalProperty("dapp_id", dappId);
-    import_analytics4.analytics.setGlobalProperty("anon_id", anonId);
-    import_analytics4.analytics.setGlobalProperty("platform", platform);
-    if (integrationType) {
-      import_analytics4.analytics.setGlobalProperty("integration_types", [integrationType]);
-    }
-    import_analytics4.analytics.enable();
+    yield setupAnalyticsGlobals(this.options, this.storage, (anonId) => {
+      __privateSet(this, _anonId, anonId);
+    });
   });
 };
 onTransportNotification_fn = function(payload) {
@@ -3153,7 +3311,7 @@ buildConnectionMetadata_fn = function() {
     dapp: this.options.dapp,
     sdk: { version: getVersion(), platform: getPlatformType() }
   };
-  if (__privateGet(this, _anonId)) {
+  if (isAnalyticsEnabled(this.options) && __privateGet(this, _anonId)) {
     metadata.analytics = { remote_session_id: __privateGet(this, _anonId) };
   }
   return metadata;
@@ -3435,38 +3593,42 @@ handleConnection_fn = function(promise, scopes, transportType) {
     this.status = "connecting";
     return promise.then(() => __async(this, null, function* () {
       this.status = "connected";
-      try {
-        const baseProps = yield getBaseAnalyticsProperties(
-          this.options,
-          this.storage
-        );
-        import_analytics4.analytics.track("mmconnect_connection_established", __spreadProps(__spreadValues({}, baseProps), {
-          transport_type: transportType,
-          user_permissioned_chains: scopes
-        }));
-      } catch (error) {
-        logger2("Error tracking connection_established event", error);
+      if (isAnalyticsEnabled(this.options)) {
+        try {
+          const baseProps = yield getBaseAnalyticsProperties(
+            this.options,
+            this.storage
+          );
+          import_analytics4.analytics.track("mmconnect_connection_established", __spreadProps(__spreadValues({}, baseProps), {
+            transport_type: transportType,
+            user_permissioned_chains: scopes
+          }));
+        } catch (error) {
+          logger2("Error tracking connection_established event", error);
+        }
       }
       return void 0;
     })).catch((error) => __async(this, null, function* () {
       this.status = "disconnected";
-      try {
-        const baseProps = yield getBaseAnalyticsProperties(
-          this.options,
-          this.storage
-        );
-        const isRejection = isRejectionError(error);
-        if (isRejection) {
-          import_analytics4.analytics.track("mmconnect_connection_rejected", __spreadProps(__spreadValues({}, baseProps), {
-            transport_type: transportType
-          }));
-        } else {
-          import_analytics4.analytics.track("mmconnect_connection_failed", __spreadProps(__spreadValues({}, baseProps), {
-            transport_type: transportType
-          }));
+      if (isAnalyticsEnabled(this.options)) {
+        try {
+          const baseProps = yield getBaseAnalyticsProperties(
+            this.options,
+            this.storage
+          );
+          const isRejection = isRejectionError(error);
+          if (isRejection) {
+            import_analytics4.analytics.track("mmconnect_connection_rejected", __spreadProps(__spreadValues({}, baseProps), {
+              transport_type: transportType
+            }));
+          } else {
+            import_analytics4.analytics.track("mmconnect_connection_failed", __spreadValues(__spreadProps(__spreadValues({}, baseProps), {
+              transport_type: transportType
+            }), extractErrorDiagnostics(error)));
+          }
+        } catch (e) {
+          logger2("Error tracking connection failed/rejected event", error);
         }
-      } catch (e) {
-        logger2("Error tracking connection failed/rejected event", error);
       }
       throw error;
     }));
@@ -3909,6 +4071,7 @@ var createMultichainClient = (options) => __async(null, null, function* () {
   StoreAdapter,
   StoreClient,
   TransportType,
+  classifyFailureReason,
   createLogger,
   createMultichainClient,
   enableDebug,