fix: return null when deregistering an encoder

chrisguttandin · Apr 26, 2024 · 8c137ed · 8c137ed
1 parent 09498f4
commit 8c137ed
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 2 deletions.
diff --git a/src/interfaces/media-encoder-host-worker-custom-definition.ts b/src/interfaces/media-encoder-host-worker-custom-definition.ts
@@ -7,7 +7,7 @@ export interface IMediaEncoderHostWorkerCustomDefinition extends IWorkerDefiniti
         };
 
         response: {
-            result: undefined;
+            result: null;
         };
     };
 

diff --git a/src/module.ts b/src/module.ts
@@ -33,7 +33,9 @@ const requestPartialEncoding = createRequestPartialEncoding(getEncoderInstance);
 
 createWorker<IMediaEncoderHostWorkerCustomDefinition>(self, <TWorkerImplementation<IMediaEncoderHostWorkerCustomDefinition>>{
     deregister: async ({ encoderId }) => {
-        return { result: deregisterEncoder(encoderId) };
+        deregisterEncoder(encoderId);
+
+        return { result: null };
     },
     encode: async ({ encoderInstanceId, timeslice }) => {
         const arrayBuffers =

diff --git a/test/integration/module.js b/test/integration/module.js
@@ -5,6 +5,64 @@ describe('module', () => {
         worker = new Worker('base/src/module.js');
     });
 
+    describe('deregister()', () => {
+        let encoderId;
+        let id;
+
+        beforeEach(() => {
+            encoderId = 17;
+            id = 43;
+        });
+
+        describe('with a not yet registered encoder', () => {
+            it('should return an error', (done) => {
+                worker.addEventListener('message', ({ data }) => {
+                    expect(data).to.deep.equal({
+                        error: {
+                            // @todo Define a more meaningful error code.
+                            code: -32603,
+                            message: 'There was no encoder stored with the given id.'
+                        },
+                        id
+                    });
+
+                    done();
+                });
+
+                worker.postMessage({ id, method: 'deregister', params: { encoderId } });
+            });
+        });
+
+        describe('with a previously registered encoder', () => {
+            beforeEach((done) => {
+                const { port1, port2 } = new MessageChannel();
+
+                port2.onmessage = ({ data }) => {
+                    port2.postMessage({ id: data.id, result: /^mime\/type$/ });
+                };
+
+                const onMessage = () => {
+                    worker.removeEventListener('message', onMessage);
+
+                    done();
+                };
+
+                worker.addEventListener('message', onMessage);
+                worker.postMessage({ id, method: 'register', params: { encoderId, port: port1 } }, [port1]);
+            });
+
+            it('should return null', (done) => {
+                worker.addEventListener('message', ({ data }) => {
+                    expect(data).to.deep.equal({ id, result: null });
+
+                    done();
+                });
+
+                worker.postMessage({ id, method: 'deregister', params: { encoderId } });
+            });
+        });
+    });
+
     describe('encode()', () => {
         // @todo
     });