Get rid of word source

Author: balloob

server.js

@@ -1,5 +1,5 @@
-import { SourceServer } from "./dist/server/source-server.js";
-import { Source } from "./dist/server/source.js";
+import { HTTPServer } from "./dist/server/http-server.js";
+import { Server } from "./dist/server/server.js";
 import { generateUniqueId } from "./dist/util/unique-id.js";
 import fs from "fs";
 import path from "path";
@@ -75,14 +75,14 @@ async function main() {
     const wavData = parseWavFile(WAV_FILE);
 
     // Create and start the Source server
-    const source = new Source(
+    const source = new Server(
       {
-        source_id: generateUniqueId("source"),
+        source_id: generateUniqueId("server"),
         name: "SDKSample",
       },
       logger,
     );
-    const server = new SourceServer(source, PORT, logger);
+    const server = new HTTPServer(source, PORT, logger);
     try {
       server.start();
     } catch (error) {

src/messages.ts

@@ -26,7 +26,7 @@ export interface PlayerTimeInfo {
   player_transmitted: number;
 }
 
-export interface SourceTimeInfo {
+export interface ServerTimeInfo {
   player_transmitted: number;
   source_received: number;
   source_transmitted: number;
@@ -37,19 +37,19 @@ export interface PlayerTimeMessage {
   payload: PlayerTimeInfo;
 }
 
-export interface SourceInfo {
+export interface ServerInfo {
   source_id: string;
   name: string;
 }
 
-export interface SourceHelloMessage {
+export interface ServerHelloMessage {
   type: "source/hello";
-  payload: SourceInfo;
+  payload: ServerInfo;
 }
 
-export interface SourceTimeMessage {
+export interface ServerTimeMessage {
   type: "source/time";
-  payload: SourceTimeInfo;
+  payload: ServerTimeInfo;
 }
 
 export interface SessionStartMessage {
@@ -115,9 +115,9 @@ export type ClientMessages =
 export type ServerMessages =
   | SessionStartMessage
   | SessionEndMessage
-  | SourceHelloMessage
+  | ServerHelloMessage
   | MetadataUpdateMessage
-  | SourceTimeMessage;
+  | ServerTimeMessage;
 
 export enum BinaryMessageType {
   PlayAudioChunk = 1,

src/player/player.ts

@@ -1,11 +1,11 @@
 import {
-  SourceInfo,
+  ServerInfo,
   SessionInfo,
   ServerMessages,
   BinaryMessageType,
   PlayerHelloMessage,
   Metadata,
-  SourceTimeInfo,
+  ServerTimeInfo,
   PlayerTimeMessage,
 } from "../messages.js";
 import type { Logger } from "../logging.js";
@@ -14,7 +14,7 @@ import { EventEmitter } from "../util/event-emitter.js";
 type Events = {
   open: void;
   close: { expected: boolean };
-  "source-update": SourceInfo | null;
+  "server-update": ServerInfo | null;
   "session-update": SessionInfo | null;
   "metadata-update": Metadata | null;
 };
@@ -28,17 +28,19 @@ export interface PlayerOptions {
 // Use standard AudioContext or fallback to webkitAudioContext
 const AudioContextClass = window.AudioContext || window.webkitAudioContext;
 
+// Maximum number of samples to keep for time diff calculation
+const MAX_TIME_DIFF_SAMPLES = 50;
+
 export class Player extends EventEmitter<Events> {
   private options: PlayerOptions;
   private logger: Logger = console;
   private ws: WebSocket | null = null;
-  private sourceInfo: SourceInfo | null = null;
+  private serverInfo: ServerInfo | null = null;
   private sessionInfo: SessionInfo | null = null;
   private audioContext: AudioContext | null = null;
   private metadata: Metadata | null = null;
   private serverTimeDiff: number = 0; // Time difference between server and client
   private serverTimeDiffSamples: number[] = []; // Store last 50 samples for median
-  private readonly maxTimeDiffSamples = 50;
   private expectClose = true;
 
   constructor(options: PlayerOptions) {
@@ -61,6 +63,7 @@ export class Player extends EventEmitter<Events> {
     this.ws.onopen = () => {
       this.logger.log("WebSocket connected");
       this.audioContext = new AudioContextClass();
+      this.serverTimeDiffSamples = [];
       this.expectClose = false;
       this.sendHello();
       this.sendPlayerTime();
@@ -139,9 +142,9 @@ export class Player extends EventEmitter<Events> {
     this.logger.log("Received text message:", message);
     switch (message.type) {
       case "source/hello":
-        this.sourceInfo = message.payload;
-        this.logger.log("Source connected:", this.sourceInfo);
-        this.fire("source-update", this.sourceInfo);
+        this.serverInfo = message.payload;
+        this.logger.log("Server connected:", this.serverInfo);
+        this.fire("server-update", this.serverInfo);
 
         break;
       case "session/start":
@@ -156,6 +159,7 @@ export class Player extends EventEmitter<Events> {
         // Re-instate the audioContext or else the old buffer keeps playing.
         this.audioContext!.close();
         this.audioContext = new AudioContextClass();
+        this.serverTimeDiffSamples = [];
         // Sync player time with the server.
         this.sendPlayerTime();
         // Clear session information when session ends.
@@ -171,7 +175,7 @@ export class Player extends EventEmitter<Events> {
 
       case "source/time":
         // Pass player_received time to the handler
-        this.handleSourceTime(message.payload, receivedAt);
+        this.handleServerTime(message.payload, receivedAt);
         break;
 
       default:
@@ -323,7 +327,7 @@ export class Player extends EventEmitter<Events> {
     }
   }
 
-  handleSourceTime(payload: SourceTimeInfo, receivedAt: number) {
+  handleServerTime(payload: ServerTimeInfo, receivedAt: number) {
     const { player_transmitted, source_received, source_transmitted } = payload;
 
     // Calculate the raw offset from this message (in seconds)
@@ -336,8 +340,11 @@ export class Player extends EventEmitter<Events> {
 
     // Store the offset sample
     this.serverTimeDiffSamples.push(offset);
-    if (this.serverTimeDiffSamples.length > this.maxTimeDiffSamples) {
+    if (this.serverTimeDiffSamples.length > MAX_TIME_DIFF_SAMPLES) {
       this.serverTimeDiffSamples.shift();
+    } else if (this.serverTimeDiffSamples.length < 20) {
+      // let's kick off another sample
+      this.sendPlayerTime();
     }
 
     // Calculate the median of the samples for a stable offset
@@ -364,7 +371,7 @@ export class Player extends EventEmitter<Events> {
     this.expectClose = true;
     this.ws.close();
     this.ws = null;
-    this.sourceInfo = null;
+    this.serverInfo = null;
     this.sessionInfo = null;
 
     if (this.audioContext && this.audioContext.state !== "closed") {

src/server/http-server.ts

@@ -0,0 +1,45 @@
+import { WebSocketServer, WebSocket } from "ws";
+import type { Logger } from "../logging.js";
+import { Server } from "./server.js";
+import { ServerClient } from "./server-client.js";
+
+export class HTTPServer {
+  private websocketServer: WebSocketServer | null = null;
+
+  constructor(
+    private server: Server,
+    public port: number,
+    private logger: Logger = console,
+  ) {}
+
+  // Start the WebSocket server
+  start() {
+    this.websocketServer = new WebSocketServer({ port: this.port });
+    this.logger.log(`WebSocket server started on port ${this.port}`);
+
+    this.websocketServer.on("connection", this.handleConnection.bind(this));
+    this.websocketServer.on("error", (error) => {
+      this.logger.error("WebSocket server error:", error);
+    });
+  }
+
+  handleConnection(ws: WebSocket, request: any) {
+    const playerClient = new ServerClient(ws, this.logger);
+    this.server.addClient(playerClient);
+  }
+
+  // Stop the WebSocket server
+  stop() {
+    const session = this.server.getSession();
+    if (session) {
+      session.end();
+    }
+
+    if (this.websocketServer) {
+      this.websocketServer.close(() => {
+        this.logger.log("WebSocket server closed");
+      });
+      this.websocketServer = null;
+    }
+  }
+}

src/server/source-client.ts renamed to src/server/server-client.ts

@@ -11,13 +11,13 @@ import type { Logger } from "../logging.js";
 import { generateUniqueId } from "../util/unique-id.js";
 import { EventEmitter } from "../util/event-emitter.js";
 
-interface SourceClientEvents {
+interface ServerClientEvents {
   close: void;
   "player-state": PlayerState | null;
   "stream-command": StreamCommandMessage["payload"];
 }
 
-export class SourceClient extends EventEmitter<SourceClientEvents> {
+export class ServerClient extends EventEmitter<ServerClientEvents> {
   public clientId: string;
   public playerInfo: PlayerInfo | null = null;
   public playerState: PlayerState | null = null;

src/server/source-session.ts renamed to src/server/server-session.ts

@@ -4,16 +4,16 @@ import {
   SessionEndMessage,
 } from "../messages.js";
 import type { Logger } from "../logging.js";
-import { SourceClient } from "./source-client.js";
+import { ServerClient } from "./server-client.js";
 
 const HEADER_SIZE = 13;
 
-export class SourceSession {
+export class ServerSession {
   sessionActive: Set<string> = new Set();
 
   constructor(
     private readonly sessionInfo: SessionInfo,
-    private readonly clients: Map<string, SourceClient>,
+    private readonly clients: Map<string, ServerClient>,
     private readonly logger: Logger,
     private readonly onSessionEnd: () => void,
   ) {}

src/server/source.ts renamed to src/server/server.ts

@@ -1,19 +1,19 @@
-import { SourceClient } from "./source-client.js";
+import { ServerClient } from "./server-client.js";
 import { generateUniqueId } from "../util/unique-id.js";
-import { SourceSession } from "./source-session.js";
+import { ServerSession } from "./server-session.js";
 import type { Logger } from "../logging.js";
-import type { SourceInfo, SessionInfo } from "../messages.js";
+import type { ServerInfo, SessionInfo } from "../messages.js";
 
-export class Source {
-  private clients: Map<string, SourceClient> = new Map();
-  private session: SourceSession | null = null;
+export class Server {
+  private clients: Map<string, ServerClient> = new Map();
+  private session: ServerSession | null = null;
 
-  constructor(private sourceInfo: SourceInfo, private logger: Logger) {}
+  constructor(private serverInfo: ServerInfo, private logger: Logger) {}
 
-  addClient(client: SourceClient) {
+  addClient(client: ServerClient) {
     client.send({
       type: "source/hello" as const,
-      payload: this.getSourceInfo(),
+      payload: this.getServerInfo(),
     });
     this.clients.set(client.clientId, client);
 
@@ -37,7 +37,7 @@ export class Source {
   }
 
   // Get a copy of the current clients map
-  getClients(): Map<string, SourceClient> {
+  getClients(): Map<string, ServerClient> {
     return new Map(this.clients);
   }
 
@@ -46,8 +46,8 @@ export class Source {
     return this.clients.size;
   }
 
-  getSourceInfo(): SourceInfo {
-    return this.sourceInfo;
+  getServerInfo(): ServerInfo {
+    return this.serverInfo;
   }
 
   // Start an audio session
@@ -56,7 +56,7 @@ export class Source {
     sampleRate: number = 44100,
     channels: number = 2,
     bitDepth: number = 16,
-  ): SourceSession {
+  ): ServerSession {
     if (this.session) {
       throw new Error("Session already active");
     }
@@ -74,7 +74,7 @@ export class Source {
     };
 
     // Create new session with current clients
-    this.session = new SourceSession(
+    this.session = new ServerSession(
       sessionInfo,
       this.getClients(),
       this.logger,
@@ -89,7 +89,7 @@ export class Source {
   }
 
   // Get current session if exists
-  getSession(): SourceSession | null {
+  getSession(): ServerSession | null {
     return this.session;
   }