koishi-plugin-bilibili-notify 3.2.1-alpha.10 → 3.2.1-alpha.11

package/lib/biliAPI.d.ts

@@ -1,4 +1,5 @@
-import { type Context, Schema, Service } from "koishi";
+import { type Awaitable, type Context, Schema, Service } from "koishi";
+import CacheableLookup from "cacheable-lookup";
 import { type AxiosInstance } from "axios";
 import { CookieJar } from "tough-cookie";
 import type { Notifier } from "@koishijs/plugin-notifier";
@@ -11,7 +12,7 @@ declare class BiliAPI extends Service {
     static inject: string[];
     jar: CookieJar;
     client: AxiosInstance;
-    cacheable: any;
+    cacheable: CacheableLookup;
     apiConfig: BiliAPI.Config;
     loginData: any;
     loginNotifier: Notifier;
@@ -19,6 +20,7 @@ declare class BiliAPI extends Service {
     loginInfoIsLoaded: boolean;
     constructor(ctx: Context, config: BiliAPI.Config);
     protected start(): void | Promise<void>;
+    protected stop(): Awaitable<void>;
     getMixinKey: (orig: string) => string;
     encWbi(params: {
         [key: string]: string | number | object;
@@ -63,7 +65,7 @@ declare class BiliAPI extends Service {
         cookies: any;
         refresh_token: string;
     }>;
-    getCSRF(): any;
+    getCSRF(): string;
     loadCookiesFromDatabase(): Promise<void>;
     enableRefreshCookiesDetect(): void;
     checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;

package/lib/biliAPI.js

@@ -1,22 +1,20 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const koishi_1 = require("koishi");
-const md5_1 = __importDefault(require("md5"));
-const node_crypto_1 = __importDefault(require("node:crypto"));
-const axios_1 = __importDefault(require("axios"));
-const tough_cookie_1 = require("tough-cookie");
-const axios_cookiejar_support_1 = require("axios-cookiejar-support");
-const jsdom_1 = require("jsdom");
-const utils_1 = require("./utils");
+import { Schema, Service } from "koishi";
+import md5 from "md5";
+import crypto from "node:crypto";
+import http from "node:http";
+import https from "node:https";
+import CacheableLookup from "cacheable-lookup";
+import axios from "axios";
+import { CookieJar, Cookie } from "tough-cookie";
+import { wrapper } from "axios-cookiejar-support";
+import { JSDOM } from "jsdom";
+import { Retry } from "./utils";
 const mixinKeyEncTab = [
     46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
     33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40, 61,
@@ -49,11 +47,10 @@ const GET_RELATION_GROUP_DETAIL = "https://api.bilibili.com/x/relation/tag";
 // 直播
 const GET_LIVE_ROOM_INFO_STREAM_KEY = "https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo";
 const GET_LIVE_ROOMS_INFO = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids";
-class BiliAPI extends koishi_1.Service {
+class BiliAPI extends Service {
     static inject = ["database", "notifier"];
     jar;
     client;
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     cacheable;
     apiConfig;
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
@@ -71,6 +68,10 @@ class BiliAPI extends koishi_1.Service {
         // 从数据库加载cookies
         this.loadCookiesFromDatabase();
     }
+    stop() {
+        this.cacheable.uninstall(http.globalAgent);
+        this.cacheable.uninstall(https.globalAgent);
+    }
     // WBI签名
     // 对 imgKey 和 subKey 进行字符顺序打乱编码
     getMixinKey = (orig) => mixinKeyEncTab
@@ -92,7 +93,7 @@ class BiliAPI extends koishi_1.Service {
             return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
         })
             .join("&");
-        const wbi_sign = (0, md5_1.default)(query + mixin_key); // 计算 w_rid
+        const wbi_sign = md5(query + mixin_key); // 计算 w_rid
         return `${query}&w_rid=${wbi_sign}`;
     }
     async getWbi(params) {
@@ -103,8 +104,8 @@ class BiliAPI extends koishi_1.Service {
         return query;
     }
     encrypt(text) {
-        const iv = node_crypto_1.default.randomBytes(16);
-        const cipher = node_crypto_1.default.createCipheriv("aes-256-cbc", Buffer.from(this.apiConfig.key), iv);
+        const iv = crypto.randomBytes(16);
+        const cipher = crypto.createCipheriv("aes-256-cbc", Buffer.from(this.apiConfig.key), iv);
         const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
         return `${iv.toString("hex")}:${encrypted.toString("hex")}`;
     }
@@ -112,7 +113,7 @@ class BiliAPI extends koishi_1.Service {
         const textParts = text.split(":");
         const iv = Buffer.from(textParts.shift(), "hex");
         const encryptedText = Buffer.from(textParts.join(":"), "hex");
-        const decipher = node_crypto_1.default.createDecipheriv("aes-256-cbc", Buffer.from(this.apiConfig.key), iv);
+        const decipher = crypto.createDecipheriv("aes-256-cbc", Buffer.from(this.apiConfig.key), iv);
         const decrypted = Buffer.concat([
             decipher.update(encryptedText),
             decipher.final(),
@@ -288,10 +289,15 @@ class BiliAPI extends koishi_1.Service {
         return userAgents[index];
     }
     createNewClient() {
+        // 创建DNS缓存
+        this.cacheable = new CacheableLookup();
+        // 安装到http和https
+        this.cacheable.install(http.globalAgent);
+        this.cacheable.install(https.globalAgent);
         // 创建cookieJar
-        this.jar = new tough_cookie_1.CookieJar();
+        this.jar = new CookieJar();
         // 包装cookieJar
-        this.client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({
+        this.client = wrapper(axios.create({
             jar: this.jar,
             headers: {
                 "Content-Type": "application/json",
@@ -407,7 +413,7 @@ class BiliAPI extends koishi_1.Service {
                 sameSite = cookieData.sameSite;
             }
             // 创建一个完整的 Cookie 实例
-            const cookie = new tough_cookie_1.Cookie({
+            const cookie = new Cookie({
                 key: cookieData.key,
                 value: cookieData.value,
                 expires: new Date(cookieData.expires),
@@ -420,7 +426,7 @@ class BiliAPI extends koishi_1.Service {
             this.jar.setCookieSync(cookie, `http${cookie.secure ? "s" : ""}://${cookie.domain}${cookie.path}`, {});
         }
         // 对于某些 IP 地址，需要在 Cookie 中提供任意非空的 buvid3 字段
-        const buvid3Cookie = new tough_cookie_1.Cookie({
+        const buvid3Cookie = new Cookie({
             key: "buvid3",
             value: "some_non_empty_value", // 设置任意非空值
             expires, // 设置过期时间
@@ -493,7 +499,7 @@ class BiliAPI extends koishi_1.Service {
             // 如果请求失败，有可能是404，直接刷新cookie
         }
         // 定义Key
-        const publicKey = await node_crypto_1.default.subtle.importKey("jwk", {
+        const publicKey = await crypto.subtle.importKey("jwk", {
             kty: "RSA",
             n: "y4HdjgJHBlbaBN04VERG4qNBIFHP6a3GozCl75AihQloSWCXC5HDNgyinEnhaQ_4-gaMud_GF50elYXLlCToR9se9Z8z433U3KjM-3Yx7ptKkmQNAMggQwAVKgq3zYAoidNEWuxpkY_mAitTSRLnsJW-NCTa0bqBFF6Wm1MxgfE",
             e: "AQAB",
@@ -501,7 +507,7 @@ class BiliAPI extends koishi_1.Service {
         // 定义获取CorrespondPath方法
         async function getCorrespondPath(timestamp) {
             const data = new TextEncoder().encode(`refresh_${timestamp}`);
-            const encrypted = new Uint8Array(await node_crypto_1.default.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data));
+            const encrypted = new Uint8Array(await crypto.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data));
             return encrypted.reduce((str, c) => str + c.toString(16).padStart(2, "0"), "");
         }
         // 获取CorrespondPath
@@ -510,7 +516,7 @@ class BiliAPI extends koishi_1.Service {
         // 获取refresh_csrf
         const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
         // 创建一个虚拟的DOM元素
-        const { document } = new jsdom_1.JSDOM(refreshCsrfHtml).window;
+        const { document } = new JSDOM(refreshCsrfHtml).window;
         // 提取标签name为1-name的内容
         const targetElement = document.getElementById("1-name");
         const refresh_csrf = targetElement ? targetElement.textContent : null;
@@ -578,7 +584,7 @@ class BiliAPI extends koishi_1.Service {
     }
 }
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getTheUserWhoIsLiveStreaming() 第${attempts}次失败: ${error.message}`);
@@ -586,7 +592,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getTheUserWhoIsLiveStreaming", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLiveRoomInfoStreamKey() 第${attempts}次失败: ${error.message}`);
@@ -594,7 +600,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLiveRoomInfoStreamKey", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLiveRoomInfoByUids() 第${attempts}次失败: ${error.message}`);
@@ -602,7 +608,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLiveRoomInfoByUids", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getServerUTCTime() 第${attempts}次失败: ${error.message}`);
@@ -610,7 +616,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getServerUTCTime", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getTimeNow() 第${attempts}次失败: ${error.message}`);
@@ -618,7 +624,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getTimeNow", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getAllGroup() 第${attempts}次失败: ${error.message}`);
@@ -626,7 +632,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getAllGroup", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`removeUserFromGroup() 第${attempts}次失败: ${error.message}`);
@@ -634,7 +640,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "removeUserFromGroup", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`copyUserToGroup() 第${attempts}次失败: ${error.message}`);
@@ -642,7 +648,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "copyUserToGroup", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getUserSpaceDynamic() 第${attempts}次失败: ${error.message}`);
@@ -650,7 +656,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getUserSpaceDynamic", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`createGroup() 第${attempts}次失败: ${error.message}`);
@@ -658,7 +664,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "createGroup", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getAllDynamic() 第${attempts}次失败: ${error.message}`);
@@ -666,7 +672,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getAllDynamic", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`hasNewDynamic() 第${attempts}次失败: ${error.message}`);
@@ -674,7 +680,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "hasNewDynamic", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`follow() 第${attempts}次失败: ${error.message}`);
@@ -682,7 +688,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "follow", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getRelationGroupDetail() 第${attempts}次失败: ${error.message}`);
@@ -690,7 +696,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getRelationGroupDetail", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getCookieInfo() 第${attempts}次失败: ${error.message}`);
@@ -698,7 +704,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getCookieInfo", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getUserInfo() 第${attempts}次失败: ${error.message}`);
@@ -706,7 +712,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getUserInfo", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getWbiKeys() 第${attempts}次失败: ${error.message}`);
@@ -714,7 +720,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getWbiKeys", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getMyselfInfo() 第${attempts}次失败: ${error.message}`);
@@ -722,7 +728,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getMyselfInfo", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLoginQRCode() 第${attempts}次失败: ${error.message}`);
@@ -730,7 +736,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLoginQRCode", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLoginStatus() 第${attempts}次失败: ${error.message}`);
@@ -738,7 +744,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLoginStatus", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getLiveRoomInfo() 第${attempts}次失败: ${error.message}`);
@@ -746,7 +752,7 @@ __decorate([
     })
 ], BiliAPI.prototype, "getLiveRoomInfo", null);
 __decorate([
-    (0, utils_1.Retry)({
+    Retry({
         attempts: 3,
         onFailure(error, attempts) {
             this.logger.error(`getMasterInfo() 第${attempts}次失败: ${error.message}`);
@@ -754,11 +760,11 @@ __decorate([
     })
 ], BiliAPI.prototype, "getMasterInfo", null);
 (function (BiliAPI) {
-    BiliAPI.Config = koishi_1.Schema.object({
-        userAgent: koishi_1.Schema.string(),
-        key: koishi_1.Schema.string()
+    BiliAPI.Config = Schema.object({
+        userAgent: Schema.string(),
+        key: Schema.string()
             .pattern(/^[0-9a-f]{32}$/)
             .required(),
     });
 })(BiliAPI || (BiliAPI = {}));
-exports.default = BiliAPI;
+export default BiliAPI;

package/lib/blive.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const koishi_1 = require("koishi");
-const blive_message_listener_1 = require("@akokko/blive-message-listener");
-class BLive extends koishi_1.Service {
+import { Service } from "koishi";
+import { startListen, } from "@akokko/blive-message-listener";
+class BLive extends Service {
     // 必要服务
     static inject = ["ba"];
     // 定义类属性
@@ -24,7 +22,7 @@ class BLive extends koishi_1.Service {
         // 获取自身信息
         const mySelfInfo = await this.ctx.ba.getMyselfInfo();
         // 创建实例并保存到Record中
-        this.listenerRecord[roomId] = (0, blive_message_listener_1.startListen)(Number.parseInt(roomId), handler, {
+        this.listenerRecord[roomId] = startListen(Number.parseInt(roomId), handler, {
             ws: {
                 headers: {
                     Cookie: cookiesStr,
@@ -55,4 +53,4 @@ class BLive extends koishi_1.Service {
         this.logger.warn(`${roomId}直播间弹幕监听未成功关闭`);
     }
 }
-exports.default = BLive;
+export default BLive;