pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added support to upgrade/install extension when already running.

pull/77/head
Simon Eisenmann 11 years ago
parent
30882f1dcc
commit
8af8f113ba
2 changed files with 140 additions and 122 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      static/js/services/chromeextension.js
  2. 203
      static/js/services/screensharing.js

59
static/js/services/chromeextension.js
Unescape View File

@ -18,21 +18,30 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
define(["underscore"], function(_) { define(["underscore", "jquery"], function(_, $) {
// chromeExtension // chromeExtension
return ["$window", "$q", function($window, $q) { return ["$window", "$q", function($window, $q) {
var available = false;
var marker = $window.document.getElementById("chromeextension-available");
if (marker) {
available = true;
console.log("Chrome extension is available.");
}
var ChromeExtension = function() { var ChromeExtension = function() {
this.available = false;
this.registry = {}; this.registry = {};
this.count = 0; this.count = 0;
this.e = $({});
this.initialize();
};
ChromeExtension.prototype.initialize = function() {
var marker = $window.document.getElementById("chromeextension-available");
if (marker && !this.available) {
this.available = true;
console.log("Chrome extension is available.");
this.e.triggerHandler("available", true);
} else if (!marker && this.available) {
this.available = false;
console.log("Chrome extension is no longer available.");
this.e.triggerHandler("available", false);
}
}; };
ChromeExtension.prototype.call = function(data) { ChromeExtension.prototype.call = function(data) {
@ -75,33 +84,27 @@ define(["underscore"], function(_) {
console.warn("Unknown call reference received", data, this.registry, this); console.warn("Unknown call reference received", data, this.registry, this);
} }
break; break;
case "Upgrade":
console.log("Extension installed or upgraded", data);
this.initialize();
break;
default: default:
console.log("Unknown message type", data.Type, data); console.log("Unknown message type", data.Type, data);
break; break;
} }
}; };
var extension; var extension = new ChromeExtension();
if (available) { $window.addEventListener("message", function(event) {
extension = new ChromeExtension(); //console.log("message", event.origin, event.source === window, event);
if (event.source === window && event.data.answer) {
$window.addEventListener("message", function(event) { // Only process answers to avoid loops.
//console.log("message", event.origin, event.source === window, event); extension.onMessage(event);
if (event.source === window && event.data.answer) {
// Only process answers to avoid loops.
extension.onMessage(event);
}
});
}
// public API.
return {
available: available,
call: function(data) {
return extension.call(data);
} }
} });
// Expose.
return extension;
}]; }];

203
static/js/services/screensharing.js
Unescape View File

@ -23,106 +23,121 @@ define(['underscore', 'webrtc.adapter'], function(_) {
// screensharing // screensharing
return ["$window", "$q", "chromeExtension", function($window, $q, chromeExtension) { return ["$window", "$q", "chromeExtension", function($window, $q, chromeExtension) {
// Check if we can do screensharing. var Screensharing = function() {
var supported = false; this.initialize();
chromeExtension.e.on("available", _.bind(function() {
// Define our helpers. this.initialize();
var prepare = null; }, this));
var cancel = null; };
// Chrome support.
if ($window.webrtcDetectedBrowser === "chrome") {
if ($window.webrtcDetectedVersion >= 32 &&
$window.webrtcDetectedVersion < 37) {
// Support for flag based developer screen sharing came in Chrome 32.
// It was removed in Chrome 37 in favour of chrome.chooseDesktopMedia
// https://code.google.com/p/chromium/issues/detail?id=347641
supported = true;
prepare = function(options) {
// This generates constrains for the flag based screen screensharing
// support in Chrome 31+ to 36. Flag to be enabled is found at:
// chrome://flags/#enable-usermedia-screen-capture
var d = $q.defer()
var opts = _.extend({
chromeMediaSource: "screen"
}, options);
d.resolve(opts);
return d.promise;
};
} else if ($window.webrtcDetectedVersion >= 37) {
// We need a extension to support screen sharing. See
// https://developer.chrome.com/extensions/desktopCapture#method-chooseDesktopMedia
// for details.
}
if (chromeExtension.available) { Screensharing.prototype.initialize = function() {
supported = true;
var pending = null; // Check if we can do screensharing.
prepare = function(options) { this.supported = false;
var select = chromeExtension.call({
Type: "Action", // Define our helpers.
Action: "chooseDesktopMedia" this.prepare = null;
}); this.cancel = null;
var d = $q.defer();
select.then(function(id) { // Chrome support.
// Success with id. if ($window.webrtcDetectedBrowser === "chrome") {
pending = null;
if (id) { if ($window.webrtcDetectedVersion >= 32 &&
var opts = _.extend({ $window.webrtcDetectedVersion < 37) {
chromeMediaSource: "desktop", // Support for flag based developer screen sharing came in Chrome 32.
chromeMediaSourceId: id // It was removed in Chrome 37 in favour of chrome.chooseDesktopMedia
}, options); // https://code.google.com/p/chromium/issues/detail?id=347641
d.resolve(opts); this.supported = true;
} else { this.prepare = function(options) {
d.resolve(null); // This generates constrains for the flag based screen screensharing
} // support in Chrome 31+ to 36. Flag to be enabled is found at:
}, function(err) { // chrome://flags/#enable-usermedia-screen-capture
// Error. var d = $q.defer()
pending = null; var opts = _.extend({
console.log("Failed to prepare screensharing", err); chromeMediaSource: "screen"
d.reject(err); }, options);
}, function(data) { d.resolve(opts);
// Notify. return d.promise;
pending = data; };
}); } else if ($window.webrtcDetectedVersion >= 37) {
return d.promise; // We need a extension to support screen sharing. See
}; // https://developer.chrome.com/extensions/desktopCapture#method-chooseDesktopMedia
cancel = function() { // for details.
if (pending !== null) { }
chromeExtension.call({
if (chromeExtension.available) {
this.supported = true;
var pending = null;
this.prepare = function(options) {
var select = chromeExtension.call({
Type: "Action", Type: "Action",
Action: "cancelChooseDesktopMedia", Action: "chooseDesktopMedia"
Args: pending
}); });
pending = null; var d = $q.defer();
} select.then(function(id) {
}; // Success with id.
pending = null;
if (id) {
var opts = _.extend({
chromeMediaSource: "desktop",
chromeMediaSourceId: id
}, options);
d.resolve(opts);
} else {
d.resolve(null);
}
}, function(err) {
// Error.
pending = null;
console.log("Failed to prepare screensharing", err);
d.reject(err);
}, function(data) {
// Notify.
pending = data;
});
return d.promise;
};
this.cancel = function() {
if (pending !== null) {
chromeExtension.call({
Type: "Action",
Action: "cancelChooseDesktopMedia",
Args: pending
});
pending = null;
}
};
}
} else {
// Currently Chrome only - sorry.
// Firefox 33 might get screen sharing support.
// See https://bugzilla.mozilla.org/show_bug.cgi?id=923225
} }
} else { console.log("Screensharing support", this.supported);
// Currently Chrome only - sorry.
// Firefox 33 might get screen sharing support. };
// See https://bugzilla.mozilla.org/show_bug.cgi?id=923225
} Screensharing.prototype.getScreen = function(options) {
if (this.prepare) {
// public API. return this.prepare(options);
return { } else {
supported: supported, var d = $q.defer()
getScreen: function(options) { d.reject("No implementation to get screen.");
if (prepare) { return d.promise;
return prepare(options); }
} else { };
var d = $q.defer()
d.reject("No implementation to get screen."); Screensharing.prototype.cancelGetScreen = function() {
return d.promise; if (this.cancel) {
} this.cancel();
},
cancelGetScreen: function() {
if (cancel) {
cancel();
}
} }
} };
// Expose.
var screensharing = new Screensharing();
return screensharing;
}]; }];

Write Preview
Loading…
Cancel
Save