equipped 5.3.0 → 5.3.1

package/dist/esm/utilities/index.mjs

@@ -8,7 +8,7 @@ import {
   random_exports,
   retry,
   sleep
-} from "../chunk-MDQKODYQ.mjs";
+} from "../chunk-A4P7P6BU.mjs";
 import "../chunk-VCCS7CAI.mjs";
 import "../chunk-J5LGTIGS.mjs";
 export {

package/dist/esm/validations/index.min.mjs

@@ -1,2 +1,2 @@
-import{c as a,d as b,e as c}from "../chunk-FLAPYQUT.min.mjs";import"../chunk-DSUJ5FUL.min.mjs";import"../chunk-AQY7QVYI.min.mjs";export{b as pipeErrorToValidationError,c as validate,a as ve};
+import{c as a,d as b,e as c}from "../chunk-IN5YKIJ7.min.mjs";import"../chunk-DSUJ5FUL.min.mjs";import"../chunk-AQY7QVYI.min.mjs";export{b as pipeErrorToValidationError,c as validate,a as ve};
 //# sourceMappingURL=index.min.mjs.map

package/dist/esm/validations/index.mjs

@@ -2,7 +2,7 @@ import {
   pipeErrorToValidationError,
   validate,
   valleyed_exports
-} from "../chunk-MDQKODYQ.mjs";
+} from "../chunk-A4P7P6BU.mjs";
 import "../chunk-VCCS7CAI.mjs";
 import "../chunk-J5LGTIGS.mjs";
 export {

package/dist/types/{base-DVr0fHil.d.ts → base-BDTBLZ9a.d.ts}

@@ -125,6 +125,11 @@ type RawResponseHandled = {
 };
 type RawResponseHandler = (request: IncomingMessage, response: ServerResponse) => unknown | Promise<unknown>;
 type RawResponder = (handler: RawResponseHandler) => Promise<RawResponseHandled>;
+type ServerBeforeListenContext = {
+    httpServer: http.Server;
+    port: number;
+};
+type ServerBeforeListenHandler = (context: ServerBeforeListenContext) => void | Promise<void>;
 type ServerNotFoundContext = {
     request: Request<any>;
     respondWithRaw: RawResponder;
@@ -145,6 +150,7 @@ declare abstract class Server {
     addRouter(...routers: Router<any>[]): void;
     addRoute<T extends RouteDef>(...routes: Route<T>[]): void;
     setNotFoundHandler(handler: ServerNotFoundHandler): this;
+    onBeforeListen(handler: ServerBeforeListenHandler): this;
     test(): TestAgent;
     start(): Promise<boolean>;
     protected createNodeRawResponder(input: {
@@ -154,4 +160,4 @@ declare abstract class Server {
     }): RawResponder;
 }
 
-export { BaseRequestAuthMethod as B, type OnJoinFn as O, type RawResponder as R, Server as S, type ServerConfig as a, type RawResponseHandled as b, type RawResponseHandler as c, type ServerNotFoundContext as d, type ServerNotFoundHandler as e, Router as f, type SocketCallbacks as g, SocketEmitter as h, serverConfigPipe as s };
+export { BaseRequestAuthMethod as B, type OnJoinFn as O, type RawResponder as R, Server as S, type ServerConfig as a, type RawResponseHandled as b, type RawResponseHandler as c, type ServerBeforeListenContext as d, type ServerBeforeListenHandler as e, type ServerNotFoundContext as f, type ServerNotFoundHandler as g, Router as h, type SocketCallbacks as i, SocketEmitter as j, serverConfigPipe as s };

package/dist/types/cache/adapters/in-memory/index.js

@@ -1,10 +1,10 @@
 import {
   Cache
-} from "../../../chunk-3TKJGSCZ.js";
+} from "../../../chunk-LPB5LS7A.js";
 import {
   Instance,
   configurable
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/cache/adapters/redis/index.js

@@ -1,9 +1,9 @@
 import {
   RedisCache,
   redisConfigPipe
-} from "../../../chunk-65EHKCDZ.js";
-import "../../../chunk-3TKJGSCZ.js";
-import "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-YLJNBL6J.js";
+import "../../../chunk-LPB5LS7A.js";
+import "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 export {

package/dist/types/cache/index.js

@@ -1,7 +1,7 @@
 import {
   Cache
-} from "../chunk-3TKJGSCZ.js";
-import "../chunk-YTY3EFNB.js";
+} from "../chunk-LPB5LS7A.js";
+import "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/{chunk-NJ2FHI3U.js → chunk-4DH3POYM.js}

@@ -11,10 +11,10 @@ import {
   PushOp,
   SetOp,
   UnsetOp
-} from "./chunk-JQ2FWX4W.js";
+} from "./chunk-5Z26ZURE.js";
 import {
   configurable
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 
 // src/orm/adapters/in-memory/index.ts
 import { AsyncLocalStorage } from "async_hooks";

package/dist/types/{chunk-OHFTQGQG.js → chunk-55CTVK7R.js}

@@ -1,6 +1,6 @@
 import {
   EquippedError
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 
 // src/orm/errors/introspection.ts
 var OrmIntrospectionError = class extends EquippedError {

package/dist/types/{chunk-JQ2FWX4W.js → chunk-5Z26ZURE.js}

@@ -1,7 +1,7 @@
 import {
   EquippedError,
   Instance
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 
 // src/orm/errors/validation.ts
 var OrmValidationError = class extends EquippedError {

package/dist/types/{chunk-3M4PBZAQ.js → chunk-IZDJDGOV.js}

@@ -1,9 +1,9 @@
 import {
   KafkaEventBus
-} from "./chunk-XGGGAEET.js";
+} from "./chunk-J3TGB5YQ.js";
 import {
   Instance
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 
 // src/dbs/adapters/base/db.ts
 var Db = class {

package/dist/types/{chunk-XGGGAEET.js → chunk-J3TGB5YQ.js}

@@ -4,7 +4,7 @@ import {
   configurable,
   parseJSONValue,
   random_exports
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 import {
   EventBus
 } from "./chunk-KZKFYO4V.js";

package/dist/types/{chunk-3TKJGSCZ.js → chunk-LPB5LS7A.js}

@@ -1,6 +1,6 @@
 import {
   Instance
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 
 // src/cache/adapters/base.ts
 var Cache = class {

package/dist/types/{chunk-YTY3EFNB.js → chunk-TT5EORDK.js}

@@ -969,6 +969,7 @@ var Server = class {
   #queue = [];
   #routesByKey = /* @__PURE__ */ new Set();
   #started = false;
+  #beforeListenHandlers = [];
   #notFoundHandler = null;
   setup(httpServer, config) {
     this.#httpServer = httpServer;
@@ -1024,6 +1025,11 @@ var Server = class {
     this.#notFoundHandler = handler;
     return this;
   }
+  onBeforeListen(handler) {
+    if (this.#started) throw new EquippedError("Cannot add before-listen handler after server has started", {});
+    this.#beforeListenHandlers.push(handler);
+    return this;
+  }
   test() {
     return supertest(this.#httpServer);
   }
@@ -1057,6 +1063,7 @@ var Server = class {
       });
       return await this.handleResponse(res, response);
     });
+    for (const handler of this.#beforeListenHandlers) await handler({ httpServer: this.#httpServer, port: config.port });
     const started = await this.startServer(config.port);
     if (started) Instance.get().log.info(`${instance.id}(${app.name}) service listening on port ${config.port}`);
     return started;
@@ -1208,6 +1215,7 @@ if (void 0) {
   const testInstanceState = globalThis;
   class TestServer extends Server {
     handledResponse = null;
+    startedPorts = [];
     notFoundHandler = null;
     constructor() {
       super();
@@ -1252,7 +1260,8 @@ if (void 0) {
     registerNotFoundHandler(cb) {
       this.notFoundHandler = cb;
     }
-    async startServer() {
+    async startServer(port) {
+      this.startedPorts.push(port);
       return true;
     }
     async dispatchNotFound(path) {
@@ -1263,6 +1272,43 @@ if (void 0) {
       return { handledResponse: this.handledResponse, rawResponse };
     }
   }
+  describe("Server before-listen handlers", () => {
+    test("runs before-listen handlers before adapter listen in registration order", async () => {
+      ensureTestInstance();
+      const server = new TestServer();
+      const calls = [];
+      let receivedServer = null;
+      server.onBeforeListen(({ httpServer, port }) => {
+        calls.push(`first:${port}`);
+        receivedServer = httpServer;
+        expect(server.startedPorts).toEqual([]);
+      }).onBeforeListen(({ httpServer, port }) => {
+        calls.push(`second:${port}`);
+        expect(httpServer).toBe(receivedServer);
+        expect(server.startedPorts).toEqual([]);
+      });
+      await server.start();
+      expect(calls).toEqual(["first:0", "second:0"]);
+      expect(receivedServer).toBeInstanceOf(http.Server);
+      expect(server.startedPorts).toEqual([0]);
+    });
+    test("rejects startup when a before-listen handler fails before adapter listen", async () => {
+      ensureTestInstance();
+      const server = new TestServer();
+      server.onBeforeListen(async () => {
+        throw new Error("before-listen failed");
+      });
+      await expect(server.start()).rejects.toThrow("before-listen failed");
+      expect(server.startedPorts).toEqual([]);
+    });
+    test("rejects adding before-listen handlers after server startup", async () => {
+      ensureTestInstance();
+      const server = new TestServer();
+      await server.start();
+      expect(() => server.onBeforeListen(() => {
+      })).toThrow("Cannot add before-listen handler after server has started");
+    });
+  });
   describe("Server not-found handler", () => {
     test("throws the default Equipped not-found error when no custom handler is set", async () => {
       ensureTestInstance();

package/dist/types/{chunk-65EHKCDZ.js → chunk-YLJNBL6J.js}

@@ -1,11 +1,11 @@
 import {
   Cache
-} from "./chunk-3TKJGSCZ.js";
+} from "./chunk-LPB5LS7A.js";
 import {
   EquippedError,
   Instance,
   configurable
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 
 // src/cache/adapters/redis/index.ts
 import { Cluster, Redis } from "ioredis";

package/dist/types/dbs/adapters/mongodb/index.js

@@ -2,13 +2,13 @@ import {
   Db,
   QueryKeys,
   dbChangeConfigPipe
-} from "../../../chunk-3M4PBZAQ.js";
-import "../../../chunk-XGGGAEET.js";
+} from "../../../chunk-IZDJDGOV.js";
+import "../../../chunk-J3TGB5YQ.js";
 import {
   EquippedError,
   Instance,
   retry
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/dbs/index.js

@@ -6,9 +6,9 @@ import {
   queryParamsPipe,
   queryResultsPipe,
   wrapQueryParams
-} from "../chunk-3M4PBZAQ.js";
-import "../chunk-XGGGAEET.js";
-import "../chunk-YTY3EFNB.js";
+} from "../chunk-IZDJDGOV.js";
+import "../chunk-J3TGB5YQ.js";
+import "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/errors/index.js

@@ -7,7 +7,7 @@ import {
   RequestError,
   TokenExpired,
   ValidationError
-} from "../chunk-YTY3EFNB.js";
+} from "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/events/adapters/kafka/index.js

@@ -1,8 +1,8 @@
 import {
   KafkaEventBus,
   kafkaConfigPipe
-} from "../../../chunk-XGGGAEET.js";
-import "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-J3TGB5YQ.js";
+import "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 export {

package/dist/types/events/adapters/rabbitmq/index.js

@@ -3,7 +3,7 @@ import {
   configurable,
   parseJSONValue,
   random_exports
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import {
   EventBus
 } from "../../../chunk-KZKFYO4V.js";

package/dist/types/index.js

@@ -1,6 +1,6 @@
 import {
   Instance
-} from "./chunk-YTY3EFNB.js";
+} from "./chunk-TT5EORDK.js";
 import "./chunk-KZKFYO4V.js";
 import "./chunk-MLKGABMK.js";
 export {

package/dist/types/instance/index.js

@@ -1,6 +1,6 @@
 import {
   Instance
-} from "../chunk-YTY3EFNB.js";
+} from "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/{introspection-VOIU3XE6.js → introspection-EHGM4RMO.js}

@@ -1,7 +1,7 @@
 import {
   OrmIntrospectionError
-} from "./chunk-OHFTQGQG.js";
-import "./chunk-YTY3EFNB.js";
+} from "./chunk-55CTVK7R.js";
+import "./chunk-TT5EORDK.js";
 import "./chunk-KZKFYO4V.js";
 import "./chunk-MLKGABMK.js";
 export {

package/dist/types/jobs/adapters/redis/index.js

@@ -1,8 +1,8 @@
 import {
   RedisCache,
   redisConfigPipe
-} from "../../../chunk-65EHKCDZ.js";
-import "../../../chunk-3TKJGSCZ.js";
+} from "../../../chunk-YLJNBL6J.js";
+import "../../../chunk-LPB5LS7A.js";
 import {
   Job
 } from "../../../chunk-LN3A6R4Y.js";
@@ -10,7 +10,7 @@ import {
   Instance,
   configurable,
   random_exports
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/orm/adapters/in-memory/index.js

@@ -1,8 +1,8 @@
 import {
   InMemoryAdapter
-} from "../../../chunk-NJ2FHI3U.js";
-import "../../../chunk-JQ2FWX4W.js";
-import "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-4DH3POYM.js";
+import "../../../chunk-5Z26ZURE.js";
+import "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 export {

package/dist/types/orm/adapters/json/index.js

@@ -1,12 +1,12 @@
 import {
   InMemoryAdapter
-} from "../../../chunk-NJ2FHI3U.js";
+} from "../../../chunk-4DH3POYM.js";
 import {
   OrmAdapter
-} from "../../../chunk-JQ2FWX4W.js";
+} from "../../../chunk-5Z26ZURE.js";
 import {
   configurable
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/orm/adapters/mongodb/index.js

@@ -11,11 +11,11 @@ import {
   PushOp,
   UnsetOp,
   flattenOps
-} from "../../../chunk-JQ2FWX4W.js";
+} from "../../../chunk-5Z26ZURE.js";
 import {
   EquippedError,
   configurable
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/orm/adapters/postgresql/index.js

@@ -12,11 +12,11 @@ import {
   PushOp,
   UnsetOp,
   flattenOps
-} from "../../../chunk-JQ2FWX4W.js";
+} from "../../../chunk-5Z26ZURE.js";
 import {
   EquippedError,
   configurable
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 
@@ -1109,7 +1109,7 @@ var PostgresAdapter = class extends configurable(postgresqlConnectionPipe, OrmAd
     await this.#getClient().query(`ALTER TABLE "${change.table}" DROP CONSTRAINT "${change.name}"`);
   }
   async introspect() {
-    const { OrmIntrospectionError } = await import("../../../introspection-VOIU3XE6.js");
+    const { OrmIntrospectionError } = await import("../../../introspection-EHGM4RMO.js");
     const client = this.#getClient();
     const tablesResult = await client.query(`
 			SELECT table_name FROM information_schema.tables

package/dist/types/orm/index.js

@@ -1,6 +1,6 @@
 import {
   OrmIntrospectionError
-} from "../chunk-OHFTQGQG.js";
+} from "../chunk-55CTVK7R.js";
 import {
   ComputedField,
   Field,
@@ -33,11 +33,11 @@ import {
   set,
   toFieldName,
   unset
-} from "../chunk-JQ2FWX4W.js";
+} from "../chunk-5Z26ZURE.js";
 import {
   EquippedError,
   Instance
-} from "../chunk-YTY3EFNB.js";
+} from "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 

package/dist/types/server/adapters/express/index.d.ts

@@ -1,4 +1,4 @@
-import { B as BaseRequestAuthMethod, S as Server, R as RawResponder } from '../../../base-DVr0fHil.js';
+import { B as BaseRequestAuthMethod, S as Server, R as RawResponder } from '../../../base-BDTBLZ9a.js';
 import { A as AuthUser } from '../../../overrides-6Hxg764S.js';
 import { R as Request, a as Response, M as MethodsEnum } from '../../../requestError-DdaL8hc3.js';
 import { EventBus } from '../../../events/index.js';

package/dist/types/server/adapters/express/index.js

@@ -6,7 +6,7 @@ import {
   configurable,
   getMediaDuration,
   serverConfigPipe
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/server/adapters/fastify/index.d.ts

@@ -1,4 +1,4 @@
-import { B as BaseRequestAuthMethod, S as Server, R as RawResponder } from '../../../base-DVr0fHil.js';
+import { B as BaseRequestAuthMethod, S as Server, R as RawResponder } from '../../../base-BDTBLZ9a.js';
 import { A as AuthUser } from '../../../overrides-6Hxg764S.js';
 import { R as Request, a as Response, M as MethodsEnum } from '../../../requestError-DdaL8hc3.js';
 import { EventBus } from '../../../events/index.js';

package/dist/types/server/adapters/fastify/index.js

@@ -7,7 +7,7 @@ import {
   configurable,
   getMediaDuration,
   serverConfigPipe
-} from "../../../chunk-YTY3EFNB.js";
+} from "../../../chunk-TT5EORDK.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/server/index.d.ts

@@ -1,5 +1,5 @@
-import { B as BaseRequestAuthMethod } from '../base-DVr0fHil.js';
-export { O as OnJoinFn, R as RawResponder, b as RawResponseHandled, c as RawResponseHandler, f as Router, S as Server, a as ServerConfig, d as ServerNotFoundContext, e as ServerNotFoundHandler, g as SocketCallbacks, h as SocketEmitter, s as serverConfigPipe } from '../base-DVr0fHil.js';
+import { B as BaseRequestAuthMethod } from '../base-BDTBLZ9a.js';
+export { O as OnJoinFn, R as RawResponder, b as RawResponseHandled, c as RawResponseHandler, h as Router, S as Server, d as ServerBeforeListenContext, e as ServerBeforeListenHandler, a as ServerConfig, f as ServerNotFoundContext, g as ServerNotFoundHandler, i as SocketCallbacks, j as SocketEmitter, s as serverConfigPipe } from '../base-BDTBLZ9a.js';
 import { A as AuthUser } from '../overrides-6Hxg764S.js';
 import { R as Request, c as RouteDefToReqRes, d as RouteDef, e as Route } from '../requestError-DdaL8hc3.js';
 export { C as CookieVal, h as DefaultCookies, D as DefaultHeaders, I as IncomingFile, k as MergeRouteDefs, f as Methods, M as MethodsEnum, a as Response, i as RouteConfig, l as RouteDefHandler, j as RouterConfig, S as StatusCodes, g as StatusCodesEnum, o as makeErrorMiddleware, m as makeMiddleware, n as makeResponseMiddleware } from '../requestError-DdaL8hc3.js';

package/dist/types/server/index.js

@@ -15,7 +15,7 @@ import {
   makeResponseMiddleware,
   requireAuthUser,
   serverConfigPipe
-} from "../chunk-YTY3EFNB.js";
+} from "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/utilities/index.js

@@ -8,7 +8,7 @@ import {
   random_exports,
   retry,
   sleep
-} from "../chunk-YTY3EFNB.js";
+} from "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/validations/index.js

@@ -2,7 +2,7 @@ import {
   pipeErrorToValidationError,
   validate,
   valleyed_exports
-} from "../chunk-YTY3EFNB.js";
+} from "../chunk-TT5EORDK.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "5.3.0",
+	"version": "5.3.1",
 	"private": false,
 	"description": "",
 	"type": "module",