watch for token changes

Author: bilucodota

.vscodeignore

@@ -1,7 +1,6 @@
 **
 !out/
 !out/extension.js
-!out/uninstall.js
 !small_logo.png
 !package.json
 !logo.svg

package.json

@@ -94,7 +94,6 @@
   "scripts": {
     "analyze:bundle": "webpack --env analyzeBundle",
     "vscode:prepublish": "yarn --frozen-lockfile && yarn clear-out && webpack --mode production",
-    "vscode:uninstall":"node ./out/uninstall.js",
     "compile": "webpack --mode development --watch",
     "build": "webpack --mode development",
     "test:copyassets": "ncp ./src/test/fixture ./out/test/fixture/",

src/extension.ts

@@ -40,16 +40,13 @@ import {
   loadStateFromGitpodEnvVar,
   persistStateToGitpodEnvVar,
 } from "./gitpod/state";
-import { onSigTerm } from "./utils/utils";
 
 export async function activate(
   context: vscode.ExtensionContext
 ): Promise<void> {
   if (isGitpod) {
-    void loadStateFromGitpodEnvVar();
-    onSigTerm(() => {
-      void persistStateToGitpodEnvVar();
-    });
+    await loadStateFromGitpodEnvVar();
+    void persistStateToGitpodEnvVar();
   }
   void initStartup(context);
   handleSelection(context);
@@ -110,7 +107,6 @@ async function backgroundInit(context: vscode.ExtensionContext) {
 }
 
 export async function deactivate(): Promise<unknown> {
-  if (isGitpod) await persistStateToGitpodEnvVar();
   disposeReporter();
   void closeValidator();
   cancelNotificationsPolling();

src/gitpod/state.ts

@@ -1,9 +1,8 @@
 import * as path from "path";
 import * as os from "os";
-import { promises as fs } from "fs";
+import fs, { promises as fsPromises } from "fs";
 import { setEnvVar } from "./cli";
 import { fromBase64, toBase64 } from "../utils/utils";
-import { asyncExists } from "../utils/file.utils";
 
 const TABNINE_TOKEN_FILE = path.join(
   os.homedir(),
@@ -28,37 +27,37 @@ export async function loadStateFromGitpodEnvVar(): Promise<void> {
   const tabnineConfig = process.env[TABNINE_CONFIG_ENV_VAR];
 
   if (tabnineToken) {
-    try {
-      await fs.writeFile(TABNINE_TOKEN_FILE, fromBase64(tabnineToken));
-    } catch (e) {
-      console.error("Error occurred while trying to load Tabnine token", e);
-    }
+    await fsPromises
+      .writeFile(TABNINE_TOKEN_FILE, fromBase64(tabnineToken))
+      .catch((e) => {
+        console.error("Error occurred while trying to load Tabnine token", e);
+      });
   }
 
   if (tabnineConfig)
-    try {
-      await fs.writeFile(TABNINE_CONFIG_FILE, fromBase64(tabnineConfig));
-    } catch (e) {
-      console.error("Error occurred while trying to load Tabnine config", e);
-    }
+    await fsPromises
+      .writeFile(TABNINE_CONFIG_FILE, fromBase64(tabnineConfig))
+      .catch((e) => {
+        console.error("Error occurred while trying to load Tabnine config", e);
+      });
 }
 
-export async function persistStateToGitpodEnvVar(): Promise<void> {
-  if (await asyncExists(TABNINE_TOKEN_FILE)) {
-    try {
-      const tabnineToken = await fs.readFile(TABNINE_TOKEN_FILE, "utf8");
-      await setEnvVar(TABNINE_TOKEN_ENV_VAR, toBase64(tabnineToken));
-    } catch (e) {
-      console.error("Error occurred while trying to persist Tabnine token", e);
-    }
-  }
-
-  if (await asyncExists(TABNINE_CONFIG_FILE)) {
-    try {
-      const tabnineConfig = await fs.readFile(TABNINE_CONFIG_FILE, "utf8");
-      await setEnvVar(TABNINE_CONFIG_ENV_VAR, toBase64(tabnineConfig));
-    } catch (e) {
-      console.error("Error occurred while trying to persist Tabnine config", e);
-    }
-  }
+export function persistStateToGitpodEnvVar(): void {
+  fs.watch(TABNINE_TOKEN_FILE, (event, filename) => {
+    if (event === "change")
+      void fsPromises
+        .readFile(filename, "utf8")
+        .then((tabnineToken) =>
+          setEnvVar(TABNINE_TOKEN_ENV_VAR, toBase64(tabnineToken))
+        );
+  });
+
+  fs.watch(TABNINE_TOKEN_FILE, (event, filename) => {
+    if (event === "change")
+      void fsPromises
+        .readFile(filename, "utf8")
+        .then((tabnineConfig) =>
+          setEnvVar(TABNINE_CONFIG_ENV_VAR, toBase64(tabnineConfig))
+        );
+  });
 }

src/scripts/uninstall.ts

@@ -67,7 +67,3 @@ export function fromBase64(str: string): string {
 export function toBase64(str: string): string {
   return Buffer.from(str, "utf8").toString("base64");
 }
-
-export function onSigTerm(callback: () => void): void {
-  process.on("SIGTERM", callback);
-}

src/utils/utils.ts

@@ -12,7 +12,6 @@ const config = {
 
   entry: {
     extension: "./src/extension.ts",
-    uninstall: "./src/scripts/uninstall.ts",
   }, // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
   output: {
     // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/