fixed connection settings

Author: daimor

.vscodeignore

@@ -1,9 +1,10 @@
+.github/**
 .vscode/**
 .vscode-test/**
 out/test/**
-src/**
+**/*.ts
+**/*.map
 .gitignore
 **/tsconfig.json
+**/tslint.json
 **/.eslintrc.json
-**/*.map
-**/*.ts

connection.schema.json

@@ -5,7 +5,8 @@
     "namespace": {
       "title": "Namespace",
       "type": "string",
-      "minLength": 1
+      "minLength": 1,
+      "default": "USER"
     },
     "username": {
       "title": "Username",
@@ -24,6 +25,7 @@
     }
   },
   "properties": {
+    "namespace": { "$ref": "#/definitions/namespace" },
     "connectionMethod": {
       "title": "Connect using",
       "type": "string",
@@ -52,7 +54,6 @@
               "default": 52773,
               "type": "integer"
             },
-            "namespace": { "$ref": "#/definitions/namespace" },
             "username": { "$ref": "#/definitions/username" },
             "askForPassword": { "$ref": "#/definitions/askForPassword" }
           },
@@ -69,7 +70,7 @@
               "minLength": 1
             }
           },
-          "required": ["connectString"]
+          "required": ["serverName"]
         }
       ]
     },
@@ -87,6 +88,6 @@
     }
   },
   "required": [
-    "connectionMethod"
+    "connectionMethod", "namespace"
   ]
 }

package.json

@@ -47,7 +47,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.5.5",
     "@types/node": "^14.0.14",
-    "@types/vscode": "^1.42.0",
+    "@types/vscode": "^1.46.0",
     "typescript": "^3.7.3"
   }
 }

src/ls/driver.ts

@@ -2,33 +2,48 @@ import AbstractDriver from '@sqltools/base-driver';
 import queries from './queries';
 import { IConnectionDriver, MConnectionExplorer, NSDatabase, ContextValue, Arg0 } from '@sqltools/types';
 import { v4 as generateId } from 'uuid';
-import IRISdb, { IRISConfiguration } from './irisdb';
+import IRISdb, { IRISDirect } from './irisdb';
 import keywordsCompletion from './keywords';
+// import { workspace } from "vscode";
 
 type DriverOptions = any;
 
 export default class IRISDriver extends AbstractDriver<IRISdb, DriverOptions> implements IConnectionDriver {
 
   queries = queries;
-  
+
   public async open() {
     if (this.connection) {
       return this.connection;
     }
 
-    let config: IRISConfiguration;
+    const { namespace } = this.credentials;
+    let config: IRISDirect;
     if (this.credentials.serverName) {
+      // const serverName = this.credentials.serverName;
+      // const server = workspace.getConfiguration(`intersystems.servers.${serverName}.webServer`);
+      // let { scheme, host, port, pathPrefix, username, password } = server;
+      // config = {
+      //   https: scheme === "https",
+      //   host,
+      //   port,
+      //   pathPrefix,
+      //   namespace,
+      //   username,
+      //   password
+      // };
+    } else {
+      let { https, server: host, port, pathPrefix, username, password } = this.credentials;
       config = {
-        serverName: this.credentials.serverName
+        https,
+        host,
+        port,
+        pathPrefix,
+        namespace,
+        username,
+        password
       };
     }
-    else {
-      config = {
-        host: this.credentials.server,
-        port: this.credentials.port,
-        namespace: this.credentials.namespace
-      }
-    }
 
     const irisdb = new IRISdb(config);
     return irisdb.open()
@@ -54,7 +69,7 @@ export default class IRISDriver extends AbstractDriver<IRISdb, DriverOptions> im
       resultsAgg.push({
         cols: Object.keys(queryResult[0]),
         connId: this.getId(),
-        messages: [{ date: new Date(), message: `Query ok with ${queryResult.length} results`}],
+        messages: [{ date: new Date(), message: `Query ok with ${queryResult.length} results` }],
         results: queryResult,
         query: queries.toString(),
         requestId: opt.requestId,

src/ls/irisdb.ts

@@ -2,36 +2,24 @@ import * as httpModule from "http";
 import * as httpsModule from "https";
 import requestPromise from "request-promise";
 
-interface IRISDirect {
+export class IRISDirect {
   https?: boolean;
   host: string;
   port: number;
+  pathPrefix?: string;
   namespace: string;
   username?: string;
   password?: string;
 }
 
-interface IRISServerManager {
-  serverName: string;
-}
-
-export type IRISConfiguration = IRISDirect | IRISServerManager;
-
 export default class IRISdb {
 
   private config: IRISDirect;
   private cookies: string[] = [];
   private apiVersion = 1;
 
-  public constructor(config: IRISConfiguration) {
-    this.config = {
-      https: false,
-      host: 'localhost',
-      port: 52774,
-      namespace: 'LIBERO',
-      username: '_SYSTEM',
-      password: 'SYS'
-    };
+  public constructor(config: IRISDirect) {
+    this.config = config;
     this.config.namespace = this.config.namespace.toUpperCase();
   }
 
@@ -109,7 +97,7 @@ export default class IRISdb {
     return auth.then(cookie => 
         requestPromise({
           agent,
-          auth: { username, password, sendImmediately: true },
+          auth: { user: username, pass: password, sendImmediately: true },
           body: ["PUT", "POST"].includes(method) ? body : null,
           headers: {
             ...headers,

src/ls/plugin.ts

@@ -1,11 +1,11 @@
 import { ILanguageServerPlugin } from '@sqltools/types';
-import YourDriver from './driver';
+import IRISDriver from './driver';
 import { DRIVER_ALIASES } from './../constants';
 
 const InterSystemsPlugin: ILanguageServerPlugin = {
   register(server) {
     DRIVER_ALIASES.forEach(({ value }) => {
-      server.getContext().drivers.set(value, YourDriver as any);
+      server.getContext().drivers.set(value, IRISDriver as any);
     });
   }
 }