@moneypot/hub 1.9.0-dev.12 → 1.9.0-dev.14

package/dist/src/db/types.d.ts

@@ -112,6 +112,7 @@ export type DbTakeRequest = {
     mp_transfer_status: DbTransferStatusKind | null;
     transfer_needs_completion: boolean;
     transfer_completion_attempted_at: Date | null;
+    refunded_at: Date | null;
     updated_at: Date;
 };
 export type DbHashChain = {

package/dist/src/db/util.d.ts

@@ -1,5 +1,9 @@
 import { QueryResult, QueryResultRow } from "pg";
 import { PgClientResult } from "postgraphile/@dataplan/pg";
+import * as pg from "pg";
+export interface QueryExecutor {
+    query<T extends pg.QueryResultRow = any>(queryText: string, values?: any[]): Promise<pg.QueryResult<T>>;
+}
 type ResultType<T> = PgClientResult<T> | QueryResult<T extends QueryResultRow ? T : never>;
 export declare function maybeOneRow<T>(result: ResultType<T>): T | undefined;
 export declare function exactlyOneRow<T>(result: ResultType<T>): T;

package/dist/src/index.d.ts

@@ -26,7 +26,7 @@ export type ServerOptions = {
     exportSchemaSDLPath?: string;
     userDatabaseMigrationsPath?: string;
 };
-type ListenInfo = {
+export declare function startAndListen(options: ServerOptions): Promise<{
     port: number;
-};
-export declare function startAndListen(options: ServerOptions): Promise<ListenInfo>;
+    stop: () => Promise<void>;
+}>;

package/dist/src/index.js

@@ -46,9 +46,11 @@ async function initialize(options) {
         logger.info("Initialization aborted by graceful shutdown");
         return;
     }
-    initializeTransferProcessors({
-        signal: options.signal,
-    });
+    if (process.env.NODE_ENV !== "test") {
+        initializeTransferProcessors({
+            signal: options.signal,
+        });
+    }
 }
 export async function startAndListen(options) {
     if (options.plugins && options.plugins.some((p) => typeof p === "function")) {
@@ -75,7 +77,7 @@ export async function startAndListen(options) {
         extraPgSchemas: options.extraPgSchemas,
         abortSignal: abortController.signal,
     });
-    const gracefulShutdown = async () => {
+    const gracefulShutdown = async ({ exit = true } = {}) => {
         if (isShuttingDown) {
             logger.warn("Already shutting down.");
             return;
@@ -87,12 +89,13 @@ export async function startAndListen(options) {
         logger.info("Closing resources...");
         hubServer.shutdown();
         try {
+            const closeTasks = [db.notifier.close()];
+            if (process.env.NODE_ENV !== "test") {
+                closeTasks.push(db.postgraphilePool.end());
+                closeTasks.push(db.superuserPool.end());
+            }
             await Promise.race([
-                Promise.all([
-                    db.notifier.close(),
-                    db.postgraphilePool.end(),
-                    db.superuserPool.end(),
-                ]),
+                Promise.all(closeTasks),
                 new Promise((_, reject) => setTimeout(() => reject(new Error("Database cleanup timeout")), 3000)),
             ]);
             logger.info("Cleanup complete.");
@@ -100,13 +103,18 @@ export async function startAndListen(options) {
         catch (err) {
             logger.warn(err, "Cleanup error (proceeding anyway)");
         }
-        process.exit(0);
+        if (exit) {
+            process.exit(0);
+        }
     };
     process.on("SIGINT", gracefulShutdown);
     process.on("SIGTERM", gracefulShutdown);
     return hubServer.listen().then(() => {
         return {
             port: config.PORT,
+            stop: async () => {
+                await gracefulShutdown({ exit: false });
+            },
         };
     });
 }

package/dist/src/pg-versions/010-take-request-refunded-at.sql

@@ -0,0 +1 @@
+alter table hub.take_request add column refunded_at timestamptz

package/dist/src/process-transfers/websocket-processor.js

@@ -7,6 +7,7 @@ import { TRANSFER_FIELDS } from "./graphql.js";
 import { logger } from "../logger.js";
 import { processTransfer } from "./process-transfer.js";
 import assert from "assert";
+import { superuserPool } from "../db/index.js";
 import { mpGetTakeRequest, processSingleTakeRequest, } from "../take-request/process-take-request.js";
 function httpToWs(url) {
     if (url.protocol === "http:") {
@@ -107,6 +108,7 @@ export function startWebsocketProcessor({ casinoId, graphqlUrl, signal, controll
             mpTakeRequest,
             casinoId,
             graphqlClient,
+            pool: superuserPool,
         });
     });
     signal.addEventListener("abort", () => {

package/dist/src/risk-policy.d.ts

@@ -7,11 +7,10 @@ export type RiskPolicyArgs = {
     maxPotentialPayout: number;
     outcomes: DbOutcome[];
 };
-type AtLeastOneKey<T, Keys extends keyof T = keyof T> = Keys extends keyof T ? Required<Pick<T, Keys>> & Partial<Omit<T, Keys>> : never;
-export type RiskLimits = AtLeastOneKey<{
+export type RiskLimits = {
     maxWager?: number;
-    maxPayout?: number;
-}>;
+    maxPayout: number;
+};
 export type RiskPolicy = (args: RiskPolicyArgs) => RiskLimits;
 export declare function validateRisk(options: RiskPolicyArgs & {
     riskPolicy: RiskPolicy;
@@ -19,4 +18,3 @@ export declare function validateRisk(options: RiskPolicyArgs & {
     displayUnitName: string;
     displayUnitScale: number;
 }): Result<void, string>;
-export {};

package/dist/src/risk-policy.js

@@ -4,12 +4,9 @@ import { z } from "zod";
 const RiskLimitsSchema = z
     .object({
     maxWager: z.number().positive().optional(),
-    maxPayout: z.number().positive().optional(),
+    maxPayout: z.number().positive(),
 })
-    .strict()
-    .refine((v) => v.maxWager !== undefined || v.maxPayout !== undefined, {
-    message: "Provide at least one of maxWager or maxPayout.",
-});
+    .strict();
 export function validateRisk(options) {
     const { wager, bankroll, maxPotentialPayout, riskPolicy } = options;
     if (maxPotentialPayout > bankroll) {
@@ -48,7 +45,7 @@ export function validateRisk(options) {
             })})`,
         };
     }
-    if (limits.maxPayout !== undefined && maxPotentialPayout > limits.maxPayout) {
+    if (maxPotentialPayout > limits.maxPayout) {
         return {
             ok: false,
             error: `Payout (${formatCurrency(maxPotentialPayout, {

package/dist/src/server/graphile.config.js

@@ -56,6 +56,7 @@ export function createPreset({ plugins, exportSchemaSDLPath, extraPgSchemas, abo
         if (!exportSchemaSDLPath.endsWith(".graphql")) {
             throw new Error("exportSchemaSDLPath must end with .graphql");
         }
+        logger.info(`Will save generated graphql schema to ${exportSchemaSDLPath}`);
     }
     const mutablePlugins = [...plugins];
     for (const requiredPlugin of requiredPlugins) {
@@ -64,7 +65,6 @@ export function createPreset({ plugins, exportSchemaSDLPath, extraPgSchemas, abo
             mutablePlugins.unshift(requiredPlugin);
         }
     }
-    logger.info(`Will save generated graphql schema to ${exportSchemaSDLPath}`);
     const preset = {
         extends: [PostGraphileAmberPreset],
         disablePlugins: ["NodePlugin"],

package/dist/src/take-request/process-take-request.d.ts

@@ -1,5 +1,6 @@
 import { GraphQLClient } from "graphql-request";
 import { MpTakeRequestFieldsFragment } from "../__generated__/graphql.js";
+import * as pg from "pg";
 export declare const MP_TAKE_REQUEST_FIELDS: import("@graphql-typed-document-node/core").TypedDocumentNode<MpTakeRequestFieldsFragment, unknown>;
 export declare function mpGetTakeRequest(graphqlClient: GraphQLClient, id: string): Promise<MpTakeRequestFieldsFragment | null>;
 export declare function processTakeRequests({ abortSignal, controllerId, casinoId, graphqlClient, }: {
@@ -8,9 +9,18 @@ export declare function processTakeRequests({ abortSignal, controllerId, casinoI
     casinoId: string;
     graphqlClient: GraphQLClient;
 }): Promise<void>;
-export declare function processSingleTakeRequest({ mpTakeRequestId, mpTakeRequest, casinoId, graphqlClient, }: {
+export declare function processSingleTakeRequest({ mpTakeRequestId, mpTakeRequest, casinoId, graphqlClient, pool, }: {
     mpTakeRequestId: string;
     mpTakeRequest?: MpTakeRequestFieldsFragment;
     casinoId: string;
     graphqlClient: GraphQLClient;
+    pool: pg.Pool;
 }): Promise<string | null>;
+export declare function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId, graphqlClient, casinoId, pool, }: {
+    mpTakeRequestId: string;
+    takeRequestId: string;
+    mpTransferId: string;
+    graphqlClient: GraphQLClient;
+    casinoId: string;
+    pool: pg.Pool;
+}): Promise<void>;

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

@@ -180,6 +180,7 @@ export async function processTakeRequests({ abortSignal, controllerId, casinoId,
             mpTakeRequest: takeRequest,
             casinoId,
             graphqlClient,
+            pool: superuserPool,
         });
     }
     await processPendingTransferCompletions({
@@ -200,8 +201,8 @@ async function fetchPendingTakeRequests(graphqlClient, controllerId) {
         return useFragment(MP_TAKE_REQUEST_FIELDS, takeRequest);
     }) || []);
 }
-export async function processSingleTakeRequest({ mpTakeRequestId, mpTakeRequest, casinoId, graphqlClient, }) {
-    return withPgPoolTransaction(superuserPool, async (pgClient) => {
+export async function processSingleTakeRequest({ mpTakeRequestId, mpTakeRequest, casinoId, graphqlClient, pool, }) {
+    return withPgPoolTransaction(pool, async (pgClient) => {
         await PgAdvisoryLock.forMpTakeRequestProcessing(pgClient, {
             mpTakeRequestId,
             casinoId,
@@ -247,10 +248,7 @@ async function createAndProcessNewTakeRequest({ pgClient, mpTakeRequest, casinoI
         currencyKey: mpTakeRequest.currencyKey,
         casinoId,
     });
-    if (!dbUser || !dbExperience || !dbCurrency || !dbBalance) {
-        await rejectMpTakeRequest(pgClient, graphqlClient, mpTakeRequest.id);
-        return null;
-    }
+    assert(dbUser && dbExperience && dbCurrency && dbBalance, "Required entities not found");
     const amountToTransfer = Math.floor(typeof mpTakeRequest.amount === "number"
         ? Math.min(mpTakeRequest.amount, dbBalance.amount)
         : dbBalance.amount);
@@ -476,15 +474,29 @@ async function processPendingTransferCompletions({ casinoId, graphqlClient, abor
             mpTransferId: request.mp_transfer_id,
             graphqlClient,
             casinoId,
+            pool: superuserPool,
         });
     }
 }
-async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId, graphqlClient, casinoId, }) {
-    return withPgPoolTransaction(superuserPool, async (pgClient) => {
+export async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId, graphqlClient, casinoId, pool, }) {
+    return withPgPoolTransaction(pool, async (pgClient) => {
         await PgAdvisoryLock.forMpTakeRequestProcessing(pgClient, {
             mpTakeRequestId,
             casinoId,
         });
+        const dbTakeRequest = await pgClient
+            .query({
+            text: `
+        SELECT transfer_needs_completion
+        FROM hub.take_request
+        WHERE id = $1
+      `,
+            values: [takeRequestId],
+        })
+            .then(exactlyOneRow);
+        if (!dbTakeRequest.transfer_needs_completion) {
+            return;
+        }
         await pgClient.query({
             text: `
         UPDATE hub.take_request
@@ -553,26 +565,57 @@ async function completeTransfer({ mpTakeRequestId, takeRequestId, mpTransferId,
                         if (!mpStatus) {
                             throw new Error("No MP status returned from MP API");
                         }
+                        const takeRequestData = await pgClient
+                            .query({
+                            text: `
+                  SELECT *
+                  FROM hub.take_request
+                  WHERE id = $1
+                `,
+                            values: [takeRequestId],
+                        })
+                            .then(exactlyOneRow);
+                        if (takeRequestData.refunded_at) {
+                            logger.warn({ mpTransferId, takeRequestId }, `[completeTransfer] Transfer was already refunded. This should never happen.`);
+                            break;
+                        }
+                        await pgClient.query({
+                            text: `
+                UPDATE hub.balance
+                SET amount = amount + $1
+                WHERE user_id = $2 
+                  AND experience_id = $3 
+                  AND casino_id = $4 
+                  AND currency_key = $5
+              `,
+                            values: [
+                                takeRequestData.reserved_amount,
+                                takeRequestData.user_id,
+                                takeRequestData.experience_id,
+                                takeRequestData.casino_id,
+                                takeRequestData.currency_key,
+                            ],
+                        });
                         await pgClient.query({
                             text: `
                 UPDATE hub.take_request
                 SET 
                   transfer_needs_completion = FALSE,
                   mp_transfer_status = $2,
-                  status = $3,
-                  mp_status = $4,
-                  debug = $5
+                  mp_status = $3,
+                  debug = $4,
+                  refunded_at = now(),
+                  updated_at = now()
                 WHERE id = $1
               `,
                             values: [
                                 takeRequestId,
                                 currentStatus,
-                                LocalTakeRequestStatus.FAILED,
                                 mpStatus,
-                                `MP transfer was ${currentStatus}`,
+                                `MP transfer was ${currentStatus}. Refunded ${takeRequestData.reserved_amount} to user`,
                             ],
                         });
-                        logger.info(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}`);
+                        logger.info(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}. Refunded ${takeRequestData.reserved_amount} base units of ${takeRequestData.currency_key} to hub user.`);
                     }
                     else {
                         logger.info(`[completeTransfer] Transfer ${mpTransferId} has status ${currentStatus}, will retry later`);
@@ -665,6 +708,7 @@ async function processStuckRequests({ casinoId, graphqlClient, abortSignal, }) {
             mpTakeRequestId: request.mp_take_request_id,
             casinoId,
             graphqlClient,
+            pool: superuserPool,
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.9.0-dev.12",
+  "version": "1.9.0-dev.14",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [