Merge branch 'main' into ngrok-custom-config

Author: dkundel

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "parser": "typescript"
+}

packages/serverless-api/src/client.ts

@@ -259,7 +259,7 @@ export class TwilioServerlessApiClient extends events.EventEmitter {
           this
         );
         const foundFunction = availableFunctions.find(
-          (fn) => fn.friendly_name === filterByFunction
+          fn => fn.friendly_name === filterByFunction
         );
         if (!foundFunction) {
           throw new Error('Invalid Function Name or SID');
@@ -297,7 +297,7 @@ export class TwilioServerlessApiClient extends events.EventEmitter {
           this
         );
         const foundFunction = availableFunctions.find(
-          (fn) => fn.friendly_name === filterByFunction
+          fn => fn.friendly_name === filterByFunction
         );
         if (!foundFunction) {
           throw new Error('Invalid Function Name or SID');
@@ -506,7 +506,7 @@ export class TwilioServerlessApiClient extends events.EventEmitter {
         message: `Uploading ${functions.length} Functions`,
       });
       const functionVersions = await Promise.all(
-        functionResources.map((fn) => {
+        functionResources.map(fn => {
           return uploadFunction(fn, serviceSid as string, this, this.config);
         })
       );
@@ -530,7 +530,7 @@ export class TwilioServerlessApiClient extends events.EventEmitter {
         message: `Uploading ${assets.length} Assets`,
       });
       const assetVersions = await Promise.all(
-        assetResources.map((asset) => {
+        assetResources.map(asset => {
           return uploadAsset(asset, serviceSid as string, this, this.config);
         })
       );
@@ -662,6 +662,8 @@ export class TwilioServerlessApiClient extends events.EventEmitter {
   ): Promise<unknown> {
     options.retry = {
       limit: this.config.retryLimit || RETRY_LIMIT,
+      methods: ['GET', 'POST', 'DELETE'],
+      statusCodes: [429],
     };
     return this.limit(() => this.client[method](path, options));
   }

packages/twilio-run/README.md

@@ -152,6 +152,9 @@ twilio-run --inspect
 # Exposes the Twilio functions via ngrok to share them
 twilio-run --ngrok
 
+# Exposes the Twilio functions via ngrok using a custom subdomain (requires a paid-for ngrok account)
+twilio-run --ngrok=subdomain
+
 # Uses a custom project ngrok config and named tunnel to expose the functions via ngrok
 twilio-run --ngrok --ngrok-config=./ngrok.yml --ngrok-name=example
 ```

packages/twilio-run/src/commands/activate.ts

@@ -21,6 +21,7 @@ import {
   sharedCliOptions,
 } from './shared';
 import { CliInfo } from './types';
+import { ClientApiError } from '@twilio-labs/serverless-api/dist/utils/error';
 
 const debug = getDebugFunction('twilio-run:activate');
 
@@ -33,7 +34,12 @@ function handleError(err: Error, spinner: Ora) {
   if (spinner) {
     if (err.name === 'TwilioApiError') {
       spinner.fail('Failed promoting build.');
-      logApiError(logger, err);
+      const clientApiError = err as ClientApiError;
+      if (clientApiError.code === 20409) {
+        clientApiError.message +=
+          '\n\nThis is probably because you are trying to promote a build to an environment where it is already live. Try promoting the build to a different environment or choosing a different build to promote to this environment.';
+      }
+      logApiError(logger, clientApiError);
     } else {
       spinner.fail(err.message);
     }

packages/twilio-run/src/commands/start.ts

@@ -138,7 +138,8 @@ export const cliInfo: CliInfo = {
     },
     ngrok: {
       type: 'string',
-      describe: 'Uses ngrok to create and outfacing url',
+      describe:
+        'Uses ngrok to create a public url. Pass a string to set the subdomain (requires a paid-for ngrok account).',
     },
     'ngrok-config': {
       type: 'string',