feat: run(appFn, { env })

src/bin/read-env-options.ts

@@ -1,27 +1,27 @@
 import { getPrivateKey } from "@probot/get-private-key";
 import { Options as PinoOptions, LogLevel } from "@probot/pino";
 
-export function readEnvOptions() {
-  const privateKey = getPrivateKey();
+export function readEnvOptions(
+  env: Record<string, string | undefined> = process.env
+) {
+  const privateKey = getPrivateKey({ env });
 
   return {
     args: [],
     privateKey: (privateKey && privateKey.toString()) || undefined,
-    id: Number(process.env.APP_ID),
-    port: Number(process.env.PORT) || 3000,
-    host: process.env.HOST,
-    secret: process.env.WEBHOOK_SECRET,
-    webhookPath: process.env.WEBHOOK_PATH,
-    webhookProxy: process.env.WEBHOOK_PROXY_URL,
-    logLevel: process.env.LOG_LEVEL as LogLevel,
-    logFormat: process.env.LOG_FORMAT as PinoOptions["logFormat"],
-    logLevelInString: process.env.LOG_LEVEL_IN_STRING === "true",
-    sentryDsn: process.env.SENTRY_DSN,
-    redisConfig: process.env.REDIS_URL,
-    baseUrl: process.env.GHE_HOST
-      ? `${process.env.GHE_PROTOCOL || "https"}://${
-          process.env.GHE_HOST
-        }/api/v3`
+    id: Number(env.APP_ID),
+    port: Number(env.PORT) || 3000,
+    host: env.HOST,
+    secret: env.WEBHOOK_SECRET,
+    webhookPath: env.WEBHOOK_PATH,
+    webhookProxy: env.WEBHOOK_PROXY_URL,
+    logLevel: env.LOG_LEVEL as LogLevel,
+    logFormat: env.LOG_FORMAT as PinoOptions["logFormat"],
+    logLevelInString: env.LOG_LEVEL_IN_STRING === "true",
+    sentryDsn: env.SENTRY_DSN,
+    redisConfig: env.REDIS_URL,
+    baseUrl: env.GHE_HOST
+      ? `${env.GHE_PROTOCOL || "https"}://${env.GHE_HOST}/api/v3`
       : "https://api.github.com",
   };
 }

src/run.ts

@@ -13,11 +13,18 @@ import { Server, ServerOptions } from "./server/server";
 import { load } from "./load";
 import { defaultApp } from "./apps/default";
 
+type AdditionalOptions = {
+  env: Record<string, string | undefined>;
+};
+
 /**
  *
  * @param appFnOrArgv set to either a probot application function: `({ app }) => { ... }` or to process.argv
  */
-export async function run(appFnOrArgv: ApplicationFunction | string[]) {
+export async function run(
+  appFnOrArgv: ApplicationFunction | string[],
+  additionalOptions?: AdditionalOptions
+) {
   const {
     // log options
     logLevel: level,
@@ -42,7 +49,7 @@ export async function run(appFnOrArgv: ApplicationFunction | string[]) {
     args,
   } = Array.isArray(appFnOrArgv)
     ? readCliOptions(appFnOrArgv)
-    : readEnvOptions();
+    : readEnvOptions(additionalOptions?.env);
 
   const logOptions: GetLogOptions = {
     level,
@@ -103,10 +110,12 @@ export async function run(appFnOrArgv: ApplicationFunction | string[]) {
     const [appFn] = args;
 
     load(probot, router, appFn);
-    server.app.use(probot.webhooks.middleware);
+
+    server.app.use(webhookPath ? webhookPath : "/", probot.webhooks.middleware);
   } else {
     load(probot, router, appFnOrArgv);
-    server.app.use(probot.webhooks.middleware);
+
+    server.app.use(webhookPath ? webhookPath : "/", probot.webhooks.middleware);
   }
   await server.start();
 

src/server/server.ts

@@ -81,18 +81,18 @@ export class Server {
           resolve(server);
         }
       );
-    })) as HttpServer;
 
-    this.state.httpServer.on("error", (error: NodeJS.ErrnoException) => {
-      if (error.code === "EADDRINUSE") {
-        this.log.error(
-          `Port ${port} is already in use. You can define the PORT environment variable to use a different port.`
-        );
-      } else {
+      server.on("error", (error: NodeJS.ErrnoException) => {
+        if (error.code === "EADDRINUSE") {
+          error = Object.assign(error, {
+            message: `Port ${port} is already in use. You can define the PORT environment variable to use a different port.`,
+          });
+        }
+
         this.log.error(error);
-      }
-      process.exit(1);
-    });
+        reject(error);
+      });
+    })) as HttpServer;
 
     return this.state.httpServer;
   }