@rdlabo/workers-hono-kit 0.6.9 → 0.6.11

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

@@ -47,16 +47,16 @@ export { KVCache } from './cache/kv-cache.js';
 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 { extractStripeFailureReason, stripeFailureMessageJa, serializePaymentFailure, serializeIapFailureReason, parsePaymentFailure, PaymentDeclinedError, toPaymentDeclinedError, } 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/index.js

@@ -36,7 +36,7 @@ export { createSentryErrorReporter } from './http/http-error.js';
 export { KVCache } from './cache/kv-cache.js';
 // stripe
 export { createStripeClient, verifyStripeWebhook } from './stripe/client.js';
-export { extractStripeFailureReason, stripeFailureMessageJa, serializePaymentFailure, parsePaymentFailure, PaymentDeclinedError, toPaymentDeclinedError, } from './stripe/failure.js';
+export { extractStripeFailureReason, stripeFailureMessageJa, serializePaymentFailure, serializeIapFailureReason, parsePaymentFailure, PaymentDeclinedError, toPaymentDeclinedError, } from './stripe/failure.js';
 export { classifyStripeReconcile } from './stripe/reconcile.js';
 // payment (provider-agnostic; web-standard only). reopenGuardedPaymentFailedSet is drizzle-based → './db'.
 export { paymentFailureMessageJa, iapFailureKey, UNRESOLVED_PAYMENT_STATUSES } from './payment/failure.js';

package/dist/payment/failure.js

@@ -32,7 +32,7 @@ export function paymentFailureMessageJa(input) {
     if (input.status === 'failed' && (input.type === 'ios' || input.type === 'android')) {
         return IAP_FAILED_MESSAGE_JA[input.type];
     }
-    const stripeReason = input.reason && !('provider' in input.reason) ? input.reason : null;
+    const stripeReason = input.type === 'ios' || input.type === 'android' ? null : (input.reason ?? null);
     return stripeFailureMessageJa(stripeReason);
 }
 /**

package/dist/stripe/failure.d.ts

@@ -24,8 +24,6 @@ export interface StripeFailureReason {
 }
 /** 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). */
@@ -50,9 +48,10 @@ export type PaymentFailureSource = 'webhook.invoice.payment_failed' | 'webhook.i
  */
 export interface PaymentFailureRecord {
     reason: PaymentFailureReason;
-    source: PaymentFailureSource;
+    /** Capture path. Optional for IAP because `payment_failed.type` already identifies the provider/path. */
+    source?: PaymentFailureSource;
     /** ISO 8601 timestamp of when the failure was captured. */
-    occurredAt: string;
+    occurredAt?: string;
 }
 /**
  * Extract a normalized {@link StripeFailureReason} from a Stripe `PaymentIntent`, `Invoice`, a
@@ -86,6 +85,8 @@ export declare function stripeFailureMessageJa(reason: StripeFailureReason | nul
  * @returns A JSON string.
  */
 export declare function serializePaymentFailure(record: PaymentFailureRecord): string;
+/** Serialize an IAP reason directly, without redundant provider/source/timestamp wrappers. */
+export declare function serializeIapFailureReason(reason: IapFailureReason): string;
 /**
  * Parse a `payment_failed.receipt` value back into a {@link PaymentFailureRecord}.
  *

package/dist/stripe/failure.js

@@ -148,6 +148,10 @@ export function stripeFailureMessageJa(reason) {
 export function serializePaymentFailure(record) {
     return JSON.stringify(record);
 }
+/** Serialize an IAP reason directly, without redundant provider/source/timestamp wrappers. */
+export function serializeIapFailureReason(reason) {
+    return JSON.stringify(reason);
+}
 /**
  * Parse a `payment_failed.receipt` value back into a {@link PaymentFailureRecord}.
  *
@@ -161,10 +165,21 @@ export function parsePaymentFailure(receipt) {
     try {
         const parsed = JSON.parse(receipt);
         const r = asRecord(parsed);
-        if (!r || !asRecord(r.reason) || typeof r.source !== 'string' || typeof r.occurredAt !== 'string') {
+        if (!r) {
             return null;
         }
-        return parsed;
+        if (asRecord(r.reason)) {
+            if ((r.source !== undefined && typeof r.source !== 'string') ||
+                (r.occurredAt !== undefined && typeof r.occurredAt !== 'string')) {
+                return null;
+            }
+            return parsed;
+        }
+        // IAP rows store the reason itself. `code` is required so arbitrary JSON is not accepted as a reason.
+        if (typeof r.code === 'string') {
+            return { reason: parsed };
+        }
+        return null;
     }
     catch {
         return null;

package/package.json

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