Refactor socket initialization to include organization and enhance asset event handling; remove unused console logs and improve asset data structure

app/src/modules/builder/geomentries/assets/addAssetModel.ts

@@ -9,6 +9,8 @@ import { retrieveGLTF, storeGLTF } from '../../../../utils/indexDB/idbUtils';
 // import { setFloorItemApi } from '../../../../services/factoryBuilder/assest/floorAsset/setFloorItemApi';
 import { Socket } from 'socket.io-client';
 import * as CONSTANTS from '../../../../types/world/worldConstants';
+import { getAssetEventType } from '../../../../services/simulation/getAssetEventType';
+import { setFloorItemApi } from '../../../../services/factoryBuilder/assest/floorAsset/setFloorItemApi';
 
 async function addAssetModel(
     raycaster: THREE.Raycaster,
@@ -58,6 +60,7 @@ async function addAssetModel(
             if (intersectPoint.y < 0) {
                 intersectPoint = new THREE.Vector3(intersectPoint.x, 0, intersectPoint.z);
             }
+            console.log('selectedItem: ', selectedItem);
             const cachedModel = THREE.Cache.get(selectedItem.id);
             if (cachedModel) {
                 // console.log(`[Cache] Fetching ${selectedItem.name}`);
@@ -136,51 +139,88 @@ async function handleModelLoad(
         modelname: selectedItem.name,
         modelfileID: selectedItem.id,
         position: [intersectPoint!.x, intersectPoint!.y, intersectPoint!.z],
-        rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z, },
+        rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z },
         isLocked: false,
         isVisible: true
     };
 
-    setFloorItems((prevItems) => {
-        const updatedItems = [...(prevItems || []), newFloorItem];
-        localStorage.setItem("FloorItems", JSON.stringify(updatedItems));
-        return updatedItems;
-    });
-
     const email = localStorage.getItem("email");
     const organization = email ? email.split("@")[1].split(".")[0] : "default";
 
-    //REST
+    getAssetEventType(selectedItem.id, organization).then(async (res) => {
+        console.log('res: ', res);
 
-    // await setFloorItemApi(
-    //     organization,
-    //     newFloorItem.modeluuid,
-    //     newFloorItem.modelname,
-    //     newFloorItem.position,
-    //     { "x": model.rotation.x, "y": model.rotation.y, "z": model.rotation.z },
-    //     newFloorItem.modelfileID!,
-    //     false,
-    //     true,
-    // );
+        if (res.type === "Conveyor") {
+            const pointUUIDs = res.points.map(() => THREE.MathUtils.generateUUID());
 
-    //SOCKET
+            const eventData: Extract<Types.FloorItemType['eventData'], { type: 'Conveyor' }> = {
+                type: 'Conveyor',
+                points: res.points.map((point: any, index: number) => ({
+                    uuid: pointUUIDs[index],
+                    position: point.position as [number, number, number],
+                    rotation: point.rotation as [number, number, number],
+                    actions: [{
+                        uuid: THREE.MathUtils.generateUUID(),
+                        name: 'Action 1',
+                        type: 'Inherit',
+                        material: 'Inherit',
+                        delay: 'Inherit',
+                        spawnInterval: 'Inherit',
+                        isUsed: false
+                    }],
+                    triggers: [],
+                    connections: {
+                        source: { pathUUID: model.uuid, pointUUID: pointUUIDs[index] },
+                        targets: []
+                    }
+                })),
+                speed: 'Inherit'
+            };
 
-    const data = {
-        organization,
-        modeluuid: newFloorItem.modeluuid,
-        modelname: newFloorItem.modelname,
-        modelfileID: newFloorItem.modelfileID,
-        position: newFloorItem.position,
-        rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z },
-        isLocked: false,
-        isVisible: true,
-        socketId: socket.id,
-    };
+            console.log('eventData: ', eventData);
+            newFloorItem.eventData = eventData;
+        }
 
-    socket.emit("v1:FloorItems:set", data);
+        setFloorItems((prevItems) => {
+            const updatedItems = [...(prevItems || []), newFloorItem];
+            localStorage.setItem("FloorItems", JSON.stringify(updatedItems));
+            return updatedItems;
+        });
 
-    gsap.to(model.position, { y: newFloorItem.position[1], duration: 1.5, ease: "power2.out" });
-    gsap.to(model.scale, { x: 1, y: 1, z: 1, duration: 1.5, ease: "power2.out", onComplete: () => { toast.success("Model Added!"); } });
+        // API
+
+        // await setFloorItemApi(
+        //     organization,
+        //     newFloorItem.modeluuid,
+        //     newFloorItem.modelname,
+        //     newFloorItem.modelfileID,
+        //     newFloorItem.position,
+        //     { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z },
+        //     false,
+        //     true,
+        //     newFloorItem.eventData
+        // );
+
+        // SOCKET
+
+        const data = {
+            organization,
+            modeluuid: newFloorItem.modeluuid,
+            modelname: newFloorItem.modelname,
+            modelfileID: newFloorItem.modelfileID,
+            position: newFloorItem.position,
+            rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z },
+            isLocked: false,
+            isVisible: true,
+            eventData: newFloorItem.eventData,
+            socketId: socket.id
+        };
+
+        socket.emit("v2:model-asset:add", data);
+
+        gsap.to(model.position, { y: newFloorItem.position[1], duration: 1.5, ease: "power2.out" });
+        gsap.to(model.scale, { x: 1, y: 1, z: 1, duration: 1.5, ease: "power2.out", onComplete: () => { toast.success("Model Added!"); } });
+    });
 }
 
 export default addAssetModel;

app/src/modules/builder/groups/floorItemsGroup.tsx

@@ -60,6 +60,7 @@ const FloorItemsGroup = ({ itemsGroup, hoveredDeletableFloorItem, AttachedObject
         };
 
         getFloorItems(organization).then((data) => {
+            console.log('data: ', data);
             const uniqueItems = (data as Types.FloorItems).filter((item, index, self) =>
                 index === self.findIndex((t) => t.modelfileID === item.modelfileID)
             );
@@ -305,7 +306,10 @@ const FloorItemsGroup = ({ itemsGroup, hoveredDeletableFloorItem, AttachedObject
         };
     }, [deleteModels, transformMode, controls, selectedItem, state.camera, state.pointer, activeTool, activeModule]);
 
+    useEffect(() => {
 
+        console.log('floorItems: ', floorItems);
+    }, [floorItems])
 
     useFrame(() => {
         if (controls)

app/src/modules/collaboration/socketResponses.dev.tsx

@@ -81,7 +81,8 @@ export default function SocketResponses({
             // console.log('data: ', data);
         })
 
-        socket.on('FloorItemsUpdateResponse', async (data: any) => {
+        socket.on('model-asset:response:updates', async (data: any) => {
+            console.log('data: ', data);
             if (socket.id === data.socketId) {
                 return
             }

app/src/modules/scene/world/world.tsx

@@ -358,7 +358,7 @@ export default function World() {
         anglesnappedPoint={anglesnappedPoint}
       />
 
-      <DrieHtmlTemp itemsGroup={itemsGroup} />
+      {/* <DrieHtmlTemp itemsGroup={itemsGroup} /> */}
 
       <Agv lines={lines} plane={plane} />
     </>

app/src/modules/simulation/behaviour/behaviour.tsx

@@ -2,22 +2,16 @@ import { useFloorItems, useSimulationPaths } from '../../../store/store';
 import * as THREE from 'three';
 import * as Types from '../../../types/world/worldTypes';
 import { useEffect } from 'react';
-import { getAssetEventType } from '../../../services/simulation/getAssetEventType';
 
 function Behaviour() {
     const { setSimulationPaths } = useSimulationPaths();
     const { floorItems } = useFloorItems();
 
     useEffect(() => {
-        const email = localStorage.getItem('email')
-        const organization = (email!.split("@")[1]).split(".")[0];
         const newPaths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema)[] = [];
 
         floorItems.forEach((item: Types.FloorItemType) => {
             if (item.modelfileID === "672a090f80d91ac979f4d0bd") {
-                // getAssetEventType(item.modelfileID, organization).then((res) => {
-                //     console.log('res: ', res);
-                // });
                 const point1Position = new THREE.Vector3(0, 0.85, 2.2);
                 const middlePointPosition = new THREE.Vector3(0, 0.85, 0);
                 const point2Position = new THREE.Vector3(0, 0.85, -2.2);