@oneuptime/common 13.0.0 → 13.0.3

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

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

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

@@ -15,6 +15,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class WorkflowLabelRuleEngineServiceClass {
     /**
@@ -37,6 +38,7 @@ class WorkflowLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     workflowLabels: { _id: true },
                     workflowNamePattern: true,
                     workflowDescriptionPattern: true,
@@ -122,6 +124,20 @@ class WorkflowLabelRuleEngineServiceClass {
         }
     }
     doesWorkflowMatchRule(workflow, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "workflowLabels",
+                "workflowNamePattern",
+                "workflowDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (workflowRule) => {
+                return this.doesWorkflowMatchRuleLegacy(workflow, workflowRule);
+            },
+        });
+    }
+    doesWorkflowMatchRuleLegacy(workflow, rule) {
         if (rule.workflowLabels && rule.workflowLabels.length > 0) {
             if (!workflow.labels || workflow.labels.length === 0) {
                 return false;

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

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

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

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class WorkflowOwnerRuleEngineServiceClass {
     /**
@@ -41,6 +42,7 @@ class WorkflowOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     workflowLabels: { _id: true },
                     workflowNamePattern: true,
@@ -142,6 +144,20 @@ class WorkflowOwnerRuleEngineServiceClass {
         }
     }
     doesWorkflowMatchRule(workflow, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "workflowLabels",
+                "workflowNamePattern",
+                "workflowDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (workflowRule) => {
+                return this.doesWorkflowMatchRuleLegacy(workflow, workflowRule);
+            },
+        });
+    }
+    doesWorkflowMatchRuleLegacy(workflow, rule) {
         if (rule.workflowLabels && rule.workflowLabels.length > 0) {
             if (!workflow.labels || workflow.labels.length === 0) {
                 return false;

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

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

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

@@ -1,9 +1,178 @@
 import DatabaseService from "./DatabaseService";
+import QueryHelper from "../Types/Database/QueryHelper";
+import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+import BadDataException from "../../Types/Exception/BadDataException";
+import Typeof from "../../Types/Typeof";
 import Model from "../../Models/DatabaseModels/WorkflowVariable";
+/*
+ * isSecret is declared `string` over a genuinely boolean column, so the value
+ * that comes back is `true` from Postgres and can be the string "true" from a
+ * request body. Read exactly the way RunWorkflow.getSecretWorkflowVariableValues
+ * reads it, so what this service calls secret and what the run logs redact can
+ * never disagree.
+ */
+function isSecretValue(value) {
+    return value === true || value === "true";
+}
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
+    /*
+     * @UniqueColumnBy(["workflowId", "projectId"]) on `name` is enforced by
+     * DatabaseService.checkUniqueColumnBy, which runs on create only - and there
+     * is no unique index on WorkflowVariable to catch what it misses. That was
+     * harmless while the dashboard offered no way to edit a variable. Now that it
+     * does, a rename is the one write that can put two rows with the same name in
+     * the same scope, and RunWorkflow.getVariables builds
+     * `storageMap.local.variables[variable.name] = variable.content` - a plain
+     * dictionary - so the second row would silently overwrite the first and
+     * {{local.variables.X}} would resolve to whichever the query happened to
+     * return last. Nothing would look broken; the workflow would just quietly run
+     * on the wrong value.
+     *
+     * Two things this cannot close, both shared with the create-side guard it
+     * mirrors: DatabaseService._updateBy skips every hook when props.ignoreHooks
+     * is set, and check-then-write is not atomic, so two concurrent renames onto
+     * the same free name can still both land. Closing either properly means a
+     * unique index on (projectId, workflowId, LOWER(name)), which needs a dedupe
+     * migration first because the racy create-side check may already have let
+     * duplicates through.
+     */
+    async onBeforeUpdate(updateBy) {
+        const rawName = updateBy.data.name;
+        /*
+         * Only an update that does not carry the column at all is exempt. An
+         * explicitly blank name is still a write to `name` - the column is
+         * nullable: false but the empty string satisfies that, and update does not
+         * re-run the required check - so two rows blanked in the same scope would
+         * both become "" and collide like any other duplicate. Let it through to
+         * the lookup rather than treating it as "no rename".
+         */
+        const isRename = rawName !== undefined && rawName !== null;
+        /*
+         * sanitizeUpdateData passes plain objects straight through, so `name` is
+         * whatever the request body said it was. Reject a non-string here rather
+         * than letting toLowerCase() throw a TypeError, which would surface as a
+         * 500 and a stack trace instead of a 400 naming the field.
+         */
+        if (isRename && typeof rawName !== Typeof.String) {
+            throw new BadDataException("Workflow variable name must be text.");
+        }
+        const newName = rawName;
+        /*
+         * Turning the secret flag OFF is the one direction that can expose
+         * something. isSecret decides whether RunWorkflow replaces this variable's
+         * value with [REDACTED] before a run log is persisted, and content itself
+         * is unreadable through the API - so a caller who may write a variable but
+         * may not read it could otherwise clear the flag, trigger a run, and read
+         * the value out of the log. Marking a variable secret stays freely
+         * available; unmarking one does not.
+         */
+        const isDeclassifying = updateBy.data.isSecret !== undefined &&
+            updateBy.data.isSecret !== null &&
+            !isSecretValue(updateBy.data.isSecret);
+        if (!isRename && !isDeclassifying) {
+            return { updateBy, carryForward: null };
+        }
+        /*
+         * Read the rows this update will actually touch. Two things about this
+         * query matter.
+         *
+         * It is scoped to the caller's tenant here rather than relying on the
+         * permission layer, because _updateBy runs this hook BEFORE
+         * ModelPermission.checkUpdateQueryPermissions - which is what appends the
+         * project clause. Reading unscoped-as-root would make this hook answer
+         * questions about another project's rows, and its refusal messages say
+         * whether a variable is global and whether a name is taken. A caller
+         * holding a variable id from a project they cannot see would get an oracle
+         * before any authorization ran.
+         *
+         * isRoot inside that scope is still right: the conflicting row may be one
+         * this caller cannot read - read access is label-gated - and a count that
+         * cannot see it reports zero and waves the duplicate through.
+         */
+        const tenantId = updateBy.props.tenantId;
+        const itemsBeingUpdated = await this.findBy({
+            query: tenantId
+                ? Object.assign(Object.assign({}, updateBy.query), { projectId: tenantId }) : updateBy.query,
+            select: {
+                _id: true,
+                name: true,
+                isSecret: true,
+                projectId: true,
+                workflowId: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        if (isDeclassifying) {
+            for (const item of itemsBeingUpdated) {
+                if (isSecretValue(item.isSecret)) {
+                    throw new BadDataException(`"${item.name}" is marked secret, and a secret variable cannot be un-marked. Its value is redacted from workflow run logs, and clearing the flag would publish that value to the logs of every later run. Delete the variable and create it again if it should no longer be secret.`);
+                }
+            }
+        }
+        if (!isRename) {
+            return { updateBy, carryForward: null };
+        }
+        /*
+         * Renaming two rows to one name is a conflict the database lookup below
+         * cannot see: neither collides with anything that exists yet, they collide
+         * with each other once both are written.
+         */
+        if (itemsBeingUpdated.length > 1) {
+            throw new BadDataException(`Cannot rename ${itemsBeingUpdated.length} workflow variables to "${newName}" at once. Variable names must be unique.`);
+        }
+        for (const item of itemsBeingUpdated) {
+            /*
+             * A no-op rename must stay a no-op. Compared case-insensitively because
+             * that is how the uniqueness lookup compares, so "TOKEN" -> "token" is a
+             * change of casing on the same row and not a collision with itself.
+             */
+            if (item.name && item.name.toLowerCase() === newName.toLowerCase()) {
+                continue;
+            }
+            /*
+             * The scope is what makes the lookup mean anything. projectId comes back
+             * from the select above and is non-nullable on the table, so its absence
+             * means the select or the row is wrong - and a missing projectId would
+             * silently drop the clause and count this name across every project on
+             * the instance. Refuse rather than answer the wrong question.
+             */
+            if (!item.projectId) {
+                throw new BadDataException("This workflow variable cannot be renamed because it is not attached to a project.");
+            }
+            const conflictCount = (await this.countBy({
+                query: {
+                    name: QueryHelper.findWithSameText(newName),
+                    projectId: item.projectId,
+                    /*
+                     * Global variables are the rows with a null workflowId, and they
+                     * share a namespace of their own. Querying `workflowId: undefined`
+                     * would drop the clause entirely and compare a global variable
+                     * against every workflow-local one in the project.
+                     */
+                    workflowId: item.workflowId
+                        ? item.workflowId
+                        : QueryHelper.isNull(),
+                    _id: QueryHelper.notEquals(item.id),
+                },
+                props: {
+                    isRoot: true,
+                },
+            })).toNumber();
+            if (conflictCount > 0) {
+                throw new BadDataException(item.workflowId
+                    ? `A workflow variable named "${newName}" already exists on this workflow. Variable names must be unique within a workflow.`
+                    : `A global variable named "${newName}" already exists in this project. Global variable names must be unique.`);
+            }
+        }
+        return { updateBy, carryForward: null };
+    }
 }
 export default new Service();
 //# sourceMappingURL=WorkflowVariableService.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"WorkflowVariableService.js","sourceRoot":"","sources":["../../../../Server/Services/WorkflowVariableService.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,8CAA8C,CAAC;AAEjE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF;AACD,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"WorkflowVariableService.js","sourceRoot":"","sources":["../../../../Server/Services/WorkflowVariableService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.js

@@ -16,6 +16,7 @@ import ProductType from "../../../../Types/MeteredPlan/ProductType";
 import MonitorType from "../../../../Types/Monitor/MonitorType";
 import ObjectID from "../../../../Types/ObjectID";
 import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
+import PayAsYouGoBillingService from "../../../Services/PayAsYouGoBillingService";
 export default class ActiveMonitoringMeteredPlan extends ServerMeteredPlan {
     getProductType() {
         return ProductType.ActiveMonitoring;
@@ -40,6 +41,16 @@ export default class ActiveMonitoringMeteredPlan extends ServerMeteredPlan {
                 isRoot: true,
             },
         });
+        /*
+         * This runs on every monitor create and delete, so each live check here
+         * is a payment-provider read on a request path. Check once, and hand the
+         * answer to the usage write instead of letting it read the same payment
+         * setup again a moment later.
+         */
+        const liveAuthorization = await PayAsYouGoBillingService.authorizeUsageNow(projectId);
+        if (!liveAuthorization) {
+            return;
+        }
         // update this count in project as well.
         const project = await ProjectService.findOneById({
             id: projectId,
@@ -56,7 +67,7 @@ export default class ActiveMonitoringMeteredPlan extends ServerMeteredPlan {
                 project.paymentProviderMeteredSubscriptionId) &&
             project.paymentProviderPlanId) {
             await BillingService.addOrUpdateMeteredPricingOnSubscription((options === null || options === void 0 ? void 0 : options.meteredPlanSubscriptionId) ||
-                project.paymentProviderMeteredSubscriptionId, this, count.toNumber());
+                project.paymentProviderMeteredSubscriptionId, this, count.toNumber(), { liveAuthorization: liveAuthorization });
         }
     }
 }

package/build/dist/Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActiveMonitoringMeteredPlan.js","sourceRoot":"","sources":["../../../../../../Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,WAAW,MAAM,uCAAuC,CAAC;AAChE,OAAO,QAAQ,MAAM,4BAA4B,CAAC;AAGlD,OAAO,WAAW,MAAM,sCAAsC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,iBAAiB;IAExD,cAAc;QAC5B,OAAO,WAAW,CAAC,gBAAgB,CAAC;IACtC,CAAC;IAGqB,AAAN,KAAK,CAAC,+BAA+B,CACnD,SAAmB,EACnB,OAEC;QAED,MAAM,KAAK,GAAmB,MAAM,cAAc,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE;gBACL,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;aACvD;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,wCAAwC;QACxC,MAAM,cAAc,CAAC,aAAa,CAAC;YACjC,EAAE,EAAE,SAAS;YACb,IAAI,EAAE;gBACJ,0BAA0B,EAAE,KAAK,CAAC,QAAQ,EAAE;aAC7C;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,wCAAwC;QACxC,MAAM,OAAO,GAAmB,MAAM,cAAc,CAAC,WAAW,CAAC;YAC/D,EAAE,EAAE,SAAS;YACb,MAAM,EAAE;gBACN,oCAAoC,EAAE,IAAI;gBAC1C,qBAAqB,EAAE,IAAI;aAC5B;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IACE,OAAO;YACP,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,yBAAyB;gBACjC,OAAO,CAAC,oCAAoC,CAAC;YAC/C,OAAO,CAAC,qBAAqB,EAC7B,CAAC;YACD,MAAM,cAAc,CAAC,uCAAuC,CAC1D,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,yBAAoC;gBAC3C,OAAO,CAAC,oCAA+C,EAC1D,IAAI,EACJ,KAAK,CAAC,QAAQ,EAAE,CACjB,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA1DiB;IADf,WAAW,EAAE;;;;iEAGb;AAGqB;IADrB,WAAW,EAAE;;qCAED,QAAQ;;kFAmDpB"}
+{"version":3,"file":"ActiveMonitoringMeteredPlan.js","sourceRoot":"","sources":["../../../../../../Server/Types/Billing/MeteredPlan/ActiveMonitoringMeteredPlan.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,WAAW,MAAM,uCAAuC,CAAC;AAChE,OAAO,QAAQ,MAAM,4BAA4B,CAAC;AAGlD,OAAO,WAAW,MAAM,sCAAsC,CAAC;AAC/D,OAAO,wBAEN,MAAM,4CAA4C,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,2BAA4B,SAAQ,iBAAiB;IAExD,cAAc;QAC5B,OAAO,WAAW,CAAC,gBAAgB,CAAC;IACtC,CAAC;IAGqB,AAAN,KAAK,CAAC,+BAA+B,CACnD,SAAmB,EACnB,OAEC;QAED,MAAM,KAAK,GAAmB,MAAM,cAAc,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE;gBACL,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;aACvD;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,wCAAwC;QACxC,MAAM,cAAc,CAAC,aAAa,CAAC;YACjC,EAAE,EAAE,SAAS;YACb,IAAI,EAAE;gBACJ,0BAA0B,EAAE,KAAK,CAAC,QAAQ,EAAE;aAC7C;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH;;;;;WAKG;QACH,MAAM,iBAAiB,GACrB,MAAM,wBAAwB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE9D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,wCAAwC;QACxC,MAAM,OAAO,GAAmB,MAAM,cAAc,CAAC,WAAW,CAAC;YAC/D,EAAE,EAAE,SAAS;YACb,MAAM,EAAE;gBACN,oCAAoC,EAAE,IAAI;gBAC1C,qBAAqB,EAAE,IAAI;aAC5B;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IACE,OAAO;YACP,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,yBAAyB;gBACjC,OAAO,CAAC,oCAAoC,CAAC;YAC/C,OAAO,CAAC,qBAAqB,EAC7B,CAAC;YACD,MAAM,cAAc,CAAC,uCAAuC,CAC1D,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,yBAAoC;gBAC3C,OAAO,CAAC,oCAA+C,EAC1D,IAAI,EACJ,KAAK,CAAC,QAAQ,EAAE,EAChB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,CACzC,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAxEiB;IADf,WAAW,EAAE;;;;iEAGb;AAGqB;IADrB,WAAW,EAAE;;qCAED,QAAQ;;kFAiEpB"}

package/build/dist/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.js

@@ -15,6 +15,7 @@ import OneUptimeDate from "../../../../Types/Date";
 import ProductType from "../../../../Types/MeteredPlan/ProductType";
 import ObjectID from "../../../../Types/ObjectID";
 import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
+import PayAsYouGoBillingService from "../../../Services/PayAsYouGoBillingService";
 export default class TelemetryMeteredPlan extends ServerMeteredPlan {
     get productType() {
         return this._productType;
@@ -41,11 +42,33 @@ export default class TelemetryMeteredPlan extends ServerMeteredPlan {
         return this.productType;
     }
     async reportQuantityToBillingProvider(projectId, options) {
-        // get all unreported logs
         var _a;
+        /*
+         * One live read of the payment setup for the whole report. Staging and the
+         * usage write each used to repeat it seconds later, for every product type
+         * of every project in the billing pass; they are handed this one instead,
+         * and still check live when it is not for this project or has aged out.
+         */
+        const liveAuthorization = await PayAsYouGoBillingService.authorizeUsageNow(projectId);
+        if (!liveAuthorization) {
+            await TelemetryUsageBillingService.waiveUnreportedUsageBilling({
+                projectId: projectId,
+                productType: this.productType,
+            });
+            return;
+        }
+        const billingStartsAt = await PayAsYouGoBillingService.getTelemetryBillingStartDate(projectId);
+        if (billingStartsAt) {
+            await TelemetryUsageBillingService.waiveUnreportedUsageBilling({
+                projectId: projectId,
+                productType: this.productType,
+                before: billingStartsAt,
+            });
+        }
         await TelemetryUsageBillingService.stageTelemetryUsageForProject({
             projectId: projectId,
             productType: this.productType,
+            liveAuthorization: liveAuthorization,
         });
         const usageBillings = await TelemetryUsageBillingService.getUnreportedUsageBilling({
             projectId: projectId,
@@ -85,7 +108,7 @@ export default class TelemetryMeteredPlan extends ServerMeteredPlan {
                 project.paymentProviderMeteredSubscriptionId) &&
             project.paymentProviderPlanId) {
             await BillingService.addOrUpdateMeteredPricingOnSubscription((options === null || options === void 0 ? void 0 : options.meteredPlanSubscriptionId) ||
-                project.paymentProviderMeteredSubscriptionId, this, totalCostInCents);
+                project.paymentProviderMeteredSubscriptionId, this, totalCostInCents, { liveAuthorization: liveAuthorization });
             for (const usageBilling of usageBillings) {
                 if (usageBilling.id) {
                     // now mark it as reported.

package/build/dist/Server/Types/Billing/MeteredPlan/TelemetryMeteredPlan.js.map

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

package/build/dist/Server/Types/Database/QueryHelper.js

@@ -8,6 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+import LIMIT_MAX from "../../../Types/Database/LimitMax";
 import ObjectID from "../../../Types/ObjectID";
 import Text from "../../../Types/Text";
 import Typeof from "../../../Types/Typeof";
@@ -16,6 +17,21 @@ import { toLikePattern } from "../../../Types/BaseDatabase/WildcardPattern";
 import CaptureSpan from "../../Utils/Telemetry/CaptureSpan";
 import buildJSONColumnQuery from "./JSONColumnQuery";
 export default class QueryHelper {
+    /** Read a boolean whose criteria-backed `true` state is encoded as null. */
+    static booleanForCriteriaBackedRule(criteriaColumnName, value) {
+        if (criteriaColumnName.match(/^[A-Za-z_][A-Za-z0-9_]*$/) === null) {
+            throw new Error("Criteria column name must be a plain identifier.");
+        }
+        const rid = Text.generateRandomText(10);
+        return Raw((alias) => {
+            const separatorIndex = alias.lastIndexOf(".");
+            const qualifier = separatorIndex >= 0 ? alias.slice(0, separatorIndex + 1) : "";
+            const criteriaAlias = `${qualifier}"${criteriaColumnName}"`;
+            return `((CASE WHEN ${criteriaAlias} IS NULL THEN COALESCE(${alias}, false) ELSE ${alias} IS NULL END) = :${rid})`;
+        }, {
+            [rid]: value,
+        });
+    }
     static modulo(moduloBy, reminder) {
         const rid = Text.generateRandomText(10);
         const rid2 = Text.generateRandomText(10);
@@ -502,6 +518,45 @@ export default class QueryHelper {
             return jsonQuery.toSql(columnReference);
         }, jsonQuery.parameters);
     }
+    /**
+     * Matches a jsonb document whose named array contains an object with a
+     * particular discriminator and whose second named property contains any of
+     * the supplied values.
+     *
+     * For example, rule criteria store filters as:
+     * `{ filters: [{ field: "monitorLabels", value: ["label-id"] }] }`.
+     * Keeping every key, discriminator, and value in the parameter bag makes
+     * this helper safe for other jsonb documents too. The CASE expressions make
+     * malformed legacy json harmless instead of letting
+     * `jsonb_array_elements*` abort the entire query.
+     */
+    static jsonArrayObjectsContainAnyArrayValue(data) {
+        const values = Array.from(new Set(data.values.map((value) => {
+            return value.toString();
+        })));
+        if (values.length === 0) {
+            return Raw(() => {
+                return "TRUE = FALSE";
+            }, {});
+        }
+        if (values.length > LIMIT_MAX) {
+            throw new Error(`JSON array value filters cannot bind more than ${LIMIT_MAX} unique values.`);
+        }
+        const arrayKeyParameter = Text.generateRandomText(10);
+        const discriminatorKeyParameter = Text.generateRandomText(10);
+        const discriminatorValueParameter = Text.generateRandomText(10);
+        const valueArrayKeyParameter = Text.generateRandomText(10);
+        const valuesParameter = Text.generateRandomText(10);
+        return Raw((alias) => {
+            return `(EXISTS (SELECT 1 FROM jsonb_array_elements(CASE WHEN jsonb_typeof(${alias} -> :${arrayKeyParameter}) = 'array' THEN ${alias} -> :${arrayKeyParameter} ELSE '[]'::jsonb END) AS json_array_item(item) WHERE json_array_item.item ->> :${discriminatorKeyParameter} = :${discriminatorValueParameter} AND EXISTS (SELECT 1 FROM jsonb_array_elements_text(CASE WHEN jsonb_typeof(json_array_item.item -> :${valueArrayKeyParameter}) = 'array' THEN json_array_item.item -> :${valueArrayKeyParameter} ELSE '[]'::jsonb END) AS json_array_value(value) WHERE json_array_value.value = ANY(CAST(:${valuesParameter} AS text[])))))`;
+        }, {
+            [arrayKeyParameter]: data.arrayKey,
+            [discriminatorKeyParameter]: data.discriminatorKey,
+            [discriminatorValueParameter]: data.discriminatorValue,
+            [valueArrayKeyParameter]: data.valueArrayKey,
+            [valuesParameter]: values,
+        });
+    }
     static lessThan(value) {
         const rid = Text.generateRandomText(10);
         return Raw((alias) => {
@@ -511,6 +566,12 @@ export default class QueryHelper {
         });
     }
 }
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Boolean]),
+    __metadata("design:returntype", Object)
+], QueryHelper, "booleanForCriteriaBackedRule", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -727,6 +788,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], QueryHelper, "queryJson", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], QueryHelper, "jsonArrayObjectsContainAnyArrayValue", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),