koishi-plugin-bilibili-notify 3.2.1-alpha.0 → 3.2.1-alpha.2

package/lib/biliAPI.d.ts

@@ -1,5 +1,4 @@
 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";
@@ -12,7 +11,7 @@ declare class BiliAPI extends Service {
     static inject: string[];
     jar: CookieJar;
     client: AxiosInstance;
-    cacheable: CacheableLookup;
+    cacheable: any;
     apiConfig: BiliAPI.Config;
     loginData: any;
     loginNotifier: Notifier;
@@ -21,6 +20,7 @@ declare class BiliAPI extends Service {
     constructor(ctx: Context, config: BiliAPI.Config);
     protected start(): void | Promise<void>;
     protected stop(): Awaitable<void>;
+    init(): Promise<void>;
     getMixinKey: (orig: string) => string;
     encWbi(params: {
         [key: string]: string | number | object;

package/lib/biliAPI.js

@@ -1,10 +1,43 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,7 +47,6 @@ const md5_1 = __importDefault(require("md5"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_http_1 = __importDefault(require("node:http"));
 const node_https_1 = __importDefault(require("node:https"));
-const cacheable_lookup_1 = __importDefault(require("cacheable-lookup"));
 const axios_1 = __importDefault(require("axios"));
 const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
@@ -56,6 +88,7 @@ class BiliAPI extends koishi_1.Service {
     static inject = ["database", "notifier"];
     jar;
     client;
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     cacheable;
     apiConfig;
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
@@ -68,6 +101,8 @@ class BiliAPI extends koishi_1.Service {
         this.apiConfig = config;
     }
     start() {
+        // init
+        this.init();
         // 创建新的http客户端(axios)
         this.createNewClient();
         // 从数据库加载cookies
@@ -78,6 +113,15 @@ class BiliAPI extends koishi_1.Service {
         this.cacheable.uninstall(node_http_1.default.globalAgent);
         this.cacheable.uninstall(node_https_1.default.globalAgent);
     }
+    async init() {
+        // 导入纯ESM模块Cacheable
+        const { default: CacheableLookup } = await Promise.resolve().then(() => __importStar(require("cacheable-lookup")));
+        // 创建Cacheable
+        this.cacheable = new CacheableLookup();
+        // 安装到http和https
+        this.cacheable.install(node_http_1.default.globalAgent);
+        this.cacheable.install(node_https_1.default.globalAgent);
+    }
     // WBI签名
     // 对 imgKey 和 subKey 进行字符顺序打乱编码
     getMixinKey = (orig) => mixinKeyEncTab
@@ -295,11 +339,6 @@ class BiliAPI extends koishi_1.Service {
         return userAgents[index];
     }
     createNewClient() {
-        // 创建DNS缓存
-        this.cacheable = new cacheable_lookup_1.default();
-        // 安装到http和https
-        this.cacheable.install(node_http_1.default.globalAgent);
-        this.cacheable.install(node_https_1.default.globalAgent);
         // 创建cookieJar
         this.jar = new tough_cookie_1.CookieJar();
         // 包装cookieJar

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.1-alpha.0",
+  "version": "3.2.1-alpha.2",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -256,7 +256,9 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.2.0-alpha.5 修复：直播检测 `WS` 模式下，直播中推送卡片 `累计观看人数` 位置错误显示为 `粉丝数变化` 、转发动态的留言文字不显示； 优化：直播检测 `API` 模式下，直播推送语 `-watched` 固定显示为 `API模式无法获取`； 
 - ver 3.2.0-alpha.6 优化：调整配置项；
 - ver 3.2.0-alpha.7 修复：自 `3.1.7` 版本 `pushImagesInDynamic` 功能失效；
-- ver 3.2.1-alpha.0 新增：多个相同平台bot可以选择某个群聊/频道指定机器人发送； 优化：直播检测 `WS` 模式下播后仍推送； 修复：打开 `pushImagesInDynamic` 功能时，如果发送的动态里没有图片则会报错 `TypeError: Cannot read properties of null (reading 'opus')` 
+- ver 3.2.1-alpha.0 新增：多个相同平台bot可以选择某个群聊/频道指定机器人发送； 优化：直播检测 `WS` 模式下播后仍推送、添加依赖 `cacheable-lookup` 优化网络； 修复：打开 `pushImagesInDynamic` 功能时，如果发送的动态里没有图片则会报错 `TypeError: Cannot read properties of null (reading 'opus')` 
+- ver 3.2.1-alpha.1 调整：将项目构建产物调整为 `esm`；
+- ver 3.2.1-alpha.2 调整：将项目构建产物调整回 `cjs` 、将依赖 `cacheable-lookup` 导入方式更改为动态导入；
 
 ## 交流群
 

package/lib/utils/retry.d.ts

@@ -1,6 +0,0 @@
-interface RetryOptions {
-    attempts: number;
-    onFailure?: (error: Error, attempts: number) => Promise<void> | void;
-}
-declare function Retry(options?: RetryOptions): MethodDecorator;
-export default Retry;

package/lib/utils/retry.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function Retry(options = { attempts: 3 }) {
-    return function (target, propertyKey, descriptor) {
-        const originalMethod = descriptor.value;
-        descriptor.value = async function (...args) {
-            let lastError;
-            for (let i = 0; i < options.attempts; i++) {
-                try {
-                    return await originalMethod.apply(this, args);
-                }
-                catch (error) {
-                    lastError = error;
-                    if (options.onFailure) {
-                        await options.onFailure.call(this, lastError, i + 1);
-                    }
-                }
-            }
-            throw lastError;
-        };
-        return descriptor;
-    };
-}
-exports.default = Retry;

package/lib/utils/withLock.d.ts

@@ -1,7 +0,0 @@
-/**
- * 高阶函数：为函数添加锁机制
- * @param {Function} fn - 需要包装的原始函数
- * @returns {Function} 带锁功能的函数
- */
-declare function withLock(fn: any): (...args: any[]) => void;
-export default withLock;

package/lib/utils/withLock.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * 高阶函数：为函数添加锁机制
- * @param {Function} fn - 需要包装的原始函数
- * @returns {Function} 带锁功能的函数
- */
-function withLock(fn) {
-    // 判断是否是异步函数
-    const isAsync = fn.constructor.name === 'AsyncFunction';
-    // 定义锁标志
-    let locked = false;
-    // 判断是否为异步函数
-    if (isAsync) {
-        // 变为Promise
-        return function (...args) {
-            // 已加锁则跳过执行
-            if (locked)
-                return;
-            // 获取锁
-            locked = true;
-            // 将异步函数转为Promise链
-            Promise.resolve(fn(...args))
-                .catch(err => {
-                // 打印错误
-                console.error("Execution error:", err);
-                // 重新抛出错误
-                throw err;
-            })
-                .finally(() => {
-                // 确保释放锁
-                locked = false;
-            });
-        };
-    }
-    // 不是异步函数
-    return function (...args) {
-        // 已加锁则跳过执行
-        if (locked)
-            return;
-        // 获取锁
-        locked = true;
-        try {
-            // 执行函数
-            fn(...args);
-        }
-        catch (err) {
-            // 打印错误
-            console.error("Execution error:", err);
-            // 重新抛出错误
-            throw err;
-        }
-        finally {
-            // 无论成功失败都释放锁
-            locked = false;
-        }
-    };
-}
-exports.default = withLock;