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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.6-beta.13",
+  "version": "0.0.6-beta.14",
   "description": "",
   "type": "module",
   "types": "./src/index.ts",
@@ -44,8 +44,8 @@
   },
   "devDependencies": {
     "thread-stream": "^4.0.0",
-    "@rife/cli": "0.0.6-beta.22",
-    "@rife/plugin-rstack": "0.0.1-beta.20"
+    "@rife/plugin-rstack": "0.0.1-beta.23",
+    "@rife/cli": "0.0.6-beta.22"
   },
   "scripts": {
     "dev": "rife dev",

package/src/pino/index.ts

@@ -2,15 +2,15 @@ import path from 'path';
 
 import pino from 'pino';
 
-import { genTraceId, getTraceId, runInTrace } from '../trace';
 export { pino };
+// 避免报错 "This is likely not portable. A type annotation is necessary."
+export type { Logger } from 'pino';
+
+import { genTraceId, getTraceId, runInTrace } from '../trace';
 
 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 = [];

package/tsconfig.json

@@ -1,9 +1,7 @@
 {
     "extends": "@rife/config/tsconfig.json", // 继承 packages 目录下通用配置
     "compilerOptions": {
-        "outDir": "dist",
         "declaration": true,
-        "baseUrl": ".",
         "paths": {
             "@/*": ["./src/*"]
         }

package/dist/cjs/pino/worker.cjs

@@ -1,116 +0,0 @@
-"use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
-(()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    createLogger: ()=>createLogger
-});
-const external_pino_namespaceObject = require("pino");
-var external_pino_default = /*#__PURE__*/ __webpack_require__.n(external_pino_namespaceObject);
-const external_path_namespaceObject = require("path");
-var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
-const external_trace_cjs_namespaceObject = require("../trace.cjs");
-function getPinoConfig() {
-    const targets = [];
-    if ('production' === process.env.NODE_ENV) ;
-    else {
-        const rotate = `./rotate${external_path_default().extname(__filename)}`;
-        targets.push({
-            level: 'debug',
-            target: rotate,
-            options: {
-                path: './logs/'
-            }
-        });
-        targets.push({
-            level: 'debug',
-            target: 'pino-pretty',
-            options: {
-                ignore: 'pid',
-                messageKey: 'message'
-            }
-        });
-    }
-    const config = {
-        transport: {
-            targets
-        },
-        mixin (data) {
-            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: (0, external_trace_cjs_namespaceObject.getTraceId)()
-            };
-            return {
-                traceId
-            };
-        },
-        browser: {
-            write: (o)=>{
-                const { name, time, level, ...rest } = o;
-                if (name) rest.message = rest.message ? `[${name}] ${rest.message}` : `[${name}]`;
-                if (!rest.traceId) rest.traceId = (0, external_trace_cjs_namespaceObject.getTraceId)();
-                if (level >= 50) console.error(rest);
-                else if (level >= 40) console.warn(rest);
-                else console.log(rest);
-            }
-        }
-    };
-    return config;
-}
-function createLogger() {
-    const logger = external_pino_default()({
-        base: {
-            pid: process.pid
-        },
-        messageKey: 'message',
-        errorKey: 'error',
-        timestamp: external_pino_default().stdTimeFunctions.epochTime,
-        ...getPinoConfig()
-    });
-    return {
-        logger
-    };
-}
-exports.createLogger = __webpack_exports__.createLogger;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createLogger"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/dist/esm/pino/worker.mjs

@@ -1,74 +0,0 @@
-import "node:module";
-import pino from "pino";
-import path from "path";
-import { getTraceId } from "../trace.mjs";
-import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
-var worker_filename = __rspack_fileURLToPath(import.meta.url);
-function getPinoConfig() {
-    const targets = [];
-    if ('production' === process.env.NODE_ENV) ;
-    else {
-        const rotate = `./rotate${path.extname(worker_filename)}`;
-        targets.push({
-            level: 'debug',
-            target: rotate,
-            options: {
-                path: './logs/'
-            }
-        });
-        targets.push({
-            level: 'debug',
-            target: 'pino-pretty',
-            options: {
-                ignore: 'pid',
-                messageKey: 'message'
-            }
-        });
-    }
-    const config = {
-        transport: {
-            targets
-        },
-        mixin (data) {
-            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)=>{
-                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;
-}
-function createLogger() {
-    const logger = pino({
-        base: {
-            pid: process.pid
-        },
-        messageKey: 'message',
-        errorKey: 'error',
-        timestamp: pino.stdTimeFunctions.epochTime,
-        ...getPinoConfig()
-    });
-    return {
-        logger
-    };
-}
-export { createLogger };

package/src/pino/worker.ts

@@ -1,82 +0,0 @@
-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 };
-}