refactor: add additional typings

darrachequesne · darrachequesne · commit 2a05042e2c70 · 2020-10-15T12:04:42.000+02:00
diff --git a/lib/client.ts b/lib/client.ts
@@ -4,14 +4,15 @@ import { IncomingMessage } from "http";
 import { Server } from "./index";
 import { Socket } from "./socket";
 import { SocketId } from "socket.io-adapter";
+import { ParentNamespace } from "./parent-namespace";
 
 const debug = debugModule("socket.io:client");
 
 export class Client {
   public readonly conn;
 
   private readonly id: string;
-  private readonly server;
+  private readonly server: Server;
   private readonly encoder: Encoder;
   private readonly decoder: Decoder;
   private sockets: Map<SocketId, Socket> = new Map();
@@ -83,7 +84,7 @@ export class Client {
       return this.doConnect(name, auth);
     }
 
-    this.server._checkNamespace(name, auth, dynamicNsp => {
+    this.server._checkNamespace(name, auth, (dynamicNsp: ParentNamespace) => {
       if (dynamicNsp) {
         debug("dynamic namespace %s was created", dynamicNsp.name);
         this.doConnect(name, auth);
@@ -113,7 +114,7 @@ export class Client {
     }
     const nsp = this.server.of(name);
 
-    const socket = nsp.add(this, auth, () => {
+    const socket = nsp._add(this, auth, () => {
       this.sockets.set(socket.id, socket);
       this.nsps.set(nsp.name, socket);
     });
diff --git a/lib/index.ts b/lib/index.ts
@@ -170,12 +170,16 @@ export class Server extends EventEmitter {
       ) => void),
     ParentNamespace
   > = new Map();
-  private _adapter;
+  private _adapter: any;
   private _serveClient: boolean;
   private eio;
   private engine;
   private _path: string;
-  private _connectTimeout: number;
+
+  /**
+   * @private
+   */
+  _connectTimeout: number;
   private httpServer: http.Server;
 
   /**
@@ -211,7 +215,9 @@ export class Server extends EventEmitter {
    * @return {Server|Boolean} self when setting or value when getting
    * @public
    */
-  public serveClient(v?: boolean) {
+  public serveClient(v: boolean): Server;
+  public serveClient(): boolean;
+  public serveClient(v?: boolean): Server | boolean {
     if (!arguments.length) return this._serveClient;
     this._serveClient = v;
     const resolvePath = function(file) {
@@ -280,7 +286,9 @@ export class Server extends EventEmitter {
    * @return {Server|String} self when setting or value when getting
    * @public
    */
-  public path(v?: string) {
+  public path(v: string): Server;
+  public path(): string;
+  public path(v?: string): Server | string {
     if (!arguments.length) return this._path;
     this._path = v.replace(/\/$/, "");
     return this;
@@ -306,7 +314,9 @@ export class Server extends EventEmitter {
    * @return {Server|Adapter} self when setting or value when getting
    * @public
    */
-  public adapter(v) {
+  public adapter(): any;
+  public adapter(v: any);
+  public adapter(v?): Server | any {
     if (!arguments.length) return this._adapter;
     this._adapter = v;
     for (const nsp of this._nsps.values()) {
diff --git a/lib/namespace.ts b/lib/namespace.ts
@@ -15,7 +15,7 @@ export class Namespace extends EventEmitter {
   public adapter: Adapter;
 
   /** @private */
-  readonly server;
+  readonly server: Server;
 
   /** @private */
   _fns: Array<(socket: Socket, next: (err: Error) => void) => void> = [];
@@ -126,7 +126,7 @@ export class Namespace extends EventEmitter {
    * @return {Socket}
    * @private
    */
-  private add(client: Client, query, fn?: () => void): Socket {
+  _add(client: Client, query, fn?: () => void): Socket {
     debug("adding socket to nsp %s", this.name);
     const socket = new Socket(this, client, query);
     this.run(socket, err => {
