Remove external dependency on FileDownloader (#99)

* Remove external dependency on FileDownloader
* File newlines
* Test and lint fixes
* Fix non-idiomatic js

Author: pcj

.gitignore

@@ -3,4 +3,3 @@ tmp
 node_modules
 .vscode-test/
 *.vsix
-vendor

package-lock.json

@@ -2,7 +2,7 @@
     "name": "bazel-stack-vscode",
     "displayName": "bazel-stack-vscode",
     "description": "Bazel Support for Visual Studio Code",
-    "version": "1.8.3",
+    "version": "1.8.4",
     "publisher": "StackBuild",
     "license": "Apache-2.0",
     "icon": "stackb-full.png",
@@ -761,15 +761,13 @@
         "vscode-package": "vsce package --out out/extension.vsix",
         "vscode:prepublish": "npm run clean && npm run compile"
     },
-    "extensionDependencies": [
-        "mindaro-dev.file-downloader"
-    ],
     "dependencies": {
         "@grpc/grpc-js": "^1.3.4",
         "@grpc/proto-loader": "0.6.4",
-        "@microsoft/vscode-file-downloader-api": "^1.0.1",
         "@octokit/rest": "18.0.3",
+        "axios": "^0.21.1",
         "bazel-stack-vscode-api": "^1.2.2",
+        "extract-zip": "^2.0.1",
         "find-up": "^5.0.0",
         "fs-extra": "9.0.1",
         "graceful-fs": "4.2.4",
@@ -779,10 +777,11 @@
         "normalize-path": "^3.0.0",
         "protobufjs": "6.10.1",
         "request": "2.88.2",
+        "rimraf": "^3.0.2",
         "semver": "7.3.5",
         "sha256-file": "1.0.0",
-        "shiki": "^0.2.6",
         "shiki-themes": "^0.2.6",
+        "shiki": "^0.2.6",
         "strip-ansi": "^6.0.0",
         "tmp": "0.2.1",
         "vscode-common": "1.50.0",
@@ -804,6 +803,7 @@
         "@types/node": "^13.11.0",
         "@types/normalize-path": "^3.0.0",
         "@types/request": "2.48.5",
+        "@types/rimraf": "^3.0.2",
         "@types/semver": "5.5.0",
         "@types/sha256-file": "1.0.0",
         "@types/sinon": "9.0.4",
@@ -831,4 +831,4 @@
         "tabWidth": 2,
         "arrowParens": "avoid"
     }
-}
+}

package.json

@@ -172,7 +172,7 @@ export class StarlarkDebugger
    */
   async resolveDebugConfigurationWithSubstitutedVariables(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken): Promise<vscode.DebugConfiguration | undefined> {
     if (config.request !== 'launch') {
-      return config
+      return config;
     }
 
     //

src/bezel/debugger.ts

@@ -2,7 +2,10 @@
 
 import * as vscode from 'vscode';
 import * as fs from 'fs';
-import { getApi, FileDownloader } from '@microsoft/vscode-file-downloader-api';
+import { IFileDownloader } from '../vendor/microsoft/vscode-file-downloader/IFileDownloader';
+import FileDownloader from '../vendor/microsoft/vscode-file-downloader/FileDownloader';
+import { Container } from '../container';
+import HttpRequestHandler from '../vendor/microsoft/vscode-file-downloader/networking/HttpRequestHandler';
 
 /**
  * Configuration type that describes a desired asset from bzl.io.
@@ -20,7 +23,7 @@ export interface BzlAssetConfiguration {
 }
 
 export class BzlAssetDownloader {
-  private constructor(private downloaderApi: FileDownloader, private cfg: BzlAssetConfiguration) {}
+  private constructor(private downloaderApi: IFileDownloader, private cfg: BzlAssetConfiguration) {}
 
   getBasename(): string {
     let basename = 'bzl';
@@ -129,7 +132,8 @@ export class BzlAssetDownloader {
    * @returns
    */
   static async fromConfiguration(cfg: BzlAssetConfiguration): Promise<BzlAssetDownloader> {
-    const api = await getApi();
-    return new BzlAssetDownloader(api, cfg);
+    const requestHandler = new HttpRequestHandler(Container.logger);
+    const downloader = new FileDownloader(requestHandler, Container.logger);
+    return new BzlAssetDownloader(downloader, cfg);
   }
 }

src/bezel/download.ts

@@ -66,7 +66,7 @@ export class BzlFeature implements vscode.Disposable {
   private readonly invocations: Invocations | undefined;
 
   constructor(private api: API, ctx: vscode.ExtensionContext, private configCtx: ConfigurationContext) {
-    let cwd = "."
+    let cwd = '.';
     if (vscode.workspace.workspaceFolders?.length) {
       cwd = vscode.workspace.workspaceFolders[0].uri.fsPath;
     }

src/bezel/feature.ts

@@ -155,7 +155,7 @@ export class InvocationsItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('invocations'))
+    items.push(new DocumentationLinkItem('invocations'));
 
     if (this.invocations.status === Status.DISABLED) {
       items.push(new DisabledItem('Depends on the Bzl Service'));

src/bezel/invocations.ts

@@ -396,23 +396,23 @@ class SubscriptionItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('subscription'))
+    items.push(new DocumentationLinkItem('subscription'));
 
     if (this.component.status === Status.DISABLED) {
       items.push(new DisabledItem('Subscription token not available.'));
       items.push(
         new MarkdownItem(
-          "Sign up to enable additional hover documentation, autocompletion, and other features."
+          'Sign up to enable additional hover documentation, autocompletion, and other features.'
         )
       );
       items.push(
         new MarkdownItem(
-          "Using this at work? Encourage your employer to support developer productivity."
+          'Using this at work? Encourage your employer to support developer productivity.'
         )
       );
       items.push(
         new MarkdownItem(
-          "Contact hello@stack.build for organizational onboarding."
+          'Contact hello@stack.build for organizational onboarding.'
         )
       );
       items.push(
@@ -520,7 +520,7 @@ class BuildozerItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('buildozer'))
+    items.push(new DocumentationLinkItem('buildozer'));
     items.push(this.createRunWizardItem());
     return items;
   }
@@ -552,7 +552,7 @@ class RemoteCacheItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('remote-cache'))
+    items.push(new DocumentationLinkItem('remote-cache'));
 
     if (!this.remoteCache.terminal) {
       items.push(this.createLaunchItem());
@@ -599,7 +599,7 @@ class BzlServerItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('ui'))
+    items.push(new DocumentationLinkItem('ui'));
 
     if (this.bzl.status === Status.DISABLED) {
       items.push(new DisabledItem('The Stack.Build subscription is not enabled.'));
@@ -702,7 +702,7 @@ class BuildEventServiceItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('build-events'))
+    items.push(new DocumentationLinkItem('build-events'));
 
     if (this.bes.status === Status.DISABLED) {
       items.push(new DisabledItem('Depends on the Bzl Service'));
@@ -742,7 +742,7 @@ class StarlarkDebuggerItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('debugger'))
+    items.push(new DocumentationLinkItem('debugger'));
 
     if (this.debug.status === Status.DISABLED) {
       items.push(new DisabledItem('The Starlark Debugger is not enabled.'));
@@ -783,7 +783,7 @@ class CodeSearchItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('codesearch'))
+    items.push(new DocumentationLinkItem('codesearch'));
 
     items.push(this.createUsageItem());
 
@@ -805,7 +805,7 @@ class BazelServerItem
 
   async getChildrenInternal(): Promise<vscode.TreeItem[]> {
     const items: vscode.TreeItem[] = [];
-    items.push(new DocumentationLinkItem('bazel'))
+    items.push(new DocumentationLinkItem('bazel'));
 
     if (this.bazel.status === Status.DISABLED) {
       items.push(new DisabledItem('Depends on the Bzl Service'));

src/bezel/workspaceView.ts

@@ -6,9 +6,11 @@ import { Timestamp } from './proto/google/protobuf/Timestamp';
 import Long = require('long');
 import crypto = require('crypto');
 import path = require('path');
+import ILogger from './vendor/microsoft/vscode-file-downloader/logging/ILogger';
 
 export class ConfigurationContext {
   constructor(
+    public readonly logger: ILogger,
     public readonly extensionUri: vscode.Uri,
     public readonly globalStorageUri: vscode.Uri,
     public readonly workspaceState: vscode.Memento,

src/common.ts

@@ -3,6 +3,7 @@ import TelemetryReporter from 'vscode-extension-telemetry';
 import { ConfigurationContext, ITelemetry } from './common';
 import { AIKey, ExtensionID, Telemetry } from './constants';
 import path = require('path');
+import ILogger from './vendor/microsoft/vscode-file-downloader/logging/ILogger';
 
 export class Container {
   private static _configCtx: ConfigurationContext;
@@ -20,6 +21,10 @@ export class Container {
     Container.telemetry.sendTelemetryEvent(Telemetry.ExtensionActivate);
   }
 
+  static get logger(): ILogger {
+    return Container._configCtx.logger;
+  }
+
   static get telemetry(): ITelemetry {
     return Container._telemetry;
   }