fix(config): use only api server

AKASHAorg · Sep 27, 2016 · 76df551 · 76df551
1 parent 02ad2ee
commit 76df551
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/IpfsConnector.ts b/src/IpfsConnector.ts
@@ -51,6 +51,9 @@ export class IpfsConnector extends EventEmitter {
                  */
                 return this.emit(events.SERVICE_STARTED);
             }
+            if(data.includes('API server')){
+                this.options.apiAddress = data.toString().trim().split(' ').pop();
+            }
         });
         this._callbacks.set('ipfs.init', (err: Error, stdout: string, stderr: string) => {
             if (err) {
@@ -181,20 +184,7 @@ export class IpfsConnector extends EventEmitter {
                      */
                     return this.emit(events.SERVICE_FAILED);
                 }
-                childProcess.exec(`${this.downloadManager.wrapper.path()} config Addresses.API`,
-                    { env: options.extra.env },
-                    (error, apiAddress, stderr) => {
-                        if (error) {
-                            this.logger.error(error);
-                        }
-                        if (stderr.includes('ipfs init')) {
-                            this._init();
-                            return Promise.delay(3000).then(() => this.start());
-                        }
-                        options.apiAddress = apiAddress.trim();
-                        return this._start();
-                    });
-
+                return this._start();
             }
         );
     }
@@ -309,9 +299,10 @@ export class IpfsConnector extends EventEmitter {
         }
 
         if (ports.hasOwnProperty('api')) {
+            this.options.apiAddress = `/ip4/127.0.0.1/tcp/${ports.api}`;
             setup.push(
                 this.api.apiClient
-                    .config.set('Addresses.API', `/ip4/127.0.0.1/tcp/${ports.api}`)
+                    .config.set('Addresses.API', this.options.apiAddress)
             );
         }
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,6 +13,7 @@
     "node_modules",
     "dist",
     "typings/main",
-    "typings/main.d.ts"
+    "typings/main.d.ts",
+    "coverage"
   ]
 }