@xuda.io/account_module 1.2.2295 → 1.2.2296

package/index.mjs

@@ -1999,10 +1999,10 @@ export const ops_account_snapshot = async function (req = {}) {
     const a = ar.data;
     let credits = { max: 0, used: 0, remaining: 0 };
     try {
-      const cr = await get_account_ai_usage({ uid: account_uid, ..._LIFETIME_WINDOW });
+      const cr = await get_account_ai_usage({ uid: account_uid });
       if (cr && cr.code === 55) {
         const max = Math.round((cr.data?.credits?.total || 0) * 100) / 100;
-        const used = Math.round(_usage_total(cr.data?.usage) * 100) / 100;
+        const used = Math.round((cr.data?.usage?.total || 0) * 100) / 100;
         credits = { max, used, remaining: Math.round((max - used) * 100) / 100, by_source: cr.data?.credits || {} };
       }
     } catch (e) { console.error('[ops snapshot credits]', e.message); }
@@ -2289,6 +2289,11 @@ export const ops_seed_do_datacenters = async function (req = {}) {
         docType: 'do_datacenter',
         provider: 'digitalocean',
         is_do_datacenter: true,
+        // Inventory doc, NOT a live controller: keep the server-health check from
+        // probing https://do_<slug>.xuda.ai/cpi/... (there is no such endpoint - DNS
+        // fails). The health loop skips any doc with application_server === false
+        // (controller_module codex_check_xuda_servers_health), same as farm nodes.
+        application_server: false,
         region_slug: dc.slug, // DO createDroplet region
         location: dc.slug, // strips (\d+$) to the metro for macro scoping, like a farm node's hel1
         metro: dc.metro,
@@ -6466,13 +6471,11 @@ export const save_cache_hit = async function (_id) {
 ///////////////////////////////
 
 export const get_account_ai_usage = async function (req, job_id, headers) {
-  // Default to the LIFETIME window (all-time spend) — the credit model is a
-  // remaining-pool ledger (see _LIFETIME_WINDOW + the Credit Management page).
-  // Callers that want a specific range (the usage chart in WorkspaceUsage.vue)
-  // pass explicit year/month/day. The nav meter + ring call with no window, so
-  // this makes them read lifetime "used" and match the Credit Management page
-  // instead of a current-month slice against a lifetime pool.
-  const { uid, year_from = 2000, month_from = 1, day_from = 1, year_to = 2999, month_to = 12, day_to = 31 } = req;
+  const d = new Date();
+  const curr_month = Number(String(d.getMonth() + 1).padStart(2, '0')); // months are 0-based
+  const curr_year = d.getFullYear();
+
+  const { uid, year_from = curr_year, month_from = curr_month, day_from = 0, year_to = curr_year, month_to = curr_month, day_to = 99 } = req;
   try {
     const app_id = await get_account_default_project_id(uid);
 
@@ -6496,13 +6499,8 @@ export const get_account_ai_usage = async function (req, job_id, headers) {
 
     // console.log('ai_usage', ai_usage.rows);
 
+    let total_usage = response.total_usage;
     let profile = response.profiles;
-    // The ai_usage2 list function emits per-profile spend but sometimes a null
-    // rolled-up total. Roll it up HERE at the source so every consumer gets a real
-    // usage.total — including the dashboard nav (shared-store fetchCredits reads
-    // data.usage.total directly). Without this, Number(null) -> 0 hid all spend in
-    // the meter/ring and disabled the account-wide credit cap.
-    let total_usage = _usage_total({ total: response.total_usage, profile });
 
     const ai_credits = await db_module.get_couch_view('xuda_billing', 'ai_credits', {
       startkey: [uid, ''],
@@ -6612,23 +6610,6 @@ const _fold_usage = function (profile_map) {
   return { by_profile, by_user };
 };
 
-// Single source of truth for an account's rolled-up AI-credit usage. The usage
-// view reliably emits per-profile spend but sometimes returns a null rolled-up
-// total (usage.total); Number(null)||0 then collapsed "used" to 0 EVERYWHERE —
-// hiding spend in the nav/meter AND making the account-wide credit cap never
-// fire. Prefer the view's own total when finite, otherwise sum the per-profile
-// fold (same source, same credit unit).
-const _usage_total = function (usage_data) {
-  // NOTE: Number(null) === 0 (and IS finite), which is exactly what collapsed
-  // "used" to 0 — so guard on the RAW type, not the coerced number. Only trust
-  // the view's own total when it is a real finite number; otherwise roll up the
-  // per-profile fold.
-  const t = usage_data?.total;
-  if (typeof t === 'number' && Number.isFinite(t)) return t;
-  const { by_profile } = _fold_usage(usage_data?.profile);
-  return Object.values(by_profile).reduce((a, b) => a + (Number(b) || 0), 0);
-};
-
 // Wide window so "used" reads as all-time spend (the lifetime / remaining-pool model).
 const _LIFETIME_WINDOW = { year_from: 2000, month_from: 1, day_from: 1, year_to: 2999, month_to: 12, day_to: 31 };
 
@@ -6644,8 +6625,8 @@ const _get_scoped_usage = async function (owner_uid, need_raw) {
   if (cached && now - cached.ts < _SCOPED_USAGE_TTL && (!need_raw || cached.has_raw)) return cached.data;
 
   const usage_ret = await get_account_ai_usage({ uid: owner_uid, ..._LIFETIME_WINDOW });
+  const total = Number(usage_ret?.data?.usage?.total) || 0;
   const { by_profile, by_user } = _fold_usage(usage_ret?.data?.usage?.profile);
-  const total = _usage_total(usage_ret?.data?.usage);
 
   let by_model = {};
   let by_source = {};
@@ -6776,8 +6757,8 @@ export const evaluate_credit_gate = async function (req) {
 
     // Back-compat: no rules or disabled => legacy single ledger cap, byte-for-byte.
     if (!rules || rules.enabled === false) {
-      const usage = await get_account_ai_usage({ uid: owner, ..._LIFETIME_WINDOW });
-      const over = (Number(usage?.data?.credits?.total) || 0) - _usage_total(usage?.data?.usage) < -0.5;
+      const usage = await get_account_ai_usage({ uid: owner });
+      const over = (Number(usage?.data?.credits?.total) || 0) - (Number(usage?.data?.usage?.total) || 0) < -0.5;
       return { block: over, scope: over ? 'pool' : null, reason: over ? _SCOPE_REASON.ledger : '', hard_breached: over ? [{ scope: 'pool', key: 'ledger' }] : [], soft_breached: [], account_id: owner };
     }
 
@@ -7124,13 +7105,10 @@ export const broadcast_credits = function (uid) {
   _credits_broadcast_timers[uid] = setTimeout(async () => {
     delete _credits_broadcast_timers[uid];
     try {
-      // Lifetime window (matches the Credit Management meter) + the same null-total
-      // rollup as _get_scoped_usage — get_account_ai_usage can return a null
-      // rolled-up usage.total, which otherwise broadcasts used:0 to the live nav.
-      const ret = await get_account_ai_usage({ uid, ..._LIFETIME_WINDOW });
+      const ret = await get_account_ai_usage({ uid });
       if (!ret || ret.code !== 55) return;
       const max = Math.round((ret.data?.credits?.total || 0) * 100) / 100;
-      const used = Math.round(_usage_total(ret.data?.usage) * 100) / 100;
+      const used = Math.round((ret.data?.usage?.total || 0) * 100) / 100;
       ws_dashboard_msa.emit_message_to_dashboard({
         service: 'credits_update',
         to: [uid],
@@ -7545,6 +7523,30 @@ const _nl_one = async (db, docType) => {
   }
 };
 
+// The newsletter/content list + random-pick queries above all select on a single
+// `docType` field. Without an index Couch full-scans each content DB and logs
+// "No matching index found". These DBs live locally on dev + master (regions read
+// newsletter from master via DSN), so ensure a [docType] index on each at module
+// load, idempotent, only on the content-home nodes.
+(async () => {
+  const host = process.env.XUDA_HOSTNAME;
+  if (host !== 'dev.xuda.ai' && host !== 'master.xuda.ai') return;
+  const content_dbs = ['xuda_newsletter', 'xuda_dev_articles', 'xuda_news_articles', 'xuda_did_you_know'];
+  for (const db of content_dbs) {
+    try {
+      const ret = await db_module.create_couch_index(db, {
+        index: { fields: ['docType'] },
+        name: 'idx_content_docType',
+        ddoc: 'idx_content_docType',
+        type: 'json',
+      });
+      if (ret?.error) console.error(`[newsletter] ${db} docType index create failed:`, ret.error);
+    } catch (err) {
+      console.error(`[newsletter] ${db} docType index init failed:`, err?.message || err);
+    }
+  }
+})();
+
 const _nl_fashion_url = (p) => {
   const rel = p.custom_url || (p.slug ? '/' + p.slug : '');
   return `https://xuda.fashion${rel}`;

package/package.json

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

package/download_model.js

@@ -1,56 +0,0 @@
-// download-models.js
-const https = require('https');
-const fs = require('fs');
-const path = require('path');
-
-const models = ['u2net.onnx', 'u2net.onnx.bin', 'u2net.onnx.wasm'];
-
-const baseUrl = 'https://static.imgly.com/background-removal/models/medium/';
-const outputDir = '/var/xuda/assets/imgly-bg';
-
-// Create directory if it doesn't exist
-if (!fs.existsSync(outputDir)) {
-  fs.mkdirSync(outputDir, { recursive: true });
-}
-
-async function downloadFile(url, filepath) {
-  return new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(filepath);
-    https
-      .get(url, (response) => {
-        if (response.statusCode === 200) {
-          response.pipe(file);
-          file.on('finish', () => {
-            file.close();
-            console.log(`Downloaded: ${path.basename(filepath)}`);
-            resolve();
-          });
-        } else {
-          reject(new Error(`HTTP ${response.statusCode}: ${url}`));
-        }
-      })
-      .on('error', (err) => {
-        fs.unlink(filepath, () => {}); // Delete partial file
-        reject(err);
-      });
-  });
-}
-
-async function downloadAll() {
-  console.log('Downloading models to:', outputDir);
-
-  for (const model of models) {
-    const url = baseUrl + model;
-    const filepath = path.join(outputDir, model);
-
-    try {
-      await downloadFile(url, filepath);
-    } catch (error) {
-      console.error(`Failed to download ${model}:`, error.message);
-    }
-  }
-
-  console.log('Download complete!');
-}
-
-downloadAll();

package/download_model.mjs

@@ -1,56 +0,0 @@
-// download-models.js
-const https = require('https');
-const fs = require('fs');
-const path = require('path');
-
-const models = ['u2net.onnx', 'u2net.onnx.bin', 'u2net.onnx.wasm'];
-
-const baseUrl = 'https://static.imgly.com/background-removal/models/medium/';
-const outputDir = '/var/xuda/assets/imgly-bg';
-
-// Create directory if it doesn't exist
-if (!fs.existsSync(outputDir)) {
-  fs.mkdirSync(outputDir, { recursive: true });
-}
-
-async function downloadFile(url, filepath) {
-  return new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(filepath);
-    https
-      .get(url, (response) => {
-        if (response.statusCode === 200) {
-          response.pipe(file);
-          file.on('finish', () => {
-            file.close();
-            console.log(`Downloaded: ${path.basename(filepath)}`);
-            resolve();
-          });
-        } else {
-          reject(new Error(`HTTP ${response.statusCode}: ${url}`));
-        }
-      })
-      .on('error', (err) => {
-        fs.unlink(filepath, () => {}); // Delete partial file
-        reject(err);
-      });
-  });
-}
-
-async function downloadAll() {
-  console.log('Downloading models to:', outputDir);
-
-  for (const model of models) {
-    const url = baseUrl + model;
-    const filepath = path.join(outputDir, model);
-
-    try {
-      await downloadFile(url, filepath);
-    } catch (error) {
-      console.error(`Failed to download ${model}:`, error.message);
-    }
-  }
-
-  console.log('Download complete!');
-}
-
-downloadAll();

package/get_active_account_profile_info.mjs

@@ -1,21 +0,0 @@
-const db_module = await import(`${module_path}/db_module/index.mjs`);
-
-export const get_active_account_profile_info = async function (uid, profile_id) {
-  try {
-    const acc_obj = await db_module.get_couch_doc_native('xuda_accounts', uid);
-
-    let active_account_profile_id = profile_id || acc_obj.account_info.active_account_profile_id;
-
-    const account_profile_obj = await db_module.get_app_couch_doc_native(acc_obj.account_project_id, active_account_profile_id);
-    if (account_profile_obj.share_item_id) {
-      // set the original profile id if shared
-      active_account_profile_id = account_profile_obj.share_item_id;
-    }
-    const app_id = await get_account_default_project_id(account_profile_obj.shared_from_uid || account_profile_obj.uid);
-
-    return { uid: account_profile_obj.shared_from_uid || uid, account_profile_id: active_account_profile_id, app_id, is_main: active_account_profile_id === acc_obj.account_profile_id, account_profile_obj };
-  } catch (err) {
-    console.error('**** get_active_account_profile_info', err);
-    debugger;
-  }
-};

package/get_user_info.mjs

@@ -1,126 +0,0 @@
-export const get_contact_info = async function (uid, contact_doc, _id) {
-  let doc = contact_doc;
-  if (_id) {
-    doc = await get_contact(uid, _id);
-  }
-
-  delete doc.metadata;
-  delete doc.profile_avatar_obj;
-  delete doc.profile_picture_obj;
-  delete doc.bio;
-
-  const chat_conversation_count = async function () {
-    const account_profile_info = await get_active_account_profile_info(uid);
-
-    const counts_ret = await db_module.get_app_couch_view(account_profile_info.app_id, 'chat_conversation_item_counts', {
-      reduce: true,
-      group_level: 1,
-
-      startkey: [doc._id, ''],
-      endkey: [doc._id, 'zzzzzz'],
-    });
-
-    return counts_ret?.rows?.[0]?.value || 0;
-  };
-  const chat_conversation_read = async function () {
-    const account_profile_info = await get_active_account_profile_info(uid);
-
-    const counts_ret = await db_module.get_app_couch_view(account_profile_info.app_id, 'chat_conversation_item_read', {
-      reduce: true,
-      group_level: 2,
-
-      startkey: [uid, doc._id, ''],
-      endkey: [uid, doc._id, 'zzzzzz'],
-    });
-
-    return counts_ret?.rows?.[0]?.value || 0;
-  };
-
-  doc.notifications = 0;
-  if (doc.contact_uid) {
-    const account_info_ret = await get_account_name({ uid_query: doc.contact_uid });
-    if (account_info_ret.code < 0) {
-      return; // throw new Error(`account ${contact_uid} not found`);
-    }
-
-    doc.profile_avatar = account_info_ret.data.profile_avatar;
-
-    //membership_plan
-    // doc.name = `${account_info_ret.data.first_name} ${account_info_ret.data.last_name}`;
-    doc.name = account_info_ret.data?.account_type === 'business' ? account_info_ret.data.business_name : `${account_info_ret.data.first_name} ${account_info_ret.data.last_name}`;
-
-    if (account_info_ret.data.phone_number) {
-      try {
-        doc.phone_number = formatPhoneWithFlag(account_info_ret.data.phone_number, account_info_ret.data.country);
-      } catch (err) {
-        // console.error(err);
-        doc.phone_number = account_info_ret.data.phone_number;
-      }
-    }
-
-    if (doc.team_req_id) {
-      try {
-        const req_doc = await db_module.get_couch_doc_native('xuda_team', doc.team_req_id);
-        doc.connection_stat = req_doc.team_req_stat;
-        doc.connection_type = req_doc.access_type;
-        doc.connection_uid = req_doc.team_req_from_uid === uid ? req_doc.team_req_to_uid : req_doc.team_req_from_uid;
-        doc.connection_contact_id = req_doc.team_req_from_contact_id === doc._id ? req_doc.team_req_to_contact_id : req_doc.team_req_from_contact_id;
-        if (doc.connection_type === 'contact_connection') {
-          doc.friend_since = req_doc.team_req_date;
-        }
-        if (doc.connection_type === 'account_profile') {
-          try {
-            const app_id = await get_account_default_project_id(uid);
-            const account_profile_doc = await db_module.get_app_couch_doc_native(app_id, req_doc.share_item_id);
-            doc.account_profile = account_profile_doc;
-          } catch (error) {}
-        }
-      } catch (err) {
-        if (err.message === 'deleted') {
-          try {
-            let contact_doc = await get_contact(uid, doc._id);
-            contact_doc.team_req_id = '';
-            await save_contact(uid, contact_doc);
-          } catch (error) {}
-        }
-        doc.connection_stat = 0;
-      }
-    }
-
-    doc.avatar_source = account_info_ret.data.avatar_source;
-    // doc.icon_pattern = await get_contact_pattern(doc);
-    doc.username = account_info_ret.data.username;
-    doc.business_name = account_info_ret.data.business_name;
-    doc.address = account_info_ret.data.address;
-    doc.city = account_info_ret.data.city;
-    doc.state = account_info_ret.data.state;
-    doc.zip = account_info_ret.data.zip;
-    doc.account_type = account_info_ret.data.account_type;
-    doc.email = doc.email;
-    if (doc.connection_stat === 3) {
-      doc.online = account_info_ret.data.online;
-    }
-  } else {
-    doc.email = doc.email;
-  }
-
-  doc.business_has_person = doc?.business_has_person && doc?.person_info?.person_full_name !== 'Not available';
-  doc.icon_pattern = await get_contact_pattern(doc);
-
-  delete doc.account_type_info;
-  delete doc.person_info;
-  delete doc.business_info;
-
-  const contact_chat_conversation_count_ret = await chat_conversation_count();
-  const contact_chat_conversation_read_ret = await chat_conversation_read();
-
-  doc.interactions = contact_chat_conversation_count_ret;
-  doc.notifications = contact_chat_conversation_count_ret - contact_chat_conversation_read_ret;
-  doc.chats = doc.interactions;
-
-  doc.card_background = get_contact_background(doc);
-
-  doc.border = get_contact_border(doc);
-
-  return doc;
-};