Code cleanup

shockpkg · Dec 5, 2023 · ee41263 · ee41263
1 parent 160f702
commit ee41263
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 30 deletions.
diff --git a/bin/newest-adobe.mjs b/bin/newest-adobe.mjs
@@ -147,15 +147,16 @@ async function main() {
 
 			console.log(`${task.resource.source}: Checking`);
 
-			const response = await fetch(task.resource.source, {
+			const {status: statusE, source: url} = task.resource;
+			const response = await fetch(url, {
 				method: 'HEAD',
 				redirect: 'manual'
 			});
+			const {status, headers} = response;
 
-			const {status} = task.resource;
-			if (response.status !== status) {
+			if (status !== statusE) {
 				throw new Error(
-					`Unexpected status code: ${response.status} != ${status}`
+					`Status code: ${status} != ${statusE}: ${url}`
 				);
 			}
 
@@ -164,7 +165,7 @@ async function main() {
 				if (typeof expected === 'undefined') {
 					continue;
 				}
-				const actual = response.headers.get(header);
+				const actual = headers.get(header);
 				const actualValue = typeof expected === 'number' ?
 					+actual : actual;
 

diff --git a/bin/newest-cn.mjs b/bin/newest-cn.mjs
@@ -34,23 +34,25 @@ async function main() {
 			continue;
 		}
 
+		const url = `${source}?_=${Date.now()}`;
 		// eslint-disable-next-line no-await-in-loop
-		const response = await fetch(`${source}?_=${Date.now()}`, {
+		const response = await fetch(url, {
 			method: 'HEAD',
 			headers: {
 				'User-Agent': userAgent,
 				Referer: referer
 			}
 		});
 
-		if (response.status !== 200) {
+		const {status, headers} = response;
+		if (status !== 200) {
 			failed.add(name);
-			console.log(`Error: Status code: ${response.status}`);
+			console.log(`Error: Status code: ${status}: ${url}`);
 			console.log('');
 			continue;
 		}
 
-		const size = +response.headers.get('content-length');
+		const size = +headers.get('content-length');
 		const sized = pkg.size;
 		if (size !== sized) {
 			failed.add(name);

diff --git a/bin/newest-harman-air-runtime.mjs b/bin/newest-harman-air-runtime.mjs
@@ -55,14 +55,15 @@ async function main() {
 		const response = await fetch(source, {
 			'User-Agent': userAgent
 		});
-		if (response.status !== 200) {
+		const {status, headers} = response;
+		if (status !== 200) {
 			failed.add(name);
-			console.log(`Error: Status code: ${response.status}`);
+			console.log(`Error: Status code: ${status}: ${source}`);
 			console.log('');
 			continue;
 		}
 
-		const size = +response.headers.get('content-length');
+		const size = +headers.get('content-length');
 		if (size !== sized) {
 			failed.add(name);
 			console.log(`Error: Unexpected size: ${size} != ${sized}`);

diff --git a/bin/newest-harman-air-sdk.mjs b/bin/newest-harman-air-sdk.mjs
@@ -30,14 +30,15 @@ async function main() {
 				Cookie: cookie
 			}
 		});
-		if (response.status !== 200) {
+		const {status, headers} = response;
+		if (status !== 200) {
 			failed.add(name);
-			console.log(`Error: Status code: ${response.status}`);
+			console.log(`Error: Status code: ${status}: ${source}`);
 			console.log('');
 			continue;
 		}
 
-		const size = +response.headers.get('content-length');
+		const size = +headers.get('content-length');
 		console.log(`Size: ${size}`);
 		if (!expected.has(name)) {
 			failed.add(name);

diff --git a/bin/verify.mjs b/bin/verify.mjs
@@ -28,12 +28,11 @@ function archiveOrgParse(url) {
 const archiveOrgMetadataCache = {};
 function archiveOrgMetadata(item) {
 	if (!archiveOrgMetadataCache[item]) {
-		archiveOrgMetadataCache[item] = fetch(
-			`https://archive.org/metadata/${encodeURI(item)}/`
-		).then(async response => {
+		const url = `https://archive.org/metadata/${encodeURI(item)}/`;
+		archiveOrgMetadataCache[item] = fetch(url).then(async response => {
 			const {status} = response;
 			if (status !== 200) {
-				throw new Error(`Unexpected status code: ${status}`);
+				throw new Error(`Status code: ${status}: ${url}`);
 			}
 			const body = await response.text();
 			const files = new Map();
@@ -75,12 +74,12 @@ async function getMetadataForUrl(url) {
 	}
 
 	const response = await fetch(url);
-	const {status} = response;
+	const {status, headers} = response;
 	if (status !== 200) {
-		throw new Error(`Unexpected status code: ${status}`);
+		throw new Error(`Status code: ${status}: ${url}`);
 	}
 	return {
-		size: +response.headers.get('content-length')
+		size: +headers.get('content-length')
 	};
 }
 

diff --git a/util/flashcn.mjs b/util/flashcn.mjs
@@ -98,7 +98,7 @@ async function listRelease() {
 		}
 	});
 	if (jsRes.status !== 200) {
-		throw new Error(`Unexpected status: ${jsRes.status}`);
+		throw new Error(`Status code: ${jsRes.status}: ${htmlUrl}`);
 	}
 	const versions = parseJsonP(await jsRes.text());
 	const r = [];
@@ -151,17 +151,18 @@ async function listDebug() {
 		}
 	});
 	if (htmlRes.status !== 200) {
-		throw new Error(`Unexpected status: ${htmlRes.status}`);
+		throw new Error(`Status code: ${htmlRes.status}: ${htmlUrl}`);
 	}
 	const html = await htmlRes.text();
-	const jsRes = await fetch('https://api.flash.cn/config/debugFlashVersion', {
+	const jsUrl = 'https://api.flash.cn/config/debugFlashVersion';
+	const jsRes = await fetch(jsUrl, {
 		headers: {
 			'User-Agent': userAgent,
 			Referer: htmlUrl
 		}
 	});
 	if (jsRes.status !== 200) {
-		throw new Error(`Unexpected status: ${jsRes.status}`);
+		throw new Error(`Status code: ${jsRes.status}: ${jsUrl}`);
 	}
 	const js = await jsRes.text();
 	const {version, date} = parseJsonV(js);

diff --git a/util/gencache.mjs b/util/gencache.mjs
@@ -39,12 +39,13 @@ export async function download(name, url, onprogress = null, headers = {}) {
 		let recievedLength = 0;
 
 		const response = await fetch(url, {headers});
-		if (response.status !== 200) {
-			throw new Error(`Bad status code: ${response.status}`);
+		const {status, headers: rheads} = response;
+		if (status !== 200) {
+			throw new Error(`Status code: ${status}: ${url}`);
 		}
 
 		onprogress(0);
-		const contentLength = +response.headers.get('content-length');
+		const contentLength = +rheads.get('content-length');
 		const body = Readable.fromWeb(response.body);
 		const p = pipe(body, createWriteStream(fileCacheTmp));
 		body.on('data', data => {

diff --git a/util/harman-airsdk.mjs b/util/harman-airsdk.mjs
@@ -17,7 +17,7 @@ export async function list() {
 		'User-Agent': userAgent
 	});
 	if (response.status !== 200) {
-		throw new Error(`Unexpected status code: ${response.status}`);
+		throw new Error(`Status code: ${response.status}: ${apiUrl}`);
 	}
 	const data = JSON.parse(await response.text());
 	const cookies = [...response.headers]