Merge pull request #3 from xgeek-net/dev

v0.1.3 beta release

Author: xgeek-net

README.md

@@ -3,7 +3,6 @@ Be less busy, less mistake in Salesforce metadata deploy.
 
 ![pipeline main - 1280](https://user-images.githubusercontent.com/5466487/43767123-31732402-9a6f-11e8-9d31-c3a40d4eaff8.png)
 
-
 ## Overview
 Pipeline is a metadata deploy app for Salesforce, supports:<br /><br />
 ・Quickly making Changeset from Excel/CSV, in 10 seconds or less! (Coming soon)<br />

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pipeline",
   "description": "Be less busy, less mistake in Salesforce metadata deploy",
-  "version": "0.1.2-beta",
+  "version": "0.1.3-beta",
   "private": false,
   "main": "src/main.js",
   "dependencies": {

src/class/SfdcApi.js

@@ -63,6 +63,9 @@ class SfdcApi {
             });
           }
         } else {
+          // Set Default value
+          self.conn.metadata.pollTimeout = 300000; // 5 mins
+
           return resolve(true);
         }
       });
@@ -425,23 +428,11 @@ class SfdcApi {
         if(err) return reject(err);
         if(result.success=='true') {
           self.logger('[SFDC] Retrieve metadata Done.');
-          //self.logger('[SFDC] packagePath DecompressZip .' + packagePath + ' > ' + metaPath + ' > ' + (fs.existsSync(packagePath)));
+          // self.logger('[SFDC] packagePath DecompressZip .' + packagePath + ' > ' + metaPath + ' > ' + (fs.statSync(packagePath).size));
           if(!fs.existsSync(packagePath)) return reject(new Error('Metadata zip not found'));
-          const unzipper = new DecompressZip(packagePath)
-          unzipper.on('error', function (err) {
-            //self.logger('[SFDC] extract err.' + err);
+          self.extractMetaZip(packagePath, metaPath, 0, function(err, success) {
             if(err) return reject(err);
-          });
-          unzipper.on('extract', function (log) {
-            //self.logger('[SFDC]Finished extracting' + log);
-            rimraf(packagePath, function(){});
-            return resolve(true);
-          });
-          unzipper.extract({
-            path: metaPath,
-            filter: function (file) {
-              return file.type !== "SymbolicLink";
-            }
+            return resolve(success);
           });
         } else {
           return reject(new Error('Retrieve metadata failed'));
@@ -450,6 +441,43 @@ class SfdcApi {
       retrieveResult.stream().pipe(zipstream);
     });
   }
+
+  // Extract metadata zip file to src folder
+  // Metadata api may zip file cost sevaral ms
+  extractMetaZip(sourceZipPath, targetPath, presize, callback) {
+    const self = this;
+    const fileinfo = fs.statSync(sourceZipPath);
+    if(fileinfo.size == 0) {
+      // Is written
+      return setTimeout(function(){
+        self.extractMetaZip(sourceZipPath, targetPath, presize, callback)
+      }, 500);
+    }
+    if(presize !== fileinfo.size) {
+      // Maybe written
+      presize = fileinfo.size;
+      return setTimeout(function(){
+        self.extractMetaZip(sourceZipPath, targetPath, presize, callback)
+      }, 500);
+    }
+    // Ready to extract
+    const unzipper = new DecompressZip(sourceZipPath)
+    unzipper.on('error', function (err) {
+      // console.log('[SFDC] extract err.' + err);
+      if(err) return callback(err);
+    });
+    unzipper.on('extract', function (log) {
+      // console.log('[SFDC]Finished extracting' + log);
+      rimraf(sourceZipPath, function(){});
+      return callback(null, true);
+    });
+    unzipper.extract({
+      path: targetPath,
+      filter: function (file) {
+        return file.type !== "SymbolicLink";
+      }
+    });
+  }
 
 }
 

src/main.js

@@ -23,9 +23,11 @@ const connect = new Connect();
 const pipeline = new Pipeline();
 
 // Raven
-const CLIENT = require('./config/client');
-const Raven = require('raven');
-Raven.config(CLIENT.RAVEN_CLIENT_ID).install();
+if(process.env.NODE_ENV !== 'development') {
+  const CLIENT = require('./config/client');
+  const Raven = require('raven');
+  Raven.config(CLIENT.RAVEN_CLIENT_ID).install();
+}
 
 let mainWindow;