@oneuptime/common 13.0.0 → 13.0.1

package/build/dist/Server/Services/PayAsYouGoBillingService.js

@@ -0,0 +1,297 @@
+import SubscriptionPlan, { PlanType, } from "../../Types/Billing/SubscriptionPlan";
+import PaymentRequiredException from "../../Types/Exception/PaymentRequiredException";
+import { getAllEnvVars } from "../EnvironmentConfig";
+import InMemoryTTLCache from "../Infrastructure/InMemoryTTLCache";
+import BillingService from "./BillingService";
+import ProjectService from "./ProjectService";
+import PromoCodeService from "./PromoCodeService";
+export const PAY_AS_YOU_GO_PAYMENT_REQUIRED_MESSAGE = "Add a payment method in Project Settings > Billing before using paid monitoring or telemetry. These features have usage charges even on the Free plan. Manual monitors remain free.";
+const NOT_AUTHORIZED = "none";
+/*
+ * A denial is the expensive answer. An authorized project answers from the
+ * positive cache and costs one provider read a minute; an unauthorized one
+ * re-ran the full check every time, and that check costs a payment-method
+ * read per supported type, plus - on a paid plan - the subscription read that
+ * rules out an invoice agreement. On the telemetry admission path - which
+ * runs for every ingested batch over OTLP, gRPC, MQTT and session replay, and
+ * which deliberately re-checks even on a key-cache hit - that is a provider
+ * read storm proportional to ingest traffic, for exactly the projects that
+ * are not paying. It is enough on its own to hold a Stripe account at its
+ * rate limit indefinitely, which then breaks the billing page for every other
+ * project.
+ *
+ * So denials are cacheable, but only where a few seconds of staleness is
+ * harmless: admission control, which the client retries anyway. Every
+ * user-facing check - the billing page's own gate, creating a monitor -
+ * still reads through, so "add a card and it works" keeps meaning that.
+ */
+const DENIAL_CACHE_TTL_IN_MS = 10000;
+const AUTHORIZATION_CACHE_TTL_IN_MS = 60000;
+/*
+ * How long a live authorization from authorizeUsageNow may stand in for the
+ * next live check of the same project. One metered report used to read the
+ * owner's payment setup three times in as many seconds - to decide, again
+ * while staging, and again before the usage write - and every one of those
+ * reads repeated the provider calls the first had just made.
+ *
+ * Equal to AUTHORIZATION_CACHE_TTL_IN_MS on purpose: it is never looser than
+ * the positive cache every other caller already accepts. Nothing stores a
+ * token, so it lives only as long as the report that asked for it.
+ */
+const LIVE_AUTHORIZATION_REUSE_WINDOW_IN_MS = AUTHORIZATION_CACHE_TTL_IN_MS;
+export class Service {
+    constructor() {
+        this.authorizedProjects = new InMemoryTTLCache(10000);
+        /*
+         * Whether a project bills under an agreement that already covers its earlier
+         * telemetry, and so takes no cutoff. Kept apart from authorizedProjects,
+         * which records only what authorized the project first - and for an invoice
+         * customer who also keeps a card on file, that is the card.
+         */
+        this.noCutoffAgreements = new InMemoryTTLCache(10000);
+    }
+    /**
+     * A subscription created during signup is not permission to incur charges.
+     * Require a payment method, or a real invoice/reseller billing agreement.
+     * Short positive caching keeps the telemetry admission path affordable.
+     *
+     * `allowStaleDenial` additionally lets a recent denial answer without going
+     * back to the provider. Only admission control should pass it - see
+     * DENIAL_CACHE_TTL_IN_MS above.
+     */
+    async canUsePayAsYouGo(projectId, options) {
+        if (!BillingService.isBillingEnabled()) {
+            return true;
+        }
+        const cacheKey = projectId.toString();
+        if ((options === null || options === void 0 ? void 0 : options.useCache) !== false) {
+            const cached = this.authorizedProjects.get(cacheKey);
+            if (cached && cached !== NOT_AUTHORIZED) {
+                return true;
+            }
+            if (cached === NOT_AUTHORIZED && (options === null || options === void 0 ? void 0 : options.allowStaleDenial)) {
+                return false;
+            }
+        }
+        const authorization = await this.checkPaymentAuthorization(projectId);
+        if (authorization) {
+            this.authorizedProjects.set(cacheKey, authorization, AUTHORIZATION_CACHE_TTL_IN_MS);
+        }
+        else {
+            this.authorizedProjects.set(cacheKey, NOT_AUTHORIZED, DENIAL_CACHE_TTL_IN_MS);
+        }
+        return Boolean(authorization);
+    }
+    /**
+     * A live check of the project's payment setup, as a token the rest of one
+     * metered report hands on instead of repeating the check - see
+     * LIVE_AUTHORIZATION_REUSE_WINDOW_IN_MS. Null when the project may not
+     * incur usage charges. A provider failure propagates like any other live
+     * check: it becomes neither a token nor a denial.
+     */
+    async authorizeUsageNow(projectId) {
+        // Stamped before the read, so a token never outlives the answer it carries.
+        const decidedAt = Date.now();
+        if (!(await this.canUsePayAsYouGo(projectId, { useCache: false }))) {
+            return null;
+        }
+        return {
+            projectId: projectId.toString(),
+            decidedAt: decidedAt,
+        };
+    }
+    /**
+     * Whether a token from authorizeUsageNow still vouches for this project.
+     * No token, another project's token, or one past the reuse window is not an
+     * answer at all, and the caller has to check live.
+     */
+    isLiveAuthorizationFor(authorization, projectId) {
+        if (!authorization || authorization.projectId !== projectId.toString()) {
+            return false;
+        }
+        const ageInMs = Date.now() - authorization.decidedAt;
+        return ageInMs >= 0 && ageInMs <= LIVE_AUTHORIZATION_REUSE_WINDOW_IN_MS;
+    }
+    /**
+     * Forget everything cached about a project's authorization and billing
+     * agreement. Called when the payment methods on file are re-read and when
+     * one is removed, so a card added a moment ago is honoured on the next
+     * admission check rather than at the end of the denial TTL.
+     */
+    invalidate(projectId) {
+        this.authorizedProjects.delete(projectId.toString());
+        this.noCutoffAgreements.delete(projectId.toString());
+    }
+    async requirePayAsYouGo(projectId, options) {
+        if (!(await this.canUsePayAsYouGo(projectId, options))) {
+            throw new PaymentRequiredException(PAY_AS_YOU_GO_PAYMENT_REQUIRED_MESSAGE);
+        }
+    }
+    async getTelemetryBillingStartDate(projectId) {
+        await this.requirePayAsYouGo(projectId);
+        if (!BillingService.isBillingEnabled()) {
+            return undefined;
+        }
+        const authorization = this.authorizedProjects.get(projectId.toString());
+        if (authorization === "invoice" || authorization === "reseller") {
+            return undefined;
+        }
+        /*
+         * "payment-method" is not the whole answer. The card is checked before the
+         * invoice agreement, so an invoice customer who also keeps a card on file
+         * is authorized by the card - and a cutoff stamped for them would waive
+         * telemetry their contract already bills. Ask about the agreement itself
+         * before any marker is written.
+         */
+        if (await this.hasNoCutoffAgreement(projectId)) {
+            return undefined;
+        }
+        const project = await ProjectService.findOneById({
+            id: projectId,
+            select: {
+                paymentProviderCustomerId: true,
+            },
+            props: { isRoot: true, ignoreHooks: true },
+        });
+        if (!(project === null || project === void 0 ? void 0 : project.paymentProviderCustomerId)) {
+            throw new PaymentRequiredException(PAY_AS_YOU_GO_PAYMENT_REQUIRED_MESSAGE);
+        }
+        const authorizedAt = await BillingService.getMeteredBillingStartDate(project.paymentProviderCustomerId);
+        /*
+         * Daily aggregates cannot separate pre-card and post-card usage. Forgive
+         * the partial authorization day and begin with the next complete UTC day.
+         */
+        return new Date(Date.UTC(authorizedAt.getUTCFullYear(), authorizedAt.getUTCMonth(), authorizedAt.getUTCDate() + 1));
+    }
+    async requireMeteredSubscriptionPayment(subscription, options) {
+        const customerId = typeof subscription.customer === "string"
+            ? subscription.customer
+            : subscription.customer.id;
+        const project = await ProjectService.findOneBy({
+            query: { paymentProviderCustomerId: customerId },
+            select: { _id: true },
+            props: { isRoot: true, ignoreHooks: true },
+        });
+        if (!(project === null || project === void 0 ? void 0 : project.id)) {
+            throw new PaymentRequiredException(PAY_AS_YOU_GO_PAYMENT_REQUIRED_MESSAGE);
+        }
+        /*
+         * The owner comes from the subscription's own customer, never from the
+         * caller, so a token only spares the read when it was made for the
+         * project this usage is about to be charged to.
+         */
+        if (this.isLiveAuthorizationFor(options === null || options === void 0 ? void 0 : options.liveAuthorization, project.id)) {
+            return;
+        }
+        if (!(await this.canUsePayAsYouGo(project.id, { useCache: false }))) {
+            throw new PaymentRequiredException(PAY_AS_YOU_GO_PAYMENT_REQUIRED_MESSAGE);
+        }
+    }
+    async checkPaymentAuthorization(projectId) {
+        const project = await this.findBillingSetup(projectId);
+        if (!project) {
+            return null;
+        }
+        if (await this.hasResellerAgreement(projectId, project)) {
+            return "reseller";
+        }
+        if (!project.paymentProviderPlanId || !project.paymentProviderCustomerId) {
+            return null;
+        }
+        const plan = SubscriptionPlan.getSubscriptionPlanById(project.paymentProviderPlanId, getAllEnvVars());
+        if (!plan) {
+            return null;
+        }
+        /*
+         * Card first, and a card holder's subscription is never read. Stripe
+         * rate-limits GET /v1/subscriptions/:id on its own, apart from the
+         * account-wide limit, and this check sits on synchronous paths - creating
+         * a monitor, the billing page's gate, every metered report. Reading the
+         * subscription first put that endpoint in front of every answer, three or
+         * four times per monitor create, and held it at its limit. Only a project
+         * with no card needs the subscription: it is what tells an invoice
+         * agreement apart from no agreement at all.
+         */
+        if (await BillingService.hasPaymentMethods(project.paymentProviderCustomerId)) {
+            return "payment-method";
+        }
+        return (await this.hasInvoiceAgreement(project)) ? "invoice" : null;
+    }
+    /*
+     * Cached per project because a telemetry billing pass asks for every product
+     * type, twice each, seconds apart - one subscription read a pass rather than
+     * fourteen. A failure is never cached and never read as "no agreement": that
+     * answer stamps a cutoff, and a cutoff waives usage.
+     */
+    async hasNoCutoffAgreement(projectId) {
+        const cacheKey = projectId.toString();
+        const cached = this.noCutoffAgreements.get(cacheKey);
+        if (cached !== undefined) {
+            return cached;
+        }
+        const project = await this.findBillingSetup(projectId);
+        const hasAgreement = project
+            ? (await this.hasResellerAgreement(projectId, project)) ||
+                (await this.hasInvoiceAgreement(project))
+            : false;
+        this.noCutoffAgreements.set(cacheKey, hasAgreement, AUTHORIZATION_CACHE_TTL_IN_MS);
+        return hasAgreement;
+    }
+    async findBillingSetup(projectId) {
+        return await ProjectService.findOneById({
+            id: projectId,
+            select: {
+                paymentProviderPlanId: true,
+                paymentProviderCustomerId: true,
+                paymentProviderSubscriptionId: true,
+                resellerId: true,
+                resellerPlanId: true,
+            },
+            props: { isRoot: true, ignoreHooks: true },
+        });
+    }
+    async hasResellerAgreement(projectId, project) {
+        if (!project.resellerId || !project.resellerPlanId) {
+            return false;
+        }
+        /*
+         * The redeemed license is bound to the project and reseller. Its
+         * original plan can differ after an authenticated reseller tier change.
+         */
+        const redeemedLicense = await PromoCodeService.findOneBy({
+            query: {
+                projectId: projectId,
+                resellerId: project.resellerId,
+                isPromoCodeUsed: true,
+            },
+            select: { _id: true },
+            props: { isRoot: true, ignoreHooks: true },
+        });
+        return Boolean(redeemedLicense);
+    }
+    /*
+     * A paid plan whose own subscription, billed to this project's own customer,
+     * is active and collected by invoice. The single definition behind both the
+     * "invoice" authorization and the telemetry cutoff exemption.
+     */
+    async hasInvoiceAgreement(project) {
+        if (!project.paymentProviderPlanId ||
+            !project.paymentProviderCustomerId ||
+            !project.paymentProviderSubscriptionId) {
+            return false;
+        }
+        const plan = SubscriptionPlan.getSubscriptionPlanById(project.paymentProviderPlanId, getAllEnvVars());
+        if (!plan || plan.getName() === PlanType.Free) {
+            return false;
+        }
+        const subscription = await BillingService.getSubscription(project.paymentProviderSubscriptionId);
+        const customerId = typeof subscription.customer === "string"
+            ? subscription.customer
+            : subscription.customer.id;
+        return (customerId === project.paymentProviderCustomerId &&
+            subscription.collection_method === "send_invoice" &&
+            subscription.status === "active");
+    }
+}
+export default new Service();
+//# sourceMappingURL=PayAsYouGoBillingService.js.map

package/build/dist/Server/Services/PayAsYouGoBillingService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PayAsYouGoBillingService.js","sourceRoot":"","sources":["../../../../Server/Services/PayAsYouGoBillingService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/ProjectService.js

@@ -76,6 +76,7 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import DatabaseConfig from "../DatabaseConfig";
 import Semaphore from "../Infrastructure/Semaphore";
 import InMemoryTTLCache from "../Infrastructure/InMemoryTTLCache";
+import { IsNull } from "typeorm";
 /*
  * Ceiling on a single manual adjustment. Staff type dollars and the column
  * stores cents, so the classic slip is a factor of 100 - this turns that into
@@ -2043,7 +2044,31 @@ These are no longer recorded against the project and have to be cancelled by han
             });
         }
     }
+    /**
+     * Record seat synchronization state only for the subscription that was read.
+     * The normal update path locates rows first and then writes by id, which can
+     * overwrite a replacement subscription's state during a concurrent plan change.
+     */
+    async updateSubscriptionSeats(data) {
+        const result = await this.getRepository().update({
+            _id: data.projectId.toString(),
+            paymentProviderSubscriptionId: data.subscriptionId,
+            paymentProviderPlanId: data.planId,
+            deletedAt: IsNull(),
+        }, {
+            paymentProviderSubscriptionSeats: data.seats === null
+                ? () => {
+                    return "NULL";
+                }
+                : data.seats,
+            version: () => {
+                return '"version" + 1';
+            },
+        });
+        return result.affected || 0;
+    }
     async reactiveSubscription(projectId) {
+        var _a;
         logger.debug("Reactivating subscription for project " + projectId, {
             projectId: projectId === null || projectId === void 0 ? void 0 : projectId.toString(),
         });
@@ -2074,7 +2099,12 @@ These are no longer recorded against the project and have to be cancelled by han
         if (!project.paymentProviderMeteredSubscriptionId) {
             throw new BadDataException("Payment Provider metered subscription not found");
         }
-        if (!project.paymentProviderSubscriptionSeats) {
+        /*
+         * A pending seat synchronization leaves the acknowledged count empty.
+         * Reactivation can still use the memberships already stored in the project.
+         */
+        const seats = (_a = project.paymentProviderSubscriptionSeats) !== null && _a !== void 0 ? _a : (await TeamMemberService.getUniqueTeamMemberCountInProject(projectId));
+        if (!seats) {
             throw new BadDataException("Payment Provider subscription seats not found");
         }
         if (!project.paymentProviderPlanId) {
@@ -2105,7 +2135,7 @@ These are no longer recorded against the project and have to be cancelled by han
             meteredSubscriptionId: project.paymentProviderMeteredSubscriptionId,
             serverMeteredPlans: AllMeteredPlans,
             newPlan: subscriptionPlan,
-            quantity: project.paymentProviderSubscriptionSeats,
+            quantity: seats,
             isYearly: SubscriptionPlan.isYearlyPlan(project.paymentProviderPlanId),
             endTrialAt: endTrialAt,
         });
@@ -2672,6 +2702,12 @@ __decorate([
     __metadata("design:paramtypes", [ObjectID, String, String]),
     __metadata("design:returntype", Promise)
 ], ProjectService.prototype, "sendEmailToProjectOwners", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ProjectService.prototype, "updateSubscriptionSeats", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),