@tencent-weixin/openclaw-weixin 2.3.1 → 2.4.2

package/dist/src/streaming/stream-session.js

@@ -0,0 +1,260 @@
+import { StreamingMarkdownFilter } from "../messaging/markdown-filter.js";
+import { findFenceSpanAt, parseFenceSpans } from "../util/markdown-fences.js";
+/**
+ * Matches every line starting with `WEIXIN_BUTTONS:` in the text. Kept in
+ * sync with INLINE_BUTTONS_RE in messaging/buttons.ts so the streaming
+ * suppressor drops exactly what parseInlineButtons later strips at deliver
+ * — including the fence-aware skip (a marker inside a code block is treated
+ * as literal documentation, never suppressed and never stripped).
+ */
+const MARKER_LINE_START_RE = /^WEIXIN_BUTTONS:/gm;
+function stripReasoningFormat(text) {
+    let s = text;
+    if (s.startsWith("Reasoning:\n"))
+        s = s.slice("Reasoning:\n".length);
+    else if (s.startsWith("Reasoning:"))
+        s = s.slice("Reasoning:".length);
+    else
+        return text;
+    return s.split("\n").map((line) => {
+        if (line.startsWith("_") && line.endsWith("_") && line.length >= 2) {
+            return line.slice(1, -1);
+        }
+        if (line.startsWith("_"))
+            return line.slice(1);
+        if (line.endsWith("_"))
+            return line.slice(0, -1);
+        return line;
+    }).join("\n");
+}
+/**
+ * Thin synchronous adapter that converts SDK callbacks into pipeline commands.
+ *
+ * Handles only text-processing concerns (delta extraction, markdown filtering,
+ * reasoning format stripping).  All async protocol work is delegated to the
+ * StreamPipeline via `push()`.
+ */
+export class StreamSession {
+    pipeline;
+    log;
+    // -- text processing (synchronous) --
+    prevReasoningText = "";
+    prevPartialText = "";
+    thinkingMdFilter = new StreamingMarkdownFilter();
+    resultMdFilter = new StreamingMarkdownFilter();
+    resultFilteredAccum = "";
+    // -- WEIXIN_BUTTONS suppression for streaming --
+    _buttonsLineSuppressed = false;
+    // -- debug/logging --
+    thinkingSegments = [];
+    // -- deliver payload (managed locally, not a pipeline command) --
+    _lastDeliverPayload;
+    _finalTextCache;
+    // -- TEMP DEBUG: track MEDIA: directive presence in raw stream --
+    _mediaDebugSeenAt;
+    _mediaDebugFirstSnippet;
+    constructor(opts) {
+        this.pipeline = opts.pipeline;
+        this.log = opts.log;
+    }
+    /** Reply callbacks to spread into replyOptions. */
+    get replyCallbacks() {
+        return {
+            onReasoningStream: (p) => this.onReasoningStream(p),
+            onReasoningEnd: () => this.onReasoningEnd(),
+            onToolStart: (p) => this.onToolStart(p),
+            onAssistantMessageStart: () => this.onAssistantMessageStart(),
+            onPartialReply: (p) => this.onPartialReply(p),
+        };
+    }
+    bufferDeliverPayload(payload) {
+        this._lastDeliverPayload = payload;
+        this._finalTextCache = undefined;
+    }
+    get lastDeliverPayload() { return this._lastDeliverPayload; }
+    get streamId() { return this.pipeline.resultStreamId; }
+    get hadStreaming() { return this.pipeline.hadStreaming; }
+    /**
+     * One-shot markdown-filtered version of the deliver text.
+     * Result is memoized; invalidated when bufferDeliverPayload is called.
+     */
+    getFinalText() {
+        if (!this._lastDeliverPayload)
+            return "";
+        if (this._finalTextCache !== undefined)
+            return this._finalTextCache;
+        const f = new StreamingMarkdownFilter();
+        this._finalTextCache = f.feed(this._lastDeliverPayload.text) + f.flush();
+        return this._finalTextCache;
+    }
+    /** Flush filters, push finalize command, and wait for the pipeline to drain. */
+    async finalize() {
+        this.log.debug(`stream-cb: finalize hadDeliver=${this._lastDeliverPayload != null} resultAccumLen=${this.resultFilteredAccum.length} prevPartialLen=${this.prevPartialText.length}`);
+        // [MEDIA-DEBUG] Dump the tail of the raw accumulated text so we can compare
+        // against the deliver payload (which has MEDIA: stripped by the host).
+        {
+            const raw = this.prevPartialText;
+            const tail = raw.slice(-300).replaceAll("\n", "\\n");
+            const hasMedia = /\bmedia:/i.test(raw);
+            const allMediaMatches = hasMedia
+                ? Array.from(raw.matchAll(/\bMEDIA:[^\n]*/gi)).map((m) => m[0])
+                : [];
+            this.log.info(`[media-debug] finalize rawLen=${raw.length} hasMediaInRaw=${hasMedia} mediaLines=${JSON.stringify(allMediaMatches)} tail="${tail}"`);
+            if (this._lastDeliverPayload) {
+                const dt = this._lastDeliverPayload.text ?? "";
+                this.log.info(`[media-debug] finalize deliver payload textLen=${dt.length} mediaUrl=${this._lastDeliverPayload.mediaUrl ?? "none"} deliverHasMedia=${/\bmedia:/i.test(dt)} deliverTail="${dt.slice(-300).replaceAll("\n", "\\n")}"`);
+            }
+            else {
+                this.log.info(`[media-debug] finalize no deliver payload buffered`);
+            }
+        }
+        // Thinking filter is flushed by onReasoningEnd(); we don't flush it again
+        // here to avoid pushing stale thinking text into a result-phase pipeline.
+        if (this.prevReasoningText) {
+            this.thinkingSegments.push({ type: "text", text: this.prevReasoningText });
+            this.prevReasoningText = "";
+        }
+        this.log.debug(`stream: thinking segments=${JSON.stringify(this.thinkingSegments)}`);
+        // Flush result markdown filter → push remaining as result text
+        const resultRemaining = this.resultMdFilter.flush();
+        if (resultRemaining) {
+            this.resultFilteredAccum += resultRemaining;
+            this.pipeline.push({ kind: "result", text: resultRemaining });
+        }
+        // Check for gap between streamed accum and one-shot filtered deliver text.
+        // Only fill the gap when some result text was already streamed — otherwise
+        // (e.g. synchronous command replies like /models) pushing a fresh "result"
+        // would force the pipeline to start a brand-new streaming phase for a
+        // single buffered payload, costing ~2s of extra HTTP round-trips.  In the
+        // thinking-only → deliver case the pipeline's doFinalize handles the
+        // late thinking→result transition via its own _hadStreaming branch.
+        if (this._lastDeliverPayload && this.resultFilteredAccum.length > 0) {
+            const fullFiltered = this.getFinalText();
+            if (fullFiltered.length > this.resultFilteredAccum.length &&
+                fullFiltered.startsWith(this.resultFilteredAccum)) {
+                const gap = fullFiltered.slice(this.resultFilteredAccum.length);
+                this.pipeline.push({ kind: "result", text: gap });
+            }
+        }
+        this.pipeline.push({
+            kind: "finalize",
+            deliverText: this.getFinalText() || undefined,
+        });
+        await this.pipeline.drain();
+    }
+    async abort(errorMsg) {
+        await this.pipeline.abort(errorMsg);
+    }
+    // ---- SDK callbacks (all synchronous, just push commands) ----
+    onReasoningStream(payload) {
+        const rawText = payload.text ?? "";
+        const stripped = stripReasoningFormat(rawText);
+        if (stripped === this.prevReasoningText)
+            return;
+        const isRefresh = !stripped.startsWith(this.prevReasoningText);
+        const delta = isRefresh ? stripped : stripped.slice(this.prevReasoningText.length);
+        this.prevReasoningText = stripped;
+        if (!delta)
+            return;
+        if (isRefresh) {
+            this.thinkingMdFilter = new StreamingMarkdownFilter();
+        }
+        const filtered = this.thinkingMdFilter.feed(delta);
+        if (!filtered)
+            return;
+        if (isRefresh) {
+            this.pipeline.push({ kind: "thinking_refresh", text: filtered });
+        }
+        else {
+            this.pipeline.push({ kind: "thinking", text: filtered });
+        }
+    }
+    onReasoningEnd() {
+        this.log.debug(`stream-cb: onReasoningEnd`);
+        const remaining = this.thinkingMdFilter.flush();
+        if (remaining) {
+            this.pipeline.push({ kind: "thinking", text: remaining });
+        }
+        if (this.prevReasoningText) {
+            this.thinkingSegments.push({ type: "text", text: this.prevReasoningText });
+            this.prevReasoningText = "";
+        }
+    }
+    onToolStart(payload) {
+        this.log.debug(`stream-cb: onToolStart name=${payload.name ?? "?"} phase=${payload.phase ?? "?"}`);
+        const phase = payload.phase === "complete" ? "end"
+            : payload.phase === "running" ? "continue"
+                : "start";
+        if (phase === "start") {
+            this.thinkingSegments.push({ type: "tool_calling", name: payload.name });
+        }
+        this.pipeline.push({ kind: "tool_call", name: payload.name, phase: phase });
+    }
+    onAssistantMessageStart() {
+        this.log.debug(`stream-cb: onAssistantMessageStart`);
+        this.prevPartialText = "";
+        this.resultFilteredAccum = "";
+        this.resultMdFilter = new StreamingMarkdownFilter();
+        this._buttonsLineSuppressed = false;
+    }
+    onPartialReply(payload) {
+        const fullText = payload.text ?? "";
+        if (this._buttonsLineSuppressed) {
+            this.prevPartialText = fullText;
+            return;
+        }
+        const prevLen = this.prevPartialText.length;
+        const rawDelta = fullText.slice(prevLen);
+        this.prevPartialText = fullText;
+        if (!rawDelta)
+            return;
+        // [MEDIA-DEBUG] Detect MEDIA: directive appearance in raw stream so we can
+        // verify whether the host strips it before deliver. Logs once per stream.
+        if (this._mediaDebugSeenAt === undefined && /\bmedia:/i.test(fullText)) {
+            this._mediaDebugSeenAt = fullText.search(/\bmedia:/i);
+            const start = Math.max(0, this._mediaDebugSeenAt - 40);
+            const end = Math.min(fullText.length, this._mediaDebugSeenAt + 200);
+            this._mediaDebugFirstSnippet = fullText.slice(start, end).replaceAll("\n", "\\n");
+            this.log.info(`[media-debug] MEDIA: seen in raw stream at offset=${this._mediaDebugSeenAt} fullLen=${fullText.length} snippet="${this._mediaDebugFirstSnippet}"`);
+        }
+        // Detect WEIXIN_BUTTONS: marker anywhere in the accumulated text. We mirror
+        // the recognition rule used by parseInlineButtons (/^WEIXIN_BUTTONS:/m —
+        // start of any line, fence-aware), so whatever gets stripped at deliver-time
+        // also gets suppressed in the live stream, regardless of whether the marker
+        // is at the tail, followed by trailing newline, or followed by more content.
+        // Markers inside an (open or closed) markdown code fence are treated as
+        // literal documentation and never suppressed.
+        const fenceSpans = parseFenceSpans(fullText);
+        const re = new RegExp(MARKER_LINE_START_RE.source, MARKER_LINE_START_RE.flags);
+        let markerStart = -1;
+        let m;
+        while ((m = re.exec(fullText)) !== null) {
+            if (!findFenceSpanAt(fenceSpans, m.index)) {
+                markerStart = m.index;
+                break;
+            }
+        }
+        if (markerStart >= 0) {
+            this._buttonsLineSuppressed = true;
+            // Push the portion of the delta that lies BEFORE the marker start.
+            // Anything from markerStart onwards (marker itself + any future tokens)
+            // is dropped from the stream.
+            const deltaCutoff = Math.max(0, markerStart - prevLen);
+            const deltaBeforeMarker = rawDelta.slice(0, deltaCutoff);
+            if (deltaBeforeMarker) {
+                const filteredDelta = this.resultMdFilter.feed(deltaBeforeMarker);
+                if (filteredDelta) {
+                    this.resultFilteredAccum += filteredDelta;
+                    this.pipeline.push({ kind: "result", text: filteredDelta });
+                }
+            }
+            return;
+        }
+        const filteredDelta = this.resultMdFilter.feed(rawDelta);
+        if (filteredDelta) {
+            this.resultFilteredAccum += filteredDelta;
+            this.pipeline.push({ kind: "result", text: filteredDelta });
+        }
+    }
+}
+//# sourceMappingURL=stream-session.js.map

package/dist/src/streaming/stream-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-session.js","sourceRoot":"","sources":["../../../src/streaming/stream-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG9E;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAelD,SAAS,oBAAoB,CAAC,IAAY;IACxC,IAAI,CAAC,GAAG,IAAI,CAAC;IACb,IAAI,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC;QAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SAChE,IAAI,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;;QACjE,OAAO,IAAI,CAAC;IACjB,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAChC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACnE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAO,aAAa;IACP,QAAQ,CAAiB;IACzB,GAAG,CAAY;IAEhC,sCAAsC;IAC9B,iBAAiB,GAAG,EAAE,CAAC;IACvB,eAAe,GAAG,EAAE,CAAC;IACrB,gBAAgB,GAAG,IAAI,uBAAuB,EAAE,CAAC;IACjD,cAAc,GAAG,IAAI,uBAAuB,EAAE,CAAC;IAC/C,mBAAmB,GAAG,EAAE,CAAC;IAEjC,iDAAiD;IACzC,sBAAsB,GAAG,KAAK,CAAC;IAEvC,sBAAsB;IACd,gBAAgB,GAAsB,EAAE,CAAC;IAEjD,kEAAkE;IAC1D,mBAAmB,CAAkD;IACrE,eAAe,CAAqB;IAE5C,kEAAkE;IAC1D,iBAAiB,CAAqB;IACtC,uBAAuB,CAAqB;IAEpD,YAAY,IAA0B;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACtB,CAAC;IAED,mDAAmD;IACnD,IAAI,cAAc;QAChB,OAAO;YACL,iBAAiB,EAAE,CAAC,CAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtE,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE;YAC3C,WAAW,EAAE,CAAC,CAAoC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;YAC1E,uBAAuB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,EAAE;YAC7D,cAAc,EAAE,CAAC,CAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;SACjE,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,OAA4C;QAC/D,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;IACnC,CAAC;IAED,IAAI,kBAAkB,KAAK,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAC7D,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IACvD,IAAI,YAAY,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;IAEzD;;;OAGG;IACH,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,mBAAmB;YAAE,OAAO,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,eAAe,CAAC;QACpE,MAAM,CAAC,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACxC,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;QACzE,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,gFAAgF;IAChF,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,kCAAkC,IAAI,CAAC,mBAAmB,IAAI,IAAI,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,MAAM,mBAAmB,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CACrK,CAAC;QAEF,4EAA4E;QAC5E,uEAAuE;QACvE,CAAC;YACC,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC;YACjC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvC,MAAM,eAAe,GAAG,QAAQ;gBAC9B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/D,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,iCAAiC,GAAG,CAAC,MAAM,kBAAkB,QAAQ,eAAe,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,UAAU,IAAI,GAAG,CACrI,CAAC;YACF,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,IAAI,EAAE,CAAC;gBAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,kDAAkD,EAAE,CAAC,MAAM,aAAa,IAAI,CAAC,mBAAmB,CAAC,QAAQ,IAAI,MAAM,oBAAoB,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CACtN,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QACD,0EAA0E;QAC1E,0EAA0E;QAC1E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAErF,+DAA+D;QAC/D,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QACpD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,CAAC,mBAAmB,IAAI,eAAe,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,2EAA2E;QAC3E,2EAA2E;QAC3E,2EAA2E;QAC3E,sEAAsE;QACtE,0EAA0E;QAC1E,qEAAqE;QACrE,oEAAoE;QACpE,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpE,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,IACE,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM;gBACrD,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,EACjD,CAAC;gBACD,MAAM,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBAChE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,SAAS;SAC9C,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAiB;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,gEAAgE;IAExD,iBAAiB,CAAC,OAA0B;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,QAAQ,KAAK,IAAI,CAAC,iBAAiB;YAAE,OAAO;QAEhD,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEnF,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC;QAClC,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,gBAAgB,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACxD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAChD,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,OAA0C;QAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,OAAO,CAAC,IAAI,IAAI,GAAG,UAAU,OAAO,CAAC,KAAK,IAAI,GAAG,EAAE,CAAC,CAAC;QACnG,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK;YAChD,CAAC,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU;gBAC1C,CAAC,CAAC,OAAO,CAAC;QACZ,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;YACtB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAqC,EAAE,CAAC,CAAC;IAC9G,CAAC;IAEO,uBAAuB;QAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpD,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC;IACtC,CAAC;IAEO,cAAc,CAAC,OAA0B;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAChC,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;QAChC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,2EAA2E;QAC3E,0EAA0E;QAC1E,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC;YACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,CAAC;YACpE,IAAI,CAAC,uBAAuB,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAClF,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,qDAAqD,IAAI,CAAC,iBAAiB,YAAY,QAAQ,CAAC,MAAM,aAAa,IAAI,CAAC,uBAAuB,GAAG,CACnJ,CAAC;QACJ,CAAC;QAED,4EAA4E;QAC5E,yEAAyE;QACzE,6EAA6E;QAC7E,4EAA4E;QAC5E,6EAA6E;QAC7E,wEAAwE;QACxE,8CAA8C;QAC9C,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QACrB,IAAI,CAAyB,CAAC;QAC9B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1C,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC;gBACtB,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;YACnC,mEAAmE;YACnE,wEAAwE;YACxE,8BAA8B;YAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC;YACvD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;YACzD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAClE,IAAI,aAAa,EAAE,CAAC;oBAClB,IAAI,CAAC,mBAAmB,IAAI,aAAa,CAAC;oBAC1C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,mBAAmB,IAAI,aAAa,CAAC;YAC1C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;CACF"}

package/dist/src/streaming/stream.js

@@ -0,0 +1,239 @@
+import crypto from "node:crypto";
+import { initStream, syncStream } from "../api/api.js";
+import { AbortType } from "../api/types.js";
+import { getOrCreateDeviceId } from "../auth/accounts.js";
+import { logger } from "../util/logger.js";
+const STREAM_BUSINESS_TYPE = 10;
+/**
+ * Manages a single uplink stream session.
+ *
+ * Usage:
+ *   const sender = new WeixinStreamSender(opts);
+ *   await sender.init();
+ *   await sender.sendPiece({ type: "text", text: "Hello " });
+ *   await sender.sendPiece({ type: "text", text: "world!" });
+ *   await sender.end();
+ */
+export class WeixinStreamSender {
+    opts;
+    deviceId;
+    clientStreamId;
+    streamTicket;
+    pieceSeq = 0;
+    ended = false;
+    /**
+     * Pieces from a previous sendPiece/end call that failed to reach the server.
+     * They are prepended to the next syncStream request so the server receives
+     * them with the original piece_seq values (true retry, not accumulation).
+     */
+    pendingPieces = [];
+    /** pieceSeq value before the pending pieces were assigned; used for rollback. */
+    seqBeforePending = 0;
+    constructor(opts) {
+        this.opts = opts;
+        this.deviceId = getOrCreateDeviceId(opts.accountId);
+        this.clientStreamId = `${opts.accountId}:${Date.now()}-${crypto.randomBytes(4).toString("hex")}`;
+    }
+    /** Call native_init_stream to obtain a stream_ticket. Must be called before sendPiece. */
+    async init() {
+        let resp;
+        try {
+            resp = await initStream({
+                baseUrl: this.opts.baseUrl,
+                token: this.opts.token,
+                timeoutMs: this.opts.timeoutMs,
+                accountId: this.opts.accountId,
+                body: {
+                    device_id: this.deviceId,
+                    client_stream_id: this.clientStreamId,
+                    business_type: STREAM_BUSINESS_TYPE,
+                },
+            });
+        }
+        catch (err) {
+            logger.warn(`WeixinStreamSender.init: initStream threw streamId=${this.clientStreamId} err=${String(err)}`);
+            throw err;
+        }
+        if (resp.base_response?.ret && resp.base_response.ret !== 0) {
+            logger.warn(`WeixinStreamSender.init: ret=${resp.base_response.ret} errmsg=${resp.base_response.errmsg ?? ""} streamId=${this.clientStreamId}`);
+            throw new Error(`initStream failed: ret=${resp.base_response.ret} errmsg=${resp.base_response.errmsg ?? ""}`);
+        }
+        if (!resp.stream_ticket) {
+            logger.warn(`WeixinStreamSender.init: no stream_ticket in response streamId=${this.clientStreamId}`);
+            throw new Error("initStream: no stream_ticket in response");
+        }
+        this.streamTicket = resp.stream_ticket;
+        logger.debug(`WeixinStreamSender.init: streamId=${this.clientStreamId}`);
+    }
+    /**
+     * Send a single piece of data on the stream.
+     * piece_seq auto-increments starting from 1.
+     *
+     * If a previous call failed, the unsent pieces are automatically prepended
+     * to this request so they are retried with their original piece_seq values.
+     */
+    async sendPiece(data) {
+        this.assertReady();
+        // Remember the seq checkpoint *before* we assign a new seq, so we can
+        // roll back on failure.
+        const seqBefore = this.pendingPieces.length > 0
+            ? this.seqBeforePending
+            : this.pieceSeq;
+        this.pieceSeq += 1;
+        const newPiece = {
+            piece_seq: this.pieceSeq,
+            piece_data: Buffer.from(JSON.stringify(data), "utf-8").toString("base64"),
+        };
+        // Merge any previously-failed pieces with the new one.
+        const pieces = [...this.pendingPieces, newPiece];
+        try {
+            const resp = await syncStream({
+                baseUrl: this.opts.baseUrl,
+                token: this.opts.token,
+                timeoutMs: this.opts.timeoutMs,
+                accountId: this.opts.accountId,
+                body: {
+                    device_id: this.deviceId,
+                    client_stream_id: this.clientStreamId,
+                    business_type: STREAM_BUSINESS_TYPE,
+                    up_piece_list: pieces,
+                    end_up_piece_seq: 0,
+                },
+            });
+            this.checkAbort(resp);
+            // Success — clear pending state.
+            const retried = pieces.length - 1;
+            this.pendingPieces = [];
+            this.seqBeforePending = 0;
+            if (retried > 0) {
+                logger.info(`WeixinStreamSender.sendPiece: seq=${this.pieceSeq} type=${data.type} batch=${pieces.length} retried=${retried} streamId=${this.clientStreamId}`);
+            }
+            else {
+                logger.debug(`WeixinStreamSender.sendPiece: seq=${this.pieceSeq} type=${data.type} batch=${pieces.length}`);
+            }
+            return resp;
+        }
+        catch (err) {
+            // Roll back: save all pieces for retry and restore pieceSeq.
+            this.pendingPieces = pieces;
+            this.seqBeforePending = seqBefore;
+            this.pieceSeq = seqBefore;
+            const seqs = pieces.map((p) => p.piece_seq).join(",");
+            logger.warn(`WeixinStreamSender.sendPiece: failed — kept pendingSeqs=[${seqs}] rolledBackTo=${seqBefore} type=${data.type} streamId=${this.clientStreamId} err=${String(err)}`);
+            throw err;
+        }
+    }
+    /**
+     * Signal that the uplink stream has ended.
+     * Optionally sends a final piece in the same request as the end marker.
+     * Any pending (previously-failed) pieces are included in the same request.
+     */
+    async end(finalData) {
+        this.assertReady();
+        this.pieceSeq += 1;
+        const finalPiece = {
+            piece_seq: this.pieceSeq,
+            piece_data: Buffer.from(JSON.stringify(finalData ?? { type: "text", text: "" }), "utf-8").toString("base64"),
+        };
+        const pieces = [...this.pendingPieces, finalPiece];
+        const pendingCarried = this.pendingPieces.length;
+        this.ended = true;
+        let resp;
+        try {
+            resp = await syncStream({
+                baseUrl: this.opts.baseUrl,
+                token: this.opts.token,
+                timeoutMs: this.opts.timeoutMs,
+                accountId: this.opts.accountId,
+                body: {
+                    device_id: this.deviceId,
+                    client_stream_id: this.clientStreamId,
+                    business_type: STREAM_BUSINESS_TYPE,
+                    up_piece_list: pieces,
+                    end_up_piece_seq: this.pieceSeq,
+                },
+            });
+        }
+        catch (err) {
+            const seqs = pieces.map((p) => p.piece_seq).join(",");
+            logger.warn(`WeixinStreamSender.end: failed — endSeq=${this.pieceSeq} batch=${pieces.length} carriedPending=${pendingCarried} seqs=[${seqs}] streamId=${this.clientStreamId} err=${String(err)}`);
+            throw err;
+        }
+        this.pendingPieces = [];
+        this.seqBeforePending = 0;
+        if (pendingCarried > 0) {
+            logger.info(`WeixinStreamSender.end: endSeq=${this.pieceSeq} batch=${pieces.length} retried=${pendingCarried} streamId=${this.clientStreamId}`);
+        }
+        else {
+            logger.debug(`WeixinStreamSender.end: endSeq=${this.pieceSeq} batch=${pieces.length}`);
+        }
+        return resp;
+    }
+    /**
+     * Send a client-side abort signal.
+     */
+    async abort(errorMsg) {
+        this.assertReady();
+        this.ended = true;
+        let resp;
+        try {
+            resp = await syncStream({
+                baseUrl: this.opts.baseUrl,
+                token: this.opts.token,
+                timeoutMs: this.opts.timeoutMs,
+                accountId: this.opts.accountId,
+                body: {
+                    device_id: this.deviceId,
+                    client_stream_id: this.clientStreamId,
+                    business_type: STREAM_BUSINESS_TYPE,
+                    up_piece_list: [],
+                    end_up_piece_seq: this.pieceSeq || 1,
+                    abort_info: {
+                        abort_type: AbortType.CLIENT_ABORT,
+                        abort_detail_error_code: 0,
+                        abort_detail_error_msg: errorMsg ?? "client abort",
+                    },
+                },
+            });
+        }
+        catch (err) {
+            logger.warn(`WeixinStreamSender.abort: failed streamId=${this.clientStreamId} reason=${errorMsg ?? "client abort"} err=${String(err)}`);
+            throw err;
+        }
+        logger.debug(`WeixinStreamSender.abort: streamId=${this.clientStreamId} reason=${errorMsg ?? "client abort"}`);
+        return resp;
+    }
+    get currentPieceSeq() {
+        return this.pieceSeq;
+    }
+    get streamId() {
+        return this.clientStreamId;
+    }
+    get ticket() {
+        return this.streamTicket;
+    }
+    get isEnded() {
+        return this.ended;
+    }
+    assertReady() {
+        if (!this.streamTicket) {
+            throw new Error("WeixinStreamSender: not initialized — call init() first");
+        }
+        if (this.ended) {
+            throw new Error("WeixinStreamSender: stream already ended");
+        }
+    }
+    checkAbort(resp) {
+        if (resp.abort_info?.abort_type) {
+            const info = resp.abort_info;
+            logger.warn(`WeixinStreamSender: server abort type=${info.abort_type} code=${info.abort_detail_error_code} msg=${info.abort_detail_error_msg}`);
+            this.ended = true;
+            throw new Error(`Stream aborted: type=${info.abort_type} code=${info.abort_detail_error_code} msg=${info.abort_detail_error_msg ?? ""}`);
+        }
+        if (resp.base_response?.ret && resp.base_response.ret !== 0) {
+            logger.warn(`WeixinStreamSender: syncStream error ret=${resp.base_response.ret} errmsg=${resp.base_response.errmsg}`);
+            throw new Error(`syncStream failed: ret=${resp.base_response.ret} errmsg=${resp.base_response.errmsg ?? ""}`);
+        }
+    }
+}
+//# sourceMappingURL=stream.js.map

package/dist/src/streaming/stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/streaming/stream.ts"],"names":[],"mappings":"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"}

package/dist/src/util/logger.js

@@ -0,0 +1,120 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/infra-runtime";
+/**
+ * Plugin logger — writes JSON lines to the main openclaw log file:
+ *   <tmpDir>/openclaw-YYYY-MM-DD.log
+ * Same file and format used by all other channels.
+ */
+const MAIN_LOG_DIR = resolvePreferredOpenClawTmpDir();
+const SUBSYSTEM = "gateway/channels/openclaw-weixin";
+const RUNTIME = "node";
+const RUNTIME_VERSION = process.versions.node;
+const HOSTNAME = os.hostname() || "unknown";
+const PARENT_NAMES = ["openclaw"];
+/** tslog-compatible level IDs (higher = more severe). */
+const LEVEL_IDS = {
+    TRACE: 1,
+    DEBUG: 2,
+    INFO: 3,
+    WARN: 4,
+    ERROR: 5,
+    FATAL: 6,
+};
+const DEFAULT_LOG_LEVEL = "INFO";
+function resolveMinLevel() {
+    const env = process.env.OPENCLAW_LOG_LEVEL?.toUpperCase();
+    if (env && env in LEVEL_IDS)
+        return LEVEL_IDS[env];
+    return LEVEL_IDS[DEFAULT_LOG_LEVEL];
+}
+let minLevelId = resolveMinLevel();
+/** Dynamically change the minimum log level at runtime. */
+export function setLogLevel(level) {
+    const upper = level.toUpperCase();
+    if (!(upper in LEVEL_IDS)) {
+        throw new Error(`Invalid log level: ${level}. Valid levels: ${Object.keys(LEVEL_IDS).join(", ")}`);
+    }
+    minLevelId = LEVEL_IDS[upper];
+}
+/** Shift a Date into local time so toISOString() renders local clock digits. */
+function toLocalISO(now) {
+    const offsetMs = -now.getTimezoneOffset() * 60_000;
+    const sign = offsetMs >= 0 ? "+" : "-";
+    const abs = Math.abs(now.getTimezoneOffset());
+    const offStr = `${sign}${String(Math.floor(abs / 60)).padStart(2, "0")}:${String(abs % 60).padStart(2, "0")}`;
+    return new Date(now.getTime() + offsetMs).toISOString().replace("Z", offStr);
+}
+function localDateKey(now) {
+    return toLocalISO(now).slice(0, 10);
+}
+function resolveMainLogPath() {
+    const dateKey = localDateKey(new Date());
+    return path.join(MAIN_LOG_DIR, `openclaw-${dateKey}.log`);
+}
+let logDirEnsured = false;
+function buildLoggerName(accountId) {
+    return accountId ? `${SUBSYSTEM}/${accountId}` : SUBSYSTEM;
+}
+function writeLog(level, message, accountId) {
+    const levelId = LEVEL_IDS[level] ?? LEVEL_IDS.INFO;
+    if (levelId < minLevelId)
+        return;
+    const now = new Date();
+    const loggerName = buildLoggerName(accountId);
+    const prefixedMessage = accountId ? `[${accountId}] ${message}` : message;
+    const entry = JSON.stringify({
+        "0": loggerName,
+        "1": prefixedMessage,
+        _meta: {
+            runtime: RUNTIME,
+            runtimeVersion: RUNTIME_VERSION,
+            hostname: HOSTNAME,
+            name: loggerName,
+            parentNames: PARENT_NAMES,
+            date: now.toISOString(),
+            logLevelId: LEVEL_IDS[level] ?? LEVEL_IDS.INFO,
+            logLevelName: level,
+        },
+        time: toLocalISO(now),
+    });
+    try {
+        if (!logDirEnsured) {
+            fs.mkdirSync(MAIN_LOG_DIR, { recursive: true });
+            logDirEnsured = true;
+        }
+        fs.appendFileSync(resolveMainLogPath(), `${entry}\n`, "utf-8");
+    }
+    catch {
+        // Best-effort; never block on logging failures.
+    }
+}
+/** Creates a logger instance, optionally bound to a specific account. */
+function createLogger(accountId) {
+    return {
+        info(message) {
+            writeLog("INFO", message, accountId);
+        },
+        debug(message) {
+            writeLog("DEBUG", message, accountId);
+        },
+        warn(message) {
+            writeLog("WARN", message, accountId);
+        },
+        error(message) {
+            writeLog("ERROR", message, accountId);
+        },
+        withAccount(id) {
+            return createLogger(id);
+        },
+        getLogFilePath() {
+            return resolveMainLogPath();
+        },
+        close() {
+            // No-op: appendFileSync has no persistent handle to close.
+        },
+    };
+}
+export const logger = createLogger();
+//# sourceMappingURL=logger.js.map

package/dist/src/util/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/util/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AAEnF;;;;GAIG;AAEH,MAAM,YAAY,GAAG,8BAA8B,EAAE,CAAC;AACtD,MAAM,SAAS,GAAG,kCAAkC,CAAC;AACrD,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;AAC9C,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,SAAS,CAAC;AAC5C,MAAM,YAAY,GAAG,CAAC,UAAU,CAAC,CAAC;AAElC,yDAAyD;AACzD,MAAM,SAAS,GAA2B;IACxC,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEjC,SAAS,eAAe;IACtB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,WAAW,EAAE,CAAC;IAC1D,IAAI,GAAG,IAAI,GAAG,IAAI,SAAS;QAAE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,SAAS,CAAC,iBAAiB,CAAC,CAAC;AACtC,CAAC;AAED,IAAI,UAAU,GAAG,eAAe,EAAE,CAAC;AAEnC,2DAA2D;AAC3D,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,IAAI,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,mBAAmB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,gFAAgF;AAChF,SAAS,UAAU,CAAC,GAAS;IAC3B,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,GAAG,MAAM,CAAC;IACnD,MAAM,IAAI,GAAG,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,GAAG,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAC9G,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,YAAY,CAAC,GAAS;IAC7B,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,kBAAkB;IACzB,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,OAAO,MAAM,CAAC,CAAC;AAC5D,CAAC;AAED,IAAI,aAAa,GAAG,KAAK,CAAC;AAc1B,SAAS,eAAe,CAAC,SAAkB;IACzC,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,OAAe,EAAE,SAAkB;IAClE,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC;IACnD,IAAI,OAAO,GAAG,UAAU;QAAE,OAAO;IAEjC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,UAAU,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3B,GAAG,EAAE,UAAU;QACf,GAAG,EAAE,eAAe;QACpB,KAAK,EAAE;YACL,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,eAAe;YAC/B,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,YAAY;YACzB,IAAI,EAAE,GAAG,CAAC,WAAW,EAAE;YACvB,UAAU,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI;YAC9C,YAAY,EAAE,KAAK;SACpB;QACD,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC;KACtB,CAAC,CAAC;IACH,IAAI,CAAC;QACH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAChD,aAAa,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,EAAE,CAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,GAAG,KAAK,IAAI,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,gDAAgD;IAClD,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,SAAS,YAAY,CAAC,SAAkB;IACtC,OAAO;QACL,IAAI,CAAC,OAAe;YAClB,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,KAAK,CAAC,OAAe;YACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,OAAe;YAClB,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,KAAK,CAAC,OAAe;YACnB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QACD,WAAW,CAAC,EAAU;YACpB,OAAO,YAAY,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;QACD,cAAc;YACZ,OAAO,kBAAkB,EAAE,CAAC;QAC9B,CAAC;QACD,KAAK;YACH,2DAA2D;QAC7D,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAW,YAAY,EAAE,CAAC"}