Merge pull request #2 from arangodb-helper/3.4-fixes

Fixes found during 3.4 tests

Author: mchacki

package.json

@@ -1,6 +1,6 @@
 {
   "name": "arangodb-instance-manager",
-  "version": "0.1.3",
+  "version": "1.0.0",
   "author": "ArangoDB GmbH",
   "license": "Apache-2.0",
   "description": "Node server to manage ArangoDB instances",
@@ -15,7 +15,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@types/request-promise": "^4.1.41",
+    "@types/request-promise-native": "^1.0.15",
     "arangojs": "^6.2.4",
     "dedent": "^0.7.0",
     "express": "^4.16.3",
@@ -26,7 +26,7 @@
     "path": "^0.12.7",
     "portfinder": "^1.0.13",
     "request": "^2.85.0",
-    "request-promise": "^4.2.2",
+    "request-promise-native": "^1.0.5",
     "rmfr": "^2.0.0",
     "tmp": "^0.0.33",
     "which": "^1.3.0"
@@ -45,4 +45,4 @@
   "scripts": {
     "compile": "tsc -p . --outDir ./lib/"
   }
-}
+}

src/Instance.ts

@@ -1,4 +1,8 @@
 import { ChildProcess } from "child_process";
+import VersionResponse from "./VersionResponse";
+
+export type Role = "agent" | "primary" | "coordinator" | "single";
+export type Status = "NEW" | "RUNNING" | "STOPPED" | "EXITED" | "KILLED";
 
 export default interface Instance {
   name: string;
@@ -7,9 +11,11 @@ export default interface Instance {
   binary?: string;
   args: string[];
   port?: string;
-  status: string;
+  status: Status;
   exitcode: number | null;
   process: ChildProcess | null;
   logFn: (line: string) => void;
-  role: string;
+  role: Role;
+  id?: string;
+  version?: VersionResponse;
 }