gapless 4.4.0 → 4.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gapless",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "description": "Gapless audio playback javascript plugin",
   "type": "module",
   "main": "dist/index.mjs",
@@ -27,22 +27,22 @@
   "author": "Daniel Saewitz",
   "license": "MIT",
   "devDependencies": {
-    "@playwright/test": "^1.60.0",
+    "@playwright/test": "^1.63.0",
     "@switz/eslint-config": "^13.1.0",
-    "@vitest/coverage-v8": "^4.1.8",
-    "eslint": "^10.4.1",
-    "happy-dom": "^20.10.2",
-    "playwright": "^1.60.0",
+    "@vitest/coverage-v8": "^5.0.1",
+    "eslint": "^10.11.0",
+    "happy-dom": "^20.14.5",
+    "playwright": "^1.63.0",
     "tsup": "^8.5.1",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
+    "typescript": "^7.0.2",
+    "vitest": "^5.0.1"
   },
   "dependencies": {
-    "xstate": "^5.32.0"
+    "xstate": "^5.33.2"
   },
   "scripts": {
     "test": "vitest run",
-    "build": "tsup",
+    "build": "tsup && tsc -p tsconfig.build.json",
     "build:demo": "pnpm --dir demo build",
     "dev": "pnpm --dir demo dev",
     "types": "tsc --noEmit",

package/src/Queue.ts

@@ -198,8 +198,9 @@ export class Queue implements TrackQueueRef {
           const e = event as { type: 'SEEK'; time: number };
           this._trackAt(context.currentTrackIndex)?.seek(e.time);
         },
-        seekCurrentToZero: ({ context }) => {
-          this._trackAt(context.currentTrackIndex)?.seek(0);
+        seekCurrentToStartTime: ({ context, event }) => {
+          const e = event as { type: 'GOTO'; startTime?: number };
+          this._trackAt(context.currentTrackIndex)?.seek(e.startTime ?? 0);
         },
         scheduleGapless: ({ context }) => {
           this._tryScheduleGapless(context.currentTrackIndex);
@@ -278,12 +279,12 @@ export class Queue implements TrackQueueRef {
     this._actor.send({ type: 'PREVIOUS' });
   }
 
-  gotoTrack(index: number, playImmediately = false): void {
+  gotoTrack(index: number, playImmediately = false, startTime?: number): void {
     if (index < 0 || index >= this._tracks.length) return;
     this.onDebug(
-      `gotoTrack(${index}, playImmediately=${playImmediately}) queueState=${this._actor.getSnapshot().value} curIdx=${this._actor.getSnapshot().context.currentTrackIndex}`
+      `gotoTrack(${index}, playImmediately=${playImmediately}, startTime=${startTime}) queueState=${this._actor.getSnapshot().value} curIdx=${this._actor.getSnapshot().context.currentTrackIndex}`
     );
-    this._actor.send({ type: 'GOTO', index, playImmediately });
+    this._actor.send({ type: 'GOTO', index, playImmediately, startTime });
   }
 
   seek(time: number): void {

package/src/Track.ts

@@ -637,7 +637,11 @@ export class Track {
   private _crossoverHtml5ToWebAudio(wasPlaying: boolean): void {
     if (!this.ctx || !this.audioBuffer || !this.gainNode) return;
 
-    const offset = this.audio.currentTime;
+    const htmlTime = this.audio.currentTime;
+    const offset =
+      isFinite(this.pausedAtTrackTime) && this.pausedAtTrackTime > htmlTime
+        ? this.pausedAtTrackTime
+        : htmlTime;
     this.pausedAtTrackTime = isFinite(offset) ? offset : 0;
 
     if (!wasPlaying) {

package/src/machines/queue.machine.ts

@@ -33,7 +33,7 @@ export type QueueEvent =
   | { type: 'TOGGLE' }
   | { type: 'NEXT' }
   | { type: 'PREVIOUS' }
-  | { type: 'GOTO'; index: number; playImmediately?: boolean }
+  | { type: 'GOTO'; index: number; playImmediately?: boolean; startTime?: number }
   | { type: 'SEEK'; time: number }
   | { type: 'SET_VOLUME'; volume: number }
   | { type: 'ADD_TRACK' }
@@ -113,7 +113,7 @@ export function createQueueMachine(initialContext: QueueContext) {
       playCurrent: () => {},
       pauseCurrent: () => {},
       seekCurrent: () => {},
-      seekCurrentToZero: () => {},
+      seekCurrentToStartTime: () => {},
       scheduleGapless: () => {},
       cancelScheduledGapless: () => {},
       cancelAndRescheduleGapless: () => {},
@@ -151,6 +151,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
+                'seekCurrentToStartTime',
                 'activateAndPlayCurrent',
                 'notifyStartNewTrack',
                 'updateMediaSessionMetadata',
@@ -163,7 +164,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
-                'seekCurrentToZero',
+                'seekCurrentToStartTime',
                 'preloadAhead',
               ],
             },
@@ -239,6 +240,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
+                'seekCurrentToStartTime',
                 'activateAndPlayCurrent',
                 'notifyStartNewTrack',
                 'updateMediaSessionMetadata',
@@ -250,7 +252,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
-                'seekCurrentToZero',
+                'seekCurrentToStartTime',
                 'preloadAhead',
               ],
             },
@@ -353,6 +355,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
+                'seekCurrentToStartTime',
                 'activateAndPlayCurrent',
                 'notifyStartNewTrack',
                 'updateMediaSessionMetadata',
@@ -364,7 +367,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
-                'seekCurrentToZero',
+                'seekCurrentToStartTime',
                 'preloadAhead',
               ],
             },
@@ -421,6 +424,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
+                'seekCurrentToStartTime',
                 'activateAndPlayCurrent',
                 'notifyStartNewTrack',
                 'updateMediaSessionMetadata',
@@ -433,7 +437,7 @@ export function createQueueMachine(initialContext: QueueContext) {
                 'deactivateCurrent',
                 'cancelAllGapless',
                 'gotoTrackIndex',
-                'seekCurrentToZero',
+                'seekCurrentToStartTime',
                 'preloadAhead',
               ],
             },