@tywalk/pcf-helper 1.4.0 → 1.4.2

package/bin/deploy.js

@@ -2,6 +2,7 @@
 const upgradeTask = require('../tasks/upgrade-pcf');
 const buildTask = require('../tasks/build-pcf');
 const importTask = require('../tasks/import-pcf');
+const { formatMsToSec } = require('../util/performanceUtil');
 const [, , ...args] = process.argv;
 
 const pathArgument = args.find(a => ['-p', '--path'].includes(a));
@@ -36,14 +37,18 @@ function executeTasks() {
   return 0;
 }
 
+var result = 0;
 try {
-  const result = executeTasks();
+  result = executeTasks();
   if (result === 0) {
     console.log('Deploy complete!');
   }
 } catch (e) {
   console.error('One or more tasks failed while deploying: ', (e && e.message) || 'unkown error');
+  result = 1;
 } finally {
   const tock = performance.now();
-  console.log('Deploy finished in %i ms.', tock - tick);
-}
+  console.log('Deploy finished in %is.', formatMsToSec(tock - tick));
+}
+
+return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tywalk/pcf-helper",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Command line helper for building and publishing PCF controls to Dataverse.",
   "scripts": {
     "test": "node test.js"

package/tasks/build-pcf.js

@@ -1,4 +1,5 @@
 const { spawnSync } = require('child_process');
+const { formatMsToSec } = require('../util/performanceUtil');
 
 function run(path) {
   const tick = performance.now();
@@ -14,13 +15,17 @@ function run(path) {
     console.log('Build complete!');
   } else {
     if (task.error) {
-      console.error('Unable to complete build: ', task.error.message);
+      if (task.signal === 'SIGKILL') {
+        console.error('Unable to complete build. A timeout of 5 minutes was reached.', task.error.message);
+      } else {
+        console.error('Unable to complete build: ', task.error.message);
+      }
       console.debug('Error details: ', task.error.name, task.error.stack);
     } else {
       console.error('Unable to complete build: One or more errors ocurred.');
     }
   }
-  console.log('Build finished in %i ms.', tock - tick);
+  console.log('Build finished in %is.', formatMsToSec(tock - tick));
   return task.status;
 }
 

package/tasks/import-pcf.js

@@ -1,8 +1,9 @@
 const { spawnSync } = require('child_process');
 const { join, extname } = require('path');
 const fs = require('fs');
+const { formatMsToSec } = require('../util/performanceUtil');
 
-function run(path, env) {
+function run(path, env, verbose) {
   const tick = performance.now();
   if (!env) {
     console.warn('Path argument not provided. Assuming active auth profile organization.');
@@ -18,7 +19,7 @@ function run(path, env) {
     cwd: process.cwd(),
     stdio: 'inherit',
     shell: true,
-    timeout: 1000 * 60 * 2 // 2 minutes
+    timeout: 1000 * 60 * 5 // 5 minutes
   });
   const tock = performance.now();
 
@@ -26,13 +27,19 @@ function run(path, env) {
     console.log('Import complete!');
   } else {
     if (task.error) {
-      console.error('Unable to complete import: ', task.error.message);
-      console.debug('Error details: ', task.error.name, task.error.stack);
+      if (task.signal === 'SIGKILL') {
+        console.error('Unable to complete import. A timeout of 5 minutes was reached.', task.error.message);
+      } else {
+      console.error('Unable to complete import:', task.signal, task.error.message);
+      }
+      if (verbose) {
+        console.debug('Error details:', task.signal, task.error.stack);
+      }
     } else {
       console.error('Unable to complete import: One or more errors ocurred.');
     }
   }
-  console.log('Import finished in %i ms.', tock - tick);
+  console.log('Import finished in %is.', formatMsToSec(tock - tick));
   return task.status;
 }
 

package/tasks/upgrade-pcf.js

@@ -1,4 +1,5 @@
 const { spawnSync } = require('child_process');
+const { formatMsToSec } = require('../util/performanceUtil');
 
 function run(path) {
   const tick = performance.now();
@@ -14,13 +15,17 @@ function run(path) {
     console.log('Upgrade complete!');
   } else {
     if (task.error) {
-      console.error('Unable to complete upgrade: ', task.error.message);
+      if (task.signal === 'SIGKILL') {
+        console.error('Unable to complete upgrade. A timeout of 1 minutes was reached.', task.error.message);
+      } else {
+        console.error('Unable to complete upgrade: ', task.error.message);
+      }
       console.debug('Error details: ', task.error.name, task.error.stack);
     } else {
       console.error('Unable to complete upgrade: One or more errors ocurred.');
     }
   }
-  console.log('Upgrade finished in %i ms.', tock - tick);
+  console.log('Upgrade finished in %is.', formatMsToSec(tock - tick));
   return task.status;
 }
 

package/util/performanceUtil.js

@@ -0,0 +1,10 @@
+const util = require('node:util');
+
+function formatMsToSec(ms, format) {
+  const seconds = ms / 1000;
+  return util.format(format, seconds);
+}
+
+module.exports = {
+  formatMsToSec
+}