fix: replay

ExpTechTW · Jul 25, 2023 · 7766f65 · 7766f65
1 parent 900f980
commit 7766f65
Showing 1 changed file with 27 additions and 23 deletions.
diff --git a/src/core/index/loop.js b/src/core/index/loop.js
@@ -156,7 +156,7 @@ setInterval(() => {
 	}, 1000 - Now().getMilliseconds());
 }, 1_000);
 
-setInterval(async () => {
+setInterval(() => {
 	try {
 		if (!rts_replay_time) return;
 		if (rts_replay_timestamp && rts_replay_time - rts_replay_timestamp > 600_000) {
@@ -166,33 +166,37 @@ setInterval(async () => {
 		const controller = new AbortController();
 		setTimeout(() => {
 			controller.abort();
-		}, 1500);
+		}, 2500);
 		const controller1 = new AbortController();
 		setTimeout(() => {
 			controller1.abort();
-		}, 1500);
+		}, 2500);
 		const _replay_time = Math.round(rts_replay_time / 1000);
-		const t = Date.now();
-		let ans = await fetch(`https://exptech.com.tw/api/v2/trem/rts?time=${_replay_time * 1000}`, { signal: controller.signal })
-			.catch((err) => void 0);
-		console.log(`1 | ${Date.now() - t}`);
-		let ans_eew = await fetch(`https://exptech.com.tw/api/v1/earthquake/info?time=${_replay_time}&type=all`, { signal: controller1.signal })
-			.catch((err) => void 0);
-		console.log(`2 | ${Date.now() - t}`);
-		if (!rts_replay_time) return;
-		if (controller.signal.aborted || ans == undefined) return;
-		if (controller1.signal.aborted || ans_eew == undefined) return;
 		rts_replay_time += 1000;
-		ans = await ans.json();
-		ans_eew = await ans_eew.json();
-		for (let i = 0; i < ans_eew.eew.length; i++) {
-			ans_eew.eew[i].replay_timestamp = ans_eew.eew[i].timestamp;
-			ans_eew.eew[i].replay_time = ans_eew.eew[i].time;
-			ans_eew.eew[i].time = Now().getTime() - (ans_eew.eew[i].timestamp - ans_eew.eew[i].time);
-			ans_eew.eew[i].timestamp = Now().getTime();
-			get_data(ans_eew.eew[i], "http");
-		}
-		on_rts_data(ans);
+		fetch(`https://exptech.com.tw/api/v2/trem/rts?time=${_replay_time * 1000}`, { signal: controller.signal })
+			.then((ans) => ans.json())
+			.then((ans) => {
+				if (!rts_replay_time) return;
+				on_rts_data(ans);
+			})
+			.catch((err) => {
+				log(err, 3, "loop", "replay_rts");
+			});
+		fetch(`https://exptech.com.tw/api/v1/earthquake/info?time=${_replay_time}&type=all`, { signal: controller1.signal })
+			.then((ans) => ans.json())
+			.then((ans_eew) => {
+				if (!rts_replay_time) return;
+				for (let i = 0; i < ans_eew.eew.length; i++) {
+					ans_eew.eew[i].replay_timestamp = ans_eew.eew[i].timestamp;
+					ans_eew.eew[i].replay_time = ans_eew.eew[i].time;
+					ans_eew.eew[i].time = Now().getTime() - (ans_eew.eew[i].timestamp - ans_eew.eew[i].time);
+					ans_eew.eew[i].timestamp = Now().getTime();
+					get_data(ans_eew.eew[i], "http");
+				}
+			})
+			.catch((err) => {
+				log(err, 3, "loop", "replay_eew");
+			});
 		for (const item of document.getElementsByClassName("report replay"))
 			item.style.border = "2px solid red";
 		setTimeout(() => {