factorio-test-cli 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "factorio-test-cli",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A CLI to run FactorioTest.",
   "license": "MIT",
   "repository": "https://github.com/GlassBricks/FactorioTest",

package/run.js

@@ -7,6 +7,9 @@ import { spawn, spawnSync } from "child_process";
 import BufferLineSplitter from "./buffer-line-splitter.js";
 import chalk from "chalk";
 import * as process from "node:process";
+import * as https from "https";
+import * as readline from "readline";
+const FACTORIO_TEST_MOD_VERSION = "2.0.1";
 const thisCommand = program
     .command("run")
     .summary("Runs tests with Factorio test.")
@@ -117,12 +120,121 @@ async function checkModExists(modsDir, modName) {
 }
 async function installFactorioTest(modsDir) {
     await fsp.mkdir(modsDir, { recursive: true });
-    const testModName = "factorio-test";
-    // if not found, install it
-    const alreadyExists = await checkModExists(modsDir, testModName);
-    if (!alreadyExists) {
-        console.log(`Downloading ${testModName} from mod portal using fmtk. This may ask for factorio login credentials.`);
-        await runScript("fmtk mods install", "--modsPath", modsDir, testModName);
+    const modName = "factorio-test";
+    const version = FACTORIO_TEST_MOD_VERSION;
+    const expectedZipName = `${modName}_${version}.zip`;
+    const expectedZipPath = path.join(modsDir, expectedZipName);
+    if (fs.existsSync(expectedZipPath)) {
+        if (thisCommand.opts().verbose)
+            console.log(`${modName} version ${version} already installed`);
+        return;
+    }
+    console.log(`Downloading ${modName} version ${version} from mod portal...`);
+    await downloadModVersion(modName, version, expectedZipPath);
+}
+async function downloadModVersion(modName, version, destPath) {
+    const modInfo = await fetchJson(`https://mods.factorio.com/api/mods/${modName}`);
+    const release = modInfo.releases.find((r) => r.version === version);
+    if (!release) {
+        const availableVersions = modInfo.releases.map((r) => r.version).join(", ");
+        throw new Error(`Version ${version} not found for mod ${modName}. Available: ${availableVersions}`);
+    }
+    const credentials = await getFactorioCredentials();
+    const downloadUrl = `https://mods.factorio.com${release.download_url}?username=${encodeURIComponent(credentials.username)}&token=${encodeURIComponent(credentials.token)}`;
+    await downloadFile(downloadUrl, destPath);
+}
+async function fetchJson(url) {
+    return new Promise((resolve, reject) => {
+        https.get(url, (res) => {
+            if (res.statusCode !== 200) {
+                reject(new Error(`HTTP ${res.statusCode} fetching ${url}`));
+                return;
+            }
+            let data = "";
+            res.on("data", (chunk) => (data += chunk));
+            res.on("end", () => {
+                try {
+                    resolve(JSON.parse(data));
+                }
+                catch (e) {
+                    reject(new Error(`Failed to parse JSON from ${url}`, { cause: e }));
+                }
+            });
+            res.on("error", reject);
+        }).on("error", reject);
+    });
+}
+async function downloadFile(url, destPath) {
+    return new Promise((resolve, reject) => {
+        https.get(url, (res) => {
+            if (res.statusCode === 302 || res.statusCode === 301) {
+                const redirectUrl = res.headers.location;
+                if (!redirectUrl) {
+                    reject(new Error("Redirect without location header"));
+                    return;
+                }
+                downloadFile(redirectUrl, destPath).then(resolve, reject);
+                return;
+            }
+            if (res.statusCode !== 200) {
+                reject(new Error(`HTTP ${res.statusCode} downloading mod`));
+                return;
+            }
+            const fileStream = fs.createWriteStream(destPath);
+            res.pipe(fileStream);
+            fileStream.on("close", () => resolve());
+            fileStream.on("error", (err) => {
+                fs.unlink(destPath, () => { });
+                reject(err);
+            });
+        }).on("error", reject);
+    });
+}
+async function getFactorioCredentials() {
+    const playerDataPath = getPlayerDataPath();
+    if (playerDataPath && fs.existsSync(playerDataPath)) {
+        try {
+            const playerData = JSON.parse(await fsp.readFile(playerDataPath, "utf8"));
+            if (playerData["service-username"] && playerData["service-token"]) {
+                return {
+                    username: playerData["service-username"],
+                    token: playerData["service-token"],
+                };
+            }
+        }
+        catch {
+            // Fall through to prompt
+        }
+    }
+    console.log("Factorio credentials required for mod portal download.");
+    return promptForCredentials();
+}
+function getPlayerDataPath() {
+    const platform = os.platform();
+    if (platform === "linux") {
+        return path.join(os.homedir(), ".factorio", "player-data.json");
+    }
+    else if (platform === "darwin") {
+        return path.join(os.homedir(), "Library", "Application Support", "factorio", "player-data.json");
+    }
+    else if (platform === "win32") {
+        return path.join(os.homedir(), "AppData", "Roaming", "Factorio", "player-data.json");
+    }
+    return undefined;
+}
+async function promptForCredentials() {
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    const question = (prompt) => new Promise((resolve) => rl.question(prompt, resolve));
+    try {
+        const username = await question("Factorio username: ");
+        const token = await question("Factorio token (from https://factorio.com/profile): ");
+        return { username, token };
+    }
+    finally {
+        rl.close();
     }
 }
 async function ensureConfigIni(dataDir) {