draftgo-cli 4.0.22 → 4.0.24

package/src/mcp/protocol.js

@@ -1,174 +1,194 @@
-'use strict';
-
+'use strict';
+
 const DEFAULT_PROTOCOL_VERSION = '2026-07-28';
-
-class McpHttpError extends Error {
-  constructor(message, { status = 0, rpc = null, code = null } = {}) {
-    super(message);
-    this.name = 'McpHttpError';
-    this.status = status;
-    this.rpc = rpc;
-    this.code = code;
-  }
-}
-
-function redactText(value, secrets = []) {
-  let text = String(value == null ? '' : value);
-  for (const secret of secrets.filter(Boolean)) text = text.split(String(secret)).join('[REDACTED]');
-  text = text.replace(/(authorization\s*[:=]\s*bearer\s+)[^\s,;"']+/ig, '$1[REDACTED]');
-  text = text.replace(/(\"?(?:token|sat)\"?\s*[:=]\s*\"?)[^\s,;"'}]+/ig, '$1[REDACTED]');
-  return text;
-}
-
-function endpointFor(config) {
-  const server = new URL(String(config.server || config.mcp_url));
-  const serverPath = server.pathname.replace(/\/+$/, '');
-  const endpoint = config.mcp_url
-    ? new URL(String(config.mcp_url), server)
-    : new URL(`${serverPath}/mcp`, server);
-  if (!['http:', 'https:'].includes(endpoint.protocol) || endpoint.username || endpoint.password) {
-    throw new McpHttpError('DraftGo MCP endpoint must be a credential-free HTTP(S) URL.');
-  }
-  const allowedOrigins = new Set([
-    server.origin,
-    ...((config.mcp_allowed_origins || []).map((value) => new URL(value).origin)),
-  ]);
-  if (!allowedOrigins.has(endpoint.origin)) {
+
+class McpHttpError extends Error {
+  constructor(message, { status = 0, rpc = null, code = null } = {}) {
+    super(message);
+    this.name = 'McpHttpError';
+    this.status = status;
+    this.rpc = rpc;
+    this.code = code;
+  }
+}
+
+function redactText(value, secrets = []) {
+  let text = String(value == null ? '' : value);
+  for (const secret of secrets.filter(Boolean)) text = text.split(String(secret)).join('[REDACTED]');
+  text = text.replace(/(authorization\s*[:=]\s*bearer\s+)[^\s,;"']+/ig, '$1[REDACTED]');
+  text = text.replace(/(\"?(?:token|sat)\"?\s*[:=]\s*\"?)[^\s,;"'}]+/ig, '$1[REDACTED]');
+  return text;
+}
+
+function endpointFor(config) {
+  const server = new URL(String(config.server || config.mcp_url));
+  const serverPath = server.pathname.replace(/\/+$/, '');
+  const endpoint = config.mcp_url
+    ? new URL(String(config.mcp_url), server)
+    : new URL(`${serverPath}/mcp`, server);
+  if (!['http:', 'https:'].includes(endpoint.protocol) || endpoint.username || endpoint.password) {
+    throw new McpHttpError('DraftGo MCP endpoint must be a credential-free HTTP(S) URL.');
+  }
+  const allowedOrigins = new Set([
+    server.origin,
+    ...((config.mcp_allowed_origins || []).map((value) => new URL(value).origin)),
+  ]);
+  if (!allowedOrigins.has(endpoint.origin)) {
     throw new McpHttpError('DraftGo MCP endpoint origin is not allowlisted; refusing to send the API Key.');
-  }
-  return endpoint.toString();
-}
-
+  }
+  return endpoint.toString();
+}
+
 function jsonRpcMessages(value) {
-  if (Array.isArray(value)) return value.filter((item) => item && typeof item === 'object');
-  return value && typeof value === 'object' ? [value] : [];
+  if (Array.isArray(value)) return value.filter((item) => item && typeof item === 'object');
+  return value && typeof value === 'object' ? [value] : [];
 }
 
-async function parseEventStream(body, onMessage) {
-  if (!body) return [];
-  const reader = body.getReader();
-  const decoder = new TextDecoder();
-  let pending = '';
-  let dataLines = [];
-  const messages = [];
-  const consume = () => {
-    if (!dataLines.length) return;
-    const data = dataLines.join('\n');
-    dataLines = [];
-    if (!data || data === '[DONE]') return;
-    let parsed;
-    try { parsed = JSON.parse(data); } catch {
-      throw new McpHttpError('DraftGo MCP returned invalid JSON in an event stream.');
-    }
-    for (const message of jsonRpcMessages(parsed)) {
-      messages.push(message);
-      if (onMessage) onMessage(message);
-    }
-  };
-  while (true) {
-    const { done, value } = await reader.read();
-    pending += decoder.decode(value || new Uint8Array(), { stream: !done });
-    const lines = pending.split(/\r?\n/);
-    pending = lines.pop() || '';
-    for (const line of lines) {
-      if (!line) consume();
-      else if (line.startsWith('data:')) dataLines.push(line.slice(5).replace(/^ /, ''));
-    }
-    if (done) break;
+function routingHeaders(message) {
+  const messages = jsonRpcMessages(message);
+  if (messages.length !== 1 || typeof messages[0].method !== 'string' || !messages[0].method) return {};
+  const request = messages[0];
+  const headers = { 'Mcp-Method': request.method };
+  const params = request.params && typeof request.params === 'object' && !Array.isArray(request.params)
+    ? request.params
+    : {};
+  if (request.method === 'tools/call' && typeof params.name === 'string' && params.name) {
+    headers['Mcp-Name'] = params.name;
+  } else if (request.method === 'prompts/get' && typeof params.name === 'string' && params.name) {
+    headers['Mcp-Name'] = params.name;
+  } else if (request.method === 'resources/read' && typeof params.uri === 'string' && params.uri) {
+    headers['Mcp-Name'] = params.uri;
   }
-  if (pending.startsWith('data:')) dataLines.push(pending.slice(5).replace(/^ /, ''));
-  consume();
-  return messages;
+  return headers;
 }
-
-async function readLimitedText(response, maxBytes = 65536) {
-  if (!response.body) return '';
-  const reader = response.body.getReader();
-  const chunks = [];
-  let size = 0;
-  while (size < maxBytes) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    const chunk = Buffer.from(value);
-    chunks.push(chunk.subarray(0, Math.max(0, maxBytes - size)));
-    size += chunk.length;
-  }
-  return Buffer.concat(chunks).toString('utf8');
-}
-
-async function postJsonRpc(config, message, options = {}) {
-  const token = String(config.token || config.sat || '');
-  const controller = new AbortController();
-  const timeoutMs = Number(options.timeoutMs || config.mcp_timeout_ms || 60000);
-  const timer = setTimeout(() => controller.abort(new Error('MCP request timed out')), timeoutMs);
-  const externalSignal = options.signal;
-  const abort = () => controller.abort(externalSignal.reason);
-  if (externalSignal) {
-    if (externalSignal.aborted) abort();
-    else externalSignal.addEventListener('abort', abort, { once: true });
-  }
-
+
+async function parseEventStream(body, onMessage) {
+  if (!body) return [];
+  const reader = body.getReader();
+  const decoder = new TextDecoder();
+  let pending = '';
+  let dataLines = [];
+  const messages = [];
+  const consume = () => {
+    if (!dataLines.length) return;
+    const data = dataLines.join('\n');
+    dataLines = [];
+    if (!data || data === '[DONE]') return;
+    let parsed;
+    try { parsed = JSON.parse(data); } catch {
+      throw new McpHttpError('DraftGo MCP returned invalid JSON in an event stream.');
+    }
+    for (const message of jsonRpcMessages(parsed)) {
+      messages.push(message);
+      if (onMessage) onMessage(message);
+    }
+  };
+  while (true) {
+    const { done, value } = await reader.read();
+    pending += decoder.decode(value || new Uint8Array(), { stream: !done });
+    const lines = pending.split(/\r?\n/);
+    pending = lines.pop() || '';
+    for (const line of lines) {
+      if (!line) consume();
+      else if (line.startsWith('data:')) dataLines.push(line.slice(5).replace(/^ /, ''));
+    }
+    if (done) break;
+  }
+  if (pending.startsWith('data:')) dataLines.push(pending.slice(5).replace(/^ /, ''));
+  consume();
+  return messages;
+}
+
+async function readLimitedText(response, maxBytes = 65536) {
+  if (!response.body) return '';
+  const reader = response.body.getReader();
+  const chunks = [];
+  let size = 0;
+  while (size < maxBytes) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    const chunk = Buffer.from(value);
+    chunks.push(chunk.subarray(0, Math.max(0, maxBytes - size)));
+    size += chunk.length;
+  }
+  return Buffer.concat(chunks).toString('utf8');
+}
+
+async function postJsonRpc(config, message, options = {}) {
+  const token = String(config.token || config.sat || '');
+  const controller = new AbortController();
+  const timeoutMs = Number(options.timeoutMs || config.mcp_timeout_ms || 60000);
+  const timer = setTimeout(() => controller.abort(new Error('MCP request timed out')), timeoutMs);
+  const externalSignal = options.signal;
+  const abort = () => controller.abort(externalSignal.reason);
+  if (externalSignal) {
+    if (externalSignal.aborted) abort();
+    else externalSignal.addEventListener('abort', abort, { once: true });
+  }
+
   const headers = {
-    Authorization: `Bearer ${token}`,
-    Accept: 'application/json, text/event-stream',
-    'Content-Type': 'application/json',
+    Authorization: `Bearer ${token}`,
+    Accept: 'application/json, text/event-stream',
+    'Content-Type': 'application/json',
     'MCP-Protocol-Version': options.protocolVersion || DEFAULT_PROTOCOL_VERSION,
-  };
-  if (options.sessionId) headers['Mcp-Session-Id'] = options.sessionId;
-
-  let response;
-  try {
-    response = await fetch(endpointFor(config), {
-      method: 'POST',
-      headers,
-      body: JSON.stringify(message),
-      signal: controller.signal,
-    });
-    const sessionId = response.headers.get('mcp-session-id');
-    if (sessionId && options.onSession) options.onSession(sessionId);
-    if (response.status === 202 || response.status === 204) return [];
-
-    const contentType = String(response.headers.get('content-type') || '').toLowerCase();
-    if (!response.ok) {
-      const bodyText = await readLimitedText(response);
-      let rpc = null;
-      try {
-        const parsed = JSON.parse(bodyText);
-        rpc = jsonRpcMessages(parsed)[0] || null;
-      } catch { /* retain a bounded text error */ }
-      const structured = rpc && rpc.error && (rpc.error.message || rpc.error.code);
-      throw new McpHttpError(
-        redactText(structured || bodyText || `MCP HTTP ${response.status}`, [token]),
-        { status: response.status, rpc, code: rpc && rpc.error && rpc.error.code },
-      );
-    }
-
-    if (contentType.includes('text/event-stream')) {
-      return await parseEventStream(response.body, options.onMessage);
-    }
-    const text = await response.text();
-    if (!text.trim()) return [];
-    let parsed;
-    try { parsed = JSON.parse(text); } catch {
-      throw new McpHttpError('DraftGo MCP returned invalid JSON.', { status: response.status });
-    }
-    const messages = jsonRpcMessages(parsed);
-    if (options.onMessage) messages.forEach(options.onMessage);
-    return messages;
-  } catch (error) {
-    if (error instanceof McpHttpError || controller.signal.aborted) throw error;
-    throw new McpHttpError(redactText(error.message || error, [token]), { status: response && response.status });
-  } finally {
-    clearTimeout(timer);
-    if (externalSignal) externalSignal.removeEventListener('abort', abort);
-  }
-}
-
-module.exports = {
-  DEFAULT_PROTOCOL_VERSION,
-  McpHttpError,
-  redactText,
+    ...routingHeaders(message),
+  };
+  if (options.sessionId) headers['Mcp-Session-Id'] = options.sessionId;
+
+  let response;
+  try {
+    response = await fetch(endpointFor(config), {
+      method: 'POST',
+      headers,
+      body: JSON.stringify(message),
+      signal: controller.signal,
+    });
+    const sessionId = response.headers.get('mcp-session-id');
+    if (sessionId && options.onSession) options.onSession(sessionId);
+    if (response.status === 202 || response.status === 204) return [];
+
+    const contentType = String(response.headers.get('content-type') || '').toLowerCase();
+    if (!response.ok) {
+      const bodyText = await readLimitedText(response);
+      let rpc = null;
+      try {
+        const parsed = JSON.parse(bodyText);
+        rpc = jsonRpcMessages(parsed)[0] || null;
+      } catch { /* retain a bounded text error */ }
+      const structured = rpc && rpc.error && (rpc.error.message || rpc.error.code);
+      throw new McpHttpError(
+        redactText(structured || bodyText || `MCP HTTP ${response.status}`, [token]),
+        { status: response.status, rpc, code: rpc && rpc.error && rpc.error.code },
+      );
+    }
+
+    if (contentType.includes('text/event-stream')) {
+      return await parseEventStream(response.body, options.onMessage);
+    }
+    const text = await response.text();
+    if (!text.trim()) return [];
+    let parsed;
+    try { parsed = JSON.parse(text); } catch {
+      throw new McpHttpError('DraftGo MCP returned invalid JSON.', { status: response.status });
+    }
+    const messages = jsonRpcMessages(parsed);
+    if (options.onMessage) messages.forEach(options.onMessage);
+    return messages;
+  } catch (error) {
+    if (error instanceof McpHttpError || controller.signal.aborted) throw error;
+    throw new McpHttpError(redactText(error.message || error, [token]), { status: response && response.status });
+  } finally {
+    clearTimeout(timer);
+    if (externalSignal) externalSignal.removeEventListener('abort', abort);
+  }
+}
+
+module.exports = {
+  DEFAULT_PROTOCOL_VERSION,
+  McpHttpError,
+  redactText,
   endpointFor,
-  postJsonRpc,
-  parseEventStream,
-};
+  routingHeaders,
+  postJsonRpc,
+  parseEventStream,
+};

package/src/prompt.js

@@ -1,94 +1,94 @@
-'use strict';
-
-// Tiny interactive prompt helpers built on Node's readline.
-// No external deps. All functions return Promises.
-
-const readline = require('readline');
-
-function makeRL() {
-  return readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: true,
-  });
-}
-
-function ask(question, { default: def } = {}) {
-  return new Promise((resolve) => {
-    const rl = makeRL();
-    const hint = def !== undefined && def !== '' ? ` [${def}]` : '';
-    rl.question(`${question}${hint} `, (answer) => {
-      rl.close();
-      const v = (answer || '').trim();
-      resolve(v === '' && def !== undefined ? String(def) : v);
-    });
-  });
-}
-
-async function askRequired(question, { default: def, validate } = {}) {
-  // Loop until user supplies a non-empty value (or default is used).
-  // If `validate(v)` returns a string, treat as error message and re-prompt.
-  while (true) {
-    const v = await ask(question, { default: def });
-    if (!v) {
-      console.log('  (不能为空，请重新输入)');
-      continue;
-    }
-    if (typeof validate === 'function') {
-      const err = validate(v);
-      if (typeof err === 'string' && err) {
-        console.log(`  ${err}`);
-        continue;
-      }
-    }
-    return v;
-  }
-}
-
-async function confirm(question, { default: def = false } = {}) {
-  const yn = def ? 'Y/n' : 'y/N';
-  const v = (await ask(`${question} (${yn})`)).toLowerCase();
-  if (!v) return def;
-  return v === 'y' || v === 'yes';
-}
-
-async function askPassword(question, { default: def } = {}) {
-  // Best-effort masked input. Falls back to plain input if stdin is not a TTY.
-  if (!process.stdin.isTTY) return ask(question, { default: def });
-  return new Promise((resolve) => {
-    const stdin = process.stdin;
-    const out = process.stdout;
-    const hint = def ? ' [使用上次保存的值]' : '';
-    out.write(`${question}${hint} `);
-    let buf = '';
-    const onData = (ch) => {
-      const s = ch.toString('utf8');
-      for (const c of s) {
-        if (c === '\n' || c === '\r' || c === '\u0004') {
-          stdin.setRawMode(false);
-          stdin.pause();
-          stdin.removeListener('data', onData);
-          out.write('\n');
-          const v = buf;
-          resolve(v === '' && def !== undefined ? String(def) : v);
-          return;
-        } else if (c === '\u0003') { // Ctrl+C
-          process.exit(130);
-        } else if (c === '\u007f' || c === '\b') {
-          if (buf.length > 0) {
-            buf = buf.slice(0, -1);
-            out.write('\b \b');
-          }
-        } else {
-          buf += c;
-          out.write('*');
-        }
-      }
-    };
-    stdin.setRawMode(true);
-    stdin.resume();
-    stdin.on('data', onData);
-  });
-}
-
-module.exports = { ask, askRequired, confirm, askPassword };
+'use strict';
+
+// Tiny interactive prompt helpers built on Node's readline.
+// No external deps. All functions return Promises.
+
+const readline = require('readline');
+
+function makeRL() {
+  return readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: true,
+  });
+}
+
+function ask(question, { default: def } = {}) {
+  return new Promise((resolve) => {
+    const rl = makeRL();
+    const hint = def !== undefined && def !== '' ? ` [${def}]` : '';
+    rl.question(`${question}${hint} `, (answer) => {
+      rl.close();
+      const v = (answer || '').trim();
+      resolve(v === '' && def !== undefined ? String(def) : v);
+    });
+  });
+}
+
+async function askRequired(question, { default: def, validate } = {}) {
+  // Loop until user supplies a non-empty value (or default is used).
+  // If `validate(v)` returns a string, treat as error message and re-prompt.
+  while (true) {
+    const v = await ask(question, { default: def });
+    if (!v) {
+      console.log('  (不能为空，请重新输入)');
+      continue;
+    }
+    if (typeof validate === 'function') {
+      const err = validate(v);
+      if (typeof err === 'string' && err) {
+        console.log(`  ${err}`);
+        continue;
+      }
+    }
+    return v;
+  }
+}
+
+async function confirm(question, { default: def = false } = {}) {
+  const yn = def ? 'Y/n' : 'y/N';
+  const v = (await ask(`${question} (${yn})`)).toLowerCase();
+  if (!v) return def;
+  return v === 'y' || v === 'yes';
+}
+
+async function askPassword(question, { default: def } = {}) {
+  // Best-effort masked input. Falls back to plain input if stdin is not a TTY.
+  if (!process.stdin.isTTY) return ask(question, { default: def });
+  return new Promise((resolve) => {
+    const stdin = process.stdin;
+    const out = process.stdout;
+    const hint = def ? ' [使用上次保存的值]' : '';
+    out.write(`${question}${hint} `);
+    let buf = '';
+    const onData = (ch) => {
+      const s = ch.toString('utf8');
+      for (const c of s) {
+        if (c === '\n' || c === '\r' || c === '\u0004') {
+          stdin.setRawMode(false);
+          stdin.pause();
+          stdin.removeListener('data', onData);
+          out.write('\n');
+          const v = buf;
+          resolve(v === '' && def !== undefined ? String(def) : v);
+          return;
+        } else if (c === '\u0003') { // Ctrl+C
+          process.exit(130);
+        } else if (c === '\u007f' || c === '\b') {
+          if (buf.length > 0) {
+            buf = buf.slice(0, -1);
+            out.write('\b \b');
+          }
+        } else {
+          buf += c;
+          out.write('*');
+        }
+      }
+    };
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.on('data', onData);
+  });
+}
+
+module.exports = { ask, askRequired, confirm, askPassword };

package/src/updateCheck.js

@@ -1,14 +1,14 @@
-'use strict';
-
+'use strict';
+
 // Fetch the latest draftgo-cli version from the DraftGo release endpoint.
 // Results are cached for 24 hours so update stays fast and deterministic.
-
+
 const http = require('http');
 const https = require('https');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-
+
 const REPO = process.env.DRAFTGO_REPO || 'draftgo/draftgo-cli';
 const RELEASE_BASE_URL = process.env.DRAFTGO_INSTALL_BASE_URL || 'https://draftgo.cn/draftgo-cli';
 const RELEASE_URLS = [
@@ -85,16 +85,16 @@ async function fetchLatestVersion(timeoutMs = 3000, opts = {}) {
   }
   return null;
 }
-
-// Compare 'a.b.c' ignoring prerelease tags. Returns 1 / 0 / -1.
-function cmpSemver(a, b) {
-  const pa = String(a).split('-')[0].split('.').map((x) => Number(x) || 0);
-  const pb = String(b).split('-')[0].split('.').map((x) => Number(x) || 0);
-  for (let i = 0; i < 3; i++) {
-    const d = (pa[i] || 0) - (pb[i] || 0);
-    if (d !== 0) return d > 0 ? 1 : -1;
-  }
-  return 0;
-}
-
+
+// Compare 'a.b.c' ignoring prerelease tags. Returns 1 / 0 / -1.
+function cmpSemver(a, b) {
+  const pa = String(a).split('-')[0].split('.').map((x) => Number(x) || 0);
+  const pb = String(b).split('-')[0].split('.').map((x) => Number(x) || 0);
+  for (let i = 0; i < 3; i++) {
+    const d = (pa[i] || 0) - (pb[i] || 0);
+    if (d !== 0) return d > 0 ? 1 : -1;
+  }
+  return 0;
+}
+
 module.exports = { fetchLatestVersion, cmpSemver, readCache, requestVersion, CACHE_TTL_MS };