v.1.7.10/details:

-update webhooks log,
-add cards asset,
-fix admin dashboard

admin/src/Dashboard.jsx

@@ -170,7 +170,8 @@ export default class Dashboard extends Component {
       );
   };
   getSourceName(source) {
-    return PLAYER_SOURCES.filter((p) => p.value === source)[0].text;
+    const source_detail = PLAYER_SOURCES.filter((p) => p.value === source);
+    return source_detail && source_detail.length > 0 ? source_detail[0].text : 'source';
   }
   handleVideoSelectorChange = (e, s) => {
     const { selectors } = this.state;

functions/package.json

@@ -18,10 +18,8 @@
     "express": "^4.17.1",
     "firebase-admin": "^9.2.0",
     "firebase-functions": "^3.3.0",
-    "firebase-tools": "^9.5.0",
     "node-fetch": "^2.6.1",
-    "nodemailer": "^6.4.11",
+    "nodemailer": "^6.4.11"
-    "stripe": "^8.92.0"
   },
   "devDependencies": {
     "eslint": "^5.12.0",

functions/webhooks/scheduledCleanUp.js

@@ -1,5 +1,4 @@
 const admin = require("firebase-admin");
-const firebase_tools = require("firebase-tools");
 
 const timeDiff = (ds1, ds2) => {
   const d1 = new Date(ds1);
@@ -29,37 +28,50 @@ const roomIdList = async (refs) => {
     .then((ids) => ids.filter((v) => v !== undefined));
 };
 
-const batchDeleteRooms = async (roomList, totalNumber) => {
+const batchDeleteRooms = async (roomList, totalNumber, batch, count = 0) => {
-  setTimeout(async () => {
+  if (roomList.length > 0 && count < 500) {
-    if (roomList.length > 0) {
+    const roomId = roomList.splice(0, 1)[0];
-      await firebase_tools.firestore
+    await admin
-        .delete(`rooms/${roomList.splice(0, 1)[0]}`, {
+      .firestore()
-          project: process.env.GCLOUD_PROJECT,
+      .collection(`rooms/${roomId}/messages`)
-          recursive: true,
+      .listDocuments()
-          yes: true,
+      .then((docs) => {
-        })
+        docs.map((doc) => {
-        .catch((err) =>
+          if (count < 500) {
-          console.error(
+            batch.delete(doc);
-            `[ERROR]\tWEBHOOKS/Room Clean Up\t# OF ROOMS ${roomList.length} REMAINING,\tERROR:${err}`
+            count++;
-          )
+          }
-        );
+        });
-      console.info(
+        return;
-        `[DONE]\tWEBHOOKS/Room Clean Up\t# OF ROOMS ${
+      });
-          totalNumber - roomList.length
+    await admin
-        }/${totalNumber}`
+      .firestore()
-      );
+      .collection(`rooms/${roomId}/users`)
-      batchDeleteRooms(roomList, totalNumber);
+      .listDocuments()
+      .then((docs) => {
+        docs.map((doc) => {
+          if (count < 500) {
+            batch.delete(doc);
+            count++;
+          }
+        });
+        return;
+      });
+    if (count < 500) {
+      await batch.delete(admin.firestore().collection("rooms").doc(roomId));
+      count++;
+    }
+    await batchDeleteRooms(roomList, totalNumber, batch, count);
+    return;
   } else {
     console.info(
       `[DONE]\tWEBHOOKS/Room Clean Up\tDeleted all ${totalNumber} rooms`
     );
+    return;
   }
-  }, 1000);
 };
 
 module.exports = async (req, res) => {
-  res.status(200).send({ message: "Started processing" });
-
   const roomList = await admin
     .firestore()
     .collection("rooms")
@@ -75,7 +87,35 @@ module.exports = async (req, res) => {
   if (roomList.length > 0) {
     var ids = await roomIdList(roomList);
     if (ids.length > 0) {
-      batchDeleteRooms(ids, ids.length);
+      const totalNumber = ids.length;
+      console.info(
+        `[PROGRESS]\tWEBHOOKS/Room Clean Up\tROOMS ${JSON.stringify(ids)}`
+      );
+      try {
+        const batch = admin.firestore().batch();
+        await batchDeleteRooms(ids, totalNumber, batch);
+        await batch.commit();
+        res.status(200).send({
+          message: `[${new Date().toLocaleString("en-US", {
+            timeZone: "America/New_York",
+          })}]    [DONE]    WEBHOOKS    Room Clean Up   ${totalNumber} rooms deleted`,
+        });
+      } catch (err) {
+        res.status(400).send({
+          message: `[${new Date().toLocaleString("en-US", {
+            timeZone: "America/New_York",
+          })}]    [ERROR]   WEBHOOKS    Room Clean Up   Batch delete failed - ${JSON.stringify(
+            err
+          )}`,
+        });
+      }
+    } else {
+      console.info(`[DONE]\tWEBHOOKS/Room Clean Up\tNo rooms to delete`);
+      res.status(200).send({
+        message: `[${new Date().toLocaleString("en-US", {
+          timeZone: "America/New_York",
+        })}]    [DONE]    WEBHOOKS    Room Clean Up    No rooms to delete`,
+      });
     }
   }
 

functions/webhooks/userCleanUp.js

@@ -60,11 +60,26 @@ const batchDeleteUser = async (userList, totalNumber) => {
 
 module.exports = async (req, res) => {
   console.info(`[START]\tWEBHOOKS/User Clean Up`);
-  res.status(200).send({ message: "User Clean Up Started" });
   const startedTime = new Date();
+  try {
     const usersToDelete = await cleanUser(undefined, startedTime);
+    const totalNumber = usersToDelete.length;
     console.info(
-    `[PROGRESS]\tWEBHOOKS/User Clean Up\t# OF USERS ${usersToDelete.length}`
+      `[PROGRESS]\tWEBHOOKS/User Clean Up\t# OF USERS ${totalNumber}`
     );
-  batchDeleteUser(usersToDelete, usersToDelete.length);
+    await batchDeleteUser(usersToDelete, totalNumber);
+    res.status(200).send({
+      message: `[${new Date().toLocaleString("en-US", {
+        timeZone: "America/New_York",
+      })}]    [DONE]   WEBHOOKS    User Clean Up   Deleted all ${totalNumber} stale users`,
+    });
+  } catch (err) {
+    res.status(400).send({
+      message: `[${new Date().toLocaleString("en-US", {
+        timeZone: "America/New_York",
+      })}]    [ERROR]   WEBHOOKS    User Clean Up   Error trying to delete users - ${JSON.stringify(
+        err
+      )}`,
+    });
+  }
 };