feat：hash优化筛选模组

Untitled-2.js

@@ -0,0 +1,15 @@
+import got from 'got';
+const res = await got.post('https://api.modrinth.com/v2/version_files', {
+    headers: {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0',
+    },
+    json: {
+        hashes: [
+            "ea0f38408102e4d2efd53c2cc11b88b711996b48d8922f76ea6abf731219c5bd1efe39ddf9cce77c54d49a62ff10fb685c00d2e4c524ab99d20f6296677ab2c4",
+            "925a5c4899affa4098d997dfa4a4cb52c636d539e94bc489d1fa034218cb96819a70eb8b01647a39316a59fcfe223c1a8c05ed2e2ae5f4c1e75fa48f6af1c961"
+        ],
+        algorithm: 'sha512',
+    }
+}).json()
+
+console.log(res)

package-lock.json

@@ -10,7 +10,6 @@
       "license": "ISC",
       "dependencies": {
         "adm-zip": "^0.5.16",
-        "chalk": "^5.4.1",
         "cli-progress": "^3.12.0",
         "dotenv": "^17.0.1",
         "fs-extra": "^11.3.0",
@@ -18,7 +17,8 @@
         "inquirer": "^12.6.3",
         "p-map": "^7.0.3",
         "p-retry": "^6.2.1",
-        "toml": "^3.0.0",
+        "picocolors": "^1.1.1",
+        "smol-toml": "^1.4.1",
         "yauzl": "^3.2.0"
       },
       "devDependencies": {
@@ -1937,18 +1937,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/chalk": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/chardet": {
       "version": "0.7.0",
       "resolved": "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz",
@@ -4873,7 +4861,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -5482,6 +5469,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/smol-toml": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/smol-toml/-/smol-toml-1.4.1.tgz",
+      "integrity": "sha512-CxdwHXyYTONGHThDbq5XdwbFsuY4wlClRGejfE2NtwUtiHYsP1QtNsHb/hnj31jKYSchztJsaA8pSQoVzkfCFg==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/cyyynthia"
+      }
+    },
     "node_modules/sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -5838,12 +5837,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/toml": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/toml/-/toml-3.0.0.tgz",
-      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==",
-      "license": "MIT"
-    },
     "node_modules/trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/trim-repeated/-/trim-repeated-1.0.0.tgz",

package.json

@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "adm-zip": "^0.5.16",
-    "chalk": "^5.4.1",
     "cli-progress": "^3.12.0",
     "dotenv": "^17.0.1",
     "fs-extra": "^11.3.0",
@@ -24,7 +23,8 @@
     "inquirer": "^12.6.3",
     "p-map": "^7.0.3",
     "p-retry": "^6.2.1",
-    "toml": "^3.0.0",
+    "picocolors": "^1.1.1",
+    "smol-toml": "^1.4.1",
     "yauzl": "^3.2.0"
   },
   "devDependencies": {

src/main copy.ts

@@ -0,0 +1,167 @@
+import inquirer from "inquirer";
+import yauzl, { Entry, ZipFile } from "yauzl";
+import process, { emit } from "node:process";
+import fs from "node:fs";
+import fse from "fs-extra";
+import { exec } from "node:child_process";
+import { join, basename, dirname } from "node:path";
+import { platform, what_platform } from "./platform/index.js";
+import { isDevelopment, readzipentry } from "./utils/utils.js";
+import fabric from "./ml_install/fabric.js";
+import forge from "./ml_install/forge.js";
+import neoforge from "./ml_install/neoforge.js";
+import { DeEarthMain } from "./utils/DeEarth.js";
+import { LOGGER } from "./utils/logger.js";
+import { fileURLToPath } from "node:url";
+interface Answers {
+  modpack_path: string | undefined;
+}
+let unzip_path: string = "";
+if (isDevelopment) {
+  unzip_path = join("./", "instance/");
+} else {
+  unzip_path = join(getCurrnetDir().replace("dist", ""), "instance");
+}
+let zipnamew: string = "";
+const argv = process.argv.slice(2)[0];
+
+if (!argv) {
+  const answer: Answers = await inquirer.prompt([
+    { type: "input", name: "modpack_path", message: "请输入整合包路径" },
+  ]);
+  if (answer.modpack_path) {
+    initdir();
+    await main(answer.modpack_path);
+  }
+} else {
+  initdir();
+  await main(argv);
+}
+
+function initdir() {
+  if (!fs.existsSync(unzip_path)) {
+    fse.ensureDirSync(join(unzip_path, "rubbish"));
+  }
+}
+
+async function main(modpack_path: string) {
+  const zipname = basename(modpack_path)
+    .replace(".zip", "")
+    .replace(".mrpack", "");
+  zipnamew = zipname;
+  let dud_files: Array<string> = [];
+  let pack_info: object | undefined = undefined;
+  let entry_arr: Entry[] = [];
+  //unzip
+  const zipfile: ZipFile = await new Promise((resolve, reject) => {
+    yauzl.open(modpack_path, { lazyEntries: true }, (err, zipfile) => {
+      if (err) {
+        reject(err);
+      }
+      resolve(zipfile);
+    });
+  });
+  zipfile.readEntry(); //首次读取
+  zipfile.on("entry", (entry) => {
+    entry_arr.push(entry);
+    zipfile.readEntry();
+  });
+  await new Promise((resolve) => zipfile.on("end", async () => resolve));
+  for (let i = 0; i < entry_arr.length; i++) {
+    const entry = entry_arr[i];
+    const name: string = entry.fileName;
+    if (/\/$/.test(name)) {
+      continue;
+    } else if (name.includes("overrides/")) {
+      const zipfilex = join(
+        unzip_path,
+        zipname,
+        name.replace("overrides/", "")
+      );
+      if (!fs.existsSync(zipfilex)) {
+        zipfile.openReadStream(entry, (err, stream) => {
+          //读取overrides文件夹下的所有文件和文件夹
+          const dir = dirname(zipfilex);
+          fse.ensureDirSync(dir);
+          console.log(zipfilex);
+          stream.pipe(fse.createWriteStream(zipfilex));
+        });
+      }
+    } else if (name.endsWith(".json") || name.includes("mcbbs.packmeta")) {
+      dud_files.push(name);
+      if (
+        name.includes("manifest.json") ||
+        name.includes("modrinth.index.json")
+      ) {
+        pack_info = JSON.parse((await readzipentry(zipfile, entry)).toString());
+      }
+    }
+  }
+  //zipfile.on("end", async () => {
+  //zip
+  //try {
+  const dirx = join(unzip_path, zipname);
+  const plat = platform(what_platform(dud_files));
+  if (typeof pack_info !== "object") throw new Error("未找到manifest.json");
+  const info = await plat.getinfo(pack_info);
+  await plat.downloadfile(pack_info, dirx);
+  await DeEarthMain(join(dirx, "mods"), join(unzip_path, "rubbish"));
+  await install(info.loader, info.minecraft, info.loader_version, dirx);
+  fs.writeFileSync(
+    join(dirx, "eula.txt"),
+    "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).\n#This serverpack created by DeEarthX(QQ_Group:559349662)\neula=true"
+  );
+  LOGGER.info("DeEarthX已将服务端制作完成！");
+  zipfile.close();
+  //} catch (e) {
+  //LOGGER.error(e);
+  //}
+  //});
+  //});
+  //})
+}
+
+async function install(
+  type: string,
+  minecraft: string,
+  loaderver: string,
+  path: string
+) {
+  if (await checkJava()) {
+    LOGGER.error(
+      "未安装Java或系统环境变量不存在Java，已跳过自动安装模组加载器服务端！"
+    );
+    return;
+  }
+  switch (type) {
+    case "fabric":
+      await fabric(minecraft, loaderver, path);
+      break;
+    case "fabric-loader":
+      await fabric(minecraft, loaderver, path);
+      break;
+    case "forge":
+      await forge(minecraft, loaderver, path);
+      break;
+    case "neoforge":
+      await neoforge(minecraft, loaderver, path);
+      break;
+  }
+}
+
+function checkJava() {
+  return new Promise((resolve) => {
+    exec("java -version", (err) => {
+      if (err) {
+        resolve(false);
+      } else {
+        resolve(true);
+      }
+    });
+  });
+}
+
+function getCurrnetDir() {
+  const url = new URL(".", import.meta.url);
+  return fileURLToPath(url);
+}

src/main.ts

@@ -5,7 +5,7 @@ import fs from "node:fs";
 import fse from "fs-extra";
 import { join, basename, dirname } from "node:path";
 import { platform, what_platform } from "./platform/index.js";
-import { isDevelopment, readzipentry } from "./utils/utils.js";
+import { type ForgeInfo, isDevelopment, isInstallJava, readzipentry } from "./utils/utils.js";
 import fabric from "./ml_install/fabric.js";
 import forge from "./ml_install/forge.js";
 import neoforge from "./ml_install/neoforge.js";
@@ -39,7 +39,7 @@ if (!argv) {
 
 function initdir() {
   if (!fs.existsSync(unzip_path)) {
-    fse.ensureDirSync(join(unzip_path, "rubbish"));
+    fse.ensureDirSync(join(unzip_path, ".rubbish"));
   }
 }
 
@@ -54,6 +54,7 @@ async function main(modpack_path: string) {
   yauzl.open(modpack_path, { lazyEntries: true }, (err, zipfile) => {
     zipfile.readEntry(); //首次读取
     zipfile.on("entry", async (entry) => {
+      
       const name: string = entry.fileName;
       if (/\/$/.test(name)) {
       } else if (name.includes("overrides/")) {
@@ -71,13 +72,15 @@ async function main(modpack_path: string) {
             stream.pipe(fse.createWriteStream(zipfilex));
           });
         }
-      } else if (name.endsWith(".json")||name.includes("mcbbs.packmeta")) {
+      } else if (name.endsWith(".json")||name.endsWith("mcbbs.packmeta")) {
           dud_files.push(name);
           //console.log((await readzipentry(zipfile, entry)))
+          if(name.endsWith("modrinth.index.json")|| name.endsWith("manifest.json")){
             pack_info = JSON.parse(
               (await readzipentry(zipfile, entry)).toString()
             );
           }
+        }
       zipfile.readEntry();
     });
     zipfile.on("end", async () => {
@@ -86,12 +89,13 @@ async function main(modpack_path: string) {
       const plat = platform(what_platform(dud_files));
       const info = await plat.getinfo(pack_info);
       await plat.downloadfile(pack_info, dirx);
-      await DeEarthMain(join(dirx, "mods"), join(unzip_path, "rubbish"));
+      await DeEarthMain(join(dirx, "mods"), join(unzip_path, ".rubbish"));
       await install(info.loader, info.minecraft, info.loader_version, dirx);
       fs.writeFileSync(
         join(dirx, "eula.txt"),
         "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).\n#This serverpack created by DeEarthX(QQ_Group:559349662)\neula=true"
       );
+      await garcol(dirx,{minecraft_verison: info.minecraft, forge_verison: info.loader_version}).catch((e)=>{});
       LOGGER.info("DeEarthX已将服务端制作完成！");
       zipfile.close();
     });
@@ -104,12 +108,19 @@ async function install(
   loaderver: string,
   path: string
 ) {
+  if (!(await isInstallJava)){
+   LOGGER.error("请先安装Java！")
+    return;
+  }
   switch (type) {
     case "fabric":
       await fabric(minecraft, loaderver, path);
       break;
     case "fabric-loader":
       await fabric(minecraft, loaderver, path);
+      const com = "java -jar fabric-server-launch.jar"
+      fs.writeFileSync(join(path,'run.bat'),com)
+      fs.writeFileSync(join(path,'run.sh'),com)
       break;
     case "forge":
       await forge(minecraft, loaderver, path);
@@ -120,6 +131,24 @@ async function install(
   }
 }
 
+async function garcol(p:string,fi:ForgeInfo): Promise<void> {
+  return new Promise((resolve,reject)=>{
+    try{
+      LOGGER.info("正在删除垃圾文件......")
+      const x = [`Forge-${fi.minecraft_verison}-${fi.forge_verison}.jar`,`installer.log`,`installer.jar`,`fabric-installer-1.0.3.jar`,`options.txt`,`shaderpacks/`,`resourcepacks/`,'essential/']
+      for (let i=0;i<x.length;i++){
+      try{
+      fs.rmSync(join(p, x[i]),{recursive: true, force: true})
+      }catch(e){}
+      }
+      resolve()
+    }catch(err){
+      reject(err)
+    }
+  })
+
+}
+
 function getCurrnetDir() {
   const url = new URL(".", import.meta.url);
   return fileURLToPath(url);

src/ml_install/fabric.ts

@@ -1,6 +1,7 @@
 import cp from "child_process";
 import fsExtra from "fs-extra";
 import got from "got";
+import { usemirror } from "../utils/utils.js";
 export default async function install(
   mcver: string,
   fabricver: string,
@@ -8,12 +9,12 @@ export default async function install(
 ) {
   const data = (
     await got.get(
-      `https://maven.fabricmc.net/net/fabricmc/fabric-installer/1.0.1/fabric-installer-1.0.1.jar`
+      `https://maven.fabricmc.net/net/fabricmc/fabric-installer/1.0.3/fabric-installer-1.0.3.jar`
     )
   ).rawBody;
-  fsExtra.outputFileSync(path+"/fabric-installer-1.0.1.jar", data);
+  fsExtra.outputFileSync(path+"/fabric-installer-1.0.3.jar", data);
   cp.execSync(
-    `java -jar fabric-installer-1.0.1.jar server -mcver ${mcver} -loader ${fabricver}`,
+    `java -jar fabric-installer-1.0.3.jar server -mcver ${mcver} -loader ${fabricver}`,
     { cwd: path, stdio: "ignore" }
   );
 }

src/ml_install/forge.ts

@@ -9,7 +9,7 @@ import { LOGGER } from "../utils/logger.js";
 
 const gotx = got.extend({
   prefixUrl: "https://bmclapi2.bangbang93.com",
-  headers: { "User-Agent": "DeEarthX V2" },
+  headers: { "User-Agent": "DeEarthX" },
 });
 
 interface mcinfoX {
@@ -24,12 +24,12 @@ export default async function install(
 ) {
   //instance
   const mcinfo = (await gotx
-    .get(`version/${minecraftversion}/json`)
+    .get(`version/${minecraftversion}/json`,{ headers: { "User-Agent": "DeEarthX" } })
     .json()) as mcinfoX; //获取Minecraft版本JSON
   const forgepath = path;
   const forgedata = (
     await gotx.get(
-      `forge/download?mcversion=${minecraftversion}&version=${loaderversion}&category=installer&format=jar`
+      `forge/download?mcversion=${minecraftversion}&version=${loaderversion}&category=installer&format=jar`,
     )
   ).rawBody;
   fse.outputFileSync(

src/ml_install/neoforge.ts

@@ -6,7 +6,7 @@ import { LOGGER } from "../utils/logger.js";
 import cp from "child_process";
 const got = gotx.extend({
   prefixUrl: "https://bmclapi2.bangbang93.com",
-  headers: { "User-Agent": "DeEarthX V2" },
+  headers: { "User-Agent": "DeEarthX" },
 });
 
 interface mcinfoX {

src/platform/curseforge.ts

@@ -46,6 +46,7 @@ export class CurseForge implements XPlatform {
           "Content-Type": "application/json",
           "x-api-key":
             "$2a$10$ydk0TLDG/Gc6uPMdz7mad.iisj2TaMDytVcIW4gcVP231VKngLBKy",
+          "User-Agent": "DeEarthX",
         },
       })
       .json()

src/utils/DeEarth.ts

@@ -7,19 +7,21 @@
 import AdmZip from "adm-zip";
 import got from "got";
 import fs from "fs";
-import toml from 'toml';
+import crypto from "crypto";
+import toml from 'smol-toml'
 import path from 'path';
 import pMap from "p-map";
+import { usemirror } from "./utils.js";
 import { LOGGER } from "./logger.js";
 import { MultiBar } from "cli-progress";
 
 export async function DeEarthMain(modspath: string, movepath: any) {
-    if(!fs.existsSync(movepath)){
-fs.mkdirSync(movepath)
+    if (!fs.existsSync(movepath)) {
+        fs.mkdirSync(movepath)
     }
     LOGGER.info(`DeEarth V1.0.0`)
     LOGGER.info(`如有无法筛选的mods，请前往 https://dearth.0771010.xyz/ 提交未成功筛选的模组的modid`)
-    LOGGER.info(`Probejs 7.0.0以上版本为非客户端mod，如rubbish中有请自行添加回去`)
+    LOGGER.info(`Probejs 7.0.0以上版本为非客户端mod，如.rubbish中有请自行添加回去`)
     const resaddr = fs.readdirSync(modspath)
     LOGGER.info(`获取目录列表，一共${resaddr.length}个jar文件。`)
     const totalBar = multibar.create(resaddr.length, 0, { filename: '总文件数' })
@@ -35,100 +37,112 @@ fs.mkdirSync(movepath)
 }
 
 export async function DeEarth(modpath: string, movepath: string) {
-    try{
-    const zip = new AdmZip(modpath).getEntries();
-    //for (let i = 0; i < zip.length; i++) {
-    //const e = zip[i]
+    let mrurl = "https://api.modrinth.com"
+    if (usemirror){
+        mrurl = "https://mod.mcimirror.top/modrinth"
+    }
+
+    let pid:string|undefined = undefined
+    try {
+      const data = fs.readFileSync(modpath)
+      const hash =  crypto.createHash('sha1').update(data).digest('hex')
+      const pjson =  await got.get(`${mrurl}/v2/version_file/${hash}?algorithm=sha1`,{
+        headers:{
+            "User-Agent": "DeEarth"
+        }
+      }).json<{project_id:string}>()
+      pid = pjson.project_id
+      //console.log("哈希命中成功，正在查询Modrinth")
+    }catch(e){}
+
+    const zipinfo = ZipInfo(modpath)
+    let modid:string = ""
+    if(zipinfo){
+    if(zipinfo.modinfo.type === "forge"){
+        modid = zipinfo.modinfo.data.mods[0].modId
+    }else if(zipinfo.modinfo.type === "fabric"){
+        modid = zipinfo.modinfo.data.id
+    }
+
     try { //Modrinth
-        for (let i = 0; i < zip.length; i++) {
-            const e = zip[i]
-            if (isForge(e.entryName)) { //Forge,NeoForge
-                const modid = toml.parse(e.getData().toString('utf-8')).mods[0].modId
-                //const body = await got.get(`https://api.modrinth.com/v2/project/${modid}`, { headers: { "User-Agent": "DeEarth" } }).json()
-                const body = JSON.parse(await FastGot(`https://api.modrinth.com/v2/project/${modid}`))
-                if (body.client_side == "required" && body.server_side !== "required") {
+    let body:any
+    if (pid){
+      body = JSON.parse(await FastGot(`${mrurl}/v2/project/${pid}`))
+    }else{
+      body = JSON.parse(await FastGot(`${mrurl}/v2/project/${modid}`))
+    }
+    if(body.client_side == "required" && body.server_side !== "required"){
         fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)        
     }
-            } else if (e.entryName == "fabric.mod.json") { //Fabric
-                const modid = JSON.parse(e.getData().toString('utf-8')).id
-                //const body = await got.get(`https://api.modrinth.com/v2/project/${modid}`, { headers: { "User-Agent": "DeEarth" } }).json()
-                const body = JSON.parse(await FastGot(`https://api.modrinth.com/v2/project/${modid}`))
-                if (body.client_side == "required" && body.server_side !== "required") {
+    } catch (error) { //DeEarthPublic
+        try {
+        if (JSON.parse(await FastGot(`https://dearth.0771010.xyz/api/modid?modid=${modid}`)).isClient) {
             fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
-                }
-            }
+        }else{
+            throw new Error("DeEarthPublic Not Found This Mod")
         }
     } catch (error) { //mods.toml或fabric.mod.json判断
-        try{//DeEarthPublic
-            for (let i = 0; i < zip.length; i++) {
-                const e = zip[i]
-                if (isForge(e.entryName)) { //Forge,Neoforge
-                    const modid = toml.parse(e.getData().toString('utf-8')).mods[0].modId
-                    const body = JSON.parse(await FastGot(`https://dearth.0771010.xyz/api/modid?modid=${modid}`))
-                    if (body.isClient) {
+        try{
+        if(zipinfo.modinfo.type === "forge"){
+            const mcside = zipinfo.modinfo.data.dependencies[modid].find((mod: { modId: string; }) => mod.modId === "minecraft").side //Minecraft
+            if (mcside == "CLIENT") {
                 fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
             }
-                } else if (e.entryName == "fabric.mod.json") { //Fabric
-                    const modid = JSON.parse(e.getData().toString('utf-8')).id
-                    const body = JSON.parse(await FastGot(`https://dearth.0771010.xyz/api/modid?modid=${modid}`))
-                    if (body.isClient) {
+            const forgeside = zipinfo.modinfo.data.dependencies[modid].find((mod: { modId: string; }) => mod.modId === "forge").side //Forge
+            if (forgeside == "CLIENT") {
                 fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
             }
-                }
-            }
-        }catch(errorr){
-        for (let i = 0; i < zip.length; i++) {
-            const e = zip[i]
-            try {
-                if (isForge(e.entryName)) { //Forge,Neoforge
-                    const tr = toml.parse(e.getData().toString('utf-8'))
-                    const mcside = tr.dependencies[tr.mods[0].modId].find((mod: { modId: string; }) => mod.modId === "minecraft").side
-                    if (mcside == "CLIENT"){ //从Minecraft判断
+            const neoside = zipinfo.modinfo.data.dependencies[modid].find((mod: { modId: string; }) => mod.modId === "neoforge").side //NeoForge
+            if (neoside == "CLIENT") {
                 fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
             }
-                    const forgeside = tr.dependencies[tr.mods[0].modId].find((mod: { modId: string; }) => mod.modId === "forge").side
-                    if (forgeside == "CLIENT") { //从Forge判断
-                        fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
-                    }
-                    const neoside = tr.dependencies[tr.mods[0].modId].find((mod: { modId: string; }) => mod.modId === "neoforge").side
-                    if (neoside == "CLIENT") { //从NeoForge判断
-                        fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
-                    }
-                } else if (e.entryName == "fabric.mod.json") { //Fabric
-                    const fmj = JSON.parse(e.getData().toString('utf-8')).environment
+        }else if(zipinfo.modinfo.type === "fabric"){ //Fabric
+            const fmj = zipinfo.modinfo.data.environment
             if (fmj == "client") {
                 fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
             }
         }
-            } catch (erro) {//从Mixin判断 但是可能为不准确
-                for (let i = 0; i < zip.length; i++) {
-                    const e = zip[i]
-                    try {
-                        if (isMixinFile(e.entryName)) {
-                            LOGGER.info(e.entryName)
-                            const resx = JSON.parse(e.getData().toString('utf-8'))
-                            if (e.entryName.includes("common.mixins.json")) { //第一步从common mixins文件判断，判断失败后再使用modid.mixins.json进行判断
-                                if (isMixin(resx)) {
-                                    fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
-                                }
-                            } else {
-                                if (isMixin(resx)) {
+    }catch(error){
+        try{
+            for (let i = 0; i < zipinfo.mixins.length; i++) {
+                const e = zipinfo.mixins[i]
+                const info = JSON.parse(e.info)
+                if (isMixin(info)) {
                     fs.renameSync(modpath, `${movepath}/${path.basename(modpath)}`)
                 }
             }
-                        }
-                    } catch (err:any) {//避免有傻逼JSON写注释（虽然GSON可以这样 但是这样一点也不人道）
-                        if (err.errno !== -4058) {
+        }catch(error){
             LOGGER.error(`大天才JSON写注释了估计，模组路径:${modpath}，过滤失败`)
         }
      }
     }
   }
  }
+}
+
+function ZipInfo(modpath: string) {
+    interface ZipInfo {
+        mixins: { filename: string, info: string }[]
+        modinfo: {type:string,data:any};
+    }
+    try{
+    let zipinfo: ZipInfo = { mixins: [], modinfo: {type: "",data: {}} }
+    const zip = new AdmZip(modpath).getEntries();
+    for (let i = 0; i < zip.length; i++) {
+        const e = zip[i]
+        if (isMixinFile(e.entryName)) {
+            zipinfo.mixins.push({ filename: e.entryName, info: e.getData().toString('utf-8') })
+        } else if (isForge(e.entryName)) {
+            zipinfo.modinfo.type = "forge"
+            zipinfo.modinfo.data = toml.parse(e.getData().toString('utf-8'))
+        } else if (e.entryName.endsWith("fabric.mod.json")) {
+            zipinfo.modinfo.type = "fabric"
+            zipinfo.modinfo.data = JSON.parse(e.getData().toString('utf-8'))
         }
     }
+    return zipinfo;
 }catch(error){
-    LOGGER.error("DeEarth: "+error)
+    LOGGER.error(error)
 }
 }
 
@@ -139,7 +153,7 @@ async function FastGot(url: string) {
         try {
             if (e[0] !== null) { //防止URL为空
                 //if(isChinaIpAddress((await got.get("https://4.ipw.cn/")).body)){
-                return (await got.get(e[0], { headers: { "User-Agent": "DeEarth" } })).body
+                return (await got.get(e[0], { headers: { "User-Agent": "DeEarthX" } })).body
                 //}else{
                 //return (await got.get(`https://mod.mcimirror.top/modrinth/${new URL(e[0]).pathname}`, { headers: { "User-Agent": "DeEarth" } })).body //MCIM源
                 //}
@@ -156,7 +170,7 @@ async function FastGot(url: string) {
     })
     if (fastgot[0] !== undefined) {
         return fastgot[0]
-    }else{
+    } else {
         return "null"
     }
 }
@@ -164,18 +178,18 @@ async function FastGot(url: string) {
 const multibar = new MultiBar({
     format: ' {bar} | {filename} | {value}/{total}',
     noTTYOutput: true,
-    notTTYSchedule: 10*1000,
+    notTTYSchedule: 10 * 1000,
 })
 
-function isMixin(resx: { mixins: {} | null; client: {}; }){
+function isMixin(resx: { mixins: {} | null; client: {}; }) {
     return resx.mixins == null || Object.keys(resx.mixins).length == 0 && Object.keys(resx.client).length !== 0
 }
 
-function isForge(name:string):boolean{
-    return name.includes("mods.toml")||name.includes("META-INF")
+function isForge(name: string): boolean {
+    return name.endsWith("mods.toml") || name.endsWith("neoforge.mod.toml")
 }
 
-function isMixinFile(name:string):boolean{
+function isMixinFile(name: string): boolean {
     return !name.includes("/") && name.endsWith(".json") && !name.endsWith("refmap.json") && !name.endsWith("mod.json")
 }
 

src/utils/logger.ts

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import pc from "picocolors"
 export const LOGGER = {
   info(text: string) {
     info(text);
@@ -6,39 +6,39 @@ export const LOGGER = {
   warn(text: string) {
     warn(text);
   },
-  error(text: string | object) {
+  error(text: string | object | unknown) {
     error(text);
   },
 };
 function info(text: string) {
   console.log(
-    `[${chalk.blue(
+    `[${pc.blue(
       new Date().toLocaleDateString() + " " + new Date().toLocaleTimeString()
-    )}](${process.pid})[${chalk.green("INFO")}]:${chalk.cyan(text)}`
+    )}](${process.pid})[${pc.green("INFO")}]:${pc.cyan(text)}`
   );
 }
 
 function warn(text: string) {
   console.log(
-    `[${chalk.blue(
+    `[${pc.blue(
       new Date().toLocaleDateString() + " " + new Date().toLocaleTimeString()
-    )}](${process.pid})[${chalk.yellowBright("WARN")}]:${chalk.yellowBright(
+    )}](${process.pid})[${pc.yellowBright("WARN")}]:${pc.yellowBright(
       text
     )}`
   );
 }
-function error(error: object | string) {
+function error(error: object | string | unknown) {
   if (typeof error === "object") {
     console.log(
-      `[${chalk.blue(
+      `[${pc.blue(
         new Date().toLocaleDateString() + " " + new Date().toLocaleTimeString()
-      )}](${process.pid})[${chalk.red("ERROR")}:${JSON.stringify(error)}`
+      )}](${process.pid})[${pc.red("ERROR")}:${JSON.stringify(error)}`
     );
   } else {
     console.log(
-      `[${chalk.blue(
+      `[${pc.blue(
         new Date().toLocaleDateString() + " " + new Date().toLocaleTimeString()
-      )}](${process.pid})[${chalk.red("ERROR")}:${error}`
+      )}](${process.pid})[${pc.red("ERROR")}:${error}`
     );
   }
 }

src/utils/utils.ts

@@ -8,6 +8,12 @@ import env from "dotenv";
 import { MultiBar } from "cli-progress";
 import { URL, fileURLToPath } from "node:url";
 import { LOGGER } from "./logger.js";
+import { exec } from "node:child_process";
+
+export interface ForgeInfo{
+  minecraft_verison: string,
+  forge_verison: string
+}
 
 export async function readzipentry(
   zipfile: yauzl.ZipFile,
@@ -147,7 +153,11 @@ export async function xfastdownload(
               path !== null &&
               !fs.existsSync(e[1])
             ) {
-              const res = (await got.get(e[0])).rawBody; //下载文件
+              const res = (await got.get(e[0],{
+                headers: {
+                  "user-agent": "DeEarthX"
+                }
+              })).rawBody; //下载文件
               await fse.outputFile(e[1], res); //保存文件
             }
           },
@@ -179,3 +189,15 @@ export const isDevelopment = (() => {
   env.config();
   return process.env.DEVELOPMENT;
 })();
+
+export const isInstallJava:Promise<boolean> = (() => {
+  return new Promise((resolve) => {
+    exec("java -version", (err) => {
+      if (err) {
+        resolve(false);
+      } else {
+        resolve(true);
+      }
+    });
+  });
+})();