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

✌️

Browse source
This commit is contained in:
syuilo 2018-03-15 19:53:46 +09:00
parent f02fcd0e2a
commit 1439c3245b
22 changed files with 446 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/web/app/common/scripts/streaming/channel.ts
View file

@ -1,11 +1,12 @@
import Stream from './stream';
import MiOS from '../../mios';
/**
* Channel stream connection
*/
export default class Connection extends Stream {
constructor(channelId) {
super('channel', {
constructor(os: MiOS, channelId) {
super(os, 'channel', {
channel: channelId
});
}

11
src/web/app/common/scripts/streaming/drive.ts
View file

@ -1,12 +1,13 @@
import Stream from './stream';
import StreamManager from './stream-manager';
import MiOS from '../../mios';
/**
* Drive stream connection
*/
export class DriveStream extends Stream {
constructor(me) {
super('drive', {
constructor(os: MiOS, me) {
super(os, 'drive', {
i: me.token
});
}
@ -14,16 +15,18 @@ export class DriveStream extends Stream {
export class DriveStreamManager extends StreamManager<DriveStream> {
private me;
private os: MiOS;
constructor(me) {
constructor(os: MiOS, me) {
super();
this.me = me;
this.os = os;
}
public getConnection() {
if (this.connection == null) {
this.connection = new DriveStream(this.me);
this.connection = new DriveStream(this.os, this.me);
}
return this.connection;

2
src/web/app/common/scripts/streaming/home.ts
View file

@ -9,7 +9,7 @@ import MiOS from '../../mios';
*/
export class HomeStream extends Stream {
constructor(os: MiOS, me) {
super('', {
super(os, '', {
i: me.token
});

11
src/web/app/common/scripts/streaming/messaging-index.ts
View file

@ -1,12 +1,13 @@
import Stream from './stream';
import StreamManager from './stream-manager';
import MiOS from '../../mios';
/**
* Messaging index stream connection
*/
export class MessagingIndexStream extends Stream {
constructor(me) {
super('messaging-index', {
constructor(os: MiOS, me) {
super(os, 'messaging-index', {
i: me.token
});
}
@ -14,16 +15,18 @@ export class MessagingIndexStream extends Stream {
export class MessagingIndexStreamManager extends StreamManager<MessagingIndexStream> {
private me;
private os: MiOS;
constructor(me) {
constructor(os: MiOS, me) {
super();
this.me = me;
this.os = os;
}
public getConnection() {
if (this.connection == null) {
this.connection = new MessagingIndexStream(this.me);
this.connection = new MessagingIndexStream(this.os, this.me);
}
return this.connection;

5
src/web/app/common/scripts/streaming/messaging.ts
View file

@ -1,11 +1,12 @@
import Stream from './stream';
import MiOS from '../../mios';
/**
* Messaging stream connection
*/
export class MessagingStream extends Stream {
constructor(me, otherparty) {
super('messaging', {
constructor(os: MiOS, me, otherparty) {
super(os, 'messaging', {
i: me.token,
otherparty
});

5
src/web/app/common/scripts/streaming/othello-game.ts
View file

@ -1,8 +1,9 @@
import Stream from './stream';
import MiOS from '../../mios';
export class OthelloGameStream extends Stream {
constructor(me, game) {
super('othello-game', {
constructor(os: MiOS, me, game) {
super(os, 'othello-game', {
i: me ? me.token : null,
game: game.id
});

11
src/web/app/common/scripts/streaming/othello.ts
View file

@ -1,9 +1,10 @@
import StreamManager from './stream-manager';
import Stream from './stream';
import MiOS from '../../mios';
export class OthelloStream extends Stream {
constructor(me) {
super('othello', {
constructor(os: MiOS, me) {
super(os, 'othello', {
i: me.token
});
}
@ -11,16 +12,18 @@ export class OthelloStream extends Stream {
export class OthelloStreamManager extends StreamManager<OthelloStream> {
private me;
private os: MiOS;
constructor(me) {
constructor(os: MiOS, me) {
super();
this.me = me;
this.os = os;
}
public getConnection() {
if (this.connection == null) {
this.connection = new OthelloStream(this.me);
this.connection = new OthelloStream(this.os, this.me);
}
return this.connection;

15
src/web/app/common/scripts/streaming/requests.ts
View file

@ -1,19 +1,28 @@
import Stream from './stream';
import StreamManager from './stream-manager';
import MiOS from '../../mios';
/**
* Requests stream connection
*/
export class RequestsStream extends Stream {
constructor() {
super('requests');
constructor(os: MiOS) {
super(os, 'requests');
}
}
export class RequestsStreamManager extends StreamManager<RequestsStream> {
private os: MiOS;
constructor(os: MiOS) {
super();
this.os = os;
}
public getConnection() {
if (this.connection == null) {
this.connection = new RequestsStream();
this.connection = new RequestsStream(this.os);
}
return this.connection;

15
src/web/app/common/scripts/streaming/server.ts
View file

@ -1,19 +1,28 @@
import Stream from './stream';
import StreamManager from './stream-manager';
import MiOS from '../../mios';
/**
* Server stream connection
*/
export class ServerStream extends Stream {
constructor() {
super('server');
constructor(os: MiOS) {
super(os, 'server');
}
}
export class ServerStreamManager extends StreamManager<ServerStream> {
private os: MiOS;
constructor(os: MiOS) {
super();
this.os = os;
}
public getConnection() {
if (this.connection == null) {
this.connection = new ServerStream();
this.connection = new ServerStream(this.os);
}
return this.connection;

6
src/web/app/common/scripts/streaming/stream-manager.ts
View file

@ -31,6 +31,8 @@ export default abstract class StreamManager<T extends Connection> extends EventE
this._connection.on('_disconnected_', () => {
this.emit('_disconnected_');
});
this._connection.user = 'Managed';
}
}
@ -77,6 +79,8 @@ export default abstract class StreamManager<T extends Connection> extends EventE
this.users.push(userId);
this._connection.user = `Managed (${ this.users.length })`;
return userId;
}
@ -87,6 +91,8 @@ export default abstract class StreamManager<T extends Connection> extends EventE
public dispose(userId) {
this.users = this.users.filter(id => id != userId);
this._connection.user = `Managed (${ this.users.length })`;
// 誰もコネクションの利用者がいなくなったら
if (this.users.length == 0) {
// また直ぐに再利用される可能性があるので、一定時間待ち、

52
src/web/app/common/scripts/streaming/stream.ts
View file

@ -1,6 +1,8 @@
import { EventEmitter } from 'eventemitter3';
import * as uuid from 'uuid';
import * as ReconnectingWebsocket from 'reconnecting-websocket';
import { apiUrl } from '../../../config';
import MiOS from '../../mios';
/**
* Misskey stream connection
@ -8,9 +10,21 @@ import { apiUrl } from '../../../config';
export default class Connection extends EventEmitter {
public state: string;
private buffer: any[];
private socket: ReconnectingWebsocket;
public socket: ReconnectingWebsocket;
public name: string;
public connectedAt: Date;
public user: string = null;
public in: number = 0;
public out: number = 0;
public inout: Array<{
type: 'in' | 'out',
at: Date,
data: string
}> = [];
public id: string;
private os: MiOS;
constructor(endpoint, params?) {
constructor(os: MiOS, endpoint, params?) {
super();
//#region BIND
@ -21,6 +35,9 @@ export default class Connection extends EventEmitter {
this.close = this.close.bind(this);
//#endregion
this.id = uuid();
this.os = os;
this.name = endpoint;
this.state = 'initializing';
this.buffer = [];
@ -35,6 +52,9 @@ export default class Connection extends EventEmitter {
this.socket.addEventListener('open', this.onOpen);
this.socket.addEventListener('close', this.onClose);
this.socket.addEventListener('message', this.onMessage);
// Register this connection for debugging
this.os.registerStreamConnection(this);
}
/**
@ -44,11 +64,18 @@ export default class Connection extends EventEmitter {
this.state = 'connected';
this.emit('_connected_');
this.connectedAt = new Date();
// バッファーを処理
const _buffer = [].concat(this.buffer); // Shallow copy
this.buffer = []; // Clear buffer
_buffer.forEach(message => {
this.send(message); // Resend each buffered messages
_buffer.forEach(data => {
this.send(data); // Resend each buffered messages
if (this.os.debug) {
this.out++;
this.inout.push({ type: 'out', at: new Date(), data });
}
});
}
@ -64,6 +91,11 @@ export default class Connection extends EventEmitter {
* Callback of when received a message from connection
*/
private onMessage(message) {
if (this.os.debug) {
this.in++;
this.inout.push({ type: 'in', at: new Date(), data: message.data });
}
try {
const msg = JSON.parse(message.data);
if (msg.type) this.emit(msg.type, msg.body);
@ -75,20 +107,26 @@ export default class Connection extends EventEmitter {
/**
* Send a message to connection
*/
public send(message) {
public send(data) {
// まだ接続が確立されていなかったらバッファリングして次に接続した時に送信する
if (this.state != 'connected') {
this.buffer.push(message);
this.buffer.push(data);
return;
}
this.socket.send(JSON.stringify(message));
if (this.os.debug) {
this.out++;
this.inout.push({ type: 'out', at: new Date(), data });
}
this.socket.send(JSON.stringify(data));
}
/**
* Close this connection
*/
public close() {
this.os.unregisterStreamConnection(this);
this.socket.removeEventListener('open', this.onOpen);
this.socket.removeEventListener('message', this.onMessage);
}