@xiboplayer/xmr 0.3.4 → 0.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiboplayer/xmr",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "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.4"
+    "@xiboplayer/utils": "0.3.5"
   },
   "devDependencies": {
     "vitest": "^2.0.0"

package/src/test-utils.js

@@ -88,6 +88,7 @@ export function createMockPlayer() {
     triggerWebhook: vi.fn(),
     refreshDataConnectors: vi.fn(),
     reportGeoLocation: vi.fn(() => Promise.resolve()),
+    requestGeoLocation: vi.fn(() => Promise.resolve({ latitude: 41.3851, longitude: 2.1734 })),
     updateStatus: vi.fn()
   };
 }

package/src/xmr-wrapper.js

@@ -269,16 +269,29 @@ export class XmrWrapper {
     });
 
     // CMS command: Current Geo Location
+    // Dual-path: if data has coordinates, CMS is telling us our location.
+    // If data is empty/no coordinates, CMS is asking us to report our location.
     this.xmr.on('currentGeoLocation', async (data) => {
       log.info('Received currentGeoLocation command:', data);
       try {
-        // Report current geo location to CMS
-        // For now, log the request - actual implementation would use navigator.geolocation
-        if (this.player.reportGeoLocation) {
-          await this.player.reportGeoLocation(data);
-          log.debug('currentGeoLocation completed successfully');
+        const hasCoordinates = data && data.latitude != null && data.longitude != null;
+
+        if (hasCoordinates) {
+          // CMS is pushing coordinates to us
+          if (this.player.reportGeoLocation) {
+            this.player.reportGeoLocation(data);
+            log.debug('currentGeoLocation: coordinates applied');
+          } else {
+            log.warn('Geo location reporting not implemented in player');
+          }
         } else {
-          log.warn('Geo location reporting not implemented in player');
+          // CMS is asking us to report our location via browser API
+          if (this.player.requestGeoLocation) {
+            await this.player.requestGeoLocation();
+            log.debug('currentGeoLocation: browser location requested');
+          } else {
+            log.warn('Geo location request not implemented in player');
+          }
         }
       } catch (error) {
         log.error('currentGeoLocation failed:', error);

package/src/xmr-wrapper.test.js

@@ -362,20 +362,37 @@ describe('XmrWrapper', () => {
         consoleErrorSpy.mockRestore();
       });
 
-      it('should handle currentGeoLocation command', async () => {
+      it('should handle currentGeoLocation with coordinates (CMS push)', async () => {
         const geoData = { latitude: 40.7128, longitude: -74.0060 };
 
         xmrInstance.simulateCommand('currentGeoLocation', geoData);
         await vi.runAllTimersAsync();
 
         expect(mockPlayer.reportGeoLocation).toHaveBeenCalledWith(geoData);
+        expect(mockPlayer.requestGeoLocation).not.toHaveBeenCalled();
       });
 
-      it('should handle currentGeoLocation when not implemented', async () => {
+      it('should handle currentGeoLocation without coordinates (CMS request)', async () => {
+        xmrInstance.simulateCommand('currentGeoLocation', {});
+        await vi.runAllTimersAsync();
+
+        expect(mockPlayer.requestGeoLocation).toHaveBeenCalled();
+        expect(mockPlayer.reportGeoLocation).not.toHaveBeenCalled();
+      });
+
+      it('should handle currentGeoLocation with null data (CMS request)', async () => {
+        xmrInstance.simulateCommand('currentGeoLocation', null);
+        await vi.runAllTimersAsync();
+
+        expect(mockPlayer.requestGeoLocation).toHaveBeenCalled();
+        expect(mockPlayer.reportGeoLocation).not.toHaveBeenCalled();
+      });
+
+      it('should handle currentGeoLocation when reportGeoLocation not implemented', async () => {
         delete mockPlayer.reportGeoLocation;
         const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
-        xmrInstance.simulateCommand('currentGeoLocation', {});
+        xmrInstance.simulateCommand('currentGeoLocation', { latitude: 40, longitude: -74 });
         await vi.runAllTimersAsync();
 
         expect(consoleWarnSpy).toHaveBeenCalledWith(
@@ -385,8 +402,22 @@ describe('XmrWrapper', () => {
         consoleWarnSpy.mockRestore();
       });
 
+      it('should handle currentGeoLocation when requestGeoLocation not implemented', async () => {
+        delete mockPlayer.requestGeoLocation;
+        const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+        xmrInstance.simulateCommand('currentGeoLocation', {});
+        await vi.runAllTimersAsync();
+
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          '[XMR]',
+          'Geo location request not implemented in player'
+        );
+        consoleWarnSpy.mockRestore();
+      });
+
       it('should handle currentGeoLocation failure gracefully', async () => {
-        mockPlayer.reportGeoLocation.mockRejectedValue(new Error('Geo location failed'));
+        mockPlayer.requestGeoLocation.mockRejectedValue(new Error('Geo location failed'));
         const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
         xmrInstance.simulateCommand('currentGeoLocation', {});