@i4e/invest4edu-access-core 0.19.0 → 0.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i4e/invest4edu-access-core",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Shared access-control primitives for NeoFindesk: tenant keystone, role capabilities, reportee tree, feature flags, and the unified access engine (registry schema, snapshot resolver, visibleWhen).",
   "type": "module",
   "exports": {

package/src/entitlement-schema.js

@@ -33,6 +33,16 @@ export const SUBSCRIPTION_STATUSES = Object.freeze([
  */
 export const QUOTA_TIMEZONE = "Asia/Kolkata";
 
+/**
+ * The synthetic feature that carries a credits-mode plan's allowance.
+ *
+ * Credits mode needed no new machinery precisely because the allowance is an ordinary
+ * entitlement row on this code: it inherits cycle columns, effective-date versioning, trial
+ * precedence, as-of resolution and the race-free counter. A plan IS credits-mode when a row for
+ * this code resolves — there is no separate flag to drift out of step with the data.
+ */
+export const CREDITS_FEATURE_CODE = "SUBSCRIPTION.CREDITS";
+
 /** Reasons an entitlement decision can carry. Stable strings — they surface in APIs and logs. */
 export const ENTITLEMENT_REASONS = Object.freeze({
   OK: "ok",
@@ -169,6 +179,7 @@ export const METER_CLIENT_DEF = Object.freeze({
 
 export default {
   PERIOD_GRANULARITIES,
+  CREDITS_FEATURE_CODE,
   QUOTA_SCOPES,
   OVERAGE_POLICIES,
   SUBSCRIPTION_STATUSES,

package/src/entitlement-store.js

@@ -23,7 +23,8 @@
  * outage into a customer-visible one. Absence is far more likely to be our gap than a customer
  * genuinely owning nothing.
  */
-import { resolveEntitlement, periodKey, subjectKeyFor } from "./entitlement.js";
+import { resolveEntitlement, resolveEntitlementRow, periodKey, subjectKeyFor } from "./entitlement.js";
+import { CREDITS_FEATURE_CODE } from "./entitlement-schema.js";
 import { LIVE_STATUSES } from "./subscription-lifecycle.js";
 
 /** Every failure path returns this, so callers never have to branch on "did the lookup work". */
@@ -96,15 +97,105 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
       const cycles = subscription.status === "trialing"
         ? ["trial", subscription.cycle]
         : [subscription.cycle];
+      /**
+       * Fetched together: the feature's own rows AND the plan's credit-allowance rows. A plan IS
+       * credits-mode when a SUBSCRIPTION.CREDITS row resolves — the mode is the data, so there is
+       * no flag to drift out of step with it.
+       */
       const fetched = await db.collection("plan_entitlements").find({
         plan_code: subscription.plan_code,
         cycle: { $in: cycles },
-        feature_code: featureCode,
+        feature_code: featureCode === CREDITS_FEATURE_CODE
+          ? featureCode
+          : { $in: [featureCode, CREDITS_FEATURE_CODE] },
       }).toArray();
-      const trialRows = fetched.filter((r) => r.cycle === "trial");
-      const rows = subscription.status === "trialing" && trialRows.length
-        ? trialRows
-        : fetched.filter((r) => r.cycle === subscription.cycle);
+      const pick = (code) => {
+        const mine = fetched.filter((r) => r.feature_code === code);
+        const trial = mine.filter((r) => r.cycle === "trial");
+        return subscription.status === "trialing" && trial.length
+          ? trial
+          : mine.filter((r) => r.cycle === subscription.cycle);
+      };
+      const rows = pick(featureCode);
+      const creditRows = featureCode === CREDITS_FEATURE_CODE ? [] : pick(CREDITS_FEATURE_CODE);
+      const creditsMode = creditRows.length > 0 && feature.is_meterable;
+
+      /**
+       * CREDITS MODE — the feature's own row says whether it is INCLUDED (and may override the
+       * cost); the guard runs against the shared credit allowance, priced per use.
+       *
+       *   cost = plan row's credit_cost  >  service's registry credit_cost  >  1
+       *
+       * The per-plan override is your "premium plans give more usage" lever: eCAS can cost 2 on
+       * Discover and 1 on Grow without any per-feature matrix returning through the back door.
+       */
+      if (creditsMode) {
+        const svcRow = resolveEntitlementRow(rows, featureCode, now);
+        // Not named in a credits plan → the same fail-open NOT_IN_PLAN as count mode. A plan
+        // that forgot to include a feature is a config gap, not a paywall.
+        if (svcRow && svcRow.unlocked !== false) {
+          const cost = Number(svcRow.credit_cost) > 0
+            ? Number(svcRow.credit_cost)
+            : (Number(feature.credit_cost) > 0 ? Number(feature.credit_cost) : 1);
+
+          let packBalance = 0;
+          try {
+            const bal = await db.collection("feature_credits").aggregate([
+              { $match: {
+                subject_type: subjectType,
+                subject_id: oid(subjectId),
+                feature_code: CREDITS_FEATURE_CODE,
+                $expr: { $lt: ["$consumed", "$purchased"] },
+                $or: [{ expires_at: null }, { expires_at: { $exists: false } }, { expires_at: { $gt: now } }],
+              } },
+              { $group: { _id: null, n: { $sum: { $subtract: ["$purchased", "$consumed"] } } } },
+            ]).toArray();
+            packBalance = bal[0]?.n || 0;
+          } catch (e) {
+            logger.warn(`[entitlement] credit-pack balance unreadable: ${e.message}`);
+          }
+
+          const creditRow = creditRows[0];
+          const period = periodKey(creditRow.period_granularity || "month", {
+            now, subscriptionId: subscription._id, periodStart: subscription.period_start,
+          });
+          const subjectKey = subjectKeyFor(creditRow.quota_scope, identity) || "";
+          const usage = await db.collection("subscription_usage").findOne({
+            subscription_id: subscription._id,
+            feature_code: CREDITS_FEATURE_CODE,
+            period,
+            subject_key: subjectKey,
+          });
+
+          const result = await resolveEntitlement({
+            subscription,
+            entitlementRows: creditRows,
+            featureCode: CREDITS_FEATURE_CODE,
+            feature: { is_meterable: true },
+            used: usage?.used || 0,
+            credits: packBalance,
+            identity, bypass, now, cost,
+          });
+
+          const effectiveCreditRow = creditRows[0]
+            ? { ...creditRows[0], quota: result.quota, overage_policy: result.overage_policy || creditRows[0].overage_policy }
+            : null;
+
+          return {
+            ...result,
+            mode: "credits",
+            carriedSubjectType: subjectType,
+            carriedSubjectId: subjectId,
+            carriedSubscriptionId: subscription._id,
+            carriedPeriodStart: subscription.period_start || null,
+            carriedIdentity: identity,
+            carriedRow: effectiveCreditRow,
+            // consume() counts against THIS bucket, at THIS price — never recomputed.
+            carriedFeatureCode: CREDITS_FEATURE_CODE,
+            carriedCost: cost,
+          };
+        }
+      }
 
       /**
        * À-la-carte credits — units bought singly. Summed across purchases that still have units
@@ -184,6 +275,31 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
     }
   }
 
+  /**
+   * Per-service breakdown when a shared bucket pays — "where did my 500 credits go".
+   *
+   * Fire-and-forget and unguarded: it is reporting, not enforcement, and a failed attribution
+   * row must never undo a consumption the guard already allowed. Only written when the bucket
+   * differs from the feature (credits mode) — in count mode the guarded row IS the attribution.
+   */
+  function recordAttribution({ db, entitlement, featureCode, bucketCode, subId, ident, n, units, now }) {
+    if (!db || bucketCode === featureCode) return;
+    try {
+      const row = entitlement?.carriedRow || {};
+      const period = periodKey(row.period_granularity || "month", {
+        now, subscriptionId: subId, periodStart: entitlement?.carriedPeriodStart,
+      });
+      const subjectKey = subjectKeyFor(row.quota_scope, ident) || "";
+      db.collection("subscription_usage").updateOne(
+        { subscription_id: subId, feature_code: featureCode, period, subject_key: subjectKey },
+        { $inc: { used: n, credits_spent: units }, $setOnInsert: { attribution: true } },
+        { upsert: true },
+      ).catch((e) => logger.warn(`[entitlement] attribution write failed: ${e.message}`));
+    } catch (e) {
+      logger.warn(`[entitlement] attribution skipped: ${e.message}`);
+    }
+  }
+
   /**
    * Consume one unit — race-free by construction.
    *
@@ -210,6 +326,14 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
       if (entitlement && !entitlement.metered) return { consumed: false, reason: "not_metered" };
       if (!db || !subId || !useRow) return { consumed: false, reason: "not_metered" };
 
+      /**
+       * Credits mode: the BUCKET is the plan's credit allowance, and one action costs `cost`
+       * units. Both were decided by the resolve that authorised this call — recomputing either
+       * here could draw from a bucket nobody checked, at a price nobody quoted.
+       */
+      const bucketCode = entitlement?.carriedFeatureCode || featureCode;
+      const units = n * (Number(entitlement?.carriedCost) > 0 ? Number(entitlement.carriedCost) : 1);
+
       // The SAME bucket that entitlementFor just checked — recomputing it from different inputs
       // would count against a period nobody validated.
       const start = periodStart !== undefined ? periodStart : entitlement?.carriedPeriodStart;
@@ -228,14 +352,24 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
           {
             subject_type: entitlement.carriedSubjectType,
             subject_id: oid(entitlement.carriedSubjectId),
-            feature_code: featureCode,
-            $expr: { $lt: ["$consumed", "$purchased"] },
+            feature_code: bucketCode,
+            /**
+             * The WHOLE cost must fit in one pack row, decided atomically. A 2-credit action
+             * against a pack with 1 left is refused rather than split across purchases —
+             * splitting would need a transaction across rows, and the boundary case (the last
+             * unit of one pack) is not worth that machinery. The refusal falls through to the
+             * plan counter, which answers honestly.
+             */
+            $expr: { $lte: [{ $add: ["$consumed", units] }, "$purchased"] },
             $or: [{ expires_at: null }, { expires_at: { $exists: false } }, { expires_at: { $gt: now } }],
           },
-          { $inc: { consumed: n } },
+          { $inc: { consumed: units } },
           { sort: { expires_at: 1, createdAt: 1 } },
         );
-        if (hit) return { consumed: true, fromCredit: true };
+        if (hit) {
+          recordAttribution({ db, entitlement, featureCode, bucketCode, subId, ident, n, units, now });
+          return { consumed: true, fromCredit: true };
+        }
         // No credit left after all — fall through and let the plan counter answer, which may well
         // refuse. Better than silently succeeding on a balance that just went to zero.
       }
@@ -244,7 +378,7 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
       const subjectKey = subjectKeyFor(useRow.quota_scope, ident) || "";
       const filter = {
         subscription_id: subId,
-        feature_code: featureCode,
+        feature_code: bucketCode,
         period,
         subject_key: subjectKey,
       };
@@ -255,15 +389,21 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
       // that record is the evidence for whether a quota is set correctly before anyone is refused.
       if (!capped) {
         await db.collection("subscription_usage").updateOne(
-          filter, { $inc: { used: n }, $setOnInsert: { ...filter } }, { upsert: true },
+          filter, { $inc: { used: units }, $setOnInsert: { ...filter } }, { upsert: true },
         );
+        recordAttribution({ db, entitlement, featureCode, bucketCode, subId, ident, n, units, now });
         return { consumed: true };
       }
 
-      // Capped: try the GUARDED update first, without upsert.
-      const guarded = { ...filter, used: { $lt: Number(useRow.quota) } };
-      const hit = await db.collection("subscription_usage").updateOne(guarded, { $inc: { used: n } });
-      if (hit.matchedCount > 0) return { consumed: true };
+      // Capped: try the GUARDED update first, without upsert. Cost-aware — the whole cost must
+      // fit ($lte quota - units is exactly $lt quota when units is 1), and a balance never goes
+      // negative on an in-flight action.
+      const guarded = { ...filter, used: { $lte: Number(useRow.quota) - units } };
+      const hit = await db.collection("subscription_usage").updateOne(guarded, { $inc: { used: units } });
+      if (hit.matchedCount > 0) {
+        recordAttribution({ db, entitlement, featureCode, bucketCode, subId, ident, n, units, now });
+        return { consumed: true };
+      }
 
       // No match means either "no row yet" (first use this period) or "quota reached". Distinguish
       // by INSERTING — the unique index makes that safe under concurrency: exactly one racer wins
@@ -272,7 +412,11 @@ export function createEntitlementStore({ getDb, toObjectId = (v) => v, logger =
       // Doing this as an upsert on the guarded filter instead would rely on a duplicate-key
       // EXCEPTION to mean "quota exceeded" — correct by accident, and unreadable.
       try {
-        await db.collection("subscription_usage").insertOne({ ...filter, used: n, createdAt: new Date() });
+        // First use this period must ALSO fit — an allowance smaller than one action's cost is
+        // refused on action one, not discovered at minus-something.
+        if (Number(useRow.quota) - units < 0) return { consumed: false, reason: "quota_exceeded" };
+        await db.collection("subscription_usage").insertOne({ ...filter, used: units, createdAt: new Date() });
+        recordAttribution({ db, entitlement, featureCode, bucketCode, subId, ident, n, units, now });
         return { consumed: true };
       } catch (e) {
         if (e?.code === 11000) return { consumed: false, reason: "quota_exceeded" };

package/src/entitlement.js

@@ -134,6 +134,12 @@ function withOverride(row, overrides = [], featureCode) {
 export function resolveEntitlement({
   subscription, entitlementRows = [], featureCode, feature = {},
   used = 0, credits = 0, identity = {}, bypass = false, now = new Date(),
+  /**
+   * Units this ONE action costs. 1 for count-mode (used + 1 ≤ quota is exactly the old
+   * used < quota), the service's credit cost when a credits-mode plan is paying. Threading it
+   * through here is what lets one resolver serve both modes instead of a parallel copy.
+   */
+  cost = 1,
 } = {}) {
   const base = {
     quota: null, used, remaining: null, period: null, subject_key: null,
@@ -177,8 +183,11 @@ export function resolveEntitlement({
   const granularity = row.period_granularity || "month";
   const period = periodKey(granularity, { now, subscriptionId: subscription._id, periodStart: subscription.period_start });
   const subject_key = subjectKeyFor(row.quota_scope, identity);
+  const unitCost = Number(cost) > 0 ? Number(cost) : 1;
   const planRemaining = Math.max(0, Number(row.quota) - Number(used || 0));
-  const withinQuota = Number(used || 0) < Number(row.quota);
+  // Cost-aware: the action is allowed only if the WHOLE cost fits. Refusing at balance < cost is
+  // the agreed rule — a balance never goes negative on an in-flight action.
+  const withinQuota = Number(used || 0) + unitCost <= Number(row.quota);
   const policy = row.overage_policy || "block";
 
   /**
@@ -192,7 +201,7 @@ export function resolveEntitlement({
    * Credits do not reset with the period — they were paid for, so they last until used.
    */
   const creditBalance = Math.max(0, Number(credits || 0));
-  const usingCredit = !withinQuota && creditBalance > 0;
+  const usingCredit = !withinQuota && creditBalance >= unitCost;
   const remaining = planRemaining + creditBalance;
 
   return {
@@ -210,6 +219,7 @@ export function resolveEntitlement({
     period,
     subject_key,
     metered: true,
+    cost: unitCost,
   };
 }