@moneypot/hub 1.20.5 → 1.21.0

package/dist/src/take-request/process-take-request.js

@@ -215,8 +215,8 @@ export async function processSingleTakeRequest({ mpTakeRequestId, mpTakeRequest,
         const existingRequest = await pgClient
             .query({
             text: `
-        SELECT id, mp_take_request_id, status, reserved_amount, user_id, experience_id, currency_key 
-        FROM hub.take_request 
+        SELECT id, mp_take_request_id, status, reserved_amount, user_id, experience_id, currency_key, mp_transfer_id
+        FROM hub.take_request
         WHERE mp_take_request_id = $1 AND casino_id = $2
         FOR UPDATE
       `,
@@ -332,6 +332,10 @@ async function processExistingTakeRequest({ pgClient, takeRequest, casinoId, gra
             logger.info(`[processExistingTakeRequest] Take request ${takeRequest.id} in PENDING state`);
             break;
         case LocalTakeRequestStatus.PROCESSING: {
+            if (takeRequest.mp_transfer_id) {
+                logger.info(`[processExistingTakeRequest] Take request ${takeRequest.id} already has transfer ${takeRequest.mp_transfer_id}`);
+                break;
+            }
             const { dbUser, dbExperience, dbCurrency } = await loadRequiredEntities(pgClient, {
                 type: "localId",
                 userId: takeRequest.user_id,
@@ -439,7 +443,6 @@ async function attemptTransfer({ pgClient, takeRequestId, mpTakeRequestId, mpExp
     catch (error) {
         logger.error(error, `[attemptTransfer] Error creating transfer`);
         const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        const shouldRetry = error instanceof Error && isNetworkError(error);
         await pgClient.query({
             text: `
         UPDATE hub.take_request
@@ -450,41 +453,12 @@ async function attemptTransfer({ pgClient, takeRequestId, mpTakeRequestId, mpExp
       `,
             values: [takeRequestId, errorMessage.slice(0, 200)],
         });
-        if (!shouldRetry) {
-            logger.info({ takeRequestId }, `[attemptTransfer] Non-retryable error, marking as FAILED and refunding`);
-            await pgClient.query({
-                text: `
-          UPDATE hub.take_request
-          SET status = $1,
-              debug = COALESCE(debug, '') || ' | Non-retryable error, refunding'
-          WHERE id = $2
-        `,
-                values: [LocalTakeRequestStatus.FAILED, takeRequestId],
-            });
-            await refundTakeRequest(pgClient, takeRequestId);
-            return null;
-        }
-        const TRANSFER_RETRY_TIMEOUT_SECONDS = 30;
-        const takeRequestAfterAttempt = await pgClient
-            .query({
-            text: `SELECT transfer_first_failure_at FROM hub.take_request WHERE id = $1`,
-            values: [takeRequestId],
-        })
-            .then(exactlyOneRow);
-        const elapsedMs = Date.now() - takeRequestAfterAttempt.transfer_first_failure_at.getTime();
-        if (elapsedMs >= TRANSFER_RETRY_TIMEOUT_SECONDS * 1000) {
-            logger.error({ takeRequestId, elapsedMs }, `[attemptTransfer] Retry timeout (${TRANSFER_RETRY_TIMEOUT_SECONDS}s) reached, marking as FAILED and refunding`);
-            await pgClient.query({
-                text: `
-          UPDATE hub.take_request
-          SET status = $1,
-              debug = COALESCE(debug, '') || ' | Transfer retry timeout reached, refunding'
-          WHERE id = $2
-        `,
-                values: [LocalTakeRequestStatus.FAILED, takeRequestId],
-            });
-            await refundTakeRequest(pgClient, takeRequestId);
-        }
+        await settleTakeRequestAfterFailedTransfer({
+            pgClient,
+            graphqlClient,
+            takeRequestId,
+            mpTakeRequestId,
+        });
         return null;
     }
 }
@@ -633,6 +607,10 @@ export async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTrans
                             .then(exactlyOneRow);
                         if (takeRequestData.refunded_at) {
                             logger.warn({ mpTransferId, takeRequestId }, `[completeTransfer] Transfer was already refunded. This should never happen.`);
+                            await pgClient.query({
+                                text: `UPDATE hub.take_request SET transfer_needs_completion = FALSE WHERE id = $1`,
+                                values: [takeRequestId],
+                            });
                             break;
                         }
                         const dbLockedBalance = await pgClient
@@ -1094,11 +1072,76 @@ async function refundTakeRequest(pgClient, takeRequestId) {
     logger.info({ takeRequestId, amount: takeRequestData.reserved_amount }, `[refundTakeRequest] Successfully refunded`);
     return true;
 }
+const NETWORK_ERROR_MARKERS = [
+    "ECONNREFUSED",
+    "ECONNRESET",
+    "ETIMEDOUT",
+    "EHOSTUNREACH",
+    "ENETUNREACH",
+    "socket hang up",
+];
 function isNetworkError(e) {
-    return (e.message?.includes("ECONNREFUSED") ||
-        e.message?.includes("ECONNRESET") ||
-        e.message?.includes("ETIMEDOUT") ||
-        e.message?.includes("EHOSTUNREACH") ||
-        e.message?.includes("ENETUNREACH") ||
-        e.message?.includes("socket hang up"));
+    for (let cur = e, depth = 0; cur && depth < 5; depth++) {
+        const err = cur;
+        const text = `${String(err.code ?? "")} ${String(err.message ?? "")}`;
+        if (NETWORK_ERROR_MARKERS.some((marker) => text.includes(marker))) {
+            return true;
+        }
+        cur = err.cause;
+    }
+    return false;
+}
+async function settleTakeRequestAfterFailedTransfer({ pgClient, graphqlClient, takeRequestId, mpTakeRequestId, }) {
+    let mpTakeRequest = null;
+    try {
+        const rejectResult = await graphqlClient.request(MP_REJECT_TAKE_REQUEST, {
+            mpTakeRequestId,
+        });
+        if (rejectResult.rejectTakeRequest.result.__typename !==
+            "RejectTakeRequestSuccess") {
+            mpTakeRequest = await mpGetTakeRequest(graphqlClient, mpTakeRequestId);
+            if (!mpTakeRequest) {
+                throw new Error(`Take request ${mpTakeRequestId} not found on casino`);
+            }
+        }
+    }
+    catch (e) {
+        logger.error({ err: e, takeRequestId, networkError: isNetworkError(e) }, `[settleTakeRequestAfterFailedTransfer] Transfer outcome unknown, keeping the reservation and retrying`);
+        return;
+    }
+    if (mpTakeRequest?.experienceTransfer) {
+        logger.info({ takeRequestId, mpTransferId: mpTakeRequest.experienceTransfer.id }, `[settleTakeRequestAfterFailedTransfer] Casino already made the transfer`);
+        await pgClient.query({
+            text: `
+        UPDATE hub.take_request
+        SET mp_transfer_id = $1,
+            mp_transfer_status = $2,
+            transfer_needs_completion = TRUE,
+            mp_status = $3
+        WHERE id = $4
+      `,
+            values: [
+                mpTakeRequest.experienceTransfer.id,
+                MpTransferStatus.Pending,
+                mpTakeRequest.status,
+                takeRequestId,
+            ],
+        });
+        return;
+    }
+    const [status, mpStatus] = mpTakeRequest
+        ? [LocalTakeRequestStatus.FAILED, mpTakeRequest.status]
+        : [LocalTakeRequestStatus.REJECTED, MpTakeRequestStatus.ControllerRejected];
+    logger.info({ takeRequestId, mpStatus }, `[settleTakeRequestAfterFailedTransfer] Casino confirmed no transfer, refunding`);
+    await pgClient.query({
+        text: `
+      UPDATE hub.take_request
+      SET status = $1,
+          mp_status = $2,
+          debug = COALESCE(debug, '') || ' | Casino confirmed no transfer, refunding'
+      WHERE id = $3
+    `,
+        values: [status, mpStatus, takeRequestId],
+    });
+    await refundTakeRequest(pgClient, takeRequestId);
 }

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.20.5",
+  "version": "1.21.0",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [
     "moneypot"
   ],
   "description": "Official MoneyPot hub server",
-  "packageManager": "pnpm@10.25.0",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -35,24 +34,6 @@
     "add-casino": "./dist/cli/add-casino.js",
     "db-migrate": "./dist/cli/db-migrate.js"
   },
-  "scripts": {
-    "build:hub": "rm -rf dist/src && tsc && cp -R src/pg-versions dist/src/ && ./scripts/strip-sql.sh",
-    "build": "pnpm run build:hub && rm -rf dist/dashboard && pnpm run build-dashboard",
-    "check": "tsc --noEmit && pnpm run check-dashboard",
-    "check-tests": "tsc -p tests/tsconfig.json --noEmit",
-    "check-dashboard": "cd ./dashboard && pnpm run check",
-    "format": "prettier --write \"**/*.ts\"",
-    "lint": "eslint --fix . && pnpm run lint-dashboard",
-    "lint-dashboard": "cd ./dashboard && pnpm run lint",
-    "prepublishOnly": "pnpm run build",
-    "codegen": "npx graphql-codegen",
-    "codegen-watch": "graphql-codegen --watch",
-    "build-dashboard": "cd ./dashboard && pnpm run build && rm -rf ../dist/dashboard && cp -Rv dist ../dist/dashboard",
-    "test:startup": "dropdb --if-exists hub-test && createdb hub-test && SUPERUSER_DATABASE_URL=postgres://localhost:5432/hub-test DATABASE_URL=postgres://localhost:5432/hub-test tsx src/test-startup.ts",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:bail": "pnpm test -- --bail --silent --reporter=basic 2>&1 | head -25"
-  },
   "dependencies": {
     "@graphile-contrib/pg-omit-archived": "4.0.0-rc.1",
     "@moneypot/hash-herald": "^1.0.0",
@@ -81,6 +62,7 @@
     "@types/supertest": "^6.0.3",
     "eslint": "^9.39.2",
     "globals": "^17.0.0",
+    "husky": "^9.1.7",
     "pino-pretty": "^13.1.3",
     "prettier": "^3.7.4",
     "supertest": "^7.2.2",
@@ -92,5 +74,22 @@
   "peerDependencies": {
     "graphile-config": "^1.0.0-rc.2"
   },
-  "license": "UNLICENSED"
-}
+  "license": "UNLICENSED",
+  "scripts": {
+    "build:hub": "rm -rf dist/src && tsc && cp -R src/pg-versions dist/src/ && ./scripts/strip-sql.sh",
+    "build": "pnpm run build:hub && rm -rf dist/dashboard && pnpm run build-dashboard",
+    "check": "tsc --noEmit && pnpm run check-dashboard",
+    "check-tests": "tsc -p tests/tsconfig.json --noEmit",
+    "check-dashboard": "cd ./dashboard && pnpm run check",
+    "format": "prettier --write \"**/*.ts\"",
+    "lint": "eslint --fix . && pnpm run lint-dashboard",
+    "lint-dashboard": "cd ./dashboard && pnpm run lint",
+    "codegen": "npx graphql-codegen",
+    "codegen-watch": "graphql-codegen --watch",
+    "build-dashboard": "cd ./dashboard && pnpm run build && rm -rf ../dist/dashboard && cp -Rv dist ../dist/dashboard",
+    "test:startup": "dropdb --if-exists hub-test && createdb hub-test && SUPERUSER_DATABASE_URL=postgres://localhost:5432/hub-test DATABASE_URL=postgres://localhost:5432/hub-test tsx src/test-startup.ts",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:bail": "pnpm test -- --bail --silent --reporter=basic 2>&1 | head -25"
+  }
+}