From c5ed2447b5d92b0cf3ba174574460c7efcea549a Mon Sep 17 00:00:00 2001
From: Jeroen Claassens <jeroen.claassens@rws.nl>
Date: Wed, 25 Sep 2024 17:16:00 +0200
Subject: [PATCH] refactor: use modern NodeJS code

---
 README.md |  2 +-
 mkbsd.js  | 75 -------------------------------------------------------
 mkbsd.mjs | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 76 deletions(-)
 delete mode 100644 mkbsd.js
 create mode 100755 mkbsd.mjs

diff --git a/README.md b/README.md
index 2d34182..4264502 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ MKBSD comes in two variants! Node.js and Python.
 ### Running in Node.js
 
 1. Ensure you have Node.js installed.
-2. Run `node mkbsd.js`
+2. Run `node mkbsd.mjs` or `./mkbsd.mjs` if you're on a Unix-like system.
 3. Wait a little.
 4. All wallpapers are now in a newly created `downloads` subfolder.
 
diff --git a/mkbsd.js b/mkbsd.js
deleted file mode 100644
index d02593a..0000000
--- a/mkbsd.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2024 Nadim Kobeissi
-// Licensed under the WTFPL License
-
-const fs = require(`fs`);
-const path = require(`path`);
-
-async function main() {
-	const url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s';
-	const delay = (ms) => {
-		return new Promise(resolve => setTimeout(resolve, ms));
-	}
-	try {
-		const response = await fetch(url);
-		if (!response.ok) {
-			throw new Error(`⛔ Failed to fetch JSON file: ${response.statusText}`);
-		}
-		const jsonData = await response.json();
-		const data = jsonData.data;
-		if (!data) {
-			throw new Error('⛔ JSON does not have a "data" property at its root.');
-		}
-		const downloadDir = path.join(__dirname, 'downloads');
-		if (!fs.existsSync(downloadDir)) {
-			fs.mkdirSync(downloadDir);
-			console.info(`📁 Created directory: ${downloadDir}`);
-		}
-		let fileIndex = 1;
-		for (const key in data) {
-			const subproperty = data[key];
-			if (subproperty && subproperty.dhd) {
-				const imageUrl = subproperty.dhd;
-				console.info(`🔍 Found image URL!`);
-				await delay(100);
-				const ext = path.extname(new URL(imageUrl).pathname) || '.jpg';
-				const filename = `${fileIndex}${ext}`;
-				const filePath = path.join(downloadDir, filename);
-				await downloadImage(imageUrl, filePath);
-				console.info(`🖼️ Saved image to ${filePath}`);
-				fileIndex++;
-				await delay(250);
-			}
-		}
-	} catch (error) {
-		console.error(`Error: ${error.message}`);
-	}
-}
-
-async function downloadImage(url, filePath) {
-	const response = await fetch(url);
-	if (!response.ok) {
-		throw new Error(`Failed to download image: ${response.statusText}`);
-	}
-	const arrayBuffer = await response.arrayBuffer();
-	const buffer = Buffer.from(arrayBuffer);
-	await fs.promises.writeFile(filePath, buffer);
-}
-
-function asciiArt() {
-	console.info(`
- /$$      /$$ /$$   /$$ /$$$$$$$   /$$$$$$  /$$$$$$$
-| $$$    /$$$| $$  /$$/| $$__  $$ /$$__  $$| $$__  $$
-| $$$$  /$$$$| $$ /$$/ | $$  \\ $$| $$  \\__/| $$  \\ $$
-| $$ $$/$$ $$| $$$$$/  | $$$$$$$ |  $$$$$$ | $$  | $$
-| $$  $$$| $$| $$  $$  | $$__  $$ \\____  $$| $$  | $$
-| $$\\  $ | $$| $$\\  $$ | $$  \\ $$ /$$  \\ $$| $$  | $$
-| $$ \\/  | $$| $$ \\  $$| $$$$$$$/|  $$$$$$/| $$$$$$$/
-|__/     |__/|__/  \\__/|_______/  \\______/ |_______/`);
-	console.info(``);
-	console.info(`🤑 Starting downloads from your favorite sellout grifter's wallpaper app...`);
-}
-
-(() => {
-	asciiArt();
-	setTimeout(main, 5000);
-})();
diff --git a/mkbsd.mjs b/mkbsd.mjs
new file mode 100755
index 0000000..a01d6d9
--- /dev/null
+++ b/mkbsd.mjs
@@ -0,0 +1,72 @@
+#!/usr/bin/env node
+
+// Copyright 2024 Nadim Kobeissi
+// Licensed under the WTFPL License
+
+import { stat, mkdir, writeFile } from 'node:fs/promises';
+import { extname } from 'node:path';
+import { setTimeout } from 'node:timers/promises'
+
+console.info(`
+/$$      /$$ /$$   /$$ /$$$$$$$   /$$$$$$  /$$$$$$$
+| $$$    /$$$| $$  /$$/| $$__  $$ /$$__  $$| $$__  $$
+| $$$$  /$$$$| $$ /$$/ | $$  \\ $$| $$  \\__/| $$  \\ $$
+| $$ $$/$$ $$| $$$$$/  | $$$$$$$ |  $$$$$$ | $$  | $$
+| $$  $$$| $$| $$  $$  | $$__  $$ \\____  $$| $$  | $$
+| $$\\  $ | $$| $$\\  $$ | $$  \\ $$ /$$  \\ $$| $$  | $$
+| $$ \\/  | $$| $$ \\  $$| $$$$$$$/|  $$$$$$/| $$$$$$$/
+|__/     |__/|__/  \\__/|_______/  \\______/ |_______/`);
+console.info(``);
+console.info(
+  `🤑 Starting downloads from your favorite sellout grifter's wallpaper app...`
+);
+
+const url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s';
+const downloadsDir = new URL('downloads/', import.meta.url);
+
+try {
+	const response = await fetch(url);
+	if (!response.ok) {
+		throw new Error(`⛔ Failed to fetch JSON file: ${response.statusText}`);
+	}
+	const jsonData = await response.json();
+	const data = jsonData.data;
+	if (!data) {
+		throw new Error('⛔ JSON does not have a "data" property at its root.');
+	}
+
+	try {
+		await stat(downloadsDir);
+	} catch {
+		await mkdir(downloadsDir);
+		console.info(`📁 Created directory: ${downloadsDir.pathname}`);
+	}
+
+	let fileIndex = 1;
+	for (const subproperty of Object.values(data)) {
+		if (subproperty?.dhd) {
+			const imageUrl = subproperty.dhd;
+			console.info(`🔍 Found image URL!`);
+			await setTimeout(100);
+			const ext = extname(new URL(imageUrl).pathname) || '.jpg';
+			const filename = `${fileIndex}${ext}`;
+			const filePath = new URL(filename, downloadsDir);
+			await downloadImage(imageUrl, filePath);
+			console.info(`🖼️ Saved image to ${filePath.pathname}`);
+			fileIndex++;
+			await setTimeout(250);
+		}
+	}
+} catch (error) {
+	console.error(`Error: ${error.message}`);
+}
+
+async function downloadImage(url, filePath) {
+	const response = await fetch(url);
+	if (!response.ok) {
+		throw new Error(`Failed to download image: ${response.statusText}`);
+	}
+	const arrayBuffer = await response.arrayBuffer();
+	const buffer = Buffer.from(arrayBuffer);
+	await writeFile(filePath, buffer);
+}