@tonconnect/sdk 0.0.5 → 0.0.7

package/lib/ton-connect.d.ts

@@ -26,7 +26,7 @@ export declare class TonConnect implements ITonConnect {
     get wallet(): Wallet | null;
     private set wallet(value);
     constructor(options?: {
-        dappMetedata?: DappMetadata;
+        dappMetedata?: Partial<DappMetadata>;
         storage?: IStorage;
     });
     /**

package/lib/ton-connect.js

@@ -24,7 +24,7 @@ var TonConnect = /** @class */ (function () {
          */
         this.isInjectedProviderAvailable = injected_provider_1.InjectedProvider.isWalletInjected;
         this.dappSettings = {
-            metadata: (options === null || options === void 0 ? void 0 : options.dappMetedata) || (0, web_api_1.getWebPageMetadata)(),
+            metadata: (0, options_1.mergeOptions)(options === null || options === void 0 ? void 0 : options.dappMetedata, (0, web_api_1.getWebPageMetadata)()),
             storage: (options === null || options === void 0 ? void 0 : options.storage) || new default_storage_1.DefaultStorage()
         };
         this.bridgeConnectionStorage = new bridge_connection_storage_1.BridgeConnectionStorage(this.dappSettings.storage);

package/lib/utils/options.js

@@ -10,6 +10,6 @@ function mergeOptions(options, defaultOptions) {
     var overwriteMerge = function (_, sourceArray, __) {
         return sourceArray;
     };
-    return (0, deepmerge_1.default)(options, defaultOptions, { arrayMerge: overwriteMerge });
+    return (0, deepmerge_1.default)(defaultOptions, options, { arrayMerge: overwriteMerge });
 }
 exports.mergeOptions = mergeOptions;

package/lib/utils/web-api.js

@@ -3,9 +3,55 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebPageMetadata = void 0;
 function getWebPageMetadata() {
     return {
-        url: (window === null || window === void 0 ? void 0 : window.location.href) || '',
-        icon: (window === null || window === void 0 ? void 0 : window.location.origin) ? (window === null || window === void 0 ? void 0 : window.location.origin) + '/favicon.ico' : '',
+        url: (window === null || window === void 0 ? void 0 : window.location.origin) || '',
+        icon: getIconUrl(),
         name: (document === null || document === void 0 ? void 0 : document.title) || 'Unknown dapp'
     };
 }
 exports.getWebPageMetadata = getWebPageMetadata;
+function getIconUrl() {
+    var appleTouchIcons = document.querySelectorAll("link[rel='apple-touch-icon']");
+    if (appleTouchIcons === null || appleTouchIcons === void 0 ? void 0 : appleTouchIcons.length) {
+        return getLargestSizeIconUrl(Array.from(appleTouchIcons));
+    }
+    var links = Array.from(document.querySelectorAll("link[rel*='icon']"));
+    var pngLinks = links.filter(function (link) { return link.href.endsWith('.png'); });
+    if (pngLinks.length) {
+        return getLargestSizeIconUrl(pngLinks);
+    }
+    var icoIcon = links.filter(function (link) { return link.href.endsWith('.ico'); })[0];
+    return (icoIcon === null || icoIcon === void 0 ? void 0 : icoIcon.href) || '';
+}
+function getLargestSizeIconUrl(links) {
+    var parsedLinks = links.map(parseIconLink);
+    var maxSizeIcon = parsedLinks.sort(function (a, b) { return (b.size > a.size ? 1 : -1); })[0];
+    return (maxSizeIcon === null || maxSizeIcon === void 0 ? void 0 : maxSizeIcon.href) || '';
+}
+function parseIconLink(link) {
+    var _a;
+    if (!((_a = link.sizes) === null || _a === void 0 ? void 0 : _a.value)) {
+        return {
+            href: link.href,
+            size: 0
+        };
+    }
+    var sizes = Array.from(link.sizes)
+        .map(function (size) {
+        var groups = size.match(/(\d+)x(\d+)/i);
+        if (!groups || !groups[1] || !groups[2]) {
+            return undefined;
+        }
+        return parseInt(groups[1]) * parseInt(groups[2]);
+    })
+        .filter(function (item) { return !!item; });
+    if (sizes.length === 0) {
+        return {
+            href: link.href,
+            size: 0
+        };
+    }
+    return {
+        href: link.href,
+        size: Math.max.apply(Math, sizes)
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonconnect/sdk",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "scripts": {
     "build": "npx rimraf lib && ttsc",
     "build:production": "npx rimraf lib && ttsc --sourceMap false"
@@ -26,7 +26,7 @@
   "dependencies": {
     "deepmerge": "^4.2.2",
     "tweetnacl": "^1.0.3",
-    "@tonconnect/protocol": "^0.0.5"
+    "@tonconnect/protocol": "^0.0.6"
   },
   "files": [
     "lib"