@simplelayer/graniteer-core 0.3.4 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -151,48 +151,20 @@ export async function handle(req, operator, deps) {
|
|
|
151
151
|
const net = Math.max(0, price_cents - dynamic_discount_cents);
|
|
152
152
|
// Reclaim stale holds overlapping the range (same as create-booking).
|
|
153
153
|
await reclaimStaleHoldsExceptCompletedTier3(admin, room_id, rangeLiteral);
|
|
154
|
-
// Contract tier lookup: needed both for member-credit eligibility (Tier 3
|
|
155
|
-
// rooms never draw member credit - they always go through the Commons
|
|
156
|
-
// contract/deposit flow) and, new here, for the contract-skip audit trail
|
|
157
|
-
// below. Root cause + rationale: claude/admin-create-booking-agreement-gap-scope.md
|
|
158
|
-
// (this function never runs create-booking.js's tiered agreement gate or
|
|
159
|
-
// the audited admin-skip-commons-contract path - every booking it settles
|
|
160
|
-
// to 'paid' does so with no agreement, previously with no audit trail
|
|
161
|
-
// either).
|
|
162
|
-
let contractTier = null;
|
|
163
|
-
try {
|
|
164
|
-
contractTier = await resolveRoomContractTier(admin, room_id);
|
|
165
|
-
}
|
|
166
|
-
catch (e) {
|
|
167
|
-
console.warn('[admin-create-booking] contract tier lookup failed', String(e));
|
|
168
|
-
try {
|
|
169
|
-
await logOps(admin, 'admin_create_booking_tier_lookup_failed', { message: String(e), room_id }, { severity: 'warning' });
|
|
170
|
-
}
|
|
171
|
-
catch { /* ignore */ }
|
|
172
|
-
}
|
|
173
154
|
let creditEligible = false;
|
|
174
155
|
if (membership) {
|
|
175
|
-
|
|
156
|
+
let tier = null;
|
|
157
|
+
try {
|
|
158
|
+
tier = await resolveRoomContractTier(admin, room_id);
|
|
159
|
+
}
|
|
160
|
+
catch (e) {
|
|
161
|
+
console.warn('[admin-create-booking] contract tier lookup failed', String(e));
|
|
162
|
+
}
|
|
163
|
+
creditEligible = room.booking_mode !== 'quote' && tier !== null && tier !== 3;
|
|
176
164
|
}
|
|
177
165
|
const useCredit = !!membership && creditEligible;
|
|
178
166
|
const nowIso = new Date().toISOString();
|
|
179
167
|
const isOffline = mode === 'offline';
|
|
180
|
-
// Audit-only contract-skip marking (landed 2026-09-18, see scope doc
|
|
181
|
-
// above): every booking this function settles straight to 'paid' bypasses
|
|
182
|
-
// the tiered agreement gate self-serve bookings go through. This does NOT
|
|
183
|
-
// block or gate the booking - it only makes the skip self-documenting via
|
|
184
|
-
// the same contract_skipped_* columns admin-skip-commons-contract uses for
|
|
185
|
-
// an explicit staff skip. NOTE: private.on_booking_paid_transition() still
|
|
186
|
-
// fires and still inserts its own booking_contract_violations row on this
|
|
187
|
-
// same write -- this stamp is in ADDITION to that row, not a replacement
|
|
188
|
-
// for it; the violations table keeps growing exactly as before.
|
|
189
|
-
const CONTRACT_SKIP_REASON = `admin-create-booking: no agreement flow in this function (tier ${contractTier ?? 'unmapped'}; ` +
|
|
190
|
-
'known gap, audit-only fix landed 2026-09-18 - see admin-create-booking-agreement-gap-scope.md)';
|
|
191
|
-
const contractSkipFields = {
|
|
192
|
-
contract_skipped_at: nowIso,
|
|
193
|
-
contract_skipped_by_email: callerEmail,
|
|
194
|
-
contract_skip_reason: CONTRACT_SKIP_REASON,
|
|
195
|
-
};
|
|
196
168
|
const insertRow = {
|
|
197
169
|
room_id,
|
|
198
170
|
during: rangeLiteral,
|
|
@@ -218,7 +190,6 @@ export async function handle(req, operator, deps) {
|
|
|
218
190
|
insertRow.charged_amount_cents = net;
|
|
219
191
|
insertRow.credit_applied_cents = 0;
|
|
220
192
|
insertRow.hold_expires_at = null;
|
|
221
|
-
Object.assign(insertRow, contractSkipFields);
|
|
222
193
|
}
|
|
223
194
|
else {
|
|
224
195
|
insertRow.status = 'pending';
|
|
@@ -329,7 +300,6 @@ export async function handle(req, operator, deps) {
|
|
|
329
300
|
credit_applied_cents: credit_applied,
|
|
330
301
|
discount_applied_cents: discount_applied,
|
|
331
302
|
hold_expires_at: null,
|
|
332
|
-
...contractSkipFields,
|
|
333
303
|
})
|
|
334
304
|
.eq('id', booking_id);
|
|
335
305
|
await runPaidSideEffects();
|
|
@@ -1634,26 +1634,7 @@ export function createStripeWebhookHandler(config) {
|
|
|
1634
1634
|
break;
|
|
1635
1635
|
}
|
|
1636
1636
|
const booking = await findBooking(session);
|
|
1637
|
-
|
|
1638
|
-
// customer or staff already cancelled. booking.status is untyped
|
|
1639
|
-
// (findBooking's select is not run through generated DB types), so
|
|
1640
|
-
// nullish-coalesce before .startsWith: a null/absent status must not
|
|
1641
|
-
// throw here -- that would reach the outer catch, delete the
|
|
1642
|
-
// stripe_events ledger row, and 500 (Stripe retries ~16x, paging
|
|
1643
|
-
// each time, booking never provisions). Preserves the pre-fix
|
|
1644
|
-
// behavior for that case (null !== 'paid' -> proceed) exactly.
|
|
1645
|
-
const bkStatus = booking?.status ?? '';
|
|
1646
|
-
// All three cancelled_* terminal states (see manage-booking.ts's
|
|
1647
|
-
// `b.status.startsWith('cancelled_')` idiom and stripe-db-reconcile.ts's
|
|
1648
|
-
// BOOKING_POST_PAID_OK set) are excluded, not just 'cancelled_credited'.
|
|
1649
|
-
// Hoisted (rather than inlined in the condition below) so the
|
|
1650
|
-
// else-if branch further down -- which handles the actual
|
|
1651
|
-
// cancelled_* case -- can reuse it without recomputing.
|
|
1652
|
-
const bkIsCancelled = bkStatus.startsWith('cancelled_');
|
|
1653
|
-
if (booking &&
|
|
1654
|
-
bkStatus !== 'paid' &&
|
|
1655
|
-
bkStatus !== 'deposit_paid' &&
|
|
1656
|
-
!bkIsCancelled) {
|
|
1637
|
+
if (booking && booking.status !== 'paid' && booking.status !== 'deposit_paid') {
|
|
1657
1638
|
const paymentIntent = typeof session.payment_intent === 'string'
|
|
1658
1639
|
? session.payment_intent
|
|
1659
1640
|
: session.payment_intent?.id ?? null;
|
|
@@ -1672,16 +1653,6 @@ export function createStripeWebhookHandler(config) {
|
|
|
1672
1653
|
// status='pending', because this generic path legitimately serves
|
|
1673
1654
|
// other non-pending recoveries (e.g. a re-paid expired hold).
|
|
1674
1655
|
.neq('status', 'deposit_paid')
|
|
1675
|
-
// Never resurrect an already-cancelled booking on a replayed/
|
|
1676
|
-
// out-of-order webhook (all 3 terminal cancelled_* states --
|
|
1677
|
-
// see stripe-db-reconcile.ts's BOOKING_POST_PAID_OK). Explicit
|
|
1678
|
-
// .neq() chain to match this file's existing idiom, rather than
|
|
1679
|
-
// a LIKE pattern -- this file elsewhere notes '_' is a live SQL
|
|
1680
|
-
// wildcard, not just a literal underscore, so an unescaped
|
|
1681
|
-
// 'cancelled_%' LIKE could match unintended values.
|
|
1682
|
-
.neq('status', 'cancelled_credited')
|
|
1683
|
-
.neq('status', 'cancelled_forfeited')
|
|
1684
|
-
.neq('status', 'cancelled_refunded')
|
|
1685
1656
|
.select('id');
|
|
1686
1657
|
if (!flipErr && flipped && flipped.length > 0) {
|
|
1687
1658
|
// Post-payment side effects — MUST NOT break the webhook.
|
|
@@ -1798,60 +1769,6 @@ export function createStripeWebhookHandler(config) {
|
|
|
1798
1769
|
console.error('[stripe-webhook] post-paid side effects error', e);
|
|
1799
1770
|
}
|
|
1800
1771
|
}
|
|
1801
|
-
else if (flipErr) {
|
|
1802
|
-
console.error('[stripe-webhook] booking paid-flip update failed', flipErr);
|
|
1803
|
-
const persisted = await logOps(supabase, 'booking_paid_flip_failed', { session_id: session.id, message: flipErr.message }, { severity: 'error', bookingId: booking.id });
|
|
1804
|
-
if (!persisted.ok) {
|
|
1805
|
-
console.error('[stripe-webhook] booking-paid-flip-failed alarm failed to persist', { bookingId: booking.id, sessionId: session.id, error: persisted.error });
|
|
1806
|
-
}
|
|
1807
|
-
}
|
|
1808
|
-
else {
|
|
1809
|
-
// Guard blocked the flip even though the JS-level read saw this
|
|
1810
|
-
// booking as flippable (not paid/deposit_paid/cancelled_*) --
|
|
1811
|
-
// a TOCTOU race: something else (another webhook delivery,
|
|
1812
|
-
// manage-booking, the reconciler) changed the row's status
|
|
1813
|
-
// between our read and this UPDATE's WHERE clause evaluating.
|
|
1814
|
-
// `read_status` below is that STALE pre-UPDATE value, not the
|
|
1815
|
-
// row's current status -- never rename it back to `db_status`,
|
|
1816
|
-
// which would wrongly imply it reflects what's in the DB right
|
|
1817
|
-
// now. Always 'warning' (never conditionally 'info'): whatever
|
|
1818
|
-
// the row's status became, Stripe says this session is paid
|
|
1819
|
-
// and nothing got flipped or provisioned for it here -- that's
|
|
1820
|
-
// never a routine no-op (project invariant: "divergence
|
|
1821
|
-
// alarms, not silence").
|
|
1822
|
-
const raced = await logOps(supabase, 'paid_session_flip_raced', {
|
|
1823
|
-
session_id: session.id,
|
|
1824
|
-
read_status: booking.status,
|
|
1825
|
-
amount_total: session.amount_total ?? null,
|
|
1826
|
-
}, {
|
|
1827
|
-
severity: 'warning',
|
|
1828
|
-
bookingId: booking.id,
|
|
1829
|
-
});
|
|
1830
|
-
if (!raced.ok) {
|
|
1831
|
-
console.error('[stripe-webhook] paid-session-flip-raced alarm failed to persist', { bookingId: booking.id, sessionId: session.id, error: raced.error });
|
|
1832
|
-
}
|
|
1833
|
-
}
|
|
1834
|
-
}
|
|
1835
|
-
else if (booking && bkIsCancelled) {
|
|
1836
|
-
// The actual bug this fix exists to catch: a Stripe payment
|
|
1837
|
-
// landed on a booking that is cancelled_* right now, per the
|
|
1838
|
-
// JS-level read above (not a TOCTOU race -- see the `else`
|
|
1839
|
-
// branch above for that case). Must never be silent (project
|
|
1840
|
-
// invariant: "divergence alarms, not silence"). dedupeKey so a
|
|
1841
|
-
// replayed/retried webhook for the same session doesn't page
|
|
1842
|
-
// Slack a second time for the same collision.
|
|
1843
|
-
const flagged = await logOps(supabase, 'paid_session_for_cancelled_booking', {
|
|
1844
|
-
session_id: session.id,
|
|
1845
|
-
booking_status: bkStatus,
|
|
1846
|
-
amount_total: session.amount_total ?? null,
|
|
1847
|
-
}, {
|
|
1848
|
-
severity: 'error',
|
|
1849
|
-
bookingId: booking.id,
|
|
1850
|
-
dedupeKey: `paid_session_for_cancelled_booking:${booking.id}:${session.id}`,
|
|
1851
|
-
});
|
|
1852
|
-
if (!flagged.ok) {
|
|
1853
|
-
console.error('[stripe-webhook] cancelled-booking paid-session alarm failed to persist', { bookingId: booking.id, sessionId: session.id, error: flagged.error });
|
|
1854
|
-
}
|
|
1855
1772
|
}
|
|
1856
1773
|
break;
|
|
1857
1774
|
}
|
package/dist/printBilling.js
CHANGED
|
@@ -45,22 +45,22 @@ export function gcCodeOf(e) {
|
|
|
45
45
|
* minimum is applied on this side. v14 also had a per-period `>= 50` inside
|
|
46
46
|
* M-11's claim UPDATE; that predicate is DELETED, because it silently billed
|
|
47
47
|
* a member who owed $9.30 nothing at all, every month (T-85). */
|
|
48
|
-
export const ELIGIBILITY_SQL = `
|
|
49
|
-
select p.membership_id,
|
|
50
|
-
array_agg(p.id order by p.period_month) as period_ids,
|
|
51
|
-
array_agg(distinct p.period_month) as period_months,
|
|
52
|
-
sum(p.charge_cents_total)::integer as amount_cents
|
|
53
|
-
from public.print_usage_periods p
|
|
54
|
-
where p.status = 'pending_bill'
|
|
55
|
-
and p.billing_run_id is null
|
|
56
|
-
and p.billed_run_id is null
|
|
57
|
-
and p.charge_cents_total > 0
|
|
58
|
-
group by p.membership_id
|
|
59
|
-
having sum(p.charge_cents_total) >= ${STRIPE_MIN_CENTS}
|
|
60
|
-
and not exists (
|
|
61
|
-
select 1 from public.print_billing_runs r
|
|
62
|
-
where r.membership_id = p.membership_id
|
|
63
|
-
and r.completed_at is null
|
|
48
|
+
export const ELIGIBILITY_SQL = `
|
|
49
|
+
select p.membership_id,
|
|
50
|
+
array_agg(p.id order by p.period_month) as period_ids,
|
|
51
|
+
array_agg(distinct p.period_month) as period_months,
|
|
52
|
+
sum(p.charge_cents_total)::integer as amount_cents
|
|
53
|
+
from public.print_usage_periods p
|
|
54
|
+
where p.status = 'pending_bill'
|
|
55
|
+
and p.billing_run_id is null
|
|
56
|
+
and p.billed_run_id is null
|
|
57
|
+
and p.charge_cents_total > 0
|
|
58
|
+
group by p.membership_id
|
|
59
|
+
having sum(p.charge_cents_total) >= ${STRIPE_MIN_CENTS}
|
|
60
|
+
and not exists (
|
|
61
|
+
select 1 from public.print_billing_runs r
|
|
62
|
+
where r.membership_id = p.membership_id
|
|
63
|
+
and r.completed_at is null
|
|
64
64
|
)`;
|
|
65
65
|
/** [v18/B12-1] The baseline query. The ORDER BY and LIMIT MUST live in a
|
|
66
66
|
* subquery: v6..v17 printed an ungrouped avg() with a bare ORDER BY, which
|
|
@@ -69,41 +69,41 @@ having sum(p.charge_cents_total) >= ${STRIPE_MIN_CENTS}
|
|
|
69
69
|
* a 25x baseline error on the v18 fixture (T-46b). Returns BOTH operands rule 2
|
|
70
70
|
* needs; the old form returned no count at all, so the rule was unimplementable
|
|
71
71
|
* from its own stated input. */
|
|
72
|
-
export const BASELINE_SQL = `
|
|
73
|
-
select coalesce(avg(b.billed_amount_cents), 0)::numeric as baseline_cents,
|
|
74
|
-
count(*)::integer as qualifying_periods
|
|
75
|
-
from (
|
|
76
|
-
select p.billed_amount_cents, p.period_month
|
|
77
|
-
from public.print_usage_periods p
|
|
78
|
-
where p.membership_id = $1
|
|
79
|
-
and p.status = 'billed'
|
|
80
|
-
and p.billed_amount_cents > 0
|
|
81
|
-
order by p.period_month desc
|
|
82
|
-
limit ${BASELINE_WINDOW}
|
|
72
|
+
export const BASELINE_SQL = `
|
|
73
|
+
select coalesce(avg(b.billed_amount_cents), 0)::numeric as baseline_cents,
|
|
74
|
+
count(*)::integer as qualifying_periods
|
|
75
|
+
from (
|
|
76
|
+
select p.billed_amount_cents, p.period_month
|
|
77
|
+
from public.print_usage_periods p
|
|
78
|
+
where p.membership_id = $1
|
|
79
|
+
and p.status = 'billed'
|
|
80
|
+
and p.billed_amount_cents > 0
|
|
81
|
+
order by p.period_month desc
|
|
82
|
+
limit ${BASELINE_WINDOW}
|
|
83
83
|
) b`;
|
|
84
84
|
/** section 5.3's escalation ladder. A held run gets louder rather than expiring —
|
|
85
85
|
* an automatic expiry that frees the periods is exactly what created the
|
|
86
86
|
* double-charge hole in R7 F4 / R8 F2. */
|
|
87
|
-
export const STUCK_ESCALATION_SQL = `
|
|
88
|
-
insert into public.ops_events (kind, severity, detail, dedupe_key)
|
|
89
|
-
select
|
|
90
|
-
'print_billing_run_stuck',
|
|
91
|
-
case
|
|
92
|
-
when r.updated_at < now() - interval '7 days' then 'critical'
|
|
93
|
-
when r.updated_at < now() - interval '24 hours' then 'error'
|
|
94
|
-
else 'warning'
|
|
95
|
-
end,
|
|
96
|
-
jsonb_build_object(
|
|
97
|
-
'run_id', r.id, 'membership_id', r.membership_id, 'status', r.status,
|
|
98
|
-
'hold_reason', r.hold_reason, 'amount_cents', r.amount_cents,
|
|
99
|
-
'stripe_invoice_id', r.stripe_invoice_id,
|
|
100
|
-
'stuck_for', now() - r.updated_at,
|
|
101
|
-
'blocking_future_runs_for_membership', true),
|
|
102
|
-
'print_billing_run_stuck:' || r.id::text || ':'
|
|
103
|
-
|| (now() at time zone 'UTC')::date::text
|
|
104
|
-
from public.print_billing_runs r
|
|
105
|
-
where r.completed_at is null
|
|
106
|
-
and r.status = 'held'
|
|
87
|
+
export const STUCK_ESCALATION_SQL = `
|
|
88
|
+
insert into public.ops_events (kind, severity, detail, dedupe_key)
|
|
89
|
+
select
|
|
90
|
+
'print_billing_run_stuck',
|
|
91
|
+
case
|
|
92
|
+
when r.updated_at < now() - interval '7 days' then 'critical'
|
|
93
|
+
when r.updated_at < now() - interval '24 hours' then 'error'
|
|
94
|
+
else 'warning'
|
|
95
|
+
end,
|
|
96
|
+
jsonb_build_object(
|
|
97
|
+
'run_id', r.id, 'membership_id', r.membership_id, 'status', r.status,
|
|
98
|
+
'hold_reason', r.hold_reason, 'amount_cents', r.amount_cents,
|
|
99
|
+
'stripe_invoice_id', r.stripe_invoice_id,
|
|
100
|
+
'stuck_for', now() - r.updated_at,
|
|
101
|
+
'blocking_future_runs_for_membership', true),
|
|
102
|
+
'print_billing_run_stuck:' || r.id::text || ':'
|
|
103
|
+
|| (now() at time zone 'UTC')::date::text
|
|
104
|
+
from public.print_billing_runs r
|
|
105
|
+
where r.completed_at is null
|
|
106
|
+
and r.status = 'held'
|
|
107
107
|
on conflict (dedupe_key) where dedupe_key is not null do nothing`;
|
|
108
108
|
/** Rules 1-3 of section 4.2's gate. The two gates are INDEPENDENT and both are
|
|
109
109
|
* evaluated — a run can trip the cap without the ratio and vice versa, and
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplelayer/graniteer-core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Shared platform core for Graniteer",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -645,7 +645,7 @@
|
|
|
645
645
|
"react": "18.3.1",
|
|
646
646
|
"stripe": "17.5.0",
|
|
647
647
|
"web-push": "3.6.7",
|
|
648
|
-
"zod": "
|
|
648
|
+
"zod": "3.23.8"
|
|
649
649
|
},
|
|
650
650
|
"files": [
|
|
651
651
|
"dist"
|