Merge pull request #109 from ioBroker/feature/44-fix-history-too-big

Author: UncleSamSwiss

express/backend/src/api/adapter.ts

@@ -60,6 +60,7 @@ router.get("/api/adapter/:name/stats/history", async function (req, res) {
 			latest: {},
 			stable: {},
 		};
+		const counts: (AdapterVersions & { date: Date })[] = [];
 		await rawStatistics
 			.find()
 			.project<Statistics>({
@@ -72,13 +73,28 @@ router.get("/api/adapter/:name/stats/history", async function (req, res) {
 			.forEach((s) => {
 				const stat = unescapeObjectKeys(s);
 				if (stat.adapters[name]) {
-					result.counts[stat.date] = {
+					counts.push({
+						date: new Date(stat.date),
 						total: stat.adapters[name],
 						versions: stat.versions[name],
-					};
+					});
 				}
 			});
 
+		// find all history entries in the given range
+		const start = new Date((req.query.start as string) ?? 0);
+		const end = new Date((req.query.end as string) ?? "2999-01-01");
+		const filtered = counts.filter(
+			({ date }) => date >= start && date <= end,
+		);
+		const minCounts = 100; // return at least 100 items
+		const modulo = Math.max(1, Math.floor(filtered.length / minCounts));
+		filtered
+			.filter((_, i) => i % modulo === 0 || i === filtered.length - 1)
+			.forEach(({ date, total, versions }) => {
+				result.counts[date.toISOString()] = { total, versions };
+			});
+
 		// the first version timestamp is wrong (except for new adapters)
 		let hadFirstLatest = false;
 		let hadFirstStable = false;
@@ -103,7 +119,19 @@ router.get("/api/adapter/:name/stats/history", async function (req, res) {
 				}
 			});
 
-		console.log(result);
+		console.log(
+			{
+				name,
+				start,
+				end,
+				total: counts.length,
+				inRange: filtered.length,
+				minCounts,
+				modulo,
+				returned: Object.keys(result.counts).length,
+			},
+			result,
+		);
 		if (Object.keys(result.counts).length === 0) {
 			res.status(404).send("Adapter not found");
 			return;

express/frontend/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "frontend-newer",
+  "name": "frontend",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
@@ -17,7 +17,8 @@
     "@types/react-dom": "^18.3.1",
     "axios": "^1.7.7",
     "clsx": "^2.1.1",
-    "echarts-for-react": "^3.0.2",
+    "echarts": "^6.0.0",
+    "echarts-for-react": "^3.0.4",
     "enquirer": "^2.4.1",
     "octokit": "^4.0.2",
     "react": "^18.3.1",

express/frontend/package.json

@@ -167,10 +167,24 @@ export async function getCurrentVersions(adapterName: string) {
 	return result.data;
 }
 
-export async function getStatisticsHistory(adapterName: string) {
-	const result = await axios.get<AdapterStats>(
+export async function getStatisticsHistory(
+	adapterName: string,
+	start?: Date,
+	end?: Date,
+) {
+	const url = new URL(
 		getApiUrl(`adapter/${uc(adapterName)}/stats/history`),
+		document.location.origin,
 	);
+	if (start) {
+		url.searchParams.set("start", start.toISOString());
+	}
+
+	if (end) {
+		url.searchParams.set("end", end.toISOString());
+	}
+
+	const result = await axios.get<AdapterStats>(url.toString());
 	return result.data;
 }