@routr/ctl 2.0.8-alpha.23 → 2.0.8-alpha.25

package/dist/commands/trunks/update.js

@@ -36,131 +36,137 @@ class UpdateCommand extends base_1.BaseCommand {
         const { args, flags } = await this.parse(UpdateCommand);
         const { endpoint, insecure } = flags;
         const api = new sdk_1.default.Trunks({ endpoint, insecure });
-        this.log("This utility will help you update an existing Trunk.");
-        this.log("Press ^C at any time to quit.");
-        this.warn("Adding Outbound SIP URIs will delete existing ones.");
-        const trunkFromDB = await api.getTrunk(args.ref);
-        // TODO: Add support for pagination
-        const acls = await new sdk_1.default.ACL({ endpoint, insecure }).listACLs({
-            pageSize: 25,
-            pageToken: ""
-        });
-        const aclChoices = acls.items.map((acl) => {
-            return {
-                name: acl.name,
-                value: acl.ref
-            };
-        });
-        const credentials = await new sdk_1.default.Credentials({
-            endpoint,
-            insecure
-        }).listCredentials({
-            pageSize: 25,
-            pageToken: ""
-        });
-        const credentialsChoice = credentials.items.map((acl) => {
-            return {
-                name: acl.name,
-                value: acl.ref
-            };
-        });
-        const group1 = await inquirer_1.default.prompt([
-            {
-                name: "name",
-                message: "Friendly Name",
-                type: "input",
-                default: trunkFromDB.name,
-                validate: validators_1.nameValidator
-            },
-            {
-                name: "inboundUri",
-                message: "Inbound SIP URI",
-                type: "input",
-                validate: validators_1.inboundUriValidator,
-                default: trunkFromDB.inboundUri
-            },
-            {
-                name: "accessControlListRef",
-                message: "IP Access Control List",
-                type: "list",
-                default: trunkFromDB.accessControlListRef,
-                choices: [{ name: "None", value: undefined }, ...aclChoices]
-            },
-            {
-                name: "inboundCredentialsRef",
-                message: "Inbound Credentials",
-                type: "list",
-                default: trunkFromDB.inboundCredentialsRef,
-                choices: [{ name: "None", value: undefined }, ...credentialsChoice]
-            },
-            {
-                name: "outboundCredentialsRef",
-                message: "Outbound Credentials",
-                type: "list",
-                default: trunkFromDB.outboundCredentialsRef,
-                choices: [{ name: "None", value: undefined }, ...credentialsChoice]
-            },
-            {
-                name: "addOutboundUri",
-                message: "Add an Outbound SIP URI?",
-                type: "confirm",
-                default: false
-            }
-        ]);
-        const group2Questions = [
-            {
-                name: "host",
-                message: "Host",
-                type: "input",
-                validate: validators_1.hostValidator
-            },
-            {
-                name: "port",
-                message: "Post",
-                type: "input",
-                default: "5060",
-                validate: validators_1.portValidator
-            },
-            {
-                name: "transport",
-                message: "Transport",
-                type: "list",
-                choices: [common_1.CommonTypes.Transport.UDP, common_1.CommonTypes.Transport.TCP, common_1.CommonTypes.Transport.TLS],
-                default: common_1.CommonTypes.Transport.UDP
-            },
-            {
-                name: "user",
-                message: "User Part",
-                type: "input",
-                validate: validators_1.optionalUsernameValidator
-            },
-            {
-                name: "priority",
-                message: "Priority",
-                type: "input",
-                default: "10",
-                validate: validators_1.priorityValidator
-            },
-            {
-                name: "weight",
-                message: "Weight",
-                type: "input",
-                default: "10",
-                validate: validators_1.weightValidator
-            },
-            {
-                name: "addOutboundUri",
-                message: "Add another Outbound SIP URI?",
-                type: "confirm",
-                default: false
-            }
-        ];
-        let addOutboundUri = group1.addOutboundUri;
-        const uris = [];
-        // eslint-disable-next-line no-loops/no-loops
-        while (addOutboundUri) {
-            const group2 = await inquirer_1.default.prompt(group2Questions);
-            if (group2.numberRef) {
+        try {
+            const trunkFromDB = await api.getTrunk(args.ref);
+            // TODO: Add support for pagination
+            const acls = await new sdk_1.default.ACL({ endpoint, insecure }).listACLs({
+                pageSize: 25,
+                pageToken: ""
+            });
+            const aclChoices = acls.items.map((acl) => {
+                return {
+                    name: acl.name,
+                    value: acl.ref
+                };
+            });
+            const credentials = await new sdk_1.default.Credentials({
+                endpoint,
+                insecure
+            }).listCredentials({
+                pageSize: 25,
+                pageToken: ""
+            });
+            const credentialsChoice = credentials.items.map((acl) => {
+                return {
+                    name: acl.name,
+                    value: acl.ref
+                };
+            });
+            this.log("This utility will help you update an existing Trunk.");
+            this.log("Press ^C at any time to quit.");
+            this.warn("Adding Outbound SIP URIs will delete existing ones.");
+            const group1 = await inquirer_1.default.prompt([
+                {
+                    name: "name",
+                    message: "Friendly Name",
+                    type: "input",
+                    default: trunkFromDB.name,
+                    validate: validators_1.nameValidator
+                },
+                {
+                    name: "inboundUri",
+                    message: "Inbound SIP URI",
+                    type: "input",
+                    validate: validators_1.inboundUriValidator,
+                    default: trunkFromDB.inboundUri
+                },
+                {
+                    name: "accessControlListRef",
+                    message: "IP Access Control List",
+                    type: "list",
+                    default: trunkFromDB.accessControlListRef,
+                    choices: [{ name: "None", value: undefined }, ...aclChoices]
+                },
+                {
+                    name: "inboundCredentialsRef",
+                    message: "Inbound Credentials",
+                    type: "list",
+                    default: trunkFromDB.inboundCredentialsRef,
+                    choices: [{ name: "None", value: undefined }, ...credentialsChoice]
+                },
+                {
+                    name: "outboundCredentialsRef",
+                    message: "Outbound Credentials",
+                    type: "list",
+                    default: trunkFromDB.outboundCredentialsRef,
+                    choices: [{ name: "None", value: undefined }, ...credentialsChoice]
+                },
+                {
+                    name: "sendRegister",
+                    message: "Send Register?",
+                    type: "confirm",
+                    default: trunkFromDB.sendRegister
+                },
+                {
+                    name: "addOutboundUri",
+                    message: "Add an Outbound SIP URI?",
+                    type: "confirm",
+                    default: false
+                }
+            ]);
+            const group2Questions = [
+                {
+                    name: "host",
+                    message: "Host",
+                    type: "input",
+                    validate: validators_1.hostValidator
+                },
+                {
+                    name: "port",
+                    message: "Post",
+                    type: "input",
+                    default: "5060",
+                    validate: validators_1.portValidator
+                },
+                {
+                    name: "transport",
+                    message: "Transport",
+                    type: "list",
+                    choices: [common_1.CommonTypes.Transport.UDP, common_1.CommonTypes.Transport.TCP, common_1.CommonTypes.Transport.TLS],
+                    default: common_1.CommonTypes.Transport.UDP
+                },
+                {
+                    name: "user",
+                    message: "User Part",
+                    type: "input",
+                    validate: validators_1.optionalUsernameValidator
+                },
+                {
+                    name: "priority",
+                    message: "Priority",
+                    type: "input",
+                    default: "10",
+                    validate: validators_1.priorityValidator
+                },
+                {
+                    name: "weight",
+                    message: "Weight",
+                    type: "input",
+                    default: "10",
+                    validate: validators_1.weightValidator
+                },
+                {
+                    name: "addOutboundUri",
+                    message: "Add another Outbound SIP URI?",
+                    type: "confirm",
+                    default: false
+                }
+            ];
+            let addOutboundUri = group1.addOutboundUri;
+            const uris = [];
+            // eslint-disable-next-line no-loops/no-loops
+            while (addOutboundUri) {
+                const group2 = await inquirer_1.default.prompt(group2Questions);
                 uris.push({
                     host: group2.host,
                     port: group2.port,
@@ -170,21 +176,19 @@ class UpdateCommand extends base_1.BaseCommand {
                     weight: group2.weight,
                     enabled: true
                 });
+                addOutboundUri = group2.addOutboundUri;
             }
-            addOutboundUri = group2.addOutboundUri;
-        }
-        const group3 = await inquirer_1.default.prompt([
-            {
-                name: "confirm",
-                message: "Ready?",
-                type: "confirm"
+            const group3 = await inquirer_1.default.prompt([
+                {
+                    name: "confirm",
+                    message: "Ready?",
+                    type: "confirm"
+                }
+            ]);
+            if (!group3.confirm) {
+                this.warn("Aborted");
             }
-        ]);
-        if (!group3.confirm) {
-            this.warn("Aborted");
-        }
-        else {
-            try {
+            else {
                 core_1.CliUx.ux.action.start(`Updating Trunk ${group1.name}`);
                 const trunk = await api.updateTrunk({
                     ref: trunkFromDB.ref,
@@ -194,10 +198,10 @@ class UpdateCommand extends base_1.BaseCommand {
                 await core_1.CliUx.ux.wait(1000);
                 core_1.CliUx.ux.action.stop(trunk.ref);
             }
-            catch (e) {
-                core_1.CliUx.ux.action.stop();
-                throw new errors_1.CLIError(e.message);
-            }
+        }
+        catch (e) {
+            core_1.CliUx.ux.action.stop();
+            throw new errors_1.CLIError(e.message);
         }
     }
 }

package/dist/delete.js

@@ -31,9 +31,14 @@ class DeleteCommand extends base_1.BaseCommand {
             throw new errors_1.CLIError("You must provide a resource ref before continuing");
         }
         core_1.CliUx.ux.action.start(`Deleting item ${args.ref}`);
-        await API[funcName](args.ref);
-        await core_1.CliUx.ux.wait(1000);
-        core_1.CliUx.ux.action.stop("Done");
+        try {
+            await API[funcName](args.ref);
+            await core_1.CliUx.ux.wait(1000);
+            core_1.CliUx.ux.action.stop("Done");
+        }
+        catch (e) {
+            throw new errors_1.CLIError(e.message);
+        }
     }
     async catch(err) {
         return super.catch(err);