@tonconnect/ui-react 0.0.11 → 0.0.13

package/lib/index.umd.js

@@ -4056,10 +4056,12 @@ var __objRest = (source, exclude) => {
       this.storage = storage;
       this.walletConnectionSource = walletConnectionSource;
       this.type = "http";
+      this.standardUniversalLink = "https://connect.ton.org";
       this.pendingRequests = /* @__PURE__ */ new Map();
       this.nextRequestId = 0;
       this.session = null;
       this.bridge = null;
+      this.pendingBridges = [];
       this.listeners = [];
       this.connectionStorage = new BridgeConnectionStorage(storage);
     }
@@ -4071,21 +4073,32 @@ var __objRest = (source, exclude) => {
       });
     }
     connect(message) {
-      var _a;
-      (_a = this.bridge) === null || _a === void 0 ? void 0 : _a.close();
+      this.closeBridges();
       const sessionCrypto = new SessionCrypto();
+      let walletConnectionSource = {
+        universalLink: this.standardUniversalLink,
+        bridgeUrl: ""
+      };
+      if (Array.isArray(this.walletConnectionSource)) {
+        this.pendingBridges = this.walletConnectionSource.map((source) => new BridgeGateway(this.storage, source, sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this)));
+        this.pendingBridges.forEach((bridge) => bridge.registerSession());
+      } else {
+        walletConnectionSource = this.walletConnectionSource;
+        this.bridge = new BridgeGateway(this.storage, this.walletConnectionSource.bridgeUrl, sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this));
+        this.bridge.registerSession();
+      }
       this.session = {
         sessionCrypto,
-        walletConnectionSource: this.walletConnectionSource
+        walletConnectionSource
       };
-      this.bridge = new BridgeGateway(this.storage, this.walletConnectionSource.bridgeUrl, sessionCrypto.sessionId, this.gatewayListener.bind(this), this.gatewayErrorsListener.bind(this));
-      this.bridge.registerSession();
-      return this.generateUniversalLink(message);
+      return this.generateUniversalLink(walletConnectionSource.universalLink, message);
     }
     restoreConnection() {
-      var _a;
       return __awaiter$4(this, void 0, void 0, function* () {
-        (_a = this.bridge) === null || _a === void 0 ? void 0 : _a.close();
+        if (Array.isArray(this.walletConnectionSource)) {
+          throw new TonConnectError$1("Internal error. Connection source is array while WalletConnectionSourceHTTP was expected.");
+        }
+        this.closeBridges();
         const storedConnection = yield this.connectionStorage.getHttpConnection();
         if (!storedConnection) {
           return;
@@ -4109,15 +4122,13 @@ var __objRest = (source, exclude) => {
       });
     }
     closeConnection() {
-      var _a;
-      (_a = this.bridge) === null || _a === void 0 ? void 0 : _a.close();
+      this.closeBridges();
       this.listeners = [];
       this.session = null;
       this.bridge = null;
     }
     disconnect() {
-      var _a;
-      (_a = this.bridge) === null || _a === void 0 ? void 0 : _a.close();
+      this.closeBridges();
       this.listeners = [];
       return this.removeBridgeAndSession();
     }
@@ -4125,6 +4136,18 @@ var __objRest = (source, exclude) => {
       this.listeners.push(callback);
       return () => this.listeners = this.listeners.filter((listener) => listener !== callback);
     }
+    pendingGatewaysListener(gateway, bridgeIncomingMessage) {
+      return __awaiter$4(this, void 0, void 0, function* () {
+        if (!this.pendingBridges.includes(gateway)) {
+          gateway.close();
+          return;
+        }
+        this.closeBridges();
+        this.session.walletConnectionSource.bridgeUrl = gateway.bridgeUrl;
+        this.bridge = gateway;
+        return this.gatewayListener(bridgeIncomingMessage);
+      });
+    }
     gatewayListener(bridgeIncomingMessage) {
       return __awaiter$4(this, void 0, void 0, function* () {
         const walletMessage = JSON.parse(this.session.sessionCrypto.decrypt(Base64$1.decode(bridgeIncomingMessage.message).toUint8Array(), hexToByteArray(bridgeIncomingMessage.from)));
@@ -4171,13 +4194,19 @@ var __objRest = (source, exclude) => {
         yield this.connectionStorage.removeConnection();
       });
     }
-    generateUniversalLink(message) {
-      const url = new URL(this.walletConnectionSource.universalLink);
+    generateUniversalLink(universalLink, message) {
+      const url = new URL(universalLink);
       url.searchParams.append("v", PROTOCOL_VERSION.toString());
       url.searchParams.append("id", this.session.sessionCrypto.sessionId);
       url.searchParams.append("r", JSON.stringify(message));
       return url.toString();
     }
+    closeBridges(except) {
+      var _a;
+      (_a = this.bridge) === null || _a === void 0 ? void 0 : _a.close();
+      this.pendingBridges.filter((item) => item !== except).forEach((bridge) => bridge.close());
+      this.pendingBridges = [];
+    }
   }
   function getWindow$1() {
     if (typeof window === "undefined") {
@@ -4661,7 +4690,7 @@ var __objRest = (source, exclude) => {
     }
     createProvider(wallet) {
       let provider;
-      if (isWalletConnectionSourceJS(wallet)) {
+      if (!Array.isArray(wallet) && isWalletConnectionSourceJS(wallet)) {
         provider = new InjectedProvider(this.dappSettings.storage, wallet.jsBridgeKey);
       } else {
         provider = new BridgeProvider(this.dappSettings.storage, wallet);
@@ -5856,6 +5885,9 @@ var __objRest = (source, exclude) => {
     };
   }
   function template$1(html, check, isSVG) {
+    if (typeof window === "undefined") {
+      return null;
+    }
     const t2 = document.createElement("template");
     t2.innerHTML = html;
     let node = t2.content.firstChild;
@@ -11138,6 +11170,20 @@ var __objRest = (source, exclude) => {
     window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", handler);
     return () => window.matchMedia("(prefers-color-scheme: dark)").removeEventListener("change", handler);
   }
+  function addQueryParameter(url, key, value) {
+    const parsed = new URL(url);
+    parsed.searchParams.append(key, value);
+    return parsed.toString();
+  }
+  function addReturnStrategy(url, returnStrategy) {
+    return addQueryParameter(url, "ret", returnStrategy);
+  }
+  const [appState, setAppState] = createStore({
+    buttonRootId: null,
+    language: "en",
+    returnStrategy: "back",
+    walletsList: {}
+  });
   const QrCodeModal = (props) => {
     const connector = useContext(ConnectorContext);
     const universalLink = connector.connect({
@@ -11188,7 +11234,7 @@ var __objRest = (source, exclude) => {
                 setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
                   openMethod: "universal-link"
                 }));
-                openLink(universalLink);
+                openLink(addReturnStrategy(universalLink, appState.returnStrategy));
               },
               get children() {
                 return createComponent(Translation, {
@@ -11428,11 +11474,6 @@ var __objRest = (source, exclude) => {
         align-items: center;
     }
 `;
-  const [appState, setAppState] = createStore({
-    buttonRootId: null,
-    language: "en",
-    walletsList: {}
-  });
   function uiWalletToWalletInfo(uiWallet) {
     if ("jsBridgeKey" in uiWallet) {
       return __spreadProps(__spreadValues({}, uiWallet), {
@@ -11536,14 +11577,14 @@ var __objRest = (source, exclude) => {
         setSelectedWalletInfo(walletInfo);
         return;
       }
-      openLink(walletInfo.aboutUrl, "_blank");
+      openLinkBlank(walletInfo.aboutUrl);
     };
     const onSelectIfMobile = (walletInfo) => {
       const universalLink = connector.connect({
         universalLink: walletInfo.universalLink,
         bridgeUrl: walletInfo.bridgeUrl
       }, additionalRequest());
-      openLink(universalLink);
+      openLink(addReturnStrategy(universalLink, appState.returnStrategy));
     };
     const onSelectIfInjected = (walletInfo) => {
       connector.connect({
@@ -11835,7 +11876,7 @@ var __objRest = (source, exclude) => {
     constructor() {
       __publicField(this, "localStorage");
       __publicField(this, "storageKey", "ton-connect-ui_wallet-info");
-      if (!localStorage) {
+      if (typeof localStorage === "undefined") {
         throw new TonConnectUIError(
           "window.localStorage is undefined. localStorage is required for TonConnectUI"
         );
@@ -11933,8 +11974,11 @@ var __objRest = (source, exclude) => {
         setBorderRadius(options.uiPreferences.borderRadius);
       }
       setAppState((state) => {
+        var _a2;
         const merged = mergeOptions(
-          __spreadValues(__spreadValues({}, options.language && { language: options.language }), !!options.walletsList && { walletsList: options.walletsList }),
+          __spreadValues(__spreadValues(__spreadValues({}, options.language && { language: options.language }), !!((_a2 = options.actionsConfiguration) == null ? void 0 : _a2.returnStrategy) && {
+            returnStrategy: options.actionsConfiguration.returnStrategy
+          }), !!options.walletsList && { walletsList: options.walletsList }),
           unwrap(state)
         );
         if (options.buttonRootId !== void 0) {
@@ -11994,10 +12038,10 @@ var __objRest = (source, exclude) => {
         if (!this.connected || !this.walletInfo) {
           throw new TonConnectUIError("Connect wallet to send a transaction.");
         }
+        const { notifications: notifications2, modals, returnStrategy } = this.getModalsAndNotificationsConfiguration(options);
         if ("universalLink" in this.walletInfo && this.walletInfo.openMethod === "universal-link") {
-          openLink(this.walletInfo.universalLink);
+          openLink(addReturnStrategy(this.walletInfo.universalLink, returnStrategy));
         }
-        const { notifications: notifications2, modals } = this.getModalsAndNotificationsConfiguration(options);
         widgetController.setAction({
           name: "confirm-transaction",
           showNotification: notifications2.includes("before"),
@@ -12096,10 +12140,17 @@ var __objRest = (source, exclude) => {
       }
       return {
         notifications: notifications2,
-        modals
+        modals,
+        returnStrategy: (options == null ? void 0 : options.returnStrategy) || "back"
       };
     }
   }
+  function isClientSide() {
+    return typeof window !== "undefined";
+  }
+  function isServerSide() {
+    return !isClientSide();
+  }
   const TonConnectUIContext = require$$0$2.createContext(null);
   let tonConnectUI = null;
   const TonConnectUIProvider = (_a) => {
@@ -12108,7 +12159,7 @@ var __objRest = (source, exclude) => {
     } = _b, options = __objRest(_b, [
       "children"
     ]);
-    if (!tonConnectUI) {
+    if (isClientSide() && !tonConnectUI) {
       tonConnectUI = new TonConnectUI(options);
     }
     return /* @__PURE__ */ jsx(TonConnectUIContext.Provider, { value: tonConnectUI, children: children2 });
@@ -12135,6 +12186,10 @@ var __objRest = (source, exclude) => {
     return true;
   }
   function useTonConnectUI() {
+    if (isServerSide()) {
+      return [null, () => {
+      }];
+    }
     const tonConnectUI2 = require$$0$2.useContext(TonConnectUIContext);
     checkProvider(tonConnectUI2);
     const setOptions = (options) => void (tonConnectUI2.uiOptions = options);
@@ -12150,6 +12205,9 @@ var __objRest = (source, exclude) => {
   };
   const TonConnectButton$1 = require$$0$2.memo(TonConnectButton);
   function useTonWallet() {
+    if (isServerSide()) {
+      return null;
+    }
     const [tonConnectUI2] = useTonConnectUI();
     const [wallet, setWallet] = require$$0$2.useState(
       () => tonConnectUI2.wallet && __spreadValues2(__spreadValues2({}, tonConnectUI2.wallet), tonConnectUI2.walletInfo)
@@ -15026,6 +15084,9 @@ var __objRest = (source, exclude) => {
     }
   }
   function useIsConnectionRestored() {
+    if (isServerSide()) {
+      return false;
+    }
     const [restored, setRestored] = require$$0$2.useState(false);
     const [tonConnectUI2] = useTonConnectUI();
     tonConnectUI2.connectionRestored.then(() => setRestored(true));