@terreno/api 0.13.3 → 0.14.1

package/dist/expressServer.test.js

@@ -86,10 +86,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
 var bun_test_1 = require("bun:test");
+var node_stream_1 = require("node:stream");
 var express_1 = __importDefault(require("express"));
 var supertest_1 = __importDefault(require("supertest"));
+var winston_1 = __importDefault(require("winston"));
 var expressServer_1 = require("./expressServer");
+var logger_1 = require("./logger");
 var tests_1 = require("./tests");
 (0, bun_test_1.describe)("expressServer", function () {
     (0, bun_test_1.describe)("setupEnvironment", function () {
@@ -122,6 +126,55 @@ var tests_1 = require("./tests");
         });
     });
     (0, bun_test_1.describe)("logRequests", function () {
+        (0, bun_test_1.it)("attaches request and session context to route logs", function () { return __awaiter(void 0, void 0, void 0, function () {
+            var logs, logStream, transport, app, res, parsedLog;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        logs = [];
+                        logStream = new node_stream_1.Writable({
+                            write: function (chunk, _encoding, callback) {
+                                logs.push(chunk.toString());
+                                callback();
+                            },
+                        });
+                        transport = new winston_1.default.transports.Stream({
+                            format: winston_1.default.format.json(),
+                            stream: logStream,
+                        });
+                        app = (0, expressServer_1.setupServer)({
+                            addRoutes: function (router) {
+                                router.get("/context-test", function (req, res) {
+                                    logger_1.logger.info("context route log");
+                                    return res.json({ requestId: req.requestId, sessionId: req.sessionId });
+                                });
+                            },
+                            logRequests: false,
+                            skipListen: true,
+                            userModel: tests_1.UserModel,
+                        });
+                        logger_1.winstonLogger.add(transport);
+                        return [4 /*yield*/, (0, supertest_1.default)(app)
+                                .get("/context-test")
+                                .set("X-Request-ID", "req-123")
+                                .set("X-Session-ID", "session-123")
+                                .expect(200)];
+                    case 1:
+                        res = _a.sent();
+                        (0, bun_test_1.expect)(res.headers["x-request-id"]).toBe("req-123");
+                        (0, bun_test_1.expect)(res.headers["x-session-id"]).toBe("session-123");
+                        (0, bun_test_1.expect)(res.body).toEqual({ requestId: "req-123", sessionId: "session-123" });
+                        parsedLog = logs
+                            .map(function (entry) { return JSON.parse(entry); })
+                            .find(function (entry) { return entry.message === "context route log"; });
+                        (0, bun_test_1.expect)(parsedLog).toBeDefined();
+                        (0, bun_test_1.expect)(parsedLog.requestId).toBe("req-123");
+                        (0, bun_test_1.expect)(parsedLog.sessionId).toBe("session-123");
+                        logger_1.winstonLogger.remove(transport);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
         (0, bun_test_1.it)("logs request with admin user type", function () {
             var req = {
                 body: {},
@@ -793,7 +846,6 @@ var tests_1 = require("./tests");
         var originalSetTimeout = globalThis.setTimeout;
         var timerIds = [];
         (0, bun_test_1.beforeEach)(function () {
-            // biome-ignore lint/suspicious/noExplicitAny: Mock requires type override for process.exit.
             process.exit = (0, bun_test_1.mock)(function () {
                 throw new Error("process.exit called");
             });
@@ -914,6 +966,118 @@ var tests_1 = require("./tests");
             });
         }); });
     });
+    (0, bun_test_1.describe)("setupServer with listen", function () {
+        var originalEnv = process.env;
+        var http = require("node:http");
+        var activeServer = null;
+        var originalListen = null;
+        (0, bun_test_1.beforeEach)(function () {
+            process.env = __assign(__assign({}, originalEnv), { PORT: "0", REFRESH_TOKEN_SECRET: "test-refresh-secret", SESSION_SECRET: "test-session-secret", TOKEN_EXPIRES_IN: "1h", TOKEN_ISSUER: "test-issuer", TOKEN_SECRET: "test-secret" });
+            originalListen = http.Server.prototype.listen;
+            http.Server.prototype.listen = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                activeServer = this;
+                return originalListen.apply(this, args);
+            };
+        });
+        (0, bun_test_1.afterEach)(function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        process.env = originalEnv;
+                        http.Server.prototype.listen = originalListen;
+                        if (!activeServer) return [3 /*break*/, 2];
+                        return [4 /*yield*/, new Promise(function (resolve) { return activeServer.close(function () { return resolve(); }); })];
+                    case 1:
+                        _a.sent();
+                        activeServer = null;
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        }); });
+        (0, bun_test_1.it)("starts listening on a port when skipListen is false", function () { return __awaiter(void 0, void 0, void 0, function () {
+            var addRoutes, app;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        addRoutes = function () { };
+                        app = (0, expressServer_1.setupServer)({
+                            addRoutes: addRoutes,
+                            skipListen: false,
+                            userModel: tests_1.UserModel,
+                        });
+                        (0, bun_test_1.expect)(app).toBeDefined();
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 100); })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
+    (0, bun_test_1.describe)("wrapScript timeout callbacks", function () {
+        var originalEnv = process.env;
+        var originalExit = process.exit;
+        var originalSetTimeout = globalThis.setTimeout;
+        var timerIds = [];
+        var timerCallbacks = [];
+        (0, bun_test_1.beforeEach)(function () {
+            process.env = __assign(__assign({}, process.env), { REFRESH_TOKEN_SECRET: "test-refresh-secret", SESSION_SECRET: "test-session-secret", TOKEN_EXPIRES_IN: "1h", TOKEN_ISSUER: "test-issuer", TOKEN_SECRET: "test-secret" });
+            process.exit = (0, bun_test_1.mock)(function () {
+                throw new Error("__EXIT__");
+            });
+            timerCallbacks.length = 0;
+            timerIds.length = 0;
+            globalThis.setTimeout = (function (cb, delay) {
+                timerCallbacks.push({ callback: cb, delay: delay });
+                var id = originalSetTimeout(cb, delay);
+                timerIds.push(id);
+                return id;
+            });
+        });
+        (0, bun_test_1.afterEach)(function () {
+            var e_2, _a;
+            try {
+                for (var timerIds_2 = __values(timerIds), timerIds_2_1 = timerIds_2.next(); !timerIds_2_1.done; timerIds_2_1 = timerIds_2.next()) {
+                    var id = timerIds_2_1.value;
+                    clearTimeout(id);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (timerIds_2_1 && !timerIds_2_1.done && (_a = timerIds_2.return)) _a.call(timerIds_2);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            globalThis.setTimeout = originalSetTimeout;
+            process.exit = originalExit;
+            process.env = originalEnv;
+        });
+        (0, bun_test_1.it)("registers warn and terminate timeouts with correct delays", function () { return __awaiter(void 0, void 0, void 0, function () {
+            var func, warnTimer, closeTimer;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        func = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                            return [2 /*return*/, "ok"];
+                        }); }); };
+                        return [4 /*yield*/, (0, bun_test_1.expect)((0, expressServer_1.wrapScript)(func, { terminateTimeout: 100 })).rejects.toThrow("__EXIT__")];
+                    case 1:
+                        _a.sent();
+                        warnTimer = timerCallbacks.find(function (t) { return t.delay === 50000; });
+                        closeTimer = timerCallbacks.find(function (t) { return t.delay === 100000; });
+                        (0, bun_test_1.expect)(warnTimer).toBeDefined();
+                        (0, bun_test_1.expect)(closeTimer).toBeDefined();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
     (0, bun_test_1.describe)("setupServer error handling", function () {
         var originalEnv = process.env;
         (0, bun_test_1.beforeEach)(function () {
@@ -930,7 +1094,6 @@ var tests_1 = require("./tests");
                 return (0, expressServer_1.setupServer)({
                     addRoutes: addRoutes,
                     skipListen: true,
-                    // biome-ignore lint/suspicious/noExplicitAny: Test mock for UserModel.
                     userModel: tests_1.UserModel,
                 });
             }).toThrow("route initialization failed");

package/dist/githubAuth.d.ts

@@ -1,4 +1,5 @@
 import type express from "express";
+import type { Schema } from "mongoose";
 import { type Profile } from "passport-github2";
 import { type UserModel } from "./auth";
 import type { AuthOptions } from "./expressServer";
@@ -46,7 +47,7 @@ export interface GitHubUserFields {
  * userSchema.plugin(githubUserPlugin);
  * ```
  */
-export declare const githubUserPlugin: (schema: any) => void;
+export declare const githubUserPlugin: (schema: Schema<any, any, any, any>) => void;
 /**
  * Sets up GitHub OAuth authentication strategy.
  * Call this after setupAuth() in your server initialization.

package/dist/githubAuth.js

@@ -58,12 +58,19 @@ var plugins_1 = require("./plugins");
  * userSchema.plugin(githubUserPlugin);
  * ```
  */
+// biome-ignore lint/suspicious/noExplicitAny: Schema generics must be loose to accept arbitrary consumer schemas
 var githubUserPlugin = function (schema) {
     schema.add({
-        githubAvatarUrl: { type: String },
-        githubId: { index: true, sparse: true, type: String, unique: true },
-        githubProfileUrl: { type: String },
-        githubUsername: { type: String },
+        githubAvatarUrl: { description: "GitHub avatar image URL", type: String },
+        githubId: {
+            description: "GitHub user ID",
+            index: true,
+            sparse: true,
+            type: String,
+            unique: true,
+        },
+        githubProfileUrl: { description: "GitHub profile URL", type: String },
+        githubUsername: { description: "GitHub username", type: String },
     });
 };
 exports.githubUserPlugin = githubUserPlugin;
@@ -74,14 +81,16 @@ exports.githubUserPlugin = githubUserPlugin;
 var setupGitHubAuth = function (_app, userModel, githubOptions) {
     var _a;
     var scope = (_a = githubOptions.scope) !== null && _a !== void 0 ? _a : ["user:email"];
-    passport_1.default.use("github", new passport_github2_1.Strategy({
+    passport_1.default.use("github", 
+    // biome-ignore lint/suspicious/noExplicitAny: passport-github2's typed constructor overloads don't match passReqToCallback variant
+    new passport_github2_1.Strategy({
         callbackURL: githubOptions.callbackURL,
         clientID: githubOptions.clientId,
         clientSecret: githubOptions.clientSecret,
         passReqToCallback: true,
         scope: scope,
-    }, (function (req, accessToken, refreshToken, profile, done) { return __awaiter(void 0, void 0, void 0, function () {
-        var existingUser, user, githubId, existingGitHubUser, user, email, existingEmailUser, newUser, error_1;
+    }, function (req, accessToken, refreshToken, profile, done) { return __awaiter(void 0, void 0, void 0, function () {
+        var existingUser, user, githubId, existingGitHubUser, user, userWithGitHub, email, existingEmailUser, emailUserWithGitHub, newUser, error_1;
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __generator(this, function (_j) {
             switch (_j.label) {
@@ -113,10 +122,11 @@ var setupGitHubAuth = function (_app, userModel, githubOptions) {
                 case 4:
                     user = _j.sent();
                     if (!user) return [3 /*break*/, 6];
-                    user.githubId = githubId;
-                    user.githubUsername = profile.username;
-                    user.githubProfileUrl = profile.profileUrl;
-                    user.githubAvatarUrl = (_b = (_a = profile.photos) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value;
+                    userWithGitHub = user;
+                    userWithGitHub.githubId = githubId;
+                    userWithGitHub.githubUsername = profile.username;
+                    userWithGitHub.githubProfileUrl = profile.profileUrl;
+                    userWithGitHub.githubAvatarUrl = (_b = (_a = profile.photos) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value;
                     return [4 /*yield*/, user.save()];
                 case 5:
                     _j.sent();
@@ -134,10 +144,11 @@ var setupGitHubAuth = function (_app, userModel, githubOptions) {
                     existingEmailUser = _j.sent();
                     if (!existingEmailUser) return [3 /*break*/, 11];
                     if (!(githubOptions.allowAccountLinking !== false)) return [3 /*break*/, 10];
-                    existingEmailUser.githubId = githubId;
-                    existingEmailUser.githubUsername = profile.username;
-                    existingEmailUser.githubProfileUrl = profile.profileUrl;
-                    existingEmailUser.githubAvatarUrl = (_f = (_e = profile.photos) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.value;
+                    emailUserWithGitHub = existingEmailUser;
+                    emailUserWithGitHub.githubId = githubId;
+                    emailUserWithGitHub.githubUsername = profile.username;
+                    emailUserWithGitHub.githubProfileUrl = profile.profileUrl;
+                    emailUserWithGitHub.githubAvatarUrl = (_f = (_e = profile.photos) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.value;
                     return [4 /*yield*/, existingEmailUser.save()];
                 case 9:
                     _j.sent();
@@ -166,7 +177,7 @@ var setupGitHubAuth = function (_app, userModel, githubOptions) {
                 case 14: return [2 /*return*/];
             }
         });
-    }); })));
+    }); }));
 };
 exports.setupGitHubAuth = setupGitHubAuth;
 /**
@@ -182,11 +193,13 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
     var router = (0, express_1.Router)();
     // Initiate GitHub OAuth flow
     router.get("/github", function (req, _res, next) {
+        var _a;
         // Store the return URL in session or query for redirect after auth
         var returnTo = req.query.returnTo;
         if (returnTo) {
-            req.session = req.session || {};
-            req.session.returnTo = returnTo;
+            var reqWithSession = req;
+            reqWithSession.session = (_a = reqWithSession.session) !== null && _a !== void 0 ? _a : {};
+            reqWithSession.session.returnTo = returnTo;
         }
         next();
     }, passport_1.default.authenticate("github", { session: false }));
@@ -208,11 +221,11 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
                     // If there's a return URL, redirect with tokens as query params
                     if (returnTo) {
                         url = new URL(returnTo);
-                        url.searchParams.set("token", tokens.token || "");
+                        url.searchParams.set("token", (_b = tokens.token) !== null && _b !== void 0 ? _b : "");
                         if (tokens.refreshToken) {
                             url.searchParams.set("refreshToken", tokens.refreshToken);
                         }
-                        url.searchParams.set("userId", ((_c = (_b = req.user) === null || _b === void 0 ? void 0 : _b._id) === null || _c === void 0 ? void 0 : _c.toString()) || "");
+                        url.searchParams.set("userId", ((_c = req.user) === null || _c === void 0 ? void 0 : _c._id) ? String(req.user._id) : "");
                         return [2 /*return*/, res.redirect(url.toString())];
                     }
                     // Otherwise return JSON response
@@ -250,7 +263,7 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
         }, passport_1.default.authenticate("github", { session: false }));
         // Unlink GitHub from user account
         router.delete("/github/unlink", passport_1.default.authenticate("jwt", { session: false }), function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-            var user, hasPassword, error_3;
+            var user, userWithAuth, hasPassword, userWithGitHub, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -266,16 +279,18 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
                         if (!user) {
                             return [2 /*return*/, res.status(404).json({ message: "User not found" })];
                         }
-                        hasPassword = !!user.hash || !!user.salt;
+                        userWithAuth = user;
+                        hasPassword = !!userWithAuth.hash || !!userWithAuth.salt;
                         if (!hasPassword) {
                             return [2 /*return*/, res.status(400).json({
                                     message: "Cannot unlink GitHub account without another authentication method. Set a password first.",
                                 })];
                         }
-                        user.githubId = undefined;
-                        user.githubUsername = undefined;
-                        user.githubProfileUrl = undefined;
-                        user.githubAvatarUrl = undefined;
+                        userWithGitHub = user;
+                        userWithGitHub.githubId = undefined;
+                        userWithGitHub.githubUsername = undefined;
+                        userWithGitHub.githubProfileUrl = undefined;
+                        userWithGitHub.githubAvatarUrl = undefined;
                         return [4 /*yield*/, user.save()];
                     case 3:
                         _a.sent();

package/dist/githubAuth.test.js

@@ -72,6 +72,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
 var bun_test_1 = require("bun:test");
 var mongoose_1 = __importStar(require("mongoose"));
 var passport_1 = __importDefault(require("passport"));

package/dist/index.d.ts

@@ -3,9 +3,11 @@ export * from "./auth";
 export * from "./betterAuth";
 export * from "./betterAuthApp";
 export * from "./betterAuthSetup";
+export * from "./config";
 export * from "./configurationApp";
 export * from "./configurationPlugin";
 export * from "./consentApp";
+export * from "./envConfigurationPlugin";
 export * from "./errors";
 export * from "./expressServer";
 export * from "./githubAuth";
@@ -22,6 +24,8 @@ export * from "./openApiValidator";
 export * from "./permissions";
 export * from "./plugins";
 export * from "./populate";
+export * from "./realtime";
+export * from "./requestContext";
 export * from "./scriptRunner";
 export * from "./secretProviders";
 export * from "./syncConsents";

package/dist/index.js

@@ -19,9 +19,11 @@ __exportStar(require("./auth"), exports);
 __exportStar(require("./betterAuth"), exports);
 __exportStar(require("./betterAuthApp"), exports);
 __exportStar(require("./betterAuthSetup"), exports);
+__exportStar(require("./config"), exports);
 __exportStar(require("./configurationApp"), exports);
 __exportStar(require("./configurationPlugin"), exports);
 __exportStar(require("./consentApp"), exports);
+__exportStar(require("./envConfigurationPlugin"), exports);
 __exportStar(require("./errors"), exports);
 __exportStar(require("./expressServer"), exports);
 __exportStar(require("./githubAuth"), exports);
@@ -38,6 +40,8 @@ __exportStar(require("./openApiValidator"), exports);
 __exportStar(require("./permissions"), exports);
 __exportStar(require("./plugins"), exports);
 __exportStar(require("./populate"), exports);
+__exportStar(require("./realtime"), exports);
+__exportStar(require("./requestContext"), exports);
 __exportStar(require("./scriptRunner"), exports);
 __exportStar(require("./secretProviders"), exports);
 __exportStar(require("./syncConsents"), exports);

package/dist/logger.d.ts

@@ -20,4 +20,4 @@ export interface LoggingOptions {
     logSlowRequestsReadMs?: number;
     logSlowRequestsWriteMs?: number;
 }
-export declare function setupLogging(options?: LoggingOptions): void;
+export declare const setupLogging: (options?: LoggingOptions) => void;

package/dist/logger.js

@@ -83,50 +83,70 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.winstonLogger = void 0;
-exports.setupLogging = setupLogging;
+exports.setupLogging = exports.logger = exports.winstonLogger = void 0;
 var node_fs_1 = __importDefault(require("node:fs"));
 var node_util_1 = require("node:util");
 var Sentry = __importStar(require("@sentry/bun"));
 var winston_1 = __importDefault(require("winston"));
-function isPrimitive(val) {
+var requestContext_1 = require("./requestContext");
+var isPrimitive = function (val) {
     return val === null || (typeof val !== "object" && typeof val !== "function");
-}
-function formatWithInspect(val) {
+};
+var formatWithInspect = function (val) {
     var prefix = isPrimitive(val) ? "" : "\n";
     var shouldFormat = typeof val !== "string";
     return prefix + (shouldFormat ? (0, node_util_1.inspect)(val, { colors: true, depth: null }) : val);
-}
+};
+var addRequestContextFormat = winston_1.default.format(function (info) {
+    var context = (0, requestContext_1.getCurrentLogContext)();
+    return __assign(__assign({}, context), info);
+});
+var formatContext = function (info) {
+    var contextParts = [
+        info.requestId ? "requestId=".concat(info.requestId) : undefined,
+        info.jobId ? "jobId=".concat(info.jobId) : undefined,
+        info.sessionId ? "sessionId=".concat(info.sessionId) : undefined,
+        info.userId ? "userId=".concat(info.userId) : undefined,
+        info.traceId ? "traceId=".concat(info.traceId) : undefined,
+    ].filter(Boolean);
+    if (contextParts.length === 0) {
+        return "";
+    }
+    return " ".concat(contextParts.join(" "));
+};
 // Winston doesn't operate like console.log by default, e.g. `logger.error('error',
 // error)` only prints the message and no args. Add handling for all the args,
 // while also supporting splat logging.
-function printf(timestamp) {
+var printf = function (timestamp) {
     if (timestamp === void 0) { timestamp = false; }
     return function (info) {
         var msg = formatWithInspect(info.message);
-        var splatArgs = (info[Symbol.for("splat")] || []);
+        var splatKey = Symbol.for("splat");
+        var splatArgs = (info[splatKey] || []);
         var rest = splatArgs.map(function (data) { return formatWithInspect(data); }).join(" ");
+        var context = formatContext(info);
         if (timestamp) {
-            return "".concat(info.timestamp, " - ").concat(info.level, ": ").concat(msg, " ").concat(rest);
+            return "".concat(info.timestamp, " - ").concat(info.level, ": ").concat(msg).concat(context, " ").concat(rest);
         }
-        return "".concat(info.level, ": ").concat(msg, " ").concat(rest);
+        return "".concat(info.level, ": ").concat(msg).concat(context, " ").concat(rest);
     };
-}
+};
 // Setup a global, default rejection handler.
 winston_1.default.add(new winston_1.default.transports.Console({
     debugStdout: true,
-    format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple(), winston_1.default.format.printf(printf(false))),
+    format: winston_1.default.format.combine(addRequestContextFormat(), winston_1.default.format.colorize(), winston_1.default.format.simple(), winston_1.default.format.printf(printf(false))),
     handleExceptions: true,
     handleRejections: true,
     level: "error",
 }));
 // Setup a default console logger.
 exports.winstonLogger = winston_1.default.createLogger({
+    format: addRequestContextFormat(),
     level: "debug",
     transports: [
         new winston_1.default.transports.Console({
             debugStdout: true,
-            format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple(), winston_1.default.format.printf(printf(false))),
+            format: winston_1.default.format.combine(addRequestContextFormat(), winston_1.default.format.colorize(), winston_1.default.format.simple(), winston_1.default.format.printf(printf(false))),
             handleExceptions: true,
             handleRejections: true,
             level: "debug",
@@ -134,11 +154,12 @@ exports.winstonLogger = winston_1.default.createLogger({
     ],
 });
 // Helper function to send logs to Sentry if enabled
-function sendToSentry(message, level) {
+var sendToSentry = function (message, level) {
     if (process.env.USE_SENTRY_LOGGING === "true" && Sentry.logger) {
-        Sentry.logger[level](message);
+        var logWithContext = Sentry.logger[level];
+        logWithContext(message, (0, requestContext_1.getCurrentLogContext)());
     }
-}
+};
 exports.logger = {
     // simple way to log a caught exception. e.g. promise().catch(logger.catch)
     catch: function (e) {
@@ -186,12 +207,12 @@ exports.logger = {
         sendToSentry(msg, "warn");
     },
 };
-function setupLogging(options) {
+var setupLogging = function (options) {
     var _a, e_1, _b;
     var _c, _d;
     exports.winstonLogger.clear();
     if (!(options === null || options === void 0 ? void 0 : options.disableConsoleLogging)) {
-        var formats = [winston_1.default.format.simple()];
+        var formats = [addRequestContextFormat(), winston_1.default.format.simple()];
         if (!(options === null || options === void 0 ? void 0 : options.disableConsoleColors)) {
             formats.push(winston_1.default.format.colorize());
         }
@@ -211,7 +232,7 @@ function setupLogging(options) {
             colorize: false,
             compress: true,
             dirname: logDirectory,
-            format: winston_1.default.format.simple(),
+            format: winston_1.default.format.combine(addRequestContextFormat(), winston_1.default.format.simple()),
             // 30 days of retention
             maxFiles: 30,
             // 50MB max file size
@@ -246,4 +267,5 @@ function setupLogging(options) {
             finally { if (e_1) throw e_1.error; }
         }
     }
-}
+};
+exports.setupLogging = setupLogging;

package/dist/models/versionConfig.d.ts

@@ -8,6 +8,8 @@ export interface VersionConfigDocument extends mongoose.Document {
     warningMessage: string;
     requiredMessage: string;
     updateUrl?: string;
+    /** How often clients should poll for version updates, in minutes. Defaults to 1440 (24 hours). */
+    pollingIntervalMinutes: number;
     created?: Date;
     updated?: Date;
 }

package/dist/models/versionConfig.js

@@ -19,6 +19,12 @@ var versionConfigSchema = new mongoose_1.default.Schema({
         min: 0,
         type: Number,
     },
+    pollingIntervalMinutes: {
+        default: 1440,
+        description: "How often clients poll for version updates, in minutes (default: 1440 = 24 hours)",
+        min: 1,
+        type: Number,
+    },
     requiredMessage: {
         default: "This version is no longer supported. Please update to continue.",
         description: "Message shown on the blocking screen",
@@ -62,5 +68,7 @@ versionConfigSchema.add({
 });
 versionConfigSchema.index({ _singleton: 1 }, { unique: true });
 versionConfigSchema.plugin(plugins_1.createdUpdatedPlugin);
+versionConfigSchema.plugin(plugins_1.isDeletedPlugin);
 versionConfigSchema.plugin(plugins_1.findOneOrNone);
+versionConfigSchema.plugin(plugins_1.findExactlyOne);
 exports.VersionConfig = mongoose_1.default.model("VersionConfig", versionConfigSchema);

package/dist/notifiers/googleChatNotifier.js

@@ -108,17 +108,16 @@ var sendToGoogleChat = function (messageText_1) {
         args_1[_i - 1] = arguments[_i];
     }
     return __awaiter(void 0, __spreadArray([messageText_1], __read(args_1), false), void 0, function (messageText, _a) {
-        var chatWebhooksString, msg, chatWebhooks, chatChannel, chatWebhookUrl, msg, formattedMessageText, error_1, errorObj;
-        var _b, _c, _d;
-        var _e = _a === void 0 ? {} : _a, channel = _e.channel, _f = _e.shouldThrow, shouldThrow = _f === void 0 ? false : _f, env = _e.env;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var chatWebhooksString, msg, chatWebhooks, chatChannel, chatWebhookUrl, msg, formattedMessageText, error_1, message;
+        var _b;
+        var _c = _a === void 0 ? {} : _a, channel = _c.channel, _d = _c.shouldThrow, shouldThrow = _d === void 0 ? false : _d, env = _c.env;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     chatWebhooksString = process.env.GOOGLE_CHAT_WEBHOOKS;
                     if (!chatWebhooksString) {
                         msg = "GOOGLE_CHAT_WEBHOOKS not set. Google Chat message not sent";
-                        Sentry.captureException(new Error(msg));
-                        logger_1.logger.error(msg);
+                        Sentry.captureException(new errors_1.APIError({ status: 500, title: msg }));
                         return [2 /*return*/];
                     }
                     chatWebhooks = JSON.parse(chatWebhooksString !== null && chatWebhooksString !== void 0 ? chatWebhooksString : "{}");
@@ -126,30 +125,29 @@ var sendToGoogleChat = function (messageText_1) {
                     chatWebhookUrl = (_b = chatWebhooks[chatChannel]) !== null && _b !== void 0 ? _b : chatWebhooks.default;
                     if (!chatWebhookUrl) {
                         msg = "No webhook url set in env for ".concat(chatChannel, ". Google Chat message not sent");
-                        Sentry.captureException(new Error(msg));
-                        logger_1.logger.error(msg);
+                        Sentry.captureException(new errors_1.APIError({ status: 500, title: msg }));
                         return [2 /*return*/];
                     }
                     formattedMessageText = messageText;
                     if (env) {
                         formattedMessageText = "[".concat(env.toUpperCase(), "] ").concat(messageText);
                     }
-                    _g.label = 1;
+                    _e.label = 1;
                 case 1:
-                    _g.trys.push([1, 3, , 4]);
+                    _e.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, axios_1.default.post(chatWebhookUrl, { text: formattedMessageText })];
                 case 2:
-                    _g.sent();
+                    _e.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _g.sent();
-                    errorObj = error_1;
-                    logger_1.logger.error("Error posting to Google Chat: ".concat((_c = errorObj.text) !== null && _c !== void 0 ? _c : errorObj.message));
+                    error_1 = _e.sent();
+                    message = (0, errors_1.errorMessage)(error_1);
+                    logger_1.logger.error("Error posting to Google Chat: ".concat(message));
                     Sentry.captureException(error_1);
                     if (shouldThrow) {
                         throw new errors_1.APIError({
                             status: 500,
-                            title: "Error posting to Google Chat: ".concat((_d = errorObj.text) !== null && _d !== void 0 ? _d : errorObj.message),
+                            title: "Error posting to Google Chat: ".concat(message),
                         });
                     }
                     return [3 /*break*/, 4];