diff --git a/packages/client/src/components/drive.vue b/packages/client/src/components/drive.vue
index 46bcd425589488bde1f8d983ee8e626b4af1a37d..f8d3d810b7609858efbcec5a8438328e484e43cd 100644
--- a/packages/client/src/components/drive.vue
+++ b/packages/client/src/components/drive.vue
@@ -53,6 +53,7 @@ import XFolder from './drive.folder.vue';
import XFile from './drive.file.vue';
import MkButton from './ui/button.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
export default defineComponent({
components: {
@@ -140,7 +141,7 @@ export default defineComponent({
});
}
- this.connection = markRaw(os.stream.useChannel('drive'));
+ this.connection = markRaw(stream.useChannel('drive'));
this.connection.on('fileCreated', this.onStreamDriveFileCreated);
this.connection.on('fileUpdated', this.onStreamDriveFileUpdated);
diff --git a/packages/client/src/components/follow-button.vue b/packages/client/src/components/follow-button.vue
index 713626191415ba1f596c5b93b514e1afb10d4c00..b16b22f26f71c6775543b96f42e6ff9ce2539163 100644
--- a/packages/client/src/components/follow-button.vue
+++ b/packages/client/src/components/follow-button.vue
@@ -30,6 +30,7 @@
<script lang="ts">
import { defineComponent, markRaw } from 'vue';
import * as os from '@/os';
+import { stream } from '@/stream';
export default defineComponent({
props: {
@@ -71,7 +72,7 @@ export default defineComponent({
},
mounted() {
- this.connection = markRaw(os.stream.useChannel('main'));
+ this.connection = markRaw(stream.useChannel('main'));
this.connection.on('follow', this.onFollowChange);
this.connection.on('unfollow', this.onFollowChange);
diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue
index 55a02f1e73af9889f0264a71074a4ec23b2a4778..a5cb2f0426e7181598862d8ec4980d6c433084dc 100644
--- a/packages/client/src/components/note-detailed.vue
+++ b/packages/client/src/components/note-detailed.vue
@@ -140,6 +140,7 @@ import { checkWordMute } from '@/scripts/check-word-mute';
import { userPage } from '@/filters/user';
import { notePage } from '@/filters/note';
import * as os from '@/os';
+import { stream } from '@/stream';
import { noteActions, noteViewInterruptors } from '@/store';
import { reactionPicker } from '@/scripts/reaction-picker';
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
@@ -260,7 +261,7 @@ export default defineComponent({
async created() {
if (this.$i) {
- this.connection = os.stream;
+ this.connection = stream;
}
this.muted = await checkWordMute(this.appearNote, this.$i, this.$store.state.mutedWords);
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue
index c4040388a9563e49d44508ad5b5294efab9b14bb..3cf924928ac41f2079a44751fcda51f0058bde5c 100644
--- a/packages/client/src/components/note.vue
+++ b/packages/client/src/components/note.vue
@@ -122,6 +122,7 @@ import copyToClipboard from '@/scripts/copy-to-clipboard';
import { checkWordMute } from '@/scripts/check-word-mute';
import { userPage } from '@/filters/user';
import * as os from '@/os';
+import { stream } from '@/stream';
import { noteActions, noteViewInterruptors } from '@/store';
import { reactionPicker } from '@/scripts/reaction-picker';
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
@@ -245,7 +246,7 @@ export default defineComponent({
async created() {
if (this.$i) {
- this.connection = os.stream;
+ this.connection = stream;
}
this.collapsed = this.appearNote.cw == null && this.appearNote.text && (
diff --git a/packages/client/src/components/notification.vue b/packages/client/src/components/notification.vue
index 37a88edc646e9ff5275755091bcbe2da2624d4dc..5659c899beee44f67d101f36fb5493a5827574e5 100644
--- a/packages/client/src/components/notification.vue
+++ b/packages/client/src/components/notification.vue
@@ -74,6 +74,7 @@ import { notePage } from '@/filters/note';
import { userPage } from '@/filters/user';
import { i18n } from '@/i18n';
import * as os from '@/os';
+import { stream } from '@/stream';
import { useTooltip } from '@/scripts/use-tooltip';
export default defineComponent({
@@ -106,7 +107,7 @@ export default defineComponent({
if (!props.notification.isRead) {
const readObserver = new IntersectionObserver((entries, observer) => {
if (!entries.some(entry => entry.isIntersecting)) return;
- os.stream.send('readNotification', {
+ stream.send('readNotification', {
id: props.notification.id
});
observer.disconnect();
@@ -114,7 +115,7 @@ export default defineComponent({
readObserver.observe(elRef.value);
- const connection = os.stream.useChannel('main');
+ const connection = stream.useChannel('main');
connection.on('readAllNotifications', () => readObserver.disconnect());
onUnmounted(() => {
diff --git a/packages/client/src/components/notifications.vue b/packages/client/src/components/notifications.vue
index f3e5ee32f70a1499f5dbace57adee98d3c5a455c..328888c355f952c1f45bd96722b08b12526d4279 100644
--- a/packages/client/src/components/notifications.vue
+++ b/packages/client/src/components/notifications.vue
@@ -28,6 +28,7 @@ import XList from './date-separated-list.vue';
import XNote from './note.vue';
import { notificationTypes } from 'misskey-js';
import * as os from '@/os';
+import { stream } from '@/stream';
import MkButton from '@/components/ui/button.vue';
export default defineComponent({
@@ -100,7 +101,7 @@ export default defineComponent({
},
mounted() {
- this.connection = markRaw(os.stream.useChannel('main'));
+ this.connection = markRaw(stream.useChannel('main'));
this.connection.on('notification', this.onNotification);
},
@@ -112,7 +113,7 @@ export default defineComponent({
onNotification(notification) {
const isMuted = !this.allIncludeTypes.includes(notification.type);
if (isMuted || document.visibilityState === 'visible') {
- os.stream.send('readNotification', {
+ stream.send('readNotification', {
id: notification.id
});
}
diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index 4265c575e2e6729a60c2992ff1e4f39ff25f507b..24f35da2e9cd8d1722e3a5454c7b1abee617ecb6 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -74,11 +74,11 @@ import { formatTimeString } from '@/scripts/format-time-string';
import { Autocomplete } from '@/scripts/autocomplete';
import { noteVisibilities } from 'misskey-js';
import * as os from '@/os';
+import { stream } from '@/stream';
import { selectFiles } from '@/scripts/select-file';
import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
import { throttle } from 'throttle-debounce';
import MkInfo from '@/components/ui/info.vue';
-import { defaultStore } from '@/store';
export default defineComponent({
components: {
@@ -176,7 +176,7 @@ export default defineComponent({
imeText: '',
typing: throttle(3000, () => {
if (this.channel) {
- os.stream.send('typingOnChannel', { channel: this.channel.id });
+ stream.send('typingOnChannel', { channel: this.channel.id });
}
}),
postFormActions,
diff --git a/packages/client/src/components/taskmanager.vue b/packages/client/src/components/taskmanager.vue
index 6901d88c2c18e1340a9a310819ffaa240d052efa..c5d2c6d8f836365addfe13a284f671e82666dfd8 100644
--- a/packages/client/src/components/taskmanager.vue
+++ b/packages/client/src/components/taskmanager.vue
@@ -83,6 +83,7 @@ import MkTab from '@/components/tab.vue';
import MkButton from '@/components/ui/button.vue';
import follow from '@/directives/follow-append';
import * as os from '@/os';
+import { stream } from '@/stream';
export default defineComponent({
components: {
@@ -104,15 +105,15 @@ export default defineComponent({
const connections = shallowRef([]);
const pools = shallowRef([]);
const refreshStreamInfo = () => {
- console.log(os.stream.sharedConnectionPools, os.stream.sharedConnections, os.stream.nonSharedConnections);
- const conn = os.stream.sharedConnections.map(c => ({
+ console.log(stream.sharedConnectionPools, stream.sharedConnections, stream.nonSharedConnections);
+ const conn = stream.sharedConnections.map(c => ({
id: c.id, name: c.name, channel: c.channel, users: c.pool.users, in: c.inCount, out: c.outCount,
- })).concat(os.stream.nonSharedConnections.map(c => ({
+ })).concat(stream.nonSharedConnections.map(c => ({
id: c.id, name: c.name, channel: c.channel, users: null, in: c.inCount, out: c.outCount,
})));
conn.sort((a, b) => (a.id > b.id) ? 1 : -1);
connections.value = conn;
- pools.value = os.stream.sharedConnectionPools;
+ pools.value = stream.sharedConnectionPools;
};
const interval = setInterval(refreshStreamInfo, 1000);
onBeforeUnmount(() => {
diff --git a/packages/client/src/components/timeline.vue b/packages/client/src/components/timeline.vue
index f8a800872f921b925eb80b7a4b327054898169c2..53697671b29658ed289edeb471caed8fdd80d145 100644
--- a/packages/client/src/components/timeline.vue
+++ b/packages/client/src/components/timeline.vue
@@ -6,6 +6,7 @@
import { defineComponent, markRaw } from 'vue';
import XNotes from './notes.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as sound from '@/scripts/sound';
export default defineComponent({
@@ -92,33 +93,33 @@ export default defineComponent({
this.query = {
antennaId: this.antenna
};
- this.connection = markRaw(os.stream.useChannel('antenna', {
+ this.connection = markRaw(stream.useChannel('antenna', {
antennaId: this.antenna
}));
this.connection.on('note', prepend);
} else if (this.src == 'home') {
endpoint = 'notes/timeline';
- this.connection = markRaw(os.stream.useChannel('homeTimeline'));
+ this.connection = markRaw(stream.useChannel('homeTimeline'));
this.connection.on('note', prepend);
- this.connection2 = markRaw(os.stream.useChannel('main'));
+ this.connection2 = markRaw(stream.useChannel('main'));
this.connection2.on('follow', onChangeFollowing);
this.connection2.on('unfollow', onChangeFollowing);
} else if (this.src == 'local') {
endpoint = 'notes/local-timeline';
- this.connection = markRaw(os.stream.useChannel('localTimeline'));
+ this.connection = markRaw(stream.useChannel('localTimeline'));
this.connection.on('note', prepend);
} else if (this.src == 'social') {
endpoint = 'notes/hybrid-timeline';
- this.connection = markRaw(os.stream.useChannel('hybridTimeline'));
+ this.connection = markRaw(stream.useChannel('hybridTimeline'));
this.connection.on('note', prepend);
} else if (this.src == 'global') {
endpoint = 'notes/global-timeline';
- this.connection = markRaw(os.stream.useChannel('globalTimeline'));
+ this.connection = markRaw(stream.useChannel('globalTimeline'));
this.connection.on('note', prepend);
} else if (this.src == 'mentions') {
endpoint = 'notes/mentions';
- this.connection = markRaw(os.stream.useChannel('main'));
+ this.connection = markRaw(stream.useChannel('main'));
this.connection.on('mention', prepend);
} else if (this.src == 'directs') {
endpoint = 'notes/mentions';
@@ -130,14 +131,14 @@ export default defineComponent({
prepend(note);
}
};
- this.connection = markRaw(os.stream.useChannel('main'));
+ this.connection = markRaw(stream.useChannel('main'));
this.connection.on('mention', onNote);
} else if (this.src == 'list') {
endpoint = 'notes/user-list-timeline';
this.query = {
listId: this.list
};
- this.connection = markRaw(os.stream.useChannel('userList', {
+ this.connection = markRaw(stream.useChannel('userList', {
listId: this.list
}));
this.connection.on('note', prepend);
@@ -148,7 +149,7 @@ export default defineComponent({
this.query = {
channelId: this.channel
};
- this.connection = markRaw(os.stream.useChannel('channel', {
+ this.connection = markRaw(stream.useChannel('channel', {
channelId: this.channel
}));
this.connection.on('note', prepend);
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 82a1e169ce58c018a027e88a36fdc0f344506df2..66d75e70fbd7e09b29aee81747f3f16d8fc7d8aa 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -26,7 +26,8 @@ import { router } from '@/router';
import { applyTheme } from '@/scripts/theme';
import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
import { i18n } from '@/i18n';
-import { stream, confirm, alert, post, popup, toast } from '@/os';
+import { confirm, alert, post, popup, toast } from '@/os';
+import { stream } from '@/stream';
import * as sound from '@/scripts/sound';
import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
import { defaultStore, ColdDeviceStorage } from '@/store';
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 4ed69e0ec030aa11918e390b3f3515a3f2933d3e..1ea205d5c8b2f60e9494dc1ebf55fd273662fba7 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -12,8 +12,6 @@ import { resolve } from '@/router';
import { $i } from '@/account';
import { defaultStore } from '@/store';
-export const stream = markRaw(new Misskey.Stream(url, $i));
-
export const pendingApiRequestsCount = ref(0);
let apiRequestsCount = 0; // for debug
export const apiRequests = ref([]); // for debug
diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue
index 05b64b235cc7a436f34f7e30e58a142a597f3f33..f566061cebf226cc76c6cfb396e34276fe0a650b 100644
--- a/packages/client/src/pages/admin/metrics.vue
+++ b/packages/client/src/pages/admin/metrics.vue
@@ -101,6 +101,7 @@ const alpha = (hex, a) => {
return `rgba(${r}, ${g}, ${b}, ${a})`;
};
import * as os from '@/os';
+import { stream } from '@/stream';
export default defineComponent({
components: {
@@ -119,7 +120,7 @@ export default defineComponent({
stats: null,
serverInfo: null,
connection: null,
- queueConnection: markRaw(os.stream.useChannel('queueStats')),
+ queueConnection: markRaw(stream.useChannel('queueStats')),
memUsage: 0,
chartCpuMem: null,
chartNet: null,
@@ -150,7 +151,7 @@ export default defineComponent({
os.api('admin/server-info', {}).then(res => {
this.serverInfo = res;
- this.connection = markRaw(os.stream.useChannel('serverStats'));
+ this.connection = markRaw(stream.useChannel('serverStats'));
this.connection.on('stats', this.onStats);
this.connection.on('statsLog', this.onStatsLog);
this.connection.send('requestLog', {
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index da5fc0ba6d892cc4aaf46638d280846002fcb2e1..59a4281599099a00ccc3e68816974cdb56875088 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -81,6 +81,7 @@ import number from '@/filters/number';
import MkInstanceInfo from './instance.vue';
import XMetrics from './metrics.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as symbols from '@/symbols';
export default defineComponent({
@@ -113,7 +114,7 @@ export default defineComponent({
notesComparedToThePrevDay: null,
fetchJobs: () => os.api('admin/queue/deliver-delayed', {}),
fetchModLogs: () => os.api('admin/show-moderation-logs', {}),
- queueStatsConnection: markRaw(os.stream.useChannel('queueStats')),
+ queueStatsConnection: markRaw(stream.useChannel('queueStats')),
}
},
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue
index 37a87089cbd9fe52f3f1e9a1e65a65df552183d5..49f3c63e822f70dd753fc5ae129bbe9c4af33c57 100644
--- a/packages/client/src/pages/admin/queue.vue
+++ b/packages/client/src/pages/admin/queue.vue
@@ -17,6 +17,7 @@ import XQueue from './queue.chart.vue';
import FormBase from '@/components/debobigego/base.vue';
import FormButton from '@/components/debobigego/button.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as symbols from '@/symbols';
export default defineComponent({
@@ -36,7 +37,7 @@ export default defineComponent({
icon: 'fas fa-clipboard-list',
bg: 'var(--bg)',
},
- connection: markRaw(os.stream.useChannel('queueStats')),
+ connection: markRaw(stream.useChannel('queueStats')),
}
},
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 01f9d4518fd7c311e2a17e16bfe1d0b05c823b46..554ebc4b6b1f3d2c663e09a81670a8027b64aa72 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -44,6 +44,7 @@ import * as Acct from 'misskey-js/built/acct';
import MkButton from '@/components/ui/button.vue';
import { acct } from '@/filters/user';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as symbols from '@/symbols';
export default defineComponent({
@@ -66,7 +67,7 @@ export default defineComponent({
},
mounted() {
- this.connection = markRaw(os.stream.useChannel('messagingIndex'));
+ this.connection = markRaw(stream.useChannel('messagingIndex'));
this.connection.on('message', this.onMessage);
this.connection.on('read', this.onRead);
diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 8d92c430f1721c5404ee7c96f5df9d351149d502..f2a90fbfba197720913456e869eac66eb5d3eb8b 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -28,6 +28,7 @@ import * as autosize from 'autosize';
import { formatTimeString } from '@/scripts/format-time-string';
import { selectFile } from '@/scripts/select-file';
import * as os from '@/os';
+import { stream } from '@/stream';
import { Autocomplete } from '@/scripts/autocomplete';
import { throttle } from 'throttle-debounce';
@@ -48,7 +49,7 @@ export default defineComponent({
file: null,
sending: false,
typing: throttle(3000, () => {
- os.stream.send('typingOnMessaging', this.user ? { partner: this.user.id } : { group: this.group.id });
+ stream.send('typingOnMessaging', this.user ? { partner: this.user.id } : { group: this.group.id });
}),
};
},
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index ffc7f7bc0d2f304eaa6b1994d8ad5a975df17a02..1bcee01d29be2c6938db8f27e9d6dbe7fa1b6bce 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -43,6 +43,7 @@ import XForm from './messaging-room.form.vue';
import * as Acct from 'misskey-js/built/acct';
import { isBottom, onScrollBottom, scroll } from '@/scripts/scroll';
import * as os from '@/os';
+import { stream } from '@/stream';
import { popout } from '@/scripts/popout';
import * as sound from '@/scripts/sound';
import * as symbols from '@/symbols';
@@ -141,7 +142,7 @@ const Component = defineComponent({
this.group = group;
}
- this.connection = markRaw(os.stream.useChannel('messaging', {
+ this.connection = markRaw(stream.useChannel('messaging', {
otherparty: this.user ? this.user.id : undefined,
group: this.group ? this.group.id : undefined,
}));
diff --git a/packages/client/src/pages/reversi/game.vue b/packages/client/src/pages/reversi/game.vue
index b1ed6329049d1c5e25e0f4c4af9a085a6a003e1b..697d2898b9037d6a4e5e5b271c4ff25f6126754a 100644
--- a/packages/client/src/pages/reversi/game.vue
+++ b/packages/client/src/pages/reversi/game.vue
@@ -9,6 +9,7 @@ import { defineComponent, markRaw } from 'vue';
import GameSetting from './game.setting.vue';
import GameBoard from './game.board.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as symbols from '@/symbols';
export default defineComponent({
@@ -61,7 +62,7 @@ export default defineComponent({
if (this.connection) {
this.connection.dispose();
}
- this.connection = markRaw(os.stream.useChannel('gamesReversiGame', {
+ this.connection = markRaw(stream.useChannel('gamesReversiGame', {
gameId: this.game.id
}));
this.connection.on('started', this.onStarted);
diff --git a/packages/client/src/pages/reversi/index.vue b/packages/client/src/pages/reversi/index.vue
index 0b118531fc71b32ad1468ec05655895d215004bd..93c22c02f32524549b242283dbadf6cf60db1441 100644
--- a/packages/client/src/pages/reversi/index.vue
+++ b/packages/client/src/pages/reversi/index.vue
@@ -62,6 +62,7 @@
<script lang="ts">
import { defineComponent, markRaw } from 'vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import MkButton from '@/components/ui/button.vue';
import MkFolder from '@/components/ui/folder.vue';
import * as symbols from '@/symbols';
@@ -92,7 +93,7 @@ export default defineComponent({
mounted() {
if (this.$i) {
- this.connection = markRaw(os.stream.useChannel('gamesReversi'));
+ this.connection = markRaw(stream.useChannel('gamesReversi'));
this.connection.on('invited', this.onInvited);
diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts
index 396abc241836d9e2fd5b4cad49f5fa6aa145d41b..0611599a29e0b0374d415dfab2d88fdcb63dbb88 100644
--- a/packages/client/src/pizzax.ts
+++ b/packages/client/src/pizzax.ts
@@ -1,6 +1,7 @@
import { onUnmounted, Ref, ref, watch } from 'vue';
import { $i } from './account';
import { api } from './os';
+import { stream } from './stream';
type StateDef = Record<string, {
where: 'account' | 'device' | 'deviceAccount';
@@ -19,6 +20,8 @@ export class Storage<T extends StateDef> {
public readonly state: { [K in keyof T]: T[K]['default'] };
public readonly reactiveState: { [K in keyof T]: Ref<T[K]['default']> };
+ private connection = stream.useChannel('main');
+
constructor(key: string, def: T) {
this.key = key;
this.keyForLocalStorage = 'pizzax::' + key;
@@ -69,8 +72,19 @@ export class Storage<T extends StateDef> {
localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
});
}, 1);
+ // streamingã®user storage updateイベントを監視ã—ã¦æ›´æ–°
+ this.connection.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => {
+ if (scope[1] !== this.key || this.state[key] === value) return;
+
+ this.state[key] = value;
+ this.reactiveState[key].value = value;
- // TODO: streamingã®user storage updateイベントを監視ã—ã¦æ›´æ–°
+ const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}');
+ if (cache[key] !== value) {
+ cache[key] = value;
+ localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
+ }
+ });
}
}
diff --git a/packages/client/src/scripts/select-file.ts b/packages/client/src/scripts/select-file.ts
index 6019890444dedbc8e1d521360918f25561290fb8..6bb3f8bf8a7b8cddb00e17f099544a42c53fd8f4 100644
--- a/packages/client/src/scripts/select-file.ts
+++ b/packages/client/src/scripts/select-file.ts
@@ -1,4 +1,5 @@
import * as os from '@/os';
+import { stream } from '@/stream';
import { i18n } from '@/i18n';
import { defaultStore } from '@/store';
import { DriveFile } from 'misskey-js/built/entities';
@@ -48,7 +49,7 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
const marker = Math.random().toString(); // TODO: UUIDã¨ã‹ä½¿ã†
- const connection = os.stream.useChannel('main');
+ const connection = stream.useChannel('main');
connection.on('urlUploadFinished', data => {
if (data.marker === marker) {
res(multiple ? [data.file] : data.file);
diff --git a/packages/client/src/stream.ts b/packages/client/src/stream.ts
new file mode 100644
index 0000000000000000000000000000000000000000..10502444b63c1a76996e4162db3724bbd51e7bef
--- /dev/null
+++ b/packages/client/src/stream.ts
@@ -0,0 +1,6 @@
+import * as Misskey from 'misskey-js';
+import { markRaw } from 'vue';
+import { $i } from '@/account';
+import { url } from '@/config';
+
+export const stream = markRaw(new Misskey.Stream(url, $i));
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index 956ec556c12080dfc631e0c2484ae25e1b9d2d27..98069258d94cc7e6f9728b150582d598ffbf7713 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -15,9 +15,10 @@
<script lang="ts">
import { defineAsyncComponent, defineComponent } from 'vue';
-import { stream, popup, popups, uploads, pendingApiRequestsCount } from '@/os';
+import { popup, popups, uploads, pendingApiRequestsCount } from '@/os';
import * as sound from '@/scripts/sound';
import { $i } from '@/account';
+import { stream } from '@/stream';
export default defineComponent({
components: {
diff --git a/packages/client/src/ui/_common_/stream-indicator.vue b/packages/client/src/ui/_common_/stream-indicator.vue
index 3f86f945495fca966170d632a72c070b981cab62..c75c6d1c0aec2f72c680213495a116a86bd0ca49 100644
--- a/packages/client/src/ui/_common_/stream-indicator.vue
+++ b/packages/client/src/ui/_common_/stream-indicator.vue
@@ -11,6 +11,7 @@
<script lang="ts">
import { defineComponent } from 'vue';
import * as os from '@/os';
+import { stream } from '@/stream';
export default defineComponent({
data() {
@@ -20,14 +21,14 @@ export default defineComponent({
},
computed: {
stream() {
- return os.stream;
+ return stream;
},
},
created() {
- os.stream.on('_disconnected_', this.onDisconnected);
+ stream.on('_disconnected_', this.onDisconnected);
},
beforeUnmount() {
- os.stream.off('_disconnected_', this.onDisconnected);
+ stream.off('_disconnected_', this.onDisconnected);
},
methods: {
onDisconnected() {
diff --git a/packages/client/src/ui/chat/note.vue b/packages/client/src/ui/chat/note.vue
index 6927dd0eaf12dc2ef01b0928e7e1d2d0efd48484..fa5faa4ec3e7cc3f760c10c0b6b4f74b67c3f7e4 100644
--- a/packages/client/src/ui/chat/note.vue
+++ b/packages/client/src/ui/chat/note.vue
@@ -118,6 +118,7 @@ import copyToClipboard from '@/scripts/copy-to-clipboard';
import { checkWordMute } from '@/scripts/check-word-mute';
import { userPage } from '@/filters/user';
import * as os from '@/os';
+import { stream } from '@/stream';
import { noteActions, noteViewInterruptors } from '@/store';
import { reactionPicker } from '@/scripts/reaction-picker';
import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm';
@@ -243,7 +244,7 @@ export default defineComponent({
async created() {
if (this.$i) {
- this.connection = os.stream;
+ this.connection = stream;
}
this.collapsed = this.appearNote.cw == null && this.appearNote.text && (
diff --git a/packages/client/src/ui/chat/pages/channel.vue b/packages/client/src/ui/chat/pages/channel.vue
index 13c735cd47381b6e824aefd5fdd70b87b410f926..2755cc92b7bb7fcc77c9a478dbc48a4f680cbf63 100644
--- a/packages/client/src/ui/chat/pages/channel.vue
+++ b/packages/client/src/ui/chat/pages/channel.vue
@@ -26,6 +26,7 @@ import { computed, defineComponent, markRaw } from 'vue';
import * as Misskey from 'misskey-js';
import XNotes from '../notes.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as sound from '@/scripts/sound';
import { scrollToBottom, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
import follow from '@/directives/follow-append';
@@ -106,7 +107,7 @@ export default defineComponent({
sound.play(note.userId === this.$i.id ? 'noteMy' : 'note');
};
- this.connection = markRaw(os.stream.useChannel('channel', {
+ this.connection = markRaw(stream.useChannel('channel', {
channelId: this.channelId
}));
this.connection.on('note', prepend);
diff --git a/packages/client/src/ui/chat/pages/timeline.vue b/packages/client/src/ui/chat/pages/timeline.vue
index 07e847ad73431636d40f26a9fd9709be5b9424d6..f67d33339870cb2ea386c0de19d0aa958d41f03d 100644
--- a/packages/client/src/ui/chat/pages/timeline.vue
+++ b/packages/client/src/ui/chat/pages/timeline.vue
@@ -17,6 +17,7 @@
import { computed, defineComponent, markRaw } from 'vue';
import XNotes from '../notes.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
import * as sound from '@/scripts/sound';
import { scrollToBottom, getScrollPosition, getScrollContainer } from '@/scripts/scroll';
import follow from '@/directives/follow-append';
@@ -90,23 +91,23 @@ export default defineComponent({
if (this.src == 'home') {
endpoint = 'notes/timeline';
- this.connection = markRaw(os.stream.useChannel('homeTimeline'));
+ this.connection = markRaw(stream.useChannel('homeTimeline'));
this.connection.on('note', prepend);
- this.connection2 = markRaw(os.stream.useChannel('main'));
+ this.connection2 = markRaw(stream.useChannel('main'));
this.connection2.on('follow', onChangeFollowing);
this.connection2.on('unfollow', onChangeFollowing);
} else if (this.src == 'local') {
endpoint = 'notes/local-timeline';
- this.connection = markRaw(os.stream.useChannel('localTimeline'));
+ this.connection = markRaw(stream.useChannel('localTimeline'));
this.connection.on('note', prepend);
} else if (this.src == 'social') {
endpoint = 'notes/hybrid-timeline';
- this.connection = markRaw(os.stream.useChannel('hybridTimeline'));
+ this.connection = markRaw(stream.useChannel('hybridTimeline'));
this.connection.on('note', prepend);
} else if (this.src == 'global') {
endpoint = 'notes/global-timeline';
- this.connection = markRaw(os.stream.useChannel('globalTimeline'));
+ this.connection = markRaw(stream.useChannel('globalTimeline'));
this.connection.on('note', prepend);
}
diff --git a/packages/client/src/ui/chat/post-form.vue b/packages/client/src/ui/chat/post-form.vue
index 8c572e3b1cf5546000eb3c664ddc9337bdc71ea2..0f04096653fbac361b14d09aa5789e3aa12b1881 100644
--- a/packages/client/src/ui/chat/post-form.vue
+++ b/packages/client/src/ui/chat/post-form.vue
@@ -59,6 +59,7 @@ import * as Acct from 'misskey-js/built/acct';
import { formatTimeString } from '@/scripts/format-time-string';
import { Autocomplete } from '@/scripts/autocomplete';
import * as os from '@/os';
+import { stream } from '@/stream';
import { selectFiles } from '@/scripts/select-file';
import { notePostInterruptors, postFormActions } from '@/store';
import { throttle } from 'throttle-debounce';
@@ -130,7 +131,7 @@ export default defineComponent({
imeText: '',
typing: throttle(3000, () => {
if (this.channel) {
- os.stream.send('typingOnChannel', { channel: this.channel });
+ stream.send('typingOnChannel', { channel: this.channel });
}
}),
postFormActions,
diff --git a/packages/client/src/widgets/job-queue.vue b/packages/client/src/widgets/job-queue.vue
index ef440881e551737b3a325c9f4814d53ccda51401..1b7c71de67413126f5ac2e5933a05934309cf062 100644
--- a/packages/client/src/widgets/job-queue.vue
+++ b/packages/client/src/widgets/job-queue.vue
@@ -49,6 +49,7 @@
import { defineComponent, markRaw } from 'vue';
import define from './define';
import * as os from '@/os';
+import { stream } from '@/stream';
import number from '@/filters/number';
import * as sound from '@/scripts/sound';
@@ -70,7 +71,7 @@ export default defineComponent({
extends: widget,
data() {
return {
- connection: markRaw(os.stream.useChannel('queueStats')),
+ connection: markRaw(stream.useChannel('queueStats')),
inbox: {
activeSincePrevTick: 0,
active: 0,
diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue
index a91d4f6c49a80530066259e3c8cbc42ad03d5065..7a0b54027b7a6b0f0090b41b2e64c8b39a38dfe8 100644
--- a/packages/client/src/widgets/photos.vue
+++ b/packages/client/src/widgets/photos.vue
@@ -20,6 +20,7 @@ import MkContainer from '@/components/ui/container.vue';
import define from './define';
import { getStaticImageUrl } from '@/scripts/get-static-image-url';
import * as os from '@/os';
+import { stream } from '@/stream';
const widget = define({
name: 'photos',
@@ -48,7 +49,7 @@ export default defineComponent({
};
},
mounted() {
- this.connection = markRaw(os.stream.useChannel('main'));
+ this.connection = markRaw(stream.useChannel('main'));
this.connection.on('driveFileCreated', this.onDriveFileCreated);
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index 019e16fb33a80dcbd1c5d1a779eab91f5a2f1abc..107b750906a9bd3fddb198019378a22aee3a1ffa 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -23,6 +23,7 @@ import XCpu from './cpu.vue';
import XMemory from './mem.vue';
import XDisk from './disk.vue';
import * as os from '@/os';
+import { stream } from '@/stream';
const widget = define({
name: 'serverMetric',
@@ -63,7 +64,7 @@ export default defineComponent({
os.api('server-info', {}).then(res => {
this.meta = res;
});
- this.connection = markRaw(os.stream.useChannel('serverStats'));
+ this.connection = markRaw(stream.useChannel('serverStats'));
},
unmounted() {
this.connection.dispose();