Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ async function main() {
// Create and start the Source server
const musicServer = new MusicServer(
{
source_id: generateUniqueId("server"),
server_id: generateUniqueId("server"),
name: "SDKSample",
},
logger,
Expand Down
10 changes: 5 additions & 5 deletions src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export class Client extends EventEmitter<Events> {
private _handleTextMessage(message: ServerMessages, receivedAt: number) {
this.logger.log("Received text message:", message);
switch (message.type) {
case "source/hello":
case "server/hello":
this.logger.log("Server connected:", this.serverInfo);
this.serverInfo = message.payload;
this.fire("server-update", this.serverInfo);
Expand Down Expand Up @@ -197,7 +197,7 @@ export class Client extends EventEmitter<Events> {
this.fire("metadata-update", this.metadata);
break;

case "source/time":
case "server/time":
this._handleServerTime(message.payload, receivedAt);
break;

Expand Down Expand Up @@ -387,13 +387,13 @@ export class Client extends EventEmitter<Events> {
}

private _handleServerTime(payload: ServerTimeInfo, receivedAt: number) {
const { player_transmitted, source_received, source_transmitted } = payload;
const { player_transmitted, server_received, server_transmitted } = payload;

// Calculate the raw offset from this message (in seconds)
const offset =
(source_received -
(server_received -
player_transmitted +
(source_transmitted - receivedAt)) /
(server_transmitted - receivedAt)) /
2 /
1000000;

Expand Down
10 changes: 5 additions & 5 deletions src/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export interface PlayerTimeInfo {

export interface ServerTimeInfo {
player_transmitted: number;
source_received: number;
source_transmitted: number;
server_received: number;
server_transmitted: number;
}

export interface PlayerTimeMessage {
Expand All @@ -38,17 +38,17 @@ export interface PlayerTimeMessage {
}

export interface ServerInfo {
source_id: string;
server_id: string;
name: string;
}

export interface ServerHelloMessage {
type: "source/hello";
type: "server/hello";
payload: ServerInfo;
}

export interface ServerTimeMessage {
type: "source/time";
type: "server/time";
payload: ServerTimeInfo;
}

Expand Down
8 changes: 4 additions & 4 deletions src/server/server-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ export class ServerClient extends EventEmitter<ServerClientEvents> {
break;
case "player/time":
this.send({
type: "source/time" as const,
type: "server/time" as const,
payload: {
player_transmitted: message.payload.player_transmitted,
source_received: Math.round(
server_received: Math.round(
(performance.timeOrigin + performance.now()) * 1000,
),
source_transmitted: Math.round(
server_transmitted: Math.round(
(performance.timeOrigin + performance.now()) * 1000,
),
},
Expand All @@ -135,7 +135,7 @@ export class ServerClient extends EventEmitter<ServerClientEvents> {
public async accept(serverInfo: ServerInfo) {
await new Promise((resolve) => {
this.send({
type: "source/hello" as const,
type: "server/hello" as const,
payload: serverInfo,
});
if (this.playerInfo) {
Expand Down