@rife/logger 0.0.6-beta.11 → 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.11",
+  "version": "0.0.6-beta.12",
   "description": "",
   "type": "module",
   "types": "./src/index.ts",
@@ -30,14 +30,14 @@
   ],
   "dependencies": {
     "pino": "^10.1.0",
-    "pino-pretty": "^13.1.2",
+    "pino-pretty": "^13.1.3",
     "pino-std-serializers": "^7.0.0",
     "rotating-file-stream": "^3.2.7"
   },
   "devDependencies": {
-    "thread-stream": "*",
-    "@rife/cli": "0.0.6-beta.16",
-    "@rife/plugin-rstack": "0.0.1-beta.15"
+    "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/pino/index.ts

@@ -53,15 +53,17 @@ function getPinoConfig() {
         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 (!data?.traceId) {
+            if (!traceId) {
                 return { traceId: getTraceId() };
             }
-            return {};
+            return { traceId };
         },
     };
 

package/src/test.ts

@@ -2,7 +2,7 @@ process.env.NODE_ENV = 'development';
 // process.env.NODE_ENV = 'production';
 
 import { createLogger } from './pino';
-import { genTraceId } from './trace';
+import { genTraceId, runInTrace } from './trace';
 
 const { logger } = createLogger();
 
@@ -16,4 +16,7 @@ const log = logger.child({ name: 'name123', traceId: genTraceId() }, { msgPrefix
 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');
-log.info(1);
+
+runInTrace({ traceId: genTraceId() }, () => {
+    log.info(1);
+});