@dynamicweb/cli 1.1.2 → 2.0.0-beta.2

package/bin/commands/install.js

@@ -1,34 +1,34 @@
 import fetch from 'node-fetch';
 import path from 'path';
-import { setupEnv, getAgent } from './env.js';
+import { setupEnv, getAgent, createCommandError } from './env.js';
 import { setupUser } from './login.js';
 import { uploadFiles, resolveFilePath } from './files.js';
 
 export function installCommand() {
     return {
-        command: 'install [filePath]', 
-        describe: 'Installs the addin on the given path, allowed file extensions are .dll, .nupkg', 
+        command: 'install <filePath>',
+        describe: 'Installs the addin on the given path, allowed file extensions are .dll, .nupkg',
         builder: (yargs) => {
             return yargs
-            .positional('filePath', {
-                describe: 'Path to the file to install'
-            })
-            .option('queue', {
-                alias: 'q',
-                type: 'boolean',
-                describe: 'Queues the install for next Dynamicweb recycle'
-            })
-            .option('output', {
-                choices: ['json'],
-                describe: 'Outputs a single JSON response for automation-friendly parsing'
-            })
+                .positional('filePath', {
+                    describe: 'Path to the file to install'
+                })
+                .option('queue', {
+                    alias: 'q',
+                    type: 'boolean',
+                    describe: 'Queues the install for next Dynamicweb recycle'
+                })
+                .option('output', {
+                    choices: ['json'],
+                    describe: 'Outputs a single JSON response for automation-friendly parsing'
+                })
         },
         handler: async (argv) => {
             const output = createInstallOutput(argv);
 
             try {
                 output.verboseLog(`Installing file located at: ${argv.filePath}`);
-                await handleInstall(argv, output)
+                await handleInstall(argv, output);
             } catch (err) {
                 output.fail(err);
                 process.exitCode = 1;
@@ -40,18 +40,15 @@ export function installCommand() {
 }
 
 async function handleInstall(argv, output) {
-    let env = await setupEnv(argv);
+    let env = await setupEnv(argv, output);
     let user = await setupUser(argv, env);
     let resolvedPath = resolveFilePath(argv.filePath);
-    output.mergeMeta({
-        resolvedPath
-    });
-    await uploadFiles(env, user, [ resolvedPath ], 'System/AddIns/Local', false, true, output);
-    await installAddin(env, user, resolvedPath, argv.queue, output)
+    await uploadFiles(env, user, [resolvedPath], 'System/AddIns/Local', false, true, output);
+    await installAddin(env, user, resolvedPath, argv.queue, output);
 }
 
 async function installAddin(env, user, resolvedPath, queue, output) {
-    output.log('Installing addin')
+    output.log('Installing addin');
     let filename = path.basename(resolvedPath);
     let data = {
         'Queue': queue,
@@ -59,41 +56,57 @@ async function installAddin(env, user, resolvedPath, queue, output) {
             `${filename.substring(0, filename.lastIndexOf('.')) || filename}|${path.extname(resolvedPath)}`
         ]
     }
-    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/AddinInstall`, {
-        method: 'POST',
-        body: JSON.stringify(data),
-        headers: {
-            'Content-Type': 'application/json',
-            'Authorization': `Bearer ${user.apiKey}`
-        },
-        agent: getAgent(env.protocol)
-    });
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 30_000);
+
+    let res;
+    try {
+        res = await fetch(`${env.protocol}://${env.host}/Admin/Api/AddinInstall`, {
+            method: 'POST',
+            body: JSON.stringify(data),
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${user.apiKey}`
+            },
+            agent: getAgent(env.protocol),
+            signal: controller.signal
+        });
+    } catch (err) {
+        if (err.name === 'AbortError') {
+            throw createCommandError('Addin installation request timed out.', 408);
+        }
+        throw err;
+    } finally {
+        clearTimeout(timeoutId);
+    }
 
     if (res.ok) {
-        const body = await res.json();
+        const body = await parseJsonSafe(res);
+        output.verboseLog(body);
         output.addData({
             type: 'install',
+            filePath: resolvedPath,
             filename,
             queued: Boolean(queue),
             response: body
         });
-        output.log(`Addin installed`)
-    }
-    else {
-        throw createInstallError('Addin install failed.', res.status, await parseJsonSafe(res));
+        output.log('Addin installed');
+    } else {
+        const body = await parseJsonSafe(res);
+        throw createCommandError('Addin installation failed.', res.status, body);
     }
 }
 
-export function createInstallOutput(argv) {
+function createInstallOutput(argv) {
     const response = {
         ok: true,
         command: 'install',
-        operation: 'install',
+        operation: argv.queue ? 'queue' : 'install',
         status: 200,
         data: [],
         errors: [],
         meta: {
-            queued: Boolean(argv.queue)
+            filePath: argv.filePath
         }
     };
 
@@ -113,7 +126,8 @@ export function createInstallOutput(argv) {
         addData(entry) {
             response.data.push(entry);
         },
-        mergeMeta(meta) {
+        mergeMeta(metaOrFn) {
+            const meta = typeof metaOrFn === 'function' ? metaOrFn(response.meta) : metaOrFn;
             response.meta = {
                 ...response.meta,
                 ...meta
@@ -135,12 +149,6 @@ export function createInstallOutput(argv) {
     };
 }
 
-function createInstallError(message, status, details = null) {
-    const error = new Error(message);
-    error.status = status;
-    error.details = details;
-    return error;
-}
 
 async function parseJsonSafe(res) {
     try {