Support passing server object

imjoy-team · Jun 28, 2024 · 788de8f · 788de8f
1 parent 2564d98
commit 788de8f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/javascript/index.d.ts b/javascript/index.d.ts
@@ -40,8 +40,14 @@ interface hRPC extends MessageEmitter {
   decode(aObject: any): Promise<any>;
 }
 
+interface HyphaServer {
+  url: string;
+  WebSocketClass: any;
+}
+
 interface ServerConfig {
-  server_url: string;
+  server?: HyphaServer;
+  server_url?: string;
   client_id?: string;
   workspace?: string;
   token?: string;

diff --git a/javascript/package-lock.json b/javascript/package-lock.json
diff --git a/javascript/package.json b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "imjoy-rpc",
-  "version": "0.5.55",
+  "version": "0.5.56",
   "description": "Remote procedure calls for ImJoy.",
   "module": "index.js",
   "types": "index.d.ts",

diff --git a/javascript/src/hypha/websocket-client.js b/javascript/src/hypha/websocket-client.js
@@ -199,6 +199,11 @@ export async function login(config) {
 }
 
 export async function connectToServer(config) {
+  if (config.server) {
+    config.server_url = config.server_url || config.server.url;
+    config.WebSocketClass =
+      config.WebSocketClass || config.server.WebSocketClass;
+  }
   let clientId = config.client_id;
   if (!clientId) {
     clientId = randId();
@@ -390,7 +395,10 @@ class LocalWebSocket {
   }
 }
 
-export function setupLocalClient({ enable_execution = false, on_ready = null }) {
+export function setupLocalClient({
+  enable_execution = false,
+  on_ready = null
+}) {
   return new Promise((resolve, reject) => {
     const context = typeof window !== "undefined" ? window : self;
     const isWindow = typeof window !== "undefined";

diff --git a/python/imjoy_rpc/VERSION b/python/imjoy_rpc/VERSION
@@ -1,3 +1,3 @@
 {
-    "version": "0.5.55"
+    "version": "0.5.56"
 }