Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

remoteUserUpdatedでpublicKeyキャッシュを削除するように

Browse source
This commit is contained in:
tamaina 2024-07-21 01:29:24 +09:00
parent 018f058ef1
commit dd41dd0da5
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
packages/backend/src/core/activitypub/ApDbResolverService.ts
View file

@ -4,6 +4,7 @@
*/ */
import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
import * as Redis from 'ioredis';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { MiUser, NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js'; import type { MiUser, NotesRepository, UserPublickeysRepository, UsersRepository } from '@/models/_.js';
import type { Config } from '@/config.js'; import type { Config } from '@/config.js';
@ -14,11 +15,12 @@ import type { MiNote } from '@/models/Note.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { MiLocalUser, MiRemoteUser } from '@/models/User.js'; import { MiLocalUser, MiRemoteUser } from '@/models/User.js';
import Logger from '@/logger.js'; import Logger from '@/logger.js';
import { UtilityService } from '../UtilityService.js'; import { UtilityService } from '@/core/UtilityService.js';
import { getApId } from './type.js'; import { getApId } from './type.js';
import { ApPersonService } from './models/ApPersonService.js'; import { ApPersonService } from './models/ApPersonService.js';
import { ApLoggerService } from './ApLoggerService.js'; import { ApLoggerService } from './ApLoggerService.js';
import type { IObject } from './type.js'; import type { IObject } from './type.js';
import { GlobalEvents } from '@/core/GlobalEventService.js';
export type UriParseResult = { export type UriParseResult = {
/** wether the URI was generated by us */ /** wether the URI was generated by us */
@ -54,6 +56,9 @@ export class ApDbResolverService implements OnApplicationShutdown {
@Inject(DI.userPublickeysRepository) @Inject(DI.userPublickeysRepository)
private userPublickeysRepository: UserPublickeysRepository, private userPublickeysRepository: UserPublickeysRepository,
@Inject(DI.redisForSub)
private redisForSub: Redis.Redis,
private cacheService: CacheService, private cacheService: CacheService,
private apPersonService: ApPersonService, private apPersonService: ApPersonService,
private apLoggerService: ApLoggerService, private apLoggerService: ApLoggerService,
@ -61,6 +66,7 @@ export class ApDbResolverService implements OnApplicationShutdown {
) { ) {
this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey[] | null>(Infinity); this.publicKeyByUserIdCache = new MemoryKVCache<MiUserPublickey[] | null>(Infinity);
this.logger = this.apLoggerService.logger.createSubLogger('db-resolver'); this.logger = this.apLoggerService.logger.createSubLogger('db-resolver');
this.redisForSub.on('message', this.onMessage);
} }
private punyHost(url: string): string { private punyHost(url: string): string {
@ -260,9 +266,26 @@ export class ApDbResolverService implements OnApplicationShutdown {
this.publicKeyByUserIdCache.delete(userId); this.publicKeyByUserIdCache.delete(userId);
} }
@bindThis
private async onMessage(_: string, data: string): Promise<void> {
const obj = JSON.parse(data);
if (obj.channel === 'internal') {
const { type, body } = obj.message as GlobalEvents['internal']['payload'];
switch (type) {
case 'remoteUserUpdated': {
this.refreshCacheByUserId(body.id);
break;
}
default:
break;
}
}
}
@bindThis @bindThis
public dispose(): void { public dispose(): void {
this.publicKeyByUserIdCache.dispose(); this.publicKeyByUserIdCache.dispose();
this.redisForSub.off('message', this.onMessage);
} }
@bindThis @bindThis