cyclops-infobook-html 5.2.0 → 5.2.2

package/lib/modloader/ModLoader.js

@@ -52,7 +52,6 @@ const fs = __importStar(require("node:fs"));
 const Path = __importStar(require("node:path"));
 const node_path_1 = require("node:path");
 const node_util_1 = require("node:util");
-const mvn_artifact_download_1 = __importDefault(require("mvn-artifact-download"));
 const ncp_1 = require("ncp");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const rimraf_1 = __importDefault(require("rimraf"));
@@ -170,14 +169,7 @@ class ModLoader {
                 }
                 else if (mod.type === 'maven') {
                     process.stdout.write(`  - ${mod.artifact} from ${mod.repo}...\n`);
-                    let name;
-                    if (mod.headers && Object.keys(mod.headers).length > 0) {
-                        // Authenticated download: construct URL manually and use fetch with headers
-                        name = yield this.downloadMavenArtifact(mod.artifact, mod.repo, modsDir, mod.headers);
-                    }
-                    else {
-                        name = yield (0, mvn_artifact_download_1.default)(mod.artifact, modsDir, mod.repo);
-                    }
+                    const name = yield this.downloadMavenArtifact(mod.artifact, mod.repo, modsDir, mod.headers);
                     // Rename file if needed
                     if ('name' in mod) {
                         fs.renameSync(name, (0, node_path_1.join)(modsDir, mod.name));

package/lib/modloader/PomConverter.d.ts

@@ -1,3 +1,12 @@
+/**
+ * Build the URL for a Maven artifact JAR in a repository.
+ */
+export declare function buildMavenArtifactUrl(groupId: string, artifactId: string, version: string, classifier: string | undefined, repoUrl: string): string;
+/**
+ * Check if a Maven artifact exists in a repository by sending an HTTP HEAD request.
+ * Returns true if the server responds with a 2xx status, false otherwise.
+ */
+export declare function artifactExistsInRepo(groupId: string, artifactId: string, version: string, classifier: string | undefined, repoUrl: string, headers?: Record<string, string>): Promise<boolean>;
 export interface IModpackMod {
     type: 'maven';
     artifact: string;

package/lib/modloader/PomConverter.js

@@ -8,13 +8,70 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMavenArtifactUrl = buildMavenArtifactUrl;
+exports.artifactExistsInRepo = artifactExistsInRepo;
 exports.convertPomToModpack = convertPomToModpack;
 const node_util_1 = require("node:util");
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const xml2js_1 = require("xml2js");
 const parseStringPromise = (0, node_util_1.promisify)(xml2js_1.parseString);
 /** Default Maven repository URL, used when no settings.xml is provided. */
-const DEFAULT_MAVEN_REPO = 'https://repo.maven.apache.org/maven2';
+const DEFAULT_MAVEN_REPO = 'https://repo.maven.apache.org/maven2/';
+/**
+ * Build the URL for a Maven artifact JAR in a repository.
+ */
+function buildMavenArtifactUrl(groupId, artifactId, version, classifier, repoUrl) {
+    const groupPath = groupId.replaceAll('.', '/');
+    const suffix = classifier ? `-${classifier}` : '';
+    const fileName = `${artifactId}-${version}${suffix}.jar`;
+    const base = repoUrl.endsWith('/') ? repoUrl : `${repoUrl}/`;
+    return `${base}${groupPath}/${artifactId}/${version}/${fileName}`;
+}
+/**
+ * Check if a Maven artifact exists in a repository by sending an HTTP HEAD request.
+ * Returns true if the server responds with a 2xx status, false otherwise.
+ */
+function artifactExistsInRepo(groupId, artifactId, version, classifier, repoUrl, headers) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const url = buildMavenArtifactUrl(groupId, artifactId, version, classifier, repoUrl);
+        try {
+            const response = yield (0, node_fetch_1.default)(url, { method: 'HEAD', headers: headers !== null && headers !== void 0 ? headers : {} });
+            return response.ok;
+        }
+        catch (_a) {
+            return false;
+        }
+    });
+}
+/**
+ * Build Authorization headers for a server entry.
+ * Returns a Bearer header for placeholder passwords, or a Basic header for literal credentials.
+ * Returns an empty object if no password is configured.
+ */
+function buildAuthHeaders(server) {
+    var _a;
+    if (!(server === null || server === void 0 ? void 0 : server.password)) {
+        return {};
+    }
+    const headers = {};
+    // If the password is an environment variable placeholder (e.g. ${GITHUB_TOKEN}),
+    // use Bearer authentication to avoid having to base64-encode at generation time.
+    if (/^\$\{[^}]+\}$/u.test(server.password)) {
+        headers.Authorization = `Bearer ${server.password}`;
+    }
+    else {
+        // Literal credentials: encode as Basic auth
+        const credentials = Buffer
+            .from(`${(_a = server.username) !== null && _a !== void 0 ? _a : 'token'}:${server.password}`)
+            .toString('base64');
+        headers.Authorization = `Basic ${credentials}`;
+    }
+    return headers;
+}
 /**
  * Convert a Maven pom.xml (and optional settings.xml) into a modpack.json object.
  * @param pomXml The contents of the pom.xml file.
@@ -23,7 +80,7 @@ const DEFAULT_MAVEN_REPO = 'https://repo.maven.apache.org/maven2';
  */
 function convertPomToModpack(pomXml, settingsXml) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const pomDoc = (yield parseStringPromise(pomXml));
         const project = pomDoc.project;
         // Extract Minecraft version from the project <version>
@@ -63,7 +120,8 @@ function convertPomToModpack(pomXml, settingsXml) {
                     if ((_g = (_f = profile.repositories) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.repository) {
                         for (const repo of profile.repositories[0].repository) {
                             const repoId = repo.id[0];
-                            const repoUrl = repo.url[0].replace(/\/$/u, '');
+                            const rawUrl = repo.url[0];
+                            const repoUrl = rawUrl.endsWith('/') ? rawUrl : `${rawUrl}/`;
                             repoMap.set(repoId, { id: repoId, url: repoUrl });
                         }
                     }
@@ -91,8 +149,21 @@ function convertPomToModpack(pomXml, settingsXml) {
                 const artifact = classifier ?
                     `${groupId}:${artifactId}:${version}:${classifier}` :
                     `${groupId}:${artifactId}:${version}`;
-                // Determine repo: use the first active repo as default
-                const repo = (_q = repos[0]) !== null && _q !== void 0 ? _q : { id: 'central', url: DEFAULT_MAVEN_REPO };
+                // Determine repo: when multiple repos are configured, probe each one in order
+                // and use the first that has the artifact (mirrors Maven's repository resolution).
+                // When only one repo is configured, skip probing and use it directly.
+                let repo = (_q = repos[0]) !== null && _q !== void 0 ? _q : { id: 'central', url: DEFAULT_MAVEN_REPO };
+                if (repos.length > 1) {
+                    for (const candidateRepo of repos) {
+                        const candidateServer = serverMap.get(candidateRepo.id);
+                        const probeHeaders = buildAuthHeaders(candidateServer);
+                        const found = yield artifactExistsInRepo(groupId, artifactId, version, classifier, candidateRepo.url, probeHeaders);
+                        if (found) {
+                            repo = candidateRepo;
+                            break;
+                        }
+                    }
+                }
                 const mod = {
                     type: 'maven',
                     artifact,
@@ -101,21 +172,7 @@ function convertPomToModpack(pomXml, settingsXml) {
                 // If the repo has a server entry with credentials, add auth headers
                 const server = serverMap.get(repo.id);
                 if (server === null || server === void 0 ? void 0 : server.password) {
-                    // If the password is an environment variable placeholder (e.g. ${GITHUB_TOKEN}),
-                    // use Bearer authentication to avoid having to base64-encode at generation time.
-                    const passwordIsPlaceholder = /^\$\{[^}]+\}$/u.test(server.password);
-                    const authHeaders = {};
-                    if (passwordIsPlaceholder) {
-                        authHeaders.Authorization = `Bearer ${server.password}`;
-                    }
-                    else {
-                        // Literal credentials: encode as Basic auth
-                        const credentials = Buffer
-                            .from(`${(_r = server.username) !== null && _r !== void 0 ? _r : 'token'}:${server.password}`)
-                            .toString('base64');
-                        authHeaders.Authorization = `Basic ${credentials}`;
-                    }
-                    mod.headers = authHeaders;
+                    mod.headers = buildAuthHeaders(server);
                 }
                 mods.push(mod);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyclops-infobook-html",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "Output Cyclops infobooks as HTML",
   "author": "Ruben Taelman <rubensworks@gmail.com>",
   "license": "MIT",