@meshconnect/uwc-injected-connector 0.27.5 → 0.28.0
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 +62 -47
- package/dist/injected-connector.js.map +1 -1
- package/dist/services/connection-manager.d.ts +17 -13
- package/dist/services/connection-manager.d.ts.map +1 -1
- package/dist/services/connection-manager.js +93 -65
- package/dist/services/connection-manager.js.map +1 -1
- package/dist/services/solana/solana-wallet-service.d.ts +2 -0
- package/dist/services/solana/solana-wallet-service.d.ts.map +1 -1
- package/dist/services/solana/solana-wallet-service.js +1 -0
- package/dist/services/solana/solana-wallet-service.js.map +1 -1
- package/dist/services/ton/ton-wallet-service.d.ts +7 -1
- package/dist/services/ton/ton-wallet-service.d.ts.map +1 -1
- package/dist/services/ton/ton-wallet-service.js +21 -1
- package/dist/services/ton/ton-wallet-service.js.map +1 -1
- package/dist/utils/secondary-prompt-gap.d.ts +47 -0
- package/dist/utils/secondary-prompt-gap.d.ts.map +1 -0
- package/dist/utils/secondary-prompt-gap.js +65 -0
- package/dist/utils/secondary-prompt-gap.js.map +1 -0
- package/package.json +6 -6
- package/src/injected-connector.test.ts +374 -7
- package/src/injected-connector.ts +100 -55
- package/src/services/connection-manager.test.ts +841 -171
- package/src/services/connection-manager.ts +157 -86
- package/src/services/solana/solana-wallet-service.check-existing.test.ts +24 -0
- package/src/services/solana/solana-wallet-service.ts +6 -1
- package/src/services/ton/ton-wallet-service.test.ts +69 -0
- package/src/services/ton/ton-wallet-service.ts +22 -1
- package/src/utils/secondary-prompt-gap.test.ts +288 -0
- package/src/utils/secondary-prompt-gap.ts +95 -0
|
@@ -41,7 +41,13 @@ export class TonWalletService {
|
|
|
41
41
|
this.sdkInstance = null;
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
|
|
44
|
+
/**
|
|
45
|
+
* Connects the injected TON wallet: resumes a stored session silently, or
|
|
46
|
+
* runs a fresh handshake, which can open the wallet's prompt.
|
|
47
|
+
* `beforeHandshake` is awaited right before that handshake only; a throw
|
|
48
|
+
* from it ends the connect without one.
|
|
49
|
+
*/
|
|
50
|
+
async connect(jsBridgeKey, beforeHandshake) {
|
|
45
51
|
const resolvedManifestUrl = typeof this.manifestUrl === 'function'
|
|
46
52
|
? this.manifestUrl()
|
|
47
53
|
: this.manifestUrl;
|
|
@@ -80,6 +86,20 @@ export class TonWalletService {
|
|
|
80
86
|
this.connectedJsBridgeKey = jsBridgeKey;
|
|
81
87
|
return restored;
|
|
82
88
|
}
|
|
89
|
+
if (beforeHandshake) {
|
|
90
|
+
try {
|
|
91
|
+
await beforeHandshake();
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
await this.cleanupSdk(sdkRef);
|
|
95
|
+
throw error;
|
|
96
|
+
}
|
|
97
|
+
// Disconnected, or superseded by a newer connect, while it ran.
|
|
98
|
+
if (this.connectGeneration !== generation) {
|
|
99
|
+
await this.cleanupSdk(sdkRef);
|
|
100
|
+
throw new Error('TON wallet connection was cancelled');
|
|
101
|
+
}
|
|
102
|
+
}
|
|
83
103
|
// No prior session — fresh handshake (preflight cleaned any stale state).
|
|
84
104
|
// Listen BEFORE connect — sdk.connect() is fire-and-forget
|
|
85
105
|
const walletPromise = new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ton-wallet-service.js","sourceRoot":"","sources":["../../../src/services/ton/ton-wallet-service.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,iBAAiB,EACjB,mCAAmC,EACnC,iBAAiB,EACjB,yBAAyB,EAC1B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,aAAa,EAA0B,MAAM,qBAAqB,CAAA;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAEjE,MAAM,kBAAkB,GAAG,MAAM,CAAA;AAOjC,MAAM,OAAO,gBAAgB;IACnB,eAAe,GAAwB,EAAE,CAAA;IACzC,gBAAgB,GAAkB,IAAI,CAAA;IACtC,oBAAoB,GAAkB,IAAI,CAAA;IAC1C,WAAW,GAAsB,IAAI,CAAA;IACrC,WAAW,CAAqC;IAChD,iBAAiB,CAA0B;IAC3C,qBAAqB,GAElB,IAAI,CAAA;IACP,gBAAgB,GAA6C,IAAI,CAAA;IACjE,kBAAkB,CAAuB;IACjD,+DAA+D;IACvD,mBAAmB,GAAwB,IAAI,CAAA;IAC/C,iBAAiB,GAAG,CAAC,CAAA;IAE7B,YACE,WAAqC,EACrC,iBAA8B;QAE9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,qBAAqB,EAAE,CAAA;IACvD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,eAAkC;QAC1D,IAAI,CAAC,eAAe,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,CAAA;IAC7D,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC7B,CAAC;IAED,gBAAgB,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IACxD,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,GAAe;QACtC,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,UAAU,EAAE,CAAA;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB;QACnB,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,GAAG,EAAE,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACzB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,WAAmB;
|
|
1
|
+
{"version":3,"file":"ton-wallet-service.js","sourceRoot":"","sources":["../../../src/services/ton/ton-wallet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Waits `secondaryPromptGapMs` (see `ConnectorConnectOptions`) before a
|
|
3
|
+
* secondary request that can open a wallet prompt. No wait for 0 or less.
|
|
4
|
+
*
|
|
5
|
+
* Rejects with the signal's reason once the gather is abandoned (its deadline
|
|
6
|
+
* passed), before the wait or during it: an abandoned leg must not go on to
|
|
7
|
+
* open a prompt after the connect has moved on.
|
|
8
|
+
*/
|
|
9
|
+
export declare function waitBeforeSecondaryPrompt(gapMs: number, signal?: AbortSignal): Promise<void>;
|
|
10
|
+
/**
|
|
11
|
+
* One secondary gather leg. `signal` aborts at the leg's deadline; `prompted`
|
|
12
|
+
* turns true once the leg sends a request that can open the wallet's prompt,
|
|
13
|
+
* as opposed to reading an existing authorization.
|
|
14
|
+
*/
|
|
15
|
+
export interface SecondaryLeg {
|
|
16
|
+
readonly signal: AbortSignal;
|
|
17
|
+
prompted: boolean;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Right before a leg's request that can open a prompt: throws if the leg was
|
|
21
|
+
* abandoned, then marks it as prompted.
|
|
22
|
+
*/
|
|
23
|
+
export declare function markPrompted(leg: SecondaryLeg | undefined): void;
|
|
24
|
+
/**
|
|
25
|
+
* Right before a secondary request that can open a prompt: waits `gapMs` (see
|
|
26
|
+
* `waitBeforeSecondaryPrompt`), then marks the leg as prompted.
|
|
27
|
+
*/
|
|
28
|
+
export declare function beforeSecondaryPrompt(leg: SecondaryLeg | undefined, gapMs: number): Promise<void>;
|
|
29
|
+
/** How one secondary leg ended, and whether it sent a request that can prompt. */
|
|
30
|
+
export type SecondaryLegResult<T> = {
|
|
31
|
+
prompted: boolean;
|
|
32
|
+
} & ({
|
|
33
|
+
status: 'settled';
|
|
34
|
+
value: T;
|
|
35
|
+
} | {
|
|
36
|
+
status: 'timedOut';
|
|
37
|
+
} | {
|
|
38
|
+
status: 'failed';
|
|
39
|
+
error: unknown;
|
|
40
|
+
});
|
|
41
|
+
/**
|
|
42
|
+
* Runs one secondary leg under `withDeadline`. At the deadline the leg's
|
|
43
|
+
* signal aborts, so a leg still waiting out its gap or discovering its provider
|
|
44
|
+
* sends nothing afterwards. Never rejects: a throw comes back as `failed`.
|
|
45
|
+
*/
|
|
46
|
+
export declare function runSecondaryLeg<T>(timeoutMs: number, run: (leg: SecondaryLeg) => Promise<T>): Promise<SecondaryLegResult<T>>;
|
|
47
|
+
//# sourceMappingURL=secondary-prompt-gap.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secondary-prompt-gap.d.ts","sourceRoot":"","sources":["../../src/utils/secondary-prompt-gap.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAC5B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,CAGhE;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,YAAY,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,kFAAkF;AAClF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,GAAG,CACxD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,GAC/B;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,GACtB;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CACvC,CAAA;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,CAAC,EACrC,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,GAAG,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,GACrC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAmBhC"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { withDeadline } from './with-deadline';
|
|
2
|
+
/**
|
|
3
|
+
* Waits `secondaryPromptGapMs` (see `ConnectorConnectOptions`) before a
|
|
4
|
+
* secondary request that can open a wallet prompt. No wait for 0 or less.
|
|
5
|
+
*
|
|
6
|
+
* Rejects with the signal's reason once the gather is abandoned (its deadline
|
|
7
|
+
* passed), before the wait or during it: an abandoned leg must not go on to
|
|
8
|
+
* open a prompt after the connect has moved on.
|
|
9
|
+
*/
|
|
10
|
+
export async function waitBeforeSecondaryPrompt(gapMs, signal) {
|
|
11
|
+
signal?.throwIfAborted();
|
|
12
|
+
if (!(gapMs > 0))
|
|
13
|
+
return;
|
|
14
|
+
await new Promise((resolve, reject) => {
|
|
15
|
+
const timer = setTimeout(() => {
|
|
16
|
+
signal?.removeEventListener('abort', onAbort);
|
|
17
|
+
resolve();
|
|
18
|
+
}, gapMs);
|
|
19
|
+
function onAbort() {
|
|
20
|
+
clearTimeout(timer);
|
|
21
|
+
reject(signal?.reason);
|
|
22
|
+
}
|
|
23
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Right before a leg's request that can open a prompt: throws if the leg was
|
|
28
|
+
* abandoned, then marks it as prompted.
|
|
29
|
+
*/
|
|
30
|
+
export function markPrompted(leg) {
|
|
31
|
+
leg?.signal.throwIfAborted();
|
|
32
|
+
if (leg)
|
|
33
|
+
leg.prompted = true;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Right before a secondary request that can open a prompt: waits `gapMs` (see
|
|
37
|
+
* `waitBeforeSecondaryPrompt`), then marks the leg as prompted.
|
|
38
|
+
*/
|
|
39
|
+
export async function beforeSecondaryPrompt(leg, gapMs) {
|
|
40
|
+
await waitBeforeSecondaryPrompt(gapMs, leg?.signal);
|
|
41
|
+
markPrompted(leg);
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Runs one secondary leg under `withDeadline`. At the deadline the leg's
|
|
45
|
+
* signal aborts, so a leg still waiting out its gap or discovering its provider
|
|
46
|
+
* sends nothing afterwards. Never rejects: a throw comes back as `failed`.
|
|
47
|
+
*/
|
|
48
|
+
export async function runSecondaryLeg(timeoutMs, run) {
|
|
49
|
+
const abandoned = new AbortController();
|
|
50
|
+
const leg = { signal: abandoned.signal, prompted: false };
|
|
51
|
+
let timedOut = false;
|
|
52
|
+
try {
|
|
53
|
+
const value = await withDeadline(() => run(leg), timeoutMs, () => {
|
|
54
|
+
timedOut = true;
|
|
55
|
+
abandoned.abort();
|
|
56
|
+
});
|
|
57
|
+
return timedOut
|
|
58
|
+
? { status: 'timedOut', prompted: leg.prompted }
|
|
59
|
+
: { status: 'settled', value: value, prompted: leg.prompted };
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
return { status: 'failed', error, prompted: leg.prompted };
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=secondary-prompt-gap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secondary-prompt-gap.js","sourceRoot":"","sources":["../../src/utils/secondary-prompt-gap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAAa,EACb,MAAoB;IAEpB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QAAE,OAAM;IACxB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC7C,OAAO,EAAE,CAAA;QACX,CAAC,EAAE,KAAK,CAAC,CAAA;QACT,SAAS,OAAO;YACd,YAAY,CAAC,KAAK,CAAC,CAAA;YACnB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACxB,CAAC;QACD,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;AACJ,CAAC;AAYD;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,GAA6B;IACxD,GAAG,EAAE,MAAM,CAAC,cAAc,EAAE,CAAA;IAC5B,IAAI,GAAG;QAAE,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAA6B,EAC7B,KAAa;IAEb,MAAM,yBAAyB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;IACnD,YAAY,CAAC,GAAG,CAAC,CAAA;AACnB,CAAC;AASD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,SAAiB,EACjB,GAAsC;IAEtC,MAAM,SAAS,GAAG,IAAI,eAAe,EAAE,CAAA;IACvC,MAAM,GAAG,GAAiB,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;IACvE,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,YAAY,CAC9B,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EACd,SAAS,EACT,GAAG,EAAE;YACH,QAAQ,GAAG,IAAI,CAAA;YACf,SAAS,CAAC,KAAK,EAAE,CAAA;QACnB,CAAC,CACF,CAAA;QACD,OAAO,QAAQ;YACb,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE;YAChD,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAU,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAA;IACtE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAA;IAC5D,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@meshconnect/uwc-injected-connector",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.28.0",
|
|
4
4
|
"description": "Injected connector for Universal Wallet Connector",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"uuid": "^14.0.2",
|
|
29
29
|
"viem": "^2.56.5",
|
|
30
30
|
"@meshconnect/uwc-bridge-child": "0.6.1",
|
|
31
|
-
"@meshconnect/uwc-constants": "0.8.
|
|
32
|
-
"@meshconnect/uwc-ton-connector": "0.9.
|
|
33
|
-
"@meshconnect/uwc-bitcoin": "0.5.
|
|
34
|
-
"@meshconnect/uwc-tron-connector": "0.
|
|
35
|
-
"@meshconnect/uwc-types": "0.
|
|
31
|
+
"@meshconnect/uwc-constants": "0.8.8",
|
|
32
|
+
"@meshconnect/uwc-ton-connector": "0.9.16",
|
|
33
|
+
"@meshconnect/uwc-bitcoin": "0.5.10",
|
|
34
|
+
"@meshconnect/uwc-tron-connector": "0.8.0",
|
|
35
|
+
"@meshconnect/uwc-types": "0.34.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"typescript": "^7.0.2"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
|
1
|
+
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
|
2
2
|
import { InjectedConnector } from './injected-connector'
|
|
3
3
|
import type {
|
|
4
4
|
Network,
|
|
@@ -389,11 +389,12 @@ describe('InjectedConnector', () => {
|
|
|
389
389
|
'eip155',
|
|
390
390
|
mockEthProvider,
|
|
391
391
|
undefined,
|
|
392
|
-
{ silentOnly: false }
|
|
392
|
+
{ silentOnly: false, secondaryPromptGapMs: 0 }
|
|
393
393
|
)
|
|
394
394
|
expect(mockConnManager.connectEthereum).toHaveBeenCalledWith(
|
|
395
395
|
mockNetwork,
|
|
396
396
|
mockEthProvider,
|
|
397
|
+
0,
|
|
397
398
|
attempt
|
|
398
399
|
)
|
|
399
400
|
expect(result.address).toBe('0xnewaddress')
|
|
@@ -418,7 +419,7 @@ describe('InjectedConnector', () => {
|
|
|
418
419
|
'eip155',
|
|
419
420
|
mockEthProvider,
|
|
420
421
|
undefined,
|
|
421
|
-
{ silentOnly: true }
|
|
422
|
+
{ silentOnly: true, secondaryPromptGapMs: 0 }
|
|
422
423
|
)
|
|
423
424
|
expect(mockConnManager.connectEthereum).not.toHaveBeenCalled()
|
|
424
425
|
})
|
|
@@ -638,7 +639,12 @@ describe('InjectedConnector', () => {
|
|
|
638
639
|
|
|
639
640
|
// Routed through the Tron connector with the wallet provider (the
|
|
640
641
|
// connector reads the tron injectedId from it).
|
|
641
|
-
expect(tronConnect).toHaveBeenCalledWith(
|
|
642
|
+
expect(tronConnect).toHaveBeenCalledWith(
|
|
643
|
+
tronNetwork,
|
|
644
|
+
multiNsProvider,
|
|
645
|
+
undefined,
|
|
646
|
+
expect.any(Function)
|
|
647
|
+
)
|
|
642
648
|
// EVM address preserved AND the Tron address merged in.
|
|
643
649
|
expect(result.address).toBe('0xeth')
|
|
644
650
|
expect(result.availableAddresses).toContainEqual({
|
|
@@ -669,6 +675,244 @@ describe('InjectedConnector', () => {
|
|
|
669
675
|
expect(result.address).toBe('0xeth')
|
|
670
676
|
})
|
|
671
677
|
|
|
678
|
+
it('secondaryPromptGapMs: passes the gap to the gathers and the target connect', async () => {
|
|
679
|
+
vi.useFakeTimers()
|
|
680
|
+
try {
|
|
681
|
+
const c = await buildWithTron(vi.fn())
|
|
682
|
+
const { ConnectionManager } = await import(
|
|
683
|
+
'./services/connection-manager'
|
|
684
|
+
)
|
|
685
|
+
const connManager = vi
|
|
686
|
+
.mocked(ConnectionManager)
|
|
687
|
+
.mock.results.at(-1)!.value
|
|
688
|
+
const attempt = { generation: 1 }
|
|
689
|
+
connManager.beginAttempt.mockReturnValue(attempt)
|
|
690
|
+
|
|
691
|
+
const pending = c.connect(mockNetwork, multiNsProvider, {
|
|
692
|
+
secondaryPromptGapMs: 1500
|
|
693
|
+
})
|
|
694
|
+
await vi.runAllTimersAsync()
|
|
695
|
+
await pending
|
|
696
|
+
|
|
697
|
+
expect(connManager.checkExistingConnections).toHaveBeenCalledWith(
|
|
698
|
+
'eip155',
|
|
699
|
+
multiNsProvider,
|
|
700
|
+
undefined,
|
|
701
|
+
{ silentOnly: false, secondaryPromptGapMs: 1500 }
|
|
702
|
+
)
|
|
703
|
+
expect(connManager.connectEthereum).toHaveBeenCalledWith(
|
|
704
|
+
mockNetwork,
|
|
705
|
+
multiNsProvider,
|
|
706
|
+
1500,
|
|
707
|
+
attempt
|
|
708
|
+
)
|
|
709
|
+
} finally {
|
|
710
|
+
vi.useRealTimers()
|
|
711
|
+
}
|
|
712
|
+
})
|
|
713
|
+
|
|
714
|
+
it('secondaryPromptGapMs: waits the gap before the Tron prompt', async () => {
|
|
715
|
+
vi.useFakeTimers()
|
|
716
|
+
try {
|
|
717
|
+
const tronConnect = vi.fn().mockResolvedValue({
|
|
718
|
+
networkId: 'tron:0x2b6653dc',
|
|
719
|
+
address: 'TTronAddr',
|
|
720
|
+
availableAddresses: [
|
|
721
|
+
{ address: 'TTronAddr', networkId: 'tron:0x2b6653dc' }
|
|
722
|
+
]
|
|
723
|
+
})
|
|
724
|
+
const c = await buildWithTron(tronConnect)
|
|
725
|
+
|
|
726
|
+
const pending = c.connect(mockNetwork, multiNsProvider, {
|
|
727
|
+
secondaryPromptGapMs: 1500
|
|
728
|
+
})
|
|
729
|
+
await vi.advanceTimersByTimeAsync(1499)
|
|
730
|
+
expect(tronConnect).not.toHaveBeenCalled()
|
|
731
|
+
await vi.advanceTimersByTimeAsync(1)
|
|
732
|
+
const result = await pending
|
|
733
|
+
|
|
734
|
+
expect(tronConnect).toHaveBeenCalledTimes(1)
|
|
735
|
+
expect(result.availableAddresses).toContainEqual({
|
|
736
|
+
address: 'TTronAddr',
|
|
737
|
+
networkId: 'tron:0x2b6653dc'
|
|
738
|
+
})
|
|
739
|
+
} finally {
|
|
740
|
+
vi.useRealTimers()
|
|
741
|
+
}
|
|
742
|
+
})
|
|
743
|
+
|
|
744
|
+
it('secondaryPromptGapMs: a Tron leg past its deadline never opens the prompt', async () => {
|
|
745
|
+
vi.useFakeTimers()
|
|
746
|
+
try {
|
|
747
|
+
const tronConnect = vi.fn()
|
|
748
|
+
const { TronConnector } = await import(
|
|
749
|
+
'@meshconnect/uwc-tron-connector'
|
|
750
|
+
)
|
|
751
|
+
vi.mocked(TronConnector).mockImplementation(function () {
|
|
752
|
+
return { connect: tronConnect } as never
|
|
753
|
+
} as never)
|
|
754
|
+
const c = new InjectedConnector({
|
|
755
|
+
tronConnectorConfig: { enabledWallets: ['trust'] } as never,
|
|
756
|
+
networks: [mockNetwork, tronNetwork],
|
|
757
|
+
secondaryGatherTimeoutMs: 1000
|
|
758
|
+
})
|
|
759
|
+
const { ConnectionManager } = await import(
|
|
760
|
+
'./services/connection-manager'
|
|
761
|
+
)
|
|
762
|
+
const connManager = vi
|
|
763
|
+
.mocked(ConnectionManager)
|
|
764
|
+
.mock.results.at(-1)!.value
|
|
765
|
+
connManager.checkExistingConnections.mockResolvedValue({
|
|
766
|
+
address: null,
|
|
767
|
+
availableAddresses: []
|
|
768
|
+
})
|
|
769
|
+
connManager.connectEthereum.mockResolvedValue({
|
|
770
|
+
networkId: 'eip155:1',
|
|
771
|
+
address: '0xeth',
|
|
772
|
+
availableAddresses: [{ address: '0xeth', networkId: 'eip155:1' }]
|
|
773
|
+
})
|
|
774
|
+
|
|
775
|
+
const pending = c.connect(mockNetwork, multiNsProvider, {
|
|
776
|
+
secondaryPromptGapMs: 1500
|
|
777
|
+
})
|
|
778
|
+
await vi.advanceTimersByTimeAsync(5000)
|
|
779
|
+
await pending
|
|
780
|
+
|
|
781
|
+
expect(tronConnect).not.toHaveBeenCalled()
|
|
782
|
+
} finally {
|
|
783
|
+
vi.useRealTimers()
|
|
784
|
+
}
|
|
785
|
+
})
|
|
786
|
+
|
|
787
|
+
const tronLegStep = async (
|
|
788
|
+
tronConnect: ReturnType<typeof vi.fn>
|
|
789
|
+
): Promise<unknown> => {
|
|
790
|
+
const onConnectStep = vi.fn()
|
|
791
|
+
const { TronConnector } = await import(
|
|
792
|
+
'@meshconnect/uwc-tron-connector'
|
|
793
|
+
)
|
|
794
|
+
vi.mocked(TronConnector).mockImplementation(function () {
|
|
795
|
+
return { connect: tronConnect } as never
|
|
796
|
+
} as never)
|
|
797
|
+
const c = new InjectedConnector({
|
|
798
|
+
tronConnectorConfig: { enabledWallets: ['trust'] } as never,
|
|
799
|
+
networks: [mockNetwork, tronNetwork],
|
|
800
|
+
onConnectStep
|
|
801
|
+
})
|
|
802
|
+
const { ConnectionManager } = await import(
|
|
803
|
+
'./services/connection-manager'
|
|
804
|
+
)
|
|
805
|
+
const connManager = vi
|
|
806
|
+
.mocked(ConnectionManager)
|
|
807
|
+
.mock.results.at(-1)!.value
|
|
808
|
+
connManager.checkExistingConnections.mockResolvedValue({
|
|
809
|
+
address: null,
|
|
810
|
+
availableAddresses: []
|
|
811
|
+
})
|
|
812
|
+
connManager.connectEthereum.mockResolvedValue({
|
|
813
|
+
networkId: 'eip155:1',
|
|
814
|
+
address: '0xeth',
|
|
815
|
+
availableAddresses: [{ address: '0xeth', networkId: 'eip155:1' }]
|
|
816
|
+
})
|
|
817
|
+
|
|
818
|
+
await c.connect(mockNetwork, multiNsProvider)
|
|
819
|
+
return onConnectStep.mock.calls
|
|
820
|
+
.map(([info]) => info)
|
|
821
|
+
.find(
|
|
822
|
+
info => info.step === 'secondaryGather' && info.namespace === 'tron'
|
|
823
|
+
)
|
|
824
|
+
}
|
|
825
|
+
|
|
826
|
+
it('reports the Tron leg as prompted once its wallet request goes out', async () => {
|
|
827
|
+
const tronConnect = vi
|
|
828
|
+
.fn()
|
|
829
|
+
.mockImplementation(
|
|
830
|
+
async (_network, _provider, _options, onWalletRequest) => {
|
|
831
|
+
onWalletRequest?.()
|
|
832
|
+
return {
|
|
833
|
+
networkId: 'tron:0x2b6653dc',
|
|
834
|
+
address: 'TTronAddr',
|
|
835
|
+
availableAddresses: [
|
|
836
|
+
{ address: 'TTronAddr', networkId: 'tron:0x2b6653dc' }
|
|
837
|
+
]
|
|
838
|
+
}
|
|
839
|
+
}
|
|
840
|
+
)
|
|
841
|
+
|
|
842
|
+
expect(await tronLegStep(tronConnect)).toMatchObject({
|
|
843
|
+
outcome: 'ok',
|
|
844
|
+
prompted: true
|
|
845
|
+
})
|
|
846
|
+
})
|
|
847
|
+
|
|
848
|
+
it('sends no Tron request when the deadline passed during provider discovery', async () => {
|
|
849
|
+
vi.useFakeTimers()
|
|
850
|
+
try {
|
|
851
|
+
let requested = false
|
|
852
|
+
const tronConnect = vi
|
|
853
|
+
.fn()
|
|
854
|
+
.mockImplementation(
|
|
855
|
+
async (_network, _provider, _options, onWalletRequest) => {
|
|
856
|
+
// Discovery outlasts the 1s deadline, then finds the wallet.
|
|
857
|
+
await new Promise(resolve => setTimeout(resolve, 2000))
|
|
858
|
+
onWalletRequest?.()
|
|
859
|
+
requested = true
|
|
860
|
+
return {
|
|
861
|
+
networkId: 'tron:0x2b6653dc',
|
|
862
|
+
address: 'T',
|
|
863
|
+
availableAddresses: []
|
|
864
|
+
}
|
|
865
|
+
}
|
|
866
|
+
)
|
|
867
|
+
const { TronConnector } = await import(
|
|
868
|
+
'@meshconnect/uwc-tron-connector'
|
|
869
|
+
)
|
|
870
|
+
vi.mocked(TronConnector).mockImplementation(function () {
|
|
871
|
+
return { connect: tronConnect } as never
|
|
872
|
+
} as never)
|
|
873
|
+
const c = new InjectedConnector({
|
|
874
|
+
tronConnectorConfig: { enabledWallets: ['trust'] } as never,
|
|
875
|
+
networks: [mockNetwork, tronNetwork],
|
|
876
|
+
secondaryGatherTimeoutMs: 1000
|
|
877
|
+
})
|
|
878
|
+
const { ConnectionManager } = await import(
|
|
879
|
+
'./services/connection-manager'
|
|
880
|
+
)
|
|
881
|
+
const connManager = vi
|
|
882
|
+
.mocked(ConnectionManager)
|
|
883
|
+
.mock.results.at(-1)!.value
|
|
884
|
+
connManager.checkExistingConnections.mockResolvedValue({
|
|
885
|
+
address: null,
|
|
886
|
+
availableAddresses: []
|
|
887
|
+
})
|
|
888
|
+
connManager.connectEthereum.mockResolvedValue({
|
|
889
|
+
networkId: 'eip155:1',
|
|
890
|
+
address: '0xeth',
|
|
891
|
+
availableAddresses: [{ address: '0xeth', networkId: 'eip155:1' }]
|
|
892
|
+
})
|
|
893
|
+
|
|
894
|
+
const pending = c.connect(mockNetwork, multiNsProvider)
|
|
895
|
+
await vi.advanceTimersByTimeAsync(5000)
|
|
896
|
+
await pending
|
|
897
|
+
|
|
898
|
+
expect(tronConnect).toHaveBeenCalledTimes(1)
|
|
899
|
+
expect(requested).toBe(false)
|
|
900
|
+
} finally {
|
|
901
|
+
vi.useRealTimers()
|
|
902
|
+
}
|
|
903
|
+
})
|
|
904
|
+
|
|
905
|
+
it('reports the Tron leg as not prompted when the wallet was never found', async () => {
|
|
906
|
+
const tronConnect = vi
|
|
907
|
+
.fn()
|
|
908
|
+
.mockRejectedValue(new Error('Tron wallet "Trust" is not installed'))
|
|
909
|
+
|
|
910
|
+
expect(await tronLegStep(tronConnect)).toMatchObject({
|
|
911
|
+
outcome: 'failed',
|
|
912
|
+
prompted: false
|
|
913
|
+
})
|
|
914
|
+
})
|
|
915
|
+
|
|
672
916
|
it('swallows a declined/failed Tron connect and keeps the EVM connection', async () => {
|
|
673
917
|
const tronConnect = vi
|
|
674
918
|
.fn()
|
|
@@ -703,7 +947,12 @@ describe('InjectedConnector', () => {
|
|
|
703
947
|
Object.defineProperty(window, 'top', { value: {}, configurable: true })
|
|
704
948
|
try {
|
|
705
949
|
const result = await c.connect(mockNetwork, multiNsProvider)
|
|
706
|
-
expect(tronConnect).toHaveBeenCalledWith(
|
|
950
|
+
expect(tronConnect).toHaveBeenCalledWith(
|
|
951
|
+
tronNetwork,
|
|
952
|
+
multiNsProvider,
|
|
953
|
+
undefined,
|
|
954
|
+
expect.any(Function)
|
|
955
|
+
)
|
|
707
956
|
expect(result.address).toBe('0xeth')
|
|
708
957
|
expect(result.availableAddresses).toContainEqual({
|
|
709
958
|
address: 'TTronAddr',
|
|
@@ -757,11 +1006,128 @@ describe('InjectedConnector', () => {
|
|
|
757
1006
|
|
|
758
1007
|
expect(mockConnManager.connectSolana).toHaveBeenCalledWith(
|
|
759
1008
|
solanaNetwork,
|
|
760
|
-
mockEthProvider
|
|
1009
|
+
mockEthProvider,
|
|
1010
|
+
0
|
|
761
1011
|
)
|
|
762
1012
|
expect(result.address).toBe('SolanaAddress123')
|
|
763
1013
|
})
|
|
764
1014
|
|
|
1015
|
+
describe("secondaryPromptGapMs: a non-EVM target's own prompt", () => {
|
|
1016
|
+
const solanaNetwork = {
|
|
1017
|
+
...mockNetwork,
|
|
1018
|
+
id: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
|
|
1019
|
+
namespace: 'solana'
|
|
1020
|
+
} as Network
|
|
1021
|
+
|
|
1022
|
+
const connectSolanaAfterGathers = async (
|
|
1023
|
+
secondaryPrompted: boolean,
|
|
1024
|
+
secondaryPromptGapMs: number
|
|
1025
|
+
) => {
|
|
1026
|
+
const { ConnectionManager } = await import(
|
|
1027
|
+
'./services/connection-manager'
|
|
1028
|
+
)
|
|
1029
|
+
const mockConnManager =
|
|
1030
|
+
vi.mocked(ConnectionManager).mock.results[0].value
|
|
1031
|
+
mockConnManager.checkExistingConnections.mockResolvedValue({
|
|
1032
|
+
address: null,
|
|
1033
|
+
availableAddresses: [],
|
|
1034
|
+
secondaryPrompted
|
|
1035
|
+
})
|
|
1036
|
+
mockConnManager.connectSolana.mockResolvedValue({
|
|
1037
|
+
networkId: solanaNetwork.id,
|
|
1038
|
+
address: 'SolanaAddress123',
|
|
1039
|
+
availableAddresses: []
|
|
1040
|
+
})
|
|
1041
|
+
const pending = connector.connect(solanaNetwork, mockEthProvider, {
|
|
1042
|
+
secondaryPromptGapMs
|
|
1043
|
+
})
|
|
1044
|
+
return { mockConnManager, pending }
|
|
1045
|
+
}
|
|
1046
|
+
|
|
1047
|
+
beforeEach(() => {
|
|
1048
|
+
vi.useFakeTimers()
|
|
1049
|
+
})
|
|
1050
|
+
afterEach(() => {
|
|
1051
|
+
vi.useRealTimers()
|
|
1052
|
+
})
|
|
1053
|
+
|
|
1054
|
+
it('waits the gap when a gather before it prompted', async () => {
|
|
1055
|
+
const { mockConnManager, pending } = await connectSolanaAfterGathers(
|
|
1056
|
+
true,
|
|
1057
|
+
1500
|
|
1058
|
+
)
|
|
1059
|
+
|
|
1060
|
+
await vi.advanceTimersByTimeAsync(1499)
|
|
1061
|
+
expect(mockConnManager.connectSolana).not.toHaveBeenCalled()
|
|
1062
|
+
await vi.advanceTimersByTimeAsync(1)
|
|
1063
|
+
const result = await pending
|
|
1064
|
+
|
|
1065
|
+
expect(mockConnManager.connectSolana).toHaveBeenCalledTimes(1)
|
|
1066
|
+
expect(mockConnManager.connectSolana).toHaveBeenCalledWith(
|
|
1067
|
+
solanaNetwork,
|
|
1068
|
+
mockEthProvider,
|
|
1069
|
+
1500
|
|
1070
|
+
)
|
|
1071
|
+
expect(result.address).toBe('SolanaAddress123')
|
|
1072
|
+
})
|
|
1073
|
+
|
|
1074
|
+
it('prompts at once when no gather before it prompted (a single-namespace wallet, or reads of an existing authorization)', async () => {
|
|
1075
|
+
const { mockConnManager, pending } = await connectSolanaAfterGathers(
|
|
1076
|
+
false,
|
|
1077
|
+
1500
|
|
1078
|
+
)
|
|
1079
|
+
|
|
1080
|
+
await vi.advanceTimersByTimeAsync(0)
|
|
1081
|
+
expect(mockConnManager.connectSolana).toHaveBeenCalledTimes(1)
|
|
1082
|
+
await expect(pending).resolves.toMatchObject({
|
|
1083
|
+
address: 'SolanaAddress123'
|
|
1084
|
+
})
|
|
1085
|
+
expect(vi.getTimerCount()).toBe(0)
|
|
1086
|
+
})
|
|
1087
|
+
|
|
1088
|
+
it('prompts at once at a gap of 0 even after a gather prompted', async () => {
|
|
1089
|
+
const { mockConnManager, pending } = await connectSolanaAfterGathers(
|
|
1090
|
+
true,
|
|
1091
|
+
0
|
|
1092
|
+
)
|
|
1093
|
+
|
|
1094
|
+
await vi.advanceTimersByTimeAsync(0)
|
|
1095
|
+
expect(mockConnManager.connectSolana).toHaveBeenCalledTimes(1)
|
|
1096
|
+
await pending
|
|
1097
|
+
})
|
|
1098
|
+
})
|
|
1099
|
+
|
|
1100
|
+
it('secondaryPromptGapMs: an EVM target prompts at once (it runs no gathers first)', async () => {
|
|
1101
|
+
vi.useFakeTimers()
|
|
1102
|
+
try {
|
|
1103
|
+
const { ConnectionManager } = await import(
|
|
1104
|
+
'./services/connection-manager'
|
|
1105
|
+
)
|
|
1106
|
+
const mockConnManager =
|
|
1107
|
+
vi.mocked(ConnectionManager).mock.results[0].value
|
|
1108
|
+
mockConnManager.checkExistingConnections.mockResolvedValue({
|
|
1109
|
+
address: null,
|
|
1110
|
+
availableAddresses: []
|
|
1111
|
+
})
|
|
1112
|
+
mockConnManager.connectEthereum.mockResolvedValue({
|
|
1113
|
+
networkId: 'eip155:1',
|
|
1114
|
+
address: '0xeth',
|
|
1115
|
+
availableAddresses: []
|
|
1116
|
+
})
|
|
1117
|
+
|
|
1118
|
+
const pending = connector.connect(mockNetwork, mockEthProvider, {
|
|
1119
|
+
secondaryPromptGapMs: 1500
|
|
1120
|
+
})
|
|
1121
|
+
await vi.advanceTimersByTimeAsync(0)
|
|
1122
|
+
|
|
1123
|
+
expect(mockConnManager.connectEthereum).toHaveBeenCalledTimes(1)
|
|
1124
|
+
await vi.runAllTimersAsync()
|
|
1125
|
+
await pending
|
|
1126
|
+
} finally {
|
|
1127
|
+
vi.useRealTimers()
|
|
1128
|
+
}
|
|
1129
|
+
})
|
|
1130
|
+
|
|
765
1131
|
it('should connect to Tron wallet for tron namespace', async () => {
|
|
766
1132
|
const { ConnectionManager } = await import(
|
|
767
1133
|
'./services/connection-manager'
|
|
@@ -801,7 +1167,8 @@ describe('InjectedConnector', () => {
|
|
|
801
1167
|
|
|
802
1168
|
expect(mockConnManager.connectTron).toHaveBeenCalledWith(
|
|
803
1169
|
tronNetwork,
|
|
804
|
-
mockEthProvider
|
|
1170
|
+
mockEthProvider,
|
|
1171
|
+
0
|
|
805
1172
|
)
|
|
806
1173
|
expect(result.address).toBe('TRonAddress123')
|
|
807
1174
|
})
|