remnote-mcp-server 0.1.3 → 0.3.0
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.
- package/CHANGELOG.md +78 -0
- package/README.md +226 -224
- package/dist/cli.d.ts +14 -0
- package/dist/cli.js +51 -0
- package/dist/cli.js.map +1 -0
- package/dist/config.d.ts +16 -0
- package/dist/config.js +41 -0
- package/dist/config.js.map +1 -0
- package/dist/http-server.d.ts +23 -0
- package/dist/http-server.js +197 -0
- package/dist/http-server.js.map +1 -0
- package/dist/index.js +48 -25
- package/dist/index.js.map +1 -1
- package/dist/logger.d.ts +20 -0
- package/dist/logger.js +85 -0
- package/dist/logger.js.map +1 -0
- package/dist/tools/index.d.ts +2 -1
- package/dist/tools/index.js +48 -50
- package/dist/tools/index.js.map +1 -1
- package/dist/websocket-server.d.ts +5 -1
- package/dist/websocket-server.js +53 -10
- package/dist/websocket-server.js.map +1 -1
- package/package.json +6 -1
package/dist/tools/index.js
CHANGED
|
@@ -78,73 +78,68 @@ export const STATUS_TOOL = {
|
|
|
78
78
|
properties: {},
|
|
79
79
|
},
|
|
80
80
|
};
|
|
81
|
-
export function registerAllTools(server, wsServer) {
|
|
81
|
+
export function registerAllTools(server, wsServer, logger) {
|
|
82
|
+
const toolLogger = logger.child({ context: 'tools' });
|
|
82
83
|
// Single CallTool handler for all tools
|
|
83
84
|
server.setRequestHandler(CallToolRequestSchema, async (request) => {
|
|
85
|
+
const toolName = request.params.name;
|
|
86
|
+
const startTime = Date.now();
|
|
87
|
+
toolLogger.debug({ tool: toolName, args: request.params.arguments }, 'Executing tool');
|
|
84
88
|
try {
|
|
85
|
-
|
|
89
|
+
let result;
|
|
90
|
+
switch (toolName) {
|
|
86
91
|
case 'remnote_create_note': {
|
|
87
92
|
const args = CreateNoteSchema.parse(request.params.arguments);
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
91
|
-
};
|
|
93
|
+
result = await wsServer.sendRequest('create_note', args);
|
|
94
|
+
break;
|
|
92
95
|
}
|
|
93
96
|
case 'remnote_search': {
|
|
94
97
|
const args = SearchSchema.parse(request.params.arguments);
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
98
|
-
};
|
|
98
|
+
result = await wsServer.sendRequest('search', args);
|
|
99
|
+
break;
|
|
99
100
|
}
|
|
100
101
|
case 'remnote_read_note': {
|
|
101
102
|
const args = ReadNoteSchema.parse(request.params.arguments);
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
105
|
-
};
|
|
103
|
+
result = await wsServer.sendRequest('read_note', args);
|
|
104
|
+
break;
|
|
106
105
|
}
|
|
107
106
|
case 'remnote_update_note': {
|
|
108
107
|
const args = UpdateNoteSchema.parse(request.params.arguments);
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
112
|
-
};
|
|
108
|
+
result = await wsServer.sendRequest('update_note', args);
|
|
109
|
+
break;
|
|
113
110
|
}
|
|
114
111
|
case 'remnote_append_journal': {
|
|
115
112
|
const args = AppendJournalSchema.parse(request.params.arguments);
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
119
|
-
};
|
|
113
|
+
result = await wsServer.sendRequest('append_journal', args);
|
|
114
|
+
break;
|
|
120
115
|
}
|
|
121
116
|
case 'remnote_status': {
|
|
122
117
|
const connected = wsServer.isConnected();
|
|
123
118
|
if (!connected) {
|
|
124
|
-
|
|
125
|
-
content: [
|
|
126
|
-
{
|
|
127
|
-
type: 'text',
|
|
128
|
-
text: JSON.stringify({ connected: false, message: 'RemNote plugin not connected' }, null, 2),
|
|
129
|
-
},
|
|
130
|
-
],
|
|
131
|
-
};
|
|
119
|
+
result = { connected: false, message: 'RemNote plugin not connected' };
|
|
132
120
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
text: JSON.stringify({ connected: true, ...(typeof result === 'object' ? result : {}) }, null, 2),
|
|
139
|
-
},
|
|
140
|
-
],
|
|
141
|
-
};
|
|
121
|
+
else {
|
|
122
|
+
const statusResult = await wsServer.sendRequest('get_status', {});
|
|
123
|
+
result = { connected: true, ...(typeof statusResult === 'object' ? statusResult : {}) };
|
|
124
|
+
}
|
|
125
|
+
break;
|
|
142
126
|
}
|
|
143
127
|
default:
|
|
144
|
-
throw new Error(`Unknown tool: ${
|
|
128
|
+
throw new Error(`Unknown tool: ${toolName}`);
|
|
145
129
|
}
|
|
130
|
+
toolLogger.debug({
|
|
131
|
+
tool: toolName,
|
|
132
|
+
duration_ms: Date.now() - startTime,
|
|
133
|
+
}, 'Tool completed');
|
|
134
|
+
return {
|
|
135
|
+
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
136
|
+
};
|
|
146
137
|
}
|
|
147
138
|
catch (error) {
|
|
139
|
+
toolLogger.error({
|
|
140
|
+
tool: toolName,
|
|
141
|
+
error: error instanceof Error ? error.message : String(error),
|
|
142
|
+
}, 'Tool failed');
|
|
148
143
|
return {
|
|
149
144
|
content: [
|
|
150
145
|
{
|
|
@@ -157,15 +152,18 @@ export function registerAllTools(server, wsServer) {
|
|
|
157
152
|
}
|
|
158
153
|
});
|
|
159
154
|
// Register list_tools handler
|
|
160
|
-
server.setRequestHandler(ListToolsRequestSchema, async () =>
|
|
161
|
-
tools
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
155
|
+
server.setRequestHandler(ListToolsRequestSchema, async () => {
|
|
156
|
+
toolLogger.debug('Listing available tools');
|
|
157
|
+
return {
|
|
158
|
+
tools: [
|
|
159
|
+
CREATE_NOTE_TOOL,
|
|
160
|
+
SEARCH_TOOL,
|
|
161
|
+
READ_NOTE_TOOL,
|
|
162
|
+
UPDATE_NOTE_TOOL,
|
|
163
|
+
APPEND_JOURNAL_TOOL,
|
|
164
|
+
STATUS_TOOL,
|
|
165
|
+
],
|
|
166
|
+
};
|
|
167
|
+
});
|
|
170
168
|
}
|
|
171
169
|
//# sourceMappingURL=index.js.map
|
package/dist/tools/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAEnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
+
import type { Logger } from './logger.js';
|
|
1
2
|
export declare class WebSocketServer {
|
|
2
3
|
private wss;
|
|
3
4
|
private client;
|
|
4
5
|
private port;
|
|
6
|
+
private logger;
|
|
7
|
+
private requestLogger;
|
|
8
|
+
private responseLogger;
|
|
5
9
|
private pendingRequests;
|
|
6
10
|
private connectCallbacks;
|
|
7
11
|
private disconnectCallbacks;
|
|
8
|
-
constructor(port: number);
|
|
12
|
+
constructor(port: number, logger: Logger, requestLogger?: Logger, responseLogger?: Logger);
|
|
9
13
|
start(): Promise<void>;
|
|
10
14
|
stop(): Promise<void>;
|
|
11
15
|
sendRequest(action: string, payload: Record<string, unknown>): Promise<unknown>;
|
package/dist/websocket-server.js
CHANGED
|
@@ -4,41 +4,48 @@ export class WebSocketServer {
|
|
|
4
4
|
wss = null;
|
|
5
5
|
client = null;
|
|
6
6
|
port;
|
|
7
|
+
logger;
|
|
8
|
+
requestLogger = null;
|
|
9
|
+
responseLogger = null;
|
|
7
10
|
pendingRequests = new Map();
|
|
8
11
|
connectCallbacks = [];
|
|
9
12
|
disconnectCallbacks = [];
|
|
10
|
-
constructor(port) {
|
|
13
|
+
constructor(port, logger, requestLogger, responseLogger) {
|
|
11
14
|
this.port = port;
|
|
15
|
+
this.logger = logger.child({ context: 'websocket-server' });
|
|
16
|
+
this.requestLogger = requestLogger || null;
|
|
17
|
+
this.responseLogger = responseLogger || null;
|
|
12
18
|
}
|
|
13
19
|
async start() {
|
|
14
20
|
return new Promise((resolve, reject) => {
|
|
15
21
|
this.wss = new WSServer({ port: this.port }, () => {
|
|
22
|
+
this.logger.debug({ port: this.port }, 'WebSocket server started');
|
|
16
23
|
resolve();
|
|
17
24
|
});
|
|
18
25
|
this.wss.on('error', (error) => {
|
|
19
|
-
|
|
26
|
+
this.logger.error({ error }, 'WebSocket server error');
|
|
20
27
|
reject(error);
|
|
21
28
|
});
|
|
22
29
|
this.wss.on('connection', (ws) => {
|
|
23
30
|
// Only allow single client connection
|
|
24
31
|
if (this.client && this.client.readyState === WebSocket.OPEN) {
|
|
25
|
-
|
|
32
|
+
this.logger.warn('Rejecting connection: client already connected');
|
|
26
33
|
ws.close(1008, 'Only one client allowed');
|
|
27
34
|
return;
|
|
28
35
|
}
|
|
29
36
|
this.client = ws;
|
|
30
|
-
|
|
37
|
+
this.logger.info('WebSocket client connected');
|
|
31
38
|
this.connectCallbacks.forEach((cb) => cb());
|
|
32
39
|
ws.on('message', (data) => {
|
|
33
40
|
try {
|
|
34
41
|
this.handleMessage(data.toString());
|
|
35
42
|
}
|
|
36
43
|
catch (error) {
|
|
37
|
-
|
|
44
|
+
this.logger.error({ error }, 'Error handling message');
|
|
38
45
|
}
|
|
39
46
|
});
|
|
40
47
|
ws.on('close', () => {
|
|
41
|
-
|
|
48
|
+
this.logger.info('WebSocket client disconnected');
|
|
42
49
|
this.client = null;
|
|
43
50
|
// Reject all pending requests
|
|
44
51
|
for (const [_id, pending] of this.pendingRequests.entries()) {
|
|
@@ -49,7 +56,7 @@ export class WebSocketServer {
|
|
|
49
56
|
this.disconnectCallbacks.forEach((cb) => cb());
|
|
50
57
|
});
|
|
51
58
|
ws.on('error', (error) => {
|
|
52
|
-
|
|
59
|
+
this.logger.error({ error }, 'WebSocket client error');
|
|
53
60
|
});
|
|
54
61
|
});
|
|
55
62
|
});
|
|
@@ -62,6 +69,7 @@ export class WebSocketServer {
|
|
|
62
69
|
}
|
|
63
70
|
if (this.wss) {
|
|
64
71
|
this.wss.close(() => {
|
|
72
|
+
this.logger.debug('WebSocket server stopped');
|
|
65
73
|
this.wss = null;
|
|
66
74
|
resolve();
|
|
67
75
|
});
|
|
@@ -77,12 +85,44 @@ export class WebSocketServer {
|
|
|
77
85
|
}
|
|
78
86
|
const id = randomUUID();
|
|
79
87
|
const request = { id, action, payload };
|
|
88
|
+
const startTime = Date.now();
|
|
89
|
+
this.logger.debug({ id, action }, 'Sending request');
|
|
90
|
+
// Log request if configured
|
|
91
|
+
if (this.requestLogger) {
|
|
92
|
+
this.requestLogger.info({ type: 'request', id, action, payload });
|
|
93
|
+
}
|
|
80
94
|
return new Promise((resolve, reject) => {
|
|
81
95
|
const timeout = setTimeout(() => {
|
|
82
96
|
this.pendingRequests.delete(id);
|
|
83
97
|
reject(new Error(`Request timeout: ${action}`));
|
|
84
98
|
}, 5000);
|
|
85
|
-
this.pendingRequests.set(id, {
|
|
99
|
+
this.pendingRequests.set(id, {
|
|
100
|
+
resolve: (result) => {
|
|
101
|
+
// Log response if configured
|
|
102
|
+
if (this.responseLogger) {
|
|
103
|
+
this.responseLogger.info({
|
|
104
|
+
type: 'response',
|
|
105
|
+
id,
|
|
106
|
+
duration_ms: Date.now() - startTime,
|
|
107
|
+
error: null,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
resolve(result);
|
|
111
|
+
},
|
|
112
|
+
reject: (error) => {
|
|
113
|
+
// Log error response if configured
|
|
114
|
+
if (this.responseLogger) {
|
|
115
|
+
this.responseLogger.info({
|
|
116
|
+
type: 'response',
|
|
117
|
+
id,
|
|
118
|
+
duration_ms: Date.now() - startTime,
|
|
119
|
+
error: error.message,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
reject(error);
|
|
123
|
+
},
|
|
124
|
+
timeout,
|
|
125
|
+
});
|
|
86
126
|
try {
|
|
87
127
|
this.client.send(JSON.stringify(request));
|
|
88
128
|
}
|
|
@@ -105,6 +145,9 @@ export class WebSocketServer {
|
|
|
105
145
|
handleMessage(data) {
|
|
106
146
|
try {
|
|
107
147
|
const message = JSON.parse(data);
|
|
148
|
+
this.logger.debug({
|
|
149
|
+
type: 'type' in message ? message.type : 'response',
|
|
150
|
+
}, 'Received message');
|
|
108
151
|
// Handle pong response to ping
|
|
109
152
|
if ('type' in message && message.type === 'pong') {
|
|
110
153
|
return;
|
|
@@ -131,12 +174,12 @@ export class WebSocketServer {
|
|
|
131
174
|
}
|
|
132
175
|
}
|
|
133
176
|
else {
|
|
134
|
-
|
|
177
|
+
this.logger.warn({ id: response.id }, 'Unknown request ID');
|
|
135
178
|
}
|
|
136
179
|
}
|
|
137
180
|
}
|
|
138
181
|
catch (error) {
|
|
139
|
-
|
|
182
|
+
this.logger.error({ error }, 'Error parsing message');
|
|
140
183
|
}
|
|
141
184
|
}
|
|
142
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../src/websocket-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,QAAQ,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../src/websocket-server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "remnote-mcp-server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "MCP server bridge for RemNote knowledge base",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -53,10 +53,14 @@
|
|
|
53
53
|
"homepage": "https://github.com/robert7/remnote-mcp-server#readme",
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"@modelcontextprotocol/sdk": "^1.26.0",
|
|
56
|
+
"commander": "^13.0.0",
|
|
57
|
+
"express": "^5.2.0",
|
|
58
|
+
"pino": "^9.6.0",
|
|
56
59
|
"ws": "^8.19.0",
|
|
57
60
|
"zod": "^4.3.6"
|
|
58
61
|
},
|
|
59
62
|
"devDependencies": {
|
|
63
|
+
"@types/express": "^5.0.0",
|
|
60
64
|
"@types/node": "^25.2.1",
|
|
61
65
|
"@types/ws": "^8.18.1",
|
|
62
66
|
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
|
@@ -65,6 +69,7 @@
|
|
|
65
69
|
"@vitest/ui": "^1.6.1",
|
|
66
70
|
"eslint": "^8.57.1",
|
|
67
71
|
"eslint-config-prettier": "^9.1.2",
|
|
72
|
+
"pino-pretty": "^11.0.0",
|
|
68
73
|
"prettier": "^3.8.1",
|
|
69
74
|
"tsx": "^4.21.0",
|
|
70
75
|
"typescript": "^5.9.3",
|