@meshconnect/uwc-injected-connector 0.14.0 → 0.14.2

package/dist/ton-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ton-discovery.d.ts","sourceRoot":"","sources":["../src/ton-discovery.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,UAAU,gBAAgB;IACxB,UAAU,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;IACjD,OAAO,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACtE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAA;IACzD,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,gBAAgB,CAAA;CAC3B;AA+ED,wBAAsB,aAAa,CACjC,eAAe,GAAE,cAAc,EAAO,GACrC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAwB9B"}
+{"version":3,"file":"ton-discovery.d.ts","sourceRoot":"","sources":["../src/ton-discovery.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,UAAU,gBAAgB;IACxB,UAAU,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;IACjD,OAAO,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACtE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAA;IACzD,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACjC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,gBAAgB,CAAA;CAC3B;AA+ED,wBAAsB,aAAa,CACjC,eAAe,GAAE,cAAc,EAAO,GACrC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA0B9B"}

package/dist/ton-discovery.js

@@ -75,15 +75,17 @@ export async function getTonWallets(expectedWallets = []) {
         const jsBridgeKeys = expectedWallets
             .map(w => w.extensionInjectedProvider?.namespaceMetaData?.tvm?.jsBridgeKey)
             .filter((key) => !!key);
-        // Bridge mode (in iframe): poll for bridge-proxied wallets
+        // Bridge mode: prefer this frame's own provider (window[jsBridgeKey]) so connect
+        // attributes to the iframe origin; fall back to the parent list only
+        // when none is present.
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore - window.UWCBridgeChildInitialized is set by the bridge
         if (window.UWCBridgeChildInitialized === true) {
-            const wallets = await pollForBridgeTonWallets();
-            if (wallets.length > 0) {
-                return wallets;
+            const local = discoverTonProviders(jsBridgeKeys);
+            if (local.length > 0) {
+                return local;
             }
-            return [];
+            return pollForBridgeTonWallets();
         }
         // Native discovery: direct window[key].tonconnect access
         return discoverTonProviders(jsBridgeKeys);

package/dist/ton-discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ton-discovery.js","sourceRoot":"","sources":["../src/ton-discovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ton-discovery.js","sourceRoot":"","sources":["../src/ton-discovery.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/uwc-injected-connector",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "Injected connector for Universal Wallet Connector",
   "type": "module",
   "main": "dist/index.js",
@@ -27,10 +27,10 @@
     "buffer": "^6.0.3",
     "uuid": "^13.0.0",
     "viem": "^2.44.4",
-    "@meshconnect/uwc-bridge-child": "0.2.1",
-    "@meshconnect/uwc-constants": "0.6.4",
-    "@meshconnect/uwc-ton-connector": "0.6.3",
-    "@meshconnect/uwc-types": "0.15.0"
+    "@meshconnect/uwc-bridge-child": "0.2.2",
+    "@meshconnect/uwc-constants": "0.6.5",
+    "@meshconnect/uwc-ton-connector": "0.6.4",
+    "@meshconnect/uwc-types": "0.15.1"
   },
   "devDependencies": {
     "typescript": "^5.9.3"

package/src/ton-discovery.test.ts

@@ -153,9 +153,10 @@ describe('getTonWallets / bridge polling', () => {
     vi.restoreAllMocks()
   })
 
-  it('prefers bridge wallets when UWCBridgeChildInitialized is true', async () => {
+  it('prefers the in-frame (local) provider over the bridge when both are present', async () => {
     mockWindow.UWCBridgeChildInitialized = true
 
+    // Parent-proxied wallet reported by the bridge...
     const bridgeWallet = {
       uuid: 'ton-tonkeeper',
       name: 'Tonkeeper',
@@ -165,13 +166,18 @@ describe('getTonWallets / bridge polling', () => {
     }
     mockWindow.tonWallets = [bridgeWallet]
 
-    // Native wallet also present — should be ignored in bridge mode
-    mockWindow.tonkeeper = { tonconnect: makeBridge('Tonkeeper') }
+    // ...and the extension's real provider injected into THIS frame. The local
+    // one must win so the connection attributes to the iframe origin.
+    const localBridge = makeBridge('Tonkeeper')
+    mockWindow.tonkeeper = { tonconnect: localBridge }
 
     const { getTonWallets } = await import('./ton-discovery')
     const wallets = await getTonWallets([makeWalletMeta('tonkeeper')])
 
-    expect(wallets).toEqual([bridgeWallet])
+    expect(wallets).toHaveLength(1)
+    expect(wallets[0].jsBridgeKey).toBe('tonkeeper')
+    expect(wallets[0].provider).toBe(localBridge)
+    expect(wallets[0].provider).not.toBe(bridgeWallet.provider)
   })
 
   it('returns empty array when bridge polling times out', async () => {
@@ -184,16 +190,50 @@ describe('getTonWallets / bridge polling', () => {
     expect(wallets).toEqual([])
   }, 3000)
 
-  it('does not fall back to native discovery in bridge mode', async () => {
+  it('uses the in-frame (local) provider in bridge mode without waiting for the parent', async () => {
     mockWindow.UWCBridgeChildInitialized = true
-    // Native wallet is available, but bridge returns nothing
-    mockWindow.tonkeeper = { tonconnect: makeBridge('Tonkeeper') }
-    // No bridge wallets
+    // In-frame provider present; parent never reports any wallets.
+    const localBridge = makeBridge('Tonkeeper')
+    mockWindow.tonkeeper = { tonconnect: localBridge }
 
     const { getTonWallets } = await import('./ton-discovery')
     const wallets = await getTonWallets([makeWalletMeta('tonkeeper')])
 
-    expect(wallets).toEqual([])
+    expect(wallets).toHaveLength(1)
+    expect(wallets[0].jsBridgeKey).toBe('tonkeeper')
+    expect(wallets[0].provider).toBe(localBridge)
+  })
+
+  it('prefers the in-frame OKX provider in bridge mode (detection is generic, not Tonkeeper-only)', async () => {
+    mockWindow.UWCBridgeChildInitialized = true
+    const localBridge = makeBridge('OKX Wallet')
+    mockWindow.okxTonWallet = { tonconnect: localBridge }
+
+    const { getTonWallets } = await import('./ton-discovery')
+    const wallets = await getTonWallets([makeWalletMeta('okxTonWallet')])
+
+    expect(wallets).toHaveLength(1)
+    expect(wallets[0].jsBridgeKey).toBe('okxTonWallet')
+    expect(wallets[0].provider).toBe(localBridge)
+  })
+
+  it('falls back to the parent-proxied list when nothing is present at window[jsBridgeKey] yet', async () => {
+    mockWindow.UWCBridgeChildInitialized = true
+    // Nothing at window.tonkeeper yet (before BridgeChild shims, or an old
+    // bridge-parent without TON support).
+    const bridgeWallet = {
+      uuid: 'ton-tonkeeper',
+      name: 'Tonkeeper',
+      icon: '',
+      jsBridgeKey: 'tonkeeper',
+      provider: makeBridge('Tonkeeper')
+    }
+    mockWindow.tonWallets = [bridgeWallet]
+
+    const { getTonWallets } = await import('./ton-discovery')
+    const wallets = await getTonWallets([makeWalletMeta('tonkeeper')])
+
+    expect(wallets).toEqual([bridgeWallet])
   }, 3000)
 
   it('picks up bridge wallets that appear after a delay', async () => {

package/src/ton-discovery.ts

@@ -112,15 +112,17 @@ export async function getTonWallets(
       )
       .filter((key): key is string => !!key)
 
-    // Bridge mode (in iframe): poll for bridge-proxied wallets
+    // Bridge mode: prefer this frame's own provider (window[jsBridgeKey]) so connect
+    // attributes to the iframe origin; fall back to the parent list only
+    // when none is present.
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - window.UWCBridgeChildInitialized is set by the bridge
     if (window.UWCBridgeChildInitialized === true) {
-      const wallets = await pollForBridgeTonWallets()
-      if (wallets.length > 0) {
-        return wallets
+      const local = discoverTonProviders(jsBridgeKeys)
+      if (local.length > 0) {
+        return local
       }
-      return []
+      return pollForBridgeTonWallets()
     }
 
     // Native discovery: direct window[key].tonconnect access