Reuse IMongoDBDownloadOptions from mongodb-download (#56)

Author: fedotov

.gitignore

@@ -3,3 +3,4 @@ node_modules
 dist
 *.log
 *.swp
+.idea

src/mongo-bins.ts

@@ -1,35 +1,30 @@
 const Debug: any = require('debug');
 import { resolve as resolvePath } from 'path';
 import { SpawnOptions, ChildProcess, spawn as spawnChild } from 'child_process';
-import { IMongoDBDownloadOpts } from './mongod-helper';
+import { IMongoDBDownloadOptions } from 'mongodb-download';
 import { MongoDBPrebuilt } from './mongodb-prebuilt';
 import { MongoSupervise } from './mongodb-supervise';
-import { MongoDBDownload } from 'mongodb-download';
 
 export class MongoBins {
-  command: string;
-  execPath: string;
   debug: any;
   childProcess: ChildProcess;
   mongoSupervice: MongoSupervise;
   mongoDBPrebuilt: MongoDBPrebuilt;
 
   constructor(
-    command: string,
+    public command: string,
     public commandArguments: string[] = [],
     public spawnOptions: SpawnOptions = {},
-
-    downloadOptions?: IMongoDBDownloadOpts
+    downloadOptions?: Partial<IMongoDBDownloadOptions>
   ) {
 
     this.debug = Debug(`mongodb-prebuilt-MongoBins`);
-    this.command = command;
+
     if (downloadOptions) {
       this.mongoDBPrebuilt = new MongoDBPrebuilt(downloadOptions);
     } else {
       this.mongoDBPrebuilt = new MongoDBPrebuilt();
     }
-
   }
 
   run(): Promise<boolean> {
@@ -87,4 +82,4 @@ export class MongoBins {
     });
   }
 
-}
+}

src/mongod-helper.ts

@@ -1,24 +1,17 @@
 import { MongoBins } from './mongo-bins';
+import { IMongoDBDownloadOptions } from 'mongodb-download';
 const Debug: any = require('debug');
 
 const COMMAND: string = "mongod";
 
-export interface IMongoDBDownloadOpts {
-  platform?: string;
-  arch?: string;
-  version?: string;
-  downloadDir?: string;
-  http?: any;
-}
-
 export class MongodHelper {
   mongoBin: MongoBins;
   debug: any;
 
   private resolveLink: (response: boolean) => void = () => { };
   private rejectLink: (response: string) => void = () => { };
 
-  constructor(commandArguments: string[] = [], downloadOptions?: IMongoDBDownloadOpts) {
+  constructor(commandArguments: string[] = [], downloadOptions?: Partial<IMongoDBDownloadOptions>) {
     if (downloadOptions) {
       this.mongoBin = new MongoBins(COMMAND, commandArguments, {}, downloadOptions);
     } else {

src/mongodb-prebuilt.ts

@@ -2,19 +2,17 @@ const Debug: any = require('debug');
 const { Glob } = require("glob");
 import { resolve as resolvePath } from 'path';
 import { homedir as osHomeDir } from 'os';
-import { MongoDBDownload } from 'mongodb-download';
-import { IMongoDBDownloadOpts } from './mongod-helper';
-
+import { IMongoDBDownloadOptions, MongoDBDownload } from 'mongodb-download';
 
 export class MongoDBPrebuilt {
   private debug: any;
   private binPath: string;
 
-  constructor(public mongoDBDownload?: MongoDBDownload | IMongoDBDownloadOpts) {
+  constructor(public mongoDBDownload?: MongoDBDownload | Partial<IMongoDBDownloadOptions>) {
     this.debug = Debug('mongodb-prebuilt-MongoDBPrebuilt');
 
     if (!this.mongoDBDownload || !(this.mongoDBDownload instanceof MongoDBDownload)) {
-      const downloadOpts: IMongoDBDownloadOpts = this.mongoDBDownload as IMongoDBDownloadOpts || {
+      const downloadOpts: Partial<IMongoDBDownloadOptions> = this.mongoDBDownload as Partial<IMongoDBDownloadOptions> || {
         downloadDir: this.getHomeDirectory()
       };
       downloadOpts.downloadDir = downloadOpts.downloadDir || this.getHomeDirectory();
@@ -77,4 +75,3 @@ export class MongoDBPrebuilt {
   }
 
 }
-