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.

Sign up for GitHub

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

Jump to bottom

http2: multiple cleanups and s/streamClosed/close #17328

Closed

jasnell wants to merge 7 commits into nodejs:master from jasnell:http2-refactor4

Member

jasnell commented Nov 26, 2017 •

edited

Loading

Includes multiple cleanups in core.js along with:

Use correct connect event for TLSSocket
Use 'close' event instead of streamClosed

/cc @nodejs/http2

Fixes: #15303

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
documentation is changed or added
commit message follows commit guidelines

Affected core subsystem(s)

http2

nodejs-github-bot added the lib / src label

Member Author

jasnell commented Nov 26, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/11731/

jasnell added the http2 label

addaleax reviewed

View reviewed changes

lib/internal/http2/core.js

    
                    socket.once('connect', setupFn);

                    const connectEvent =

                      socket instanceof tls.TLSSocket ? 'secureConnect' : 'connect';

                    socket.once(connectEvent, setupFn);

Member

addaleax Nov 26, 2017

Is it possible to add a test for this?

Member Author

jasnell Nov 26, 2017

There are already tests for it that have been flaky, this should fix those flaky tests. One of the existing ones could be modified to check that a secureConnect handler has been registered.

Member

addaleax Nov 26, 2017

@jasnell Can you point me to one? I volunteer to try and make it fail/pass consistently :)

Member Author

jasnell Nov 26, 2017

http2-create-client-secure-session is one, which should be fixed by this PR.
I've updated it to include the check for secureConnect

apapirovski approved these changes

View reviewed changes

Member

apapirovski left a comment

LGTM 👍

lib/internal/http2/compat.js Outdated

    
            @@ -250,7 +250,7 @@ class Http2ServerRequest extends Readable {
          
                  stream.on('close', onStreamClosedRequest);

Member

apapirovski Nov 26, 2017

Can you remove this and the associated function? They should not be necessary.

lib/internal/http2/compat.js Outdated

    
            @@ -383,7 +383,7 @@ class Http2ServerResponse extends Stream {
          
                  stream.on('close', onStreamClosedResponse);

Member

apapirovski Nov 26, 2017 •

edited

Loading

Same as above.

Can you remove this and the associated function? They should not be necessary.

lib/internal/http2/core.js Outdated

    
            @@ -959,13 +968,14 @@ class Http2Session extends EventEmitter {
          
                    this.on('shutdown', callback);

                  }

                  const fn = submitShutdown.bind(this, options);

Member

apapirovski Nov 26, 2017

Could this be a bit more descriptively named? (Similar to setupFn elsewhere in this code.)

Member Author

jasnell commented Nov 27, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/11739/

sebdeckers approved these changes

View reviewed changes

Contributor

sebdeckers left a comment

LGTM 👍 This event confused me many times. Thanks for clearing it up.

jasnell added 7 commits

November 27, 2017 10:35


          http2: use correct connect event for TLS Socket

516881e


          http2: general cleanups

a21f2c9


          http2: reduce code duplication in settings

48514ce


          http2: use 'close' event instead of 'streamClosed'

e7ad83d


          test: fixup test-http2-create-client-secure-session

72c5f1f

General improvements to test and verify that a secureConnect
handler is present


          http2: remove unnecessary event handlers

379f999


          http2: use more descriptive names

4b964e5

jasnell force-pushed the http2-refactor4 branch from 2e5bcdb to 4b964e5 Compare

November 27, 2017 19:43

Member Author

jasnell commented Nov 28, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/11782/

jasnell added a commit that referenced this pull request


          http2: use correct connect event for TLS Socket

f3686f2

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

jasnell added a commit that referenced this pull request


          http2: general cleanups

d4111d0

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

jasnell added a commit that referenced this pull request


          http2: reduce code duplication in settings

df33d8d

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

jasnell added a commit that referenced this pull request


          http2: use 'close' event instead of 'streamClosed'

1b99542

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

jasnell added a commit that referenced this pull request


          test: fixup test-http2-create-client-secure-session

5fe111a

General improvements to test and verify that a secureConnect
handler is present

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

jasnell added a commit that referenced this pull request


          http2: remove unnecessary event handlers

973b8e0

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

jasnell added a commit that referenced this pull request


          http2: use more descriptive names

093a870

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

Member Author

jasnell commented Nov 28, 2017

Landed in 0fb1e07...093a870

jasnell closed this

MylesBorins pushed a commit that referenced this pull request


          http2: use correct connect event for TLS Socket

d607718

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: use correct connect event for TLS Socket

c81e968

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

evanlucas pushed a commit that referenced this pull request


          http2: use correct connect event for TLS Socket

71cf21a

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

evanlucas mentioned this pull request

v9.2.1 release proposal #17531

Merged

MylesBorins pushed a commit that referenced this pull request


          http2: general cleanups

e5f92cd

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: reduce code duplication in settings

67abc1e

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          test: fixup test-http2-create-client-secure-session

047bac2

General improvements to test and verify that a secureConnect
handler is present

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: remove unnecessary event handlers

4994d57

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: use more descriptive names

658338e

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins mentioned this pull request

v9.3.0 proposal #17631

Merged

MylesBorins added dont-land-on-v6.x labels

MylesBorins pushed a commit that referenced this pull request


          http2: general cleanups

bdcbe81

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: reduce code duplication in settings

31cdbd6

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          test: fixup test-http2-create-client-secure-session

927a281

General improvements to test and verify that a secureConnect
handler is present

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: remove unnecessary event handlers

9fd0b32

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

MylesBorins pushed a commit that referenced this pull request


          http2: use more descriptive names

673e263

PR-URL: #17328
Fixes: #15303
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Sebastiaan Deckers <sebdeckers83@gmail.com>

This was referenced Dec 20, 2017

v8.9.4 proposal #17772

Closed

v8.9.4 proposal #17774

Merged

kjin mentioned this pull request

grpc-js-core: prevent callback before 'end' event and handle eos headers as trailers grpc/grpc-node#132

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

http2 lib / src