Merge pull request #328 from Zagrios/bugfix/replace-resvg-that-need-dll-by-sharp

[bugfix] Remove resvg lib that need DLL by Sharp that doesnt

package-lock.json

@@ -24,6 +24,7 @@
                 "history": "^5.3.0",
                 "jszip": "^3.10.1",
                 "md5-file": "^5.0.0",
+                "node-abi": "^3.47.0",
                 "node-fetch": "^2.6.7",
                 "node-stream-zip": "^1.15.0",
                 "ps-list": "^7.2.0",
@@ -13509,10 +13510,9 @@
             }
         },
         "node_modules/node-abi": {
-            "version": "3.28.0",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz",
-            "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==",
-            "dev": true,
+            "version": "3.47.0",
+            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz",
+            "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==",
             "dependencies": {
                 "semver": "^7.3.5"
             },
@@ -29518,10 +29518,9 @@
             }
         },
         "node-abi": {
-            "version": "3.28.0",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz",
-            "integrity": "sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A==",
-            "dev": true,
+            "version": "3.47.0",
+            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz",
+            "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==",
             "requires": {
                 "semver": "^7.3.5"
             }

package.json

@@ -244,6 +244,7 @@
         "history": "^5.3.0",
         "jszip": "^3.10.1",
         "md5-file": "^5.0.0",
+        "node-abi": "^3.47.0",
         "node-fetch": "^2.6.7",
         "node-stream-zip": "^1.15.0",
         "ps-list": "^7.2.0",

release/app/package.json

@@ -14,8 +14,8 @@
     "postinstall": "npm run electron-rebuild && npm run link-modules"
   },
   "dependencies": {
-    "@resvg/resvg-js": "^2.4.1",
-    "ps-list": "^7.2.0"
+    "ps-list": "^7.2.0",
+    "sharp": "^0.32.6"
   },
   "license": "MIT"
 }

src/main/services/bs-launcher.service.ts

@@ -11,7 +11,6 @@ import log from "electron-log";
 import { Observable, of } from "rxjs";
 import { BsmProtocolService } from "./bsm-protocol.service";
 import { app, shell} from "electron";
-import { Resvg } from "@resvg/resvg-js";
 import Color from "color";
 import { ensureDir, writeFile } from "fs-extra";
 import toIco from "to-ico";
@@ -20,6 +19,7 @@ import { WindowManagerService } from "./window-manager.service";
 import { IpcService } from "./ipc.service";
 import { BSVersionLibService } from "./bs-version-lib.service";
 import { execOnOs } from "../helpers/env.helpers";
+import sharp from "sharp";
 
 export class BSLauncherService {
     private static instance: BSLauncherService;
@@ -224,19 +224,16 @@ export class BSLauncherService {
         return res;
     }
 
-    private createShortcutPngBuffer(color: Color): Buffer{
+    private createShortcutPngBuffer(color: Color): Promise<Buffer>{
         
-        const svgIcon = `
+        const svgBuffer = Buffer.from(`
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 406.4 406.4" height="406.4" width="406.4">
                 <rect rx="69.453" height="406.4" width="406.4" fill="${color.hex()}"/>
                 <path d="M65.467 60.6H336.4v33.867L200.933 162.2 65.467 94.467z" fill="#fff"/>
             </svg>
-        `;
-
-        return new Resvg(svgIcon, {
-            fitTo: { mode: "width", value: 256 }
-        }).render().asPng();
+        `);
 
+        return sharp(svgBuffer).resize(256).png().toBuffer();
     }
 
     /**
@@ -262,7 +259,7 @@ export class BSLauncherService {
      * @returns {Promise<string>} Path of the icon
      */
     private async createShortcutIco(color: Color): Promise<string>{
-        const pngBuffer = this.createShortcutPngBuffer(color);
+        const pngBuffer = await this.createShortcutPngBuffer(color);
         const icoBuffer = await toIco([pngBuffer]);
 
         await ensureDir(IMAGE_CACHE_PATH);