feat(amazonq): Bundle LSP with the extension as fallback. #7421
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "type": "Feature", | ||
| "description": "Launch LSP with bundled artifacts as fallback" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| import * as https from 'https' | ||
| import * as fs from 'fs' | ||
| import * as crypto from 'crypto' | ||
| import * as path from 'path' | ||
| import * as os from 'os' | ||
| import AdmZip from 'adm-zip' | ||
|
|
||
| interface ManifestContent { | ||
| filename: string | ||
| url: string | ||
| hashes: string[] | ||
| bytes: number | ||
| } | ||
|
|
||
| interface ManifestTarget { | ||
| platform: string | ||
| arch: string | ||
| contents: ManifestContent[] | ||
| } | ||
|
|
||
| interface ManifestVersion { | ||
| serverVersion: string | ||
| isDelisted: boolean | ||
| targets: ManifestTarget[] | ||
| } | ||
|
|
||
| interface Manifest { | ||
| versions: ManifestVersion[] | ||
| } | ||
| async function verifyFileHash(filePath: string, expectedHash: string): Promise<boolean> { | ||
| return new Promise((resolve, reject) => { | ||
| const hash = crypto.createHash('sha384') | ||
| const stream = fs.createReadStream(filePath) | ||
|
|
||
| stream.on('data', (data) => { | ||
| hash.update(data) | ||
| }) | ||
|
|
||
| stream.on('end', () => { | ||
| const fileHash = hash.digest('hex') | ||
| // Remove 'sha384:' prefix from expected hash if present | ||
| const expectedHashValue = expectedHash.replace('sha384:', '') | ||
| resolve(fileHash === expectedHashValue) | ||
| }) | ||
|
|
||
| stream.on('error', reject) | ||
| }) | ||
| } | ||
|
|
||
| async function ensureDirectoryExists(dirPath: string): Promise<void> { | ||
| if (!fs.existsSync(dirPath)) { | ||
| await fs.promises.mkdir(dirPath, { recursive: true }) | ||
| } | ||
| } | ||
|
|
||
| export async function downloadLanguageServer(): Promise<void> { | ||
| const tempDir = path.join(os.tmpdir(), 'amazonq-download-temp') | ||
| const resourcesDir = path.join(__dirname, '../packages/amazonq/resources/language-server') | ||
|
|
||
| // clear previous cached language server | ||
leigaol marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| try { | ||
| if (fs.existsSync(resourcesDir)) { | ||
| fs.rmdirSync(resourcesDir, { recursive: true }) | ||
| } | ||
| } catch (e) { | ||
| throw Error(`Failed to clean up language server ${resourcesDir}`) | ||
| } | ||
|
|
||
| await ensureDirectoryExists(tempDir) | ||
| await ensureDirectoryExists(resourcesDir) | ||
|
|
||
| return new Promise((resolve, reject) => { | ||
| const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json' | ||
|
|
||
|
|
||
| https | ||
| .get(manifestUrl, (res) => { | ||
| let data = '' | ||
|
|
||
| res.on('data', (chunk) => { | ||
| data += chunk | ||
| }) | ||
|
|
||
| res.on('end', async () => { | ||
| try { | ||
| const manifest: Manifest = JSON.parse(data) | ||
|
|
||
| const latestVersion = manifest.versions | ||
| .filter((v) => !v.isDelisted) | ||
| .sort((a, b) => b.serverVersion.localeCompare(a.serverVersion))[0] | ||
|
|
||
| if (!latestVersion) { | ||
| throw new Error('No valid version found in manifest') | ||
| } | ||
|
|
||
| const darwinArm64Target = latestVersion.targets.find( | ||
| (t) => t.platform === 'darwin' && t.arch === 'arm64' | ||
| ) | ||
|
|
||
| if (!darwinArm64Target) { | ||
| throw new Error('No darwin arm64 target found') | ||
| } | ||
|
|
||
| for (const content of darwinArm64Target.contents) { | ||
| const fileName = content.filename | ||
| const fileUrl = content.url | ||
| const expectedHash = content.hashes[0] | ||
| const tempFilePath = path.join(tempDir, fileName) | ||
| const fileFolderName = content.filename.replace('.zip', '') | ||
|
|
||
| console.log(`Downloading ${fileName} from ${fileUrl} ...`) | ||
|
|
||
| await new Promise((downloadResolve, downloadReject) => { | ||
| https | ||
| .get(fileUrl, (fileRes) => { | ||
| const fileStream = fs.createWriteStream(tempFilePath) | ||
| fileRes.pipe(fileStream) | ||
|
|
||
| fileStream.on('finish', () => { | ||
| fileStream.close() | ||
| downloadResolve(void 0) | ||
| }) | ||
|
|
||
| fileStream.on('error', (err) => { | ||
| fs.unlink(tempFilePath, () => {}) | ||
| downloadReject(err) | ||
| }) | ||
| }) | ||
| .on('error', (err) => { | ||
| fs.unlink(tempFilePath, () => {}) | ||
| downloadReject(err) | ||
| }) | ||
| }) | ||
|
|
||
| console.log(`Verifying hash for ${fileName}...`) | ||
leigaol marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const isHashValid = await verifyFileHash(tempFilePath, expectedHash) | ||
|
|
||
| if (!isHashValid) { | ||
| fs.unlinkSync(tempFilePath) | ||
| throw new Error(`Hash verification failed for ${fileName}`) | ||
| } | ||
|
|
||
| console.log(`Extracting ${fileName}...`) | ||
| const zip = new AdmZip(tempFilePath) | ||
| zip.extractAllTo(path.join(resourcesDir, fileFolderName), true) // true for overwrite | ||
|
|
||
| // Clean up temp file | ||
| fs.unlinkSync(tempFilePath) | ||
| console.log(`Successfully processed ${fileName}`) | ||
| } | ||
|
|
||
| // Clean up temp directory | ||
| fs.rmdirSync(tempDir) | ||
| fs.rmdirSync(path.join(resourcesDir, 'servers', 'indexing'), { recursive: true }) | ||
| fs.rmdirSync(path.join(resourcesDir, 'servers', 'ripgrep'), { recursive: true }) | ||
| fs.rmSync(path.join(resourcesDir, 'servers', 'node')) | ||
| if (!fs.existsSync(path.join(resourcesDir, 'servers', 'aws-lsp-codewhisperer.js'))) { | ||
| throw new Error(`Extracting aws-lsp-codewhisperer.js failure`) | ||
| } | ||
| if (!fs.existsSync(path.join(resourcesDir, 'clients', 'amazonq-ui.js'))) { | ||
| throw new Error(`Extracting amazonq-ui.js failure`) | ||
| } | ||
| console.log('Download and extraction completed successfully') | ||
| resolve() | ||
| } catch (err) { | ||
| // Clean up temp directory on error | ||
| if (fs.existsSync(tempDir)) { | ||
| fs.rmdirSync(tempDir, { recursive: true }) | ||
| } | ||
| reject(err) | ||
| } | ||
| }) | ||
| }) | ||
| .on('error', (err) => { | ||
| // Clean up temp directory on error | ||
| if (fs.existsSync(tempDir)) { | ||
| fs.rmdirSync(tempDir, { recursive: true }) | ||
| } | ||
| reject(err) | ||
| }) | ||
| }) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the fallback logic should live in the resolver, just like all the other fallback cases. it doesn't make sense to add a fallback at this level.
this fallback is no different than the other fallback cases in the resolver. it's just yet another fallback scenario.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. In the case of a firewall/anti virus, the resolver believes it successfully finished downloading and it then proceed to start the language server with the download path, but at that moment anti virus kicked in and broke it.
This outmost try catch can handle such cases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't that a bug in the resolver that should be fixed / redesigned ?