@xiboplayer/xmr 0.3.0 → 0.3.3

package/README.md

@@ -45,4 +45,4 @@ xmr.connect();
 
 ---
 
-**Part of the [XiboPlayer SDK](https://github.com/linuxnow/xiboplayer)**
+**Part of the [XiboPlayer SDK](https://github.com/xibo-players/xiboplayer)** | [MCP Server](https://github.com/xibo-players/xiboplayer/tree/main/mcp-server) for AI-assisted development

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiboplayer/xmr",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "description": "XMR WebSocket client for real-time Xibo CMS commands",
   "type": "module",
   "main": "./src/index.js",
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@xibosignage/xibo-communication-framework": "^0.0.6",
-    "@xiboplayer/utils": "0.3.0"
+    "@xiboplayer/utils": "0.3.3"
   },
   "devDependencies": {
     "vitest": "^2.0.0"

package/src/test-utils.js

@@ -101,6 +101,14 @@ export function createMockConfig(overrides = {}) {
     hardwareKey: 'test-hw-key',
     serverKey: 'test-server-key',
     xmrChannel: 'test-channel',
+    data: {
+      xmrPubKey: '',
+      xmrPrivKey: '',
+    },
+    ensureXmrKeyPair: vi.fn(async function () {
+      this.data.xmrPubKey = '-----BEGIN PUBLIC KEY-----\nMOCK\n-----END PUBLIC KEY-----';
+      this.data.xmrPrivKey = '-----BEGIN PRIVATE KEY-----\nMOCK\n-----END PRIVATE KEY-----';
+    }),
     ...overrides
   };
 }

package/src/xmr-wrapper.js

@@ -232,10 +232,18 @@ export class XmrWrapper {
       }
     });
 
-    // CMS command: Rekey
-    this.xmr.on('rekey', () => {
-      log.debug('Received rekey command (pubKey rotation)');
-      // TODO: Implement RSA key pair rotation if XMR encryption is needed
+    // CMS command: Rekey (RSA key pair rotation)
+    this.xmr.on('rekey', async () => {
+      log.info('Received rekey command - rotating RSA key pair');
+      try {
+        this.config.data.xmrPubKey = '';
+        this.config.data.xmrPrivKey = '';
+        await this.config.ensureXmrKeyPair();
+        await this.player.collect();
+        log.info('RSA key pair rotated successfully');
+      } catch (error) {
+        log.error('Key rotation failed:', error);
+      }
     });
 
     // CMS command: Screen Shot (alternative event name)

package/src/xmr-wrapper.test.js

@@ -305,11 +305,36 @@ describe('XmrWrapper', () => {
         consoleErrorSpy.mockRestore();
       });
 
-      it('should handle rekey command', () => {
-        // rekey is a debug-level log — just verify it doesn't throw
-        expect(() => {
-          xmrInstance.simulateCommand('rekey');
-        }).not.toThrow();
+      it('should handle rekey command — rotates RSA keys and triggers collect', async () => {
+        // Set existing keys
+        mockConfig.data.xmrPubKey = 'old-pub-key';
+        mockConfig.data.xmrPrivKey = 'old-priv-key';
+
+        xmrInstance.simulateCommand('rekey');
+        await vi.runAllTimersAsync();
+
+        // Should clear old keys before regenerating
+        expect(mockConfig.ensureXmrKeyPair).toHaveBeenCalled();
+        // After ensureXmrKeyPair, new keys should be set
+        expect(mockConfig.data.xmrPubKey).toMatch(/^-----BEGIN PUBLIC KEY-----/);
+        expect(mockConfig.data.xmrPrivKey).toMatch(/^-----BEGIN PRIVATE KEY-----/);
+        // Should trigger collect to re-register with new key
+        expect(mockPlayer.collect).toHaveBeenCalled();
+      });
+
+      it('should handle rekey failure gracefully', async () => {
+        mockConfig.ensureXmrKeyPair.mockRejectedValue(new Error('Key generation failed'));
+        const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+        xmrInstance.simulateCommand('rekey');
+        await vi.runAllTimersAsync();
+
+        expect(consoleErrorSpy).toHaveBeenCalledWith(
+          '[XMR]',
+          'Key rotation failed:',
+          expect.any(Error)
+        );
+        consoleErrorSpy.mockRestore();
       });
 
       it('should handle criteriaUpdate command', async () => {