@xuda.io/account_module 1.2.2306 → 1.2.2307

package/index.mjs

@@ -608,6 +608,10 @@ const _MODULE_SUBSCRIPTIONS = [
   { key: 'preview', scope: 'resource' },
   { key: 'instance', scope: 'resource' },
   { key: 'backup', scope: 'resource' },
+  // UI-97: a registered domain renews yearly and a dedicated IPv4 is a monthly line,
+  // so both carry their own `cycle` on each item rather than being assumed monthly.
+  { key: 'domain', scope: 'resource' },
+  { key: 'ipv4', scope: 'resource' },
   // Xuda Verify (verify_module) has no PLAN_OBJ category: every check is metered
   // per call into verify_meter and nothing is charged to the account today.
   { key: 'trust_center', scope: 'metered' },
@@ -672,6 +676,65 @@ const _module_resource_items = async (uid) => {
     console.error('[get_module_subscriptions hosting]', e.message);
   }
 
+  // UI-97: domains registered THROUGH Xuda. A domain the customer merely connected
+  // (registered elsewhere, `connection_type: 'connected'`) costs nothing here, so the
+  // Stripe yearly price is what decides whether it is a subscription at all.
+  try {
+    const ret = await db_module.find_couch_query(
+      'xuda_master',
+      { selector: { docType: 'domain_registration', owner_uid: uid }, limit: 500 },
+      true,
+    );
+    for (const dom of ret?.docs || []) {
+      const price = Number(dom.stripe_price_yr) || 0;
+      if (!price) continue;
+      const renews = dom.expires_at ? new Date(dom.expires_at) : null;
+      items.domain.push({
+        id: dom._id,
+        label: dom.name || dom._id,
+        // Auto renew off means it lapses at expiry, which is the one thing worth
+        // saying on a billing screen about a domain.
+        plan_name: dom.auto_renew === false
+          ? `Renews ${renews ? renews.toISOString().slice(0, 10) : 'at expiry'}, auto renew off`
+          : `Renews ${renews ? renews.toISOString().slice(0, 10) : 'yearly'}`,
+        price,
+        cycle: 'yr',
+      });
+    }
+  } catch (e) {
+    console.error('[get_module_subscriptions domains]', e.message);
+  }
+
+  // UI-97: dedicated IPv4. The per-address price depends on what it is doing
+  // (internal / external / parked), which is exactly how ipv4_module prices it, so the
+  // rate is read from PRICE_OBJ the same way rather than assumed.
+  try {
+    const prices = {
+      internal: Number(_conf.PRICE_OBJ?.ipv4?.internal ?? 2),
+      external: Number(_conf.PRICE_OBJ?.ipv4?.external ?? 10),
+      parked: Number(_conf.PRICE_OBJ?.ipv4?.parked ?? 5),
+    };
+    const ret = await db_module.find_couch_query(
+      'xuda_ipv4',
+      { selector: { docType: 'ipv4_addr', account_id: uid }, limit: 1000 },
+      true,
+    );
+    for (const ip of ret?.docs || []) {
+      // A suspended address keeps billing at the rate it held, same as ipv4_module.
+      const bill = ip.state === 'suspended' ? ip.bill_as : ip.state;
+      const price = Number(prices[bill]) || 0;
+      if (!price) continue;
+      items.ipv4.push({
+        id: ip._id,
+        label: ip.address || ip._id,
+        plan_name: [bill, ip.target ? `on ${ip.target}` : ''].filter(Boolean).join(', '),
+        price,
+      });
+    }
+  } catch (e) {
+    console.error('[get_module_subscriptions ipv4]', e.message);
+  }
+
   try {
     const ret = await db_module.find_couch_query(
       'xuda_master',
@@ -730,6 +793,9 @@ export const get_module_subscriptions = async function (req = {}) {
       const base = { key: m.key, scope: m.scope, billable: billable(m.key), items: resource_items[m.key] || [] };
       if (m.scope === 'resource' || m.scope === 'metered') {
         const price = base.items.reduce((sum, i) => sum + Number(i.price || 0), 0);
+        // UI-97: a row is only yearly when everything in it is (domains). Anything
+        // else stays monthly, so a total is never a sum of two different cycles.
+        const cycle = base.items.length && base.items.every((i) => i.cycle === 'yr') ? 'yr' : 'mo';
         return {
           ...base,
           active: m.scope === 'metered' || base.items.length > 0,
@@ -737,6 +803,7 @@ export const get_module_subscriptions = async function (req = {}) {
           plan_id: '',
           plan_name: '',
           price,
+          cycle,
         };
       }
       const plan_id = account[m.field] || m.default_plan;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.2306",
+  "version": "1.2.2307",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {