scandit-datacapture-frameworks-core 8.1.1 → 8.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scandit-datacapture-frameworks-core",
-  "version": "8.1.1",
+  "version": "8.2.0",
   "description": "Core common package",
   "author": {
     "name": "Scandit",

package/test/Camera.test.ts

@@ -1,9 +1,8 @@
 import { describe, it, expect, jest, beforeEach } from '@jest/globals';
 import { Camera, CameraSettings, FrameSourceState, TorchState, CameraPosition, createNativeProxy, FactoryMaker } from '../src';
 import { MockCaller, MockNativeEventEmitter, MockDataCaptureContext, createMockCameraNativeModule, createMockDataCaptureContextNativeModule, createMockFeedbackNativeModule } from '../__mocks__/ScanditDataCaptureCore';
-import { CameraProxy } from '../src/camera/CameraController';
+import { CoreProxy } from '../src/generated/CoreProxy';
 import { DataCaptureContextProxy } from '../src/context/controller/DataCaptureContextController';
-import { FeedbackProxy } from '../src/feedback/FeedbackController';
 import { loadMockDefaults } from '../__mocks__/Defaults';
 
 describe('Camera Lifecycle with Promise-based Waiting', () => {
@@ -15,22 +14,21 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    
+
     (Camera as any)._cameraInstances.clear();
-    FactoryMaker.instances.delete('CameraProxy');
+    FactoryMaker.instances.delete('CoreProxy');
     FactoryMaker.instances.delete('DataCaptureContextProxy');
-    FactoryMaker.instances.delete('FeedbackProxy');
 
     mockCameraNativeModule = createMockCameraNativeModule();
     mockContextNativeModule = createMockDataCaptureContextNativeModule();
     mockFeedbackNativeModule = createMockFeedbackNativeModule();
     nativeEventEmitter = new MockNativeEventEmitter();
-    
+
     loadMockDefaults();
 
-    FactoryMaker.bindLazyInstance('CameraProxy', () => {
+    FactoryMaker.bindLazyInstance('CoreProxy', () => {
       const caller = new MockCaller(mockCameraNativeModule, nativeEventEmitter);
-      return createNativeProxy<CameraProxy>(caller);
+      return createNativeProxy<CoreProxy>(caller);
     });
 
     FactoryMaker.bindLazyInstance('DataCaptureContextProxy', () => {
@@ -38,11 +36,6 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
       return createNativeProxy<DataCaptureContextProxy>(caller);
     });
 
-    FactoryMaker.bindLazyInstance('FeedbackProxy', () => {
-      const caller = new MockCaller(mockFeedbackNativeModule, nativeEventEmitter);
-      return createNativeProxy<FeedbackProxy>(caller);
-    });
-
     mockContext = new MockDataCaptureContext();
   });
 
@@ -50,10 +43,10 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('operations only update properties, no native calls', () => {
       const camera = Camera.default!;
       const settings = new CameraSettings();
-      
+
       camera.desiredTorchState = TorchState.On;
       camera.applySettings(settings);
-      
+
       expect(camera.desiredTorchState).toBe(TorchState.On);
       expect((camera as any).settings).toBe(settings);
       expect(mockContext.update).not.toHaveBeenCalled();
@@ -63,41 +56,41 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
   describe('Phase 2: Native Creation In Progress', () => {
     it('operations wait for native camera to be ready', async () => {
       const camera = Camera.default!;
-      
+
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
-      
+
       camera.desiredTorchState = TorchState.On;
-      
+
       await setFrameSourcePromise;
       await new Promise(resolve => setTimeout(resolve, 50));
-      
+
       expect(mockContext.controller.updateContextFromJSON).toHaveBeenCalled();
     });
 
     it('switchToDesiredState waits for native camera', async () => {
       const camera = Camera.default!;
-      
+
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
       const switchPromise = camera.switchToDesiredState(FrameSourceState.On);
-      
+
       const controllerSpy = jest.spyOn((camera as any).controller, 'switchCameraToDesiredState');
-      
+
       await setFrameSourcePromise;
       await switchPromise;
-      
+
       expect(controllerSpy).toHaveBeenCalledWith(FrameSourceState.On);
     });
 
     it('applySettings waits for native camera', async () => {
       const camera = Camera.default!;
       const settings = new CameraSettings();
-      
+
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
       const applyPromise = camera.applySettings(settings);
-      
+
       await setFrameSourcePromise;
       await applyPromise;
-      
+
       expect(mockContext.controller.updateContextFromJSON).toHaveBeenCalled();
     });
   });
@@ -105,15 +98,15 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
   describe('Phase 3: Active State', () => {
     it('operations execute immediately', async () => {
       const camera = Camera.default!;
-      
+
       await mockContext.setFrameSource(camera);
       await new Promise(resolve => setTimeout(resolve, 50));
-      
+
       mockContext.controller.updateContextFromJSON.mockClear();
-      
+
       camera.desiredTorchState = TorchState.On;
       await new Promise(resolve => setTimeout(resolve, 50));
-      
+
       expect(mockContext.controller.updateContextFromJSON).toHaveBeenCalled();
     });
   });
@@ -121,30 +114,30 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
   describe('Phase transitions', () => {
     it('transitions from Phase 1 → Phase 2 → Phase 3 correctly', async () => {
       const camera = Camera.default!;
-      
+
       camera.desiredTorchState = TorchState.On;
       expect(mockContext.controller.updateContextFromJSON).not.toHaveBeenCalled();
-      
+
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
       expect((camera as any).nativeReadyPromise).not.toBeNull();
-      
+
       camera.desiredTorchState = TorchState.Off;
-      
+
       await setFrameSourcePromise;
       await new Promise(resolve => setTimeout(resolve, 50));
-      
+
       expect((camera as any).nativeReadyPromise).toBeNull();
       expect(mockContext.controller.updateContextFromJSON).toHaveBeenCalled();
     });
 
     it('context set to null clears native ready promise', async () => {
       const camera = Camera.default!;
-      
+
       mockContext.setFrameSource(camera);
       expect((camera as any).nativeReadyPromise).not.toBeNull();
-      
+
       (camera as any).context = null;
-      
+
       expect((camera as any).nativeReadyPromise).toBeNull();
     });
   });
@@ -153,18 +146,18 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('multiple operations all wait and execute after native is ready', async () => {
       const camera = Camera.default!;
       const settings = new CameraSettings();
-      
+
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
-      
+
       camera.desiredTorchState = TorchState.On;
       const switchPromise = camera.switchToDesiredState(FrameSourceState.On);
       const applyPromise = camera.applySettings(settings);
-      
+
       const controllerSpy = jest.spyOn((camera as any).controller, 'switchCameraToDesiredState');
-      
+
       await setFrameSourcePromise;
       await Promise.all([switchPromise, applyPromise]);
-      
+
       expect(mockContext.controller.updateContextFromJSON).toHaveBeenCalled();
       expect(controllerSpy).toHaveBeenCalledWith(FrameSourceState.On);
     });
@@ -172,17 +165,17 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('property updates are preserved even when operations are waiting', async () => {
       const camera = Camera.default!;
       const settings = new CameraSettings();
-      
+
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
-      
+
       camera.desiredTorchState = TorchState.On;
       camera.desiredTorchState = TorchState.Off;
-      
+
       expect(camera.desiredTorchState).toBe(TorchState.Off);
-      
+
       await setFrameSourcePromise;
       await new Promise(resolve => setTimeout(resolve, 50));
-      
+
       expect(camera.desiredTorchState).toBe(TorchState.Off);
     });
   });
@@ -191,18 +184,18 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('returns same camera instance for same position', () => {
       const camera1 = Camera.atPosition(CameraPosition.WorldFacing);
       const camera2 = Camera.atPosition(CameraPosition.WorldFacing);
-      
+
       expect(camera1).toBe(camera2);
     });
 
     it('resetPhaseState clears promise when camera is retrieved from cache', () => {
       const camera1 = Camera.atPosition(CameraPosition.WorldFacing)!;
-      
+
       mockContext.setFrameSource(camera1);
       expect((camera1 as any).nativeReadyPromise).not.toBeNull();
-      
+
       const camera2 = Camera.create(CameraPosition.WorldFacing);
-      
+
       expect(camera2).toBe(camera1);
       expect((camera2 as any).nativeReadyPromise).toBeNull();
     });
@@ -210,7 +203,7 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('different camera positions are independent instances', () => {
       const worldCamera = Camera.atPosition(CameraPosition.WorldFacing);
       const userCamera = Camera.atPosition(CameraPosition.UserFacing);
-      
+
       expect(worldCamera).not.toBe(userCamera);
     });
   });
@@ -219,37 +212,37 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('switchToDesiredState in Phase 1 shows warning', async () => {
       const camera = Camera.default!;
       const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
-      
+
       await camera.switchToDesiredState(FrameSourceState.On);
-      
+
       expect(consoleWarnSpy).toHaveBeenCalledWith(
         expect.stringContaining('not added to the DataCaptureContext')
       );
-      
+
       consoleWarnSpy.mockRestore();
     });
 
     it('multiple property changes in Phase 1 only update TS properties', () => {
       const camera = Camera.default!;
-      
+
       camera.desiredTorchState = TorchState.On;
       camera.desiredTorchState = TorchState.Off;
       camera.desiredTorchState = TorchState.On;
-      
+
       expect(camera.desiredTorchState).toBe(TorchState.On);
       expect(mockContext.controller.updateContextFromJSON).not.toHaveBeenCalled();
     });
 
     it('handles operations during rapid phase transitions', async () => {
       const camera = Camera.default!;
-      
+
       camera.desiredTorchState = TorchState.On;
       const setFrameSourcePromise = mockContext.setFrameSource(camera);
       camera.desiredTorchState = TorchState.Off;
-      
+
       await setFrameSourcePromise;
       await new Promise(resolve => setTimeout(resolve, 50));
-      
+
       expect(camera.desiredTorchState).toBe(TorchState.Off);
       expect(mockContext.controller.updateContextFromJSON).toHaveBeenCalled();
     });
@@ -257,34 +250,34 @@ describe('Camera Lifecycle with Promise-based Waiting', () => {
     it('times out if native camera is not ready after 5 seconds', async () => {
       jest.useFakeTimers();
       const camera = Camera.default!;
-      
+
       (camera as any).setNativeFrameSourceIsBeingCreated();
-      
+
       const switchPromise = camera.switchToDesiredState(FrameSourceState.On);
-      
+
       jest.advanceTimersByTime(5000);
-      
+
       await expect(switchPromise).rejects.toThrow('Camera native initialization timed out after 5 seconds');
-      
+
       jest.useRealTimers();
     });
 
     it('timeout is cleared when context is set', async () => {
       jest.useFakeTimers();
       const camera = Camera.default!;
-      
+
       mockContext.setFrameSource(camera);
-      
+
       const switchPromise = camera.switchToDesiredState(FrameSourceState.On);
-      
+
       jest.advanceTimersByTime(1000);
-      
+
       (camera as any).context = mockContext;
-      
+
       await switchPromise;
-      
+
       jest.advanceTimersByTime(5000);
-      
+
       jest.useRealTimers();
     });
   });