@octane-xplat/camera 0.16.1 → 0.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octane-xplat/camera",
-  "version": "0.16.1",
+  "version": "0.17.1",
   "description": "Live camera preview for Octane xplat — web getUserMedia + native capture (AVCapture / CameraX)",
   "keywords": [
     "android",
@@ -43,16 +43,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@octane-xplat/platform": "0.16.1",
+    "@octane-xplat/platform": "0.17.1",
     "mediabunny": "1.61.3"
   },
   "devDependencies": {
     "@nativescript-community/octane": "0.2.5",
     "@nativescript/core": "9.1.3",
-    "@octane-xplat/macos-renderer": "0.16.1",
+    "@octane-xplat/macos-renderer": "0.17.1",
     "@octanejs/vite-plugin": "0.1.61",
-    "octane": "0.11.0",
-    "tsrx-typegen": "0.3.1",
+    "octane": "0.14.0",
+    "tsrx-typegen": "0.4.0",
     "typescript": "5.9.3",
     "vite": "8.3.0",
     "vitest": "4.1.11"

package/platforms/android/java/com/octanexplat/camera/CameraSessionBridge.java

@@ -66,6 +66,7 @@ public final class CameraSessionBridge implements LifecycleOwner {
 	private boolean resumeAfterFinalization;
 	private boolean ownsDestination;
 	private boolean ready;
+	private boolean streaming;
 	private boolean started;
 	private boolean finalizing;
 	private final java.util.concurrent.ExecutorService finalizer = java.util.concurrent.Executors.newSingleThreadExecutor();
@@ -89,7 +90,12 @@ public final class CameraSessionBridge implements LifecycleOwner {
 	}
 	@Override public Lifecycle getLifecycle() { return lifecycle; }
 	private void emit(String type, String value) { if (listener != null) listener.event(type, value); }
-	private void ready(boolean value) { ready = value; emit("ready", Boolean.toString(value)); }
+	private void ready(boolean value) { if (ready == value) return; ready = value; emit("ready", Boolean.toString(value)); }
+	/** The "ready" event means the JS `previewReady()` gate is satisfied,
+	 *  not just that the preview view reports streaming — a stream-state
+	 *  event can lead the first measured frame, and a stale STREAMING
+	 *  replayed by LiveData on rebind can precede the new camera's open. */
+	private void updateReady() { ready(streaming && sourceFrameRate > 0); }
 	public boolean isReady() { return ready && sourceFrameRate > 0 && !detached && !released; }
 	public long elapsedMs() { return elapsed; }
 	private void failure(String stage, String kind, String message) {
@@ -129,7 +135,12 @@ public final class CameraSessionBridge implements LifecycleOwner {
 						if (released || epoch != generation) return;
 						Long timestamp = result.get(android.hardware.camera2.CaptureResult.SENSOR_TIMESTAMP);
 						if (timestamp != null && timestamp > lastFrameTime) {
-							if (lastFrameTime > 0) sourceFrameRate = 1_000_000_000.0 / (timestamp - lastFrameTime);
+							if (lastFrameTime > 0) {
+								boolean firstRate = sourceFrameRate == 0;
+								sourceFrameRate = 1_000_000_000.0 / (timestamp - lastFrameTime);
+								// Runs on the camera executor; readiness is emitted on main.
+								if (firstRate) handler.post(() -> updateReady());
+							}
 							lastFrameTime = timestamp;
 						}
 					}
@@ -139,18 +150,34 @@ public final class CameraSessionBridge implements LifecycleOwner {
 				camera = provider.bindToLifecycle(this, selector, preview, video);
 				camera.getCameraInfo().getCameraState().observe(this, state -> {
 					if (released || epoch != generation) return;
-					if (state.getError() != null || state.getType() == CameraState.Type.CLOSED) {
-						ready(false);
+					if (state.getError() != null) {
 						emit("availability", "false");
+						ready(false);
+						if (recording != null) { emit("interruption", "cameraInUse"); stop(); }
+					} else if (state.getType() == CameraState.Type.CLOSED) {
+						// Plain CLOSED is the camera's normal resting state —
+						// every bind starts here and it can be delivered late
+						// relative to stream state — so it must not flip
+						// availability while a live preview keeps streaming.
+						ready(false);
 						if (recording != null) { emit("interruption", "cameraInUse"); stop(); }
+					} else if (state.getType() == CameraState.Type.OPEN) {
+						// An open recovers availability without waiting for a
+						// stream-state cycle, which never re-fires while
+						// STREAMING persists through an internal retry.
+						emit("availability", "true");
+						updateReady();
 					}
 				});
 				observedHost = view;
 				view.getStreamState().observe(this, state -> {
 					if (host != view || detached || released || epoch != generation) return;
-					boolean streaming = state == androidx.camera.view.PreviewView.StreamState.STREAMING;
-					ready(streaming);
+					streaming = state == androidx.camera.view.PreviewView.StreamState.STREAMING;
+					// Availability/recovery must land before "ready": onReady
+					// consumers may admit recording synchronously, and the
+					// session gates on the flags these events update.
 					if (streaming) { emit("availability", "true"); emit("recovered", "unknown"); }
+					updateReady();
 				});
 			} catch (Exception cause) { ready(false); emit("previewError", cause.toString()); unbind(); }
 		}, ContextCompat.getMainExecutor(context));
@@ -167,14 +194,16 @@ public final class CameraSessionBridge implements LifecycleOwner {
 	}
 	public void detach() {
 		detached = true;
+		streaming = false;
 		generation++;
 		host = null;
 		ready(false);
 		if (recording == null) unbind();
 	}
-	public void background() { backgrounded = true; resumeAfterFinalization = false; ready(false); emit("interruption", "background"); if (recording != null) stop(); else unbind(); }
+	public void background() { backgrounded = true; resumeAfterFinalization = false; streaming = false; ready(false); emit("interruption", "background"); if (recording != null) stop(); else unbind(); }
 	public void foreground() { backgrounded = false; emit("recovered", "background"); if (recording != null) { resumeAfterFinalization = true; } else if (host != null && !detached) { unbind(); attach(host, selection); } }
 	private void unbind() {
+		streaming = false;
 		if (camera != null) camera.getCameraInfo().getCameraState().removeObservers(this);
 		if (observedHost != null) { observedHost.getStreamState().removeObservers(this); observedHost = null; }
 		if (provider != null) {

package/src/layout-child.ts

@@ -1,11 +1,12 @@
 import type { CameraViewProps } from './props'
 import { isIOS } from '@nativescript/core'
+import { mergeStyle } from './style-merge'
 
 /** NativeScript reads layout fields from a child view during parent layout. */
 export function layoutChildProps(
 	props: CameraViewProps,
-	baseStyle = props.style,
-): { style: Record<string, any> } {
+	baseStyle: Record<string, any> | string | undefined = props.style,
+) {
 	const style: Record<string, any> = { ...(typeof baseStyle === 'object' ? baseStyle : {}) }
 	if (props.row !== undefined) {
 		style.gridRow = `${props.row + 1} / span ${props.rowSpan ?? 1}`
@@ -43,7 +44,7 @@ export function layoutChildProps(
 	if ((props.left !== undefined || props.top !== undefined) && props.dock === undefined) {
 		style.position = style.position ?? 'absolute'
 	}
-	return { style }
+	return { style: typeof baseStyle === 'string' ? mergeStyle(style, baseStyle) : style }
 }
 
 export function applyEscapeProps(view: any, props: { ios?: any; android?: any }): void {

package/src/layout-child.windows.ts

@@ -1,4 +1,5 @@
 import type { CameraViewProps } from './props'
+import { mergeStyle } from './style-merge'
 
 /** Windows twins of the layout-child helpers — the unsuffixed module
  *  resolves the platform escape bag through `isIOS`, which has no Windows
@@ -7,28 +8,43 @@ import type { CameraViewProps } from './props'
 
 export function layoutChildProps(
 	props: CameraViewProps,
-	baseStyle = props.style,
-): Record<string, any> {
-	const result: Record<string, any> = { style: baseStyle }
-	for (const key of [
-		'row',
-		'col',
-		'rowSpan',
-		'colSpan',
-		'dock',
-		'left',
-		'top',
-		'flexGrow',
-		'flexShrink',
-		'alignSelf',
-		'order',
-	] as const) {
+	baseStyle: Record<string, any> | string | undefined = props.style,
+) {
+	const style: Record<string, any> = { ...(typeof baseStyle === 'object' ? baseStyle : {}) }
+	if (props.row !== undefined) {
+		style.gridRow = `${props.row + 1} / span ${props.rowSpan ?? 1}`
+	} else if (props.rowSpan !== undefined) {
+		style.gridRow = `span ${props.rowSpan}`
+	}
+	if (props.col !== undefined) {
+		style.gridColumn = `${props.col + 1} / span ${props.colSpan ?? 1}`
+	} else if (props.colSpan !== undefined) {
+		style.gridColumn = `span ${props.colSpan}`
+	}
+	if (props.dock !== undefined) {
+		style.position = style.position ?? 'absolute'
+		if (props.dock === 'left' || props.dock === 'top' || props.dock === 'bottom') {
+			style.left = style.left ?? 0
+		}
+		if (props.dock === 'right' || props.dock === 'top' || props.dock === 'bottom') {
+			style.right = style.right ?? 0
+		}
+		if (props.dock === 'top' || props.dock === 'left' || props.dock === 'right') {
+			style.top = style.top ?? 0
+		}
+		if (props.dock === 'bottom' || props.dock === 'left' || props.dock === 'right') {
+			style.bottom = style.bottom ?? 0
+		}
+	}
+	for (const key of ['left', 'top', 'flexGrow', 'flexShrink', 'alignSelf', 'order'] as const) {
 		if (props[key] !== undefined) {
-			result[key] = props[key]
+			style[key] = props[key]
 		}
 	}
-
-	return result
+	if ((props.left !== undefined || props.top !== undefined) && props.dock === undefined) {
+		style.position = style.position ?? 'absolute'
+	}
+	return { style: typeof baseStyle === 'string' ? mergeStyle(style, baseStyle) : style }
 }
 
 export function applyEscapeProps(view: any, props: { windows?: any }): void {

package/src/session-core.ts

@@ -170,6 +170,7 @@ export class SharedCameraSession implements CameraSession {
 	private cameraAvailable = true
 	private previewAttached = false
 	private interrupted = false
+	private pendingOnReady: (() => void) | undefined
 	private disposeRequested = false
 	private disposed = false
 	private lastCapabilities: CameraSessionCapabilities | undefined
@@ -195,7 +196,14 @@ export class SharedCameraSession implements CameraSession {
 		backend.setObserver({
 			interruption: (phase, reason) => this.handleInterruption(phase, reason),
 			availability: (available) => this.handleAvailability(available),
-			previewReady: () => {
+			previewReady: (ready) => {
+				// A retracted readiness signal invalidates a pending onReady;
+				// a delivered one retries admission.
+				if (!ready) {
+					this.pendingOnReady = undefined
+				}
+
+				this.flushPendingReady()
 				this.emit({ type: 'stateChanged', snapshot: this.snapshot() })
 			},
 		})
@@ -212,7 +220,12 @@ export class SharedCameraSession implements CameraSession {
 		}
 
 		const detach = this.backend.attachPreview(host, {
-			onReady: listener?.onReady,
+			onReady: listener?.onReady
+				? () => {
+						this.pendingOnReady = listener.onReady
+						this.flushPendingReady()
+					}
+				: undefined,
 			onError: (captureIssue) => {
 				listener?.onError?.(captureIssue)
 			},
@@ -235,6 +248,7 @@ export class SharedCameraSession implements CameraSession {
 		}
 
 		this.previewAttached = false
+		this.pendingOnReady = undefined
 		const attempt = this.attempt
 		if (attempt && (attempt.state === 'starting' || attempt.state === 'recording')) {
 			this.requestStop('previewReleased')
@@ -245,6 +259,22 @@ export class SharedCameraSession implements CameraSession {
 		this.emit({ type: 'stateChanged', snapshot: this.snapshot() })
 	}
 
+	/** `onReady` means "recording can start": it is delivered only while
+	 *  the session would actually admit `startRecording`. Adapters emit
+	 *  their availability/interruption observations in their own order, so
+	 *  a ready signal that arrives before those updates settles pends
+	 *  until the next lifecycle event makes admission possible — or is
+	 *  dropped if readiness is retracted first. */
+	private flushPendingReady() {
+		const pending = this.pendingOnReady
+		if (!pending || this.interrupted || !this.cameraAvailable || !this.backend.previewReady()) {
+			return
+		}
+
+		this.pendingOnReady = undefined
+		pending()
+	}
+
 	private emit(event: CameraSessionEvent) {
 		for (const listener of this.listeners) {
 			try {
@@ -423,6 +453,7 @@ export class SharedCameraSession implements CameraSession {
 			this.requestStop(cause)
 		}
 
+		this.flushPendingReady()
 		this.emit({ type: 'stateChanged', snapshot: this.snapshot() })
 	}
 
@@ -437,6 +468,7 @@ export class SharedCameraSession implements CameraSession {
 			this.requestStop('cameraUnavailable')
 		}
 
+		this.flushPendingReady()
 		this.emit({ type: 'stateChanged', snapshot: this.snapshot() })
 	}
 
@@ -713,6 +745,7 @@ export class SharedCameraSession implements CameraSession {
 		}
 
 		this.disposed = true
+		this.pendingOnReady = undefined
 		this.backend.setObserver(undefined)
 		try {
 			await this.backend.release()

package/src/style-merge.ts

@@ -0,0 +1,59 @@
+const kebab = (key: string) => key.replace(/[A-Z]/g, (c) => '-' + c.toLowerCase())
+
+/** Anything accepted as a style value, including nested arrays. */
+export type StyleInput =
+	| string
+	| Record<string, any>
+	| null
+	| undefined
+	| readonly StyleInput[]
+
+/** Merge component-emitted style defaults under the authored `style` prop.
+ *  Authored keys win; array styles fold in order; a string style is appended
+ *  after the serialized defaults so its declarations override them too. */
+export function mergeStyle(
+	base: Record<string, any>,
+	style?: Record<string, any> | readonly (Record<string, any> | null | undefined)[] | null,
+): Record<string, any>
+export function mergeStyle(
+	base: Record<string, any>,
+	style?: StyleInput,
+): string | Record<string, any>
+export function mergeStyle(
+	base: Record<string, any>,
+	style?: StyleInput,
+): string | Record<string, any> {
+	if (style == null) {
+		return base
+	}
+
+	let obj: Record<string, any> = { ...base }
+	const strings: string[] = []
+	const add = (s: StyleInput) => {
+		if (s == null) {
+			return
+		}
+		if (typeof s === 'string') {
+			strings.push(s)
+		} else if (Array.isArray(s)) {
+			for (const part of s) {
+				add(part)
+			}
+		} else {
+			obj = { ...obj, ...s }
+		}
+	}
+	add(style)
+
+	if (strings.length === 0) {
+		return obj
+	}
+
+	const prefix = Object.entries(obj)
+		.filter(([, v]) => v != null)
+		.map(([k, v]) => `${kebab(k)}:${v}`)
+		.join(';')
+	return [prefix, ...strings].filter(Boolean).join(';')
+}
+
+export type StyleProp = string | Record<string, any> | readonly StyleProp[] | null | undefined

package/types/session-core.d.ts

@@ -106,6 +106,7 @@ export declare class SharedCameraSession implements CameraSession {
     private cameraAvailable;
     private previewAttached;
     private interrupted;
+    private pendingOnReady;
     private disposeRequested;
     private disposed;
     private lastCapabilities;
@@ -116,6 +117,13 @@ export declare class SharedCameraSession implements CameraSession {
     attach(host: unknown, listener?: BackendPreviewListener): () => void;
     get attached(): boolean;
     private detachInternal;
+    /** `onReady` means "recording can start": it is delivered only while
+     *  the session would actually admit `startRecording`. Adapters emit
+     *  their availability/interruption observations in their own order, so
+     *  a ready signal that arrives before those updates settles pends
+     *  until the next lifecycle event makes admission possible — or is
+     *  dropped if readiness is retracted first. */
+    private flushPendingReady;
     private emit;
     private setState;
     snapshot(): CameraSessionSnapshot;