update

Author: jpinkney-aws

packages/amazonq/src/lsp/activation.ts

@@ -5,13 +5,14 @@
 
 import vscode from 'vscode'
 import { startLanguageServer } from './client'
-import { AmazonQLSPInstaller } from './lspInstaller'
+import { AmazonQLSPResolver } from './lspInstaller'
 import { ToolkitError } from 'aws-core-vscode/shared'
+import path from 'path'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     try {
-        const result = await new AmazonQLSPInstaller().install()
-        await startLanguageServer(ctx, result.location)
+        const installResult = await new AmazonQLSPResolver().resolve()
+        await startLanguageServer(ctx, path.join(installResult.assetDirectory, 'servers/aws-lsp-codewhisperer.js'))
     } catch (err) {
         const e = err as ToolkitError
         void vscode.window.showInformationMessage(`Unable to launch amazonq language server: ${e.message}`)

packages/amazonq/src/lsp/lspInstaller.ts

@@ -4,12 +4,14 @@
  */
 
 import * as vscode from 'vscode'
-import { ManifestManager, LspManager, LspInstaller, LspResult } from 'aws-core-vscode/shared'
+import { Range } from 'semver'
+import { ManifestResolver, LanguageServerResolver, LspResolver, LspResult } from 'aws-core-vscode/shared'
 
 const manifestURL = 'https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json'
+const supportedLspServerVersions = '^2.3.1'
 
-export class AmazonQLSPInstaller implements LspInstaller {
-    async install(): Promise<LspResult> {
+export class AmazonQLSPResolver implements LspResolver {
+    async resolve(): Promise<LspResult> {
         const overrideLocation = process.env.AWS_LANGUAGE_SERVER_OVERRIDE
         if (overrideLocation) {
             void vscode.window.showInformationMessage(`Using language server override location: ${overrideLocation}`)
@@ -20,13 +22,16 @@ export class AmazonQLSPInstaller implements LspInstaller {
             }
         }
 
-        const manifestManager = new ManifestManager(manifestURL, 'amazonq')
-        const manifest = await manifestManager.getManifest()
-
-        const lspManager = new LspManager(manifest, '', '')
-        const downloadResult = lspManager.download()
+        // "AmazonQ" is shared across toolkits to provide a common access point, don't change it
+        const name = 'AmazonQ'
+        const manifest = await new ManifestResolver(manifestURL, name).resolve()
+        const installationResult = await new LanguageServerResolver(
+            manifest,
+            name,
+            new Range(supportedLspServerVersions)
+        ).resolve()
 
         // TODO Cleanup old versions of language servers
-        return downloadResult
+        return installationResult
     }
 }

packages/amazonq/test/unit/amazonq/lsp/lspController.test.ts

@@ -172,13 +172,11 @@ export class LspClient {
  * It will create a output channel named Amazon Q Language Server.
  * This function assumes the LSP server has already been downloaded.
  */
-export async function activate(extensionContext: ExtensionContext) {
+export async function activate(extensionContext: ExtensionContext, serverModule: string) {
     LspClient.instance
     const toDispose = extensionContext.subscriptions
 
     let rangeFormatting: Disposable | undefined
-    // The server is implemented in node
-    const serverModule = path.join(extensionContext.extensionPath, 'resources/qserver/lspServer.js')
     // The debug options for the server
     // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
     const debugOptions = { execArgv: ['--nolazy', '--preserve-symlinks', '--stdio'] }

packages/core/src/amazonq/lsp/lspClient.ts

@@ -14,9 +14,7 @@ import { telemetry } from '../../shared/telemetry'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import globals, { isWeb } from '../../shared/extensionGlobals'
 import { isAmazonInternalOs } from '../../shared/vscode/env'
-import { fs } from '../../shared/fs/fs'
-import { tryRemoveFolder } from '../../shared/filesystemUtilities'
-import { LspInstaller, LspResult } from '../../shared/languageServer/types'
+import { WorkspaceLSPResolver } from './workspaceInstaller'
 
 export interface Chunk {
     readonly filePath: string
@@ -25,13 +23,6 @@ export interface Chunk {
     readonly relativePath?: string
     readonly programmingLanguage?: string
 }
-
-// const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
-// // this LSP client in Q extension is only going to work with these LSP server versions
-// const supportedLspServerVersions = ['0.1.32']
-
-const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'
-
 export interface BuildIndexConfig {
     startUrl?: string
     maxIndexSize: number
@@ -49,21 +40,14 @@ export interface BuildIndexConfig {
  *    Pre-process the input to Index Files API
  *    Post-process the output from Query API
  */
-export class LspController implements LspInstaller {
+export class LspController {
     static #instance: LspController
     private _isIndexingInProgress = false
-    private serverPath: string
-    private nodePath: string
 
     public static get instance() {
         return (this.#instance ??= new this())
     }
 
-    constructor() {
-        this.serverPath = globals.context.asAbsolutePath(path.join('resources', 'qserver'))
-        this.nodePath = globals.context.asAbsolutePath(path.join('resources', nodeBinName))
-    }
-
     isIndexingInProgress() {
         return this._isIndexingInProgress
     }
@@ -169,40 +153,16 @@ export class LspController implements LspInstaller {
         }
     }
 
-    async isLspInstalled(): Promise<boolean> {
-        return (await fs.exists(this.serverPath)) && (await fs.exists(this.nodePath))
-    }
-
-    async cleanup(): Promise<boolean> {
-        if (await fs.exists(this.serverPath)) {
-            await tryRemoveFolder(this.serverPath)
-        }
-
-        if (await fs.exists(this.nodePath)) {
-            await fs.delete(this.nodePath)
-        }
-
-        return true
-    }
-
-    install(): Promise<LspResult> {
-        // TODO
-        throw new Error('Method not implemented.')
-    }
-
     async trySetupLsp(context: vscode.ExtensionContext, buildIndexConfig: BuildIndexConfig) {
         if (isCloud9() || isWeb() || isAmazonInternalOs()) {
             getLogger().warn('LspController: Skipping LSP setup. LSP is not compatible with the current environment. ')
             // do not do anything if in Cloud9 or Web mode or in AL2 (AL2 does not support node v18+)
             return
         }
         setImmediate(async () => {
-            const ok = await LspController.instance.install()
-            if (!ok) {
-                return
-            }
             try {
-                await activateLsp(context)
+                const installResult = await new WorkspaceLSPResolver().resolve()
+                await activateLsp(context, path.join(installResult.assetDirectory, 'resources/qserver/lspServer.js'))
                 getLogger().info('LspController: LSP activated')
                 void LspController.instance.buildIndex(buildIndexConfig)
                 // log the LSP server CPU and Memory usage per 30 minutes.

packages/core/src/amazonq/lsp/lspController.ts

@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LspResolver, LspResult } from '../../shared/languageServer/types'
+import { ManifestResolver } from '../../shared/languageServer/manifestResolver'
+import { LanguageServerResolver } from '../../shared/languageServer/lspResolver'
+import { Range } from 'semver'
+
+const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
+// this LSP client in Q extension is only going to work with these LSP server versions
+const supportedLspServerVersions = '0.1.32'
+
+export class WorkspaceLSPResolver implements LspResolver {
+    async resolve(): Promise<LspResult> {
+        const name = 'AmazonQ-Workspace'
+        const manifest = await new ManifestResolver(manifestUrl, name).resolve()
+        const installationResult = await new LanguageServerResolver(
+            manifest,
+            name,
+            new Range(supportedLspServerVersions)
+        ).resolve()
+
+        // TODO Cleanup old versions of language servers
+        return installationResult
+    }
+}

packages/core/src/amazonq/lsp/workspaceInstaller.ts

@@ -24,11 +24,15 @@
 import { isWeb } from './extensionGlobals'
 
 export function randomUUID(): `${string}-${string}-${string}-${string}-${string}` {
+    return getCrypto().randomUUID()
+}
+
+function getCrypto() {
     if (isWeb()) {
-        return globalThis.crypto.randomUUID()
+        return globalThis.crypto
     }
 
-    return require('crypto').randomUUID()
+    return require('crypto')
 }
 
 /**
@@ -54,3 +58,10 @@ export function truncateUuid(uuid: string) {
     const cleanedUUID = uuid.replace(/-/g, '')
     return `${cleanedUUID.substring(0, 4)}...${cleanedUUID.substring(cleanedUUID.length - 4)}`
 }
+
+export function createHash(algorithm: string, contents: string | Buffer): string {
+    const crypto = getCrypto()
+    const hash = crypto.createHash(algorithm)
+    hash.update(contents)
+    return `${algorithm}:${hash.digest('hex')}`
+}

packages/core/src/shared/crypto.ts

@@ -59,6 +59,6 @@ export { i18n } from './i18n-helper'
 export * from './icons'
 export * as textDocumentUtil from './utilities/textDocumentUtilities'
 export { TabTypeDataMap } from '../amazonq/webview/ui/tabs/constants'
-export * from './languageServer/manifestManager'
-export * from './languageServer/lspManager'
+export * from './languageServer/manifestResolver'
+export * from './languageServer/lspResolver'
 export * from './languageServer/types'