improve some typescript errors

Author: anonrig

src/node/dns.ts

@@ -3,6 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
+import type nodejsDns from 'node:dns';
 import * as errorCodes from 'node-internal:internal_dns_constants';
 import * as dns from 'node-internal:internal_dns';
 import { callbackify } from 'node-internal:internal_utils';
@@ -23,16 +24,16 @@ export const resolveSoa = callbackify(dns.resolveSoa.bind(dns));
 export const resolveNaptr = callbackify(dns.resolveNaptr.bind(dns));
 export const resolve4 = callbackify(dns.resolve4.bind(dns));
 export const resolve6 = callbackify(dns.resolve6.bind(dns));
-export const getServers = callbackify(dns.getServers.bind(dns));
-export const setServers = callbackify(dns.setServers.bind(dns));
+export const getServers = dns.getServers.bind(dns);
+export const setServers = dns.setServers.bind(dns);
 export const getDefaultResultOrder = dns.getDefaultResultOrder.bind(dns);
 export const setDefaultResultOrder = dns.setDefaultResultOrder.bind(dns);
 export const lookup = dns.lookup.bind(dns);
 export const lookupService = callbackify(dns.lookupService.bind(this));
 export const resolve = callbackify(dns.resolve.bind(this));
 export const resolveAny = callbackify(dns.resolveAny.bind(this));
 
-export class Resolver {
+export class Resolver implements nodejsDns.Resolver {
   cancel(): void {
     // TODO(soon): Implement this.
     throw new Error('Not implemented');
@@ -43,58 +44,71 @@ export class Resolver {
     throw new Error('Not implemented');
   }
 
-  getServers(...args: Parameters<typeof getServers>): void {
-    getServers(...args);
+  getServers(...args: Parameters<typeof getServers>): string[] {
+    return getServers(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolve(...args: Parameters<typeof resolve>): void {
     resolve(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolve4(...args: Parameters<typeof resolve4>): void {
     resolve4(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolve6(...args: Parameters<typeof resolve6>): void {
     resolve6(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveAny(...args: Parameters<typeof resolveAny>): void {
     resolveAny(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveCaa(...args: Parameters<typeof resolveCaa>): void {
     resolveCaa(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveCname(...args: Parameters<typeof resolveCname>): void {
     resolveCname(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveMx(...args: Parameters<typeof resolveMx>): void {
     resolveMx(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveNaptr(...args: Parameters<typeof resolveNaptr>): void {
     resolveNaptr(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveNs(...args: Parameters<typeof resolveNs>): void {
     resolveNs(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolvePtr(...args: Parameters<typeof resolvePtr>): void {
     resolvePtr(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveSoa(...args: Parameters<typeof resolveSoa>): void {
     resolveSoa(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveSrv(...args: Parameters<typeof resolveSrv>): void {
     resolveSrv(...args);
   }
 
+  // @ts-expect-error TS2416 Type mismatch.
   resolveTxt(...args: Parameters<typeof resolveTxt>): void {
     resolveTxt(...args);
   }

src/node/internal/internal_dns.ts

@@ -3,6 +3,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 // Copyright Joyent and Node contributors. All rights reserved. MIT license.
 
+/* eslint-disable @typescript-eslint/no-deprecated */
 import {
   sendDnsRequest,
   validateAnswer,
@@ -37,6 +38,7 @@ import {
 } from 'node-internal:validators';
 import * as errorCodes from 'node-internal:internal_dns_constants';
 import { isIP } from 'node-internal:internal_net';
+import type dns from 'node:dns';
 
 type DnsOrder = 'verbatim' | 'ipv4first' | 'ipv6first';
 
@@ -49,19 +51,10 @@ export const validDnsOrders: DnsOrder[] = [
 
 let defaultDnsOrder: DnsOrder = 'verbatim';
 
-// eslint-disable-next-line @typescript-eslint/require-await
-export async function getServers(): Promise<string[]> {
+export function getServers(): ReturnType<(typeof dns)['getServers']> {
   return ['1.1.1.1', '2606:4700:4700::1111', '1.0.0.1', '2606:4700:4700::1001'];
 }
 
-export type LookupOptions = {
-  family?: number | string;
-  hints?: number;
-  all?: boolean;
-  order?: string;
-  verbatim?: boolean;
-};
-
 export type LookupCallback = (
   err: Error | null,
   address?: string | { address: string; family: number }[],
@@ -70,7 +63,7 @@ export type LookupCallback = (
 
 export function lookup(
   hostname: string,
-  options?: LookupOptions | LookupCallback,
+  options?: dns.LookupOptions | LookupCallback,
   callback?: LookupCallback
 ): void {
   let family: 0 | 4 | 6 = 0;
@@ -442,8 +435,7 @@ export function getDefaultResultOrder(): DnsOrder {
   return defaultDnsOrder;
 }
 
-// eslint-disable-next-line @typescript-eslint/require-await
-export async function setServers(): Promise<void> {
+export function setServers(): void {
   // This function does not apply to workerd model.
   // Our implementation always use Cloudflare DNS and does not
   // allow users to change the underlying DNS server.

src/node/internal/internal_dns_promises.ts

@@ -1,3 +1,15 @@
+// Copyright (c) 2017-2022 Cloudflare, Inc.
+// Licensed under the Apache 2.0 license found in the LICENSE file or at:
+//     https://opensource.org/licenses/Apache-2.0
+// Copyright Joyent and Node contributors. All rights reserved. MIT license.
+
+import type dns from 'node:dns/promises';
+import type {
+  LookupAddress,
+  LookupAllOptions,
+  LookupOneOptions,
+  LookupOptions,
+} from 'node:dns';
 import * as errorCodes from 'node-internal:internal_dns_constants';
 import {
   reverse,
@@ -20,7 +32,6 @@ import {
   lookupService,
   resolve,
   resolveAny,
-  type LookupOptions,
 } from 'node-internal:internal_dns';
 import {
   CAA,
@@ -54,41 +65,43 @@ export {
   resolveAny,
 } from 'node-internal:internal_dns';
 
-export class Resolver {
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async cancel(): Promise<void> {
+export class Resolver implements dns.Resolver {
+  cancel(): void {
     // TODO(soon): Implement this.
     throw new Error('Not implemented');
   }
 
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async setLocalAddress(): Promise<void> {
+  setLocalAddress(): void {
     // Does not apply to workerd implementation
     throw new Error('Not implemented');
   }
 
-  getServers(): Promise<string[]> {
+  getServers(): string[] {
     return getServers();
   }
 
+  // @ts-expect-error TS2769 No matching overload.
   resolve(name: string, rrtype: string): ReturnType<typeof resolve> {
     return resolve(name, rrtype);
   }
 
+  // @ts-expect-error TS2769 No matching overload.
   resolve4(
     input: string,
     options?: { ttl?: boolean }
   ): Promise<(string | TTLResponse)[]> {
     return resolve4(input, options);
   }
 
+  // @ts-expect-error TS2769 No matching overload.
   resolve6(
     input: string,
     options?: { ttl?: boolean }
   ): Promise<(string | TTLResponse)[]> {
     return resolve6(input, options);
   }
 
+  // @ts-expect-error TS2769 No matching overload.
   resolveAny(): Promise<void> {
     return resolveAny();
   }
@@ -133,16 +146,18 @@ export class Resolver {
     return reverse(name);
   }
 
-  setServers(): Promise<void> {
-    return setServers();
+  setServers(): void {
+    setServers();
   }
 }
 
 export function lookup(
   hostname: string,
-  options?: LookupOptions
-): Promise<unknown> {
-  const { promise, resolve, reject } = Promise.withResolvers();
+  options?: LookupOptions | LookupOneOptions | LookupAllOptions
+): Promise<LookupAddress | LookupAddress[]> {
+  const { promise, resolve, reject } = Promise.withResolvers<
+    LookupAddress | LookupAddress[]
+  >();
   internalLookup(hostname, options, (error, address, family) => {
     if (error) {
       reject(error);
@@ -152,7 +167,7 @@ export function lookup(
       resolve({
         address,
         family,
-      });
+      } as LookupAddress);
     }
   });
   return promise;

src/node/internal/internal_net.ts

@@ -650,12 +650,12 @@ Socket.prototype._final = function (
   );
 };
 
-// @ts-expect-error TS2322 No easy way to enable this.
 Socket.prototype.end = function (
   this: Socket,
-  data: string | Uint8Array,
-  encoding?: NodeJS.BufferEncoding,
-  cb?: () => void
+  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+  data?: string | Uint8Array | NodeJS.BufferEncoding | VoidFunction,
+  encoding?: NodeJS.BufferEncoding | VoidFunction,
+  cb?: VoidFunction
 ): Socket {
   // @ts-expect-error this fails after upgrading to @types/[email protected]
   Duplex.prototype.end.call(this, data, encoding, cb);
@@ -1404,7 +1404,7 @@ export function tryReadStart(socket: Socket): void {
 function writeAfterFIN(
   this: Socket,
   chunk: Uint8Array | string,
-  encoding?: NodeJS.BufferEncoding | null,
+  encoding?: NodeJS.BufferEncoding | null | ((err?: Error) => void),
   cb?: (err?: Error) => void
 ): boolean {
   if (!this.writableEnded) {
@@ -1431,7 +1431,6 @@ function writeAfterFIN(
 
 function onReadableStreamEnd(this: Socket): void {
   if (!this.allowHalfOpen) {
-    // @ts-expect-error TS2554 Required due to @types/node
     this.write = writeAfterFIN;
   }
 }

src/node/internal/streams_readable.d.ts

@@ -1,7 +1,10 @@
+// Copyright (c) 2017-2022 Cloudflare, Inc.
+// Licensed under the Apache 2.0 license found in the LICENSE file or at:
+//     https://opensource.org/licenses/Apache-2.0
+
 import { Readable as _Readable } from 'node:stream';
 
 export declare class Readable extends _Readable {
-  destroyed: boolean;
   _readableState?: {
     readingMore: boolean;
   };