@tywalk/pcf-helper 1.3.3 → 1.3.5

package/bin/deploy.js

@@ -7,16 +7,18 @@ const [, , ...args] = process.argv;
 const pathArgument = args.find(a => ['-p', '--path'].includes(a));
 if (typeof pathArgument === 'undefined') {
   console.error('Path argument is required. Use --path to specify the path to solution folder.');
-  return 0;
+  return 1;
 }
 
 const pathIndex = args.indexOf(pathArgument) + 1;
 const path = args.at(pathIndex);
 if (typeof path === 'undefined') {
   console.error('Path argument is required. Use --path to specify the path to solution folder.');
-  return 0;
+  return 1;
 }
 
+const tick = performance.now();
+
 const envArgument = args.find(a => ['-env', '--environment'].includes(a));
 let envIndex = args.indexOf(envArgument) + 1;
 let env = '';
@@ -24,6 +26,24 @@ if (envIndex > 0) {
   env = args.at(envIndex);
 }
 
-upgradeTask.run(path);
-buildTask.run(path);
-importTask.run(path, env);
+function executeTasks() {
+  const upgradeResult = upgradeTask.run(path);
+  if (upgradeResult === 1) return 1;
+  const buildResult = buildTask.run(path);
+  if (buildResult === 1) return 1;
+  const importResult = importTask.run(path, env);
+  if (importResult === 1) return 1;
+  return 0;
+}
+
+try {
+  const 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');
+} finally {
+  const tock = performance.now();
+  console.log('Deploy finished in %d ms.', tick - tock);
+}

package/bin/upgrade.js

@@ -5,14 +5,14 @@ const [, , ...args] = process.argv;
 const pathArgument = args.find(a => ['-p', '--path'].includes(a));
 if (typeof pathArgument === 'undefined') {
   console.error('Path argument is required. Use --path to specify the path to solution folder.');
-  return 0;
+  return 1;
 }
 
 const pathIndex = args.indexOf(pathArgument) + 1;
 const path = args.at(pathIndex);
 if (typeof path === 'undefined') {
   console.error('Path argument is required. Use --path to specify the path to solution folder.');
-  return 0;
+  return 1;
 }
 
 task.run(path);

package/package.json

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

package/tasks/build-pcf.js

@@ -1,13 +1,27 @@
 const { spawnSync } = require('child_process');
 
 function run(path) {
+  const tick = performance.now();
   const task = spawnSync('dotnet build', ['--restore', '-c', 'Release', path], {
     cwd: process.cwd(),
     stdio: 'inherit',
-    shell: true
+    shell: true,
+    timeout: 1000 * 60 * 5 // 5 minutes
   });
+  const tock = performance.now();
 
-  console.log('Build complete!: ', task.status);
+  if (task.status === 0) {
+    console.log('Build complete!');
+  } else {
+    if (task.error) {
+      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 %d ms.', tick - tock);
+  return task.status;
 }
 
 exports.run = run;

package/tasks/import-pcf.js

@@ -3,6 +3,7 @@ const { join, extname } = require('path');
 const fs = require('fs');
 
 function run(path, env) {
+  const tick = performance.now();
   if (!env) {
     console.warn('Path argument not provided. Assuming active auth profile organization.');
   }
@@ -16,10 +17,23 @@ function run(path, env) {
   const task = spawnSync('pac solution import', ['-env', env, '-p', zipFilePath, '-pc'], {
     cwd: process.cwd(),
     stdio: 'inherit',
-    shell: true
+    shell: true,
+    timeout: 1000 * 60 * 2 // 2 minutes
   });
+  const tock = performance.now();
 
-  console.log('Import complete!: ', task.status);
+  if (task.status === 0) {
+    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);
+    } else {
+      console.error('Unable to complete import: One or more errors ocurred.');
+    }
+  }
+  console.log('Import finished in %d ms.', tick - tock);
+  return task.status;
 }
 
 exports.run = run;

package/tasks/upgrade-pcf.js

@@ -1,13 +1,27 @@
 const { spawnSync } = require('child_process');
 
 function run(path) {
+  const tick = performance.now();
   const task = spawnSync(`pac solution version -s Solution -sp ${path} && pac pcf version -s Manifest && npm version patch`, {
     cwd: process.cwd(),
     stdio: 'inherit',
-    shell: true
+    shell: true,
+    timeout: 1000 * 60 // 1 min
   });
+  const tock = performance.now();
 
-  console.log('Upgrade complete!: ', task.status);
+  if (task.status === 0) {
+    console.log('Upgrade complete!');
+  } else {
+    if (task.error) {
+      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 %d ms.', tick - tock);
+  return task.status;
 }
 
 exports.run = run;