@kubohiroya/turbowarp-teachable-machine 3.3.0 → 3.4.1

package/dist/tm.js

@@ -553,7 +553,7 @@
   }
   var package_default = {
   	name: "@kubohiroya/turbowarp-teachable-machine",
-  	version: "3.3.0",
+  	version: "3.4.1",
   	description: "A TurboWarp extension for recognition using Teachable Machine pose, image, and audio models.",
   	author: "Hiroya Kubo <hiroya@cuc.ac.jp>",
   	license: "MPL-2.0",
@@ -621,6 +621,7 @@
   		"prepack": "npm run build && npm run release:consistency:check"
   	},
   	devDependencies: {
+  		"@kubohiroya/turbowarp-camera-source": "0.13.0",
   		"@kubohiroya/vite-plugin-turbowarp-extension": "0.4.0",
   		"@teachablemachine/image": "0.8.5",
   		"@teachablemachine/pose": "0.8.6",
@@ -647,6 +648,23 @@
   };
   //#endregion
   //#region src/extension.ts
+  /**
+  * Where Camera Source puts itself on the VM runtime.
+  *
+  * Declared here rather than imported as a value, because this file is bundled into a single-file
+  * extension and no dependency's code has ever been inlined into it. The key and the member read
+  * below are pinned against Camera Source's own published constant and narrowing function in the
+  * tests, which import both and are not shipped, so a rename upstream fails here rather than
+  * silently reading an absent extension as "not loaded".
+  */
+  var CAMERA_SOURCE_RUNTIME_KEY = "ext_kubohiroyacamerasource";
+  function readCameraSource(runtime) {
+  	if (typeof runtime !== "object" || runtime === null) return void 0;
+  	const candidate = runtime[CAMERA_SOURCE_RUNTIME_KEY];
+  	if (typeof candidate !== "object" || candidate === null) return void 0;
+  	const { acquireCamera } = candidate;
+  	return typeof acquireCamera === "function" ? candidate : void 0;
+  }
   var EXTENSION_ID = "kubohiroyatm";
   var VERSION = `${package_default.version}-typescript`;
   var DOCS_URI = "https://kubohiroya.github.io/turbowarp-teachable-machine/";
@@ -929,6 +947,7 @@
   		this.modelURL = "";
   		this.model = null;
   		this.webcam = null;
+  		this.cameraLease = null;
   		this.cameraRunning = false;
   		this.cameraSelection = "default";
   		this.cameraSelectionIsDeviceId = false;
@@ -1150,8 +1169,11 @@
   		await this.ensureComputeBackend();
   	}
   	cleanupCameraResources() {
+  		const lease = this.cameraLease;
+  		this.cameraLease = null;
   		const video = this.webcam?.webcam;
-  		if (video?.srcObject) {
+  		if (lease) lease.release();
+  		else if (video?.srcObject) {
   			video.srcObject.getTracks().forEach((track) => track.stop());
   			video.srcObject = null;
   		}
@@ -1184,11 +1206,17 @@
   			if (!runtime) throw new Error("Teachable Machine: Runtime is unavailable.");
   			if (!("Webcam" in runtime)) throw new Error("Teachable Machine: Camera runtime is unavailable in the current mode.");
   			this.webcam = new runtime.Webcam(320, 240, true);
-  			const constraints = cameraConstraints(this.resolvedCameraSelection());
+  			const lease = await this.acquireSharedCamera();
+  			if (lease) {
+  				this.cameraLease = lease;
+  				this.webcam.webcam = lease.getFrameSource().element;
+  			}
+  			const constraints = lease ? void 0 : cameraConstraints(this.resolvedCameraSelection());
   			if (constraints) await this.webcam.setup(constraints);
   			else await this.webcam.setup();
+  			this.ensureCameraCanvas();
   			initializeCameraReadbackContext(this.webcam.canvas);
-  			await this.webcam.play();
+  			if (!lease) await this.webcam.play();
   			this.attachPreviewToStage();
   			this.cameraRunning = true;
   			try {
@@ -1203,6 +1231,46 @@
   			throw error;
   		}
   	}
+  	/**
+  	* Give the camera the readback canvas `setup()` did not build.
+  	*
+  	* Upstream creates that canvas inside the same branch that opens the camera, so an injected
+  	* element skips the canvas with the `getUserMedia` call. 3.4.0 shipped assuming the two were
+  	* separate, and every leased start then failed at the first context request with "Webcam canvas
+  	* does not provide a 2D context" -- which is to say pose recognition did not start at all
+  	* wherever Camera Source was present. The canvas built here is the one upstream would have
+  	* built, so the mirrored centre crop every downstream reader expects is unchanged.
+  	*/
+  	ensureCameraCanvas() {
+  		if (!this.webcam || this.webcam.canvas) return;
+  		const canvas = document.createElement("canvas");
+  		canvas.width = this.webcam.width ?? 320;
+  		canvas.height = this.webcam.height ?? 240;
+  		this.webcam.canvas = canvas;
+  	}
+  	/**
+  	* A lease on the shared camera, or null when Camera Source is not loaded.
+  	*
+  	* Camera Source owns the device and decides when a stream stops, which is what lets one camera
+  	* serve pose recognition and anything else reading frames at the same time. It is a separate
+  	* TurboWarp extension, and this one is also distributed for standalone URL loading, so its
+  	* absence is ordinary rather than a failure: the self-acquired path stays for it.
+  	*
+  	* One camera id for every visual recognition mode. Opening a second device for a work that
+  	* recognises both poses and images is not what sharing is for, and `pose` is the role name
+  	* Camera Source's own documentation uses for this consumer.
+  	*/
+  	async acquireSharedCamera() {
+  		const cameraSource = readCameraSource(Scratch.vm?.runtime);
+  		if (!cameraSource) return null;
+  		const selection = this.resolvedCameraSelection();
+  		const options = {
+  			owner: package_default.name,
+  			cameraId: "pose"
+  		};
+  		if (selection.kind === "device") options.deviceId = selection.value;
+  		return cameraSource.acquireCamera(options);
+  	}
   	stopCamera() {
   		try {
   			this.stopRecognition();

package/dist/types/extension.d.ts

@@ -5,6 +5,9 @@ export declare const EXTENSION_ID = "kubohiroyatm";
 export declare const VERSION: string;
 export declare const DOCS_URI = "https://kubohiroya.github.io/turbowarp-teachable-machine/";
 export declare const ACCUMULATED_POSE_CHANGED_EVENT = "TM_ACCUMULATED_POSE_CHANGED";
+/** The readback canvas size every downstream frame reader is written against. */
+export declare const CAMERA_FRAME_WIDTH = 320;
+export declare const CAMERA_FRAME_HEIGHT = 240;
 export declare const BLOCK_ICON_URI: string;
 export type RecognitionMode = 'pose' | 'image' | 'audio';
 export interface TeachableMachineRuntime {
@@ -152,6 +155,30 @@ export declare class TMExtension {
     ensureLibrariesLoaded(): Promise<void>;
     cleanupCameraResources(): void;
     startCamera(): Promise<void>;
+    /**
+     * Give the camera the readback canvas `setup()` did not build.
+     *
+     * Upstream creates that canvas inside the same branch that opens the camera, so an injected
+     * element skips the canvas with the `getUserMedia` call. 3.4.0 shipped assuming the two were
+     * separate, and every leased start then failed at the first context request with "Webcam canvas
+     * does not provide a 2D context" -- which is to say pose recognition did not start at all
+     * wherever Camera Source was present. The canvas built here is the one upstream would have
+     * built, so the mirrored centre crop every downstream reader expects is unchanged.
+     */
+    ensureCameraCanvas(): void;
+    /**
+     * A lease on the shared camera, or null when Camera Source is not loaded.
+     *
+     * Camera Source owns the device and decides when a stream stops, which is what lets one camera
+     * serve pose recognition and anything else reading frames at the same time. It is a separate
+     * TurboWarp extension, and this one is also distributed for standalone URL loading, so its
+     * absence is ordinary rather than a failure: the self-acquired path stays for it.
+     *
+     * One camera id for every visual recognition mode. Opening a second device for a work that
+     * recognises both poses and images is not what sharing is for, and `pose` is the role name
+     * Camera Source's own documentation uses for this consumer.
+     */
+    private acquireSharedCamera;
     stopCamera(): void;
     isCameraRunning(): any;
     getCameraMenuItems(): {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubohiroya/turbowarp-teachable-machine",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "A TurboWarp extension for recognition using Teachable Machine pose, image, and audio models.",
   "author": "Hiroya Kubo <hiroya@cuc.ac.jp>",
   "license": "MPL-2.0",
@@ -72,6 +72,7 @@
     "prepack": "npm run build && npm run release:consistency:check"
   },
   "devDependencies": {
+    "@kubohiroya/turbowarp-camera-source": "0.13.0",
     "@kubohiroya/vite-plugin-turbowarp-extension": "0.4.0",
     "@teachablemachine/image": "0.8.5",
     "@teachablemachine/pose": "0.8.6",