@dynamicweb/cli 1.0.15 → 1.1.0

package/bin/commands/config.js

@@ -1,55 +1,55 @@
-import os from 'os';
-import fs from 'fs';
-
-const configLocation = os.homedir() + '/.dwc';
-let localConfig;
-
-export function configCommand() {
-    return {
-        command: 'config',
-        describe: 'Edit the configs located in usr/.dwc',
-        handler: (argv) => handleConfig(argv),
-        builder: {
-            prop: {
-                type: 'string',
-                describe: 'Path to your config property, i.e --env.dev.host=newHost:1000'
-            }
-        }
-    }
-}
-
-export function setupConfig() {
-    try {
-        localConfig = JSON.parse(fs.readFileSync(configLocation));
-    } catch (e) {
-        localConfig = {}
-    }
-}
-
-export function getConfig() {
-    return localConfig;
-}
-
-export function handleConfig(argv) {
-    Object.keys(argv).forEach(a => {
-        if (a != '_' && a != '$0') {
-            resolveConfig(a, argv[a], config[a]);
-            updateConfig();
-        }
-    })
-}
-
-export function updateConfig() {
-    fs.writeFileSync(configLocation, JSON.stringify(localConfig));
-}
-
-function resolveConfig(key, obj, conf) {
-    if (typeof obj !== 'object' || !(obj instanceof Object)) {
-        return obj;
-    }
-    Object.keys(obj).forEach(a => {
-        conf[a] = conf[a] || {};
-        conf[a] = resolveConfig(key, obj[a], conf[a]);
-    })
-    return conf;
+import os from 'os';
+import fs from 'fs';
+
+const configLocation = os.homedir() + '/.dwc';
+let localConfig;
+
+export function configCommand() {
+    return {
+        command: 'config',
+        describe: 'Edit the configs located in ~/.dwc',
+        handler: (argv) => handleConfig(argv),
+        builder: {
+            prop: {
+                type: 'string',
+                describe: 'Path to your config property, i.e --env.dev.host=newHost:1000'
+            }
+        }
+    }
+}
+
+export function setupConfig() {
+    try {
+        localConfig = JSON.parse(fs.readFileSync(configLocation));
+    } catch (e) {
+        localConfig = {}
+    }
+}
+
+export function getConfig() {
+    return localConfig;
+}
+
+export function handleConfig(argv) {
+    Object.keys(argv).forEach(a => {
+        if (a != '_' && a != '$0') {
+            localConfig[a] = resolveConfig(a, argv[a], localConfig[a] || {});
+            updateConfig();
+        }
+    })
+}
+
+export function updateConfig() {
+    fs.writeFileSync(configLocation, JSON.stringify(localConfig));
+}
+
+function resolveConfig(key, obj, conf) {
+    if (typeof obj !== 'object' || !(obj instanceof Object)) {
+        return obj;
+    }
+    Object.keys(obj).forEach(a => {
+        conf[a] = conf[a] || {};
+        conf[a] = resolveConfig(key, obj[a], conf[a]);
+    })
+    return conf;
 }

package/bin/commands/database.js

@@ -1,72 +1,66 @@
-import fetch from 'node-fetch';
-import fs from 'fs';
-import _path from 'path';
-import { setupEnv, getAgent } from './env.js';
-import { setupUser } from './login.js';
-
-export function databaseCommand() {
-    return {
-        command: 'database [path]', 
-        describe: 'Handles database', 
-        builder: (yargs) => {
-            return yargs
-            .positional('path', {
-                describe: 'Path to the .bacpac file',
-                default: '.'
-            })
-            .option('export', {
-                alias: 'e',
-                type: 'boolean',
-                description: 'Exports the solutions database to a .bacpac file at [path]'
-            })
-        },
-        handler: (argv) => {
-            if (argv.verbose) console.info(`Handling database with path: ${argv.path}`)
-            handleDatabase(argv)
-        }
-    }
-}
-
-async function handleDatabase(argv) {
-    let env = await setupEnv(argv);
-    let user = await setupUser(argv, env);
-
-    if (argv.export) {
-        await download(env, user, argv.path, argv.verbose);
-    }
-}
-
-async function download(env, user, path, verbose) {
-    let filename = 'database.bacpac';
-    fetch(`${env.protocol}://${env.host}/Admin/Api/DatabaseDownload`, {
-        method: 'POST',
-        headers: {
-            'Authorization': `Bearer ${user.apiKey}`,
-            'content-type': 'application/json'
-        },
-        agent: getAgent(env.protocol)
-    }).then(async (res) => {
-        if (verbose) console.log(res)
-        const header = res.headers.get('Content-Disposition');
-        const parts = header?.split(';');
-        if (!parts || !header.includes('attachment')) {
-            console.log('Failed download, check users database permissions')
-            if (verbose) console.log(await res.json())
-            return;
-        }
-        filename = parts[1].split('=')[1];
-        return res;
-    }).then(async (res) => {
-        if (!res) {
-            process.exit(1);
-        }
-        const fileStream = fs.createWriteStream(_path.resolve(`${_path.resolve(path)}/${filename}`));
-        await new Promise((resolve, reject) => {
-            res.body.pipe(fileStream);
-            res.body.on("error", reject);
-            fileStream.on("finish", resolve);
-        });
-        console.log(`Finished downloading`);
-        return res;
-    });
+import fetch from 'node-fetch';
+import fs from 'fs';
+import _path from 'path';
+import { setupEnv, getAgent } from './env.js';
+import { setupUser } from './login.js';
+
+export function databaseCommand() {
+    return {
+        command: 'database [path]', 
+        describe: 'Handles database', 
+        builder: (yargs) => {
+            return yargs
+            .positional('path', {
+                describe: 'Path to the .bacpac file',
+                default: '.'
+            })
+            .option('export', {
+                alias: 'e',
+                type: 'boolean',
+                description: 'Exports the solutions database to a .bacpac file at [path]'
+            })
+        },
+        handler: async (argv) => {
+            if (argv.verbose) console.info(`Handling database with path: ${argv.path}`)
+            await handleDatabase(argv)
+        }
+    }
+}
+
+async function handleDatabase(argv) {
+    let env = await setupEnv(argv);
+    let user = await setupUser(argv, env);
+
+    if (argv.export) {
+        await download(env, user, argv.path, argv.verbose);
+    }
+}
+
+async function download(env, user, path, verbose) {
+    const res = await fetch(`${env.protocol}://${env.host}/Admin/Api/DatabaseDownload`, {
+        method: 'POST',
+        headers: {
+            'Authorization': `Bearer ${user.apiKey}`,
+            'content-type': 'application/json'
+        },
+        agent: getAgent(env.protocol)
+    });
+
+    if (verbose) console.log(res)
+    const header = res.headers.get('Content-Disposition');
+    const parts = header?.split(';');
+    if (!parts || !header.includes('attachment')) {
+        console.log('Failed download, check users database permissions')
+        if (verbose) console.log(await res.json())
+        process.exit(1);
+    }
+
+    const filename = parts[1].split('=')[1];
+    const fileStream = fs.createWriteStream(_path.resolve(`${_path.resolve(path)}/${filename}`));
+    await new Promise((resolve, reject) => {
+        res.body.pipe(fileStream);
+        res.body.on("error", reject);
+        fileStream.on("finish", resolve);
+    });
+    console.log(`Finished downloading`);
 }

package/bin/commands/env.js

@@ -1,155 +1,174 @@
-import { updateConfig, getConfig } from './config.js'
-import { Agent as HttpAgent } from 'http';
-import { Agent as HttpsAgent } from 'https';
-import yargsInteractive from 'yargs-interactive';
-
-const httpAgent = new HttpAgent({
-    rejectUnauthorized: false
-})
-
-const httpsAgent = new HttpsAgent({
-    rejectUnauthorized: false
-})
-
-export function getAgent(protocol) {
-    return protocol === 'http' ? httpAgent : httpsAgent;
-}
-
-export function envCommand() {
-    return {
-        command: 'env [env]',
-        describe: 'If environment is specified, changes the current environment to the environment specified, otherwise sets up the config for a new environment',
-        builder: (yargs) => {
-            return yargs
-                .positional('env', {
-                    describe: 'Environment'
-                })
-                .option('list', {
-                    alias: 'l',
-                    type: 'boolean',
-                    description: 'List all existing environments'
-                })
-                .option('users', {
-                    alias: 'u',
-                    type: 'boolean',
-                    description: 'List all users in environment, uses positional [env] if used, otherwise current env'
-                })
-        },
-        handler: (argv) => handleEnv(argv)
-    }
-}
-
-export async function setupEnv(argv) {
-    let env = {};
-    let askEnv = true;
-
-    if (argv.host) {
-        askEnv = false;
-        env.host = argv.host;
-        if (argv.protocol) {
-            env.protocol = argv.protocol;
-        } else {
-            env.protocol = 'https';
-        }
-    }
-
-    if (askEnv && getConfig().env) {
-        env = getConfig().env[argv.env] || getConfig().env[getConfig()?.current?.env];
-        if (!env.protocol) {
-            console.log('Protocol for environment not set, defaulting to https');
-            env.protocol = 'https';
-        }
-    }
-    else if (askEnv) {
-        console.log('Current environment not set, please set it')
-        await interactiveEnv(argv, {
-            environment: {
-                type: 'input'
-            },
-            interactive: {
-                default: true
-            }
-        })
-        env = getConfig().env[getConfig()?.current?.env];
-    }
-    return env;
-}
-
-async function handleEnv(argv) {
-    if (argv.users) {
-        let env = argv.env || getConfig().current.env;
-        console.log(`Users in environment ${env}: ${Object.keys(getConfig().env[env].users || {})}`);
-    } else if (argv.env) {
-        changeEnv(argv)
-    } else if (argv.list) {
-        console.log(`Existing environments: ${Object.keys(getConfig().env || {})}`)
-    } else {
-        interactiveEnv(argv, {
-            environment: {
-                type: 'input'
-            },
-            host: {
-                describe: 'Enter your host including protocol, i.e "https://yourHost.com":',
-                type: 'input'
-            },
-            interactive: {
-                default: true
-            }
-        })
-    }
-}
-
-export async function interactiveEnv(argv, options) {
-    if (argv.verbose) console.info('Setting up new environment')
-    await yargsInteractive()
-        .interactive(options)
-        .then(async (result) => {
-            getConfig().env = getConfig().env || {};
-            getConfig().env[result.environment] = getConfig().env[result.environment] || {};
-            if (result.host) {
-                var hostSplit = result.host.split("://");
-                if (hostSplit.length == 1) {
-                    getConfig().env[result.environment].protocol = 'https';
-                    getConfig().env[result.environment].host = hostSplit[0];
-                } else if (hostSplit.length == 2) {
-                    getConfig().env[result.environment].protocol = hostSplit[0];
-                    getConfig().env[result.environment].host = hostSplit[1];
-                } else {
-                    console.log(`Issues resolving host ${result.host}`);
-                    return;
-                }
-            }
-            if (result.environment) {
-                getConfig().current = getConfig().current || {};
-                getConfig().current.env = result.environment;
-            }
-            updateConfig();
-            console.log(`Your current environment is now ${getConfig().current.env}`);
-            console.log(`To change the host of your environment, use the command 'dw env'`)
-        });
-}
-
-async function changeEnv(argv) {
-    if (!Object.keys(getConfig().env).includes(argv.env)) {
-        console.log(`The specified environment ${argv.env} doesn't exist, please create it`);
-        await interactiveEnv(argv, {
-            environment: {
-                type: 'input',
-                default: argv.env,
-                prompt: 'never'
-            },
-            host: {
-                describe: 'Enter your host including protocol, i.e "https://yourHost.com":',
-                type: 'input',
-                prompt: 'always'
-            },
-            interactive: {
-                default: true
-            }
-        })
-    } else {
-        getConfig().current.env = argv.env;
-        updateConfig();
-        console.log(`Your current environment is now ${getConfig().current.env}`);
-    }
-}
+import { updateConfig, getConfig } from './config.js'
+import { Agent as HttpAgent } from 'http';
+import { Agent as HttpsAgent } from 'https';
+import { input } from '@inquirer/prompts';
+
+const httpAgent = new HttpAgent({
+    keepAlive: true,
+    maxSockets: 8,
+    maxFreeSockets: 4,
+    keepAliveMsecs: 10_000
+});
+
+const httpsAgent = new HttpsAgent({
+    keepAlive: true,
+    maxSockets: 8,
+    maxFreeSockets: 4,
+    keepAliveMsecs: 10_000,
+    rejectUnauthorized: false
+});
+
+export function getAgent(protocol) {
+    return protocol === 'http' ? httpAgent : httpsAgent;
+}
+
+export function envCommand() {
+    return {
+        command: 'env [env]',
+        describe: 'If environment is specified, changes the current environment to the environment specified, otherwise sets up the config for a new environment',
+        builder: (yargs) => {
+            return yargs
+                .positional('env', {
+                    describe: 'Environment'
+                })
+                .option('list', {
+                    alias: 'l',
+                    type: 'boolean',
+                    description: 'List all existing environments'
+                })
+                .option('users', {
+                    alias: 'u',
+                    type: 'boolean',
+                    description: 'List all users in environment, uses positional [env] if used, otherwise current env'
+                })
+        },
+        handler: (argv) => handleEnv(argv)
+    }
+}
+
+export async function setupEnv(argv) {
+    let env = {};
+    let askEnv = true;
+
+    if (argv.host) {
+        askEnv = false;
+        env.host = argv.host;
+        if (argv.protocol) {
+            env.protocol = argv.protocol;
+        } else {
+            env.protocol = 'https';
+        }
+    }
+
+    if (askEnv && getConfig().env) {
+        env = getConfig().env[argv.env] || getConfig().env[getConfig()?.current?.env];
+        if (!env.protocol) {
+            console.log('Protocol for environment not set, defaulting to https');
+            env.protocol = 'https';
+        }
+    }
+    else if (askEnv) {
+        console.log('Current environment not set, please set it')
+        await interactiveEnv(argv, {
+            environment: {
+                type: 'input'
+            },
+            interactive: {
+                default: true
+            }
+        })
+        env = getConfig().env[getConfig()?.current?.env];
+    }
+    return env;
+}
+
+async function handleEnv(argv) {
+    if (argv.users) {
+        let env = argv.env || getConfig().current.env;
+        console.log(`Users in environment ${env}: ${Object.keys(getConfig().env[env].users || {})}`);
+    } else if (argv.env) {
+        changeEnv(argv)
+    } else if (argv.list) {
+        console.log(`Existing environments: ${Object.keys(getConfig().env || {})}`)
+    } else {
+        await interactiveEnv(argv, {
+            environment: {
+                type: 'input'
+            },
+            host: {
+                describe: 'Enter your host including protocol, i.e "https://yourHost.com":',
+                type: 'input'
+            },
+            interactive: {
+                default: true
+            }
+        })
+    }
+}
+
+export async function interactiveEnv(argv, options) {
+    if (argv.verbose) console.info('Setting up new environment')
+    const result = {};
+    for (const [key, config] of Object.entries(options)) {
+        if (key === 'interactive') continue;
+        if (config.prompt === 'never') {
+            result[key] = config.default;
+            continue;
+        }
+        result[key] = await input({
+            message: config.describe || key,
+            default: config.default
+        });
+    }
+    getConfig().env = getConfig().env || {};
+    if (!result.environment || !result.environment.trim()) {
+        console.log('Environment name cannot be empty');
+        return;
+    }
+    getConfig().env[result.environment] = getConfig().env[result.environment] || {};
+    if (result.host) {
+        const hostSplit = result.host.split("://");
+        if (hostSplit.length == 1) {
+            getConfig().env[result.environment].protocol = 'https';
+            getConfig().env[result.environment].host = hostSplit[0];
+        } else if (hostSplit.length == 2) {
+            getConfig().env[result.environment].protocol = hostSplit[0];
+            getConfig().env[result.environment].host = hostSplit[1];
+        } else {
+            console.log(`Issues resolving host ${result.host}`);
+            return;
+        }
+    }
+    if (result.environment) {
+        getConfig().current = getConfig().current || {};
+        getConfig().current.env = result.environment;
+    }
+    updateConfig();
+    console.log(`Your current environment is now ${getConfig().current.env}`);
+    console.log(`To change the host of your environment, use the command 'dw env'`)
+}
+
+async function changeEnv(argv) {
+    if (!Object.keys(getConfig().env).includes(argv.env)) {
+        console.log(`The specified environment ${argv.env} doesn't exist, please create it`);
+        await interactiveEnv(argv, {
+            environment: {
+                type: 'input',
+                default: argv.env,
+                prompt: 'never'
+            },
+            host: {
+                describe: 'Enter your host including protocol, i.e "https://yourHost.com":',
+                type: 'input',
+                prompt: 'always'
+            },
+            interactive: {
+                default: true
+            }
+        })
+    } else {
+        getConfig().current.env = argv.env;
+        updateConfig();
+        console.log(`Your current environment is now ${getConfig().current.env}`);
+    }
+}