fix(typings): remove typings.d.ts which caused many problems

Author: kalitine

package.json

@@ -31,7 +31,7 @@
   ],
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.dist.json && rollup --config",
-    "postbuild": "cp src/misc/typings.d.ts dist/esm/misc && mkdir dist/esm/proto && cp src/proto/index.js src/proto/index.d.ts dist/esm/proto && uglifyjs -o dist/netflux.umd.min.js dist/netflux.umd.js",
+    "postbuild": "mkdir dist/esm/proto && cp src/proto/index.js src/proto/index.d.ts dist/esm/proto && uglifyjs -o dist/netflux.umd.min.js dist/netflux.umd.js",
     "pretest": "rollup -c test/util/rollup.config.js && pm2 --silent restart test/util/process.yml --only netflux-test-signaling && pm2 restart test/util/process.yml --only netflux-test-bot ",
     "test": "karma start",
     "posttest": "pm2 --silent delete test/util/process.yml",

src/Bot.ts

@@ -1,4 +1,5 @@
 import { WebGroupState } from './index.common.doc'
+import { NodeJSHttpServer, NodeJSHttpsServer } from './misc/env'
 import { IWebChannelOptions, WebChannel, webChannelDefaultOptions } from './WebChannel'
 import { wcs, WebGroup } from './WebChannelFacade'
 import { Route, WebSocketBuilder } from './WebSocketBuilder'

src/BotFacade.ts

@@ -1,4 +1,5 @@
 import { Bot as BotServer, IBotOptions as BotOptions } from './Bot'
+import { NodeJSHttpServer, NodeJSHttpsServer } from './misc/env'
 import { WebGroup } from './WebChannelFacade'
 
 let botServer: BotServer

src/Channel.ts

@@ -1,3 +1,4 @@
+import { RTCDataChannel } from './misc/env'
 import { isBrowser, log } from './misc/util'
 import { channel as proto, IMessage, Message } from './proto'
 import { UserMessage } from './service/UserMessage'

src/index.common.ts

@@ -1,5 +1,3 @@
-/// <reference path="./misc/typings.d.ts" />
-
 export { LogLevel, setLogLevel } from './misc/util'
 export { TopologyEnum as Topology } from './service/topology/Topology'
 export { SignalingState } from './Signaling'

src/misc/env.ts

@@ -1,8 +1,32 @@
+/* tslint:disable:interface-name */
+
+export interface RTCDataChannelEvent {
+  readonly channel: RTCDataChannel
+}
+
+export interface RTCDataChannel extends EventTarget {
+  label: string
+  reliable: boolean
+  readyState: string
+  bufferedAmount: number
+  binaryType: string
+  onopen: (event: Event) => void
+  onerror: (event: Event) => void
+  onclose: (event: Event) => void
+  onmessage: (event: Event) => void
+  close(): void
+  send(data: string | ArrayBuffer | Blob): void
+}
+
+// Types for NodeJS environment, just for visual understanding
+export type NodeJSHttpServer = any // NodeJS http.Server
+export type NodeJSHttpsServer = any // NodeJS https.Server
+
 export interface IEnvironment {
-  RTCPeerConnection: typeof RTCPeerConnection
-  RTCIceCandidate: typeof RTCIceCandidate
-  TextEncoder: typeof TextEncoder
-  TextDecoder: typeof TextDecoder
+  RTCPeerConnection: any
+  RTCIceCandidate: any
+  TextEncoder: any
+  TextDecoder: any
   WebSocket: typeof WebSocket
   crypto: Crypto
   cryptoNode: any

src/misc/typings.d.ts

@@ -2,7 +2,7 @@ import { Observable, Subject } from 'rxjs'
 
 import { Channel, ChannelType } from '../../Channel'
 import '../../misc/env'
-import { env } from '../../misc/env'
+import { env, RTCDataChannelEvent } from '../../misc/env'
 import { log } from '../../misc/util'
 import { dataChannelBuilder as proto } from '../../proto'
 import { WebChannel } from '../../WebChannel'
@@ -121,7 +121,7 @@ export class DataChannelBuilder extends Service<proto.IMessage, proto.Message> {
     } else {
       remote = this.createRemote(streamId, id)
     }
-    const dc = remote.pc.createDataChannel(this.wc.myId.toString())
+    const dc = (remote.pc as any).createDataChannel(this.wc.myId.toString())
     const offerInit = await remote.pc.createOffer()
     await remote.pc.setLocalDescription(offerInit)
 
@@ -148,8 +148,8 @@ export class DataChannelBuilder extends Service<proto.IMessage, proto.Message> {
     )
     if (passive) {
       log.webrtc(`create a new remote object with ${id} - PASSIVE`)
-
-      remote.pc.ondatachannel = ({ channel: dc }: RTCDataChannelEvent) => {
+      const pc = remote.pc as any
+      pc.ondatachannel = ({ channel: dc }: RTCDataChannelEvent) => {
         const peerId = Number.parseInt(dc.label, 10)
         let type: ChannelType
         if (streamId === this.wc.STREAM_ID) {

src/service/dataChannelBuilder/DataChannelBuilder.ts

@@ -1,6 +1,6 @@
 import { ReplaySubject } from 'rxjs'
 
-import { env } from '../../misc/env'
+import { env, RTCDataChannel } from '../../misc/env'
 import { log } from '../../misc/util'
 import { dataChannelBuilder as proto } from '../../proto'
 
@@ -88,7 +88,7 @@ export class Remote {
     log.webrtc('CLEAN')
     this.pc.oniceconnectionstatechange = () => {}
     this.pc.onicecandidate = () => {}
-    this.pc.ondatachannel = () => {}
+    ;(this.pc as any).ondatachannel = () => {}
     this._onError = () => {}
     this.candidates.complete()
     this.remotes.delete(this.id)
@@ -106,7 +106,7 @@ export class Remote {
     }
     this.pc.oniceconnectionstatechange = () => {}
     dc.onopen = () => {}
-    this.pc.ondatachannel = () => {}
+    ;(this.pc as any).ondatachannel = () => {}
     this._onError = () => {}
     clearTimeout(this.timer)
   }

src/service/dataChannelBuilder/Remote.ts

@@ -5,7 +5,7 @@
     "lib": ["es2017", "dom"],
     "moduleResolution": "node",
     "downlevelIteration": true,
-    "typeRoots": ["src/misc/typings"],
+    "types": [],
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": false,