@miketako3/cloki 0.1.20 → 0.1.22

package/README.md

@@ -75,23 +75,119 @@ You can pass a string directly as a message. It will be converted to `{"message"
 await logger.info("Hello World!");
 ```
 
-#### 3. Cloudflare Workers `ctx.waitUntil`
+#### 3. Cloudflare Workers `ctx.waitUntil` and `cf` properties
 
-To prevent the log sending from being cancelled when the worker returns a response, you can pass the `ExecutionContext`.
+To prevent the log sending from being cancelled when the worker returns a response, you can pass the `ExecutionContext` to `getLokiLogger` or to each log method. You can also automatically add labels from `request.cf`.
 
 ```typescript
 export default {
   async fetch(request, env, ctx) {
-    const logger = getLokiLogger({ ... });
+    const logger = getLokiLogger({ 
+      cf: request.cf, // Automatically add cf_colo, cf_country, etc.
+      ctx: ctx // Use ctx.waitUntil internally for all logs
+    });
     
     // This will use ctx.waitUntil internally and won't block the response
-    logger.info("Request received", { path: new URL(request.url).pathname }, ctx);
+    logger.info("Request received", { path: new URL(request.url).pathname });
     
     return new Response("OK");
   }
 }
 ```
 
+#### 4. Zero Configuration (Environment Variables)
+
+If you set the following environment variables, you can initialize the logger without any arguments:
+
+- `LOKI_HOST` (e.g., `logs-prod-us-central1.grafana.net`)
+- `LOKI_USER`
+- `LOKI_TOKEN`
+
+Standard usage for Cloudflare Workers:
+
+```typescript
+export default {
+  async fetch(request, env, ctx) {
+    const logger = getLokiLogger({ cf: request.cf, ctx });
+    // ...
+  }
+}
+```
+
+#### 5. Retries and Error Handling
+
+You can configure retries and a callback for when sending fails.
+
+```typescript
+const logger = getLokiLogger({
+  retries: 3,
+  onSendError: (err, msg) => {
+    console.error("Failed to send to Loki after retries", err);
+  }
+});
+```
+
+#### 6. Custom Formatter and Silent Mode
+
+```typescript
+const logger = getLokiLogger({
+  silent: process.env.NODE_ENV === 'development',
+  format: (level, msg, labels) => {
+    // Return custom LokiMessage structure
+    return {
+      streams: [{
+        stream: { ...labels, level, custom: 'label' },
+        values: [[Date.now().toString() + "000000", JSON.stringify(msg)]]
+      }]
+    };
+  }
+});
+```
+
+#### 7. Request Auto Extraction and Trace IDs
+
+You can automatically extract labels like `http_method`, `http_url`, `trace_id` (from `CF-Ray`), and `request_id` (from `X-Request-ID`) by passing the `Request` object.
+
+```typescript
+const logger = getLokiLogger({ 
+  request: request // Default request for all logs
+});
+
+// Or pass it in a specific log
+await logger.info({ message: "API called", request: request });
+```
+
+#### 8. Function Wrapper (AOP Style)
+
+You can measure execution time and log it automatically using the `wrap` method.
+
+```typescript
+const wrappedFetch = logger.wrap("external-api", async (url) => {
+  return await fetch(url);
+});
+
+const response = await wrappedFetch("https://example.com");
+// This will automatically log: Function external-api executed with duration_ms
+```
+
+#### 9. Development Environment (Pretty Print)
+
+When `NODE_ENV` or `WORKER_ENV` is set to `development` (or `dev`), or `silent: true` is set, `cloki` will output colorized and formatted logs to the console for better readability.
+
+#### 10. TypeScript Type Safety for Labels
+
+You can define the allowed label keys using Generics.
+
+```typescript
+type MyLabels = 'env' | 'service' | 'version';
+const logger = getLokiLogger<MyLabels>({
+  defaultLabels: { env: 'prod' } // Type checked
+});
+
+await logger.info("Hello", { service: 'api' }); // Type checked
+// await logger.info("Hello", { unknown: 'label' }); // TypeScript Error
+```
+
 ## Contributing
 
 Contributions are what make the open-source community such an amazing place to learn, inspire, and create. Any contributions you make are greatly appreciated.

package/dist/logger.d.ts

@@ -1,18 +1,46 @@
 /**
  * Loki config
  */
-export type LokiConfig = {
-    lokiHost: string;
-    lokiToken: string;
-    lokiUser: string;
+export type LokiConfig<T extends string = string> = {
+    lokiHost?: string;
+    lokiToken?: string;
+    lokiUser?: string;
     /**
      * Default labels added to all logs
      */
-    defaultLabels?: LokiLabels;
+    defaultLabels?: LokiLabels<T>;
     /**
      * Minimum log level to send to Loki
      */
     minLevel?: LogLevel;
+    /**
+     * Number of retries for fetch (default: 0)
+     */
+    retries?: number;
+    /**
+     * Callback when fetch fails
+     */
+    onSendError?: (error: unknown, message: LokiMessage<T>) => void;
+    /**
+     * Custom formatter for Loki message
+     */
+    format?: (logLevel: LogLevel, message: object, labels: LokiLabels<T>) => LokiMessage<T>;
+    /**
+     * If true, don't send to Loki (just console.log)
+     */
+    silent?: boolean;
+    /**
+     * Automatically add labels from request.cf
+     */
+    cf?: CfProperties;
+    /**
+     * Default ExecutionContext for ctx.waitUntil
+     */
+    ctx?: ExecutionContext;
+    /**
+     * Default Request object for automatic label extraction
+     */
+    request?: Request;
 };
 /**
  * Log levels
@@ -21,20 +49,32 @@ export type LogLevel = "debug" | "info" | "warn" | "error";
 /**
  * Loki labels
  */
-export type LokiLabels = {
+export type LokiLabels<T extends string = string> = {
+    [key in T]?: string;
+} & {
     [key: string]: string;
 };
 /**
  * Loki message
  */
-export type LokiMessage = {
+export type LokiMessage<T extends string = string> = {
     streams: [
         {
-            stream: LokiLabels;
+            stream: LokiLabels<T>;
             values: [string[]];
         }
     ];
 };
+/**
+ * Cloudflare Workers IncomingRequestCfProperties
+ */
+export type CfProperties = {
+    colo?: string;
+    country?: string;
+    city?: string;
+    asn?: number;
+    [key: string]: unknown;
+};
 /**
  * Cloudflare Workers ExecutionContext
  */
@@ -44,16 +84,20 @@ export type ExecutionContext = {
 /**
  * Log message type
  */
-export type LogMessage = string | object;
+export type LogMessage = string | object | {
+    request?: Request;
+    [key: string]: unknown;
+};
 /**
  * Create a Loki logger
  * logger has some async logging methods like info, error, warn, etc.
  *
  * @param config
  */
-export declare const getLokiLogger: (config: LokiConfig) => {
-    info: (message: LogMessage, labels?: LokiLabels, ctx?: ExecutionContext) => Promise<void>;
-    warn: (message: LogMessage, labels?: LokiLabels, ctx?: ExecutionContext) => Promise<void>;
-    error: (message: LogMessage, labels?: LokiLabels, ctx?: ExecutionContext) => Promise<void>;
-    debug: (message: LogMessage, labels?: LokiLabels, ctx?: ExecutionContext) => Promise<void>;
+export declare const getLokiLogger: <T extends string = string>(config?: LokiConfig<T>) => {
+    info: (message: LogMessage, labels?: LokiLabels<T> | undefined, ctx?: ExecutionContext) => Promise<void>;
+    warn: (message: LogMessage, labels?: LokiLabels<T> | undefined, ctx?: ExecutionContext) => Promise<void>;
+    error: (message: LogMessage, labels?: LokiLabels<T> | undefined, ctx?: ExecutionContext) => Promise<void>;
+    debug: (message: LogMessage, labels?: LokiLabels<T> | undefined, ctx?: ExecutionContext) => Promise<void>;
+    wrap: <R, Args extends unknown[]>(name: string, fn: (...args: Args) => R | Promise<R>) => (...args: Args) => Promise<R>;
 };

package/dist/logger.js

@@ -22,15 +22,62 @@ const LOG_LEVEL_PRIORITY = {
  *
  * @param config
  */
-const getLokiLogger = (config) => {
+const getLokiLogger = (config = {}) => {
+    var _a;
+    const mergedConfig = Object.assign(Object.assign({}, config), { lokiHost: config.lokiHost ||
+            getEnv("LOKI_HOST") ||
+            ((_a = getEnv("LOKI_URL")) === null || _a === void 0 ? void 0 : _a.replace(/^https?:\/\//, "")), lokiToken: config.lokiToken || getEnv("LOKI_TOKEN"), lokiUser: config.lokiUser || getEnv("LOKI_USER") });
     return {
-        info: lokiInfo(config),
-        warn: lokiWarn(config),
-        error: lokiError(config),
-        debug: lokiDebug(config),
+        info: lokiInfo(mergedConfig),
+        warn: lokiWarn(mergedConfig),
+        error: lokiError(mergedConfig),
+        debug: lokiDebug(mergedConfig),
+        wrap: (name, fn) => {
+            return (...args) => __awaiter(void 0, void 0, void 0, function* () {
+                const start = Date.now();
+                try {
+                    const result = yield fn(...args);
+                    const duration = Date.now() - start;
+                    yield log(mergedConfig, "info", {
+                        message: `Function ${name} executed`,
+                        duration_ms: duration,
+                        function_name: name,
+                    }, {});
+                    return result;
+                }
+                catch (error) {
+                    const duration = Date.now() - start;
+                    yield log(mergedConfig, "error", {
+                        message: `Function ${name} failed`,
+                        duration_ms: duration,
+                        function_name: name,
+                        error: error instanceof Error ? error.message : String(error),
+                    }, {});
+                    throw error;
+                }
+            });
+        },
     };
 };
 exports.getLokiLogger = getLokiLogger;
+/**
+ * Get environment variable from various sources
+ */
+function getEnv(name) {
+    try {
+        // Node.js
+        if (typeof process !== "undefined" && process.env) {
+            return process.env[name];
+        }
+        // Global
+        if (typeof globalThis !== "undefined") {
+            const global = globalThis;
+            return global[name];
+        }
+    }
+    catch (_e) { }
+    return undefined;
+}
 /**
  * Log info to Loki curried
  *
@@ -79,11 +126,30 @@ function log(config, logLevel, message, labels, ctx) {
             return;
         }
         const normalizedMessage = typeof message === "string" ? { message } : message;
-        console.log(JSON.stringify(normalizedMessage));
-        const lokiMessage = generateLokiMessage(config, logLevel, normalizedMessage, labels);
-        const promise = sendToLoki(config, lokiMessage);
-        if (ctx) {
-            ctx.waitUntil(promise);
+        const isDev = getEnv("NODE_ENV") === "development" || getEnv("WORKER_ENV") === "dev";
+        if (config.silent || isDev) {
+            const colorMap = {
+                debug: "\x1b[34m", // blue
+                info: "\x1b[32m", // green
+                warn: "\x1b[33m", // yellow
+                error: "\x1b[31m", // red
+            };
+            const reset = "\x1b[0m";
+            console.log(`${colorMap[logLevel]}[${logLevel.toUpperCase()}]${reset}`, JSON.stringify(normalizedMessage, null, isDev ? 2 : 0));
+        }
+        else {
+            console.log(JSON.stringify(normalizedMessage));
+        }
+        if (config.silent) {
+            return;
+        }
+        const lokiMessage = config.format
+            ? config.format(logLevel, normalizedMessage, labels)
+            : generateLokiMessage(config, logLevel, normalizedMessage, labels);
+        const promise = sendWithRetry(config, lokiMessage);
+        const effectiveCtx = ctx || config.ctx;
+        if (effectiveCtx) {
+            effectiveCtx.waitUntil(promise);
         }
         else {
             yield promise;
@@ -99,15 +165,69 @@ function log(config, logLevel, message, labels, ctx) {
  * @param labels
  */
 function generateLokiMessage(config, logLevel, message, labels) {
+    const cfLabels = {};
+    if (config.cf) {
+        if (config.cf.colo)
+            cfLabels.cf_colo = config.cf.colo;
+        if (config.cf.country)
+            cfLabels.cf_country = config.cf.country;
+        if (config.cf.city)
+            cfLabels.cf_city = config.cf.city;
+        if (config.cf.asn)
+            cfLabels.cf_asn = config.cf.asn.toString();
+    }
+    const requestLabels = {};
+    const req = message.request || config.request;
+    if (req) {
+        requestLabels.http_method = req.method;
+        requestLabels.http_url = req.url;
+        const userAgent = req.headers.get("user-agent");
+        if (userAgent)
+            requestLabels.http_user_agent = userAgent;
+        const rayId = req.headers.get("cf-ray");
+        if (rayId)
+            requestLabels.trace_id = rayId;
+        const requestId = req.headers.get("x-request-id");
+        if (requestId)
+            requestLabels.request_id = requestId;
+    }
     return {
         streams: [
             {
-                stream: Object.assign(Object.assign({ level: logLevel }, config.defaultLabels), labels),
+                stream: Object.assign(Object.assign(Object.assign(Object.assign({ level: logLevel }, config.defaultLabels), cfLabels), requestLabels), labels),
                 values: [[`${Date.now().toString()}000000`, JSON.stringify(message)]],
             },
         ],
     };
 }
+/**
+ * Send with retry
+ */
+function sendWithRetry(config, lokiMessage) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const retries = config.retries || 0;
+        let lastError;
+        for (let i = 0; i <= retries; i++) {
+            try {
+                yield sendToLoki(config, lokiMessage);
+                return; // Success
+            }
+            catch (e) {
+                lastError = e;
+                if (i < retries) {
+                    // Simple backoff: 100ms, 200ms, 400ms...
+                    yield new Promise((resolve) => setTimeout(resolve, 100 * 2 ** i));
+                }
+            }
+        }
+        if (config.onSendError) {
+            config.onSendError(lastError, lokiMessage);
+        }
+        else {
+            console.error("Loki logging failed after retries:", lastError);
+        }
+    });
+}
 /**
  * Send a message to Loki
  *
@@ -116,22 +236,20 @@ function generateLokiMessage(config, logLevel, message, labels) {
  */
 function sendToLoki(config, lokiMessage) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield fetch(`https://${config.lokiHost}/loki/api/v1/push`, {
+        if (!config.lokiHost || !config.lokiUser || !config.lokiToken) {
+            throw new Error("Loki configuration missing (host, user, or token)");
+        }
+        const response = yield fetch(`https://${config.lokiHost}/loki/api/v1/push`, {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
                 Authorization: `Basic ${btoa(`${config.lokiUser}:${config.lokiToken}`)}`,
             },
             body: JSON.stringify(lokiMessage),
-        })
-            .then((r) => {
-            if (!r.ok) {
-                throw new Error(r.statusText);
-            }
-        })
-            .catch((e) => {
-            console.error("Error:", e);
         });
+        if (!response.ok) {
+            throw new Error(`Loki push failed: ${response.status} ${response.statusText}`);
+        }
     });
 }
 //# sourceMappingURL=logger.js.map

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsDA,MAAM,kBAAkB,GAA6B;IACpD,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACR,CAAC;AAiDF;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAC5B,SAAwB,EAAE,EA0BzB,EAAE;;IACH,MAAM,YAAY,mCACd,MAAM,KACT,QAAQ,EACP,MAAM,CAAC,QAAQ;YACf,MAAM,CAAC,WAAW,CAAC;aACnB,MAAA,MAAM,CAAC,UAAU,CAAC,0CAAE,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA,EAChD,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,YAAY,CAAC,EACnD,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,WAAW,CAAC,GAChD,CAAC;IAEF,OAAO;QACN,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC;QAC5B,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC;QAC5B,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;QAC9B,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;QAC9B,IAAI,EAAE,CACL,IAAY,EACZ,EAAqC,EACpC,EAAE;YACH,OAAO,CAAO,GAAG,IAAU,EAAE,EAAE;gBAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACzB,IAAI,CAAC;oBACJ,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;oBACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;oBACpC,MAAM,GAAG,CACR,YAAY,EACZ,MAAM,EACN;wBACC,OAAO,EAAE,YAAY,IAAI,WAAW;wBACpC,WAAW,EAAE,QAAQ;wBACrB,aAAa,EAAE,IAAI;qBACnB,EACD,EAAmB,CACnB,CAAC;oBACF,OAAO,MAAM,CAAC;gBACf,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;oBACpC,MAAM,GAAG,CACR,YAAY,EACZ,OAAO,EACP;wBACC,OAAO,EAAE,YAAY,IAAI,SAAS;wBAClC,WAAW,EAAE,QAAQ;wBACrB,aAAa,EAAE,IAAI;wBACnB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAC7D,EACD,EAAmB,CACnB,CAAC;oBACF,MAAM,KAAK,CAAC;gBACb,CAAC;YACF,CAAC,CAAA,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAjFW,QAAA,aAAa,iBAiFxB;AAEF;;GAEG;AACH,SAAS,MAAM,CAAC,IAAY;IAC3B,IAAI,CAAC;QACJ,UAAU;QACV,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACnD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,SAAS;QACT,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,UAGd,CAAC;YACF,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACF,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC,CAAA,CAAC;IACf,OAAO,SAAS,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,QAAQ,GACb,CAAmB,MAAqB,EAAE,EAAE,CAC5C,CACC,OAAmB,EACnB,SAAwB,EAAmB,EAC3C,GAAsB,EACrB,EAAE;IACH,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AACjD,CAAC,CAAA,CAAC;AAEH;;;;GAIG;AACH,MAAM,QAAQ,GACb,CAAmB,MAAqB,EAAE,EAAE,CAC5C,CACC,OAAmB,EACnB,SAAwB,EAAmB,EAC3C,GAAsB,EACrB,EAAE;IACH,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AACjD,CAAC,CAAA,CAAC;AAEH;;;;GAIG;AACH,MAAM,SAAS,GACd,CAAmB,MAAqB,EAAE,EAAE,CAC5C,CACC,OAAmB,EACnB,SAAwB,EAAmB,EAC3C,GAAsB,EACrB,EAAE;IACH,MAAM,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AAClD,CAAC,CAAA,CAAC;AAEH;;;;GAIG;AACH,MAAM,SAAS,GACd,CAAmB,MAAqB,EAAE,EAAE,CAC5C,CACC,OAAmB,EACnB,SAAwB,EAAmB,EAC3C,GAAsB,EACrB,EAAE;IACH,MAAM,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AAClD,CAAC,CAAA,CAAC;AAEH;;;;;;;;GAQG;AACH,SAAe,GAAG,CACjB,MAAqB,EACrB,QAAkB,EAClB,OAAmB,EACnB,MAAqB,EACrB,GAAsB;;QAEtB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC;QAC5C,IAAI,kBAAkB,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,OAAO;QACR,CAAC;QAED,MAAM,iBAAiB,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAE9E,MAAM,KAAK,GACV,MAAM,CAAC,UAAU,CAAC,KAAK,aAAa,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,KAAK,CAAC;QAExE,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAA6B;gBAC1C,KAAK,EAAE,UAAU,EAAE,OAAO;gBAC1B,IAAI,EAAE,UAAU,EAAE,QAAQ;gBAC1B,IAAI,EAAE,UAAU,EAAE,SAAS;gBAC3B,KAAK,EAAE,UAAU,EAAE,MAAM;aACzB,CAAC;YACF,MAAM,KAAK,GAAG,SAAS,CAAC;YACxB,OAAO,CAAC,GAAG,CACV,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,IAAI,KAAK,EAAE,EAC1D,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QACH,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM;YAChC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC;YACpD,CAAC,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAEpE,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;QACvC,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,CAAC;QACf,CAAC;IACF,CAAC;CAAA;AAED;;;;;;;GAOG;AACH,SAAS,mBAAmB,CAC3B,MAAqB,EACrB,QAAgB,EAChB,OAAe,EACf,MAAqB;IAErB,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI;YAAE,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;QACtD,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO;YAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC;QAC/D,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI;YAAE,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC;QACtD,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG;YAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC/D,CAAC;IAED,MAAM,aAAa,GAA2B,EAAE,CAAC;IACjD,MAAM,GAAG,GAAI,OAAiC,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC;IACzE,IAAI,GAAG,EAAE,CAAC;QACT,aAAa,CAAC,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;QACvC,aAAa,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC;QACjC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,SAAS;YAAE,aAAa,CAAC,eAAe,GAAG,SAAS,CAAC;QAEzD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,KAAK;YAAE,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;QAE1C,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAClD,IAAI,SAAS;YAAE,aAAa,CAAC,UAAU,GAAG,SAAS,CAAC;IACrD,CAAC;IAED,OAAO;QACN,OAAO,EAAE;YACR;gBACC,MAAM,EAAE,0DACP,KAAK,EAAE,QAAQ,IACZ,MAAM,CAAC,aAAa,GACpB,QAAQ,GACR,aAAa,GACb,MAAM,CACQ;gBAClB,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;aACrE;SACD;KACD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAe,aAAa,CAC3B,MAAqB,EACrB,WAA2B;;QAE3B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;QACpC,IAAI,SAAkB,CAAC;QAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,IAAI,CAAC;gBACJ,MAAM,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;gBACtC,OAAO,CAAC,UAAU;YACnB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,SAAS,GAAG,CAAC,CAAC;gBACd,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC;oBACjB,yCAAyC;oBACzC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACnE,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACxB,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,SAAS,CAAC,CAAC;QAChE,CAAC;IACF,CAAC;CAAA;AAED;;;;;GAKG;AACH,SAAe,UAAU,CACxB,MAAqB,EACrB,WAA2B;;QAE3B,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,MAAM,CAAC,QAAQ,mBAAmB,EAAE;YAC3E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACR,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,SAAS,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE;aACxE;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACd,qBAAqB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC7D,CAAC;QACH,CAAC;IACF,CAAC;CAAA"}

package/dist/logger.test.js

@@ -14,7 +14,6 @@ const logger_1 = require("./logger"); // Adjust the import path as necessary
 global.fetch = vitest_1.vi.fn(() => Promise.resolve({
     ok: true,
 }));
-Date.now = vitest_1.vi.fn(() => 1482363367071);
 (0, vitest_1.describe)("Loki Logger", () => {
     const mockConfig = {
         lokiHost: "testhost",
@@ -23,6 +22,7 @@ Date.now = vitest_1.vi.fn(() => 1482363367071);
     };
     (0, vitest_1.beforeEach)(() => {
         vitest_1.vi.clearAllMocks();
+        vitest_1.vi.restoreAllMocks();
     });
     (0, vitest_1.it)("should create a logger with the correct methods", () => {
         const logger = (0, logger_1.getLokiLogger)(mockConfig);
@@ -32,15 +32,13 @@ Date.now = vitest_1.vi.fn(() => 1482363367071);
         (0, vitest_1.expect)(logger).toHaveProperty("debug");
     });
     (0, vitest_1.describe)("Logging Methods", () => {
-        vitest_1.it.each([
-            "info",
-            "warn",
-            "error",
-            "debug",
-        ])("should call log for %s method", (method) => __awaiter(void 0, void 0, void 0, function* () {
+        const methods = ["info", "warn", "error", "debug"];
+        vitest_1.it.each(methods)("should call log for %s method", (method) => __awaiter(void 0, void 0, void 0, function* () {
+            const consoleErrorSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
             const logger = (0, logger_1.getLokiLogger)(mockConfig);
             const mockMessage = { test: "message" };
             const consoleSpy = vitest_1.vi.spyOn(console, "log").mockImplementation(() => { });
+            const dateNowSpy = vitest_1.vi.spyOn(Date, "now").mockReturnValue(1482363367071);
             yield logger[method](mockMessage);
             (0, vitest_1.expect)(consoleSpy).toHaveBeenCalledWith(JSON.stringify(mockMessage));
             (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(1);
@@ -54,17 +52,16 @@ Date.now = vitest_1.vi.fn(() => 1482363367071);
             });
             // Reset the spy
             consoleSpy.mockRestore();
+            dateNowSpy.mockRestore();
+            consoleErrorSpy.mockRestore();
         }));
-        vitest_1.it.each([
-            "info",
-            "warn",
-            "error",
-            "debug",
-        ])("should call log for %s method with some labels", (method) => __awaiter(void 0, void 0, void 0, function* () {
+        vitest_1.it.each(methods)("should call log for %s method with some labels", (method) => __awaiter(void 0, void 0, void 0, function* () {
+            const consoleErrorSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
             const logger = (0, logger_1.getLokiLogger)(mockConfig);
             const mockMessage = { test: "message" };
             const mockLabels = { hoge: "huga" };
             const consoleSpy = vitest_1.vi.spyOn(console, "log").mockImplementation(() => { });
+            const dateNowSpy = vitest_1.vi.spyOn(Date, "now").mockReturnValue(1482363367071);
             yield logger[method](mockMessage, mockLabels);
             (0, vitest_1.expect)(consoleSpy).toHaveBeenCalledWith(JSON.stringify(mockMessage));
             (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(1);
@@ -76,62 +73,235 @@ Date.now = vitest_1.vi.fn(() => 1482363367071);
                 },
                 body: `{"streams":[{"stream":{"level":"${method}","hoge":"huga"},"values":[["1482363367071000000","{\\"test\\":\\"message\\"}"]]}]}`,
             });
-            // Reset the spy
             consoleSpy.mockRestore();
+            dateNowSpy.mockRestore();
+            consoleErrorSpy.mockRestore();
         }));
     });
-    (0, vitest_1.describe)("New Features", () => {
-        (0, vitest_1.it)("should support string messages", () => __awaiter(void 0, void 0, void 0, function* () {
-            const logger = (0, logger_1.getLokiLogger)(mockConfig);
-            const message = "string message";
-            const consoleSpy = vitest_1.vi.spyOn(console, "log").mockImplementation(() => { });
-            yield logger.info(message);
-            (0, vitest_1.expect)(consoleSpy).toHaveBeenCalledWith(JSON.stringify({ message }));
-            (0, vitest_1.expect)(fetch).toHaveBeenCalledWith(vitest_1.expect.any(String), vitest_1.expect.objectContaining({
-                body: vitest_1.expect.stringContaining(JSON.stringify({ message }).replace(/"/g, '\\"')),
-            }));
+});
+(0, vitest_1.describe)("Advanced Features", () => {
+    const mockConfig = {
+        lokiHost: "testhost",
+        lokiToken: "token123",
+        lokiUser: "user",
+    };
+    (0, vitest_1.beforeEach)(() => {
+        vitest_1.vi.clearAllMocks();
+    });
+    (0, vitest_1.it)("should support zero config from env", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        // Mock environment variables
+        process.env.LOKI_HOST = "env-host";
+        process.env.LOKI_TOKEN = "env-token";
+        process.env.LOKI_USER = "env-user";
+        const logger = (0, logger_1.getLokiLogger)();
+        yield logger.info({ msg: "test" });
+        (0, vitest_1.expect)(fetch).toHaveBeenCalledWith(vitest_1.expect.stringContaining("env-host"), vitest_1.expect.objectContaining({
+            headers: vitest_1.expect.objectContaining({
+                Authorization: `Basic ${btoa("env-user:env-token")}`,
+            }),
+        }));
+        // Cleanup
+        delete process.env.LOKI_HOST;
+        delete process.env.LOKI_TOKEN;
+        delete process.env.LOKI_USER;
+        consoleSpy.mockRestore();
+    }));
+    (0, vitest_1.it)("should not send when silent: true", () => __awaiter(void 0, void 0, void 0, function* () {
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { silent: true }));
+        yield logger.info({ msg: "test" });
+        (0, vitest_1.expect)(fetch).not.toHaveBeenCalled();
+    }));
+    (0, vitest_1.it)("should retry on failure", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        let callCount = 0;
+        global.fetch = vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
+            callCount++;
+            if (callCount < 3) {
+                return { ok: false, status: 500, statusText: "Error" };
+            }
+            return { ok: true };
+        }));
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { retries: 3 }));
+        yield logger.info({ msg: "test" });
+        (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(3);
+        consoleSpy.mockRestore();
+    }));
+    (0, vitest_1.it)("should call onSendError after retries fail", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        global.fetch = vitest_1.vi.fn(() => __awaiter(void 0, void 0, void 0, function* () {
+            return ({
+                ok: false,
+                status: 500,
+                statusText: "Fatal",
+            });
+        }));
+        const onSendError = vitest_1.vi.fn();
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { retries: 1, onSendError }));
+        yield logger.info({ msg: "test" });
+        (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(2);
+        (0, vitest_1.expect)(onSendError).toHaveBeenCalled();
+        consoleSpy.mockRestore();
+    }));
+    (0, vitest_1.it)("should support custom format", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        const format = vitest_1.vi.fn((_level, _msg, _labels) => ({
+            streams: [
+                {
+                    stream: { custom: "label" },
+                    values: [["123456", "custom-body"]],
+                },
+            ],
+        }));
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { format: format }));
+        yield logger.info({ msg: "test" });
+        const fetchMock = fetch;
+        const _body = JSON.parse(fetchMock.mock.calls[0][1].body);
+        (0, vitest_1.expect)(format).toHaveBeenCalled();
+        (0, vitest_1.expect)(fetch).toHaveBeenCalledWith(vitest_1.expect.any(String), vitest_1.expect.objectContaining({
+            body: vitest_1.expect.stringContaining("custom-body"),
+        }));
+        consoleSpy.mockRestore();
+    }));
+    (0, vitest_1.it)("should add labels from cf properties", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        const cf = {
+            colo: "KIX",
+            country: "JP",
+            city: "Osaka",
+            asn: 12345,
+        };
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { cf }));
+        yield logger.info({ msg: "test" });
+        const fetchMock = fetch;
+        const body = JSON.parse(fetchMock.mock.calls[0][1].body);
+        const stream = body.streams[0].stream;
+        (0, vitest_1.expect)(stream.cf_colo).toBe("KIX");
+        (0, vitest_1.expect)(stream.cf_country).toBe("JP");
+        (0, vitest_1.expect)(stream.cf_city).toBe("Osaka");
+        (0, vitest_1.expect)(stream.cf_asn).toBe("12345");
+        consoleSpy.mockRestore();
+    }));
+    (0, vitest_1.describe)("Request Auto Extraction", () => {
+        const mockRequest = {
+            method: "GET",
+            url: "https://example.com/api",
+            headers: new Map([
+                ["user-agent", "test-agent"],
+                ["cf-ray", "ray-123"],
+                ["x-request-id", "req-456"],
+            ]),
+        };
+        (0, vitest_1.it)("should extract labels from request in config", () => __awaiter(void 0, void 0, void 0, function* () {
+            const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+            const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { request: mockRequest }));
+            yield logger.info({ msg: "test" });
+            const fetchMock = fetch;
+            const body = JSON.parse(fetchMock.mock.calls[0][1].body);
+            const stream = body.streams[0].stream;
+            (0, vitest_1.expect)(stream.http_method).toBe("GET");
+            (0, vitest_1.expect)(stream.http_url).toBe("https://example.com/api");
+            (0, vitest_1.expect)(stream.http_user_agent).toBe("test-agent");
+            (0, vitest_1.expect)(stream.trace_id).toBe("ray-123");
+            (0, vitest_1.expect)(stream.request_id).toBe("req-456");
             consoleSpy.mockRestore();
         }));
-        (0, vitest_1.it)("should apply default labels", () => __awaiter(void 0, void 0, void 0, function* () {
-            const configWithLabels = Object.assign(Object.assign({}, mockConfig), { defaultLabels: { env: "prod", app: "test" } });
-            const logger = (0, logger_1.getLokiLogger)(configWithLabels);
-            const mockMessage = { test: "message" };
-            const consoleSpy = vitest_1.vi.spyOn(console, "log").mockImplementation(() => { });
-            yield logger.info(mockMessage);
-            (0, vitest_1.expect)(fetch).toHaveBeenCalledWith(vitest_1.expect.any(String), vitest_1.expect.objectContaining({
-                body: vitest_1.expect.stringContaining('"env":"prod"'),
-            }));
-            (0, vitest_1.expect)(fetch).toHaveBeenCalledWith(vitest_1.expect.any(String), vitest_1.expect.objectContaining({
-                body: vitest_1.expect.stringContaining('"app":"test"'),
-            }));
+        (0, vitest_1.it)("should extract labels from request in message", () => __awaiter(void 0, void 0, void 0, function* () {
+            const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+            const logger = (0, logger_1.getLokiLogger)(mockConfig);
+            yield logger.info({ msg: "test", request: mockRequest });
+            const fetchMock = fetch;
+            const body = JSON.parse(fetchMock.mock.calls[0][1].body);
+            const stream = body.streams[0].stream;
+            (0, vitest_1.expect)(stream.http_method).toBe("GET");
+            (0, vitest_1.expect)(stream.trace_id).toBe("ray-123");
             consoleSpy.mockRestore();
         }));
-        (0, vitest_1.it)("should respect minLevel", () => __awaiter(void 0, void 0, void 0, function* () {
-            const configWithMinLevel = Object.assign(Object.assign({}, mockConfig), { minLevel: "warn" });
-            const logger = (0, logger_1.getLokiLogger)(configWithMinLevel);
-            const consoleSpy = vitest_1.vi.spyOn(console, "log").mockImplementation(() => { });
-            yield logger.debug({ msg: "debug" });
-            yield logger.info({ msg: "info" });
-            (0, vitest_1.expect)(fetch).not.toHaveBeenCalled();
-            yield logger.warn({ msg: "warn" });
+    });
+    (0, vitest_1.describe)("Wrapper (AOP)", () => {
+        (0, vitest_1.it)("should measure execution time and log it", () => __awaiter(void 0, void 0, void 0, function* () {
+            const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+            const logger = (0, logger_1.getLokiLogger)(mockConfig);
+            // Simulate passage of time by returning different values for Date.now
+            const dateNowSpy = vitest_1.vi.spyOn(Date, "now");
+            dateNowSpy
+                .mockReturnValueOnce(1000) // start
+                .mockReturnValueOnce(1010) // end
+                .mockReturnValue(1010); // for generateLokiMessage
+            const fn = (a, b) => __awaiter(void 0, void 0, void 0, function* () {
+                return a + b;
+            });
+            const wrapped = logger.wrap("testFn", fn);
+            const result = yield wrapped(1, 2);
+            (0, vitest_1.expect)(result).toBe(3);
             (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(1);
-            yield logger.error({ msg: "error" });
-            (0, vitest_1.expect)(fetch).toHaveBeenCalledTimes(2);
+            const fetchMock = fetch;
+            const body = JSON.parse(fetchMock.mock.calls[0][1].body);
+            const message = JSON.parse(body.streams[0].values[0][1]);
+            (0, vitest_1.expect)(message.function_name).toBe("testFn");
+            (0, vitest_1.expect)(message.duration_ms).toBe(10);
+            dateNowSpy.mockRestore();
             consoleSpy.mockRestore();
         }));
-        (0, vitest_1.it)("should use ctx.waitUntil when provided", () => __awaiter(void 0, void 0, void 0, function* () {
+        (0, vitest_1.it)("should log error on failure", () => __awaiter(void 0, void 0, void 0, function* () {
+            const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
             const logger = (0, logger_1.getLokiLogger)(mockConfig);
-            const mockCtx = {
-                waitUntil: vitest_1.vi.fn(),
-            };
+            const fn = () => __awaiter(void 0, void 0, void 0, function* () {
+                throw new Error("fail");
+            });
+            const wrapped = logger.wrap("failFn", fn);
+            yield (0, vitest_1.expect)(wrapped()).rejects.toThrow("fail");
+            const fetchMock = fetch;
+            const body = JSON.parse(fetchMock.mock.calls[0][1].body);
+            const stream = body.streams[0].stream;
+            (0, vitest_1.expect)(stream.level).toBe("error");
+            const message = JSON.parse(body.streams[0].values[0][1]);
+            (0, vitest_1.expect)(message.function_name).toBe("failFn");
+            (0, vitest_1.expect)(message.error).toBe("fail");
+            consoleSpy.mockRestore();
+        }));
+    });
+    (0, vitest_1.describe)("Dev environment", () => {
+        (0, vitest_1.it)("should use pretty print in dev", () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.NODE_ENV = "development";
             const consoleSpy = vitest_1.vi.spyOn(console, "log").mockImplementation(() => { });
-            yield logger.info({ msg: "test" }, {}, mockCtx);
-            (0, vitest_1.expect)(mockCtx.waitUntil).toHaveBeenCalled();
-            // In case of waitUntil, the logger shouldn't await the fetch promise internally
-            // but we can't easily check that without complex mocking.
-            // At least we verify waitUntil was called.
+            const logger = (0, logger_1.getLokiLogger)(mockConfig);
+            yield logger.info({ msg: "test" });
+            (0, vitest_1.expect)(consoleSpy).toHaveBeenCalledWith(vitest_1.expect.stringContaining("[INFO]"), vitest_1.expect.stringContaining('{\n  "msg": "test"\n}'));
+            delete process.env.NODE_ENV;
             consoleSpy.mockRestore();
         }));
     });
 });
+(0, vitest_1.describe)("Cloudflare Workers context", () => {
+    const mockConfig = {
+        lokiHost: "testhost",
+        lokiToken: "token123",
+        lokiUser: "user",
+    };
+    (0, vitest_1.it)("should use ctx from getLokiLogger", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        const ctx = {
+            waitUntil: vitest_1.vi.fn(),
+        };
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { ctx }));
+        yield logger.info("test");
+        (0, vitest_1.expect)(ctx.waitUntil).toHaveBeenCalled();
+        consoleSpy.mockRestore();
+    }));
+    (0, vitest_1.it)("should use ctx from method call even if getLokiLogger has one", () => __awaiter(void 0, void 0, void 0, function* () {
+        const consoleSpy = vitest_1.vi.spyOn(console, "error").mockImplementation(() => { });
+        const ctx1 = {
+            waitUntil: vitest_1.vi.fn(),
+        };
+        const ctx2 = {
+            waitUntil: vitest_1.vi.fn(),
+        };
+        const logger = (0, logger_1.getLokiLogger)(Object.assign(Object.assign({}, mockConfig), { ctx: ctx1 }));
+        yield logger.info("test", {}, ctx2);
+        (0, vitest_1.expect)(ctx2.waitUntil).toHaveBeenCalled();
+        (0, vitest_1.expect)(ctx1.waitUntil).not.toHaveBeenCalled();
+        consoleSpy.mockRestore();
+    }));
+});
 //# sourceMappingURL=logger.test.js.map

package/dist/logger.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../src/logger.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../src/logger.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@miketako3/cloki",
-	"version": "0.1.20",
+	"version": "0.1.22",
 	"description": "cloki is zero dependency and simple logger library for Loki and Cloudflare Workers.",
 	"main": "dist/index.js",
 	"files": [
@@ -13,7 +13,8 @@
 		"build": "tsc",
 		"format": "bunx @biomejs/biome check . --write",
 		"lint": "bunx @biomejs/biome check .",
-		"test": "vitest run"
+		"test": "vitest run",
+		"typecheck": "tsc --noEmit"
 	},
 	"repository": {
 		"type": "git",