@interopio/gateway-server 0.6.0-beta → 0.6.2-beta

package/dist/index.js

@@ -159,8 +159,7 @@ var HttpServerRequest = class {
         return void 0;
       }
       const text = await blob.text();
-      const json = JSON.parse(text);
-      return json;
+      return JSON.parse(text);
     });
   }
 };
@@ -275,15 +274,19 @@ var HttpServerResponse = class {
   }
   end(chunk) {
     if (!this._res.headersSent) {
-      return new Promise((resolve) => {
-        if (chunk === void 0) {
-          this._res.end(() => {
-            resolve(true);
-          });
-        } else {
-          this._res.end(chunk, () => {
-            resolve(true);
-          });
+      return new Promise((resolve, reject) => {
+        try {
+          if (chunk === void 0) {
+            this._res.end(() => {
+              resolve(true);
+            });
+          } else {
+            this._res.end(chunk, () => {
+              resolve(true);
+            });
+          }
+        } catch (e) {
+          reject(e instanceof Error ? e : new Error(`end failed: ${e}`));
         }
       });
     } else {
@@ -771,9 +774,10 @@ function routes(connections, config, authorize) {
         } else {
           const nodes = json;
           const result = connections.announce(nodes);
-          const body = new Blob([JSON.stringify(result)], { type: "application/json" });
+          const buffer = Buffer.from(JSON.stringify(result), "utf-8");
           ctx.response.statusCode = 200;
-          await ctx.response.end(body);
+          ctx.response.headers.set("Content-Type", "application/json").set("Content-Length", buffer.length);
+          await ctx.response.end(buffer);
         }
       } else {
         await next();
@@ -1257,9 +1261,9 @@ var localIp = (() => {
     return a.length > 0 ? a[0] : void 0;
   }
   const addresses = Object.values(networkInterfaces()).flatMap((details) => {
-    return (details ?? []).filter((info) => info.family === "IPv4");
-  }).reduce((acc, info) => {
-    acc[info.internal ? "internal" : "external"].push(info);
+    return (details ?? []).filter((info2) => info2.family === "IPv4");
+  }).reduce((acc, info2) => {
+    acc[info2.internal ? "internal" : "external"].push(info2);
     return acc;
   }, { internal: [], external: [] });
   return (first(addresses.internal) ?? first(addresses.external))?.address;
@@ -1479,16 +1483,17 @@ function regexifyOriginFilters(originFilters) {
 }
 
 // src/server/server-header.ts
+import info from "@interopio/gateway-server/package.json" with { type: "json" };
 var serverHeader = (server) => {
-  const enabled = typeof server === "string";
+  server ??= `${info.name} - v${info.version}`;
   return async ({ response }, next) => {
-    if (server != false && !response.headers.has("server")) {
+    if (server !== false && !response.headers.has("server")) {
       response.headers.set("Server", server);
     }
     await next();
   };
 };
-var server_header_default = (server = "gateway-server") => serverHeader(server);
+var server_header_default = (server) => serverHeader(server);
 
 // src/app/route.ts
 function findSocketRoute({ request }, { sockets: routes3 }) {
@@ -1841,14 +1846,25 @@ function authenticationFilter(opts) {
 // src/server/security/oauth2/token-error.ts
 var BearerTokenErrorCodes = {
   invalid_request: "invalid_request",
-  invalid_token: "invalid_token"
+  invalid_token: "invalid_token",
+  insufficient_scope: "insufficient_scope"
 };
 var DEFAULT_URI = "https://tools.ietf.org/html/rfc6750#section-3.1";
 function invalidToken(message) {
-  return { errorCode: BearerTokenErrorCodes.invalid_token, httpStatus: 401, description: message, uri: DEFAULT_URI };
+  return {
+    errorCode: BearerTokenErrorCodes.invalid_token,
+    httpStatus: 401,
+    description: message,
+    uri: DEFAULT_URI
+  };
 }
 function invalidRequest(message) {
-  return { errorCode: BearerTokenErrorCodes.invalid_request, httpStatus: 400, description: message, uri: DEFAULT_URI };
+  return {
+    errorCode: BearerTokenErrorCodes.invalid_request,
+    httpStatus: 400,
+    description: message,
+    uri: DEFAULT_URI
+  };
 }
 
 // src/server/security/oauth2/token-converter.ts
@@ -2133,7 +2149,7 @@ function httpBasic(opts) {
   const preferredMatcher = or([xhrMatcher, restNoHtmlMatcher]);
   opts.defaultEntryPoints.push([preferredMatcher, entryPoint]);
   const failureHandler = opts.failureHandler ?? serverAuthenticationEntryPointFailureHandler({ entryPoint });
-  const successHandler = delegatingSuccessHandler(opts.successHandlers === void 0 ? opts.defaultSuccessHandlers : opts.successHandlers);
+  const successHandler = delegatingSuccessHandler(opts.successHandlers ?? opts.defaultSuccessHandlers);
   const converter = httpBasicAuthenticationConverter({});
   return authenticationFilter({
     storage: opts.storage,
@@ -2740,8 +2756,9 @@ async function createCorsConfigSource(context) {
 // src/app/auth.ts
 function createSecurityConfig(context) {
   const authorize = [];
+  const defaultAccess = { access: context.authConfig?.type !== "none" ? "authenticated" : "permitted" };
   for (const [path, route] of context.sockets) {
-    const rule = route.authorize ?? { access: "authenticated" };
+    const rule = route.authorize ?? defaultAccess;
     let matcher = pattern(path, { method: "GET" });
     matcher = and([upgradeMatcher, matcher]);
     authorize.push([matcher, rule]);
@@ -2752,7 +2769,7 @@ function createSecurityConfig(context) {
   if (context.authorize.length > 0) {
     authorize.push(...context.authorize);
   }
-  authorize.push(["any-exchange", { access: "authenticated" }]);
+  authorize.push(["any-exchange", defaultAccess]);
   return {
     authorize,
     basic: {
@@ -2796,23 +2813,23 @@ async function createListener(middleware, context, onSocketError) {
         if ((request.method === "GET" || request.method === "CONNECT") && upgradeMatchResult.match) {
           const socket = request.socket;
           const host = request.host;
-          const info = socketKey(request._req.socket);
+          const info2 = socketKey(request._req.socket);
           if (route.wss) {
             socket.removeListener("error", onSocketError);
             const wss = route.wss;
             if (route.maxConnections !== void 0 && wss.clients?.size >= route.maxConnections) {
-              logger10.warn(`${info} dropping ws connection request from ${host} on ${path}. max connections exceeded.`);
+              logger10.warn(`${info2} dropping ws connection request from ${host} on ${path}. max connections exceeded.`);
               socket.destroy();
               return;
             }
             const origin = request.headers.one("origin");
             if (!acceptsOrigin(origin, route.originFilters)) {
-              logger10.info(`${info} dropping ws connection request from ${host} on ${path}. origin ${origin ?? "<missing>"}`);
+              logger10.info(`${info2} dropping ws connection request from ${host} on ${path}. origin ${origin ?? "<missing>"}`);
               socket.destroy();
               return;
             }
             if (logger10.enabledFor("debug")) {
-              logger10.debug(`${info} accepted new ws connection request from ${host} on ${path}`);
+              logger10.debug(`${info2} accepted new ws connection request from ${host} on ${path}`);
             }
             wss.handleUpgrade(request._req, socket, request._req["_upgradeHead"], (ws) => {
               response._res["_header"] = true;
@@ -2822,7 +2839,7 @@ async function createListener(middleware, context, onSocketError) {
               wss.emit("connection", ws, request._req);
             });
           } else {
-            logger10.warn(`${info} rejected upgrade request from ${host} on ${path}`);
+            logger10.warn(`${info2} rejected upgrade request from ${host} on ${path}`);
             socket.destroy();
           }
         } else {
@@ -2976,12 +2993,12 @@ var Factory = async (options) => {
       }
     });
     server2.on("listening", async () => {
-      const info = server2.address();
+      const info2 = server2.address();
       for (const [path, route] of context.sockets) {
         try {
           logger10.info(`creating ws server for [${path}]. max connections: ${route.maxConnections ?? "<unlimited>"}, origin filters: ${route.originFilters ? JSON.stringify(route.originFilters, regexAwareReplacer) : "<none>"}`);
           const wss = new WebSocketServer({ noServer: true });
-          const endpoint = `${ssl ? "wss" : "ws"}://${localIp}:${info.port}${path}`;
+          const endpoint = `${ssl ? "wss" : "ws"}://${localIp}:${info2.port}${path}`;
           const handler = await route.factory({ endpoint, wss, storage: context.storage });
           const pingInterval = route.ping;
           if (pingInterval) {
@@ -3004,7 +3021,7 @@ var Factory = async (options) => {
           logger10.warn(`failed to init route ${path}`, e);
         }
       }
-      logger10.info(`http server listening on ${info.address}:${info.port}`);
+      logger10.info(`http server listening on ${info2.address}:${info2.port}`);
       resolve(server2);
     });
     server2.on("upgrade", (req, socket, head) => {