
* wip
* wip
* wip
* Update SystemAccountService.ts
* Update 1740121393164-system-accounts.js
* Update DeleteAccountService.ts
* wip
* wip
* wip
* wip
* Update 1740121393164-system-accounts.js
* Update RepositoryModule.ts
* wip
* wip
* wip
* Update ApRendererService.ts
* wip
* wip
* Update SystemAccountService.ts
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* add print logs
* ログが長すぎて出てないかもしれない
* fix migration
* refactor
* fix fed-tests
* Update RelayService.ts
* merge
* Update user.test.ts
* chore: emit log
* fix: tweak sleep duration
* fix: exit 1
* fix: wait for misskey processes to become healthy
* fix: longer sleep for user deletion
* fix: make sleep longer again
* デッドロック解消の試み
https://github.com/misskey-dev/misskey/issues/15005
* Revert "デッドロック解消の試み"
This reverts commit 266141f66f
.
* wip
* Update SystemAccountService.ts
---------
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
113 lines
3.3 KiB
TypeScript
113 lines
3.3 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import type { MiUser } from '@/models/User.js';
|
|
import type { RelaysRepository } from '@/models/_.js';
|
|
import { IdService } from '@/core/IdService.js';
|
|
import { MemorySingleCache } from '@/misc/cache.js';
|
|
import type { MiRelay } from '@/models/Relay.js';
|
|
import { QueueService } from '@/core/QueueService.js';
|
|
import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import { deepClone } from '@/misc/clone.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
import { SystemAccountService } from '@/core/SystemAccountService.js';
|
|
|
|
@Injectable()
|
|
export class RelayService {
|
|
private relaysCache: MemorySingleCache<MiRelay[]>;
|
|
|
|
constructor(
|
|
@Inject(DI.relaysRepository)
|
|
private relaysRepository: RelaysRepository,
|
|
|
|
private idService: IdService,
|
|
private queueService: QueueService,
|
|
private systemAccountService: SystemAccountService,
|
|
private apRendererService: ApRendererService,
|
|
) {
|
|
this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10); // 10m
|
|
}
|
|
|
|
@bindThis
|
|
public async addRelay(inbox: string): Promise<MiRelay> {
|
|
const relay = await this.relaysRepository.insertOne({
|
|
id: this.idService.gen(),
|
|
inbox,
|
|
status: 'requesting',
|
|
});
|
|
|
|
const relayActor = await this.systemAccountService.fetch('relay');
|
|
const follow = this.apRendererService.renderFollowRelay(relay, relayActor);
|
|
const activity = this.apRendererService.addContext(follow);
|
|
this.queueService.deliver(relayActor, activity, relay.inbox, false);
|
|
|
|
return relay;
|
|
}
|
|
|
|
@bindThis
|
|
public async removeRelay(inbox: string): Promise<void> {
|
|
const relay = await this.relaysRepository.findOneBy({
|
|
inbox,
|
|
});
|
|
|
|
if (relay == null) {
|
|
throw new Error('relay not found');
|
|
}
|
|
|
|
const relayActor = await this.systemAccountService.fetch('relay');
|
|
const follow = this.apRendererService.renderFollowRelay(relay, relayActor);
|
|
const undo = this.apRendererService.renderUndo(follow, relayActor);
|
|
const activity = this.apRendererService.addContext(undo);
|
|
this.queueService.deliver(relayActor, activity, relay.inbox, false);
|
|
|
|
await this.relaysRepository.delete(relay.id);
|
|
}
|
|
|
|
@bindThis
|
|
public async listRelay(): Promise<MiRelay[]> {
|
|
const relays = await this.relaysRepository.find();
|
|
return relays;
|
|
}
|
|
|
|
@bindThis
|
|
public async relayAccepted(id: string): Promise<string> {
|
|
const result = await this.relaysRepository.update(id, {
|
|
status: 'accepted',
|
|
});
|
|
|
|
return JSON.stringify(result);
|
|
}
|
|
|
|
@bindThis
|
|
public async relayRejected(id: string): Promise<string> {
|
|
const result = await this.relaysRepository.update(id, {
|
|
status: 'rejected',
|
|
});
|
|
|
|
return JSON.stringify(result);
|
|
}
|
|
|
|
@bindThis
|
|
public async deliverToRelays(user: { id: MiUser['id']; host: null; }, activity: any): Promise<void> {
|
|
if (activity == null) return;
|
|
|
|
const relays = await this.relaysCache.fetch(() => this.relaysRepository.findBy({
|
|
status: 'accepted',
|
|
}));
|
|
if (relays.length === 0) return;
|
|
|
|
const copy = deepClone(activity);
|
|
if (!copy.to) copy.to = ['https://www.w3.org/ns/activitystreams#Public'];
|
|
|
|
const signed = await this.apRendererService.attachLdSignature(copy, user);
|
|
|
|
for (const relay of relays) {
|
|
this.queueService.deliver(user, signed, relay.inbox, false);
|
|
}
|
|
}
|
|
}
|