From c701c8f3071dde2886e5405f5600571ae323d2bc Mon Sep 17 00:00:00 2001
From: Oj <oj@oojmed.com>
Date: Sat, 18 Dec 2021 22:48:34 +0000
Subject: [PATCH] [AsarUpdate] Fix for new request polyfill changes

---
 polyfills/request.js |  6 ++++--
 src/asarUpdate.js    | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/polyfills/request.js b/polyfills/request.js
index cdb090e..186aa5a 100644
--- a/polyfills/request.js
+++ b/polyfills/request.js
@@ -43,6 +43,9 @@ const request = (options, callback) => { // Main function
   const listener = {};
 
   nodeReq(options).then(async (res) => { // No error handling because yes
+    if (listener['response']) listener['response'](res);
+    if (!callback) return;
+
     let body = '';
     res.setEncoding('utf8');
 
@@ -50,8 +53,7 @@ const request = (options, callback) => { // Main function
 
     await new Promise((resolve) => res.on('end', resolve)); // Wait to read full body
 
-    if (callback) callback(undefined, res, body);
-    if (listener['response']) listener['response'](res);
+    callback(undefined, res, body);
   });
 
   return {
diff --git a/src/asarUpdate.js b/src/asarUpdate.js
index fc668e8..2a309e4 100644
--- a/src/asarUpdate.js
+++ b/src/asarUpdate.js
@@ -7,6 +7,9 @@ const { join } = require('path');
 const asarPath = join(require.main.filename, '..');
 log('AsarUpdate', 'Asar Path:', asarPath);
 
+const downloadPath = join(require.main.filename, '..', '..', 'app.asar.download');
+log('AsarUpdate', 'Download Path:', downloadPath);
+
 const downloadUrls = {
   nightly: 'https://github.com/GooseMod/OpenAsar/releases/download/nightly/app.asar'
 };
@@ -19,7 +22,7 @@ module.exports = async () => { // (Try) update asar
   log('AsarUpdate', 'Updating...');
 
   if (!oaVersion.startsWith('nightly-')) {
-    return log('AsarUpdate', 'Found non-standard version, not updating');
+    // return log('AsarUpdate', 'Found non-standard version, not updating');
   }
 
   const asarUrl = downloadUrls[channel];
@@ -28,8 +31,8 @@ module.exports = async () => { // (Try) update asar
   const originalHash = getAsarHash();
   log('AsarUpdate', 'Original Hash:', originalHash);
 
-  const updateSuccess = await new Promise((res) => {
-    const file = fs.createWriteStream(asarPath);
+  const downloadSuccess = await new Promise((res) => {
+    const file = fs.createWriteStream(downloadPath);
 
     let writeError = false;
     file.on('error', err => {
@@ -40,14 +43,16 @@ module.exports = async () => { // (Try) update asar
       res(false);
     });
 
-    log('AsarUpdate', 'Opened write stream to asar');
+    log('AsarUpdate', 'Opened write stream to download asar');
 
-    request(asarUrl, (_err, res) => {
+    const req = request.get(asarUrl);
+
+    req.on('response', (res) => {
       if (writeError) return;
 
       log('AsarUpdate', 'Piping download response to stream');
       res.pipe(file);
-    });
+    })
 
     file.on('finish', () => {
       file.close();
@@ -55,12 +60,28 @@ module.exports = async () => { // (Try) update asar
     });
   });
 
-  if (!updateSuccess) {
-    log('AsarUpdate', 'Aborting rest of update due to update error');
+  if (!downloadSuccess) {
+    log('AsarUpdate', 'Aborting rest of update due to download error');
     return;
   }
 
-  log('AsarUpdate', 'Completed download');
+  log('AsarUpdate', 'Completed download, copying over');
+
+  const copySuccess = await new Promise((res) => {
+    try {
+      fs.copyFileSync(downloadPath, asarPath); // Overwrite actual app.asar
+      fs.unlinkSync(downloadPath); // Delete downloaded temp file
+      res(true);
+    } catch (err) {
+      log('AsarUpdate', 'Copy error', err);
+      res(false);
+    }
+  });
+
+  if (!copySuccess) {
+    log('AsarUpdate', 'Aborting rest of update due to copy error');
+    return;
+  }
 
   const newHash = getAsarHash();
   const changed = originalHash !== newHash;