warpr 1.0.0 → 1.0.9

package/src/lib/services/streaming.service.ts

@@ -1,150 +1,150 @@
-import { Injectable } from '@angular/core';
-import { MessagingService } from './messaging.service';
-import { PeerConnectionCandidateMessage, PeerConnectionDescriptionMessage, WarprSignalingMessage, WarprSignalingMessageType } from '../data/signaling-messages';
-import { IMessagingClient } from '../networking/messaging-client';
-import { EncodedFrame, FrameType } from '../data/frames';
-import { EventOwner, EventPublisher } from '../infrastructure/events';
-import { MessageAssembler } from '../infrastructure/message-assembler';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class StreamingService {
-
-  private _peerConnection?: RTCPeerConnection;
-  private _reliableConnection?: RTCDataChannel;
-  private _lowLatencyConnection?: RTCDataChannel;
-  private _messageBuilder? : MessageAssembler;
-
-  private readonly _events = new EventOwner();
-  public readonly FrameReceived = new EventPublisher<StreamingService, EncodedFrame>(this._events);
-  public readonly Connected = new EventPublisher<StreamingService, any>(this._events);
-
-  private static _config: RTCConfiguration = {
-    iceServers: [
-      { urls: "stun:stun.l.google.com:19302" },
-      { urls: "stun:stun.relay.metered.ca:80" },
-      {
-        urls: "turn:global.relay.metered.ca:80",
-        username: "cb51ef701a61be3cdc89466f",
-        credential: "BBnGCvnTLaxhVbuf"
-      },
-      {
-        urls: "turn:global.relay.metered.ca:80?transport=tcp",
-        username: "cb51ef701a61be3cdc89466f",
-        credential: "BBnGCvnTLaxhVbuf"
-      },
-      {
-        urls: "turn:global.relay.metered.ca:443",
-        username: "cb51ef701a61be3cdc89466f",
-        credential: "BBnGCvnTLaxhVbuf"
-      },
-      {
-        urls: "turns:global.relay.metered.ca:443?transport=tcp",
-        username: "cb51ef701a61be3cdc89466f",
-        credential: "BBnGCvnTLaxhVbuf"
-      }
-    ]
-  };
-
-  constructor(
-    private _messagingService: MessagingService) {
-
-    _messagingService.MessageReceived.Subscribe((sender: IMessagingClient<WarprSignalingMessage>, message: WarprSignalingMessage) => this.OnMessageReceived(sender, message));
-
-    this.Reconnect();
-  }
-
-  private Reconnect() {
-    this._reliableConnection?.close();
-    this._lowLatencyConnection?.close();
-    this._peerConnection?.close();
-    this._messageBuilder = new MessageAssembler();
-
-    this._peerConnection = new RTCPeerConnection(StreamingService._config);
-    this._peerConnection.onicecandidate = (event) => this.OnIceCandidateAdded(event.candidate?.candidate);
-    this._peerConnection.ondatachannel = (event) => this.OnDataChannel(event);
-    this._peerConnection.onconnectionstatechange = (event) => this.OnConnectionStateChanged();
-  }
-  
-  public SendMessage(message: any) {
-    let json = JSON.stringify(message);
-    this._reliableConnection?.send(json);
-  }
-
-  private OnConnectionStateChanged() {
-    console.log("WebRTC: " + this._peerConnection?.connectionState);
-  }
-
-  private OnDataChannel(event: RTCDataChannelEvent) {
-    console.log(`WebRTC data channel ${event.channel.label} connected.`);
-
-    switch (event.channel.label) {
-      case "reliable":
-        this._reliableConnection = event.channel;
-        this._events.Raise(this.Connected, this, null);
-        break;
-      case "low_latency":
-        this._lowLatencyConnection = event.channel;
-        this._lowLatencyConnection.binaryType = "arraybuffer"
-        this._lowLatencyConnection.onmessage = (event) => this.OnLowLatencyMessage(event);
-        break;
-    }
-  }
-
-  private _lastRefreshTime = performance.now();
-  private _count = 0;
-
-  private OnLowLatencyMessage(event: MessageEvent<any>) {
-
-    let message = this._messageBuilder?.PushMessage(event.data as ArrayBuffer);
-    if (!message) return;
-
-    let now = performance.now();
-    let elapsed = now - this._lastRefreshTime;
-    this._count++;
-
-    if (elapsed > 1000) {
-      this._lastRefreshTime = now;
-
-      console.log(`Messages: ${this._count / elapsed * 1000} FPS`);
-      this._count = 0;
-    }
-
-    let frame = new EncodedFrame(message);
-    this._events.Raise(this.FrameReceived, this, frame);
-  }
-
-  private OnIceCandidateAdded(candidate?: string) {
-    if (candidate == null) return;
-
-    let message = new PeerConnectionCandidateMessage();
-    message.Candidate = candidate;
-    this._messagingService.SendMessage(message);
-  }
-
-  private async OnMessageReceived(sender: IMessagingClient<WarprSignalingMessage>, message: WarprSignalingMessage) {
-
-    if (!this._peerConnection) return;
-
-    switch (message.$type) {
-      case WarprSignalingMessageType.PairingCompleteMessage:
-        this.Reconnect();
-        break;
-      case WarprSignalingMessageType.PeerConnectionDescriptionMessage:
-        await this._peerConnection.setRemoteDescription({ type: "offer", sdp: message.Description });
-        let answer = await this._peerConnection.createAnswer();
-        await this._peerConnection.setLocalDescription(answer);
-
-        let answerMessage = new PeerConnectionDescriptionMessage();
-        answerMessage.Description = answer.sdp;
-        this._messagingService.SendMessage(answerMessage);
-
-        break;
-      case WarprSignalingMessageType.PeerConnectionCandidateMessage:
-        await this._peerConnection.addIceCandidate({ candidate: message.Candidate, sdpMid: "0" });
-        break;
-    }
-
-  }
-}
+import { Injectable } from '@angular/core';
+import { MessagingService } from './messaging.service';
+import { PeerConnectionCandidateMessage, PeerConnectionDescriptionMessage, WarprSignalingMessage, WarprSignalingMessageType } from '../data/signaling-messages';
+import { IMessagingClient } from '../networking/messaging-client';
+import { EncodedFrame, FrameType } from '../data/frames';
+import { EventOwner, EventPublisher } from '../infrastructure/events';
+import { MessageAssembler } from '../infrastructure/message-assembler';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class StreamingService {
+
+  private _peerConnection?: RTCPeerConnection;
+  private _reliableConnection?: RTCDataChannel;
+  private _lowLatencyConnection?: RTCDataChannel;
+  private _messageBuilder? : MessageAssembler;
+
+  private readonly _events = new EventOwner();
+  public readonly FrameReceived = new EventPublisher<StreamingService, EncodedFrame>(this._events);
+  public readonly Connected = new EventPublisher<StreamingService, any>(this._events);
+
+  private static _config: RTCConfiguration = {
+    iceServers: [
+      { urls: "stun:stun.l.google.com:19302" },
+      { urls: "stun:stun.relay.metered.ca:80" },
+      {
+        urls: "turn:global.relay.metered.ca:80",
+        username: "cb51ef701a61be3cdc89466f",
+        credential: "BBnGCvnTLaxhVbuf"
+      },
+      {
+        urls: "turn:global.relay.metered.ca:80?transport=tcp",
+        username: "cb51ef701a61be3cdc89466f",
+        credential: "BBnGCvnTLaxhVbuf"
+      },
+      {
+        urls: "turn:global.relay.metered.ca:443",
+        username: "cb51ef701a61be3cdc89466f",
+        credential: "BBnGCvnTLaxhVbuf"
+      },
+      {
+        urls: "turns:global.relay.metered.ca:443?transport=tcp",
+        username: "cb51ef701a61be3cdc89466f",
+        credential: "BBnGCvnTLaxhVbuf"
+      }
+    ]
+  };
+
+  constructor(
+    private _messagingService: MessagingService) {
+
+    _messagingService.MessageReceived.Subscribe((sender: IMessagingClient<WarprSignalingMessage>, message: WarprSignalingMessage) => this.OnMessageReceived(sender, message));
+
+    this.Reconnect();
+  }
+
+  private Reconnect() {
+    this._reliableConnection?.close();
+    this._lowLatencyConnection?.close();
+    this._peerConnection?.close();
+    this._messageBuilder = new MessageAssembler();
+
+    this._peerConnection = new RTCPeerConnection(StreamingService._config);
+    this._peerConnection.onicecandidate = (event) => this.OnIceCandidateAdded(event.candidate?.candidate);
+    this._peerConnection.ondatachannel = (event) => this.OnDataChannel(event);
+    this._peerConnection.onconnectionstatechange = (event) => this.OnConnectionStateChanged();
+  }
+  
+  public SendMessage(message: any) {
+    let json = JSON.stringify(message);
+    this._reliableConnection?.send(json);
+  }
+
+  private OnConnectionStateChanged() {
+    console.log("WebRTC: " + this._peerConnection?.connectionState);
+  }
+
+  private OnDataChannel(event: RTCDataChannelEvent) {
+    console.log(`WebRTC data channel ${event.channel.label} connected.`);
+
+    switch (event.channel.label) {
+      case "reliable":
+        this._reliableConnection = event.channel;
+        this._events.Raise(this.Connected, this, null);
+        break;
+      case "low_latency":
+        this._lowLatencyConnection = event.channel;
+        this._lowLatencyConnection.binaryType = "arraybuffer"
+        this._lowLatencyConnection.onmessage = (event) => this.OnLowLatencyMessage(event);
+        break;
+    }
+  }
+
+  private _lastRefreshTime = performance.now();
+  private _count = 0;
+
+  private OnLowLatencyMessage(event: MessageEvent<any>) {
+
+    let message = this._messageBuilder?.PushMessage(event.data as ArrayBuffer);
+    if (!message) return;
+
+    let now = performance.now();
+    let elapsed = now - this._lastRefreshTime;
+    this._count++;
+
+    if (elapsed > 1000) {
+      this._lastRefreshTime = now;
+
+      console.log(`Messages: ${this._count / elapsed * 1000} FPS`);
+      this._count = 0;
+    }
+
+    let frame = new EncodedFrame(message);
+    this._events.Raise(this.FrameReceived, this, frame);
+  }
+
+  private OnIceCandidateAdded(candidate?: string) {
+    if (candidate == null) return;
+
+    let message = new PeerConnectionCandidateMessage();
+    message.Candidate = candidate;
+    this._messagingService.SendMessage(message);
+  }
+
+  private async OnMessageReceived(sender: IMessagingClient<WarprSignalingMessage>, message: WarprSignalingMessage) {
+
+    if (!this._peerConnection) return;
+
+    switch (message.$type) {
+      case WarprSignalingMessageType.PairingCompleteMessage:
+        this.Reconnect();
+        break;
+      case WarprSignalingMessageType.PeerConnectionDescriptionMessage:
+        await this._peerConnection.setRemoteDescription({ type: "offer", sdp: message.Description });
+        let answer = await this._peerConnection.createAnswer();
+        await this._peerConnection.setLocalDescription(answer);
+
+        let answerMessage = new PeerConnectionDescriptionMessage();
+        answerMessage.Description = answer.sdp;
+        this._messagingService.SendMessage(answerMessage);
+
+        break;
+      case WarprSignalingMessageType.PeerConnectionCandidateMessage:
+        await this._peerConnection.addIceCandidate({ candidate: message.Candidate, sdpMid: "0" });
+        break;
+    }
+
+  }
+}

package/src/public-api.ts

@@ -1,15 +1,15 @@
-/*
- * Public API Surface of warpr-lib
- */
-
-export * from './lib/data/frames';
-export * from './lib/data/signaling-messages';
-export * from './lib/data/streaming-messages';
-export * from './lib/infrastructure/array-stream';
-export * from './lib/infrastructure/events';
-export * from './lib/infrastructure/message-assembler';
-export * from './lib/networking/messaging-client';
-export * from './lib/networking/web-socket-client';
-export * from './lib/services/messaging.service';
-export * from './lib/services/streaming.service';
-export * from './lib/components/stream-host/stream-host.component';
+/*
+ * Public API Surface of warpr-lib
+ */
+
+export * from './lib/data/frames';
+export * from './lib/data/signaling-messages';
+export * from './lib/data/streaming-messages';
+export * from './lib/infrastructure/array-stream';
+export * from './lib/infrastructure/events';
+export * from './lib/infrastructure/message-assembler';
+export * from './lib/networking/messaging-client';
+export * from './lib/networking/web-socket-client';
+export * from './lib/services/messaging.service';
+export * from './lib/services/streaming.service';
+export * from './lib/components/stream-host/stream-host.component';

package/tsconfig.lib.json

@@ -1,14 +1,14 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/lib",
-    "declaration": true,
-    "declarationMap": true,
-    "inlineSources": true,
-    "types": []
-  },
-  "exclude": [
-    "**/*.spec.ts"
-  ]
-}
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "declaration": true,
+    "declarationMap": true,
+    "inlineSources": true,
+    "types": []
+  },
+  "exclude": [
+    "**/*.spec.ts"
+  ]
+}

package/tsconfig.lib.prod.json

@@ -1,10 +1,10 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "./tsconfig.lib.json",
-  "compilerOptions": {
-    "declarationMap": false
-  },
-  "angularCompilerOptions": {
-    "compilationMode": "partial"
-  }
-}
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "compilationMode": "partial"
+  }
+}

package/tsconfig.spec.json

@@ -1,14 +1,14 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "types": [
+      "jasmine"
+    ]
+  },
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}