perf: 各ストリーミング接続ごとにポーリングしないように
This commit is contained in:
@ -4,6 +4,7 @@ import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { Channels, ChannelFollowings } from '../../../../models';
|
||||
import { genId } from '../../../../misc/gen-id';
|
||||
import { publishUserEvent } from '../../../../services/stream';
|
||||
|
||||
export const meta = {
|
||||
tags: ['channels'],
|
||||
@ -42,4 +43,6 @@ export default define(meta, async (ps, user) => {
|
||||
followerId: user.id,
|
||||
followeeId: channel.id,
|
||||
});
|
||||
|
||||
publishUserEvent(user.id, 'followChannel', channel);
|
||||
});
|
||||
|
@ -3,6 +3,7 @@ import { ID } from '../../../../misc/cafy-id';
|
||||
import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { Channels, ChannelFollowings } from '../../../../models';
|
||||
import { publishUserEvent } from '../../../../services/stream';
|
||||
|
||||
export const meta = {
|
||||
tags: ['channels'],
|
||||
@ -39,4 +40,6 @@ export default define(meta, async (ps, user) => {
|
||||
followerId: user.id,
|
||||
followeeId: channel.id,
|
||||
});
|
||||
|
||||
publishUserEvent(user.id, 'unfollowChannel', channel);
|
||||
});
|
||||
|
@ -1,6 +1,6 @@
|
||||
import $ from 'cafy';
|
||||
import { ID } from '../../../../misc/cafy-id';
|
||||
import { publishMainStream } from '../../../../services/stream';
|
||||
import { publishMainStream, publishUserEvent } from '../../../../services/stream';
|
||||
import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
|
||||
import { publishToFollowers } from '../../../../services/i/update';
|
||||
import define from '../../define';
|
||||
@ -317,6 +317,7 @@ export default define(meta, async (ps, user, token) => {
|
||||
|
||||
// Publish meUpdated event
|
||||
publishMainStream(user.id, 'meUpdated', iObj);
|
||||
publishUserEvent(user.id, 'updateUserProfile', await UserProfiles.findOne(user.id));
|
||||
|
||||
// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
|
||||
if (user.isLocked && ps.isLocked === false) {
|
||||
|
@ -6,6 +6,7 @@ import { getUser } from '../../common/getters';
|
||||
import { genId } from '../../../../misc/gen-id';
|
||||
import { Mutings, NoteWatchings } from '../../../../models';
|
||||
import { Muting } from '../../../../models/entities/muting';
|
||||
import { publishUserEvent } from '../../../../services/stream';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
@ -82,6 +83,8 @@ export default define(meta, async (ps, user) => {
|
||||
muteeId: mutee.id,
|
||||
} as Muting);
|
||||
|
||||
publishUserEvent(user.id, 'mute', mutee);
|
||||
|
||||
NoteWatchings.delete({
|
||||
userId: muter.id,
|
||||
noteUserId: mutee.id
|
||||
|
@ -4,6 +4,7 @@ import define from '../../define';
|
||||
import { ApiError } from '../../error';
|
||||
import { getUser } from '../../common/getters';
|
||||
import { Mutings } from '../../../../models';
|
||||
import { publishUserEvent } from '../../../../services/stream';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
@ -76,4 +77,6 @@ export default define(meta, async (ps, user) => {
|
||||
await Mutings.delete({
|
||||
id: exist.id
|
||||
});
|
||||
|
||||
publishUserEvent(user.id, 'unmute', mutee);
|
||||
});
|
||||
|
@ -30,10 +30,6 @@ export default class Connection {
|
||||
public subscriber: EventEmitter;
|
||||
private channels: Channel[] = [];
|
||||
private subscribingNotes: any = {};
|
||||
private followingClock: ReturnType<typeof setInterval>;
|
||||
private mutingClock: ReturnType<typeof setInterval>;
|
||||
private followingChannelsClock: ReturnType<typeof setInterval>;
|
||||
private userProfileClock: ReturnType<typeof setInterval>;
|
||||
|
||||
constructor(
|
||||
wsConnection: websocket.connection,
|
||||
@ -52,19 +48,51 @@ export default class Connection {
|
||||
this.onBroadcastMessage(type, body);
|
||||
});
|
||||
|
||||
// TODO: reidsでイベントをもらうようにし、ポーリングはしないようにする
|
||||
if (this.user) {
|
||||
this.updateFollowing();
|
||||
this.followingClock = setInterval(this.updateFollowing, 5000);
|
||||
|
||||
this.updateMuting();
|
||||
this.mutingClock = setInterval(this.updateMuting, 5000);
|
||||
|
||||
this.updateFollowingChannels();
|
||||
this.followingChannelsClock = setInterval(this.updateFollowingChannels, 5000);
|
||||
|
||||
this.updateUserProfile();
|
||||
this.userProfileClock = setInterval(this.updateUserProfile, 5000);
|
||||
|
||||
this.subscriber.on(`user:${this.user.id}`, ({ type, body }) => {
|
||||
this.onUserEvent(type, body);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@autobind
|
||||
private onUserEvent(type: string, body: any) {
|
||||
switch (type) {
|
||||
case 'follow':
|
||||
this.following.add(body.id);
|
||||
break;
|
||||
|
||||
case 'unfollow':
|
||||
this.following.delete(body.id);
|
||||
break;
|
||||
|
||||
case 'mute':
|
||||
this.muting.add(body.id);
|
||||
break;
|
||||
|
||||
case 'unmute':
|
||||
this.muting.delete(body.id);
|
||||
break;
|
||||
|
||||
case 'followChannel':
|
||||
this.followingChannels.add(body.id);
|
||||
break;
|
||||
|
||||
case 'unfollowChannel':
|
||||
this.followingChannels.delete(body.id);
|
||||
break;
|
||||
|
||||
case 'updateUserProfile':
|
||||
this.userProfile = body;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -354,10 +382,5 @@ export default class Connection {
|
||||
for (const c of this.channels.filter(c => c.dispose)) {
|
||||
if (c.dispose) c.dispose();
|
||||
}
|
||||
|
||||
if (this.followingClock) clearInterval(this.followingClock);
|
||||
if (this.mutingClock) clearInterval(this.mutingClock);
|
||||
if (this.followingChannelsClock) clearInterval(this.followingChannelsClock);
|
||||
if (this.userProfileClock) clearInterval(this.userProfileClock);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user