From 0afebcfd9e10a1c5deb98fb739e00aa73c757624 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 10 Feb 2022 17:45:12 +0900
Subject: [PATCH] enhance: improve federation chart
---
.../migration/1644481657998-chart-v15.js | 31 +++++++++++++++++
packages/backend/src/queue/index.ts | 5 +++
.../src/queue/processors/system/index.ts | 2 ++
.../queue/processors/system/tick-charts.ts | 28 ++++++++++++++++
.../api/endpoints/admin/resync-chart.ts | 22 -------------
.../src/services/chart/charts/active-users.ts | 7 +++-
.../src/services/chart/charts/ap-request.ts | 7 +++-
.../src/services/chart/charts/drive.ts | 7 +++-
.../chart/charts/entities/federation.ts | 5 ++-
.../src/services/chart/charts/federation.ts | 33 +++++++++++--------
.../src/services/chart/charts/hashtag.ts | 7 +++-
.../src/services/chart/charts/instance.ts | 7 +++-
.../src/services/chart/charts/notes.ts | 7 +++-
.../services/chart/charts/per-user-drive.ts | 7 +++-
.../chart/charts/per-user-following.ts | 7 +++-
.../services/chart/charts/per-user-notes.ts | 7 +++-
.../chart/charts/per-user-reactions.ts | 7 +++-
.../src/services/chart/charts/test-grouped.ts | 7 +++-
.../chart/charts/test-intersection.ts | 7 +++-
.../src/services/chart/charts/test-unique.ts | 7 +++-
.../backend/src/services/chart/charts/test.ts | 7 +++-
.../src/services/chart/charts/users.ts | 7 +++-
packages/backend/src/services/chart/core.ts | 19 +++++++++--
.../register-or-fetch-instance-doc.ts | 3 --
packages/client/src/components/chart.vue | 10 +++---
25 files changed, 199 insertions(+), 64 deletions(-)
create mode 100644 packages/backend/migration/1644481657998-chart-v15.js
create mode 100644 packages/backend/src/queue/processors/system/tick-charts.ts
delete mode 100644 packages/backend/src/server/api/endpoints/admin/resync-chart.ts
diff --git a/packages/backend/migration/1644481657998-chart-v15.js b/packages/backend/migration/1644481657998-chart-v15.js
new file mode 100644
index 0000000000..4eee83f612
--- /dev/null
+++ b/packages/backend/migration/1644481657998-chart-v15.js
@@ -0,0 +1,31 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class chartV151644481657998 {
+ name = 'chartV151644481657998'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_total"`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_inc"`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___instance_dec"`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_total"`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_inc"`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___instance_dec"`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___sub" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___pub" smallint NOT NULL DEFAULT '0'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___pub"`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___sub"`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___pub"`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___sub"`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_dec" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_inc" smallint NOT NULL DEFAULT '0'`);
+ await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___instance_total" integer NOT NULL DEFAULT '0'`);
+ }
+}
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index 16acabfbf8..62f372f3a8 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -258,6 +258,11 @@ export default function() {
processDb(dbQueue);
processObjectStorage(objectStorageQueue);
+ systemQueue.add('tickCharts', {
+ }, {
+ repeat: { cron: '55 * * * *' },
+ });
+
systemQueue.add('resyncCharts', {
}, {
repeat: { cron: '0 0 * * *' },
diff --git a/packages/backend/src/queue/processors/system/index.ts b/packages/backend/src/queue/processors/system/index.ts
index 636fefc402..1513ea4a84 100644
--- a/packages/backend/src/queue/processors/system/index.ts
+++ b/packages/backend/src/queue/processors/system/index.ts
@@ -1,8 +1,10 @@
import * as Bull from 'bull';
+import { tickCharts } from './tick-charts';
import { resyncCharts } from './resync-charts';
import { cleanCharts } from './clean-charts';
const jobs = {
+ tickCharts,
resyncCharts,
cleanCharts,
} as Record<string, Bull.ProcessCallbackFunction<Record<string, unknown>> | Bull.ProcessPromiseFunction<Record<string, unknown>>>;
diff --git a/packages/backend/src/queue/processors/system/tick-charts.ts b/packages/backend/src/queue/processors/system/tick-charts.ts
new file mode 100644
index 0000000000..d53089f89c
--- /dev/null
+++ b/packages/backend/src/queue/processors/system/tick-charts.ts
@@ -0,0 +1,28 @@
+import * as Bull from 'bull';
+
+import { queueLogger } from '../../logger';
+import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceChart, notesChart, perUserDriveChart, perUserFollowingChart, perUserNotesChart, perUserReactionsChart, usersChart, apRequestChart } from '@/services/chart/index';
+
+const logger = queueLogger.createSubLogger('tick-charts');
+
+export async function tickCharts(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
+ logger.info(`Tick charts...`);
+
+ await Promise.all([
+ federationChart.tick(false),
+ notesChart.tick(false),
+ usersChart.tick(false),
+ activeUsersChart.tick(false),
+ instanceChart.tick(false),
+ perUserNotesChart.tick(false),
+ driveChart.tick(false),
+ perUserReactionsChart.tick(false),
+ hashtagChart.tick(false),
+ perUserFollowingChart.tick(false),
+ perUserDriveChart.tick(false),
+ apRequestChart.tick(false),
+ ]);
+
+ logger.succ(`All charts successfully ticked.`);
+ done();
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/resync-chart.ts b/packages/backend/src/server/api/endpoints/admin/resync-chart.ts
deleted file mode 100644
index d80d2b0426..0000000000
--- a/packages/backend/src/server/api/endpoints/admin/resync-chart.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import define from '../../define';
-import { driveChart, notesChart, usersChart } from '@/services/chart/index';
-import { insertModerationLog } from '@/services/insert-moderation-log';
-
-export const meta = {
- tags: ['admin'],
-
- requireCredential: true,
- requireModerator: true,
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-export default define(meta, async (ps, me) => {
- insertModerationLog(me, 'chartResync');
-
- driveChart.resync();
- notesChart.resync();
- usersChart.resync();
-
- // TODO: ユーザーごとのチャートもキューに入れて更新する
- // TODO: インスタンスごとのチャートもキューに入れて更新する
-});
diff --git a/packages/backend/src/services/chart/charts/active-users.ts b/packages/backend/src/services/chart/charts/active-users.ts
index 87dd95f4dc..5baf46f772 100644
--- a/packages/backend/src/services/chart/charts/active-users.ts
+++ b/packages/backend/src/services/chart/charts/active-users.ts
@@ -18,7 +18,12 @@ export default class ActiveUsersChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/ap-request.ts b/packages/backend/src/services/chart/charts/ap-request.ts
index bac5e425c8..ca763c8847 100644
--- a/packages/backend/src/services/chart/charts/ap-request.ts
+++ b/packages/backend/src/services/chart/charts/ap-request.ts
@@ -12,7 +12,12 @@ export default class ApRequestChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/drive.ts b/packages/backend/src/services/chart/charts/drive.ts
index 2f00adae2b..288689784e 100644
--- a/packages/backend/src/services/chart/charts/drive.ts
+++ b/packages/backend/src/services/chart/charts/drive.ts
@@ -15,7 +15,12 @@ export default class DriveChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/entities/federation.ts b/packages/backend/src/services/chart/charts/entities/federation.ts
index 0c8c20991d..6b2089f0b4 100644
--- a/packages/backend/src/services/chart/charts/entities/federation.ts
+++ b/packages/backend/src/services/chart/charts/entities/federation.ts
@@ -3,12 +3,11 @@ import Chart from '../../core';
export const name = 'federation';
export const schema = {
- 'instance.total': { accumulate: true },
- 'instance.inc': { range: 'small' },
- 'instance.dec': { range: 'small' },
'deliveredInstances': { uniqueIncrement: true, range: 'small' },
'inboxInstances': { uniqueIncrement: true, range: 'small' },
'stalled': { uniqueIncrement: true, range: 'small' },
+ 'sub': { accumulate: true, range: 'small' },
+ 'pub': { accumulate: true, range: 'small' },
} as const;
export const entity = Chart.schemaToEntity(name, schema);
diff --git a/packages/backend/src/services/chart/charts/federation.ts b/packages/backend/src/services/chart/charts/federation.ts
index 19c75c98ad..211ba1debc 100644
--- a/packages/backend/src/services/chart/charts/federation.ts
+++ b/packages/backend/src/services/chart/charts/federation.ts
@@ -1,6 +1,6 @@
import autobind from 'autobind-decorator';
import Chart, { KVs } from '../core';
-import { Instances } from '@/models/index';
+import { Followings } from '@/models/index';
import { name, schema } from './entities/federation';
/**
@@ -13,23 +13,30 @@ export default class FederationChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
- const [total] = await Promise.all([
- Instances.count({}),
- ]);
-
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
return {
- 'instance.total': total,
};
}
@autobind
- public async update(isAdditional: boolean): Promise<void> {
- await this.commit({
- 'instance.total': isAdditional ? 1 : -1,
- 'instance.inc': isAdditional ? 1 : 0,
- 'instance.dec': isAdditional ? 0 : 1,
- });
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ const [sub, pub] = await Promise.all([
+ Followings.createQueryBuilder('following')
+ .select('COUNT(DISTINCT following.followeeHost)')
+ .where('following.followeeHost IS NOT NULL')
+ .getRawOne()
+ .then(x => parseInt(x.count, 10)),
+ Followings.createQueryBuilder('following')
+ .select('COUNT(DISTINCT following.followerHost)')
+ .where('following.followerHost IS NOT NULL')
+ .getRawOne()
+ .then(x => parseInt(x.count, 10)),
+ ]);
+
+ return {
+ 'sub': sub,
+ 'pub': pub,
+ };
}
@autobind
diff --git a/packages/backend/src/services/chart/charts/hashtag.ts b/packages/backend/src/services/chart/charts/hashtag.ts
index 0b7bc467d2..cbae686833 100644
--- a/packages/backend/src/services/chart/charts/hashtag.ts
+++ b/packages/backend/src/services/chart/charts/hashtag.ts
@@ -14,7 +14,12 @@ export default class HashtagChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/instance.ts b/packages/backend/src/services/chart/charts/instance.ts
index 5ea4d567e1..930ac4729b 100644
--- a/packages/backend/src/services/chart/charts/instance.ts
+++ b/packages/backend/src/services/chart/charts/instance.ts
@@ -16,7 +16,7 @@ export default class InstanceChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(group: string): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
const [
notesCount,
usersCount,
@@ -42,6 +42,11 @@ export default class InstanceChart extends Chart<typeof schema> {
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async requestReceived(host: string): Promise<void> {
await this.commit({
diff --git a/packages/backend/src/services/chart/charts/notes.ts b/packages/backend/src/services/chart/charts/notes.ts
index 5c56a9a718..624ee5db28 100644
--- a/packages/backend/src/services/chart/charts/notes.ts
+++ b/packages/backend/src/services/chart/charts/notes.ts
@@ -15,7 +15,7 @@ export default class NotesChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
const [localCount, remoteCount] = await Promise.all([
Notes.count({ userHost: null }),
Notes.count({ userHost: Not(IsNull()) }),
@@ -27,6 +27,11 @@ export default class NotesChart extends Chart<typeof schema> {
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async update(note: Note, isAdditional: boolean): Promise<void> {
const prefix = note.userHost === null ? 'local' : 'remote';
diff --git a/packages/backend/src/services/chart/charts/per-user-drive.ts b/packages/backend/src/services/chart/charts/per-user-drive.ts
index 969ed018f9..ae9e8c5694 100644
--- a/packages/backend/src/services/chart/charts/per-user-drive.ts
+++ b/packages/backend/src/services/chart/charts/per-user-drive.ts
@@ -14,7 +14,7 @@ export default class PerUserDriveChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(group: string): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
const [count, size] = await Promise.all([
DriveFiles.count({ userId: group }),
DriveFiles.calcDriveUsageOf(group),
@@ -26,6 +26,11 @@ export default class PerUserDriveChart extends Chart<typeof schema> {
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async update(file: DriveFile, isAdditional: boolean): Promise<void> {
const fileSizeKb = file.size / 1000;
diff --git a/packages/backend/src/services/chart/charts/per-user-following.ts b/packages/backend/src/services/chart/charts/per-user-following.ts
index cdd0aad947..0b39881c14 100644
--- a/packages/backend/src/services/chart/charts/per-user-following.ts
+++ b/packages/backend/src/services/chart/charts/per-user-following.ts
@@ -15,7 +15,7 @@ export default class PerUserFollowingChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(group: string): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
const [
localFollowingsCount,
localFollowersCount,
@@ -36,6 +36,11 @@ export default class PerUserFollowingChart extends Chart<typeof schema> {
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async update(follower: { id: User['id']; host: User['host']; }, followee: { id: User['id']; host: User['host']; }, isFollow: boolean): Promise<void> {
const prefixFollower = Users.isLocalUser(follower) ? 'local' : 'remote';
diff --git a/packages/backend/src/services/chart/charts/per-user-notes.ts b/packages/backend/src/services/chart/charts/per-user-notes.ts
index 6a4f0363b2..01a2785158 100644
--- a/packages/backend/src/services/chart/charts/per-user-notes.ts
+++ b/packages/backend/src/services/chart/charts/per-user-notes.ts
@@ -15,7 +15,7 @@ export default class PerUserNotesChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(group: string): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
const [count] = await Promise.all([
Notes.count({ userId: group }),
]);
@@ -25,6 +25,11 @@ export default class PerUserNotesChart extends Chart<typeof schema> {
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async update(user: { id: User['id'] }, note: Note, isAdditional: boolean): Promise<void> {
await this.commit({
diff --git a/packages/backend/src/services/chart/charts/per-user-reactions.ts b/packages/backend/src/services/chart/charts/per-user-reactions.ts
index 2ec347f40a..59af0e86c0 100644
--- a/packages/backend/src/services/chart/charts/per-user-reactions.ts
+++ b/packages/backend/src/services/chart/charts/per-user-reactions.ts
@@ -15,7 +15,12 @@ export default class PerUserReactionsChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(group: string): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/test-grouped.ts b/packages/backend/src/services/chart/charts/test-grouped.ts
index 5f0b1aafdc..19b2135849 100644
--- a/packages/backend/src/services/chart/charts/test-grouped.ts
+++ b/packages/backend/src/services/chart/charts/test-grouped.ts
@@ -14,12 +14,17 @@ export default class TestGroupedChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(group: string): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
return {
'foo.total': this.total[group],
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async increment(group: string): Promise<void> {
if (this.total[group] == null) this.total[group] = 0;
diff --git a/packages/backend/src/services/chart/charts/test-intersection.ts b/packages/backend/src/services/chart/charts/test-intersection.ts
index c6ba71a956..6fd780f9b9 100644
--- a/packages/backend/src/services/chart/charts/test-intersection.ts
+++ b/packages/backend/src/services/chart/charts/test-intersection.ts
@@ -12,7 +12,12 @@ export default class TestIntersectionChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/test-unique.ts b/packages/backend/src/services/chart/charts/test-unique.ts
index e67036acef..2c9cc2fd6a 100644
--- a/packages/backend/src/services/chart/charts/test-unique.ts
+++ b/packages/backend/src/services/chart/charts/test-unique.ts
@@ -12,7 +12,12 @@ export default class TestUniqueChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
return {};
}
diff --git a/packages/backend/src/services/chart/charts/test.ts b/packages/backend/src/services/chart/charts/test.ts
index 878acd51be..b539625c10 100644
--- a/packages/backend/src/services/chart/charts/test.ts
+++ b/packages/backend/src/services/chart/charts/test.ts
@@ -14,12 +14,17 @@ export default class TestChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
return {
'foo.total': this.total,
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async increment(): Promise<void> {
this.total++;
diff --git a/packages/backend/src/services/chart/charts/users.ts b/packages/backend/src/services/chart/charts/users.ts
index 50fca3a8d6..70ef89f8cd 100644
--- a/packages/backend/src/services/chart/charts/users.ts
+++ b/packages/backend/src/services/chart/charts/users.ts
@@ -15,7 +15,7 @@ export default class UsersChart extends Chart<typeof schema> {
}
@autobind
- protected async queryCurrentState(): Promise<Partial<KVs<typeof schema>>> {
+ protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
const [localCount, remoteCount] = await Promise.all([
Users.count({ host: null }),
Users.count({ host: Not(IsNull()) }),
@@ -27,6 +27,11 @@ export default class UsersChart extends Chart<typeof schema> {
};
}
+ @autobind
+ protected async tickMinor(): Promise<Partial<KVs<typeof schema>>> {
+ return {};
+ }
+
@autobind
public async update(user: { id: User['id'], host: User['host'] }, isAdditional: boolean): Promise<void> {
const prefix = Users.isLocalUser(user) ? 'local' : 'remote';
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index 5888e1a144..61a7575706 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -81,7 +81,15 @@ export default abstract class Chart<T extends Schema> {
protected repositoryForHour: Repository<RawRecord<T>>;
protected repositoryForDay: Repository<RawRecord<T>>;
- protected abstract queryCurrentState(group: string | null): Promise<Partial<KVs<T>>>;
+ /**
+ * 1日に一回程度実行されれば良いような計算処理を入れる(主にCASCADE削除などアプリケーション側で感知できない変動によるズレの修正用)
+ */
+ protected abstract tickMajor(group: string | null): Promise<Partial<KVs<T>>>;
+
+ /**
+ * 少なくとも最小スパン内に1回は実行されて欲しい計算処理を入れる
+ */
+ protected abstract tickMinor(group: string | null): Promise<Partial<KVs<T>>>;
@autobind
private static convertSchemaToColumnDefinitions(schema: Schema): Record<string, { type: string; array?: boolean; default?: any; }> {
@@ -445,8 +453,8 @@ export default abstract class Chart<T extends Schema> {
}
@autobind
- public async resync(group: string | null = null): Promise<void> {
- const data = await this.queryCurrentState(group);
+ public async tick(major: boolean, group: string | null = null): Promise<void> {
+ const data = major ? await this.tickMajor(group) : await this.tickMinor(group);
const columns = {} as Record<string, number>;
for (const [k, v] of Object.entries(data)) {
@@ -480,6 +488,11 @@ export default abstract class Chart<T extends Schema> {
update(logHour, logDay));
}
+ @autobind
+ public resync(group: string | null = null): Promise<void> {
+ return this.tick(true, group);
+ }
+
@autobind
public async clean(): Promise<void> {
const current = dateUTC(Chart.getCurrentDate());
diff --git a/packages/backend/src/services/register-or-fetch-instance-doc.ts b/packages/backend/src/services/register-or-fetch-instance-doc.ts
index 18b42ed15b..c42506a2ed 100644
--- a/packages/backend/src/services/register-or-fetch-instance-doc.ts
+++ b/packages/backend/src/services/register-or-fetch-instance-doc.ts
@@ -1,6 +1,5 @@
import { Instance } from '@/models/entities/instance';
import { Instances } from '@/models/index';
-import { federationChart } from '@/services/chart/index';
import { genId } from '@/misc/gen-id';
import { toPuny } from '@/misc/convert-host';
import { Cache } from '@/misc/cache';
@@ -23,8 +22,6 @@ export async function registerOrFetchInstanceDoc(host: string): Promise<Instance
lastCommunicatedAt: new Date(),
}).then(x => Instances.findOneOrFail(x.identifiers[0]));
- federationChart.update(true);
-
cache.set(host, i);
return i;
} else {
diff --git a/packages/client/src/components/chart.vue b/packages/client/src/components/chart.vue
index ced0d481c4..5865715deb 100644
--- a/packages/client/src/components/chart.vue
+++ b/packages/client/src/components/chart.vue
@@ -370,14 +370,14 @@ export default defineComponent({
const raw = await os.api('charts/federation', { limit: props.limit, span: props.span });
return {
series: [{
- name: 'Total',
+ name: 'Sub',
type: 'area',
- data: format(raw.instance.total),
- color: '#888888',
+ data: format(raw.sub),
+ color: colors.orange,
}, {
- name: 'Inc/Dec',
+ name: 'Pub',
type: 'area',
- data: format(sum(raw.instance.inc, negate(raw.instance.dec))),
+ data: format(raw.pub),
color: colors.purple,
}, {
name: 'Received',