@fantastic.dev/better-stripe 0.53.0 → 0.55.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 +1 -1
- package/dist/client/connect/payoutAdoptionTestHelpers.d.ts +226 -34
- package/dist/client/connect/payoutAdoptionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutExecutionTestHelpers.d.ts +97 -1
- package/dist/client/connect/payoutExecutionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutLargeAdoptionTestHelpers.d.ts +226 -34
- package/dist/client/connect/payoutLargeAdoptionTestHelpers.d.ts.map +1 -1
- package/dist/client/connect/payoutSyncTestHelpers.d.ts +97 -1
- package/dist/client/connect/payoutSyncTestHelpers.d.ts.map +1 -1
- package/dist/client/index.d.ts +8 -0
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +1 -0
- package/dist/client/index.js.map +1 -1
- 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 +3 -3
- package/dist/client/usage/client.js.map +1 -1
- package/dist/client/usage/deliveryClient.d.ts +64 -0
- package/dist/client/usage/deliveryClient.d.ts.map +1 -0
- package/dist/client/usage/deliveryClient.js +60 -0
- package/dist/client/usage/deliveryClient.js.map +1 -0
- package/dist/client/usage/deliveryProtocol.d.ts +130 -0
- package/dist/client/usage/deliveryProtocol.d.ts.map +1 -0
- package/dist/client/usage/deliveryProtocol.js +21 -0
- package/dist/client/usage/deliveryProtocol.js.map +1 -0
- package/dist/client/usage/deliveryProvider.d.ts +32 -0
- package/dist/client/usage/deliveryProvider.d.ts.map +1 -0
- package/dist/client/usage/deliveryProvider.js +127 -0
- package/dist/client/usage/deliveryProvider.js.map +1 -0
- package/dist/client/usage/index.d.ts +8 -0
- package/dist/client/usage/index.d.ts.map +1 -1
- package/dist/client/usage/index.js +1 -0
- package/dist/client/usage/index.js.map +1 -1
- package/dist/client/usage/invoiceObservation.d.ts +38 -0
- package/dist/client/usage/invoiceObservation.d.ts.map +1 -0
- package/dist/client/usage/invoiceObservation.js +157 -0
- package/dist/client/usage/invoiceObservation.js.map +1 -0
- package/dist/client/usage/observationClient.d.ts +83 -0
- package/dist/client/usage/observationClient.d.ts.map +1 -0
- package/dist/client/usage/observationClient.js +157 -0
- package/dist/client/usage/observationClient.js.map +1 -0
- package/dist/client/usage/observationTypes.d.ts +63 -0
- package/dist/client/usage/observationTypes.d.ts.map +1 -0
- package/dist/client/usage/observationTypes.js +59 -0
- package/dist/client/usage/observationTypes.js.map +1 -0
- package/dist/client/usage/providerObservation.d.ts +4 -0
- package/dist/client/usage/providerObservation.d.ts.map +1 -0
- package/dist/client/usage/providerObservation.js +96 -0
- package/dist/client/usage/providerObservation.js.map +1 -0
- package/dist/client/usage/reconciliation.d.ts +12 -0
- package/dist/client/usage/reconciliation.d.ts.map +1 -0
- package/dist/client/usage/reconciliation.js +48 -0
- package/dist/client/usage/reconciliation.js.map +1 -0
- package/dist/client/usage/summary.d.ts +50 -0
- package/dist/client/usage/summary.d.ts.map +1 -0
- package/dist/client/usage/summary.js +110 -0
- package/dist/client/usage/summary.js.map +1 -0
- package/dist/client/webhooks/handler.d.ts.map +1 -1
- package/dist/client/webhooks/handler.js +2 -1
- package/dist/client/webhooks/handler.js.map +1 -1
- package/dist/client/webhooks/meterErrors.d.ts +5 -0
- package/dist/client/webhooks/meterErrors.d.ts.map +1 -0
- package/dist/client/webhooks/meterErrors.js +98 -0
- package/dist/client/webhooks/meterErrors.js.map +1 -0
- package/dist/client/webhooks/v2.d.ts.map +1 -1
- package/dist/client/webhooks/v2.js +5 -0
- package/dist/client/webhooks/v2.js.map +1 -1
- package/dist/component/_generated/api.d.ts +22 -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 +265 -0
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/component/balanceFunding/internal/actions.d.ts +11 -11
- package/dist/component/balanceFunding/mutations.d.ts +27 -27
- package/dist/component/balanceFunding/stateHandlers.d.ts +8 -8
- package/dist/component/earnings/triggers.d.ts +206 -18
- package/dist/component/earnings/triggers.d.ts.map +1 -1
- package/dist/component/schema.d.ts +97 -1
- package/dist/component/schema.js +6 -0
- package/dist/component/schema.js.map +1 -1
- package/dist/component/usage/schema.d.ts +101 -1
- package/dist/component/usage/schema.d.ts.map +1 -1
- package/dist/component/usage/schema.js +11 -2
- package/dist/component/usage/schema.js.map +1 -1
- package/dist/component/usageDelivery/bridge.d.ts +25 -0
- package/dist/component/usageDelivery/bridge.d.ts.map +1 -0
- package/dist/component/usageDelivery/bridge.js +45 -0
- package/dist/component/usageDelivery/bridge.js.map +1 -0
- package/dist/component/usageDelivery/fields.d.ts +79 -0
- package/dist/component/usageDelivery/fields.d.ts.map +1 -0
- package/dist/component/usageDelivery/fields.js +39 -0
- package/dist/component/usageDelivery/fields.js.map +1 -0
- package/dist/component/usageDelivery/helpers.d.ts +84 -0
- package/dist/component/usageDelivery/helpers.d.ts.map +1 -0
- package/dist/component/usageDelivery/helpers.js +63 -0
- package/dist/component/usageDelivery/helpers.js.map +1 -0
- package/dist/component/usageDelivery/mutations.d.ts +97 -0
- package/dist/component/usageDelivery/mutations.d.ts.map +1 -0
- package/dist/component/usageDelivery/mutations.js +160 -0
- package/dist/component/usageDelivery/mutations.js.map +1 -0
- package/dist/component/usageDelivery/queries.d.ts +115 -0
- package/dist/component/usageDelivery/queries.d.ts.map +1 -0
- package/dist/component/usageDelivery/queries.js +22 -0
- package/dist/component/usageDelivery/queries.js.map +1 -0
- package/dist/component/usageDelivery/schema.d.ts +79 -0
- package/dist/component/usageDelivery/schema.d.ts.map +1 -0
- package/dist/component/usageDelivery/schema.js +30 -0
- package/dist/component/usageDelivery/schema.js.map +1 -0
- package/dist/component/usageDelivery/steps.d.ts +85 -0
- package/dist/component/usageDelivery/steps.d.ts.map +1 -0
- package/dist/component/usageDelivery/steps.js +161 -0
- package/dist/component/usageDelivery/steps.js.map +1 -0
- package/dist/component/usageDelivery/workflow.d.ts +15 -0
- package/dist/component/usageDelivery/workflow.d.ts.map +1 -0
- package/dist/component/usageDelivery/workflow.js +28 -0
- package/dist/component/usageDelivery/workflow.js.map +1 -0
- package/dist/component/usageObservations/helpers.d.ts +38 -0
- package/dist/component/usageObservations/helpers.d.ts.map +1 -0
- package/dist/component/usageObservations/helpers.js +80 -0
- package/dist/component/usageObservations/helpers.js.map +1 -0
- package/dist/component/usageObservations/history.d.ts +6 -0
- package/dist/component/usageObservations/history.d.ts.map +1 -0
- package/dist/component/usageObservations/history.js +29 -0
- package/dist/component/usageObservations/history.js.map +1 -0
- package/dist/component/usageObservations/mutations.d.ts +6 -0
- package/dist/component/usageObservations/mutations.d.ts.map +1 -0
- package/dist/component/usageObservations/mutations.js +39 -0
- package/dist/component/usageObservations/mutations.js.map +1 -0
- package/dist/component/usageObservations/queries.d.ts +78 -0
- package/dist/component/usageObservations/queries.d.ts.map +1 -0
- package/dist/component/usageObservations/queries.js +131 -0
- package/dist/component/usageObservations/queries.js.map +1 -0
- package/dist/component/usageObservations/schema.d.ts +72 -0
- package/dist/component/usageObservations/schema.d.ts.map +1 -0
- package/dist/component/usageObservations/schema.js +29 -0
- package/dist/component/usageObservations/schema.js.map +1 -0
- package/docs/README.md +5 -1
- package/docs/metering-setup.md +3 -1
- package/docs/usage-delivery.md +143 -0
- package/docs/usage-observations.md +152 -0
- package/package.json +4 -2
- package/src/client/index.ts +34 -0
- package/src/client/usage/client.ts +5 -2
- package/src/client/usage/deliveryClient.ts +130 -0
- package/src/client/usage/deliveryProtocol.ts +26 -0
- package/src/client/usage/deliveryProvider.test.ts +207 -0
- package/src/client/usage/deliveryProvider.ts +155 -0
- package/src/client/usage/index.ts +31 -0
- package/src/client/usage/invoiceObservation.test.ts +195 -0
- package/src/client/usage/invoiceObservation.ts +203 -0
- package/src/client/usage/observationClient.ts +233 -0
- package/src/client/usage/observationTypes.ts +101 -0
- package/src/client/usage/providerObservation.test.ts +207 -0
- package/src/client/usage/providerObservation.ts +124 -0
- package/src/client/usage/reconciliation.test.ts +117 -0
- package/src/client/usage/reconciliation.ts +86 -0
- package/src/client/usage/summary.test.ts +222 -0
- package/src/client/usage/summary.ts +188 -0
- package/src/client/webhooks/handler.ts +2 -1
- package/src/client/webhooks/meterErrors.test.ts +164 -0
- package/src/client/webhooks/meterErrors.ts +118 -0
- package/src/client/webhooks/v2.ts +5 -0
- package/src/component/_generated/api.ts +22 -0
- package/src/component/_generated/component.ts +437 -0
- package/src/component/schema.ts +12 -0
- package/src/component/usage/schema.ts +11 -2
- package/src/component/usageDelivery/bridge.ts +56 -0
- package/src/component/usageDelivery/concurrency.test.ts +62 -0
- package/src/component/usageDelivery/fields.ts +60 -0
- package/src/component/usageDelivery/helpers.ts +77 -0
- package/src/component/usageDelivery/mutations.ts +210 -0
- package/src/component/usageDelivery/queries.ts +25 -0
- package/src/component/usageDelivery/schema.ts +33 -0
- package/src/component/usageDelivery/steps.ts +209 -0
- package/src/component/usageDelivery/workflow.test.ts +402 -0
- package/src/component/usageDelivery/workflow.ts +36 -0
- package/src/component/usageObservations/helpers.ts +95 -0
- package/src/component/usageObservations/history.test.ts +87 -0
- package/src/component/usageObservations/history.ts +39 -0
- package/src/component/usageObservations/mutations.ts +39 -0
- package/src/component/usageObservations/queries.test.ts +162 -0
- package/src/component/usageObservations/queries.ts +145 -0
- package/src/component/usageObservations/schema.ts +40 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isMeterErrorEvent, handleMeterErrorEvent } from "./meterErrors.js";
|
|
1
2
|
import { STRIPE_CUSTOMER_PREVIEW_API_VERSION } from "../apiVersion.js";
|
|
2
3
|
import type Stripe from "stripe";
|
|
3
4
|
|
|
@@ -44,6 +45,10 @@ export async function handleV2Event(
|
|
|
44
45
|
thinEvent: V2ThinEvent,
|
|
45
46
|
): Promise<string | null> {
|
|
46
47
|
const { stripe } = whCtx;
|
|
48
|
+
if (isMeterErrorEvent(thinEvent.type)) {
|
|
49
|
+
await handleMeterErrorEvent(whCtx, thinEvent);
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
47
52
|
|
|
48
53
|
if (!thinEvent.type.startsWith("v2.core.account")) {
|
|
49
54
|
console.info(`[better-stripe] Unhandled V2 event type: ${thinEvent.type}`);
|
|
@@ -167,6 +167,17 @@ import type * as usage_mutations from "../usage/mutations.js";
|
|
|
167
167
|
import type * as usage_queries from "../usage/queries.js";
|
|
168
168
|
import type * as usageCatalog_mutations from "../usageCatalog/mutations.js";
|
|
169
169
|
import type * as usageCatalog_queries from "../usageCatalog/queries.js";
|
|
170
|
+
import type * as usageDelivery_bridge from "../usageDelivery/bridge.js";
|
|
171
|
+
import type * as usageDelivery_fields from "../usageDelivery/fields.js";
|
|
172
|
+
import type * as usageDelivery_helpers from "../usageDelivery/helpers.js";
|
|
173
|
+
import type * as usageDelivery_mutations from "../usageDelivery/mutations.js";
|
|
174
|
+
import type * as usageDelivery_queries from "../usageDelivery/queries.js";
|
|
175
|
+
import type * as usageDelivery_steps from "../usageDelivery/steps.js";
|
|
176
|
+
import type * as usageDelivery_workflow from "../usageDelivery/workflow.js";
|
|
177
|
+
import type * as usageObservations_helpers from "../usageObservations/helpers.js";
|
|
178
|
+
import type * as usageObservations_history from "../usageObservations/history.js";
|
|
179
|
+
import type * as usageObservations_mutations from "../usageObservations/mutations.js";
|
|
180
|
+
import type * as usageObservations_queries from "../usageObservations/queries.js";
|
|
170
181
|
import type * as webhooks_mutations from "../webhooks/mutations.js";
|
|
171
182
|
import type * as webhooks_queries from "../webhooks/queries.js";
|
|
172
183
|
import type * as webhooks_validators from "../webhooks/validators.js";
|
|
@@ -338,6 +349,17 @@ const fullApi: ApiFromModules<{
|
|
|
338
349
|
"usage/queries": typeof usage_queries;
|
|
339
350
|
"usageCatalog/mutations": typeof usageCatalog_mutations;
|
|
340
351
|
"usageCatalog/queries": typeof usageCatalog_queries;
|
|
352
|
+
"usageDelivery/bridge": typeof usageDelivery_bridge;
|
|
353
|
+
"usageDelivery/fields": typeof usageDelivery_fields;
|
|
354
|
+
"usageDelivery/helpers": typeof usageDelivery_helpers;
|
|
355
|
+
"usageDelivery/mutations": typeof usageDelivery_mutations;
|
|
356
|
+
"usageDelivery/queries": typeof usageDelivery_queries;
|
|
357
|
+
"usageDelivery/steps": typeof usageDelivery_steps;
|
|
358
|
+
"usageDelivery/workflow": typeof usageDelivery_workflow;
|
|
359
|
+
"usageObservations/helpers": typeof usageObservations_helpers;
|
|
360
|
+
"usageObservations/history": typeof usageObservations_history;
|
|
361
|
+
"usageObservations/mutations": typeof usageObservations_mutations;
|
|
362
|
+
"usageObservations/queries": typeof usageObservations_queries;
|
|
341
363
|
"webhooks/mutations": typeof webhooks_mutations;
|
|
342
364
|
"webhooks/queries": typeof webhooks_queries;
|
|
343
365
|
"webhooks/validators": typeof webhooks_validators;
|
|
@@ -8454,6 +8454,443 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
8454
8454
|
>;
|
|
8455
8455
|
};
|
|
8456
8456
|
};
|
|
8457
|
+
usageDelivery: {
|
|
8458
|
+
mutations: {
|
|
8459
|
+
hold: FunctionReference<
|
|
8460
|
+
"mutation",
|
|
8461
|
+
"internal",
|
|
8462
|
+
{
|
|
8463
|
+
eventId: string;
|
|
8464
|
+
scope: {
|
|
8465
|
+
customerAccount: string;
|
|
8466
|
+
livemode: boolean;
|
|
8467
|
+
meterId: string;
|
|
8468
|
+
stripeAccountId: string;
|
|
8469
|
+
};
|
|
8470
|
+
},
|
|
8471
|
+
{
|
|
8472
|
+
attempts: number;
|
|
8473
|
+
eventId: string;
|
|
8474
|
+
held: boolean;
|
|
8475
|
+
providerIdentifier: string;
|
|
8476
|
+
reason?:
|
|
8477
|
+
| "rate_limited"
|
|
8478
|
+
| "provider_unavailable"
|
|
8479
|
+
| "provider_outcome_unknown"
|
|
8480
|
+
| "provider_rejected"
|
|
8481
|
+
| "retry_exhausted"
|
|
8482
|
+
| "delivery_window_expired"
|
|
8483
|
+
| "scope_busy"
|
|
8484
|
+
| "administrative_hold";
|
|
8485
|
+
receipt?: { created: number; identifier: string };
|
|
8486
|
+
state:
|
|
8487
|
+
| "queued"
|
|
8488
|
+
| "sending"
|
|
8489
|
+
| "provider_accepted"
|
|
8490
|
+
| "rejected"
|
|
8491
|
+
| "unknown"
|
|
8492
|
+
| "held";
|
|
8493
|
+
validationErrors: Array<{
|
|
8494
|
+
code:
|
|
8495
|
+
| "meter_event_customer_not_found"
|
|
8496
|
+
| "meter_event_no_customer_defined"
|
|
8497
|
+
| "meter_event_dimension_count_too_high"
|
|
8498
|
+
| "archived_meter"
|
|
8499
|
+
| "timestamp_too_far_in_past"
|
|
8500
|
+
| "timestamp_in_future"
|
|
8501
|
+
| "meter_event_value_not_found"
|
|
8502
|
+
| "meter_event_invalid_value"
|
|
8503
|
+
| "no_meter";
|
|
8504
|
+
observedAt: number;
|
|
8505
|
+
providerEventId: string;
|
|
8506
|
+
}>;
|
|
8507
|
+
validationHistoryComplete: boolean;
|
|
8508
|
+
},
|
|
8509
|
+
Name
|
|
8510
|
+
>;
|
|
8511
|
+
recordErrorReport: FunctionReference<
|
|
8512
|
+
"mutation",
|
|
8513
|
+
"internal",
|
|
8514
|
+
{
|
|
8515
|
+
livemode: boolean;
|
|
8516
|
+
meterId?: string;
|
|
8517
|
+
providerEventId: string;
|
|
8518
|
+
samples: Array<{
|
|
8519
|
+
code:
|
|
8520
|
+
| "meter_event_customer_not_found"
|
|
8521
|
+
| "meter_event_no_customer_defined"
|
|
8522
|
+
| "meter_event_dimension_count_too_high"
|
|
8523
|
+
| "archived_meter"
|
|
8524
|
+
| "timestamp_too_far_in_past"
|
|
8525
|
+
| "timestamp_in_future"
|
|
8526
|
+
| "meter_event_value_not_found"
|
|
8527
|
+
| "meter_event_invalid_value"
|
|
8528
|
+
| "no_meter";
|
|
8529
|
+
identifier: string;
|
|
8530
|
+
}>;
|
|
8531
|
+
stripeAccountId: string;
|
|
8532
|
+
truncated: boolean;
|
|
8533
|
+
},
|
|
8534
|
+
{ matched: number; truncated: boolean; unattributed: number },
|
|
8535
|
+
Name
|
|
8536
|
+
>;
|
|
8537
|
+
resume: FunctionReference<
|
|
8538
|
+
"mutation",
|
|
8539
|
+
"internal",
|
|
8540
|
+
{
|
|
8541
|
+
eventId: string;
|
|
8542
|
+
scope: {
|
|
8543
|
+
customerAccount: string;
|
|
8544
|
+
livemode: boolean;
|
|
8545
|
+
meterId: string;
|
|
8546
|
+
stripeAccountId: string;
|
|
8547
|
+
};
|
|
8548
|
+
},
|
|
8549
|
+
{
|
|
8550
|
+
attempts: number;
|
|
8551
|
+
eventId: string;
|
|
8552
|
+
held: boolean;
|
|
8553
|
+
providerIdentifier: string;
|
|
8554
|
+
reason?:
|
|
8555
|
+
| "rate_limited"
|
|
8556
|
+
| "provider_unavailable"
|
|
8557
|
+
| "provider_outcome_unknown"
|
|
8558
|
+
| "provider_rejected"
|
|
8559
|
+
| "retry_exhausted"
|
|
8560
|
+
| "delivery_window_expired"
|
|
8561
|
+
| "scope_busy"
|
|
8562
|
+
| "administrative_hold";
|
|
8563
|
+
receipt?: { created: number; identifier: string };
|
|
8564
|
+
state:
|
|
8565
|
+
| "queued"
|
|
8566
|
+
| "sending"
|
|
8567
|
+
| "provider_accepted"
|
|
8568
|
+
| "rejected"
|
|
8569
|
+
| "unknown"
|
|
8570
|
+
| "held";
|
|
8571
|
+
validationErrors: Array<{
|
|
8572
|
+
code:
|
|
8573
|
+
| "meter_event_customer_not_found"
|
|
8574
|
+
| "meter_event_no_customer_defined"
|
|
8575
|
+
| "meter_event_dimension_count_too_high"
|
|
8576
|
+
| "archived_meter"
|
|
8577
|
+
| "timestamp_too_far_in_past"
|
|
8578
|
+
| "timestamp_in_future"
|
|
8579
|
+
| "meter_event_value_not_found"
|
|
8580
|
+
| "meter_event_invalid_value"
|
|
8581
|
+
| "no_meter";
|
|
8582
|
+
observedAt: number;
|
|
8583
|
+
providerEventId: string;
|
|
8584
|
+
}>;
|
|
8585
|
+
validationHistoryComplete: boolean;
|
|
8586
|
+
},
|
|
8587
|
+
Name
|
|
8588
|
+
>;
|
|
8589
|
+
start: FunctionReference<
|
|
8590
|
+
"mutation",
|
|
8591
|
+
"internal",
|
|
8592
|
+
{
|
|
8593
|
+
definitionVersion: 1;
|
|
8594
|
+
eventId: string;
|
|
8595
|
+
provider: string;
|
|
8596
|
+
scope: {
|
|
8597
|
+
customerAccount: string;
|
|
8598
|
+
livemode: boolean;
|
|
8599
|
+
meterId: string;
|
|
8600
|
+
stripeAccountId: string;
|
|
8601
|
+
};
|
|
8602
|
+
},
|
|
8603
|
+
{
|
|
8604
|
+
attempts: number;
|
|
8605
|
+
eventId: string;
|
|
8606
|
+
held: boolean;
|
|
8607
|
+
providerIdentifier: string;
|
|
8608
|
+
reason?:
|
|
8609
|
+
| "rate_limited"
|
|
8610
|
+
| "provider_unavailable"
|
|
8611
|
+
| "provider_outcome_unknown"
|
|
8612
|
+
| "provider_rejected"
|
|
8613
|
+
| "retry_exhausted"
|
|
8614
|
+
| "delivery_window_expired"
|
|
8615
|
+
| "scope_busy"
|
|
8616
|
+
| "administrative_hold";
|
|
8617
|
+
receipt?: { created: number; identifier: string };
|
|
8618
|
+
state:
|
|
8619
|
+
| "queued"
|
|
8620
|
+
| "sending"
|
|
8621
|
+
| "provider_accepted"
|
|
8622
|
+
| "rejected"
|
|
8623
|
+
| "unknown"
|
|
8624
|
+
| "held";
|
|
8625
|
+
validationErrors: Array<{
|
|
8626
|
+
code:
|
|
8627
|
+
| "meter_event_customer_not_found"
|
|
8628
|
+
| "meter_event_no_customer_defined"
|
|
8629
|
+
| "meter_event_dimension_count_too_high"
|
|
8630
|
+
| "archived_meter"
|
|
8631
|
+
| "timestamp_too_far_in_past"
|
|
8632
|
+
| "timestamp_in_future"
|
|
8633
|
+
| "meter_event_value_not_found"
|
|
8634
|
+
| "meter_event_invalid_value"
|
|
8635
|
+
| "no_meter";
|
|
8636
|
+
observedAt: number;
|
|
8637
|
+
providerEventId: string;
|
|
8638
|
+
}>;
|
|
8639
|
+
validationHistoryComplete: boolean;
|
|
8640
|
+
},
|
|
8641
|
+
Name
|
|
8642
|
+
>;
|
|
8643
|
+
};
|
|
8644
|
+
queries: {
|
|
8645
|
+
get: FunctionReference<
|
|
8646
|
+
"query",
|
|
8647
|
+
"internal",
|
|
8648
|
+
{
|
|
8649
|
+
eventId: string;
|
|
8650
|
+
scope: {
|
|
8651
|
+
customerAccount: string;
|
|
8652
|
+
livemode: boolean;
|
|
8653
|
+
meterId: string;
|
|
8654
|
+
stripeAccountId: string;
|
|
8655
|
+
};
|
|
8656
|
+
},
|
|
8657
|
+
{
|
|
8658
|
+
attempts: number;
|
|
8659
|
+
eventId: string;
|
|
8660
|
+
held: boolean;
|
|
8661
|
+
providerIdentifier: string;
|
|
8662
|
+
reason?:
|
|
8663
|
+
| "rate_limited"
|
|
8664
|
+
| "provider_unavailable"
|
|
8665
|
+
| "provider_outcome_unknown"
|
|
8666
|
+
| "provider_rejected"
|
|
8667
|
+
| "retry_exhausted"
|
|
8668
|
+
| "delivery_window_expired"
|
|
8669
|
+
| "scope_busy"
|
|
8670
|
+
| "administrative_hold";
|
|
8671
|
+
receipt?: { created: number; identifier: string };
|
|
8672
|
+
state:
|
|
8673
|
+
| "queued"
|
|
8674
|
+
| "sending"
|
|
8675
|
+
| "provider_accepted"
|
|
8676
|
+
| "rejected"
|
|
8677
|
+
| "unknown"
|
|
8678
|
+
| "held";
|
|
8679
|
+
validationErrors: Array<{
|
|
8680
|
+
code:
|
|
8681
|
+
| "meter_event_customer_not_found"
|
|
8682
|
+
| "meter_event_no_customer_defined"
|
|
8683
|
+
| "meter_event_dimension_count_too_high"
|
|
8684
|
+
| "archived_meter"
|
|
8685
|
+
| "timestamp_too_far_in_past"
|
|
8686
|
+
| "timestamp_in_future"
|
|
8687
|
+
| "meter_event_value_not_found"
|
|
8688
|
+
| "meter_event_invalid_value"
|
|
8689
|
+
| "no_meter";
|
|
8690
|
+
observedAt: number;
|
|
8691
|
+
providerEventId: string;
|
|
8692
|
+
}>;
|
|
8693
|
+
validationHistoryComplete: boolean;
|
|
8694
|
+
},
|
|
8695
|
+
Name
|
|
8696
|
+
>;
|
|
8697
|
+
snapshot: FunctionReference<
|
|
8698
|
+
"query",
|
|
8699
|
+
"internal",
|
|
8700
|
+
{
|
|
8701
|
+
eventId: string;
|
|
8702
|
+
scope: {
|
|
8703
|
+
customerAccount: string;
|
|
8704
|
+
livemode: boolean;
|
|
8705
|
+
meterId: string;
|
|
8706
|
+
stripeAccountId: string;
|
|
8707
|
+
};
|
|
8708
|
+
},
|
|
8709
|
+
{
|
|
8710
|
+
event: {
|
|
8711
|
+
_creationTime: number;
|
|
8712
|
+
_id: string;
|
|
8713
|
+
acceptedAt: number;
|
|
8714
|
+
identity: string;
|
|
8715
|
+
occurredAt: number;
|
|
8716
|
+
recordJson: string;
|
|
8717
|
+
reservationId?: string;
|
|
8718
|
+
scopeKey: string;
|
|
8719
|
+
subscriptionJson: string;
|
|
8720
|
+
};
|
|
8721
|
+
outbox: {
|
|
8722
|
+
_creationTime: number;
|
|
8723
|
+
_id: string;
|
|
8724
|
+
attempts: number;
|
|
8725
|
+
definitionVersion?: 1;
|
|
8726
|
+
dispatch?: string;
|
|
8727
|
+
eventId: string;
|
|
8728
|
+
firstSendAt?: number;
|
|
8729
|
+
held?: boolean;
|
|
8730
|
+
historySequence?: number;
|
|
8731
|
+
leaseUntil?: number;
|
|
8732
|
+
nextAttemptAt: number;
|
|
8733
|
+
provider?: string;
|
|
8734
|
+
providerIdentifier: string;
|
|
8735
|
+
reason?:
|
|
8736
|
+
| "rate_limited"
|
|
8737
|
+
| "provider_unavailable"
|
|
8738
|
+
| "provider_outcome_unknown"
|
|
8739
|
+
| "provider_rejected"
|
|
8740
|
+
| "retry_exhausted"
|
|
8741
|
+
| "delivery_window_expired"
|
|
8742
|
+
| "scope_busy"
|
|
8743
|
+
| "administrative_hold";
|
|
8744
|
+
receipt?: { created: number; identifier: string };
|
|
8745
|
+
scopeKey: string;
|
|
8746
|
+
state:
|
|
8747
|
+
| "queued"
|
|
8748
|
+
| "sending"
|
|
8749
|
+
| "provider_accepted"
|
|
8750
|
+
| "rejected"
|
|
8751
|
+
| "unknown"
|
|
8752
|
+
| "held";
|
|
8753
|
+
workflowId?: string;
|
|
8754
|
+
};
|
|
8755
|
+
},
|
|
8756
|
+
Name
|
|
8757
|
+
>;
|
|
8758
|
+
};
|
|
8759
|
+
};
|
|
8760
|
+
usageObservations: {
|
|
8761
|
+
mutations: {
|
|
8762
|
+
save: FunctionReference<
|
|
8763
|
+
"mutation",
|
|
8764
|
+
"internal",
|
|
8765
|
+
{ observationJson: string; sourceJson: string; startedAt: number },
|
|
8766
|
+
null,
|
|
8767
|
+
Name
|
|
8768
|
+
>;
|
|
8769
|
+
};
|
|
8770
|
+
queries: {
|
|
8771
|
+
cached: FunctionReference<
|
|
8772
|
+
"query",
|
|
8773
|
+
"internal",
|
|
8774
|
+
{ sourceJson: string },
|
|
8775
|
+
string | null,
|
|
8776
|
+
Name
|
|
8777
|
+
>;
|
|
8778
|
+
deliveryHistory: FunctionReference<
|
|
8779
|
+
"query",
|
|
8780
|
+
"internal",
|
|
8781
|
+
{
|
|
8782
|
+
eventId: string;
|
|
8783
|
+
paginationOpts: {
|
|
8784
|
+
cursor: string | null;
|
|
8785
|
+
endCursor?: string | null;
|
|
8786
|
+
id?: number;
|
|
8787
|
+
maximumBytesRead?: number;
|
|
8788
|
+
maximumRowsRead?: number;
|
|
8789
|
+
numItems: number;
|
|
8790
|
+
};
|
|
8791
|
+
scope: {
|
|
8792
|
+
customerAccount: string;
|
|
8793
|
+
livemode: boolean;
|
|
8794
|
+
meterId: string;
|
|
8795
|
+
stripeAccountId: string;
|
|
8796
|
+
};
|
|
8797
|
+
},
|
|
8798
|
+
{
|
|
8799
|
+
continueCursor: string;
|
|
8800
|
+
isDone: boolean;
|
|
8801
|
+
legacyHistoryMissing: boolean;
|
|
8802
|
+
page: Array<{
|
|
8803
|
+
_creationTime: number;
|
|
8804
|
+
_id: string;
|
|
8805
|
+
attempt: number;
|
|
8806
|
+
created?: number;
|
|
8807
|
+
eventId: string;
|
|
8808
|
+
identity: string;
|
|
8809
|
+
phase:
|
|
8810
|
+
| "started"
|
|
8811
|
+
| "accepted"
|
|
8812
|
+
| "rate_limited"
|
|
8813
|
+
| "unavailable"
|
|
8814
|
+
| "unknown"
|
|
8815
|
+
| "rejected"
|
|
8816
|
+
| "held"
|
|
8817
|
+
| "resumed"
|
|
8818
|
+
| "window_expired"
|
|
8819
|
+
| "retry_exhausted";
|
|
8820
|
+
recordedAt: number;
|
|
8821
|
+
scopeKey: string;
|
|
8822
|
+
sequence: number;
|
|
8823
|
+
}>;
|
|
8824
|
+
pageStatus?: "SplitRecommended" | "SplitRequired" | null;
|
|
8825
|
+
splitCursor?: string | null;
|
|
8826
|
+
},
|
|
8827
|
+
Name
|
|
8828
|
+
>;
|
|
8829
|
+
summary: FunctionReference<
|
|
8830
|
+
"query",
|
|
8831
|
+
"internal",
|
|
8832
|
+
{
|
|
8833
|
+
maxRecords: number;
|
|
8834
|
+
period: { end: number; start: number };
|
|
8835
|
+
scope: {
|
|
8836
|
+
customerAccount: string;
|
|
8837
|
+
livemode: boolean;
|
|
8838
|
+
meterId: string;
|
|
8839
|
+
stripeAccountId: string;
|
|
8840
|
+
};
|
|
8841
|
+
},
|
|
8842
|
+
string,
|
|
8843
|
+
Name
|
|
8844
|
+
>;
|
|
8845
|
+
validationHistory: FunctionReference<
|
|
8846
|
+
"query",
|
|
8847
|
+
"internal",
|
|
8848
|
+
{
|
|
8849
|
+
eventId: string;
|
|
8850
|
+
paginationOpts: {
|
|
8851
|
+
cursor: string | null;
|
|
8852
|
+
endCursor?: string | null;
|
|
8853
|
+
id?: number;
|
|
8854
|
+
maximumBytesRead?: number;
|
|
8855
|
+
maximumRowsRead?: number;
|
|
8856
|
+
numItems: number;
|
|
8857
|
+
};
|
|
8858
|
+
scope: {
|
|
8859
|
+
customerAccount: string;
|
|
8860
|
+
livemode: boolean;
|
|
8861
|
+
meterId: string;
|
|
8862
|
+
stripeAccountId: string;
|
|
8863
|
+
};
|
|
8864
|
+
},
|
|
8865
|
+
{
|
|
8866
|
+
continueCursor: string;
|
|
8867
|
+
isDone: boolean;
|
|
8868
|
+
page: Array<{
|
|
8869
|
+
_creationTime: number;
|
|
8870
|
+
_id: string;
|
|
8871
|
+
code:
|
|
8872
|
+
| "meter_event_customer_not_found"
|
|
8873
|
+
| "meter_event_no_customer_defined"
|
|
8874
|
+
| "meter_event_dimension_count_too_high"
|
|
8875
|
+
| "archived_meter"
|
|
8876
|
+
| "timestamp_too_far_in_past"
|
|
8877
|
+
| "timestamp_in_future"
|
|
8878
|
+
| "meter_event_value_not_found"
|
|
8879
|
+
| "meter_event_invalid_value"
|
|
8880
|
+
| "no_meter";
|
|
8881
|
+
dedupe: string;
|
|
8882
|
+
eventId: string;
|
|
8883
|
+
observedAt: number;
|
|
8884
|
+
providerEventId: string;
|
|
8885
|
+
scopeKey: string;
|
|
8886
|
+
}>;
|
|
8887
|
+
pageStatus?: "SplitRecommended" | "SplitRequired" | null;
|
|
8888
|
+
splitCursor?: string | null;
|
|
8889
|
+
},
|
|
8890
|
+
Name
|
|
8891
|
+
>;
|
|
8892
|
+
};
|
|
8893
|
+
};
|
|
8457
8894
|
webhooks: {
|
|
8458
8895
|
mutations: {
|
|
8459
8896
|
insertWebhookEvent: FunctionReference<
|
package/src/component/schema.ts
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
import {
|
|
2
|
+
historyTable as usageDeliveryHistory,
|
|
3
|
+
observationsTable as usageProviderObservations,
|
|
4
|
+
} from "./usageObservations/schema.js";
|
|
5
|
+
import {
|
|
6
|
+
errorsTable as usageDeliveryErrors,
|
|
7
|
+
locksTable as usageDeliveryLocks,
|
|
8
|
+
} from "./usageDelivery/fields.js";
|
|
1
9
|
import { claimsTable as refundSyncClaimsTable } from "./refundSync/schema.js";
|
|
2
10
|
import { operationsTable as processingCostReconciliationOperations } from "./processingCostReconciliation/schema.js";
|
|
3
11
|
import {
|
|
@@ -96,6 +104,10 @@ import { pricesTable, productsTable } from "./products/schema";
|
|
|
96
104
|
import { webhookEventsTable } from "./webhooks/schema";
|
|
97
105
|
|
|
98
106
|
export default defineSchema({
|
|
107
|
+
usageProviderObservations,
|
|
108
|
+
usageDeliveryHistory,
|
|
109
|
+
usageDeliveryLocks,
|
|
110
|
+
usageDeliveryErrors,
|
|
99
111
|
usageCatalog: usageCatalogTable,
|
|
100
112
|
usageEvents: usageEventsTable,
|
|
101
113
|
usageOutbox: usageOutboxTable,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { deliveryFields } from "../usageDelivery/fields.js";
|
|
1
2
|
import { defineTable } from "convex/server";
|
|
2
3
|
import { v } from "convex/values";
|
|
3
4
|
|
|
@@ -32,7 +33,8 @@ export const eventDoc = v.object({
|
|
|
32
33
|
export const usageEventsTable = defineTable(eventFields)
|
|
33
34
|
.index("by_identity", ["identity"])
|
|
34
35
|
.index("by_scope_time", ["scopeKey", "occurredAt"]);
|
|
35
|
-
export const
|
|
36
|
+
export const outboxFields = {
|
|
37
|
+
...deliveryFields,
|
|
36
38
|
eventId: v.id("usageEvents"),
|
|
37
39
|
scopeKey: v.string(),
|
|
38
40
|
state: deliveryValidator,
|
|
@@ -40,7 +42,14 @@ export const usageOutboxTable = defineTable({
|
|
|
40
42
|
nextAttemptAt: v.number(),
|
|
41
43
|
providerIdentifier: v.string(),
|
|
42
44
|
dispatch: v.optional(v.string()),
|
|
43
|
-
}
|
|
45
|
+
};
|
|
46
|
+
export const outboxDoc = v.object({
|
|
47
|
+
_id: v.id("usageOutbox"),
|
|
48
|
+
_creationTime: v.number(),
|
|
49
|
+
...outboxFields,
|
|
50
|
+
});
|
|
51
|
+
export const usageOutboxTable = defineTable(outboxFields)
|
|
52
|
+
.index("by_provider_identifier", ["providerIdentifier"])
|
|
44
53
|
.index("by_event", ["eventId"])
|
|
45
54
|
.index("by_state_next", ["state", "nextAttemptAt"])
|
|
46
55
|
.index("by_scope_state", ["scopeKey", "state"]);
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { anyApi, type FunctionHandle } from "convex/server";
|
|
2
|
+
import { internalAction } from "../_generated/server.js";
|
|
3
|
+
import { request } from "./schema.js";
|
|
4
|
+
import { outcome } from "./fields.js";
|
|
5
|
+
import type { Infer } from "convex/values";
|
|
6
|
+
import { z } from "zod";
|
|
7
|
+
const accepted = z.strictObject({
|
|
8
|
+
status: z.literal("accepted"),
|
|
9
|
+
created: z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER),
|
|
10
|
+
});
|
|
11
|
+
const parsedOutcome = z.union([
|
|
12
|
+
accepted,
|
|
13
|
+
z.strictObject({
|
|
14
|
+
status: z.enum(["rate_limited", "unavailable", "unknown", "rejected"]),
|
|
15
|
+
}),
|
|
16
|
+
]);
|
|
17
|
+
export const invoke = internalAction({
|
|
18
|
+
args: request,
|
|
19
|
+
returns: outcome,
|
|
20
|
+
handler: async (ctx, args): Promise<Infer<typeof outcome>> => {
|
|
21
|
+
try {
|
|
22
|
+
const { outbox } = await ctx.runQuery(
|
|
23
|
+
anyApi.usageDelivery.queries.saved,
|
|
24
|
+
{ scope: args.scope, eventId: args.eventId },
|
|
25
|
+
);
|
|
26
|
+
if (outbox.held) return { status: "unavailable" };
|
|
27
|
+
if (
|
|
28
|
+
!outbox.provider ||
|
|
29
|
+
outbox.attempts !== args.attempt ||
|
|
30
|
+
outbox.state !== "sending" ||
|
|
31
|
+
outbox.providerIdentifier !== args.identifier
|
|
32
|
+
)
|
|
33
|
+
return { status: "unknown" };
|
|
34
|
+
const raw: unknown = await ctx.runAction(
|
|
35
|
+
outbox.provider as FunctionHandle<"action">,
|
|
36
|
+
args,
|
|
37
|
+
);
|
|
38
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw))
|
|
39
|
+
return { status: "unknown" };
|
|
40
|
+
const result = raw as Record<string, unknown>;
|
|
41
|
+
if (
|
|
42
|
+
Object.keys(result).length !== Object.keys(args).length + 1 ||
|
|
43
|
+
Object.keys(args).some(
|
|
44
|
+
(key) =>
|
|
45
|
+
JSON.stringify(result[key]) !==
|
|
46
|
+
JSON.stringify(args[key as keyof typeof args]),
|
|
47
|
+
)
|
|
48
|
+
)
|
|
49
|
+
return { status: "unknown" };
|
|
50
|
+
const validated = parsedOutcome.safeParse(result.outcome);
|
|
51
|
+
return validated.success ? validated.data : { status: "unknown" };
|
|
52
|
+
} catch {
|
|
53
|
+
return { status: "unknown" };
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
});
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { convexTest } from "convex-test";
|
|
2
|
+
import { makeFunctionReference } from "convex/server";
|
|
3
|
+
import { expect, it, vi } from "vitest";
|
|
4
|
+
import { schema, modules } from "../../test.js";
|
|
5
|
+
const record = makeFunctionReference<"mutation">("usage/mutations:record"),
|
|
6
|
+
claim = makeFunctionReference<"mutation">("usageDelivery/steps:claim");
|
|
7
|
+
it("serializes the same native customer/meter even across distinct authorized payer scopes", async () => {
|
|
8
|
+
vi.useFakeTimers();
|
|
9
|
+
try {
|
|
10
|
+
const t = convexTest(schema, modules),
|
|
11
|
+
now = Math.floor(Date.now() / 1000);
|
|
12
|
+
const accepted = [];
|
|
13
|
+
for (const customerAccount of ["acct_aliasA", "acct_aliasB"]) {
|
|
14
|
+
const scope = {
|
|
15
|
+
stripeAccountId: "acct_platform",
|
|
16
|
+
customerAccount,
|
|
17
|
+
meterId: "mtr_calls",
|
|
18
|
+
livemode: false,
|
|
19
|
+
};
|
|
20
|
+
const receipt = await t.mutation(record, {
|
|
21
|
+
inputJson: JSON.stringify({
|
|
22
|
+
scope,
|
|
23
|
+
binding: {
|
|
24
|
+
stripeCustomerId: "cus_shared",
|
|
25
|
+
stripePriceId: "price_calls",
|
|
26
|
+
eventName: "calls",
|
|
27
|
+
plan: {
|
|
28
|
+
key: "calls",
|
|
29
|
+
version: "v1",
|
|
30
|
+
model: "pay_as_you_go",
|
|
31
|
+
unit: { name: "call", precision: 0 },
|
|
32
|
+
rate: { currency: "usd", unitAmountDecimal: "2" },
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
sourceEventId: "one",
|
|
36
|
+
quantity: "1",
|
|
37
|
+
occurredAt: now,
|
|
38
|
+
}),
|
|
39
|
+
subscriptionJson: JSON.stringify({
|
|
40
|
+
subscriptionId: "sub_calls",
|
|
41
|
+
subscriptionItemId: "si_calls",
|
|
42
|
+
stripePriceId: "price_calls",
|
|
43
|
+
period: { start: now - 1, end: now + 86400 },
|
|
44
|
+
interval: "month",
|
|
45
|
+
}),
|
|
46
|
+
});
|
|
47
|
+
accepted.push({ scope, eventId: receipt.eventId });
|
|
48
|
+
}
|
|
49
|
+
expect(await t.mutation(claim, accepted[0])).toMatchObject({
|
|
50
|
+
kind: "ready",
|
|
51
|
+
});
|
|
52
|
+
vi.setSystemTime(Date.now() + 2000);
|
|
53
|
+
expect(await t.mutation(claim, accepted[1])).toMatchObject({
|
|
54
|
+
kind: "wait",
|
|
55
|
+
delayMs: 60000,
|
|
56
|
+
});
|
|
57
|
+
const rows = await t.run((ctx) => ctx.db.query("usageOutbox").take(2));
|
|
58
|
+
expect(rows.map((r) => r.attempts)).toEqual([1, 0]);
|
|
59
|
+
} finally {
|
|
60
|
+
vi.useRealTimers();
|
|
61
|
+
}
|
|
62
|
+
});
|