Big commit

src/app/core/services/server-directory.service.ts

@@ -3,6 +3,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable, of, throwError, forkJoin } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { ServerInfo, JoinRequest, User } from '../models';
+import { v4 as uuidv4 } from 'uuid';
 
 export interface ServerEndpoint {
   id: string;
@@ -15,9 +16,19 @@ export interface ServerEndpoint {
 }
 
 const STORAGE_KEY = 'metoyou_server_endpoints';
+
+/** Derive default server URL from current page protocol (handles SSL toggle). */
+function getDefaultServerUrl(): string {
+  if (typeof window !== 'undefined' && window.location) {
+    const proto = window.location.protocol === 'https:' ? 'https' : 'http';
+    return `${proto}://localhost:3001`;
+  }
+  return 'http://localhost:3001';
+}
+
 const DEFAULT_SERVER: Omit<ServerEndpoint, 'id'> = {
   name: 'Local Server',
-  url: 'http://localhost:3001',
+  url: getDefaultServerUrl(),
   isActive: true,
   isDefault: true,
   status: 'unknown',
@@ -41,12 +52,21 @@ export class ServerDirectoryService {
     const stored = localStorage.getItem(STORAGE_KEY);
     if (stored) {
       try {
-        const servers = JSON.parse(stored) as ServerEndpoint[];
+        let servers = JSON.parse(stored) as ServerEndpoint[];
         // Ensure at least one is active
         if (!servers.some((s) => s.isActive) && servers.length > 0) {
           servers[0].isActive = true;
         }
+        // Migrate default localhost entries to match current protocol
+        const expectedProto = (typeof window !== 'undefined' && window.location?.protocol === 'https:') ? 'https' : 'http';
+        servers = servers.map((s) => {
+          if (s.isDefault && /^https?:\/\/localhost:\d+$/.test(s.url)) {
+            return { ...s, url: s.url.replace(/^https?/, expectedProto) };
+          }
+          return s;
+        });
         this._servers.set(servers);
+        this.saveServers();
       } catch {
         this.initializeDefaultServer();
       }
@@ -58,7 +78,7 @@ export class ServerDirectoryService {
   private initializeDefaultServer(): void {
     const defaultServer: ServerEndpoint = {
       ...DEFAULT_SERVER,
-      id: crypto.randomUUID(),
+      id: uuidv4(),
     };
     this._servers.set([defaultServer]);
     this.saveServers();
@@ -70,7 +90,7 @@ export class ServerDirectoryService {
 
   private get baseUrl(): string {
     const active = this.activeServer();
-    const raw = active ? active.url : 'http://localhost:3001';
+    const raw = active ? active.url : getDefaultServerUrl();
     // Strip trailing slashes and any accidental '/api'
     let base = raw.replace(/\/+$/,'');
     if (base.toLowerCase().endsWith('/api')) {
@@ -87,7 +107,7 @@ export class ServerDirectoryService {
   // Server management methods
   addServer(server: { name: string; url: string }): void {
     const newServer: ServerEndpoint = {
-      id: crypto.randomUUID(),
+      id: uuidv4(),
       name: server.name,
       // Sanitize: remove trailing slashes and any '/api'
       url: (() => {
@@ -396,7 +416,10 @@ export class ServerDirectoryService {
   // Get the WebSocket URL for the active server
   getWebSocketUrl(): string {
     const active = this.activeServer();
-    if (!active) return 'ws://localhost:3001';
+    if (!active) {
+      const proto = (typeof window !== 'undefined' && window.location?.protocol === 'https:') ? 'wss' : 'ws';
+      return `${proto}://localhost:3001`;
+    }
 
     // Convert http(s) to ws(s)
     return active.url.replace(/^http/, 'ws');