Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

fix: Close stream after sink #23

Merged
merged 16 commits into from
Nov 16, 2022
Merged

fix: Close stream after sink #23

merged 16 commits into from
Nov 16, 2022

Conversation

MarcoPolo
Copy link
Contributor

Draft PR because I want to discuss this first before adding a proper error if you call sink twice and some tests.

I was surprised to learn that the stream muxers close the write side of the stream when they finish draining a sink. Is this behavior documented anywhere? The streaming-iterables.md gist doesn't mention this behavior. This also explains why I only noticed this bug on webtransport.

I think it is valid to want to pipe two sources into the same stream, but this behavior would prohibit you from doing that without making another generator that reads from the two streams.

I don't really want to change the existing muxers, so I will likely merge this. But I just want to understand what the reasoning is for this behavior and if makes something better. I think at the very least it's a bit surprising to users (it was to me).

cc @achingbrain for your js-libp2p expertise :)

@achingbrain achingbrain changed the title Close stream after sink fix: Close stream after sink Nov 1, 2022
@achingbrain
Copy link
Member

I think the primary motivation was to make it easy to reason about when streams are done, though a lot of the semantics were inherited from pull-streams which were used extensively before async iterators.

I think it is valid to want to pipe two sources into the same stream

I would mildly disagree at an API level as it's hard to know when there might be a third source or a forth source.

If you want to pipe multiple things it's trivial to use a module like it-merge if you don't care about ordering or create in inline generator that yields each source one after another if you do. If you don't know how many sources you have you can use it-pushable instead though there's still an open question around back pressure and that module.

It does sound like there may be some missing tests in the stream muxer compliance tests at the very least if this isn't documented anywhere.

@MarcoPolo
Copy link
Contributor Author

It does sound like there may be some missing tests in the stream muxer compliance tests at the very least if this isn't documented anywhere.

I should add stream muxer compliance tests to this package. This isn't easy since we don't have a listener and we're a hybrid stream-muxer transport.

@achingbrain
Copy link
Member

I'm adding a node listener based on @fails-components/webtransport so this should become a lot easier in the very near future. Almost got a PR ready - it's passing about 1/3 of the transport compliance tests so far.

@MarcoPolo
Copy link
Contributor Author

I found this pattern: https://github.com/ChainSafe/it-handshake/blob/bdea8b194bee756eb68390c157b130e71d279656/src/index.ts#L26

I wonder if we do something similar in other places. This pattern assumes that the we will only ever call sink once. If this pattern is very common, it would make it harder to change to having the owner of stream close the stream (rather than the sink).

@MarcoPolo MarcoPolo force-pushed the marco/close-after-sink-ends branch from b58ee11 to 0370aa5 Compare November 2, 2022 16:53
@MarcoPolo MarcoPolo force-pushed the marco/close-after-sink-ends branch from 0370aa5 to ce4cbe1 Compare November 2, 2022 16:56
@MarcoPolo MarcoPolo marked this pull request as ready for review November 2, 2022 16:56
@MarcoPolo MarcoPolo requested a review from achingbrain November 2, 2022 16:56
src/index.ts Outdated Show resolved Hide resolved
src/index.ts Outdated Show resolved Hide resolved
src/index.ts Outdated Show resolved Hide resolved
src/index.ts Outdated Show resolved Hide resolved
@@ -73,7 +90,10 @@ async function webtransportBiDiStreamToStream (bidiStream: any, streamId: string
});

(async function () {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could lose the IIFE and just wrap the contents in a try/catch?

@@ -63,7 +74,13 @@ async function webtransportBiDiStreamToStream (bidiStream: any, streamId: string
let writerClosed = false
let readerClosed = false;
(async function () {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could lose the IIFE and just wrap the contents in a try/catch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so? await writer.closed will block until the writer is closed. We could get rid of the iife by doing something like:

writer.closed.catch(err => err).then(maybeErr => { ...

Do you think that's better?

src/index.ts Outdated Show resolved Hide resolved
test/browser.ts Outdated Show resolved Hide resolved
test/browser.ts Outdated Show resolved Hide resolved
Copy link
Member

@achingbrain achingbrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, some small nits to clear up.

Co-authored-by: Alex Potsides <[email protected]>
@MarcoPolo MarcoPolo requested a review from achingbrain November 2, 2022 22:56
@MarcoPolo
Copy link
Contributor Author

Merging this when CI passes. No blocking comments left, and it would be good to have webtransport implement the behavior other transports do here.

@MarcoPolo MarcoPolo merged commit a95720c into main Nov 16, 2022
@MarcoPolo MarcoPolo deleted the marco/close-after-sink-ends branch November 16, 2022 16:17
github-actions bot pushed a commit that referenced this pull request Nov 16, 2022
## [1.0.5](v1.0.4...v1.0.5) (2022-11-16)

### Bug Fixes

* Close stream after sink ([#23](#23)) ([a95720c](a95720c))
@github-actions
Copy link

🎉 This PR is included in version 1.0.5 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants