@meshconnect/uwc-injected-connector 0.28.0 → 0.28.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"ton-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/ton/ton-transaction-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EACV,wBAAwB,EACxB,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;AAa/B;;GAEG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,OAAO,CAAuB;IAEtC,cAEC;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,wBAAwB,EACjC,GAAG,EAAE,UAAU,EACf,gBAAgB,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,IAAI,GAC1D,OAAO,CAAC,iBAAiB,CAAC,CAe5B;IAED;;OAEG;IACG,WAAW,CACf,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,UAAU,EACf,gBAAgB,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,IAAI,EAC3D,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,aAAa,CAAC,CAgBxB;IAED,OAAO,CAAC,aAAa;CAetB"}
1
+ {"version":3,"file":"ton-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/ton/ton-transaction-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EACV,wBAAwB,EACxB,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;AAc/B;;GAEG;AACH,qBAAa,qBAAqB;IAChC,OAAO,CAAC,OAAO,CAAuB;IAEtC,cAEC;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,wBAAwB,EACjC,GAAG,EAAE,UAAU,EACf,gBAAgB,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,IAAI,GAC1D,OAAO,CAAC,iBAAiB,CAAC,CAe5B;IAED;;OAEG;IACG,WAAW,CACf,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,UAAU,EACf,gBAAgB,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,IAAI,EAC3D,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,aAAa,CAAC,CAgBxB;IAED,OAAO,CAAC,aAAa;CA0BtB"}
@@ -1,5 +1,5 @@
1
1
  import { WalletConnectorError } from '@meshconnect/uwc-types';
2
- import { buildSignDataPayload, executeSignData, unwrapBoc, bocToHash, TON_CONNECT_INJECTED_STORAGE_PREFIX, withWalletResponseTimeout } from '@meshconnect/uwc-ton-connector';
2
+ import { buildSignDataPayload, executeSignData, unwrapBoc, bocToHash, TON_CONNECT_INJECTED_STORAGE_PREFIX, TON_CONNECT_USER_REJECTS_CODE, withWalletResponseTimeout } from '@meshconnect/uwc-ton-connector';
3
3
  import { extractTonSdkErrorMessage, parseError } from '../../utils/error-utils';
4
4
  import { TonTransactionBuilder } from './ton-transaction-builder';
5
5
  /**
@@ -47,6 +47,17 @@ export class TonTransactionService {
47
47
  }
48
48
  const isRejected = UserRejectsError != null && error instanceof UserRejectsError;
49
49
  const message = extractTonSdkErrorMessage(error) || 'TON wallet operation failed';
50
+ // Tonkeeper in an iOS in-app browser rejects the injected bridge call with
51
+ // the bare TON Connect code instead of a typed UserRejectsError, so only
52
+ // "300" survives as the message. Keep 300 as the code so telemetry can tell
53
+ // it from a typed rejection.
54
+ if (!isRejected && message === String(TON_CONNECT_USER_REJECTS_CODE)) {
55
+ throw new WalletConnectorError({
56
+ type: 'rejected',
57
+ message,
58
+ code: TON_CONNECT_USER_REJECTS_CODE
59
+ });
60
+ }
50
61
  parseError({ code: isRejected ? 4001 : undefined, message });
51
62
  }
52
63
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ton-transaction-service.js","sourceRoot":"","sources":["../../../src/services/ton/ton-transaction-service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,SAAS,EACT,SAAS,EACT,mCAAmC,EACnC,yBAAyB,EAC1B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAEjE;;GAEG;AACH,MAAM,OAAO,qBAAqB;IACxB,OAAO,CAAuB;IAEtC;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACnB,OAAiC,EACjC,GAAe,EACf,gBAA2D;QAE3D,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAChD,OAAO,EACP,GAAG,CAAC,OAAO,EAAE,OAAO,CACrB,CAAA;YACD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,EAC9B,mCAAmC,CACpC,CAAA;YACD,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;YAC7B,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CACf,OAAe,EACf,GAAe,EACf,gBAA2D,EAC3D,eAAoC;QAEpC,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAA;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;YAC9D,OAAO,MAAM,yBAAyB,CACpC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7B,mCAAmC,CACpC,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAEO,aAAa,CACnB,KAAc,EACd,gBAA2D;QAE3D,wEAAwE;QACxE,0DAA0D;QAC1D,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;YAC1C,MAAM,KAAK,CAAA;QACb,CAAC;QACD,MAAM,UAAU,GACd,gBAAgB,IAAI,IAAI,IAAI,KAAK,YAAY,gBAAgB,CAAA;QAC/D,MAAM,OAAO,GACX,yBAAyB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAA;QACnE,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9D,CAAC;CACF"}
1
+ {"version":3,"file":"ton-transaction-service.js","sourceRoot":"","sources":["../../../src/services/ton/ton-transaction-service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,SAAS,EACT,SAAS,EACT,mCAAmC,EACnC,6BAA6B,EAC7B,yBAAyB,EAC1B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAEjE;;GAEG;AACH,MAAM,OAAO,qBAAqB;IACxB,OAAO,CAAuB;IAEtC;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACnB,OAAiC,EACjC,GAAe,EACf,gBAA2D;QAE3D,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAChD,OAAO,EACP,GAAG,CAAC,OAAO,EAAE,OAAO,CACrB,CAAA;YACD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,EAC9B,mCAAmC,CACpC,CAAA;YACD,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;YAC7B,OAAO,MAAM,SAAS,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CACf,OAAe,EACf,GAAe,EACf,gBAA2D,EAC3D,eAAoC;QAEpC,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAA;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;YAC9D,OAAO,MAAM,yBAAyB,CACpC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,EAC7B,mCAAmC,CACpC,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAEO,aAAa,CACnB,KAAc,EACd,gBAA2D;QAE3D,wEAAwE;QACxE,0DAA0D;QAC1D,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;YAC1C,MAAM,KAAK,CAAA;QACb,CAAC;QACD,MAAM,UAAU,GACd,gBAAgB,IAAI,IAAI,IAAI,KAAK,YAAY,gBAAgB,CAAA;QAC/D,MAAM,OAAO,GACX,yBAAyB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAA;QACnE,2EAA2E;QAC3E,yEAAyE;QACzE,4EAA4E;QAC5E,6BAA6B;QAC7B,IAAI,CAAC,UAAU,IAAI,OAAO,KAAK,MAAM,CAAC,6BAA6B,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,oBAAoB,CAAC;gBAC7B,IAAI,EAAE,UAAU;gBAChB,OAAO;gBACP,IAAI,EAAE,6BAA6B;aACpC,CAAC,CAAA;QACJ,CAAC;QACD,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9D,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@meshconnect/uwc-injected-connector",
3
- "version": "0.28.0",
3
+ "version": "0.28.1",
4
4
  "description": "Injected connector for Universal Wallet Connector",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -29,7 +29,7 @@
29
29
  "viem": "^2.56.5",
30
30
  "@meshconnect/uwc-bridge-child": "0.6.1",
31
31
  "@meshconnect/uwc-constants": "0.8.8",
32
- "@meshconnect/uwc-ton-connector": "0.9.16",
32
+ "@meshconnect/uwc-ton-connector": "0.10.0",
33
33
  "@meshconnect/uwc-bitcoin": "0.5.10",
34
34
  "@meshconnect/uwc-tron-connector": "0.8.0",
35
35
  "@meshconnect/uwc-types": "0.34.0"
@@ -144,6 +144,46 @@ describe('TonTransactionService', () => {
144
144
  }
145
145
  })
146
146
 
147
+ it.each([
148
+ ['an Error', new Error('300')],
149
+ [
150
+ 'an SDK UnknownError',
151
+ new Error('[TON_CONNECT_SDK_ERROR] UnknownError\n300')
152
+ ]
153
+ ])(
154
+ 'treats a bare TON Connect 300 (%s) as rejected and keeps the code',
155
+ async (_label, rejection) => {
156
+ const sdk = createMockSdk()
157
+ mockSendTransaction.mockRejectedValue(rejection)
158
+
159
+ const error = await service
160
+ .sendTransaction(
161
+ { to: 'UQBxyz', amount: '1000000000', from: 'UQBabc' },
162
+ sdk,
163
+ MockUserRejectsError
164
+ )
165
+ .catch((e: unknown) => e)
166
+
167
+ expect(error).toHaveProperty('type', 'rejected')
168
+ expect(error).toHaveProperty('code', 300)
169
+ }
170
+ )
171
+
172
+ it('leaves a 300 with no message as unknown', async () => {
173
+ const sdk = createMockSdk()
174
+ mockSendTransaction.mockRejectedValue({ code: 300 })
175
+
176
+ const error = await service
177
+ .sendTransaction(
178
+ { to: 'UQBxyz', amount: '1000000000', from: 'UQBabc' },
179
+ sdk,
180
+ MockUserRejectsError
181
+ )
182
+ .catch((e: unknown) => e)
183
+
184
+ expect(error).toHaveProperty('type', 'unknown')
185
+ })
186
+
147
187
  it('uses fallback message when error is completely empty', async () => {
148
188
  const sdk = createMockSdk()
149
189
  mockSendTransaction.mockRejectedValue(null)
@@ -226,5 +266,17 @@ describe('TonTransactionService', () => {
226
266
  expect(error).toHaveProperty('message', 'User rejected signing')
227
267
  }
228
268
  })
269
+
270
+ it('treats a bare TON Connect 300 as rejected', async () => {
271
+ const sdk = createMockSdk()
272
+ mockSignData.mockRejectedValue(new Error('300'))
273
+
274
+ const error = await service
275
+ .signMessage('hello', sdk, MockUserRejectsError)
276
+ .catch((e: unknown) => e)
277
+
278
+ expect(error).toHaveProperty('type', 'rejected')
279
+ expect(error).toHaveProperty('code', 300)
280
+ })
229
281
  })
230
282
  })
@@ -12,6 +12,7 @@ import {
12
12
  unwrapBoc,
13
13
  bocToHash,
14
14
  TON_CONNECT_INJECTED_STORAGE_PREFIX,
15
+ TON_CONNECT_USER_REJECTS_CODE,
15
16
  withWalletResponseTimeout
16
17
  } from '@meshconnect/uwc-ton-connector'
17
18
  import { extractTonSdkErrorMessage, parseError } from '../../utils/error-utils'
@@ -90,6 +91,17 @@ export class TonTransactionService {
90
91
  UserRejectsError != null && error instanceof UserRejectsError
91
92
  const message =
92
93
  extractTonSdkErrorMessage(error) || 'TON wallet operation failed'
94
+ // Tonkeeper in an iOS in-app browser rejects the injected bridge call with
95
+ // the bare TON Connect code instead of a typed UserRejectsError, so only
96
+ // "300" survives as the message. Keep 300 as the code so telemetry can tell
97
+ // it from a typed rejection.
98
+ if (!isRejected && message === String(TON_CONNECT_USER_REJECTS_CODE)) {
99
+ throw new WalletConnectorError({
100
+ type: 'rejected',
101
+ message,
102
+ code: TON_CONNECT_USER_REJECTS_CODE
103
+ })
104
+ }
93
105
  parseError({ code: isRejected ? 4001 : undefined, message })
94
106
  }
95
107
  }