@moneypot/hub 1.3.0-dev.14 → 1.3.0-dev.16

package/dist/src/plugins/hub-make-outcome-bet.d.ts

@@ -37,7 +37,7 @@ declare const InputSchema: z.ZodObject<{
         weight: number;
     }[]>;
     hashChainId: z.ZodString;
-    metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, "strict", z.ZodTypeAny, {
     currency: string;
     hashChainId: string;
@@ -47,7 +47,7 @@ declare const InputSchema: z.ZodObject<{
         profit: number;
         weight: number;
     }[];
-    metadata?: Record<string, any> | undefined;
+    metadata?: Record<string, unknown> | undefined;
 }, {
     currency: string;
     hashChainId: string;
@@ -57,10 +57,11 @@ declare const InputSchema: z.ZodObject<{
         profit: number;
         weight: number;
     }[];
-    metadata?: Record<string, any> | undefined;
+    metadata?: Record<string, unknown> | undefined;
 }>;
 type Input = z.infer<typeof InputSchema>;
 type Outcome = z.infer<typeof OutcomeSchema>;
+type Metadata = NonNullable<Input["metadata"]>;
 type FinalizeMetadataData = {
     wager: number;
     currencyKey: string;
@@ -72,8 +73,8 @@ type FinalizeMetadataData = {
 export type OutcomeBetConfig = {
     houseEdge: number;
     saveOutcomes: boolean;
-    initializeMetadataFromUntrustedUserInput?: (input: Input) => Result<Record<string, any>, string>;
-    finalizeMetadata?: (validatedMetadata: Record<string, any>, data: FinalizeMetadataData) => Record<string, any>;
+    initializeMetadataFromUntrustedUserInput?: (input: Input) => Result<Metadata, string>;
+    finalizeMetadata?: (validatedMetadata: Metadata, data: FinalizeMetadataData) => Metadata;
 };
 export type OutcomeBetConfigMap<BetKind extends string> = {
     [betKind in BetKind]: OutcomeBetConfig;

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

@@ -39,7 +39,7 @@ const InputSchema = z
         .refine((data) => data.some((o) => o.profit < 0), "At least one outcome should have profit < 0")
         .refine((data) => data.some((o) => o.profit > 0), "At least one outcome should have profit > 0"),
     hashChainId: z.string().uuid("Invalid hash chain ID"),
-    metadata: z.record(z.string(), z.any()).optional(),
+    metadata: z.record(z.string(), z.unknown()).optional(),
 })
     .strict();
 const BetKindSchema = z
@@ -119,9 +119,6 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                             if (!betConfig) {
                                 throw new GraphQLError(`Invalid bet kind`);
                             }
-                            if (!betKinds.includes(rawInput.kind)) {
-                                throw new GraphQLError(`Invalid bet kind`);
-                            }
                             let initializedMetadata;
                             if (betConfig.initializeMetadataFromUntrustedUserInput) {
                                 const result = betConfig.initializeMetadataFromUntrustedUserInput(input);

package/dist/src/plugins/hub-user-balance-by-currency.js

@@ -1,55 +1,30 @@
-import { access, context, loadOne, object, } from "postgraphile/grafast";
+import { access, constant, context } from "postgraphile/grafast";
 import { gql, makeExtendSchemaPlugin } from "postgraphile/utils";
-import { superuserPool } from "../db/index.js";
-import { pgSelectSingleFromRecord, } from "postgraphile/@dataplan/pg";
+import { TYPES } from "postgraphile/@dataplan/pg";
+import { sql } from "postgraphile/pg-sql2";
 export const HubUserBalanceByCurrencyPlugin = makeExtendSchemaPlugin((build) => {
-    const balances = build.input.pgRegistry.pgResources.hub_balance;
+    const balanceTable = build.input.pgRegistry.pgResources.hub_balance;
     return {
         typeDefs: gql `
         extend type HubUser {
-          balanceByCurrency(currency: String!): HubBalance
+          hubBalanceByCurrency(currency: String!): HubBalance
         }
       `,
         plans: {
             HubUser: {
-                balanceByCurrency: ($record, { $currency }) => {
+                hubBalanceByCurrency: ($record, { $currency }) => {
                     const $identity = context().get("identity");
-                    const $params = object({
-                        currency: $currency,
-                        targetUserId: $record.get("id"),
-                        casino_id: access($identity, ["session", "casino_id"]),
-                        experience_id: access($identity, ["session", "experience_id"]),
-                    });
-                    const $balance = loadOne($params, batchGetUserBalanceByCurrency);
-                    return pgSelectSingleFromRecord(balances, $balance);
+                    const $balances = balanceTable.find();
+                    $balances.where(sql `
+              ${$balances}.currency_key = ${$balances.placeholder($currency, TYPES.text)}
+              AND ${$balances}.user_id = ${$balances.placeholder($record.get("id"), TYPES.uuid)}
+              AND ${$balances}.casino_id = ${$balances.placeholder(access($identity, ["session", "casino_id"]), TYPES.uuid)}
+              AND ${$balances}.experience_id = ${$balances.placeholder(access($identity, ["session", "experience_id"]), TYPES.uuid)}
+            `);
+                    $balances.setFirst(constant(1));
+                    return $balances.single();
                 },
             },
         },
     };
 });
-async function batchGetUserBalanceByCurrency(paramsArray) {
-    const values = [];
-    const valuePlaceholders = [];
-    paramsArray.forEach((p, index) => {
-        const baseIndex = index * 4 + 1;
-        valuePlaceholders.push(`($${baseIndex}, $${baseIndex + 1}::uuid, $${baseIndex + 2}::uuid, $${baseIndex + 3}::uuid)`);
-        values.push(p.currency, p.targetUserId, p.casino_id, p.experience_id);
-    });
-    const sql = `
-    SELECT b.*
-    FROM hub.balance b
-    JOIN (
-      VALUES
-        ${valuePlaceholders.join(",\n        ")}
-    ) AS vals(currency_key, user_id, casino_id, experience_id)
-    ON b.currency_key = vals.currency_key
-    AND b.user_id = vals.user_id
-    AND b.casino_id = vals.casino_id
-    AND b.experience_id = vals.experience_id
-  `;
-    const { rows } = await superuserPool.query(sql, values);
-    return paramsArray.map((p) => rows.find((row) => row.currency_key === p.currency &&
-        row.user_id === p.targetUserId &&
-        row.casino_id === p.casino_id &&
-        row.experience_id === p.experience_id));
-}

package/package.json

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