[Revert] Refactor Extraction methods #3181

electron-builder.yml

@@ -1,7 +1,6 @@
 appId: com.heroicgameslauncher.hgl
 productName: Heroic
 afterSign: sign/afterSign.js
-afterPack: sign/afterPack.js
 files:
   - build/**/*
   - node_modules/**/*
@@ -18,9 +17,6 @@ asarUnpack:
   - build/bin/**/*
   - '!build/bin/legendary.LICENSE'
 
-electronDownload:
-  mirror: https://github.com/castlabs/electron-releases/releases/download/v
-
 protocols:
   - name: heroic
     schemes:

package.json

@@ -53,7 +53,6 @@
   "dependencies": {
     "@emotion/react": "11.10.6",
     "@emotion/styled": "11.10.6",
-    "@felipecrs/decompress-tarxz": "4.0.0",
     "@fontsource/cabin": "4.5.10",
     "@fontsource/rubik": "4.5.14",
     "@fortawesome/fontawesome-svg-core": "6.3.0",
@@ -65,9 +64,6 @@
     "@mui/material": "5.11.12",
     "@node-steam/vdf": "2.2.0",
     "@shockpkg/icon-encoder": "2.1.3",
-    "@xhmikosr/decompress": "9.0.1",
-    "@xhmikosr/decompress-targz": "7.0.0",
-    "@xhmikosr/decompress-unzip": "^7.0.0",
     "axios": "0.26.1",
     "classnames": "2.3.1",
     "compare-versions": "6.1.0",
@@ -133,7 +129,7 @@
     "@typescript-eslint/parser": "5.47.1",
     "@vitejs/plugin-react-swc": "3.6.0",
     "cross-env": "7.0.3",
-    "electron": "github:castlabs/electron-releases#v29.1.3+wvcus",
+    "electron": "29.1.3",
     "electron-builder": "24.13.3",
     "electron-vite": "^2.0.0",
     "eslint": "8.36.0",

sign/afterSign.js

@@ -1,11 +1,6 @@
-// const notarize = require("./notarize").default
-const vmp = require("./vmp").default
+const notarize = require("./notarize").default
 
 exports.default = async function (context) {
-    // await notarize(context);
-    console.log("Finshed Signing, signing with VMP if on Windows. Platform:", context.packager.platform.name)
-    if (context.packager.platform.name === 'windows') {
-        console.log("Signing with VMP on Windows")
-        await vmp(context);
-    }
+    await notarize(context);
+    console.log("Finshed Signing, Notarizing with Apple")
 }

src/backend/main.ts

@@ -19,7 +19,6 @@ import {
   protocol,
   screen,
   clipboard,
-  components,
   session
 } from 'electron'
 import 'backend/updater'
@@ -317,17 +316,6 @@ if (!gotTheLock) {
       )
     }
 
-    if (!process.env.CI) {
-      await components.whenReady().catch((e) => {
-        logError([
-          'Failed to download / update DRM components.',
-          'Make sure you do not block update.googleapis.com domain if you want to use WideVine in Browser sideloaded apps',
-          e
-        ])
-      })
-      logInfo(['DRM module staus', components.status()])
-    }
-
     // try to fix notification app name on windows
     if (isWindows) {
       app.setAppUserModelId('Heroic Games Launcher')

src/backend/tools/index.ts

@@ -17,7 +17,6 @@ import {
   axiosClient,
   downloadFile,
   execAsync,
-  extractFiles,
   getWineFromProton
 } from '../utils'
 import {
@@ -60,6 +59,7 @@ interface Tool {
   name: string
   url: string
   os: string
+  extractCommand: string
   strip?: number
 }
 
@@ -117,24 +117,29 @@ async function installOrUpdateTool(tool: Tool) {
 
   const extractDestination = join(toolsPath, tool.name, latestVersion)
   mkdirSync(extractDestination, { recursive: true })
-  try {
-    await extractFiles({
-      path: latestVersionArchivePath,
-      destination: extractDestination,
-      strip: tool.strip ?? 1
+  const extractCommand = `${tool.extractCommand} ${latestVersion} -C ${toolsPath}/${tool.name}`
+  await execAsync(extractCommand)
+    .then(() => {
+      writeFileSync(installedVersionStorage, latestVersion)
+      logInfo(`${tool.name} updated!`, LogPrefix.DXVKInstaller)
+    })
+    .catch((error) => {
+      logWarning(
+        [`Error when extracting ${tool.name}`, error],
+        LogPrefix.DXVKInstaller
+      )
+      showDialogBoxModalAuto({
+        title: i18next.t('box.error.dxvk.title', 'DXVK/VKD3D error'),
+        message: i18next.t(
+          'box.error.dxvk.message',
+          'Error installing DXVK/VKD3D! Check your connection!'
+        ),
+        type: 'ERROR'
+      })
+    })
+    .finally(() => {
+      rmSync(latestVersionArchivePath)
     })
-  } catch (error) {
-    logError(
-      [`Extraction of ${tool.name} failed with:`, error],
-      LogPrefix.DXVKInstaller
-    )
-    return
-  } finally {
-    rmSync(latestVersionArchivePath)
-  }
-
-  writeFileSync(installedVersionStorage, latestVersion)
-  logInfo(`${tool.name} updated!`, LogPrefix.DXVKInstaller)
 }
 
 export const DXVK = {
@@ -154,23 +159,27 @@ export const DXVK = {
       {
         name: 'vkd3d',
         url: getVkd3dUrl(),
-        os: 'linux'
+        os: 'linux',
+        extractCommand: 'tar -xf'
       },
       {
         name: 'dxvk',
         url: getDxvkUrl(),
-        os: 'linux'
+        os: 'linux',
+        extractCommand: 'tar -xf'
       },
       {
         name: 'dxvk-nvapi',
         url: 'https://api.github.com/repos/jp7677/dxvk-nvapi/releases/latest',
         os: 'linux',
+        extractCommand: 'tar --one-top-level -xf',
         strip: 0
       },
       {
         name: 'dxvk-macOS',
         url: 'https://api.github.com/repos/Gcenx/DXVK-macOS/releases/latest',
-        os: 'darwin'
+        os: 'darwin',
+        extractCommand: 'tar -xf'
       }
     ]
 

src/backend/utils.ts

@@ -34,8 +34,7 @@ import {
   GITHUB_API,
   isMac,
   configStore,
-  isLinux,
-  isSnap
+  isLinux
 } from './constants'
 import {
   appendGamePlayLog,
@@ -81,10 +80,6 @@ import { backendEvents } from './backend_events'
 import { wikiGameInfoStore } from './wiki_game_info/electronStore'
 import EasyDl from 'easydl'
 
-import decompress from '@xhmikosr/decompress'
-import decompressTargz from '@xhmikosr/decompress-targz'
-import decompressTarxz from '@felipecrs/decompress-tarxz'
-import decompressUnzip from '@xhmikosr/decompress-unzip'
 import {
   deviceNameCache,
   vendorNameCache
@@ -1483,66 +1478,6 @@ function calculateEta(
   return eta
 }
 
-interface ExtractOptions {
-  path: string
-  destination: string
-  strip: number
-}
-
-async function extractFiles({ path, destination, strip = 0 }: ExtractOptions) {
-  if (!isSnap && (path.endsWith('.tar.xz') || path.endsWith('.tar.gz'))) {
-    try {
-      await extractNative(path, destination, strip)
-    } catch (error) {
-      logError(['Error:', error], LogPrefix.Backend)
-    }
-  } else {
-    try {
-      await extractDecompress(path, destination, strip)
-    } catch (error) {
-      logError(['Error:', error], LogPrefix.Backend)
-    }
-  }
-}
-
-async function extractNative(path: string, destination: string, strip: number) {
-  logInfo(
-    `Extracting ${path} to ${destination} using native tar`,
-    LogPrefix.Backend
-  )
-  const { code, stderr } = await spawnAsync('tar', [
-    '-xf',
-    path,
-    '-C',
-    destination,
-    `--strip-components=${strip}`
-  ])
-  if (code !== 0) {
-    logError(`Extracting Error: ${stderr}`, LogPrefix.Backend)
-    return { status: 'error', error: stderr }
-  }
-  return { status: 'done', installPath: destination }
-}
-
-async function extractDecompress(
-  path: string,
-  destination: string,
-  strip: number
-) {
-  logInfo(
-    `Extracting ${path} to ${destination} using decompress`,
-    LogPrefix.Backend
-  )
-  try {
-    await decompress(path, destination, {
-      plugins: [decompressTargz(), decompressTarxz(), decompressUnzip()],
-      strip
-    })
-  } catch (error) {
-    logError(['Error:', error], LogPrefix.Backend)
-  }
-}
-
 const axiosClient = axios.create({
   timeout: 10 * 1000,
   httpsAgent: new https.Agent({ keepAlive: true })
@@ -1583,7 +1518,6 @@ export {
   sendGameStatusUpdate,
   sendProgressUpdate,
   calculateEta,
-  extractFiles,
   axiosClient
 }
 

src/backend/utils/__tests__/compatibility_layers.test.ts

@@ -8,7 +8,6 @@ import { mkdirSync } from 'graceful-fs'
 import { dirname, join } from 'path'
 import { tmpdir } from 'os'
 
-jest.mock('@xhmikosr/decompress')
 jest.mock('../../logger/logfile')
 
 describe('getDefaultWine', () => {

src/backend/wine/manager/downloader/__tests__/utilities/unzip.test.ts

@@ -3,21 +3,6 @@ import { unzipFile } from '../../utilities'
 
 jest.mock('backend/logger/logger')
 jest.mock('backend/logger/logfile')
-jest.mock('@xhmikosr/decompress', () => {
-  return jest.fn().mockImplementation(async () => Promise.resolve())
-})
-
-jest.mock('@xhmikosr/decompress-unzip', () => {
-  return jest.fn().mockImplementation(() => {})
-})
-
-jest.mock('@xhmikosr/decompress-targz', () => {
-  return jest.fn().mockImplementation(() => {})
-})
-
-jest.mock('@felipecrs/decompress-tarxz', () => {
-  return jest.fn().mockImplementation(() => {})
-})
 
 describe('Utilities - Unzip', () => {
   test('unzip file fails because of invalid archive path', async () => {