feat(): getDisplayMedia support

triniwiz · triniwiz · commit 0f0e1ada99d6 · 2019-02-26T20:57:08.000-04:00
diff --git a/demo/app/standard/standard-vm.ts b/demo/app/standard/standard-vm.ts
@@ -140,6 +140,18 @@ export class StandardViewModel extends Observable {
         });
     }
 
+    public shareScreen(event) {
+        TNSRTCMediaDevices.getDisplayMedia(new TNSRTCMediaStreamConstraints(true, true))
+            .then(mediaStream => {
+                this.localStream = mediaStream;
+                this.localView.srcObject = mediaStream;
+                this.localView.mirror = false;
+            })
+            .catch(error => {
+                console.log(error);
+            });
+    }
+
     public switchCamera(event) {
         if (this.localStream) {
             for (let track of this.localStream.videoTracks) {
diff --git a/demo/app/standard/standard.ts b/demo/app/standard/standard.ts
@@ -40,3 +40,7 @@ export function endCall(event) {
 export function switchCamera(event) {
     vm.switchCamera(event.object);
 }
+
+export function shareScreen(event) {
+    vm.shareScreen(event.object);
+}
diff --git a/demo/app/standard/standard.xml b/demo/app/standard/standard.xml
@@ -2,11 +2,12 @@
       xmlns:ui="nativescript-webrtc-plugin">
     <GridLayout rows="*,*,*">
         <ui:WebRTCView loaded="videoLoaded" row="0" id="remoteVideoView"/>
-        <GridLayout verticalAlignment="center" horizontalAlignment="center" row="1" rows="auto,auto,auto" columns="auto,auto,auto">
+        <GridLayout verticalAlignment="center" horizontalAlignment="center" row="1" rows="auto,auto,auto,auto" columns="auto,auto,auto">
             <Button tap="makeCall" row="0" col="1" text="Call"/>
             <Button row="1" col="0" text="Switch" tap="switchCamera"/>
             <Button row="1" col="2" text="Mute"/>
             <Button row="2" col="1" text="End"/>
+            <Button row="3" col="2" text="ShareScreen" tap="shareScreen"/>
         </GridLayout>
         <ui:WebRTCView row="2" id="localVideoView" loaded="videoLoaded"/>
     </GridLayout>
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nativescript-webrtc-plugin",
-    "version": "2.0.0-alpha.12",
+    "version": "2.0.0-alpha.13",
     "description": "WebRTC for NativeScript",
     "main": "webrtc",
     "typings": "index.d.ts",
diff --git a/src/platforms/android/fancywebrtc-release.aar b/src/platforms/android/fancywebrtc-release.aar
diff --git a/src/src/android/TNSRTCMediaDevices.ts b/src/src/android/TNSRTCMediaDevices.ts
@@ -14,4 +14,16 @@ export class TNSRTCMediaDevices {
             }));
         });
     }
+
+    public static getDisplayMedia(constraints: TNSRTCMediaStreamConstraints): Promise<TNSRTCMediaStream> {
+        return new Promise((resolve, reject) => {
+            co.fitcom.fancywebrtc.FancyRTCMediaDevices.getDisplayMedia(app.android.foregroundActivity, constraints.instance, new co.fitcom.fancywebrtc.FancyRTCMediaDevices.GetUserMediaListener({
+                onError(error: string): void {
+                    reject(error);
+                }, onSuccess(stream: co.fitcom.fancywebrtc.FancyRTCMediaStream): void {
+                    resolve(TNSRTCMediaStream.fromNative(stream));
+                }
+            }));
+        });
+    }
 }
diff --git a/src/src/index.d.ts b/src/src/index.d.ts
@@ -295,6 +295,7 @@ export declare class TNSRTCIceServer extends TNSRTCIceServerBase {
 
 export declare class TNSRTCMediaDevices {
     static getUserMedia(constraints: TNSRTCMediaStreamConstraints): Promise<TNSRTCMediaStream>;
+    static getDisplayMedia(constraints: TNSRTCMediaStreamConstraints): Promise<TNSRTCMediaStream>;
 }
 
 export declare class TNSRTCMediaStream extends TNSRTCMediaStreamBase {
diff --git a/src/src/ios/TNSRTCMediaDevices.ts b/src/src/ios/TNSRTCMediaDevices.ts
@@ -13,4 +13,16 @@ export class TNSRTCMediaDevices {
             });
         });
     }
+
+    public static getDisplayMedia(constraints: TNSRTCMediaStreamConstraints): Promise<TNSRTCMediaStream> {
+        return new Promise((resolve, reject) => {
+            FancyRTCMediaDevices.getDisplayMediaWithConstraintsListener(constraints.instance, (stream: FancyRTCMediaStream, error) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    resolve(TNSRTCMediaStream.fromNative(stream));
+                }
+            });
+        });
+    }
 }
diff --git a/src/typings/android.d.ts b/src/typings/android.d.ts
@@ -1,3 +1,5 @@
+/// <reference path="android-declarations.d.ts"/>
+
 declare module co {
 	export module fitcom {
 		export module fancywebrtc {
@@ -15,6 +17,38 @@ declare module co {
 	}
 }
 
+declare module co {
+	export module fitcom {
+		export module fancywebrtc {
+			export class FancyRTCApplicationHelper {
+				public static class: java.lang.Class<co.fitcom.fancywebrtc.FancyRTCApplicationHelper>;
+				public requestPermissions(param0: globalAndroid.content.Context, param1: native.Array<string>, param2: number, param3: co.fitcom.fancywebrtc.FancyRTCApplicationHelper.Callback): void;
+				public handlePermissionResult(param0: number, param1: native.Array<string>, param2: native.Array<number>): void;
+				public handleResult(param0: number, param1: number, param2: globalAndroid.content.Intent): void;
+				public static getInstance(): co.fitcom.fancywebrtc.FancyRTCApplicationHelper;
+				public requestPermission(param0: globalAndroid.content.Context, param1: string, param2: number, param3: co.fitcom.fancywebrtc.FancyRTCApplicationHelper.Callback): void;
+				public constructor();
+				public onResult(param0: number, param1: co.fitcom.fancywebrtc.FancyRTCApplicationHelper.Callback): void;
+			}
+			export module FancyRTCApplicationHelper {
+				export class Callback {
+					public static class: java.lang.Class<co.fitcom.fancywebrtc.FancyRTCApplicationHelper.Callback>;
+					/**
+					 * Constructs a new instance of the co.fitcom.fancywebrtc.FancyRTCApplicationHelper$Callback interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+					 */
+					public constructor(implementation: {
+						onPermissionResult(param0: number, param1: native.Array<string>, param2: native.Array<number>): void;
+						onResult(param0: number, param1: number, param2: globalAndroid.content.Intent): void;
+					});
+					public constructor();
+					public onResult(param0: number, param1: number, param2: globalAndroid.content.Intent): void;
+					public onPermissionResult(param0: number, param1: native.Array<string>, param2: native.Array<number>): void;
+				}
+			}
+		}
+	}
+}
+
 declare module co {
 	export module fitcom {
 		export module fancywebrtc {
@@ -234,7 +268,9 @@ declare module co {
 		export module fancywebrtc {
 			export class FancyRTCMediaDevices {
 				public static class: java.lang.Class<co.fitcom.fancywebrtc.FancyRTCMediaDevices>;
+				public static WEBRTC_SCREEN_PERMISSIONS_REQUEST_CODE: number;
 				public static getUserMedia(param0: globalAndroid.content.Context, param1: co.fitcom.fancywebrtc.FancyRTCMediaStreamConstraints, param2: co.fitcom.fancywebrtc.FancyRTCMediaDevices.GetUserMediaListener): void;
+				public static getDisplayMedia(param0: globalAndroid.content.Context, param1: co.fitcom.fancywebrtc.FancyRTCMediaStreamConstraints, param2: co.fitcom.fancywebrtc.FancyRTCMediaDevices.GetUserMediaListener): void;
 				public constructor();
 			}
 			export module FancyRTCMediaDevices {
diff --git a/src/typings/objc!FancyWebRTC.d.ts b/src/typings/objc!FancyWebRTC.d.ts
@@ -245,6 +245,8 @@ declare class FancyRTCMediaDevices extends NSObject {
 
 	static alloc(): FancyRTCMediaDevices; // inherited from NSObject
 
+	static getDisplayMediaWithConstraintsListener(constraints: FancyRTCMediaStreamConstraints, listener: (p1: FancyRTCMediaStream, p2: string) => void): void;
+
 	static getUserMediaWithConstraintsListener(constraints: FancyRTCMediaStreamConstraints, listener: (p1: FancyRTCMediaStream, p2: string) => void): void;
 
 	static new(): FancyRTCMediaDevices; // inherited from NSObject
diff --git a/src/webrtc.android.ts b/src/webrtc.android.ts
@@ -17,6 +17,7 @@ import { View } from 'tns-core-modules/ui/core/view';
 import { ad } from 'tns-core-modules/utils/utils';
 import * as permissions from 'nativescript-permissions';
 import { TNSRTCMediaStream, TNSRTCMediaStreamTrack } from './src/android';
+import * as app from 'tns-core-modules/application';
 
 export * from './src/android';
 export {
@@ -373,8 +374,19 @@ export class WebRTC extends Common {
         );
     }
 
+    private static _callbackFn(args: app.AndroidActivityResultEventData) {
+        co.fitcom.fancywebrtc.FancyRTCApplicationHelper.getInstance().handleResult(args.requestCode, args.resultCode, args.intent);
+    }
+
+    private static callback: any;
+
     public static init(): void {
         co.fitcom.fancywebrtc.FancyWebRTC.init(ad.getApplicationContext());
+        if (!this.callback) {
+            this.callback = this._callbackFn.bind(this);
+        }
+        app.android.off(app.AndroidApplication.activityResultEvent, this.callback);
+        app.android.on(app.AndroidApplication.activityResultEvent, this.callback);
     }
 
     public dataChannelSend(

Original file line number	Diff line number	Diff line change
`@@ -40,3 +40,7 @@ export function endCall(event) {`
`40`	`40`	`export function switchCamera(event) {`
`41`	`41`	`vm.switchCamera(event.object);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+export function shareScreen(event) {`
	`45`	`+ vm.shareScreen(event.object);`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-webrtc-plugin",`
`3`		`- "version": "2.0.0-alpha.12",`
	`3`	`+ "version": "2.0.0-alpha.13",`
`4`	`4`	`"description": "WebRTC for NativeScript",`
`5`	`5`	`"main": "webrtc",`
`6`	`6`	`"typings": "index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,7 @@ export declare class TNSRTCIceServer extends TNSRTCIceServerBase {`
`295`	`295`
`296`	`296`	`export declare class TNSRTCMediaDevices {`
`297`	`297`	`static getUserMedia(constraints: TNSRTCMediaStreamConstraints): Promise<TNSRTCMediaStream>;`
	`298`	`+ static getDisplayMedia(constraints: TNSRTCMediaStreamConstraints): Promise<TNSRTCMediaStream>;`
`298`	`299`	`}`
`299`	`300`
`300`	`301`	`export declare class TNSRTCMediaStream extends TNSRTCMediaStreamBase {`