支持CF整合包安装，加快了安装速度

Author: jdnjk

build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 git_hash=$(git rev-parse --short HEAD 2>/dev/null)
-version="1.2.2-${git_hash}"
+version="1.3.0-${git_hash}"
 echo "Build: AutoInstall-${version}"
-go build -ldflags "-X main.gitversion=${version}" -o dist/$BUILD_NAME main.go
+go build -ldflags "-X main.gitversion=${version} -X github.com/autoinst/AutoInstall/pkg.cfapiKey=${{ secrets.CF_API_KEY }}" -o dist/$BUILD_NAME main.go
 ls dist

main.go

@@ -22,9 +22,6 @@ func main() {
 	instFile := "inst.json"
 	var config core.InstConfig
 	fmt.Println("AutoInstall-" + gitversion + " https://github.com/autoinst/AutoInstall")
-	if cfapiKey == "" {
-		fmt.Println("无法获取CF APIKEY,自己构建的?")
-	}
 	pkg.Search(config.MaxConnections, config.Argsment)
 	if _, err := os.Stat(instFile); err == nil {
 		data, err := os.ReadFile(instFile)
@@ -48,6 +45,7 @@ func main() {
 		}
 		fmt.Printf("下载源: %s\n", config.Download)
 		pkg.Common(config, cleaninst)
+		pkg.WaitDownloads()
 	} else if os.IsNotExist(err) {
 		fmt.Println("inst.json 文件不存在")
 	} else {

pkg/cf.go

@@ -29,12 +29,14 @@ type CurseForgeManifest struct {
 	} `json:"files"`
 }
 
+var cfapiKey string
+
 // resolveCFDownloadURL 使用 CurseForge API 获取可用直链
 // 需要环境变量 CF_API_KEY，可在 https://console.curseforge.com/ 申请
 func resolveCFDownloadURL(projectID, fileID int) (string, error) {
-	cfapiKey := os.Getenv("CF_API_KEY")
 	if cfapiKey == "" {
 		return "", fmt.Errorf("缺少 CF_API_KEY")
+		os.Exit(128)
 	}
 	// 直接获取下载直链
 	req, err := http.NewRequest("GET", fmt.Sprintf("https://api.curseforge.com/v1/mods/%d/files/%d/download-url", projectID, fileID), nil)
@@ -50,7 +52,7 @@ func resolveCFDownloadURL(projectID, fileID int) (string, error) {
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
 		b, _ := io.ReadAll(resp.Body)
-		return "", fmt.Errorf("CF API 响应异常: %d %s", resp.StatusCode, string(b))
+		return "", fmt.Errorf("响应异常: %d %s", resp.StatusCode, string(b))
 	}
 	var out struct {
 		Data string `json:"data"`
@@ -65,7 +67,6 @@ func resolveCFDownloadURL(projectID, fileID int) (string, error) {
 }
 
 func CurseForge(file string, MaxCon int, Args string) {
-	// 1) 读取 manifest.json
 	mf := "manifest.json"
 	if file != "" && strings.HasSuffix(strings.ToLower(file), ".json") {
 		mf = file
@@ -74,54 +75,32 @@ func CurseForge(file string, MaxCon int, Args string) {
 	mfFile, err := os.Open(mfPath)
 	if err != nil {
 		fmt.Println("未找到 manifest.json，停止 CurseForge 安装流程")
-		os.Exit(0)
+		return
 	}
 	defer mfFile.Close()
 
 	var manifest CurseForgeManifest
 	if err := json.NewDecoder(mfFile).Decode(&manifest); err != nil {
-		panic(fmt.Errorf("解析 manifest.json 失败: %w", err))
+		fmt.Println("解析 manifest.json 失败:", err)
+		return
 	}
 
-	// 2) 迁移 overrides 内容到根目录
-	overridesPath := filepath.Join("./", manifest.Overrides)
-	if manifest.Overrides == "" {
-		overridesPath = filepath.Join("./", "overrides")
+	overridesDir := manifest.Overrides
+	if overridesDir == "" {
+		overridesDir = "overrides"
 	}
-	if stat, statErr := os.Stat(overridesPath); statErr == nil && stat.IsDir() {
-		err = filepath.Walk(overridesPath, func(path string, info os.FileInfo, walkErr error) error {
-			if walkErr != nil {
-				return walkErr
-			}
-			if !info.IsDir() {
-				relPath, err := filepath.Rel(overridesPath, path)
-				if err != nil {
-					return err
-				}
-				destPath := filepath.Join("./", relPath)
-				if err := os.MkdirAll(filepath.Dir(destPath), os.ModePerm); err != nil {
-					return err
-				}
-				if err := os.Rename(path, destPath); err != nil {
-					return err
-				}
-			}
-			return nil
-		})
-		if err != nil {
-			panic(fmt.Sprintf("移动 overrides 文件失败: %v", err))
-		}
-		_ = os.RemoveAll(overridesPath)
+	if err := moveOverrides(filepath.Join("./", overridesDir)); err != nil {
+		fmt.Println("移动 overrides 文件失败:", err)
+		return
 	}
 
-	// 3) 生成 inst.json（Minecraft 版本 + 加载器信息）
 	inst := core.InstConfig{
 		Version:        manifest.Minecraft.Version,
 		Download:       "bmclapi",
 		MaxConnections: 32,
 		Argsment:       "-Xmx{maxmen}M -Xms{maxmen}M -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32 -Dusing.aikars.flags=https://mcflags.emc.gs -Daikars.new.flags=true",
 	}
-	// 从 modLoaders 选择 primary 或第一个
+
 	loaderID := ""
 	if len(manifest.Minecraft.ModLoaders) > 0 {
 		for _, ml := range manifest.Minecraft.ModLoaders {
@@ -134,7 +113,7 @@ func CurseForge(file string, MaxCon int, Args string) {
 			loaderID = manifest.Minecraft.ModLoaders[0].ID
 		}
 	}
-	// 常见格式: forge-<ver> / fabric-<loader>
+
 	if strings.HasPrefix(strings.ToLower(loaderID), "neoforge-") {
 		inst.Loader = "neoforge"
 		inst.LoaderVersion = strings.TrimPrefix(loaderID, "neoforge-")
@@ -145,90 +124,86 @@ func CurseForge(file string, MaxCon int, Args string) {
 		inst.Loader = "fabric"
 		inst.LoaderVersion = strings.TrimPrefix(loaderID, "fabric-")
 	} else {
-		// 默认回退 fabric（部分清单可能只有 minecraft 原版）
 		if loaderID == "" {
 			inst.Loader = "vanilla"
 			inst.LoaderVersion = ""
 		} else {
-			// 未识别时尽量按原样放入 fabric 字段，避免阻断
 			inst.Loader = "fabric"
 			inst.LoaderVersion = loaderID
 		}
 	}
 	jsonData, err := json.MarshalIndent(inst, "", "  ")
 	if err != nil {
-		panic(err)
+		fmt.Println("生成 inst.json 失败:", err)
+		return
 	}
 	if err := os.WriteFile("inst.json", jsonData, 0777); err != nil {
-		panic(err)
+		fmt.Println("写入 inst.json 失败:", err)
+		return
 	}
 
-	// 4) 下载 mods：通过 CF API 解析下载直链；放置到 ./mods 目录
 	if len(manifest.Files) == 0 {
 		return
 	}
 
-	if os.Getenv("CF_API_KEY") == "" {
-		fmt.Println("未设置 CF_API_KEY，跳过 CurseForge 模组下载。已完成 overrides 应用与 inst.json 生成。")
-		fmt.Println("如需自动下载 CF 模组，请设置环境变量 CF_API_KEY 后重试。")
-		return
-	}
+	DownloadWg.Add(1)
+	go func() {
+		defer DownloadWg.Done()
+		var wg sync.WaitGroup
+		maxConcurrency := 24
+		if MaxCon > 0 {
+			maxConcurrency = MaxCon
+		}
+		semaphore := make(chan struct{}, maxConcurrency)
+		errChan := make(chan error, len(manifest.Files))
 
-	var wg sync.WaitGroup
-	maxConcurrency := 24
-	if MaxCon > 0 {
-		maxConcurrency = MaxCon
-	}
-	semaphore := make(chan struct{}, maxConcurrency)
-	errChan := make(chan error, len(manifest.Files))
+		modsDir := filepath.Join(".", "mods")
+		_ = os.MkdirAll(modsDir, os.ModePerm)
 
-	modsDir := filepath.Join(".", "mods")
-	_ = os.MkdirAll(modsDir, os.ModePerm)
+		for _, mf := range manifest.Files {
+			if !mf.Required {
+				continue
+			}
+			wg.Add(1)
+			semaphore <- struct{}{}
 
-	for _, mf := range manifest.Files {
-		if !mf.Required {
-			continue
+			go func(entry struct {
+				ProjectID int  `json:"projectID"`
+				FileID    int  `json:"fileID"`
+				Required  bool `json:"required"`
+			}) {
+				defer func() { <-semaphore; wg.Done() }()
+
+				url, err := resolveCFDownloadURL(entry.ProjectID, entry.FileID)
+				if err != nil {
+					errChan <- err
+					return
+				}
+
+				segs := strings.Split(url, "/")
+				filename := fmt.Sprintf("%d.jar", entry.FileID)
+				if len(segs) > 0 && segs[len(segs)-1] != "" {
+					filename = segs[len(segs)-1]
+				}
+				dst := filepath.Join(modsDir, filename)
+				if err := os.MkdirAll(filepath.Dir(dst), os.ModePerm); err != nil {
+					errChan <- err
+					return
+				}
+				fmt.Println("尝试下载:", url)
+				if err := core.DownloadFile(url, dst); err != nil {
+					errChan <- fmt.Errorf("下载失败(Project %d, File %d): %v", entry.ProjectID, entry.FileID, err)
+					return
+				}
+			}(mf)
 		}
-		wg.Add(1)
-		semaphore <- struct{}{}
-
-		go func(entry struct {
-			ProjectID int  `json:"projectID"`
-			FileID    int  `json:"fileID"`
-			Required  bool `json:"required"`
-		}) {
-			defer func() { <-semaphore; wg.Done() }()
-
-			// 解析直链并以 URL 最末文件名保存
-			url, err := resolveCFDownloadURL(entry.ProjectID, entry.FileID)
+
+		wg.Wait()
+		close(errChan)
+		for err := range errChan {
 			if err != nil {
-				errChan <- err
-				return
-			}
-			// 从 URL 提取文件名
-			segs := strings.Split(url, "/")
-			filename := fmt.Sprintf("%d.jar", entry.FileID)
-			if len(segs) > 0 && segs[len(segs)-1] != "" {
-				filename = segs[len(segs)-1]
-			}
-			dst := filepath.Join(modsDir, filename)
-			if err := os.MkdirAll(filepath.Dir(dst), os.ModePerm); err != nil {
-				errChan <- err
-				return
+				fmt.Println("下载出错:", err)
 			}
-			fmt.Println("尝试下载:", url)
-			if err := core.DownloadFile(url, dst); err != nil {
-				errChan <- fmt.Errorf("下载失败(Project %d, File %d): %v", entry.ProjectID, entry.FileID, err)
-				return
-			}
-		}(mf)
-	}
-
-	wg.Wait()
-	close(errChan)
-	for err := range errChan {
-		if err != nil {
-			panic(err)
 		}
-	}
+	}()
 }