discord-bridge 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-bridge",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Claude Code <-> Discord bidirectional communication bridge",
   "type": "module",
   "bin": {

package/plugin/skills/discord-comm/scripts/discord-status.sh

@@ -1,11 +1,20 @@
 #!/bin/bash
-# Discord Bridge ヘルスチェック
+# Discord Bridge ヘルスチェック（チャンネル登録込み）
 # Usage: discord-status.sh
 PORT="${DISCORD_BRIDGE_PORT:-13456}"
 PROJECT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
 CHANNEL_ID=""
+ALLOWED_USER_IDS=""
 if [ -n "$PROJECT_ROOT" ] && [ -f "$PROJECT_ROOT/.discord-bridge.json" ]; then
-  CHANNEL_ID=$(python3 -c "import json; print(json.load(open('$PROJECT_ROOT/.discord-bridge.json'))['channelId'])" 2>/dev/null)
+  CHANNEL_ID=$(python3 -c "import json; print(json.load(open('$PROJECT_ROOT/.discord-bridge.json')).get('channelId', ''))" 2>/dev/null)
+  ALLOWED_USER_IDS=$(python3 -c "import json; print(json.dumps(json.load(open('$PROJECT_ROOT/.discord-bridge.json')).get('allowedUserIds', [])))" 2>/dev/null)
+fi
+
+# チャンネル設定をサーバーに登録
+if [ -n "$CHANNEL_ID" ] && [ -n "$ALLOWED_USER_IDS" ]; then
+  curl -s -X POST "http://localhost:${PORT}/register-channel" \
+    -H "Content-Type: application/json" \
+    -d "{\"channelId\": \"${CHANNEL_ID}\", \"allowedUserIds\": ${ALLOWED_USER_IDS}}" > /dev/null
 fi
 
 if [ -n "$CHANNEL_ID" ]; then

package/server/index.js

@@ -14,7 +14,6 @@ import path from "path";
 
 const CONFIG = {
   token: process.env.DISCORD_BRIDGE_TOKEN,
-  allowedUserIds: [],
   host: "127.0.0.1",
   port: parseInt(process.env.DISCORD_BRIDGE_PORT || "13456", 10),
   defaultTimeout: 5 * 60 * 1000,
@@ -24,17 +23,19 @@ const CONFIG = {
   sseKeepAliveInterval: 30 * 1000,
 };
 
-function isAllowedUser(authorId) {
-  return CONFIG.allowedUserIds.includes(authorId);
+// Per-channel allowed user IDs (registered via POST /register-channel)
+const channelAllowedUsers = new Map();
+
+function isAllowedUser(authorId, channelId) {
+  const allowed = channelAllowedUsers.get(channelId);
+  if (!allowed || allowed.length === 0) return true; // 未登録チャンネルは全員許可
+  return allowed.includes(authorId);
 }
 
 function validateConfig() {
   if (!CONFIG.token) {
     throw new Error("Missing required environment variable: DISCORD_BRIDGE_TOKEN");
   }
-  if (CONFIG.allowedUserIds.length === 0) {
-    throw new Error("Missing required field in .discord-bridge.json: allowedUserIds (must have at least one entry)");
-  }
 }
 
 // ---------------------------------------------------------------------------
@@ -97,8 +98,8 @@ async function initDiscord() {
   });
 
   discordClient.on("messageCreate", (message) => {
-    if (!isAllowedUser(message.author.id)) return;
     if (message.author.bot) return;
+    if (!isAllowedUser(message.author.id, message.channel.id)) return;
 
     const chId = message.channel.id;
 
@@ -212,10 +213,25 @@ app.get("/health", (_req, res) => {
     response.channel = channelId;
     response.queuedMessages = getMessageQueue(channelId).length;
     response.sseSubscribers = getSseSubscribers(channelId).size;
+    response.allowedUserIds = channelAllowedUsers.get(channelId) ?? [];
   }
   res.json(response);
 });
 
+// ---- POST /register-channel ----
+app.post("/register-channel", (req, res) => {
+  const { channelId, allowedUserIds } = req.body;
+  if (!channelId) {
+    return res.status(400).json({ status: "error", error: "channelId is required" });
+  }
+  if (!Array.isArray(allowedUserIds)) {
+    return res.status(400).json({ status: "error", error: "allowedUserIds must be an array" });
+  }
+  const ids = allowedUserIds.filter((id) => typeof id === "string");
+  channelAllowedUsers.set(channelId, ids);
+  res.json({ status: "ok", channelId, allowedUserIds: ids });
+});
+
 // ---- GET /events (SSE) ----
 app.get("/events", (req, res) => {
   const channelId = req.query.channelId;
@@ -297,7 +313,8 @@ app.post("/ask", async (req, res) => {
     fields,
   });
 
-  await sendMessage(channelId, `<@${CONFIG.allowedUserIds[0]}>`, [embed]);
+  const mentionUser = channelAllowedUsers.get(channelId)?.[0];
+  await sendMessage(channelId, mentionUser ? `<@${mentionUser}>` : null, [embed]);
 
   try {
     const reply = await waitForReply(channelId, timeoutMs);
@@ -453,25 +470,7 @@ app.get("/messages", async (req, res) => {
 // Lifecycle
 // ---------------------------------------------------------------------------
 
-async function loadProjectConfig() {
-  const configPath = path.join(process.cwd(), ".discord-bridge.json");
-  let projectConfig;
-  try {
-    const raw = await readFile(configPath, "utf-8");
-    projectConfig = JSON.parse(raw);
-  } catch {
-    throw new Error(`.discord-bridge.json not found or invalid JSON in ${process.cwd()}`);
-  }
-
-  if (Array.isArray(projectConfig.allowedUserIds)) {
-    CONFIG.allowedUserIds = projectConfig.allowedUserIds.filter(
-      (id) => typeof id === "string"
-    );
-  }
-}
-
 async function main() {
-  await loadProjectConfig();
   validateConfig();
   await initDiscord();