@meshconnect/uwc-injected-connector 0.27.3 → 0.27.4-snapshot.4a8b6b2
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.
- package/dist/injected-connector.d.ts.map +1 -1
- package/dist/injected-connector.js +10 -5
- package/dist/injected-connector.js.map +1 -1
- package/dist/services/connection-manager.d.ts +44 -7
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js +119 -25
- package/dist/services/connection-manager.js.map +1 -1
- package/dist/utils/error-utils.d.ts +13 -0
- package/dist/utils/error-utils.d.ts.map +1 -1
- package/dist/utils/error-utils.js +25 -1
- package/dist/utils/error-utils.js.map +1 -1
- package/dist/utils/gather-failure.d.ts +13 -0
- package/dist/utils/gather-failure.d.ts.map +1 -0
- package/dist/utils/gather-failure.js +32 -0
- package/dist/utils/gather-failure.js.map +1 -0
- package/package.json +7 -7
- package/src/injected-connector.test.ts +16 -2
- package/src/injected-connector.ts +17 -5
- package/src/services/connection-manager.test.ts +511 -1
- package/src/services/connection-manager.ts +213 -51
- package/src/utils/error-utils.test.ts +42 -1
- package/src/utils/error-utils.ts +28 -1
- package/src/utils/gather-failure.test.ts +47 -0
- package/src/utils/gather-failure.ts +44 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injected-connector.d.ts","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAEP,yBAAyB,EACzB,iCAAiC,EACjC,SAAS,EACT,uBAAuB,EACvB,eAAe,EAEf,mBAAmB,EACnB,SAAS,EACT,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,iBAAiB,EAEjB,aAAa,EACb,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EAEb,cAAc,EACf,MAAM,wBAAwB,CAAA;AAK/B,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAA;AASxC,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,2CAA2C,CAAA;
|
|
1
|
+
{"version":3,"file":"injected-connector.d.ts","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { BitcoinWalletService } from './services/bitcoin/bitcoin-wallet-service'
|
|
|
10
10
|
import { StorageService } from './services/storage-service';
|
|
11
11
|
import { ConnectionManager, DEFAULT_SECONDARY_GATHER_TIMEOUT_MS } from './services/connection-manager';
|
|
12
12
|
import { withDeadline } from './utils/with-deadline';
|
|
13
|
+
import { gatherFailure } from './utils/gather-failure';
|
|
13
14
|
import { createStepReporter } from './utils/step-reporter';
|
|
14
15
|
import { SignatureService } from './services/signature-service';
|
|
15
16
|
import { TransactionService } from './services/transaction-service';
|
|
@@ -190,6 +191,10 @@ export class InjectedConnector {
|
|
|
190
191
|
// doesn't satisfy the caller's pin must NOT be reported as an existing
|
|
191
192
|
// connection, or the prompting connect that could authorize the right one
|
|
192
193
|
// is skipped and the caller is stuck with an address it already rejected.
|
|
194
|
+
//
|
|
195
|
+
// Begun first, so an earlier attempt still running stops being live; its
|
|
196
|
+
// generation is carried to the primary request (ONC-2390).
|
|
197
|
+
const attempt = this.connectionManager.beginAttempt();
|
|
193
198
|
const { address: existingAddress, availableAddresses } = await this.connectionManager.checkExistingConnections(targetNamespace, provider, requiredAddresses, { silentOnly });
|
|
194
199
|
// Silent-only: the non-prompting probe above is the whole attempt. Without
|
|
195
200
|
// an already-authorized account, stop here — every path below
|
|
@@ -209,7 +214,7 @@ export class InjectedConnector {
|
|
|
209
214
|
}
|
|
210
215
|
else {
|
|
211
216
|
// Not connected, need to establish a new connection.
|
|
212
|
-
result = await this.connectToNamespace(targetNamespace, network, provider, requiredAddresses);
|
|
217
|
+
result = await this.connectToNamespace(targetNamespace, network, provider, requiredAddresses, attempt);
|
|
213
218
|
}
|
|
214
219
|
// Cross-namespace Tron auto-connect. When the Tron connector owns the Tron
|
|
215
220
|
// namespace, the legacy connection-manager gather is dormant, so a
|
|
@@ -226,10 +231,10 @@ export class InjectedConnector {
|
|
|
226
231
|
return result;
|
|
227
232
|
}
|
|
228
233
|
/** Establish a fresh connection for the target namespace. */
|
|
229
|
-
async connectToNamespace(targetNamespace, network, provider, requiredAddresses) {
|
|
234
|
+
async connectToNamespace(targetNamespace, network, provider, requiredAddresses, attempt) {
|
|
230
235
|
switch (targetNamespace) {
|
|
231
236
|
case 'eip155':
|
|
232
|
-
return await this.connectionManager.connectEthereum(network, provider);
|
|
237
|
+
return await this.connectionManager.connectEthereum(network, provider, attempt);
|
|
233
238
|
case 'solana':
|
|
234
239
|
return await this.connectionManager.connectSolana(network, provider);
|
|
235
240
|
case 'tron':
|
|
@@ -310,13 +315,13 @@ export class InjectedConnector {
|
|
|
310
315
|
namespace: 'tron'
|
|
311
316
|
});
|
|
312
317
|
}
|
|
313
|
-
catch {
|
|
318
|
+
catch (error) {
|
|
314
319
|
// Tron unavailable or the user declined the prompt — continue without it,
|
|
315
320
|
// same as the Solana/Tron/TON gathers in ConnectionManager.
|
|
316
321
|
if (!timedOut) {
|
|
317
322
|
this.steps.report({
|
|
318
323
|
step: 'secondaryGather',
|
|
319
|
-
|
|
324
|
+
...gatherFailure(error),
|
|
320
325
|
durationMs: Date.now() - start,
|
|
321
326
|
namespace: 'tron'
|
|
322
327
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injected-connector.js","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"AA+BA,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EACL,aAAa,EAEd,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AACpE,OAAO,EACL,oBAAoB,EAErB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EACL,iBAAiB,EACjB,mCAAmC,EACpC,MAAM,+BAA+B,CAAA;AAKtC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,kBAAkB,EAAqB,MAAM,uBAAuB,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AAKnE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAwFpE,MAAM,OAAO,iBAAiB;IACX,cAAc,CAAgB;IACvC,eAAe,CAAuB;IACtC,aAAa,CAAqB;IAClC,WAAW,CAAmB;IAC9B,UAAU,CAAkB;IAC5B,iBAAiB,CAAmB;IACpC,gBAAgB,CAAkB;IAClC,kBAAkB,CAAoB;IACtC,aAAa,CAAe;IAC5B,qBAAqB,CAAqC;IAClE;;;;OAIG;IACK,aAAa,CAAsB;IAC3C;;;;OAIG;IACK,cAAc,CAAsB;IAC5C;;;OAGG;IACK,QAAQ,CAAW;IAC3B;;;OAGG;IACK,sBAAsB,CAAS;IAC/B,wBAAwB,CAEnB;IACb;kFAC8E;IAC7D,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAA;IAC3D,+EAA+E;IAC9D,KAAK,CAAc;IACpC,2EAA2E;IAC1D,wBAAwB,CAAQ;IAEjD,kFAAkF;IAC1E,4BAA4B,GAClC,IAAI,CAAC,EAAE;QACL,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;YAAE,OAAM;QAC5D,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAChD,IAAI,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC,CAAA;IAEH,YAAY,OAAO,GAA6B,EAAE;QAChD,MAAM,EACJ,aAAa,GAAG,EAAE,EAClB,eAAe,GAAG,EAAE,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,EACb,QAAQ,GAAG,EAAE,EACb,aAAa,EACb,sBAAsB,GAAG,KAAK,EAC9B,wBAAwB,EACxB,+BAA+B,EAC/B,gCAAgC,EAChC,2BAA2B,EAC3B,aAAa,EACb,oBAAoB,EACpB,wBAAwB,EACzB,GAAG,OAAO,CAAA;QAEX,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAA;QACpD,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAA;QACxD,IAAI,CAAC,qBAAqB,GAAG,gBAAgB,EAAE,WAAW,CAAA;QAC1D,IAAI,CAAC,aAAa,GAAG,mBAAmB;YACtC,CAAC,CAAC,IAAI,aAAa,CAAC,mBAAmB,CAAC;YACxC,CAAC,CAAC,IAAI,CAAA;QACR,IAAI,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAC5C,aAAa,EACb,oBAAoB,CACrB,CAAA;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,EAAE,CAAA;QAC1C,IAAI,CAAC,eAAe,GAAG,IAAI,qBAAqB,EAAE,CAAA;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACjE,IAAI,CAAC,WAAW,GAAG,IAAI,iBAAiB,EAAE,CAAA;QAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,gBAAgB,CACpC,IAAI,CAAC,qBAAqB,EAC1B,gBAAgB,EAAE,iBAAiB,CACpC,CAAA;QACD,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAC5C,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,cAAc,EACnB;YACE,sBAAsB;YACtB,+BAA+B;YAC/B,gCAAgC;YAChC,2BAA2B;YAC3B,aAAa;YACb,wBAAwB;SACzB,CACF,CAAA;QACD,IAAI,CAAC,KAAK,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAC9C,IAAI,CAAC,wBAAwB;YAC3B,wBAAwB,IAAI,mCAAmC,CAAA;QACjE,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC9C,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAEpE,IAAI,WAAW,CAAC;YACd,eAAe,EACb,IAAI,CAAC,WAAW,CAAC,mCAAmC,CAAC,eAAe,CAAC;YACvE,eAAe,EACb,IAAI,CAAC,UAAU,CAAC,mCAAmC,CAAC,eAAe,CAAC;YACtE,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,mBAAmB,CACvB,SAAoB,EACpB,eAAe,GAAqB,EAAE;QAQtC,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,QAAQ,EAAE,CAAC;gBACd,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAA;gBAEjE,kCAAkC;gBAClC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjC,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAA;gBACjE,CAAC;gBAED,uCAAuC;gBACvC,OAAO,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC9D,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CAAC,CAAC,CAAA;YACL,CAAC;YAED,KAAK,QAAQ,EAAE,CAAC;gBACd,0BAA0B;gBAC1B,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAC1C,eAAe,EACf,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,wBAAwB;oBAC3B,CAAC,CAAC,IAAI,CAAC,4BAA4B;oBACnC,CAAC,CAAC,SAAS,CACd,CAAA;gBAED,uCAAuC;gBACvC,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC5D,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,uEAAuE;oBACvE,oEAAoE;oBACpE,+DAA+D;oBAC/D,GAAG,CAAC,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI;wBACzC,cAAc,EAAE,MAAM,CAAC,cAAc;qBACtC,CAAC;iBACH,CAAC,CAAC,CAAA;YACL,CAAC;YAED,KAAK,MAAM,EAAE,CAAC;gBACZ,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBACvB,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAClD,MAAM,EACN,eAAe,CAChB,CAA6B,CAAA;gBAChC,CAAC;gBACD,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAA;gBAE3D,OAAO,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC1D,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,CAAC,CAAC,CAAA;YACL,CAAC;YAED,KAAK,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAA;gBAE1D,OAAO,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACzD,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,WAAW,EAAE,MAAM,CAAC,WAAW;iBAChC,CAAC,CAAC,CAAA;YACL,CAAC;YAED,KAAK,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAC3C,eAAe,EACf,IAAI,CAAC,sBAAsB,CAC5B,CAAA;gBAED,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC7D,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC1B,CAAC,CAAC,CAAA;YACL,CAAC;YAED;gBACE,OAAO,EAAE,CAAA;QACb,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CACX,OAAgB,EAChB,QAAwE,EACxE,OAAiC;QAEjC,4EAA4E;QAC5E,yEAAyE;QACzE,0EAA0E;QAC1E,yEAAyE;QACzE,0EAA0E;QAC1E,0CAA0C;QAC1C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAA;QACH,CAAC;QACD,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAA;QACzC,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,CAAA;QACpD,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,KAAK,IAAI,CAAA;QAE/C,uEAAuE;QACvE,wEAAwE;QACxE,0DAA0D;QAC1D,EAAE;QACF,2EAA2E;QAC3E,uEAAuE;QACvE,0EAA0E;QAC1E,0EAA0E;QAC1E,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,GACpD,MAAM,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CACnD,eAAe,EACf,QAAQ,EACR,iBAAiB,EACjB,EAAE,UAAU,EAAE,CACf,CAAA;QAEH,2EAA2E;QAC3E,8DAA8D;QAC9D,wEAAwE;QACxE,IAAI,UAAU,IAAI,CAAC,eAAe,EAAE,CAAC;YACnC,MAAM,IAAI,wBAAwB,EAAE,CAAA;QACtC,CAAC;QAED,IAAI,MAAuB,CAAA;QAC3B,IAAI,eAAe,EAAE,CAAC;YACpB,sDAAsD;YACtD,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACtD,MAAM,GAAG;gBACP,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,OAAO,EAAE,eAAe;gBACxB,kBAAkB;aACnB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,qDAAqD;YACrD,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CACpC,eAAe,EACf,OAAO,EACP,QAAQ,EACR,iBAAiB,CAClB,CAAA;QACH,CAAC;QAED,2EAA2E;QAC3E,mEAAmE;QACnE,uEAAuE;QACvE,qEAAqE;QACrE,0EAA0E;QAC1E,2CAA2C;QAC3C,sEAAsE;QACtE,0EAA0E;QAC1E,mBAAmB;QACnB,IAAI,eAAe,KAAK,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAChE,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,6DAA6D;IACrD,KAAK,CAAC,kBAAkB,CAC9B,eAA0B,EAC1B,OAAgB,EAChB,QAAuE,EACvE,iBAAqC;QAErC,QAAQ,eAAe,EAAE,CAAC;YACxB,KAAK,QAAQ;gBACX,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAExE,KAAK,QAAQ;gBACX,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAEtE,KAAK,MAAM;gBACT,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBACvB,oEAAoE;oBACpE,iEAAiE;oBACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;oBAClE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;oBACtD,OAAO,MAAM,CAAA;gBACf,CAAC;gBACD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAEpE,KAAK,KAAK;gBACR,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAEnE,KAAK,QAAQ;gBACX,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAChD,OAAO,EACP,QAAQ,EACR,iBAAiB,CAClB,CAAA;YAEH;gBACE,MAAM,IAAI,KAAK,CACb,cAAc,OAAO,CAAC,SAAS,yGAAyG,CACzI,CAAA;QACL,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,cAAc,CAC1B,QAAuE,EACvE,kBAAsC;QAEtC,IAAI,CAAC,IAAI,CAAC,aAAa;YAAE,OAAM;QAE/B,qEAAqE;QACrE,8EAA8E;QAC9E,gFAAgF;QAChF,8EAA8E;QAC9E,+EAA+E;QAC/E,4EAA4E;QAC5E,4EAA4E;QAC5E,+EAA+E;QAC/E,4EAA4E;QAC5E,8DAA8D;QAE9D,oEAAoE;QACpE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,UAAU;YAAE,OAAM;QAEzD,iEAAiE;QACjE,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAAE,OAAM;QAEzE,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,MAAM,IAAI,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAC3E,CAAA;QACD,IAAI,CAAC,WAAW;YAAE,OAAM;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACxB,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC;YACH,oEAAoE;YACpE,2EAA2E;YAC3E,yEAAyE;YACzE,wEAAwE;YACxE,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,GAAG,EAAE,CAAC,IAAI,CAAC,aAAc,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,EACxD,IAAI,CAAC,wBAAwB,EAC7B,GAAG,EAAE;gBACH,QAAQ,GAAG,IAAI,CAAA;gBACf,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBAChB,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;oBAC9B,SAAS,EAAE,MAAM;oBACjB,SAAS,EAAE,IAAI,CAAC,wBAAwB;iBACzC,CAAC,CAAA;YACJ,CAAC,CACF,CAAA;YACD,IAAI,CAAC,MAAM;gBAAE,OAAM;YACnB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC7C,MAAM,GAAG,GAAG,kBAAkB,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAClE,CAAA;gBACD,IAAI,CAAC,GAAG;oBAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzC,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAChB,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;gBAC9B,SAAS,EAAE,MAAM;aAClB,CAAC,CAAA;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,0EAA0E;YAC1E,4DAA4D;YAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBAChB,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,QAAQ;oBACjB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;oBAC9B,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CACjB,OAAgB,EAChB,QAAuE;QAEvE,IAAI,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YAC9D,oEAAoE;YACpE,kEAAkE;YAClE,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YACtD,OAAO,MAAM,CAAA;QACf,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACtE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,0EAA0E;YAC1E,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAA;YACvC,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;QACD,mEAAmE;QACnE,gEAAgE;QAChE,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAA;IAC3C,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,gBAAgB,CACd,QAA+C,EAC/C,OAA+B;QAE/B,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;YAC1B,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;YACxD,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;YACtD;gBACE,OAAO,SAAS,CAAA;QACpB,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,iBAAiB,CACf,QAAsC,EACtC,OAA+B;QAE/B,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;YAC1B,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;YACzD,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;YACvD,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACnE,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;YACxD;gBACE,OAAO,SAAS,CAAA;QACpB,CAAC;IACH,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,cAAc,CAAC,SAAoB;QACvC,IAAI,CAAC;YACH,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,QAAQ;oBACX,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAA;gBACpD,KAAK,QAAQ;oBACX,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAA;gBAClD,KAAK,MAAM;oBACT,OAAO,CACL,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,EAAE,CAAC;wBAC9C,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAC1C,CAAA;gBACH,KAAK,KAAK;oBACR,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,IAAI,CAAA;gBAC7C,KAAK,QAAQ;oBACX,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAA;gBACnD;oBACE,OAAO,IAAI,CAAA;YACf,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CACf,OAAe,EACf,QAAuE;QAEvE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACpD,CAAC;QAED,gDAAgD;QAChD,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAA;QACrE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QACjD,CAAC;QAED,oEAAoE;QACpE,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAKnC,CAAA;QAEZ,wCAAwC;QACxC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAA;QAEjE,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,mCAAmC;YACnC,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE,CAAA;YAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;YACnD,CAAC;YAED,wEAAwE;YACxE,0EAA0E;YAC1E,0EAA0E;YAC1E,kEAAkE;YAClE,2EAA2E;YAC3E,0DAA0D;YAC1D,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,IAAI,cAAc,CAAA;YACjE,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACzD,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAC/D,OAAO,EACP,aAAa,EACb,WAAW,CACZ,CAAA;YACD,OAAO;gBACL,SAAS,EAAE;oBACT,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,SAAS;iBACrB;gBACD,OAAO,EAAE,aAAa;aACvB,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,4EAA4E;YAC5E,2EAA2E;YAC3E,4EAA4E;YAC5E,4DAA4D;YAC5D,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAA;YACjD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAA;YAC9D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAChD,CAAC;YAED,mEAAmE;YACnE,yEAAyE;YACzE,oCAAoC;YACpC,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,IAAI,cAAc,CAAA;YAC/D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACzD,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAC7D,OAAO,EACP,aAAa,CACd,CAAA;YACD,OAAO;gBACL,SAAS,EAAE;oBACT,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,SAAS;iBACrB;gBACD,OAAO,EAAE,aAAa;aACvB,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,8DAA8D;gBAC9D,0DAA0D;gBAC1D,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YACtD,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAA;YAC5D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAC/C,CAAC;YAED,yEAAyE;YACzE,wEAAwE;YACxE,sEAAsE;YACtE,wEAAwE;YACxE,MAAM,cAAc,GAClB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,IAAI,cAAc,CAAA;YAE7D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAC3D,OAAO,EACP,YAAY,CACb,CAAA;YAED,kEAAkE;YAClE,qEAAqE;YACrE,oEAAoE;YACpE,2DAA2D;YAC3D,iEAAiE;YACjE,kEAAkE;YAClE,+CAA+C;YAC/C,MAAM,aAAa,GACjB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,IAAI,cAAc,CAAA;YAC7D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACzD,CAAC;YAED,OAAO;gBACL,SAAS,EAAE;oBACT,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,SAAS;iBACrB;gBACD,OAAO,EAAE,aAAa;aACvB,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YAC/B,sEAAsE;YACtE,yDAAyD;YACzD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAA;YAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACzD,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YAC5D,OAAO;gBACL,SAAS;gBACT,OAAO,EAAE,UAAU;aACpB,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,mEAAmE;YACnE,iEAAiE;YACjE,qEAAqE;YACrE,6DAA6D;YAC7D,MAAM,cAAc,GAClB,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;gBAC5C,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;YAClC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;YACzD,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YAChE,OAAO;gBACL,SAAS;gBACT,OAAO,EAAE,cAAc;aACxB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa,CACjB,SAA0B,EAC1B,SAAyE;QAEzE,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAA;QACrE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QACjD,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAChD,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,yDAAyD,SAAS,EAAE,CACrE,CAAA;QACH,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAA;QACjE,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE,CAAA;QAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAChD,SAAS,EACT,cAAc,EACd,WAAW,CACZ,CAAA;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACnB,OAA2B,EAC3B,QAAuE;QAEvE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;QAED,gDAAgD;QAChD,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAA;QACrE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QACjD,CAAC;QAED,oEAAoE;QACpE,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAKnC,CAAA;QAEZ,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,mCAAmC;YACnC,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE,CAAA;YAC/D,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;YACnD,CAAC;YAED,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAClD,OAAO,EACP,SAAS,EACT,WAAW,CACZ,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,2EAA2E;YAC3E,yEAAyE;YACzE,kBAAkB;YAClB,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAA;YACjD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAA;YAC9D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAChD,CAAC;YAED,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAClD,OAAO,EACP,SAAS,EACT,aAAa,EACb,gBAA6B,CAC9B,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;YAC1D,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAA;YAC5D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAC/C,CAAC;YAED,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAClD,OAAO,EACP,SAAS,EACT,YAAY,CACb,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YAC/B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAC1C,OAAmC,CACpC,CAAA;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAC9C,OAAoC,CACrC,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,6CAA6C,SAAS,EAAE,CAAC,CAAA;QAC3E,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CACzB,IAAY,EACZ,QAAmB;QAEnB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAA;QACrE,MAAM,SAAS,GAAG,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACjD,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAA;QACX,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IACnE,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,0BAA0B,CAC9B,YAAwB;QAExB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,CAAA;QACrE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAA;QACH,CAAC;QAED,2EAA2E;QAC3E,yEAAyE;QACzE,kBAAkB;QAClB,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAA;QACjD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAA;QAC9D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAChD,CAAC;QAED,IAAI,CAAC;YACH,0EAA0E;YAC1E,uEAAuE;YACvE,uEAAuE;YACvE,MAAM,eAAe,GAAG,aAA8C,CAAA;YACtE,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,eAAe,CAAA;YACvD,IAAI,SAAS,EAAE,QAAQ,CAAC,4BAA4B,CAAC,EAAE,CAAC;gBACtD,uEAAuE;gBACvE,gBAAgB;gBAChB,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,0BAA0B,CAC7D,YAAY,EACZ,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,SAAS,CACxD,CAAA;gBACD,mEAAmE;gBACnE,yEAAyE;gBACzE,oDAAoD;gBACpD,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;gBACvC,OAAO,MAAM,CAAA;YACf,CAAC;YAED,qEAAqE;YACrE,MAAM,MAAM,GAAI,aAAuC,CAAC,MAAM,CAAA;YAC9D,MAAM,OAAO,GAAG,wBAAwB,CAAA;YAExC,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvE,MAAM,OAAO,GAAG,qBAAqB,CACnC,MAAM,CAAC,QAAQ,EACf,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAC3C,CAAA;gBACD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;gBACxC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC;oBAC7C,OAAO;oBACP,WAAW,EAAE,YAAY;iBAC1B,CAAC,CAAA;gBACF,IAAI,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;oBAC/B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;gBAC1D,CAAC;gBACD,yDAAyD;gBACzD,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAA;gBACzD,OAAO,MAAM,CAAC,iBAAiB,CAAA;YACjC,CAAC;YAED,8CAA8C;YAC9C,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;YACtE,CAAC;YAED,gFAAgF;YAChF,IAAI,WAA+C,CAAA;YACnD,IAAI,CAAC;gBACH,WAAW,GAAG,oBAAoB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;YAC9D,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC;oBACH,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAC9C,CAAC;gBAAC,MAAM,CAAC;oBACP,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAA;gBACH,CAAC;YACH,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YAC/D,MAAM,WAAW,GACf,MAAM,YAAY,oBAAoB;gBACpC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE;gBACpB,CAAC,CAAC,IAAI,UAAU,CACZ,MAAM,CAAC,SAAS,CAAC;oBACf,oBAAoB,EAAE,KAAK;oBAC3B,gBAAgB,EAAE,KAAK;iBACxB,CAAC,CACH,CAAA;YACP,yEAAyE;YACzE,yEAAyE;YACzE,iDAAiD;YACjD,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;YAC5C,OAAO,WAAW,CAAA;QACpB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,wEAAwE;YACxE,0EAA0E;YAC1E,wEAAwE;YACxE,MAAM,UAAU,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"injected-connector.js","sourceRoot":"","sources":["../src/injected-connector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { Network, Namespace, ExtensionInjectedProvider, IntegratedBrowserInjectedProvider, ConnectorResult, SwitchNetworkResult, AvailableAddress, WalletStepInfo } from '@meshconnect/uwc-types';
|
|
2
|
-
import { EthereumWalletService } from './ethereum/ethereum-wallet-service';
|
|
3
|
-
import { SolanaWalletService } from './solana/solana-wallet-service';
|
|
4
|
-
import { TronWalletService } from './tron/tron-wallet-service';
|
|
5
|
-
import { TonWalletService } from './ton/ton-wallet-service';
|
|
6
|
-
import { BitcoinWalletService } from './bitcoin/bitcoin-wallet-service';
|
|
2
|
+
import type { EthereumWalletService } from './ethereum/ethereum-wallet-service';
|
|
3
|
+
import type { SolanaWalletService } from './solana/solana-wallet-service';
|
|
4
|
+
import type { TronWalletService } from './tron/tron-wallet-service';
|
|
5
|
+
import type { TonWalletService } from './ton/ton-wallet-service';
|
|
6
|
+
import { type BitcoinWalletService } from './bitcoin/bitcoin-wallet-service';
|
|
7
|
+
import { type SecondaryGatherFailure } from '../utils/gather-failure';
|
|
7
8
|
/**
|
|
8
9
|
* Payload for the `onSecondarySolanaConnectSkipped` triage sink: the ONC-3536
|
|
9
10
|
* gate was active for a legacy-`injectedId` wallet's secondary Solana gather —
|
|
@@ -112,6 +113,15 @@ export interface ConnectionManagerOptions {
|
|
|
112
113
|
* from the `walletStep` p99 once it has run in prod.
|
|
113
114
|
*/
|
|
114
115
|
export declare const DEFAULT_SECONDARY_GATHER_TIMEOUT_MS = 15000;
|
|
116
|
+
/**
|
|
117
|
+
* One connect attempt, from its pre-connect check to its primary request
|
|
118
|
+
* (ONC-2390). A superseded attempt keeps running after a newer one starts
|
|
119
|
+
* (core only stops awaiting it), so it carries its generation and can tell
|
|
120
|
+
* when it is no longer live.
|
|
121
|
+
*/
|
|
122
|
+
export interface ConnectAttempt {
|
|
123
|
+
readonly generation: number;
|
|
124
|
+
}
|
|
115
125
|
/**
|
|
116
126
|
* What a per-namespace secondary gather actually did, as reported UP to
|
|
117
127
|
* `gatherNamespace` for step telemetry.
|
|
@@ -125,7 +135,7 @@ export declare const DEFAULT_SECONDARY_GATHER_TIMEOUT_MS = 15000;
|
|
|
125
135
|
* return this instead so a swallowed failure is still reported as one, while
|
|
126
136
|
* the swallow keeps the connect alive.
|
|
127
137
|
*/
|
|
128
|
-
export type SecondaryGatherOutcome = 'ok' |
|
|
138
|
+
export type SecondaryGatherOutcome = 'ok' | SecondaryGatherFailure;
|
|
129
139
|
export declare class ConnectionManager {
|
|
130
140
|
private ethereumService;
|
|
131
141
|
private solanaService;
|
|
@@ -147,6 +157,18 @@ export declare class ConnectionManager {
|
|
|
147
157
|
private readonly onWalletConnectionsReleased?;
|
|
148
158
|
private readonly steps;
|
|
149
159
|
private readonly secondaryGatherTimeoutMs;
|
|
160
|
+
/**
|
|
161
|
+
* Bumped by every new connect attempt ({@link beginAttempt}) and by
|
|
162
|
+
* {@link disconnect}: an attempt whose generation no longer matches is no
|
|
163
|
+
* longer live.
|
|
164
|
+
*/
|
|
165
|
+
private attemptGeneration;
|
|
166
|
+
/**
|
|
167
|
+
* Requests still pending in each wallet (keyed by its EIP-6963 uuid), from
|
|
168
|
+
* any attempt: while one is open, MetaMask refuses every other request with
|
|
169
|
+
* -32002 "already pending" (ONC-2390).
|
|
170
|
+
*/
|
|
171
|
+
private readonly openPrompts;
|
|
150
172
|
constructor(ethereumService: EthereumWalletService, solanaService: SolanaWalletService, tronService: TronWalletService, tonService: TonWalletService, bitcoinService: BitcoinWalletService, options?: ConnectionManagerOptions);
|
|
151
173
|
/** Report a gathered legacy-injectedId Solana address, once per injectedId x source. */
|
|
152
174
|
private reportSecondarySolanaConnectGathered;
|
|
@@ -256,10 +278,25 @@ export declare class ConnectionManager {
|
|
|
256
278
|
* here), so tvm keeps `getAccount()`.
|
|
257
279
|
*/
|
|
258
280
|
private collectLiveConnectedAddresses;
|
|
281
|
+
/** Start a connect attempt; any earlier one stops being live. */
|
|
282
|
+
beginAttempt(): ConnectAttempt;
|
|
283
|
+
/** Track `request` as open in the wallet until it settles; returns it. */
|
|
284
|
+
private trackPrompt;
|
|
285
|
+
/**
|
|
286
|
+
* The EVM connect, asked again once if the wallet refused it because one of
|
|
287
|
+
* its windows is still open (ONC-2390): a secondary gather's past its
|
|
288
|
+
* deadline (on production's MetaMask config the connect window IS the
|
|
289
|
+
* Solana gather's), or one an earlier connect left open (Try Again, Link's
|
|
290
|
+
* return-user "Open MetaMask"). Either way the user's answer to that window
|
|
291
|
+
* was lost and the connect failed with -32002. Waits for the window with no
|
|
292
|
+
* deadline of its own, like any connect prompt: the consumer owns
|
|
293
|
+
* cancelling (Link's watchdog).
|
|
294
|
+
*/
|
|
295
|
+
private requestEthereumAccount;
|
|
259
296
|
/**
|
|
260
297
|
* Connect to Ethereum wallet
|
|
261
298
|
*/
|
|
262
|
-
connectEthereum(network: Network, provider: ExtensionInjectedProvider | IntegratedBrowserInjectedProvider): Promise<ConnectorResult>;
|
|
299
|
+
connectEthereum(network: Network, provider: ExtensionInjectedProvider | IntegratedBrowserInjectedProvider, attempt?: ConnectAttempt): Promise<ConnectorResult>;
|
|
263
300
|
/**
|
|
264
301
|
* Connect to Solana wallet
|
|
265
302
|
*/
|
|
@@ -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,EAEhB,cAAc,EACf,MAAM,wBAAwB,CAAA;
|
|
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,EAEhB,cAAc,EACf,MAAM,wBAAwB,CAAA;AAI/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAChE,OAAO,EACL,KAAK,oBAAoB,EAG1B,MAAM,kCAAkC,CAAA;AAGzC,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,yBAAyB,CAAA;AAuHhC;;;;;;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;AAuCD,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;IACb;;;;;OAKG;IACH,aAAa,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,SAAS,CAAA;IAC5D;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9C;AAED;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,mCAAmC,QAAS,CAAA;AAWzD;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,sBAAsB,GAAG,IAAI,GAAG,sBAAsB,CAAA;AAElE,qBAAa,iBAAiB;IAuC1B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,cAAc;IA1CxB,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;IACb,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAQ;IACjD;;;;OAIG;IACH,OAAO,CAAC,iBAAiB,CAAI;IAC7B;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqC;IAEjE,YACU,eAAe,EAAE,qBAAqB,EACtC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,UAAU,EAAE,gBAAgB,EAC5B,cAAc,EAAE,oBAAoB,EAC5C,OAAO,GAAE,wBAA6B,EAWvC;IAED,wFAAwF;IACxF,OAAO,CAAC,oCAAoC;IAiB5C,2EAA2E;IAC3E,OAAO,CAAC,mCAAmC;IAiB3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;YACW,6BAA6B;IAuE3C;;OAEG;IACG,wBAAwB,CAC5B,eAAe,EAAE,SAAS,EAC1B,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,EACvE,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,EACrC,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,GACjC,OAAO,CAAC;QACT,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;QACtB,kBAAkB,EAAE,gBAAgB,EAAE,CAAA;KACvC,CAAC,CAwND;IAED;;OAEG;YACW,4BAA4B;IA6D1C;;OAEG;YACW,0BAA0B;IAoGxC;;OAEG;YACW,wBAAwB;IAkDtC;;;;OAIG;YACW,uBAAuB;IAuCrC;;;;;;;OAOG;YACW,2BAA2B;IAiCzC;;;;;;;;;;OAUG;YACW,kCAAkC;IAkEhD;;;;;;;;;;;;OAYG;YACW,eAAe;IAgD7B;;;;;;;;;;OAUG;YACW,6BAA6B;IA8D3C,iEAAiE;IACjE,YAAY,IAAI,cAAc,CAG7B;IAED,0EAA0E;IAC1E,OAAO,CAAC,WAAW;IAyBnB;;;;;;;;;OASG;YACW,sBAAsB;IAkDpC;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,EAGvE,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,eAAe,CAAC,CAmD1B;IAED;;OAEG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC,CA4C1B;IAED;;OAEG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC,CAuC1B;IAED;;OAEG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,eAAe,CAAC,CAqC1B;IAED;;OAEG;IACG,cAAc,CAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,EACvE,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,GACpC,OAAO,CAAC,eAAe,CAAC,CA8B1B;IAED;;OAEG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,yBAAyB,GAAG,iCAAiC,GACtE,OAAO,CAAC,mBAAmB,CAAC,CAkG9B;IAED;;OAEG;IACH,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAEnC;IAED;;OAEG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAElD;IAED;;OAEG;IACH,iBAAiB,IAAI,MAAM,GAAG,IAAI,CAgBjC;IAED;;;;;OAKG;YACW,qBAAqB;IAkBnC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAUhC;CACF"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { withDeadline } from '../utils/with-deadline';
|
|
2
2
|
import { createStepReporter } from '../utils/step-reporter';
|
|
3
|
-
import {
|
|
4
|
-
import { SolanaWalletService } from './solana/solana-wallet-service';
|
|
5
|
-
import { TronWalletService } from './tron/tron-wallet-service';
|
|
6
|
-
import { TonWalletService } from './ton/ton-wallet-service';
|
|
7
|
-
import { BitcoinWalletService, normalizeRequiredAddresses, pinIncludes } from './bitcoin/bitcoin-wallet-service';
|
|
3
|
+
import { normalizeRequiredAddresses, pinIncludes } from './bitcoin/bitcoin-wallet-service';
|
|
8
4
|
import { assertBitcoinNetwork } from '@meshconnect/uwc-bitcoin';
|
|
9
|
-
import { parseError } from '../utils/error-utils';
|
|
5
|
+
import { isRequestAlreadyPending, parseError } from '../utils/error-utils';
|
|
6
|
+
import { gatherFailure } from '../utils/gather-failure';
|
|
10
7
|
/**
|
|
11
8
|
* True when running inside an iframe (`window.top !== window.self`). The
|
|
12
9
|
* try/catch is a safety net for sandboxed/restricted frames where evaluating
|
|
@@ -189,6 +186,18 @@ export class ConnectionManager {
|
|
|
189
186
|
onWalletConnectionsReleased;
|
|
190
187
|
steps;
|
|
191
188
|
secondaryGatherTimeoutMs;
|
|
189
|
+
/**
|
|
190
|
+
* Bumped by every new connect attempt ({@link beginAttempt}) and by
|
|
191
|
+
* {@link disconnect}: an attempt whose generation no longer matches is no
|
|
192
|
+
* longer live.
|
|
193
|
+
*/
|
|
194
|
+
attemptGeneration = 0;
|
|
195
|
+
/**
|
|
196
|
+
* Requests still pending in each wallet (keyed by its EIP-6963 uuid), from
|
|
197
|
+
* any attempt: while one is open, MetaMask refuses every other request with
|
|
198
|
+
* -32002 "already pending" (ONC-2390).
|
|
199
|
+
*/
|
|
200
|
+
openPrompts = new Map();
|
|
192
201
|
constructor(ethereumService, solanaService, tronService, tonService, bitcoinService, options = {}) {
|
|
193
202
|
this.ethereumService = ethereumService;
|
|
194
203
|
this.solanaService = solanaService;
|
|
@@ -517,11 +526,11 @@ export class ConnectionManager {
|
|
|
517
526
|
this.ethereumService.setConnectionState(ethWallet.provider, ethAddress, ethWalletUuid);
|
|
518
527
|
}
|
|
519
528
|
}
|
|
520
|
-
catch {
|
|
529
|
+
catch (error) {
|
|
521
530
|
// EVM unavailable or the user declined the connect prompt —
|
|
522
531
|
// continue without it (same as the Solana/Tron/TON gathers), but
|
|
523
532
|
// record it so the step telemetry doesn't report this as 'ok'.
|
|
524
|
-
outcome =
|
|
533
|
+
outcome = gatherFailure(error);
|
|
525
534
|
}
|
|
526
535
|
}
|
|
527
536
|
}
|
|
@@ -583,11 +592,11 @@ export class ConnectionManager {
|
|
|
583
592
|
this.reportSecondarySolanaConnectSkipped(solanaMeta, 'connectSuppressed');
|
|
584
593
|
}
|
|
585
594
|
}
|
|
586
|
-
catch {
|
|
595
|
+
catch (error) {
|
|
587
596
|
// Solana namespace not available (or the user declined the Snap
|
|
588
597
|
// prompt) — continue without it, but record the failure so the
|
|
589
598
|
// step telemetry doesn't report this as 'ok'.
|
|
590
|
-
outcome =
|
|
599
|
+
outcome = gatherFailure(error);
|
|
591
600
|
}
|
|
592
601
|
}
|
|
593
602
|
}
|
|
@@ -624,10 +633,10 @@ export class ConnectionManager {
|
|
|
624
633
|
this.tronService.setConnectionState(tronWallet.provider, address);
|
|
625
634
|
}
|
|
626
635
|
}
|
|
627
|
-
catch {
|
|
636
|
+
catch (error) {
|
|
628
637
|
// Tron namespace not available — continue without it, but record
|
|
629
638
|
// the failure so the step telemetry doesn't report this as 'ok'.
|
|
630
|
-
outcome =
|
|
639
|
+
outcome = gatherFailure(error);
|
|
631
640
|
}
|
|
632
641
|
}
|
|
633
642
|
}
|
|
@@ -659,10 +668,10 @@ export class ConnectionManager {
|
|
|
659
668
|
const result = await this.tonService.connect(jsBridgeKey);
|
|
660
669
|
tonAccount = result.address;
|
|
661
670
|
}
|
|
662
|
-
catch {
|
|
671
|
+
catch (error) {
|
|
663
672
|
// TON connection failed or was rejected — continue without TON, but
|
|
664
673
|
// record the failure so the step telemetry doesn't report it as 'ok'.
|
|
665
|
-
outcome =
|
|
674
|
+
outcome = gatherFailure(error);
|
|
666
675
|
}
|
|
667
676
|
}
|
|
668
677
|
}
|
|
@@ -713,19 +722,24 @@ export class ConnectionManager {
|
|
|
713
722
|
* wallet's slowness into three missing addresses.
|
|
714
723
|
*/
|
|
715
724
|
async checkAndAddOtherNamespaceAddresses(connectedNamespace, provider, availableAddresses, silentOnly = false) {
|
|
725
|
+
// A silent gather never opens a window, so it is not tracked.
|
|
726
|
+
const promptKey = silentOnly
|
|
727
|
+
? undefined
|
|
728
|
+
: provider.namespaceMetaData.eip155?.detectedWallet?.uuid;
|
|
716
729
|
if (connectedNamespace !== 'eip155') {
|
|
717
|
-
await this.gatherNamespace('eip155', () => this.checkAndAddEthereumAddresses(provider, availableAddresses, silentOnly));
|
|
730
|
+
await this.gatherNamespace('eip155', () => this.checkAndAddEthereumAddresses(provider, availableAddresses, silentOnly), promptKey);
|
|
718
731
|
}
|
|
719
732
|
if (connectedNamespace !== 'solana') {
|
|
720
|
-
await this.gatherNamespace('solana', () => this.checkAndAddSolanaAddresses(provider, availableAddresses, silentOnly));
|
|
733
|
+
await this.gatherNamespace('solana', () => this.checkAndAddSolanaAddresses(provider, availableAddresses, silentOnly), promptKey);
|
|
721
734
|
}
|
|
722
735
|
if (connectedNamespace !== 'tron') {
|
|
723
|
-
await this.gatherNamespace('tron', () => this.checkAndAddTronAddresses(provider, availableAddresses, silentOnly));
|
|
736
|
+
await this.gatherNamespace('tron', () => this.checkAndAddTronAddresses(provider, availableAddresses, silentOnly), promptKey);
|
|
724
737
|
}
|
|
725
738
|
if (connectedNamespace !== 'tvm') {
|
|
726
|
-
await this.gatherNamespace('tvm', () => this.checkAndAddTonAddresses(provider, availableAddresses, silentOnly));
|
|
739
|
+
await this.gatherNamespace('tvm', () => this.checkAndAddTonAddresses(provider, availableAddresses, silentOnly), promptKey);
|
|
727
740
|
}
|
|
728
741
|
if (connectedNamespace !== 'bip122') {
|
|
742
|
+
// Passive only: it never opens a window, so it is not tracked.
|
|
729
743
|
await this.gatherNamespace('bip122', () => this.checkAndAddBitcoinAddresses(provider, availableAddresses));
|
|
730
744
|
}
|
|
731
745
|
}
|
|
@@ -742,12 +756,15 @@ export class ConnectionManager {
|
|
|
742
756
|
* {@link SecondaryGatherOutcome}, NOT from "did the promise resolve" — see
|
|
743
757
|
* that type for why those two are not the same thing.
|
|
744
758
|
*/
|
|
745
|
-
async gatherNamespace(namespace, gather
|
|
759
|
+
async gatherNamespace(namespace, gather,
|
|
760
|
+
// The wallet to track the gather's request under while it is pending;
|
|
761
|
+
// omitted for a gather that never opens a window.
|
|
762
|
+
promptKey) {
|
|
746
763
|
const timeoutMs = this.secondaryGatherTimeoutMs;
|
|
747
764
|
const start = Date.now();
|
|
748
765
|
let timedOut = false;
|
|
749
766
|
try {
|
|
750
|
-
const outcome = await withDeadline(gather, timeoutMs, () => {
|
|
767
|
+
const outcome = await withDeadline(() => this.trackPrompt(promptKey, namespace, gather()), timeoutMs, () => {
|
|
751
768
|
timedOut = true;
|
|
752
769
|
this.steps.report({
|
|
753
770
|
step: 'secondaryGather',
|
|
@@ -763,16 +780,18 @@ export class ConnectionManager {
|
|
|
763
780
|
// `withDeadline` resolves undefined only on the timeout path, which
|
|
764
781
|
// the `!timedOut` guard already excludes; treat a missing outcome as
|
|
765
782
|
// a failure rather than silently reporting success.
|
|
766
|
-
outcome
|
|
783
|
+
...(outcome === 'ok'
|
|
784
|
+
? { outcome }
|
|
785
|
+
: (outcome ?? { outcome: 'failed' })),
|
|
767
786
|
durationMs: Date.now() - start,
|
|
768
787
|
namespace
|
|
769
788
|
});
|
|
770
789
|
}
|
|
771
790
|
}
|
|
772
|
-
catch {
|
|
791
|
+
catch (error) {
|
|
773
792
|
this.steps.report({
|
|
774
793
|
step: 'secondaryGather',
|
|
775
|
-
|
|
794
|
+
...gatherFailure(error),
|
|
776
795
|
durationMs: Date.now() - start,
|
|
777
796
|
namespace
|
|
778
797
|
});
|
|
@@ -817,10 +836,84 @@ export class ConnectionManager {
|
|
|
817
836
|
}
|
|
818
837
|
return addresses;
|
|
819
838
|
}
|
|
839
|
+
/** Start a connect attempt; any earlier one stops being live. */
|
|
840
|
+
beginAttempt() {
|
|
841
|
+
this.attemptGeneration++;
|
|
842
|
+
return { generation: this.attemptGeneration };
|
|
843
|
+
}
|
|
844
|
+
/** Track `request` as open in the wallet until it settles; returns it. */
|
|
845
|
+
trackPrompt(key, namespace, request) {
|
|
846
|
+
if (!key)
|
|
847
|
+
return request;
|
|
848
|
+
const prompts = this.openPrompts.get(key) ?? new Set();
|
|
849
|
+
this.openPrompts.set(key, prompts);
|
|
850
|
+
const prompt = {
|
|
851
|
+
namespace,
|
|
852
|
+
settled: request.then(() => undefined, () => undefined)
|
|
853
|
+
};
|
|
854
|
+
prompts.add(prompt);
|
|
855
|
+
void prompt.settled.then(() => {
|
|
856
|
+
prompts.delete(prompt);
|
|
857
|
+
if (prompts.size === 0 && this.openPrompts.get(key) === prompts) {
|
|
858
|
+
this.openPrompts.delete(key);
|
|
859
|
+
}
|
|
860
|
+
});
|
|
861
|
+
return request;
|
|
862
|
+
}
|
|
863
|
+
/**
|
|
864
|
+
* The EVM connect, asked again once if the wallet refused it because one of
|
|
865
|
+
* its windows is still open (ONC-2390): a secondary gather's past its
|
|
866
|
+
* deadline (on production's MetaMask config the connect window IS the
|
|
867
|
+
* Solana gather's), or one an earlier connect left open (Try Again, Link's
|
|
868
|
+
* return-user "Open MetaMask"). Either way the user's answer to that window
|
|
869
|
+
* was lost and the connect failed with -32002. Waits for the window with no
|
|
870
|
+
* deadline of its own, like any connect prompt: the consumer owns
|
|
871
|
+
* cancelling (Link's watchdog).
|
|
872
|
+
*/
|
|
873
|
+
async requestEthereumAccount(wallet, attempt) {
|
|
874
|
+
const isLive = () => attempt === undefined || attempt.generation === this.attemptGeneration;
|
|
875
|
+
// Disconnected or superseded before its primary request: sending it
|
|
876
|
+
// would open a prompt nobody waits for, or one that refuses the newer
|
|
877
|
+
// attempt's.
|
|
878
|
+
if (!isLive()) {
|
|
879
|
+
throw new DOMException('Superseded by a newer connection attempt', 'AbortError');
|
|
880
|
+
}
|
|
881
|
+
const connect = () => this.trackPrompt(wallet.uuid, 'eip155', this.ethereumService.connect(wallet.provider, wallet.uuid, info => this.steps.report(info)));
|
|
882
|
+
// Taken when the request is sent: its refusal can arrive after the user
|
|
883
|
+
// answered the window that caused it (a slow bridge).
|
|
884
|
+
const open = [...(this.openPrompts.get(wallet.uuid) ?? [])];
|
|
885
|
+
try {
|
|
886
|
+
return await connect();
|
|
887
|
+
}
|
|
888
|
+
catch (error) {
|
|
889
|
+
if (!attempt || open.length === 0 || !isRequestAlreadyPending(error)) {
|
|
890
|
+
throw error;
|
|
891
|
+
}
|
|
892
|
+
const start = Date.now();
|
|
893
|
+
await Promise.all(open.map(prompt => prompt.settled));
|
|
894
|
+
// Disconnected, or superseded by a newer attempt, while waiting: asking
|
|
895
|
+
// now could open a prompt nobody is waiting for.
|
|
896
|
+
const live = isLive();
|
|
897
|
+
for (const { namespace } of open) {
|
|
898
|
+
this.steps.report({
|
|
899
|
+
step: 'awaitOpenPrompt',
|
|
900
|
+
outcome: live ? 'ok' : 'skipped',
|
|
901
|
+
durationMs: Date.now() - start,
|
|
902
|
+
namespace
|
|
903
|
+
});
|
|
904
|
+
}
|
|
905
|
+
if (!live)
|
|
906
|
+
throw error;
|
|
907
|
+
return await connect();
|
|
908
|
+
}
|
|
909
|
+
}
|
|
820
910
|
/**
|
|
821
911
|
* Connect to Ethereum wallet
|
|
822
912
|
*/
|
|
823
|
-
async connectEthereum(network, provider
|
|
913
|
+
async connectEthereum(network, provider,
|
|
914
|
+
// The attempt whose pre-connect check ran before this; without one there
|
|
915
|
+
// is no open window to wait for.
|
|
916
|
+
attempt) {
|
|
824
917
|
try {
|
|
825
918
|
// Provider detection is reported as its own step (ONC-183): both throws
|
|
826
919
|
// below are "the wallet was never found", a failure class that is
|
|
@@ -838,7 +931,7 @@ export class ConnectionManager {
|
|
|
838
931
|
}
|
|
839
932
|
return Promise.resolve({ uuid, provider: detected.provider });
|
|
840
933
|
});
|
|
841
|
-
const address = await this.
|
|
934
|
+
const address = await this.requestEthereumAccount(wallet, attempt);
|
|
842
935
|
this.currentNetworkId = network.id;
|
|
843
936
|
const availableAddresses = [];
|
|
844
937
|
// Add all Ethereum addresses
|
|
@@ -1121,6 +1214,7 @@ export class ConnectionManager {
|
|
|
1121
1214
|
* Disconnect all
|
|
1122
1215
|
*/
|
|
1123
1216
|
async disconnect() {
|
|
1217
|
+
this.attemptGeneration++;
|
|
1124
1218
|
this.ethereumService.disconnect();
|
|
1125
1219
|
this.solanaService.disconnect();
|
|
1126
1220
|
this.tronService.disconnect();
|