diff --git a/javascript/index.d.ts b/javascript/index.d.ts index f0366d4d..a5715f3f 100644 --- a/javascript/index.d.ts +++ b/javascript/index.d.ts @@ -40,8 +40,14 @@ interface hRPC extends MessageEmitter { decode(aObject: any): Promise; } +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 index 8dbba48d..f420c645 100644 --- a/javascript/package-lock.json +++ b/javascript/package-lock.json @@ -1,6 +1,6 @@ { "name": "imjoy-rpc", - "version": "0.5.55", + "version": "0.5.56", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/javascript/package.json b/javascript/package.json index bb78e892..197c3459 100644 --- 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 index bce1eea0..fb6cc508 100644 --- 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 index ec28061a..0b96465f 100644 --- a/python/imjoy_rpc/VERSION +++ b/python/imjoy_rpc/VERSION @@ -1,3 +1,3 @@ { - "version": "0.5.55" + "version": "0.5.56" }