warpr 1.0.21 → 1.0.22

package/src/lib/services/messaging.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { MessagingService } from './messaging.service';
-
-describe('MessagingService', () => {
-  let service: MessagingService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(MessagingService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

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

@@ -1,32 +0,0 @@
-import { Injectable } from '@angular/core';
-import { WebSocketClient } from '../networking/web-socket-client';
-import { WarprSignalingMessage, ConnectionRequest } from '../data/signaling-messages';
-import { v4 as uuid } from 'uuid';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class MessagingService extends WebSocketClient<WarprSignalingMessage> {
-
-  private static readonly _connectionUri = 'api/sinks/connect';
-  private readonly _sessionId = uuid();
-
-  constructor() {
-    const uri = MessagingService.GetServerUri();
-    super(uri);
-  }
-
-  private static GetServerUri(): string {
-    const location = window.location;
-    const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
-    return `${protocol}://${location.host}/${this._connectionUri}`;
-  }
-
-  protected override OnConnected(): void {
-    super.OnConnected();
-
-    let request = new ConnectionRequest();
-    request.SessionId = this._sessionId;
-    this.SendMessage(request);
-  }
-}

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

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { StreamingService } from './streaming.service';
-
-describe('StreamingService', () => {
-  let service: StreamingService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(StreamingService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

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

@@ -1,145 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MessagingService } from './messaging.service';
-import { GetConfiguration, PairingCompleteMessage, PeerConnectionCandidateMessage, PeerConnectionDescriptionMessage, WarprSignalingMessage, WarprSignalingMessageType } from '../data/signaling-messages';
-import { IMessagingClient } from '../networking/messaging-client';
-import { EncodedFrame } 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 _controlConnection?: RTCDataChannel;
-
-  private _streamConnection?: RTCDataChannel;
-  private _messageBuilder?: MessageAssembler;
-
-  private _auxConnection?: RTCDataChannel;
-
-  private readonly _events = new EventOwner();
-  public readonly FrameReceived = new EventPublisher<StreamingService, EncodedFrame>(this._events);
-  public readonly Connected = new EventPublisher<StreamingService, any>(this._events);
-
-  public readonly ControlMessageReceived = new EventPublisher<StreamingService, any>(this._events);
-  public readonly AuxMessageReceived = new EventPublisher<StreamingService, any>(this._events);
-
-  constructor(
-    private _messagingService: MessagingService) {
-
-    _messagingService.MessageReceived.Subscribe((sender: IMessagingClient<WarprSignalingMessage>, message: WarprSignalingMessage) => this.OnSignalingMessageReceived(sender, message));
-    _messagingService.Connect();
-  }
-
-  private Reconnect(configuration: RTCConfiguration) {
-    console.log("Establishing peer connection...");
-
-    this._controlConnection?.close();
-    this._streamConnection?.close();
-    this._messageBuilder = new MessageAssembler();
-    this._auxConnection?.close();
-    this._peerConnection?.close();
-
-    this._peerConnection = new RTCPeerConnection(configuration);
-    this._peerConnection.onicecandidate = (event) => this.OnIceCandidateAdded(event.candidate?.candidate);
-    this._peerConnection.ondatachannel = (event) => this.OnDataChannel(event);
-    this._peerConnection.onconnectionstatechange = (event) => this.OnConnectionStateChanged();
-  }
-
-  public SendControlMessage(message: any) {
-    let json = JSON.stringify(message);
-    this._controlConnection?.send(json);
-  }
-
-  public SendAuxMessage(message: any) {
-    this._auxConnection?.send(message);
-  }
-
-  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 "control":
-        this._controlConnection = event.channel;
-        this._controlConnection.binaryType = "arraybuffer"
-        this._controlConnection.onmessage = (event) => this._events.Raise(this.ControlMessageReceived, this, event.data);
-        this._events.Raise(this.Connected, this, null);
-        break;
-      case "stream":
-        this._streamConnection = event.channel;
-        this._streamConnection.binaryType = "arraybuffer"
-        this._streamConnection.onmessage = (event) => this.OnLowLatencyMessage(event);
-        break;
-      case "aux":
-        this._auxConnection = event.channel;
-        this._auxConnection.binaryType = "arraybuffer"
-        this._auxConnection.onmessage = (event) => this._events.Raise(this.AuxMessageReceived, this, event.data);
-        this._events.Raise(this.Connected, this, null);
-        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.debug(`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 OnSignalingMessageReceived(sender: IMessagingClient<WarprSignalingMessage>, message: WarprSignalingMessage) {
-
-    switch (message.$type) {
-      case WarprSignalingMessageType.PairingCompleteMessage:
-        this.Reconnect(GetConfiguration(message.IceServers));
-        break;
-      case WarprSignalingMessageType.PeerConnectionDescriptionMessage:
-        if (!this._peerConnection) return;
-
-        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:
-        if (!this._peerConnection) return;
-
-        await this._peerConnection.addIceCandidate({ candidate: message.Candidate, sdpMid: "0" });
-        break;
-    }
-
-  }
-}

package/tsconfig.lib.json

@@ -1,14 +0,0 @@
-/* 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 +0,0 @@
-/* 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 +0,0 @@
-/* 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"
-  ]
-}