@rife/logger 0.0.6-beta.18 → 0.0.6-beta.20

package/dist/worker/thread-stream.cjs

@@ -26,12 +26,12 @@ var __webpack_modules__ = {
         "use strict";
         const WAIT_MS = 10000;
         function wait(state, index, expected, timeout, done) {
-            const max = timeout === 1 / 0 ? 1 / 0 : Date.now() + timeout;
+            const max = 1 / 0 === timeout ? 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()));
+                if (1 / 0 !== max && Date.now() > max) return void done(null, 'timed-out');
+                const remaining = 1 / 0 === max ? 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);
@@ -39,12 +39,12 @@ var __webpack_modules__ = {
             check();
         }
         function waitDiff(state, index, expected, timeout, done) {
-            const max = timeout === 1 / 0 ? 1 / 0 : Date.now() + timeout;
+            const max = 1 / 0 === timeout ? 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()));
+                if (1 / 0 !== max && Date.now() > max) return void done(null, 'timed-out');
+                const remaining = 1 / 0 === max ? 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((res)=>{
                     if ('ok' === res) return void done(null, 'ok');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.6-beta.18",
+  "version": "0.0.6-beta.20",
   "description": "",
   "type": "module",
   "types": "./src/index.ts",
@@ -37,15 +37,15 @@
     "tsconfig.json"
   ],
   "dependencies": {
-    "pino": "^10.3.1",
-    "pino-pretty": "^13.1.3",
+    "pino": "^10.4.0",
+    "pino-pretty": "^13.2.0",
     "pino-std-serializers": "^7.1.0",
     "rotating-file-stream": "^3.2.9"
   },
   "devDependencies": {
-    "thread-stream": "^4.0.0",
-    "@rife/plugin-rstack": "0.0.1-beta.25",
-    "@rife/cli": "0.0.6-beta.25"
+    "@rife/cli": "0.0.6-beta.28",
+    "@rife/plugin-rstack": "0.0.1-beta.27",
+    "thread-stream": "^4.0.0"
   },
   "scripts": {
     "dev": "rife dev",

package/src/pino/index.ts

@@ -5,11 +5,12 @@ export { pino };
 
 import { genTraceId, getTraceId, runInTrace } from '../trace';
 
-declare var __isNodeSingleFileBundle: any;
-declare var __isVite: any;
+declare let RSTACK_NODE_SINGLE_FILE_BUNDLE: any;
+
+export type Logger = pino.Logger;
 
 // https://github.com/pinojs/pino/blob/master/docs/api.md
-function getPinoConfig() {
+export function createLogger() {
     const targets: any = [];
 
     const rotate = `./rotate${path.extname(__filename)}`;
@@ -20,12 +21,7 @@ function getPinoConfig() {
         options: { path: './logs/' },
     });
 
-    if (
-        typeof __isNodeSingleFileBundle !== 'undefined' ||
-        typeof __isVite !== 'undefined' || // remix
-        (global as any)?.__remix_devServerHooks || // remix
-        process.env.NODE_ENV !== 'development'
-    ) {
+    if (typeof (RSTACK_NODE_SINGLE_FILE_BUNDLE as any) !== 'undefined' || process.env.NODE_ENV !== 'development') {
         // 打包单文件的时候自动拷贝worker
         (globalThis as any).__bundlerPathsOverrides = {
             'pino-pretty': path.join(__dirname, './worker/pino-pretty.cjs'),
@@ -103,12 +99,6 @@ function getPinoConfig() {
         },
     };
 
-    return config;
-}
-
-export type Logger = pino.Logger<never, boolean>;
-
-export function createLogger() {
     const logger: Logger = pino({
         // https://github.com/pinojs/pino/blob/main/docs/api.md#opt-serializers
         base: { pid: process.pid },
@@ -116,7 +106,7 @@ export function createLogger() {
         errorKey: 'error',
         timestamp: pino.stdTimeFunctions.epochTime,
         // timestamp: process.env.NODE_ENV === 'production' ? pino.stdTimeFunctions.epochTime : pino.stdTimeFunctions.isoTime,
-        ...getPinoConfig(),
+        ...config,
     });
 
     return { logger };

package/src/trace.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'async_hooks';
 
-const als = new AsyncLocalStorage<{ traceId: string } & any>();
+const als = new AsyncLocalStorage<{ traceId: string } & Record<string, any>>();
 
 export function runInTrace<T>(data: any, fn: (...args: any[]) => T): T {
     return als.run(data, fn);

package/tsconfig.json

@@ -4,7 +4,8 @@
         "declaration": true,
         "paths": {
             "@/*": ["./src/*"]
-        }
+        },
+        "tsBuildInfoFile": "./node_modules/.cache/.tsbuildinfo"
     },
     "include": ["./src/**/*"]
 }

package/dist/esm/rslib-runtime.mjs

@@ -1,19 +0,0 @@
-import "node:module";
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };