@tonconnect/sdk 2.0.4 → 2.0.5

package/lib/cjs/provider/injected/injected-provider.js

@@ -15,7 +15,8 @@ const bridge_connection_storage_1 = require("../../storage/bridge-connection-sto
 const web_api_1 = require("../../utils/web-api");
 const protocol_1 = require("../../resources/protocol");
 class InjectedProvider {
-    constructor(injectedWalletKey) {
+    constructor(storage, injectedWalletKey) {
+        this.injectedWalletKey = injectedWalletKey;
         this.type = 'injected';
         this.unsubscribeCallback = null;
         this.listenSubscriptions = false;
@@ -24,13 +25,14 @@ class InjectedProvider {
         if (!InjectedProvider.isWindowContainsWallet(window, injectedWalletKey)) {
             throw new wallet_not_injected_error_1.WalletNotInjectedError();
         }
+        this.connectionStorage = new bridge_connection_storage_1.BridgeConnectionStorage(storage);
         this.injectedWallet = window[injectedWalletKey].tonconnect;
     }
     static fromStorage(storage) {
         return __awaiter(this, void 0, void 0, function* () {
             const bridgeConnectionStorage = new bridge_connection_storage_1.BridgeConnectionStorage(storage);
             const connection = yield bridgeConnectionStorage.getInjectedConnection();
-            return new InjectedProvider(connection.jsBridgeKey);
+            return new InjectedProvider(storage, connection.jsBridgeKey);
         });
     }
     static isWalletInjected(injectedWalletKey) {
@@ -48,26 +50,8 @@ class InjectedProvider {
             typeof window[injectedWalletKey] === 'object' &&
             'tonconnect' in window[injectedWalletKey]);
     }
-    connect(message, auto = false) {
-        this.injectedWallet
-            .connect(protocol_1.PROTOCOL_VERSION, message, auto)
-            .then(connectEvent => {
-            if (connectEvent.event === 'connect') {
-                this.makeSubscriptions();
-                this.listenSubscriptions = true;
-            }
-            this.listeners.forEach(listener => listener(connectEvent));
-        })
-            .catch(e => {
-            const connectEventError = {
-                event: 'connect_error',
-                payload: {
-                    code: 0,
-                    message: e === null || e === void 0 ? void 0 : e.toString()
-                }
-            };
-            this.listeners.forEach(listener => listener(connectEventError));
-        });
+    connect(message) {
+        this._connect(protocol_1.PROTOCOL_VERSION, message);
     }
     restoreConnection() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -75,11 +59,14 @@ class InjectedProvider {
                 const connectEvent = yield this.injectedWallet.restoreConnection();
                 if (connectEvent.event === 'connect') {
                     this.makeSubscriptions();
-                    this.listenSubscriptions = true;
                     this.listeners.forEach(listener => listener(connectEvent));
                 }
+                else {
+                    yield this.connectionStorage.removeConnection();
+                }
             }
             catch (e) {
+                yield this.connectionStorage.removeConnection();
                 console.error(e);
             }
         });
@@ -93,7 +80,7 @@ class InjectedProvider {
     disconnect() {
         this.closeAllListeners();
         this.injectedWallet.disconnect();
-        return Promise.resolve();
+        return this.connectionStorage.removeConnection();
     }
     closeAllListeners() {
         var _a;
@@ -110,7 +97,31 @@ class InjectedProvider {
             return this.injectedWallet.send(Object.assign(Object.assign({}, request), { id: '0' }));
         });
     }
+    _connect(protocolVersion, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const connectEvent = yield this.injectedWallet.connect(protocolVersion, message);
+                if (connectEvent.event === 'connect') {
+                    yield this.updateSession();
+                    this.makeSubscriptions();
+                }
+                this.listeners.forEach(listener => listener(connectEvent));
+            }
+            catch (e) {
+                console.debug(e);
+                const connectEventError = {
+                    event: 'connect_error',
+                    payload: {
+                        code: 0,
+                        message: e === null || e === void 0 ? void 0 : e.toString()
+                    }
+                };
+                this.listeners.forEach(listener => listener(connectEventError));
+            }
+        });
+    }
     makeSubscriptions() {
+        this.listenSubscriptions = true;
         this.unsubscribeCallback = this.injectedWallet.listen(e => {
             if (this.listenSubscriptions) {
                 this.listeners.forEach(listener => listener(e));
@@ -120,6 +131,12 @@ class InjectedProvider {
             }
         });
     }
+    updateSession() {
+        return this.connectionStorage.storeConnection({
+            type: 'injected',
+            jsBridgeKey: this.injectedWalletKey
+        });
+    }
 }
 exports.InjectedProvider = InjectedProvider;
 InjectedProvider.window = (0, web_api_1.getWindow)();

package/lib/cjs/ton-connect.js

@@ -48,6 +48,7 @@ class TonConnect {
             manifestUrl: (options === null || options === void 0 ? void 0 : options.manifestUrl) || (0, web_api_1.getWebPageManifest)(),
             storage: (options === null || options === void 0 ? void 0 : options.storage) || new default_storage_1.DefaultStorage()
         };
+        this.walletsList = new wallets_list_manager_1.WalletsListManager(options === null || options === void 0 ? void 0 : options.walletsListSource);
         if (!this.dappSettings.manifestUrl) {
             throw new dapp_metadata_error_1.DappMetadataError('Dapp tonconnect-manifest.json must be specified if window.location.origin is undefined. See more https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest');
         }
@@ -176,7 +177,7 @@ class TonConnect {
     createProvider(wallet) {
         let provider;
         if ((0, wallet_connection_source_1.isWalletConnectionSourceJS)(wallet)) {
-            provider = new injected_provider_1.InjectedProvider(wallet.jsBridgeKey);
+            provider = new injected_provider_1.InjectedProvider(this.dappSettings.storage, wallet.jsBridgeKey);
         }
         else {
             provider = new bridge_provider_1.BridgeProvider(this.dappSettings.storage, wallet);
@@ -261,3 +262,13 @@ class TonConnect {
 }
 exports.TonConnect = TonConnect;
 TonConnect.walletsList = new wallets_list_manager_1.WalletsListManager();
+/**
+ * Check if specified wallet is injected and available to use with the app.
+ * @param walletJSKey target wallet's js bridge key.
+ */
+TonConnect.isWalletInjected = (walletJSKey) => injected_provider_1.InjectedProvider.isWalletInjected(walletJSKey);
+/**
+ * Check if the app is opened inside specified wallet's browser.
+ * @param walletJSKey target wallet's js bridge key.
+ */
+TonConnect.isInsideWalletBrowser = (walletJSKey) => injected_provider_1.InjectedProvider.isInsideWalletBrowser(walletJSKey);

package/lib/cjs/wallets-list-manager.js

@@ -14,9 +14,12 @@ const fetch_wallets_error_1 = require("./errors/wallets-manager/fetch-wallets.er
 const wallet_info_1 = require("./models/wallet/wallet-info");
 const injected_provider_1 = require("./provider/injected/injected-provider");
 class WalletsListManager {
-    constructor() {
+    constructor(walletsListSource) {
         this.walletsListCache = null;
         this.walletsListSource = 'https://raw.githubusercontent.com/ton-connect/wallets-list/main/wallets.json';
+        if (walletsListSource) {
+            this.walletsListSource = walletsListSource;
+        }
     }
     getWallets() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -30,11 +33,11 @@ class WalletsListManager {
     getEmbeddedWallet() {
         return __awaiter(this, void 0, void 0, function* () {
             const walletsList = yield this.getWallets();
-            const injectedWallets = walletsList.filter(wallet_info_1.isWalletInfoInjected);
-            if (injectedWallets.length !== 1) {
+            const embeddedWallets = walletsList.filter(item => (0, wallet_info_1.isWalletInfoInjected)(item) && item.embedded);
+            if (embeddedWallets.length !== 1) {
                 return null;
             }
-            return injectedWallets[0].embedded ? injectedWallets[0] : null;
+            return embeddedWallets[0];
         });
     }
     fetchWalletsList() {

package/lib/esm/provider/injected/injected-provider.js

@@ -12,7 +12,8 @@ import { BridgeConnectionStorage } from "../../storage/bridge-connection-storage
 import { getWindow } from "../../utils/web-api";
 import { PROTOCOL_VERSION } from "../../resources/protocol";
 export class InjectedProvider {
-    constructor(injectedWalletKey) {
+    constructor(storage, injectedWalletKey) {
+        this.injectedWalletKey = injectedWalletKey;
         this.type = 'injected';
         this.unsubscribeCallback = null;
         this.listenSubscriptions = false;
@@ -21,13 +22,14 @@ export class InjectedProvider {
         if (!InjectedProvider.isWindowContainsWallet(window, injectedWalletKey)) {
             throw new WalletNotInjectedError();
         }
+        this.connectionStorage = new BridgeConnectionStorage(storage);
         this.injectedWallet = window[injectedWalletKey].tonconnect;
     }
     static fromStorage(storage) {
         return __awaiter(this, void 0, void 0, function* () {
             const bridgeConnectionStorage = new BridgeConnectionStorage(storage);
             const connection = yield bridgeConnectionStorage.getInjectedConnection();
-            return new InjectedProvider(connection.jsBridgeKey);
+            return new InjectedProvider(storage, connection.jsBridgeKey);
         });
     }
     static isWalletInjected(injectedWalletKey) {
@@ -45,26 +47,8 @@ export class InjectedProvider {
             typeof window[injectedWalletKey] === 'object' &&
             'tonconnect' in window[injectedWalletKey]);
     }
-    connect(message, auto = false) {
-        this.injectedWallet
-            .connect(PROTOCOL_VERSION, message, auto)
-            .then(connectEvent => {
-            if (connectEvent.event === 'connect') {
-                this.makeSubscriptions();
-                this.listenSubscriptions = true;
-            }
-            this.listeners.forEach(listener => listener(connectEvent));
-        })
-            .catch(e => {
-            const connectEventError = {
-                event: 'connect_error',
-                payload: {
-                    code: 0,
-                    message: e === null || e === void 0 ? void 0 : e.toString()
-                }
-            };
-            this.listeners.forEach(listener => listener(connectEventError));
-        });
+    connect(message) {
+        this._connect(PROTOCOL_VERSION, message);
     }
     restoreConnection() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -72,11 +56,14 @@ export class InjectedProvider {
                 const connectEvent = yield this.injectedWallet.restoreConnection();
                 if (connectEvent.event === 'connect') {
                     this.makeSubscriptions();
-                    this.listenSubscriptions = true;
                     this.listeners.forEach(listener => listener(connectEvent));
                 }
+                else {
+                    yield this.connectionStorage.removeConnection();
+                }
             }
             catch (e) {
+                yield this.connectionStorage.removeConnection();
                 console.error(e);
             }
         });
@@ -90,7 +77,7 @@ export class InjectedProvider {
     disconnect() {
         this.closeAllListeners();
         this.injectedWallet.disconnect();
-        return Promise.resolve();
+        return this.connectionStorage.removeConnection();
     }
     closeAllListeners() {
         var _a;
@@ -107,7 +94,31 @@ export class InjectedProvider {
             return this.injectedWallet.send(Object.assign(Object.assign({}, request), { id: '0' }));
         });
     }
+    _connect(protocolVersion, message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const connectEvent = yield this.injectedWallet.connect(protocolVersion, message);
+                if (connectEvent.event === 'connect') {
+                    yield this.updateSession();
+                    this.makeSubscriptions();
+                }
+                this.listeners.forEach(listener => listener(connectEvent));
+            }
+            catch (e) {
+                console.debug(e);
+                const connectEventError = {
+                    event: 'connect_error',
+                    payload: {
+                        code: 0,
+                        message: e === null || e === void 0 ? void 0 : e.toString()
+                    }
+                };
+                this.listeners.forEach(listener => listener(connectEventError));
+            }
+        });
+    }
     makeSubscriptions() {
+        this.listenSubscriptions = true;
         this.unsubscribeCallback = this.injectedWallet.listen(e => {
             if (this.listenSubscriptions) {
                 this.listeners.forEach(listener => listener(e));
@@ -117,5 +128,11 @@ export class InjectedProvider {
             }
         });
     }
+    updateSession() {
+        return this.connectionStorage.storeConnection({
+            type: 'injected',
+            jsBridgeKey: this.injectedWalletKey
+        });
+    }
 }
 InjectedProvider.window = getWindow();

package/lib/esm/ton-connect.js

@@ -45,6 +45,7 @@ export class TonConnect {
             manifestUrl: (options === null || options === void 0 ? void 0 : options.manifestUrl) || getWebPageManifest(),
             storage: (options === null || options === void 0 ? void 0 : options.storage) || new DefaultStorage()
         };
+        this.walletsList = new WalletsListManager(options === null || options === void 0 ? void 0 : options.walletsListSource);
         if (!this.dappSettings.manifestUrl) {
             throw new DappMetadataError('Dapp tonconnect-manifest.json must be specified if window.location.origin is undefined. See more https://github.com/ton-connect/docs/blob/main/requests-responses.md#app-manifest');
         }
@@ -173,7 +174,7 @@ export class TonConnect {
     createProvider(wallet) {
         let provider;
         if (isWalletConnectionSourceJS(wallet)) {
-            provider = new InjectedProvider(wallet.jsBridgeKey);
+            provider = new InjectedProvider(this.dappSettings.storage, wallet.jsBridgeKey);
         }
         else {
             provider = new BridgeProvider(this.dappSettings.storage, wallet);
@@ -257,3 +258,13 @@ export class TonConnect {
     }
 }
 TonConnect.walletsList = new WalletsListManager();
+/**
+ * Check if specified wallet is injected and available to use with the app.
+ * @param walletJSKey target wallet's js bridge key.
+ */
+TonConnect.isWalletInjected = (walletJSKey) => InjectedProvider.isWalletInjected(walletJSKey);
+/**
+ * Check if the app is opened inside specified wallet's browser.
+ * @param walletJSKey target wallet's js bridge key.
+ */
+TonConnect.isInsideWalletBrowser = (walletJSKey) => InjectedProvider.isInsideWalletBrowser(walletJSKey);

package/lib/esm/wallets-list-manager.js

@@ -11,9 +11,12 @@ import { FetchWalletsError } from "./errors/wallets-manager/fetch-wallets.error"
 import { isWalletInfoInjected } from "./models/wallet/wallet-info";
 import { InjectedProvider } from "./provider/injected/injected-provider";
 export class WalletsListManager {
-    constructor() {
+    constructor(walletsListSource) {
         this.walletsListCache = null;
         this.walletsListSource = 'https://raw.githubusercontent.com/ton-connect/wallets-list/main/wallets.json';
+        if (walletsListSource) {
+            this.walletsListSource = walletsListSource;
+        }
     }
     getWallets() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -27,11 +30,11 @@ export class WalletsListManager {
     getEmbeddedWallet() {
         return __awaiter(this, void 0, void 0, function* () {
             const walletsList = yield this.getWallets();
-            const injectedWallets = walletsList.filter(isWalletInfoInjected);
-            if (injectedWallets.length !== 1) {
+            const embeddedWallets = walletsList.filter(item => isWalletInfoInjected(item) && item.embedded);
+            if (embeddedWallets.length !== 1) {
                 return null;
             }
-            return injectedWallets[0].embedded ? injectedWallets[0] : null;
+            return embeddedWallets[0];
         });
     }
     fetchWalletsList() {

package/lib/types/models/ton-connect-options.d.ts

@@ -12,4 +12,8 @@ export interface TonConnectOptions {
      * Storage to save protocol data. For browser default is `localStorage`. If you use SDK with nodeJS, you have to specify this field.
      */
     storage?: IStorage;
+    /**
+     * @deprecated Don't use it
+     */
+    walletsListSource?: string;
 }

package/lib/types/models/wallet/index.d.ts

@@ -1,4 +1,4 @@
 export type { Account } from './account';
 export type { Wallet } from './wallet';
 export type { WalletConnectionSource, WalletConnectionSourceHTTP, WalletConnectionSourceJS } from './wallet-connection-source';
-export { WalletInfo, WalletInfoInjected, WalletInfoRemote, isWalletInfoInjected } from './wallet-info';
+export { WalletInfo, WalletInfoBase, WalletInfoInjected, WalletInfoRemote, isWalletInfoInjected } from './wallet-info';

package/lib/types/provider/injected/injected-provider.d.ts

@@ -3,6 +3,7 @@ import { InternalProvider } from "../provider";
 import { IStorage } from "../../storage/models/storage.interface";
 import { WithoutId } from "../../utils/types";
 export declare class InjectedProvider<T extends string = string> implements InternalProvider {
+    private readonly injectedWalletKey;
     private static window;
     static fromStorage(storage: IStorage): Promise<InjectedProvider>;
     static isWalletInjected(injectedWalletKey: string): boolean;
@@ -11,15 +12,18 @@ export declare class InjectedProvider<T extends string = string> implements Inte
     readonly type = "injected";
     private unsubscribeCallback;
     private injectedWallet;
+    private readonly connectionStorage;
     private listenSubscriptions;
     private listeners;
-    constructor(injectedWalletKey: T);
-    connect(message: ConnectRequest, auto?: boolean): void;
+    constructor(storage: IStorage, injectedWalletKey: T);
+    connect(message: ConnectRequest): void;
     restoreConnection(): Promise<void>;
     closeConnection(): void;
     disconnect(): Promise<void>;
     private closeAllListeners;
     listen(eventsCallback: (e: WalletEvent) => void): () => void;
     sendRequest<T extends RpcMethod>(request: WithoutId<AppRequest<T>>): Promise<WithoutId<WalletResponse<T>>>;
+    private _connect;
     private makeSubscriptions;
+    private updateSession;
 }

package/lib/types/provider/injected/models/injected-wallet-api.d.ts

@@ -3,7 +3,7 @@ export interface InjectedWalletApi {
     deviceInfo: DeviceInfo;
     protocolVersion: number;
     isWalletBrowser: boolean;
-    connect(protocolVersion: number, message: ConnectRequest, auto: boolean): Promise<ConnectEvent>;
+    connect(protocolVersion: number, message: ConnectRequest): Promise<ConnectEvent>;
     restoreConnection(): Promise<ConnectEvent>;
     send<T extends RpcMethod>(message: AppRequest<T>): Promise<WalletResponse<T>>;
     listen(callback: (event: WalletEvent) => void): () => void;

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

@@ -7,6 +7,16 @@ import { WalletConnectionSourceJS } from "./models/wallet/wallet-connection-sour
 import { ITonConnect } from "./ton-connect.interface";
 export declare class TonConnect implements ITonConnect {
     private static readonly walletsList;
+    /**
+     * Check if specified wallet is injected and available to use with the app.
+     * @param walletJSKey target wallet's js bridge key.
+     */
+    static isWalletInjected: (walletJSKey: string) => boolean;
+    /**
+     * Check if the app is opened inside specified wallet's browser.
+     * @param walletJSKey target wallet's js bridge key.
+     */
+    static isInsideWalletBrowser: (walletJSKey: string) => boolean;
     /**
      * Returns available wallets list.
      */

package/lib/types/wallets-list-manager.d.ts

@@ -2,6 +2,7 @@ import { WalletInfoInjected, WalletInfo } from "./models/wallet/wallet-info";
 export declare class WalletsListManager {
     private walletsListCache;
     private readonly walletsListSource;
+    constructor(walletsListSource?: string);
     getWallets(): Promise<WalletInfo[]>;
     getEmbeddedWallet(): Promise<WalletInfoInjected | null>;
     private fetchWalletsList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonconnect/sdk",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "scripts": {
     "build": "npx rimraf lib && ttsc --outDir ./lib/cjs && ttsc --module esnext --outDir ./lib/esm && npx rimraf dist &&  webpack --mode development",
     "build:production": "npx rimraf lib && ttsc --project tsconfig.cjs.json --sourceMap false && ttsc --project tsconfig.esm.json --sourceMap false && npx rimraf dist &&  webpack --mode production"