From b65b4ecadcd364adeede80f71a2f106671fb434f Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 14 Nov 2024 12:11:37 -0500 Subject: add inbound activity logger for debugging --- packages/backend/src/models/RepositoryModule.ts | 20 +++++- packages/backend/src/models/SkActivityContext.ts | 24 +++++++ packages/backend/src/models/SkActivityLog.ts | 82 ++++++++++++++++++++++++ packages/backend/src/models/_.ts | 6 ++ 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 packages/backend/src/models/SkActivityContext.ts create mode 100644 packages/backend/src/models/SkActivityLog.ts (limited to 'packages/backend/src/models') diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts index 3a1158a42a..37c4e4fd92 100644 --- a/packages/backend/src/models/RepositoryModule.ts +++ b/packages/backend/src/models/RepositoryModule.ts @@ -80,7 +80,9 @@ import { MiUserPublickey, MiUserSecurityKey, MiWebhook, - NoteEdit + NoteEdit, + SkActivityContext, + SkActivityLog, } from './_.js'; import type { DataSource } from 'typeorm'; @@ -126,6 +128,18 @@ const $latestNotesRepository: Provider = { inject: [DI.db], }; +const $activityContextRepository: Provider = { + provide: DI.activityContextRepository, + useFactory: (db: DataSource) => db.getRepository(SkActivityContext).extend(miRepository as MiRepository), + inject: [DI.db], +}; + +const $activityLogsRepository: Provider = { + provide: DI.activityLogsRepository, + useFactory: (db: DataSource) => db.getRepository(SkActivityLog).extend(miRepository as MiRepository), + inject: [DI.db], +}; + const $noteFavoritesRepository: Provider = { provide: DI.noteFavoritesRepository, useFactory: (db: DataSource) => db.getRepository(MiNoteFavorite).extend(miRepository as MiRepository), @@ -526,6 +540,8 @@ const $noteScheduleRepository: Provider = { $appsRepository, $avatarDecorationsRepository, $latestNotesRepository, + $activityContextRepository, + $activityLogsRepository, $noteFavoritesRepository, $noteThreadMutingsRepository, $noteReactionsRepository, @@ -600,6 +616,8 @@ const $noteScheduleRepository: Provider = { $appsRepository, $avatarDecorationsRepository, $latestNotesRepository, + $activityContextRepository, + $activityLogsRepository, $noteFavoritesRepository, $noteThreadMutingsRepository, $noteReactionsRepository, diff --git a/packages/backend/src/models/SkActivityContext.ts b/packages/backend/src/models/SkActivityContext.ts new file mode 100644 index 0000000000..9fdd0a9525 --- /dev/null +++ b/packages/backend/src/models/SkActivityContext.ts @@ -0,0 +1,24 @@ +/* + * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { Column, PrimaryColumn, Entity, Index } from 'typeorm'; + +@Entity('activity_context') +export class SkActivityContext { + @PrimaryColumn('text') + @Index() + public md5: string; + + @Column('jsonb') + // https://github.com/typeorm/typeorm/issues/8559 + // eslint-disable-next-line @typescript-eslint/no-explicit-any + public json: any; + + constructor(data?: Partial) { + if (data) { + Object.assign(this, data); + } + } +} diff --git a/packages/backend/src/models/SkActivityLog.ts b/packages/backend/src/models/SkActivityLog.ts new file mode 100644 index 0000000000..229c333588 --- /dev/null +++ b/packages/backend/src/models/SkActivityLog.ts @@ -0,0 +1,82 @@ +/* + * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'; +import { SkActivityContext } from '@/models/SkActivityContext.js'; +import { MiUser } from '@/models/_.js'; +import { id } from './util/id.js'; + +@Entity('activity_log') +export class SkActivityLog { + @PrimaryColumn(id()) + public id: string; + + @Index() + @Column('timestamptz') + public at: Date; + + @Column({ + type: 'text', + name: 'key_id', + }) + public keyId: string; + + @Index() + @Column('text') + public host: string; + + @Column('boolean') + public verified: boolean; + + @Column('boolean') + public accepted: boolean; + + @Column('text') + public result: string; + + @Column('jsonb') + // https://github.com/typeorm/typeorm/issues/8559 + // eslint-disable-next-line @typescript-eslint/no-explicit-any + public activity: any; + + @Column({ + type: 'text', + name: 'context_hash', + nullable: true, + }) + public contextHash: string | null; + + @ManyToOne(() => SkActivityContext, { + onDelete: 'CASCADE', + nullable: true, + }) + @JoinColumn({ + name: 'context_hash', + }) + public context: SkActivityContext | null; + + @Column({ + type: 'varchar' as const, + length: 32, + name: 'auth_user_id', + nullable: true, + }) + public authUserId: string | null; + + @ManyToOne(() => MiUser, { + onDelete: 'CASCADE', + nullable: true, + }) + @JoinColumn({ + name: 'auth_user_id', + }) + public authUser: MiUser | null; + + constructor(data?: Partial) { + if (data) { + Object.assign(this, data); + } + } +} diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts index 9a4ebfc90f..aeb6133d70 100644 --- a/packages/backend/src/models/_.ts +++ b/packages/backend/src/models/_.ts @@ -82,6 +82,8 @@ import { NoteEdit } from '@/models/NoteEdit.js'; import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js'; import { MiReversiGame } from '@/models/ReversiGame.js'; import { MiNoteSchedule } from '@/models/NoteSchedule.js'; +import { SkActivityLog } from '@/models/SkActivityLog.js'; +import { SkActivityContext } from './SkActivityContext.js'; import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js'; export interface MiRepository { @@ -129,6 +131,8 @@ export const miRepository = { export { SkLatestNote, + SkActivityContext, + SkActivityLog, MiAbuseUserReport, MiAbuseReportNotificationRecipient, MiAccessToken, @@ -229,6 +233,8 @@ export type HashtagsRepository = Repository & MiRepository export type InstancesRepository = Repository & MiRepository; export type MetasRepository = Repository & MiRepository; export type LatestNotesRepository = Repository & MiRepository; +export type ActivityContextRepository = Repository & MiRepository; +export type ActivityLogsRepository = Repository & MiRepository; export type ModerationLogsRepository = Repository & MiRepository; export type MutingsRepository = Repository & MiRepository; export type RenoteMutingsRepository = Repository & MiRepository; -- cgit v1.2.3-freya