@taujs/server 0.3.4 → 0.3.5

package/dist/build.js

@@ -267,64 +267,6 @@ function createAuthHook(routes, isDebug) {
 
 // src/security/csp.ts
 import crypto from "crypto";
-var defaultGenerateCSP = (directives, nonce) => {
-  const merged = { ...directives };
-  merged["script-src"] = merged["script-src"] || ["'self'"];
-  if (!merged["script-src"].some((v) => v.startsWith("'nonce-"))) merged["script-src"].push(`'nonce-${nonce}'`);
-  if (process.env.NODE_ENV !== "production") {
-    const connect = merged["connect-src"] || ["'self'"];
-    if (!connect.includes("ws:")) connect.push("ws:");
-    if (!connect.includes("http:")) connect.push("http:");
-    merged["connect-src"] = connect;
-    const style = merged["style-src"] || ["'self'"];
-    if (!style.includes("'unsafe-inline'")) style.push("'unsafe-inline'");
-    merged["style-src"] = style;
-  }
-  return Object.entries(merged).map(([key, values]) => `${key} ${values.join(" ")}`).join("; ");
-};
-var generateNonce = () => crypto.randomBytes(16).toString("base64");
-var createCSPHook = (options = {}) => (req, reply, done) => {
-  const nonce = generateNonce();
-  const directives = options.directives ?? DEV_CSP_DIRECTIVES;
-  const generate = options.generateCSP ?? defaultGenerateCSP;
-  const cspHeader = generate(directives, nonce);
-  reply.header("Content-Security-Policy", cspHeader);
-  if (typeof options.exposeNonce === "function") {
-    options.exposeNonce(req, nonce);
-  } else {
-    req.nonce = nonce;
-  }
-  done();
-};
-var applyCSP = (security, reply) => {
-  const nonce = generateNonce();
-  const directives = security?.csp?.directives ?? DEV_CSP_DIRECTIVES;
-  const generate = security?.csp?.generateCSP ?? defaultGenerateCSP;
-  const header = generate(directives, nonce);
-  reply.header("Content-Security-Policy", header);
-  reply.request.nonce = nonce;
-  return nonce;
-};
-
-// src/security/verifyMiddleware.ts
-var isAuthRequired = (r) => r.attr?.middleware?.auth?.required === true;
-var hasAuthenticate = (app) => typeof app.authenticate === "function";
-var verifyContracts = (app, routes, contracts, isDebug) => {
-  const logger = createLogger(Boolean(isDebug));
-  for (const contract of contracts) {
-    const isUsed = routes.some(contract.required);
-    if (!isUsed) {
-      debugLog(logger, `Middleware "${contract.key}" not used in any routes`);
-      continue;
-    }
-    if (!contract.verify(app)) {
-      const error = new Error(`[\u03C4js] ${contract.errorMessage}`);
-      logger.error(error.message);
-      throw error;
-    }
-    debugLog(logger, `Middleware "${contract.key}" verified \u2713`);
-  }
-};
 
 // src/utils/Utils.ts
 import { dirname, join } from "path";
@@ -412,19 +354,17 @@ var isServiceDescriptor = (obj) => {
   return typeof maybe.serviceName === "string" && typeof maybe.serviceMethod === "string";
 };
 var fetchInitialData = async (attr, params, serviceRegistry, ctx = { headers: {} }, callServiceMethodImpl = callServiceMethod) => {
-  if (!attr?.data || typeof attr.data !== "function") return {};
-  const result = await attr.data(params, ctx);
-  if (isServiceDescriptor(result)) {
-    const { serviceName, serviceMethod, args } = result;
-    if (serviceRegistry[serviceName]?.[serviceMethod]) {
-      return await callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {});
+  const dataHandler = attr?.data;
+  if (!dataHandler || typeof dataHandler !== "function") return Promise.resolve({});
+  return dataHandler(params, ctx).then(async (result) => {
+    if (isServiceDescriptor(result)) {
+      const { serviceName, serviceMethod, args } = result;
+      if (serviceRegistry[serviceName]?.[serviceMethod]) return callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {});
+      throw new Error(`Invalid service: serviceName=${String(serviceName)}, method=${String(serviceMethod)}`);
     }
-    throw new Error(`Invalid service: serviceName=${String(serviceName)}, method=${String(serviceMethod)}`);
-  }
-  if (typeof result === "object" && result !== null) {
-    return result;
-  }
-  throw new Error("Invalid result from attr.data");
+    if (typeof result === "object" && result !== null) return result;
+    throw new Error("Invalid result from attr.data");
+  });
 };
 var matchRoute = (url, renderRoutes) => {
   for (const route of renderRoutes) {
@@ -464,6 +404,66 @@ var ensureNonNull = (value, errorMessage) => {
   return value;
 };
 
+// src/security/csp.ts
+var defaultGenerateCSP = (directives, nonce) => {
+  const merged = { ...directives };
+  merged["script-src"] = merged["script-src"] || ["'self'"];
+  if (!merged["script-src"].some((v) => v.startsWith("'nonce-"))) merged["script-src"].push(`'nonce-${nonce}'`);
+  if (isDevelopment) {
+    const connect = merged["connect-src"] || ["'self'"];
+    if (!connect.includes("ws:")) connect.push("ws:");
+    if (!connect.includes("http:")) connect.push("http:");
+    merged["connect-src"] = connect;
+    const style = merged["style-src"] || ["'self'"];
+    if (!style.includes("'unsafe-inline'")) style.push("'unsafe-inline'");
+    merged["style-src"] = style;
+  }
+  return Object.entries(merged).map(([key, values]) => `${key} ${values.join(" ")}`).join("; ");
+};
+var generateNonce = () => crypto.randomBytes(16).toString("base64");
+var createCSPHook = (options = {}) => (req, reply, done) => {
+  const nonce = generateNonce();
+  const directives = options.directives ?? DEV_CSP_DIRECTIVES;
+  const generate = options.generateCSP ?? defaultGenerateCSP;
+  const cspHeader = generate(directives, nonce);
+  reply.header("Content-Security-Policy", cspHeader);
+  if (typeof options.exposeNonce === "function") {
+    options.exposeNonce(req, nonce);
+  } else {
+    req.nonce = nonce;
+  }
+  done();
+};
+var applyCSP = (security, reply) => {
+  const nonce = generateNonce();
+  const directives = security?.csp?.directives ?? DEV_CSP_DIRECTIVES;
+  const generate = security?.csp?.generateCSP ?? defaultGenerateCSP;
+  const header = generate(directives, nonce);
+  reply.header("Content-Security-Policy", header);
+  reply.request.nonce = nonce;
+  return nonce;
+};
+
+// src/security/verifyMiddleware.ts
+var isAuthRequired = (r) => r.attr?.middleware?.auth?.required === true;
+var hasAuthenticate = (app) => typeof app.authenticate === "function";
+var verifyContracts = (app, routes, contracts, isDebug) => {
+  const logger = createLogger(Boolean(isDebug));
+  for (const contract of contracts) {
+    const isUsed = routes.some(contract.required);
+    if (!isUsed) {
+      debugLog(logger, `Middleware "${contract.key}" not used in any routes`);
+      continue;
+    }
+    if (!contract.verify(app)) {
+      const error = new Error(`[\u03C4js] ${contract.errorMessage}`);
+      logger.error(error.message);
+      throw error;
+    }
+    debugLog(logger, `Middleware "${contract.key}" verified \u2713`);
+  }
+};
+
 // src/SSRServer.ts
 var createMaps = () => {
   return {

package/dist/index.js

@@ -265,64 +265,6 @@ function createAuthHook(routes, isDebug) {
 
 // src/security/csp.ts
 import crypto from "crypto";
-var defaultGenerateCSP = (directives, nonce) => {
-  const merged = { ...directives };
-  merged["script-src"] = merged["script-src"] || ["'self'"];
-  if (!merged["script-src"].some((v) => v.startsWith("'nonce-"))) merged["script-src"].push(`'nonce-${nonce}'`);
-  if (process.env.NODE_ENV !== "production") {
-    const connect = merged["connect-src"] || ["'self'"];
-    if (!connect.includes("ws:")) connect.push("ws:");
-    if (!connect.includes("http:")) connect.push("http:");
-    merged["connect-src"] = connect;
-    const style = merged["style-src"] || ["'self'"];
-    if (!style.includes("'unsafe-inline'")) style.push("'unsafe-inline'");
-    merged["style-src"] = style;
-  }
-  return Object.entries(merged).map(([key, values]) => `${key} ${values.join(" ")}`).join("; ");
-};
-var generateNonce = () => crypto.randomBytes(16).toString("base64");
-var createCSPHook = (options = {}) => (req, reply, done) => {
-  const nonce = generateNonce();
-  const directives = options.directives ?? DEV_CSP_DIRECTIVES;
-  const generate = options.generateCSP ?? defaultGenerateCSP;
-  const cspHeader = generate(directives, nonce);
-  reply.header("Content-Security-Policy", cspHeader);
-  if (typeof options.exposeNonce === "function") {
-    options.exposeNonce(req, nonce);
-  } else {
-    req.nonce = nonce;
-  }
-  done();
-};
-var applyCSP = (security, reply) => {
-  const nonce = generateNonce();
-  const directives = security?.csp?.directives ?? DEV_CSP_DIRECTIVES;
-  const generate = security?.csp?.generateCSP ?? defaultGenerateCSP;
-  const header = generate(directives, nonce);
-  reply.header("Content-Security-Policy", header);
-  reply.request.nonce = nonce;
-  return nonce;
-};
-
-// src/security/verifyMiddleware.ts
-var isAuthRequired = (r) => r.attr?.middleware?.auth?.required === true;
-var hasAuthenticate = (app) => typeof app.authenticate === "function";
-var verifyContracts = (app, routes, contracts, isDebug) => {
-  const logger = createLogger(Boolean(isDebug));
-  for (const contract of contracts) {
-    const isUsed = routes.some(contract.required);
-    if (!isUsed) {
-      debugLog(logger, `Middleware "${contract.key}" not used in any routes`);
-      continue;
-    }
-    if (!contract.verify(app)) {
-      const error = new Error(`[\u03C4js] ${contract.errorMessage}`);
-      logger.error(error.message);
-      throw error;
-    }
-    debugLog(logger, `Middleware "${contract.key}" verified \u2713`);
-  }
-};
 
 // src/utils/Utils.ts
 import { dirname, join } from "path";
@@ -410,19 +352,17 @@ var isServiceDescriptor = (obj) => {
   return typeof maybe.serviceName === "string" && typeof maybe.serviceMethod === "string";
 };
 var fetchInitialData = async (attr, params, serviceRegistry, ctx = { headers: {} }, callServiceMethodImpl = callServiceMethod) => {
-  if (!attr?.data || typeof attr.data !== "function") return {};
-  const result = await attr.data(params, ctx);
-  if (isServiceDescriptor(result)) {
-    const { serviceName, serviceMethod, args } = result;
-    if (serviceRegistry[serviceName]?.[serviceMethod]) {
-      return await callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {});
+  const dataHandler = attr?.data;
+  if (!dataHandler || typeof dataHandler !== "function") return Promise.resolve({});
+  return dataHandler(params, ctx).then(async (result) => {
+    if (isServiceDescriptor(result)) {
+      const { serviceName, serviceMethod, args } = result;
+      if (serviceRegistry[serviceName]?.[serviceMethod]) return callServiceMethodImpl(serviceRegistry, serviceName, serviceMethod, args ?? {});
+      throw new Error(`Invalid service: serviceName=${String(serviceName)}, method=${String(serviceMethod)}`);
     }
-    throw new Error(`Invalid service: serviceName=${String(serviceName)}, method=${String(serviceMethod)}`);
-  }
-  if (typeof result === "object" && result !== null) {
-    return result;
-  }
-  throw new Error("Invalid result from attr.data");
+    if (typeof result === "object" && result !== null) return result;
+    throw new Error("Invalid result from attr.data");
+  });
 };
 var matchRoute = (url, renderRoutes) => {
   for (const route of renderRoutes) {
@@ -462,6 +402,66 @@ var ensureNonNull = (value, errorMessage) => {
   return value;
 };
 
+// src/security/csp.ts
+var defaultGenerateCSP = (directives, nonce) => {
+  const merged = { ...directives };
+  merged["script-src"] = merged["script-src"] || ["'self'"];
+  if (!merged["script-src"].some((v) => v.startsWith("'nonce-"))) merged["script-src"].push(`'nonce-${nonce}'`);
+  if (isDevelopment) {
+    const connect = merged["connect-src"] || ["'self'"];
+    if (!connect.includes("ws:")) connect.push("ws:");
+    if (!connect.includes("http:")) connect.push("http:");
+    merged["connect-src"] = connect;
+    const style = merged["style-src"] || ["'self'"];
+    if (!style.includes("'unsafe-inline'")) style.push("'unsafe-inline'");
+    merged["style-src"] = style;
+  }
+  return Object.entries(merged).map(([key, values]) => `${key} ${values.join(" ")}`).join("; ");
+};
+var generateNonce = () => crypto.randomBytes(16).toString("base64");
+var createCSPHook = (options = {}) => (req, reply, done) => {
+  const nonce = generateNonce();
+  const directives = options.directives ?? DEV_CSP_DIRECTIVES;
+  const generate = options.generateCSP ?? defaultGenerateCSP;
+  const cspHeader = generate(directives, nonce);
+  reply.header("Content-Security-Policy", cspHeader);
+  if (typeof options.exposeNonce === "function") {
+    options.exposeNonce(req, nonce);
+  } else {
+    req.nonce = nonce;
+  }
+  done();
+};
+var applyCSP = (security, reply) => {
+  const nonce = generateNonce();
+  const directives = security?.csp?.directives ?? DEV_CSP_DIRECTIVES;
+  const generate = security?.csp?.generateCSP ?? defaultGenerateCSP;
+  const header = generate(directives, nonce);
+  reply.header("Content-Security-Policy", header);
+  reply.request.nonce = nonce;
+  return nonce;
+};
+
+// src/security/verifyMiddleware.ts
+var isAuthRequired = (r) => r.attr?.middleware?.auth?.required === true;
+var hasAuthenticate = (app) => typeof app.authenticate === "function";
+var verifyContracts = (app, routes, contracts, isDebug) => {
+  const logger = createLogger(Boolean(isDebug));
+  for (const contract of contracts) {
+    const isUsed = routes.some(contract.required);
+    if (!isUsed) {
+      debugLog(logger, `Middleware "${contract.key}" not used in any routes`);
+      continue;
+    }
+    if (!contract.verify(app)) {
+      const error = new Error(`[\u03C4js] ${contract.errorMessage}`);
+      logger.error(error.message);
+      throw error;
+    }
+    debugLog(logger, `Middleware "${contract.key}" verified \u2713`);
+  }
+};
+
 // src/SSRServer.ts
 var createMaps = () => {
   return {

package/dist/security/csp.js

@@ -9,12 +9,21 @@ var DEV_CSP_DIRECTIVES = {
   "img-src": ["'self'", "data:"]
 };
 
+// src/utils/Utils.ts
+import { dirname, join } from "path";
+import "path";
+import { fileURLToPath } from "url";
+import { match } from "path-to-regexp";
+var isDevelopment = process.env.NODE_ENV === "development";
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = join(dirname(__filename), !isDevelopment ? "./" : "..");
+
 // src/security/csp.ts
 var defaultGenerateCSP = (directives, nonce) => {
   const merged = { ...directives };
   merged["script-src"] = merged["script-src"] || ["'self'"];
   if (!merged["script-src"].some((v) => v.startsWith("'nonce-"))) merged["script-src"].push(`'nonce-${nonce}'`);
-  if (process.env.NODE_ENV !== "production") {
+  if (isDevelopment) {
     const connect = merged["connect-src"] || ["'self'"];
     if (!connect.includes("ws:")) connect.push("ws:");
     if (!connect.includes("http:")) connect.push("http:");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "taujs [ τjs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",