@terreno/api 0.20.2 → 0.22.0

package/dist/tests.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -68,222 +35,38 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupDb = exports.authAsUser = exports.getBaseServer = exports.RequiredModel = exports.FoodModel = exports.StaffUserModel = exports.SuperUserModel = exports.UserModel = void 0;
-var express_1 = __importDefault(require("express"));
-var mongoose_1 = __importStar(require("mongoose"));
-var passport_local_mongoose_1 = __importDefault(require("passport-local-mongoose"));
-var qs_1 = __importDefault(require("qs"));
-var supertest_1 = __importDefault(require("supertest"));
-var logger_1 = require("./logger");
+exports.loadTestData = exports.authAsUser = exports.getBaseServer = exports.UserModel = exports.setupTestData = exports.setupTestCache = exports.setupDb = exports.SuperUserModel = exports.StaffUserModel = exports.RequiredModel = exports.loadTestDataFromCache = exports.FoodModel = exports.createTestData = void 0;
+var test_1 = require("@terreno/test");
 var openApiCompat_1 = require("./openApiCompat");
-var plugins_1 = require("./plugins");
-var userSchema = new mongoose_1.Schema({
-    admin: { default: false, description: "Whether the user has admin privileges", type: Boolean },
-    age: { description: "The user's age", type: Number },
-    name: { description: "The user's display name", type: String },
-    username: { description: "The user's username", type: String },
-});
-userSchema.plugin(passport_local_mongoose_1.default, {
-    attemptsField: "attempts",
-    interval: process.env.NODE_ENV === "test" ? 1 : 100,
-    limitAttempts: true,
-    maxAttempts: 3,
-    maxInterval: process.env.NODE_ENV === "test" ? 1 : 300000,
-    usernameCaseInsensitive: true,
-    usernameField: "email",
-});
-// userSchema.plugin(tokenPlugin);
-userSchema.plugin(plugins_1.createdUpdatedPlugin);
-userSchema.plugin(plugins_1.isDisabledPlugin);
-userSchema.methods.postCreate = function (body) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            this.age = body.age;
-            return [2 /*return*/, this.save()];
-        });
-    });
-};
-exports.UserModel = (0, mongoose_1.model)("User", userSchema);
-var superUserSchema = new mongoose_1.Schema({
-    superTitle: { description: "The super user's title", required: true, type: String },
-});
-exports.SuperUserModel = exports.UserModel.discriminator("SuperUser", superUserSchema);
-var staffUserSchema = new mongoose_1.Schema({
-    department: {
-        description: "The department the staff member belongs to",
-        required: true,
-        type: String,
-    },
-});
-exports.StaffUserModel = exports.UserModel.discriminator("Staff", staffUserSchema);
-var foodCategorySchema = new mongoose_1.Schema({
-    name: { description: "The name of the food category", type: String },
-    show: { description: "Whether this category is visible", type: Boolean },
-}, { timestamps: { createdAt: "created", updatedAt: "updated" } });
-var likesSchema = new mongoose_1.Schema({
-    likes: { description: "Whether the user liked the item", type: Boolean },
-    userId: { description: "The user who liked the item", ref: "User", type: "ObjectId" },
-});
-var foodSchema = new mongoose_1.Schema({
-    calories: { description: "Number of calories in the food", type: Number },
-    categories: { description: "Categories this food belongs to", type: [foodCategorySchema] },
-    created: { description: "When this food was created", type: Date },
-    eatenBy: [
-        {
-            description: "Users who have eaten this food",
-            ref: "User",
-            required: true,
-            type: mongoose_1.Schema.Types.ObjectId,
-        },
-    ],
-    // biome-ignore lint/suspicious/noExplicitAny: DateOnly is a custom SchemaType not recognized by Mongoose's built-in type definitions
-    expiration: { description: "Expiration date of the food", type: plugins_1.DateOnly },
-    hidden: {
-        default: false,
-        description: "Whether this food is hidden from listings",
-        type: Boolean,
-    },
-    lastEatenWith: {
-        description: "Map of user names to dates they last ate this food with",
-        of: Date,
-        type: Map,
-    },
-    likesIds: { description: "User likes for this food", required: true, type: [likesSchema] },
-    name: { description: "The name of the food", type: String },
-    ownerId: { description: "The user who owns this food entry", ref: "User", type: "ObjectId" },
-    source: {
-        dateAdded: { description: "When the source was added", type: String },
-        href: { description: "URL of the source", type: String },
-        name: { description: "Name of the source", type: String },
-    },
-    tags: { description: "Tags associated with this food", type: [String] },
-}, { strict: "throw", toJSON: { virtuals: true }, toObject: { virtuals: true } });
-foodSchema.virtual("description").get(function () {
-    return "".concat(this.name, " has ").concat(this.calories, " calories");
-});
-exports.FoodModel = (0, mongoose_1.model)("Food", foodSchema);
-var requiredSchema = new mongoose_1.Schema({
-    about: { description: "Information about the item", type: String },
-    name: { description: "The name of the item", required: true, type: String },
-});
-exports.RequiredModel = (0, mongoose_1.model)("Required", requiredSchema);
+var createTestData_1 = require("./tests/createTestData");
+Object.defineProperty(exports, "createTestData", { enumerable: true, get: function () { return createTestData_1.createTestData; } });
+var models_1 = require("./tests/models");
+Object.defineProperty(exports, "FoodModel", { enumerable: true, get: function () { return models_1.FoodModel; } });
+Object.defineProperty(exports, "RequiredModel", { enumerable: true, get: function () { return models_1.RequiredModel; } });
+Object.defineProperty(exports, "StaffUserModel", { enumerable: true, get: function () { return models_1.StaffUserModel; } });
+Object.defineProperty(exports, "SuperUserModel", { enumerable: true, get: function () { return models_1.SuperUserModel; } });
+Object.defineProperty(exports, "UserModel", { enumerable: true, get: function () { return models_1.UserModel; } });
+var mongoTestSetup_1 = require("./tests/mongoTestSetup");
+Object.defineProperty(exports, "loadTestDataFromCache", { enumerable: true, get: function () { return mongoTestSetup_1.loadTestDataFromCache; } });
+Object.defineProperty(exports, "setupTestCache", { enumerable: true, get: function () { return mongoTestSetup_1.setupTestCache; } });
+var testHelper_1 = require("./tests/testHelper");
+Object.defineProperty(exports, "setupDb", { enumerable: true, get: function () { return testHelper_1.setupDb; } });
+Object.defineProperty(exports, "setupTestData", { enumerable: true, get: function () { return testHelper_1.setupTestData; } });
 var getBaseServer = function () {
-    var app = (0, express_1.default)();
-    app.set("query parser", function (str) { return qs_1.default.parse(str, { arrayLimit: 200 }); });
-    // Express 5 defaults to 'simple' query parser (Node querystring) which doesn't
-    // support nested bracket notation like name[$regex]=Green. Use qs to match
-    // what setupServer() configures.
-    app.set("query parser", function (str) { return qs_1.default.parse(str, { arrayLimit: 200 }); });
-    // Record mount paths on layers for Express 5 → OpenAPI compat
-    (0, openApiCompat_1.patchAppUse)(app);
-    app.use(function (req, res, next) {
-        res.header("Access-Control-Allow-Origin", "*");
-        res.header("Access-Control-Allow-Headers", "*");
-        // intercepts OPTIONS method
-        if (req.method === "OPTIONS") {
-            res.send(200);
-        }
-        else {
-            next();
-        }
+    return (0, test_1.getBaseServer)({
+        patchOpenApiCompat: openApiCompat_1.patchAppUse,
     });
-    app.use(express_1.default.json());
-    return app;
 };
 exports.getBaseServer = getBaseServer;
 var authAsUser = function (app, type) { return __awaiter(void 0, void 0, void 0, function () {
-    var email, password, agent, res;
+    var email, password;
     return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                email = type === "admin" ? "admin@example.com" : "notAdmin@example.com";
-                password = type === "admin" ? "securePassword" : "password";
-                agent = supertest_1.default.agent(app);
-                return [4 /*yield*/, agent.post("/auth/login").send({ email: email, password: password }).expect(200)];
-            case 1:
-                res = _a.sent();
-                return [4 /*yield*/, agent.set("authorization", "Bearer ".concat(res.body.data.token))];
-            case 2:
-                _a.sent();
-                return [2 /*return*/, agent];
-        }
+        email = type === "admin" ? "admin@example.com" : "notAdmin@example.com";
+        password = type === "admin" ? "securePassword" : "password";
+        return [2 /*return*/, (0, test_1.authAsUser)(app, { email: email, password: password })];
     });
 }); };
 exports.authAsUser = authAsUser;
-var setupDb = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, notAdmin, admin, adminOther, error_1;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, mongoose_1.default
-                    .connect("mongodb://127.0.0.1/terreno?&connectTimeoutMS=360000")
-                    .catch(logger_1.logger.catch)];
-            case 1:
-                _b.sent();
-                process.env.REFRESH_TOKEN_SECRET = "refresh_secret";
-                process.env.TOKEN_SECRET = "secret";
-                process.env.TOKEN_EXPIRES_IN = "30m";
-                process.env.TOKEN_ISSUER = "example.com";
-                process.env.SESSION_SECRET = "session";
-                // Broken out of the try/catch below so you can test the catch logger by shutting down mongo.
-                return [4 /*yield*/, Promise.all([exports.UserModel.deleteMany({}), exports.FoodModel.deleteMany({})]).catch(logger_1.logger.catch)];
-            case 2:
-                // Broken out of the try/catch below so you can test the catch logger by shutting down mongo.
-                _b.sent();
-                _b.label = 3;
-            case 3:
-                _b.trys.push([3, 11, , 12]);
-                return [4 /*yield*/, Promise.all([
-                        exports.UserModel.create({ email: "notAdmin@example.com", name: "Not Admin" }),
-                        exports.UserModel.create({ admin: true, email: "admin@example.com", name: "Admin" }),
-                        exports.UserModel.create({ admin: true, email: "admin+other@example.com", name: "Admin Other" }),
-                    ])];
-            case 4:
-                _a = __read.apply(void 0, [_b.sent(), 3]), notAdmin = _a[0], admin = _a[1], adminOther = _a[2];
-                return [4 /*yield*/, notAdmin.setPassword("password")];
-            case 5:
-                _b.sent();
-                return [4 /*yield*/, notAdmin.save()];
-            case 6:
-                _b.sent();
-                return [4 /*yield*/, admin.setPassword("securePassword")];
-            case 7:
-                _b.sent();
-                return [4 /*yield*/, admin.save()];
-            case 8:
-                _b.sent();
-                return [4 /*yield*/, adminOther.setPassword("otherPassword")];
-            case 9:
-                _b.sent();
-                return [4 /*yield*/, adminOther.save()];
-            case 10:
-                _b.sent();
-                return [2 /*return*/, [admin, notAdmin, adminOther]];
-            case 11:
-                error_1 = _b.sent();
-                logger_1.logger.error("Error setting up DB", error_1);
-                throw error_1;
-            case 12: return [2 /*return*/];
-        }
-    });
-}); };
-exports.setupDb = setupDb;
+var mongoTestSetup_2 = require("./tests/mongoTestSetup");
+Object.defineProperty(exports, "loadTestData", { enumerable: true, get: function () { return mongoTestSetup_2.loadTestData; } });

package/dist/transformers.test.js

@@ -46,22 +46,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -81,37 +65,16 @@ var transformers_1 = require("./transformers");
     var server;
     var app;
     (0, bun_test_1.beforeEach)(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var testData;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     process.env.REFRESH_TOKEN_SECRET = "testsecret1234";
-                    return [4 /*yield*/, (0, tests_1.setupDb)()];
+                    return [4 /*yield*/, (0, tests_1.setupTestData)()];
                 case 1:
-                    _a = __read.apply(void 0, [_b.sent(), 2]), admin = _a[0], notAdmin = _a[1];
-                    return [4 /*yield*/, Promise.all([
-                            tests_1.FoodModel.create({
-                                calories: 1,
-                                created: new Date(),
-                                name: "Spinach",
-                                ownerId: notAdmin._id,
-                            }),
-                            tests_1.FoodModel.create({
-                                calories: 100,
-                                created: Date.now() - 10,
-                                hidden: true,
-                                name: "Apple",
-                                ownerId: admin._id,
-                            }),
-                            tests_1.FoodModel.create({
-                                calories: 100,
-                                created: Date.now() - 10,
-                                name: "Carrots",
-                                ownerId: admin._id,
-                            }),
-                        ])];
-                case 2:
-                    _b.sent();
+                    testData = _a.sent();
+                    admin = testData.users.admin;
+                    notAdmin = testData.users.notAdmin;
                     app = (0, tests_1.getBaseServer)();
                     (0, auth_1.setupAuth)(app, tests_1.UserModel);
                     (0, auth_1.addAuthRoutes)(app, tests_1.UserModel);
@@ -156,7 +119,7 @@ var transformers_1 = require("./transformers");
                     return [4 /*yield*/, agent.get("/food").expect(200)];
                 case 2:
                     foodRes = _a.sent();
-                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(2);
+                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(3);
                     return [2 /*return*/];
             }
         });
@@ -171,7 +134,7 @@ var transformers_1 = require("./transformers");
                     return [4 /*yield*/, agent.get("/food").expect(200)];
                 case 2:
                     foodRes = _a.sent();
-                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(3);
+                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(4);
                     return [2 /*return*/];
             }
         });
@@ -186,7 +149,7 @@ var transformers_1 = require("./transformers");
                     return [4 /*yield*/, agent.get("/food").expect(200)];
                 case 2:
                     foodRes = _a.sent();
-                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(3);
+                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(4);
                     spinach = foodRes.body.data.find(function (food) { return food.name === "Spinach"; });
                     (0, bun_test_1.expect)(spinach.created).toBeDefined();
                     (0, bun_test_1.expect)(spinach.id).toBeDefined();
@@ -227,7 +190,7 @@ var transformers_1 = require("./transformers");
                     return [4 /*yield*/, agent.get("/food").expect(200)];
                 case 2:
                     foodRes = _a.sent();
-                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(2);
+                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(3);
                     spinach = foodRes.body.data.find(function (food) { return food.name === "Spinach"; });
                     (0, bun_test_1.expect)(spinach.id).toBeDefined();
                     (0, bun_test_1.expect)(spinach.name).toBe("Spinach");
@@ -289,7 +252,7 @@ var transformers_1 = require("./transformers");
                     return [4 /*yield*/, agent.get("/food").expect(200)];
                 case 2:
                     foodRes = _a.sent();
-                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(2);
+                    (0, bun_test_1.expect)(foodRes.body.data).toHaveLength(3);
                     spinach = foodRes.body.data.find(function (food) { return food.name === "Spinach"; });
                     (0, bun_test_1.expect)(spinach.id).toBeDefined();
                     (0, bun_test_1.expect)(spinach.name).toBe("Spinach");
@@ -358,9 +321,10 @@ var transformers_1 = require("./transformers");
                 case 0: return [4 /*yield*/, server.get("/food")];
                 case 1:
                     res = _a.sent();
-                    (0, bun_test_1.expect)(res.body.data).toHaveLength(2);
+                    (0, bun_test_1.expect)(res.body.data).toHaveLength(3);
                     (0, bun_test_1.expect)(res.body.data.find(function (f) { return f.name === "Spinach"; })).toBeDefined();
                     (0, bun_test_1.expect)(res.body.data.find(function (f) { return f.name === "Carrots"; })).toBeDefined();
+                    (0, bun_test_1.expect)(res.body.data.find(function (f) { return f.name === "Pizza"; })).toBeDefined();
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -46,6 +46,7 @@
   "description": "Styled after the Django & Django REST Framework, a batteries-include framework for building REST APIs with Node/Express/Mongoose.",
   "devDependencies": {
     "@biomejs/biome": "^2.3.6",
+    "@terreno/test": "workspace:*",
     "@types/bcrypt": "^6.0.0",
     "@types/bun": "^1.2.4",
     "@types/cors": "^2.8.17",
@@ -80,6 +81,16 @@
   ],
   "license": "Apache-2.0",
   "main": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./testing": {
+      "types": "./dist/tests.d.ts",
+      "default": "./dist/tests.js"
+    }
+  },
   "name": "@terreno/api",
   "publishConfig": {
     "access": "public"
@@ -96,18 +107,21 @@
     "json5": "2.2.3"
   },
   "scripts": {
-    "compile": "bun tsc",
+    "compile": "node ../.github/scripts/compile-workspace-deps.js && bun tsc",
     "compile:watch": "bun tsc -w",
     "dev": "bun tsc -w",
     "docs": "typedoc --out docs src/index.ts",
     "lint": "biome check ./src",
     "lint:fix": "biome check --write ./src",
     "lint:unsafefix": "biome check --fix --unsafe ./src",
-    "test": "bun test --preload ./src/tests/bunSetup.ts --update-snapshots",
-    "test:ci": "bun test --preload ./src/tests/bunSetup.ts",
+    "test": "bun test --update-snapshots",
+    "test:ci": "bun test",
     "test:coverage": "bun run ../scripts/check-coverage.ts",
+    "test:cache:clean": "bun ./src/tests/mongoTestSetup.ts clean",
+    "test:cache:setup": "bun ./src/tests/mongoTestSetup.ts setup",
+    "test:cache:status": "bun ./src/tests/mongoTestSetup.ts status",
     "updateSnapshot": "bun test --update-snapshots"
   },
   "types": "dist/index.d.ts",
-  "version": "0.20.2"
+  "version": "0.22.0"
 }

package/src/__snapshots__/openApiBuilder.test.ts.snap

@@ -910,6 +910,7 @@ exports[`OpenApiMiddlewareBuilder snapshot tests matches OpenAPI spec snapshot 1
     "/food/stats": {
       "get": {
         "description": "Returns aggregated statistics about food items",
+        "operationId": "getFoodStats",
         "parameters": [
           {
             "description": "Filter by food category",

package/src/__tests__/versionCheckPlugin.test.ts

@@ -30,19 +30,27 @@ describe("VersionCheckPlugin", () => {
   it("returns ok when no VersionConfig exists", async () => {
     const res = await app.get("/version-check").query({platform: "web", version: 100});
     expect(res.status).toBe(200);
-    expect(res.body).toEqual({pollingIntervalMs: 86400000, status: "ok"});
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
+    expect(res.body).toEqual(
+      expect.objectContaining({
+        pollingIntervalMs: 86400000,
+        status: "ok",
+      })
+    );
   });
 
   it("returns ok when version param is missing", async () => {
     const res = await app.get("/version-check");
     expect(res.status).toBe(200);
-    expect(res.body).toEqual({status: "ok"});
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
+    expect(res.body).toEqual(expect.objectContaining({status: "ok"}));
   });
 
   it("returns ok when version param is invalid", async () => {
     const res = await app.get("/version-check").query({platform: "web", version: "invalid"});
     expect(res.status).toBe(200);
-    expect(res.body).toEqual({status: "ok"});
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
+    expect(res.body).toEqual(expect.objectContaining({status: "ok"}));
   });
 
   it("returns ok when client version >= warning and required (web)", async () => {
@@ -53,12 +61,15 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 150});
     expect(res.status).toBe(200);
-    expect(res.body).toEqual({
-      pollingIntervalMs: 86400000,
-      requiredVersion: 50,
-      status: "ok",
-      warningVersion: 100,
-    });
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
+    expect(res.body).toEqual(
+      expect.objectContaining({
+        pollingIntervalMs: 86400000,
+        requiredVersion: 50,
+        status: "ok",
+        warningVersion: 100,
+      })
+    );
   });
 
   it("returns warning when client version < warning (web)", async () => {
@@ -70,6 +81,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 80});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("warning");
     expect(res.body.message).toBe("Please update!");
   });
@@ -84,6 +96,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 50});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("required");
     expect(res.body.message).toBe("Update required");
     expect(res.body.updateUrl).toBe("https://example.com/update");
@@ -98,9 +111,11 @@ describe("VersionCheckPlugin", () => {
     });
 
     const webRes = await app.get("/version-check").query({platform: "web", version: 100});
+    expect(webRes.body.requestId).toBe(webRes.headers["x-request-id"]);
     expect(webRes.body.status).toBe("ok");
 
     const mobileRes = await app.get("/version-check").query({platform: "mobile", version: 100});
+    expect(mobileRes.body.requestId).toBe(mobileRes.headers["x-request-id"]);
     expect(mobileRes.body.status).toBe("required");
   });
 
@@ -111,6 +126,7 @@ describe("VersionCheckPlugin", () => {
     });
 
     const res = await app.get("/version-check").query({platform: "invalid", version: 50});
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("required");
   });
 
@@ -122,12 +138,15 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 100});
     expect(res.status).toBe(200);
-    expect(res.body).toEqual({
-      pollingIntervalMs: 86400000,
-      requiredVersion: 50,
-      status: "ok",
-      warningVersion: 100,
-    });
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
+    expect(res.body).toEqual(
+      expect.objectContaining({
+        pollingIntervalMs: 86400000,
+        requiredVersion: 50,
+        status: "ok",
+        warningVersion: 100,
+      })
+    );
   });
 
   it("returns pollingIntervalMs from config pollingIntervalMinutes", async () => {
@@ -139,6 +158,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 100});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.pollingIntervalMs).toBe(3600000);
   });
 
@@ -150,6 +170,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 100});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.pollingIntervalMs).toBe(86400000);
   });
 
@@ -161,6 +182,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check?version=50&platform=web");
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("required");
   });
 
@@ -172,6 +194,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 50});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("warning");
     expect(res.body.message).toBe(
       "A new version is available. Please update for the best experience."
@@ -186,6 +209,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 50});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("required");
     expect(res.body.message).toBe(
       "This version is no longer supported. Please update to continue."
@@ -200,6 +224,7 @@ describe("VersionCheckPlugin", () => {
 
     const res = await app.get("/version-check").query({platform: "web", version: 100});
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
     expect(res.body.status).toBe("warning");
   });
 
@@ -210,12 +235,14 @@ describe("VersionCheckPlugin", () => {
     });
 
     const warningRes = await app.get("/version-check").query({platform: "web", version: 150});
+    expect(warningRes.body.requestId).toBe(warningRes.headers["x-request-id"]);
     expect(warningRes.body.status).toBe("warning");
     expect(warningRes.body.message).toBe(
       "A new version is available. Please update for the best experience."
     );
 
     const requiredRes = await app.get("/version-check").query({platform: "web", version: 50});
+    expect(requiredRes.body.requestId).toBe(requiredRes.headers["x-request-id"]);
     expect(requiredRes.body.status).toBe("required");
     expect(requiredRes.body.message).toBe(
       "This version is no longer supported. Please update to continue."
@@ -225,6 +252,7 @@ describe("VersionCheckPlugin", () => {
   it("handles numeric version parameter", async () => {
     const res = await app.get("/version-check?version=50&platform=web");
     expect(res.status).toBe(200);
+    expect(res.body.requestId).toBe(res.headers["x-request-id"]);
   });
 });