@tonconnect/sdk 0.0.41 → 0.0.43

package/lib/models/methods/connect/connect-additional-request.d.ts

@@ -1,6 +1,15 @@
+import { ReturnStrategy } from '@tonconnect/protocol';
 export interface ConnectAdditionalRequest {
     /**
      * Payload for ton_proof
      */
-    tonProof: string;
+    tonProof?: string;
+    /**
+     * @default 'back'
+     * Return strategy for deeplinks when the user accepts or declines the request.
+     *   - `'back'` means return to the app which initialized deeplink jump (e.g. browser, native app, ...),
+     *   - `'none'` means no jumps after user action;
+     *   - a URL: wallet will open this URL after completing the user's action. Note, that you shouldn't pass your app's URL if it is a webpage. This option should be used for native apps to work around possible OS-specific issues with `'back'` option.
+     */
+    return?: ReturnStrategy;
 }

package/lib/models/methods/send-transaction/index.d.ts

@@ -1,2 +1,3 @@
 export { SendTransactionRequest } from './send-transaction-request';
 export { SendTransactionResponse } from './send-transaction-response';
+export { SendTransactionOptions } from './send-transaction-options';

package/lib/models/methods/send-transaction/send-transaction-options.d.ts

@@ -0,0 +1,11 @@
+import { ReturnStrategy } from '@tonconnect/protocol';
+export interface SendTransactionOptions {
+    /**
+     * @default 'back'
+     * Return strategy for deeplinks when the user accepts or declines the request.
+     *   - `'back'` means return to the app which initialized deeplink jump (e.g. browser, native app, ...),
+     *   - `'none'` means no jumps after user action;
+     *   - a URL: wallet will open this URL after completing the user's action. Note, that you shouldn't pass your app's URL if it is a webpage. This option should be used for native apps to work around possible OS-specific issues with `'back'` option.
+     */
+    return: ReturnStrategy;
+}

package/lib/models/methods/send-transaction/send-transaction-options.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/parsers/send-transaction-parser.d.ts

@@ -1,11 +1,11 @@
-import { SendTransactionRpcRequest, SendTransactionRpcResponseError, SendTransactionRpcResponseSuccess } from '@tonconnect/protocol';
+import { ReturnStrategy, SendTransactionRpcRequest, SendTransactionRpcResponseError, SendTransactionRpcResponseSuccess } from '@tonconnect/protocol';
 import { SendTransactionRequest, SendTransactionResponse } from "../models/methods";
 import { RpcParser } from "./rpc-parser";
 import { WithoutId } from "../utils/types";
 declare class SendTransactionParser extends RpcParser<'sendTransaction'> {
     convertToRpcRequest(request: Omit<SendTransactionRequest, 'validUntil'> & {
         valid_until: number;
-    }): WithoutId<SendTransactionRpcRequest>;
+    }, returnStrategy: ReturnStrategy): WithoutId<SendTransactionRpcRequest>;
     parseAndThrowError(response: WithoutId<SendTransactionRpcResponseError>): never;
     convertFromRpcResponse(rpcResponse: WithoutId<SendTransactionRpcResponseSuccess>): SendTransactionResponse;
 }

package/lib/parsers/send-transaction-parser.js

@@ -12,10 +12,11 @@ const sendTransactionErrors = {
     [protocol_1.SEND_TRANSACTION_ERROR_CODES.UNKNOWN_APP_ERROR]: errors_1.UnknownAppError
 };
 class SendTransactionParser extends rpc_parser_1.RpcParser {
-    convertToRpcRequest(request) {
+    convertToRpcRequest(request, returnStrategy) {
         return {
             method: 'sendTransaction',
-            params: [JSON.stringify(request)]
+            params: [JSON.stringify(request)],
+            return: returnStrategy
         };
     }
     parseAndThrowError(response) {

package/lib/provider/bridge/bridge-provider.js

@@ -160,7 +160,7 @@ class BridgeProvider {
         const url = new URL(this.walletConnectionSource.universalLink);
         url.searchParams.append('v', protocol.version.toString());
         url.searchParams.append('id', this.session.sessionCrypto.sessionId);
-        url.searchParams.append('r', protocol_1.Base64.encode(JSON.stringify(message), true));
+        url.searchParams.append('r', JSON.stringify(message));
         return url.toString();
     }
 }

package/lib/ton-connect.d.ts

@@ -5,6 +5,7 @@ import { ConnectAdditionalRequest } from "./models/methods/connect/connect-addit
 import { TonConnectOptions } from "./models/ton-connect-options";
 import { WalletConnectionSourceJS } from "./models/wallet/wallet-connection-source";
 import { ITonConnect } from "./ton-connect.interface";
+import { SendTransactionOptions } from "./models/methods/send-transaction/send-transaction-options";
 export declare class TonConnect implements ITonConnect {
     private readonly walletsList;
     private readonly dappSettings;
@@ -52,10 +53,11 @@ export declare class TonConnect implements ITonConnect {
     /**
      * Asks connected wallet to sign and send the transaction.
      * @param transaction transaction to send.
+     * @param options request options
      * @returns signed transaction boc that allows you to find the transaction in the blockchain.
      * If user rejects transaction, method will throw the corresponding error.
      */
-    sendTransaction(transaction: SendTransactionRequest): Promise<SendTransactionResponse>;
+    sendTransaction(transaction: SendTransactionRequest, options: SendTransactionOptions): Promise<SendTransactionResponse>;
     /**
      * Disconnect form thw connected wallet and drop current session.
      */

package/lib/ton-connect.interface.d.ts

@@ -4,6 +4,7 @@ import { SendTransactionRequest, SendTransactionResponse } from "./models/method
 import { ConnectAdditionalRequest } from "./models/methods/connect/connect-additional-request";
 import { WalletInfo } from "./models/wallet/wallet-info";
 import { WalletConnectionSourceJS } from "./models/wallet/wallet-connection-source";
+import { SendTransactionOptions } from "./models/methods/send-transaction/send-transaction-options";
 export interface ITonConnect {
     /**
      * Shows if the wallet is connected right now.
@@ -46,8 +47,9 @@ export interface ITonConnect {
     /**
      * Asks connected wallet to sign and send the transaction.
      * @param transaction transaction to send.
+     * @param options request options
      * @returns signed transaction boc that allows you to find the transaction in the blockchain.
      * If user rejects transaction, method will throw the corresponding error.
      */
-    sendTransaction(transaction: SendTransactionRequest): Promise<SendTransactionResponse>;
+    sendTransaction(transaction: SendTransactionRequest, options: SendTransactionOptions): Promise<SendTransactionResponse>;
 }

package/lib/ton-connect.js

@@ -140,15 +140,16 @@ class TonConnect {
     /**
      * Asks connected wallet to sign and send the transaction.
      * @param transaction transaction to send.
+     * @param options request options
      * @returns signed transaction boc that allows you to find the transaction in the blockchain.
      * If user rejects transaction, method will throw the corresponding error.
      */
-    sendTransaction(transaction) {
+    sendTransaction(transaction, options) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkConnection();
             this.checkFeatureSupport('SendTransaction');
             const { validUntil } = transaction, tx = __rest(transaction, ["validUntil"]);
-            const response = yield this.provider.sendRequest(send_transaction_parser_1.sendTransactionParser.convertToRpcRequest(Object.assign(Object.assign({}, tx), { valid_until: validUntil })));
+            const response = yield this.provider.sendRequest(send_transaction_parser_1.sendTransactionParser.convertToRpcRequest(Object.assign(Object.assign({}, tx), { valid_until: validUntil }), (options === null || options === void 0 ? void 0 : options.return) || 'back'));
             if (send_transaction_parser_1.sendTransactionParser.isError(response)) {
                 return send_transaction_parser_1.sendTransactionParser.parseAndThrowError(response);
             }
@@ -241,7 +242,7 @@ class TonConnect {
                 name: 'ton_addr'
             }
         ];
-        if (request) {
+        if (request === null || request === void 0 ? void 0 : request.tonProof) {
             items.push({
                 name: 'ton_proof',
                 payload: request.tonProof
@@ -249,7 +250,8 @@ class TonConnect {
         }
         return {
             manifestUrl: this.dappSettings.manifestUrl,
-            items
+            items,
+            return: (request === null || request === void 0 ? void 0 : request.return) || 'back'
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonconnect/sdk",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "scripts": {
     "build": "npx rimraf lib && ttsc && npx rimraf dist &&  webpack --mode development",
     "build:production": "npx rimraf lib && ttsc --sourceMap false && npx rimraf dist &&  webpack --mode production"
@@ -28,7 +28,7 @@
     "tweetnacl": "^1.0.3",
     "eventsource": "^2.0.2",
     "node-fetch": "^2.6.7",
-    "@tonconnect/protocol": "^0.0.22"
+    "@tonconnect/protocol": "^0.0.24"
   },
   "files": [
     "lib",