2g 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 2g
 
+## 0.3.1
+
+### Patch Changes
+
+- ⚠️ Fix missing child `_w` IDs on piped events and auto-install in child workers
+  Submitted by [@kitten](https://github.com/kitten) (See [#8](https://github.com/kitten/2g/pull/8))
+
 ## 0.3.0
 
 ### Minor Changes

package/dist/2g.d.ts

@@ -27,11 +27,19 @@ interface InstallEventLoggerOptions extends SessionOptions {
   session?: boolean;
   debug?: boolean;
 }
+declare function installChildEventLogger(options?: InstallEventLoggerOptions): boolean;
 declare function installEventLogger(
   targetOrOptions?: string | number | InstallEventLoggerOptions
 ): void;
 declare const getEventLoggerInfo: () => EventLoggerInfo | null;
 declare function flushEventLogger(): Promise<void>;
 
-export { EventLogger, events, flushEventLogger, getEventLoggerInfo, installEventLogger };
+export {
+  EventLogger,
+  events,
+  flushEventLogger,
+  getEventLoggerInfo,
+  installChildEventLogger,
+  installEventLogger,
+};
 export type { EventLoggerInfo, InstallEventLoggerOptions };

package/dist/2g.js

@@ -39,9 +39,9 @@ const d = Array.from({
 
 let f = -1;
 
-let p = "";
+let g = "";
 
-let g;
+let p;
 
 let y = "";
 
@@ -88,14 +88,14 @@ function stringifyTimestamp() {
   const i = Math.floor(e);
   if (i !== f) {
     f = i;
-    p = `${i}`;
+    g = `${i}`;
   }
-  return p + d[1e3 * (e - i) | 0];
+  return g + d[1e3 * (e - i) | 0];
 }
 
 function stringifyWorkerId(e) {
-  if (e !== g) {
-    g = e;
+  if (e !== p) {
+    p = e;
     y = JSON.stringify(e);
   }
   return y;
@@ -245,25 +245,25 @@ class LogStream extends c.EventEmitter {
   #u="";
   #d=0;
   #f=[];
-  #p=0;
   #g=0;
+  #p=0;
   #y=0;
   #m=!1;
   #S=!1;
-  #w;
-  #v=(e, t) => {
-    this.#_(e, t);
+  #v;
+  #w=(e, t) => {
+    this.#E(e, t);
   };
-  #k=e => {
+  #_=e => {
     if (null != e) {
-      this.#E(e);
+      this.#k(e);
     } else {
-      this.#_(null, o.Buffer.byteLength(this.#u));
+      this.#E(null, o.Buffer.byteLength(this.#u));
     }
   };
   #L=() => {
     this.#S = !1;
-    if (!this.#n && !this.#l && (this.#f.length - this.#p > this.#g || this.#u)) {
+    if (!this.#n && !this.#l && (this.#f.length - this.#g > this.#p || this.#u)) {
       this.#b();
     }
   };
@@ -325,9 +325,9 @@ class LogStream extends c.EventEmitter {
     this.#I(this.#t);
   }
   #P(e) {
-    if ("EAGAIN" === e.code && null != this.#w) {
+    if ("EAGAIN" === e.code && null != this.#v) {
       this.#m = !0;
-      this.#w(this.#u, this.#k);
+      this.#v(this.#u, this.#_);
     } else if (0 === this.#y) {
       this.#y = 1;
       setImmediate(() => this.#b());
@@ -336,12 +336,12 @@ class LogStream extends c.EventEmitter {
       setTimeout(() => this.#b(), this.#y);
     }
   }
-  #_(e, t) {
+  #E(e, t) {
     if (e) {
       if ("EAGAIN" === e.code || "EBUSY" === e.code) {
         this.#P(e);
       } else {
-        this.#E(e);
+        this.#k(e);
       }
       return;
     }
@@ -365,7 +365,7 @@ class LogStream extends c.EventEmitter {
     } else if (this.#o && !this.#r) {
       this.#n = !1;
       this.#T();
-    } else if (this.#f.length - this.#p > this.#g) {
+    } else if (this.#f.length - this.#g > this.#p) {
       this.#b();
     } else if (this.#a) {
       this.#n = !1;
@@ -406,11 +406,11 @@ class LogStream extends c.EventEmitter {
       this.#i = null;
       if (e) {
         this.#h = !1;
-        this.#E(e);
+        this.#k(e);
       } else {
         this.#e = i ?? -1;
         this.#t = t;
-        this.#w = n;
+        this.#v = n;
         this.#h = !1;
         this.#n = !1;
         this.emit("ready");
@@ -422,7 +422,7 @@ class LogStream extends c.EventEmitter {
         }
         if (this.#o) {
           this.#T();
-        } else if (!this.#n && this.#f.length - this.#p > this.#g || this.#c) {
+        } else if (!this.#n && this.#f.length - this.#g > this.#p || this.#c) {
           this.#b();
         }
       }
@@ -434,9 +434,9 @@ class LogStream extends c.EventEmitter {
       return;
     }
     this.#l = !0;
-    this.#g = 0;
-    this.#f.length = 0;
     this.#p = 0;
+    this.#f.length = 0;
+    this.#g = 0;
     const onClose = e => {
       if (e) {
         this.emit("error", e);
@@ -460,7 +460,7 @@ class LogStream extends c.EventEmitter {
       }
     });
   }
-  #E(e) {
+  #k(e) {
     this.#n = !1;
     if (this.listenerCount("error")) {
       this.emit("error", e);
@@ -476,22 +476,22 @@ class LogStream extends c.EventEmitter {
   #b() {
     this.#n = !0;
     if (!this.#u) {
-      const e = this.#f.length - this.#g;
-      if (e > this.#p) {
-        this.#u = this.#f[this.#p++] || "";
-        while (this.#p < e && this.#u.length < 65536) {
-          this.#u += this.#f[this.#p++];
+      const e = this.#f.length - this.#p;
+      if (e > this.#g) {
+        this.#u = this.#f[this.#g++] || "";
+        while (this.#g < e && this.#u.length < 65536) {
+          this.#u += this.#f[this.#g++];
         }
-        if (this.#p === this.#f.length) {
+        if (this.#g === this.#f.length) {
           this.#f.length = 0;
-          this.#p = 0;
+          this.#g = 0;
         }
       }
     }
-    if (null != this.#w && (this.#m || this.#e < 0)) {
-      this.#w(this.#u, this.#k);
+    if (null != this.#v && (this.#m || this.#e < 0)) {
+      this.#v(this.#u, this.#_);
     } else {
-      s.write(this.#e, this.#u, this.#v);
+      s.write(this.#e, this.#u, this.#w);
     }
   }
   _end() {
@@ -500,7 +500,7 @@ class LogStream extends c.EventEmitter {
       if (this.#h) {
         this.once("ready", () => this._end());
       } else if (!this.#n && this.#e >= 0) {
-        if (this.#f.length - this.#p > this.#g) {
+        if (this.#f.length - this.#g > this.#p) {
           this.#b();
         } else {
           this.#T();
@@ -529,7 +529,7 @@ class LogStream extends c.EventEmitter {
     }
     if (this.#n || this.#h) {
       this.#o = !0;
-    } else if (this.#f.length - this.#p > this.#g) {
+    } else if (this.#f.length - this.#g > this.#p) {
       this.#o = !0;
       this.#b();
     } else {
@@ -565,7 +565,7 @@ class LogStream extends c.EventEmitter {
       this.once("drain", onDrain);
       this.once("error", onError);
       if (!this.#n) {
-        if (this.#f.length - this.#p > this.#g || this.#u) {
+        if (this.#f.length - this.#g > this.#p || this.#u) {
           this.#b();
         } else {
           process.nextTick(() => this.emit("drain"));
@@ -588,7 +588,7 @@ class LogStream extends c.EventEmitter {
     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.#d += e.length;
@@ -596,24 +596,24 @@ class LogStream extends c.EventEmitter {
     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.#f[this.#f.length - 1] += s;
       } else {
         this.#f.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.#f[this.#f.length - 1] += i;
       } else {
         this.#f.push(e.slice(t));
       }
-      this.#g = 1;
+      this.#p = 1;
     }
-    if (!this.#n && this.#f.length - this.#p > this.#g) {
+    if (!this.#n && this.#f.length - this.#g > this.#p) {
       this.#$();
     }
     return this.#d < 16384;
@@ -680,12 +680,12 @@ class SocketSink {
 }
 
 class BroadcastChannel {
-  #V;
-  #D=[];
+  #C;
+  #V=[];
   #l=!1;
   constructor(e) {
-    this.#V = e;
-    this.#D.push({
+    this.#C = e;
+    this.#V.push({
       sink: e,
       dropOnBackpressure: !1,
       destroy: () => e.destroy()
@@ -695,8 +695,8 @@ class BroadcastChannel {
     if (this.#l) {
       return !1;
     }
-    for (let e = 0; e < this.#D.length; e++) {
-      if (this.#D[e].sink.writable) {
+    for (let e = 0; e < this.#V.length; e++) {
+      if (this.#V[e].sink.writable) {
         return !0;
       }
     }
@@ -709,7 +709,7 @@ class BroadcastChannel {
     if (this.#l) {
       e.destroy();
     } else {
-      this.#D.push({
+      this.#V.push({
         sink: e,
         dropOnBackpressure: !1,
         destroy: () => e.destroy()
@@ -741,11 +741,11 @@ class BroadcastChannel {
         e.destroy();
       }
     };
-    this.#D.push(i);
+    this.#V.push(i);
     const detach = () => {
-      const e = this.#D.indexOf(i);
+      const e = this.#V.indexOf(i);
       if (e > -1) {
-        this.#D.splice(e, 1);
+        this.#V.splice(e, 1);
       }
       i.destroy();
     };
@@ -772,7 +772,7 @@ class BroadcastChannel {
     e.on("error", () => {});
   }
   _writeln(e) {
-    const t = this.#D;
+    const t = this.#V;
     let i = !1;
     for (let s = t.length - 1; s >= 0; s--) {
       const n = t[s];
@@ -786,24 +786,24 @@ class BroadcastChannel {
     return i;
   }
   flush(e) {
-    if (this.#V.flush) {
-      this.#V.flush(e);
+    if (this.#C.flush) {
+      this.#C.flush(e);
     } else {
       e();
     }
   }
   end(e) {
-    for (const t of this.#D) {
-      t.sink.end(t.sink === this.#V ? e : void 0);
+    for (const t of this.#V) {
+      t.sink.end(t.sink === this.#C ? e : void 0);
     }
     return this;
   }
   destroy() {
     this.#l = !0;
-    for (const e of this.#D) {
+    for (const e of this.#V) {
       e.destroy();
     }
-    this.#D.length = 0;
+    this.#V.length = 0;
   }
 }
 
@@ -921,8 +921,8 @@ function createSession(t) {
   const u = i.createSocketAddress(l, c, "live");
   const d = i.createSocketAddress(l, c, "ipc");
   const f = new LogStream(e.join(l, "0.jsonl"));
-  const p = new BroadcastChannel(f);
-  p.add(createDebugSink());
+  const g = new BroadcastChannel(f);
+  g.add(createDebugSink());
   !function trackSegmentRotation(t, i, n, r) {
     let o = 0;
     t.on("write", c => {
@@ -946,11 +946,11 @@ function createSession(t) {
       t.reopen();
     });
   }(f, l, h, a);
-  const g = n.createServer(e => p.attach(e));
-  const y = n.createServer(e => p.ingest(e));
-  const m = i.listenSocket(g, u.path);
+  const p = n.createServer(e => g.attach(e));
+  const y = n.createServer(e => g.ingest(e));
+  const m = i.listenSocket(p, u.path);
   const S = i.listenSocket(y, d.path);
-  const w = function publishIpcPath(e) {
+  const v = function publishIpcPath(e) {
     process.env[i.INTERNAL_IPC_ENV] = e;
     return () => {
       if (process.env[i.INTERNAL_IPC_ENV] === e) {
@@ -958,7 +958,7 @@ function createSession(t) {
       }
     };
   }(d.path);
-  const v = function publishProcessOrigin() {
+  const w = function publishProcessOrigin() {
     const e = String(process.pid);
     process.env[i.INTERNAL_PROCESS_ORIGIN_ENV] = e;
     setLocalProcessOrigin(e);
@@ -969,7 +969,7 @@ function createSession(t) {
       setLocalProcessOrigin(void 0);
     };
   }();
-  const _ = {
+  const E = {
     pid: process.pid,
     formatVersion: i.EVENT_LOG_FORMAT_VERSION,
     startedAt: o,
@@ -988,19 +988,19 @@ function createSession(t) {
         mode: 384
       });
       s.renameSync(i, e);
-    }(e.join(l, i.SESSION_FILES.meta), _);
+    }(e.join(l, i.SESSION_FILES.meta), E);
   } catch {}
-  let k = !1;
+  let _ = !1;
   const destroy = () => {
-    if (k) {
+    if (_) {
       return;
     }
-    k = !0;
-    p.destroy();
+    _ = !0;
+    g.destroy();
     m();
     S();
-    w();
     v();
+    w();
     i.removeSocket(u.path);
     i.removeSocket(d.path);
   };
@@ -1029,8 +1029,8 @@ function createSession(t) {
   });
   return {
     sessionDir: l,
-    meta: _,
-    sink: p,
+    meta: E,
+    sink: g,
     destroy
   };
 }
@@ -1050,7 +1050,41 @@ function createSessionOrigin() {
   };
 }
 
-const w = events("root");
+const v = events("root");
+
+function installChildEventLogger(e) {
+  if (a.primarySink) {
+    return !0;
+  }
+  const t = function getProcessWorkerId() {
+    const e = getProcessOrigin();
+    return e ? `${e.kind}:${e.id}` : void 0;
+  }();
+  if (t) {
+    a.eventMeta = {
+      _w: t
+    };
+  }
+  const s = function getParentIpcPath() {
+    return process.env[i.INTERNAL_IPC_ENV];
+  }();
+  if (s) {
+    a.debug = e?.debug ?? !!process.env[i.LOG_DEBUG_ENV];
+    !function connectToParent(e) {
+      a.primarySink = createPrimarySink(openIpc(e), {
+        closeFd: !1
+      });
+      a.eventLoggerInfo = {
+        destination: "ipc",
+        isUserVisibleOutput: !1
+      };
+      v("init", getInitMetadata());
+    }(s);
+    return !0;
+  } else {
+    return !1;
+  }
+}
 
 function parseLogTarget(t) {
   if ("number" == typeof t) {
@@ -1093,9 +1127,11 @@ function getInitMetadata(e) {
 
 function activateSink(e, t) {
   a.primarySink = e;
-  w("init", getInitMetadata(t));
+  v("init", getInitMetadata(t));
 }
 
+installChildEventLogger();
+
 exports.events = events;
 
 exports.flushEventLogger = function flushEventLogger() {
@@ -1111,11 +1147,13 @@ exports.flushEventLogger = function flushEventLogger() {
 
 exports.getEventLoggerInfo = () => a.primarySink?.writable ? a.eventLoggerInfo : null;
 
+exports.installChildEventLogger = installChildEventLogger;
+
 exports.installEventLogger = function installEventLogger(e) {
-  if (a.primarySink) {
+  const t = e && "object" == typeof e ? e : void 0;
+  if (installChildEventLogger(t)) {
     return;
   }
-  const t = e && "object" == typeof e ? e : void 0;
   const s = parseLogTarget(process.env[i.LOG_EVENTS_ENV]) ?? parseLogTarget("string" == typeof e || "number" == typeof e ? e : void 0);
   if (null != s) {
     if ("number" == typeof s) {
@@ -1139,32 +1177,6 @@ exports.installEventLogger = function installEventLogger(e) {
     activateSink(createPrimarySink(s));
     return;
   }
-  const n = function getParentIpcPath() {
-    return process.env[i.INTERNAL_IPC_ENV];
-  }();
-  if (n) {
-    a.debug = t?.debug ?? !!process.env[i.LOG_DEBUG_ENV];
-    !function connectToParent(e) {
-      const t = function getProcessWorkerId() {
-        const e = getProcessOrigin();
-        return e ? `${e.kind}:${e.id}` : void 0;
-      }();
-      if (t) {
-        a.eventMeta = {
-          _w: t
-        };
-      }
-      a.primarySink = createPrimarySink(openIpc(e), {
-        closeFd: !1
-      });
-      a.eventLoggerInfo = {
-        destination: "ipc",
-        isUserVisibleOutput: !1
-      };
-      w("init", getInitMetadata());
-    }(n);
-    return;
-  }
   if (t && !1 !== t.session) {
     a.debug = t.debug ?? !!process.env[i.LOG_DEBUG_ENV];
     const e = createSession(t);