@fantastic.dev/better-stripe 0.57.0 → 0.59.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.
- package/CHANGELOG.md +12 -0
- package/README.md +3 -1
- package/dist/client/connect/payoutAdoptionTestHelpers.d.ts +356 -50
- package/dist/client/connect/payoutAdoptionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutExecutionTestHelpers.d.ts +162 -9
- package/dist/client/connect/payoutExecutionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutLargeAdoptionTestHelpers.d.ts +356 -50
- package/dist/client/connect/payoutLargeAdoptionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutSyncTestHelpers.d.ts +162 -9
- package/dist/client/connect/payoutSyncTestHelpers.d.ts.map +1 -1
- package/dist/client/usage/allowanceClient.d.ts +51 -0
- package/dist/client/usage/allowanceClient.d.ts.map +1 -0
- package/dist/client/usage/allowanceClient.js +64 -0
- package/dist/client/usage/allowanceClient.js.map +1 -0
- package/dist/client/usage/allowanceTerms.d.ts +64 -0
- package/dist/client/usage/allowanceTerms.d.ts.map +1 -0
- package/dist/client/usage/allowanceTerms.js +101 -0
- package/dist/client/usage/allowanceTerms.js.map +1 -0
- package/dist/client/usage/client.d.ts +2 -2
- package/dist/client/usage/client.d.ts.map +1 -1
- package/dist/client/usage/client.js +2 -2
- package/dist/client/usage/client.js.map +1 -1
- package/dist/client/usage/correctionClient.d.ts +33 -0
- package/dist/client/usage/correctionClient.d.ts.map +1 -0
- package/dist/client/usage/correctionClient.js +27 -0
- package/dist/client/usage/correctionClient.js.map +1 -0
- package/dist/client/usage/correctionEligibility.d.ts +4 -0
- package/dist/client/usage/correctionEligibility.d.ts.map +1 -0
- package/dist/client/usage/correctionEligibility.js +7 -0
- package/dist/client/usage/correctionEligibility.js.map +1 -0
- package/dist/client/usage/correctionInvoice.d.ts +9 -0
- package/dist/client/usage/correctionInvoice.d.ts.map +1 -0
- package/dist/client/usage/correctionInvoice.js +218 -0
- package/dist/client/usage/correctionInvoice.js.map +1 -0
- package/dist/client/usage/correctionInvoiceProof.d.ts +29 -0
- package/dist/client/usage/correctionInvoiceProof.d.ts.map +1 -0
- package/dist/client/usage/correctionInvoiceProof.js +41 -0
- package/dist/client/usage/correctionInvoiceProof.js.map +1 -0
- package/dist/client/usage/correctionProofs.d.ts +36 -0
- package/dist/client/usage/correctionProofs.d.ts.map +1 -0
- package/dist/client/usage/correctionProofs.js +41 -0
- package/dist/client/usage/correctionProofs.js.map +1 -0
- package/dist/client/usage/correctionProvider.d.ts +6 -0
- package/dist/client/usage/correctionProvider.d.ts.map +1 -0
- package/dist/client/usage/correctionProvider.js +243 -0
- package/dist/client/usage/correctionProvider.js.map +1 -0
- package/dist/client/usage/correctionRead.d.ts +27 -0
- package/dist/client/usage/correctionRead.d.ts.map +1 -0
- package/dist/client/usage/correctionRead.js +36 -0
- package/dist/client/usage/correctionRead.js.map +1 -0
- package/dist/client/usage/correctionTerms.d.ts +64 -0
- package/dist/client/usage/correctionTerms.d.ts.map +1 -0
- package/dist/client/usage/correctionTerms.js +65 -0
- package/dist/client/usage/correctionTerms.js.map +1 -0
- package/dist/client/usage/correctionTransport.fixtures.d.ts +37 -0
- package/dist/client/usage/correctionTransport.fixtures.d.ts.map +1 -0
- package/dist/client/usage/correctionTransport.fixtures.js +322 -0
- package/dist/client/usage/correctionTransport.fixtures.js.map +1 -0
- package/dist/client/usage/creditClient.d.ts +1 -1
- package/dist/client/usage/index.d.ts +4 -0
- package/dist/client/usage/index.d.ts.map +1 -1
- package/dist/client/usage/observationClient.d.ts +20 -0
- package/dist/client/usage/observationClient.d.ts.map +1 -1
- package/dist/client/usage/observationClient.js +20 -6
- package/dist/client/usage/observationClient.js.map +1 -1
- package/dist/client/usage/records.d.ts +1 -1
- package/dist/client/usage/records.d.ts.map +1 -1
- package/dist/client/usage/records.js.map +1 -1
- package/dist/client/usage/summary.d.ts +3 -0
- package/dist/client/usage/summary.d.ts.map +1 -1
- package/dist/client/usage/summary.js +9 -4
- package/dist/client/usage/summary.js.map +1 -1
- package/dist/client/usageExports.d.ts +4 -0
- package/dist/client/usageExports.d.ts.map +1 -1
- package/dist/component/_generated/api.d.ts +20 -0
- package/dist/component/_generated/api.d.ts.map +1 -1
- package/dist/component/_generated/api.js.map +1 -1
- package/dist/component/_generated/component.d.ts +324 -13
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/component/accountClosure/mutations.d.ts.map +1 -1
- package/dist/component/accountClosure/mutations.js +13 -0
- package/dist/component/accountClosure/mutations.js.map +1 -1
- package/dist/component/balanceFunding/internal/actions.d.ts +11 -11
- package/dist/component/balanceFunding/mutations.d.ts +43 -43
- package/dist/component/balanceFunding/workflowValidators.d.ts +16 -16
- package/dist/component/earnings/triggers.d.ts +288 -10
- package/dist/component/earnings/triggers.d.ts.map +1 -1
- package/dist/component/schema.d.ts +162 -9
- package/dist/component/schema.js +7 -0
- package/dist/component/schema.js.map +1 -1
- package/dist/component/usage/mutations.d.ts.map +1 -1
- package/dist/component/usage/mutations.js +4 -0
- package/dist/component/usage/mutations.js.map +1 -1
- package/dist/component/usage/queries.d.ts +2 -2
- package/dist/component/usage/schema.d.ts +21 -15
- package/dist/component/usage/schema.d.ts.map +1 -1
- package/dist/component/usage/schema.js +4 -2
- package/dist/component/usage/schema.js.map +1 -1
- package/dist/component/usageAllowance/helpers.d.ts +78 -0
- package/dist/component/usageAllowance/helpers.d.ts.map +1 -0
- package/dist/component/usageAllowance/helpers.js +99 -0
- package/dist/component/usageAllowance/helpers.js.map +1 -0
- package/dist/component/usageAllowance/mutations.d.ts +37 -0
- package/dist/component/usageAllowance/mutations.d.ts.map +1 -0
- package/dist/component/usageAllowance/mutations.js +99 -0
- package/dist/component/usageAllowance/mutations.js.map +1 -0
- package/dist/component/usageAllowance/queries.d.ts +36 -0
- package/dist/component/usageAllowance/queries.d.ts.map +1 -0
- package/dist/component/usageAllowance/queries.js +122 -0
- package/dist/component/usageAllowance/queries.js.map +1 -0
- package/dist/component/usageAllowance/reservations.d.ts +25 -0
- package/dist/component/usageAllowance/reservations.d.ts.map +1 -0
- package/dist/component/usageAllowance/reservations.js +150 -0
- package/dist/component/usageAllowance/reservations.js.map +1 -0
- package/dist/component/usageAllowance/schema.d.ts +77 -0
- package/dist/component/usageAllowance/schema.d.ts.map +1 -0
- package/dist/component/usageAllowance/schema.js +32 -0
- package/dist/component/usageAllowance/schema.js.map +1 -0
- package/dist/component/usageCorrections/accounting.d.ts +5 -0
- package/dist/component/usageCorrections/accounting.d.ts.map +1 -0
- package/dist/component/usageCorrections/accounting.js +55 -0
- package/dist/component/usageCorrections/accounting.js.map +1 -0
- package/dist/component/usageCorrections/cancellation.d.ts +6 -0
- package/dist/component/usageCorrections/cancellation.d.ts.map +1 -0
- package/dist/component/usageCorrections/cancellation.js +29 -0
- package/dist/component/usageCorrections/cancellation.js.map +1 -0
- package/dist/component/usageCorrections/helpers.d.ts +60 -0
- package/dist/component/usageCorrections/helpers.d.ts.map +1 -0
- package/dist/component/usageCorrections/helpers.js +52 -0
- package/dist/component/usageCorrections/helpers.js.map +1 -0
- package/dist/component/usageCorrections/invoice.d.ts +38 -0
- package/dist/component/usageCorrections/invoice.d.ts.map +1 -0
- package/dist/component/usageCorrections/invoice.js +82 -0
- package/dist/component/usageCorrections/invoice.js.map +1 -0
- package/dist/component/usageCorrections/mutations.d.ts +121 -0
- package/dist/component/usageCorrections/mutations.d.ts.map +1 -0
- package/dist/component/usageCorrections/mutations.js +256 -0
- package/dist/component/usageCorrections/mutations.js.map +1 -0
- package/dist/component/usageCorrections/queries.d.ts +115 -0
- package/dist/component/usageCorrections/queries.d.ts.map +1 -0
- package/dist/component/usageCorrections/queries.js +84 -0
- package/dist/component/usageCorrections/queries.js.map +1 -0
- package/dist/component/usageCorrections/schema.d.ts +248 -0
- package/dist/component/usageCorrections/schema.d.ts.map +1 -0
- package/dist/component/usageCorrections/schema.js +74 -0
- package/dist/component/usageCorrections/schema.js.map +1 -0
- package/dist/component/usageCredits/queries.d.ts +1 -1
- package/dist/component/usageCredits/queries.d.ts.map +1 -1
- package/dist/component/usageCredits/queries.js +6 -0
- package/dist/component/usageCredits/queries.js.map +1 -1
- package/dist/component/usageCredits/schema.d.ts +5 -5
- package/dist/component/usageCredits/schema.d.ts.map +1 -1
- package/dist/component/usageCredits/schema.js +1 -1
- package/dist/component/usageCredits/schema.js.map +1 -1
- package/dist/component/usageDelivery/fields.d.ts +2 -2
- package/dist/component/usageDelivery/fields.d.ts.map +1 -1
- package/dist/component/usageDelivery/fields.js +1 -1
- package/dist/component/usageDelivery/fields.js.map +1 -1
- package/dist/component/usageDelivery/helpers.d.ts +7 -6
- package/dist/component/usageDelivery/helpers.d.ts.map +1 -1
- package/dist/component/usageDelivery/mutations.d.ts +6 -6
- package/dist/component/usageDelivery/mutations.d.ts.map +1 -1
- package/dist/component/usageDelivery/mutations.js +9 -1
- package/dist/component/usageDelivery/mutations.js.map +1 -1
- package/dist/component/usageDelivery/queries.d.ts +8 -6
- package/dist/component/usageDelivery/queries.d.ts.map +1 -1
- package/dist/component/usageDelivery/schema.d.ts +4 -4
- package/dist/component/usageDelivery/steps.d.ts +2 -2
- package/dist/component/usageDelivery/steps.js +1 -1
- package/dist/component/usageDelivery/steps.js.map +1 -1
- package/dist/component/usageObservations/queries.d.ts.map +1 -1
- package/dist/component/usageObservations/queries.js +4 -2
- package/dist/component/usageObservations/queries.js.map +1 -1
- package/dist/component/usageSubscriptions/retirement.d.ts.map +1 -1
- package/dist/component/usageSubscriptions/retirement.js +24 -2
- package/dist/component/usageSubscriptions/retirement.js.map +1 -1
- package/docs/README.md +4 -0
- package/docs/usage-corrections.md +249 -0
- package/docs/usage-limits.md +217 -0
- package/package.json +3 -1
- package/src/client/usage/allowanceClient.test.ts +93 -0
- package/src/client/usage/allowanceClient.ts +134 -0
- package/src/client/usage/allowanceTerms.test.ts +131 -0
- package/src/client/usage/allowanceTerms.ts +172 -0
- package/src/client/usage/client.ts +2 -2
- package/src/client/usage/correctionClient.test.ts +153 -0
- package/src/client/usage/correctionClient.ts +62 -0
- package/src/client/usage/correctionCredits.test.ts +156 -0
- package/src/client/usage/correctionEligibility.ts +14 -0
- package/src/client/usage/correctionInvoice.test.ts +127 -0
- package/src/client/usage/correctionInvoice.ts +269 -0
- package/src/client/usage/correctionInvoiceProof.ts +40 -0
- package/src/client/usage/correctionProofs.ts +40 -0
- package/src/client/usage/correctionProvider.ts +326 -0
- package/src/client/usage/correctionRead.ts +73 -0
- package/src/client/usage/correctionRecovery.test.ts +113 -0
- package/src/client/usage/correctionTerms.ts +98 -0
- package/src/client/usage/correctionTransport.fixtures.ts +372 -0
- package/src/client/usage/index.ts +19 -0
- package/src/client/usage/observationClient.ts +20 -6
- package/src/client/usage/records.ts +7 -1
- package/src/client/usage/summary.ts +12 -4
- package/src/client/usageExports.ts +19 -0
- package/src/component/_generated/api.ts +20 -0
- package/src/component/_generated/component.ts +423 -1
- package/src/component/accountClosure/mutations.ts +17 -0
- package/src/component/schema.ts +14 -0
- package/src/component/usage/allowance.test.ts +435 -0
- package/src/component/usage/mutations.ts +13 -0
- package/src/component/usage/schema.ts +6 -1
- package/src/component/usageAllowance/helpers.ts +137 -0
- package/src/component/usageAllowance/mutations.ts +139 -0
- package/src/component/usageAllowance/queries.ts +140 -0
- package/src/component/usageAllowance/reservations.ts +220 -0
- package/src/component/usageAllowance/schema.ts +37 -0
- package/src/component/usageCorrections/accounting.ts +79 -0
- package/src/component/usageCorrections/cancellation.ts +32 -0
- package/src/component/usageCorrections/corrections.test.ts +389 -0
- package/src/component/usageCorrections/helpers.ts +57 -0
- package/src/component/usageCorrections/invoice.ts +103 -0
- package/src/component/usageCorrections/mutations.ts +278 -0
- package/src/component/usageCorrections/queries.ts +94 -0
- package/src/component/usageCorrections/schema.ts +90 -0
- package/src/component/usageCredits/queries.ts +4 -0
- package/src/component/usageCredits/schema.ts +1 -0
- package/src/component/usageDelivery/fields.ts +1 -0
- package/src/component/usageDelivery/mutations.ts +8 -3
- package/src/component/usageDelivery/steps.ts +1 -1
- package/src/component/usageObservations/queries.ts +5 -2
- package/src/component/usageSubscriptions/retirement.ts +31 -2
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
import { internalMutationGeneric } from "convex/server";
|
|
2
|
+
import { v } from "convex/values";
|
|
3
|
+
import { schema, modules } from "../../test.js";
|
|
4
|
+
import { vi } from "vitest";
|
|
5
|
+
import { BetterStripe } from "../index.js";
|
|
6
|
+
import { componentRef } from "../webhooks/helpers.js";
|
|
7
|
+
import { fixture } from "./subscriptionTransport.fixtures.js";
|
|
8
|
+
import { request } from "./subscription.fixtures.js";
|
|
9
|
+
const response = (value) => new Response(JSON.stringify(value), {
|
|
10
|
+
headers: { "content-type": "application/json" },
|
|
11
|
+
});
|
|
12
|
+
export async function setupCorrection(withAllowance = false, periodEnd = 1200) {
|
|
13
|
+
vi.useFakeTimers();
|
|
14
|
+
vi.setSystemTime(700000);
|
|
15
|
+
const state = {
|
|
16
|
+
advanceAtInvoiceRead: 0,
|
|
17
|
+
status: "pending",
|
|
18
|
+
missingEvidence: false,
|
|
19
|
+
failFirstAdjustment: false,
|
|
20
|
+
invalidCash: false,
|
|
21
|
+
paidAdjustment: false,
|
|
22
|
+
refundSucceeded: true,
|
|
23
|
+
voidedNote: false,
|
|
24
|
+
truncatedNote: false,
|
|
25
|
+
foreignLine: false,
|
|
26
|
+
finalizeOnAdjust: false,
|
|
27
|
+
finalized: false,
|
|
28
|
+
creditNoteAmount: 4,
|
|
29
|
+
foreignNote: false,
|
|
30
|
+
};
|
|
31
|
+
const calls = [];
|
|
32
|
+
const f = fixture(false, false, async (input, init) => {
|
|
33
|
+
const path = new URL(input).pathname;
|
|
34
|
+
if (path === "/v1/credit_notes/cn_fix")
|
|
35
|
+
return response({
|
|
36
|
+
id: "cn_fix",
|
|
37
|
+
object: "credit_note",
|
|
38
|
+
livemode: false,
|
|
39
|
+
customer_account: state.foreignNote ? "acct_other" : "acct_buyer",
|
|
40
|
+
customer: "cus_buyer",
|
|
41
|
+
invoice: "in_usage",
|
|
42
|
+
currency: "usd",
|
|
43
|
+
status: state.voidedNote ? "void" : "issued",
|
|
44
|
+
amount: state.creditNoteAmount,
|
|
45
|
+
total: state.creditNoteAmount,
|
|
46
|
+
subtotal: state.creditNoteAmount,
|
|
47
|
+
discount_amount: 0,
|
|
48
|
+
amount_shipping: 0,
|
|
49
|
+
total_taxes: state.missingEvidence ? undefined : [],
|
|
50
|
+
pre_payment_amount: state.paidAdjustment ? 0 : state.creditNoteAmount,
|
|
51
|
+
post_payment_amount: state.paidAdjustment ? state.creditNoteAmount : 0,
|
|
52
|
+
customer_balance_transaction: null,
|
|
53
|
+
out_of_band_amount: 0,
|
|
54
|
+
refunds: state.paidAdjustment
|
|
55
|
+
? [
|
|
56
|
+
{
|
|
57
|
+
type: "refund",
|
|
58
|
+
refund: "re_fix",
|
|
59
|
+
amount_refunded: state.creditNoteAmount,
|
|
60
|
+
},
|
|
61
|
+
]
|
|
62
|
+
: [],
|
|
63
|
+
pretax_credit_amounts: [],
|
|
64
|
+
lines: {
|
|
65
|
+
has_more: state.truncatedNote,
|
|
66
|
+
data: [
|
|
67
|
+
{
|
|
68
|
+
id: "cnli_fix",
|
|
69
|
+
type: "invoice_line_item",
|
|
70
|
+
invoice_line_item: "il_usage",
|
|
71
|
+
amount: state.creditNoteAmount,
|
|
72
|
+
livemode: false,
|
|
73
|
+
discount_amount: 0,
|
|
74
|
+
taxes: [],
|
|
75
|
+
pretax_credit_amounts: [],
|
|
76
|
+
},
|
|
77
|
+
],
|
|
78
|
+
},
|
|
79
|
+
});
|
|
80
|
+
if (path === "/v1/invoices/in_usage")
|
|
81
|
+
return response({
|
|
82
|
+
id: "in_usage",
|
|
83
|
+
object: "invoice",
|
|
84
|
+
livemode: false,
|
|
85
|
+
customer_account: "acct_buyer",
|
|
86
|
+
customer: "cus_buyer",
|
|
87
|
+
currency: "usd",
|
|
88
|
+
status: state.paidAdjustment ? "paid" : "open",
|
|
89
|
+
status_transitions: { finalized_at: 701 },
|
|
90
|
+
parent: {
|
|
91
|
+
type: "subscription_details",
|
|
92
|
+
subscription_details: { subscription: "sub_calls" },
|
|
93
|
+
},
|
|
94
|
+
lines: {
|
|
95
|
+
has_more: false,
|
|
96
|
+
data: [
|
|
97
|
+
{
|
|
98
|
+
id: "il_usage",
|
|
99
|
+
amount: 12,
|
|
100
|
+
currency: "usd",
|
|
101
|
+
pricing: {
|
|
102
|
+
price_details: {
|
|
103
|
+
price: state.foreignLine ? "price_other" : "price_calls",
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
period: { start: 600, end: periodEnd },
|
|
107
|
+
parent: {
|
|
108
|
+
subscription_item_details: {
|
|
109
|
+
subscription_item: "si_calls",
|
|
110
|
+
subscription: "sub_calls",
|
|
111
|
+
proration: false,
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
quantity_decimal: state.missingEvidence ? undefined : "6",
|
|
115
|
+
pretax_credit_amounts: [],
|
|
116
|
+
discount_amounts: [],
|
|
117
|
+
taxes: [],
|
|
118
|
+
},
|
|
119
|
+
],
|
|
120
|
+
},
|
|
121
|
+
});
|
|
122
|
+
if (path === "/v1/refunds/re_fix")
|
|
123
|
+
return response({
|
|
124
|
+
id: "re_fix",
|
|
125
|
+
object: "refund",
|
|
126
|
+
status: state.refundSucceeded ? "succeeded" : "pending",
|
|
127
|
+
amount: state.creditNoteAmount,
|
|
128
|
+
currency: "usd",
|
|
129
|
+
payment_intent: "pi_invoice",
|
|
130
|
+
charge: "ch_invoice",
|
|
131
|
+
});
|
|
132
|
+
if (path === "/v1/payment_intents/pi_invoice")
|
|
133
|
+
return response({
|
|
134
|
+
id: "pi_invoice",
|
|
135
|
+
object: "payment_intent",
|
|
136
|
+
livemode: false,
|
|
137
|
+
customer_account: "acct_buyer",
|
|
138
|
+
customer: "cus_buyer",
|
|
139
|
+
status: "succeeded",
|
|
140
|
+
currency: "usd",
|
|
141
|
+
amount: 12,
|
|
142
|
+
amount_received: 12,
|
|
143
|
+
latest_charge: "ch_invoice",
|
|
144
|
+
});
|
|
145
|
+
if (path === "/v1/charges/ch_invoice")
|
|
146
|
+
return response({
|
|
147
|
+
id: "ch_invoice",
|
|
148
|
+
object: "charge",
|
|
149
|
+
payment_intent: "pi_invoice",
|
|
150
|
+
livemode: false,
|
|
151
|
+
customer: "cus_buyer",
|
|
152
|
+
currency: "usd",
|
|
153
|
+
paid: true,
|
|
154
|
+
captured: true,
|
|
155
|
+
status: "succeeded",
|
|
156
|
+
disputed: false,
|
|
157
|
+
amount: 12,
|
|
158
|
+
amount_captured: state.invalidCash ? 12.5 : 12,
|
|
159
|
+
amount_refunded: state.creditNoteAmount,
|
|
160
|
+
});
|
|
161
|
+
if (path === "/v1/invoice_payments")
|
|
162
|
+
return response({
|
|
163
|
+
has_more: false,
|
|
164
|
+
data: [
|
|
165
|
+
{
|
|
166
|
+
id: "inpay_usage",
|
|
167
|
+
object: "invoice_payment",
|
|
168
|
+
amount_requested: 12,
|
|
169
|
+
invoice: "in_usage",
|
|
170
|
+
status: "paid",
|
|
171
|
+
currency: "usd",
|
|
172
|
+
amount_paid: 12,
|
|
173
|
+
payment: { type: "payment_intent", payment_intent: "pi_invoice" },
|
|
174
|
+
},
|
|
175
|
+
],
|
|
176
|
+
});
|
|
177
|
+
if (path === "/v1/invoices") {
|
|
178
|
+
if (state.advanceAtInvoiceRead) {
|
|
179
|
+
vi.advanceTimersByTime(state.advanceAtInvoiceRead);
|
|
180
|
+
state.advanceAtInvoiceRead = 0;
|
|
181
|
+
}
|
|
182
|
+
return response({
|
|
183
|
+
data: state.finalized
|
|
184
|
+
? [
|
|
185
|
+
{
|
|
186
|
+
id: "in_usage",
|
|
187
|
+
livemode: false,
|
|
188
|
+
customer_account: "acct_buyer",
|
|
189
|
+
customer: "cus_buyer",
|
|
190
|
+
status: "open",
|
|
191
|
+
currency: "usd",
|
|
192
|
+
parent: {
|
|
193
|
+
type: "subscription_details",
|
|
194
|
+
subscription_details: { subscription: "sub_calls" },
|
|
195
|
+
},
|
|
196
|
+
status_transitions: { finalized_at: 701 },
|
|
197
|
+
lines: {
|
|
198
|
+
has_more: false,
|
|
199
|
+
data: [
|
|
200
|
+
{
|
|
201
|
+
pricing: { price_details: { price: "price_calls" } },
|
|
202
|
+
period: { start: 600, end: periodEnd },
|
|
203
|
+
quantity_decimal: state.missingEvidence ? undefined : "6",
|
|
204
|
+
},
|
|
205
|
+
],
|
|
206
|
+
},
|
|
207
|
+
},
|
|
208
|
+
]
|
|
209
|
+
: [],
|
|
210
|
+
has_more: false,
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
if (path === "/v1/billing/meter_event_adjustments") {
|
|
214
|
+
if (state.finalizeOnAdjust)
|
|
215
|
+
state.finalized = true;
|
|
216
|
+
const body = new URLSearchParams(String(init?.body));
|
|
217
|
+
calls.push({
|
|
218
|
+
body,
|
|
219
|
+
key: new Headers(init?.headers).get("idempotency-key"),
|
|
220
|
+
});
|
|
221
|
+
if (state.failFirstAdjustment) {
|
|
222
|
+
state.failFirstAdjustment = false;
|
|
223
|
+
throw new Error("private provider response sk_test_private");
|
|
224
|
+
}
|
|
225
|
+
return response({
|
|
226
|
+
object: "billing.meter_event_adjustment",
|
|
227
|
+
livemode: false,
|
|
228
|
+
status: state.status,
|
|
229
|
+
event_name: "calls",
|
|
230
|
+
type: "cancel",
|
|
231
|
+
cancel: { identifier: body.get("cancel[identifier]") },
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
return undefined;
|
|
235
|
+
});
|
|
236
|
+
f.t.registerComponent("betterStripe", schema, {
|
|
237
|
+
...modules,
|
|
238
|
+
"./component/testSetup.ts": () => Promise.resolve({
|
|
239
|
+
delivered: internalMutationGeneric({
|
|
240
|
+
args: { eventId: v.id("usageEvents") },
|
|
241
|
+
returns: v.null(),
|
|
242
|
+
handler: async (ctx, args) => {
|
|
243
|
+
const row = await ctx.db
|
|
244
|
+
.query("usageOutbox")
|
|
245
|
+
.withIndex("by_event", (q) => q.eq("eventId", args.eventId))
|
|
246
|
+
.unique();
|
|
247
|
+
await ctx.db.patch(row._id, {
|
|
248
|
+
state: "provider_accepted",
|
|
249
|
+
attempts: 1,
|
|
250
|
+
firstSendAt: 700,
|
|
251
|
+
definitionVersion: 1,
|
|
252
|
+
receipt: { identifier: row.providerIdentifier, created: 700 },
|
|
253
|
+
});
|
|
254
|
+
return null;
|
|
255
|
+
},
|
|
256
|
+
}),
|
|
257
|
+
}),
|
|
258
|
+
});
|
|
259
|
+
const client = new BetterStripe(f.component), options = {
|
|
260
|
+
stripeSecretKey: "sk_test_subscription",
|
|
261
|
+
httpClient: f.httpClient,
|
|
262
|
+
};
|
|
263
|
+
let managed = await f.t.action((ctx) => client.usage.ensureSubscription(ctx, request, options));
|
|
264
|
+
if (periodEnd !== 1200) {
|
|
265
|
+
for (const item of f.state.native.items.data)
|
|
266
|
+
item.current_period_end = periodEnd;
|
|
267
|
+
managed = await f.t.action((ctx) => client.usage.observeSubscription(ctx, {
|
|
268
|
+
scope: {
|
|
269
|
+
stripeAccountId: "acct_platform",
|
|
270
|
+
customerAccount: "acct_buyer",
|
|
271
|
+
livemode: false,
|
|
272
|
+
},
|
|
273
|
+
requestId: request.requestId,
|
|
274
|
+
}, options));
|
|
275
|
+
}
|
|
276
|
+
const original = managed.bindings[0];
|
|
277
|
+
if (withAllowance)
|
|
278
|
+
await f.t.action((ctx) => client.usage.configureAllowance(ctx, {
|
|
279
|
+
...original,
|
|
280
|
+
expectedRevision: 0,
|
|
281
|
+
policy: {
|
|
282
|
+
reset: "billing_period",
|
|
283
|
+
rollover: "none",
|
|
284
|
+
entitled: true,
|
|
285
|
+
overage: "allow",
|
|
286
|
+
limit: { mode: "hard", quantity: "12" },
|
|
287
|
+
},
|
|
288
|
+
}));
|
|
289
|
+
const event = {
|
|
290
|
+
scope: original.scope,
|
|
291
|
+
binding: original.binding,
|
|
292
|
+
sourceEventId: "work1",
|
|
293
|
+
quantity: "6",
|
|
294
|
+
occurredAt: 700,
|
|
295
|
+
};
|
|
296
|
+
const reservation = withAllowance
|
|
297
|
+
? await f.t.action((ctx) => client.usage.reserveAllowance(ctx, {
|
|
298
|
+
event,
|
|
299
|
+
subscription: original.subscription,
|
|
300
|
+
}))
|
|
301
|
+
: null;
|
|
302
|
+
const receipt = await f.t.action((ctx) => client.usage.record(ctx, {
|
|
303
|
+
event,
|
|
304
|
+
subscription: original.subscription,
|
|
305
|
+
...(reservation && reservation.state !== "denied"
|
|
306
|
+
? { reservationId: reservation.reservationId }
|
|
307
|
+
: {}),
|
|
308
|
+
}));
|
|
309
|
+
await f.t.action((ctx) => ctx.runMutation(componentRef(f.component, "testSetup/delivered"), {
|
|
310
|
+
eventId: receipt.eventId,
|
|
311
|
+
}));
|
|
312
|
+
const correction = {
|
|
313
|
+
scope: original.scope,
|
|
314
|
+
eventId: receipt.eventId,
|
|
315
|
+
correctionId: "fix1",
|
|
316
|
+
actor: "operator1",
|
|
317
|
+
reason: "duplicate activity",
|
|
318
|
+
operation: "cancel",
|
|
319
|
+
};
|
|
320
|
+
return { f, client, options, correction, receipt, calls, state, original };
|
|
321
|
+
}
|
|
322
|
+
//# sourceMappingURL=correctionTransport.fixtures.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"correctionTransport.fixtures.js","sourceRoot":"","sources":["../../../src/client/usage/correctionTransport.fixtures.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ export declare class UsageCreditClient extends UsageSubscriptionClient {
|
|
|
63
63
|
at: number;
|
|
64
64
|
evidenceJson: string;
|
|
65
65
|
fingerprint: string;
|
|
66
|
-
kind: "closure" | "commit" | "grant" | "observation" | "payment" | "purchase" | "recovery" | "release" | "reservation";
|
|
66
|
+
kind: "closure" | "commit" | "correction" | "grant" | "observation" | "payment" | "purchase" | "recovery" | "release" | "reservation";
|
|
67
67
|
purchaseKey?: string | undefined;
|
|
68
68
|
sourceKey: string;
|
|
69
69
|
}[];
|
|
@@ -18,4 +18,8 @@ export type { UsageSubscriptionInvoice } from "./subscriptionInvoiceSchema.js";
|
|
|
18
18
|
export { UsageSubscriptionError } from "./subscriptionErrors.js";
|
|
19
19
|
export { UsageCreditError } from "./creditTerms.js";
|
|
20
20
|
export type { UsageCreditBinding, UsageCreditPurchaseOptions, UsageCreditPurchase, UsageCreditBalance, } from "./creditTerms.js";
|
|
21
|
+
export type { UsageAllowanceBinding, UsageAllowanceStatus, UsageAllowanceReconciliation, UsageLimitPolicy, } from "./allowanceTerms.js";
|
|
22
|
+
export type { UsageAllowanceReservation } from "./allowanceClient.js";
|
|
23
|
+
export type { UsageCorrectionOptions, UsageCorrectionView, UsageInvoiceCorrectionOptions, UsageInvoiceCorrectionEvidence, } from "./correctionTerms.js";
|
|
24
|
+
export type { UsageCorrectionHistoryPage, UsageCorrectionHistoryRecord, } from "./correctionRead.js";
|
|
21
25
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/usage/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrE,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,YAAY,EACV,UAAU,EACV,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,EACtB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,4BAA4B,GAC7B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,YAAY,EACV,uBAAuB,EACvB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,YAAY,EACV,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,YAAY,EACV,kBAAkB,EAClB,0BAA0B,EAC1B,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/usage/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrE,YAAY,EACV,SAAS,EACT,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,YAAY,EACV,UAAU,EACV,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,sBAAsB,EACtB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,4BAA4B,GAC7B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,YAAY,EACV,uBAAuB,EACvB,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,YAAY,EACV,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,YAAY,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,YAAY,EACV,kBAAkB,EAClB,0BAA0B,EAC1B,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,4BAA4B,EAC5B,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEtE,YAAY,EACV,sBAAsB,EACtB,mBAAmB,EACnB,6BAA6B,EAC7B,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,qBAAqB,CAAC"}
|
|
@@ -59,9 +59,19 @@ export declare class UsageObservationClient extends UsageDeliveryClient {
|
|
|
59
59
|
retryable: boolean;
|
|
60
60
|
};
|
|
61
61
|
correctionHistory: {
|
|
62
|
+
status: "available";
|
|
63
|
+
observedAt: number;
|
|
64
|
+
value: import("./correctionRead.js").UsageCorrectionHistoryPage;
|
|
65
|
+
reason?: undefined;
|
|
66
|
+
retryable?: undefined;
|
|
67
|
+
legacyHistoryMissing?: undefined;
|
|
68
|
+
} | {
|
|
69
|
+
observedAt?: undefined;
|
|
70
|
+
value?: undefined;
|
|
62
71
|
status: "unsupported";
|
|
63
72
|
reason: string;
|
|
64
73
|
retryable: boolean;
|
|
74
|
+
legacyHistoryMissing: boolean;
|
|
65
75
|
};
|
|
66
76
|
}>;
|
|
67
77
|
reconcile(ctx: RunCtx, input: UsageReconciliationOptions, options: UsageDeliveryProviderOptions): Promise<{
|
|
@@ -74,9 +84,19 @@ export declare class UsageObservationClient extends UsageDeliveryClient {
|
|
|
74
84
|
retryable: boolean;
|
|
75
85
|
};
|
|
76
86
|
correctionHistory: {
|
|
87
|
+
status: "available";
|
|
88
|
+
observedAt: number;
|
|
89
|
+
value: import("./correctionRead.js").UsageCorrectionHistoryPage;
|
|
90
|
+
reason?: undefined;
|
|
91
|
+
retryable?: undefined;
|
|
92
|
+
legacyHistoryMissing?: undefined;
|
|
93
|
+
} | {
|
|
94
|
+
observedAt?: undefined;
|
|
95
|
+
value?: undefined;
|
|
77
96
|
status: "unsupported";
|
|
78
97
|
reason: string;
|
|
79
98
|
retryable: boolean;
|
|
99
|
+
legacyHistoryMissing: boolean;
|
|
80
100
|
};
|
|
81
101
|
}>;
|
|
82
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observationClient.d.ts","sourceRoot":"","sources":["../../../src/client/usage/observationClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"observationClient.d.ts","sourceRoot":"","sources":["../../../src/client/usage/observationClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAG5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAE1E,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,yBAAyB,EAC/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAA4B,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE7E,MAAM,MAAM,0BAA0B,GAAG,uBAAuB,GAAG;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,8EAA8E;AAC9E,qBAAa,sBAAuB,SAAQ,mBAAmB;IACvD,UAAU,CACd,GAAG,EAAE,MAAM,EACX,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,WAAW,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GACrE,OAAO,CAAC,iBAAiB,CAAC,CAY5B;IACK,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,yBAAyB,CAAC,CA0BpC;IACK,oBAAoB,CACxB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,yBAAyB,CAAC,CA4BpC;IACK,mBAAmB,CACvB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,gBAAgB,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;;;;;;;;;;;OAkCnE;IACK,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,gBAAgB,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;;;;;;;;OA+BnE;IACK,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,uBAAuB,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,OAAO,EAAE,4BAA4B,mHAgBtC;IACK,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,0BAA0B;;;;;YAqBhE,MAAM,EAAE,aAAa;YACrB,MAAM;YACN,SAAS;;;oBAIG,WAAW;;;;;;;;;oBAKX,aAAa;;;;;OAM9B;IACK,SAAS,CACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,0BAA0B,EACjC,OAAO,EAAE,4BAA4B;;;;;YArBjC,MAAM,EAAE,aAAa;YACrB,MAAM;YACN,SAAS;;;oBAIG,WAAW;;;;;;;;;oBAKX,aAAa;;;;;OAc9B;CACF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readCorrectionEvidence } from "./correctionRead.js";
|
|
1
2
|
import { observeUsageInvoice } from "./invoiceObservation.js";
|
|
2
3
|
import Stripe from "stripe";
|
|
3
4
|
import { runMutationOrThrow } from "../helpers.js";
|
|
@@ -125,13 +126,19 @@ export class UsageObservationClient extends UsageDeliveryClient {
|
|
|
125
126
|
}
|
|
126
127
|
async getReconciliation(ctx, input) {
|
|
127
128
|
const opts = observationOptions(input);
|
|
128
|
-
const [local, aggregate] = await Promise.all([
|
|
129
|
+
const [local, aggregate, corrections] = await Promise.all([
|
|
129
130
|
this.getSummary(ctx, {
|
|
130
131
|
scope: opts.scope,
|
|
131
132
|
period: opts.period,
|
|
132
133
|
maxRecords: input.maxRecords,
|
|
133
134
|
}),
|
|
134
135
|
this.getProviderUsage(ctx, input),
|
|
136
|
+
readCorrectionEvidence(this.component, ctx, {
|
|
137
|
+
scope: opts.scope,
|
|
138
|
+
period: opts.period,
|
|
139
|
+
limit: 100,
|
|
140
|
+
cursor: null,
|
|
141
|
+
}),
|
|
135
142
|
]);
|
|
136
143
|
return {
|
|
137
144
|
local,
|
|
@@ -142,11 +149,18 @@ export class UsageObservationClient extends UsageDeliveryClient {
|
|
|
142
149
|
reason: "invoice_not_observed",
|
|
143
150
|
retryable: true,
|
|
144
151
|
},
|
|
145
|
-
correctionHistory:
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
152
|
+
correctionHistory: corrections.records.length
|
|
153
|
+
? {
|
|
154
|
+
status: "available",
|
|
155
|
+
observedAt: Math.floor(Date.now() / 1000),
|
|
156
|
+
value: corrections,
|
|
157
|
+
}
|
|
158
|
+
: {
|
|
159
|
+
status: "unsupported",
|
|
160
|
+
reason: "corrections_not_configured",
|
|
161
|
+
retryable: false,
|
|
162
|
+
legacyHistoryMissing: corrections.legacyHistoryMissing,
|
|
163
|
+
},
|
|
150
164
|
};
|
|
151
165
|
}
|
|
152
166
|
async reconcile(ctx, input, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observationClient.js","sourceRoot":"","sources":["../../../src/client/usage/observationClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"observationClient.js","sourceRoot":"","sources":["../../../src/client/usage/observationClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ export type PreparedUsageRecord = Omit<z.infer<typeof recordSchema>, "quantity"
|
|
|
38
38
|
plan: UsagePlan;
|
|
39
39
|
};
|
|
40
40
|
};
|
|
41
|
-
export type UsageDeliveryState = "queued" | "sending" | "provider_accepted" | "rejected" | "unknown" | "held";
|
|
41
|
+
export type UsageDeliveryState = "canceled" | "queued" | "sending" | "provider_accepted" | "rejected" | "unknown" | "held";
|
|
42
42
|
/**
|
|
43
43
|
* Validate and snapshot a record before acceptance. This pure helper does not
|
|
44
44
|
* authorize an actor, verify provider ownership, persist or deliver anything.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../../src/client/usage/records.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAGL,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAC;AAExB,eAAO,MAAM,WAAW;;;;;kBAKtB,CAAC;AACH,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;kBAchB,CAAC;AAEH,4EAA4E;AAC5E,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AACrD,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,EAC5B,UAAU,GAAG,SAAS,CACvB,GAAG;IACF,aAAa,EAAE,CAAC,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GAAG;QAC/D,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC;CACH,CAAC;AACF,MAAM,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../../src/client/usage/records.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAGL,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAC;AAExB,eAAO,MAAM,WAAW;;;;;kBAKtB,CAAC;AACH,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;kBAchB,CAAC;AAEH,4EAA4E;AAC5E,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AACrD,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,EAC5B,UAAU,GAAG,SAAS,CACvB,GAAG;IACF,aAAa,EAAE,CAAC,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GAAG;QAC/D,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC;CACH,CAAC;AACF,MAAM,MAAM,kBAAkB,GAC1B,UAAU,GACV,QAAQ,GACR,SAAS,GACT,mBAAmB,GACnB,UAAU,GACV,SAAS,GACT,MAAM,CAAC;AAEX;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAqBtE;AASD,oFAAoF;AACpF,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAgB5E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.js","sourceRoot":"","sources":["../../../src/client/usage/records.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,mCAAmC,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EACL,eAAe,EACf,kBAAkB,GAEnB,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,YAAY,CAAC;IACxC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC;IACxD,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC;IACxD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC;IAChD,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;CACtB,CAAC,CAAC;AACH,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC;IAClC,KAAK,EAAE,WAAW;IAClB,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC;QACtB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC;QACxD,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC;QACvD,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;QACrC,UAAU,EAAE,CAAC;aACV,IAAI,CAAC,CAAC,kBAAkB,EAAE,mCAAmC,CAAC,CAAC;aAC/D,OAAO,CAAC,kBAAkB,CAAC;QAC9B,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;KAClB,CAAC;IACF,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IACzC,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;IACrB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC;CACxE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"records.js","sourceRoot":"","sources":["../../../src/client/usage/records.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,9 @@ export type UsageLocalGroup = {
|
|
|
18
18
|
acceptedScaledQuantity: string;
|
|
19
19
|
providerAcceptedScaledQuantity: string;
|
|
20
20
|
acceptedQuantity: string;
|
|
21
|
+
canceledQuantity: string;
|
|
22
|
+
effectiveQuantity: string;
|
|
23
|
+
effectiveScaledQuantity: string;
|
|
21
24
|
providerAcceptedQuantity: string;
|
|
22
25
|
eventCount: number;
|
|
23
26
|
validationErrorEventCount: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../src/client/usage/summary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,YAAY,EAAE,wBAAwB,CAAC;IACvC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACxC,YAAY,EAAE,wBAAwB,CAAC;IACvC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,8BAA8B,EAAE,MAAM,CAAC;IACvC,gBAAgB,EAAE,MAAM,CAAC;IACzB,wBAAwB,EAAE,MAAM,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,yBAAyB,EAAE,MAAM,CAAC;IAClC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACvD,QAAQ,EAAE,iBAAiB,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzE,QAAQ,EAAE,iBAAiB,CAAC;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,OAAO,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CAChD,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B,CAAC;AACF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAM1E;
|
|
1
|
+
{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../src/client/usage/summary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,KAAK,EACV,iBAAiB,EACjB,WAAW,EACX,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,YAAY,EAAE,wBAAwB,CAAC;IACvC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACxC,YAAY,EAAE,wBAAwB,CAAC;IACvC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,8BAA8B,EAAE,MAAM,CAAC;IACvC,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,wBAAwB,EAAE,MAAM,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,yBAAyB,EAAE,MAAM,CAAC;IAClC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACvD,QAAQ,EAAE,iBAAiB,CAAC;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzE,QAAQ,EAAE,iBAAiB,CAAC;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,OAAO,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CAChD,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B,CAAC;AACF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAM1E;AAuBD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,iBAAiB,EAAE,EAC3B,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACtE,iBAAiB,CAkHnB"}
|
|
@@ -16,6 +16,7 @@ const unavailable = (reason) => ({
|
|
|
16
16
|
retryable: false,
|
|
17
17
|
});
|
|
18
18
|
const states = [
|
|
19
|
+
"canceled",
|
|
19
20
|
"queued",
|
|
20
21
|
"sending",
|
|
21
22
|
"provider_accepted",
|
|
@@ -41,7 +42,8 @@ export function summarizeUsageRecords(events, options) {
|
|
|
41
42
|
const fullPeriod = options.period.start === subscription.period.start &&
|
|
42
43
|
options.period.end === subscription.period.end;
|
|
43
44
|
const eligible = options.complete && (plan.model !== "included_overage" || fullPeriod);
|
|
44
|
-
|
|
45
|
+
const effective = accepted - sums.canceled;
|
|
46
|
+
let chargeable = effective;
|
|
45
47
|
let included = unavailable(plan.model === "included_overage"
|
|
46
48
|
? options.complete
|
|
47
49
|
? "partial_billing_period"
|
|
@@ -49,14 +51,14 @@ export function summarizeUsageRecords(events, options) {
|
|
|
49
51
|
: "not_included_model");
|
|
50
52
|
if (plan.model === "included_overage" && eligible) {
|
|
51
53
|
const allowance = BigInt(parseUsageQuantity(plan.includedQuantity, precision).scaledQuantity);
|
|
52
|
-
chargeable =
|
|
54
|
+
chargeable = effective > allowance ? effective - allowance : 0n;
|
|
53
55
|
included = {
|
|
54
56
|
status: "available",
|
|
55
57
|
observedAt: options.observedAt,
|
|
56
58
|
value: {
|
|
57
59
|
included: decimalFromScaled(allowance, precision),
|
|
58
|
-
consumed: decimalFromScaled(
|
|
59
|
-
remaining: decimalFromScaled(allowance >
|
|
60
|
+
consumed: decimalFromScaled(effective, precision),
|
|
61
|
+
remaining: decimalFromScaled(allowance > effective ? allowance - effective : 0n, precision),
|
|
60
62
|
overage: decimalFromScaled(chargeable, precision),
|
|
61
63
|
},
|
|
62
64
|
};
|
|
@@ -67,6 +69,9 @@ export function summarizeUsageRecords(events, options) {
|
|
|
67
69
|
acceptedScaledQuantity: accepted.toString(),
|
|
68
70
|
providerAcceptedScaledQuantity: sums.provider_accepted.toString(),
|
|
69
71
|
acceptedQuantity: decimalFromScaled(accepted, precision),
|
|
72
|
+
canceledQuantity: decimalFromScaled(sums.canceled, precision),
|
|
73
|
+
effectiveQuantity: decimalFromScaled(effective, precision),
|
|
74
|
+
effectiveScaledQuantity: effective.toString(),
|
|
70
75
|
providerAcceptedQuantity: decimalFromScaled(sums.provider_accepted, precision),
|
|
71
76
|
eventCount: values.length,
|
|
72
77
|
validationErrorEventCount: values.filter((v) => v.hasValidationError)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"summary.js","sourceRoot":"","sources":["../../../src/client/usage/summary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"summary.js","sourceRoot":"","sources":["../../../src/client/usage/summary.ts"],"names":[],"mappings":"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"}
|