@moneypot/hub 1.4.0 → 1.4.2

package/README.md

@@ -76,6 +76,6 @@ insert into hub.api_key default values returning key;
 
 ## Changelog
 
-### 1.4.0
+### 1.4.1
 
 - Added `hubPutAlert` subscription

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

@@ -1,7 +1,22 @@
 import * as pg from "pg";
-import { DbCurrency, DbSession } from "./types.js";
+import { DbBalance, DbBankroll, DbCurrency, DbSession } from "./types.js";
+import { PgClientInTransaction } from "./index.js";
 export declare function getActiveSessionById(pgClient: pg.PoolClient, sessionId: string): Promise<DbSession | undefined>;
 export declare function getCasinoCurrencyByKey(pgClient: pg.PoolClient, { currencyKey, casinoId }: {
     currencyKey: string;
     casinoId: string;
 }): Promise<DbCurrency | undefined>;
+export declare function dbLockPlayerBalanceAndHouseBankroll(pgClient: PgClientInTransaction, { userId, casinoId, experienceId, currencyKey, }: {
+    userId: string;
+    casinoId: string;
+    experienceId: string;
+    currencyKey: string;
+}): Promise<{
+    found: false;
+    dbPlayerBalance: null;
+    dbHouseBankroll: null;
+} | {
+    found: true;
+    dbPlayerBalance: DbBalance["amount"];
+    dbHouseBankroll: DbBankroll["amount"];
+}>;

package/dist/src/db/public.js

@@ -1,4 +1,5 @@
 import { maybeOneRow } from "./util.js";
+import { assert } from "tsafe";
 export async function getActiveSessionById(pgClient, sessionId) {
     return pgClient
         .query("select * from hub.active_session where id = $1", [
@@ -18,3 +19,40 @@ export async function getCasinoCurrencyByKey(pgClient, { currencyKey, casinoId }
     })
         .then(maybeOneRow);
 }
+export async function dbLockPlayerBalanceAndHouseBankroll(pgClient, { userId, casinoId, experienceId, currencyKey, }) {
+    assert(pgClient._inTransaction, "pgClient must be in a transaction");
+    const row = await pgClient
+        .query(`
+        WITH locked_balance AS (
+          SELECT amount
+          FROM hub.balance
+          WHERE user_id        = $1
+            AND casino_id      = $2
+            AND experience_id  = $3
+            AND currency_key   = $4
+
+          FOR UPDATE
+        )
+        SELECT
+          pb.amount as player_balance,
+          br.amount as house_bankroll
+        FROM locked_balance pb
+        JOIN hub.bankroll br
+          ON br.casino_id   = $2
+        AND br.currency_key = $4
+
+        FOR UPDATE OF br
+      `, [userId, casinoId, experienceId, currencyKey])
+        .then(maybeOneRow);
+    return row
+        ? {
+            found: true,
+            dbPlayerBalance: row.player_balance,
+            dbHouseBankroll: row.house_bankroll,
+        }
+        : {
+            found: false,
+            dbPlayerBalance: null,
+            dbHouseBankroll: null,
+        };
+}

package/dist/src/plugins/hub-make-outcome-bet.js

@@ -2,7 +2,7 @@ import { access, context, object, ObjectStep, polymorphicBranch, sideEffect, } f
 import { gql, makeExtendSchemaPlugin } from "postgraphile/utils";
 import { z } from "zod";
 import { GraphQLError } from "graphql";
-import { DbHashKind, exactlyOneRow, maybeOneRow, superuserPool, withPgPoolTransaction, } from "../db/index.js";
+import { DbHashKind, dbLockPlayerBalanceAndHouseBankroll, exactlyOneRow, maybeOneRow, superuserPool, withPgPoolTransaction, } from "../db/index.js";
 import { assert } from "tsafe";
 import { dbInsertHubHash, dbLockHubHashChain, } from "../hash-chain/db-hash-chain.js";
 import { getIntermediateHash, getPreimageHash, } from "../hash-chain/get-hash.js";
@@ -150,7 +150,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                 throw new GraphQLError("Currency not found");
                             }
                             return withPgPoolTransaction(superuserPool, async (pgClient) => {
-                                const { dbPlayerBalance, dbHouseBankroll, found } = await dbLockBalanceAndBankroll(pgClient, {
+                                const { dbPlayerBalance, dbHouseBankroll, found } = await dbLockPlayerBalanceAndHouseBankroll(pgClient, {
                                     userId: session.user_id,
                                     casinoId: session.casino_id,
                                     experienceId: session.experience_id,
@@ -409,43 +409,6 @@ function pickRandomOutcome({ outcomes, hash, }) {
         outcomeIdx: outcomes.length - 1,
     };
 }
-async function dbLockBalanceAndBankroll(pgClient, { userId, casinoId, experienceId, currencyKey, }) {
-    assert(pgClient._inTransaction, "pgClient must be in a transaction");
-    const row = await pgClient
-        .query(`
-        WITH locked_balance AS (
-          SELECT amount
-          FROM hub.balance
-          WHERE user_id        = $1
-            AND casino_id      = $2
-            AND experience_id  = $3
-            AND currency_key   = $4
-
-          FOR UPDATE
-        )
-        SELECT
-          pb.amount as player_balance,
-          br.amount as house_bankroll
-        FROM locked_balance pb
-        JOIN hub.bankroll br
-          ON br.casino_id   = $2
-        AND br.currency_key = $4
-
-        FOR UPDATE OF br
-      `, [userId, casinoId, experienceId, currencyKey])
-        .then(maybeOneRow);
-    return row
-        ? {
-            found: true,
-            dbPlayerBalance: row.player_balance,
-            dbHouseBankroll: row.house_bankroll,
-        }
-        : {
-            found: false,
-            dbPlayerBalance: null,
-            dbHouseBankroll: null,
-        };
-}
 async function finishHashChainInBackground({ hashChainId, }) {
     console.log("Finishing hash chain in background", { hashChainId });
     const preimageHashResult = await getPreimageHash({

package/dist/src/plugins/hub-put-alert.js

@@ -28,7 +28,11 @@ export const HubPutAlertPlugin = makeExtendSchemaPlugin(() => {
                                 return "";
                             }
                         });
-                        return listenWithFilter($pgSubscriber, $channelKey, jsonParse, $identity, (identity, item) => {
+                        return listenWithFilter($pgSubscriber, $channelKey, jsonParse, $identity, (item, identity) => {
+                            if (typeof item !== "string") {
+                                console.warn(`hubPutAlert: item is not a string: ${JSON.stringify(item)}`);
+                                return false;
+                            }
                             if (identity?.kind !== "user") {
                                 return false;
                             }

package/dist/src/plugins/listen-with-filter.d.ts

@@ -5,7 +5,7 @@ export declare class ListenWithFilterStep<TTopics extends {
     [topic: string]: any;
 }, TTopic extends keyof TTopics, TPayloadStep extends Step, TFilterInput> extends Step<TTopics[TTopic][]> {
     itemPlan: (itemPlan: __ItemStep<TTopics[TTopic]>) => TPayloadStep;
-    filterFn: (filterInput: TFilterInput, item: any) => boolean;
+    filterFn: (item: unknown, filterInput: TFilterInput) => boolean;
     static $$export: {
         moduleName: string;
         exportName: string;
@@ -14,9 +14,9 @@ export declare class ListenWithFilterStep<TTopics extends {
     private pubsubDep;
     private topicDep;
     private filterInputDep;
-    constructor(pubsubOrPlan: Step<GrafastSubscriber<TTopics> | null> | GrafastSubscriber<TTopics> | null, topicOrPlan: Step<TTopic> | string, itemPlan: ((itemPlan: __ItemStep<TTopics[TTopic]>) => TPayloadStep) | undefined, filterInputPlan: Step<TFilterInput>, filterFn: (filterInput: TFilterInput, item: any) => boolean);
+    constructor(pubsubOrPlan: Step<GrafastSubscriber<TTopics> | null> | GrafastSubscriber<TTopics> | null, topicOrPlan: Step<TTopic> | string, itemPlan: ((itemPlan: __ItemStep<TTopics[TTopic]>) => TPayloadStep) | undefined, filterInputPlan: Step<TFilterInput>, filterFn: (item: unknown, filterInput: TFilterInput) => boolean);
     execute({ indexMap, values, stream, }: ExecutionDetails<readonly [GrafastSubscriber<TTopics>, TTopic]>): GrafastResultStreamList<TTopics[TTopic]>;
 }
 export declare function listenWithFilter<TTopics extends {
     [topic: string]: any;
-}, TTopic extends keyof TTopics, TPayloadStep extends Step, TFilterInput>(pubsubOrPlan: Step<GrafastSubscriber<TTopics> | null> | GrafastSubscriber<TTopics> | null, topicOrPlan: Step<TTopic> | string, itemPlan: ((itemPlan: __ItemStep<TTopics[TTopic]>) => TPayloadStep) | undefined, filterInputPlan: Step<TFilterInput>, filterFn: (filterInput: TFilterInput, item: any) => boolean): ListenWithFilterStep<TTopics, TTopic, TPayloadStep, TFilterInput>;
+}, TTopic extends keyof TTopics, TPayloadStep extends Step, TFilterInput>(pubsubOrPlan: Step<GrafastSubscriber<TTopics> | null> | GrafastSubscriber<TTopics> | null, topicOrPlan: Step<TTopic> | string, itemPlan: ((itemPlan: __ItemStep<TTopics[TTopic]>) => TPayloadStep) | undefined, filterInputPlan: Step<TFilterInput>, filterFn: (item: unknown, filterInput: TFilterInput) => boolean): ListenWithFilterStep<TTopics, TTopic, TPayloadStep, TFilterInput>;

package/dist/src/plugins/listen-with-filter.js

@@ -47,7 +47,7 @@ export class ListenWithFilterStep extends Step {
                 [Symbol.asyncIterator]: async function* () {
                     const iterator = await origStream;
                     for await (const item of iterator) {
-                        if (filterFn(filterInput, item)) {
+                        if (filterFn(item, filterInput)) {
                             yield item;
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [