@zhin.js/core 1.4.2 → 1.4.3

package/lib/built/authorization.js

@@ -2,10 +2,34 @@ import { mergeAITriggerConfig, resolveSenderRoles, } from './ai-trigger.js';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 const logger = getLogger('Authorization');
 function findEndpointEntryFromConfig(config, adapter, endpointId) {
-    const endpoints = config.endpoints;
-    if (!Array.isArray(endpoints))
+    // 1) top-level endpoints[] (legacy / flat format)
+    const topLevel = config.endpoints;
+    if (Array.isArray(topLevel)) {
+        const found = topLevel.find((b) => b.context === adapter && String(b.name) === endpointId);
+        if (found)
+            return found;
+    }
+    // 2) plugins.<adapter> — adapter-level master/trusted + nested endpoints[]
+    const adapterConfig = config.plugins?.[adapter];
+    if (!adapterConfig)
         return undefined;
-    return endpoints.find((b) => b.context === adapter && String(b.name) === endpointId);
+    const nested = adapterConfig.endpoints;
+    const entry = Array.isArray(nested)
+        ? nested.find((b) => String(b.name) === endpointId)
+        : undefined;
+    // Merge adapter-level master/trusted onto the matched endpoint entry
+    // so that resolveSenderRoles sees them in one place
+    const merged = {
+        context: adapter,
+        ...(entry ?? { name: endpointId }),
+    };
+    if (adapterConfig.master != null && merged.master == null) {
+        merged.master = adapterConfig.master;
+    }
+    if (adapterConfig.trusted != null && merged.trusted == null) {
+        merged.trusted = adapterConfig.trusted;
+    }
+    return merged;
 }
 function readTriggerConfig(plugin) {
     const root = plugin.root ?? plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/core",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Zhin机器人核心框架",
   "type": "module",
   "main": "./lib/index.js",
@@ -93,7 +93,7 @@
     "@types/qrcode": "^1.5.5",
     "ajv": "8.18.0",
     "typescript": "^6.0.3",
-    "@zhin.js/ai": "1.4.6"
+    "@zhin.js/ai": "1.4.7"
   },
   "repository": {
     "type": "git",