@jay-framework/editor-client 0.6.3 → 0.6.5

package/dist/index.cjs

@@ -28,8 +28,8 @@ class ConnectionManager {
     this.scanTimeout = options.scanTimeout || 5e3;
     this.retryAttempts = options.retryAttempts || 3;
     this.editorId = options.editorId || uuid.v4();
-    this.autoReconnect = options.autoReconnect ?? true;
-    this.reconnectDelay = options.reconnectDelay ?? 1e3;
+    this.autoReconnect = options.autoReconnect || true;
+    this.reconnectDelay = options.reconnectDelay || 1e3;
   }
   async connect() {
     if (this.connectionState === "connected" || this.isConnecting) {
@@ -118,6 +118,7 @@ class ConnectionManager {
   async discoverServer() {
     const [startPort, endPort] = this.portRange;
     const ports = Array.from({ length: endPort - startPort + 1 }, (_, i) => startPort + i);
+    const errors = [];
     for (let attempt = 0; attempt < this.retryAttempts; attempt++) {
       for (const port of ports) {
         try {
@@ -126,13 +127,17 @@ class ConnectionManager {
             return port;
           }
         } catch (error) {
+          errors.push(`tried port ${port} with error ${error?.message}`);
         }
       }
       if (attempt < this.retryAttempts - 1) {
         await new Promise((resolve) => setTimeout(resolve, 1e3));
       }
     }
-    throw new Error(`No editor server found in port range ${startPort}-${endPort}`);
+    throw new Error(
+      `No editor server found in port range ${startPort}-${endPort}:
+${errors.join("\n")}`
+    );
   }
   async checkPort(port) {
     return new Promise((resolve, reject) => {
@@ -149,10 +154,17 @@ class ConnectionManager {
         }
         throw new Error(`HTTP ${response.status}`);
       }).then((data) => {
-        if (data.status === "init" || data.id === this.editorId) {
+        if (data.status === "init" || data.id === this.editorId && data.status === "match") {
           resolve(data);
         } else {
-          resolve(null);
+          if (data.id)
+            reject(
+              new Error(
+                `failed to match on editorId ${this.editorId} !== port's ${data.id}`
+              )
+            );
+          else
+            reject(new Error(`failed to match on editorId ${this.editorId}`));
         }
       }).catch((error) => {
         clearTimeout(timeout);
@@ -241,6 +253,9 @@ class EditorClient {
   async hasImage(params) {
     return this.connectionManager.sendMessage(params);
   }
+  async send(params) {
+    return this.connectionManager.sendMessage(params);
+  }
   // Get access to the underlying connection manager if needed
   getConnectionManager() {
     return this.connectionManager;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _jay_framework_editor_protocol from '@jay-framework/editor-protocol';
-import { ConnectionState, PublishMessage, SaveImageMessage, HasImageMessage, PublishResponse, SaveImageResponse, HasImageResponse, EditorProtocol } from '@jay-framework/editor-protocol';
+import { ConnectionState, PublishMessage, SaveImageMessage, HasImageMessage, PublishResponse, SaveImageResponse, HasImageResponse, EditorProtocol, EditorProtocolMessageTypes, EditorProtocolResponseTypes } from '@jay-framework/editor-protocol';
 
 interface ConnectionManagerOptions {
     portRange?: [number, number];
@@ -52,6 +52,7 @@ declare class EditorClient implements EditorProtocol {
     publish(params: PublishMessage): Promise<PublishResponse>;
     saveImage(params: SaveImageMessage): Promise<SaveImageResponse>;
     hasImage(params: HasImageMessage): Promise<HasImageResponse>;
+    send(params: EditorProtocolMessageTypes): Promise<EditorProtocolResponseTypes>;
     getConnectionManager(): ConnectionManager;
 }
 declare function createEditorClient(options?: EditorClientOptions): EditorClient;

package/dist/index.js

@@ -26,8 +26,8 @@ class ConnectionManager {
     this.scanTimeout = options.scanTimeout || 5e3;
     this.retryAttempts = options.retryAttempts || 3;
     this.editorId = options.editorId || v4();
-    this.autoReconnect = options.autoReconnect ?? true;
-    this.reconnectDelay = options.reconnectDelay ?? 1e3;
+    this.autoReconnect = options.autoReconnect || true;
+    this.reconnectDelay = options.reconnectDelay || 1e3;
   }
   async connect() {
     if (this.connectionState === "connected" || this.isConnecting) {
@@ -116,6 +116,7 @@ class ConnectionManager {
   async discoverServer() {
     const [startPort, endPort] = this.portRange;
     const ports = Array.from({ length: endPort - startPort + 1 }, (_, i) => startPort + i);
+    const errors = [];
     for (let attempt = 0; attempt < this.retryAttempts; attempt++) {
       for (const port of ports) {
         try {
@@ -124,13 +125,17 @@ class ConnectionManager {
             return port;
           }
         } catch (error) {
+          errors.push(`tried port ${port} with error ${error?.message}`);
         }
       }
       if (attempt < this.retryAttempts - 1) {
         await new Promise((resolve) => setTimeout(resolve, 1e3));
       }
     }
-    throw new Error(`No editor server found in port range ${startPort}-${endPort}`);
+    throw new Error(
+      `No editor server found in port range ${startPort}-${endPort}:
+${errors.join("\n")}`
+    );
   }
   async checkPort(port) {
     return new Promise((resolve, reject) => {
@@ -147,10 +152,17 @@ class ConnectionManager {
         }
         throw new Error(`HTTP ${response.status}`);
       }).then((data) => {
-        if (data.status === "init" || data.id === this.editorId) {
+        if (data.status === "init" || data.id === this.editorId && data.status === "match") {
           resolve(data);
         } else {
-          resolve(null);
+          if (data.id)
+            reject(
+              new Error(
+                `failed to match on editorId ${this.editorId} !== port's ${data.id}`
+              )
+            );
+          else
+            reject(new Error(`failed to match on editorId ${this.editorId}`));
         }
       }).catch((error) => {
         clearTimeout(timeout);
@@ -239,6 +251,9 @@ class EditorClient {
   async hasImage(params) {
     return this.connectionManager.sendMessage(params);
   }
+  async send(params) {
+    return this.connectionManager.sendMessage(params);
+  }
   // Get access to the underlying connection manager if needed
   getConnectionManager() {
     return this.connectionManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/editor-client",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -27,14 +27,14 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/editor-protocol": "^0.6.3",
+    "@jay-framework/editor-protocol": "^0.6.5",
     "get-port": "^7.0.0",
     "socket.io-client": "^4.7.4",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.6.3",
-    "@jay-framework/jay-cli": "^0.6.3",
+    "@jay-framework/dev-environment": "^0.6.5",
+    "@jay-framework/jay-cli": "^0.6.5",
     "@types/node": "^22.15.21",
     "@types/uuid": "^9.0.7",
     "rimraf": "^5.0.5",