Merge branch 'main' into dev

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

Author: worksofliam

package.json

@@ -36,7 +36,7 @@
     "lint": "eslint .",
     "pretest": "npm run lint",
     "language:test": "vitest",
-    "dsc": "mkdir -p dist && npx tsx src/dsc",
+    "dsc": "npx tsx src/dsc",
     "package": "vsce package",
     "vscode:prepublish": "rm -rf dist && webpack --mode production && npm run dsc",
     "webpack": "webpack --mode development",
@@ -1325,4 +1325,4 @@
     "showdown": "^2.1.0",
     "sql-formatter": "^14.0.0"
   }
-}
+}

src/connection/serverComponent.ts

@@ -1,12 +1,16 @@
 import { getInstance } from "../base";
 
-import { Config } from "../config";
 import path from "path";
 import { OutputChannel, extensions, window } from "vscode";
+import { Config } from "../config";
 
 import { stat } from "fs/promises";
 import { SERVER_VERSION_FILE } from "./SCVersion";
 
+import IBMi from "@halcyontech/vscode-ibmi-types/api/IBMi";
+import Crypto from 'crypto';
+import { readFileSync } from "fs";
+
 const ExecutablePathDir = `$HOME/.vscode/`;
 
 export enum UpdateStatus {
@@ -33,7 +37,7 @@ export class ServerComponent {
     if (show) {
       this.outputChannel.show();
     }
-    
+
     if (this.outputChannel) {
       this.outputChannel.appendLine(jsonString);
     }
@@ -43,15 +47,15 @@ export class ServerComponent {
     return this.installed;
   }
 
-  static getInitCommand(): string|undefined {
+  static getInitCommand(): string | undefined {
     const path = this.getComponentPath();
 
     if (path) {
       return `/QOpenSys/QIBM/ProdData/JavaVM/jdk80/64bit/bin/java -Dos400.stdio.convert=N -jar ${path} --single`
     }
   }
 
-  static getComponentPath(): string|undefined {
+  static getComponentPath(): string | undefined {
     if (Config.ready) {
       const installedVersion = Config.getServerComponentName();
 
@@ -82,6 +86,10 @@ export class ServerComponent {
     return this.installed;
   }
 
+  static reset(){
+    this.installed = false;
+  }
+
   static async isAlreadyInstalled() {
     const instance = getInstance();
     const connection = instance.getConnection();
@@ -107,13 +115,13 @@ export class ServerComponent {
       const assetPath = path.join(extensionPath, `dist`, SERVER_VERSION_FILE);
       const assetExistsLocally = await exists(assetPath);
 
-      ServerComponent.writeOutput(JSON.stringify({assetPath, assetExists: assetExistsLocally}));
+      ServerComponent.writeOutput(JSON.stringify({ assetPath, assetExists: assetExistsLocally }));
 
       if (assetExistsLocally) {
         const basename = SERVER_VERSION_FILE;
         const lastInstalledName = Config.getServerComponentName();
 
-        ServerComponent.writeOutput(JSON.stringify({basename, lastInstalledName}));
+        ServerComponent.writeOutput(JSON.stringify({ basename, lastInstalledName }));
 
         await this.initialise();
 
@@ -132,26 +140,49 @@ export class ServerComponent {
             const stuffInStderr = commandResult.stderr.length > 0;
             const remotePath = path.posix.join(commandResult.stdout, basename);
 
-            ServerComponent.writeOutput(JSON.stringify({remotePath, ExecutablePathDir}));
+            ServerComponent.writeOutput(JSON.stringify({ remotePath, ExecutablePathDir }));
+
+            const remoteExists = await connection.content.testStreamFile(remotePath, "f");
+            const md5IsEqual = remoteExists && await compareMD5Hash(connection, assetPath, remotePath);
+            if (!remoteExists || !md5IsEqual) {
+              if (remoteExists) {
+                const allowWrite = await connection.sendCommand({
+                  command: `chmod 600 ${remotePath}`
+                });
+                if (allowWrite.code !== 0) {
+                  this.writeOutput(JSON.stringify(allowWrite));
+                  window.showErrorMessage(`Remote file ${remotePath} cannot be written; try to delete it and reconnect.`, 'Show')
+                    .then(show => {
+                      if (show) {
+                        this.outputChannel.show();
+                      }
+                    });
+                  return UpdateStatus.FAILED;
+                }
+              }
+              await connection.uploadFiles([{ local: assetPath, remote: remotePath }]);
 
-            await connection.uploadFiles([{local: assetPath, remote: remotePath}]);
+              const scAuth = await connection.sendCommand({
+                command: `chmod 400 ${remotePath}`
+              });
 
-            const scAuth = await connection.sendCommand({
-              command: `chmod 400 ${remotePath}`
-            });
+              this.writeOutput(JSON.stringify(scAuth));
 
-            this.writeOutput(JSON.stringify(scAuth));
+              await Config.setServerComponentName(basename);
 
-            await Config.setServerComponentName(basename);
+              if (stuffInStderr) {
+                ServerComponent.writeOutput(`Server component was uploaded to ${remotePath} but there was something in stderr, which is not right. It might be worth seeing your user profile startup scripts.`);
+              }
 
-            if (stuffInStderr) {
-              ServerComponent.writeOutput(`Server component was uploaded to ${remotePath} but there was something in stderr, which is not right. It might be worth seeing your user profile startup scripts.`);
+              window.showInformationMessage(`Db2 for IBM i extension server component has been updated!`);
+              this.installed = true;
+              updateResult = UpdateStatus.JUST_UPDATED;
+            }
+            else{
+              await Config.setServerComponentName(basename);
+              this.installed = true;
+              updateResult = UpdateStatus.UP_TO_DATE;
             }
-
-            window.showInformationMessage(`Db2 for IBM i extension server component has been updated!`);
-            this.installed = true;
-            updateResult = UpdateStatus.JUST_UPDATED;
-            
           } else {
             updateResult = UpdateStatus.FAILED;
 
@@ -196,4 +227,20 @@ async function exists(path: string) {
   } catch (e) {
     return false;
   }
+}
+
+async function compareMD5Hash(connection: IBMi, local: string, remote: string) {
+  const localMD5 = Crypto.createHash("md5")
+    .update(readFileSync(local))
+    .digest("hex")
+    .toLowerCase();
+
+  const remoteMD5Result = (await connection.sendCommand({ command: `${connection.remoteFeatures.md5sum} ${remote}` }));
+  if (remoteMD5Result.code === 0) {
+    return localMD5 === remoteMD5Result.stdout.split(/\s+/)[0];
+  }
+  else {
+    ServerComponent.writeOutput(JSON.stringify(remoteMD5Result));
+    return false;
+  }
 }

src/dsc.ts

@@ -1,8 +1,9 @@
 import path from "path";
 
+import { existsSync, mkdirSync } from "fs";
+import { writeFile } from "fs/promises";
 import fetch from "node-fetch";
 import { Octokit } from "octokit";
-import { writeFile } from "fs/promises";
 import { SERVER_VERSION_FILE, SERVER_VERSION_TAG } from "./connection/SCVersion";
 
 async function work() {
@@ -26,12 +27,15 @@ async function work() {
       console.log(`Asset found: ${newAsset.name}`);
 
       const url = newAsset.browser_download_url;
+      const distDirectory = path.join(`.`, `dist`);
+      if (!existsSync(distDirectory)) {
+        mkdirSync(distDirectory);
+      }
 
-      const dist = path.join(`.`, `dist`, SERVER_VERSION_FILE);
-
-      await downloadFile(url, dist);
+      const serverFile = path.join(distDirectory, SERVER_VERSION_FILE);
+      await downloadFile(url, serverFile);
 
-      console.log(`Asset downloaded.`);
+      console.log(`Asset downloaded: ${serverFile}`);
 
     } else {
       console.log(`Release found but no asset found.`);
@@ -45,8 +49,8 @@ async function work() {
 
 function downloadFile(url, outputPath) {
   return fetch(url)
-      .then(x => x.arrayBuffer())
-      .then(x => writeFile(outputPath, Buffer.from(x)));
+    .then(x => x.arrayBuffer())
+    .then(x => writeFile(outputPath, Buffer.from(x)));
 }
 
 work();

src/extension.ts

@@ -1,28 +1,28 @@
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
-import vscode from "vscode"
+import * as vscode from "vscode";
 import schemaBrowser from "./views/schemaBrowser";
 
 import * as JSONServices from "./language/json";
 import * as resultsProvider from "./views/results";
 
+import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
 import { getInstance, loadBase } from "./base";
-import { JobManager, onConnectOrServerInstall, initConfig } from "./config";
-import { queryHistory } from "./views/queryHistoryView";
-import { ExampleBrowser } from "./views/examples/exampleBrowser";
-import { languageInit } from "./language/providers";
-import { initialiseTestSuite } from "./testing";
-import { JobManagerView } from "./views/jobManager/jobManagerView";
-import { ServerComponent } from "./connection/serverComponent";
+import { JobManager, initConfig, onConnectOrServerInstall } from "./config";
+import Configuration from "./configuration";
 import { SQLJobManager } from "./connection/manager";
+import { ServerComponent } from "./connection/serverComponent";
 import { OldSQLJob } from "./connection/sqlJob";
+import { languageInit } from "./language/providers";
+import { DbCache } from "./language/providers/logic/cache";
 import { notebookInit } from "./notebooks/IBMiSerializer";
+import { initialiseTestSuite } from "./testing";
+import { Db2iUriHandler, getStatementUri } from "./uriHandler";
+import { ExampleBrowser } from "./views/examples/exampleBrowser";
+import { JobManagerView } from "./views/jobManager/jobManagerView";
 import { SelfTreeDecorationProvider, selfCodesResultsView } from "./views/jobManager/selfCodes/selfCodesResultsView";
-import Configuration from "./configuration";
+import { queryHistory } from "./views/queryHistoryView";
 import { activateChat } from "./chat/chat";
-import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
-import { Db2iUriHandler, getStatementUri } from "./uriHandler";
-import { DbCache } from "./language/providers/logic/cache";
 
 export interface Db2i {
   sqlJobManager: SQLJobManager,
@@ -42,7 +42,7 @@ interface IDB2ChatResult extends vscode.ChatResult {
 // 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!`);
@@ -90,7 +90,7 @@ export function activate(context: vscode.ExtensionContext): Db2i {
 
   console.log(`Developer environment: ${process.env.DEV}`);
   const devMode = process.env.DEV !== undefined;
-  let runTests: Function|undefined;
+  let runTests: Function | undefined;
   if (devMode) {
     // Run tests if not in production build
     runTests = initialiseTestSuite(context);
@@ -159,6 +159,7 @@ export function activate(context: vscode.ExtensionContext): Db2i {
 
 
 
+  instance.subscribe(context, `disconnected`, `db2i-disconnected`, () => ServerComponent.reset());
 
   return { sqlJobManager: JobManager, sqlJob: (options?: JDBCOptions) => new OldSQLJob(options) };
 }