@interopio/gateway-server 0.12.0-beta.0 → 0.13.0-beta.0

package/dist/index.cjs

@@ -44,22 +44,22 @@ var import_node_http2 = __toESM(require("node:http"), 1);
 var import_node_https = __toESM(require("node:https"), 1);
 var import_node_fs = require("node:fs");
 var import_node_async_hooks4 = require("node:async_hooks");
-var import_gateway7 = require("@interopio/gateway");
+var import_gateway6 = require("@interopio/gateway");
 
 // src/logger.ts
-var import_gateway = require("@interopio/gateway");
-function getLogger(name) {
-  return import_gateway.IOGateway.Logging.getLogger(`gateway.server.${name}`);
+var GatewayLogging = __toESM(require("@interopio/gateway/logging/core"), 1);
+function getLogger2(name) {
+  return GatewayLogging.getLogger(`gateway.server.${name}`);
 }
 function regexAwareReplacer(_key, value) {
   return value instanceof RegExp ? value.toString() : value;
 }
 
 // src/gateway/ws/core.ts
-var import_gateway2 = require("@interopio/gateway");
+var import_gateway = require("@interopio/gateway");
 var import_node_async_hooks = require("node:async_hooks");
-var GatewayEncoders = import_gateway2.IOGateway.Encoding;
-var log = getLogger("ws");
+var GatewayEncoders = import_gateway.IOGateway.Encoding;
+var log = getLogger2("ws");
 var codec = GatewayEncoders.json();
 function principalName(authentication) {
   let name;
@@ -1072,7 +1072,7 @@ var localIp = (() => {
 // src/server/monitoring.ts
 var import_node_v8 = require("node:v8");
 var import_promises = require("node:fs/promises");
-var log2 = getLogger("monitoring");
+var log2 = getLogger2("monitoring");
 var DEFAULT_OPTIONS = {
   memoryLimit: 1024 * 1024 * 1024,
   // 1GB
@@ -1226,8 +1226,8 @@ var serverHeader = (server) => {
 var server_header_default = (server) => serverHeader(server);
 
 // src/server/ws-client-verify.ts
-var import_gateway3 = require("@interopio/gateway");
-var log3 = getLogger("gateway.ws.client-verify");
+var import_gateway2 = require("@interopio/gateway");
+var log3 = getLogger2("gateway.ws.client-verify");
 function acceptsMissing(originFilters) {
   switch (originFilters.missing) {
     case "allow":
@@ -1245,10 +1245,10 @@ function acceptsMissing(originFilters) {
 function tryMatch(originFilters, origin) {
   const block = originFilters.block ?? originFilters["blacklist"];
   const allow = originFilters.allow ?? originFilters["whitelist"];
-  if (block.length > 0 && import_gateway3.IOGateway.Filtering.valuesMatch(block, origin)) {
+  if (block.length > 0 && import_gateway2.IOGateway.Filtering.valuesMatch(block, origin)) {
     log3.warn(`origin ${origin} matches block filter`);
     return false;
-  } else if (allow.length > 0 && import_gateway3.IOGateway.Filtering.valuesMatch(allow, origin)) {
+  } else if (allow.length > 0 && import_gateway2.IOGateway.Filtering.valuesMatch(allow, origin)) {
     if (log3.enabledFor("debug")) {
       log3.debug(`origin ${origin} matches allow filter`);
     }
@@ -1286,8 +1286,8 @@ function acceptsOrigin(origin, originFilters) {
 }
 function regexifyOriginFilters(originFilters) {
   if (originFilters) {
-    const block = (originFilters.block ?? originFilters.blacklist ?? []).map(import_gateway3.IOGateway.Filtering.regexify);
-    const allow = (originFilters.allow ?? originFilters.whitelist ?? []).map(import_gateway3.IOGateway.Filtering.regexify);
+    const block = (originFilters.block ?? originFilters.blacklist ?? []).map(import_gateway2.IOGateway.Filtering.regexify);
+    const allow = (originFilters.allow ?? originFilters.whitelist ?? []).map(import_gateway2.IOGateway.Filtering.regexify);
     return {
       non_matched: originFilters.non_matched ?? "allow",
       missing: originFilters.missing ?? "allow",
@@ -1402,12 +1402,12 @@ var upgradeMatcher = async ({ request }) => {
 upgradeMatcher.toString = () => "websocket upgrade";
 
 // src/app/route.ts
-var import_gateway4 = require("@interopio/gateway");
+var import_gateway3 = require("@interopio/gateway");
 async function configure(app, config, routes) {
   const applyCors = (request, options) => {
     if (options?.cors) {
       const cors = options.cors === true ? {
-        allowOrigins: options.origins?.allow?.map(import_gateway4.IOGateway.Filtering.regexify),
+        allowOrigins: options.origins?.allow?.map(import_gateway3.IOGateway.Filtering.regexify),
         allowMethods: request.method === void 0 ? ["*"] : [request.method],
         allowCredentials: options.authorize?.access !== "permitted" ? true : void 0
       } : options.cors;
@@ -1418,7 +1418,7 @@ async function configure(app, config, routes) {
   const configurer = new class {
     handle(...handlers) {
       handlers.forEach(({ request, options, handler }) => {
-        const matcher = pattern(import_gateway4.IOGateway.Filtering.regexify(request.path), { method: request.method });
+        const matcher = pattern(import_gateway3.IOGateway.Filtering.regexify(request.path), { method: request.method });
         if (options?.authorize) {
           routes.authorize.push([matcher, options.authorize]);
         }
@@ -1452,7 +1452,7 @@ async function configure(app, config, routes) {
 }
 
 // src/server/cors.ts
-var import_gateway5 = require("@interopio/gateway");
+var import_gateway4 = require("@interopio/gateway");
 function isSameOrigin(request) {
   const origin = request.headers.one("origin");
   if (origin === void 0) {
@@ -1542,7 +1542,7 @@ function validateCorsConfig(config) {
           ...config,
           allowOrigins: allowOrigins.map((origin) => {
             if (typeof origin === "string" && origin !== ALL) {
-              origin = import_gateway5.IOGateway.Filtering.regexify(origin);
+              origin = import_gateway4.IOGateway.Filtering.regexify(origin);
               if (typeof origin === "string") {
                 return trimTrailingSlash(origin).toLowerCase();
               }
@@ -1605,7 +1605,7 @@ var corsFilter = (opts) => {
   };
 };
 var cors_default = corsFilter;
-var logger = getLogger("cors");
+var logger = getLogger2("cors");
 function rejectRequest(response) {
   response.setStatusCode(HttpStatus.FORBIDDEN);
 }
@@ -1684,7 +1684,7 @@ function checkOrigin(config, origin) {
       }
       const originToCheck = trimTrailingSlash(origin.toLowerCase());
       for (const allowedOrigin of allowedOrigins) {
-        if (allowedOrigin === ALL || import_gateway5.IOGateway.Filtering.valueMatches(allowedOrigin, originToCheck)) {
+        if (allowedOrigin === ALL || import_gateway4.IOGateway.Filtering.valueMatches(allowedOrigin, originToCheck)) {
           return origin;
         }
       }
@@ -1697,7 +1697,7 @@ function checkMethods(config, requestMethod) {
     if (allowedMethods === ALL) {
       return [requestMethod];
     }
-    if (import_gateway5.IOGateway.Filtering.valuesMatch(allowedMethods, requestMethod)) {
+    if (import_gateway4.IOGateway.Filtering.valuesMatch(allowedMethods, requestMethod)) {
       return allowedMethods;
     }
   }
@@ -1756,7 +1756,7 @@ var matchingCorsConfigSource = (opts) => {
 };
 
 // src/app/cors.ts
-var import_gateway6 = require("@interopio/gateway");
+var import_gateway5 = require("@interopio/gateway");
 function createCorsConfigSource(context) {
   const { sockets: routes, cors } = context;
   const defaultCorsConfig = context.corsConfig === false ? void 0 : combineCorsConfig(PERMIT_DEFAULT_CONFIG, context.corsConfig);
@@ -1764,7 +1764,7 @@ function createCorsConfigSource(context) {
   for (const [path, route] of routes) {
     let routeCorsConfig = defaultCorsConfig;
     for (const [matcher, config2] of cors) {
-      if (import_gateway6.IOGateway.Filtering.valueMatches(matcher, path)) {
+      if (import_gateway5.IOGateway.Filtering.valueMatches(matcher, path)) {
         if (config2 === void 0) {
           routeCorsConfig = void 0;
         } else {
@@ -2170,7 +2170,7 @@ var httpStatusEntryPoint = (opts) => {
 };
 
 // src/server/security/delegating-entry-point.ts
-var logger2 = getLogger("auth.entry-point");
+var logger2 = getLogger2("auth.entry-point");
 var delegatingEntryPoint = (opts) => {
   const defaultEntryPoint = opts.defaultEntryPoint ?? (async ({ response }, _error) => {
     response.setStatusCode(HttpStatus.UNAUTHORIZED);
@@ -2526,7 +2526,7 @@ var errorFilter = (opts) => {
 };
 
 // src/server/security/delegating-authorization-manager.ts
-var logger3 = getLogger("security.auth");
+var logger3 = getLogger2("security.auth");
 function delegatingAuthorizationManager(opts) {
   const check = async (authentication, exchange) => {
     let decision;
@@ -2547,7 +2547,7 @@ function delegatingAuthorizationManager(opts) {
 }
 
 // src/server/security/authorization-filter.ts
-var logger4 = getLogger("security.auth");
+var logger4 = getLogger2("security.auth");
 function authorizationFilter(opts) {
   const { manager, storage } = opts;
   return async (exchange, next) => {
@@ -2917,7 +2917,7 @@ var WebHttpHandlerBuilder = class {
     this.#webHandler = webHandler;
   }
   build() {
-    const logger7 = getLogger("http");
+    const logger7 = getLogger2("http");
     const adapter = new HandlerAdapter(logger7, this.#webHandler);
     if (this.#storage !== void 0) adapter.storage = this.#storage;
     adapter.enableLoggingRequestDetails = false;
@@ -3000,7 +3000,7 @@ var ExtendedWebSocket = class extends import_ws.WebSocket {
   }
   connected;
 };
-var logger5 = getLogger("ws");
+var logger5 = getLogger2("ws");
 function upgradeStrategy(path, route, wss, onSocketError) {
   return (exchange) => {
     const { logPrefix, request } = exchange;
@@ -3112,7 +3112,7 @@ async function initRoute(path, route, endpoint, storage, onSocketError) {
 }
 
 // src/server.ts
-var logger6 = getLogger("app");
+var logger6 = getLogger2("app");
 function secureContextOptions(ssl) {
   const options = {};
   if (ssl.key) options.key = (0, import_node_fs.readFileSync)(ssl.key);
@@ -3212,7 +3212,7 @@ var Factory = async (options) => {
     storage: new import_node_async_hooks4.AsyncLocalStorage(),
     sockets: /* @__PURE__ */ new Map()
   };
-  const gw = import_gateway7.IOGateway.Factory({ ...options.gateway });
+  const gw = import_gateway6.IOGateway.Factory({ ...options.gateway });
   if (options.gateway) {
     const config = options.gateway;
     await configure(async (configurer) => {
@@ -3230,7 +3230,8 @@ var Factory = async (options) => {
   const serverP = new Promise((resolve, reject) => {
     const server2 = createServer({
       IncomingMessage: ExtendedHttpIncomingMessage,
-      ServerResponse: ExtendedHttpServerResponse
+      ServerResponse: ExtendedHttpServerResponse,
+      ...options.http
     }, listener);
     server2.on("error", (e) => {
       if (e["code"] === "EADDRINUSE") {