@moneypot/hub 1.20.0-dev.0 → 1.20.0-dev.2

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

@@ -1,7 +1,8 @@
 import { QueryResult, QueryResultRow } from "pg";
 import { PgClientResult } from "postgraphile/@dataplan/pg";
 import * as pg from "pg";
-export type QueryExecutor = Pick<pg.Pool, "query"> | Pick<pg.ClientBase, "query">;
+import { Prettify } from "../util.js";
+export type QueryExecutor = Prettify<Pick<pg.Pool, "query"> | Pick<pg.ClientBase, "query">>;
 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/liability/internal/db.d.ts

@@ -1,8 +1,5 @@
 import { PgClientInTransaction } from "../../db/transaction.js";
 import { DbLiability } from "../types.js";
-export declare function dbGetAndLockLiabilitiesPastDeadline(pgClient: PgClientInTransaction, { limit }?: {
-    limit?: number;
-}): Promise<DbLiability[]>;
-export declare function dbGetAndLockLiability(pool: PgClientInTransaction, { id }: {
+export declare function dbLockLiability(pool: PgClientInTransaction, { id }: {
     id: string;
 }): Promise<DbLiability | null>;

package/dist/src/liability/internal/db.js

@@ -1,19 +1,4 @@
-export async function dbGetAndLockLiabilitiesPastDeadline(pgClient, { limit = 100 } = {}) {
-    const result = await pgClient.query({
-        text: `
-      SELECT *
-      FROM hub.liability
-      WHERE resolved_at IS NULL
-        AND deadline < now()
-      ORDER BY deadline ASC
-      LIMIT $1
-      FOR UPDATE SKIP LOCKED
-    `,
-        values: [limit],
-    });
-    return result.rows;
-}
-export async function dbGetAndLockLiability(pool, { id }) {
+export async function dbLockLiability(pool, { id }) {
     const result = await pool.query({
         text: `
       SELECT *

package/dist/src/liability/internal/index.d.ts

@@ -1,2 +1,2 @@
-export { dbGetAndLockLiabilitiesPastDeadline as dbGetAndLockLiabilitiesToExpire, dbGetAndLockLiability, } from "./db.js";
+export { dbLockLiability } from "./db.js";
 export { startLiabilityExpirationProcessor, processExpiredLiabilities, } from "./processor.js";

package/dist/src/liability/internal/index.js

@@ -1,2 +1,2 @@
-export { dbGetAndLockLiabilitiesPastDeadline as dbGetAndLockLiabilitiesToExpire, dbGetAndLockLiability, } from "./db.js";
+export { dbLockLiability } from "./db.js";
 export { startLiabilityExpirationProcessor, processExpiredLiabilities, } from "./processor.js";

package/dist/src/liability/internal/processor.d.ts

@@ -1,5 +1,9 @@
 import * as pg from "pg";
 import { LiabilityConfigInternal } from "../public/config.js";
+import { QueryExecutor } from "../../db/util.js";
+export declare function dbGetLiabilityIdsPastDeadline(pgClient: QueryExecutor, { limit }?: {
+    limit?: number;
+}): Promise<string[]>;
 export declare function startLiabilityExpirationProcessor<RefType extends string>({ signal, pool, liabilityConfig, }: {
     signal: AbortSignal;
     pool: pg.Pool;

package/dist/src/liability/internal/processor.js

@@ -1,9 +1,8 @@
 import { logger } from "../../logger.js";
 import { withPgPoolTransaction, } from "../../db/transaction.js";
 import { dbLockHouseBankroll, dbLockPlayerBalance } from "../../db/public.js";
-const POLL_INTERVAL = 30_000;
 const BATCH_SIZE = 100;
-async function dbGetLiabilityIdsPastDeadline(pgClient, { limit = 100 } = {}) {
+export async function dbGetLiabilityIdsPastDeadline(pgClient, { limit = 100 } = {}) {
     const result = await pgClient.query({
         text: `
       SELECT id
@@ -49,7 +48,7 @@ export function startLiabilityExpirationProcessor({ signal, pool, liabilityConfi
                 logger.error(e, `Error processing expired liabilities`);
             }
             if (!shouldStop && !signal.aborted) {
-                await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL));
+                await new Promise((resolve) => setTimeout(resolve, liabilityConfig._options.pollIntervalMs));
             }
         }
         logger.info(`Liability expiration processor stopped`);

package/dist/src/liability/public/config.d.ts

@@ -1,7 +1,6 @@
 import { DbLockedHouseBankrollWithAvailable, DbLockedPlayerBalance, PgClientInTransaction } from "../../db/index.js";
 import { Branded } from "../../util.js";
-import type { DbLiability } from "../types.js";
-import { dbCreateLiability, dbResolveLiabilityByRef } from "./db.js";
+import type { DbLiability, NewLiability } from "../types.js";
 export type DbLockedLiability<RefType extends string = string> = DbLiability & {
     ref_type: RefType;
 };
@@ -21,16 +20,23 @@ export type LiabilityRefTypeConfig<RefType extends string> = {
 };
 export declare function createLiabilityConfig<RefType extends string>(refTypes: {
     [K in RefType]: LiabilityRefTypeConfig<K>;
-}, options?: LiabilityConfigOptions): LiabilityConfig<RefType>;
+}, options?: Partial<LiabilityConfigOptions>): LiabilityConfig<RefType>;
 export type LiabilityConfig<RefType extends string> = {
-    dbCreateLiability: typeof dbCreateLiability<RefType>;
-    dbResolveLiabilityByRef: typeof dbResolveLiabilityByRef<RefType>;
+    dbCreateLiability: <T extends RefType>(pgClient: PgClientInTransaction, args: NewLiability<T>) => Promise<DbLiability & {
+        ref_type: T;
+    }>;
+    dbResolveLiabilityByRef: <T extends RefType>(pgClient: PgClientInTransaction, args: {
+        refType: T;
+        refId: string;
+        lockedBankrollId: string;
+    }) => Promise<boolean>;
+};
+export type LiabilityConfigOptions = {
+    pollIntervalMs: number;
 };
-type LiabilityConfigOptions = never;
 export type LiabilityConfigInternal<RefType extends string> = LiabilityConfig<RefType> & {
     _refTypes: {
         [K in RefType]: LiabilityRefTypeConfig<K>;
     };
     _options: LiabilityConfigOptions;
 };
-export {};

package/dist/src/liability/public/config.js

@@ -2,10 +2,13 @@ import { dbCreateLiability, dbResolveLiabilityByRef } from "./db.js";
 export const LIABILITY_RESOLVED = {
     resolved: true,
 };
+const DEFAULT_OPTIONS = {
+    pollIntervalMs: 30_000,
+};
 export function createLiabilityConfig(refTypes, options) {
     return {
         _refTypes: refTypes,
-        _options: options,
+        _options: { ...DEFAULT_OPTIONS, ...options },
         dbCreateLiability,
         dbResolveLiabilityByRef,
     };

package/dist/src/util.d.ts

@@ -3,6 +3,9 @@ declare const BRAND: unique symbol;
 export type Branded<Brand, T> = T & {
     readonly [BRAND]: Brand;
 };
+export type Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
 export declare function isUuid(input: any): boolean;
 export type Result<V, E> = {
     ok: true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.20.0-dev.0",
+  "version": "1.20.0-dev.2",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [