@xiboplayer/xmds 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiboplayer/xmds",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "XMDS SOAP client for Xibo CMS communication",
   "type": "module",
   "main": "./src/index.js",
@@ -9,7 +9,7 @@
     "./xmds": "./src/xmds.js"
   },
   "dependencies": {
-    "@xiboplayer/utils": "0.3.1"
+    "@xiboplayer/utils": "0.3.3"
   },
   "devDependencies": {
     "vitest": "^2.0.0"

package/src/rest-client.js

@@ -148,7 +148,7 @@ export class RestClient {
       operatingSystem: os,
       macAddress: this.config.macAddress || 'n/a',
       xmrChannel: this.config.xmrChannel,
-      xmrPubKey: '',
+      xmrPubKey: this.config.xmrPubKey || '',
     });
 
     return this._parseRegisterDisplayJson(json);

package/src/xmds-client.js

@@ -155,7 +155,7 @@ export class XmdsClient {
       operatingSystem: os,
       macAddress: this.config.macAddress || 'n/a',
       xmrChannel: this.config.xmrChannel,
-      xmrPubKey: ''
+      xmrPubKey: this.config.xmrPubKey || ''
     });
 
     return this.parseRegisterDisplayResponse(xml);

package/src/xmds.rest.test.js

@@ -237,6 +237,40 @@ describe('RestClient - RegisterDisplay', () => {
     global.fetch = mockFetch;
   });
 
+  it('should include xmrPubKey from config in POST body', async () => {
+    const clientWithKey = createRestClient({
+      xmrPubKey: '-----BEGIN PUBLIC KEY-----\nTEST\n-----END PUBLIC KEY-----',
+    });
+    const mockFetchLocal = vi.fn();
+    global.fetch = mockFetchLocal;
+
+    mockFetchLocal.mockResolvedValue(jsonResponse({
+      display: {
+        '@attributes': { code: 'READY', message: 'OK' },
+        collectInterval: '60',
+      }
+    }));
+
+    await clientWithKey.registerDisplay();
+
+    const body = JSON.parse(mockFetchLocal.mock.calls[0][1].body);
+    expect(body.xmrPubKey).toBe('-----BEGIN PUBLIC KEY-----\nTEST\n-----END PUBLIC KEY-----');
+  });
+
+  it('should send empty xmrPubKey when config has no key', async () => {
+    mockFetch.mockResolvedValue(jsonResponse({
+      display: {
+        '@attributes': { code: 'READY', message: 'OK' },
+        collectInterval: '60',
+      }
+    }));
+
+    await client.registerDisplay();
+
+    const body = JSON.parse(mockFetch.mock.calls[0][1].body);
+    expect(body.xmrPubKey).toBe('');
+  });
+
   it('should POST to /register and parse READY response', async () => {
     mockFetch.mockResolvedValue(jsonResponse({
       display: {

package/src/xmds.test.js

@@ -7,6 +7,69 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { XmdsClient } from './xmds-client.js';
 
+describe('XmdsClient - RegisterDisplay', () => {
+  let client;
+  let mockFetch;
+
+  beforeEach(() => {
+    client = new XmdsClient({
+      cmsAddress: 'https://cms.example.com',
+      cmsKey: 'test-server-key',
+      hardwareKey: 'test-hardware-key',
+      displayName: 'Test Display',
+      xmrChannel: 'test-xmr-channel',
+      xmrPubKey: '-----BEGIN PUBLIC KEY-----\nTEST\n-----END PUBLIC KEY-----',
+      retryOptions: { maxRetries: 0 }
+    });
+
+    mockFetch = vi.fn();
+    global.fetch = mockFetch;
+  });
+
+  it('should include xmrPubKey from config in SOAP envelope', () => {
+    const envelope = client.buildEnvelope('RegisterDisplay', {
+      serverKey: 'test-server-key',
+      hardwareKey: 'test-hardware-key',
+      displayName: 'Test Display',
+      clientType: 'chromeOS',
+      clientVersion: '0.1.0',
+      clientCode: '1',
+      operatingSystem: 'test',
+      macAddress: 'n/a',
+      xmrChannel: 'test-xmr-channel',
+      xmrPubKey: client.config.xmrPubKey || ''
+    });
+
+    expect(envelope).toContain('<xmrPubKey xsi:type="xsd:string">-----BEGIN PUBLIC KEY-----');
+  });
+
+  it('should send empty xmrPubKey when config has no key', () => {
+    const clientNoKey = new XmdsClient({
+      cmsAddress: 'https://cms.example.com',
+      cmsKey: 'test-server-key',
+      hardwareKey: 'test-hardware-key',
+      displayName: 'Test Display',
+      xmrChannel: 'test-xmr-channel',
+      retryOptions: { maxRetries: 0 }
+    });
+
+    const envelope = clientNoKey.buildEnvelope('RegisterDisplay', {
+      serverKey: 'test-server-key',
+      hardwareKey: 'test-hardware-key',
+      displayName: 'Test Display',
+      clientType: 'chromeOS',
+      clientVersion: '0.1.0',
+      clientCode: '1',
+      operatingSystem: 'test',
+      macAddress: 'n/a',
+      xmrChannel: 'test-xmr-channel',
+      xmrPubKey: clientNoKey.config.xmrPubKey || ''
+    });
+
+    expect(envelope).toContain('<xmrPubKey xsi:type="xsd:string"></xmrPubKey>');
+  });
+});
+
 describe('XmdsClient - SubmitLog', () => {
   let client;
   let mockFetch;