diff --git a/package.json b/package.json index 1fb4512..01db1c3 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "name": "fql", "displayName": "fql", "description": "FQL language support", - "version": "0.0.1", "publisher": "Fauna", + "version": "0.0.1", "engines": { "vscode": "^1.72.0" }, @@ -17,7 +17,8 @@ "main": "./out/extension.js", "dependencies": { "fauna": "^0.9.0", - "vscode-languageclient": "^8.0.2" + "vscode-languageclient": "^8.0.2", + "axios": "^1.4.0" }, "devDependencies": { "@types/glob": "^8.0.0", diff --git a/src/LanguageClientManager.ts b/src/LanguageServer.ts similarity index 71% rename from src/LanguageClientManager.ts rename to src/LanguageServer.ts index d081041..d8a9c3d 100644 --- a/src/LanguageClientManager.ts +++ b/src/LanguageServer.ts @@ -1,14 +1,20 @@ +import * as axios from 'axios'; import * as path from "path"; import * as vscode from "vscode"; import { LanguageClient, LanguageClientOptions, RevealOutputChannelOn, ServerOptions, TransportKind } from "vscode-languageclient/node"; import { ConfigurationChangeSubscription, FQLConfiguration, FQLConfigurationManager } from "./FQLConfigurationManager"; -export class LanguageClientManager implements ConfigurationChangeSubscription { +const serverDownloadUrl = "https://static-assets.fauna.com/fql-analyzer/index.js"; +export class LanguageService implements ConfigurationChangeSubscription { client: LanguageClient; outputChannel: vscode.OutputChannel; + context: vscode.ExtensionContext; + serverLocation: vscode.Uri; constructor(context: vscode.ExtensionContext, outputChannel: vscode.OutputChannel) { this.outputChannel = outputChannel; + this.context = context; + this.serverLocation = vscode.Uri.joinPath(this.context.globalStorageUri, `fql-analyzer.js`); // The server is implemented in node const serverModule = context.asAbsolutePath( @@ -31,7 +37,7 @@ export class LanguageClientManager implements ConfigurationChangeSubscription { // Otherwise the run options are used const serverOptions: ServerOptions = { run: { - module: serverModule, + module: this.serverLocation.path, transport: TransportKind.ipc, }, debug: { @@ -61,6 +67,23 @@ export class LanguageClientManager implements ConfigurationChangeSubscription { this.client = new LanguageClient("fql", "FQL", serverOptions, clientOptions); } + async start() { + let exists = await vscode.workspace.fs.stat(this.serverLocation).then( + () => true, + () => false, + ); + + // todo: going to want to resfresh this at some point + // https://faunadb.atlassian.net/browse/ENG-5306 + if (!exists) { + await vscode.workspace.fs.createDirectory(this.context.globalStorageUri); + const response = await axios.default.get(serverDownloadUrl, { responseType: 'arraybuffer' }); + await vscode.workspace.fs.writeFile(this.serverLocation, response.data); + } + + await this.client.start(); + } + async configChanged(updatedConfiguration: FQLConfiguration) { const resp = await this.client.sendRequest("setFaunaSecret", { secret: updatedConfiguration.dbSecret }) as any; this.outputChannel.clear(); diff --git a/src/RunQueryHandler.ts b/src/RunQueryHandler.ts index e99f666..c8bcf17 100644 --- a/src/RunQueryHandler.ts +++ b/src/RunQueryHandler.ts @@ -55,7 +55,5 @@ export class RunQueryHandler implements ConfigurationChangeSubscription { this.outputChannel.appendLine((e as any).toString()); } } - }; - } \ No newline at end of file diff --git a/src/extension.ts b/src/extension.ts index fb5d22f..0b53897 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -6,7 +6,7 @@ import { import * as vscode from "vscode"; import { FQLConfigurationManager } from "./FQLConfigurationManager"; -import { LanguageClientManager } from "./LanguageClientManager"; +import { LanguageService } from "./LanguageServer"; import { RunQueryHandler } from "./RunQueryHandler"; // This method is called when your extension is activated @@ -33,18 +33,18 @@ export async function activate(context: vscode.ExtensionContext) { context.subscriptions.push(disposable); // Create the language client and start the client. - const clientManager = new LanguageClientManager(context, outputChannel); + const languageService = new LanguageService(context, outputChannel); // subscribe the entities that want to know when configuration changes fqlConfigManager.subscribeToConfigurationChanges(runQueryHandler); - fqlConfigManager.subscribeToConfigurationChanges(clientManager); + fqlConfigManager.subscribeToConfigurationChanges(languageService); vscode.workspace.onDidChangeConfiguration(event => fqlConfigManager.onConfigurationChange(event)); // Start the client. This will also launch the server - await clientManager.client.start(); + await languageService.start(); // used to initialize the lsp service with the starting configuration - await clientManager.configChanged(fqlConfigManager.config()); + await languageService.configChanged(fqlConfigManager.config()); } // This method is called when your extension is deactivated diff --git a/yarn.lock b/yarn.lock index 4af68b8..8a5bfc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -314,6 +314,20 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +axios@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -405,6 +419,13 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -441,6 +462,11 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + diff@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" @@ -667,6 +693,11 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + foreground-child@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" @@ -675,6 +706,15 @@ foreground-child@^3.1.0: cross-spawn "^7.0.0" signal-exit "^4.0.1" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -981,6 +1021,18 @@ micromatch@^4.0.4: braces "^3.0.2" picomatch "^2.3.1" +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + minimatch@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" @@ -1159,6 +1211,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + punycode@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" @@ -1277,6 +1334,7 @@ slash@^3.0.0: integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0: + name string-width-cjs version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1420,6 +1478,7 @@ workerpool@6.2.1: integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + name wrap-ansi-cjs version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==