Fixes errors references. Removes references to webrtc

This commit is contained in:
Kir Dergachev
2017-01-23 16:14:33 +03:00
parent 1c753b2c69
commit fc6a9729df
3 changed files with 51 additions and 56 deletions
+32 -36
View File
@@ -3,21 +3,23 @@
// Definitions by: Kir Dergachev <https://github.com/decyrus>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
/// <reference types="webrtc" />
declare interface SIP {
UA: {
new (configuration?: sipjs.ConfigurationParameters): sipjs.UA;
};
URI: {
new (scheme?: string, user?: string, host?: string, port?: number, parameters?: string[], headers?: string[]): sipjs.URI;
parse(uri: string): sipjs.URI;
};
NameAddrHeader: {
new (uri: string | sipjs.URI, displayName: string, parameters: Array<{ key: string, value: string }>): sipjs.NameAddrHeader;
parse(name_addr_header: string): sipjs.NameAddrHeader;
};
}
export = SIP;
declare namespace SIP {
class URI {
constructor(
scheme?: string,
user?: string,
host?: string,
port?: number,
parameters?: string[],
headers?: string[]);
declare namespace sipjs {
interface URI {
scheme?: string;
user?: string;
host?: string;
@@ -35,8 +37,6 @@ declare namespace SIP {
clearHeaders(): void;
clone(): URI;
toString(): string;
static parse(uri: string): URI;
}
namespace UA.EventArgs {
@@ -45,8 +45,7 @@ declare namespace SIP {
interface RegistrationFailedArgs extends UnregisteredArgs { }
}
class UA {
constructor(configuration?: ConfigurationParameters);
interface UA {
start(): void;
stop(): void;
register(options?: ExtraHeadersOptions): UA;
@@ -59,7 +58,7 @@ declare namespace SIP {
request(method: string, target: string | URI, options?: RequestOptions): ClientContext;
on(name: 'connected', callback: (args: UA.EventArgs.ConnectedArgs) => void): void;
on(name: 'disconnected' | 'registered', callback: () => void): void;
on(name: 'disconnected' | 'registered' | string, callback: () => void): void;
on(name: 'unregistered', callback: (args: UA.EventArgs.UnregisteredArgs) => void): void;
on(name: 'registrationFailed', callback: (args: UA.EventArgs.RegistrationFailedArgs) => void): void;
on(name: 'invite', callback: (session: Session) => void): void;
@@ -81,7 +80,7 @@ declare namespace SIP {
}
}
class Session {
interface Session {
startTime?: Date;
endTime?: Date;
ua?: UA;
@@ -95,8 +94,8 @@ declare namespace SIP {
dtmf(tone: string | number, options?: Session.DtmfOptions): Session;
terminate(options?: Session.CommonOptions): Session;
bye(options?: Session.CommonOptions): Session;
getLocalStreams(): MediaStream[];
getRemoteStreams(): MediaStream[];
getLocalStreams(): any[];
getRemoteStreams(): any[];
refer(target: string | Session, options?: ExtraHeadersOptions): Session;
mute(options?: ExtraHeadersOptions): void;
unmute(options?: ExtraHeadersOptions): void;
@@ -111,7 +110,7 @@ declare namespace SIP {
on(name: 'accepted', callback: (data: { code: number, response: IncomingResponse }) => void): void;
on(name: 'failed' | 'rejected', callback: (response: IncomingResponse, cause: string) => void): void;
on(name: 'terminated', callback: (message: IncomingResponse, cause: string) => void): void;
on(name: 'cancel', callback: () => void): void;
on(name: 'cancel' | string, callback: () => void): void;
on(name: 'replaced', callback: (newSession: Session) => void): void;
on(name: 'dtmf', callback: (request: IncomingRequest, dtmf: Session.DTMF) => void): void;
on(name: 'muted' | 'unmuted', callback: (data: Session.Muted) => void): void;
@@ -136,7 +135,7 @@ declare namespace SIP {
}
interface AcceptOptions {
RTCConstraints?: RTCPeerConnection;
RTCConstraints?: any;
media?: MediaOptions;
}
@@ -169,21 +168,21 @@ declare namespace SIP {
interface Options {
stunServers?: string | string[];
turnServers?: TurnServer | TurnServer[];
RTCConstraints?: RTCPeerConnection;
RTCConstraints?: any;
}
type MediaHandlerFactory = (session: Session, options: Options) => MediaHandler;
class MediaHandler {
getLocalStreams(): MediaStream[];
getRemoteStreams(): MediaStream[];
getLocalStreams(): any[];
getRemoteStreams(): any[];
render(renderHint: RenderHint): void;
on(name: 'userMediaRequest', callback: (constraints: MediaConstraints) => void): void;
on(name: 'addStream' | 'userMedia', callback: (stream: MediaStream) => void): void;
on(name: 'addStream' | 'userMedia', callback: (stream: any) => void): void;
on(name: 'userMediaFailed', callback: (error: string) => void): void;
on(name: 'iceCandidate', callback: (candidate: RTCIceCandidate) => void): void;
on(name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' | 'iceConnectionDisconnected' | 'iceConnectionClosed', callback: () => void): void;
on(name: 'iceCandidate', callback: (candidate: any) => void): void;
on(name: 'iceGathering' | 'iceGatheringComplete' | 'iceConnection' | 'iceConnectionChecking' | 'iceConnectionConnected' | 'iceConnectionCompleted' | 'iceConnectionFailed' | 'iceConnectionDisconnected' | 'iceConnectionClosed' | string, callback: () => void): void;
on(name: 'dataChannel' | 'getDescription' | 'setDescription', callback: (sdpWrapper: { type: string, sdp: string }) => void): void;
}
}
@@ -247,7 +246,7 @@ declare namespace SIP {
interface MediaOptions {
constraints?: MediaConstraints;
stream?: MediaStream;
stream?: any;
render?: RenderHint;
}
@@ -256,7 +255,7 @@ declare namespace SIP {
anonymous?: boolean;
rel100?: string;
inviteWithoutSdp?: boolean;
RTCConstraints?: RTCPeerConnection;
RTCConstraints?: any;
}
interface RequestOptions extends ExtraHeadersOptions {
@@ -290,6 +289,7 @@ declare namespace SIP {
data: {};
on(name: 'progress' | 'accepted' | 'rejected' | 'failed', callback: (response: IncomingMessage, cause: string) => void): void;
on(name: 'notify', callback: (request: IncomingRequest) => void): void;
on(name: string, callback: () => void): void;
}
interface ClientContext extends Context {
@@ -320,9 +320,7 @@ declare namespace SIP {
}
/* Header */
class NameAddrHeader {
constructor(uri: string | URI, displayName: string, parameters: Array<{ key: string, value: string }>);
interface NameAddrHeader {
uri: string | URI;
displayName: string;
@@ -330,7 +328,5 @@ declare namespace SIP {
getParam(key: string): string;
deleteParam(key: string): string;
clearParams(): void;
static parse(name_addr_header: string): NameAddrHeader;
}
}
+18 -18
View File
@@ -1,11 +1,11 @@
import SIP = require("./index");
declare var sip: SIP;
let ua: SIP.UA = new SIP.UA();
let ua: sipjs.UA = new sip.UA();
const mediaHandler = (session: SIP.Session, options: SIP.WebRTC.Options) => new SIP.WebRTC.MediaHandler();
const mediaHandler = (session: sipjs.Session, options: sipjs.WebRTC.Options) => new sipjs.WebRTC.MediaHandler();
const logConnector = (level: string, category: string, label: string, content: string) => null;
const uaWithConfig: SIP.UA = new SIP.UA({
const uaWithConfig: sipjs.UA = new sip.UA({
uri: "wss://uri",
wsServers: ["s1", "s2"],
allowLegacyNotifications: true,
@@ -38,7 +38,7 @@ const uaWithConfig: SIP.UA = new SIP.UA({
stunServers: ["", ""],
turnServers: [
{
password: "",
password: "",
username: "",
urls: ["", ""]
}
@@ -61,15 +61,15 @@ ua.unregister({ extraHeaders: [""], all: true });
const isConnected: boolean = ua.isConnected();
const isRegistered: boolean = ua.isRegistered();
const message: SIP.Message = ua.message("", "", { contentType: "" });
const message: sipjs.Message = ua.message("", "", { contentType: "" });
ua.subscribe("", "", { expires: 1, extraHeaders: [""]});
const subscription: SIP.Subscription = ua.subscribe(new SIP.URI(), "", { expires: 1, extraHeaders: [""]});
ua.subscribe("", "", { expires: 1, extraHeaders: [""] });
const subscription: sipjs.Subscription = ua.subscribe(new sip.URI(), "", { expires: 1, extraHeaders: [""] });
let session = ua.invite("", new HTMLVideoElement());
const inviteOptions: SIP.InviteOptions = {
media: {
const inviteOptions: sipjs.InviteOptions = {
media: {
constraints: { audio: true, video: false },
stream: new MediaStream(),
render: { remote: new Element(), local: new Element() },
@@ -77,17 +77,17 @@ const inviteOptions: SIP.InviteOptions = {
anonymous: true,
rel100: "",
inviteWithoutSdp: true,
RTCConstraints: new RTCPeerConnection()
RTCConstraints: {}
}
session = ua.invite("", inviteOptions);
ua.on('connected', (args: SIP.UA.EventArgs.ConnectedArgs) => {});
ua.on('disconnected', () => {});
ua.on('registered', () => {});
ua.on('unregistered', (args: SIP.UA.EventArgs.UnregisteredArgs) => {});
ua.on('registrationFailed', (args: SIP.UA.EventArgs.RegistrationFailedArgs) => {});
ua.on('invite', (session: SIP.Session) => {
ua.on('connected', (args: sipjs.UA.EventArgs.ConnectedArgs) => { });
ua.on('disconnected', () => { });
ua.on('registered', () => { });
ua.on('unregistered', (args: sipjs.UA.EventArgs.UnregisteredArgs) => { });
ua.on('registrationFailed', (args: sipjs.UA.EventArgs.RegistrationFailedArgs) => { });
ua.on('invite', (session: sipjs.Session) => {
session.on('progress', (response) => {
});
session.on('accepted', (response) => {
@@ -96,4 +96,4 @@ ua.on('invite', (session: SIP.Session) => {
});
});
ua.on('message', (message: SIP.Message) => {});
ua.on('message', (message: sipjs.Message) => { });
+1 -2
View File
@@ -1,7 +1,6 @@
{
"extends": "../tslint.json",
"rules": {
"no-empty-interface": false,
"export-just-namespace": false
"no-empty-interface": false
}
}