@rife/logger 0.0.6-beta.15 → 0.0.6-beta.17

package/dist/worker/thread-stream.cjs

@@ -1,6 +1,6 @@
 "use strict";
 var __webpack_modules__ = {
-    "../../node_modules/.pnpm/real-require@0.2.0/node_modules/real-require/src/index.js" (module1) {
+    "../../node_modules/.pnpm/real-require@1.0.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);
@@ -11,16 +11,18 @@ var __webpack_modules__ = {
             realRequire
         };
     },
-    "../../node_modules/.pnpm/thread-stream@4.0.0/node_modules/thread-stream/lib/indexes.js" (module1) {
+    "../../node_modules/.pnpm/thread-stream@4.2.0/node_modules/thread-stream/lib/indexes.js" (module1) {
         "use strict";
+        const SEQ_INDEX = 2;
         const WRITE_INDEX = 4;
         const READ_INDEX = 8;
         module1.exports = {
             WRITE_INDEX,
-            READ_INDEX
+            READ_INDEX,
+            SEQ_INDEX
         };
     },
-    "../../node_modules/.pnpm/thread-stream@4.0.0/node_modules/thread-stream/lib/wait.js" (module1) {
+    "../../node_modules/.pnpm/thread-stream@4.2.0/node_modules/thread-stream/lib/wait.js" (module1) {
         "use strict";
         const WAIT_MS = 10000;
         function wait(state, index, expected, timeout, done) {
@@ -44,7 +46,10 @@ var __webpack_modules__ = {
                 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);
+                if (result.async) result.value.then((res)=>{
+                    if ('ok' === res) return void done(null, 'ok');
+                    check();
+                });
                 else setImmediate(check);
             };
             check();
@@ -54,6 +59,10 @@ var __webpack_modules__ = {
             waitDiff
         };
     },
+    string_decoder (module1) {
+        "use strict";
+        module1.exports = require("string_decoder");
+    },
     worker_threads (module1) {
         "use strict";
         module1.exports = require("worker_threads");
@@ -72,15 +81,81 @@ function __webpack_require__(moduleId) {
 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 { realImport, realRequire } = __webpack_require__("../../node_modules/.pnpm/real-require@1.0.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@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 { StringDecoder } = __webpack_require__("string_decoder");
+    const { WRITE_INDEX, READ_INDEX, SEQ_INDEX } = __webpack_require__("../../node_modules/.pnpm/thread-stream@4.2.0/node_modules/thread-stream/lib/indexes.js");
+    const { waitDiff } = __webpack_require__("../../node_modules/.pnpm/thread-stream@4.2.0/node_modules/thread-stream/lib/wait.js");
     const { dataBuf, filename, stateBuf } = workerData;
     let destination;
+    const flushQueue = [];
+    let flushing = false;
     const state = new Int32Array(stateBuf);
     const data = Buffer.from(dataBuf);
+    const decoder = new StringDecoder('utf8');
     const keepAlive = setInterval(()=>{}, 3600000);
+    function onParentPortMessage(msg) {
+        if (!msg || 'FLUSH' !== msg.code || 'thread-stream' !== msg.context) return;
+        flushQueue.push(msg.id);
+        processFlushQueue();
+    }
+    function processFlushQueue() {
+        if (flushing || !destination) return;
+        const id = flushQueue.shift();
+        if (void 0 === id) return;
+        flushing = true;
+        flushDestination((err)=>{
+            flushing = false;
+            if (err) return void parentPort.postMessage({
+                code: 'ERROR',
+                err
+            });
+            parentPort.postMessage({
+                code: 'FLUSHED',
+                context: 'thread-stream',
+                id
+            });
+            processFlushQueue();
+        });
+    }
+    function flushDestination(cb) {
+        if ('function' == typeof destination?.flush) {
+            if (0 === destination.flush.length) {
+                try {
+                    const result = destination.flush();
+                    if (result && 'function' == typeof result.then) result.then(()=>cb(), cb);
+                    else cb();
+                } catch (err) {
+                    cb(err);
+                }
+                return;
+            }
+            let done = false;
+            const onDone = (err)=>{
+                if (done) return;
+                done = true;
+                cb(err);
+            };
+            try {
+                const result = destination.flush(onDone);
+                if (result && 'function' == typeof result.then) result.then(()=>onDone(), onDone);
+            } catch (err) {
+                onDone(err);
+            }
+            return;
+        }
+        if ('function' == typeof destination?.flushSync) {
+            try {
+                destination.flushSync();
+                cb();
+            } catch (err) {
+                cb(err);
+            }
+            return;
+        }
+        if (destination?.writableNeedDrain && !destination?.writableEnded) return void destination.once('drain', cb);
+        cb();
+    }
     async function start() {
         let worker;
         try {
@@ -124,19 +199,38 @@ var __webpack_exports__ = {};
                 process.exit(0);
             });
         });
+        processFlushQueue();
     }
     start().then(function() {
+        parentPort.on('message', onParentPortMessage);
         parentPort.postMessage({
             code: 'READY'
         });
         process.nextTick(run);
     });
+    function readState() {
+        while(true){
+            const seq = Atomics.load(state, SEQ_INDEX);
+            if ((1 & seq) !== 0) continue;
+            const current = Atomics.load(state, READ_INDEX);
+            const end = Atomics.load(state, WRITE_INDEX);
+            if (seq === Atomics.load(state, SEQ_INDEX)) return {
+                current,
+                end,
+                seq
+            };
+        }
+    }
     function run() {
-        const current = Atomics.load(state, READ_INDEX);
-        const end = Atomics.load(state, WRITE_INDEX);
-        if (end === current) return void (end === data.length ? waitDiff(state, READ_INDEX, end, 1 / 0, run) : waitDiff(state, WRITE_INDEX, end, 1 / 0, run));
-        if (-1 === end) return void destination.end();
-        const toWrite = data.toString('utf8', current, end);
+        const { current, end, seq } = readState();
+        if (end === current) return void waitDiff(state, SEQ_INDEX, seq, 1 / 0, run);
+        if (-1 === end) {
+            const remaining = decoder.end();
+            if (remaining.length > 0) destination.write(remaining);
+            destination.end();
+            return;
+        }
+        const toWrite = decoder.write(data.subarray(current, end));
         const res = destination.write(toWrite);
         if (res) {
             Atomics.store(state, READ_INDEX, end);

package/package.json

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

package/src/pino/index.ts

@@ -1,5 +1,4 @@
 import path from 'path';
-
 import pino from 'pino';
 
 export { pino };
@@ -66,7 +65,6 @@ function getPinoConfig() {
             delete data.level;
             delete data.time;
             delete data.pid;
-            delete data.name;
             delete data.hostname;
             if (!traceId) {
                 return { traceId: getTraceId() };
@@ -75,17 +73,29 @@ function getPinoConfig() {
         },
         // cloudfare worker 需要自己实现输出
         browser: {
+            // https://github.com/pinojs/pino/blob/main/docs/browser.md
+            serialize: true,
             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}]`;
+                const { fn, time, level, ...rest } = o;
+                const clone = { ...o };
+                if (fn) {
+                    rest.message = rest.message ? `[${fn}] ${rest.message}` : `[${fn}]`;
                 }
                 if (!rest.traceId) {
                     rest.traceId = getTraceId();
+                    clone.traceId = getTraceId();
                 }
                 if (level >= 50) {
-                    console.error(rest);
+                    const keys = ['fn', 'time', 'level'];
+                    keys.forEach(k => delete clone[k]);
+                    if (clone.msg) {
+                        clone.msg = `${clone.name || 'Error'}: ${clone.msg}`;
+                        if (fn) {
+                            clone.msg = `[${fn}] ${clone.msg}`;
+                        }
+                    }
+                    console.error(clone);
                 } else if (level >= 40) {
                     console.warn(rest);
                 } else {

package/dist/cjs/worker/index.cjs

@@ -1,5 +0,0 @@
-var __webpack_exports__ = {};
-for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/dist/esm/worker/index.mjs

@@ -1 +0,0 @@
-import "node:module";

package/src/worker/index.ts

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