Fix so spacetimedb can be hosted with a pathname (#183)

* Allow spacetimedb sdk to work when spacetimedb url is more than a host name.

* run pnpm format

---------

Co-authored-by: DeveloperChaseLewis <[email protected]>

Author: ChaseLewis

examples/quickstart-chat/src/index.css

@@ -32,16 +32,16 @@ body,
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+    'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+  font-family:
+    source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
 }
 
 /* ----- Buttons ----- */

packages/sdk/src/db_connection_impl.ts

@@ -194,8 +194,7 @@ export class DbConnectionImpl<
   }: DbConnectionConfig) {
     stdbLogger('info', 'Connecting to SpacetimeDB WS...');
 
-    let url = new URL(`v1/database/${nameOrAddress}/subscribe`, uri);
-
+    let url = new URL(uri);
     if (!/^wss?:/.test(uri.protocol)) {
       url.protocol = 'ws:';
     }
@@ -219,6 +218,7 @@ export class DbConnectionImpl<
 
     this.wsPromise = createWSFn({
       url,
+      nameOrAddress,
       wsProtocol: 'v1.bsatn.spacetimedb',
       authToken: token,
       compression: compression,

packages/sdk/src/websocket_decompress_adapter.ts

@@ -63,13 +63,15 @@ export class WebsocketDecompressAdapter {
 
   static async createWebSocketFn({
     url,
+    nameOrAddress,
     wsProtocol,
     authToken,
     compression,
     lightMode,
   }: {
     url: URL;
     wsProtocol: string;
+    nameOrAddress: string;
     authToken?: string;
     compression: 'gzip' | 'none';
     lightMode: boolean;
@@ -90,7 +92,7 @@ export class WebsocketDecompressAdapter {
 
     if (authToken) {
       headers.set('Authorization', `Bearer ${authToken}`);
-      const tokenUrl = new URL('/v1/identity/websocket-token', url);
+      const tokenUrl = new URL('v1/identity/websocket-token', url);
       tokenUrl.protocol = url.protocol === 'wss:' ? 'https:' : 'http:';
 
       const response = await fetch(tokenUrl, { method: 'POST', headers });
@@ -103,15 +105,17 @@ export class WebsocketDecompressAdapter {
         );
       }
     }
-    url.searchParams.set(
+
+    const databaseUrl = new URL(`v1/database/${nameOrAddress}/subscribe`, url);
+    databaseUrl.searchParams.set(
       'compression',
       compression === 'gzip' ? 'Gzip' : 'None'
     );
     if (lightMode) {
-      url.searchParams.set('light', 'true');
+      databaseUrl.searchParams.set('light', 'true');
     }
 
-    const ws = new WS(url, wsProtocol);
+    const ws = new WS(databaseUrl, wsProtocol);
 
     return new WebsocketDecompressAdapter(ws);
   }