2g 0.3.0 → 0.3.1

package/dist/2g.mjs

@@ -2,19 +2,19 @@ import e from "node:path";
 
 import { performance as t } from "node:perf_hooks";
 
-import { E as i, h as s, p as n, m as r, j as o, c, I as l, k as h, D as a, l as u, o as f, q as d, S as p, b as g, s as m, g as y, t as w, L as k } from "./chunks/sessionSockets-chunk.mjs";
+import { E as i, h as s, p as n, m as r, j as o, c, I as l, k as h, D as a, l as u, o as f, q as d, S as g, b as p, s as m, g as y, t as w, L as k } from "./chunks/sessionSockets-chunk.mjs";
 
-import S from "node:fs";
+import v from "node:fs";
 
-import v from "node:net";
+import S from "node:net";
 
 import { s as b, f as L, a as _ } from "./chunks/pretty-chunk.mjs";
 
 import { Buffer as P } from "node:buffer";
 
-import { EventEmitter as I } from "node:events";
+import { EventEmitter as E } from "node:events";
 
-import { isMainThread as $, threadId as E } from "node:worker_threads";
+import { isMainThread as I, threadId as $ } from "node:worker_threads";
 
 const O = Symbol.for(`2g/state-${i}`);
 
@@ -27,19 +27,19 @@ const D = function getEventLogState() {
   };
 }();
 
-const x = t.timeOrigin;
+const C = t.timeOrigin;
 
-const N = Array.from({
+const x = Array.from({
   length: 1e3
 }, (e, t) => `.${`${t}`.padStart(3, "0")}`);
 
-let T = -1;
+let N = -1;
 
-let j = "";
+let T = "";
 
-let F;
+let j;
 
-let C = "";
+let F = "";
 
 function writeEvent(e, t, i, s, n, r) {
   try {
@@ -80,21 +80,21 @@ function writeCompleteEvent(e, t, i, s, n, r, o, c) {
 }
 
 function stringifyTimestamp() {
-  const e = x + t.now();
+  const e = C + t.now();
   const i = Math.floor(e);
-  if (i !== T) {
-    T = i;
-    j = `${i}`;
+  if (i !== N) {
+    N = i;
+    T = `${i}`;
   }
-  return j + N[1e3 * (e - i) | 0];
+  return T + x[1e3 * (e - i) | 0];
 }
 
 function stringifyWorkerId(e) {
-  if (e !== F) {
-    F = e;
-    C = JSON.stringify(e);
+  if (e !== j) {
+    j = e;
+    F = JSON.stringify(e);
   }
-  return C;
+  return F;
 }
 
 function appendPayload(e, t) {
@@ -226,7 +226,7 @@ function createDebugSink(e = process.env[o]) {
   };
 }
 
-class LogStream extends I {
+class LogStream extends E {
   #e=-1;
   #t=null;
   #i=null;
@@ -241,25 +241,25 @@ class LogStream extends I {
   #u="";
   #f=0;
   #d=[];
-  #p=0;
   #g=0;
+  #p=0;
   #m=0;
   #y=!1;
   #w=!1;
   #k;
-  #S=(e, t) => {
-    this.#v(e, t);
+  #v=(e, t) => {
+    this.#S(e, t);
   };
   #b=e => {
     if (null != e) {
       this.#L(e);
     } else {
-      this.#v(null, P.byteLength(this.#u));
+      this.#S(null, P.byteLength(this.#u));
     }
   };
   #_=() => {
     this.#w = !1;
-    if (!this.#n && !this.#l && (this.#d.length - this.#p > this.#g || this.#u)) {
+    if (!this.#n && !this.#l && (this.#d.length - this.#g > this.#p || this.#u)) {
       this.#P();
     }
   };
@@ -268,14 +268,14 @@ class LogStream extends I {
     this.#s = !1 !== t.closeFd;
     if ("number" == typeof e) {
       try {
-        S.fsyncSync(e);
+        v.fsyncSync(e);
       } catch {}
       this.#e = e;
       process.nextTick(() => this.emit("ready"));
     } else if ("string" == typeof e) {
-      this.#I(e);
+      this.#E(e);
     } else {
-      this.#$(e, null);
+      this.#I(e, null);
     }
   }
   get file() {
@@ -309,16 +309,16 @@ class LogStream extends I {
     }
     this.#a = !0;
     if (!this.#n) {
-      this.#E();
+      this.#$();
     }
   }
-  #E() {
+  #$() {
     if (null == this.#t) {
       return;
     }
     this.#a = !1;
     this.#i = this.#e;
-    this.#I(this.#t);
+    this.#E(this.#t);
   }
   #O(e) {
     if ("EAGAIN" === e.code && null != this.#k) {
@@ -332,7 +332,7 @@ class LogStream extends I {
       setTimeout(() => this.#P(), this.#m);
     }
   }
-  #v(e, t) {
+  #S(e, t) {
     if (e) {
       if ("EAGAIN" === e.code || "EBUSY" === e.code) {
         this.#O(e);
@@ -361,11 +361,11 @@ class LogStream extends I {
     } else if (this.#o && !this.#r) {
       this.#n = !1;
       this.#D();
-    } else if (this.#d.length - this.#p > this.#g) {
+    } else if (this.#d.length - this.#g > this.#p) {
       this.#P();
     } else if (this.#a) {
       this.#n = !1;
-      this.#E();
+      this.#$();
     } else if (this.#r) {
       this.#n = !1;
       this.#D();
@@ -377,24 +377,24 @@ class LogStream extends I {
       }
     }
   }
-  #I(t) {
-    this.#$(i => {
-      S.mkdir(e.dirname(t), {
+  #E(t) {
+    this.#I(i => {
+      v.mkdir(e.dirname(t), {
         recursive: !0
       }, () => {
-        S.open(t, "a", 384, (e, t) => {
+        v.open(t, "a", 384, (e, t) => {
           if (e || null == t) {
             i(e);
             return;
           }
-          S.fchmod(t, 384, () => {
+          v.fchmod(t, 384, () => {
             i(null, t);
           });
         });
       });
     }, t);
   }
-  #$(e, t) {
+  #I(e, t) {
     this.#h = !0;
     this.#n = !0;
     e((e, i, s) => {
@@ -411,14 +411,14 @@ class LogStream extends I {
         this.#n = !1;
         this.emit("ready");
         if (null != n && n !== this.#e && !isStdFd(n)) {
-          fsFsync(n, () => S.close(n, () => {}));
+          fsFsync(n, () => v.close(n, () => {}));
         }
         if (this.#l) {
           return;
         }
         if (this.#o) {
           this.#D();
-        } else if (!this.#n && this.#d.length - this.#p > this.#g || this.#c) {
+        } else if (!this.#n && this.#d.length - this.#g > this.#p || this.#c) {
           this.#P();
         }
       }
@@ -430,9 +430,9 @@ class LogStream extends I {
       return;
     }
     this.#l = !0;
-    this.#g = 0;
-    this.#d.length = 0;
     this.#p = 0;
+    this.#d.length = 0;
+    this.#g = 0;
     const onClose = e => {
       if (e) {
         this.emit("error", e);
@@ -450,7 +450,7 @@ class LogStream extends I {
     }
     fsFsync(this.#e, e => {
       if (!e && this.#s && !isStdFd(this.#e)) {
-        S.close(this.#e, onClose);
+        v.close(this.#e, onClose);
       } else {
         onClose();
       }
@@ -463,7 +463,7 @@ class LogStream extends I {
     }
     this.#D();
   }
-  #x() {
+  #C() {
     if (!this.#w) {
       this.#w = !0;
       setImmediate(this.#_);
@@ -472,22 +472,22 @@ class LogStream extends I {
   #P() {
     this.#n = !0;
     if (!this.#u) {
-      const e = this.#d.length - this.#g;
-      if (e > this.#p) {
-        this.#u = this.#d[this.#p++] || "";
-        while (this.#p < e && this.#u.length < 65536) {
-          this.#u += this.#d[this.#p++];
+      const e = this.#d.length - this.#p;
+      if (e > this.#g) {
+        this.#u = this.#d[this.#g++] || "";
+        while (this.#g < e && this.#u.length < 65536) {
+          this.#u += this.#d[this.#g++];
         }
-        if (this.#p === this.#d.length) {
+        if (this.#g === this.#d.length) {
           this.#d.length = 0;
-          this.#p = 0;
+          this.#g = 0;
         }
       }
     }
     if (null != this.#k && (this.#y || this.#e < 0)) {
       this.#k(this.#u, this.#b);
     } else {
-      S.write(this.#e, this.#u, this.#S);
+      v.write(this.#e, this.#u, this.#v);
     }
   }
   _end() {
@@ -496,7 +496,7 @@ class LogStream extends I {
       if (this.#h) {
         this.once("ready", () => this._end());
       } else if (!this.#n && this.#e >= 0) {
-        if (this.#d.length - this.#p > this.#g) {
+        if (this.#d.length - this.#g > this.#p) {
           this.#P();
         } else {
           this.#D();
@@ -525,7 +525,7 @@ class LogStream extends I {
     }
     if (this.#n || this.#h) {
       this.#o = !0;
-    } else if (this.#d.length - this.#p > this.#g) {
+    } else if (this.#d.length - this.#g > this.#p) {
       this.#o = !0;
       this.#P();
     } else {
@@ -561,7 +561,7 @@ class LogStream extends I {
       this.once("drain", onDrain);
       this.once("error", onError);
       if (!this.#n) {
-        if (this.#d.length - this.#p > this.#g || this.#u) {
+        if (this.#d.length - this.#g > this.#p || this.#u) {
           this.#P();
         } else {
           process.nextTick(() => this.emit("drain"));
@@ -576,7 +576,7 @@ class LogStream extends I {
     this.#f += e.length;
     this.#d.push(e);
     if (!this.#n) {
-      this.#x();
+      this.#C();
     }
     return this.#f < 16384;
   }
@@ -584,7 +584,7 @@ class LogStream extends I {
     if (this.#l) {
       return !1;
     }
-    if (0 === this.#g && 10 === e.charCodeAt(e.length - 1)) {
+    if (0 === this.#p && 10 === e.charCodeAt(e.length - 1)) {
       return this._writeln(e);
     }
     this.#f += e.length;
@@ -592,25 +592,25 @@ class LogStream extends I {
     let i = -1;
     while ((i = e.indexOf("\n", t)) > -1) {
       const s = e.slice(t, i + 1);
-      if (this.#g > 0) {
+      if (this.#p > 0) {
         this.#d[this.#d.length - 1] += s;
       } else {
         this.#d.push(s);
       }
-      this.#g = 0;
+      this.#p = 0;
       t = ++i;
     }
     if (t < e.length) {
       const i = e.slice(t);
-      if (this.#g > 0) {
+      if (this.#p > 0) {
         this.#d[this.#d.length - 1] += i;
       } else {
         this.#d.push(e.slice(t));
       }
-      this.#g = 1;
+      this.#p = 1;
     }
-    if (!this.#n && this.#d.length - this.#p > this.#g) {
-      this.#x();
+    if (!this.#n && this.#d.length - this.#g > this.#p) {
+      this.#C();
     }
     return this.#f < 16384;
   }
@@ -645,43 +645,43 @@ const isStdFd = e => {
 
 const fsFsync = (e, t) => {
   try {
-    S.fsync(e, t);
+    v.fsync(e, t);
   } catch (e) {
     t(e);
   }
 };
 
 class SocketSink {
-  #N;
+  #x;
   constructor(e) {
-    this.#N = e;
+    this.#x = e;
     e.on("error", () => {});
   }
   get writable() {
-    return this.#N.writable;
+    return this.#x.writable;
   }
   get buffered() {
-    return this.#N.writableLength;
+    return this.#x.writableLength;
   }
   _writeln(e) {
-    return this.#N.write(e);
+    return this.#x.write(e);
   }
   end(e) {
-    this.#N.end(e);
+    this.#x.end(e);
     return this;
   }
   destroy() {
-    this.#N.destroy();
+    this.#x.destroy();
   }
 }
 
 class BroadcastChannel {
-  #T;
-  #j=[];
+  #N;
+  #T=[];
   #l=!1;
   constructor(e) {
-    this.#T = e;
-    this.#j.push({
+    this.#N = e;
+    this.#T.push({
       sink: e,
       dropOnBackpressure: !1,
       destroy: () => e.destroy()
@@ -691,8 +691,8 @@ class BroadcastChannel {
     if (this.#l) {
       return !1;
     }
-    for (let e = 0; e < this.#j.length; e++) {
-      if (this.#j[e].sink.writable) {
+    for (let e = 0; e < this.#T.length; e++) {
+      if (this.#T[e].sink.writable) {
         return !0;
       }
     }
@@ -705,7 +705,7 @@ class BroadcastChannel {
     if (this.#l) {
       e.destroy();
     } else {
-      this.#j.push({
+      this.#T.push({
         sink: e,
         dropOnBackpressure: !1,
         destroy: () => e.destroy()
@@ -737,11 +737,11 @@ class BroadcastChannel {
         e.destroy();
       }
     };
-    this.#j.push(i);
+    this.#T.push(i);
     const detach = () => {
-      const e = this.#j.indexOf(i);
+      const e = this.#T.indexOf(i);
       if (e > -1) {
-        this.#j.splice(e, 1);
+        this.#T.splice(e, 1);
       }
       i.destroy();
     };
@@ -768,7 +768,7 @@ class BroadcastChannel {
     e.on("error", () => {});
   }
   _writeln(e) {
-    const t = this.#j;
+    const t = this.#T;
     let i = !1;
     for (let s = t.length - 1; s >= 0; s--) {
       const n = t[s];
@@ -782,24 +782,24 @@ class BroadcastChannel {
     return i;
   }
   flush(e) {
-    if (this.#T.flush) {
-      this.#T.flush(e);
+    if (this.#N.flush) {
+      this.#N.flush(e);
     } else {
       e();
     }
   }
   end(e) {
-    for (const t of this.#j) {
-      t.sink.end(t.sink === this.#T ? e : void 0);
+    for (const t of this.#T) {
+      t.sink.end(t.sink === this.#N ? e : void 0);
     }
     return this;
   }
   destroy() {
     this.#l = !0;
-    for (const e of this.#j) {
+    for (const e of this.#T) {
       e.destroy();
     }
-    this.#j.length = 0;
+    this.#T.length = 0;
   }
 }
 
@@ -809,7 +809,7 @@ function openIpc(e, t = {}) {
   return (t, n) => {
     const r = Date.now();
     const attempt = () => {
-      const o = v.connect(e);
+      const o = S.connect(e);
       let c = !1;
       o.once("connect", () => {
         const e = o._handle?.fd;
@@ -859,10 +859,10 @@ function setLocalProcessOrigin(e) {
 }
 
 function getProcessOrigin() {
-  if (!$) {
+  if (!I) {
     return {
       kind: "worker_thread",
-      id: String(E)
+      id: String($)
     };
   }
   const e = globalThis[M];
@@ -906,11 +906,11 @@ function createSession(t) {
   const n = `${process.pid}-${s.toString(36)}-${Math.random().toString(36).slice(2, 8).padEnd(6, "0")}`;
   const r = e.join(i, n);
   try {
-    S.mkdirSync(r, {
+    v.mkdirSync(r, {
       recursive: !0,
       mode: 448
     });
-    S.chmodSync(i, 448);
+    v.chmodSync(i, 448);
   } catch {}
   const o = t.maxSegments ?? a;
   const c = t.maxSegmentSize ?? u;
@@ -928,24 +928,24 @@ function createSession(t) {
       }
       r = 0;
       !function rotateSegments(t, i) {
-        S.rmSync(e.join(t, i - 1 + ".jsonl"), {
+        v.rmSync(e.join(t, i - 1 + ".jsonl"), {
           force: !0
         });
         for (let s = i - 1; s >= 1; s--) {
           const i = e.join(t, s - 1 + ".jsonl");
           const n = e.join(t, `${s}.jsonl`);
           try {
-            S.renameSync(i, n);
+            v.renameSync(i, n);
           } catch {}
         }
       }(i, s);
       t.reopen();
     });
   }(L, r, o, c);
-  const P = v.createServer(e => _.attach(e));
-  const I = v.createServer(e => _.ingest(e));
-  const $ = d(P, k.path);
-  const E = d(I, b.path);
+  const P = S.createServer(e => _.attach(e));
+  const E = S.createServer(e => _.ingest(e));
+  const I = d(P, k.path);
+  const $ = d(E, b.path);
   const O = function publishIpcPath(e) {
     process.env[l] = e;
     return () => {
@@ -965,7 +965,7 @@ function createSession(t) {
       setLocalProcessOrigin(void 0);
     };
   }();
-  const x = {
+  const C = {
     pid: process.pid,
     formatVersion: m,
     startedAt: s,
@@ -980,21 +980,21 @@ function createSession(t) {
   try {
     !function writeJsonAtomic(e, t) {
       const i = `${e}.${process.pid}.tmp`;
-      S.writeFileSync(i, JSON.stringify(t, null, 2), {
+      v.writeFileSync(i, JSON.stringify(t, null, 2), {
         mode: 384
       });
-      S.renameSync(i, e);
-    }(e.join(r, p.meta), x);
+      v.renameSync(i, e);
+    }(e.join(r, g.meta), C);
   } catch {}
-  let N = !1;
+  let x = !1;
   const destroy = () => {
-    if (N) {
+    if (x) {
       return;
     }
-    N = !0;
+    x = !0;
     _.destroy();
+    I();
     $();
-    E();
     O();
     D();
     w(k.path);
@@ -1020,12 +1020,12 @@ function createSession(t) {
   }(destroy);
   setImmediate(() => {
     try {
-      g();
+      p();
     } catch {}
   });
   return {
     sessionDir: r,
-    meta: x,
+    meta: C,
     sink: _,
     destroy
   };
@@ -1048,11 +1048,45 @@ function createSessionOrigin() {
 
 const U = events("root");
 
-function installEventLogger(e) {
+function installChildEventLogger(e) {
   if (D.primarySink) {
-    return;
+    return !0;
   }
+  const t = function getProcessWorkerId() {
+    const e = getProcessOrigin();
+    return e ? `${e.kind}:${e.id}` : void 0;
+  }();
+  if (t) {
+    D.eventMeta = {
+      _w: t
+    };
+  }
+  const i = function getParentIpcPath() {
+    return process.env[l];
+  }();
+  if (i) {
+    D.debug = e?.debug ?? !!process.env[o];
+    !function connectToParent(e) {
+      D.primarySink = createPrimarySink(openIpc(e), {
+        closeFd: !1
+      });
+      D.eventLoggerInfo = {
+        destination: "ipc",
+        isUserVisibleOutput: !1
+      };
+      U("init", getInitMetadata());
+    }(i);
+    return !0;
+  } else {
+    return !1;
+  }
+}
+
+function installEventLogger(e) {
   const t = e && "object" == typeof e ? e : void 0;
+  if (installChildEventLogger(t)) {
+    return;
+  }
   const i = parseLogTarget(process.env[k]) ?? parseLogTarget("string" == typeof e || "number" == typeof e ? e : void 0);
   if (null != i) {
     if ("number" == typeof i) {
@@ -1076,32 +1110,6 @@ function installEventLogger(e) {
     activateSink(createPrimarySink(i));
     return;
   }
-  const s = function getParentIpcPath() {
-    return process.env[l];
-  }();
-  if (s) {
-    D.debug = t?.debug ?? !!process.env[o];
-    !function connectToParent(e) {
-      const t = function getProcessWorkerId() {
-        const e = getProcessOrigin();
-        return e ? `${e.kind}:${e.id}` : void 0;
-      }();
-      if (t) {
-        D.eventMeta = {
-          _w: t
-        };
-      }
-      D.primarySink = createPrimarySink(openIpc(e), {
-        closeFd: !1
-      });
-      D.eventLoggerInfo = {
-        destination: "ipc",
-        isUserVisibleOutput: !1
-      };
-      U("init", getInitMetadata());
-    }(s);
-    return;
-  }
   if (t && !1 !== t.session) {
     D.debug = t.debug ?? !!process.env[o];
     const e = createSession(t);
@@ -1173,5 +1181,7 @@ function activateSink(e, t) {
   U("init", getInitMetadata(t));
 }
 
-export { events, flushEventLogger, getEventLoggerInfo, installEventLogger };
+installChildEventLogger();
+
+export { events, flushEventLogger, getEventLoggerInfo, installChildEventLogger, installEventLogger };
 //# sourceMappingURL=2g.mjs.map