@noodleseed/one 0.54.0 → 0.56.0

package/node_modules/@noodle-borg/service/dist/billing/postgres-stripe-store.js

@@ -0,0 +1,322 @@
+import { claimBillingStripeEvent, completeBillingStripeEvent, failBillingStripeEvent, } from './postgres-stripe-events.js';
+import { postgresStripeInteger, requiredPostgresStripeTimestamp, stripeBindingRecord, stripeCheckoutRecord, stripeCustomerRecord, } from './postgres-stripe-records.js';
+import { requireActiveBillingAccount, requireEnforcedBillingAccount, requirePaidAuthority, } from './postgres-subscription-reconciliation-authority.js';
+import { parseBillingBaseSubscriptionRevision } from './subscription-model.js';
+export class PostgresBillingStripeStore {
+    #pool;
+    #keyGeneration;
+    constructor(pool, options) {
+        if (!/^[0-9a-f]{64}$/.test(options.authoritativeKeyGeneration)) {
+            throw new Error('Stripe billing requires a valid authoritative key generation');
+        }
+        this.#pool = pool;
+        this.#keyGeneration = options.authoritativeKeyGeneration;
+    }
+    async assertPaidCheckoutEligible(billingAccountId) {
+        const client = await this.#pool.connect();
+        try {
+            await client.query('BEGIN');
+            await lockAccount(client, billingAccountId);
+            await requirePaidAuthority(client, this.#keyGeneration);
+            await requireActiveBillingAccount(client, billingAccountId);
+            await requireEnforcedBillingAccount(client, billingAccountId);
+            const { rows } = await client.query(`SELECT snapshot.schema_version,
+                snapshot.plan_version_id,
+                EXISTS (
+                  SELECT 1 FROM billing_account_defaults AS defaults
+                  WHERE defaults.billing_account_id = active.billing_account_id
+                ) AS is_default,
+                binding.provider_subscription_id AS active_provider_subscription_id
+                , checkout.session_id AS active_checkout_id
+         FROM billing_account_active_snapshots AS active
+         JOIN billing_entitlement_snapshots AS snapshot
+           ON snapshot.billing_account_id = active.billing_account_id
+          AND snapshot.id = active.snapshot_id
+         LEFT JOIN billing_stripe_subscription_bindings AS binding
+           ON binding.billing_account_id = active.billing_account_id
+          AND binding.active
+         LEFT JOIN billing_stripe_checkout_operations AS checkout
+           ON checkout.billing_account_id = active.billing_account_id
+          AND checkout.active
+          AND checkout.expires_at > now()
+         WHERE active.billing_account_id = $1
+         FOR UPDATE OF active, snapshot`, [billingAccountId]);
+            const state = rows[0];
+            if (state === undefined ||
+                state.plan_version_id !== 'free@1' ||
+                (state.schema_version !== 1 && state.schema_version !== 3) ||
+                !state.is_default ||
+                state.active_provider_subscription_id !== null ||
+                state.active_checkout_id !== null) {
+                throw new Error('billing account is not eligible to start a paid checkout');
+            }
+            await client.query('COMMIT');
+        }
+        catch (error) {
+            await rollback(client);
+            throw error;
+        }
+        finally {
+            client.release();
+        }
+    }
+    async getCustomer(billingAccountId, mode) {
+        const { rows } = await this.#pool.query(`SELECT * FROM billing_stripe_customers WHERE billing_account_id = $1 AND mode = $2`, [billingAccountId, mode]);
+        return rows[0] === undefined ? undefined : stripeCustomerRecord(rows[0]);
+    }
+    async putCustomer(record) {
+        await this.#pool.query(`INSERT INTO billing_stripe_customers
+         (billing_account_id, mode, customer_id, email, created_at)
+       VALUES ($1, $2, $3, $4, $5)
+       ON CONFLICT (billing_account_id, mode) DO NOTHING`, [record.billingAccountId, record.mode, record.customerId, record.email, record.createdAt]);
+        const persisted = await this.getCustomer(record.billingAccountId, record.mode);
+        if (persisted === undefined || persisted.customerId !== record.customerId) {
+            throw new Error('Stripe customer binding conflicts with persisted billing state');
+        }
+        return persisted;
+    }
+    async getCheckout(mode, idempotencyKeyHash) {
+        const { rows } = await this.#pool.query(`SELECT * FROM billing_stripe_checkout_operations
+       WHERE mode = $1 AND idempotency_key_hash = $2`, [mode, idempotencyKeyHash]);
+        return rows[0] === undefined ? undefined : stripeCheckoutRecord(rows[0]);
+    }
+    async putCheckout(record) {
+        const client = await this.#pool.connect();
+        try {
+            await client.query('BEGIN');
+            await lockAccount(client, record.billingAccountId);
+            await client.query(`UPDATE billing_stripe_checkout_operations
+         SET active = false
+         WHERE mode = $1 AND billing_account_id = $2 AND active AND expires_at <= $3`, [record.mode, record.billingAccountId, record.createdAt]);
+            await client.query(`INSERT INTO billing_stripe_checkout_operations
+           (mode, idempotency_key_hash, request_fingerprint, billing_account_id, customer_id,
+            session_id, session_url, expires_at, active, created_at)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, true, $9)
+         ON CONFLICT (mode, idempotency_key_hash) DO NOTHING`, [
+                record.mode,
+                record.idempotencyKeyHash,
+                record.requestFingerprint,
+                record.billingAccountId,
+                record.customerId,
+                record.sessionId,
+                record.sessionUrl,
+                record.expiresAt,
+                record.createdAt,
+            ]);
+            await client.query('COMMIT');
+        }
+        catch (error) {
+            await rollback(client);
+            throw error;
+        }
+        finally {
+            client.release();
+        }
+        const persisted = await this.getCheckout(record.mode, record.idempotencyKeyHash);
+        if (persisted === undefined ||
+            persisted.requestFingerprint !== record.requestFingerprint ||
+            persisted.sessionId !== record.sessionId) {
+            throw new Error('Stripe checkout idempotency key conflicts with persisted billing state');
+        }
+        return persisted;
+    }
+    async claimEvent(input) {
+        return claimBillingStripeEvent(this.#pool, input);
+    }
+    async completeEvent(mode, eventId, outcomeCode, completedAt) {
+        return completeBillingStripeEvent(this.#pool, mode, eventId, outcomeCode, completedAt);
+    }
+    async failEvent(mode, eventId, errorCode, failedAt) {
+        return failBillingStripeEvent(this.#pool, mode, eventId, errorCode, failedAt);
+    }
+    async activateSubscriptionBinding(input) {
+        const client = await this.#pool.connect();
+        try {
+            await client.query('BEGIN');
+            await lockAccount(client, input.billingAccountId);
+            const existing = await readBinding(client, input.mode, input.providerSubscriptionId);
+            if (existing !== undefined) {
+                await client.query('COMMIT');
+                return existing;
+            }
+            const customer = await readCustomerForUpdate(client, input.billingAccountId, input.mode);
+            if (customer?.customer_id !== input.customerId) {
+                throw new Error('Stripe subscription customer is not bound to the billing account');
+            }
+            const active = await readActiveBindingForUpdate(client, input.billingAccountId, input.mode);
+            const { rows: stateRows } = await client.query(`SELECT snapshot.plan_version_id
+         FROM billing_account_active_snapshots AS active
+         JOIN billing_entitlement_snapshots AS snapshot
+           ON snapshot.billing_account_id = active.billing_account_id
+          AND snapshot.id = active.snapshot_id
+         WHERE active.billing_account_id = $1
+         FOR UPDATE OF active, snapshot`, [input.billingAccountId]);
+            if (active !== undefined) {
+                throw new Error('a different paid Stripe subscription is already active');
+            }
+            if (stateRows[0]?.plan_version_id !== 'free@1') {
+                throw new Error('billing account is not ready to bind a new Stripe subscription');
+            }
+            const { rows: currentRows } = await client.query(`SELECT subscription_id FROM billing_account_current_base_subscriptions
+         WHERE billing_account_id = $1 FOR UPDATE`, [input.billingAccountId]);
+            const internalSubscriptionId = currentRows[0]?.subscription_id ?? input.newInternalSubscriptionId;
+            await client.query(`INSERT INTO billing_stripe_subscription_bindings
+           (mode, provider_subscription_id, billing_account_id, customer_id,
+            internal_subscription_id, active, created_at, updated_at)
+         VALUES ($1, $2, $3, $4, $5, true, $6, $6)`, [
+                input.mode,
+                input.providerSubscriptionId,
+                input.billingAccountId,
+                input.customerId,
+                internalSubscriptionId,
+                input.activatedAt,
+            ]);
+            const binding = await readBinding(client, input.mode, input.providerSubscriptionId);
+            if (binding === undefined)
+                throw new Error('Stripe subscription binding was not persisted');
+            await client.query('COMMIT');
+            return binding;
+        }
+        catch (error) {
+            await rollback(client);
+            throw error;
+        }
+        finally {
+            client.release();
+        }
+    }
+    async getActiveSubscriptionBinding(billingAccountId, mode) {
+        const { rows } = await this.#pool.query(`SELECT mode, provider_subscription_id, billing_account_id, customer_id,
+              internal_subscription_id, active
+       FROM billing_stripe_subscription_bindings
+       WHERE billing_account_id = $1 AND mode = $2 AND active`, [billingAccountId, mode]);
+        return rows[0] === undefined ? undefined : stripeBindingRecord(rows[0]);
+    }
+    async listActiveSubscriptionBindings(mode, limit) {
+        if (!Number.isSafeInteger(limit) || limit < 1 || limit > 500) {
+            throw new Error('Stripe subscription reconciliation limit is invalid');
+        }
+        const { rows } = await this.#pool.query(`SELECT mode, provider_subscription_id, billing_account_id, customer_id,
+              internal_subscription_id, active
+       FROM billing_stripe_subscription_bindings
+       WHERE mode = $1 AND active
+       ORDER BY updated_at, provider_subscription_id
+       LIMIT $2`, [mode, limit]);
+        return rows.map(stripeBindingRecord);
+    }
+    async markSubscriptionBindingChecked(binding, checkedAt) {
+        await this.#pool.query(`UPDATE billing_stripe_subscription_bindings
+       SET updated_at = $5
+       WHERE mode = $1 AND provider_subscription_id = $2
+         AND billing_account_id = $3 AND internal_subscription_id = $4 AND active`, [
+            binding.mode,
+            binding.providerSubscriptionId,
+            binding.billingAccountId,
+            binding.internalSubscriptionId,
+            checkedAt,
+        ]);
+    }
+    async getReconciliationState(binding) {
+        if (!binding.active)
+            throw new Error('retired Stripe subscription bindings cannot reconcile');
+        const { rows } = await this.#pool.query(`SELECT snapshot.version AS snapshot_version,
+              current.subscription_id, current.revision_version,
+              revision.schema_version, revision.plan_version_id, revision.state,
+              revision.billing_interval, revision.currency, revision.base_amount_minor,
+              revision.current_period_start, revision.current_period_end,
+              revision.effective_from, revision.effective_until, revision.renews,
+              revision.content_checksum, revision.verified_at, revision.created_at
+       FROM billing_account_active_snapshots AS active
+       JOIN billing_entitlement_snapshots AS snapshot
+         ON snapshot.billing_account_id = active.billing_account_id
+        AND snapshot.id = active.snapshot_id
+       LEFT JOIN billing_account_current_base_subscriptions AS current
+         ON current.billing_account_id = active.billing_account_id
+       LEFT JOIN billing_base_subscription_revisions AS revision
+         ON revision.billing_account_id = current.billing_account_id
+        AND revision.subscription_id = current.subscription_id
+        AND revision.version = current.revision_version
+       WHERE active.billing_account_id = $1`, [binding.billingAccountId]);
+        const row = rows[0];
+        if (row === undefined)
+            throw new Error('Stripe billing account entitlement state is incomplete');
+        const currentSubscription = row.subscription_id === null
+            ? null
+            : parseBillingBaseSubscriptionRevision({
+                schemaVersion: row.schema_version,
+                subscriptionId: row.subscription_id,
+                billingAccountId: binding.billingAccountId,
+                version: row.revision_version,
+                planVersionId: row.plan_version_id,
+                state: row.state,
+                billingInterval: row.billing_interval,
+                currency: row.currency,
+                baseAmountMinor: postgresStripeInteger(row.base_amount_minor),
+                currentPeriodStart: requiredPostgresStripeTimestamp(row.current_period_start),
+                currentPeriodEnd: requiredPostgresStripeTimestamp(row.current_period_end),
+                effectiveFrom: requiredPostgresStripeTimestamp(row.effective_from),
+                effectiveUntil: requiredPostgresStripeTimestamp(row.effective_until),
+                renews: row.renews,
+                contentChecksum: row.content_checksum,
+                verifiedAt: requiredPostgresStripeTimestamp(row.verified_at),
+                createdAt: requiredPostgresStripeTimestamp(row.created_at),
+            });
+        if (currentSubscription !== null &&
+            currentSubscription.subscriptionId !== binding.internalSubscriptionId) {
+            throw new Error('Stripe subscription binding conflicts with current billing history');
+        }
+        return {
+            billingAccountId: binding.billingAccountId,
+            activeSnapshotVersion: row.snapshot_version,
+            internalSubscriptionId: binding.internalSubscriptionId,
+            currentSubscription,
+        };
+    }
+    async retireSubscriptionBinding(binding, retiredAt) {
+        const result = await this.#pool.query(`UPDATE billing_stripe_subscription_bindings
+       SET active = false, updated_at = $5
+       WHERE mode = $1 AND provider_subscription_id = $2
+         AND billing_account_id = $3 AND internal_subscription_id = $4 AND active`, [
+            binding.mode,
+            binding.providerSubscriptionId,
+            binding.billingAccountId,
+            binding.internalSubscriptionId,
+            retiredAt,
+        ]);
+        if (result.rowCount !== 1)
+            throw new Error('Stripe subscription binding changed concurrently');
+    }
+}
+async function readCustomerForUpdate(client, billingAccountId, mode) {
+    const { rows } = await client.query(`SELECT * FROM billing_stripe_customers
+     WHERE billing_account_id = $1 AND mode = $2 FOR UPDATE`, [billingAccountId, mode]);
+    return rows[0];
+}
+async function readBinding(client, mode, providerSubscriptionId) {
+    const { rows } = await client.query(`SELECT mode, provider_subscription_id, billing_account_id, customer_id,
+            internal_subscription_id, active
+     FROM billing_stripe_subscription_bindings
+     WHERE mode = $1 AND provider_subscription_id = $2`, [mode, providerSubscriptionId]);
+    return rows[0] === undefined ? undefined : stripeBindingRecord(rows[0]);
+}
+async function readActiveBindingForUpdate(client, billingAccountId, mode) {
+    const { rows } = await client.query(`SELECT mode, provider_subscription_id, billing_account_id, customer_id,
+            internal_subscription_id, active
+     FROM billing_stripe_subscription_bindings
+     WHERE billing_account_id = $1 AND mode = $2 AND active FOR UPDATE`, [billingAccountId, mode]);
+    return rows[0] === undefined ? undefined : stripeBindingRecord(rows[0]);
+}
+async function lockAccount(client, billingAccountId) {
+    await client.query('SELECT pg_advisory_xact_lock(hashtextextended($1, 0))', [
+        `billing-stripe-account:${billingAccountId}`,
+    ]);
+}
+async function rollback(client) {
+    try {
+        await client.query('ROLLBACK');
+    }
+    catch {
+        // Preserve the original transaction error.
+    }
+}
+//# sourceMappingURL=postgres-stripe-store.js.map

package/node_modules/@noodle-borg/service/dist/billing/postgres-stripe-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"postgres-stripe-store.js","sourceRoot":"","sources":["../../src/billing/postgres-stripe-store.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation-persistence.d.ts

@@ -1,6 +1,6 @@
 import type { PoolClient } from 'pg';
+import type { FreeFallbackEntitlementSnapshotRecord, PaidEntitlementSnapshotRecord } from './model.js';
 import { entitlementSnapshotRowToRecord } from './postgres-records.js';
-import type { createPaidEntitlementSnapshot } from './subscription-model.js';
 import { type BillingSubscriptionReconciliationRequest, type BillingSubscriptionReconciliationResult, type normalizeBillingSubscriptionReconciliationRequest } from './subscription-reconciliation.js';
 export interface OperationRow {
     readonly request_fingerprint: string;
@@ -38,7 +38,7 @@ export declare function readCurrentSubscriptionForUpdate(client: PoolClient, bil
 export declare function validateCurrentSubscription(current: CurrentSubscriptionRow | undefined, expected: BillingSubscriptionReconciliationRequest['expectedCurrentBaseSubscription'], previousSnapshot: ReturnType<typeof entitlementSnapshotRowToRecord>): void;
 export declare function validateSubscriptionHistory(client: PoolClient, request: ReturnType<typeof normalizeBillingSubscriptionReconciliationRequest>, current: CurrentSubscriptionRow | undefined): Promise<void>;
 export declare function insertRevision(client: PoolClient, revision: ReturnType<typeof normalizeBillingSubscriptionReconciliationRequest>['revision']): Promise<void>;
-export declare function insertPaidSnapshot(client: PoolClient, snapshot: ReturnType<typeof createPaidEntitlementSnapshot>): Promise<void>;
+export declare function insertEntitlementSnapshot(client: PoolClient, snapshot: PaidEntitlementSnapshotRecord | FreeFallbackEntitlementSnapshotRecord): Promise<void>;
 export declare function compareAndSwapPointers(client: PoolClient, request: ReturnType<typeof normalizeBillingSubscriptionReconciliationRequest>, previousSnapshotId: string, current: CurrentSubscriptionRow | undefined): Promise<void>;
 export declare function insertOperation(client: PoolClient, input: {
     readonly operationId: string;

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-subscription-reconciliation-persistence.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation-persistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"postgres-subscription-reconciliation-persistence.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation-persistence.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation-persistence.js

@@ -93,7 +93,7 @@ export function validateCurrentSubscription(current, expected, previousSnapshot)
     if (current === undefined ||
         current.subscription_id !== expected.subscriptionId ||
         current.revision_version !== expected.revisionVersion ||
-        previousSnapshot.schemaVersion !== 2 ||
+        previousSnapshot.schemaVersion === 1 ||
         previousSnapshot.sourceSubscriptionId !== expected.subscriptionId ||
         previousSnapshot.sourceSubscriptionVersion !== expected.revisionVersion) {
         throw conflict('base_subscription_conflict', 'the current base subscription changed; retry from the current billing account state');
@@ -146,7 +146,7 @@ export async function insertRevision(client, revision) {
         revision.createdAt,
     ]);
 }
-export async function insertPaidSnapshot(client, snapshot) {
+export async function insertEntitlementSnapshot(client, snapshot) {
     await client.query(`INSERT INTO billing_entitlement_snapshots
        (id, billing_account_id, version, plan_version_id, schema_version, source_kind,
         generation_reason, verification_status, effective_from, effective_until,
@@ -163,7 +163,7 @@ export async function insertPaidSnapshot(client, snapshot) {
         snapshot.generationReason,
         snapshot.verificationStatus,
         snapshot.effectiveFrom,
-        snapshot.effectiveUntil,
+        'effectiveUntil' in snapshot ? snapshot.effectiveUntil : null,
         snapshot.monthlyUsageAnchor,
         JSON.stringify(snapshot.entitlements),
         snapshot.sourceSubscriptionId,

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation-persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-subscription-reconciliation-persistence.js","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation-persistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"postgres-subscription-reconciliation-persistence.js","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation-persistence.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-subscription-reconciliation.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;AA6B3C,OAAO,EACL,KAAK,wCAAwC,EAC7C,KAAK,uCAAuC,EAC5C,KAAK,sCAAsC,EAM5C,MAAM,kCAAkC,CAAC;AAK1C,MAAM,WAAW,qDAAqD;IACpE,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC;IAC5C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED,mFAAmF;AACnF,qBAAa,8CACX,YAAW,sCAAsC;;gBAQrC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,qDAAqD;IAchF,yBAAyB,CAC7B,UAAU,EAAE,wCAAwC,GACnD,OAAO,CAAC,uCAAuC,CAAC;CAiHpD"}
+{"version":3,"file":"postgres-subscription-reconciliation.d.ts","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;AAgC3C,OAAO,EACL,KAAK,wCAAwC,EAC7C,KAAK,uCAAuC,EAC5C,KAAK,sCAAsC,EAM5C,MAAM,kCAAkC,CAAC;AAK1C,MAAM,WAAW,qDAAqD;IACpE,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAC;IAC5C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5B;AAED,mFAAmF;AACnF,qBAAa,8CACX,YAAW,sCAAsC;;gBAQrC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,qDAAqD;IAchF,yBAAyB,CAC7B,UAAU,EAAE,wCAAwC,GACnD,OAAO,CAAC,uCAAuC,CAAC;CA4HpD"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation.js

@@ -3,10 +3,10 @@ import { insertAuditEvent } from '@noodle-borg/module-audit';
 import { readBillingMeterTransactionTime } from './postgres-meter-clock.js';
 import { BILLING_METER_EPOCH_LIFECYCLE_LOCK_KEY } from './postgres-meter-epochs.js';
 import { requireActiveBillingAccount, requireEnforcedBillingAccount, requirePaidAuthority, } from './postgres-subscription-reconciliation-authority.js';
-import { compareAndSwapPointers, findOperation, insertOperation, insertPaidSnapshot, insertRevision, readActiveSnapshotForUpdate, readCurrentSubscriptionForUpdate, replayOperation, requireNoLaterSnapshot, validateCurrentSubscription, validateSubscriptionHistory, } from './postgres-subscription-reconciliation-persistence.js';
+import { compareAndSwapPointers, findOperation, insertEntitlementSnapshot, insertOperation, insertRevision, readActiveSnapshotForUpdate, readCurrentSubscriptionForUpdate, replayOperation, requireNoLaterSnapshot, validateCurrentSubscription, validateSubscriptionHistory, } from './postgres-subscription-reconciliation-persistence.js';
 import { conflict, keyGeneration, rollbackQuietly, timeout, translateTransactionError, } from './postgres-subscription-reconciliation-support.js';
-import { createPaidEntitlementSnapshot } from './subscription-model.js';
-import { billingSubscriptionReconciliationContractError, billingSubscriptionReconciliationRequestFingerprint, billingSubscriptionReconciliationSuccessAudit, normalizeBillingSubscriptionReconciliationRequest, requireCurrentlyEffectivePaidSubscription, } from './subscription-reconciliation.js';
+import { createFreeFallbackEntitlementSnapshot, createPaidEntitlementSnapshot, } from './subscription-model.js';
+import { billingSubscriptionReconciliationContractError, billingSubscriptionReconciliationRequestFingerprint, billingSubscriptionReconciliationSuccessAudit, normalizeBillingSubscriptionReconciliationRequest, requireReconciliableSubscriptionRevision, } from './subscription-reconciliation.js';
 const DEFAULT_LOCK_TIMEOUT_MS = 5_000;
 const DEFAULT_STATEMENT_TIMEOUT_MS = 10_000;
 /** Atomic provider-neutral paid history and entitlement-pointer reconciliation. */
@@ -60,28 +60,38 @@ export class PostgresBillingSubscriptionReconciliationStore {
             validateCurrentSubscription(currentSubscription, request.expectedCurrentBaseSubscription, previousSnapshot);
             await validateSubscriptionHistory(client, request, currentSubscription);
             const reconciledAt = await readBillingMeterTransactionTime(client);
-            requireCurrentlyEffectivePaidSubscription(request.revision, reconciledAt);
-            const paidSnapshot = createPaidEntitlementSnapshot({
-                id: request.snapshotId,
-                version: previousSnapshot.version + 1,
-                sourceSubscription: request.revision,
-                previousSnapshot,
-            });
+            requireReconciliableSubscriptionRevision(request.revision, reconciledAt);
+            if (request.revision.state === 'ended') {
+                await requireDefaultBillingAccount(client, request.billingAccountId);
+            }
+            const entitlementSnapshot = request.revision.state === 'ended'
+                ? createFreeFallbackEntitlementSnapshot({
+                    id: request.snapshotId,
+                    version: previousSnapshot.version + 1,
+                    sourceSubscription: request.revision,
+                    previousSnapshot,
+                })
+                : createPaidEntitlementSnapshot({
+                    id: request.snapshotId,
+                    version: previousSnapshot.version + 1,
+                    sourceSubscription: request.revision,
+                    previousSnapshot,
+                });
             if (currentSubscription === undefined) {
                 await client.query(`INSERT INTO billing_base_subscriptions (id, billing_account_id, created_at)
            VALUES ($1, $2, $3)`, [request.revision.subscriptionId, request.billingAccountId, request.revision.createdAt]);
             }
             await insertRevision(client, request.revision);
-            await insertPaidSnapshot(client, paidSnapshot);
+            await insertEntitlementSnapshot(client, entitlementSnapshot);
             await compareAndSwapPointers(client, request, previousSnapshot.id, currentSubscription);
             const result = {
                 schemaVersion: 1,
                 billingAccountId: request.billingAccountId,
                 subscriptionId: request.revision.subscriptionId,
                 subscriptionRevisionVersion: request.revision.version,
-                snapshotId: paidSnapshot.id,
-                snapshotVersion: paidSnapshot.version,
-                planVersionId: paidSnapshot.planVersionId,
+                snapshotId: entitlementSnapshot.id,
+                snapshotVersion: entitlementSnapshot.version,
+                planVersionId: entitlementSnapshot.planVersionId,
                 reconciledAt,
                 replayed: false,
             };
@@ -120,4 +130,13 @@ function normalizeRequest(rawRequest) {
 async function advisoryLock(client, identity) {
     await client.query('SELECT pg_advisory_xact_lock(hashtextextended($1, 0))', [identity]);
 }
+async function requireDefaultBillingAccount(client, billingAccountId) {
+    const { rowCount } = await client.query(`SELECT 1
+     FROM billing_account_defaults
+     WHERE billing_account_id = $1
+     FOR UPDATE`, [billingAccountId]);
+    if (rowCount !== 1) {
+        throw billingSubscriptionReconciliationContractError('ended subscription reconciliation currently requires a default billing account');
+    }
+}
 //# sourceMappingURL=postgres-subscription-reconciliation.js.map

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-reconciliation.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-subscription-reconciliation.js","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"postgres-subscription-reconciliation.js","sourceRoot":"","sources":["../../src/billing/postgres-subscription-reconciliation.ts"],"names":[],"mappings":"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"}

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-schema.js

@@ -273,12 +273,12 @@ async function ensureBillingSubscriptionSchemaTx(client) {
       END IF;
       IF NOT EXISTS (
         SELECT 1 FROM pg_constraint
-        WHERE conname = 'billing_entitlement_snapshots_provenance_v2_check'
+        WHERE conname = 'billing_entitlement_snapshots_provenance_v3_check'
           AND conrelid = 'billing_entitlement_snapshots'::regclass
       ) THEN
         BEGIN
           ALTER TABLE billing_entitlement_snapshots
-            ADD CONSTRAINT billing_entitlement_snapshots_provenance_v2_check
+            ADD CONSTRAINT billing_entitlement_snapshots_provenance_v3_check
             CHECK (
               verification_status = 'verified' AND (
                 (
@@ -295,6 +295,14 @@ async function ensureBillingSubscriptionSchemaTx(client) {
                   effective_until > effective_from AND
                   source_subscription_id IS NOT NULL AND
                   source_subscription_version > 0
+                ) OR (
+                  schema_version = 3 AND
+                  plan_version_id = 'free@1' AND
+                  source_kind = 'subscription' AND
+                  generation_reason = 'subscription-ended' AND
+                  effective_until IS NULL AND
+                  source_subscription_id IS NOT NULL AND
+                  source_subscription_version > 0
                 )
               )
             );
@@ -304,6 +312,37 @@ async function ensureBillingSubscriptionSchemaTx(client) {
       END IF;
     END
     $billing_paid_snapshot_constraints$
+  `);
+    await client.query(`
+    ALTER TABLE billing_entitlement_snapshots
+      DROP CONSTRAINT IF EXISTS billing_entitlement_snapshots_provenance_v2_check
+  `);
+    await client.query(`
+    DO $billing_snapshot_subscription_identity_fk$
+    BEGIN
+      IF NOT EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'billing_entitlement_snapshots_subscription_revision_identity_fk'
+          AND conrelid = 'billing_entitlement_snapshots'::regclass
+      ) THEN
+        BEGIN
+          ALTER TABLE billing_entitlement_snapshots
+            ADD CONSTRAINT billing_entitlement_snapshots_subscription_revision_identity_fk
+            FOREIGN KEY (
+              billing_account_id,
+              source_subscription_id,
+              source_subscription_version
+            ) REFERENCES billing_base_subscription_revisions (
+              billing_account_id,
+              subscription_id,
+              version
+            ) ON DELETE RESTRICT;
+        EXCEPTION WHEN duplicate_object THEN
+          NULL;
+        END;
+      END IF;
+    END
+    $billing_snapshot_subscription_identity_fk$
   `);
     // Replace the earlier four-column draft FK inside the same transaction. Including both effective
     // bounds makes the snapshot an exact projection of the referenced immutable revision.

package/node_modules/@noodle-borg/service/dist/billing/postgres-subscription-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-subscription-schema.js","sourceRoot":"","sources":["../../src/billing/postgres-subscription-schema.ts"],"names":[],"mappings":"AAEA,kGAAkG;AAClG,MAAM,CAAC,KAAK,UAAU,+BAA+B,CAAC,IAAU;IAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC;YACH,4FAA4F;YAC5F,yEAAyE;YACzE,MAAM,MAAM,CAAC,KAAK,CAChB,iFAAiF,CAClF,CAAC;YACF,MAAM,iCAAiC,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iCAAiC,CAAC,MAAkB;IACjE,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;GAOlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;GAkBlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;GAUlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;GAqBlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;GAMlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsClB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;GAalB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgClB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;GAmBlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDlB,CAAC,CAAC;IAEH,iGAAiG;IACjG,sFAAsF;IACtF,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyClB,CAAC,CAAC;IAEH,mGAAmG;IACnG,iGAAiG;IACjG,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;GAKlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;GASlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+ClB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"postgres-subscription-schema.js","sourceRoot":"","sources":["../../src/billing/postgres-subscription-schema.ts"],"names":[],"mappings":"AAEA,kGAAkG;AAClG,MAAM,CAAC,KAAK,UAAU,+BAA+B,CAAC,IAAU;IAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC;YACH,4FAA4F;YAC5F,yEAAyE;YACzE,MAAM,MAAM,CAAC,KAAK,CAChB,iFAAiF,CAClF,CAAC;YACF,MAAM,iCAAiC,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iCAAiC,CAAC,MAAkB;IACjE,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;GAOlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;GAkBlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;GAUlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;GAqBlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;GAMlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsClB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;GAalB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgClB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;GAmBlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgElB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;GAGlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BlB,CAAC,CAAC;IAEH,iGAAiG;IACjG,sFAAsF;IACtF,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyClB,CAAC,CAAC;IAEH,mGAAmG;IACnG,iGAAiG;IACjG,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;GAKlB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;GASlB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+ClB,CAAC,CAAC;AACL,CAAC"}