Merge pull request #158 from codefori/feature/local_server_component

Feature/local server component

Author: worksofliam

.vscodeignore

@@ -10,4 +10,6 @@ vsc-extension-quickstart.md
 media/main.png
 node_modules
 src
-types
+types
+.github
+src/dsc.ts

README.md

@@ -24,4 +24,5 @@ As of 0.3.0, the Db2 for i extension requires a server component. The component
 1. This project requires VS Code and Node.js.
 2. fork & clone repo
 3. `npm i`
+4. `npm run dsc` (to fetch the Server Component)
 4. 'Run Extension' from vscode debug.

package.json

@@ -561,8 +561,9 @@
     "lint": "eslint .",
     "pretest": "npm run lint",
     "language:test": "vitest",
+    "dsc": "mkdir -p dist && npx tsx src/dsc",
     "package": "vsce package",
-    "vscode:prepublish": "webpack --mode production",
+    "vscode:prepublish": "rm -rf dist && webpack --mode production && npm run dsc",
     "webpack": "webpack --mode development",
     "webpack-dev": "webpack --mode development --watch",
     "typings": "npx -p typescript tsc ./src/extension.ts --declaration --allowJs --emitDeclarationOnly --outDir types --esModuleInterop -t es2019 --moduleResolution node"

src/connection/SCVersion.ts

@@ -0,0 +1,3 @@
+
+export const SERVER_VERSION_TAG = `v1.2.0`;
+export const SERVER_VERSION_FILE = `codeforiserver-1.2.0.jar`;

src/connection/serverComponent.ts

@@ -1,20 +1,13 @@
 import { getInstance } from "../base";
 
 import { Octokit } from "octokit";
-import fetch from 'node-fetch';
 
 import { Config } from "../config";
 import path from "path";
-import { OutputChannel, commands, window } from "vscode";
+import { OutputChannel, extensions, window } from "vscode";
 
-import { writeFile, unlink } from "fs/promises";
-import os from "os";
-
-const octokit = new Octokit();
-
-// During development, you can set the SERVER_VERSION in .vscode/launch.json
-// Otherwise, fall back to the working version
-const SERVER_VERSION = process.env[`SERVER_VERSION`] || `v1.2.0`;
+import { stat } from "fs/promises";
+import { SERVER_VERSION_FILE } from "./SCVersion";
 
 const ExecutablePathDir = `$HOME/.vscode/`;
 
@@ -90,79 +83,54 @@ export class ServerComponent {
    */
   public static async checkForUpdate(): Promise<UpdateStatus> {
     let updateResult: UpdateStatus = UpdateStatus.NONE_AVAILABLE;
+
+    const extensionPath = extensions.getExtension(`halcyontechltd.vscode-db2i`).extensionPath;
     const instance = getInstance();
     const connection = instance.getConnection();
 
-    const owner = `ThePrez`;
-    const repo = `CodeForIBMiServer`;
-
     try {
-      const result = await octokit.request(`GET /repos/{owner}/{repo}/releases/tags/${SERVER_VERSION}`, {
-        owner,
-        repo,
-        headers: {
-          'X-GitHub-Api-Version': '2022-11-28'
-        }
-      });
+      const assetPath = path.join(extensionPath, `dist`, SERVER_VERSION_FILE);
+      const assetExists = await exists(assetPath);
 
-      ServerComponent.writeOutput(JSON.stringify(result));
+      ServerComponent.writeOutput(JSON.stringify({assetPath, assetExists}));
 
-      const newAsset = result.data.assets.find(asset => asset.name.endsWith(`.jar`));
-
-      if (newAsset) {
-        const url = newAsset.browser_download_url;
-        const basename = newAsset.name;
+      if (assetExists) {
+        const basename = SERVER_VERSION_FILE;
         const lastInstalledName = Config.getServerComponentName();
 
-        if (lastInstalledName !== basename || this.installed === false) {
-          const updateQuestion = await window.showInformationMessage(
-            `Database Extension update required`, 
-            {
-              modal: true,
-              detail: `An update to the database server component is required: ${basename}`
-            }, 
-            `Update`
-          );
-
-          if (updateQuestion === `Update`) {
-            // This means we're currently running a different version, 
-            // or maybe not at all (currentlyInstalled can be undefined)
-
-            // First, we need their home directory
-            const commandResult = await connection.sendCommand({
-              command: `echo ${ExecutablePathDir}`
-            });
-
-            if (commandResult.code === 0 && commandResult.stderr === ``) {
-              const remotePath = path.posix.join(commandResult.stdout, basename)
+        ServerComponent.writeOutput(JSON.stringify({basename, lastInstalledName}));
 
-              const tempFile = path.join(os.tmpdir(), basename);
+        if (lastInstalledName !== basename || this.installed === false) {
+          // This means we're currently running a different version, 
+          // or maybe not at all (currentlyInstalled can be undefined)
 
-              await downloadFile(url, tempFile);
+          // First, we need their home directory
+          const commandResult = await connection.sendCommand({
+            command: `echo ${ExecutablePathDir}`
+          });
 
-              await connection.uploadFiles([{local: tempFile, remote: remotePath}]);
+          if (commandResult.code === 0 && commandResult.stderr === ``) {
+            const remotePath = path.posix.join(commandResult.stdout, basename);
 
-              // Clean up the temp file
-              unlink(tempFile);
+            ServerComponent.writeOutput(JSON.stringify({remotePath, ExecutablePathDir}));
 
-              await Config.setServerComponentName(basename);
+            await connection.uploadFiles([{local: assetPath, remote: remotePath}]);
 
-              window.showInformationMessage(`Db2 for IBM i extension server component has been updated!`);
-              this.installed = true;
-              updateResult = UpdateStatus.JUST_UPDATED;
-              
-            } else {
-              updateResult = UpdateStatus.FAILED;
+            await Config.setServerComponentName(basename);
 
-              this.writeOutput(JSON.stringify(commandResult));
-              window.showErrorMessage(`Something went really wrong when trying to fetch your home directory.`).then(chosen => {
-                if (chosen === `Show`) {
-                  this.outputChannel.show();
-                }
-              });
-            }
+            window.showInformationMessage(`Db2 for IBM i extension server component has been updated!`);
+            this.installed = true;
+            updateResult = UpdateStatus.JUST_UPDATED;
+            
           } else {
-            updateResult = UpdateStatus.DECLINED_UPDATE;
+            updateResult = UpdateStatus.FAILED;
+
+            this.writeOutput(JSON.stringify(commandResult));
+            window.showErrorMessage(`Something went really wrong when trying to fetch your home directory.`).then(chosen => {
+              if (chosen === `Show`) {
+                this.outputChannel.show();
+              }
+            });
           }
 
         } else {
@@ -172,9 +140,10 @@ export class ServerComponent {
 
       } else {
         // Uh oh. A release was made by there's no jar file??
-        ServerComponent.writeOutput('Unable to get file name from server component release');
+        ServerComponent.writeOutput('Unable to get file name from server component release.');
         updateResult = UpdateStatus.NONE_AVAILABLE;
       }
+
     } catch (e) {
       updateResult = UpdateStatus.FAILED;
       ServerComponent.writeOutput(JSON.stringify(e));
@@ -191,8 +160,11 @@ export class ServerComponent {
   }
 }
 
-function downloadFile(url, outputPath) {
-  return fetch(url)
-      .then(x => x.arrayBuffer())
-      .then(x => writeFile(outputPath, Buffer.from(x)));
-}
+async function exists(path: string) {
+  try {
+    await stat(path);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}

src/dsc.ts

@@ -0,0 +1,53 @@
+import path from "path";
+
+import fetch from "node-fetch";
+import { Octokit } from "octokit";
+import { writeFile } from "fs/promises";
+import { SERVER_VERSION_TAG } from "./connection/SCVersion";
+
+async function work() {
+  const octokit = new Octokit();
+
+  const owner = `ThePrez`;
+  const repo = `CodeForIBMiServer`;
+
+  try {
+    const result = await octokit.request(`GET /repos/{owner}/{repo}/releases/tags/${SERVER_VERSION_TAG}`, {
+      owner,
+      repo,
+      headers: {
+        'X-GitHub-Api-Version': '2022-11-28'
+      }
+    });
+
+    const newAsset = result.data.assets.find(asset => asset.name.endsWith(`.jar`));
+
+    if (newAsset) {
+      console.log(`Asset found: ${newAsset.name}`);
+
+      const url = newAsset.browser_download_url;
+      const basename = newAsset.name;
+
+      const dist = path.join(`.`, `dist`, basename);
+
+      await downloadFile(url, dist);
+
+      console.log(`Asset downloaded.`);
+
+    } else {
+      console.log(`Release found but no asset found.`);
+    }
+
+
+  } catch (e) {
+    console.log(e);
+  }
+}
+
+function downloadFile(url, outputPath) {
+  return fetch(url)
+      .then(x => x.arrayBuffer())
+      .then(x => writeFile(outputPath, Buffer.from(x)));
+}
+
+work();

src/extension.ts

@@ -27,7 +27,7 @@ export interface Db2i {
 // your extension is activated the very first time the command is executed
 
 export function activate(context: vscode.ExtensionContext): Db2i {
-
+  
   // Use the console to output diagnostic information (console.log) and errors (console.error)
   // This line of code will only be executed once when your extension is activated
   console.log(`Congratulations, your extension "vscode-db2i" is now active!`);