fix #6055: tolerate missing internet access while deploying plugins

- check whether a plugin is already to be deployed by an id - fix to use canonical plugin ids to resolve and activate plugins - make sure that dependencies only resolved after listed plugin entries - don't fail the entire deployment if a resolution of a single plugin entry failed Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Aug 29, 2019 · 1a3048d · 1a3048d
1 parent 30b340a
commit 1a3048d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 22 deletions.
diff --git a/packages/plugin-ext-vscode/src/node/scanner-vscode.ts b/packages/plugin-ext-vscode/src/node/scanner-vscode.ts
@@ -63,6 +63,6 @@ export class VsCodePluginScanner extends TheiaPluginScanner implements PluginSca
      * to an array of deployable extension dependencies
      */
     private getDeployableDependencies(dependencies: string[]): string[] {
-        return dependencies.map(dep => this.VSCODE_PREFIX + dep);
+        return dependencies.map(dep => this.VSCODE_PREFIX + dep.toLowerCase());
     }
 }
diff --git a/packages/plugin-ext/src/common/plugin-protocol.ts b/packages/plugin-ext/src/common/plugin-protocol.ts
@@ -377,6 +377,10 @@ export interface PluginModel {
         backend?: string;
     };
     contributes?: PluginContribution;
+    /**
+     * The deployable form of extensionDependencies from package.json,
+     * i.e. not `publisher.name`, but `vscode:extension/publisher.name`.
+     */
     extensionDependencies?: string[];
 }
 

diff --git a/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts b/packages/plugin-ext/src/main/node/plugin-deployer-impl.ts
@@ -114,27 +114,40 @@ export class PluginDeployerImpl implements PluginDeployer {
 
         const queue = [...pluginEntries];
         while (queue.length) {
-            const current = queue.shift()!;
-            if (visited.has(current)) {
-                continue;
+            const chunk = [];
+            while (queue.length) {
+                const current = queue.shift()!;
+                if (visited.has(current)) {
+                    continue;
+                }
+                visited.add(current);
+                try {
+                    const pluginDeployerEntries = await this.resolvePlugin(current);
+                    await this.applyFileHandlers(pluginDeployerEntries);
+                    await this.applyDirectoryFileHandlers(pluginDeployerEntries);
+                    for (const deployerEntry of pluginDeployerEntries) {
+                        const metadata = await this.pluginDeployerHandler.getPluginMetadata(deployerEntry);
+                        if (metadata && !pluginsToDeploy.has(metadata.model.id)) {
+                            pluginsToDeploy.set(metadata.model.id, deployerEntry);
+                            chunk.push(metadata);
+                        }
+                    }
+                } catch (e) {
+                    console.error(`Failed to resolve plugins from '${current}'`, e);
+                }
             }
-            visited.add(current);
-
-            // resolve plugins
-            const pluginDeployerEntries = await this.resolvePlugin(current);
-
-            // now that we have plugins check if we have File Handler for them
-            await this.applyFileHandlers(pluginDeployerEntries);
-
-            // ok now ask for directory handlers
-            await this.applyDirectoryFileHandlers(pluginDeployerEntries);
-
-            for (const deployerEntry of pluginDeployerEntries) {
-                const metadata = await this.pluginDeployerHandler.getPluginMetadata(deployerEntry);
-                if (metadata && !pluginsToDeploy.has(metadata.model.id)) {
-                    pluginsToDeploy.set(metadata.model.id, deployerEntry);
-                    if (metadata.model.extensionDependencies) {
-                        queue.push(...metadata.model.extensionDependencies);
+            for (const metadata of chunk) {
+                const extensionDependencies = metadata.source.extensionDependencies;
+                const deployableExtensionDependencies = metadata.model.extensionDependencies;
+                if (extensionDependencies && deployableExtensionDependencies) {
+                    for (let dependencyIndex = 0; dependencyIndex < extensionDependencies.length; dependencyIndex++) {
+                        const dependencyId = extensionDependencies[dependencyIndex].toLowerCase();
+                        if (!pluginsToDeploy.has(dependencyId)) {
+                            const deployableDependency = deployableExtensionDependencies[dependencyIndex];
+                            if (deployableDependency) {
+                                queue.push(deployableDependency);
+                            }
+                        }
                     }
                 }
             }

diff --git a/packages/plugin-ext/src/plugin/plugin-manager.ts b/packages/plugin-ext/src/plugin/plugin-manager.ts
@@ -192,7 +192,7 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
             loading = (async () => {
                 if (plugin.rawModel.extensionDependencies) {
                     for (const dependencyId of plugin.rawModel.extensionDependencies) {
-                        const dependency = this.registry.get(dependencyId);
+                        const dependency = this.registry.get(dependencyId.toLowerCase());
                         if (dependency) {
                             await this.loadPlugin(dependency, configStorage, visited);
                         } else {