@axsnull/audio-sync-engine 1.2.0 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -35,10 +35,9 @@ export declare class PlayerStateSync {
|
|
|
35
35
|
private readonly deviceId;
|
|
36
36
|
private readonly seekDriftThresholdSeconds;
|
|
37
37
|
private readonly activationDriftThresholdSeconds;
|
|
38
|
-
private lastPlaybackIntent;
|
|
39
38
|
private lastAppliedStateVersion;
|
|
40
39
|
constructor(config?: PlayerStateSyncConfig);
|
|
41
|
-
handlePlayerUpdate(state: PlayerState, audio: PlayerStateSyncAudioAdapter, loadTrack: (trackId: string) => Promise<TrackMetadata>, lastEventSeq?: number): ReducePlayerUpdateResult
|
|
40
|
+
handlePlayerUpdate(state: PlayerState, audio: PlayerStateSyncAudioAdapter, loadTrack: (trackId: string) => Promise<TrackMetadata>, lastEventSeq?: number): Promise<ReducePlayerUpdateResult>;
|
|
42
41
|
private loadNewTrack;
|
|
43
42
|
private syncPosition;
|
|
44
43
|
private pauseIfNeeded;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player-state-sync.d.ts","sourceRoot":"","sources":["../src/player-state-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAS;IACnD,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAS;IACzD,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"player-state-sync.d.ts","sourceRoot":"","sources":["../src/player-state-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,IAAI,GAAG,KAAK,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAS;IACnD,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAS;IACzD,OAAO,CAAC,uBAAuB,CAAK;gBAExB,MAAM,GAAE,qBAA0B;IAOxC,kBAAkB,CACtB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,2BAA2B,EAClC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,EACtD,YAAY,GAAE,MAAU,GACvB,OAAO,CAAC,wBAAwB,CAAC;YA4EtB,YAAY;IAiB1B,OAAO,CAAC,YAAY;IAwBpB,OAAO,CAAC,aAAa;YAIP,YAAY;IAM1B,iBAAiB,IAAI,MAAM,GAAG,IAAI;IAIlC,mBAAmB,IAAI,MAAM,GAAG,IAAI;IAIpC,YAAY,IAAI,WAAW,GAAG,IAAI;IAIlC,0BAA0B,IAAI,MAAM;CAGrC"}
|
|
@@ -7,21 +7,34 @@ class PlayerStateSync {
|
|
|
7
7
|
this.currentTrackId = null;
|
|
8
8
|
this.currentStreamUrl = null;
|
|
9
9
|
this.lastState = null;
|
|
10
|
-
this.lastPlaybackIntent = null;
|
|
11
10
|
this.lastAppliedStateVersion = 0;
|
|
12
11
|
this.deviceId = config.deviceId ?? null;
|
|
13
12
|
this.seekDriftThresholdSeconds = config.seekDriftThresholdSeconds ?? 0.35;
|
|
14
13
|
this.activationDriftThresholdSeconds =
|
|
15
14
|
config.activationDriftThresholdSeconds ?? 0.2;
|
|
16
15
|
}
|
|
17
|
-
handlePlayerUpdate(state, audio, loadTrack, lastEventSeq = 0) {
|
|
16
|
+
async handlePlayerUpdate(state, audio, loadTrack, lastEventSeq = 0) {
|
|
17
|
+
console.log('[PlayerStateSync] handlePlayerUpdate:', {
|
|
18
|
+
trackId: state.trackId,
|
|
19
|
+
isPlaying: state.isPlaying,
|
|
20
|
+
positionMs: state.positionMs,
|
|
21
|
+
activeDeviceId: state.activeDeviceId,
|
|
22
|
+
deviceId: this.deviceId,
|
|
23
|
+
lastEventSeq,
|
|
24
|
+
currentTrackId: this.currentTrackId
|
|
25
|
+
});
|
|
18
26
|
const reduceResult = (0, playback_state_reducer_1.reduceIncomingPlayerUpdate)(state, this.lastState, lastEventSeq);
|
|
19
27
|
if (!reduceResult.shouldApply) {
|
|
28
|
+
console.log('[PlayerStateSync] Ignoring state:', reduceResult.reason);
|
|
20
29
|
return reduceResult;
|
|
21
30
|
}
|
|
22
31
|
const nextState = reduceResult.state;
|
|
23
32
|
const stateVersion = (0, playback_state_reducer_1.getPlayerStateVersion)(nextState);
|
|
24
33
|
if (stateVersion < this.lastAppliedStateVersion) {
|
|
34
|
+
console.log('[PlayerStateSync] Stale version:', {
|
|
35
|
+
stateVersion,
|
|
36
|
+
lastAppliedStateVersion: this.lastAppliedStateVersion
|
|
37
|
+
});
|
|
25
38
|
return {
|
|
26
39
|
shouldApply: false,
|
|
27
40
|
reason: "stale_version",
|
|
@@ -32,17 +45,27 @@ class PlayerStateSync {
|
|
|
32
45
|
this.lastState = nextState;
|
|
33
46
|
const isActiveDevice = (0, playback_state_reducer_1.isPlayerStateActiveForDevice)(nextState, this.deviceId);
|
|
34
47
|
if (!isActiveDevice) {
|
|
48
|
+
console.log('[PlayerStateSync] Not active device, pausing');
|
|
35
49
|
this.pauseIfNeeded(audio);
|
|
36
50
|
return reduceResult;
|
|
37
51
|
}
|
|
38
52
|
if (nextState.trackId !== this.currentTrackId && nextState.trackId) {
|
|
39
|
-
|
|
53
|
+
console.log('[PlayerStateSync] Loading new track:', nextState.trackId);
|
|
54
|
+
await this.loadNewTrack(nextState.trackId, audio, loadTrack);
|
|
40
55
|
}
|
|
56
|
+
console.log('[PlayerStateSync] Syncing position:', {
|
|
57
|
+
serverPosition: nextState.positionMs,
|
|
58
|
+
serverUpdatedAt: nextState.updatedAt,
|
|
59
|
+
isPlaying: nextState.isPlaying,
|
|
60
|
+
currentAudioTime: audio.currentTime
|
|
61
|
+
});
|
|
41
62
|
this.syncPosition(nextState.positionMs, nextState.updatedAt, nextState.isPlaying, audio);
|
|
42
63
|
if (nextState.isPlaying) {
|
|
43
|
-
|
|
64
|
+
console.log('[PlayerStateSync] Playing');
|
|
65
|
+
await this.playIfNeeded(audio);
|
|
44
66
|
}
|
|
45
67
|
else {
|
|
68
|
+
console.log('[PlayerStateSync] Pausing');
|
|
46
69
|
this.pauseIfNeeded(audio);
|
|
47
70
|
}
|
|
48
71
|
return reduceResult;
|
|
@@ -54,6 +77,7 @@ class PlayerStateSync {
|
|
|
54
77
|
this.currentStreamUrl = metadata.streamUrl;
|
|
55
78
|
audio.src = metadata.streamUrl;
|
|
56
79
|
audio.currentTime = 0;
|
|
80
|
+
audio.load?.();
|
|
57
81
|
}
|
|
58
82
|
catch (error) {
|
|
59
83
|
console.error("Failed to load track:", error);
|
|
@@ -77,18 +101,10 @@ class PlayerStateSync {
|
|
|
77
101
|
}
|
|
78
102
|
}
|
|
79
103
|
pauseIfNeeded(audio) {
|
|
80
|
-
if (this.lastPlaybackIntent === "pause") {
|
|
81
|
-
return;
|
|
82
|
-
}
|
|
83
104
|
audio.pause();
|
|
84
|
-
this.lastPlaybackIntent = "pause";
|
|
85
105
|
}
|
|
86
106
|
async playIfNeeded(audio) {
|
|
87
|
-
if (this.lastPlaybackIntent === "play") {
|
|
88
|
-
return;
|
|
89
|
-
}
|
|
90
107
|
await Promise.resolve(audio.play());
|
|
91
|
-
this.lastPlaybackIntent = "play";
|
|
92
108
|
}
|
|
93
109
|
getCurrentTrackId() {
|
|
94
110
|
return this.currentTrackId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player-state-sync.js","sourceRoot":"","sources":["../src/player-state-sync.ts"],"names":[],"mappings":";;;AAAA,qEAKkC;AAmClC,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"player-state-sync.js","sourceRoot":"","sources":["../src/player-state-sync.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED