fix: inconsistent w3ui custom URL handling

this is one way of resolving issue storacha#344, where a custom server URL is used only for the individual HTTP requests and not for the corresponding WebSocket connection
natevw · Jan 31, 2023 · bcbc8f8 · bcbc8f8
1 parent fc53a16
commit bcbc8f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/access-client/src/agent.js b/packages/access-client/src/agent.js
@@ -79,7 +79,7 @@ export class Agent {
    * @param {import('./types').AgentOptions} [options]
    */
   constructor(data, options = {}) {
-    this.url = options.url ?? new URL(HOST)
+    this.url = options.connection?.url ?? options.url ?? new URL(HOST)
     this.connection =
       options.connection ??
       connection({

diff --git a/packages/access-client/src/types.ts b/packages/access-client/src/types.ts
@@ -171,9 +171,14 @@ export interface SpaceMeta {
  * Agent class types
  */
 
+// w3ui's keyring providers pass custom URL via this object
+interface _AgentConnection extends ConnectionView<Service> {
+  url?: URL
+}
+
 export interface AgentOptions {
   url?: URL
-  connection?: ConnectionView<Service>
+  connection?: _AgentConnection
   servicePrincipal?: Principal
 }