@baishuyun/chat-backend 0.0.9 → 0.0.10

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @baishuyun/chat-backend
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @baishuyun/coze-provider@0.0.10
+  - @baishuyun/types@1.0.10
+
 ## 0.0.9
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/chat-backend",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -22,8 +22,8 @@
     "parse-sse": "^0.1.0",
     "pino": "^10.1.0",
     "zod": "^4.1.13",
-    "@baishuyun/coze-provider": "0.0.9",
-    "@baishuyun/types": "1.0.9"
+    "@baishuyun/coze-provider": "0.0.10",
+    "@baishuyun/types": "1.0.10"
   },
   "devDependencies": {
     "@types/config": "^3.3.5",
@@ -34,7 +34,7 @@
     "pm2": "^6.0.14",
     "tsx": "^4.7.1",
     "typescript": "^5.8.3",
-    "@baishuyun/typescript-config": "0.0.9"
+    "@baishuyun/typescript-config": "0.0.10"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development tsx watch src/index.ts",

package/src/controllers/report/query/createQueryTransformStream.ts

@@ -5,18 +5,20 @@ import {
   createJsonStreamTransformer,
   type IParserCtx,
 } from '../../../utils/createJsonStreamTransformer.js';
-import { isArrayElement } from './utils.js';
+import { isTargetElement } from './utils.js';
+import { logger } from '../../../logger/index.js';
+import { fieldHandlers } from './handler-registry.js';
 
 export const createQueryResultTransformer = (): TransformStream<LanguageModelV2StreamPart, any> => {
   return createJsonStreamTransformer<IQueryResult>({
     createJSONParser: createJSONParser,
     onParseValue: handleParsedValue,
     onParseError(error) {
-      console.error('JSON parsing error in query transformer:', error);
+      logger.error('JSON parsing error in query transformer: ', error);
       return '数据解析异常，请重试';
     },
     onErrorChunk(chunk) {
-      console.log('Unsupported chunk encountered in query transformer:', chunk);
+      logger.error('Received error chunk in query transformer');
       return '';
     },
   });
@@ -26,96 +28,98 @@ function createJSONParser(): JSONParser {
   return new JSONParser({
     stringBufferSize: undefined,
     numberBufferSize: undefined,
-    separator: '', // 使用默认路径分隔符 '.'
+    separator: '',
     paths: [
-      '$', // 根对象（可选，如果需要完整对象）
-      '$.title', // 报表名称
-      '$.userID', // 用户ID
-      '$.forms', // 表单ID
-      '$.formIds.*', // 表单ID数组中的每个元素
-      '$.fields.*', // fields数组中的每个对象
-      '$.xFields.*', // xFields数组中的每个对象
-      '$.metrics.*', // metrics数组中的每个对象
-      '$.formulas.*', // 公式字段数组中的每个对象
-      '$.filter.rel', // 过滤条件关系
-      '$.filter.conds.*', // 过滤条件数组中的每个对象
-      '$.limit', // 限制条数
+      '$', // 保留完整结果推送
+      '$.title',
+      '$.name',
+      '$.type',
+      '$.userID',
+      '$.forms',
+      '$.fields.*',
+      '$.xFields.*',
+      '$.yFields.*',
+      '$.metrics.*',
+      '$.formulas.*',
+      '$.filter.rel',
+      '$.filter.cond.*',
+      '$.limit',
     ],
-    keepStack: true, // 保持栈信息以便获取父级上下文
+    keepStack: true,
   });
 }
 
 function handleParsedValue(ctx: IParserCtx<IQueryResult>): void {
-  const { parsedInfo, parsedResult, currentChunkId, deltaChunkEnqueuer: enqueueTextDelta } = ctx;
-  const { key, value, stack, parent } = parsedInfo;
-
-  // 快速提取顶层字段
-  // @ts-ignore
-  if (key === 'title') parsedResult.title = value;
-  // @ts-ignore
-  if (key === 'userID') parsedResult.userID = value;
-  // @ts-ignore
-  if (key === 'limit') parsedResult.limit = value;
-  // @ts-ignore
-  if (key === 'forms') parsedResult.formIds = [value];
-
-  // 处理数组类型
-  // @ts-ignore
-  if (key === 'rel' && stack.length >= 1 && stack[stack.length - 1]?.key === 'filter') {
-    if (!parsedResult.filter) parsedResult.filter = { rel: 'and', conds: [] };
-    parsedResult.filter.rel = value as any;
-  }
+  const { parsedInfo, getResult, currentChunkId, deltaChunkEnqueuer: enqueueTextDelta, ctrl } = ctx;
+  const { value } = parsedInfo;
 
-  if (isArrayElement('fields', parsedInfo)) {
-    if (!parsedResult.fields) {
-      parsedResult.fields = [];
-    }
-    // @ts-ignore
-    parsedResult.fields?.push(value);
-  }
+  logger.debug('Parsed JSON value: ' + JSON.stringify(value));
 
-  if (isArrayElement('formulas', parsedInfo)) {
-    if (!parsedResult.formulas) {
-      parsedResult.formulas = [];
-    }
-    // @ts-ignore
-    parsedResult.formulas.push(value);
+  // TODO: 使用约定的字段判断类型
+  // Phase 1: aggregate 类型 —— name 字段触发，独立处理后直接返回
+  if (isTargetElement('$.name', parsedInfo)) {
+    handleAggregateName(ctx);
+    return;
   }
 
-  if (isArrayElement('conds', parsedInfo)) {
-    console.log('✅ Parsed filter cond object:', value);
-    if (!parsedResult.filter) {
-      parsedResult.filter = { rel: 'and', conds: [] };
-    }
-    // @ts-ignore
-    parsedResult.filter.conds.push(value);
+  // Phase 2: 报表标题 —— 初始化结果并发送 text-start
+  if (isTargetElement('$.title', parsedInfo)) {
+    handleTitle(ctx);
   }
 
-  if (isArrayElement('metrics', parsedInfo)) {
-    if (!parsedResult.metrics) {
-      parsedResult.metrics = [];
-    }
-    // @ts-ignore
-    parsedResult.metrics.push(value);
-  }
+  // Phase 3: aggregate 结果无需后续字段处理
+  if (getResult().isAggregate) return;
 
-  if (isArrayElement('xFields', parsedInfo)) {
-    if (!parsedResult.xFields) {
-      parsedResult.xFields = [];
+  // Phase 4: 按注册的 handler 分发字段处理
+  for (const { path, handler } of fieldHandlers) {
+    if (isTargetElement(path, parsedInfo)) {
+      handler(ctx, value);
+      break;
     }
-    // @ts-ignore
-    parsedResult.xFields.push(value);
   }
 
-  const validResult = JSON.stringify(parsedResult);
-
+  // Phase 5: 向下游推送增量结果
   enqueueTextDelta(
     `${JSON.stringify(value)},`,
-    {
-      type: 'query-stream-parsed-info',
-      result: validResult,
-    },
-    currentChunkId,
+    { type: 'query-stream-parsed-info', result: JSON.stringify(getResult()) },
+    currentChunkId + 2,
     true
   );
 }
+
+// ===================== Phase Handlers =====================
+
+function handleAggregateName(ctx: IParserCtx<IQueryResult>): void {
+  const { parsedInfo, getResult, currentChunkId, deltaChunkEnqueuer: enqueueTextDelta } = ctx;
+  const value = parsedInfo.value;
+
+  ctx.setPartialResult({
+    title: value as string,
+    isAggregate: true,
+    type: 'data_table',
+  });
+
+  logger.debug('Parsed aggregate table title: ' + value);
+
+  enqueueTextDelta(
+    `${JSON.stringify(value)},`,
+    { type: 'query-stream-parsed-info', result: JSON.stringify(getResult()) },
+    currentChunkId + 1,
+    false
+  );
+}
+
+function handleTitle(ctx: IParserCtx<IQueryResult>): void {
+  const { parsedInfo, currentChunkId, ctrl } = ctx;
+
+  ctx.clearResult();
+
+  ctrl.enqueue({
+    type: 'text-start',
+    id: currentChunkId + 2,
+  });
+
+  ctx.setPartialResult({
+    title: parsedInfo.value as string,
+  });
+}

package/src/controllers/report/query/handler-helpers.ts

@@ -0,0 +1,35 @@
+import { type IQueryResult } from '@baishuyun/types';
+import { type IParserCtx } from '../../../utils/createJsonStreamTransformer.js';
+import type { ValueHandler } from './types.js';
+
+// ===================== Handler Helpers =====================
+/** 创建一个将值推入指定数组字段的 handler */
+export function pushToArray(field: keyof IQueryResult): ValueHandler {
+  return (ctx, value) => {
+    const result = ctx.getResult();
+    if (!result[field]) {
+      ctx.setPartialResult({ [field]: [] } as Partial<IQueryResult>);
+    }
+    (ctx.getResult()[field] as any[]).push(value);
+  };
+}
+
+/** 创建一个将值推入数组字段、并附加 tag/form 元信息的 handler */
+export function pushToArrayWithMeta(field: keyof IQueryResult): ValueHandler {
+  return (ctx, value) => {
+    const result = ctx.getResult();
+    if (!result[field]) {
+      ctx.setPartialResult({ [field]: [] } as Partial<IQueryResult>);
+    }
+    value.tag = `f_${Date.now()}`;
+    value.form = result.formIds ? result.formIds[0] : '';
+    (ctx.getResult()[field] as any[]).push(value);
+  };
+}
+
+/** 确保 filter 对象已初始化 */
+export function ensureFilter(ctx: IParserCtx<IQueryResult>): void {
+  if (!ctx.getResult().filter) {
+    ctx.setPartialResult({ filter: { rel: 'and', conds: [] } });
+  }
+}

package/src/controllers/report/query/handler-registry.ts

@@ -0,0 +1,46 @@
+import { type IDashWidgetType, type IQueryFilter } from '@baishuyun/types';
+import type { PathHandler } from './types.js';
+import { ensureFilter, pushToArray, pushToArrayWithMeta } from './handler-helpers.js';
+
+export const fieldHandlers: PathHandler[] = [
+  {
+    path: '$.userID',
+    handler: (ctx, value) => ctx.setPartialResult({ userID: value as number }),
+  },
+  {
+    path: '$.limit',
+    handler: (ctx, value) => ctx.setPartialResult({ limit: value as number }),
+  },
+  {
+    path: '$.forms',
+    handler: (ctx, value) => ctx.setPartialResult({ formIds: [value as string] }),
+  },
+  {
+    path: '$.type',
+    handler: (ctx, value) => ctx.setPartialResult({ type: value as IDashWidgetType }),
+  },
+  {
+    path: '$.filter.rel',
+    handler: (ctx, value) => {
+      ensureFilter(ctx);
+      ctx.setPartialResult({
+        filter: { ...ctx.getResult().filter, rel: value } as IQueryFilter,
+      });
+    },
+  },
+  {
+    path: '$.filter.cond.*',
+    handler: (ctx, value) => {
+      ensureFilter(ctx);
+      const filter = ctx.getResult().filter!;
+      ctx.setPartialResult({
+        filter: { ...filter, conds: [...(filter.conds || []), value] } as IQueryFilter,
+      });
+    },
+  },
+  { path: '$.fields.*', handler: pushToArray('fields') },
+  { path: '$.formulas.*', handler: pushToArray('formulas') },
+  { path: '$.metrics.*', handler: pushToArrayWithMeta('metrics') },
+  { path: '$.xFields.*', handler: pushToArrayWithMeta('xFields') },
+  { path: '$.yFields.*', handler: pushToArrayWithMeta('yFields') },
+];

package/src/controllers/report/query/types.ts

@@ -0,0 +1,9 @@
+import { type IQueryResult } from '@baishuyun/types';
+import { type IParserCtx } from '../../../utils/createJsonStreamTransformer.js';
+
+export type ValueHandler = (ctx: IParserCtx<IQueryResult>, value: any) => void;
+
+export interface PathHandler {
+  path: string;
+  handler: ValueHandler;
+}

package/src/controllers/report/query/utils.ts

@@ -35,20 +35,50 @@ export const queryChunkGuard = (chunk: LanguageModelV2StreamPart) => {
   return true;
 };
 
-// JSON Parser 处理数组元素
-// 当解析 $.elementKey.* 时:
-// - key 是数组索引（number）
-// - parent 是数组 []
-// - stack 的最后一个元素的 key 是 elementKey
-export const isArrayElement = (elementKey: string, parsedInfo: ParsedElementInfo): boolean => {
-  const { key, value, stack, parent } = parsedInfo;
-  return (
-    typeof key === 'number' &&
-    Array.isArray(parent) &&
-    stack.length >= 1 &&
-    stack[stack.length - 1]?.key === elementKey &&
-    typeof value === 'object' &&
-    value !== null &&
-    !Array.isArray(value)
-  );
+/**
+ * 通用路径匹配器：判断当前解析到的元素是否命中指定的 JSONParser 路径。
+ *
+ * 支持两种路径形式：
+ * - 精确路径：`$.title`、`$.filter.rel` — 匹配特定 key
+ * - 通配路径：`$.fields.*`、`$.filter.cond.*` — 匹配数组元素
+ *
+ * path 格式与 `JSONParser` 的 `paths` 配置完全一致，无需额外转换。
+ *
+ * @example
+ * isTargetElement('$.title', parsedInfo)
+ * isTargetElement('$.filter.rel', parsedInfo)
+ * isTargetElement('$.fields.*', parsedInfo)
+ * isTargetElement('$.filter.cond.*', parsedInfo)
+ */
+export const isTargetElement = (path: string, parsedInfo: ParsedElementInfo): boolean => {
+  const { key, stack, parent } = parsedInfo;
+
+  // 去掉 '$.' 前缀，按 '.' 分割
+  const segments = path.replace(/^\$\./, '').split('.');
+  const endsWithWildcard = segments[segments.length - 1] === '*';
+
+  if (endsWithWildcard) {
+    // ---- 通配路径：匹配数组中的元素 ----
+    const parentKeys = segments.slice(0, -1);
+
+    // 当前 key 必须为数组索引，parent 必须为数组
+    if (typeof key !== 'number' || !Array.isArray(parent)) return false;
+
+    // stack 深度 = root(1) + parentKeys
+    if (stack.length !== parentKeys.length + 1) return false;
+
+    // 从 stack[1] 开始逐段匹配（跳过 root）
+    return parentKeys.every((seg, i) => stack[i + 1]?.key === seg);
+  }
+
+  // ---- 精确路径：匹配特定 key ----
+  const leafKey = segments[segments.length - 1];
+  if (key !== leafKey) return false;
+
+  const parentKeys = segments.slice(0, -1);
+
+  // stack 深度 = root(1) + parentKeys（叶子节点自身不在 stack 中）
+  if (stack.length !== parentKeys.length + 1) return false;
+
+  return parentKeys.every((seg, i) => stack[i + 1]?.key === seg);
 };

package/src/utils/createJsonStreamTransformer.ts

@@ -7,13 +7,16 @@ import { logger } from '../logger/index.js';
 /** onParseValue 回调接收的上下文 */
 export interface IParserCtx<T> {
   /** 累积的解析结果，可直接修改 */
-  parsedResult: T;
+  getResult: () => T;
+  setPartialResult: (partial: Partial<T>) => void;
+  clearResult: () => void;
   /** 当前触发 onValue 的解析信息 */
   parsedInfo: ParsedElementInfo;
   /** 向下游推送 text-delta chunk 的工具函数 */
   deltaChunkEnqueuer: ReturnType<typeof createTextInfoEnqueuer>;
   /** 当前正在处理的 chunk id */
   currentChunkId: string;
+  ctrl: Controller;
 }
 
 /** 创建 JSON 流转换器的选项 */
@@ -140,8 +143,6 @@ class JsonStreamProcessor<T> {
     const enqueue = createTextInfoEnqueuer(controller);
 
     this.parser.onValue = (parsedInfo: ParsedElementInfo) => {
-      logger.debug('enter onValue');
-
       // 超时错误特殊处理
       if (isTimeoutError(parsedInfo.value)) {
         if (!this.terminated) {
@@ -155,15 +156,19 @@ class JsonStreamProcessor<T> {
       }
 
       this.options.onParseValue({
-        parsedResult: this.result,
         parsedInfo,
         deltaChunkEnqueuer: enqueue,
         currentChunkId: this.currentChunkId,
+        ctrl: controller,
+        getResult: () => this.result,
+        clearResult: this.clearResult.bind(this),
+        setPartialResult: (partial) => {
+          this.result = { ...this.result, ...partial };
+        },
       });
     };
 
     this.parser.onError = (err: any) => {
-      logger.debug('enter onError: ' + err);
       if (!this.terminated) {
         const msg = this.options.onParseError
           ? this.options.onParseError(err)
@@ -191,6 +196,10 @@ class JsonStreamProcessor<T> {
     });
   }
 
+  private clearResult(): void {
+    this.result = {} as T;
+  }
+
   /** 标记解析完成，重置状态 */
   private completeParsing(): void {
     this.resolveParseCompleted?.();