@openwf/cli 0.1.0 → 0.2.0

package/lib.js

@@ -59,10 +59,13 @@ const downloadFileFromMega = async (url, out) => {
 };
 
 // For single-file torrents, downloadDir is the folder that contains the file.
-const verifyLocalTorrentDownload = (torrentFilePath, downloadDir) => {
+const verifyLocalTorrentDownload = (torrentFilePath, downloadDir, infoHash) => {
 	return new Promise(resolve => {
 		const nt = require("nt");
 		nt.read(torrentFilePath, (_err, torrent) => {
+			if (infoHash && torrent.infoHash() != infoHash) {
+				throw new Error(`${torrentFilePath} does not seem to match infohash ${infoHash}`);
+			}
 			const hasher = torrent.hashCheck(downloadDir);
 			let p;
 			hasher.on("match", (i, hash, percent) => {
@@ -77,6 +80,7 @@ const verifyLocalTorrentDownload = (torrentFilePath, downloadDir) => {
 
 const downloadUpdatePatch = async (version, btConsent) => {
 	const params = new URLSearchParams(new URL(version.attributes.magnet).search);
+	const infoHash = params.get("xt").substring(9);
 	const torrentFilePath = `depot/${params.get("dn")}.torrent`;
 	if (!fs.existsSync(torrentFilePath)) {
 		const torrentFileUrl = `https://about.openwf.io/supplementals/torrents/patches/${params.get("dn")}.torrent`;
@@ -102,13 +106,14 @@ const downloadUpdatePatch = async (version, btConsent) => {
 				await downloadFileFromMega(version.attributes.mega, `depot/${params.get("dn")}`);
 			}
 		}
-		if (await verifyLocalTorrentDownload(torrentFilePath, "depot")) {
+		if (await verifyLocalTorrentDownload(torrentFilePath, "depot", infoHash)) {
 			return `depot/${params.get("dn")}`;
 		}
 		if (needToDownload) {
 			// This was a fresh download, no point in retrying.
-			throw new Error(`Failed to download ${magnetUri}`);
+			throw new Error(`Failed to download ${version.attributes.mega}`);
 		}
+		//console.log("File is locally available but failed to verify against .torrent");
 		needToDownload = true;
 	}
 };

package/openwf.js

@@ -100,7 +100,21 @@ switch (tool) {
 
 				console.log("Applying update patch...");
 				const sz = require("7zip-min");
-				await sz.unpackSome(patchArchivePath, [target], "install");
+				if (patchArchivePath.endsWith(".wim.7z")) {
+					await sz.unpack(patchArchivePath, "depot");
+					const wimPath = patchArchivePath.substr(0, patchArchivePath.length - 3);
+					{
+						const { Wim } = require("wim-parser");
+						const wim = await Wim.open(wimPath);
+						const root = await wim.getRootDirectoryEntry();
+						const targetDir = (await wim.listDirectory(root)).find(entry => entry.file_name == target);
+						await wim.extract(targetDir, `install/${target}`);
+						await wim.close();
+					}
+					await fs.promises.unlink(wimPath);
+				} else {
+					await sz.unpackSome(patchArchivePath, [target], "install");
+				}
 			}
 			if (tool == "install") {
 				console.log("Downloading Bootstrapper manifest...");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@openwf/cli",
-	"version": "0.1.0",
+	"version": "0.2.0",
 	"main": "lib.js",
 	"repository": {
 		"type": "git",
@@ -16,6 +16,7 @@
 		"nt": "^0.7.1",
 		"steam-manifest-tools": "^0.1.11",
 		"webtorrent": "^2.3.0",
+		"wim-parser": "^0.1.0",
 		"yesno": "^0.4.0"
 	}
 }