scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allow 'then' on service registration

Browse source 
This allows a service to postpone communication with other services
until it can be sure that it's registered with central dispatch. Service
registration on the main thread always happens immediately, but that
version of `setService` still returns a Promise for consistency.
This commit is contained in:
Christopher Willis-Ford 2017-07-21 13:13:45 -07:00
parent 84ac66d6e5
commit 97d67d75f4
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/dispatch/central-dispatch.js
View file

@ -106,15 +106,19 @@ class CentralDispatch {
/**
* Set a local object as the global provider of the specified service.
* WARNING: Any method on the provider can be called from any worker within the dispatch system.
* @param {string} service - a globally unique string identifying this service. Examples: 'vm', 'gui', 'extension9'.
* @param {object} provider - a local object which provides this service.
* WARNING: Any method on the provider can be called from any worker within the dispatch system.
* @returns {Promise} - a promise which will resolve once the service is registered.
*/
setService (service, provider) {
if (this.services.hasOwnProperty(service)) {
log.warn(`Replacing existing service provider for ${service}`);
}
this.services[service] = provider;
return new Promise(resolve => {
if (this.services.hasOwnProperty(service)) {
log.warn(`Replacing existing service provider for ${service}`);
}
this.services[service] = provider;
resolve();
});
}
/**
@ -140,17 +144,21 @@ class CentralDispatch {
*/
_onMessage (worker, event) {
const [service, method, callbackId, ...args] = /** @type {[string, string, *]} */ event.data;
let promise;
if (service === 'dispatch') {
switch (method) {
case '_callback':
this._callback(callbackId, ...args);
break;
case 'setService':
this.setService(args[0], worker);
promise = this.setService(args[0], worker);
break;
}
} else {
this.call(service, method, ...args).then(
promise = this.call(service, method, ...args);
}
if (promise) {
promise.then(
result => {
worker.postMessage(['dispatch', '_callback', callbackId, result]);
},

7
src/dispatch/worker-dispatch.js
View file

@ -117,18 +117,17 @@ class WorkerDispatch {
/**
* Set a local object as the global provider of the specified service.
* WARNING: Any method on the provider can be called from any worker within the dispatch system.
* @param {string} service - a globally unique string identifying this service. Examples: 'vm', 'gui', 'extension9'.
* @param {object} provider - a local object which provides this service.
* WARNING: Any method on the provider can be called from any worker within the dispatch system.
* @returns {Promise} - a promise which will resolve once the service is registered.
*/
setService (service, provider) {
if (this.services.hasOwnProperty(service)) {
log.warn(`Replacing existing service provider for ${service}`);
}
this.services[service] = provider;
this.waitForConnection.then(() => {
this.call('dispatch', 'setService', service);
});
return this.waitForConnection.then(() => this.call('dispatch', 'setService', service));
}
/**