@rife/logger 0.0.6-beta.12 → 0.0.6-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.6-beta.12",
+  "version": "0.0.6-beta.13",
   "description": "",
   "type": "module",
   "types": "./src/index.ts",
@@ -14,12 +14,20 @@
       "types": "./src/pino/index.ts",
       "require": "./dist/cjs/pino/index.cjs",
       "import": "./dist/esm/pino/index.mjs"
+    },
+    "./worker": {
+      "types": "./src/worker/index.ts",
+      "require": "./dist/cjs/worker/index.cjs",
+      "import": "./dist/esm/worker/index.mjs"
     }
   },
   "typesVersions": {
     "*": {
       "pino": [
         "./src/pino"
+      ],
+      "worker": [
+        "./src/worker"
       ]
     }
   },
@@ -29,15 +37,15 @@
     "tsconfig.json"
   ],
   "dependencies": {
-    "pino": "^10.1.0",
+    "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
-    "pino-std-serializers": "^7.0.0",
-    "rotating-file-stream": "^3.2.7"
+    "pino-std-serializers": "^7.1.0",
+    "rotating-file-stream": "^3.2.9"
   },
   "devDependencies": {
     "thread-stream": "^4.0.0",
-    "@rife/cli": "0.0.6-beta.20",
-    "@rife/plugin-rstack": "0.0.1-beta.17"
+    "@rife/cli": "0.0.6-beta.22",
+    "@rife/plugin-rstack": "0.0.1-beta.20"
   },
   "scripts": {
     "dev": "rife dev",

package/src/pino/index.ts

@@ -3,15 +3,20 @@ import path from 'path';
 import pino from 'pino';
 
 import { genTraceId, getTraceId, runInTrace } from '../trace';
+export { pino };
 
 declare var __isNodeSingleFileBundle: any;
 declare var __isVite: any;
 
+/** @ts-ignore 当前是cloudflare worker */
+const isCFWorker = typeof WebSocketPair !== 'undefined';
+
 // https://github.com/pinojs/pino/blob/master/docs/api.md
 function getPinoConfig() {
     const targets: any = [];
 
     const rotate = `./rotate${path.extname(__filename)}`;
+
     targets.push({
         level: 'debug',
         target: rotate,
@@ -52,7 +57,7 @@ function getPinoConfig() {
         transport: { targets },
         mixin(data: any) {
             // {"level":30,"time":1726065716643,"pid":21968,"hostname":"Win-LH"}
-            // 基础字段不能重复 删除掉
+            // 基础字段不能重复
             const traceId = data?.traceId;
             delete data.traceId;
             delete data.level;
@@ -65,6 +70,26 @@ function getPinoConfig() {
             }
             return { traceId };
         },
+        // cloudfare worker 需要自己实现输出
+        browser: {
+            write: (o: any) => {
+                // https://github.com/pinojs/pino/blob/main/docs/api.md#level-1
+                const { name, time, level, ...rest } = o;
+                if (name) {
+                    rest.message = rest.message ? `[${name}] ${rest.message}` : `[${name}]`;
+                }
+                if (!rest.traceId) {
+                    rest.traceId = getTraceId();
+                }
+                if (level >= 50) {
+                    console.error(rest);
+                } else if (level >= 40) {
+                    console.warn(rest);
+                } else {
+                    console.log(rest);
+                }
+            },
+        },
     };
 
     return config;

package/src/pino/worker.ts

@@ -0,0 +1,82 @@
+import pino from 'pino';
+import path from 'path';
+
+import { getTraceId } from '../trace';
+
+// https://github.com/pinojs/pino/blob/master/docs/api.md
+function getPinoConfig() {
+    const targets: any = [];
+
+    if (process.env.NODE_ENV === 'production') {
+    } else {
+        const rotate = `./rotate${path.extname(__filename)}`;
+        targets.push({
+            level: 'debug',
+            target: rotate,
+            options: { path: './logs/' },
+        });
+        targets.push({
+            level: 'debug',
+            target: 'pino-pretty', // must be installed separately,
+            options: {
+                // https://github.com/pinojs/pino-pretty?tab=readme-ov-file#options
+                ignore: 'pid',
+                messageKey: 'message',
+            },
+        });
+    }
+
+    const config: pino.LoggerOptions = {
+        transport: { targets },
+        mixin(data: any) {
+            // {"level":30,"time":1726065716643,"pid":21968,"hostname":"Win-LH"}
+            // 基础字段不能重复
+            const traceId = data?.traceId;
+            delete data.traceId;
+            delete data.level;
+            delete data.time;
+            delete data.pid;
+            delete data.name;
+            delete data.hostname;
+            if (!traceId) {
+                return { traceId: getTraceId() };
+            }
+            return { traceId };
+        },
+        browser: {
+            write: (o: any) => {
+                // https://github.com/pinojs/pino/blob/main/docs/api.md#level-1
+                const { name, time, level, ...rest } = o;
+                if (name) {
+                    rest.message = rest.message ? `[${name}] ${rest.message}` : `[${name}]`;
+                }
+                if (!rest.traceId) {
+                    rest.traceId = getTraceId();
+                }
+                if (level >= 50) {
+                    console.error(rest);
+                } else if (level >= 40) {
+                    console.warn(rest);
+                } else {
+                    console.log(rest);
+                }
+            },
+        },
+    };
+
+    return config;
+}
+
+export function createLogger() {
+    const logger = pino({
+        // https://github.com/pinojs/pino/blob/main/docs/api.md#opt-serializers
+        base: { pid: process.pid },
+        messageKey: 'message',
+        errorKey: 'error',
+        timestamp: pino.stdTimeFunctions.epochTime,
+        // timestamp: process.env.NODE_ENV === 'production' ? pino.stdTimeFunctions.epochTime : pino.stdTimeFunctions.isoTime,
+        ...getPinoConfig(),
+    });
+
+    return { logger };
+}

package/src/worker/index.ts

@@ -0,0 +1,3 @@
+
+
+