Skip to content

Commit

Permalink
#40 desktopCapture-p2p screen-auto-close issue seems fixed now
Browse files Browse the repository at this point in the history
  • Loading branch information
muaz-khan committed Jun 9, 2018
1 parent 34059c0 commit 8c55604
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 38 deletions.
10 changes: 3 additions & 7 deletions desktopCapture-p2p/IceServersHandler.js
Expand Up @@ -3,6 +3,7 @@
var IceServersHandler = (function() {
function getIceServers(connection) {
// resiprocate: 3344+4433
// pions: 7575
var iceServers = [{
'urls': [
'stun:webrtcweb.com:7788', // coTURN
Expand All @@ -14,15 +15,10 @@ var IceServersHandler = (function() {
{
'urls': [
'turn:webrtcweb.com:7788', // coTURN 7788+8877
'turn:webrtcweb.com:4455', // restund udp

'turn:webrtcweb.com:7788?transport=udp', // coTURN udp
'turn:webrtcweb.com:7788?transport=tcp', // coTURN tcp

'turn:webrtcweb.com:4455?transport=udp', // restund udp
'turn:webrtcweb.com:5544?transport=tcp', // restund tcp

'turn:webrtcweb.com:7575?transport=udp', // pions/turn
'turn:webrtcweb.com:8877?transport=udp', // coTURN udp
'turn:webrtcweb.com:8877?transport=tcp', // coTURN tcp
],
'username': 'muazkh',
'credential': 'muazkh'
Expand Down
10 changes: 5 additions & 5 deletions desktopCapture-p2p/RTCMultiConnection.min.js

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions desktopCapture-p2p/desktop-capturing.js
Expand Up @@ -474,7 +474,7 @@ function gotStream(stream) {
var background_page_id = win.id;

setTimeout(function() {
chrome.windows.remove(background_page_id);
// chrome.windows.remove(background_page_id);
}, 3000);
});

Expand Down Expand Up @@ -515,9 +515,6 @@ function setBadgeText(text) {
}

function setupRTCMultiConnection(stream) {
// force adapter.js
window.enableAdapter = true;

// www.RTCMultiConnection.org/docs/
connection = new RTCMultiConnection();
connection.socketURL = 'https://rtcmulticonnection.herokuapp.com:443/';
Expand Down
5 changes: 2 additions & 3 deletions desktopCapture-p2p/index.php
Expand Up @@ -192,9 +192,6 @@ function d(s) {
window.params = params;
})();

// force adapter.js
window.enableAdapter = true;

// http://www.rtcmulticonnection.org/docs/constructor/
var connection = new RTCMultiConnection(params.s);
connection.socketURL = 'https://rtcmulticonnection.herokuapp.com:443/';
Expand Down Expand Up @@ -329,6 +326,8 @@ function setBandwidth(sdp) {

transitionToWaiting();
connection.onSessionClosed();

location.reload();
};

connection.onSessionClosed = function() {
Expand Down
2 changes: 1 addition & 1 deletion desktopCapture-p2p/manifest.json
@@ -1,7 +1,7 @@
{
"name":"WebRTC Desktop Sharing",
"author":"Muaz Khan",
"version":"4.5",
"version":"4.6",
"manifest_version":2,
"minimum_chrome_version":"34",
"description":"WebRTC P2P HQ/HD screen-sharing. Share camera, microphone, speakers, full-screen, or software's screens.",
Expand Down
39 changes: 21 additions & 18 deletions desktopCapture/README.md
Expand Up @@ -66,24 +66,6 @@ For more `Screen-Capturing.js` snippets/help:

* https://github.com/muaz-khan/Chrome-Extensions/tree/master/Screen-Capturing.js#how-to-use-screen-capturingjs

# Other Extensions

| Description | Download | Install |
| ------------- |-------------|-------------|
| Record full screen, apps' screen, youtube audio, and more. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/screen-recording) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/recordrtc/ndcljioonkecdnaaihodjgiliohngojp) |
| Share full screen, apps' screen, youtube audio, and more. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/desktopCapture-p2p) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/webrtc-desktop-sharing/nkemblooioekjnpfekmjhpgkackcajhg) |
| Access/capture screen from any HTTPs domain. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/desktopCapture) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/screen-capturing/ajhifddimkapgcifgcodmmfdlknahffk) |
| Share selected tab (peer-to-peer). | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/tabCapture) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/tab-capturing-sharing/pcnepejfgcmidedoimegcafiabjnodhk) |
| Share files peer-to-peer. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/file-sharing) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/tab-capturing-sharing/pcnepejfgcmidedoimegcafiabjnodhk) |

### List of applications that are using same extension:

1. [RecordRTC.js](https://github.com/muaz-khan/RecordRTC) - a WebRTC wrapper library for audio+video+screen activity recording
2. [RTCMultiConnection.js](https://github.com/muaz-khan/RTCMultiConnection) - a WebRTC wrapper library for peer-to-peer applications
3. [getScreenId.js](https://github.com/muaz-khan/getScreenId) - a tinny javascript library that be used in any domain, application or WebRTC wrapper library.
4. [Screen.js](https://github.com/muaz-khan/WebRTC-Experiment/tree/master/screen-sharing) - a screen capturing library along with multi-user p2p screen streaming.
5. [Pluginfree Screen Sharing](https://github.com/muaz-khan/WebRTC-Experiment/tree/master/Pluginfree-Screen-Sharing) - a standalone application, providing multi-user p2p screen streaming in HD format.

----

# Do NOT Deploy Chrome Extension YourSelf!!!!
Expand Down Expand Up @@ -113,6 +95,27 @@ getScreenId(function (error, sourceId, screen_constraints) {
</script>
```

----

# Other Extensions

| Description | Download | Install |
| ------------- |-------------|-------------|
| Record full screen, apps' screen, youtube audio, and more. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/screen-recording) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/recordrtc/ndcljioonkecdnaaihodjgiliohngojp) |
| Share full screen, apps' screen, youtube audio, and more. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/desktopCapture-p2p) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/webrtc-desktop-sharing/nkemblooioekjnpfekmjhpgkackcajhg) |
| Access/capture screen from any HTTPs domain. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/desktopCapture) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/screen-capturing/ajhifddimkapgcifgcodmmfdlknahffk) |
| Share selected tab (peer-to-peer). | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/tabCapture) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/tab-capturing-sharing/pcnepejfgcmidedoimegcafiabjnodhk) |
| Share files peer-to-peer. | [Source Code](https://github.com/muaz-khan/Chrome-Extensions/tree/master/file-sharing) | [Install from Google Web Store](https://chrome.google.com/webstore/detail/tab-capturing-sharing/pcnepejfgcmidedoimegcafiabjnodhk) |

### List of applications that are using same extension:

1. [RecordRTC.js](https://github.com/muaz-khan/RecordRTC) - a WebRTC wrapper library for audio+video+screen activity recording
2. [RTCMultiConnection.js](https://github.com/muaz-khan/RTCMultiConnection) - a WebRTC wrapper library for peer-to-peer applications
3. [getScreenId.js](https://github.com/muaz-khan/getScreenId) - a tinny javascript library that be used in any domain, application or WebRTC wrapper library.
4. [Screen.js](https://github.com/muaz-khan/WebRTC-Experiment/tree/master/screen-sharing) - a screen capturing library along with multi-user p2p screen streaming.
5. [Pluginfree Screen Sharing](https://github.com/muaz-khan/WebRTC-Experiment/tree/master/Pluginfree-Screen-Sharing) - a standalone application, providing multi-user p2p screen streaming in HD format.


# License

[Chrome-Extensions](https://github.com/muaz-khan/Chrome-Extensions) are released under [MIT licence](https://www.webrtc-experiment.com/licence/) . Copyright (c) [Muaz Khan](https://plus.google.com/+MuazKhan).

0 comments on commit 8c55604

Please sign in to comment.