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

package/dist/worker/thread-stream.cjs

@@ -1,5 +1,6 @@
+"use strict";
 var __webpack_modules__ = {
-    "../../node_modules/.pnpm/real-require@0.2.0/node_modules/real-require/src/index.js": function(module1) {
+    "../../node_modules/.pnpm/real-require@0.2.0/node_modules/real-require/src/index.js" (module1) {
         const realImport = new Function('modulePath', 'return import(modulePath)');
         function realRequire(modulePath) {
             if ('function' == typeof __non_webpack__require__) return __non_webpack__require__(modulePath);
@@ -10,7 +11,7 @@ var __webpack_modules__ = {
             realRequire
         };
     },
-    "../../node_modules/.pnpm/thread-stream@3.1.0/node_modules/thread-stream/lib/indexes.js": function(module1) {
+    "../../node_modules/.pnpm/thread-stream@4.0.0/node_modules/thread-stream/lib/indexes.js" (module1) {
         "use strict";
         const WRITE_INDEX = 4;
         const READ_INDEX = 8;
@@ -19,45 +20,41 @@ var __webpack_modules__ = {
             READ_INDEX
         };
     },
-    "../../node_modules/.pnpm/thread-stream@3.1.0/node_modules/thread-stream/lib/wait.js": function(module1) {
+    "../../node_modules/.pnpm/thread-stream@4.0.0/node_modules/thread-stream/lib/wait.js" (module1) {
         "use strict";
-        const MAX_TIMEOUT = 1000;
+        const WAIT_MS = 10000;
         function wait(state, index, expected, timeout, done) {
-            const max = Date.now() + timeout;
-            let current = Atomics.load(state, index);
-            if (current === expected) return void done(null, 'ok');
-            let prior = current;
-            const check = (backoff)=>{
-                if (Date.now() > max) done(null, 'timed-out');
-                else setTimeout(()=>{
-                    prior = current;
-                    current = Atomics.load(state, index);
-                    if (current === prior) check(backoff >= MAX_TIMEOUT ? MAX_TIMEOUT : 2 * backoff);
-                    else current === expected ? done(null, 'ok') : done(null, 'not-equal');
-                }, backoff);
+            const max = timeout === 1 / 0 ? 1 / 0 : Date.now() + timeout;
+            const check = ()=>{
+                const current = Atomics.load(state, index);
+                if (current === expected) return void done(null, 'ok');
+                if (max !== 1 / 0 && Date.now() > max) return void done(null, 'timed-out');
+                const remaining = max === 1 / 0 ? WAIT_MS : Math.min(WAIT_MS, Math.max(1, max - Date.now()));
+                const result = Atomics.waitAsync(state, index, current, remaining);
+                if (result.async) result.value.then(check);
+                else setImmediate(check);
             };
-            check(1);
+            check();
         }
         function waitDiff(state, index, expected, timeout, done) {
-            const max = Date.now() + timeout;
-            let current = Atomics.load(state, index);
-            if (current !== expected) return void done(null, 'ok');
-            const check = (backoff)=>{
-                if (Date.now() > max) done(null, 'timed-out');
-                else setTimeout(()=>{
-                    current = Atomics.load(state, index);
-                    if (current !== expected) done(null, 'ok');
-                    else check(backoff >= MAX_TIMEOUT ? MAX_TIMEOUT : 2 * backoff);
-                }, backoff);
+            const max = timeout === 1 / 0 ? 1 / 0 : Date.now() + timeout;
+            const check = ()=>{
+                const current = Atomics.load(state, index);
+                if (current !== expected) return void done(null, 'ok');
+                if (max !== 1 / 0 && Date.now() > max) return void done(null, 'timed-out');
+                const remaining = max === 1 / 0 ? WAIT_MS : Math.min(WAIT_MS, Math.max(1, max - Date.now()));
+                const result = Atomics.waitAsync(state, index, expected, remaining);
+                if (result.async) result.value.then(check);
+                else setImmediate(check);
             };
-            check(1);
+            check();
         }
         module1.exports = {
             wait,
             waitDiff
         };
     },
-    worker_threads: function(module1) {
+    worker_threads (module1) {
         "use strict";
         module1.exports = require("worker_threads");
     }
@@ -77,21 +74,17 @@ var __webpack_exports__ = {};
     "use strict";
     const { realImport, realRequire } = __webpack_require__("../../node_modules/.pnpm/real-require@0.2.0/node_modules/real-require/src/index.js");
     const { workerData, parentPort } = __webpack_require__("worker_threads");
-    const { WRITE_INDEX, READ_INDEX } = __webpack_require__("../../node_modules/.pnpm/thread-stream@3.1.0/node_modules/thread-stream/lib/indexes.js");
-    const { waitDiff } = __webpack_require__("../../node_modules/.pnpm/thread-stream@3.1.0/node_modules/thread-stream/lib/wait.js");
+    const { WRITE_INDEX, READ_INDEX } = __webpack_require__("../../node_modules/.pnpm/thread-stream@4.0.0/node_modules/thread-stream/lib/indexes.js");
+    const { waitDiff } = __webpack_require__("../../node_modules/.pnpm/thread-stream@4.0.0/node_modules/thread-stream/lib/wait.js");
     const { dataBuf, filename, stateBuf } = workerData;
     let destination;
     const state = new Int32Array(stateBuf);
     const data = Buffer.from(dataBuf);
+    const keepAlive = setInterval(()=>{}, 3600000);
     async function start() {
         let worker;
         try {
-            if (filename.endsWith('.ts') || filename.endsWith('.cts')) {
-                if (process[Symbol.for('ts-node.register.instance')]) {
-                    if (process.env.TS_NODE_DEV) realRequire('ts-node-dev');
-                } else realRequire('ts-node/register');
-                worker = realRequire(decodeURIComponent(filename.replace('win32' === process.platform ? 'file:///' : 'file://', '')));
-            } else worker = await realImport(filename);
+            worker = await realImport(filename);
         } catch (error) {
             if (('ENOTDIR' === error.code || 'ERR_MODULE_NOT_FOUND' === error.code) && filename.startsWith('file://')) worker = realRequire(decodeURIComponent(filename.replace('file://', '')));
             else if (void 0 === error.code || 'ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING' === error.code) try {
@@ -99,6 +92,14 @@ var __webpack_exports__ = {};
             } catch  {
                 throw error;
             }
+            else if (filename.endsWith('.ts') || filename.endsWith('.cts')) try {
+                if (process[Symbol.for('ts-node.register.instance')]) {
+                    if (process.env.TS_NODE_DEV) realRequire('ts-node-dev');
+                } else realRequire('ts-node/register');
+                worker = realRequire(decodeURIComponent(filename.replace('win32' === process.platform ? 'file:///' : 'file://', '')));
+            } catch  {
+                throw error;
+            }
             else throw error;
         }
         if ('object' == typeof worker) worker = worker.default;
@@ -118,6 +119,7 @@ var __webpack_exports__ = {};
             const end = Atomics.load(state, WRITE_INDEX);
             Atomics.store(state, READ_INDEX, end);
             Atomics.notify(state, READ_INDEX);
+            clearInterval(keepAlive);
             setImmediate(()=>{
                 process.exit(0);
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.6-beta.10",
+  "version": "0.0.6-beta.12",
   "description": "",
   "type": "module",
   "types": "./src/index.ts",
@@ -29,15 +29,15 @@
     "tsconfig.json"
   ],
   "dependencies": {
-    "pino": "^9.8.0",
-    "pino-pretty": "^13.1.1",
+    "pino": "^10.1.0",
+    "pino-pretty": "^13.1.3",
     "pino-std-serializers": "^7.0.0",
-    "rotating-file-stream": "^3.2.6"
+    "rotating-file-stream": "^3.2.7"
   },
   "devDependencies": {
-    "thread-stream": "*",
-    "@rife/cli": "0.0.6-beta.15",
-    "@rife/plugin-rstack": "0.0.1-beta.11"
+    "thread-stream": "^4.0.0",
+    "@rife/cli": "0.0.6-beta.20",
+    "@rife/plugin-rstack": "0.0.1-beta.17"
   },
   "scripts": {
     "dev": "rife dev",

package/src/common.ts

@@ -1,4 +1,4 @@
-import path from 'path';
-
-export const isEsm = path.extname(__filename) === '.mjs';
-export const isCjs = !isEsm;
+import path from 'path';
+
+export const isEsm = path.extname(__filename) === '.mjs';
+export const isCjs = !isEsm;

package/src/pino/index.ts

@@ -1,102 +1,122 @@
-import path from 'path';
-
-import pino from 'pino';
-
-import { isEsm } from '../common';
-import { genTraceId, getTraceId, runInTrace } from '../trace';
-
-declare var PINO_RSPACK_PLUGIN: any;
-
-// https://github.com/pinojs/pino/blob/master/docs/api.md
-function getPinoConfig() {
-    const targets: any = [];
-
-    if (typeof PINO_RSPACK_PLUGIN !== 'undefined') {
-        // 打包单文件的时候自动拷贝worker
-        (globalThis as any).__bundlerPathsOverrides = {
-            'pino-pretty': path.join(__dirname, './worker/pino-pretty.cjs'),
-            'pino-worker': path.join(__dirname, './worker/pino-worker.cjs'),
-            './rotate.cjs': path.join(__dirname, './worker/pino-rotate.cjs'),
-            'pino/file': path.join(__dirname, './worker/pino-file.cjs'),
-            'thread-stream-worker': path.join(__dirname, './worker/thread-stream.cjs'),
-            ...(globalThis as any).__bundlerPathsOverrides,
-        };
-    }
-
-    if (process.env.NODE_ENV === 'production') {
-    } else {
-        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',
-            },
-        });
-    }
-
-    targets.push({
-        level: 'debug',
-        target: `./rotate${isEsm ? '.mjs' : '.cjs'}`,
-        options: { path: './logs/' },
-    });
-
-    const config: pino.LoggerOptions = {
-        transport: { targets },
-        mixin(data: any) {
-            // {"level":30,"time":1726065716643,"pid":21968,"hostname":"Win-LH"}
-            // 基础字段不能重复 删除掉
-            delete data.level;
-            delete data.time;
-            delete data.pid;
-            delete data.name;
-            delete data.hostname;
-            if (!data?.traceId) {
-                return { traceId: getTraceId() };
-            }
-            return {};
-        },
-    };
-
-    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 };
-}
-
-// export function express(logger: any) {
-//     const { mapHttpRequest, mapHttpResponse } = require('pino-std-serializers') as typeof import('pino-std-serializers');
-
-//     return (req: any, res: any, next: any) => {
-//         const response: any = res;
-//         response[startTime] = response[startTime] || Date.now();
-//         const traceId = req.headers['trace-id'] || genTraceId();
-
-//         const onComplete = () => {
-//             res.removeListener('close', onComplete);
-//             res.removeListener('finish', onComplete);
-//             res.removeListener('error', onComplete);
-//             const duration = Date.now() - response[startTime];
-
-//             logger.info({ duration, request: mapHttpRequest(req).req, response: mapHttpResponse(res).res }, 'request');
-//         };
-
-//         res.on('close', onComplete);
-//         res.on('finish', onComplete);
-//         res.on('error', onComplete);
-
-//         runInTrace({ traceId }, next);
-//     };
-// }
+import path from 'path';
+
+import pino from 'pino';
+
+import { genTraceId, getTraceId, runInTrace } from '../trace';
+
+declare var __isNodeSingleFileBundle: any;
+declare var __isVite: any;
+
+// 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,
+        options: { path: './logs/' },
+    });
+
+    if (
+        typeof __isNodeSingleFileBundle !== 'undefined' ||
+        typeof __isVite !== 'undefined' || // remix
+        (global as any)?.__remix_devServerHooks || // remix
+        process.env.NODE_ENV !== 'development'
+    ) {
+        // 打包单文件的时候自动拷贝worker
+        (globalThis as any).__bundlerPathsOverrides = {
+            'pino-pretty': path.join(__dirname, './worker/pino-pretty.cjs'),
+            'pino-worker': path.join(__dirname, './worker/pino-worker.cjs'),
+            [rotate]: path.join(__dirname, './worker/pino-rotate.cjs'),
+            'pino/file': path.join(__dirname, './worker/pino-file.cjs'),
+            'thread-stream-worker': path.join(__dirname, './worker/thread-stream.cjs'),
+            ...(globalThis as any).__bundlerPathsOverrides,
+        };
+    }
+
+    if (process.env.NODE_ENV === 'production') {
+    } else {
+        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 };
+        },
+    };
+
+    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 };
+}
+
+import type { SerializedRequest, SerializedResponse } from 'pino-std-serializers';
+
+export type ExpressFormat = (info: ExpressInfo) => any;
+
+export interface ExpressInfo {
+    duration: number;
+    request: SerializedRequest;
+    response: SerializedResponse;
+}
+
+export function useExpress(logger: any, format?: ExpressFormat) {
+    const serializers = require('pino-std-serializers') as typeof import('pino-std-serializers');
+    const mapHttpRequest = serializers.mapHttpRequest;
+    const mapHttpResponse = serializers.mapHttpResponse || (serializers as any).default.mapHttpResponse;
+    const startTime = Symbol();
+    return (req: any, res: any, next: any) => {
+        const response: any = res;
+        response[startTime] = response[startTime] || Date.now();
+        const traceId = req.headers['trace-id'] || genTraceId();
+        const onComplete = () => {
+            res.removeListener('close', onComplete);
+            res.removeListener('finish', onComplete);
+            res.removeListener('error', onComplete);
+            const duration = Date.now() - response[startTime];
+            const serializedRequest = mapHttpRequest(req).req;
+            const serializedResponse = mapHttpResponse(res).res;
+            const msg = `${serializedRequest.method} ${serializedRequest.url}`;
+            const info: ExpressInfo = { duration, request: serializedRequest, response: serializedResponse };
+            logger.info(format?.(info) || info, msg);
+        };
+        res.on('close', onComplete);
+        res.on('finish', onComplete);
+        res.on('error', onComplete);
+        runInTrace({ traceId }, next);
+    };
+}

package/src/pino/rotate.ts

@@ -1,32 +1,32 @@
-import type { Options } from 'rotating-file-stream';
-
-export interface PinoRotatingFileStreamOptions extends Options {
-    path: string;
-}
-
-const generator = (time: number | Date, index?: number) => {
-    if (!time) {
-        return 'server.log';
-    }
-    time = new Date(time);
-
-    const month = String(time.getMonth() + 1).padStart(2, '0');
-    const day = String(time.getDate()).padStart(2, '0');
-    if (index) {
-        const count = String(index).padStart(3, '0');
-        return `server.${time.getFullYear()}${month}${day}-${count}.log`;
-    }
-    return `server.${time.getFullYear()}${month}${day}.log`;
-};
-
-export default (options: PinoRotatingFileStreamOptions) => {
-    const { createStream } = require('rotating-file-stream') as typeof import('rotating-file-stream');
-
-    const { path } = options;
-    return createStream(generator, {
-        size: '50M',
-        maxSize: '500M',
-        interval: '1d',
-        path,
-    });
-};
+import type { Options } from 'rotating-file-stream';
+
+export interface PinoRotatingFileStreamOptions extends Options {
+    path: string;
+}
+
+const generator = (time: number | Date, index?: number) => {
+    if (!time) {
+        return 'server.log';
+    }
+    time = new Date(time);
+
+    const month = String(time.getMonth() + 1).padStart(2, '0');
+    const day = String(time.getDate()).padStart(2, '0');
+    if (index) {
+        const count = String(index).padStart(3, '0');
+        return `server.${time.getFullYear()}${month}${day}-${count}.log`;
+    }
+    return `server.${time.getFullYear()}${month}${day}.log`;
+};
+
+export default (options: PinoRotatingFileStreamOptions) => {
+    const { createStream } = require('rotating-file-stream') as typeof import('rotating-file-stream');
+
+    const { path } = options;
+    return createStream(generator, {
+        size: '50M',
+        maxSize: '500M',
+        interval: '1d',
+        path,
+    });
+};

package/src/test.ts

@@ -1,19 +1,22 @@
-process.env.NODE_ENV = 'development';
-// process.env.NODE_ENV = 'production';
-
-import { createLogger } from './pino';
-import { genTraceId } from './trace';
-
-const { logger } = createLogger();
-
-logger.info({ a: 999 }, '1');
-
-const start = performance.now();
-logger.info({ duration: Math.round(performance.now() - start), traceId: genTraceId() });
-
-const log = logger.child({ name: 'name123', traceId: genTraceId() }, { msgPrefix: '[123] ' });
-
-log.info(2);
-log.info({ c: 1, name: '========' }, 'name overide');
-log.error(new Error('cause', { cause: new Error('789') }));
-log.error({ error: new Error('error data'), data: 2 });
+process.env.NODE_ENV = 'development';
+// process.env.NODE_ENV = 'production';
+
+import { createLogger } from './pino';
+import { genTraceId, runInTrace } from './trace';
+
+const { logger } = createLogger();
+
+logger.info({ a: 999 }, '1');
+
+const start = performance.now();
+logger.info({ duration: Math.round(performance.now() - start), traceId: genTraceId() });
+
+const log = logger.child({ name: 'name123', traceId: genTraceId() }, { msgPrefix: '[123] ' });
+
+log.error(new Error('cause', { cause: new Error('789') }));
+log.error({ error: new Error('error data'), data: 2 });
+log.info({ c: 1, name: '========' }, 'name overide');
+
+runInTrace({ traceId: genTraceId() }, () => {
+    log.info(1);
+});

package/src/trace.ts

@@ -1,15 +1,15 @@
-import { AsyncLocalStorage } from 'async_hooks';
-
-const als = new AsyncLocalStorage<{ traceId: string } & any>();
-
-export function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {
-    return als.run(data, fn);
-}
-
-export function genTraceId() {
-    return crypto.randomUUID().replaceAll('-', '');
-}
-
-export function getTraceId() {
-    return als.getStore()?.traceId;
-}
+import { AsyncLocalStorage } from 'async_hooks';
+
+const als = new AsyncLocalStorage<{ traceId: string } & any>();
+
+export function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {
+    return als.run(data, fn);
+}
+
+export function genTraceId() {
+    return crypto.randomUUID().replaceAll('-', '');
+}
+
+export function getTraceId() {
+    return als.getStore()?.traceId;
+}

package/tsconfig.json

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