Merge pull request #49 from undefined-hestudio/main

### 1.4.6
1. external.refreshtask: Fix the problem of code structure update causing large-scale error reporting of scheduled tasks.

Author: undefined-hestudio

CHANGELOG

@@ -1,3 +1,6 @@
+### 1.4.6
+1. external.refreshtask: Fix the problem of code structure update causing large-scale error reporting of scheduled tasks.
+
 ### 1.4.5
 1. external.refreshtask: Fix an issue where scheduled tasks have stopped running even though they haven't finished running yet.
 2. server.getupdate: Optimize the error-throwing mechanism when checking for updates.

get.js

@@ -1,5 +1,5 @@
 require("dotenv").config();
-const VERSION = "1.4.5";
+const VERSION = "1.4.6";
 
 const express = require("express");
 const schedule = require("node-schedule");
@@ -185,15 +185,6 @@ if (
 }
 
 function cacheimg() {
-  if (typeof hbwgConfig.refreshtask === "function") {
-    try {
-      logwarn("task is running...");
-      hbwgConfig.refreshtask();
-      logwarn("task is finish.");
-    } catch (e) {
-      logerr(`refreshtask: ${e}`);
-    }
-  }
   if (hbwgConfig.getupdate !== false) {
     const requestOptions = {
       method: "GET",
@@ -206,22 +197,22 @@ function cacheimg() {
     }
     fetch(hbwgConfig.packageurl, requestOptions)
       .then((response) => response.json())
-      .then((result) => AfterGetVersion(result))
+      .then(async (result) => await AfterGetVersion(result))
       .catch((error) => logerr(`getupdate: ${error}`));
   }
   fetch(hbwgConfig.api, {
     method: "GET",
     redirect: "follow",
   })
     .then((response) => response.json())
-    .then((result) => {
+    .then(async (result) => {
       hbwgConfig.bingsrc = result;
       const url = hbwgConfig.host + result.images[0].url;
-      fetch(url, {
+      await fetch(url, {
         method: "GET",
       })
-        .then((response) => {
-          response.arrayBuffer().then(async (buffer) => {
+        .then(async (response) => {
+          await response.arrayBuffer().then(async (buffer) => {
             await (hbwgConfig.image = Buffer.from(buffer));
           });
         })
@@ -230,8 +221,21 @@ function cacheimg() {
       hbwgConfig.copyrightlink = String(result.images[0].copyrightlink);
       hbwgConfig.title = String(result.images[0].title);
     })
-    .catch((error) => logerr(`source.bingsrc: ${error}`));
-
+    .catch((error) => {
+      logerr(`source.bingsrc: ${error}`);
+      if (hbwgConfig.image == undefined) {
+        process.exit(1);
+      }
+    });
+    if (typeof hbwgConfig.refreshtask === "function") {
+      try {
+        logwarn("task is running...");
+        hbwgConfig.refreshtask();
+        logwarn("task is finish.");
+      } catch (e) {
+        logerr(`refreshtask: ${e}`);
+      }
+    }
   logback("Refresh Successfully!");
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hestudio-bingwallpaper-get",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "A Bing wallpaper API interface that can directly image output images.",
   "main": "get.js",
   "scripts": {