fix ftb apis & napi build

blarfoon · blarfoon · commit b8c7e774f1d2 · 2022-07-24T01:34:11.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,7 @@
 # rust target
 /target
 /napi/target
-/public/napi.node
+napi.node
 /napi/napi.node
 /napi/node_modules
 /napi/index.d.ts
diff --git a/napi/package.json b/napi/package.json
@@ -4,7 +4,7 @@
   "main": "./index.node",
   "types": "./index.d.ts",
   "scripts": {
-    "build": "node ../node_modules/cross-env/src/bin/cross-env-shell.js RUSTFLAGS=-Csymbol-mangling-version=v0 node ../node_modules/@napi-rs/cli/scripts/index.js build --js false --release"
+    "build": "node ../node_modules/cross-env/src/bin/cross-env-shell.js node ../node_modules/@napi-rs/cli/scripts/index.js build --js true --release"
   },
   "napi": {
     "name": "napi"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "release:setup": "cross-env-shell NODE_ENV=production APP_TYPE=electron REACT_APP_RELEASE_TYPE=setup \"npm run build\" && npm run build-electron:setup && npm run deploy setup",
     "release:portable": "cross-env-shell NODE_ENV=production APP_TYPE=electron REACT_APP_RELEASE_TYPE=portable \"npm run build\" && npm run build-electron:portable && npm run deploy portable",
     "upload": "node ./scripts/uploadRelease.js",
-    "release": "rimraf ./deploy && npm run release:setup && npm run release:portable",
+    "release": "npm run napi-build && rimraf ./deploy && npm run release:setup && npm run release:portable",
     "prepare": "husky install",
     "napi-build": "cd napi && npm run build && node ../scripts/moveNapi.js"
   },
@@ -184,7 +184,7 @@
     "node-machine-id": "^1.1.12",
     "p-map": "^5.3.0",
     "polished": "^4.1.3",
-    "preact": "^10.6.5",
+    "preact": "^10.8.2",
     "ps-tree": "^1.2.0",
     "randomstring": "^1.2.2",
     "react": "^17.0.2",
diff --git a/src/common/reducers/actions.js b/src/common/reducers/actions.js
@@ -1565,10 +1565,128 @@ export function processFTBManifest(instanceName) {
     const instancePath = path.join(instancesPath, instanceName);
     const fileHashes = {};
 
-    const { files } = manifest;
+    const { files: allFiles } = manifest;
     const concurrency = state.settings.concurrentDownloads;
 
+    const files = allFiles.filter(v => v.url !== '');
+    const CFFiles = allFiles.filter(v => v.url === '');
+
+    dispatch(updateDownloadStatus(instanceName, 'Downloading CF files...'));
+    const addonsHashmap = {};
+    const addonsFilesHashmap = {};
+
+    // DOWNLOAD CF FILES
+
+    const _getAddons = async () => {
+      const addons = await getMultipleAddons(
+        CFFiles.map(v => v.curseforge?.project)
+      );
+
+      addons.forEach(v => {
+        addonsHashmap[v.id] = v;
+      });
+    };
+
+    const _getAddonFiles = async () => {
+      await pMap(
+        CFFiles,
+        async item => {
+          const modManifest = await getAddonFile(
+            item.curseforge?.project,
+            item.curseforge?.file
+          );
+
+          addonsFilesHashmap[item.curseforge?.project] = modManifest;
+        },
+        { concurrency: concurrency + 10 }
+      );
+    };
+
+    await Promise.all([_getAddons(), _getAddonFiles()]);
+
     let modManifests = [];
+    const optedOutMods = [];
+    await pMap(
+      CFFiles,
+      async item => {
+        if (!addonsHashmap[item.curseforge?.project]) return;
+        let ok = false;
+        let tries = 0;
+        /* eslint-disable no-await-in-loop */
+        do {
+          tries += 1;
+          if (tries !== 1) {
+            await new Promise(resolve => setTimeout(resolve, 5000));
+          }
+
+          const addon = addonsHashmap[item.curseforge?.project];
+          const isResourcePack = addon.classId === 12;
+          const modManifest = addonsFilesHashmap[item.curseforge?.project];
+          const destFile = path.join(
+            _getInstancesPath(state),
+            instanceName,
+            isResourcePack ? 'resourcepacks' : 'mods',
+            modManifest.fileName
+          );
+
+          const fileExists = await fse.pathExists(destFile);
+
+          if (!fileExists) {
+            if (!modManifest.downloadUrl) {
+              const normalizedModData = normalizeModData(
+                modManifest,
+                item.curseforge?.project,
+                addon.name
+              );
+
+              optedOutMods.push({ addon, modManifest: normalizedModData });
+              return;
+            }
+            await downloadFile(destFile, modManifest.downloadUrl);
+            modManifests = modManifests.concat(
+              normalizeModData(
+                modManifest,
+                item.curseforge?.project,
+                addon.name
+              )
+            );
+          }
+          const percentage = (modManifests.length * 100) / CFFiles.length - 1;
+
+          dispatch(updateDownloadProgress(percentage > 0 ? percentage : 0));
+          ok = true;
+        } while (!ok && tries <= 3);
+        /* eslint-enable no-await-in-loop */
+      },
+      { concurrency }
+    );
+
+    if (optedOutMods.length) {
+      await new Promise((resolve, reject) => {
+        dispatch(
+          openModal('OptedOutModsList', {
+            optedOutMods,
+            instancePath: path.join(_getInstancesPath(state), instanceName),
+            resolve,
+            reject,
+            abortCallback: () => {
+              setTimeout(
+                () => reject(new Error('Download Aborted by the user')),
+                300
+              );
+            }
+          })
+        );
+      });
+    }
+
+    modManifests = modManifests.concat(
+      ...optedOutMods.map(v =>
+        normalizeModData(v.modManifest, v.modManifest.projectID, v.addon.name)
+      )
+    );
+
+    // DOWNLOAD FTB FILES
 
     let prev = 0;
     const updatePercentage = downloaded => {
@@ -1586,7 +1704,6 @@ export function processFTBManifest(instanceName) {
         path: path.join(instancePath, item.path, item.name)
       };
     });
-
     dispatch(updateDownloadStatus(instanceName, 'Downloading FTB files...'));
     await downloadInstanceFiles(
       mappedFiles,
