Fix bugs

5 files changed, 25 insertions, 17 deletions

diff --git a/src/web/app/common/scripts/signout.ts b/src/web/app/common/scripts/signout.ts
deleted file mode 100644
index 2923196549..0000000000
--- a/src/web/app/common/scripts/signout.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare const _HOST_: string;
-
-export default () => {
-	localStorage.removeItem('me');
-	document.cookie = `i=; domain=.${_HOST_}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
-	location.href = '/';
-};
diff --git a/src/web/app/common/scripts/streaming/home-stream-manager.ts b/src/web/app/common/scripts/streaming/home-stream-manager.ts
index ad1dc870eb..ab56d5a73a 100644
--- a/src/web/app/common/scripts/streaming/home-stream-manager.ts
+++ b/src/web/app/common/scripts/streaming/home-stream-manager.ts
@@ -1,18 +1,21 @@
 import StreamManager from './stream-manager';
 import Connection from './home-stream';
+import MiOS from '../../mios';
 
 export default class HomeStreamManager extends StreamManager<Connection> {
 	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 Connection(this.me);
+			this.connection = new Connection(this.os, this.me);
 		}
 
 		return this.connection;
diff --git a/src/web/app/common/scripts/streaming/home-stream.ts b/src/web/app/common/scripts/streaming/home-stream.ts
index b8e417b6d4..57bf0ec2a6 100644
--- a/src/web/app/common/scripts/streaming/home-stream.ts
+++ b/src/web/app/common/scripts/streaming/home-stream.ts
@@ -1,11 +1,11 @@
 import Stream from './stream';
-import signout from '../signout';
+import MiOS from '../../mios';
 
 /**
  * Home stream connection
  */
 export default class Connection extends Stream {
-	constructor(me) {
+	constructor(os: MiOS, me) {
 		super('', {
 			i: me.token
 		});
@@ -25,7 +25,7 @@ export default class Connection extends Stream {
 		// このままではAPIが利用できないので強制的にサインアウトさせる
 		this.on('my_token_regenerated', () => {
 			alert('%i18n:common.my-token-regenerated%');
-			signout();
+			os.signout();
 		});
 	}
 }
diff --git a/src/web/app/common/scripts/streaming/stream-manager.ts b/src/web/app/common/scripts/streaming/stream-manager.ts
index 5bb0dc701c..a4a73c561f 100644
--- a/src/web/app/common/scripts/streaming/stream-manager.ts
+++ b/src/web/app/common/scripts/streaming/stream-manager.ts
@@ -23,6 +23,14 @@ export default abstract class StreamManager<T extends Connection> extends EventE
 			this.emit('disconnected');
 		} else {
 			this.emit('connected', this._connection);
+
+			this._connection.on('_connected_', () => {
+				this.emit('_connected_');
+			});
+
+			this._connection.on('_disconnected_', () => {
+				this.emit('_disconnected_');
+			});
 		}
 	}
 
@@ -37,6 +45,11 @@ export default abstract class StreamManager<T extends Connection> extends EventE
 		return this._connection != null;
 	}
 
+	public get state(): string {
+		if (!this.hasConnection) return 'no-connection';
+		return this._connection.state;
+	}
+
 	/**
 	 * コネクションを要求します
 	 */
diff --git a/src/web/app/common/scripts/streaming/stream.ts b/src/web/app/common/scripts/streaming/stream.ts
index 770d77510f..8799f6fe6b 100644
--- a/src/web/app/common/scripts/streaming/stream.ts
+++ b/src/web/app/common/scripts/streaming/stream.ts
@@ -1,13 +1,12 @@
-declare const _API_URL_: string;
-
 import { EventEmitter } from 'eventemitter3';
 import * as ReconnectingWebsocket from 'reconnecting-websocket';
+import { apiUrl } from '../../../config';
 
 /**
  * Misskey stream connection
  */
 export default class Connection extends EventEmitter {
-	private state: string;
+	public state: string;
 	private buffer: any[];
 	private socket: ReconnectingWebsocket;
 
@@ -25,7 +24,7 @@ export default class Connection extends EventEmitter {
 		this.state = 'initializing';
 		this.buffer = [];
 
-		const host = _API_URL_.replace('http', 'ws');
+		const host = apiUrl.replace('http', 'ws');
 		const query = params
 			? Object.keys(params)
 				.map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
@@ -58,7 +57,7 @@ export default class Connection extends EventEmitter {
 	 */
 	private onClose() {
 		this.state = 'reconnecting';
-		this.emit('_closed_');
+		this.emit('_disconnected_');
 	}
 
 	/**