mqtt

Author: algertc

app/api/plate-reads/route.js

@@ -274,7 +274,6 @@ export async function POST(req) {
             plateData.plate_number,
             {
               ...plateData,
-              imageData: data.Image,
               camera_name: camera,
               timestamp: timestamp,
             }

components/chat/ChatButton.jsx

@@ -32,9 +32,9 @@ export function ChatButton() {
         <TooltipContent side="right" className="border-0 bg-muted">
           <div className="text-center">
             <p>AI Assistant (Coming Soon!)</p>
-            <p className="text-xs text-muted-foreground mt-1">
+            {/* <p className="text-xs text-muted-foreground mt-1">
               Press ⌘K or Ctrl+K
-            </p>
+            </p> */}
           </div>
         </TooltipContent>
       </Tooltip>

lib/mqtt-client.js

@@ -101,69 +101,45 @@ async function buildMqttPayload(
   plateData = null,
   isTest = false
 ) {
-  const timestamp = new Date().toISOString();
+  if (isTest) {
+    return "This is a test MQTT notification";
+  }
 
-  let message = {
-    timestamp,
-    plate_number: plateNumber,
-    notification_name: notificationConfig.name,
-    broker_name: brokerInfo.name,
-  };
+  // Get camera name and timestamp from plateData
+  const cameraName =
+    plateData?.camera_name || plateData?.camera || "Unknown Camera";
+  const detectionTime = plateData?.timestamp
+    ? new Date(plateData.timestamp).toLocaleString()
+    : new Date().toLocaleString();
 
-  // Add test flag if this is a test notification
-  if (isTest) {
-    message.test = true;
-    message.message = "This is a test MQTT notification";
-  } else {
-    // Add custom message if provided
-    if (notificationConfig.message) {
-      message.message = notificationConfig.message;
-    }
+  let plateDisplayName = plateNumber;
+  let tagsText = "";
 
-    // Add plate recognition data if available
-    if (plateData) {
-      message.recognition_data = {
-        confidence: plateData.confidence,
-        camera_name: plateData.camera_name,
-        timestamp: plateData.timestamp,
-        ...(plateData.crop_coordinates && {
-          crop_coordinates: plateData.crop_coordinates,
-        }),
-        ...(plateData.ocr_annotation && {
-          ocr_annotation: plateData.ocr_annotation,
-        }),
-      };
+  // Fetch known plate info and tags
+  try {
+    const knownPlates = await getKnownPlates();
+    const knownPlate = knownPlates.find(
+      (kp) => kp.plate_number === plateNumber
+    );
 
-      // Add image data if available (base64 encoded)
-      if (plateData.imageData) {
-        message.image = {
-          type: "base64",
-          data: plateData.imageData.replace(/^data:image\/[a-z]+;base64,/, ""),
-          format: "jpeg",
-        };
-      }
+    if (knownPlate && knownPlate.name) {
+      plateDisplayName = knownPlate.name;
     }
+
+    if (knownPlate && knownPlate.tags && knownPlate.tags.length > 0) {
+      const tagNames = knownPlate.tags.map((tag) => tag.name || tag).join(", ");
+      tagsText = `. Tags: ${tagNames}`;
+    }
+  } catch (error) {
+    console.error("Error fetching known plate info for MQTT:", error);
   }
 
-  // Add known plate information if requested
-  if (notificationConfig.includeknownplateinfo && !isTest) {
-    try {
-      const knownPlates = await getKnownPlates();
-      const knownPlate = knownPlates.find(
-        (kp) => kp.plate_number === plateNumber
-      );
+  // Create simple text message
+  let message = `${plateDisplayName} detected on ${cameraName} at ${detectionTime}${tagsText}`;
 
-      if (knownPlate) {
-        message.known_plate_info = {
-          name: knownPlate.name,
-          notes: knownPlate.notes,
-          tags: knownPlate.tags || [],
-          flagged: knownPlate.flagged,
-        };
-      }
-    } catch (error) {
-      console.error("Error fetching known plate info for MQTT:", error);
-    }
+  // Add custom message if provided
+  if (notificationConfig.message && notificationConfig.message.trim()) {
+    message += `. ${notificationConfig.message.trim()}`;
   }
 
   return message;
@@ -224,18 +200,13 @@ export async function sendMqttNotification(
 
     // Publish message
     await new Promise((resolve, reject) => {
-      client.publish(
-        brokerInfo.topic,
-        JSON.stringify(payload, null, 2),
-        { qos: 1 },
-        (error) => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve();
-          }
+      client.publish(brokerInfo.topic, payload, { qos: 1 }, (error) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve();
         }
-      );
+      });
     });
 
     console.log(