separate streams implementations for maintenance

Author: anonrig

src/node/internal/internal_errors.ts

@@ -762,7 +762,7 @@ export class ConnResetException extends NodeError {
 
 export function aggregateTwoErrors(
   innerError: unknown,
-  outerError: Error | null
+  outerError: Error | null | undefined
 ): AggregateError {
   if (innerError && outerError && innerError !== outerError) {
     if ('errors' in outerError && Array.isArray(outerError.errors)) {

src/node/internal/internal_fs_streams.ts

@@ -40,7 +40,8 @@ import type {
 
 import type { FileHandle } from 'node-internal:internal_fs_promises';
 
-import { errorOrDestroy, eos } from 'node-internal:streams_util';
+import { errorOrDestroy } from 'node-internal:streams_destroy';
+import { eos } from 'node-internal:streams_end_of_stream';
 
 import {
   ERR_INVALID_ARG_VALUE,
@@ -541,7 +542,7 @@ function readImpl(this: ReadStream, n: number): void {
     }
 
     if (er) {
-      errorOrDestroy(this, er);
+      errorOrDestroy(this, er as Error);
       return;
     }
 

src/node/internal/internal_http_client.ts

@@ -29,7 +29,7 @@ import {
   validateNumber,
 } from 'node-internal:validators';
 import { getTimerDuration } from 'node-internal:internal_net';
-import { addAbortSignal } from 'node-internal:streams_util';
+import { addAbortSignal } from 'node-internal:streams_add_abort_signal';
 import { Writable } from 'node-internal:streams_writable';
 import type {
   ClientRequest as _ClientRequest,
@@ -79,7 +79,7 @@ export class ClientRequest extends OutgoingMessage implements _ClientRequest {
   agent: Agent | undefined;
 
   // Unused fields required to be Node.js compatible.
-  aborted: boolean = false;
+  override aborted: boolean = false;
   reusedSocket: boolean = false;
   maxHeadersCount: number = Infinity;
   connection: Socket | null = null;
@@ -168,6 +168,7 @@ export class ClientRequest extends OutgoingMessage implements _ClientRequest {
 
     const signal = options.signal;
     if (signal) {
+      // @ts-expect-error TS2379 Type incompatibility with exactOptionalPropertyTypes
       addAbortSignal(signal, this);
     }
     let method = options.method;

src/node/internal/internal_http_incoming.ts

@@ -3,9 +3,6 @@
 //     https://opensource.org/licenses/Apache-2.0
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
-// this.aborted attribute is set as deprecated in @types/node package.
-/* eslint-disable @typescript-eslint/no-deprecated */
-
 import { EventEmitter } from 'node-internal:events';
 import { Readable } from 'node-internal:streams_readable';
 import { isIPv4, Socket } from 'node-internal:internal_net';
@@ -43,7 +40,7 @@ export class IncomingMessage extends Readable implements _IncomingMessage {
   #socket: unknown;
   #stream: ReadableStream | null = null;
 
-  aborted = false;
+  override aborted = false;
   url: string = '';
   // @ts-expect-error TS2416 Type-inconsistencies
   method: string | null = null;

src/node/internal/internal_http_outgoing.ts

@@ -8,7 +8,7 @@
 
 import { validateString } from 'node-internal:validators';
 import { Writable } from 'node-internal:streams_writable';
-import { getDefaultHighWaterMark } from 'node-internal:streams_util';
+import { getDefaultHighWaterMark } from 'node-internal:streams_state';
 import type { DataWrittenEvent } from 'node-internal:internal_http_server';
 import {
   ERR_HTTP_HEADERS_SENT,
@@ -228,7 +228,7 @@ export class OutgoingMessage extends Writable implements _OutgoingMessage {
   maxRequestsOnConnectionReached = false;
 
   // These are attributes provided by the Node.js implementation.
-  _closed = false;
+  override _closed = false;
   _headerSent = false;
   _onPendingData: (delta: number) => void = () => {};
   _header: string | null = null;

src/node/internal/internal_http_server.ts

@@ -24,7 +24,7 @@ import {
   ERR_SERVER_ALREADY_LISTEN,
 } from 'node-internal:internal_errors';
 import { EventEmitter } from 'node-internal:events';
-import { getDefaultHighWaterMark } from 'node-internal:streams_util';
+import { getDefaultHighWaterMark } from 'node-internal:streams_state';
 import {
   kUniqueHeaders,
   OutgoingMessage,

src/node/internal/internal_net.ts

@@ -331,6 +331,7 @@ export function Socket(this: Socket, options?: SocketOptions): Socket {
   // Call Duplex constructor before setting up the abort signal
   // This ensures the stream methods are properly set up before
   // any abort handling that might call destroy()
+  // @ts-expect-error TS2379 Type incompatibility with exactOptionalPropertyTypes
   Duplex.call(this, options);
 
   if (options.handle) {

src/node/internal/internal_tls_wrap.ts

@@ -38,7 +38,7 @@ import type {
   TlsOptions,
   TLSSocket as TLSSocketType,
 } from 'node:tls';
-import type { Duplex } from 'node:stream';
+import type { Duplex } from 'node-internal:streams_duplex';
 import type { OnReadOpts, TcpSocketConnectOpts } from 'node:net';
 import {
   validateBuffer,
@@ -702,6 +702,7 @@ export function connect(...args: unknown[]): TLSSocket {
     );
   }
 
+  // @ts-expect-error TS2345 Type incompatibility between Node.js Duplex and internal Duplex
   const tlssock = new TLSSocket(options.socket, {
     allowHalfOpen: options.allowHalfOpen,
     pipe: !!options.path,
@@ -710,7 +711,6 @@ export function connect(...args: unknown[]): TLSSocket {
     highWaterMark: options.highWaterMark,
     secureContext: options.secureContext,
     checkServerIdentity: options.checkServerIdentity ?? checkServerIdentity,
-    // @ts-expect-error TS2412 Type inconsistencies between types/node
     onread: options.onread,
     signal: options.signal,
     lookup: options.lookup,

src/node/internal/internal_zlib_base.ts

@@ -22,7 +22,7 @@ import {
   NodeError,
 } from 'node-internal:internal_errors';
 import { Transform, type DuplexOptions } from 'node-internal:streams_transform';
-import { eos as finished } from 'node-internal:streams_util';
+import { eos as finished } from 'node-internal:streams_end_of_stream';
 import {
   isArrayBufferView,
   isAnyArrayBuffer,
@@ -439,6 +439,8 @@ export class ZlibBase extends Transform {
     this._maxOutputLength = maxOutputLength;
   }
 
+  // Note: This is intentionally a getter that shadows the property from Transform
+  // @ts-expect-error TS2611 Property/accessor mismatch with Transform._closed
   get _closed(): boolean {
     return this._handle == null;
   }

src/node/internal/public_process.ts

@@ -61,7 +61,7 @@ function chunkToBuffer(
 // For stdout, we emulate `nohup node foo.js`
 class SyncWriteStream extends Writable {
   fd: number;
-  readable: boolean;
+  override readable: boolean;
   _type = 'fs';
   _isStdio = true;
   constructor(fd: number) {