feat: enhance object detection with state management and new reporting functions

Author: dido18

scratch-arduino-extensions/packages/scratch-vm/src/extensions/arduino_object_detection/index.js

@@ -22,7 +22,9 @@ const iconURI = "";
 // eslint-disable-next-line max-len
 const menuIconURI = "";
 
-const wsServerURL = `${window.location.protocol}//${window.location.hostname}:7000`;
+// const wsServerURL = `${window.location.protocol}//${window.location.hostname}:7000`;
+
+const wsServerURL = `ws://192.168.1.39:7000`;
 
 /**
  * RGB color constants for confidence visualization
@@ -42,7 +44,8 @@ class ArduinoObjectDetection {
 
     this._penSkinId = null;
 
-    this._isfaceDetected = false;
+    /** @type {Object<string, boolean>} */
+    this._detectionStates = this._initializeDetectionStates();
 
     /** @type {number|null} */
     this._loopIntervalId = null;
@@ -93,11 +96,7 @@ class ArduinoObjectDetection {
         );
       });
 
-      // Update person detection for backward compatibility
-      const personDetected = this.detectedObjects.some(detectionObject =>
-        detectionObject.label === MODEL_LABELS.PERSON
-      );
-      this._isfaceDetected = personDetected;
+      this._updateDetectionStates();
 
       if (this._enableBoundingBoxes) {
         this._drawBoundingBoxes();
@@ -143,11 +142,17 @@ ArduinoObjectDetection.prototype.getInfo = function() {
         arguments: {},
       },
       {
-        opcode: "isPersonDetected",
+        opcode: "isObjectDetected",
         blockType: BlockType.BOOLEAN,
-        text: "is person detected",
-        func: "isPersonDetected",
-        arguments: {},
+        text: "is [OBJECT] detected",
+        func: "isObjectDetected",
+        arguments: {
+          OBJECT: {
+            type: ArgumentType.STRING,
+            menu: "modelsLabels",
+            defaultValue: MODEL_LABELS.PERSON,
+          },
+        },
       },
       {
         opcode: "showBoundingBoxes",
@@ -163,6 +168,20 @@ ArduinoObjectDetection.prototype.getInfo = function() {
         func: "hideBoundingBoxes",
         arguments: {},
       },
+      {
+        opcode: "getDetectedObjectsCount",
+        blockType: BlockType.REPORTER,
+        text: "number of detected objects",
+        func: "getDetectedObjectsCount",
+        arguments: {},
+      },
+      {
+        opcode: "getDetectedLabelsAsString",
+        blockType: BlockType.REPORTER,
+        text: "detected object types",
+        func: "getDetectedLabelsAsString",
+        arguments: {},
+      },
     ],
     menus: {
       modelsLabels: Object.values(MODEL_LABELS).sort(),
@@ -208,19 +227,22 @@ ArduinoObjectDetection.prototype._loop = function() {
   }
   this._detectObjects();
 
-  // Note: The face detection state (_isfaceDetected) will be updated
+  // Note: The detection states for all objects will be updated
   // automatically when the detection_result event is received
 };
 
 ArduinoObjectDetection.prototype.whenObjectDetected = function(args) {
   const objectLabel = args.OBJECT;
-  return this.detectedObjects.some(detectionObject => 
+  return this.detectedObjects.some(detectionObject =>
     detectionObject.label === objectLabel
   );
 };
 
-ArduinoObjectDetection.prototype.isPersonDetected = function(args) {
-  return this._isfaceDetected;
+ArduinoObjectDetection.prototype.isObjectDetected = function(args) {
+  const objectLabel = args.OBJECT;
+  return this.detectedObjects.some(detectionObject =>
+    detectionObject.label === objectLabel
+  );
 };
 
 ArduinoObjectDetection.prototype.hideBoundingBoxes = function(args) {
@@ -335,4 +357,70 @@ ArduinoObjectDetection.prototype._createRectangleFromBoundingBox = function(x1,
   return rectangle;
 };
 
+/**
+ * Block function: Get the total number of detected objects
+ * @returns {number} Number of currently detected objects
+ */
+ArduinoObjectDetection.prototype.getDetectedObjectsCount = function() {
+  return this.detectedObjects.length;
+};
+
+/**
+ * Block function: Get detected object types as a comma-separated string
+ * @returns {string} Comma-separated list of detected object types
+ */
+ArduinoObjectDetection.prototype.getDetectedLabelsAsString = function() {
+  const detectedLabels = this.getDetectedLabels();
+  return detectedLabels.length > 0 ? detectedLabels.join(', ') : 'none';
+};
+
+/**
+ * Initialize detection states for all model labels
+ * @returns {Object<string, boolean>} Object with all labels set to false
+ */
+ArduinoObjectDetection.prototype._initializeDetectionStates = function() {
+  const states = {};
+  Object.values(MODEL_LABELS).forEach(label => {
+    states[label] = false;
+  });
+  return states;
+};
+
+/**
+ * Update detection states based on currently detected objects
+ */
+ArduinoObjectDetection.prototype._updateDetectionStates = function() {
+  // Reset all states to false
+  Object.keys(this._detectionStates).forEach(label => {
+    this._detectionStates[label] = false;
+  });
+
+  // Set to true for currently detected objects
+  this.detectedObjects.forEach(detectionObject => {
+    this._detectionStates[detectionObject.label] = true;
+  });
+
+  // Log detection updates for debugging
+  const detectedLabels = Object.keys(this._detectionStates).filter(label => this._detectionStates[label]);
+  if (detectedLabels.length > 0) {
+    console.log(`Currently detected: ${detectedLabels.join(', ')}`);
+  }
+};
+
+/**
+ * Get all currently detected object labels
+ * @returns {Array<string>} Array of currently detected object labels
+ */
+ArduinoObjectDetection.prototype.getDetectedLabels = function() {
+  return Object.keys(this._detectionStates).filter(label => this._detectionStates[label]);
+};
+
+/**
+ * Get detection states for all labels
+ * @returns {Object<string, boolean>} Object mapping labels to detection state
+ */
+ArduinoObjectDetection.prototype.getAllDetectionStates = function() {
+  return { ...this._detectionStates }; // Return a copy to prevent external modification
+};
+
 module.exports = ArduinoObjectDetection;