Merge branch 'default' into assets

Author: goto-bus-stop

package.json

@@ -85,8 +85,8 @@
     "@types/express": "^4.17.11",
     "@types/has": "^1.0.0",
     "@types/htmlescape": "^1.1.1",
-    "@types/http-errors": "^1.8.0",
-    "@types/ioredis": "^4.22.1",
+    "@types/http-errors": "^2.0.0",
+    "@types/ioredis": "^5.0.0",
     "@types/json-merge-patch": "^0.0.8",
     "@types/jsonwebtoken": "^8.5.1",
     "@types/lodash": "^4.14.168",

src/plugins/booth.js

@@ -43,6 +43,9 @@ class Booth {
 
   #locker;
 
+  /** @type {Promise<unknown>|null} */
+  #awaitAdvance = null;
+
   /**
    * @param {import('../Uwave')} uw
    */
@@ -62,19 +65,28 @@ class Booth {
       const endTime = Number(current.playedAt) + duration;
       if (endTime > Date.now()) {
         this.#timeout = setTimeout(
-          () => this.advance(),
+          () => this.#advanceAutomatically(),
           endTime - Date.now(),
         );
       } else {
-        this.advance();
+        this.#advanceAutomatically();
       }
     }
 
-    /** @type {import('../Uwave').Boot} */ (this.#uw).onClose(() => {
+    /** @type {import('../Uwave').Boot} */ (this.#uw).onClose(async () => {
       this.#onStop();
+      await this.#awaitAdvance;
     });
   }
 
+  async #advanceAutomatically() {
+    try {
+      await this.advance();
+    } catch (error) {
+      this.#logger.error({ err: error }, 'advance failed');
+    }
+  }
+
   #onStop() {
     this.#maybeStop();
   }
@@ -237,7 +249,7 @@ class Booth {
   #play(entry) {
     this.#maybeStop();
     this.#timeout = setTimeout(
-      () => this.advance(),
+      () => this.#advanceAutomatically(),
       (entry.media.end - entry.media.start) * 1000,
     );
   }
@@ -316,6 +328,7 @@ class Booth {
    * @typedef {object} AdvanceOptions
    * @prop {boolean} [remove]
    * @prop {boolean} [publish]
+   * @prop {import('redlock').RedlockAbortSignal} [signal]
    *
    * @param {AdvanceOptions} [opts]
    * @returns {Promise<PopulatedHistoryEntry|null>}
@@ -341,6 +354,10 @@ class Booth {
       throw err;
     }
 
+    if (opts.signal?.aborted) {
+      throw opts.signal.error;
+    }
+
     if (previous) {
       await this.#saveStats(previous);
 
@@ -391,7 +408,13 @@ class Booth {
    * @returns {Promise<PopulatedHistoryEntry|null>}
    */
   advance(opts = {}) {
-    return this.#locker.using(['booth:advancing'], 10_000, () => this.#advanceLocked(opts));
+    const result = this.#locker.using(
+      ['booth:advancing'],
+      10_000,
+      (signal) => this.#advanceLocked({ ...opts, signal }),
+    );
+    this.#awaitAdvance = result;
+    return result;
   }
 }
 

test/playlists.mjs

@@ -47,8 +47,7 @@ describe('Playlists', () => {
           sourceID: id,
           artist: `artist ${id}`,
           title: `title ${id}`,
-          start: 0,
-          end: 60,
+          duration: 60,
         }));
       },
       async search() {

test/waitlist.mjs

@@ -15,13 +15,12 @@ describe('Waitlist', () => {
     uw.source({
       name: 'test-source',
       api: 2,
-      async get(context, ids) {
+      async get(_context, ids) {
         return ids.map((id) => ({
           sourceID: id,
           artist: `artist ${id}`,
           title: `title ${id}`,
-          start: 0,
-          end: 60,
+          duration: 60,
         }));
       },
       async search() {
@@ -76,7 +75,7 @@ describe('Waitlist', () => {
     });
   });
 
-  describe.skip('POST /waitlist', () => {
+  describe('POST /waitlist', () => {
     it('requires authentication', async () => {
       await supertest(uw.server)
         .post('/api/waitlist')