diff --git a/src/client/components/taskmanager.vue b/src/client/components/taskmanager.vue
new file mode 100644
index 000000000..14d4e2d1b
--- /dev/null
+++ b/src/client/components/taskmanager.vue
@@ -0,0 +1,96 @@
+
+
+
+ Task Manager
+
+
+
+
+
+
+
#{{ c.id }}
+
{{ c.channel }}
+
(shared){{ ' ' + c.name }}
+
{{ c.name ? c.name : '
' }}
+
{{ c.in }}
+
{{ c.out }}
+
+
+
+
+
+
+
+
+
diff --git a/src/client/config.ts b/src/client/config.ts
index e0d2fd1de..9c5e0f765 100644
--- a/src/client/config.ts
+++ b/src/client/config.ts
@@ -14,3 +14,4 @@ export const getLocale = async () => Object.fromEntries((await entries(clientDb.
export const version = _VERSION_;
export const instanceName = siteName === 'Misskey' ? host : siteName;
export const deckmode = localStorage.getItem('deckmode') === 'true';
+export const debug = localStorage.getItem('debug') === 'true';
diff --git a/src/client/init.ts b/src/client/init.ts
index 86991b69e..070deec0c 100644
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -252,7 +252,7 @@ if (store.getters.isSignedIn) {
}
}
- const main = stream.useSharedConnection('main');
+ const main = stream.useSharedConnection('main', 'system');
// 自分の情報が更新されたとき
main.on('meUpdated', i => {
diff --git a/src/client/pages/settings/other.vue b/src/client/pages/settings/other.vue
index 38c2e8adb..dbeb9ad71 100644
--- a/src/client/pages/settings/other.vue
+++ b/src/client/pages/settings/other.vue
@@ -10,22 +10,31 @@
-
RegEdit
+
+ DEBUG MODE
+
+
+ RegEdit
+ Task Manager
+
diff --git a/src/client/scripts/stream.ts b/src/client/scripts/stream.ts
index 789bf9432..942e2a8da 100644
--- a/src/client/scripts/stream.ts
+++ b/src/client/scripts/stream.ts
@@ -1,7 +1,7 @@
import autobind from 'autobind-decorator';
import { EventEmitter } from 'eventemitter3';
import ReconnectingWebsocket from 'reconnecting-websocket';
-import { wsUrl } from '@/config';
+import { debug, wsUrl } from '@/config';
import { query as urlQuery } from '../../prelude/url';
/**
@@ -28,7 +28,7 @@ export default class Stream extends EventEmitter {
}
@autobind
- public useSharedConnection(channel: string): SharedConnection {
+ public useSharedConnection(channel: string, name?: string): SharedConnection {
let pool = this.sharedConnectionPools.find(p => p.channel === channel);
if (pool == null) {
@@ -36,7 +36,7 @@ export default class Stream extends EventEmitter {
this.sharedConnectionPools.push(pool);
}
- const connection = new SharedConnection(this, channel, pool);
+ const connection = new SharedConnection(this, channel, pool, name);
this.sharedConnections.push(connection);
return connection;
}
@@ -113,6 +113,7 @@ export default class Stream extends EventEmitter {
for (const c of connections.filter(c => c != null)) {
c.emit(body.type, Object.freeze(body.body));
+ if (debug) c.inCount++;
}
} else {
this.emit(type, Object.freeze(body));
@@ -142,6 +143,8 @@ export default class Stream extends EventEmitter {
}
}
+let idCounter = 0;
+
class Pool {
public channel: string;
public id: string;
@@ -154,7 +157,7 @@ class Pool {
this.channel = channel;
this.stream = stream;
- this.id = Math.random().toString().substr(2, 8);
+ this.id = (++idCounter).toString();
this.stream.on('_disconnected_', this.onStreamDisconnected);
}
@@ -216,11 +219,16 @@ abstract class Connection extends EventEmitter {
protected stream: Stream;
public abstract id: string;
- constructor(stream: Stream, channel: string) {
+ public name?: string; // for debug
+ public inCount: number = 0; // for debug
+ public outCount: number = 0; // for debug
+
+ constructor(stream: Stream, channel: string, name?: string) {
super();
this.stream = stream;
this.channel = channel;
+ this.name = name;
}
@autobind
@@ -233,6 +241,8 @@ abstract class Connection extends EventEmitter {
type: type,
body: body
});
+
+ if (debug) this.outCount++;
}
public abstract dispose(): void;
@@ -245,8 +255,8 @@ class SharedConnection extends Connection {
return this.pool.id;
}
- constructor(stream: Stream, channel: string, pool: Pool) {
- super(stream, channel);
+ constructor(stream: Stream, channel: string, pool: Pool, name?: string) {
+ super(stream, channel, name);
this.pool = pool;
this.pool.inc();
@@ -273,7 +283,7 @@ class NonSharedConnection extends Connection {
super(stream, channel);
this.params = params;
- this.id = Math.random().toString().substr(2, 8);
+ this.id = (++idCounter).toString();
this.connect();
}