Merge pull request #268 from DestinyItemManager/loadout-share

Author: bhollis

api/routes/import.ts

@@ -89,15 +89,12 @@ export async function statelyImport(
   triumphs: ExportResponse['triumphs'],
   searches: ExportResponse['searches'],
   itemHashTags: ItemHashTag[],
-  deleteExisting = true,
 ): Promise<number> {
   // TODO: what we should do, is map all these to items, and then we can just do
   // batch puts, 25 at a time.
 
   let numTriumphs = 0;
-  if (deleteExisting) {
-    await deleteAllDataForUser(bungieMembershipId, platformMembershipIds);
-  }
+  await deleteAllDataForUser(bungieMembershipId, platformMembershipIds);
 
   const settingsItem = convertToStatelyItem(
     { ...defaultSettings, ...settings },

api/routes/update.ts

@@ -167,13 +167,14 @@ function validateUpdates(
         };
     }
     if (result.status !== 'Success') {
+      const dimVersion = req.headers['x-dim-version']?.[0];
       captureMessage(`update ${update.action} failed validation: ${result.message}`, {
         extra: {
           update,
           result,
           platformMembershipId,
           appId,
-          dimVersion: req.headers['x-dim-version']?.[0],
+          dimVersion: `v${dimVersion?.replaceAll('.', '_') ?? 'Unknown'}`,
         },
       });
       console.log('Stately failed update', update.action, result, appId);

api/server.ts

@@ -162,7 +162,7 @@ const errorHandler: ErrorRequestHandler = (err, req, res, _next) => {
     tags: {
       dimApp: dimApp?.id,
       user: user?.bungieMembershipId,
-      dimVersion: `v${dimVersion ?? 'Unknown'}`,
+      dimVersion: `v${dimVersion?.replaceAll('.', '_') ?? 'Unknown'}`,
     },
   });
   // Allow any origin to see the response

api/stately/loadout-share-queries.ts

@@ -1,5 +1,6 @@
 import { keyPath, StatelyError, WithPutOptions } from '@stately-cloud/client';
 import { Loadout } from '../shapes/loadouts.js';
+import { delay } from '../utils.js';
 import { client } from './client.js';
 import { LoadoutShare as StatelyLoadoutShare } from './generated/index.js';
 import {
@@ -82,18 +83,30 @@ export async function addLoadoutSharesForMigration(
  * Touch the last_accessed_at and visits fields to keep track of access.
  */
 export async function recordAccess(shareId: string): Promise<void> {
-  // Hmm this is probably pretty expensive. Should I store the view count in a
-  // separate item? It'd also be nice to have an Update API.
-  await client.transaction(async (txn) => {
-    const loadoutShare = await txn.get('LoadoutShare', keyFor(shareId));
-    if (!loadoutShare) {
-      throw new Error("somehow this loadout share doesn't exist");
-    }
+  for (let attempts = 0; attempts < 3; attempts++) {
+    try {
+      // Hmm this is probably pretty expensive. Should I store the view count in a
+      // separate item? It'd also be nice to have an Update API.
+      await client.transaction(async (txn) => {
+        const loadoutShare = await txn.get('LoadoutShare', keyFor(shareId));
+        if (!loadoutShare) {
+          throw new Error("somehow this loadout share doesn't exist");
+        }
 
-    loadoutShare.viewCount++;
+        loadoutShare.viewCount++;
 
-    await txn.put(loadoutShare);
-  });
+        await txn.put(loadoutShare);
+      });
+      return;
+    } catch (e) {
+      if (e instanceof StatelyError && e.statelyCode === 'ConcurrentModification') {
+        // try again after a delay
+        await delay(100 * Math.random() + 100);
+      } else {
+        throw e;
+      }
+    }
+  }
 }
 
 export async function getLoadoutShareByShareId(shareId: string): Promise<Loadout | undefined> {