@cloudnux/local-cloud-provider 0.11.0 → 0.14.0

package/dist/index.js

@@ -1,5 +1,6 @@
-// src/services/event-broker.ts
-import axios from "axios";
+// src/logging/pretty-writer.ts
+import chalk from "chalk";
+import { EOL as EOL2 } from "os";
 
 // ../../../node_modules/lodash-es/_freeGlobal.js
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
@@ -963,20 +964,32 @@ var tokenUtils = {
   verifyAccessToken: verify
 };
 
-// ../../utils/src/logging/index.ts
-import chalk from "chalk";
-import { EOL } from "os";
-
 // ../../utils/src/logging/types.ts
 var logLevels = {
   fatal: -1,
   error: 0,
   warn: 1,
   info: 2,
-  debug: 3
+  debug: 3,
+  trace: 4
 };
 
 // ../../utils/src/logging/error-to-string.ts
+var safeJsonStringify = (value) => {
+  const seen = /* @__PURE__ */ new WeakSet();
+  return JSON.stringify(value, (key, currentValue) => {
+    if (key === "constructor") return void 0;
+    if (typeof currentValue === "object" && currentValue !== null) {
+      if (seen.has(currentValue)) return "[Circular]";
+      seen.add(currentValue);
+    }
+    return currentValue;
+  });
+};
+var hasOwnConstructorProp = (value) => {
+  if (typeof value !== "object" || value === null) return false;
+  return Object.prototype.hasOwnProperty.call(value, "constructor");
+};
 var errorToString = (error) => {
   if (error === null) return "Null error";
   if (error === void 0) return "Undefined error";
@@ -986,13 +999,22 @@ var errorToString = (error) => {
       `Message: ${error.message}`,
       `Stack: ${error.stack || "No stack trace available"}`,
       // Handle additional properties that might exist on custom errors
-      ...Object.entries(error).filter(([key]) => !["name", "message", "stack"].includes(key)).map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
+      ...Object.entries(error).filter(
+        ([key, value]) => !["name", "message", "stack"].includes(key) && !hasOwnConstructorProp(value)
+      ).map(([key, value]) => `${key}: ${safeJsonStringify(value)}`)
     ].join("\n");
   }
   if (typeof error === "string") return error;
   if (typeof error === "object") {
     try {
-      return JSON.stringify(error, null, 2);
+      return JSON.stringify(
+        error,
+        (key, value) => {
+          if (key === "constructor") return void 0;
+          return value;
+        },
+        2
+      );
     } catch {
       return `[Object that cannot be stringified: ${Object.prototype.toString.call(error)}]`;
     }
@@ -1000,64 +1022,130 @@ var errorToString = (error) => {
   return String(error);
 };
 
+// ../../utils/src/logging/writer.ts
+import { EOL } from "os";
+var jsonWriter = (entry) => {
+  process.stdout.write(JSON.stringify(entry) + EOL);
+};
+var _writer = jsonWriter;
+function setWriter(writer) {
+  _writer = writer;
+}
+function getWriter() {
+  return _writer;
+}
+
 // ../../utils/src/logging/index.ts
-var currentLogLevel = logLevels[env("LOG_LEVEL")?.toLowerCase()] ?? logLevels.info;
-var module = "default";
-var requestId = "";
-var logger = {
-  fatal: (message, meta) => {
-    if (currentLogLevel >= logLevels.fatal) {
-      console.error(
-        `[${(/* @__PURE__ */ new Date()).toTimeString()}]`,
-        `${chalk.bgRed.white(" fatal ")} - ${module || "unknown module"} - ${requestId || "no request ID"} - ${EOL}`,
-        errorToString(message),
-        meta ? `${EOL}${JSON.stringify(meta, null, 2)}` : ""
-      );
-    }
-  },
-  error: (message, meta) => {
-    if (currentLogLevel >= logLevels.error) {
-      console.error(
-        `[${(/* @__PURE__ */ new Date()).toTimeString()}]`,
-        `${chalk.bgRed.white(" error ")} - ${module || "unknown module"} - ${requestId || "no request ID"} - ${EOL}`,
-        errorToString(message),
-        meta ? `${EOL}${JSON.stringify(meta, null, 2)}` : ""
-      );
-    }
-  },
-  warn: (message, meta) => {
-    if (currentLogLevel >= logLevels.warn) {
-      console.warn(
-        `[${(/* @__PURE__ */ new Date()).toTimeString()}]`,
-        `${chalk.bgYellow.black(" warn ")} - ${module || "unknown module"} - ${requestId || "no request ID"} - ${EOL}`,
-        errorToString(message),
-        meta ? `${EOL}${JSON.stringify(meta, null, 2)}` : ""
-      );
-    }
-  },
-  info: (message, meta) => {
-    if (currentLogLevel >= logLevels.info) {
-      console.info(
-        `[${(/* @__PURE__ */ new Date()).toTimeString()}]`,
-        `${chalk.bgBlue.white(" info ")} - ${module || "unknown module"} - ${requestId || "no request ID"} - ${EOL}`,
-        message,
-        meta ? `${EOL}${JSON.stringify(meta, null, 2)}` : ""
-      );
-    }
-  },
-  debug: (message, meta) => {
-    if (currentLogLevel >= logLevels.debug) {
-      console.debug(
-        `[${(/* @__PURE__ */ new Date()).toTimeString()}]`,
-        `${chalk.bgWhite.black(" debug ")} - ${module || "unknown module"} - ${requestId || "no request ID"} - ${EOL}`,
-        message,
-        meta ? `${EOL}${JSON.stringify(meta, null, 2)}` : ""
-      );
-    }
+var levelValues = {
+  fatal: 70,
+  error: 60,
+  warn: 50,
+  info: 40,
+  debug: 30,
+  trace: 20
+};
+var currentLogLevel = 2;
+var _module = "default";
+var _requestId = "";
+function writeLine(level, mergeObject, msg, bindings) {
+  getWriter()({
+    level: levelValues[level],
+    levelName: level,
+    time: Date.now(),
+    module: bindings.module || _module,
+    reqId: bindings.reqId || _requestId,
+    msg: level === "error" || level === "fatal" ? errorToString(msg) : msg,
+    ...mergeObject ? { meta: mergeObject } : {}
+  });
+}
+function createLogger(bindings = {}) {
+  const currentLogLevelName = env("LOG_LEVEL")?.toLowerCase() ?? "info";
+  currentLogLevel = logLevels[currentLogLevelName] ?? logLevels.info;
+  return {
+    level: currentLogLevelName,
+    fatal: (mergeObject, msg) => {
+      if (currentLogLevel >= logLevels.fatal) {
+        typeof mergeObject === "string" || mergeObject instanceof Error ? writeLine("fatal", null, mergeObject, bindings) : writeLine("fatal", mergeObject, msg ?? "", bindings);
+      }
+    },
+    error: (mergeObject, msg) => {
+      if (currentLogLevel >= logLevels.error) {
+        typeof mergeObject === "string" || mergeObject instanceof Error ? writeLine("error", null, mergeObject, bindings) : writeLine("error", mergeObject, msg ?? "", bindings);
+      }
+    },
+    warn: (mergeObject, msg) => {
+      if (currentLogLevel >= logLevels.warn) {
+        typeof mergeObject === "string" ? writeLine("warn", null, mergeObject, bindings) : writeLine("warn", mergeObject, msg ?? "", bindings);
+      }
+    },
+    info: (mergeObject, msg) => {
+      if (currentLogLevel >= logLevels.info) {
+        typeof mergeObject === "string" ? writeLine("info", null, mergeObject, bindings) : writeLine("info", mergeObject, msg ?? "", bindings);
+      }
+    },
+    debug: (mergeObject, msg) => {
+      if (currentLogLevel >= logLevels.debug) {
+        typeof mergeObject === "string" ? writeLine("debug", null, mergeObject, bindings) : writeLine("debug", mergeObject, msg ?? "", bindings);
+      }
+    },
+    trace: (mergeObject, msg) => {
+      if (currentLogLevel >= logLevels.trace) {
+        typeof mergeObject === "string" ? writeLine("trace", null, mergeObject, bindings) : writeLine("trace", mergeObject, msg ?? "", bindings);
+      }
+    },
+    silent: () => {
+    },
+    child: (childBindings) => createLogger({ ...bindings, ...childBindings })
+  };
+}
+var logger = createLogger();
+
+// src/logging/pretty-writer.ts
+var levelColor = {
+  fatal: chalk.bgRed.white,
+  error: chalk.red,
+  warn: chalk.yellow,
+  info: chalk.cyan,
+  debug: chalk.gray,
+  trace: chalk.white
+};
+function formatTime(ms) {
+  return new Date(ms).toTimeString().slice(0, 8);
+}
+function formatMeta(meta) {
+  const { req, res, ...rest } = meta;
+  const lines = [];
+  if (req) {
+    const reqParts = [`${req.method} ${req.url}`];
+    if (req.remoteAddress) reqParts.push(`from ${req.remoteAddress}:${req.remotePort ?? ""}`);
+    if (req.headers) reqParts.push(`headers=${JSON.stringify(req.headers, null, 2)}`);
+    if (req.body !== void 0) reqParts.push(`body=${typeof req.body === "string" ? req.body : JSON.stringify(req.body, null, 2)}`);
+    lines.push(chalk.dim("  req: " + reqParts.join(" ")));
+  }
+  if (res) {
+    const resParts = [`${res.statusCode}`];
+    if (res.headers) resParts.push(`headers=${JSON.stringify(res.headers, null, 2)}`);
+    if (res.body !== void 0) resParts.push(`body=${typeof res.body === "string" ? res.body : JSON.stringify(res.body, null, 2)}`);
+    lines.push(chalk.dim("  res: " + resParts.join(" ")));
   }
+  if (Object.keys(rest).length) {
+    lines.push(chalk.dim("  " + JSON.stringify(rest, null, 2)));
+  }
+  return lines.length ? EOL2 + lines.join(EOL2) : "";
+}
+var prettyWriter = (entry) => {
+  const color = levelColor[entry.levelName] ?? chalk.white;
+  const time = chalk.dim(formatTime(entry.time));
+  const level = color(entry.levelName.toUpperCase().padEnd(5));
+  const module = chalk.magenta(entry.module);
+  const reqId = entry.reqId ? chalk.dim(`[${entry.reqId}]`) + " " : "";
+  const meta = entry.meta ? formatMeta(entry.meta) : "";
+  process.stdout.write(`${time} ${level} ${module} ${reqId}- ${entry.msg}${meta}${EOL2}`);
 };
+setWriter(prettyWriter);
 
 // src/services/event-broker.ts
+import axios from "axios";
 function createLocalEventBrokerService() {
   const baseURL = env("DEV_CLOUD_EVENT_BROKER_URL", "http://localhost:3000");
   function getQueueUrl(queueName) {
@@ -1085,6 +1173,8 @@ function createLocalEventBrokerService() {
      * @returns Promise resolving when publishing is complete
      */
     async publish(target, message, options) {
+      if (!target)
+        throw new Error("Target queue name or URL is required for publishing a message.");
       const queueUrl = getQueueUrl(target);
       const headers = {};
       if (options?.attributes) {
@@ -1251,7 +1341,7 @@ function createLocalStorageService() {
           await unlink(metadataPath);
         } catch (error) {
           if (error.code !== "ENOENT") {
-            logger.warn("Error deleting metadata file:", { error });
+            logger.warn({ error }, "Error deleting metadata file:");
           }
         }
       } catch (error) {
@@ -1736,13 +1826,30 @@ function createLocalFunctionsService() {
     createEventRequest: (message) => {
       const eventRequest = {
         body: message.payload,
-        attributes: message.attributes,
+        attributes: {
+          ...message.attributes,
+          messageId: message.id
+        },
         requestId: message.id,
         timestamp: message.timestamp,
         attempts: message.attempts
       };
       return [eventRequest];
     },
+    createWebSocketRequest: (connectionId, event, data, request) => {
+      logger.info(request.params);
+      const wsRequest = {
+        connectionId,
+        event,
+        url: getFullUrlFromRequest(request),
+        params: request.params,
+        body: data,
+        queryString: request.query,
+        headers: request.headers,
+        requestId: request.id
+      };
+      return [wsRequest];
+    },
     buildHttpResponse: (context, _, reply) => {
       reply.headers(context.response.headers ?? {}).status(context.response.status).send(context.response.body);
     },
@@ -1752,26 +1859,21 @@ function createLocalFunctionsService() {
       }
       return context.response.body;
     },
-    buildEventResponse: (context) => {
+    buildEventResponse: async (context) => {
       if (context.response.status === "error") {
-        throw new Error(JSON.stringify(context.response.body));
+        const { messageId } = context.attributes();
+        return { failureId: messageId };
       }
-      return context.response.body;
-    },
-    createWebSocketRequest: (connectionId, event, data) => {
-      const wsRequest = {
-        connectionId,
-        event,
-        path: "",
-        body: data
-      };
-      return [wsRequest];
+      return void 0;
     },
-    buildWebSocketResponse: (context) => {
+    buildWebSocketResponse: (context, _, __, ___, ____, reply) => {
       if (context.response.status === "error") {
-        throw new Error(JSON.stringify(context.response.body));
+        if (reply) {
+          return reply.status(context.response.statusCode ?? 500).send(context.response.body);
+        }
+        return void 0;
       }
-      return context.response.body;
+      return void 0;
     }
   };
 }
@@ -1788,6 +1890,12 @@ function createLocalWebSocketService() {
         throw new Error("WebSocket plugin not initialized");
       }
       return _manager.sendToClient(connectionId, data);
+    },
+    async disconnect(connectionId) {
+      if (!_manager) {
+        throw new Error("WebSocket plugin not initialized");
+      }
+      return _manager.disconnect(connectionId);
     }
   };
 }
@@ -1800,22 +1908,15 @@ import fastifyPrintRoutes from "fastify-print-routes";
 function createRouter(options = {}) {
   const fastify = Fastify({
     maxParamLength: 1e3,
-    logger: options.logger ? {
-      transport: {
-        target: "pino-pretty",
-        options: {
-          colorize: true,
-          translateTime: "HH:MM:ss Z",
-          ignore: "pid,hostname"
-        }
-      }
-    } : void 0
+    ...options.logger ? { loggerInstance: logger } : {}
   });
   fastify.register(fastifyRawBody, {
     field: "rawBody",
     encoding: "utf8"
   });
-  fastify.register(cors, {});
+  fastify.register(cors, {
+    "methods": ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"]
+  });
   fastify.register(fastifyPrintRoutes);
   fastify.addHook("onReady", () => {
     setWebSocketManager(fastify.websockets);