Increase lock time

.github/workflows/aws_dev_release.yml

@@ -62,8 +62,6 @@ jobs:
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
-        with:
-          mask-password: 'false'
 
       - name: Image Metadata
         id: metadata

.github/workflows/aws_prod_release.yml

@@ -66,8 +66,6 @@ jobs:
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
-        with:
-          mask-password: 'false'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

package.json

@@ -7,7 +7,7 @@
   "main": "src/index.ts",
   "dependencies": {
     "@googleapis/sheets": "^7.0.0",
-    "@rtsdk/topia": "^0.15.8",
+    "@rtsdk/topia": "^0.15.9",
     "@types/cors": "^2.8.13",
     "axios": "^1.5.0",
     "body-parser": "^1.20.2",

src/controllers/handleDropPiece.ts

@@ -16,7 +16,7 @@ import { DroppedAssetInterface } from "@rtsdk/topia";
 
 export const handleDropPiece = async (req: Request, res: Response) => {
   try {
-    const credentials = getCredentials(req.body);
+    const credentials = req.credentials;
     const { displayName, identityId, sceneDropId, urlSlug, visitorId } = credentials;
     const { username } = req.body;
 
@@ -67,8 +67,7 @@ export const handleDropPiece = async (req: Request, res: Response) => {
 
     try {
       try {
-        const timestamp = new Date(Math.round(new Date().getTime() / 5000) * 5000);
-        await lockDataObject(`${keyAssetId}-${resetCount}-${turnCount}-${timestamp}`, keyAsset);
+        await lockDataObject(`${keyAssetId}-${resetCount}-${turnCount}`, keyAsset);
       } catch (error) {
         return res.status(409).json({ message: "Move already in progress." });
       }
@@ -93,9 +92,12 @@ export const handleDropPiece = async (req: Request, res: Response) => {
       }
 
       const world = World.create(urlSlug, { credentials });
-      const droppedAssets: DroppedAssetInterface[] = await world.fetchDroppedAssetsBySceneDropId({ sceneDropId });
-      const gameText = droppedAssets.find((droppedAsset) => droppedAsset.uniqueName === "gameText");
+      const droppedAssets: DroppedAssetInterface[] = await world.fetchDroppedAssetsBySceneDropId({
+        sceneDropId,
+        uniqueName: "gameText",
+      });
 
+      const gameText = droppedAssets[0];
       if (!shouldUpdateGame) {
         if (gameText) gameText.updateCustomTextAsset({}, text);
         throw text;

src/controllers/handlePlayerSelection.ts

@@ -7,7 +7,7 @@ export const handlePlayerSelection = async (req: Request, res: Response) => {
   try {
     const playerId = req.params.player;
     const isPlayer2 = parseInt(playerId) === 2;
-    const credentials = getCredentials(req.body);
+    const credentials = req.credentials;
     const { profileId, sceneDropId, urlSlug, visitorId } = credentials;
     const { username } = req.body;
 

src/utils/droppedAssets/getDroppedAssetDataObject.ts

@@ -1,6 +1,5 @@
 import { errorHandler, DroppedAsset, initializeDroppedAssetDataObject, World } from "../index.js";
 import { Credentials, WorldDataObjectType } from "../../types/index.js";
-import { DroppedAssetInterface } from "@rtsdk/topia";
 
 export const getDroppedAssetDataObject = async (credentials: Credentials, isKeyAsset: boolean) => {
   try {
@@ -18,8 +17,7 @@ export const getDroppedAssetDataObject = async (credentials: Credentials, isKeyA
         keyAssetId = dataObject[sceneDropId].keyAssetId;
       } else {
         // find key asset by sceneDropId and unique name
-        const droppedAssets: DroppedAssetInterface[] = await world.fetchDroppedAssetsBySceneDropId({ sceneDropId });
-        keyAsset = droppedAssets.find((droppedAsset) => droppedAsset.uniqueName === "reset");
+        keyAsset = await DroppedAsset.getWithUniqueName("reset", urlSlug, process.env.INTERACTIVE_SECRET!, credentials);
         if (!keyAsset) throw "No key asset with the unique name 'reset' found.";
         keyAssetId = keyAsset?.id;
       }

src/utils/lockDataObject.ts

@@ -1,3 +1,3 @@
 export const lockDataObject = async (lockId, recordToLock) => {
-  await recordToLock.updateDataObject({}, { lock: { lockId, releaseLock: false } });
+  return await recordToLock.updateDataObject({}, { lock: { lockId, releaseLock: false } });
 };