diff --git a/server/controllers/session/handleGetDataObject.ts b/server/controllers/session/handleGetDataObject.ts index a8c9d89..0a99667 100644 --- a/server/controllers/session/handleGetDataObject.ts +++ b/server/controllers/session/handleGetDataObject.ts @@ -4,7 +4,9 @@ import { Request, Response } from "express"; export default async function handleGetDataObject(req: Request, res: Response) { try { const credentials = getCredentials(req.query); + const keyAsset = await getDroppedAsset(credentials); + if (!keyAsset.dataObject.landmarkZoneId) throw "No landmark zone ID found in data object"; if (keyAsset.error) { return res.status(404).json({ message: "Asset not found" }); @@ -17,9 +19,7 @@ export default async function handleGetDataObject(req: Request, res: Response) { keyAsset.dataObject.participants = visitorProfileIds; - if (keyAsset) { - return res.status(200).json(keyAsset.dataObject); - } + if (keyAsset) return res.status(200).json(keyAsset.dataObject); } catch (error: any) { return errorHandler({ error, diff --git a/server/controllers/session/handleSetBreakoutConfig.ts b/server/controllers/session/handleSetBreakoutConfig.ts index f3662f6..4956a04 100644 --- a/server/controllers/session/handleSetBreakoutConfig.ts +++ b/server/controllers/session/handleSetBreakoutConfig.ts @@ -235,8 +235,13 @@ export default async function handleSetBreakoutConfig(req: Request, res: Respons duration: 5, position: keyAsset.position, }) - .then() - .catch(() => console.error("Error: Cannot trigger particle")); + .catch((error) => + errorHandler({ + error, + functionName: "handleSetBreakoutConfig", + message: "Error triggering particle effects", + }), + ); placeVisitors(matches, visitorsObj, participants, keyAsset.id!, breakouts, privateZones); }, countdown * 1000); @@ -341,6 +346,13 @@ export default async function handleSetBreakoutConfig(req: Request, res: Respons const timeout = setTimeout(() => { const world = World.create(urlSlug, { credentials }); + world.triggerActivity({ type: WorldActivityType.GAME_ON, assetId }).catch((error) => + errorHandler({ + error, + functionName: "handleSetBreakoutConfig", + message: "Error triggering world activity", + }), + ); world .triggerParticle({ @@ -348,10 +360,13 @@ export default async function handleSetBreakoutConfig(req: Request, res: Respons duration: 5, position: keyAsset.position, }) - .then() - .catch(() => console.error("Error: Cannot trigger particle")); - - world.triggerActivity({ type: WorldActivityType.GAME_ON, assetId }); + .catch((error) => + errorHandler({ + error, + functionName: "handleSetBreakoutConfig", + message: "Error triggering world activity", + }), + ); placeVisitors(matches, visitorsObj, participants, keyAsset.id!, breakouts, privateZonesAtStart); }, countdown * 1000);