From 86aee7b25d15454d899e2d7a0ff240240cc3bb39 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Thu, 31 Mar 2022 22:43:00 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=BC=20Trying=20out=20p7zip-threetwo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                   |  4 ++--
 package-lock.json            | 18 +++++++++---------
 package.json                 |  2 +-
 utils/uncompression.utils.ts |  2 +-
 yarn.lock                    |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bbb2d01..c0b908f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,13 @@ WORKDIR /core-services
 
 
 RUN apk add --update \
-    --repository http://dl-3.alpinelinux.org/alpine/edge/testing \
+    --repository http://nl.alpinelinux.org/alpine/v3.14/main \
     vips-tools \
     wget \
     imagemagick \
     python3 \
     unrar \
-    make \
+    p7zip \
     nodejs \
     npm \
     xvfb \
diff --git a/package-lock.json b/package-lock.json
index 02f52aa..5e092a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,7 @@
         "nats": "^1.3.2",
         "node-calibre": "^2.1.1",
         "node-unrar-js": "^1.0.5",
-        "p7zip": "^5.0.2",
+        "p7zip-threetwo": "^1.0.4",
         "sharp": "^0.30.3",
         "socket.io": "^4.4.0",
         "threetwo-ui-typings": "^1.0.14",
@@ -12664,10 +12664,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p7zip": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/p7zip/-/p7zip-5.0.2.tgz",
-      "integrity": "sha512-rIjUMpJuCfz25k7E8r5CHlR9zfm1RKScQp3p//bXWDkWJKrpCsN18wHkNESBim1iumtqDGKfadFIaRG2tRaIUg==",
+    "node_modules/p7zip-threetwo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/p7zip-threetwo/-/p7zip-threetwo-1.0.4.tgz",
+      "integrity": "sha512-eFzv9Cr8+gQN9IhJa0oujGElVnFAlZ6Pqpe+VWzddYz1GW9AAFY5qjdOf1KxRCCyskInOIWNUE35ambfwB4ZPg==",
       "hasInstallScript": true,
       "os": [
         "darwin",
@@ -24767,10 +24767,10 @@
         "p-timeout": "^3.0.0"
       }
     },
-    "p7zip": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/p7zip/-/p7zip-5.0.2.tgz",
-      "integrity": "sha512-rIjUMpJuCfz25k7E8r5CHlR9zfm1RKScQp3p//bXWDkWJKrpCsN18wHkNESBim1iumtqDGKfadFIaRG2tRaIUg==",
+    "p7zip-threetwo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/p7zip-threetwo/-/p7zip-threetwo-1.0.4.tgz",
+      "integrity": "sha512-eFzv9Cr8+gQN9IhJa0oujGElVnFAlZ6Pqpe+VWzddYz1GW9AAFY5qjdOf1KxRCCyskInOIWNUE35ambfwB4ZPg==",
       "requires": {
         "decompress": "^4.2.1"
       }
diff --git a/package.json b/package.json
index ff3848f..3129eb7 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "nats": "^1.3.2",
     "node-calibre": "^2.1.1",
     "node-unrar-js": "^1.0.5",
-    "p7zip": "^5.0.2",
+    "p7zip-threetwo": "^1.0.4",
     "sharp": "^0.30.3",
     "socket.io": "^4.4.0",
     "threetwo-ui-typings": "^1.0.14",
diff --git a/utils/uncompression.utils.ts b/utils/uncompression.utils.ts
index cb036ed..a6b0ccf 100644
--- a/utils/uncompression.utils.ts
+++ b/utils/uncompression.utils.ts
@@ -41,7 +41,7 @@ import {
 const fse = require("fs-extra");
 const Unrar = require("unrar");
 import path, { parse } from "path";
-import * as p7zip from "p7zip";
+import * as p7zip from "p7zip-threetwo";
 import { IExtractedComicBookCoverFile } from "threetwo-ui-typings";
 import sharp from "sharp";
 import { getFileConstituents } from "../utils/file.utils";
diff --git a/yarn.lock b/yarn.lock
index c5e7b91..df7264a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5674,10 +5674,10 @@
   dependencies:
     "p-timeout" "^3.0.0"
 
-"p7zip@^5.0.2":
-  "integrity" "sha512-rIjUMpJuCfz25k7E8r5CHlR9zfm1RKScQp3p//bXWDkWJKrpCsN18wHkNESBim1iumtqDGKfadFIaRG2tRaIUg=="
-  "resolved" "https://registry.npmjs.org/p7zip/-/p7zip-5.0.2.tgz"
-  "version" "5.0.2"
+"p7zip-threetwo@^1.0.4":
+  "integrity" "sha512-eFzv9Cr8+gQN9IhJa0oujGElVnFAlZ6Pqpe+VWzddYz1GW9AAFY5qjdOf1KxRCCyskInOIWNUE35ambfwB4ZPg=="
+  "resolved" "https://registry.npmjs.org/p7zip-threetwo/-/p7zip-threetwo-1.0.4.tgz"
+  "version" "1.0.4"
   dependencies:
     "decompress" "^4.2.1"