@xuda.io/account_module 1.2.2278 → 1.2.2280

package/index.mjs

@@ -367,7 +367,13 @@ export const increment_account_usage = async function (req) {
 
       if (Date.now() - doc.ts >= interval) {
         const plan = _conf.PLAN_OBJ[account_data.membership_plan];
-        if (!plan) throw new Error(`${account_data.account_info.first_name + ' ' + account_data.account_info.last_name} has no plan in file`);
+        if (!plan) {
+          // Only report missing plans for stat 3 (verified) accounts. Stat 1/2
+          // (unverified stubs, temp-pass invites, widget signups) have no plan
+          // until their first real login by design — skip silently.
+          if (account_data.stat === 3) throw new Error(`${account_data.account_info.first_name + ' ' + account_data.account_info.last_name} has no plan in file`);
+          return;
+        }
         const drive_size_total = account_data.user_drive_size + account_data.studio_drive_size + account_data.workspace_drive_size + account_data.builds_drive_size + account_data.plugins_drive_size;
         if (bytesToGB(drive_size_total) > plan.features.drive) {
           var price_per_hour = (bytesToGB(drive_size_total) * _conf.PRICE_OBJ.price_per_gb_drive) / _conf.PRICE_OBJ.avg_hours_in_month;

package/package.json

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

package/scripts/cleanup_orphan_account_projects.mjs

@@ -0,0 +1,90 @@
+// One-off cleanup: soft-delete orphan account-project shells.
+//
+// A half-provisioned account can accumulate multiple `is_account_project`
+// projects — login_maintenance creates a fresh one on every retry but only ever
+// adopts ONE as the account doc's `account_project_id`. The non-adopted shells
+// are empty orphans (the "4 Jonathan's Project" pileup). This soft-deletes the
+// orphans (app_status_code = 4) so they drop out of the sidebar, keeping the
+// adopted/live one untouched.
+//
+// The create_project resilience fix stops the pileup from happening again; this
+// just cleans up accounts that already accumulated shells.
+//
+// Usage (from XUDA_HOME, same env the cpi workers run with — XUDA_HOME +
+// XUDA_CONFIG set):
+//   node cpi/account_module/scripts/cleanup_orphan_account_projects.mjs <uid>           # DRY RUN (lists, writes nothing)
+//   node cpi/account_module/scripts/cleanup_orphan_account_projects.mjs <uid> --apply   # actually soft-delete
+//
+// Idempotent — re-running skips already-deleted docs. Hard-aborts if the
+// account has no account_project_id (so it can never delete EVERY project).
+
+import path from 'path';
+
+if (!global._conf) {
+  global._conf = (await import(path.join(process.env.XUDA_HOME, "common", "load_conf.mjs"))).loadConf();
+}
+
+const uid = process.argv[2];
+const apply = process.argv.includes('--apply');
+if (!uid || uid.startsWith('--')) {
+  console.error('usage: node cleanup_orphan_account_projects.mjs <uid> [--apply]');
+  process.exit(1);
+}
+
+const module_path = path.join(process.env.XUDA_HOME, 'cpi') + (!_conf.is_debug ? '/node_modules/@xuda.io' : '');
+const db_module = await import(`${module_path}/db_module/index.mjs`);
+
+// 1. The account doc tells us which project is the live one to KEEP.
+const acct = await db_module.get_couch_doc('xuda_accounts', uid);
+if (acct.code < 0) {
+  console.error('account not found:', uid, acct.data);
+  process.exit(1);
+}
+const keep = acct.data.account_project_id;
+console.log('account', uid, '→ keep account_project_id:', keep || '(NONE SET)');
+
+// 2. Every is_account_project project owned by this account (full scan — fine on
+//    the small set an account owns; ignore_warning silences the no-index notice).
+const found = await db_module.find_couch_query(
+  'xuda_master',
+  { selector: { app_uId: uid, is_account_project: true }, limit: 9999 },
+  true,
+);
+const docs = found?.data?.docs || found?.docs || [];
+console.log(
+  'found',
+  docs.length,
+  'is_account_project doc(s):',
+  docs.map((d) => `${d._id}${d._id === keep ? ' (KEEP)' : ''}${d.app_status_code === 4 ? ' (already deleted)' : ''}`),
+);
+
+// Safety: never run blind on an account that hasn't adopted a project yet —
+// otherwise every project would look like an orphan and we'd wipe them all.
+if (!keep) {
+  console.error('\nABORT: account has no account_project_id set. Re-provision it first (re-login so login_maintenance adopts one), then re-run.');
+  process.exit(1);
+}
+
+// 3. Orphans = not the adopted one + not already soft-deleted.
+const orphans = docs.filter((d) => d._id !== keep && d.app_status_code !== 4);
+console.log('\norphans to soft-delete (' + orphans.length + '):', orphans.map((d) => d._id));
+
+if (!orphans.length) {
+  console.log('\nnothing to clean. done.');
+  process.exit(0);
+}
+
+if (!apply) {
+  console.log('\nDRY RUN — re-run with --apply to soft-delete the above. Nothing was written.');
+  process.exit(0);
+}
+
+for (const d of orphans) {
+  d.app_status_code = 4;
+  d.stat_reason = 'orphan account-project cleanup';
+  d.date_updated_ts = Date.now();
+  const r = await db_module.save_couch_doc('xuda_master', d);
+  console.log('soft-deleted', d._id, '→ code', r.code);
+}
+console.log('\ndone — soft-deleted', orphans.length, 'orphan(s). The live project', keep, 'was kept.');
+process.exit(0);