@tonconnect/ui 2.0.0-beta.9 → 2.0.0

package/lib/index.cjs

@@ -1754,172 +1754,22 @@ class TonConnectUIError extends sdk.TonConnectError {
     Object.setPrototypeOf(this, TonConnectUIError.prototype);
   }
 }
-function logError(...args) {
-  {
-    try {
-      console.error("[TON_CONNECT_UI]", ...args);
-    } catch (e2) {
-    }
-  }
-}
-function logWarning(...args) {
-  {
-    try {
-      console.warn("[TON_CONNECT_UI]", ...args);
-    } catch (e2) {
-    }
-  }
-}
-let initParams = {};
-try {
-  let locationHash = location.hash.toString();
-  initParams = urlParseHashParams(locationHash);
-} catch (e2) {
-}
-let tmaPlatform = "unknown";
-if (initParams == null ? void 0 : initParams.tgWebAppPlatform) {
-  tmaPlatform = (_a = initParams.tgWebAppPlatform) != null ? _a : "unknown";
-}
-if (tmaPlatform === "unknown") {
-  tmaPlatform = (_d = (_c = (_b = window == null ? void 0 : window.Telegram) == null ? void 0 : _b.WebApp) == null ? void 0 : _c.platform) != null ? _d : "unknown";
-}
-let webAppVersion = "6.0";
-if (initParams == null ? void 0 : initParams.tgWebAppVersion) {
-  webAppVersion = initParams.tgWebAppVersion;
-}
-if (!webAppVersion) {
-  webAppVersion = (_g = (_f = (_e = window == null ? void 0 : window.Telegram) == null ? void 0 : _e.WebApp) == null ? void 0 : _f.version) != null ? _g : "6.0";
-}
-function isTmaPlatform(...platforms) {
-  return platforms.includes(tmaPlatform);
-}
-function isInTMA() {
-  var _a2;
-  return tmaPlatform !== "unknown" || !!((_a2 = getWindow$1()) == null ? void 0 : _a2.TelegramWebviewProxy);
-}
-function sendExpand() {
-  postEvent("web_app_expand", {});
-}
-function sendOpenTelegramLink(link) {
-  const url = new URL(link);
-  if (url.protocol !== "http:" && url.protocol !== "https:") {
-    throw new TonConnectUIError(`Url protocol is not supported: ${url}`);
-  }
-  if (url.hostname !== "t.me") {
-    throw new TonConnectUIError(`Url host is not supported: ${url}`);
-  }
-  const pathFull = url.pathname + url.search;
-  if (isIframe() || versionAtLeast("6.1")) {
-    postEvent("web_app_open_tg_link", { path_full: pathFull });
-  } else {
-    window.open("https://t.me" + pathFull, "_blank", "noreferrer noopener");
-  }
-}
-function isIframe() {
-  try {
-    return window.parent != null && window !== window.parent;
-  } catch (e2) {
-    return false;
-  }
-}
-function postEvent(eventType, eventData) {
-  try {
-    if (window.TelegramWebviewProxy !== void 0) {
-      window.TelegramWebviewProxy.postEvent(eventType, JSON.stringify(eventData));
-    } else if (window.external && "notify" in window.external) {
-      window.external.notify(JSON.stringify({ eventType, eventData }));
-    } else if (isIframe()) {
-      const trustedTarget = "*";
-      const message = JSON.stringify({ eventType, eventData });
-      window.parent.postMessage(message, trustedTarget);
-    }
-    throw new TonConnectUIError(`Can't post event to TMA`);
-  } catch (e2) {
-    logError(`Can't post event to parent window: ${e2}`);
-  }
-}
-function urlParseHashParams(locationHash) {
-  locationHash = locationHash.replace(/^#/, "");
-  let params = {};
-  if (!locationHash.length) {
-    return params;
-  }
-  if (locationHash.indexOf("=") < 0 && locationHash.indexOf("?") < 0) {
-    params._path = urlSafeDecode(locationHash);
-    return params;
-  }
-  let qIndex = locationHash.indexOf("?");
-  if (qIndex >= 0) {
-    let pathParam = locationHash.substr(0, qIndex);
-    params._path = urlSafeDecode(pathParam);
-    locationHash = locationHash.substr(qIndex + 1);
-  }
-  let query_params = urlParseQueryString(locationHash);
-  for (let k in query_params) {
-    params[k] = query_params[k];
-  }
-  return params;
-}
-function urlSafeDecode(urlencoded) {
-  try {
-    urlencoded = urlencoded.replace(/\+/g, "%20");
-    return decodeURIComponent(urlencoded);
-  } catch (e2) {
-    return urlencoded;
-  }
-}
-function urlParseQueryString(queryString) {
-  let params = {};
-  if (!queryString.length) {
-    return params;
-  }
-  let queryStringParams = queryString.split("&");
-  let i2, param, paramName, paramValue;
-  for (i2 = 0; i2 < queryStringParams.length; i2++) {
-    param = queryStringParams[i2].split("=");
-    paramName = urlSafeDecode(param[0]);
-    paramValue = param[1] == null ? null : urlSafeDecode(param[1]);
-    params[paramName] = paramValue;
-  }
-  return params;
-}
-function versionCompare(v1, v2) {
-  if (typeof v1 !== "string")
-    v1 = "";
-  if (typeof v2 !== "string")
-    v2 = "";
-  let v1List = v1.replace(/^\s+|\s+$/g, "").split(".");
-  let v2List = v2.replace(/^\s+|\s+$/g, "").split(".");
-  let a2, i2, p1, p2;
-  a2 = Math.max(v1List.length, v2List.length);
-  for (i2 = 0; i2 < a2; i2++) {
-    p1 = parseInt(v1List[i2]) || 0;
-    p2 = parseInt(v2List[i2]) || 0;
-    if (p1 === p2)
-      continue;
-    if (p1 > p2)
-      return 1;
-    return -1;
-  }
-  return 0;
-}
-function versionAtLeast(ver) {
-  return versionCompare(webAppVersion, ver) >= 0;
-}
 function openLink(href, target = "_self") {
   window.open(href, target, "noopener noreferrer");
 }
 function openLinkBlank(href) {
   openLink(href, "_blank");
 }
-function openIframeLink(href, fallback) {
-  const iframe = document.createElement("iframe");
-  iframe.style.display = "none";
-  iframe.src = href;
-  document.body.appendChild(iframe);
-  const fallbackTimeout = setTimeout(() => fallback(), 1e3);
+function openDeeplinkWithFallback(href, fallback) {
+  const doFallback = () => {
+    if (isBrowser("safari")) {
+      return;
+    }
+    fallback();
+  };
+  const fallbackTimeout = setTimeout(() => doFallback(), 200);
   window.addEventListener("blur", () => clearTimeout(fallbackTimeout), { once: true });
-  setTimeout(() => document.body.removeChild(iframe), 1e3);
+  openLink(href, "_self");
 }
 function getSystemTheme() {
   if (window.matchMedia && window.matchMedia("(prefers-color-scheme: light)").matches) {
@@ -1932,25 +1782,6 @@ function subscribeToThemeChange(callback) {
   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, strategy) {
-  let returnStrategy;
-  if (typeof strategy === "string") {
-    returnStrategy = strategy;
-  } else {
-    returnStrategy = isInTMA() ? strategy.twaReturnUrl || strategy.returnStrategy : "none";
-  }
-  const newUrl = addQueryParameter(url, "ret", returnStrategy);
-  if (!sdk.isTelegramUrl(url)) {
-    return newUrl;
-  }
-  const lastParam = newUrl.slice(newUrl.lastIndexOf("&") + 1);
-  return newUrl.slice(0, newUrl.lastIndexOf("&")) + "-" + sdk.encodeTelegramUrlParameters(lastParam);
-}
 function disableScroll() {
   if (document.documentElement.scrollHeight === document.documentElement.clientHeight) {
     return;
@@ -2060,61 +1891,12 @@ function getUserAgent() {
 function isOS(...os) {
   return os.includes(getUserAgent().os);
 }
-function redirectToTelegram(universalLink, options) {
-  options = __spreadValues({}, options);
-  const directLink = convertToDirectLink(universalLink);
-  const directLinkUrl = new URL(directLink);
-  if (!directLinkUrl.searchParams.has("startapp")) {
-    directLinkUrl.searchParams.append("startapp", "tonconnect");
-  }
-  if (isInTMA()) {
-    if (isTmaPlatform("ios", "android")) {
-      options.returnStrategy = "back";
-      options.twaReturnUrl = void 0;
-      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
-    } else if (isTmaPlatform("macos", "tdesktop")) {
-      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
-    } else if (isTmaPlatform("weba")) {
-      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
-    } else if (isTmaPlatform("web")) {
-      options.returnStrategy = "back";
-      options.twaReturnUrl = void 0;
-      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
-    } else {
-      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
-    }
-  } else {
-    if (isOS("ios", "android")) {
-      options.returnStrategy = "none";
-      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options.returnStrategy));
-    } else if (isOS("macos", "windows", "linux")) {
-      options.returnStrategy = "none";
-      options.twaReturnUrl = void 0;
-      if (options.forceRedirect) {
-        openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
-      } else {
-        const link = addReturnStrategy(directLinkUrl.toString(), options);
-        const deepLink = convertToDeepLink(link);
-        openIframeLink(deepLink, () => openLinkBlank(link));
-      }
-    } else {
-      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
-    }
-  }
+function isBrowser(...browser) {
+  return browser.includes(getUserAgent().browser);
 }
-function convertToDirectLink(universalLink) {
+function toDeeplink(universalLink, deeplink) {
   const url = new URL(universalLink);
-  if (url.searchParams.has("attach")) {
-    url.searchParams.delete("attach");
-    url.pathname += "/start";
-  }
-  return url.toString();
-}
-function convertToDeepLink(directLink) {
-  const parsed = new URL(directLink);
-  const [, domain, appname] = parsed.pathname.split("/");
-  const startapp = parsed.searchParams.get("startapp");
-  return `tg://resolve?domain=${domain}&appname=${appname}&startapp=${startapp}`;
+  return deeplink + url.search;
 }
 class WalletInfoStorage {
   constructor() {
@@ -2835,6 +2617,169 @@ const Image = (props) => {
     }
   })];
 };
+function logError(...args) {
+  {
+    try {
+      console.error("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
+function logWarning(...args) {
+  {
+    try {
+      console.warn("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
+let initParams = {};
+try {
+  let locationHash = location.hash.toString();
+  initParams = urlParseHashParams(locationHash);
+} catch (e2) {
+}
+let tmaPlatform = "unknown";
+if (initParams == null ? void 0 : initParams.tgWebAppPlatform) {
+  tmaPlatform = (_a = initParams.tgWebAppPlatform) != null ? _a : "unknown";
+}
+if (tmaPlatform === "unknown") {
+  const window2 = getWindow$1();
+  tmaPlatform = (_d = (_c = (_b = window2 == null ? void 0 : window2.Telegram) == null ? void 0 : _b.WebApp) == null ? void 0 : _c.platform) != null ? _d : "unknown";
+}
+let webAppVersion = "6.0";
+if (initParams == null ? void 0 : initParams.tgWebAppVersion) {
+  webAppVersion = initParams.tgWebAppVersion;
+}
+if (!webAppVersion) {
+  const window2 = getWindow$1();
+  webAppVersion = (_g = (_f = (_e = window2 == null ? void 0 : window2.Telegram) == null ? void 0 : _e.WebApp) == null ? void 0 : _f.version) != null ? _g : "6.0";
+}
+function isTmaPlatform(...platforms) {
+  return platforms.includes(tmaPlatform);
+}
+function isInTMA() {
+  var _a2;
+  return tmaPlatform !== "unknown" || !!((_a2 = getWindow$1()) == null ? void 0 : _a2.TelegramWebviewProxy);
+}
+function sendExpand() {
+  postEvent("web_app_expand", {});
+}
+function sendOpenTelegramLink(link) {
+  const url = new URL(link);
+  if (url.protocol !== "http:" && url.protocol !== "https:") {
+    throw new TonConnectUIError(`Url protocol is not supported: ${url}`);
+  }
+  if (url.hostname !== "t.me") {
+    throw new TonConnectUIError(`Url host is not supported: ${url}`);
+  }
+  const pathFull = url.pathname + url.search;
+  if (isIframe() || versionAtLeast("6.1")) {
+    postEvent("web_app_open_tg_link", { path_full: pathFull });
+  } else {
+    openLinkBlank("https://t.me" + pathFull);
+  }
+}
+function isIframe() {
+  try {
+    const window2 = getWindow$1();
+    if (!window2) {
+      return false;
+    }
+    return window2.parent != null && window2 !== window2.parent;
+  } catch (e2) {
+    return false;
+  }
+}
+function postEvent(eventType, eventData) {
+  try {
+    const window2 = getWindow$1();
+    if (!window2) {
+      throw new TonConnectUIError(`Can't post event to parent window: window is not defined`);
+    }
+    if (window2.TelegramWebviewProxy !== void 0) {
+      window2.TelegramWebviewProxy.postEvent(eventType, JSON.stringify(eventData));
+    } else if (window2.external && "notify" in window2.external) {
+      window2.external.notify(JSON.stringify({ eventType, eventData }));
+    } else if (isIframe()) {
+      const trustedTarget = "*";
+      const message = JSON.stringify({ eventType, eventData });
+      window2.parent.postMessage(message, trustedTarget);
+    } else {
+      throw new TonConnectUIError(`Can't post event to TMA`);
+    }
+  } catch (e2) {
+    logError(`Can't post event to parent window: ${e2}`);
+  }
+}
+function urlParseHashParams(locationHash) {
+  locationHash = locationHash.replace(/^#/, "");
+  let params = {};
+  if (!locationHash.length) {
+    return params;
+  }
+  if (locationHash.indexOf("=") < 0 && locationHash.indexOf("?") < 0) {
+    params._path = urlSafeDecode(locationHash);
+    return params;
+  }
+  let qIndex = locationHash.indexOf("?");
+  if (qIndex >= 0) {
+    let pathParam = locationHash.substr(0, qIndex);
+    params._path = urlSafeDecode(pathParam);
+    locationHash = locationHash.substr(qIndex + 1);
+  }
+  let query_params = urlParseQueryString(locationHash);
+  for (let k in query_params) {
+    params[k] = query_params[k];
+  }
+  return params;
+}
+function urlSafeDecode(urlencoded) {
+  try {
+    urlencoded = urlencoded.replace(/\+/g, "%20");
+    return decodeURIComponent(urlencoded);
+  } catch (e2) {
+    return urlencoded;
+  }
+}
+function urlParseQueryString(queryString) {
+  let params = {};
+  if (!queryString.length) {
+    return params;
+  }
+  let queryStringParams = queryString.split("&");
+  let i2, param, paramName, paramValue;
+  for (i2 = 0; i2 < queryStringParams.length; i2++) {
+    param = queryStringParams[i2].split("=");
+    paramName = urlSafeDecode(param[0]);
+    paramValue = param[1] == null ? null : urlSafeDecode(param[1]);
+    params[paramName] = paramValue;
+  }
+  return params;
+}
+function versionCompare(v1, v2) {
+  if (typeof v1 !== "string")
+    v1 = "";
+  if (typeof v2 !== "string")
+    v2 = "";
+  let v1List = v1.replace(/^\s+|\s+$/g, "").split(".");
+  let v2List = v2.replace(/^\s+|\s+$/g, "").split(".");
+  let a2, i2, p1, p2;
+  a2 = Math.max(v1List.length, v2List.length);
+  for (i2 = 0; i2 < a2; i2++) {
+    p1 = parseInt(v1List[i2]) || 0;
+    p2 = parseInt(v2List[i2]) || 0;
+    if (p1 === p2)
+      continue;
+    if (p1 > p2)
+      return 1;
+    return -1;
+  }
+  return 0;
+}
+function versionAtLeast(ver) {
+  return versionCompare(webAppVersion, ver) >= 0;
+}
 const maxWidth = {
   mobile: 440,
   tablet: 1020
@@ -8316,6 +8261,82 @@ const Translation = (props) => {
     return t2(props.translationKey, props.translationValues, (_a2 = props.children) == null ? void 0 : _a2.toString());
   });
 };
+function addReturnStrategy(url, strategy) {
+  let returnStrategy;
+  if (typeof strategy === "string") {
+    returnStrategy = strategy;
+  } else {
+    returnStrategy = isInTMA() ? strategy.twaReturnUrl || strategy.returnStrategy : "none";
+  }
+  const newUrl = addQueryParameter(url, "ret", returnStrategy);
+  if (!sdk.isTelegramUrl(url)) {
+    return newUrl;
+  }
+  const lastParam = newUrl.slice(newUrl.lastIndexOf("&") + 1);
+  return newUrl.slice(0, newUrl.lastIndexOf("&")) + "-" + sdk.encodeTelegramUrlParameters(lastParam);
+}
+function redirectToTelegram(universalLink, options) {
+  options = __spreadValues({}, options);
+  const directLink = convertToTGDirectLink(universalLink);
+  const directLinkUrl = new URL(directLink);
+  if (!directLinkUrl.searchParams.has("startapp")) {
+    directLinkUrl.searchParams.append("startapp", "tonconnect");
+  }
+  if (isInTMA()) {
+    if (isTmaPlatform("ios", "android")) {
+      options.returnStrategy = "back";
+      options.twaReturnUrl = void 0;
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else if (isTmaPlatform("macos", "tdesktop")) {
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else if (isTmaPlatform("weba")) {
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else if (isTmaPlatform("web")) {
+      options.returnStrategy = "back";
+      options.twaReturnUrl = void 0;
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else {
+      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
+    }
+  } else {
+    if (isOS("ios", "android")) {
+      options.returnStrategy = "none";
+      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options.returnStrategy));
+    } else if (isOS("macos", "windows", "linux")) {
+      options.returnStrategy = "none";
+      options.twaReturnUrl = void 0;
+      if (options.forceRedirect) {
+        openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
+      } else {
+        const link = addReturnStrategy(directLinkUrl.toString(), options);
+        const deepLink = convertToTGDeepLink(link);
+        openDeeplinkWithFallback(deepLink, () => openLinkBlank(link));
+      }
+    } else {
+      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
+    }
+  }
+}
+function addQueryParameter(url, key, value) {
+  const parsed = new URL(url);
+  parsed.searchParams.append(key, value);
+  return parsed.toString();
+}
+function convertToTGDirectLink(universalLink) {
+  const url = new URL(universalLink);
+  if (url.searchParams.has("attach")) {
+    url.searchParams.delete("attach");
+    url.pathname += "/start";
+  }
+  return url.toString();
+}
+function convertToTGDeepLink(directLink) {
+  const parsed = new URL(directLink);
+  const [, domain, appname] = parsed.pathname.split("/");
+  const startapp = parsed.searchParams.get("startapp");
+  return `tg://resolve?domain=${domain}&appname=${appname}&startapp=${startapp}`;
+}
+let openDesktopDeeplinkAttempts = 0;
 const DesktopConnectionModal = (props) => {
   const [mode, setMode] = createSignal("mobile");
   const [connectionErrored, setConnectionErrored] = createSignal(false);
@@ -8356,10 +8377,25 @@ const DesktopConnectionModal = (props) => {
       generateUniversalLink();
     }
     setMode("desktop");
-    setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
-      openMethod: "universal-link"
-    }));
-    openLinkBlank(addReturnStrategy(universalLink(), appState.returnStrategy));
+    const linkWithStrategy = addReturnStrategy(universalLink(), appState.returnStrategy);
+    const haveTriedToOpenDeeplinkInSafari = isBrowser("safari") && openDesktopDeeplinkAttempts >= 1;
+    if (props.wallet.deepLink && !haveTriedToOpenDeeplinkInSafari) {
+      openDesktopDeeplinkAttempts++;
+      setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+        openMethod: "custom-deeplink"
+      }));
+      openDeeplinkWithFallback(toDeeplink(linkWithStrategy, props.wallet.deepLink), () => {
+        setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+          openMethod: "universal-link"
+        }));
+        openLinkBlank(linkWithStrategy);
+      });
+    } else {
+      setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+        openMethod: "universal-link"
+      }));
+      openLinkBlank(linkWithStrategy);
+    }
   };
   const onClickTelegram = () => {
     const forceRedirect = !firstClick();