@xuda.io/account_module 1.2.4 → 1.2.15

package/index.js

@@ -277,6 +277,9 @@ exports.increment_account_usage = async function (req) {
           });
           if (size_ret.code > -1)
             account_data.plugins_drive_size += size_ret.data;
+
+          // db data
+          account_data.project_data_size += 0;
         }
 
         const usage_id = await _common.xuda_get_uuid("usage");
@@ -418,6 +421,7 @@ exports.increment_account_usage = async function (req) {
     account_data.workspace_drive_size = 0;
     account_data.plugins_drive_size = 0;
     account_data.builds_drive_size = 0;
+    account_data.project_data_size = 0;
 
     await run_account_apps(account_data);
     await run_account_drive(account_data);
@@ -427,75 +431,87 @@ exports.increment_account_usage = async function (req) {
       account_data.studio_drive_size +
       account_data.workspace_drive_size +
       account_data.plugins_drive_size +
-      account_data.builds_drive_size;
+      account_data.builds_drive_size +
+      account_data.project_data_size;
     await db_module.save_couch_doc("xuda_accounts", account_data);
   }
 };
 
 exports.get_account_data = async function (req) {
   var { uid, enforce_usage } = req;
-  const get_info = async function () {
-    // const get_stripe_subscription = async function (subscription_id) {
-    //   if (!subscription_id) {
-    //     return { code: -1, data: "subscription_id missing" };
-    //   }
-    //   try {
-    //     const ret = await stripe.subscriptions.retrieve(subscription_id);
+  // const get_info = async function () {
+  // const get_stripe_subscription = async function (subscription_id) {
+  //   if (!subscription_id) {
+  //     return { code: -1, data: "subscription_id missing" };
+  //   }
+  //   try {
+  //     const ret = await stripe.subscriptions.retrieve(subscription_id);
+
+  //     return { code: 1, data: ret };
+  //   } catch (err) {
+  //     return { code: -400, data: err };
+  //   }
+  // };
 
-    //     return { code: 1, data: ret };
-    //   } catch (err) {
-    //     return { code: -400, data: err };
-    //   }
-    // };
-
-    try {
-      const account_ret = await db_module.get_couch_doc("xuda_accounts", uid);
-      const { acc_obj = data } = account_ret;
-      // const account_obj= account_ret.data
-      var ret = { code: 1 };
-      ret.data = {
-        _id: account_ret.data._id,
-        account_info: account_ret.data.account_info,
-        usage: account_ret.data.activity_usage,
-        plan: account_ret.data.plan,
-        plan_changed: account_ret.data.plan_changed,
-        plan_info: account_ret.data.plan_info,
-        support_plan: account_ret.data.support_plan,
-        support_plan_changed: account_ret.data.support_plan_changed,
-        support_plan_info: account_ret.data.support_plan_info,
-        prices_info: account_ret.data.prices_info,
-        activity_usage: account_ret.data.activity_usage,
-        uid: account_ret.data._id,
-        stat: account_ret.data.stat,
-        preferences: account_ret.data.preferences || {},
-        billing_status: {
-          account_suspension_status: account_ret.data.account_suspension_status,
-          account_suspension_data: account_ret.data.account_suspension_data,
-          account_billing_hold_status:
-            account_ret.data.account_billing_hold_status,
-          account_billing_hold_data: account_ret.data.account_billing_hold_date,
-          account_termination_status:
-            account_ret.data.account_termination_status,
-          account_termination_data: account_ret.data.account_termination_data,
-        },
-      };
+  try {
+    const { data: acc_obj } = await db_module.get_couch_doc(
+      "xuda_accounts",
+      uid
+    );
+    // const account_obj= account_ret.data
+    var ret = { code: 1 };
+    ret.data = {
+      _id: acc_obj._id,
+      account_info: acc_obj.account_info,
+      usage: acc_obj.activity_usage,
+      plan: acc_obj.plan,
+      plan_changed: acc_obj.plan_changed,
+      plan_info: acc_obj.plan_info,
+      support_plan: acc_obj.support_plan,
+      support_plan_changed: acc_obj.support_plan_changed,
+      storage_plan: acc_obj.storage_plan,
+      storage_plan_changed: acc_obj.storage_plan_changed,
+
+      prices_info: acc_obj.prices_info,
+      activity_usage: acc_obj.activity_usage,
+      uid: acc_obj._id,
+      stat: acc_obj.stat,
+      preferences: acc_obj.preferences || {},
+      billing_status: {
+        account_suspension_status: acc_obj.account_suspension_status,
+        account_suspension_data: acc_obj.account_suspension_data,
+        account_billing_hold_status: acc_obj.account_billing_hold_status,
+        account_billing_hold_data: acc_obj.account_billing_hold_date,
+        account_termination_status: acc_obj.account_termination_status,
+        account_termination_data: acc_obj.account_termination_data,
+      },
+      drive_usage: {
+        user_drive_size: acc_obj.user_drive_size || 0,
+        studio_drive_size: acc_obj.studio_drive_size || 0,
+        workspace_drive_size: acc_obj.workspace_drive_size || 0,
+        plugins_drive_size: acc_obj.plugins_drive_size || 0,
+        builds_drive_size: acc_obj.builds_drive_size || 0,
+        project_data_size: acc_obj.project_data_size || 0,
+        total_drive_size: acc_obj.total_drive_size || 0,
+      },
+    };
 
-      // if (account_ret.data.stripe_membership_subscription_id) {
-      //   const subscription_ret = await get_stripe_subscription(
-      //     account_ret.data.stripe_membership_subscription_id
-      //   );
+    // if (account_ret.data.stripe_membership_subscription_id) {
+    //   const subscription_ret = await get_stripe_subscription(
+    //     account_ret.data.stripe_membership_subscription_id
+    //   );
 
-      //   if (subscription_ret.code > 0) {
-      //     ret.data.stripe_membership_subscription_id = subscription_ret.data.id;
-      //   }
-      // }
-      return ret;
-    } catch (error) {
-      return { code: -1, data: error };
-    }
-  };
+    //   if (subscription_ret.code > 0) {
+    //     ret.data.stripe_membership_subscription_id = subscription_ret.data.id;
+    //   }
+    // }
+    return ret;
+  } catch (error) {
+    return { code: -1, data: error };
+  }
+  // };
 
-  return get_info();
+  // return get_info();
 };
 
 exports.get_user_projects = async function (req) {

package/package.json

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