From 49d696f210819b9baf9e2a632c40edb9ce79ad86 Mon Sep 17 00:00:00 2001
From: Dmytro Shcherbonos <dmytro.sh@code-care.pro>
Date: Mon, 31 Jul 2023 16:56:15 +0300
Subject: [PATCH 1/3] Revert "removed extract-zip lib"

This reverts commit 6be6d62667b78e5ee7631f2c43366c48fccf9357.
---
 package-lock.json                       | 21 +++++++++------------
 package.json                            |  1 +
 scripts/auto-updater/bfx.mac.updater.js | 12 +++++++++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d328f1349..5fdcef0d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2289,7 +2289,6 @@
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "dev": true,
       "optional": true,
       "dependencies": {
         "@types/node": "*"
@@ -6213,15 +6212,14 @@
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
-    "node_modules/extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
       },
       "bin": {
@@ -8934,8 +8932,7 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 1e8fdb8ba..d7bb6aa5c 100644
--- a/package.json
+++ b/package.json
@@ -151,6 +151,7 @@
     "electron-util": "^0.17.2",
     "electron-window-state": "^5.0.3",
     "env-cmd": "^10.1.0",
+    "extract-zip": "^2.0.1",
     "open": "^7.0.1"
   },
   "browserslist": {
diff --git a/scripts/auto-updater/bfx.mac.updater.js b/scripts/auto-updater/bfx.mac.updater.js
index 87339850b..b507071a8 100644
--- a/scripts/auto-updater/bfx.mac.updater.js
+++ b/scripts/auto-updater/bfx.mac.updater.js
@@ -4,10 +4,10 @@ const path = require('path')
 const fs = require('fs')
 const { spawn } = require('child_process')
 const { MacUpdater } = require('electron-updater')
+const extract = require('extract-zip')
 
 const { rootPath: appDir } = require('electron-root-path')
 const logger = require('electron-log')
-const AdmZip = require('adm-zip')
 
 class BfxMacUpdater extends MacUpdater {
   constructor(...args) {
@@ -56,8 +56,14 @@ class BfxMacUpdater extends MacUpdater {
 
       await fs.promises.rmdir(root, { recursive: true, force: true })
 
-      const downloadedZIPFile = new AdmZip(downloadedFilePath)
-      await downloadedZIPFile.extractAllToAsync(dist, true)
+      await extract(
+        downloadedFilePath,
+        {
+          dir: dist,
+          defaultDirMode: '0o777',
+          defaultFileMode: '0o777',
+        },
+      )
 
       if (!isForceRunAfter) {
         return true

From 8232d6c431e186f1d13cd3d3d3fc9b40e90abfea Mon Sep 17 00:00:00 2001
From: Dmytro Shcherbonos <dmytro.sh@code-care.pro>
Date: Mon, 31 Jul 2023 17:27:07 +0300
Subject: [PATCH 2/3] change extract file and dir mode

---
 scripts/auto-updater/bfx.mac.updater.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/auto-updater/bfx.mac.updater.js b/scripts/auto-updater/bfx.mac.updater.js
index b507071a8..82253ceff 100644
--- a/scripts/auto-updater/bfx.mac.updater.js
+++ b/scripts/auto-updater/bfx.mac.updater.js
@@ -60,8 +60,8 @@ class BfxMacUpdater extends MacUpdater {
         downloadedFilePath,
         {
           dir: dist,
-          defaultDirMode: '0o777',
-          defaultFileMode: '0o777',
+          defaultDirMode: '0o744',
+          defaultFileMode: '0o744',
         },
       )
 

From 756a67ab3e7192d0044fc03c97c1454cd8e3b494 Mon Sep 17 00:00:00 2001
From: Dmytro Shcherbonos <dmytro.sh@code-care.pro>
Date: Wed, 9 Aug 2023 01:46:15 +0300
Subject: [PATCH 3/3] autoupdater: add logger for catch block

---
 scripts/auto-updater/bfx.mac.updater.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/auto-updater/bfx.mac.updater.js b/scripts/auto-updater/bfx.mac.updater.js
index 82253ceff..4e98fb6d1 100644
--- a/scripts/auto-updater/bfx.mac.updater.js
+++ b/scripts/auto-updater/bfx.mac.updater.js
@@ -79,6 +79,7 @@ class BfxMacUpdater extends MacUpdater {
       return true
     } catch (err) {
       // this.dispatchError(err)
+      this._logger.error(err)
 
       return false
     }