remnote-bridge 0.1.11 → 0.1.12

package/remnote-plugin/dist/manifest.json

@@ -6,7 +6,7 @@
   "repoUrl": "https://github.com/baobao700508/unofficial-remnote-bridge-cli",
   "version": {
     "major": 0,
-    "minor": 1,
+    "minor": 2,
     "patch": 0
   },
   "theme": [],

package/remnote-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "unofficial-remnote-bridge-plugin",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "MIT",
   "description": "RemNote 桥接层：嵌入 RemNote 的 WebSocket 桥接插件",
   "scripts": {

package/remnote-plugin/public/manifest.json

@@ -6,7 +6,7 @@
   "repoUrl": "https://github.com/baobao700508/unofficial-remnote-bridge-cli",
   "version": {
     "major": 0,
-    "minor": 1,
+    "minor": 2,
     "patch": 0
   },
   "theme": [],

package/remnote-plugin/src/bridge/multi-connection-manager.ts

@@ -0,0 +1,151 @@
+/**
+ * Multi-Connection Manager — 管理 Plugin 到多个 Daemon 的连接
+ *
+ * 一个 Plugin 同时连接最多 4 个 daemon，通过"孪生优先级"机制
+ * 保证各 daemon 与其原生 Plugin 的亲和性，同时允许空闲 daemon 被接管。
+ *
+ * 依赖方向：multi-connection-manager → websocket-client（单向）
+ */
+
+import { WebSocketClient } from './websocket-client';
+import type { ConnectionStatus, BridgeRequest } from './websocket-client';
+import { ALL_WS_PORTS, SCAN_INTERVAL_MS } from '../settings';
+
+// ── 类型定义 ──
+
+export type DisconnectReason = 'not_started' | 'preempted' | 'twin_occupied' | 'other_occupied' | null;
+
+export interface SlotState {
+  slotIndex: number;
+  wsPort: number;
+  status: ConnectionStatus;
+  isTwin: boolean;
+  disconnectReason: DisconnectReason;
+}
+
+export interface MultiConnectionManagerConfig {
+  twinSlotIndex: number;
+  pluginVersion: string;
+  sdkReady: boolean;
+  onSlotsChange: (slots: SlotState[]) => void;
+  onLog: (slotIndex: number, message: string, level: 'info' | 'warn' | 'error') => void;
+}
+
+// ── 实现 ──
+
+export class MultiConnectionManager {
+  private clients: WebSocketClient[] = [];
+  private slotStates: SlotState[] = [];
+  private scanTimer: ReturnType<typeof setInterval> | null = null;
+  private config: MultiConnectionManagerConfig;
+
+  constructor(config: MultiConnectionManagerConfig) {
+    this.config = config;
+
+    // 初始化 4 个槽位状态 + 创建 4 个 WebSocketClient
+    for (let i = 0; i < ALL_WS_PORTS.length; i++) {
+      const isTwin = (i === config.twinSlotIndex);
+
+      this.slotStates.push({
+        slotIndex: i,
+        wsPort: ALL_WS_PORTS[i],
+        status: 'disconnected',
+        isTwin,
+        disconnectReason: 'not_started',
+      });
+
+      this.clients.push(new WebSocketClient({
+        url: `ws://127.0.0.1:${ALL_WS_PORTS[i]}`,
+        pluginVersion: config.pluginVersion,
+        sdkReady: config.sdkReady,
+        twinSlotIndex: config.twinSlotIndex,
+        isTwinConnection: isTwin,
+        maxReconnectAttempts: isTwin ? 10 : 0,  // 非孪生不自动重连
+        initialReconnectDelay: 1000,
+        maxReconnectDelay: 30000,
+        onStatusChange: (status) => this.handleStatusChange(i, status),
+        onLog: (message, level) => config.onLog(i, message, level),
+        onPreempted: () => this.handleDisconnectReason(i, 'preempted'),
+        onTwinOccupied: () => this.handleDisconnectReason(i, 'twin_occupied'),
+        onOtherOccupied: () => this.handleDisconnectReason(i, 'other_occupied'),
+      }));
+    }
+  }
+
+  /** 设置消息处理器（所有连接共享同一个 messageHandler） */
+  setMessageHandler(handler: (request: BridgeRequest) => Promise<unknown>): void {
+    for (const client of this.clients) {
+      client.setMessageHandler(handler);
+    }
+  }
+
+  /** 启动连接：先连孪生槽位，延迟 2s 后连其余 */
+  start(): void {
+    const twinIdx = this.config.twinSlotIndex;
+
+    // 先连孪生
+    this.clients[twinIdx].connect();
+
+    // 延迟 2s 后连其余
+    setTimeout(() => {
+      for (let i = 0; i < this.clients.length; i++) {
+        if (i !== twinIdx) {
+          this.clients[i].connect();
+        }
+      }
+    }, 2000);
+
+    // 启动周期扫描
+    this.scanTimer = setInterval(() => this.scanAndReconnect(), SCAN_INTERVAL_MS);
+  }
+
+  /** 停止所有连接和定时器 */
+  stop(): void {
+    if (this.scanTimer) {
+      clearInterval(this.scanTimer);
+      this.scanTimer = null;
+    }
+    for (const client of this.clients) {
+      client.disconnect();
+    }
+  }
+
+  /** 获取当前所有槽位状态 */
+  getSlots(): SlotState[] {
+    return this.slotStates.slice();
+  }
+
+  // ── 内部方法 ──
+
+  private handleStatusChange(slotIndex: number, status: ConnectionStatus): void {
+    const slot = this.slotStates[slotIndex];
+    slot.status = status;
+    if (status === 'connected') {
+      slot.disconnectReason = null;
+    }
+    this.notifySlotsChange();
+  }
+
+  private handleDisconnectReason(slotIndex: number, reason: DisconnectReason): void {
+    this.slotStates[slotIndex].disconnectReason = reason;
+    this.notifySlotsChange();
+  }
+
+  private notifySlotsChange(): void {
+    this.config.onSlotsChange(this.slotStates.slice());
+  }
+
+  /** 周期扫描：对所有未连接的非孪生槽位尝试重连 */
+  private scanAndReconnect(): void {
+    for (let i = 0; i < this.clients.length; i++) {
+      const slot = this.slotStates[i];
+      // 跳过孪生（有自己的重连逻辑）、已连接
+      if (slot.isTwin) continue;
+      if (slot.status === 'connected' || slot.status === 'connecting') continue;
+      // 所有非孪生槽位都参与轮询（含 preempted/twin_occupied/other_occupied）
+      // 对方 Plugin 可能已断开，daemon 空闲后我们能感知到
+
+      this.clients[i].connect();
+    }
+  }
+}

package/remnote-plugin/src/bridge/websocket-client.ts

@@ -13,12 +13,23 @@
 
 // ── 协议类型（独立定义）──
 
+/** 已有其他 Plugin 连接（非孪生），拒绝 */
+const WS_CLOSE_OTHER_CONNECTED = 4000;
+/** 孪生已连，拒绝非孪生 */
+const WS_CLOSE_TWIN_EXISTS = 4003;
+
 export type ConnectionStatus = 'disconnected' | 'connecting' | 'connected';
 
 export interface HelloMessage {
   type: 'hello';
   version: string;
   sdkReady: boolean;
+  twinSlotIndex: number;  // Plugin 的孪生 daemon 槽位索引 (0-3)
+}
+
+export interface PreemptedMessage {
+  type: 'preempted';
+  reason: string;  // 'twin_plugin_connected'
 }
 
 export interface PingMessage {
@@ -47,11 +58,16 @@ export interface WebSocketClientConfig {
   url: string;
   pluginVersion: string;
   sdkReady: boolean;
+  twinSlotIndex: number;       // Plugin 的孪生槽位
+  isTwinConnection?: boolean;  // 本连接是否孪生连接
   maxReconnectAttempts?: number;
   initialReconnectDelay?: number;
   maxReconnectDelay?: number;
   onStatusChange?: (status: ConnectionStatus) => void;
   onLog?: (message: string, level: 'info' | 'warn' | 'error') => void;
+  onPreempted?: () => void;      // 被孪生 Plugin 抢占回调
+  onTwinOccupied?: () => void;   // 被拒绝：孪生 Plugin 已连（不可重试）
+  onOtherOccupied?: () => void;  // 被拒绝：已有其他非孪生 Plugin（可重试）
 }
 
 // ── WebSocket Client 实现 ──
@@ -63,11 +79,16 @@ export class WebSocketClient {
   private messageHandler: ((request: BridgeRequest) => Promise<unknown>) | null = null;
   private status: ConnectionStatus = 'disconnected';
   private isShuttingDown = false;
+  private isPreempted = false;
   private _sdkReady: boolean;
 
-  private config: Required<Omit<WebSocketClientConfig, 'onStatusChange' | 'onLog'>> & {
+  private config: Required<Omit<WebSocketClientConfig, 'onStatusChange' | 'onLog' | 'onPreempted' | 'onTwinOccupied' | 'onOtherOccupied' | 'isTwinConnection'>> & {
     onStatusChange?: (status: ConnectionStatus) => void;
     onLog?: (message: string, level: 'info' | 'warn' | 'error') => void;
+    onPreempted?: () => void;
+    onTwinOccupied?: () => void;
+    onOtherOccupied?: () => void;
+    isTwinConnection: boolean;
   };
 
   constructor(config: WebSocketClientConfig) {
@@ -76,11 +97,16 @@ export class WebSocketClient {
       url: config.url,
       pluginVersion: config.pluginVersion,
       sdkReady: config.sdkReady,
+      twinSlotIndex: config.twinSlotIndex,
+      isTwinConnection: config.isTwinConnection ?? false,
       maxReconnectAttempts: config.maxReconnectAttempts ?? 10,
       initialReconnectDelay: config.initialReconnectDelay ?? 1000,
       maxReconnectDelay: config.maxReconnectDelay ?? 30000,
       onStatusChange: config.onStatusChange,
       onLog: config.onLog,
+      onPreempted: config.onPreempted,
+      onTwinOccupied: config.onTwinOccupied,
+      onOtherOccupied: config.onOtherOccupied,
     };
   }
 
@@ -100,10 +126,11 @@ export class WebSocketClient {
       type: 'hello',
       version: this.config.pluginVersion,
       sdkReady: this._sdkReady,
+      twinSlotIndex: this.config.twinSlotIndex,
     };
     try {
       this.ws?.send(JSON.stringify(hello));
-      this.log(`发送 hello（v${this.config.pluginVersion}, sdkReady=${this._sdkReady}）`);
+      this.log(`发送 hello（v${this.config.pluginVersion}, sdkReady=${this._sdkReady}, twinSlot=${this.config.twinSlotIndex}）`);
     } catch (error) {
       this.log(`发送 hello 失败: ${error}`, 'warn');
     }
@@ -115,8 +142,8 @@ export class WebSocketClient {
     }
 
     this.isShuttingDown = false;
+    this.isPreempted = false;
     this.setStatus('connecting');
-    this.log(`正在连接 ${this.config.url}...`);
 
     try {
       this.ws = new WebSocket(this.config.url);
@@ -133,16 +160,26 @@ export class WebSocketClient {
       };
 
       this.ws.onclose = (event) => {
-        this.log(`连接断开: ${event.code} ${event.reason}`, 'warn');
+        // 1006 = 连接从未建立（daemon 未运行），不打日志
+        if (event.code !== 1006) {
+          this.log(`连接断开: ${event.code} ${event.reason}`, 'warn');
+        }
         this.setStatus('disconnected');
 
+        // 被 daemon 拒绝
+        if (event.code === WS_CLOSE_TWIN_EXISTS) {
+          this.config.onTwinOccupied?.();
+        } else if (event.code === WS_CLOSE_OTHER_CONNECTED) {
+          this.config.onOtherOccupied?.();
+        }
+
         if (!this.isShuttingDown) {
           this.scheduleReconnect();
         }
       };
 
-      this.ws.onerror = (error) => {
-        this.log(`WebSocket 错误: ${error}`, 'error');
+      this.ws.onerror = () => {
+        // 连接失败的错误由 onclose 处理，此处不重复打日志
       };
     } catch (error) {
       this.log(`连接失败: ${error}`, 'error');
@@ -155,6 +192,14 @@ export class WebSocketClient {
     try {
       const message = JSON.parse(data);
 
+      // 抢占通知
+      if (message.type === 'preempted') {
+        this.isPreempted = true;
+        this.log(`被孪生 Plugin 抢占: ${message.reason}`, 'warn');
+        this.config.onPreempted?.();
+        return;
+      }
+
       // 心跳响应
       if (message.type === 'ping') {
         this.ws?.send(JSON.stringify({ type: 'pong' } as PongMessage));
@@ -186,6 +231,17 @@ export class WebSocketClient {
   private scheduleReconnect(): void {
     if (this.isShuttingDown) return;
 
+    // 被抢占 → 不在此处重连，由外部轮询驱动
+    if (this.isPreempted) {
+      return;
+    }
+
+    // 非孪生连接 → 不在此处重连，由外部轮询驱动
+    if (!this.config.isTwinConnection) {
+      return;
+    }
+
+    // 孪生连接保留指数退避重连
     if (this.reconnectAttempts >= this.config.maxReconnectAttempts) {
       this.log('已达最大重连次数', 'error');
       return;
@@ -213,10 +269,6 @@ export class WebSocketClient {
     this.messageHandler = handler;
   }
 
-  setSdkReady(ready: boolean): void {
-    this._sdkReady = ready;
-  }
-
   disconnect(): void {
     this.isShuttingDown = true;
 
@@ -233,12 +285,6 @@ export class WebSocketClient {
     this.setStatus('disconnected');
   }
 
-  reconnect(): void {
-    this.reconnectAttempts = 0;
-    this.disconnect();
-    this.connect();
-  }
-
   getStatus(): ConnectionStatus {
     return this.status;
   }

package/remnote-plugin/src/services/index.ts

@@ -5,12 +5,4 @@
  * 由 bridge 层调用，不直接暴露给 widgets。
  *
  * 依赖方向：services → utils（单向）
- *
- * 待实现：
- * - read-note.ts    → readNote()
- * - create-note.ts  → createNote()
- * - update-note.ts  → updateNote()
- * - search.ts       → search()
- * - search-by-tag.ts → searchByTag()
- * - append-journal.ts → appendJournal()
  */

package/remnote-plugin/src/services/read-rem.ts

@@ -16,6 +16,7 @@ import type {
   PropertyTypeValue,
 } from '../types';
 import { filterNoisyChildren, filterNoisyTags } from './powerup-filter';
+import { remTypeToString } from './rem-builder';
 
 /**
  * 读取单个 Rem，组装为完整 RemObject。
@@ -263,15 +264,6 @@ function sortRichTextKeys(rt: RichText): RichText {
   });
 }
 
-/** SDK RemType 枚举值 → 字符串 */
-function remTypeToString(type: number): RemTypeValue {
-  switch (type) {
-    case 1: return 'concept';
-    case 2: return 'descriptor';
-    case 6: return 'portal';
-    default: return 'default';
-  }
-}
 
 /** SDK PORTAL_TYPE 枚举值 → 字符串 */
 function portalTypeToString(pt: number): PortalType {

package/remnote-plugin/src/services/search.ts

@@ -38,16 +38,19 @@ export async function search(
 
   const rems = await plugin.search.search([query], undefined, { numResults });
 
-  const results: SearchResultItem[] = [];
-  for (const rem of rems) {
-    const markdownText = await safeToMarkdown(plugin, rem.text ?? []);
-    const isDocument = await rem.isDocument();
-    results.push({
-      remId: rem._id,
-      text: markdownText.replace(/\n/g, ' '),
-      isDocument,
-    });
-  }
+  const results: SearchResultItem[] = await Promise.all(
+    rems.map(async (rem) => {
+      const [markdownText, isDocument] = await Promise.all([
+        safeToMarkdown(plugin, rem.text ?? []),
+        rem.isDocument(),
+      ]);
+      return {
+        remId: rem._id,
+        text: markdownText.replace(/\n/g, ' '),
+        isDocument,
+      };
+    }),
+  );
 
   return {
     query,

package/remnote-plugin/src/settings.ts

@@ -1,12 +1,14 @@
 /**
- * Plugin 设置常量
+ * Plugin 常量
  *
- * 定义 RemNote 设置面板中的设置项 ID 和默认值。
+ * 定义默认值和版本号。
+ * 多 daemon 连接：Plugin 同时连接 ALL_WS_PORTS 对应的 4 个槽位。
  */
 
-// 设置项 ID
-export const SETTING_WS_URL = 'bridge-ws-url';
+export const DEFAULT_PLUGIN_VERSION = '0.2.0';
 
-// 默认值
-export const DEFAULT_WS_URL = 'ws://127.0.0.1:3002';
-export const DEFAULT_PLUGIN_VERSION = '0.1.0';
+/** 4 个固定 WS 端口，对应 4 个 daemon 槽位 */
+export const ALL_WS_PORTS = [29100, 29110, 29120, 29130] as const;
+
+/** 非孪生槽位周期扫描间隔（ms） */
+export const SCAN_INTERVAL_MS = 18_000;

package/remnote-plugin/src/utils/index.ts

@@ -2,9 +2,4 @@
  * Utils 层 — 共享辅助工具（无状态纯函数）
  *
  * 被 services 层单向依赖，不依赖任何其他业务层。
- *
- * 待实现：
- * - rich-text.ts        → 富文本解析（extractText 等）
- * - content-renderer.ts → 内容渲染（Markdown / Structured）
- * - rem-classifier.ts   → Rem 分类、别名、父级解析
  */

package/remnote-plugin/src/widgets/bridge_widget.tsx

@@ -1,13 +1,13 @@
 /**
- * Bridge Widget — 显示守护进程连接状态（纯展示）
+ * Bridge Widget — 显示多 daemon 连接状态（纯展示）
  *
- * WebSocket 连接在 index.tsx 的 onActivate 中建立，
- * 此 widget 每秒从 plugin.storage 读取并显示状态和日志。
+ * 多连接管理在 index.tsx 的 onActivate 中建立，
+ * 此 widget 每秒从 plugin.storage 读取并显示所有槽位状态和日志。
  */
 
 import { renderWidget, usePlugin } from '@remnote/plugin-sdk';
 import React, { useEffect, useState } from 'react';
-import type { ConnectionStatus } from '../bridge/websocket-client';
+import type { SlotState, DisconnectReason } from '../bridge/multi-connection-manager';
 
 interface StoredLog {
   time: number;
@@ -15,10 +15,27 @@ interface StoredLog {
   level: string;
 }
 
+/** 未连接时的提示文案 */
+function getDisconnectHint(reason: DisconnectReason): string {
+  switch (reason) {
+    case 'preempted':
+      return '被孪生 Plugin 抢占，已断开';
+    case 'twin_occupied':
+      return '孪生 Plugin 已连接，当前无法连接';
+    case 'other_occupied':
+      return '已有其他 Plugin 连接，等待重试';
+    case 'not_started':
+    default:
+      return '该实例未启动，或端口被占用';
+  }
+}
+
 function BridgeWidget() {
   const plugin = usePlugin();
-  const [status, setStatus] = useState<ConnectionStatus>('disconnected');
+  const [slots, setSlots] = useState<SlotState[]>([]);
   const [logs, setLogs] = useState<StoredLog[]>([]);
+  const [instanceName, setInstanceName] = useState<string>('');
+  const [configPort, setConfigPort] = useState<number>(29102);
 
   // 每秒轮询 plugin.storage 获取最新状态
   useEffect(() => {
@@ -26,11 +43,15 @@ function BridgeWidget() {
 
     async function poll() {
       if (!active) return;
-      const s = await plugin.storage.getSession('bridge-status');
+      const s = await plugin.storage.getSession('bridge-slots');
       const l = await plugin.storage.getSession('bridge-logs');
+      const inst = await plugin.storage.getSession('bridge-instance');
+      const cp = await plugin.storage.getSession('bridge-config-port');
       if (active) {
-        setStatus((s as ConnectionStatus) ?? 'disconnected');
+        setSlots((s as SlotState[]) ?? []);
         setLogs((l as StoredLog[]) ?? []);
+        setInstanceName((inst as string) ?? '');
+        setConfigPort((cp as number) ?? 29102);
       }
     }
 
@@ -42,13 +63,7 @@ function BridgeWidget() {
     };
   }, [plugin]);
 
-  const statusConfig = {
-    connected: { color: '#22c55e', bg: '#dcfce7', icon: '\u25cf', text: '已连接' },
-    connecting: { color: '#f59e0b', bg: '#fef3c7', icon: '\u25d0', text: '连接中...' },
-    disconnected: { color: '#ef4444', bg: '#fee2e2', icon: '\u25cb', text: '未连接' },
-  };
-
-  const currentStatus = statusConfig[status];
+  const connectedCount = slots.filter(s => s.status === 'connected').length;
 
   return (
     <div style={{ padding: '12px', fontFamily: 'system-ui, sans-serif', fontSize: '13px' }}>
@@ -61,7 +76,9 @@ function BridgeWidget() {
           marginBottom: '12px',
         }}
       >
-        <h3 style={{ margin: 0, fontSize: '14px', fontWeight: 600 }}>RemNote Bridge</h3>
+        <h3 style={{ margin: 0, fontSize: '14px', fontWeight: 600 }}>
+          RemNote Bridge{instanceName ? ` (${instanceName})` : ''}
+        </h3>
         <div
           style={{
             display: 'flex',
@@ -69,15 +86,83 @@ function BridgeWidget() {
             gap: '6px',
             padding: '4px 8px',
             borderRadius: '12px',
-            backgroundColor: currentStatus.bg,
-            color: currentStatus.color,
+            backgroundColor: connectedCount > 0 ? '#dcfce7' : '#fee2e2',
+            color: connectedCount > 0 ? '#22c55e' : '#ef4444',
             fontSize: '12px',
             fontWeight: 500,
           }}
         >
-          <span>{currentStatus.icon}</span>
-          <span>{currentStatus.text}</span>
+          <span>{connectedCount > 0 ? '\u25cf' : '\u25cb'}</span>
+          <span>{connectedCount}</span>
+        </div>
+      </div>
+
+      {/* 连接状态 */}
+      <div
+        style={{
+          border: '1px solid #e5e7eb',
+          borderRadius: '6px',
+          backgroundColor: '#f9fafb',
+          marginBottom: '12px',
+        }}
+      >
+        <div
+          style={{
+            fontSize: '11px',
+            fontWeight: 600,
+            padding: '8px 10px',
+            borderBottom: '1px solid #e5e7eb',
+            color: '#6b7280',
+          }}
+        >
+          连接状态
         </div>
+        {slots.map((slot) => (
+          <div key={slot.slotIndex}>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+                padding: '6px 10px',
+                borderBottom: '1px solid #f3f4f6',
+              }}
+            >
+              <span style={{ fontSize: '12px' }}>
+                {slot.isTwin ? '\u2605 ' : '  '}
+                槽位 {slot.slotIndex} ({slot.wsPort})
+              </span>
+              <span
+                style={{
+                  fontSize: '11px',
+                  color:
+                    slot.status === 'connected'
+                      ? '#22c55e'
+                      : slot.status === 'connecting'
+                        ? '#f59e0b'
+                        : '#9ca3af',
+                }}
+              >
+                {slot.status === 'connected'
+                  ? '\u25cf 已连接'
+                  : slot.status === 'connecting'
+                    ? '\u25d0 连接中...'
+                    : '\u25cb 未连接'}
+              </span>
+            </div>
+            {slot.status === 'disconnected' && (
+              <div
+                style={{
+                  padding: '2px 10px 6px 26px',
+                  fontSize: '10px',
+                  color: '#9ca3af',
+                }}
+              >
+                {getDisconnectHint(slot.disconnectReason)}
+              </div>
+            )}
+          </div>
+        ))}
       </div>
 
       {/* 日志 */}
@@ -143,7 +228,7 @@ function BridgeWidget() {
 
       {/* 配置按钮 */}
       <button
-        onClick={() => window.open('http://127.0.0.1:3003', '_blank')}
+        onClick={() => window.open(`http://127.0.0.1:${configPort}`, '_blank')}
         style={{
           display: 'flex',
           alignItems: 'center',