Wait for extensions when doing protocol handler routing (#3159)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen authored and GitHub committed 2021-06-23 08:48:43 -04:00
1 parent d4c8f04989
commit f8dd7b12f2
4 files changed
+10 -12

No files matched your search

-4
View File
@@ -187,10 +187,6 @@ app.on("ready", async () => {
LensProtocolRouterMain.getInstance().rendererLoaded = true;
});
ExtensionLoader.getInstance().whenLoaded.then(() => {
LensProtocolRouterMain.getInstance().extensionsLoaded = true;
});
logger.info("🧩 Initializing extensions");
// call after windowManager to see splash earlier
@@ -44,7 +44,6 @@ describe("protocol router tests", () => {
const lpr = LensProtocolRouterMain.createInstance();
lpr.extensionsLoaded = true;
lpr.rendererLoaded = true;
});
+1 -2
View File
@@ -54,7 +54,6 @@ export class LensProtocolRouterMain extends proto.LensProtocolRouter {
private missingExtensionHandlers: FallbackHandler[] = [];
@observable rendererLoaded = false;
@observable extensionsLoaded = false;
protected disposers = disposer();
@@ -90,7 +89,7 @@ export class LensProtocolRouterMain extends proto.LensProtocolRouter {
if (routeInternally) {
this._routeToInternal(url);
} else {
this.disposers.push(when(() => this.extensionsLoaded, () => this._routeToExtension(url)));
this._routeToExtension(url);
}
} catch (error) {
broadcastMessage(ProtocolHandlerInvalid, error.toString(), rawUrl);