Improve chart engine (#8253)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update core.ts

* wip

* wip

* #7361

* delete network chart

* federationChart強化 apRequestChart追加

* tweak

packages/backend/src/server/api/endpoints/charts/active-users.ts

@@ -22,7 +22,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(activeUsersChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/ap-request.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import define from '../../define';
 import { convertLog } from '@/services/chart/core';
-import { networkChart } from '@/services/chart/index';
+import { apRequestChart } from '@/services/chart/index';
 
 export const meta = {
 	tags: ['charts'],
@@ -22,10 +22,10 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(networkChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, async (ps) => {
-	return await networkChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
+	return await apRequestChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
 });

packages/backend/src/server/api/endpoints/charts/drive.ts

@@ -22,7 +22,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(driveChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/federation.ts

@@ -22,7 +22,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(federationChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/hashtag.ts

@@ -26,7 +26,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(hashtagChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/instance.ts

@@ -26,7 +26,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(instanceChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/notes.ts

@@ -22,7 +22,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(notesChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/user/drive.ts

@@ -27,7 +27,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(perUserDriveChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/user/following.ts

@@ -27,7 +27,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(perUserFollowingChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/user/notes.ts

@@ -27,7 +27,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(perUserNotesChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/user/reactions.ts

@@ -27,7 +27,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(perUserReactionsChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/charts/users.ts

@@ -22,7 +22,7 @@ export const meta = {
 		},
 	},
 
-	res: convertLog(usersChart.schema),
+	// TODO: response definition
 } as const;
 
 // eslint-disable-next-line import/no-default-export

packages/backend/src/server/api/endpoints/stats.ts

@@ -66,8 +66,8 @@ export default define(meta, async () => {
 		NoteReactions.count({ cache: 3600000 }), // 1 hour
 		//NoteReactions.count({ where: { userHost: null }, cache: 3600000 }),
 		federationChart.getChart('hour', 1, null).then(chart => chart.instance.total[0]),
-		driveChart.getChart('hour', 1, null).then(chart => chart.local.totalSize[0]),
-		driveChart.getChart('hour', 1, null).then(chart => chart.remote.totalSize[0]),
+		driveChart.getChart('hour', 1, null).then(chart => chart.local.totalSize[0] * 1000),
+		driveChart.getChart('hour', 1, null).then(chart => chart.remote.totalSize[0] * 1000),
 	]);
 
 	return {