Merge pull request #3737 from kanreisa/master

Fix some incorrect types of socket.io.d.ts / node.d.ts.
This commit is contained in:
Masahiro Wakame
2015-03-05 21:50:46 +09:00
2 changed files with 14 additions and 9 deletions
+1 -1
View File
@@ -609,7 +609,7 @@ declare module "child_process" {
stderr: stream.Readable;
pid: number;
kill(signal?: string): void;
send(message: any, sendHandle: any): void;
send(message: any, sendHandle?: any): void;
disconnect(): void;
}
+13 -8
View File
@@ -37,19 +37,19 @@ declare module SocketIO {
emit(name: string, ...args: any[]): Socket;
use(fn: Function): Namespace;
on(event: 'connection', listener: (socket: Socket) => void): any;
on(event: 'connect', listener: (socket: Socket) => void): any;
on(event: string, listener: Function): any;
on(event: 'connection', listener: (socket: Socket) => void): Namespace;
on(event: 'connect', listener: (socket: Socket) => void): Namespace;
on(event: string, listener: Function): Namespace;
}
interface Namespace extends NodeJS.EventEmitter {
name: string;
connected: { [id: string]: Socket };
use(fn: Function): Namespace
use(fn: Function): Namespace;
on(event: 'connection', listener: (socket: Socket) => void): any;
on(event: 'connect', listener: (socket: Socket) => void): any;
on(event: string, listener: Function): any;
on(event: 'connection', listener: (socket: Socket) => void): Namespace;
on(event: 'connect', listener: (socket: Socket) => void): Namespace;
on(event: string, listener: Function): Namespace;
}
interface Socket {
@@ -63,8 +63,13 @@ declare module SocketIO {
leave(name: string, fn?: Function): Socket;
to(room: string): Socket;
in(room: string): Socket;
send(...args: any[]): Socket;
write(...args: any[]): Socket;
on(event: string, listener: Function): any;
on(event: string, listener: Function): Socket;
once(event: string, listener: Function): Socket;
removeListener(event: string, listener: Function): Socket;
removeAllListeners(event: string): Socket;
broadcast: Socket;
volatile: Socket;
connected: boolean;