@terreno/api 0.13.3 → 0.14.1

package/dist/errors.js

@@ -58,11 +58,27 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiErrorMiddleware = exports.apiUnauthorizedMiddleware = exports.getAPIErrorBody = exports.getDisableExternalErrorTracking = exports.isAPIError = exports.errorsPlugin = exports.APIError = void 0;
+exports.apiFallthroughErrorMiddleware = exports.apiErrorMiddleware = exports.mongooseErrorToAPIError = exports.apiUnauthorizedMiddleware = exports.getAPIErrorBody = exports.getDisableExternalErrorTracking = exports.errorStack = exports.errorMessage = exports.isAPIError = exports.errorsPlugin = exports.APIError = void 0;
 // https://jsonapi.org/format/#errors
 var Sentry = __importStar(require("@sentry/bun"));
-var mongoose_1 = require("mongoose");
+var mongoose_1 = __importStar(require("mongoose"));
 var logger_1 = require("./logger");
 /**
  * APIError is a simple way to throw an error in an API route and control what is shown and the
@@ -81,9 +97,10 @@ var logger_1 = require("./logger");
 var APIError = /** @class */ (function (_super) {
     __extends(APIError, _super);
     function APIError(data) {
-        var _a, _b;
+        var _this = this;
+        var errorStack = data.error instanceof Error && data.error.stack ? "\n".concat(data.error.stack) : "";
         // Include details in when the error is printed to the console or sent to Sentry.
-        var _this = _super.call(this, "".concat(data.title).concat(data.detail ? ": ".concat(data.detail) : "").concat(data.error ? "\n".concat(data.error.stack) : "")) || this;
+        _this = _super.call(this, "".concat(data.title).concat(data.detail ? ": ".concat(data.detail) : "").concat(errorStack)) || this;
         _this.name = "APIError";
         var title = data.title, id = data.id, links = data.links, status = data.status, code = data.code, detail = data.detail, source = data.source, meta = data.meta, fields = data.fields, error = data.error;
         if (!status) {
@@ -106,7 +123,8 @@ var APIError = /** @class */ (function (_super) {
             _this.meta.fields = fields;
         }
         _this.error = error;
-        var logMessage = "APIError(".concat(status, "): ").concat(title, " ").concat(detail ? detail : "").concat(((_a = data.error) === null || _a === void 0 ? void 0 : _a.stack) ? "\n".concat((_b = data.error) === null || _b === void 0 ? void 0 : _b.stack) : "");
+        var dataErrorStack = data.error instanceof Error && data.error.stack ? "\n".concat(data.error.stack) : "";
+        var logMessage = "APIError(".concat(status, "): ").concat(title, " ").concat(detail ? detail : "").concat(dataErrorStack);
         if (data.disableExternalErrorTracking) {
             logger_1.logger.warn(logMessage);
         }
@@ -132,7 +150,10 @@ var errorsPlugin = function (schema) {
             about: { description: "Link to documentation about this error", type: String },
             type: { description: "Link describing the error type", type: String },
         },
-        meta: { description: "Non-standard meta information about the error", type: mongoose_1.Schema.Types.Mixed },
+        meta: {
+            description: "Non-standard meta information about the error",
+            type: mongoose_1.Schema.Types.Mixed,
+        },
         source: {
             header: { description: "HTTP header that caused the error", type: String },
             parameter: { description: "Query parameter that caused the error", type: String },
@@ -143,14 +164,30 @@ var errorsPlugin = function (schema) {
         },
         status: { description: "HTTP status code for this error", type: Number },
         title: { description: "Short summary of the error", required: true, type: String },
-    });
+    }, { _id: false, strict: "throw" });
     schema.add({ apiErrors: errorSchema });
 };
 exports.errorsPlugin = errorsPlugin;
 var isAPIError = function (error) {
-    return error.name === "APIError";
+    return error instanceof Error && error.name === "APIError";
 };
 exports.isAPIError = isAPIError;
+/** Extract a human-readable message from an unknown error. */
+var errorMessage = function (error) {
+    if (error instanceof Error) {
+        return error.message;
+    }
+    return String(error);
+};
+exports.errorMessage = errorMessage;
+/** Extract a stack trace string from an unknown error. */
+var errorStack = function (error) {
+    if (error instanceof Error && error.stack) {
+        return error.stack;
+    }
+    return String(error);
+};
+exports.errorStack = errorStack;
 /**
  * Safely extracts the disableExternalErrorTracking property from an error.
  * Works with both APIError instances and regular Error objects that may have
@@ -174,6 +211,7 @@ exports.getDisableExternalErrorTracking = getDisableExternalErrorTracking;
 var getAPIErrorBody = function (error) {
     var e_1, _a;
     var errorData = { status: error.status, title: error.title };
+    var indexable = error;
     try {
         for (var _b = __values([
             "id",
@@ -186,8 +224,8 @@ var getAPIErrorBody = function (error) {
             "disableExternalErrorTracking",
         ]), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
-            if (error[key]) {
-                errorData[key] = error[key];
+            if (indexable[key]) {
+                errorData[key] = indexable[key];
             }
         }
     }
@@ -211,15 +249,76 @@ var apiUnauthorizedMiddleware = function (err, _req, res, next) {
     }
 };
 exports.apiUnauthorizedMiddleware = apiUnauthorizedMiddleware;
+/**
+ * Converts Mongoose validation/cast errors into client-friendly APIErrors.
+ */
+var mongooseErrorToAPIError = function (err) {
+    var e_2, _a, _b;
+    var _c, _d;
+    if (err instanceof mongoose_1.default.Error.ValidationError) {
+        var fields = {};
+        try {
+            for (var _e = __values(Object.entries(err.errors)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var _g = __read(_f.value, 2), path = _g[0], subErr = _g[1];
+                fields[path] = subErr.message;
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return new APIError({
+            detail: err.message,
+            disableExternalErrorTracking: true,
+            fields: fields,
+            status: 400,
+            title: "Validation failed",
+        });
+    }
+    if (err instanceof mongoose_1.default.Error.CastError) {
+        var path = (_c = err.path) !== null && _c !== void 0 ? _c : "field";
+        return new APIError({
+            detail: "Invalid value for ".concat(path),
+            disableExternalErrorTracking: true,
+            fields: (_b = {},
+                _b[path] = "Expected ".concat((_d = err.kind) !== null && _d !== void 0 ? _d : "a valid value", ", got ").concat(JSON.stringify(err.value)),
+                _b),
+            status: 400,
+            title: "Validation failed",
+        });
+    }
+    return null;
+};
+exports.mongooseErrorToAPIError = mongooseErrorToAPIError;
 var apiErrorMiddleware = function (err, _req, res, next) {
     if ((0, exports.isAPIError)(err)) {
         if (!err.disableExternalErrorTracking) {
             Sentry.captureException(err);
         }
         res.status(err.status).json((0, exports.getAPIErrorBody)(err)).send();
+        return;
     }
-    else {
-        next(err);
+    var mongooseError = (0, exports.mongooseErrorToAPIError)(err);
+    if (mongooseError) {
+        res.status(mongooseError.status).json((0, exports.getAPIErrorBody)(mongooseError)).send();
+        return;
     }
+    next(err);
 };
 exports.apiErrorMiddleware = apiErrorMiddleware;
+/**
+ * Final Express error handler for unexpected errors. Always returns JSON so
+ * clients (e.g. RTK Query) can parse the response.
+ */
+var apiFallthroughErrorMiddleware = function (err, _req, res, _next) {
+    logger_1.logger.error("Fallthrough error: ".concat(err).concat(err.stack ? "\n".concat(err.stack) : ""));
+    Sentry.captureException(err);
+    if (res.headersSent) {
+        return;
+    }
+    res.status(500).json({ status: 500, title: "Internal server error" }).send();
+};
+exports.apiFallthroughErrorMiddleware = apiFallthroughErrorMiddleware;

package/dist/errors.test.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var bun_test_1 = require("bun:test");
 var Sentry = __importStar(require("@sentry/bun"));
-var mongoose_1 = require("mongoose");
+var mongoose_1 = __importStar(require("mongoose"));
 var errors_1 = require("./errors");
 var buildResponse = function () {
     var res = {
@@ -277,4 +277,19 @@ var buildResponse = function () {
         (0, bun_test_1.expect)(next).toHaveBeenCalledWith(err);
         (0, bun_test_1.expect)(res.status).not.toHaveBeenCalled();
     });
+    (0, bun_test_1.it)("converts Mongoose CastError to a 400 APIError response", function () {
+        var err = new mongoose_1.default.Error.CastError("Number", "not-a-number", "general.maxUploadSizeMb");
+        (0, errors_1.apiErrorMiddleware)(err, req, res, next);
+        (0, bun_test_1.expect)(res.status).toHaveBeenCalledWith(400);
+        (0, bun_test_1.expect)(res.json).toHaveBeenCalledWith(bun_test_1.expect.objectContaining({
+            meta: bun_test_1.expect.objectContaining({
+                fields: bun_test_1.expect.objectContaining({
+                    "general.maxUploadSizeMb": bun_test_1.expect.stringContaining("Expected Number"),
+                }),
+            }),
+            status: 400,
+            title: "Validation failed",
+        }));
+        (0, bun_test_1.expect)(next).not.toHaveBeenCalled();
+    });
 });

package/dist/example.js

@@ -67,20 +67,32 @@ mongoose_1.default
 var userSchema = new mongoose_1.Schema({
     admin: { default: false, description: "Whether the user has admin privileges", type: Boolean },
     username: { description: "The user's username", type: String },
-});
+}, { strict: "throw", toJSON: { virtuals: true }, toObject: { virtuals: true } });
+// biome-ignore lint/suspicious/noExplicitAny: passport-local-mongoose's plugin type is incompatible with mongoose Schema generics
 userSchema.plugin(passport_local_mongoose_1.default, { usernameField: "email" });
 userSchema.plugin(plugins_1.createdUpdatedPlugin);
+userSchema.plugin(plugins_1.isDeletedPlugin);
+userSchema.plugin(plugins_1.findOneOrNone);
+userSchema.plugin(plugins_1.findExactlyOne);
 userSchema.plugin(plugins_1.baseUserPlugin);
 var UserModel = (0, mongoose_1.model)("User", userSchema);
 var schema = new mongoose_1.Schema({
     calories: { description: "Number of calories in the food", type: Number },
     created: { description: "When this food was created", type: Date },
-    hidden: { default: false, description: "Whether this food is hidden from listings", type: Boolean },
+    hidden: {
+        default: false,
+        description: "Whether this food is hidden from listings",
+        type: Boolean,
+    },
     name: { description: "The name of the food", type: String },
     ownerId: { description: "The user who owns this food entry", ref: "User", type: "ObjectId" },
-});
+}, { strict: "throw", toJSON: { virtuals: true }, toObject: { virtuals: true } });
+schema.plugin(plugins_1.createdUpdatedPlugin);
+schema.plugin(plugins_1.isDeletedPlugin);
+schema.plugin(plugins_1.findOneOrNone);
+schema.plugin(plugins_1.findExactlyOne);
 var FoodModel = (0, mongoose_1.model)("Food", schema);
-function getBaseServer() {
+var getBaseServer = function () {
     var app = (0, express_1.default)();
     app.use(function (req, res, next) {
         res.header("Access-Control-Allow-Origin", "*");
@@ -96,7 +108,7 @@ function getBaseServer() {
     app.use(express_1.default.json());
     (0, auth_1.setupAuth)(app, UserModel);
     (0, auth_1.addAuthRoutes)(app, UserModel);
-    function addRoutes(router, options) {
+    var addRoutes = function (router, options) {
         router.use("/food", (0, api_1.modelRouter)(FoodModel, __assign(__assign({}, options), { openApiOverwrite: {
                 get: { responses: { 200: { description: "Get all the food" } } },
             }, permissions: {
@@ -106,7 +118,7 @@ function getBaseServer() {
                 read: [permissions_1.Permissions.IsAny],
                 update: [permissions_1.Permissions.IsOwner],
             }, queryFields: ["name", "calories", "created", "ownerId", "hidden"] })));
-    }
+    };
     return (0, expressServer_1.setupServer)({
         addRoutes: addRoutes,
         loggingOptions: {
@@ -114,5 +126,5 @@ function getBaseServer() {
         },
         userModel: UserModel,
     });
-}
+};
 getBaseServer();

package/dist/expressServer.d.ts

@@ -5,13 +5,13 @@ import type { ModelRouterOptions } from "./api";
 import { type UserModel as UserMongooseModel } from "./auth";
 import { type GitHubAuthOptions } from "./githubAuth";
 import { type LoggingOptions } from "./logger";
-export declare function setupEnvironment(): void;
+export declare const setupEnvironment: () => void;
 export type AddRoutes = (router: Router, options?: Partial<ModelRouterOptions<unknown>>) => void;
-export declare function logRequests(req: any, res: any, next: any): void;
-export declare function createRouter(rootPath: string, addRoutes: AddRoutes, middleware?: any[]): any[];
-export declare function createRouterWithAuth(rootPath: string, addRoutes: (router: Router) => void, middleware?: any[]): any[];
+export declare const logRequests: (req: any, res: any, next: express.NextFunction) => void;
+export declare const createRouter: (rootPath: string, addRoutes: AddRoutes, middleware?: express.RequestHandler[]) => Array<string | express.RequestHandler | Router>;
+export declare const createRouterWithAuth: (rootPath: string, addRoutes: (router: Router) => void, middleware?: express.RequestHandler[]) => Array<string | express.RequestHandler | Router>;
 export interface AuthOptions {
-    generateJWTPayload?: (user: any) => Record<string, any>;
+    generateJWTPayload?: (user: any) => Record<string, unknown>;
     generateTokenExpiration?: (user: any) => number | jwt.SignOptions["expiresIn"];
     generateRefreshTokenExpiration?: (user: any) => number | jwt.SignOptions["expiresIn"];
 }
@@ -19,6 +19,7 @@ export interface SetupServerOptions {
     userModel: UserMongooseModel;
     addRoutes: AddRoutes;
     loggingOptions?: LoggingOptions;
+    logRequests?: boolean;
     authOptions?: AuthOptions;
     /**
      * GitHub OAuth configuration. When provided, enables GitHub authentication.
@@ -31,11 +32,11 @@ export interface SetupServerOptions {
     ignoreTraces?: string[];
     sentryOptions?: Sentry.BunOptions;
 }
-export declare function setupServer(options: SetupServerOptions): express.Application;
-export declare function cronjob(name: string, schedule: "hourly" | "minutely" | string, callback: () => void): void;
+export declare const setupServer: (options: SetupServerOptions) => express.Application;
+export declare const cronjob: (name: string, schedule: "hourly" | "minutely" | string, callback: () => void) => void;
 export interface WrapScriptOptions {
-    onFinish?: (result?: any) => void | Promise<void>;
+    onFinish?: (result?: unknown) => void | Promise<void>;
     terminateTimeout?: number;
     slackChannel?: string;
 }
-export declare function wrapScript(func: () => Promise<any>, options?: WrapScriptOptions): Promise<void>;
+export declare const wrapScript: (func: () => Promise<unknown>, options?: WrapScriptOptions) => Promise<void>;

package/dist/expressServer.js

@@ -97,13 +97,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupEnvironment = setupEnvironment;
-exports.logRequests = logRequests;
-exports.createRouter = createRouter;
-exports.createRouterWithAuth = createRouterWithAuth;
-exports.setupServer = setupServer;
-exports.cronjob = cronjob;
-exports.wrapScript = wrapScript;
+exports.wrapScript = exports.cronjob = exports.setupServer = exports.createRouterWithAuth = exports.createRouter = exports.logRequests = exports.setupEnvironment = void 0;
 var Sentry = __importStar(require("@sentry/bun"));
 var cors_1 = __importDefault(require("cors"));
 var cron_1 = __importDefault(require("cron"));
@@ -119,11 +113,12 @@ var logger_1 = require("./logger");
 var notifiers_1 = require("./notifiers");
 var openApiCompat_1 = require("./openApiCompat");
 var openApiEtag_1 = require("./openApiEtag");
+var requestContext_1 = require("./requestContext");
 var index_1 = __importDefault(require("./vendor/wesleytodd-openapi/index"));
 var SLOW_READ_MAX = 200;
 var SLOW_WRITE_MAX = 500;
 var IS_JEST = process.env.JEST_WORKER_ID !== undefined;
-function setupEnvironment() {
+var setupEnvironment = function () {
     if (!process.env.TOKEN_ISSUER) {
         throw new Error("TOKEN_ISSUER must be set in env.");
     }
@@ -142,12 +137,14 @@ function setupEnvironment() {
     if (!process.env.REFRESH_TOKEN_EXPIRES_IN && !IS_JEST) {
         logger_1.logger.warn("REFRESH_TOKEN_EXPIRES_IN not set so using default.");
     }
-}
+};
+exports.setupEnvironment = setupEnvironment;
+// biome-ignore lint/suspicious/noExplicitAny: also called from tests with mock request/response objects
 var logRequestsFinished = function (req, res, startTime) {
-    var _a, _b, _c;
-    var options = ((_a = res.locals.loggingOptions) !== null && _a !== void 0 ? _a : {});
-    var slowReadMs = (_b = options.logSlowRequestsReadMs) !== null && _b !== void 0 ? _b : SLOW_READ_MAX;
-    var slowWriteMs = (_c = options.logSlowRequestsWriteMs) !== null && _c !== void 0 ? _c : SLOW_WRITE_MAX;
+    var _a, _b, _c, _d;
+    var options = ((_b = (_a = res.locals) === null || _a === void 0 ? void 0 : _a.loggingOptions) !== null && _b !== void 0 ? _b : {});
+    var slowReadMs = (_c = options.logSlowRequestsReadMs) !== null && _c !== void 0 ? _c : SLOW_READ_MAX;
+    var slowWriteMs = (_d = options.logSlowRequestsWriteMs) !== null && _d !== void 0 ? _d : SLOW_WRITE_MAX;
     var diff = process.hrtime.bigint() - startTime;
     var diffInMs = Number(diff) / 1000000;
     var pathName = "unknown";
@@ -180,7 +177,8 @@ var logRequestsFinished = function (req, res, startTime) {
         }
     }
 };
-function logRequests(req, res, next) {
+// biome-ignore lint/suspicious/noExplicitAny: also called from tests with mock request/response objects
+var logRequests = function (req, res, next) {
     var _a, _b, _c, _d;
     var startTime = process.hrtime.bigint();
     var userString = "";
@@ -210,35 +208,38 @@ function logRequests(req, res, next) {
     }
     (0, on_finished_1.default)(res, function () { return logRequestsFinished(req, res, startTime); });
     next();
-}
-function createRouter(rootPath, addRoutes, middleware) {
+};
+exports.logRequests = logRequests;
+var createRouter = function (rootPath, addRoutes, middleware) {
     if (middleware === void 0) { middleware = []; }
-    function routePathMiddleware(req, _res, next) {
+    var routePathMiddleware = function (req, _res, next) {
         if (!req.routeMount) {
             req.routeMount = [];
         }
         req.routeMount.push(rootPath);
         next();
-    }
+    };
     var router = express_1.default.Router();
     router.use(routePathMiddleware);
     addRoutes(router);
     return __spreadArray(__spreadArray([rootPath], __read(middleware), false), [router], false);
-}
-function createRouterWithAuth(rootPath, addRoutes, middleware) {
+};
+exports.createRouter = createRouter;
+var createRouterWithAuth = function (rootPath, addRoutes, middleware) {
     if (middleware === void 0) { middleware = []; }
-    return createRouter(rootPath, addRoutes, __spreadArray([
+    return (0, exports.createRouter)(rootPath, addRoutes, __spreadArray([
         passport_1.default.authenticate("firebase-jwt", { session: false })
     ], __read(middleware), false));
-}
-function initializeRoutes(UserModel, addRoutes, options) {
+};
+exports.createRouterWithAuth = createRouterWithAuth;
+var initializeRoutes = function (UserModel, addRoutes, options) {
     var _a;
     if (options === void 0) { options = {}; }
     var app = (0, express_1.default)();
     // Record mount paths on layers for Express 5 → OpenAPI compat
     (0, openApiCompat_1.patchAppUse)(app);
-    // TODO: Log a warning when we hit the array limit.
     app.set("query parser", function (str) { var _a; return qs_1.default.parse(str, { arrayLimit: (_a = options.arrayLimit) !== null && _a !== void 0 ? _a : 200 }); });
+    app.use(requestContext_1.requestContextMiddleware);
     app.use((0, cors_1.default)({
         origin: (_a = options.corsOrigin) !== null && _a !== void 0 ? _a : "*",
     }));
@@ -249,8 +250,12 @@ function initializeRoutes(UserModel, addRoutes, options) {
     // Add login/signup/refresh_token before the JWT/auth middlewares
     (0, auth_1.addAuthRoutes)(app, UserModel, options === null || options === void 0 ? void 0 : options.authOptions);
     (0, auth_1.setupAuth)(app, UserModel);
+    app.use(function (req, res, next) {
+        (0, requestContext_1.updateRequestContextFromRequest)(req, res);
+        next();
+    });
     if (options.logRequests !== false) {
-        app.use(logRequests);
+        app.use(exports.logRequests);
     }
     // Store the logging options on the request so we can access them later.
     app.use(function (_req, res, next) {
@@ -259,17 +264,21 @@ function initializeRoutes(UserModel, addRoutes, options) {
     });
     // Add Sentry scopes for session, transaction, and userId if any are set
     app.use(function (req, _res, next) {
-        var _a;
+        var _a, _b;
+        var context = (0, requestContext_1.getCurrentRequestContext)();
         var transactionId = req.header("X-Transaction-ID");
-        var sessionId = req.header("X-Session-ID");
+        var sessionId = (_a = context === null || context === void 0 ? void 0 : context.sessionId) !== null && _a !== void 0 ? _a : req.header("X-Session-ID");
+        if (context === null || context === void 0 ? void 0 : context.requestId) {
+            Sentry.getCurrentScope().setTag("request_id", context.requestId);
+        }
         if (transactionId) {
             Sentry.getCurrentScope().setTag("transaction_id", transactionId);
         }
         if (sessionId) {
             Sentry.getCurrentScope().setTag("session_id", sessionId);
         }
-        if ((_a = req.user) === null || _a === void 0 ? void 0 : _a._id) {
-            Sentry.getCurrentScope().setTag("user", req.user._id);
+        if ((_b = req.user) === null || _b === void 0 ? void 0 : _b._id) {
+            Sentry.getCurrentScope().setTag("user", String(req.user._id));
         }
         next();
     });
@@ -299,16 +308,10 @@ function initializeRoutes(UserModel, addRoutes, options) {
     // Catch any thrown APIErrors and return them in an OpenAPI compatible format
     app.use(errors_1.apiUnauthorizedMiddleware);
     app.use(errors_1.apiErrorMiddleware);
-    app.use(function onError(err, _req, res, _next) {
-        logger_1.logger.error("Fallthrough error: ".concat(err).concat((err === null || err === void 0 ? void 0 : err.stack) ? "\n".concat(err.stack) : "", "}"));
-        Sentry.captureException(err);
-        res.statusCode = 500;
-        res.end("".concat(res.sentry, "\n"));
-    });
+    app.use(errors_1.apiFallthroughErrorMiddleware);
     return app;
-}
-// Sets up the routes and returns the app.
-function setupServer(options) {
+};
+var setupServer = function (options) {
     var UserModel = options.userModel;
     var addRoutes = options.addRoutes;
     (0, logger_1.setupLogging)(options.loggingOptions);
@@ -319,10 +322,13 @@ function setupServer(options) {
             authOptions: options.authOptions,
             corsOrigin: options.corsOrigin,
             githubAuth: options.githubAuth,
+            loggingOptions: options.loggingOptions,
+            logRequests: options.logRequests,
         });
     }
     catch (error) {
-        logger_1.logger.error("Error initializing routes: ".concat(error.stack));
+        var stack = error instanceof Error && error.stack ? error.stack : String(error);
+        logger_1.logger.error("Error initializing routes: ".concat(stack));
         throw error;
     }
     if (!options.skipListen) {
@@ -333,14 +339,15 @@ function setupServer(options) {
             });
         }
         catch (error) {
-            logger_1.logger.error("Error trying to start HTTP server: ".concat(error, "\n").concat(error.stack));
+            var stack = error instanceof Error ? error.stack : String(error);
+            logger_1.logger.error("Error trying to start HTTP server: ".concat(error, "\n").concat(stack));
             process.exit(1);
         }
     }
     return app;
-}
-// Convenience method to execute cronjobs with an always-running server.
-function cronjob(name, schedule, callback) {
+};
+exports.setupServer = setupServer;
+var cronjob = function (name, schedule, callback) {
     var cronSchedule = schedule === "hourly" ? "0 * * * *" : schedule === "minutely" ? "* * * * *" : schedule;
     logger_1.logger.info("Adding cronjob ".concat(name, ", running at: ").concat(cronSchedule));
     try {
@@ -349,13 +356,15 @@ function cronjob(name, schedule, callback) {
     catch (error) {
         throw new Error("Failed to create cronjob: ".concat(error));
     }
-}
-// Wrap up a script with some helpers, such as catching errors, reporting them to sentry, notifying
-// Slack of runs, etc. Also supports timeouts.
-function wrapScript(func_1) {
-    return __awaiter(this, arguments, void 0, function (func, options) {
+};
+exports.cronjob = cronjob;
+var wrapScript = function (func_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([func_1], __read(args_1), false), void 0, function (func, options) {
         var name, warnTime_1, closeTime, result, error_1;
-        var _this = this;
         var _a, _b, _c;
         if (options === void 0) { options = {}; }
         return __generator(this, function (_d) {
@@ -371,7 +380,7 @@ function wrapScript(func_1) {
                     if (options.terminateTimeout !== 0) {
                         warnTime_1 = (((_b = options.terminateTimeout) !== null && _b !== void 0 ? _b : 300) / 2) * 1000;
                         closeTime = ((_c = options.terminateTimeout) !== null && _c !== void 0 ? _c : 300) * 1000;
-                        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                        setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
                             var msg;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -385,7 +394,7 @@ function wrapScript(func_1) {
                                 }
                             });
                         }); }, warnTime_1);
-                        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                        setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
                             var msg;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -432,10 +441,10 @@ function wrapScript(func_1) {
                 case 9: return [4 /*yield*/, (0, notifiers_1.sendToSlack)("Success running script ".concat(name, ": ").concat(result))];
                 case 10:
                     _d.sent();
-                    // Unclear why we have to exit here to prevent the script for continuing to run.
                     process.exit(0);
                     return [2 /*return*/];
             }
         });
     });
-}
+};
+exports.wrapScript = wrapScript;