Fix/base url issue (#193)

* fix base url retrieval method * incorrect base
rapidsai · May 1, 2024 · 10d4f91 · 10d4f91
1 parent 578b58b
commit 10d4f91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/charts/PciThroughputChart.tsx b/src/charts/PciThroughputChart.tsx
@@ -24,7 +24,7 @@ const PciThroughputChart: React.FC<IChartProps> = ({ settingRegistry }) => {
   // Load settings and initialize WebSocket connection
   loadSettingRegistry(settingRegistry, setUpdateFrequency, setIsSettingsLoaded);
   useWebSocket<IPCIThroughputProps>(
-    'nvlink_throughput',
+    'pci_stats',
     false,
     updateFrequency,
     setPciStats,

diff --git a/src/handler.ts b/src/handler.ts
@@ -1,14 +1,18 @@
+import { URLExt } from '@jupyterlab/coreutils';
+import { ServerConnection } from '@jupyterlab/services';
+
 /**
  * Connect to a WebSocket API endpoint
  *
  * @param endPoint WebSocket endpoint for the extension
  * @returns A WebSocket object connected to the endpoint
  */
 export function connectToWebSocket(endPoint = '') {
-  const baseUrl = document.location.origin.replace(/^http/, 'ws');
-  const wsUrl = new URL(`nvdashboard/${endPoint}`, baseUrl);
+  const settings = ServerConnection.makeSettings();
+  const baseUrl = settings.baseUrl.replace(/^http/, 'ws');
+  const wsUrl = URLExt.join(baseUrl, 'nvdashboard', endPoint);
 
-  const ws = new WebSocket(wsUrl.href);
+  const ws = new WebSocket(wsUrl);
 
   ws.onopen = () => {
     console.log(`WebSocket connected to ${endPoint}`);