m365connector 0.3.6 → 0.3.7

package/src/tools/search.js

@@ -1,16 +1,9 @@
 import crypto from "node:crypto";
 
-const WHOAMI_TIMEOUT_MS = 60000;
-const FIND_PEOPLE_TIMEOUT_MS = 90000;
-const COUNT_PEOPLE_TIMEOUT_MS = 120000;
-
-const SEARCH_FILE_THRESHOLD = 8192;
-const OPEN_FILE_THRESHOLD = 4096;
-
 const SEARCH_TOOL = {
   name: "search",
   description:
-    "Search across Microsoft 365 data including emails, files, Teams chats, calendar events, and external connectors. Large result sets are saved to a local temp file — use the returned file_path with your file-reading tool to access the full results.",
+    "Search across Microsoft 365 data including emails, files, Teams chats, calendar events, and external connectors.",
   inputSchema: {
     type: "object",
     properties: {
@@ -250,10 +243,9 @@ export function registerTools(registry, context) {
     const size = Number.isInteger(args.size) ? args.size : 10;
     const from = Number.isInteger(args.from) ? args.from : 0;
 
-    const wsResult = await context.ws.sendRequest(
-      "search",
-      { conversation_id: conversationId, query, source, connector, size, from },
-      { timeoutMs: 30000 }
+    await context.substrateTokenProvider.getTokenEntry();
+    const wsResult = await context.searchApi.search(
+      { conversation_id: conversationId, query, source, connector, size, from }
     );
 
     const resultObject = asObject(wsResult);
@@ -274,7 +266,7 @@ export function registerTools(registry, context) {
       const readHandle = makeReadHandle(context.readHandleCache, readContext);
 
       // Only expose the opaque handle to agents; never return internal read context.
-      const entry = {
+      return {
         index: Number.isInteger(publicRow.index) ? publicRow.index : index,
         type: publicRow.type || "",
         title: publicRow.title || "",
@@ -303,18 +295,9 @@ export function registerTools(registry, context) {
         email: publicRow.email,
         _readHandle: readHandle
       };
-
-      // Strip null/undefined fields to reduce payload size
-      for (const key of Object.keys(entry)) {
-        if (entry[key] == null) {
-          delete entry[key];
-        }
-      }
-
-      return entry;
     });
 
-    const response = {
+    return {
       results: transformedResults,
       totalEstimatedMatches: Number(resultObject.totalEstimatedMatches || 0),
       moreAvailable: Boolean(resultObject.moreAvailable),
@@ -324,24 +307,6 @@ export function registerTools(registry, context) {
           : from + transformedResults.length,
       warnings: Array.isArray(resultObject.warnings) ? resultObject.warnings : []
     };
-
-    const responseJson = JSON.stringify(response);
-    const responseBytes = Buffer.byteLength(responseJson, "utf-8");
-
-    if (responseBytes > SEARCH_FILE_THRESHOLD) {
-      const filePath = context.tempFiles.write(responseJson);
-      return {
-        result_count: transformedResults.length,
-        file_path: filePath,
-        file_size_bytes: responseBytes,
-        totalEstimatedMatches: response.totalEstimatedMatches,
-        moreAvailable: response.moreAvailable,
-        nextFrom: response.nextFrom,
-        warnings: response.warnings
-      };
-    }
-
-    return response;
   });
 
   registry.addTool(OPEN_TOOL, async (args) => {
@@ -360,10 +325,8 @@ export function registerTools(registry, context) {
       throw new Error("Invalid or expired read_handle. Run search again.");
     }
 
-    const wsResult = await context.ws.sendRequest(
-      "open",
-      { conversation_id: conversationId, context: readContext, fullContent: Boolean(args.fullContent) },
-      { timeoutMs: args.fullContent ? 90000 : 60000 }
+    const wsResult = await context.contentReader.read(
+      { conversation_id: conversationId, context: readContext, fullContent: Boolean(args.fullContent) }
     );
 
     const result = asObject(wsResult);
@@ -375,7 +338,8 @@ export function registerTools(registry, context) {
       : (result.content != null ? JSON.stringify(result.content, null, 2) : "");
     const contentBytes = Buffer.byteLength(content, "utf-8");
 
-    const useFile = contentBytes > OPEN_FILE_THRESHOLD;
+    const FILE_THRESHOLD = 4096;
+    const useFile = contentBytes > FILE_THRESHOLD;
 
     const summary = {
       type: readContext.type || result.type || "",
@@ -436,16 +400,11 @@ export function registerTools(registry, context) {
       throw new Error("conversation_id is required");
     }
 
-    const wsResult = await context.ws.sendRequest(
-      "whoami",
-      {
-        conversation_id: conversationId,
-        direct_reports_size: Number.isInteger(args.direct_reports_size)
-          ? args.direct_reports_size
-          : 30
-      },
-      { timeoutMs: WHOAMI_TIMEOUT_MS }
-    );
+    const wsResult = await context.contentReader.whoAmI({
+      directReportsSize: Number.isInteger(args.direct_reports_size)
+        ? args.direct_reports_size
+        : 30
+    });
 
     return asObject(wsResult);
   });
@@ -469,11 +428,7 @@ export function registerTools(registry, context) {
     };
     const size = Number.isInteger(args.size) ? args.size : 20;
 
-    const wsResult = await context.ws.sendRequest(
-      "find_people",
-      { conversation_id: conversationId, ...requestParams, size },
-      { timeoutMs: FIND_PEOPLE_TIMEOUT_MS }
-    );
+    const wsResult = await context.contentReader.findPeople({ ...requestParams, size });
 
     return asObject(wsResult);
   });
@@ -494,11 +449,7 @@ export function registerTools(registry, context) {
       title: typeof args.title === "string" ? args.title.trim() : ""
     };
 
-    const wsResult = await context.ws.sendRequest(
-      "count_people",
-      { conversation_id: conversationId, ...requestParams },
-      { timeoutMs: COUNT_PEOPLE_TIMEOUT_MS }
-    );
+    const wsResult = await context.contentReader.countPeople(requestParams);
 
     return asObject(wsResult);
   });

package/src/ws-server.js

@@ -1,203 +0,0 @@
-import crypto from "node:crypto";
-import { WebSocket, WebSocketServer } from "ws";
-
-export class WsServer {
-  constructor(options = {}) {
-    const stderrLogger = {
-      info: (...args) => console.error(...args),
-      warn: (...args) => console.warn(...args),
-      error: (...args) => console.error(...args)
-    };
-
-    this.host = options.host || "127.0.0.1";
-    this.port = Number(options.port || 52365);
-    this.logger = options.logger || stderrLogger;
-
-    this.wss = null;
-    this.client = null;
-    this.pending = new Map();
-  }
-
-  async start() {
-    if (this.wss) {
-      return;
-    }
-
-    this.wss = new WebSocketServer({
-      host: this.host,
-      port: this.port
-    });
-
-    this.wss.on("connection", (socket, req) => {
-      this.handleConnection(socket, req).catch((err) => {
-        this.logger.error("[m365connector/ws] connection handling failed:", err);
-        try {
-          socket.close(1011, "internal error");
-        } catch (_err) {
-          // ignored
-        }
-      });
-    });
-
-    await new Promise((resolve, reject) => {
-      this.wss.once("listening", resolve);
-      this.wss.once("error", reject);
-    });
-
-    this.logger.info(`[m365connector/ws] listening on ws://${this.host}:${this.port}`);
-  }
-
-  async stop() {
-    for (const pending of this.pending.values()) {
-      clearTimeout(pending.timeout);
-      pending.reject(new Error("WebSocket server stopped"));
-    }
-    this.pending.clear();
-
-    if (this.client) {
-      try {
-        this.client.close(1001, "server stopping");
-      } catch (_err) {
-        // ignored
-      }
-      this.client = null;
-    }
-
-    if (!this.wss) {
-      return;
-    }
-
-    const wss = this.wss;
-    this.wss = null;
-    await new Promise((resolve) => wss.close(resolve));
-  }
-
-  isReady() {
-    return Boolean(this.client && this.client.readyState === WebSocket.OPEN);
-  }
-
-  getStatus() {
-    return {
-      host: this.host,
-      port: this.port,
-      connected: this.isReady()
-    };
-  }
-
-  async sendRequest(type, params, options = {}) {
-    const timeoutMs = Number(options.timeoutMs || 30000);
-
-    if (!this.isReady()) {
-      throw new Error("M365 Connector extension is not connected");
-    }
-
-    const id = crypto.randomUUID();
-    const payload = { id, type, params: params || {} };
-
-    return new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => {
-        this.logger.warn(`[m365connector/ws] request timed out: type=${type} id=${id}`);
-        this.pending.delete(id);
-        reject(new Error(`WebSocket request timed out after ${timeoutMs}ms`));
-      }, timeoutMs);
-
-      this.pending.set(id, { resolve, reject, timeout });
-
-      try {
-        this.client.send(JSON.stringify(payload));
-      } catch (err) {
-        clearTimeout(timeout);
-        this.pending.delete(id);
-        reject(err);
-      }
-    });
-  }
-
-  async handleConnection(socket, req) {
-    const origin = req.headers.origin;
-
-    if (!origin) {
-      this.logger.warn("[m365connector/ws] rejected connection: missing origin header");
-      socket.close(1008, "origin required");
-      return;
-    }
-
-    if (!origin.startsWith("chrome-extension://")) {
-      this.logger.warn(`[m365connector/ws] rejected connection from origin: ${origin}`);
-      socket.close(1008, "origin not allowed");
-      return;
-    }
-
-    if (this.client && this.client.readyState === WebSocket.OPEN) {
-      // MV3 service workers can die silently without sending a close frame.
-      // When the extension reconnects, replace the stale connection.
-      this.logger.info("[m365connector/ws] replacing existing connection with new one");
-      try { this.client.terminate(); } catch (_e) { /* ignored */ }
-      this.handleClose(this.client);
-    }
-
-    // Clean up if client ref exists but is no longer OPEN
-    if (this.client && this.client.readyState !== WebSocket.OPEN) {
-      this.client = null;
-    }
-
-    this.client = socket;
-
-    socket.on("message", async (rawData) => {
-      await this.handleMessage(socket, rawData);
-    });
-
-    socket.on("close", (code, reason) => {
-      this.logger.info(`[m365connector/ws] socket close: code=${code}, reason=${String(reason)}`);
-      this.handleClose(socket);
-    });
-
-    socket.on("error", (err) => {
-      this.logger.warn("[m365connector/ws] client socket error:", err.message);
-    });
-    this.logger.info("[m365connector/ws] extension connected");
-  }
-
-  async handleMessage(socket, rawData) {
-    let message;
-    try {
-      message = JSON.parse(String(rawData));
-    } catch (_err) {
-      socket.close(4002, "invalid json");
-      return;
-    }
-
-    if (!message?.id) {
-      return;
-    }
-
-    const pending = this.pending.get(message.id);
-    if (!pending) {
-      return;
-    }
-
-    clearTimeout(pending.timeout);
-    this.pending.delete(message.id);
-
-    if (!message.success) {
-      pending.reject(new Error(message.error || "Unknown extension error"));
-      return;
-    }
-
-    pending.resolve(message.data);
-  }
-
-  handleClose(socket) {
-    if (this.client === socket) {
-      this.client = null;
-    }
-
-    for (const [id, pending] of this.pending.entries()) {
-      clearTimeout(pending.timeout);
-      pending.reject(new Error("Extension disconnected"));
-      this.pending.delete(id);
-    }
-
-    this.logger.info("[m365connector/ws] extension disconnected");
-  }
-}