Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: /proxyをFileServerServiceに統合し、/proxyのurlで/filesが指定されていた場合は直接ファイルを解決するようにする #9709

Merged
merged 59 commits into from
Jan 26, 2023

Conversation

tamaina
Copy link
Member

@tamaina tamaina commented Jan 24, 2023

What

  • /proxyをFileServerServiceに統合する
  • /proxyと/filesのコードを共通化する

Why

Related to #9695

@tamaina
Copy link
Member Author

tamaina commented Jan 24, 2023

p1.a9z.devで動作中

@tamaina
Copy link
Member Author

tamaina commented Jan 25, 2023

コンフリクト解消が面倒になったのでclose

@tamaina tamaina closed this Jan 25, 2023
@tamaina tamaina reopened this Jan 25, 2023
@codecov
Copy link

codecov bot commented Jan 25, 2023

Codecov Report

Merging #9709 (f732530) into develop (452bd6d) will decrease coverage by 0.02%.
The diff coverage is 4.32%.

@@             Coverage Diff             @@
##           develop    #9709      +/-   ##
===========================================
- Coverage    22.54%   22.53%   -0.02%     
===========================================
  Files          736      735       -1     
  Lines        68817    68906      +89     
  Branches      2021     2022       +1     
===========================================
+ Hits         15514    15527      +13     
- Misses       53303    53379      +76     
Impacted Files Coverage Δ
packages/backend/src/server/FileServerService.ts 0.00% <0.00%> (ø)
packages/backend/src/server/ServerModule.ts 0.00% <ø> (ø)
packages/backend/src/server/ServerService.ts 0.00% <0.00%> (ø)
...ackages/backend/src/core/ImageProcessingService.ts 47.22% <45.16%> (-0.15%) ⬇️
packages/backend/src/logger.ts 59.01% <100.00%> (-1.32%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@tamaina
Copy link
Member Author

tamaina commented Jan 25, 2023

とりあえずpathベースにしてみた

(あとsharpのストリームはtoBufferをawaitせずにsharp.Sharpを吸い取るようにした)

@tamaina tamaina marked this pull request as draft January 25, 2023 14:35
@tamaina
Copy link
Member Author

tamaina commented Jan 25, 2023

(あとsharpのストリームはtoBufferをawaitせずにsharp.Sharpを吸い取るようにした)

streamを処理し切る前にcleanupしてしまうのでダメですね

@tamaina
Copy link
Member Author

tamaina commented Jan 25, 2023

ストリームエンドでcleanupするのもダメっぽくて結局toBufferを待つ実装に戻した

@tamaina tamaina marked this pull request as ready for review January 25, 2023 15:01
This reverts commit 636f919.
@tamaina
Copy link
Member Author

tamaina commented Jan 25, 2023

ストリームエンドでcleanupするのもダメっぽくて結局toBufferを待つ実装に戻した

これは偽だったのでストリーム返信に戻した

@syuilo syuilo merged commit 4735ae6 into develop Jan 26, 2023
@syuilo syuilo deleted the proxy-res-file branch January 26, 2023 07:06
@syuilo
Copy link
Member

syuilo commented Jan 26, 2023

🙏🏻

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages/backend Server side specific issue/PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants