refactor: publishHogeStreamとStreamのEventEmitterに型定義する #7769

tamaina · 2021-09-05T14:52:57Z

Resolve #7765

Required PR

(#7771, #7772 (merged)), #7789, #7792

What

型定義をがんばる

Redisから受け取る方(EventEmitter)の型定義
Redisにpublishする方(publish**Stream)の型定義
ついでに炙り出したバグの修正
- internal antennaUpdatedイベントがPromiseのままだったのをawait

Why

Streamまわりを開発するたびにどのようなデータが通信されているのか調べるのが面倒

tamaina · 2021-09-05T15:36:06Z

サーバー側のコードにmisskey.jsを使うのはやっぱ無理ある

src/server/api/stream/channels/main.ts

tamaina · 2021-09-05T16:14:48Z

packedNotificationSchemaは別のPRにするか

…翻訳を追加

tamaina · 2021-09-05T17:10:27Z

あ～、packedNotificationSchemaを書いたとしてもrefをよしなに解読してくれるわけではないので結局エラーは出るのか

src/server/api/stream/channels/antenna.ts

CHANGELOG.md

syuilo · 2021-10-02T10:12:41Z

これもうrewuiredなpr全部マージされたっぽい？

rinsuki · 2021-10-02T10:28:56Z

src/server/api/stream/index.ts

+	private onUserEvent(data: StreamMessages['user']['spec']) { // { type, body }と展開すると型も展開されてしまう
+		switch (data.type) {
 			case 'follow':
-				this.following.add(body.id);
+				this.following.add(data.body.id);
 				break;

 			case 'unfollow':
-				this.following.delete(body.id);
+				this.following.delete(data.body.id);
 				break;

 			case 'mute':
-				this.muting.add(body.id);
+				this.muting.add(data.body.id);
 				break;

 			case 'unmute':
-				this.muting.delete(body.id);
+				this.muting.delete(data.body.id);
 				break;

 			// TODO: block events

 			case 'followChannel':
-				this.followingChannels.add(body.id);
+				this.followingChannels.add(data.body.id);
 				break;

 			case 'unfollowChannel':
-				this.followingChannels.delete(body.id);
+				this.followingChannels.delete(data.body.id);
 				break;

 			case 'updateUserProfile':
-				this.userProfile = body;
+				this.userProfile = data.body;


複数行に渡るなら関数内部で const { type, body } = data しちゃってもいいのでは？と思ったり

残念なお知らせ: constで展開してもtypeとbodyの型が分離してしまうのは変わらない

ジェネリックで関数を定義しても分離してしまうのでswitch-caseのTypeScriptの仕様なんだと思う

fyi: microsoft/TypeScript#44730 (comment)

fyi: microsoft/TypeScript#46266

rinsuki · 2021-10-02T10:29:56Z

src/services/stream.ts

 		this.publish('broadcast', type, typeof value === 'undefined' ? null : value);
 	}

-	public publishMainStream = (userId: User['id'], type: string, value?: any): void => {
+	public publishMainStream = <K extends keyof MainStreamTypes>(userId: User['id'], type: K, value?: MainStreamTypes[K]): void => {


よくなった？

tamaina · 2021-10-03T05:53:37Z

これもうrewuiredなpr全部マージされたっぽい？

yes

syuilo

yosasou

syuilo · 2021-10-20T16:04:21Z

🆒

* clean up * ev => data * refactor * clean up * add type * antenna * channel * fix * add Packed type * add PackedRef * fix lint * add emoji schema * add reversiGame * add reversiMatching * remove signin schema (use Signin entity) * add schemas refs, fix Packed type * wip PackedHoge => Packed<'Hoge'> * add Packed type * note-reaction * user * user-group * user-list * note * app, messaging-message * notification * drive-file * drive-folder * following * muting * blocking * hashtag * page * app (with modifying schema) * import user? * channel * antenna * clip * gallery-post * emoji * Packed * reversi-matching * update stream.ts * #7769 (comment) * fix lint * clean up? * add app * fix * nanka iroiro * wip * wip * fix lint * fix loginId * fix * refactor * refactor * remove follow action * clean up * Revert "remove follow action" This reverts commit defbb41. * Revert "clean up" This reverts commit f94919c. * remove fetch specification * renoteの条件追加 * apiFetch => cli * bypass fetch? * fix * refactor: use path alias * temp: add submodule * remove submodule * enhane: unison-reloadに指定したパスに移動できるように * null * null * feat: ログインするアカウントのIDをクエリ文字列で指定する機能 * null * await? * rename * rename * Update read.ts * merge * get-note-summary * fix * swパッケージに * add missing packages * fix getNoteSummary * add webpack-cli * ✌️ * remove plugins * sw-inject分離したがテストしてない * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix * ✌️ * clean up config * typesを戻した * Update packages/client/src/components/notification.vue Co-authored-by: Acid Chicken (硫酸鶏) <[email protected]> * disconnect * oops * Failed to load the script unexpectedly回避 sw.jsとlib.tsを分離してみた * truncate notification * Update packages/client/src/ui/_common_/common.vue Co-authored-by: syuilo <[email protected]> * clean up * clean up * キャッシュ対策 * Truncate push notification message * クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正 * components/drive-file-thumbnail.vue * components/drive-select-dialog.vue * components/drive-window.vue * merge * fix * Service Workerのビルドにesbuildを使うようにする * return createEmptyNotification() * fix * i18n.ts * update * ✌️ * remove ts-loader * fix * fix * enhance: Service Workerを常に登録するように * pollEnded * URLをsw.jsに戻す * clean up Co-authored-by: Acid Chicken (硫酸鶏) <[email protected]> Co-authored-by: syuilo <[email protected]>

* update stream.ts * #7769 (comment) * fix lint * clean up? * add app * fix * nanka iroiro * wip * wip * fix lint * fix loginId * fix * refactor * refactor * remove follow action * clean up * Revert "remove follow action" This reverts commit defbb41. * Revert "clean up" This reverts commit f94919c. * remove fetch specification * renoteの条件追加 * apiFetch => cli * bypass fetch? * fix * refactor: use path alias * temp: add submodule * remove submodule * enhane: unison-reloadに指定したパスに移動できるように * null * null * feat: ログインするアカウントのIDをクエリ文字列で指定する機能 * null * await? * rename * rename * Update read.ts * merge * get-note-summary * fix * swパッケージに * add missing packages * fix getNoteSummary * add webpack-cli * ✌️ * remove plugins * sw-inject分離したがテストしてない * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix * ✌️ * clean up config * typesを戻した * Update packages/client/src/components/notification.vue Co-authored-by: Acid Chicken (硫酸鶏) <[email protected]> * disconnect * oops * Failed to load the script unexpectedly回避 sw.jsとlib.tsを分離してみた * truncate notification * Update packages/client/src/ui/_common_/common.vue Co-authored-by: syuilo <[email protected]> * clean up * clean up * キャッシュ対策 * Truncate push notification message * クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正 * components/drive-file-thumbnail.vue * components/drive-select-dialog.vue * components/drive-window.vue * merge * fix * Service Workerのビルドにesbuildを使うようにする * return createEmptyNotification() * fix * i18n.ts * update * ✌️ * remove ts-loader * fix * fix * enhance: Service Workerを常に登録するように * pollEnded * URLをsw.jsに戻す * clean up * wip * wip * wip * wip * wip * wip * ✌️ * use import * fix * install rollup * use defineAsyncComponent. * fix emojilist * wip use defineAsyncComponent * popup(import -> popup(defineAsyncComponent(() => import * draggable? * fix init import * clean up * fix router * add comment * ✌️ * ✌️ * ✌️ * remove webpack * update vite * fix boot sequence * Revert "fix boot sequence" This reverts commit e893dbf. * revert boot import * never make two app div * ; * remove console.log * change clientEntry sequence * fix * Revert "fix" This reverts commit 12741b3. * fix * add comment #8575 (comment) * add log * add comment Co-authored-by: Acid Chicken (硫酸鶏) <[email protected]> Co-authored-by: syuilo <[email protected]>

wip

987c98f

tamaina self-assigned this Sep 5, 2021

tamaina marked this pull request as draft September 5, 2021 14:53

tamaina changed the title ~~wip: refactor: publish**StreamとStreamのEventEmitterに型定義する~~ refactor: publish**StreamとStreamのEventEmitterに型定義する Sep 5, 2021

tamaina added 3 commits September 5, 2021 23:55

wip

225805d

wip

f74f4ff

✌️

08576c4

add main stream

06c0373

tamaina commented Sep 5, 2021

View reviewed changes

src/server/api/stream/channels/main.ts Outdated Show resolved Hide resolved

tamaina added 2 commits September 6, 2021 01:23

packedNotificationSchemaを更新

ba1c57c

read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに…

9a089e5

…翻訳を追加

tamaina mentioned this pull request Sep 5, 2021

chore: APIドキュメントの修正 #7771

Merged

tamaina added 5 commits September 6, 2021 01:35

fix

3bde3e5

Merge branch 'chore-api-R30906' into stream-types

e9b9afb

ok

110de16

add header, choice, invitation

47e0e32

add header, choice, invitation

75015c7

tamaina added 2 commits September 6, 2021 02:33

test

ee03cd6

Merge branch 'expand-schema' into stream-types

07a9744

tamaina mentioned this pull request Sep 5, 2021

refactor: Expand schema #7772

Merged

tamaina added 7 commits September 6, 2021 02:49

fix

7ab9700

fix

d200424

yatta

c86ac1c

remove no longer needed "as PackedUser/PackedNote"

93fd76f

clean up

f89a326

add simple-schema

abbeb9a

fix lint

02dbdc5

tamaina added 5 commits September 17, 2021 23:04

Merge branch 'develop' into packed-type

d3e4843

add changelog

04c5cc1

Merge branch 'packed-type' into stream-types

9a8bfc6

Merge branch 'infer-pack-type' into stream-types

357d884

add changelog

8e5386e

tamaina mentioned this pull request Sep 17, 2021

feat: Improve Push Notification #7667

Merged

9 tasks

syuilo reviewed Sep 18, 2021

View reviewed changes

src/server/api/stream/channels/antenna.ts Show resolved Hide resolved

syuilo reviewed Sep 18, 2021

View reviewed changes

src/server/api/stream/channels/antenna.ts Outdated Show resolved Hide resolved

syuilo reviewed Sep 18, 2021

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

tamaina added 9 commits September 18, 2021 14:22

fix: アンテナが既読にならないのを修正

6fa583d

revert fix

1236600

Merge branch 'read-antenna-fix' into stream-types

2dd3a89

Merge branch 'develop' into packed-type

ea097e2

Merge branch 'develop' into packed-type

d924137

Merge branch 'develop' into infer-pack-type

8dc6007

Merge branch 'infer-pack-type' into packed-type

0447558

Merge branch 'packed-type' into stream-types

a064ac4

Merge branch 'develop' into stream-types

fb4482c

rinsuki reviewed Oct 2, 2021

View reviewed changes

tamaina added 2 commits October 3, 2021 14:49

https://github.com/misskey-dev/misskey/pull/7769#discussion_r711474875

d3cfc45

Merge branch 'develop' into stream-types

d7f57cc

tamaina added 2 commits October 3, 2021 14:58

spec => payload

eb2e4d4

edit commetn

ee823eb

syuilo approved these changes Oct 5, 2021

View reviewed changes

syuilo merged commit 69b56f6 into misskey-dev:develop Oct 20, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: publishHogeStreamとStreamのEventEmitterに型定義する #7769

refactor: publishHogeStreamとStreamのEventEmitterに型定義する #7769

tamaina commented Sep 5, 2021 •

edited

Loading

tamaina commented Sep 5, 2021

tamaina commented Sep 5, 2021

tamaina commented Sep 5, 2021

syuilo commented Oct 2, 2021

rinsuki Oct 2, 2021

tamaina Oct 3, 2021 •

edited

Loading

acid-chicken Oct 3, 2021

acid-chicken Oct 12, 2021

rinsuki Oct 2, 2021

tamaina commented Oct 3, 2021

syuilo left a comment

syuilo commented Oct 20, 2021

refactor: publishHogeStreamとStreamのEventEmitterに型定義する #7769

refactor: publishHogeStreamとStreamのEventEmitterに型定義する #7769

Conversation

tamaina commented Sep 5, 2021 • edited Loading

Required PR

What

Why

tamaina commented Sep 5, 2021

tamaina commented Sep 5, 2021

tamaina commented Sep 5, 2021

syuilo commented Oct 2, 2021

rinsuki Oct 2, 2021

Choose a reason for hiding this comment

tamaina Oct 3, 2021 • edited Loading

Choose a reason for hiding this comment

acid-chicken Oct 3, 2021

Choose a reason for hiding this comment

acid-chicken Oct 12, 2021

Choose a reason for hiding this comment

rinsuki Oct 2, 2021

Choose a reason for hiding this comment

tamaina commented Oct 3, 2021

syuilo left a comment

Choose a reason for hiding this comment

syuilo commented Oct 20, 2021

tamaina commented Sep 5, 2021 •

edited

Loading

tamaina Oct 3, 2021 •

edited

Loading