web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for login & logout while keeping the same shared worker

Browse Source
This commit is contained in:
yflory 2018-06-08 17:35:44 +02:00
parent 02b282a1a5
commit 47dee664da
6 changed files with 1472 additions and 1433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/cryptpad-common.js
View File

@ -932,9 +932,12 @@ define([
document.location.reload();
} else if (o && !n) {
LocalStore.logout();
postMessage("DISCONNECT");
}
});
LocalStore.onLogout(function () {
console.log('onLogout: disconnect');
postMessage("DISCONNECT");
});
if (PINNING_ENABLED && LocalStore.isLoggedIn()) {
console.log("logged in. pads will be pinned");

6
www/common/outer/async-store.js
View File

@ -23,6 +23,7 @@ define([
Crypto, ChainPad, Listmap, nThen, Saferphore) {
var Store = {};
var create = function () {
var postMessage = function () {};
var broadcast = function () {};
var sendDriveEvent = function () {};
@ -1454,4 +1455,9 @@ define([
store.network.disconnect();
};
return Store;
};
return {
create: create
};
});

13
www/common/outer/serviceworker.js
View File

@ -27,10 +27,15 @@ var init = function (client, cb) {
'/common/common-util.js',
'/common/outer/worker-channel.js',
'/common/outer/store-rpc.js'
], function (Util, Channel, Rpc) {
], function (Util, Channel, SRpc) {
debug('SW Required ressources loaded');
var msgEv = Util.mkEvent();
if (!self.Rpc) {
self.Rpc = SRpc();
}
var Rpc = self.Rpc;
var postToClient = function (data) {
postMsg(client, data);
};
@ -51,11 +56,17 @@ var init = function (client, cb) {
console.error(e);
console.log(data);
}
if (q === "DISCONNECT") {
console.log('Deleting existing store!');
delete self.Rpc;
delete self.store;
}
});
});
chan.on('CONNECT', function (cfg, cb) {
debug('SW Connect callback');
if (self.store) {
debug('Store already exists!');
if (cfg.driveEvents) {
Rpc._subscribeToDrive(clientId);
}

12
www/common/outer/sharedworker.js
View File

@ -27,10 +27,15 @@ var init = function (client, cb) {
'/common/common-util.js',
'/common/outer/worker-channel.js',
'/common/outer/store-rpc.js'
], function (Util, Channel, Rpc) {
], function (Util, Channel, SRpc) {
debug('SharedW Required ressources loaded');
var msgEv = Util.mkEvent();
if (!self.Rpc) {
self.Rpc = SRpc();
}
var Rpc = self.Rpc;
var postToClient = function (data) {
postMsg(client, data);
};
@ -51,6 +56,11 @@ var init = function (client, cb) {
console.error(e);
console.log(data);
}
if (q === "DISCONNECT") {
console.log('Deleting existing store!');
delete self.Rpc;
delete self.store;
}
});
});
chan.on('CONNECT', function (cfg, cb) {

9
www/common/outer/store-rpc.js
View File

@ -1,6 +1,10 @@
define([
'/common/outer/async-store.js'
], function (Store) {
], function (AStore) {
var create = function () {
var Store = AStore.create();
var Rpc = {};
var queries = Rpc.queries = {
@ -85,5 +89,8 @@ define([
Rpc._subscribeToMessenger = Store._subscribeToMessenger;
return Rpc;
};
return create;
});

4
www/common/outer/webworker.js
View File

@ -15,9 +15,11 @@ require([
'/common/common-util.js',
'/common/outer/worker-channel.js',
'/common/outer/store-rpc.js'
], function (Util, Channel, Rpc) {
], function (Util, Channel, SRpc) {
var msgEv = Util.mkEvent();
var Rpc = SRpc();
Channel.create(msgEv, postMessage, function (chan) {
var clientId = '1';
Object.keys(Rpc.queries).forEach(function (q) {