@cloudnux/local-cloud-provider 0.18.0 → 0.20.0

package/dist/index.d.ts

@@ -1,10 +1,25 @@
-import { CloudProvider } from '@cloudnux/core-cloud-provider';
+import { LoggerService, LogEntry, CloudProvider } from '@cloudnux/core-cloud-provider';
 import { FastifyInstance } from 'fastify';
 
+type LogContext = {
+    module?: string;
+    reqId?: string;
+};
+type LogListener = (entry: LogEntry) => void;
+type RunWithLogContext = <T>(context: LogContext, fn: () => T) => T;
+type SubscribeToLogs = (listener: LogListener) => () => void;
+type LoggingContext = LoggerService & {
+    runWithLogContext: RunWithLogContext;
+    subscribeToLogs: SubscribeToLogs;
+};
+declare module "fastify" {
+    interface FastifyInstance {
+        logging: LoggingContext;
+    }
+}
+
 type RouterInstance = FastifyInstance;
-declare function createRouter(options?: {
-    logger?: boolean;
-}): RouterInstance;
+declare function createRouter(): RouterInstance;
 
 declare const localCloudProvider: CloudProvider;
 

package/dist/index.js

@@ -1,6 +1,5 @@
-// src/logging/pretty-writer.ts
-import chalk from "chalk";
-import { EOL as EOL2 } from "os";
+// src/services/event-broker.ts
+import axios from "axios";
 
 // ../../../node_modules/lodash-es/_freeGlobal.js
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
@@ -964,190 +963,9 @@ var tokenUtils = {
   verifyAccessToken: verify
 };
 
-// ../../utils/src/logging/types.ts
-var logLevels = {
-  fatal: -1,
-  error: 0,
-  warn: 1,
-  info: 2,
-  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";
-  if (error instanceof Error) {
-    return [
-      `Name: ${error.name}`,
-      `Message: ${error.message}`,
-      `Stack: ${error.stack || "No stack trace available"}`,
-      // Handle additional properties that might exist on custom errors
-      ...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,
-        (key, value) => {
-          if (key === "constructor") return void 0;
-          return value;
-        },
-        2
-      );
-    } catch {
-      return `[Object that cannot be stringified: ${Object.prototype.toString.call(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 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");
+  const baseURL = env("DEV_CLOUD_EVENT_BROKER_URL");
   function getQueueUrl(queueName) {
     if (queueName.startsWith("http://") || queueName.startsWith("https://")) {
       return queueName;
@@ -1243,9 +1061,11 @@ function createLocalEventBrokerService() {
 // src/services/storage.ts
 import * as fs from "fs";
 import * as path from "path";
+import { getService } from "@cloudnux/core-cloud-provider";
 var { mkdir, writeFile, readFile, unlink, access } = fs.promises;
 function createLocalStorageService() {
   const baseDir = env("DEV_CLOUD_STORAGE_BUCKET", path.join(process.cwd(), ".local-storage"));
+  const logger2 = getService("logger");
   if (!fs.existsSync(baseDir)) {
     fs.mkdirSync(baseDir, { recursive: true });
   }
@@ -1341,7 +1161,7 @@ function createLocalStorageService() {
           await unlink(metadataPath);
         } catch (error) {
           if (error.code !== "ENOENT") {
-            logger.warn({ error }, "Error deleting metadata file:");
+            logger2.warn({ error }, "Error deleting metadata file:");
           }
         }
       } catch (error) {
@@ -1357,6 +1177,9 @@ function createLocalStorageService() {
 // src/services/locations.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
+import {
+  getService as getService2
+} from "@cloudnux/core-cloud-provider";
 var { readFile: readFile2, writeFile: writeFile2, access: access2, mkdir: mkdir2 } = fs2.promises;
 var DEFAULT_MOCK_LOCATIONS = {
   "place-001": {
@@ -1590,6 +1413,7 @@ function toLocationAddress(location) {
 function createLocalLocationService() {
   const baseDir = env("DEV_CLOUD_LOCATION_PATH", path2.join(process.cwd(), ".develop", ".local-location"));
   const placesFilePath = path2.join(baseDir, "places.json");
+  const logger2 = getService2("logger");
   async function loadPlaces() {
     try {
       try {
@@ -1603,11 +1427,11 @@ function createLocalLocationService() {
         return JSON.parse(data);
       } catch {
         await writeFile2(placesFilePath, JSON.stringify(DEFAULT_MOCK_LOCATIONS, null, 2), "utf8");
-        logger.info(`Created default places file at: ${placesFilePath}`);
+        logger2.info(`Created default places file at: ${placesFilePath}`);
         return DEFAULT_MOCK_LOCATIONS;
       }
     } catch (error) {
-      logger.warn(`Error loading places data: ${String(error)}`);
+      logger2.warn(`Error loading places data: ${String(error)}`);
       return DEFAULT_MOCK_LOCATIONS;
     }
   }
@@ -1746,7 +1570,7 @@ function createLocalLocationService() {
         Math.max(...lats)
         // maxLat
       ];
-      logger.info(`Calculated route: ${totalDistanceKm.toFixed(2)}km, ${totalDurationMinutes.toFixed(0)}min, ${legs.length} legs`);
+      logger2.info(`Calculated route: ${totalDistanceKm.toFixed(2)}km, ${totalDurationMinutes.toFixed(0)}min, ${legs.length} legs`);
       return {
         totalDistanceKm,
         totalDurationMinutes,
@@ -1778,8 +1602,7 @@ function createLocalFunctionsService() {
     createHttRequest(request) {
       const rawBody = request.rawBody;
       const isAuth = env("DEV_IDENTITY");
-      const index = request.raw.rawHeaders ? request.raw.rawHeaders?.indexOf("Authorization") : -1;
-      const authorization = index !== -1 ? request.raw.rawHeaders[index + 1] : null;
+      const authorization = request.headers.authorization ?? null;
       const token = authorization ? authorization.replace(/^bearer\s+/i, "") : null;
       const httpRequest = {
         body: String(rawBody),
@@ -1790,7 +1613,8 @@ function createLocalFunctionsService() {
         params: request.params,
         rawQueryString: querystring.stringify(request.query),
         host: request.hostname,
-        requestId: request.id
+        requestId: request.id,
+        moduleName: request.routeOptions.config?.module
       };
       const jwtClaims = token && tokenUtils.decodeAccessToken(token);
       const httpAuth = isAuth ? {
@@ -1819,7 +1643,8 @@ function createLocalFunctionsService() {
       const scheduleName = job.name;
       const scheduleRequest = {
         name: scheduleName,
-        requestId: execution.id
+        requestId: execution.id,
+        moduleName: job.module
       };
       return [scheduleRequest];
     },
@@ -1837,7 +1662,6 @@ function createLocalFunctionsService() {
       return [eventRequest];
     },
     createWebSocketRequest: (connectionId, event, data, request) => {
-      logger.info(request.params);
       const wsRequest = {
         connectionId,
         event,
@@ -1937,16 +1761,138 @@ function createLocalInvokeService() {
   };
 }
 
+// src/logger/index.ts
+import chalk from "chalk";
+import { EOL } from "os";
+import { AsyncLocalStorage } from "async_hooks";
+var storage = new AsyncLocalStorage();
+function enterLogContext(context) {
+  storage.enterWith(context);
+}
+function runWithLogContext(context, fn) {
+  return storage.run(context, fn);
+}
+function getLogContext() {
+  return storage.getStore() ?? {};
+}
+var listeners = /* @__PURE__ */ new Set();
+function subscribeToLogs(listener) {
+  listeners.add(listener);
+  return () => listeners.delete(listener);
+}
+function publish(entry) {
+  for (const listener of listeners) {
+    listener(entry);
+  }
+}
+var levels = ["fatal", "error", "warn", "info", "debug", "trace"];
+function resolveLevel() {
+  const configured = env("LOG_LEVEL", "info").toLowerCase();
+  return levels.includes(configured) ? configured : "info";
+}
+var cachedLevel;
+function currentLevel() {
+  if (cachedLevel === void 0) {
+    cachedLevel = resolveLevel();
+  }
+  return cachedLevel;
+}
+function isEnabled(level) {
+  return levels.indexOf(level) <= levels.indexOf(currentLevel());
+}
+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 circularSafeReplacer() {
+  const seen = /* @__PURE__ */ new WeakSet();
+  return (_key, value) => {
+    if (typeof value === "object" && value !== null) {
+      if (seen.has(value)) return "[Circular]";
+      seen.add(value);
+    }
+    return value;
+  };
+}
+function formatMeta(meta) {
+  return EOL + chalk.dim("  " + JSON.stringify(meta, circularSafeReplacer()));
+}
+function printPretty(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}${EOL}`);
+}
+function write(level, mergeObject, msg) {
+  if (!isEnabled(level)) return;
+  const context = getLogContext();
+  let module = context.module ?? "default";
+  let reqId = context.reqId ?? "";
+  let text;
+  let meta;
+  if (typeof mergeObject === "string") {
+    text = mergeObject;
+  } else if (mergeObject instanceof Error) {
+    text = mergeObject.stack ?? mergeObject.message;
+  } else {
+    const { module: explicitModule, reqId: explicitReqId, ...rest } = mergeObject;
+    if (explicitModule) module = explicitModule;
+    if (explicitReqId) reqId = explicitReqId;
+    meta = Object.keys(rest).length ? rest : void 0;
+    text = msg ?? "";
+  }
+  const entry = {
+    level: levels.indexOf(level),
+    levelName: level,
+    time: Date.now(),
+    module,
+    reqId,
+    msg: text,
+    ...meta ? { meta } : {}
+  };
+  printPretty(entry);
+  publish(entry);
+}
+var logger = {
+  get level() {
+    return currentLevel();
+  },
+  setBindings: () => {
+  },
+  fatal: (mergeObject, msg) => write("fatal", mergeObject, msg),
+  error: (mergeObject, msg) => write("error", mergeObject, msg),
+  warn: (mergeObject, msg) => write("warn", mergeObject, msg),
+  info: (mergeObject, msg) => write("info", mergeObject, msg),
+  debug: (mergeObject, msg) => write("debug", mergeObject, msg),
+  trace: (mergeObject, msg) => write("trace", mergeObject, msg)
+};
+
+// src/services/logger.ts
+function createLocalLoggerService() {
+  return logger;
+}
+
 // src/router/index.ts
 import Fastify from "fastify";
 import fastifyRawBody from "fastify-raw-body";
 import cors from "@fastify/cors";
 import fastifyPrintRoutes from "fastify-print-routes";
-function createRouter(options = {}) {
+function createRouter() {
   const fastify = Fastify({
     maxParamLength: 1e3,
-    ...options.logger ? { loggerInstance: logger } : {}
+    logger: false
   });
+  fastify.decorate("logging", { ...logger, runWithLogContext, subscribeToLogs });
   fastify.register(fastifyRawBody, {
     field: "rawBody",
     encoding: "utf8"
@@ -1955,6 +1901,24 @@ function createRouter(options = {}) {
     "methods": ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"]
   });
   fastify.register(fastifyPrintRoutes);
+  fastify.addHook("onRequest", (request, _reply, done) => {
+    const module = request.routeOptions.config?.module;
+    enterLogContext({ module, reqId: request.id });
+    done();
+  });
+  fastify.addHook("onResponse", (request, reply, done) => {
+    if (!request.url.startsWith("/console")) {
+      logger.info(
+        { method: request.method, url: request.url, statusCode: reply.statusCode, responseTime: reply.elapsedTime },
+        `${request.method} ${request.url} ${reply.statusCode}`
+      );
+    }
+    done();
+  });
+  fastify.addHook("onError", (_request, _reply, error, done) => {
+    logger.error(error);
+    done();
+  });
   fastify.addHook("onReady", () => {
     setWebSocketManager(fastify.websockets);
     setInvokeManager(fastify.invokes);
@@ -1970,7 +1934,8 @@ var localCloudProvider = {
   createEventBrokerService: createLocalEventBrokerService,
   createFunctionsService: createLocalFunctionsService,
   createWebSocketService: createLocalWebSocketService,
-  createInvokeService: createLocalInvokeService
+  createInvokeService: createLocalInvokeService,
+  createLoggerService: createLocalLoggerService
 };
 export {
   createRouter,