@zhin.js/adapter-slack 1.1.26 → 1.1.27

package/schema.json

@@ -17,34 +17,6 @@
       "default": 15000,
       "description": "Socket Mode client ping timeout (ms)"
     },
-    "master": {
-      "type": [
-        "string",
-        "number"
-      ],
-      "description": "框架 master（Slack user id；AI/工具权限、endpoint 管理）。endpoints[i].master 可逐项覆盖",
-      "x-i18n": {
-        "en": {
-          "description": "Framework masters (Slack user id; AI/tool permissions and endpoint management). endpoints[i].master can override this value."
-        }
-      }
-    },
-    "trusted": {
-      "type": "array",
-      "items": {
-        "type": [
-          "string",
-          "number"
-        ],
-        "description": "Trusted Slack user id"
-      },
-      "description": "框架 trusted 用户列表（弱于 master）。endpoints[i].trusted 可逐项追加",
-      "x-i18n": {
-        "en": {
-          "description": "Framework trusted users, below master authority. endpoints[i].trusted can add users."
-        }
-      }
-    },
     "endpoints": {
       "type": "array",
       "minItems": 1,
@@ -53,34 +25,6 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "master": {
-            "type": [
-              "string",
-              "number"
-            ],
-            "description": "本 endpoint 的框架 master（Slack user id）；覆盖顶层 master",
-            "x-i18n": {
-              "en": {
-                "description": "Framework masters for this endpoint (Slack user id), overriding the top-level master list."
-              }
-            }
-          },
-          "trusted": {
-            "type": "array",
-            "items": {
-              "type": [
-                "string",
-                "number"
-              ],
-              "description": "Trusted Slack user id"
-            },
-            "description": "本 endpoint 的 trusted 列表",
-            "x-i18n": {
-              "en": {
-                "description": "Trusted users for this endpoint."
-              }
-            }
-          },
           "token": {
             "type": "string",
             "description": "Bot User OAuth Token (xoxb-...)"

package/src/index.ts

@@ -6,7 +6,6 @@ export {
   headerValue,
   keyboardToBlockKitBlocks,
   normalizeWebhookPath,
-  readTextBody,
   resolveSlackChannelType,
   resolveSlackConfig,
   slackInboundConversation,
@@ -41,12 +40,7 @@ export {
   type SlackUserInfo,
 } from './client.js';
 
-export {
-  checkSlackPlatformPermit,
-  normalizeSlackSenderForPermit,
-  platformPermit,
-  slackGroupPermitResolver,
-} from './platform-permit.js';
+export { platformPermit } from './platform-permit.js';
 
 export { normalizeSlackReactionName } from './slack-reaction.js';
 export { markdownToMrkdwn, mrkdwnToPlainFallback, splitMrkdwnText } from './markdown-to-mrkdwn.js';

package/src/platform-permit.ts

@@ -1,59 +1,10 @@
 /**
- * Slack platform permit — workspace + channel 权限
+ * Slack platform permit helper（ADR 0056 §5）。
+ *
+ * 平台身份由适配器上报到 `sender.platform`，permit 由内置评估器（`@zhin.js/permission`）判断；
+ * 适配器不再导出自有的 permit 解析器或检查函数。
  */
-import type { PermissionSubject } from '@zhin.js/permission';
-
-const ADAPTER = 'slack';
 
 export function platformPermit(perm: string): string {
-  return `platform(${ADAPTER},${perm})`;
-}
-
-const FACTORY_PERM_MAP: Record<string, string> = {
-  scene_admin: 'channel_manager',
-  scene_owner: 'workspace_owner',
-};
-
-export function slackGroupPermitResolver(logicalPerm: string): string {
-  return platformPermit(FACTORY_PERM_MAP[logicalPerm] ?? logicalPerm);
-}
-
-export function normalizeSlackSenderForPermit(input: {
-  isWorkspaceOwner?: boolean;
-  isWorkspaceAdmin?: boolean;
-  isChannelManager?: boolean;
-}): { role?: string; permissions?: string[] } {
-  const permissions: string[] = [];
-  if (input.isWorkspaceOwner) {
-    permissions.push('workspace_owner', 'workspace_admin', 'channel_manager');
-    return { role: 'owner', permissions };
-  }
-  if (input.isWorkspaceAdmin) {
-    permissions.push('workspace_admin', 'channel_manager');
-    return { role: 'admin', permissions };
-  }
-  if (input.isChannelManager) {
-    permissions.push('channel_manager');
-    return { role: 'channel_admin', permissions };
-  }
-  return { role: 'member', permissions };
+  return `platform-permission:${perm}`;
 }
-
-export function checkSlackPlatformPermit(perm: string, subject: PermissionSubject): boolean {
-  const role = subject.sender?.role?.[0];
-  const permissions = subject.sender?.permissions ?? [];
-  const has = (t: string) => permissions.includes(t);
-
-  switch (perm) {
-    case 'workspace_owner':
-      return role === 'owner' || has('workspace_owner');
-    case 'workspace_admin':
-      return role === 'owner' || role === 'admin' || has('workspace_admin') || has('workspace_owner');
-    case 'channel_manager':
-      return role === 'owner' || role === 'admin' || role === 'channel_admin'
-        || has('channel_manager') || has('workspace_admin') || has('workspace_owner');
-    default:
-      return false;
-  }
-}
-

package/src/protocol.ts

@@ -4,7 +4,6 @@ import type { EndpointProfileConfiguration } from 'zhin.js/adapter';
  * Canonicalization is owned by gateway/core before endpoint.send.
  */
 import { createHmac, timingSafeEqual } from 'node:crypto';
-import type { IncomingMessage } from 'node:http';
 import { isMediaRef, type MediaRef, type ConversationKind, type ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import { mrkdwnToMarkdown } from './mrkdwn-to-markdown.js';
@@ -417,30 +416,10 @@ export function verifySlackSignature(
   return timingSafeEqual(Buffer.from(expected), Buffer.from(signature));
 }
 
-export async function readTextBody(
-  request: IncomingMessage,
-  options: { readonly limit?: number } = {},
-): Promise<string> {
-  const limit = options.limit ?? 1_048_576;
-  const chunks: Buffer[] = [];
-  let size = 0;
-  for await (const chunk of request) {
-    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-    size += buffer.length;
-    if (size > limit) {
-      request.destroy();
-      throw new Error(`Request body exceeds ${limit} bytes`);
-    }
-    chunks.push(buffer);
-  }
-  return Buffer.concat(chunks).toString('utf8');
-}
 
 export function headerValue(
-  headers: IncomingMessage['headers'],
+  headers: Headers,
   name: string,
 ): string {
-  const raw = headers[name.toLowerCase()];
-  if (Array.isArray(raw)) return raw[0] ?? '';
-  return raw ?? '';
+  return headers.get(name) ?? '';
 }

package/src/slack-message-ref.ts

@@ -12,7 +12,3 @@ export function parseSlackMessageRef(ref: string): { channel: string; ts: string
   if (!channel || !ts) return null;
   return { channel, ts };
 }
-
-export function slackMessageTs(ref: string): string {
-  return parseSlackMessageRef(ref)?.ts ?? ref;
-}

package/src/webhook.ts

@@ -1,12 +1,11 @@
 /**
  * Slack webhook HTTP: signature → parse → admit.
  */
-import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { HttpHost, HttpRouteRegistration } from '@zhin.js/host-http';
+import { readTextBody } from '@zhin.js/host-http-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import {
   headerValue,
-  readTextBody,
   verifySlackSignature,
   type ResolvedSlackConfig,
   type SlackInteractionPayload,
@@ -29,26 +28,21 @@ export function registerSlackWebhookRoutes(
 ): HttpRouteRegistration[] {
   const path = handler.config.webhookPath;
   return [
-    http.route('POST', path, async (request, response) => {
-      await handleSlackWebhookRequest(request, response, handler);
-    }, { summary: 'Slack Events API / Interactivity', tags: ['slack'] }),
+    http.route('POST', path, (request) => handleSlackWebhookRequest(request, handler), { summary: 'Slack Events API / Interactivity', tags: ['slack'] }),
   ];
 }
 
 export async function handleSlackWebhookRequest(
-  request: IncomingMessage,
-  response: ServerResponse,
+  request: Request,
   handler: SlackWebhookHandler,
-): Promise<void> {
+): Promise<Response> {
   try {
     const rawBody = await readTextBody(request);
     const timestamp = headerValue(request.headers, 'x-slack-request-timestamp');
     const signature = headerValue(request.headers, 'x-slack-signature');
 
     if (!verifySlackSignature(handler.config.signingSecret, rawBody, timestamp, signature)) {
-      response.writeHead(401, { 'Content-Type': 'text/plain' });
-      response.end('Invalid signature');
-      return;
+      return new Response('Invalid signature', { status: 401, headers: { 'Content-Type': 'text/plain' } });
     }
 
     const contentType = headerValue(request.headers, 'content-type');
@@ -57,17 +51,13 @@ export async function handleSlackWebhookRequest(
       const payloadStr = params.get('payload');
       if (payloadStr) {
         const payload = JSON.parse(payloadStr) as SlackInteractionPayload;
-        response.writeHead(200);
-        response.end('');
         handler.admitInteraction(payload);
-        return;
+        return new Response('', { status: 200 });
       }
       const body = Object.fromEntries(params) as unknown as SlackSlashCommand;
       if (body.command) {
-        response.writeHead(200);
-        response.end('');
         handler.admitSlashCommand(body);
-        return;
+        return new Response('', { status: 200 });
       }
     }
 
@@ -75,32 +65,22 @@ export async function handleSlackWebhookRequest(
     try {
       envelope = JSON.parse(rawBody) as Record<string, unknown>;
     } catch {
-      response.writeHead(200);
-      response.end('');
-      return;
+      return new Response('', { status: 200 });
     }
 
     if (envelope.type === 'url_verification') {
       const challenge = (envelope as unknown as SlackUrlVerification).challenge;
-      response.writeHead(200, { 'Content-Type': 'application/json' });
-      response.end(JSON.stringify({ challenge }));
-      return;
+      return new Response(JSON.stringify({ challenge }), { status: 200, headers: { 'Content-Type': 'application/json' } });
     }
 
     if (envelope.type === 'event_callback' && envelope.event) {
-      response.writeHead(200);
-      response.end('');
       handler.handleEnvelope(envelope);
-      return;
+      return new Response('', { status: 200 });
     }
 
-    response.writeHead(200);
-    response.end('');
+    return new Response('', { status: 200 });
   } catch (error) {
     logger.error('Slack webhook error:', error);
-    if (!response.headersSent) {
-      response.writeHead(200);
-      response.end('');
-    }
+    return new Response('', { status: 200 });
   }
 }