to main

package.json

@@ -1,7 +1,7 @@
 {
   "name": "webjamsocketserver",
   "description": "Uses latest version of socketcluster-server",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "license": "MIT",
   "type": "module",
   "main": "build/src/index.js",
@@ -64,7 +64,7 @@
     "express": "^5.2.1",
     "express-sslify": "^1.2.0",
     "jsonwebtoken": "^9.0.1",
-    "mongoose": "^9.6.1",
+    "mongoose": "^9.7.4",
     "morgan": "^1.10.0",
     "rimraf": "^6.1.3",
     "sc-errors": "^3.0.0",

src/AgController/index.ts

@@ -172,9 +172,14 @@ class AgController {
     let r: any;
     // eslint-disable-next-line security/detect-object-injection
     try { r = await (this.jamPicsController as any)[func](data); } catch (e) {
-      const eMessage = (e as Error).message;
-      debug(eMessage);
-      return eMessage;
+      // Rethrow (JaMmusic#1199): swallowing this and returning the error
+      // message meant callers (newImage/removeImage) never saw the failure,
+      // so no socketError was ever sent and a bogus imageCreated/imageDeleted
+      // was still published below with the error string as its payload. Let
+      // the caller's own try/catch (which already transmits socketError)
+      // handle it.
+      debug((e as Error).message);
+      throw e;
     }
     this.server.exchange.transmitPublish(message, r);
     return message;

src/lib/facade.ts

@@ -48,8 +48,13 @@ class Facade {
   //   return this.Schema.findById(id).lean().exec();
   // }
   //
+  // Mongoose 9.x removed `findByIdAndRemove` entirely (both on Model and
+  // Query) in favor of `findByIdAndDelete` (JaMmusic#1199) — calling the old
+  // name here threw synchronously, which the caller silently swallowed, so
+  // deletes never took effect. Keep this method's own name (`findByIdAndRemove`)
+  // unchanged since Controller/GigController/JamPicsController call it.
   findByIdAndRemove(id: any): any {
-    return this.Schema.findByIdAndRemove(id).lean().exec();
+    return this.Schema.findByIdAndDelete(id).lean().exec();
   }
 }
 

test/AgController/index.spec.ts

@@ -648,6 +648,37 @@ describe('AgControler', () => {
     expect(agController.verifyAdminWrite).toHaveBeenCalledWith('token');
     expect(agController.handleImage).toHaveBeenCalled();
   });
+  it('surfaces a genuine deleteById failure as socketError instead of a silent no-op (#1199)', async () => {
+    const agController = new AgController(aStub);
+    agController.clients = ['123'];
+    agController.jamPicsController.deleteById = vi.fn(() => Promise.reject(new Error('Delete id not found')));
+    agController.verifyAdminWrite = vi.fn(() => Promise.resolve());
+    const transmit = vi.fn();
+    const cStub:any = {
+      socket: {
+        id: '123',
+        listener: () => ({ createConsumer: () => ({ next: () => Promise.resolve({ done: true, value: '1000' }) }) }),
+        transmit,
+        receiver: () => ({
+          createConsumer: () => ({
+            next: () => Promise.resolve({
+              value: {
+                token: 'token',
+                data: 'id',
+              },
+              done: true,
+            }),
+          }),
+        }),
+      },
+    };
+    const setIntervalMock:any = vi.fn((cb:any) => cb());
+    global.setInterval = setIntervalMock;
+    agController.removeImage(cStub);
+    await delay(2000);
+    expect(transmit).toHaveBeenCalledWith('socketError', { deleteImage: 'Delete id not found' });
+    expect(aStub.exchange.transmitPublish).not.toHaveBeenCalledWith('imageDeleted', expect.anything());
+  });
   it('rejects deleteImage when the token is missing/invalid (#94)', async () => {
     const agController = new AgController(aStub);
     agController.handleImage = vi.fn();
@@ -964,14 +995,13 @@ describe('AgControler', () => {
     }, 'imageCreated');
     expect(r).toBe('imageCreated');
   });
-  it('returns error message when creates a book (image)', async () => {
+  it('rethrows the error when creating a book (image) fails (#1199)', async () => {
     const agController = new AgController(aStub);
     agController.jamPicsController.createDocs = vi.fn(() => Promise.reject(new Error('bad')));
-    r = await agController.handleImage('createDocs', {
+    await expect(agController.handleImage('createDocs', {
       url: 'url', title: 'title', type: 'JaMmusic',
-    }, 'imageCreated');
-    expect(r).toBe('bad');
-    await delay(1000);
+    }, 'imageCreated')).rejects.toThrow('bad');
+    expect(aStub.exchange.transmitPublish).not.toHaveBeenCalledWith('imageCreated', expect.anything());
   });
   it('updateImage when id not found', async () => {
     clientStub = {

test/lib/facade.test.ts

@@ -31,14 +31,21 @@ describe('Facade', () => {
     const result = await facade.find();
     expect(result.test).toBe(true);
   });
-  it('findByIdAndRemove', async () => {
+  it('findByIdAndRemove calls the model\'s findByIdAndDelete (mongoose 9.x removed findByIdAndRemove, JaMmusic#1199)', async () => {
     const schema = {
-      findByIdAndRemove: () => ({ lean: () => ({ exec: () => Promise.resolve(true) }) }),
+      findByIdAndDelete: () => ({ lean: () => ({ exec: () => Promise.resolve(true) }) }),
     };
     const facade:any = new Facade(schema);
     const result = await facade.findByIdAndRemove();
     expect(result).toBe(true);
   });
+  it('findByIdAndRemove propagates a rejection from findByIdAndDelete', async () => {
+    const schema = {
+      findByIdAndDelete: () => ({ lean: () => ({ exec: () => Promise.reject(new Error('bad')) }) }),
+    };
+    const facade:any = new Facade(schema);
+    await expect(facade.findByIdAndRemove()).rejects.toThrow('bad');
+  });
   it('findByIdAndUpdate', async () => {
     const schema = {
       findByIdAndUpdate: () => ({ lean: () => ({ exec: () => Promise.resolve(true) }) }),