@rdlabo/workers-hono-kit 0.6.8 → 0.6.10

package/dist/iap/apple.d.ts

@@ -40,6 +40,18 @@ export interface AppleVerifyReceiptResponse {
  * - `unknown` — indeterminate (no receipt, or expired with auto-renew on and no retry) → no-op.
  */
 export type AppleRenewalState = 'billing_retry' | 'lapsed' | 'active' | 'unknown';
+/** Apple renewal classification plus the exact provider fields used to reach it. */
+export interface AppleRenewalClassification {
+    state: AppleRenewalState;
+    originalTransactionId?: string;
+    expiresDateMs?: string;
+    /** Apple verifyReceipt response status (normally 0 for a successfully verified receipt). */
+    statusCode?: number;
+    /** Value from the pending-renewal entry matched to `originalTransactionId`. */
+    billingRetryStatus?: string;
+    /** Value from the pending-renewal entry matched to `originalTransactionId`. */
+    autoRenewStatus?: string;
+}
 /**
  * Classify an Apple verifyReceipt response into an {@link AppleRenewalState}.
  *
@@ -52,11 +64,7 @@ export type AppleRenewalState = 'billing_retry' | 'lapsed' | 'active' | 'unknown
  * @param now - Current epoch-ms (`Date.now()`); injected for determinism/testing.
  * @returns The state plus the latest `original_transaction_id` / `expires_date_ms` (for the row key).
  */
-export declare function classifyAppleRenewal(verify: unknown, now: number): {
-    state: AppleRenewalState;
-    originalTransactionId?: string;
-    expiresDateMs?: string;
-};
+export declare function classifyAppleRenewal(verify: unknown, now: number): AppleRenewalClassification;
 /**
  * Verify an App Store receipt against Apple, falling back from production to sandbox.
  *

package/dist/iap/apple.js

@@ -23,6 +23,7 @@ const toArray = (v) => (Array.isArray(v) ? v : []);
  */
 export function classifyAppleRenewal(verify, now) {
     const v = asRecord(verify);
+    const statusCode = typeof v?.status === 'number' ? v.status : undefined;
     // 消耗型など expires_date_ms 欠損エントリを除外してから最新（max expires）を選ぶ。
     // 欠損値を Number() すると NaN で比較が常に false になり、先頭の欠損行が最後まで残って
     // 誤って 'active'（isExpired=false）を返すため、有効な expires を持つ行だけを対象にする。
@@ -35,7 +36,7 @@ export function classifyAppleRenewal(verify, now) {
     }, undefined);
     const originalTransactionId = latest?.original_transaction_id;
     if (!latest || !originalTransactionId) {
-        return { state: 'unknown' };
+        return { state: 'unknown', statusCode };
     }
     // 複数サブスク商品時に別商品の renewal info を読まないよう、latest と同じ original_transaction_id の
     // pending エントリを優先（無ければ先頭にフォールバック）。
@@ -43,7 +44,13 @@ export function classifyAppleRenewal(verify, now) {
     const pending = pendingArr.find((p) => p.original_transaction_id === originalTransactionId) ?? pendingArr.at(0);
     const expiresMs = Number(latest.expires_date_ms);
     const isExpired = Number.isFinite(expiresMs) && expiresMs < now;
-    const base = { originalTransactionId, expiresDateMs: latest.expires_date_ms };
+    const base = {
+        originalTransactionId,
+        expiresDateMs: latest.expires_date_ms,
+        statusCode,
+        billingRetryStatus: pending?.is_in_billing_retry_period,
+        autoRenewStatus: pending?.auto_renew_status,
+    };
     if (pending?.is_in_billing_retry_period === '1') {
         return { state: 'billing_retry', ...base };
     }

package/dist/iap/google.d.ts

@@ -36,15 +36,21 @@ export interface GoogleSubscriptionPurchase {
  * a member is semi-breaking for exhaustive `switch` consumers).
  */
 export type GoogleSubscriptionState = 'canceled' | 'gone' | 'active' | 'unknown';
+/** Google subscription classification plus provider diagnostic codes used by persistence. */
+export interface GoogleSubscriptionClassification {
+    state: GoogleSubscriptionState;
+    /** Google error-body code, such as 410. */
+    statusCode?: number;
+    /** Google cancellation reason (0=user, 1=system, 2=replaced, 3=developer). */
+    cancelReason?: number;
+}
 /**
  * Classify a Google subscriptions.get response into a {@link GoogleSubscriptionState}.
  *
  * @param purchase - The response body (duck-typed); may be `{ error: { code } }`.
  * @param now - Current epoch-ms (`Date.now()`); injected for determinism/testing.
  */
-export declare function classifyGoogleSubscription(purchase: unknown, now: number): {
-    state: GoogleSubscriptionState;
-};
+export declare function classifyGoogleSubscription(purchase: unknown, now: number): GoogleSubscriptionClassification;
 /** OAuth service-account credentials for the Android Publisher API (per-app; inject, never hardcode in kit). */
 export interface GoogleOAuthCredentials {
     client_id: string;

package/dist/iap/google.js

@@ -22,18 +22,21 @@ export function classifyGoogleSubscription(purchase, now) {
     const err = asRecord(p.error);
     if (err) {
         // 410 = "The subscription purchase is no longer available for query" (expired too long) = churned.
-        return { state: err.code === 410 ? 'gone' : 'unknown' };
+        const statusCode = typeof err.code === 'number' ? err.code : undefined;
+        return { state: statusCode === 410 ? 'gone' : 'unknown', statusCode };
     }
     const expiryMs = Number(p.expiryTimeMillis);
-    const isExpired = Number.isFinite(expiryMs) && expiryMs < now;
-    const willNotRenew = p.autoRenewing === false || p.cancelReason !== undefined;
+    const hasValidExpiry = Number.isFinite(expiryMs);
+    const isExpired = hasValidExpiry && expiryMs < now;
+    const cancelReason = typeof p.cancelReason === 'number' ? p.cancelReason : undefined;
+    const willNotRenew = p.autoRenewing === false || cancelReason !== undefined;
     if (isExpired && willNotRenew) {
-        return { state: 'canceled' };
+        return { state: 'canceled', cancelReason };
     }
-    if (!isExpired) {
-        return { state: 'active' };
+    if (hasValidExpiry && !isExpired) {
+        return { state: 'active', cancelReason };
     }
-    return { state: 'unknown' };
+    return { state: 'unknown', cancelReason };
 }
 /**
  * Exchange a refresh token for an Android Publisher access token.

package/dist/index.d.ts

@@ -48,15 +48,15 @@ export type { KVNamespace, KVCacheOptions } from './cache/kv-cache.js';
 export { createStripeClient, verifyStripeWebhook } from './stripe/client.js';
 export type { CreateStripeClientOptions } from './stripe/client.js';
 export { extractStripeFailureReason, stripeFailureMessageJa, serializePaymentFailure, parsePaymentFailure, PaymentDeclinedError, toPaymentDeclinedError, } from './stripe/failure.js';
-export type { StripeFailureReason, PaymentFailureSource, PaymentFailureRecord, PaymentDeclinedBody, } from './stripe/failure.js';
+export type { StripeFailureReason, PaymentFailureSource, PaymentFailureRecord, PaymentFailureReason, IapFailureReason, PaymentDeclinedBody, } from './stripe/failure.js';
 export { classifyStripeReconcile } from './stripe/reconcile.js';
 export type { StripeReconcileAction } from './stripe/reconcile.js';
 export { paymentFailureMessageJa, iapFailureKey, UNRESOLVED_PAYMENT_STATUSES } from './payment/failure.js';
 export type { PaymentFailureStatus, PaymentFailureType } from './payment/failure.js';
 export { classifyAppleRenewal, verifyAppleReceipt } from './iap/apple.js';
-export type { AppleRenewalState, AppleVerifyReceiptResponse, ApplePendingRenewalInfo, AppleLatestReceiptInfo, } from './iap/apple.js';
+export type { AppleRenewalClassification, AppleRenewalState, AppleVerifyReceiptResponse, ApplePendingRenewalInfo, AppleLatestReceiptInfo, } from './iap/apple.js';
 export { classifyGoogleSubscription, getGoogleSubscription, googleAccessToken } from './iap/google.js';
-export type { GoogleSubscriptionState, GoogleSubscriptionPurchase, GoogleOAuthCredentials } from './iap/google.js';
+export type { GoogleSubscriptionClassification, GoogleSubscriptionState, GoogleSubscriptionPurchase, GoogleOAuthCredentials, } from './iap/google.js';
 export { retryWhenDeadlock } from './db/retry.js';
 export { sendInChunks } from './queue/send.js';
 export type { QueueLike, QueueSendMessage } from './queue/send.js';

package/dist/payment/failure.d.ts

@@ -1,4 +1,4 @@
-import type { StripeFailureReason } from '../stripe/failure.js';
+import type { PaymentFailureReason } from '../stripe/failure.js';
 /**
  * Provider-agnostic status of a row in the `payment_failed` table.
  *
@@ -35,22 +35,23 @@ export declare function paymentFailureMessageJa(input: {
     status: PaymentFailureStatus;
     /** The row `type` (stripe/ios/android). Typed as `string` since it comes from the DB column. */
     type?: string | null;
-    reason?: StripeFailureReason | null;
+    reason?: PaymentFailureReason | null;
 }): string;
 /**
- * Build the `payment_failed.recursions_id` (PRIMARY KEY) with a per-type namespace.
+ * Build the provider-native `payment_failed.recursions_id`.
  *
  * @remarks
- * - iOS: `ios:${original_transaction_id}:${expires_date_ms}`. `original_transaction_id` is stable
+ * - iOS: `${original_transaction_id}:${expires_date_ms}`. `original_transaction_id` is stable
  *   across re-subscribes, so keying on it alone would let the resolved-reopen guard permanently mask
  *   every event after the first. Including `expires_date_ms` makes each billing cycle a distinct row,
  *   while the same cycle's daily reconcile (billing-retry) still converges to one row.
- * - Android: `android:${orderId}` — Google issues a new orderId per subscription, so it is already
- *   cycle-specific; the `android:` prefix only guards against cross-type PK collisions.
+ * - Android: `${orderId}` — Google issues a new orderId per subscription, so it is already cycle-specific.
  *
  * Stripe rows use the invoice / subscription id directly (globally unique) and need no helper.
  *
- * @remarks Fits the fleet's `payment_failed.recursions_id` `varchar(50)` (iOS ≤ ~38, Android ≤ ~36 chars).
+ * The provider is stored separately in the `type` column. Provider-native ID formats are disjoint in practice
+ * (Apple numeric pair / Google `GPA.*` / Stripe `in_*` or `sub_*`), so duplicating `type` in the primary-key value
+ * is unnecessary.
  */
 export declare function iapFailureKey(input: {
     platform: 'ios';

package/dist/payment/failure.js

@@ -32,25 +32,25 @@ export function paymentFailureMessageJa(input) {
     if (input.status === 'failed' && (input.type === 'ios' || input.type === 'android')) {
         return IAP_FAILED_MESSAGE_JA[input.type];
     }
-    return stripeFailureMessageJa(input.reason ?? null);
+    const stripeReason = input.reason && !('provider' in input.reason) ? input.reason : null;
+    return stripeFailureMessageJa(stripeReason);
 }
 /**
- * Build the `payment_failed.recursions_id` (PRIMARY KEY) with a per-type namespace.
+ * Build the provider-native `payment_failed.recursions_id`.
  *
  * @remarks
- * - iOS: `ios:${original_transaction_id}:${expires_date_ms}`. `original_transaction_id` is stable
+ * - iOS: `${original_transaction_id}:${expires_date_ms}`. `original_transaction_id` is stable
  *   across re-subscribes, so keying on it alone would let the resolved-reopen guard permanently mask
  *   every event after the first. Including `expires_date_ms` makes each billing cycle a distinct row,
  *   while the same cycle's daily reconcile (billing-retry) still converges to one row.
- * - Android: `android:${orderId}` — Google issues a new orderId per subscription, so it is already
- *   cycle-specific; the `android:` prefix only guards against cross-type PK collisions.
+ * - Android: `${orderId}` — Google issues a new orderId per subscription, so it is already cycle-specific.
  *
  * Stripe rows use the invoice / subscription id directly (globally unique) and need no helper.
  *
- * @remarks Fits the fleet's `payment_failed.recursions_id` `varchar(50)` (iOS ≤ ~38, Android ≤ ~36 chars).
+ * The provider is stored separately in the `type` column. Provider-native ID formats are disjoint in practice
+ * (Apple numeric pair / Google `GPA.*` / Stripe `in_*` or `sub_*`), so duplicating `type` in the primary-key value
+ * is unnecessary.
  */
 export function iapFailureKey(input) {
-    return input.platform === 'ios'
-        ? `ios:${input.originalTransactionId}:${input.expiresDateMs}`
-        : `android:${input.orderId}`;
+    return input.platform === 'ios' ? `${input.originalTransactionId}:${input.expiresDateMs}` : input.orderId;
 }

package/dist/stripe/failure.d.ts

@@ -22,6 +22,23 @@ export interface StripeFailureReason {
     /** Id of the Subscription the failing invoice belongs to, when resolvable. */
     subscriptionId?: string;
 }
+/** Normalized reason persisted for an App Store / Google Play subscription failure. */
+export interface IapFailureReason {
+    /** Provider discriminator. */
+    provider: 'ios' | 'android';
+    /** Stable machine-readable classification. */
+    code: 'billing_retry' | 'auto_renew_off' | 'subscription_canceled' | 'subscription_gone';
+    /** Provider response status code when present (Apple verifyReceipt status / Google error code). */
+    statusCode?: number;
+    /** Apple auto-renew status (`'0'` means disabled). */
+    autoRenewStatus?: string;
+    /** Apple billing-retry status (`'1'` means retrying a failed renewal). */
+    billingRetryStatus?: string;
+    /** Google cancellation reason code (0=user, 1=system, 2=replaced, 3=developer). */
+    cancelReason?: number;
+}
+/** Provider-specific diagnostic reason stored in `payment_failed.receipt`. */
+export type PaymentFailureReason = StripeFailureReason | IapFailureReason;
 /** Where a {@link PaymentFailureRecord} was captured. */
 export type PaymentFailureSource = 'webhook.invoice.payment_failed' | 'webhook.invoice.payment_action_required' | 'reconcile' | 'checkout' | 'iap';
 /**
@@ -32,7 +49,7 @@ export type PaymentFailureSource = 'webhook.invoice.payment_failed' | 'webhook.i
  * on read via {@link stripeFailureMessageJa} so that wording changes never require a data migration.
  */
 export interface PaymentFailureRecord {
-    reason: StripeFailureReason;
+    reason: PaymentFailureReason;
     source: PaymentFailureSource;
     /** ISO 8601 timestamp of when the failure was captured. */
     occurredAt: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdlabo/workers-hono-kit",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "private": false,
   "publishConfig": {
     "access": "public"