@trap_stevo/filetide 0.0.70 → 0.0.72

package/dist/cjs/FileMessager.js

@@ -64,6 +64,13 @@ class FileMessager {
   }
   onDisconnect(connectionRes, socket) {
     console.log(`Client disconnected ~ ${socket.id}`);
+    const currentOnlineClient = FileNetClientManager.getOnlineClientByConnectionID(socket.id);
+    if (currentOnlineClient) {
+      this.handleClientOffline({}, {
+        connectionID: currentOnlineClient.id,
+        ...currentOnlineClient
+      });
+    }
     this.onlineClients.delete(socket.id);
     return;
   }
@@ -100,6 +107,9 @@ class FileMessager {
   async getTidalyticsSince(interval = "1d", source = "storage", filter = {}) {
     return await tidalytics.getMetricsSince(interval, source, filter);
   }
+  async getTidalyticsBetween(start, end, source = "both", filter = {}) {
+    return await tidalytics.getMetricsBetween(start, end, source, filter);
+  }
   async getStoredTidalytics(filter = {}) {
     return await tidalytics.getStoredMetrics(filter);
   }
@@ -281,26 +291,30 @@ class FileMessager {
       interval = "1d",
       limit = Infinity,
       filter = {},
-      mode = "all"
+      rangeMode = "since",
+      mode = "all",
+      start = null,
+      end = null
     } = options;
     const sources = ["storage", "memory"];
-    const [storedOnline, storedOffline] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [storedOnline, storedOffline] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tider:online": "tider:online"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tider:offline": "tider:offline"
       }
-    })]);
-    const [liveOnline] = await Promise.all([this.getTidalyticsSince(interval, sources[1], {
+    }, sources[0])]);
+    const [liveOnline] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tider:online": "tider:online"
       }
-    })]);
+    }, sources[1])]);
     const onlineMetrics = [...storedOnline, ...liveOnline];
     const offlineMetrics = storedOffline;
     const sessionsByKey = {};
@@ -337,11 +351,14 @@ class FileMessager {
   }
   async getAlreadyOnlineVisualData(options = {}) {
     const {
+      chartConfig = {},
       interval = "1d",
       filter = {},
       limit = Infinity,
       format = "raw",
-      chartConfig = {}
+      rangeMode = "since",
+      start = null,
+      end = null
     } = options;
     const fullChartConfig = {
       groupBy: "metadata.user",
@@ -352,17 +369,18 @@ class FileMessager {
       ...chartConfig
     };
     const sources = ["storage", "memory"];
-    const [alreadyOnlineEvents, onlineJoins] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [alreadyOnlineEvents, onlineJoins] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tider:already-online": "tider:already-online"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tider:online": "tider:online"
       }
-    })]);
+    }, sources[0])]);
     const entries = alreadyOnlineEvents.map(e => ({
       ...e,
       type: "already-online"
@@ -397,11 +415,14 @@ class FileMessager {
   }
   async getTiderBanVisualData(options = {}) {
     const {
+      chartConfig = {},
       interval = "1d",
       filter = {},
       limit = Infinity,
       format = "raw",
-      chartConfig = {}
+      rangeMode = "since",
+      start = null,
+      end = null
     } = options;
     const fullChartConfig = {
       groupBy: "type",
@@ -409,22 +430,23 @@ class FileMessager {
       ...chartConfig
     };
     const sources = ["storage", "memory"];
-    const [banned, kicked, unbanned] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [banned, kicked, unbanned] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tider:banned": "tider:banned"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tider:kicked": "tider:kicked"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tider:unbanned": "tider:unbanned"
       }
-    })]);
+    }, sources[0])]);
     const entries = [...banned.map(e => ({
       ...e,
       type: "banned"
@@ -448,11 +470,14 @@ class FileMessager {
   }
   async getTideFileTransferVisualData(options = {}) {
     const {
+      chartConfig = {},
       interval = "1d",
       filter = {},
       limit = Infinity,
       format = "raw",
-      chartConfig = {}
+      rangeMode = "since",
+      start = null,
+      end = null
     } = options;
     const fullChartConfig = {
       groupBy: "type",
@@ -460,22 +485,23 @@ class FileMessager {
       ...chartConfig
     };
     const sources = ["storage", "memory"];
-    const [incomingTransfers, incoming, completed] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [incomingTransfers, incoming, completed] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tide:incoming-transfer": "tide:incoming-transfer"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tide:incoming-file": "tide:incoming-file"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tide:completed-transfer": "tide:completed-transfer"
       }
-    })]);
+    }, sources[0])]);
     const entries = [...incomingTransfers.map(e => ({
       ...e,
       type: "incoming-transfer"
@@ -499,11 +525,14 @@ class FileMessager {
   }
   async getTideTransferStateVisualData(options = {}) {
     const {
+      chartConfig = {},
       interval = "1d",
       filter = {},
       limit = Infinity,
       format = "raw",
-      chartConfig = {}
+      rangeMode = "since",
+      start = null,
+      end = null
     } = options;
     const fullChartConfig = {
       groupBy: "metadata.transferStateID",
@@ -514,12 +543,13 @@ class FileMessager {
       ...chartConfig
     };
     const sources = ["storage", "memory"];
-    const [transferStates] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [transferStates] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tide:transfer-state": "tide:transfer-state"
       }
-    })]);
+    }, sources[0])]);
     const entries = transferStates.map(e => ({
       ...e,
       type: "transfer-state"
@@ -537,11 +567,14 @@ class FileMessager {
   }
   async getFileListActivityVisualData(options = {}) {
     const {
+      chartConfig = {},
       interval = "1d",
       filter = {},
       limit = Infinity,
       format = "raw",
-      chartConfig = {}
+      rangeMode = "since",
+      start = null,
+      end = null
     } = options;
     const fullChartConfig = {
       groupBy: "type",
@@ -549,17 +582,18 @@ class FileMessager {
       ...chartConfig
     };
     const sources = ["storage", "memory"];
-    const [requested, received] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [requested, received] = await Promise.all([fetch({
       ...filter,
       tags: {
         "file-list:request": "file-list:request"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "file-list:received": "file-list:received"
       }
-    })]);
+    }, sources[0])]);
     const entries = [...requested.map(e => ({
       ...e,
       type: "requested"
@@ -580,11 +614,14 @@ class FileMessager {
   }
   async getTideBarrierVisualData(options = {}) {
     const {
+      chartConfig = {},
       interval = "1d",
       filter = {},
       limit = Infinity,
       format = "raw",
-      chartConfig = {}
+      rangeMode = "since",
+      start = null,
+      end = null
     } = options;
     const fullChartConfig = {
       groupBy: "type",
@@ -592,17 +629,18 @@ class FileMessager {
       ...chartConfig
     };
     const sources = ["storage", "memory"];
-    const [accepted, denied] = await Promise.all([this.getTidalyticsSince(interval, sources[0], {
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const [accepted, denied] = await Promise.all([fetch({
       ...filter,
       tags: {
         "tide-barrier:accepted": "tide-barrier:accepted"
       }
-    }), this.getTidalyticsSince(interval, sources[0], {
+    }, sources[0]), fetch({
       ...filter,
       tags: {
         "tide-barrier:denied": "tide-barrier:denied"
       }
-    })]);
+    }, sources[0])]);
     const entries = [...accepted.map(e => ({
       ...e,
       type: "accepted"
@@ -624,18 +662,23 @@ class FileMessager {
 
   // --- File Messager Tide Actions Management ---
 
-  async getTideCompletedTransferActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTideCompletedTransferActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tide:completed-transfer": "tide:completed-transfer"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -655,18 +698,23 @@ class FileMessager {
       }
     }));
   }
-  async getTideTransferStateActions({
-    interval = "1d",
-    limit = Infinity,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTideTransferStateActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = Infinity,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tide:transfer-state": "tide:transfer-state"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -689,18 +737,23 @@ class FileMessager {
       }
     }));
   }
-  async getTideIncomingFileActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTideIncomingFileActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tide:incoming-file": "tide:incoming-file"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -719,18 +772,23 @@ class FileMessager {
       }
     }));
   }
-  async getTideIncomingTransferActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTideIncomingTransferActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tide:incoming-transfer": "tide:incoming-transfer"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -748,18 +806,23 @@ class FileMessager {
       }
     }));
   }
-  async getTideBarrierAcceptedActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTideBarrierAcceptedActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tide-barrier:accepted": "tide-barrier:accepted"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -780,18 +843,23 @@ class FileMessager {
       }
     }));
   }
-  async getTideBarrierDeniedActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTideBarrierDeniedActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tide-barrier:denied": "tide-barrier:denied"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -812,18 +880,23 @@ class FileMessager {
       }
     }));
   }
-  async getFileListReceivedActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getFileListReceivedActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "file-list:received": "file-list:received"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -839,18 +912,23 @@ class FileMessager {
       }
     }));
   }
-  async getFileListRequestActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getFileListRequestActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "file-list:request": "file-list:request"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -865,18 +943,23 @@ class FileMessager {
       }
     }));
   }
-  async getTiderBannedActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTiderBannedActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tider:banned": "tider:banned"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -890,18 +973,23 @@ class FileMessager {
       }
     }));
   }
-  async getTiderKickedActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTiderKickedActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tider:kicked": "tider:kicked"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -915,18 +1003,23 @@ class FileMessager {
       }
     }));
   }
-  async getTiderUnbannedActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTiderUnbannedActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tider:unbanned": "tider:unbanned"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -939,18 +1032,23 @@ class FileMessager {
       }
     }));
   }
-  async getTiderAlreadyOnlineActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTiderAlreadyOnlineActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tider:already-online": "tider:already-online"
       }
-    });
+    }, source);
     if (!Array.isArray(rawMetrics)) {
       return [];
     }
@@ -969,18 +1067,23 @@ class FileMessager {
       }
     }));
   }
-  async getTiderOnlineActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTiderOnlineActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tider:online": "tider:online"
       }
-    });
+    }, source);
     if (!rawMetrics || !Array.isArray(rawMetrics)) {
       return [];
     }
@@ -999,18 +1102,23 @@ class FileMessager {
       }
     }));
   }
-  async getTiderOfflineActions({
-    interval = "1d",
-    limit = 50,
-    source = "storage",
-    filter = {}
-  } = {}) {
-    const rawMetrics = await this.getTidalyticsSince(interval, source, {
+  async getTiderOfflineActions(options = {}) {
+    const {
+      interval = "1d",
+      limit = 50,
+      source = "storage",
+      filter = {},
+      rangeMode = "since",
+      start = null,
+      end = null
+    } = options;
+    const fetch = _assertClassBrand(_FileMessager_brand, this, _getTidalyticsRangeFetcher).call(this, interval, rangeMode, start, end);
+    const rawMetrics = await fetch({
       ...filter,
       tags: {
         "tider:offline": "tider:offline"
       }
-    });
+    }, source);
     if (!rawMetrics || !Array.isArray(rawMetrics)) {
       return [];
     }
@@ -2159,5 +2267,20 @@ function _log(...message) {
   }
   console.log(...message);
 }
+function _getTidalyticsRangeFetcher(interval, rangeMode, start, end) {
+  return async (tagFilter, source) => {
+    const effectiveFilter = {
+      ...tagFilter
+    };
+    if (rangeMode === "between") {
+      if (start == null || end == null) {
+        console.log("[FileTide | Tidalytics] ~ Missing start or end time for 'between' mode.");
+        return [];
+      }
+      return await this.getTidalyticsBetween(start, end, source, effectiveFilter);
+    }
+    return await this.getTidalyticsSince(interval, source, effectiveFilter);
+  };
+}
 ;
 module.exports = FileMessager;