@meshconnect/uwc-bridge-child 0.2.2 → 0.2.3-snapshot.0da4ecc

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,gFAAgF;AAChF,gDAAgD;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-bridge-child",
-  "version": "0.2.2",
+  "version": "0.2.3-snapshot.0da4ecc",
   "description": "Child iframe bridge for Universal Wallet Connector",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/BridgeChild.test.ts

@@ -337,6 +337,319 @@ describe('BridgeChild', () => {
     })
   })
 
+  describe('Tron/TON discovery race (premature empty default)', () => {
+    it('does not default Tron to [] while a triggered discovery is still pending, then delivers the wallet once ready', async () => {
+      const mockTron = [
+        {
+          uuid: 'tron-tronlink',
+          name: 'tronLink',
+          injectedId: 'tronLink',
+          provider: { tronWeb: {} }
+        }
+      ]
+
+      // Parent supports Tron but reports not-ready at first (e.g. TronLink's
+      // tronWeb hasn't finished injecting yet). EVM + Solana resolve instantly.
+      let tronReady = false
+      const api = {
+        eip6963WalletsReady: true,
+        walletStandardWalletsReady: true,
+        tonWalletsReady: true,
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        tonWallets: [],
+        tronWallets: mockTron,
+        get tronWalletsReady() {
+          return tronReady
+        },
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe({ tronInjectedIds: ['tronLink'] })
+
+      // EVM + Solana resolve and several poll ticks pass while Tron is pending.
+      await vi.advanceTimersByTimeAsync(200)
+
+      // The placeholder must NOT default Tron to `[]` here: the injected
+      // connector's pollForBridgeTronWallets resolves on the first array it
+      // sees, so a premature `[]` makes it report "none found" and miss the
+      // real wallet marshalled below.
+      expect((window as any).tronWallets).toBeUndefined()
+
+      // Parent finishes Tron discovery (tronWeb now injected).
+      tronReady = true
+      await vi.advanceTimersByTimeAsync(100)
+
+      expect((window as any).tronWallets).toHaveLength(1)
+      expect((window as any).tronWallets[0].uuid).toBe('tron-tronlink')
+    })
+
+    it('does not default TON to [] while a triggered discovery is still pending, then delivers the wallet once ready', async () => {
+      const mockTon = [
+        {
+          uuid: 'ton-trustwalletto',
+          name: 'Trust Wallet',
+          icon: '',
+          jsBridgeKey: 'trustwalletTon',
+          provider: createMockTonProvider('Trust Wallet')
+        }
+      ]
+
+      let tonReady = false
+      const api = {
+        eip6963WalletsReady: true,
+        walletStandardWalletsReady: true,
+        tronWalletsReady: true,
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        tronWallets: [],
+        tonWallets: mockTon,
+        get tonWalletsReady() {
+          return tonReady
+        },
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe({ tonJsBridgeKeys: ['trustwalletTon'] })
+      await vi.advanceTimersByTimeAsync(200)
+
+      // Same race as Tron: the placeholder must not pre-empt a pending TON
+      // discovery, or the connector's poll resolves empty and misses it.
+      expect((window as any).tonWallets).toBeUndefined()
+
+      tonReady = true
+      await vi.advanceTimersByTimeAsync(100)
+
+      expect((window as any).tonWallets).toHaveLength(1)
+      expect((window as any).tonWallets[0].uuid).toBe('ton-trustwalletto')
+    })
+
+    it('still backstops Tron to [] at MAX_POLL_MS when the parent never reports ready', async () => {
+      const api = {
+        eip6963WalletsReady: true,
+        walletStandardWalletsReady: true,
+        tonWalletsReady: true,
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        tonWallets: [],
+        tronWallets: [],
+        tronWalletsReady: false,
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe({ tronInjectedIds: ['tronLink'] })
+
+      // Pending → not prematurely defaulted.
+      await vi.advanceTimersByTimeAsync(500)
+      expect((window as any).tronWallets).toBeUndefined()
+
+      // Past MAX_POLL_MS (5s) the fillEmptyDefaults backstop resolves it to [].
+      await vi.advanceTimersByTimeAsync(5000)
+      expect((window as any).tronWallets).toEqual([])
+    })
+
+    it('recovers Tron when the parent exposes late (Comlink reads hang until then)', async () => {
+      // Reproduces the iframe-example race: BridgeParent is created on the
+      // iframe `load` event, so its Comlink endpoint isn't live when the child
+      // starts polling. A Comlink read to a not-yet-exposed parent never settles
+      // (comlink.ts requestResponseMessage has no timeout) — simulate with a
+      // getter returning a never-settling promise until the parent goes "live".
+      const mockTron = [
+        {
+          uuid: 'tron-tronlink',
+          name: 'tronLink',
+          injectedId: 'tronLink',
+          provider: { tronWeb: {} }
+        }
+      ]
+      let live = false
+      const hang = () => new Promise(() => {})
+      const api = {
+        get eip6963WalletsReady() {
+          return live ? true : hang()
+        },
+        get walletStandardWalletsReady() {
+          return live ? true : hang()
+        },
+        get tronWalletsReady() {
+          return live ? true : hang()
+        },
+        get tonWalletsReady() {
+          return live ? true : hang()
+        },
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        tronWallets: mockTron,
+        tonWallets: [],
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe({ tronInjectedIds: ['tronLink'] })
+
+      // Parent not live yet: reads time out and the loop retries — it must NOT
+      // hang (the bug). Tron stays undiscovered for now.
+      await vi.advanceTimersByTimeAsync(600)
+      expect((window as any).tronWallets).toBeUndefined()
+
+      // Parent's BridgeParent finally exposes — the child must recover.
+      live = true
+      await vi.advanceTimersByTimeAsync(600)
+
+      expect((window as any).tronWallets).toHaveLength(1)
+      expect((window as any).tronWallets[0].uuid).toBe('tron-tronlink')
+    })
+
+    it('recovers EIP-6963 when the parent exposes late (same raceParentRead path as Tron)', async () => {
+      // EVM/Solana use the same per-tick raceParentRead recovery as Tron, so a
+      // late-exposing parent must not strand them either.
+      const mockEip = [
+        {
+          uuid: 'mm',
+          name: 'MetaMask',
+          icon: '',
+          rdns: 'io.metamask',
+          provider: { request: vi.fn() }
+        }
+      ]
+      let live = false
+      const hang = () => new Promise(() => {})
+      const api = {
+        get eip6963WalletsReady() {
+          return live ? true : hang()
+        },
+        get walletStandardWalletsReady() {
+          return live ? true : hang()
+        },
+        get tronWalletsReady() {
+          return live ? true : hang()
+        },
+        get tonWalletsReady() {
+          return live ? true : hang()
+        },
+        eip6963Wallets: mockEip,
+        walletStandardWallets: [],
+        tronWallets: [],
+        tonWallets: [],
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe()
+
+      // Pre-expose: reads time out, the loop retries, nothing set yet.
+      await vi.advanceTimersByTimeAsync(600)
+      expect((window as any).eip6963Wallets).toBeUndefined()
+
+      // Parent exposes — the child must recover EVM, not just Tron.
+      live = true
+      await vi.advanceTimersByTimeAsync(600)
+
+      expect((window as any).eip6963Wallets).toHaveLength(1)
+      expect((window as any).eip6963Wallets[0].uuid).toBe('mm')
+    })
+
+    it('recovers TON when the parent exposes late (same raceParentRead path as Tron)', async () => {
+      const mockTon = [
+        {
+          uuid: 'ton-tonkeeper',
+          name: 'Tonkeeper',
+          icon: '',
+          jsBridgeKey: 'tonkeeper',
+          provider: createMockTonProvider('Tonkeeper')
+        }
+      ]
+      let live = false
+      const hang = () => new Promise(() => {})
+      const api = {
+        get eip6963WalletsReady() {
+          return live ? true : hang()
+        },
+        get walletStandardWalletsReady() {
+          return live ? true : hang()
+        },
+        get tronWalletsReady() {
+          return live ? true : hang()
+        },
+        get tonWalletsReady() {
+          return live ? true : hang()
+        },
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        tronWallets: [],
+        tonWallets: mockTon,
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe({ tonJsBridgeKeys: ['tonkeeper'] })
+
+      await vi.advanceTimersByTimeAsync(600)
+      expect((window as any).tonWallets).toBeUndefined()
+
+      live = true
+      await vi.advanceTimersByTimeAsync(600)
+
+      expect((window as any).tonWallets).toHaveLength(1)
+      expect((window as any).tonWallets[0].uuid).toBe('ton-tonkeeper')
+    })
+
+    it('recovers Solana when the parent exposes late (same raceParentRead path as Tron)', async () => {
+      const mockSolana = [
+        {
+          uuid: 'phantom-solana',
+          name: 'Phantom',
+          chains: ['solana:mainnet'],
+          features: ['standard:connect'],
+          adapter: {}
+        }
+      ]
+      let live = false
+      const hang = () => new Promise(() => {})
+      const api = {
+        get eip6963WalletsReady() {
+          return live ? true : hang()
+        },
+        get walletStandardWalletsReady() {
+          return live ? true : hang()
+        },
+        get tronWalletsReady() {
+          return live ? true : hang()
+        },
+        get tonWalletsReady() {
+          return live ? true : hang()
+        },
+        eip6963Wallets: [],
+        walletStandardWallets: mockSolana,
+        tronWallets: [],
+        tonWallets: [],
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe()
+
+      await vi.advanceTimersByTimeAsync(600)
+      expect((window as any).walletStandardWallets).toBeUndefined()
+
+      live = true
+      await vi.advanceTimersByTimeAsync(600)
+
+      expect((window as any).walletStandardWallets).toHaveLength(1)
+      expect((window as any).walletStandardWallets[0].name).toBe('Phantom')
+    })
+  })
+
   describe('backward compatibility with older BridgeParent (no Tron)', () => {
     it('should still set EVM and Solana wallets when parent has no Tron support', async () => {
       const eip6963Wallets = [
@@ -358,7 +671,10 @@ describe('BridgeChild', () => {
         }
       ]
 
-      // Simulate old parent that throws on any Tron property access
+      // Defensive path: a parent whose Tron property access THROWS (e.g. a
+      // non-Comlink stub). Real old Comlink parents instead resolve a missing
+      // prop to undefined — see the MAX_POLL_MS backstop test below. Both end at
+      // tronWallets = [].
       const oldParentAPI = {
         eip6963WalletsReady: true,
         walletStandardWalletsReady: true,
@@ -389,6 +705,33 @@ describe('BridgeChild', () => {
       expect((window as any).tronWallets).toEqual([])
     })
 
+    it('defaults Tron to [] via the MAX_POLL_MS backstop on a real old parent (missing props resolve to undefined, not throw)', async () => {
+      // Real Comlink resolves a GET on a missing property to `undefined` (only
+      // an APPLY on a missing method rejects). So an old parent without Tron
+      // support reports tronWalletsReady=undefined every tick; the child retries
+      // until MAX_POLL_MS, then fillEmptyDefaults sets [].
+      const oldParentAPI = {
+        eip6963WalletsReady: true,
+        walletStandardWalletsReady: true,
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        parentOrigin: 'https://parent.example.com'
+        // No tronWalletsReady / tronWallets / discoverTronWallets — a Comlink GET
+        // on a missing prop would resolve them to undefined.
+      }
+      mockWrappedAPI = oldParentAPI as any
+
+      await createBridgeChildInIframe({ tronInjectedIds: ['tronLink'] })
+
+      // Not prematurely defaulted while readiness stays undefined.
+      await vi.advanceTimersByTimeAsync(500)
+      expect((window as any).tronWallets).toBeUndefined()
+
+      // Past MAX_POLL_MS (5s) the backstop resolves it to [].
+      await vi.advanceTimersByTimeAsync(5000)
+      expect((window as any).tronWallets).toEqual([])
+    })
+
     it('should set tron to empty array when discoverTronWallets throws', async () => {
       const apiWithBrokenDiscover = {
         eip6963WalletsReady: true,
@@ -435,13 +778,19 @@ describe('BridgeChild', () => {
       // EVM and Solana should be set even though tron is not ready
       expect((window as any).eip6963Wallets).toHaveLength(1)
       expect((window as any).walletStandardWallets).toEqual([])
-      // Tron should be empty (not ready, so inner block skipped)
-      expect((window as any).tronWallets).toEqual([])
+      // Tron stays undefined while the parent reports not-ready — we must NOT
+      // prematurely default it to []. The connector's poll resolves on the first
+      // array it sees, so an early [] makes it miss a wallet that arrives a
+      // moment later. tryMarshalTron writes it once the parent reports ready, or
+      // the MAX_POLL_MS backstop fills [] if it never does.
+      expect((window as any).tronWallets).toBeUndefined()
     })
 
-    it('should only call discoverTronWallets once across multiple polls', async () => {
-      // First poll: eip6963 not ready, so returns 'continue'
-      // Second poll: eip6963 ready, completes
+    it('calls discoverTronWallets once when Tron resolves on the first tick (re-issues per tick until tronDone otherwise)', async () => {
+      // Not a general invariant: the design re-issues discovery every tick until
+      // tronDone. Here Tron is ready immediately, so it marshals and sets
+      // tronDone on tick 1 — hence exactly one call. A slow parent would see one
+      // call per tick until ready.
       let callCount = 0
       const progressiveAPI = {
         get eip6963WalletsReady() {
@@ -463,7 +812,8 @@ describe('BridgeChild', () => {
       })
       await vi.advanceTimersByTimeAsync(1000)
 
-      // discoverTronWallets should only be called once due to tronDiscoveryTriggered flag
+      // Tron reports ready on the first tick, so tryMarshalTron marshals and
+      // sets tronDone — it stops re-issuing discoverTronWallets after that.
       expect(progressiveAPI.discoverTronWallets).toHaveBeenCalledTimes(1)
     })
   })
@@ -708,6 +1058,42 @@ describe('BridgeChild', () => {
         manifestUrl: 'https://example.com'
       })
     })
+
+    it('recovers parentOrigin when the parent exposes late (same raceParentRead path as wallets)', async () => {
+      // syncParentOrigin shares the late-expose hazard: a parentOrigin read posted
+      // before the parent's Comlink.expose never settles. The retry loop must keep
+      // trying until the parent comes up, then set window.uwcParentOrigin.
+      let live = false
+      const hang = () => new Promise(() => {})
+      const api = {
+        eip6963WalletsReady: true,
+        walletStandardWalletsReady: true,
+        tronWalletsReady: true,
+        tonWalletsReady: true,
+        eip6963Wallets: [],
+        walletStandardWallets: [],
+        tronWallets: [],
+        tonWallets: [],
+        get parentOrigin() {
+          return live ? 'https://stake.com' : hang()
+        },
+        discoverTronWallets: vi.fn(),
+        discoverTonWallets: vi.fn()
+      }
+      mockWrappedAPI = api as any
+
+      await createBridgeChildInIframe()
+
+      // Parent not live yet: the read times out and the loop retries — it must
+      // NOT hang and must NOT set a value.
+      await vi.advanceTimersByTimeAsync(600)
+      expect((window as any).uwcParentOrigin).toBeUndefined()
+
+      // Parent's BridgeParent finally exposes — the retry must recover.
+      live = true
+      await vi.advanceTimersByTimeAsync(600)
+      expect((window as any).uwcParentOrigin).toBe('https://stake.com')
+    })
   })
 
   describe('checkWallets with all wallet types', () => {