Second attempt to initialise when connect event fails

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/connection/serverComponent.ts

@@ -67,13 +67,30 @@ export class ServerComponent {
     const instance = getInstance();
     const connection = instance.getConnection();
 
+    if (!connection) {
+      return false;
+    }
+
+    if (!Config.ready) {
+      Config.setConnectionName(connection.currentConnectionName);
+    }
+
+    if (!this.installed) {
+      this.installed = await this.isAlreadyInstalled();
+    }
+
+    return this.installed;
+  }
+
+  static async isAlreadyInstalled() {
+    const instance = getInstance();
+    const connection = instance.getConnection();
+
     const exists = await connection.sendCommand({
       command: `ls ${this.getComponentPath()}`
     });
 
-    this.installed = (exists.code === 0);
-
-    return this.installed;
+    return (exists.code === 0);
   }
 
   /**
@@ -88,16 +105,18 @@ export class ServerComponent {
 
     try {
       const assetPath = path.join(extensionPath, `dist`, SERVER_VERSION_FILE);
-      const assetExists = await exists(assetPath);
+      const assetExistsLocally = await exists(assetPath);
 
-      ServerComponent.writeOutput(JSON.stringify({assetPath, assetExists}));
+      ServerComponent.writeOutput(JSON.stringify({assetPath, assetExists: assetExistsLocally}));
 
-      if (assetExists) {
+      if (assetExistsLocally) {
         const basename = SERVER_VERSION_FILE;
         const lastInstalledName = Config.getServerComponentName();
 
         ServerComponent.writeOutput(JSON.stringify({basename, lastInstalledName}));
 
+        await this.initialise();
+
         if (lastInstalledName !== basename || this.installed === false) {
           // This means we're currently running a different version, 
           // or maybe not at all (currentlyInstalled can be undefined)