rebroadcast: fix unhandled rejection on stream startup failure

koush · Dec 12, 2023 · 3f1b45c · 3f1b45c
1 parent 4b715e5
commit 3f1b45c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/common/src/read-stream.ts b/common/src/read-stream.ts
@@ -59,13 +59,13 @@ export async function read16BELengthLoop(readable: Readable, options: {
 
 export class StreamEndError extends Error {
   constructor() {
-    super()
+    super('stream ended');
   }
 }
 
 export async function readLength(readable: Readable, length: number): Promise<Buffer> {
   if (readable.readableEnded || readable.destroyed)
-    throw new Error("stream ended");
+    throw new StreamEndError();
 
   if (!length) {
     return Buffer.alloc(0);

diff --git a/plugins/prebuffer-mixin/package-lock.json b/plugins/prebuffer-mixin/package-lock.json
diff --git a/plugins/prebuffer-mixin/package.json b/plugins/prebuffer-mixin/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/prebuffer-mixin",
-   "version": "0.10.2",
+   "version": "0.10.3",
    "description": "Video Stream Rebroadcast, Prebuffer, and Management Plugin for Scrypted.",
    "author": "Scrypted",
    "license": "Apache-2.0",

diff --git a/plugins/prebuffer-mixin/src/main.ts b/plugins/prebuffer-mixin/src/main.ts
@@ -203,14 +203,14 @@ class PrebufferSession {
       return;
     this.console.log(this.streamName, 'prebuffer session started');
     this.parserSessionPromise = this.startPrebufferSession();
-    this.parserSessionPromise.catch(e => {
-      this.console.error(this.streamName, 'prebuffer session ended with error', e);
-      this.parserSessionPromise = undefined;
-    });
     this.parserSessionPromise.then(pso => pso.killed.finally(() => {
       this.console.error(this.streamName, 'prebuffer session ended');
       this.parserSessionPromise = undefined;
-    }));
+    }))
+      .catch(e => {
+        this.console.error(this.streamName, 'prebuffer session ended with error', e);
+        this.parserSessionPromise = undefined;
+      });
   }
 
   canUseRtspParser(mediaStreamOptions: MediaStreamOptions) {