mindcache 2.2.0 → 2.3.0

package/dist/cloud/index.mjs

@@ -15,16 +15,17 @@ var CloudAdapter_exports = {};
 __export(CloudAdapter_exports, {
   CloudAdapter: () => CloudAdapter
 });
-var DEFAULT_BASE_URL, RECONNECT_DELAY, MAX_RECONNECT_DELAY, CloudAdapter;
+var RECONNECT_DELAY, MAX_RECONNECT_DELAY, CloudAdapter;
 var init_CloudAdapter = __esm({
   "src/cloud/CloudAdapter.ts"() {
-    DEFAULT_BASE_URL = "wss://api.mindcache.io";
     RECONNECT_DELAY = 1e3;
     MAX_RECONNECT_DELAY = 3e4;
     CloudAdapter = class {
       constructor(config) {
         this.config = config;
-        this.config.baseUrl = config.baseUrl || DEFAULT_BASE_URL;
+        if (!config.baseUrl) {
+          throw new Error("MindCache Cloud: baseUrl is required. Please provide the cloud API URL in your configuration.");
+        }
       }
       ws = null;
       queue = [];
@@ -85,6 +86,40 @@ var init_CloudAdapter = __esm({
         }
         this.mindcache = null;
       }
+      /**
+       * Fetch a short-lived WebSocket token from the API using the API key.
+       * This keeps the API key secure by only using it for a single HTTPS request,
+       * then using the short-lived token for the WebSocket connection.
+       *
+       * Supports two key formats:
+       * - API keys: mc_live_xxx or mc_test_xxx → Bearer token
+       * - Delegate keys: del_xxx:sec_xxx → ApiKey format
+       */
+      async fetchTokenWithApiKey() {
+        if (!this.config.apiKey) {
+          throw new Error("API key is required to fetch token");
+        }
+        const httpBaseUrl = this.config.baseUrl.replace("wss://", "https://").replace("ws://", "http://");
+        const isDelegate = this.config.apiKey.startsWith("del_") && this.config.apiKey.includes(":");
+        const authHeader = isDelegate ? `ApiKey ${this.config.apiKey}` : `Bearer ${this.config.apiKey}`;
+        const response = await fetch(`${httpBaseUrl}/api/ws-token`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            "Authorization": authHeader
+          },
+          body: JSON.stringify({
+            instanceId: this.config.instanceId,
+            permission: "write"
+          })
+        });
+        if (!response.ok) {
+          const error = await response.json().catch(() => ({ error: "Failed to get token" }));
+          throw new Error(error.error || `Failed to get WebSocket token: ${response.status}`);
+        }
+        const data = await response.json();
+        return data.token;
+      }
       /**
        * Connect to the cloud service
        */
@@ -94,13 +129,19 @@ var init_CloudAdapter = __esm({
         }
         this._state = "connecting";
         try {
-          if (this.config.tokenProvider && !this.token) {
-            this.token = await this.config.tokenProvider();
+          if (!this.token) {
+            if (this.config.tokenProvider) {
+              this.token = await this.config.tokenProvider();
+            } else if (this.config.apiKey) {
+              this.token = await this.fetchTokenWithApiKey();
+            }
           }
           let url = `${this.config.baseUrl}/sync/${this.config.instanceId}`;
           if (this.token) {
             url += `?token=${encodeURIComponent(this.token)}`;
             this.token = null;
+          } else {
+            throw new Error("MindCache Cloud: No authentication method available. Provide apiKey or tokenProvider.");
           }
           this.ws = new WebSocket(url);
           this.setupWebSocket();
@@ -162,12 +203,6 @@ var init_CloudAdapter = __esm({
           return;
         }
         this.ws.onopen = () => {
-          if (this.config.apiKey) {
-            this.ws.send(JSON.stringify({
-              type: "auth",
-              apiKey: this.config.apiKey
-            }));
-          }
         };
         this.ws.onmessage = (event) => {
           try {
@@ -175,6 +210,7 @@ var init_CloudAdapter = __esm({
             this.handleMessage(msg);
           } catch (error) {
             console.error("MindCache Cloud: Failed to parse message:", error);
+            console.error("Raw message:", typeof event.data === "string" ? event.data.slice(0, 200) : event.data);
           }
         };
         this.ws.onclose = () => {
@@ -182,10 +218,12 @@ var init_CloudAdapter = __esm({
           this.emit("disconnected");
           this.scheduleReconnect();
         };
-        this.ws.onerror = (error) => {
+        this.ws.onerror = () => {
           this._state = "error";
-          this.emit("error", new Error("WebSocket error"));
-          console.error("MindCache Cloud: WebSocket error:", error);
+          const url = `${this.config.baseUrl}/sync/${this.config.instanceId}`;
+          console.error(`MindCache Cloud: WebSocket error connecting to ${url}`);
+          console.error("Check that the instance ID and API key are correct, and that the server is reachable.");
+          this.emit("error", new Error(`WebSocket connection failed to ${url}`));
         };
       }
       handleMessage(msg) {
@@ -262,15 +300,6 @@ var init_CloudAdapter = __esm({
         this.reconnectTimeout = setTimeout(async () => {
           this.reconnectTimeout = null;
           this.reconnectAttempts++;
-          if (this.config.tokenProvider) {
-            try {
-              this.token = await this.config.tokenProvider();
-            } catch (error) {
-              console.error("MindCache Cloud: Failed to get token for reconnect:", error);
-              this.emit("error", error);
-              return;
-            }
-          }
           this.connect();
         }, delay);
       }
@@ -325,6 +354,7 @@ var MindCache = class {
   _cloudConfig = null;
   // Access level for system operations
   _accessLevel = "user";
+  _initPromise = null;
   constructor(options) {
     if (options?.accessLevel) {
       this._accessLevel = options.accessLevel;
@@ -333,7 +363,7 @@ var MindCache = class {
       this._cloudConfig = options.cloud;
       this._isLoaded = false;
       this._connectionState = "disconnected";
-      this._initCloud();
+      this._initPromise = this._initCloud();
     }
   }
   /**
@@ -353,9 +383,11 @@ var MindCache = class {
       return;
     }
     try {
-      const { CloudAdapter: CloudAdapter2 } = await Promise.resolve().then(() => (init_CloudAdapter(), CloudAdapter_exports));
-      const configUrl = this._cloudConfig.baseUrl || "https://api.mindcache.io";
-      const baseUrl = configUrl.replace("https://", "wss://").replace("http://", "ws://");
+      const CloudAdapter2 = await this._getCloudAdapterClass();
+      if (!this._cloudConfig.baseUrl) {
+        throw new Error("MindCache Cloud: baseUrl is required. Please provide the cloud API URL in your configuration.");
+      }
+      const baseUrl = this._cloudConfig.baseUrl.replace("https://", "wss://").replace("http://", "ws://");
       const adapter = new CloudAdapter2({
         instanceId: this._cloudConfig.instanceId,
         projectId: this._cloudConfig.projectId || "default",
@@ -423,12 +455,46 @@ var MindCache = class {
   get isLoaded() {
     return this._isLoaded;
   }
+  /**
+   * Protected method to load CloudAdapter class.
+   * Can be overridden/mocked for testing.
+   */
+  async _getCloudAdapterClass() {
+    const { CloudAdapter: CloudAdapter2 } = await Promise.resolve().then(() => (init_CloudAdapter(), CloudAdapter_exports));
+    return CloudAdapter2;
+  }
   /**
    * Check if this instance is connected to cloud
    */
   get isCloud() {
     return this._cloudConfig !== null;
   }
+  /**
+   * Wait for initial sync to complete (or resolve immediately if already synced/local).
+   * Useful for scripts or linear execution flows.
+   */
+  async waitForSync() {
+    if (this._isLoaded) {
+      return;
+    }
+    if (this._initPromise) {
+      await this._initPromise;
+    }
+    if (this._isLoaded) {
+      return;
+    }
+    return new Promise((resolve) => {
+      if (!this._cloudAdapter) {
+        resolve();
+        return;
+      }
+      const handler = () => {
+        this._cloudAdapter?.off("synced", handler);
+        resolve();
+      };
+      this._cloudAdapter.on("synced", handler);
+    });
+  }
   /**
    * Disconnect from cloud (if connected)
    */