@frigear-nu/subscriptions 0.0.6 → 0.0.8

package/dist/runtime/server/utils/plans.js

@@ -1,4 +1,6 @@
 import { kv } from "@nuxthub/kv";
+import { isWithinDisabledRanges } from "../../utils/plans.js";
+import { getUserSubscription } from "./subscriptions.js";
 const CACHE_TTL_SECONDS = 60 * 5;
 const INTERVALS = ["day", "week", "month", "year"];
 function toPlanPrice(price) {
@@ -49,6 +51,7 @@ export async function getResolvedPlans() {
       key,
       label: plan.label ?? key,
       ...plan.description ? { description: plan.description } : {},
+      ...plan.features?.length ? { features: plan.features } : {},
       rank: plan.rank,
       prices: resolved
     };
@@ -58,7 +61,23 @@ export async function getResolvedPlans() {
   return plans;
 }
 export async function getAvailablePlans(event) {
-  const ctx = { event, plans: structuredClone(await getResolvedPlans()) };
+  const config = useRuntimeConfig().subscriptions?.plans ?? {};
+  let plans = structuredClone(await getResolvedPlans());
+  if (Object.values(config).some((plan) => plan.availability?.disabledRanges?.length)) {
+    const subscriber = await isSubscriber(event);
+    if (!subscriber) {
+      const now = /* @__PURE__ */ new Date();
+      plans = plans.filter((plan) => !isWithinDisabledRanges(config[plan.key]?.availability?.disabledRanges, now));
+    }
+  }
+  const ctx = { event, plans };
   await useNitroApp().hooks.callHook("subscriptions:plans:filter", ctx);
   return ctx.plans;
 }
+async function isSubscriber(event) {
+  if (!event) return false;
+  const user = await getUser(event, { scopes: ["subscriptions:read"] }).catch(() => null);
+  const userId = user?.id;
+  if (userId === void 0 || userId === null) return false;
+  return !!await getUserSubscription(Number(userId));
+}

package/dist/runtime/server/utils/subscriptions.d.ts

@@ -1,9 +1,12 @@
+import type { MeResponse } from '../../../types.js';
 export type HasActiveSubscriptionOptions = {
     /** Only count subscriptions on one of these plan keys. Omit for "any plan". */
     plans?: string[];
     /** Statuses that count as entitled. Defaults to `active` and `trialing`. */
     statuses?: string[];
 };
+/** Every subscription row of the user, newest first, in the shape the API and MCP expose. */
+export declare function listUserSubscriptions(userId: number): Promise<MeResponse>;
 /**
  * The user's current entitled subscription row (default statuses `active`/`trialing`, not ended), the one
  * with the latest period end when several match, or `null`.

package/dist/runtime/server/utils/subscriptions.js

@@ -1,16 +1,35 @@
 import { db, schema } from "@nuxthub/db";
 import { desc, eq } from "drizzle-orm";
-import { DEFAULT_ENTITLED_STATUSES } from "../../utils/plans.js";
+import { DEFAULT_ENTITLED_STATUSES, isEntitledRow } from "../../utils/plans.js";
+export async function listUserSubscriptions(userId) {
+  const rows = await db.select().from(schema.subscriptions).where(eq(schema.subscriptions.userId, userId)).orderBy(desc(schema.subscriptions.createdAt));
+  const iso = (date) => date ? date.toISOString() : null;
+  const active = rows.filter((row) => isEntitledRow(row)).sort((a, b) => (b.currentPeriodEnd?.getTime() ?? 0) - (a.currentPeriodEnd?.getTime() ?? 0))[0];
+  return {
+    subscriptions: rows.map((row) => ({
+      id: row.id,
+      planKey: row.planKey,
+      priceId: row.priceId,
+      status: row.status,
+      cancelAtPeriodEnd: row.cancelAtPeriodEnd,
+      currentPeriodStart: iso(row.currentPeriodStart),
+      currentPeriodEnd: iso(row.currentPeriodEnd),
+      endedAt: iso(row.endedAt),
+      source: row.source === "manual" ? "manual" : "stripe"
+    })),
+    activePlan: active?.planKey ?? null
+  };
+}
 export async function getUserSubscription(userId, options = {}) {
   const statuses = options.statuses ?? DEFAULT_ENTITLED_STATUSES;
   const rows = await db.select().from(schema.subscriptions).where(eq(schema.subscriptions.userId, userId)).orderBy(desc(schema.subscriptions.createdAt));
-  const entitled = rows.filter((row) => statuses.includes(row.status) && !row.endedAt).sort((a, b) => (b.currentPeriodEnd?.getTime() ?? 0) - (a.currentPeriodEnd?.getTime() ?? 0));
+  const entitled = rows.filter((row) => isEntitledRow(row, statuses)).sort((a, b) => (b.currentPeriodEnd?.getTime() ?? 0) - (a.currentPeriodEnd?.getTime() ?? 0));
   return entitled[0] ?? null;
 }
 export async function hasActiveSubscription(userId, options = {}) {
   const statuses = options.statuses ?? DEFAULT_ENTITLED_STATUSES;
   const rows = await db.select().from(schema.subscriptions).where(eq(schema.subscriptions.userId, userId));
   return rows.some(
-    (row) => statuses.includes(row.status) && !row.endedAt && (!options.plans?.length || row.planKey !== null && options.plans.includes(row.planKey))
+    (row) => isEntitledRow(row, statuses) && (!options.plans?.length || row.planKey !== null && options.plans.includes(row.planKey))
   );
 }

package/dist/runtime/utils/index.d.ts

@@ -1,4 +1,4 @@
 export { getUserSubscription, hasActiveSubscription } from '../server/utils/subscriptions.js';
 export type { HasActiveSubscriptionOptions } from '../server/utils/subscriptions.js';
-export { decideChangeKind, resolvePlanKey, resolveSameOriginUrl, DEFAULT_ENTITLED_STATUSES } from './plans.js';
+export { decideChangeKind, resolvePlanKey, resolveSameOriginUrl, isWithinDisabledRanges, DEFAULT_ENTITLED_STATUSES } from './plans.js';
 export type { CheckoutBeforeContext, PlansFilterContext, ResolvedPlan, PlanPrice, SubscriptionDto, ModuleOptions, } from '../../types.js';

package/dist/runtime/utils/index.js

@@ -1,2 +1,2 @@
 export { getUserSubscription, hasActiveSubscription } from "../server/utils/subscriptions.js";
-export { decideChangeKind, resolvePlanKey, resolveSameOriginUrl, DEFAULT_ENTITLED_STATUSES } from "./plans.js";
+export { decideChangeKind, resolvePlanKey, resolveSameOriginUrl, isWithinDisabledRanges, DEFAULT_ENTITLED_STATUSES } from "./plans.js";

package/dist/runtime/utils/plans.d.ts

@@ -1,6 +1,16 @@
-import type { PlanPriceRef, ResolvedPlan } from '../../types.js';
+import type { PlanDisabledRange, PlanPriceRef, ResolvedPlan } from '../../types.js';
 export declare const DEFAULT_ENTITLED_STATUSES: string[];
 /** Statuses that count as "holds a live subscription" when deciding between a new checkout and a plan change. */
+/**
+ * Whether a stored row currently entitles its user: an entitled status, not ended, and (for manual grants,
+ * which have no Stripe lifecycle to end them) not past its optional end date.
+ */
+export declare function isEntitledRow(row: {
+    status: string;
+    endedAt: Date | null;
+    source?: string | null;
+    currentPeriodEnd: Date | null;
+}, statuses?: string[], now?: number): boolean;
 export declare const LIVE_STATUSES: string[];
 type PlanConfigLike = Record<string, {
     prices: PlanPriceRef[];
@@ -19,14 +29,13 @@ export type ChangeKind = 'upgrade' | 'downgrade';
  * plan that isn't configured counts as the lowest rank.
  */
 export declare function decideChangeKind(currentRank: number | null | undefined, targetRank: number): ChangeKind;
-/**
- * Validates a redirect URL supplied by a client: it must be a relative path (`/x`) or an absolute URL on
- * `origin`. Returns an absolute URL on that origin, or `null` when it is unsafe.
- */
-export declare function resolveSameOriginUrl(input: string, origin: string): string | null;
 /** Finds a price (and its plan) in already resolved plans by price id. */
 export declare function findPrice(plans: ResolvedPlan[], priceId: string): {
     plan: ResolvedPlan;
     price: import(".").PlanPrice;
 } | null;
+/** Parses a range date; `{fullYear}` becomes the current year. Invalid dates yield `null`. */
+export declare function parseRangeDate(text: string, now?: Date): Date | null;
+/** Whether `now` falls (inclusively) within any of the ranges. Unparseable ranges are ignored. */
+export declare function isWithinDisabledRanges(ranges: PlanDisabledRange[] | undefined, now?: Date): boolean;
 export {};

package/dist/runtime/utils/plans.js

@@ -1,4 +1,9 @@
 export const DEFAULT_ENTITLED_STATUSES = ["active", "trialing"];
+export function isEntitledRow(row, statuses = DEFAULT_ENTITLED_STATUSES, now = Date.now()) {
+  if (!statuses.includes(row.status) || row.endedAt) return false;
+  if (row.source === "manual" && row.currentPeriodEnd && row.currentPeriodEnd.getTime() <= now) return false;
+  return true;
+}
 export const LIVE_STATUSES = ["active", "trialing", "past_due"];
 export function resolvePlanKey(plans, price) {
   for (const [key, plan] of Object.entries(plans)) {
@@ -13,17 +18,6 @@ export function decideChangeKind(currentRank, targetRank) {
   if (currentRank === null || currentRank === void 0) return "upgrade";
   return targetRank > currentRank ? "upgrade" : "downgrade";
 }
-export function resolveSameOriginUrl(input, origin) {
-  if (input.startsWith("/")) {
-    if (input.startsWith("//") || input.startsWith("/\\")) return null;
-    return `${origin}${input}`;
-  }
-  try {
-    return new URL(input).origin === new URL(origin).origin ? input : null;
-  } catch {
-    return null;
-  }
-}
 export function findPrice(plans, priceId) {
   for (const plan of plans) {
     const price = plan.prices.find((item) => item.id === priceId);
@@ -31,3 +25,14 @@ export function findPrice(plans, priceId) {
   }
   return null;
 }
+export function parseRangeDate(text, now = /* @__PURE__ */ new Date()) {
+  const date = new Date(text.replaceAll("{fullYear}", String(now.getFullYear())));
+  return Number.isNaN(date.getTime()) ? null : date;
+}
+export function isWithinDisabledRanges(ranges, now = /* @__PURE__ */ new Date()) {
+  return (ranges ?? []).some((range) => {
+    const from = parseRangeDate(range.from, now);
+    const to = parseRangeDate(range.to, now);
+    return !!from && !!to && now >= from && now <= to;
+  });
+}

package/dist/types.d.mts

@@ -1,3 +1,3 @@
 export { default } from './module.mjs'
 
-export { type CheckoutBeforeContext, type CheckoutBody, type CheckoutResponse, type MeResponse, type ModuleOptions, type PlanConfig, type PlanPrice, type PlanPriceRef, type PlansFilterContext, type PlansResponse, type PortalBody, type PublicModuleOptions, type PublicPlan, type ResolvedPlan, type SubscriptionDto, type SubscriptionsRuntimeConfig } from './module.mjs'
+export { type AdminMembershipResponse, type AdminPaymentLinkResponse, type CheckoutBeforeContext, type CheckoutBody, type CheckoutResponse, type InvoicePaymentEvent, type MeResponse, type ModuleOptions, type PlanAvailability, type PlanConfig, type PlanDisabledRange, type PlanPrice, type PlanPriceRef, type PlansFilterContext, type PlansResponse, type PortalBody, type PublicModuleOptions, type PublicPlan, type ResolvedPlan, type SubscriptionDto, type SubscriptionsRuntimeConfig } from './module.mjs'

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@frigear-nu/subscriptions",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Recurring subscriptions (plans, checkout, upgrade/downgrade, billing portal and entitlements) for the frigear ecosystem, built on @frigear-nu/stripe.",
+  "homepage": "https://docs.frigear.dev/modules/subscriptions",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/frigear-nu/frigear-nu.git",
@@ -29,10 +30,12 @@
     "playground"
   ],
   "dependencies": {
-    "@frigear-nu/menu": "0.0.7",
-    "@frigear-nu/module-kit": "0.1.5",
-    "@frigear-nu/stripe": "0.0.6",
-    "@frigear-nu/users": "1.0.7",
+    "@frigear-nu/auth": "0.0.3",
+    "@frigear-nu/mcp": "0.0.3",
+    "@frigear-nu/module-kit": "0.1.7",
+    "@frigear-nu/stripe": "0.0.8",
+    "@frigear-nu/ui": "0.0.7",
+    "@frigear-nu/users": "1.0.9",
     "@libsql/client": "^0.18.0",
     "@nuxt/kit": "^4.6.0",
     "@vueuse/core": "^15.0.0",
@@ -44,15 +47,25 @@
     "zod": "^4.6.5"
   },
   "peerDependencies": {
+    "@frigear-nu/menu": "0.0.9",
+    "@frigear-nu/widget": "0.0.2",
     "@nuxt/ui": "^4.10.0",
     "@nuxthub/core": "^0.10.8"
   },
   "peerDependenciesMeta": {
+    "@frigear-nu/menu": {
+      "optional": true
+    },
+    "@frigear-nu/widget": {
+      "optional": true
+    },
     "@nuxt/ui": {
       "optional": true
     }
   },
   "devDependencies": {
+    "@frigear-nu/menu": "0.0.9",
+    "@frigear-nu/widget": "0.0.2",
     "@nuxt/devtools": "^3.4.2",
     "@nuxt/eslint-config": "^1.17.0",
     "@nuxt/module-builder": "^1.0.3",