fix loosing posts if error with pleroma

add time

.gitignore

@@ -2,5 +2,5 @@ credentials.json
 known_ids
 logindata
 ._*
-output.txt
+*.txt
 node_modules

Bot.js

@@ -18,11 +18,12 @@ export default class Bot {
 		form.append("grant_type", "password");
 		form.append("username", this.username);
 		form.append("password", this.password);
-		var data = await fetch(this.url + "/oauth/token", {
+		var res = await fetch(this.url + "/oauth/token", {
 			method: "POST",
 			body: form
-		}).then(res => res.json());
+		});
-		this.loginData = data;
+		if (!res.ok) throw new Error("HTTP "+ res.status);
+		this.loginData = await res.json();
 		writeFileSync(`logindata/${this.username}.json`, JSON.stringify(this.loginData));
 	}
 
@@ -46,6 +47,7 @@ export default class Bot {
 				"Authorization": `${this.loginData.token_type} ${this.loginData.access_token}`
 			}
 		});
+		if (!res.ok) throw new Error("HTTP "+ res.status);
 		var json = await res.json();
 		console.log("posted", res.status, json.uri || json);
 		return json;
@@ -61,6 +63,7 @@ export default class Bot {
 				"Authorization": `${this.loginData.token_type} ${this.loginData.access_token}`
 			}
 		});
+		if (!res.ok) throw new Error("HTTP "+ res.status);
 		var json = await res.json();
 		console.log("uploaded file", res.status, json.url);
 		return json;

index.js

@@ -1,9 +1,12 @@
 import {unescape} from 'html-escaper';
+import fetchRetry from "fetch-retry";
+import { appendFileSync } from "fs";
 import credentials from "./credentials.json" assert { type: 'json' };
 import Bot from "./Bot.js";
 import { getPostDataById, getNewPixivPosts } from "./pixiv.js";
 
 process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
+global.fetch = fetchRetry(global.fetch);
 
 var mikubot = new Bot({
 	url: "https://mikuobsession.net",
@@ -26,35 +29,31 @@ await mikubot_nsfw.login();
 
 var newPosts = await getNewPixivPosts("初音ミク");
 
-posts: for (let post of newPosts) {
+for (let post of newPosts) {
 	let bot = post.xRestrict ? mikubot_nsfw : mikubot;
 	let url = `https://www.pixiv.net/en/artworks/${post.id}`;
-	let attempts = 0, error;
+	try {
-	do {
+		let {images, illust} = await getPostDataById(post.id);
-		attempts++;
+		let date = new Date(illust.createDate);
-		if (attempts > 1) console.log("attempt", attempts);
+		let dateString = date.toLocaleDateString("en-US", {timeZone: "JST", month: "long", day: "numeric", year: "numeric"});
-		try {
+		let timeString = date.toLocaleTimeString("en-US", {timeZone: "JST", hour12: true, hour: "numeric", "minute": "numeric"}) + " JST";
-			let {images, illust} = await getPostDataById(post.id);
+		let status = `<b>${illust.title}</b> / ${illust.userName} / ${dateString} ${timeString}<br>${unescape(illust.description)}<br>${illust.aiType == 2 ? `#AIgenerated ` : ''}${post.tags.map(tag => `#${tag}`).join(" ")}<br>${url}<br>https://www.pixiv.net/en/users/${illust.userId}`;
-			let date = new Date(illust.createDate).toLocaleString("en-US", {timeZone: "JST", month: "long", day: "numeric", year: "numeric"});
+		if (images.length > 4) {
-			let status = `<b>${illust.title}</b> / ${illust.userName} / ${date}<br>${unescape(illust.description)}<br>${illust.aiType == 2 ? `#AIgenerated ` : ''}${post.tags.map(tag => `#${tag}`).join(" ")}<br>${url}<br>https://www.pixiv.net/en/users/${illust.userId}`;
+			status += `<br>⚠ There are ${images.length} images.`;
-			if (images.length > 4) {
-				status += `<br>⚠ There are ${images.length} images.`;
-			}
-			await bot.post({
-				status,
-				content_type: "text/html",
-				files: images,
-				sensitive: Boolean(post.xRestrict),
-				visibility: "public"
-			});
-			continue posts;
-		} catch(e) {
-			console.error(e.stack);
-			error = e;
 		}
-	} while (attempts < 3)
+		await bot.post({
-	await bot.post({
+			status,
-		status: `${url}\n#error\n${error.stack}`,
+			content_type: "text/html",
-		visibility: "public"
+			files: images,
-	});
+			sensitive: Boolean(post.xRestrict),
+			visibility: "public"
+		});
+		appendFileSync(`known_ids/初音ミク.txt`, "\n" + post.id);
+	} catch(error) {
+		console.error(error.stack);
+		await bot.post({
+			status: `${url}\n#error\n${error.stack}`,
+			visibility: "public"
+		});
+	}
 }

package-lock.json

@@ -5,9 +5,15 @@
 	"packages": {
 		"": {
 			"dependencies": {
+				"fetch-retry": "^6.0.0",
 				"html-escaper": "^3.0.3"
 			}
 		},
+		"node_modules/fetch-retry": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
+			"integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag=="
+		},
 		"node_modules/html-escaper": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-3.0.3.tgz",
@@ -15,6 +21,11 @@
 		}
 	},
 	"dependencies": {
+		"fetch-retry": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
+			"integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag=="
+		},
 		"html-escaper": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-3.0.3.tgz",

package.json

@@ -1,6 +1,7 @@
 {
 	"type": "module",
 	"dependencies": {
+		"fetch-retry": "^6.0.0",
 		"html-escaper": "^3.0.3"
 	}
 }

pixiv.js

@@ -21,8 +21,7 @@ export async function getNewPixivPosts(tag = "初音ミク") {
 			}
 		}).then(res => res.json());
 		if (data.error) {
-			console.error(data);
+			throw new Error(JSON.stringify(data));
-			break;
 		}
 
 		for (let post of data.body.illustManga.data) {
@@ -36,7 +35,8 @@ export async function getNewPixivPosts(tag = "初音ミク") {
 		await sleep(1);
 	}
 
-	return {
+	return newPosts.reverse();
+	/*return {
 		[Symbol.iterator]() {
 			return this;
 		},
@@ -47,7 +47,7 @@ export async function getNewPixivPosts(tag = "初音ミク") {
 			}
 			return {value, done: !Boolean(value)}
 		}
-	}
+	}*/
 }
 
 async function sleep(seconds) {