@tonconnect/sdk 0.0.2 → 0.0.4

package/lib/models/index.d.ts

@@ -1,3 +1,4 @@
 export * from './wallet';
+export * from './methods';
 export { DappMetadata } from './dapp/dapp-metadata';
 export { DappSettings } from './dapp/dapp-settings';

package/lib/models/index.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./wallet"), exports);
+tslib_1.__exportStar(require("./methods"), exports);

package/lib/provider/bridge/bridge-gateway.d.ts

@@ -1,5 +1,6 @@
 import { BridgeIncomingMessage } from "./models/bridge-incomming-message";
 export declare class BridgeGateway {
+    private readonly bridgeUrl;
     readonly sessionId: string;
     private readonly listener;
     private readonly errorsListener;
@@ -8,7 +9,6 @@ export declare class BridgeGateway {
     private readonly defaultTtl;
     private eventSource;
     private isClosed;
-    private readonly bridgeUrl;
     constructor(bridgeUrl: string, sessionId: string, listener: (msg: BridgeIncomingMessage) => void, errorsListener: (err: Event) => void);
     registerSession(): Promise<void>;
     send(message: Uint8Array, receiver: string, ttl?: number): Promise<void>;

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

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeGateway = void 0;
 var tslib_1 = require("tslib");
+var url_1 = require("../../utils/url");
 var BridgeGateway = /** @class */ (function () {
     function BridgeGateway(bridgeUrl, sessionId, listener, errorsListener) {
+        this.bridgeUrl = bridgeUrl;
         this.sessionId = sessionId;
         this.listener = listener;
         this.errorsListener = errorsListener;
@@ -11,19 +13,13 @@ var BridgeGateway = /** @class */ (function () {
         this.postPath = 'message';
         this.defaultTtl = 300;
         this.isClosed = false;
-        if (bridgeUrl.slice(-1) === '/') {
-            this.bridgeUrl = bridgeUrl.slice(0, -1);
-        }
-        else {
-            this.bridgeUrl = bridgeUrl;
-        }
     }
     BridgeGateway.prototype.registerSession = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var url;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                url = new URL("this.bridgeUrl/".concat(this.ssePath));
+                url = new URL((0, url_1.addPathToUrl)(this.bridgeUrl, this.ssePath));
                 url.searchParams.append('client_id', this.sessionId);
                 this.eventSource = new EventSource(url);
                 return [2 /*return*/, new Promise(function (resolve, reject) {
@@ -43,7 +39,7 @@ var BridgeGateway = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        url = new URL("this.bridgeUrl/".concat(this.postPath));
+                        url = new URL((0, url_1.addPathToUrl)(this.bridgeUrl, this.postPath));
                         url.searchParams.append('client_id', this.sessionId);
                         url.searchParams.append('to', receiver);
                         url.searchParams.append('ttl', (ttl || this.defaultTtl).toString());

package/lib/provider/bridge/bridge-provider.d.ts

@@ -6,6 +6,7 @@ import { WithoutId } from "../../utils/types";
 export declare class BridgeProvider implements HTTPProvider {
     private readonly walletConnectionSource;
     readonly type = "http";
+    private readonly universalLinkPath;
     private readonly connectionStorage;
     private readonly pendingRequests;
     private nextRequestId;

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

@@ -7,10 +7,12 @@ var ton_connect_error_1 = require("../../errors/ton-connect.error");
 var bridge_gateway_1 = require("./bridge-gateway");
 var bridge_connection_storage_1 = require("../../storage/bridge-connection-storage");
 var protocol = tslib_1.__importStar(require("../../resources/protocol.json"));
+var url_1 = require("../../utils/url");
 var BridgeProvider = /** @class */ (function () {
     function BridgeProvider(storage, walletConnectionSource) {
         this.walletConnectionSource = walletConnectionSource;
         this.type = 'http';
+        this.universalLinkPath = 'ton-connect';
         this.pendingRequests = new Map();
         this.nextRequestId = 0;
         this.session = null;
@@ -149,7 +151,8 @@ var BridgeProvider = /** @class */ (function () {
         });
     };
     BridgeProvider.prototype.generateUniversalLink = function (message) {
-        var url = new URL(this.walletConnectionSource.universalLinkBase);
+        var urlString = (0, url_1.addPathToUrl)(this.walletConnectionSource.universalLinkBase, this.universalLinkPath);
+        var url = new URL(urlString);
         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));

package/lib/ton-connect.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonConnect = void 0;
 var tslib_1 = require("tslib");
-var protocol_1 = require("@tonconnect/protocol");
 var ton_connect_error_1 = require("./errors/ton-connect.error");
 var wallet_already_connected_error_1 = require("./errors/wallet/wallet-already-connected.error");
 var wallet_not_connected_error_1 = require("./errors/wallet/wallet-not-connected.error");
@@ -81,22 +80,26 @@ var TonConnect = /** @class */ (function () {
     };
     TonConnect.prototype._autoConnect = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var bridgeConnection, provider;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var bridgeConnection, _a, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0: return [4 /*yield*/, this.bridgeConnectionStorage.getConnection()];
                     case 1:
-                        bridgeConnection = _a.sent();
+                        bridgeConnection = _c.sent();
                         if (!bridgeConnection) return [3 /*break*/, 3];
+                        _a = this;
                         return [4 /*yield*/, this.createProvider(bridgeConnection.session.walletConnectionSource)];
                     case 2:
-                        provider = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.createProvider('injected')];
+                        _a.provider = _c.sent();
+                        return [2 /*return*/, this.provider.autoConnect()];
+                    case 3:
+                        if (!injected_provider_1.InjectedProvider.isWalletInjected()) return [3 /*break*/, 5];
+                        _b = this;
+                        return [4 /*yield*/, this.createProvider('injected')];
                     case 4:
-                        provider = _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/, provider.autoConnect()];
+                        _b.provider = _c.sent();
+                        return [2 /*return*/, this.provider.autoConnect()];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -170,7 +173,7 @@ var TonConnect = /** @class */ (function () {
             provider: this.provider.type,
             account: {
                 address: tonAccountItem.address,
-                chain: protocol_1.CHAIN.MAINNET // TODO
+                chain: tonAccountItem.network
             }
         };
         if (tonProofItem) {

package/lib/utils/url.d.ts

@@ -0,0 +1,2 @@
+export declare function removeUrlLastSlash(url: string): string;
+export declare function addPathToUrl(url: string, path: string): string;

package/lib/utils/url.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addPathToUrl = exports.removeUrlLastSlash = void 0;
+function removeUrlLastSlash(url) {
+    if (url.slice(-1) === '/') {
+        return url.slice(0, -1);
+    }
+    return url;
+}
+exports.removeUrlLastSlash = removeUrlLastSlash;
+function addPathToUrl(url, path) {
+    return removeUrlLastSlash(url) + '/' + path;
+}
+exports.addPathToUrl = addPathToUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonconnect/sdk",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "scripts": {
     "build": "npx rimraf lib && ttsc",
     "build:production": "npx rimraf lib && ttsc --sourceMap false"