Skip to content

Commit b968623

Browse files
committed
stream_base: introduce StreamBase
StreamBase is an improved way to write C++ streams. The class itself is for separting `StreamWrap` (with the methods like `.writeAsciiString`, `.writeBuffer`, `.writev`, etc) from the `HandleWrap` class, making possible to write abstract C++ streams that are not bound to any uv socket. The following methods are important part of the abstraction (which mimics libuv's stream API): * Events: * `OnAlloc(size_t size, uv_buf_t*)` * `OnRead(ssize_t nread, const uv_buf_t*, uv_handle_type pending)` * `OnAfterWrite(WriteWrap*)` * Wrappers: * `DoShutdown(ShutdownWrap*)` * `DoTryWrite(uv_buf_t** bufs, size_t* count)` * `DoWrite(WriteWrap*, uv_buf_t*, size_t count, uv_stream_t* handle)` * `Error()` * `ClearError()` The implementation should provide all of these methods, thus providing the access to the underlying resource (be it uv handle, TLS socket, or anything else). A C++ stream may consume the input of another stream by replacing the event callbacks and proxying the writes. This kind of API is actually used now for the TLSWrap implementation, making it possible to wrap TLS stream into another TLS stream. Thus legacy API calls are no longer required in `_tls_wrap.js`. PR-URL: #840 Reviewed-By: Trevor Norris <[email protected]> Reviewed-By: Chris Dickinson <[email protected]>
1 parent 97b4243 commit b968623

21 files changed

+1406
-1060
lines changed

lib/_tls_legacy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ function onCryptoStreamFinish() {
9292
// Generate close notify
9393
// NOTE: first call checks if client has sent us shutdown,
9494
// second call enqueues shutdown into the BIO.
95-
if (this.pair.ssl.shutdown() !== 1) {
95+
if (this.pair.ssl.shutdownSSL() !== 1) {
9696
if (this.pair.ssl && this.pair.ssl.error)
9797
return this.pair.error();
9898

99-
this.pair.ssl.shutdown();
99+
this.pair.ssl.shutdownSSL();
100100
}
101101

102102
if (this.pair.ssl && this.pair.ssl.error)

0 commit comments

Comments
 (0)