@zuplo/zudoku-plugin-monetization 0.0.13 → 0.0.15

package/LICENSE.md

@@ -0,0 +1,18 @@
+The MIT License (MIT)
+
+Copyright (c) Zuplo, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/index.mjs

@@ -138,7 +138,7 @@ const categorizeRateCards = (rateCards, currency) => {
 		if (!et) continue;
 		if (et.type === "metered" && et.issueAfterReset != null) {
 			let overagePrice;
-			if (rc.price?.type === "tiered" && rc.price.tiers) {
+			if (et.isSoftLimit !== false && rc.price?.type === "tiered" && rc.price.tiers) {
 				const overageTier = rc.price.tiers.find((t) => t.unitPrice?.amount);
 				if (overageTier?.unitPrice) overagePrice = `${formatPrice(parseFloat(overageTier.unitPrice.amount), currency)}/unit`;
 			}
@@ -184,7 +184,11 @@ const getPriceFromPlan = (plan) => {
 
 //#endregion
 //#region src/ZuploMonetizationWrapper.tsx
-const BASE_URL = "https://api.zuploedge.com";
+const DEFAULT_GATEWAY_URL = "https://api.zuploedge.com";
+const getBaseUrl = (context) => {
+	if (!context) return DEFAULT_GATEWAY_URL;
+	return context.env.ZUPLO_GATEWAY_SERVICE_URL || DEFAULT_GATEWAY_URL;
+};
 const hasVariables = (value) => typeof value === "object" && value != null;
 const queryClient = new QueryClient({ defaultOptions: {
 	queries: {
@@ -194,7 +198,7 @@ const queryClient = new QueryClient({ defaultOptions: {
 			if (q.queryKey.length === 0) throw new Error("Query key must be a non-empty array");
 			const url = q.queryKey[0];
 			if (!url || typeof url !== "string") throw new Error("URL is required");
-			const request = new Request(`${BASE_URL}${url}`, {
+			const request = new Request(joinUrl(getBaseUrl(q.meta?.context), url), {
 				...q.meta?.request,
 				headers: {
 					"Content-Type": "application/json",
@@ -221,7 +225,7 @@ const queryClient = new QueryClient({ defaultOptions: {
 			const init = typeof m.meta?.request === "function" ? m.meta.request(variables) : m.meta?.request ?? {};
 			const method = init.method || "POST";
 			const body = init.body ?? (method !== "GET" && method !== "HEAD" ? JSON.stringify(variables) : void 0);
-			const request = new Request(joinUrl(BASE_URL, url), {
+			const request = new Request(joinUrl(getBaseUrl(m.meta?.context), url), {
 				...init,
 				method,
 				body,
@@ -520,13 +524,18 @@ const CheckoutPage = () => {
 const ManagePaymentPage = () => {
 	const zudoku = useZudoku();
 	const { generateUrl } = useUrlUtils();
+	const deploymentName = useDeploymentName();
+	const auth = useAuth();
 	const billingPortal = useQuery({
-		queryKey: [`/v3/zudoku-metering/${useDeploymentName()}/stripe/portal`],
+		queryKey: [`/v3/zudoku-metering/${deploymentName}/stripe/portal`],
 		meta: {
 			context: zudoku,
 			request: {
 				method: "POST",
-				body: JSON.stringify({ returnURL: generateUrl("/subscriptions") })
+				body: JSON.stringify({
+					email: auth.profile?.email,
+					returnURL: generateUrl("/subscriptions")
+				})
 			}
 		}
 	});
@@ -561,7 +570,7 @@ const PricingCard = ({ plan, isPopular = false, isSubscribed = false }) => {
 	const { quotas, features } = categorizeRateCards(defaultPhase.rateCards, plan.currency);
 	const price = getPriceFromPlan(plan);
 	const isFree = price.monthly === 0;
-	const isCustom = plan.key === "enterprise";
+	const isCustom = plan.metadata?.isCustom === true;
 	return /* @__PURE__ */ jsxs("div", {
 		className: cn("relative rounded-lg border p-6 flex flex-col", isPopular && "border-primary border-2"),
 		children: [
@@ -598,7 +607,7 @@ const PricingCard = ({ plan, isPopular = false, isSubscribed = false }) => {
 							children: [formatPrice(price.yearly, plan.currency), "/year"]
 						})] })] })
 					}),
-					isFree && /* @__PURE__ */ jsx("div", {
+					plan.paymentRequired === false && /* @__PURE__ */ jsx("div", {
 						className: "text-sm text-muted-foreground mt-1",
 						children: "No CC required"
 					})
@@ -666,9 +675,9 @@ const PricingPage = ({ subtitle = "See our pricing options and choose the one th
 			}),
 			/* @__PURE__ */ jsx("div", {
 				className: "w-full grid grid-cols-1 sm:grid-cols-[repeat(auto-fit,minmax(300px,max-content))] justify-center gap-6",
-				children: pricingTable.items.slice(0, 4).map((plan) => /* @__PURE__ */ jsx(PricingCard, {
+				children: pricingTable.items.map((plan) => /* @__PURE__ */ jsx(PricingCard, {
 					plan,
-					isPopular: plan.key === "pro",
+					isPopular: plan.metadata?.isMostPopular === true,
 					isSubscribed: subscriptions.items.some((subscription) => ["active", "canceled"].includes(subscription.status))
 				}, plan.id))
 			})
@@ -1541,34 +1550,59 @@ const isMeteredEntitlement = (entitlement) => {
 	return "balance" in entitlement;
 };
 const UsageItem = ({ meter, item, subscription }) => {
+	const isSoftLimit = item?.included?.entitlement?.isSoftLimit ?? true;
 	const rate = (item?.price?.tiers?.find((t) => !t.upToAmount) ?? item?.price?.tiers?.at(-1))?.unitPrice?.amount;
+	const hasOverage = meter.overage > 0;
+	const limit = meter.balance + meter.usage - meter.overage;
+	const isAtLimit = !isSoftLimit && meter.usage >= limit;
+	const dangerZone = hasOverage || isAtLimit;
 	return /* @__PURE__ */ jsxs(Card, {
-		className: cn(meter.overage > 0 && "border-destructive bg-destructive/5"),
-		children: [/* @__PURE__ */ jsxs(CardHeader, { children: [meter.overage > 0 && /* @__PURE__ */ jsxs(Alert, {
-			variant: "destructive",
-			className: "mb-4",
-			children: [
-				/* @__PURE__ */ jsx(AlertTriangleIcon, { className: "size-4 text-red-600 shrink-0" }),
-				/* @__PURE__ */ jsx(AlertTitle, { children: "You've exceeded your monthly quota" }),
-				/* @__PURE__ */ jsxs(AlertDescription, { children: [
-					"Additional usage is being charged at the overage rate",
-					rate ? ` ($${Number(rate).toFixed(2)}/call)` : "",
-					". Upgrade to a higher plan for more usage."
-				] }),
-				subscription && /* @__PURE__ */ jsx(AlertAction, { children: /* @__PURE__ */ jsx(SwitchPlanModal, {
-					subscription,
-					children: /* @__PURE__ */ jsxs(Button, {
-						variant: "destructive",
-						size: "xs",
-						children: [/* @__PURE__ */ jsx(ArrowUpIcon, {}), "Upgrade"]
-					})
-				}) })
-			]
-		}), /* @__PURE__ */ jsxs(CardTitle, { children: [
-			item?.name ?? "Limit",
-			" ",
-			item?.price?.amount
-		] })] }), /* @__PURE__ */ jsxs(CardContent, {
+		className: cn(dangerZone && "border-destructive bg-destructive/5"),
+		children: [/* @__PURE__ */ jsxs(CardHeader, { children: [
+			hasOverage && isSoftLimit && /* @__PURE__ */ jsxs(Alert, {
+				variant: "destructive",
+				className: "mb-4",
+				children: [
+					/* @__PURE__ */ jsx(AlertTriangleIcon, { className: "size-4 text-red-600 shrink-0" }),
+					/* @__PURE__ */ jsx(AlertTitle, { children: "You've exceeded your monthly quota" }),
+					/* @__PURE__ */ jsxs(AlertDescription, { children: [
+						"Additional usage is being charged at the overage rate",
+						rate ? ` ($${Number(rate).toFixed(2)}/call)` : "",
+						". Upgrade to a higher plan for more usage."
+					] }),
+					subscription && /* @__PURE__ */ jsx(AlertAction, { children: /* @__PURE__ */ jsx(SwitchPlanModal, {
+						subscription,
+						children: /* @__PURE__ */ jsxs(Button, {
+							variant: "destructive",
+							size: "xs",
+							children: [/* @__PURE__ */ jsx(ArrowUpIcon, {}), "Upgrade"]
+						})
+					}) })
+				]
+			}),
+			isAtLimit && !isSoftLimit && /* @__PURE__ */ jsxs(Alert, {
+				variant: "destructive",
+				className: "mb-4",
+				children: [
+					/* @__PURE__ */ jsx(AlertTriangleIcon, { className: "size-4 text-red-600 shrink-0" }),
+					/* @__PURE__ */ jsx(AlertTitle, { children: "You've reached your monthly limit" }),
+					/* @__PURE__ */ jsx(AlertDescription, { children: "Requests beyond your quota are blocked. Upgrade to a higher plan for more usage." }),
+					subscription && /* @__PURE__ */ jsx(AlertAction, { children: /* @__PURE__ */ jsx(SwitchPlanModal, {
+						subscription,
+						children: /* @__PURE__ */ jsxs(Button, {
+							variant: "destructive",
+							size: "xs",
+							children: [/* @__PURE__ */ jsx(ArrowUpIcon, {}), "Upgrade"]
+						})
+					}) })
+				]
+			}),
+			/* @__PURE__ */ jsxs(CardTitle, { children: [
+				item?.name ?? "Limit",
+				" ",
+				item?.price?.amount
+			] })
+		] }), /* @__PURE__ */ jsxs(CardContent, {
 			className: "space-y-2",
 			children: [
 				/* @__PURE__ */ jsxs("div", {
@@ -1576,11 +1610,11 @@ const UsageItem = ({ meter, item, subscription }) => {
 					children: [/* @__PURE__ */ jsx("div", {
 						className: "flex flex-col gap-2 mb-2",
 						children: /* @__PURE__ */ jsxs("span", {
-							className: cn(meter.overage > 0 && "text-red-600 font-medium"),
+							className: cn(dangerZone && "text-red-600 font-medium"),
 							children: [
 								meter.usage.toLocaleString(),
 								" used",
-								meter.overage > 0 && /* @__PURE__ */ jsxs("span", {
+								hasOverage && isSoftLimit && /* @__PURE__ */ jsxs("span", {
 									className: "ml-1 text-xs",
 									children: [
 										"(+",
@@ -1592,16 +1626,12 @@ const UsageItem = ({ meter, item, subscription }) => {
 						})
 					}), /* @__PURE__ */ jsxs("span", {
 						className: "text-foreground font-medium",
-						children: [
-							(meter.balance + meter.usage - meter.overage).toLocaleString(),
-							" ",
-							"limit"
-						]
+						children: [limit.toLocaleString(), " limit"]
 					})]
 				}),
 				/* @__PURE__ */ jsx(Progress, {
-					value: meter.usage / (meter.balance + meter.usage - meter.overage) * 100,
-					className: cn("mb-3 h-2", meter.overage > 0 && "bg-red-500")
+					value: Math.min(100, limit > 0 ? meter.usage / limit * 100 : 100),
+					className: cn("mb-3 h-2", dangerZone && "bg-destructive")
 				}),
 				/* @__PURE__ */ jsxs("p", {
 					className: "text-xs text-muted-foreground",
@@ -1611,8 +1641,7 @@ const UsageItem = ({ meter, item, subscription }) => {
 		})]
 	});
 };
-const Usage = ({ usageQuery, currentItems, subscription, isPendingFirstPayment }) => {
-	const usage = usageQuery.data;
+const Usage = ({ usage, isFetching, currentItems, subscription, isPendingFirstPayment }) => {
 	const hasUsage = Object.values(usage.entitlements).some((value) => isMeteredEntitlement(value));
 	return /* @__PURE__ */ jsxs("div", {
 		className: "space-y-4",
@@ -1652,7 +1681,7 @@ const Usage = ({ usageQuery, currentItems, subscription, isPendingFirstPayment }
 				meter: { ...value },
 				subscription,
 				item: currentItems?.find((item) => item.featureKey === key)
-			}, key) : []) : !usageQuery.isFetching && !subscription?.annotations?.["subscription.previous.id"] ? /* @__PURE__ */ jsxs(Alert, {
+			}, key) : []) : !isFetching && !subscription?.annotations?.["subscription.previous.id"] ? /* @__PURE__ */ jsxs(Alert, {
 				variant: "warning",
 				children: [
 					/* @__PURE__ */ jsx(Grid2x2XIcon, {}),
@@ -1693,7 +1722,8 @@ const ActiveSubscription = ({ subscription, deploymentName }) => {
 		}),
 		/* @__PURE__ */ jsx(Usage, {
 			currentItems: activePhase?.items,
-			usageQuery,
+			usage: usageQuery.data,
+			isFetching: usageQuery.isFetching,
 			subscription,
 			isPendingFirstPayment
 		}),

package/package.json

@@ -1,53 +1,46 @@
 {
   "name": "@zuplo/zudoku-plugin-monetization",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/zuplo/zudoku",
     "directory": "packages/plugin-zuplo-monetization"
   },
   "type": "module",
-  "main": "./src/index.ts",
-  "types": "./src/index.ts",
+  "main": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "exports": {
-    ".": "./src/index.ts"
+    ".": {
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.mts"
+    }
   },
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "prepublishOnly": "pnpm build"
-  },
-  "publishConfig": {
-    "main": "./dist/index.mjs",
-    "types": "./dist/index.d.mts",
-    "exports": {
-      ".": {
-        "import": "./dist/index.mjs",
-        "types": "./dist/index.d.mts"
-      }
-    }
-  },
   "dependencies": {
     "tinyduration": "3.4.1"
   },
   "devDependencies": {
-    "@testing-library/dom": "catalog:",
-    "@testing-library/jest-dom": "catalog:",
-    "@testing-library/react": "catalog:",
-    "@types/react": "catalog:",
-    "@types/react-dom": "catalog:",
-    "happy-dom": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
+    "@testing-library/dom": "10.4.1",
+    "@testing-library/jest-dom": "6.9.1",
+    "@testing-library/react": "16.3.2",
+    "@types/react": "19.2.14",
+    "@types/react-dom": "19.2.3",
+    "happy-dom": "20.6.1",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
     "tsdown": "0.20.3",
-    "zudoku": "workspace:*"
+    "zudoku": "0.69.0"
   },
   "peerDependencies": {
     "react": ">=19.2.0",
     "react-dom": ">=19.2.0",
     "zudoku": "*"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsdown --watch",
+    "typecheck": "tsc --project tsconfig.json"
   }
-}
+}