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

package/dist/index.js

@@ -13,22 +13,22 @@ import http2 from "node:http";
 import https from "node:https";
 import { readFileSync } from "node:fs";
 import { AsyncLocalStorage as AsyncLocalStorage4 } from "node:async_hooks";
-import { IOGateway as IOGateway7 } from "@interopio/gateway";
+import { IOGateway as IOGateway6 } from "@interopio/gateway";
 
 // src/logger.ts
-import { IOGateway } from "@interopio/gateway";
-function getLogger(name) {
-  return IOGateway.Logging.getLogger(`gateway.server.${name}`);
+import * as GatewayLogging from "@interopio/gateway/logging/core";
+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
-import { IOGateway as IOGateway2 } from "@interopio/gateway";
+import { IOGateway } from "@interopio/gateway";
 import { AsyncLocalStorage } from "node:async_hooks";
-var GatewayEncoders = IOGateway2.Encoding;
-var log = getLogger("ws");
+var GatewayEncoders = IOGateway.Encoding;
+var log = getLogger2("ws");
 var codec = GatewayEncoders.json();
 function principalName(authentication) {
   let name;
@@ -1041,7 +1041,7 @@ var localIp = (() => {
 // src/server/monitoring.ts
 import { getHeapStatistics, writeHeapSnapshot } from "node:v8";
 import { access, mkdir, rename, unlink } from "node:fs/promises";
-var log2 = getLogger("monitoring");
+var log2 = getLogger2("monitoring");
 var DEFAULT_OPTIONS = {
   memoryLimit: 1024 * 1024 * 1024,
   // 1GB
@@ -1195,8 +1195,8 @@ var serverHeader = (server) => {
 var server_header_default = (server) => serverHeader(server);
 
 // src/server/ws-client-verify.ts
-import { IOGateway as IOGateway3 } from "@interopio/gateway";
-var log3 = getLogger("gateway.ws.client-verify");
+import { IOGateway as IOGateway2 } from "@interopio/gateway";
+var log3 = getLogger2("gateway.ws.client-verify");
 function acceptsMissing(originFilters) {
   switch (originFilters.missing) {
     case "allow":
@@ -1214,10 +1214,10 @@ function acceptsMissing(originFilters) {
 function tryMatch(originFilters, origin) {
   const block = originFilters.block ?? originFilters["blacklist"];
   const allow = originFilters.allow ?? originFilters["whitelist"];
-  if (block.length > 0 && IOGateway3.Filtering.valuesMatch(block, origin)) {
+  if (block.length > 0 && IOGateway2.Filtering.valuesMatch(block, origin)) {
     log3.warn(`origin ${origin} matches block filter`);
     return false;
-  } else if (allow.length > 0 && IOGateway3.Filtering.valuesMatch(allow, origin)) {
+  } else if (allow.length > 0 && IOGateway2.Filtering.valuesMatch(allow, origin)) {
     if (log3.enabledFor("debug")) {
       log3.debug(`origin ${origin} matches allow filter`);
     }
@@ -1255,8 +1255,8 @@ function acceptsOrigin(origin, originFilters) {
 }
 function regexifyOriginFilters(originFilters) {
   if (originFilters) {
-    const block = (originFilters.block ?? originFilters.blacklist ?? []).map(IOGateway3.Filtering.regexify);
-    const allow = (originFilters.allow ?? originFilters.whitelist ?? []).map(IOGateway3.Filtering.regexify);
+    const block = (originFilters.block ?? originFilters.blacklist ?? []).map(IOGateway2.Filtering.regexify);
+    const allow = (originFilters.allow ?? originFilters.whitelist ?? []).map(IOGateway2.Filtering.regexify);
     return {
       non_matched: originFilters.non_matched ?? "allow",
       missing: originFilters.missing ?? "allow",
@@ -1371,12 +1371,12 @@ var upgradeMatcher = async ({ request }) => {
 upgradeMatcher.toString = () => "websocket upgrade";
 
 // src/app/route.ts
-import { IOGateway as IOGateway4 } from "@interopio/gateway";
+import { IOGateway as IOGateway3 } from "@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(IOGateway4.Filtering.regexify),
+        allowOrigins: options.origins?.allow?.map(IOGateway3.Filtering.regexify),
         allowMethods: request.method === void 0 ? ["*"] : [request.method],
         allowCredentials: options.authorize?.access !== "permitted" ? true : void 0
       } : options.cors;
@@ -1387,7 +1387,7 @@ async function configure(app, config, routes) {
   const configurer = new class {
     handle(...handlers) {
       handlers.forEach(({ request, options, handler }) => {
-        const matcher = pattern(IOGateway4.Filtering.regexify(request.path), { method: request.method });
+        const matcher = pattern(IOGateway3.Filtering.regexify(request.path), { method: request.method });
         if (options?.authorize) {
           routes.authorize.push([matcher, options.authorize]);
         }
@@ -1421,7 +1421,7 @@ async function configure(app, config, routes) {
 }
 
 // src/server/cors.ts
-import { IOGateway as IOGateway5 } from "@interopio/gateway";
+import { IOGateway as IOGateway4 } from "@interopio/gateway";
 function isSameOrigin(request) {
   const origin = request.headers.one("origin");
   if (origin === void 0) {
@@ -1511,7 +1511,7 @@ function validateCorsConfig(config) {
           ...config,
           allowOrigins: allowOrigins.map((origin) => {
             if (typeof origin === "string" && origin !== ALL) {
-              origin = IOGateway5.Filtering.regexify(origin);
+              origin = IOGateway4.Filtering.regexify(origin);
               if (typeof origin === "string") {
                 return trimTrailingSlash(origin).toLowerCase();
               }
@@ -1574,7 +1574,7 @@ var corsFilter = (opts) => {
   };
 };
 var cors_default = corsFilter;
-var logger = getLogger("cors");
+var logger = getLogger2("cors");
 function rejectRequest(response) {
   response.setStatusCode(HttpStatus.FORBIDDEN);
 }
@@ -1653,7 +1653,7 @@ function checkOrigin(config, origin) {
       }
       const originToCheck = trimTrailingSlash(origin.toLowerCase());
       for (const allowedOrigin of allowedOrigins) {
-        if (allowedOrigin === ALL || IOGateway5.Filtering.valueMatches(allowedOrigin, originToCheck)) {
+        if (allowedOrigin === ALL || IOGateway4.Filtering.valueMatches(allowedOrigin, originToCheck)) {
           return origin;
         }
       }
@@ -1666,7 +1666,7 @@ function checkMethods(config, requestMethod) {
     if (allowedMethods === ALL) {
       return [requestMethod];
     }
-    if (IOGateway5.Filtering.valuesMatch(allowedMethods, requestMethod)) {
+    if (IOGateway4.Filtering.valuesMatch(allowedMethods, requestMethod)) {
       return allowedMethods;
     }
   }
@@ -1725,7 +1725,7 @@ var matchingCorsConfigSource = (opts) => {
 };
 
 // src/app/cors.ts
-import { IOGateway as IOGateway6 } from "@interopio/gateway";
+import { IOGateway as IOGateway5 } from "@interopio/gateway";
 function createCorsConfigSource(context) {
   const { sockets: routes, cors } = context;
   const defaultCorsConfig = context.corsConfig === false ? void 0 : combineCorsConfig(PERMIT_DEFAULT_CONFIG, context.corsConfig);
@@ -1733,7 +1733,7 @@ function createCorsConfigSource(context) {
   for (const [path, route] of routes) {
     let routeCorsConfig = defaultCorsConfig;
     for (const [matcher, config2] of cors) {
-      if (IOGateway6.Filtering.valueMatches(matcher, path)) {
+      if (IOGateway5.Filtering.valueMatches(matcher, path)) {
         if (config2 === void 0) {
           routeCorsConfig = void 0;
         } else {
@@ -2139,7 +2139,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);
@@ -2495,7 +2495,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;
@@ -2516,7 +2516,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) => {
@@ -2886,7 +2886,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;
@@ -2969,7 +2969,7 @@ var ExtendedWebSocket = class extends WebSocket {
   }
   connected;
 };
-var logger5 = getLogger("ws");
+var logger5 = getLogger2("ws");
 function upgradeStrategy(path, route, wss, onSocketError) {
   return (exchange) => {
     const { logPrefix, request } = exchange;
@@ -3081,7 +3081,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 = readFileSync(ssl.key);
@@ -3181,7 +3181,7 @@ var Factory = async (options) => {
     storage: new AsyncLocalStorage4(),
     sockets: /* @__PURE__ */ new Map()
   };
-  const gw = IOGateway7.Factory({ ...options.gateway });
+  const gw = IOGateway6.Factory({ ...options.gateway });
   if (options.gateway) {
     const config = options.gateway;
     await configure(async (configurer) => {
@@ -3199,7 +3199,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") {