@wahaha216/koishi-plugin-jmcomic 0.2.8 → 0.2.9

package/lib/abstract/JMClientAbstract.d.ts

@@ -1,4 +1,3 @@
-import crypto from "crypto";
 import { IJMSearchResult, IJMUser } from "../types/JMClient";
 import { JMPhotoAbstract } from "./JMPhotoAbstract";
 import { JMAlbumAbstract } from "./JMAlbumAbstract";
@@ -84,10 +83,4 @@ export declare abstract class JMClientAbstract {
      * @param single 类型为本子时，该本子是否是单章节
      */
     abstract decodeByPhoto(photo: JMPhotoAbstract, type: "photo" | "album", albumId: string, single: boolean): Promise<void>;
-    /**
-     * 使用MD5将字符串加密成十六进制
-     * @param key 要计算MD5的字符串
-     * @returns 十六进制MD5
-     */
-    md5Hex(key: string, inputEncoding?: crypto.Encoding): string;
 }

package/lib/entity/JMAppClient.d.ts

@@ -8,10 +8,6 @@ import { JMPhotoAbstract } from "../abstract/JMPhotoAbstract";
 import { JMAppBlog } from "./JMAppBlog";
 import Puppeteer from "koishi-plugin-puppeteer";
 export declare class JMAppClient extends JMClientAbstract {
-    static APP_VERSION: string;
-    static APP_TOKEN_SECRET: string;
-    static APP_TOKEN_SECRET_2: string;
-    static APP_DATA_SECRET: string;
     /**
      * koishi 配置项
      */
@@ -67,12 +63,4 @@ export declare class JMAppClient extends JMClientAbstract {
      * @returns 请求时所需的token和tokenparam
      */
     private getTokenAndTokenParam;
-    /**
-     * 解密加密字符串
-     * @param timestamp 请求时传递的时间戳
-     * @param base64 待解密的字符串
-     * @param secret
-     * @returns 解密结果，JSON
-     */
-    private decodeBase64;
 }

package/lib/error/allDomainFailed.error.d.ts

@@ -0,0 +1,3 @@
+export declare class AllDomainFailedError extends Error {
+    constructor(message?: string);
+}

package/lib/error/index.d.ts

@@ -1,6 +1,7 @@
-import { AlbumNotExistError } from "../error/albumNotExist.error";
-import { PhotoNotExistError } from "../error/photoNotExist.error";
-import { MySqlError } from "../error/mysql.error";
-import { EmptyBufferError } from "../error/emptybuffer.error";
-import { OverRetryError } from "../error/overRetry.error";
-export { AlbumNotExistError, PhotoNotExistError, MySqlError, EmptyBufferError, OverRetryError, };
+import { AlbumNotExistError } from "./albumNotExist.error";
+import { PhotoNotExistError } from "./photoNotExist.error";
+import { MySqlError } from "./mysql.error";
+import { EmptyBufferError } from "./emptybuffer.error";
+import { OverRetryError } from "./overRetry.error";
+import { AllDomainFailedError } from "./allDomainFailed.error";
+export { AlbumNotExistError, PhotoNotExistError, MySqlError, EmptyBufferError, OverRetryError, AllDomainFailedError, };

package/lib/index.js

@@ -78,10 +78,41 @@ var JM_IMAGE_URL_LIST = [
   "cdn-msp.jmapinodeudzn.net",
   "cdn-msp3.jmapinodeudzn.net"
 ];
+var JM_API_URL_DOMAIN_SERVER_LIST = [
+  "https://rup4a04-c01.tos-ap-southeast-1.bytepluses.com/newsvr-2025.txt",
+  "https://rup4a04-c02.tos-cn-hongkong.bytepluses.com/newsvr-2025.txt"
+];
+var JM_APP_VERSION = "1.7.9";
+var JM_APP_TOKEN_SECRET = "18comicAPP";
+var JM_APP_TOKEN_SECRET_2 = "18comicAPPContent";
+var JM_APP_DATA_SECRET = "185Hcomic3PAPP7R";
+var JM_API_DOMAIN_SERVER_SECRET = "diosfjckwpqpdfjkvnqQjsik";
 
 // src/utils/Utils.ts
 var import_path = require("path");
 
+// src/error/albumNotExist.error.ts
+var AlbumNotExistError = class extends Error {
+  static {
+    __name(this, "AlbumNotExistError");
+  }
+  constructor(message) {
+    super(message);
+    this.name = "AlbumNotExistError";
+  }
+};
+
+// src/error/photoNotExist.error.ts
+var PhotoNotExistError = class extends Error {
+  static {
+    __name(this, "PhotoNotExistError");
+  }
+  constructor(message) {
+    super(message);
+    this.name = "PhotoNotExistError";
+  }
+};
+
 // src/error/mysql.error.ts
 var MySqlError = class extends Error {
   static {
@@ -93,6 +124,17 @@ var MySqlError = class extends Error {
   }
 };
 
+// src/error/emptybuffer.error.ts
+var EmptyBufferError = class extends Error {
+  static {
+    __name(this, "EmptyBufferError");
+  }
+  constructor(message) {
+    super(message);
+    this.name = "EmptyBufferError";
+  }
+};
+
 // src/error/overRetry.error.ts
 var OverRetryError = class extends Error {
   static {
@@ -104,18 +146,19 @@ var OverRetryError = class extends Error {
   }
 };
 
-// src/error/emptybuffer.error.ts
-var EmptyBufferError = class extends Error {
+// src/error/allDomainFailed.error.ts
+var AllDomainFailedError = class extends Error {
   static {
-    __name(this, "EmptyBufferError");
+    __name(this, "AllDomainFailedError");
   }
   constructor(message) {
     super(message);
-    this.name = "EmptyBufferError";
+    this.name = "AllDomainFailedError";
   }
 };
 
 // src/utils/Utils.ts
+var import_crypto = require("crypto");
 function fileExistsAsync(path) {
   try {
     (0, import_fs.accessSync)(path, import_fs.constants.F_OK);
@@ -203,8 +246,9 @@ async function requestWithRetry(url, method, config = {}, http, pluginsConfig, l
   }
 }
 __name(requestWithRetry, "requestWithRetry");
-async function requestWithUrlSwitch(url, method, config = {}, http, pluginsConfig, logger, type = "CLIENT", urlIndex = 0) {
+async function requestWithUrlSwitch(url, method, config = {}, http, pluginsConfig, logger, type = "CLIENT", urlIndex = 0, isUpdate = false) {
   const list = type === "CLIENT" ? JM_CLIENT_URL_LIST : JM_IMAGE_URL_LIST;
+  console.log(list);
   const urlCount = list.length;
   const url_bak = url;
   if (url.startsWith("/")) {
@@ -225,12 +269,13 @@ async function requestWithUrlSwitch(url, method, config = {}, http, pluginsConfi
       }
       return res;
     } else {
-      throw new Error("所有域名请求失败");
+      throw new AllDomainFailedError();
     }
   } catch (error) {
     const isMysqlError = error instanceof MySqlError;
     const isEmptyBuffer = error instanceof EmptyBufferError;
     const isOverRetryError = error instanceof OverRetryError;
+    const isAllDomainFailedError = error instanceof AllDomainFailedError;
     if (isMysqlError || isEmptyBuffer || isOverRetryError) {
       logger.info(`请求失败，尝试切换域名... ${urlIndex + 1}/${urlCount}`);
       return await requestWithUrlSwitch(
@@ -241,7 +286,23 @@ async function requestWithUrlSwitch(url, method, config = {}, http, pluginsConfi
         pluginsConfig,
         logger,
         type,
-        urlIndex + 1
+        urlIndex + 1,
+        isUpdate
+      );
+    } else if (isAllDomainFailedError && !isUpdate) {
+      logger.info(`请求失败，尝试更新域名...`);
+      const res = await updateApiDomain(http, pluginsConfig, logger);
+      if (!res) throw new AllDomainFailedError();
+      return await requestWithUrlSwitch(
+        url_bak,
+        method,
+        config,
+        http,
+        pluginsConfig,
+        logger,
+        type,
+        0,
+        true
       );
     }
     throw new Error(error);
@@ -278,13 +339,55 @@ function formatFileName(originName, name2, id, index) {
   return originName.replaceAll("{{name}}", name2).replaceAll("{{id}}", id).replaceAll("{{index}}", index ? `${index}` : "").trim();
 }
 __name(formatFileName, "formatFileName");
+function md5Hex(key, inputEncoding = "utf-8") {
+  return (0, import_crypto.createHash)("md5").update(key, inputEncoding).digest("hex");
+}
+__name(md5Hex, "md5Hex");
+function decodeBase64(base64, timestamp, secret = JM_APP_DATA_SECRET) {
+  const dataB64 = Buffer.from(base64, "base64");
+  const md5 = md5Hex(`${timestamp}${secret}`);
+  const key = Buffer.from(md5);
+  const decipher = (0, import_crypto.createDecipheriv)("aes-256-ecb", key, null);
+  let dataAES = decipher.update(dataB64);
+  let decrypted = Buffer.concat([dataAES, decipher.final()]);
+  const decodedString = decrypted.toString("utf-8");
+  return JSON.parse(decodedString);
+}
+__name(decodeBase64, "decodeBase64");
+async function updateApiDomain(http, config, logger) {
+  for (const url of JM_API_URL_DOMAIN_SERVER_LIST) {
+    try {
+      const encodeText = await requestWithRetry(
+        url,
+        "GET",
+        { responseType: "text" },
+        http,
+        config,
+        logger
+      );
+      const domainJson = decodeBase64(
+        encodeText,
+        "",
+        JM_API_DOMAIN_SERVER_SECRET
+      );
+      JM_CLIENT_URL_LIST.splice(0, JM_CLIENT_URL_LIST.length);
+      JM_CLIENT_URL_LIST.push(...domainJson.Server);
+      console.log(domainJson);
+      console.log(JM_CLIENT_URL_LIST);
+      return true;
+    } catch (error) {
+      console.log(error);
+    }
+  }
+  return false;
+}
+__name(updateApiDomain, "updateApiDomain");
 
 // src/entity/JMAppClient.ts
 var import_crypto3 = require("crypto");
 var import_form_data = __toESM(require("form-data"));
 
 // src/abstract/JMClientAbstract.ts
-var import_crypto = __toESM(require("crypto"));
 var JMClientAbstract = class {
   static {
     __name(this, "JMClientAbstract");
@@ -299,14 +402,6 @@ var JMClientAbstract = class {
   getRoot() {
     return this.root;
   }
-  /**
-   * 使用MD5将字符串加密成十六进制
-   * @param key 要计算MD5的字符串
-   * @returns 十六进制MD5
-   */
-  md5Hex(key, inputEncoding = "utf-8") {
-    return import_crypto.default.createHash("md5").update(key, inputEncoding).digest("hex");
-  }
 };
 
 // src/abstract/JMPhotoAbstract.ts
@@ -751,28 +846,6 @@ var import_path3 = require("path");
 var import_sharp2 = __toESM(require("sharp"));
 var import_muhammara = require("muhammara");
 
-// src/error/albumNotExist.error.ts
-var AlbumNotExistError = class extends Error {
-  static {
-    __name(this, "AlbumNotExistError");
-  }
-  constructor(message) {
-    super(message);
-    this.name = "AlbumNotExistError";
-  }
-};
-
-// src/error/photoNotExist.error.ts
-var PhotoNotExistError = class extends Error {
-  static {
-    __name(this, "PhotoNotExistError");
-  }
-  constructor(message) {
-    super(message);
-    this.name = "PhotoNotExistError";
-  }
-};
-
 // src/abstract/JMBlogAbstract.ts
 var JMBlogAbstract = class {
   static {
@@ -832,14 +905,10 @@ var JMAppBlog = class _JMAppBlog extends JMBlogAbstract {
 };
 
 // src/entity/JMAppClient.ts
-var JMAppClient = class _JMAppClient extends JMClientAbstract {
+var JMAppClient = class extends JMClientAbstract {
   static {
     __name(this, "JMAppClient");
   }
-  static APP_VERSION = "1.7.9";
-  static APP_TOKEN_SECRET = "18comicAPP";
-  static APP_TOKEN_SECRET_2 = "18comicAPPContent";
-  static APP_DATA_SECRET = "185Hcomic3PAPP7R";
   /**
    * koishi 配置项
    */
@@ -883,7 +952,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       formData,
       { headers, responseType: "json" }
     );
-    return this.decodeBase64(res.data, timestamp);
+    return decodeBase64(res.data, timestamp);
   }
   async search(keyword) {
     if (this.config.debug) this.logger.info(`搜索本子: ${keyword}`);
@@ -901,7 +970,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       this.config,
       this.logger
     );
-    return this.decodeBase64(searchRes.data, timestamp);
+    return decodeBase64(searchRes.data, timestamp);
   }
   async getAlbumById(id) {
     if (this.config.debug) this.logger.info(`获取本子(${id})信息`);
@@ -919,7 +988,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       this.config,
       this.logger
     );
-    const album_json = this.decodeBase64(res.data, timestamp);
+    const album_json = decodeBase64(res.data, timestamp);
     if (!album_json.name) throw new AlbumNotExistError();
     const album = JMAppAlbum.fromJson(album_json);
     const series = album.getSeries();
@@ -954,7 +1023,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       this.config,
       this.logger
     );
-    const photo_json = this.decodeBase64(res.data, timestamp);
+    const photo_json = decodeBase64(res.data, timestamp);
     if (!photo_json.name) throw new PhotoNotExistError();
     const photo = JMAppPhoto.fromJson(photo_json);
     const images = photo.getImages();
@@ -978,7 +1047,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
       this.config,
       this.logger
     );
-    const blog_json = this.decodeBase64(res.data, timestamp);
+    const blog_json = decodeBase64(res.data, timestamp);
     if (!blog_json?.info?.title) throw new AlbumNotExistError();
     return JMAppBlog.fromJson(blog_json);
   }
@@ -1325,7 +1394,7 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
     const timestamp = this.getTimeStamp();
     const { token, tokenparam } = this.getTokenAndTokenParam(
       timestamp,
-      _JMAppClient.APP_TOKEN_SECRET_2
+      JM_APP_TOKEN_SECRET_2
     );
     const html = await requestWithUrlSwitch(
       "/chapter_view_template",
@@ -1344,29 +1413,12 @@ var JMAppClient = class _JMAppClient extends JMClientAbstract {
    * @param secret 密钥
    * @returns 请求时所需的token和tokenparam
    */
-  getTokenAndTokenParam(timestamp, secret = _JMAppClient.APP_TOKEN_SECRET, version = _JMAppClient.APP_VERSION) {
+  getTokenAndTokenParam(timestamp, secret = JM_APP_TOKEN_SECRET, version = JM_APP_VERSION) {
     const key = `${timestamp}${secret}`;
     const token = (0, import_crypto3.createHash)("md5").update(key).digest("hex");
     const tokenparam = `${timestamp},${version}`;
     return { token, tokenparam };
   }
-  /**
-   * 解密加密字符串
-   * @param timestamp 请求时传递的时间戳
-   * @param base64 待解密的字符串
-   * @param secret
-   * @returns 解密结果，JSON
-   */
-  decodeBase64(base64, timestamp, secret = _JMAppClient.APP_DATA_SECRET) {
-    const dataB64 = Buffer.from(base64, "base64");
-    const md5 = this.md5Hex(`${timestamp}${secret}`);
-    const key = Buffer.from(md5);
-    const decipher = (0, import_crypto3.createDecipheriv)("aes-256-ecb", key, null);
-    let dataAES = decipher.update(dataB64);
-    let decrypted = Buffer.concat([dataAES, decipher.final()]);
-    const decodedString = decrypted.toString("utf-8");
-    return JSON.parse(decodedString);
-  }
 };
 
 // src/processors/jmProcessor.ts

package/lib/utils/Const.d.ts

@@ -1,3 +1,9 @@
 export declare const buildHtmlContent: (base64Images: string[]) => string;
 export declare const JM_CLIENT_URL_LIST: string[];
 export declare const JM_IMAGE_URL_LIST: string[];
+export declare const JM_API_URL_DOMAIN_SERVER_LIST: string[];
+export declare const JM_APP_VERSION = "1.7.9";
+export declare const JM_APP_TOKEN_SECRET = "18comicAPP";
+export declare const JM_APP_TOKEN_SECRET_2 = "18comicAPPContent";
+export declare const JM_APP_DATA_SECRET = "185Hcomic3PAPP7R";
+export declare const JM_API_DOMAIN_SERVER_SECRET = "diosfjckwpqpdfjkvnqQjsik";

package/lib/utils/Utils.d.ts

@@ -1,6 +1,7 @@
 import { Config } from "..";
 import { HTTP, Logger } from "koishi";
 import { IJMResponse } from "../types/JMClient";
+import { Encoding } from "crypto";
 /**
  * 文件是否存在
  * @param path 文件路径
@@ -48,7 +49,7 @@ export declare function requestWithRetry<T = IJMResponse>(url: string, method: "
  * @param urlIndex 地址下标，默认从0开始尝试
  * @returns 请求结果
  */
-export declare function requestWithUrlSwitch<T = IJMResponse>(url: string, method: "GET" | "POST", config: HTTP.RequestConfig, http: HTTP, pluginsConfig: Config, logger: Logger, type?: "IMAGE" | "CLIENT", urlIndex?: number): Promise<T>;
+export declare function requestWithUrlSwitch<T = IJMResponse>(url: string, method: "GET" | "POST", config: HTTP.RequestConfig, http: HTTP, pluginsConfig: Config, logger: Logger, type?: "IMAGE" | "CLIENT", urlIndex?: number, isUpdate?: boolean): Promise<T>;
 /**
  * 获取文件名和扩展名
  * @param filePath 文件路径
@@ -66,3 +67,13 @@ export declare function getFileInfo(filePath: string): {
  */
 export declare function deleteFewDaysAgoFolders(path: string, days: number): Promise<void>;
 export declare function formatFileName(originName: string, name: string, id: string, index?: number): string;
+export declare function md5Hex(key: string, inputEncoding?: Encoding): string;
+/**
+ * 解密加密字符串
+ * @param timestamp 请求时传递的时间戳
+ * @param base64 待解密的字符串
+ * @param secret
+ * @returns 解密结果，JSON
+ */
+export declare function decodeBase64<T = Record<string, unknown>>(base64: string, timestamp: number | string, secret?: string): T;
+export declare function updateApiDomain(http: HTTP, config: Config, logger: Logger): Promise<boolean>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wahaha216/koishi-plugin-jmcomic",
   "description": "下载JM本子，无需python。支持pdf、zip加密。",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -18,6 +18,13 @@ jm queue
 
 ## 更新日志
 
+<details>
+<summary>0.2.9</summary>
+
+添加所有域名请求失败后，自动更新域名功能
+
+</details>
+
 <details>
 <summary>0.2.8</summary>