@meshconnect/uwc-injected-connector 0.21.0 → 0.22.1

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 (35) hide show
  1. package/dist/injected-connector.d.ts +18 -1
  2. package/dist/injected-connector.d.ts.map +1 -1
  3. package/dist/injected-connector.js +45 -4
  4. package/dist/injected-connector.js.map +1 -1
  5. package/dist/services/connection-manager.d.ts +67 -1
  6. package/dist/services/connection-manager.d.ts.map +1 -1
  7. package/dist/services/connection-manager.js +130 -18
  8. package/dist/services/connection-manager.js.map +1 -1
  9. package/dist/services/ethereum/ethereum-transaction-builder.d.ts.map +1 -1
  10. package/dist/services/ethereum/ethereum-transaction-builder.js +3 -2
  11. package/dist/services/ethereum/ethereum-transaction-builder.js.map +1 -1
  12. package/dist/services/ethereum/ethereum-wallet-service.d.ts +10 -3
  13. package/dist/services/ethereum/ethereum-wallet-service.d.ts.map +1 -1
  14. package/dist/services/ethereum/ethereum-wallet-service.js +15 -7
  15. package/dist/services/ethereum/ethereum-wallet-service.js.map +1 -1
  16. package/dist/utils/step-reporter.d.ts +33 -0
  17. package/dist/utils/step-reporter.d.ts.map +1 -0
  18. package/dist/utils/step-reporter.js +54 -0
  19. package/dist/utils/step-reporter.js.map +1 -0
  20. package/dist/utils/with-deadline.d.ts +30 -0
  21. package/dist/utils/with-deadline.d.ts.map +1 -0
  22. package/dist/utils/with-deadline.js +67 -0
  23. package/dist/utils/with-deadline.js.map +1 -0
  24. package/package.json +5 -5
  25. package/src/injected-connector.test.ts +97 -0
  26. package/src/injected-connector.ts +68 -5
  27. package/src/services/connection-manager.test.ts +234 -0
  28. package/src/services/connection-manager.ts +187 -28
  29. package/src/services/ethereum/ethereum-transaction-builder.test.ts +97 -0
  30. package/src/services/ethereum/ethereum-transaction-builder.ts +3 -2
  31. package/src/services/ethereum/ethereum-wallet-service.ts +28 -8
  32. package/src/utils/step-reporter.test.ts +56 -0
  33. package/src/utils/step-reporter.ts +83 -0
  34. package/src/utils/with-deadline.test.ts +80 -0
  35. package/src/utils/with-deadline.ts +67 -0
@@ -1,4 +1,4 @@
1
- import type { Network, ExtensionInjectedProvider, IntegratedBrowserInjectedProvider, Connector, ConnectorResult, SwitchNetworkResult, Namespace, DetectedEIP6963WalletInfo, DetectedSolanaWalletInfo, DetectedTronWalletInfo, DetectedTonWalletInfo, TransactionRequest, TransactionResult, NetworkRpcMap, EVMCapabilities, SignatureResult, EIP712TypedData, WalletMetadata, TonConnectConfig, WalletLifecycleEvent, WalletLifecycleContext } from '@meshconnect/uwc-types';
1
+ import type { Network, ExtensionInjectedProvider, IntegratedBrowserInjectedProvider, Connector, ConnectorResult, SwitchNetworkResult, Namespace, DetectedEIP6963WalletInfo, DetectedSolanaWalletInfo, DetectedTronWalletInfo, DetectedTonWalletInfo, TransactionRequest, TransactionResult, NetworkRpcMap, EVMCapabilities, SignatureResult, EIP712TypedData, WalletMetadata, TonConnectConfig, WalletLifecycleEvent, WalletLifecycleContext, WalletStepInfo } from '@meshconnect/uwc-types';
2
2
  import { type TronConnectorConfig } from '@meshconnect/uwc-tron-connector';
3
3
  import type { SecondarySolanaConnectSkippedInfo, SecondarySolanaConnectGatheredInfo } from './services/connection-manager';
4
4
  import type { LegacyInjectedSolanaDiscoveryFailure } from './wallet-standard-discovery';
@@ -52,6 +52,19 @@ export interface InjectedConnectorOptions {
52
52
  onWalletConnectionsReleased?: ((info: {
53
53
  namespaces: Namespace[];
54
54
  }) => void) | undefined;
55
+ /**
56
+ * Step-level telemetry sink (ONC-183): one call per named phase of a connect
57
+ * — provider detection, the authorizing wallet call, the chain read, and each
58
+ * best-effort secondary-namespace gather. Core forwards these as `walletStep`
59
+ * events, stamped with the enclosing handoff id.
60
+ */
61
+ onConnectStep?: ((info: WalletStepInfo) => void) | undefined;
62
+ /**
63
+ * Per-namespace deadline (ms) for a best-effort SECONDARY address gather.
64
+ * `0` disables the bound. Defaults to
65
+ * {@link DEFAULT_SECONDARY_GATHER_TIMEOUT_MS}.
66
+ */
67
+ secondaryGatherTimeoutMs?: number | undefined;
55
68
  }
56
69
  export declare class InjectedConnector implements Connector {
57
70
  private readonly storageService;
@@ -84,6 +97,10 @@ export declare class InjectedConnector implements Connector {
84
97
  /** injectedIds already reported this session — dedupes the emit across the
85
98
  * repeated Solana detection cycles (mirrors the bridgeError source dedup). */
86
99
  private readonly reportedLegacyFailures;
100
+ /** Step-level telemetry reporter (ONC-183); see `InjectedConnectorOptions`. */
101
+ private readonly steps;
102
+ /** Deadline for the cross-namespace Tron gather (see `enrichWithTron`). */
103
+ private readonly secondaryGatherTimeoutMs;
87
104
  /** Forward a legacy Solana discovery failure to the sink, once per injectedId. */
88
105
  private reportLegacyDiscoveryFailure;
89
106
  constructor(options?: InjectedConnectorOptions);
@@ -1 +1 @@
1
- {"version":3,"file":"injected-connector.d.ts","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"injected-connector.d.ts","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,9 @@ import { SolanaWalletService } from './services/solana/solana-wallet-service';
7
7
  import { TronWalletService } from './services/tron/tron-wallet-service';
8
8
  import { TonWalletService } from './services/ton/ton-wallet-service';
9
9
  import { StorageService } from './services/storage-service';
10
- import { ConnectionManager } from './services/connection-manager';
10
+ import { ConnectionManager, DEFAULT_SECONDARY_GATHER_TIMEOUT_MS } from './services/connection-manager';
11
+ import { withDeadline } from './utils/with-deadline';
12
+ import { createStepReporter } from './utils/step-reporter';
11
13
  import { SignatureService } from './services/signature-service';
12
14
  import { TransactionService } from './services/transaction-service';
13
15
  import { parseError } from './utils/error-utils';
@@ -43,6 +45,10 @@ export class InjectedConnector {
43
45
  /** injectedIds already reported this session — dedupes the emit across the
44
46
  * repeated Solana detection cycles (mirrors the bridgeError source dedup). */
45
47
  reportedLegacyFailures = new Set();
48
+ /** Step-level telemetry reporter (ONC-183); see `InjectedConnectorOptions`. */
49
+ steps;
50
+ /** Deadline for the cross-namespace Tron gather (see `enrichWithTron`). */
51
+ secondaryGatherTimeoutMs;
46
52
  /** Forward a legacy Solana discovery failure to the sink, once per injectedId. */
47
53
  reportLegacyDiscoveryFailure = info => {
48
54
  if (this.reportedLegacyFailures.has(info.injectedId))
@@ -51,7 +57,7 @@ export class InjectedConnector {
51
57
  this.onLegacyDiscoveryFailure?.(info);
52
58
  };
53
59
  constructor(options = {}) {
54
- const { networkRpcMap = {}, expectedWallets = [], tonConnectConfig, tronConnectorConfig, networks = [], onBridgeError, usingIntegratedBrowser = false, onLegacyDiscoveryFailure, onSecondarySolanaConnectSkipped, onSecondarySolanaConnectGathered, onWalletConnectionsReleased } = options;
60
+ const { networkRpcMap = {}, expectedWallets = [], tonConnectConfig, tronConnectorConfig, networks = [], onBridgeError, usingIntegratedBrowser = false, onLegacyDiscoveryFailure, onSecondarySolanaConnectSkipped, onSecondarySolanaConnectGathered, onWalletConnectionsReleased, onConnectStep, secondaryGatherTimeoutMs } = options;
55
61
  this.networkRpcMap = networkRpcMap;
56
62
  this.networks = networks;
57
63
  this.usingIntegratedBrowser = usingIntegratedBrowser;
@@ -69,8 +75,13 @@ export class InjectedConnector {
69
75
  usingIntegratedBrowser,
70
76
  onSecondarySolanaConnectSkipped,
71
77
  onSecondarySolanaConnectGathered,
72
- onWalletConnectionsReleased
78
+ onWalletConnectionsReleased,
79
+ onConnectStep,
80
+ secondaryGatherTimeoutMs
73
81
  });
82
+ this.steps = createStepReporter(onConnectStep);
83
+ this.secondaryGatherTimeoutMs =
84
+ secondaryGatherTimeoutMs ?? DEFAULT_SECONDARY_GATHER_TIMEOUT_MS;
74
85
  this.signatureService = new SignatureService();
75
86
  this.transactionService = new TransactionService(this.networkRpcMap);
76
87
  new BridgeChild({
@@ -223,18 +234,48 @@ export class InjectedConnector {
223
234
  const tronNetwork = this.networks.find(n => n.namespace === 'tron' && provider.supportedNetworkIds.includes(n.id));
224
235
  if (!tronNetwork)
225
236
  return;
237
+ const start = Date.now();
238
+ let timedOut = false;
226
239
  try {
227
240
  // Pass the provider — the Tron connector reads its tron.injectedId.
228
- const result = await this.tronConnector.connect(tronNetwork, provider);
241
+ // Deadline-bounded like the ConnectionManager gathers (ONC-183): this runs
242
+ // after the target namespace is already authorized, so a Tron prompt the
243
+ // user never answers must cost the Tron address, not the whole connect.
244
+ const result = await withDeadline(() => this.tronConnector.connect(tronNetwork, provider), this.secondaryGatherTimeoutMs, () => {
245
+ timedOut = true;
246
+ this.steps.report({
247
+ step: 'secondaryGather',
248
+ outcome: 'timedOut',
249
+ durationMs: Date.now() - start,
250
+ namespace: 'tron',
251
+ timeoutMs: this.secondaryGatherTimeoutMs
252
+ });
253
+ });
254
+ if (!result)
255
+ return;
229
256
  for (const addr of result.availableAddresses) {
230
257
  const dup = availableAddresses.some(a => a.networkId === addr.networkId && a.address === addr.address);
231
258
  if (!dup)
232
259
  availableAddresses.push(addr);
233
260
  }
261
+ this.steps.report({
262
+ step: 'secondaryGather',
263
+ outcome: 'ok',
264
+ durationMs: Date.now() - start,
265
+ namespace: 'tron'
266
+ });
234
267
  }
235
268
  catch {
236
269
  // Tron unavailable or the user declined the prompt — continue without it,
237
270
  // same as the Solana/Tron/TON gathers in ConnectionManager.
271
+ if (!timedOut) {
272
+ this.steps.report({
273
+ step: 'secondaryGather',
274
+ outcome: 'failed',
275
+ durationMs: Date.now() - start,
276
+ namespace: 'tron'
277
+ });
278
+ }
238
279
  }
239
280
  }
240
281
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"injected-connector.js","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"injected-connector.js","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { Network, Namespace, ExtensionInjectedProvider, IntegratedBrowserInjectedProvider, ConnectorResult, SwitchNetworkResult, AvailableAddress } from '@meshconnect/uwc-types';
1
+ import type { Network, Namespace, ExtensionInjectedProvider, IntegratedBrowserInjectedProvider, ConnectorResult, SwitchNetworkResult, AvailableAddress, WalletStepInfo } from '@meshconnect/uwc-types';
2
2
  import { EthereumWalletService } from './ethereum/ethereum-wallet-service';
3
3
  import { SolanaWalletService } from './solana/solana-wallet-service';
4
4
  import { TronWalletService } from './tron/tron-wallet-service';
@@ -81,7 +81,50 @@ export interface ConnectionManagerOptions {
81
81
  onWalletConnectionsReleased?: ((info: {
82
82
  namespaces: Namespace[];
83
83
  }) => void) | undefined;
84
+ /**
85
+ * Step-level telemetry sink (ONC-183) — see {@link WalletStepInfo}. Invoked
86
+ * once per named phase of a connect. Unlike the dedup'd sinks above this
87
+ * fires EVERY time: the point is per-attempt timing, so suppressing repeats
88
+ * would erase exactly the signal (a retry that hangs where the first didn't).
89
+ */
90
+ onConnectStep?: ((info: WalletStepInfo) => void) | undefined;
91
+ /**
92
+ * Per-namespace deadline (ms) for a best-effort SECONDARY address gather —
93
+ * see {@link ConnectionManager.checkAndAddOtherNamespaceAddresses}. `0`
94
+ * disables the bound (pre-ONC-183 behaviour).
95
+ */
96
+ secondaryGatherTimeoutMs?: number | undefined;
84
97
  }
98
+ /**
99
+ * Default per-namespace cap for a secondary address gather (ONC-183).
100
+ *
101
+ * These run AFTER the user has already authorized the target namespace, and a
102
+ * wallet that never answers one of them used to hold the entire connect open
103
+ * indefinitely — the dominant "connected but hung" class (MetaMask's Solana
104
+ * Snap prompt being the motivating case: EVM approved, Snap prompt abandoned,
105
+ * `connect()` pending forever).
106
+ *
107
+ * 15s is deliberately generous relative to the ~19s MEDIAN for a whole connect:
108
+ * this bounds one supplementary leg, not the user-facing approval, and the cost
109
+ * of firing early is a missing secondary address (the session still connects on
110
+ * the namespace the user asked for) while the cost of firing late is nil. Tune
111
+ * from the `walletStep` p99 once it has run in prod.
112
+ */
113
+ export declare const DEFAULT_SECONDARY_GATHER_TIMEOUT_MS = 15000;
114
+ /**
115
+ * What a per-namespace secondary gather actually did, as reported UP to
116
+ * `gatherNamespace` for step telemetry.
117
+ *
118
+ * Necessary because each `checkAndAdd*Addresses` helper CATCHES its own wallet
119
+ * errors internally — that is the best-effort contract and it predates this
120
+ * telemetry. So the helper resolving normally does NOT mean the gather worked:
121
+ * a declined Solana Snap prompt is swallowed and resolves exactly like a clean
122
+ * no-op. Reporting `ok` off "the promise resolved" therefore mislabelled every
123
+ * user-declined secondary prompt as a success (ONC-183 review). The helpers
124
+ * return this instead so a swallowed failure is still reported as one, while
125
+ * the swallow keeps the connect alive.
126
+ */
127
+ export type SecondaryGatherOutcome = 'ok' | 'failed';
85
128
  export declare class ConnectionManager {
86
129
  private ethereumService;
87
130
  private solanaService;
@@ -100,6 +143,8 @@ export declare class ConnectionManager {
100
143
  private readonly onSecondarySolanaConnectSkipped?;
101
144
  private readonly onSecondarySolanaConnectGathered?;
102
145
  private readonly onWalletConnectionsReleased?;
146
+ private readonly steps;
147
+ private readonly secondaryGatherTimeoutMs;
103
148
  constructor(ethereumService: EthereumWalletService, solanaService: SolanaWalletService, tronService: TronWalletService, tonService: TonWalletService, options?: ConnectionManagerOptions);
104
149
  /** Report a gathered legacy-injectedId Solana address, once per injectedId x source. */
105
150
  private reportSecondarySolanaConnectGathered;
@@ -163,8 +208,29 @@ export declare class ConnectionManager {
163
208
  /**
164
209
  * After connecting one namespace, check and add addresses for all OTHER namespaces.
165
210
  * E.g. after connecting Ethereum, also gather Solana, Tron, and TON addresses.
211
+ *
212
+ * Every leg is BEST-EFFORT and individually deadline-bounded (ONC-183). These
213
+ * run after the user has already authorized the target namespace, so a leg
214
+ * that never answers must cost its own address — not the whole connect. Each
215
+ * leg gets its OWN budget rather than one shared across all four: a shared
216
+ * budget would let a slow first leg silently starve the rest, turning one
217
+ * wallet's slowness into three missing addresses.
166
218
  */
167
219
  private checkAndAddOtherNamespaceAddresses;
220
+ /**
221
+ * Run one secondary-namespace gather under its deadline, reporting the
222
+ * outcome as a `secondaryGather` step.
223
+ *
224
+ * Swallows a rejection as well as a timeout: the per-namespace helpers below
225
+ * already catch their own wallet errors, so anything reaching here is an
226
+ * unexpected throw — and dropping one namespace's address is still the right
227
+ * degradation for a gather the user never asked for.
228
+ *
229
+ * The reported outcome comes from the helper's own
230
+ * {@link SecondaryGatherOutcome}, NOT from "did the promise resolve" — see
231
+ * that type for why those two are not the same thing.
232
+ */
233
+ private gatherNamespace;
168
234
  /**
169
235
  * Collect addresses from all currently-connected namespaces using LIVE
170
236
  * (freshly-read) accounts rather than each service's connect-time cache.
@@ -1 +1 @@
1
- {"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../src/services/connection-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EACT,yBAAyB,EACzB,iCAAiC,EACjC,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAEjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAwH3D;;;;;;GAMG;AACH,MAAM,WAAW,iCAAiC;IAChD,4FAA4F;IAC5F,UAAU,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAAA;IACjD;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAA;IACvB;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAA;CAChB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,kCAAkC;IACjD,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAA;IAClB,gGAAgG;IAChG,MAAM,EAAE,UAAU,GAAG,SAAS,CAAA;IAC9B,+GAA+G;IAC/G,cAAc,EAAE,OAAO,CAAA;IACvB,sGAAsG;IACtG,MAAM,EAAE,OAAO,CAAA;CAChB;AAUD,4DAA4D;AAC5D,MAAM,WAAW,wBAAwB;IACvC;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5C;;;;;OAKG;IACH,+BAA+B,CAAC,EAC5B,CAAC,CAAC,IAAI,EAAE,iCAAiC,KAAK,IAAI,CAAC,GACnD,SAAS,CAAA;IACb;;;;OAIG;IACH,gCAAgC,CAAC,EAC7B,CAAC,CAAC,IAAI,EAAE,kCAAkC,KAAK,IAAI,CAAC,GACpD,SAAS,CAAA;IACb;;;;;;OAMG;IACH,2BAA2B,CAAC,EACxB,CAAC,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,SAAS,EAAE,CAAA;KAAE,KAAK,IAAI,CAAC,GAC7C,SAAS,CAAA;CACd;AAED,qBAAa,iBAAiB;IAyB1B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,UAAU;IA3BpB,OAAO,CAAC,gBAAgB,CAAsB;IAE9C;;;+DAG2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAoB;IAE9D;oFACgF;IAChF,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAoB;IAE1D,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAS;IAChD,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAEpC;IACb,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAErC;IACb,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAEhC;gBAGH,eAAe,EAAE,qBAAqB,EACtC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,gBAAgB,EACpC,OAAO,GAAE,wBAA6B;IAUxC,wFAAwF;IACxF,OAAO,CAAC,oCAAoC;IAiB5C,2EAA2E;IAC3E,OAAO,CAAC,mCAAmC;IAiB3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;YACW,6BAA6B;IA2D3C;;OAEG;IACG,wBAAwB,CAC5B,eAAe,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,EACrD,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC;QACT,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;QACtB,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;KACvC,CAAC;IA+JF;;OAEG;YACW,4BAA4B;IAsD1C;;OAEG;YACW,0BAA0B;IAsFxC;;OAEG;YACW,wBAAwB;IA0CtC;;;;OAIG;YACW,uBAAuB;IAgCrC;;;OAGG;YACW,kCAAkC;IAmBhD;;;;;;;;;;OAUG;YACW,6BAA6B;IAgD3C;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC;IA8C3B;;OAEG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC;IA8C3B;;OAEG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC;IAyC3B;;OAEG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC;IAuC3B;;OAEG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,mBAAmB,CAAC;IAgF/B;;OAEG;IACH,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAIpC;;OAEG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAInD;;OAEG;IACH,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAgBlC;;;;;OAKG;YACW,qBAAqB;IAgBnC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CASlC"}
1
+ {"version":3,"file":"connection-manager.d.ts","sourceRoot":"","sources":["../../src/services/connection-manager.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,5 @@
1
+ import { withDeadline } from '../utils/with-deadline';
2
+ import { createStepReporter } from '../utils/step-reporter';
1
3
  import { EthereumWalletService } from './ethereum/ethereum-wallet-service';
2
4
  import { SolanaWalletService } from './solana/solana-wallet-service';
3
5
  import { TronWalletService } from './tron/tron-wallet-service';
@@ -124,6 +126,22 @@ function skipLegacyInjectedSolanaSecondaryConnect(solanaMeta, usingIntegratedBro
124
126
  * egress cap — so an oversized value can't bloat the Set or reach consumers.
125
127
  */
126
128
  const MAX_INJECTED_ID_LENGTH = 64;
129
+ /**
130
+ * Default per-namespace cap for a secondary address gather (ONC-183).
131
+ *
132
+ * These run AFTER the user has already authorized the target namespace, and a
133
+ * wallet that never answers one of them used to hold the entire connect open
134
+ * indefinitely — the dominant "connected but hung" class (MetaMask's Solana
135
+ * Snap prompt being the motivating case: EVM approved, Snap prompt abandoned,
136
+ * `connect()` pending forever).
137
+ *
138
+ * 15s is deliberately generous relative to the ~19s MEDIAN for a whole connect:
139
+ * this bounds one supplementary leg, not the user-facing approval, and the cost
140
+ * of firing early is a missing secondary address (the session still connects on
141
+ * the namespace the user asked for) while the cost of firing late is nil. Tune
142
+ * from the `walletStep` p99 once it has run in prod.
143
+ */
144
+ export const DEFAULT_SECONDARY_GATHER_TIMEOUT_MS = 15_000;
127
145
  export class ConnectionManager {
128
146
  ethereumService;
129
147
  solanaService;
@@ -142,6 +160,8 @@ export class ConnectionManager {
142
160
  onSecondarySolanaConnectSkipped;
143
161
  onSecondarySolanaConnectGathered;
144
162
  onWalletConnectionsReleased;
163
+ steps;
164
+ secondaryGatherTimeoutMs;
145
165
  constructor(ethereumService, solanaService, tronService, tonService, options = {}) {
146
166
  this.ethereumService = ethereumService;
147
167
  this.solanaService = solanaService;
@@ -153,6 +173,9 @@ export class ConnectionManager {
153
173
  this.onSecondarySolanaConnectGathered =
154
174
  options.onSecondarySolanaConnectGathered;
155
175
  this.onWalletConnectionsReleased = options.onWalletConnectionsReleased;
176
+ this.steps = createStepReporter(options.onConnectStep);
177
+ this.secondaryGatherTimeoutMs =
178
+ options.secondaryGatherTimeoutMs ?? DEFAULT_SECONDARY_GATHER_TIMEOUT_MS;
156
179
  }
157
180
  /** Report a gathered legacy-injectedId Solana address, once per injectedId x source. */
158
181
  reportSecondarySolanaConnectGathered(meta, source) {
@@ -285,7 +308,7 @@ export class ConnectionManager {
285
308
  if (walletUuid) {
286
309
  const wallet = this.ethereumService.findWalletByUuid(walletUuid);
287
310
  if (wallet?.provider) {
288
- const accounts = await this.ethereumService.checkExistingConnection(wallet.provider);
311
+ const accounts = await this.steps.track('existingConnectionCheck', 'eip155', () => this.ethereumService.checkExistingConnection(wallet.provider));
289
312
  if (accounts && accounts.length > 0) {
290
313
  currentAddress = accounts[0] || null;
291
314
  this.ethereumService.setConnectionState(wallet.provider, currentAddress, walletUuid);
@@ -378,6 +401,9 @@ export class ConnectionManager {
378
401
  * Check and add Ethereum addresses if connected
379
402
  */
380
403
  async checkAndAddEthereumAddresses(provider, availableAddresses) {
404
+ // Default 'ok'; the internal catch below flips it so a swallowed wallet
405
+ // error is still REPORTED as a failure (see SecondaryGatherOutcome).
406
+ let outcome = 'ok';
381
407
  let ethAccount = this.ethereumService.getAccount();
382
408
  // If not connected, try to check existing connection
383
409
  if (!ethAccount) {
@@ -401,7 +427,9 @@ export class ConnectionManager {
401
427
  }
402
428
  catch {
403
429
  // EVM unavailable or the user declined the connect prompt —
404
- // continue without it (same as the Solana/Tron/TON gathers).
430
+ // continue without it (same as the Solana/Tron/TON gathers), but
431
+ // record it so the step telemetry doesn't report this as 'ok'.
432
+ outcome = 'failed';
405
433
  }
406
434
  }
407
435
  }
@@ -411,11 +439,15 @@ export class ConnectionManager {
411
439
  const ethAddresses = this.ethereumService.buildAvailableAddresses(provider.supportedNetworkIds, ethAccount);
412
440
  availableAddresses.push(...ethAddresses);
413
441
  }
442
+ return outcome;
414
443
  }
415
444
  /**
416
445
  * Check and add Solana addresses if connected
417
446
  */
418
447
  async checkAndAddSolanaAddresses(provider, availableAddresses) {
448
+ // Default 'ok'; the internal catch below flips it so a swallowed wallet
449
+ // error is still REPORTED as a failure (see SecondaryGatherOutcome).
450
+ let outcome = 'ok';
419
451
  let solanaAccount = this.solanaService.getAccount();
420
452
  // If not connected, try to check existing connection
421
453
  if (!solanaAccount) {
@@ -457,7 +489,10 @@ export class ConnectionManager {
457
489
  }
458
490
  }
459
491
  catch {
460
- // Solana namespace not available — continue without it
492
+ // Solana namespace not available (or the user declined the Snap
493
+ // prompt) — continue without it, but record the failure so the
494
+ // step telemetry doesn't report this as 'ok'.
495
+ outcome = 'failed';
461
496
  }
462
497
  }
463
498
  }
@@ -467,11 +502,15 @@ export class ConnectionManager {
467
502
  const solanaAddresses = this.solanaService.buildAvailableAddresses(provider.supportedNetworkIds, solanaAccount);
468
503
  availableAddresses.push(...solanaAddresses);
469
504
  }
505
+ return outcome;
470
506
  }
471
507
  /**
472
508
  * Check and add Tron addresses if connected
473
509
  */
474
510
  async checkAndAddTronAddresses(provider, availableAddresses) {
511
+ // Default 'ok'; the internal catch below flips it so a swallowed wallet
512
+ // error is still REPORTED as a failure (see SecondaryGatherOutcome).
513
+ let outcome = 'ok';
475
514
  let tronAccount = this.tronService.getAccount();
476
515
  // If not connected, try to check existing connection
477
516
  if (!tronAccount) {
@@ -490,7 +529,9 @@ export class ConnectionManager {
490
529
  }
491
530
  }
492
531
  catch {
493
- // Tron namespace not available — continue without it
532
+ // Tron namespace not available — continue without it, but record
533
+ // the failure so the step telemetry doesn't report this as 'ok'.
534
+ outcome = 'failed';
494
535
  }
495
536
  }
496
537
  }
@@ -500,6 +541,7 @@ export class ConnectionManager {
500
541
  const tronAddresses = this.tronService.buildAvailableAddresses(provider.supportedNetworkIds, tronAccount);
501
542
  availableAddresses.push(...tronAddresses);
502
543
  }
544
+ return outcome;
503
545
  }
504
546
  /**
505
547
  * Check and add TON addresses if connected, or auto-connect if detected.
@@ -507,6 +549,9 @@ export class ConnectionManager {
507
549
  * same behavior as Solana/Tron cross-namespace auto-connect.
508
550
  */
509
551
  async checkAndAddTonAddresses(provider, availableAddresses) {
552
+ // Default 'ok'; the internal catch below flips it so a swallowed wallet
553
+ // error is still REPORTED as a failure (see SecondaryGatherOutcome).
554
+ let outcome = 'ok';
510
555
  let tonAccount = this.tonService.getAccount();
511
556
  if (!tonAccount) {
512
557
  tonAccount = await this.tonService.checkExistingConnection();
@@ -519,7 +564,9 @@ export class ConnectionManager {
519
564
  tonAccount = result.address;
520
565
  }
521
566
  catch {
522
- // TON connection failed or was rejected — continue without TON
567
+ // TON connection failed or was rejected — continue without TON, but
568
+ // record the failure so the step telemetry doesn't report it as 'ok'.
569
+ outcome = 'failed';
523
570
  }
524
571
  }
525
572
  }
@@ -527,23 +574,80 @@ export class ConnectionManager {
527
574
  const tonAddresses = this.tonService.buildAvailableAddresses(provider.supportedNetworkIds, tonAccount);
528
575
  availableAddresses.push(...tonAddresses);
529
576
  }
577
+ return outcome;
530
578
  }
531
579
  /**
532
580
  * After connecting one namespace, check and add addresses for all OTHER namespaces.
533
581
  * E.g. after connecting Ethereum, also gather Solana, Tron, and TON addresses.
582
+ *
583
+ * Every leg is BEST-EFFORT and individually deadline-bounded (ONC-183). These
584
+ * run after the user has already authorized the target namespace, so a leg
585
+ * that never answers must cost its own address — not the whole connect. Each
586
+ * leg gets its OWN budget rather than one shared across all four: a shared
587
+ * budget would let a slow first leg silently starve the rest, turning one
588
+ * wallet's slowness into three missing addresses.
534
589
  */
535
590
  async checkAndAddOtherNamespaceAddresses(connectedNamespace, provider, availableAddresses) {
536
591
  if (connectedNamespace !== 'eip155') {
537
- await this.checkAndAddEthereumAddresses(provider, availableAddresses);
592
+ await this.gatherNamespace('eip155', () => this.checkAndAddEthereumAddresses(provider, availableAddresses));
538
593
  }
539
594
  if (connectedNamespace !== 'solana') {
540
- await this.checkAndAddSolanaAddresses(provider, availableAddresses);
595
+ await this.gatherNamespace('solana', () => this.checkAndAddSolanaAddresses(provider, availableAddresses));
541
596
  }
542
597
  if (connectedNamespace !== 'tron') {
543
- await this.checkAndAddTronAddresses(provider, availableAddresses);
598
+ await this.gatherNamespace('tron', () => this.checkAndAddTronAddresses(provider, availableAddresses));
544
599
  }
545
600
  if (connectedNamespace !== 'tvm') {
546
- await this.checkAndAddTonAddresses(provider, availableAddresses);
601
+ await this.gatherNamespace('tvm', () => this.checkAndAddTonAddresses(provider, availableAddresses));
602
+ }
603
+ }
604
+ /**
605
+ * Run one secondary-namespace gather under its deadline, reporting the
606
+ * outcome as a `secondaryGather` step.
607
+ *
608
+ * Swallows a rejection as well as a timeout: the per-namespace helpers below
609
+ * already catch their own wallet errors, so anything reaching here is an
610
+ * unexpected throw — and dropping one namespace's address is still the right
611
+ * degradation for a gather the user never asked for.
612
+ *
613
+ * The reported outcome comes from the helper's own
614
+ * {@link SecondaryGatherOutcome}, NOT from "did the promise resolve" — see
615
+ * that type for why those two are not the same thing.
616
+ */
617
+ async gatherNamespace(namespace, gather) {
618
+ const timeoutMs = this.secondaryGatherTimeoutMs;
619
+ const start = Date.now();
620
+ let timedOut = false;
621
+ try {
622
+ const outcome = await withDeadline(gather, timeoutMs, () => {
623
+ timedOut = true;
624
+ this.steps.report({
625
+ step: 'secondaryGather',
626
+ outcome: 'timedOut',
627
+ durationMs: Date.now() - start,
628
+ namespace,
629
+ timeoutMs
630
+ });
631
+ });
632
+ if (!timedOut) {
633
+ this.steps.report({
634
+ step: 'secondaryGather',
635
+ // `withDeadline` resolves undefined only on the timeout path, which
636
+ // the `!timedOut` guard already excludes; treat a missing outcome as
637
+ // a failure rather than silently reporting success.
638
+ outcome: outcome ?? 'failed',
639
+ durationMs: Date.now() - start,
640
+ namespace
641
+ });
642
+ }
643
+ }
644
+ catch {
645
+ this.steps.report({
646
+ step: 'secondaryGather',
647
+ outcome: 'failed',
648
+ durationMs: Date.now() - start,
649
+ namespace
650
+ });
547
651
  }
548
652
  }
549
653
  /**
@@ -582,15 +686,23 @@ export class ConnectionManager {
582
686
  */
583
687
  async connectEthereum(network, provider) {
584
688
  try {
585
- const walletUuid = provider.namespaceMetaData?.eip155?.detectedWallet?.uuid;
586
- if (!walletUuid) {
587
- throw new Error(`${provider.namespaceMetaData.eip155?.eip155Name || provider.namespaceMetaData.eip155?.injectedId} wallet eip155 provider was not detected`);
588
- }
589
- const wallet = this.ethereumService.findWalletByUuid(walletUuid);
590
- if (!wallet || !wallet.provider) {
591
- throw new Error(`Wallet provider not found for UUID: ${walletUuid}`);
592
- }
593
- const address = await this.ethereumService.connect(wallet.provider, walletUuid);
689
+ // Provider detection is reported as its own step (ONC-183): both throws
690
+ // below are "the wallet was never found", a failure class that is
691
+ // indistinguishable from "the wallet never answered" once it collapses
692
+ // into a single `walletFailed` terminal — and unlike a wallet hang it is
693
+ // retryable without re-prompting the user.
694
+ const wallet = await this.steps.track('providerDetection', 'eip155', () => {
695
+ const uuid = provider.namespaceMetaData?.eip155?.detectedWallet?.uuid;
696
+ if (!uuid) {
697
+ throw new Error(`${provider.namespaceMetaData.eip155?.eip155Name || provider.namespaceMetaData.eip155?.injectedId} wallet eip155 provider was not detected`);
698
+ }
699
+ const detected = this.ethereumService.findWalletByUuid(uuid);
700
+ if (!detected || !detected.provider) {
701
+ throw new Error(`Wallet provider not found for UUID: ${uuid}`);
702
+ }
703
+ return Promise.resolve({ uuid, provider: detected.provider });
704
+ });
705
+ const address = await this.ethereumService.connect(wallet.provider, wallet.uuid, info => this.steps.report(info));
594
706
  this.currentNetworkId = network.id;
595
707
  const availableAddresses = [];
596
708
  // Add all Ethereum addresses