npm - koishi-plugin-subscription - Versions diffs - 0.0.5 → 0.0.7 - Mend

koishi-plugin-subscription 0.0.5 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/index.d.ts CHANGED Viewed

@@ -1,4 +1,9 @@
 import { Context, Dict, Schema, Service, Fragment } from 'koishi';
+interface RecordsItem {
+    app: string;
+    id: string;
+    createdAt: Date;
+}
 interface SubscriptionItem {
     id: number;
     app: string;
@@ -31,17 +36,21 @@ declare module 'koishi' {
     }
     interface Tables {
         subscription_service: SubscriptionItem;
+        subscription_records: RecordsItem;
     }
 }
 declare class SubscriptionService extends Service {
-    readonly tableName = "subscription_service";
+    readonly subTableName = "subscription_service";
+    readonly recTableName = "subscription_records";
     subsConfig: Config;
     appMap: Map<string, string>;
     accountMap: Map<string, string>;
     constructor(ctx: Context, config: Config);
     initMap(): void;
     private getApp;
-    private getAccount;
+    checkExist(app: string, id: string): Promise<boolean>;
+    getAccount(app: string, account: string): string;
+    getName(app: string, account: string): string;
     getAvailableAccounts(app: string): string[];
     getSubscribedGroups(app: string, account: string): Promise<string[]>;
     broadcast(app: string, account: string, content: Fragment): Promise<void>;

package/lib/index.js CHANGED Viewed

@@ -27,6 +27,21 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
+// src/retry.ts
+async function retry(retries, fn, delay = 500) {
+  try {
+    return await fn();
+  } catch (err) {
+    console.log(`剩余${retries}次尝试`, err);
+    if (retries <= 1) throw err;
+    await new Promise((r) => setTimeout(r, delay));
+    return retry(retries - 1, fn, delay * 2);
+  }
+}
+__name(retry, "retry");
+// src/index.tsx
 var import_jsx_runtime = require("@satorijs/element/jsx-runtime");
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
@@ -62,7 +77,8 @@ var SubscriptionService = class extends import_koishi.Service {
     __name(this, "SubscriptionService");
   }
   // 数据表名称
-  tableName = "subscription_service";
+  subTableName = "subscription_service";
+  recTableName = "subscription_records";
   subsConfig;
   appMap;
   accountMap;
@@ -70,7 +86,7 @@ var SubscriptionService = class extends import_koishi.Service {
     super(ctx, "subscription");
     this.subsConfig = config;
     this.initMap();
-    ctx.model.extend(this.tableName, {
+    ctx.model.extend(this.subTableName, {
       id: "unsigned",
       app: "string",
       account: "string",
@@ -80,6 +96,14 @@ var SubscriptionService = class extends import_koishi.Service {
       primary: "id",
       autoInc: true
     });
+    ctx.model.extend(this.recTableName, {
+      app: "string",
+      id: "string",
+      createdAt: "timestamp"
+    }, {
+      primary: ["app", "id"],
+      autoInc: false
+    });
     this.registerCommands(ctx, config);
   }
   initMap() {
@@ -109,9 +133,25 @@ var SubscriptionService = class extends import_koishi.Service {
   getApp(app) {
     return this.appMap.get(app.toLowerCase());
   }
+  async checkExist(app, id) {
+    app = this.getApp(app);
+    if ((await this.ctx.database.get(this.recTableName, { app, id })).length > 0) {
+      return true;
+    }
+    await this.ctx.database.upsert(this.recTableName, [{
+      app,
+      id,
+      createdAt: /* @__PURE__ */ new Date()
+    }]);
+    return false;
+  }
   getAccount(app, account) {
     return this.accountMap.get((app + account).toLowerCase());
   }
+  getName(app, account) {
+    app = this.getApp(app);
+    return this.subsConfig.apps[app].allowedAccounts.find((item) => item.id === this.getAccount(app, account))?.name;
+  }
   // 获取对应应用可以订阅的账号
   getAvailableAccounts(app) {
     app = this.getApp(app);
@@ -121,7 +161,7 @@ var SubscriptionService = class extends import_koishi.Service {
   // 根据应用和账号获取订阅了这个账号的所有群组
   async getSubscribedGroups(app, account) {
     app = this.getApp(app), account = this.getAccount(app, account);
-    const subscriptions = await this.ctx.database.get(this.tableName, {
+    const subscriptions = await this.ctx.database.get(this.subTableName, {
       app,
       account
     });
@@ -167,18 +207,50 @@ var SubscriptionService = class extends import_koishi.Service {
     return (await Promise.all(this.ctx.bots.map(async (bot) => {
       const targets = assignMap[bot.platform]?.[bot.selfId];
       if (!targets) return Promise.resolve([]);
-      const messageIds = await bot.sendPrivateMessage(bot.selfId, content);
-      const forwardContent = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { forward: true, children: messageIds.map((id) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { id: `${id}` })) });
-      const sessions = targets.map(({ id, guildId, locales }) => {
-        const session = bot.session({
+      try {
+        const selfChannelId = `private:${bot.selfId}`, session = bot.session({
           type: "message",
-          channel: { id, type: import_koishi.Universal.Channel.Type.TEXT },
-          guild: { id: guildId }
+          channel: {
+            id: selfChannelId,
+            type: import_koishi.Universal.Channel.Type.DIRECT
+          },
+          user: { id: bot.selfId }
         });
-        session.locales = locales;
-        return session;
-      });
-      return bot.broadcast(sessions, forwardContent);
+        let messageIds = [];
+        if (Array.isArray(content)) {
+          for (const msg of content) {
+            try {
+              const ids = await retry(
+                3,
+                () => bot.sendMessage(selfChannelId, msg, void 0, { session })
+              );
+              if (Array.isArray(ids)) messageIds.push(...ids);
+              else if (ids != null) messageIds.push(ids);
+            } catch (e) {
+              continue;
+            }
+          }
+        } else {
+          messageIds = await retry(
+            3,
+            () => bot.sendMessage(selfChannelId, content, void 0, { session })
+          );
+        }
+        const forwardContent = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { forward: true, children: messageIds.map((id) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { id: `${id}` })) });
+        const sessions = targets.map(({ id, guildId, locales }) => {
+          const session2 = bot.session({
+            type: "message",
+            channel: { id, type: import_koishi.Universal.Channel.Type.TEXT },
+            guild: { id: guildId }
+          });
+          session2.locales = locales;
+          return session2;
+        });
+        return bot.broadcast(sessions, forwardContent);
+      } catch (e) {
+        this.ctx.logger("broadcastForward").warn("broadcast error:", bot.selfId, Array.isArray(content) ? content.length : 1, e);
+        return Promise.resolve([]);
+      }
     }))).flat(1);
   }
   // 添加订阅
@@ -191,7 +263,7 @@ var SubscriptionService = class extends import_koishi.Service {
     if (!appConfig.includes(account)) {
       return { status: false, msg: "账号不在白名单中" };
     }
-    const existing = await this.ctx.database.get(this.tableName, {
+    const existing = await this.ctx.database.get(this.subTableName, {
       app,
       account,
       groupId
@@ -199,7 +271,7 @@ var SubscriptionService = class extends import_koishi.Service {
     if (existing.length > 0) {
       return { status: false, msg: "已订阅该账号" };
     }
-    await this.ctx.database.create(this.tableName, {
+    await this.ctx.database.create(this.subTableName, {
       app,
       account,
       groupId,
@@ -209,8 +281,8 @@ var SubscriptionService = class extends import_koishi.Service {
   }
   // 删除订阅
   async removeSubscription(app, account, groupId) {
-    app = this.appMap.get(app), account = this.accountMap.get(app + account);
-    const result = await this.ctx.database.remove(this.tableName, {
+    app = this.appMap.get(app), account = this.getAccount(app, account);
+    const result = await this.ctx.database.remove(this.subTableName, {
       app,
       account,
       groupId
@@ -219,11 +291,11 @@ var SubscriptionService = class extends import_koishi.Service {
   }
   // 获取群组的所有订阅
   async getGroupSubscriptions(groupId) {
-    return await this.ctx.database.get(this.tableName, { groupId });
+    return await this.ctx.database.get(this.subTableName, { groupId });
   }
   // 获取所有订阅（用于管理）
   async getAllSubscriptions() {
-    return await this.ctx.database.get(this.tableName, {});
+    return await this.ctx.database.get(this.subTableName, {});
   }
   // 按应用获取订阅统计
   async getSubscriptionStats() {
@@ -257,19 +329,21 @@ var SubscriptionService = class extends import_koishi.Service {
     return `${channel.platform}:${channel.id}`;
   }
   registerCommands(ctx, config) {
-    const sub = ctx.command("subscription <app:string> [...accounts]", "添加订阅，格式：订阅 <应用名> <账号>").alias("订阅").alias("添加订阅").userFields(["authority"]).example("推特订阅 爱美").example("订阅 twitter aimi_sound").action(async ({ session, options }, app, ...accounts) => {
+    const sub = ctx.command("subscription <app:string> [...accounts]", "添加订阅，账号可以使用 用户名 用户id 或是别名，格式：订阅 <应用名> <账号> [...更多账号]").alias("订阅").alias("添加订阅").userFields(["authority"]).example("推特订阅 爱美 伊藤彩沙").example("订阅 twitter aimi_sound").action(async ({ session, options }, app, ...accounts) => {
       if (!await this.authCheck(session, config)) {
         return "权限不足";
       }
       if (!app || !accounts || accounts.length == 0) {
         return "请指定应用名和账号，格式：订阅 <应用名> <账号> [...更多账号]";
       }
+      accounts;
       const groupId = this.getChannelId(session.channel);
       if (!groupId) {
         return "请在群聊中使用当前指令";
       }
       let result = "";
-      for (const account of accounts) {
+      for (let account of accounts) {
+        app = this.getApp(app), account = this.getName(app, account);
         const { status, msg } = await this.addSubscription(app, account, groupId);
         if (status) {
           result += `成功为群组 ${groupId} 添加订阅：${app} - ${account}
@@ -288,6 +362,7 @@ var SubscriptionService = class extends import_koishi.Service {
       if (!app || !account) {
         return "请指定应用名和账号，格式：取消订阅 <应用名> <账号>";
       }
+      app = this.getApp(app), account = this.getName(app, account);
       const groupId = this.getChannelId(session.channel);
       if (!groupId) {
         return "请在群聊中使用当前指令";
@@ -351,7 +426,23 @@ var SubscriptionService = class extends import_koishi.Service {
         return result;
       }
       const html = generateSubscriptionHTML(groupId, availableAccounts, subscribedByApp);
-      return await ctx.puppeteer.render(html);
+      const page = await ctx.puppeteer.page();
+      try {
+        await page.setViewport({
+          width: 1e3,
+          height: 800
+        });
+        await page.setContent(html, {
+          waitUntil: "networkidle0"
+        });
+        const image = await page.screenshot({
+          type: "jpeg",
+          fullPage: true
+        });
+        return `<image url="data:image/png;base64,${image.toString("base64")}" />`;
+      } finally {
+        await page.close();
+      }
     });
     function generateSubscriptionHTML(groupId, availableAccounts, subscribedByApp) {
       return `
@@ -372,7 +463,7 @@ var SubscriptionService = class extends import_koishi.Service {
             padding: 20px;
         }
         .container {
-            max-width: 1200px;
+            max-width: 1000px;
             margin: 0 auto;
         }
         .header {
@@ -381,18 +472,18 @@ var SubscriptionService = class extends import_koishi.Service {
             color: #2c3e50;
         }
         .header h1 {
-            font-size: 24px;
-            margin-bottom: 8px;
-            font-weight: 600;
+            font-size: 36px;
+            margin-bottom: 12px;
+            font-weight: 900;
         }
         .header .subtitle {
-            font-size: 14px;
+            font-size: 21px;
             color: #7f8c8d;
         }
         .apps-container {
             background: white;
-            border-radius: 8px;
-            box-shadow: 0 2px 12px rgba(0,0,0,0.08);
+            border-radius: 12px;
+            box-shadow: 0 3px 18px rgba(0,0,0,0.08);
             overflow: hidden;
         }
         .app-section {
@@ -402,46 +493,48 @@ var SubscriptionService = class extends import_koishi.Service {
             border-bottom: none;
         }
         .app-title {
-            font-size: 16px;
+            font-size: 24px;
             font-weight: 600;
             color: #34495e;
-            padding: 12px 16px;
+            padding: 18px 24px;
             background: #f8f9fa;
             border-bottom: 1px solid #eaeaea;
             display: flex;
             align-items: center;
-            gap: 8px;
+            gap: 12px;
         }
         .app-title::before {
             content: "▸";
-            font-size: 14px;
+            font-size: 21px;
             color: #3498db;
         }
         .grid {
             display: grid;
-            grid-template-columns: repeat(3, 1fr);
+            grid-template-columns: repeat(2, 1fr);
             gap: 0;
         }
         .account-card {
-            padding: 14px;
+            padding: 21px;
             border-right: 1px solid #f0f0f0;
             border-bottom: 1px solid #f0f0f0;
             transition: all 0.2s ease;
             position: relative;
-            min-height: 80px;
+            min-height: 120px;
             display: flex;
             flex-direction: column;
         }
-        .account-card:nth-child(odd) {
+        .account-card:nth-child(4n+1),
+        .account-card:nth-child(4n+4) {
             background: #f8f9fa;
         }
-        .account-card:nth-child(even) {
+        .account-card:nth-child(4n+2),
+        .account-card:nth-child(4n+3) {
             background: #f0f2f5;
         }
         .account-card:hover {
             background: #e6f3ff !important;
         }
-        .account-card:nth-child(3n) {
+        .account-card:nth-child(2n) {
             border-right: none;
         }
         .account-card:last-child {
@@ -451,12 +544,12 @@ var SubscriptionService = class extends import_koishi.Service {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            margin-bottom: 8px;
+            margin-bottom: 12px;
             flex-wrap: wrap;
         }
         .name {
-            font-size: 14px;
-            font-weight: 600;
+            font-size: 21px;
+            font-weight: 900;
             color: #2c3e50;
             line-height: 1.3;
             max-width: 60%;
@@ -465,12 +558,12 @@ var SubscriptionService = class extends import_koishi.Service {
             white-space: nowrap;
         }
         .id {
-            font-size: 12px;
+            font-size: 21px;
             color: #5a6c7d;
             font-family: 'Courier New', monospace;
             background: #f8f9fa;
-            padding: 3px 6px;
-            border-radius: 3px;
+            padding: 4.5px 9px;
+            border-radius: 4.5px;
             line-height: 1.3;
             max-width: 35%;
             overflow: hidden;
@@ -483,7 +576,7 @@ var SubscriptionService = class extends import_koishi.Service {
         }
         .name-id-container.vertical .name {
             max-width: 100%;
-            margin-bottom: 4px;
+            margin-bottom: 6px;
         }
         .name-id-container.vertical .id {
             max-width: 100%;
@@ -492,49 +585,49 @@ var SubscriptionService = class extends import_koishi.Service {
         .alias-status-container {
             display: flex;
             justify-content: space-between;
-            margin-top: 8px;
+            margin-top: 12px;
             flex-grow: 1;
         }
         .alias-container {
             flex: 1;
-            max-width: calc(100% - 70px);
+            max-width: calc(100% - 105px);
             align-self: flex-start;
         }
         .alias {
-            font-size: 11px;
+            font-size: 20px;
             color: #6c757d;
             display: flex;
             flex-wrap: wrap;
-            gap: 4px;
+            gap: 6px;
             align-items: flex-start;
         }
         .alias-tag {
             background: #e8f4fd;
             color: #1971c2;
-            padding: 2px 6px;
-            border-radius: 10px;
+            padding: 3px 9px;
+            border-radius: 15px;
             border: 1px solid #a5d8ff;
             white-space: nowrap;
-            margin-bottom: 2px;
+            margin-bottom: 3px;
         }
         .no-alias {
-            font-size: 11px;
+            font-size: 20px;
             color: #adb5bd;
             font-style: italic;
         }
         .status-container {
             display: flex;
             align-items: flex-end;
-            margin-left: 8px;
+            margin-left: 12px;
         }
         .status {
             display: inline-flex;
             align-items: center;
-            gap: 6px;
-            padding: 3px 10px;
-            border-radius: 16px;
-            font-size: 11px;
-            font-weight: 600;
+            gap: 9px;
+            padding: 4.5px 15px;
+            border-radius: 24px;
+            font-size: 20px;
+            font-weight: 900;
             white-space: nowrap;
             flex-shrink: 0;
         }
@@ -552,7 +645,7 @@ var SubscriptionService = class extends import_koishi.Service {
             text-align: center;
             color: #6c757d;
             font-style: italic;
-            padding: 30px;
+            padding: 45px;
             background: #f8f9fa;
             grid-column: 1 / -1;
         }
@@ -624,8 +717,20 @@ var SubscriptionService = class extends import_koishi.Service {
       if (subscriptions.length === 0) {
         return `群组 ${groupId} 暂无订阅`;
       }
-      await ctx.database.remove("subscription_service", { groupId });
-      return `已删除群组 ${groupId} 的所有订阅（共 ${subscriptions.length} 个）`;
+      const confirm = await session.send(
+        `确认要清空当前群聊的所有订阅吗？
+请输入 "是" 或 "确认" 或 "yes" 来确认删除，输入其他内容取消。`
+      );
+      const response = await session.prompt(3e4);
+      if (!response) {
+        return "操作已取消（超时）。";
+      }
+      if (["是", "确认", "yes", "y"].includes(response.toLowerCase())) {
+        await ctx.database.remove("subscription_service", { groupId });
+        return `已删除群组 ${groupId} 的所有订阅（共 ${subscriptions.length} 个）`;
+      } else {
+        return "操作已取消。";
+      }
     });
     ctx.command("subscription.stats", "查看订阅统计", {
       permissions: [`authority:${config.minAuthority}`],

package/lib/retry.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare function retry<T>(retries: number, fn: () => Promise<T> \| T, delay?: number): Promise<T>;

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-subscription",
   "description": "给多个应用提供订阅群组管理",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [