Remove the need for CurseForge API key (#1636)

iluha168 · web-flow · commit 245af224770a · 2025-05-04T13:20:01.000-05:00
* removed the need for CF API key

* Log api calls for modlist.html

* remove api key from workflow too
diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml
@@ -25,9 +25,6 @@ on:
       version:
         required: true
         type: string
-    secrets:
-      API_TOKEN:
-        required: true
 
 jobs:
   pack_pr:
@@ -67,8 +64,6 @@ jobs:
           sed -i s/\"version\":\ \"development\"/\"version\":\ \"${{ inputs.version }}\"/ manifest.json
         shell: bash
       - name: Pack Modpack
-        env:
-          CFCORE_API_TOKEN: ${{ secrets.API_TOKEN }}
         run: |
           ./pack-mode-switcher.sh n
           cd tools/build
diff --git a/tools/build/index.js b/tools/build/index.js
@@ -8,10 +8,11 @@
 
 import fs from "fs";
 import path, { resolve } from "path";
-import { env } from "process";
 import Juke from "juke-build";
 import { DownloadCF, GetModInfo } from "./lib/curseforge.js";
 import { CodegenAllTarget } from "./codegen/target-all.js";
+import { z } from "zod";
+import { progressNumber } from "./lib/log.js"
 
 Juke.chdir("../..", import.meta.url);
 Juke.setup({ file: import.meta.url }).then((code) => {
@@ -113,27 +114,23 @@ export const ModeParameter = new Juke.Parameter({
     type: "string"
 })
 
-// for windows users, go do -> --key=curseforgekey
-// not recommended, go use env vars!!
-export const KeyParameter = new Juke.Parameter({
-    type: "string"
-})
-
 export const BuildModlistTarget = new Juke.Target({
-    parameters: [KeyParameter],
     inputs: ["manifest.json"],
     outputs: ["dist/modlist.html"],
-    executes: async ({ get }) => {
-        if (!env.CFCORE_API_TOKEN && !get(KeyParameter)) {
-            Juke.logger.error("CFCORE_API_TOKEN env var is required for downloading mods.");
-            throw new Juke.ExitCode(1);
-        }
+    executes: async () => {
         fs.mkdirSync("dist", { recursive: true })
-        const jsonData = JSON.parse(fs.readFileSync("manifest.json", "utf-8"));
+        const {files} = z.object({
+            files: z.object({
+                projectID: z.number()
+            }).array()
+        }).parse(
+            JSON.parse(fs.readFileSync("manifest.json", "utf-8"))
+        );
+        const total = progressNumber(files.length)
         let html = "<ul>\n"
-        for (const key in jsonData.files) {
-            const file = jsonData.files[key];
-            const modInfo = await GetModInfo(env.CFCORE_API_TOKEN ?? get(KeyParameter), file.projectID);
+        for (const [i, {projectID}] of files.entries()) {
+            const modInfo = await GetModInfo(projectID);
+            Juke.logger.info(`Downloaded: (${total(i)}) Mod info "${modInfo.name}"`)
             html += `<li><a href=${modInfo.links.websiteUrl}>${modInfo.name} (by ${modInfo.authors[0].name})</a></li>\n`;
         }
         html += "</ul>"
@@ -144,11 +141,7 @@ export const BuildModlistTarget = new Juke.Target({
 export const DownloadModsTarget = new Juke.Target({
     inputs: ["manifest.json"],
     outputs: () => [], // always run, we have internal logic to check mods now
-    executes: async ({ get }) => {
-        if (!env.CFCORE_API_TOKEN && !get(KeyParameter)) {
-            Juke.logger.error("CFCORE_API_TOKEN env var is required for downloading mods.");
-            throw new Juke.ExitCode(1);
-        }
+    executes: async () => {
         const manifest = JSON.parse(fs.readFileSync("manifest.json", "utf-8"));
 
         fs.mkdirSync("dist/modcache", { recursive: true })
@@ -217,7 +210,7 @@ export const DownloadModsTarget = new Juke.Target({
 
         for (const modID of mIdToDownload) {
             const file = dataKeys[modID];
-            const res = await DownloadCF(env.CFCORE_API_TOKEN ?? get(KeyParameter), {
+            const res = await DownloadCF({
                 modID,
                 modFileID: file.fileID
             }, "dist/modcache/");
@@ -338,16 +331,12 @@ export const BuildAllTarget = new Juke.Target({
 
 export const UploadTarget = new Juke.Target({
     dependsOn: [BuildAllTarget],
-    parameters: [ModeParameter, KeyParameter],
+    parameters: [ModeParameter],
     inputs: [
         "dist/client.zip",
         "dist/server.zip",
     ],
     executes: async ({ get }) => {
-        if (!env.CFCORE_API_TOKEN && !get(KeyParameter)) {
-            Juke.logger.error("CFCORE_API_TOKEN env var is required for downloading mods.");
-            throw new Juke.ExitCode(1);
-        }
         get(ModeParameter);
     },
 })
diff --git a/tools/build/lib/curseforge.js b/tools/build/lib/curseforge.js
@@ -2,11 +2,10 @@ import Juke from "juke-build";
 import fs from "fs";
 import https from "https";
 
-export const GetModInfo = async (key, modID) => {
-    const modData = await fetch(`https://api.curseforge.com/v1/mods/${modID}`, {
+export const GetModInfo = async (modID) => {
+    const modData = await fetch(`https://api.curse.tools/v1/cf/mods/${modID}`, {
         redirect: "follow",
         headers: {
-            "X-Api-Key": key,
             Accept: "application/json"
         }
     });
@@ -22,7 +21,7 @@ export const GetModInfo = async (key, modID) => {
     return (await modData.json()).data;
 }
 
-export const DownloadCF = async (key, modInfo = {}, dest, retrycount) => {
+export const DownloadCF = async (modInfo = {}, dest, retrycount) => {
     if (retrycount === null || retrycount === undefined) {
         retrycount = 5;
     }
@@ -31,13 +30,10 @@ export const DownloadCF = async (key, modInfo = {}, dest, retrycount) => {
         Juke.logger.error(`Bad DownloadCF modInfo args. modID: ${modID} | modFileID: ${modFileID}`);
         throw new Juke.ExitCode(1);
     }
-    const headers = {
-        "X-Api-Key": key
-    }
 
-    const modData = await fetch(`https://api.curseforge.com/v1/mods/${modID}/files/${modFileID}`, {
+    const modData = await fetch(`https://api.curse.tools/v1/cf/mods/${modID}/files/${modFileID}`, {
         redirect: "follow",
-        headers: {...headers, Accept: "application/json"}
+        headers: {Accept: "application/json"}
     });
 
     if (modData.status !== 200) {
@@ -52,7 +48,7 @@ export const DownloadCF = async (key, modInfo = {}, dest, retrycount) => {
             throw new Juke.ExitCode(1);
         }
         retrycount--;
-        return await DownloadCF(key, modInfo, dest, retrycount);
+        return await DownloadCF(modInfo, dest, retrycount);
     }
     const modDataJson = (await modData.json()).data;
 
@@ -67,15 +63,15 @@ export const DownloadCF = async (key, modInfo = {}, dest, retrycount) => {
     Juke.logger.info(`Downloading: ${modDataJson.fileName}`)
 
     try {
-        await download_file(modDataJson.downloadUrl, { headers: headers }, dest);
+        await download_file(modDataJson.downloadUrl, {}, dest);
     } catch {
         Juke.logger.warn(`Download failed ${modDataJson.fileName}`)
         if (retrycount <= 0) {
             Juke.logger.error("Exhausted retries, exiting download");
             throw new Juke.ExitCode(1);
         }
         retrycount--;
-        return await DownloadCF(key, modInfo, dest, retrycount);
+        return await DownloadCF(modInfo, dest, retrycount);
     }
 
     if (!fs.existsSync(dest) || fs.statSync(dest).size !== modDataJson.fileLength) {
@@ -85,7 +81,7 @@ export const DownloadCF = async (key, modInfo = {}, dest, retrycount) => {
             throw new Juke.ExitCode(1);
         }
         retrycount--;
-        return await DownloadCF(key, modInfo, dest, retrycount);
+        return await DownloadCF(modInfo, dest, retrycount);
     }
     return modDataJson;
 };
diff --git a/tools/build/lib/log.js b/tools/build/lib/log.js
@@ -0,0 +1,12 @@
+// @ts-check
+
+/**
+ * @param {number} max
+ */
+export const progressNumber = (max) => {
+    const padLen = Math.ceil(Math.log10(max))
+    /**
+	 * @param {number} current
+	 */
+    return (current) => current.toString().padStart(padLen) + "/" + max
+}
