dolphindb 2.0.1027 → 2.0.1029

package/browser.d.ts

@@ -330,6 +330,12 @@ export declare function int1282str(buffer: Uint8Array, le?: boolean): string;
 export interface StreamingParams {
     table: string;
     action?: string;
+    filters?: {
+        /** https://docs.dolphindb.cn/zh/help/FunctionsandCommands/FunctionReferences/s/subscribeTable.html#:~:text=%E8%BF%9E%E6%8E%A5%E6%96%B0%E7%9A%84%20leader%E3%80%82-,filter%20%E5%8F%82%E6%95%B0%E9%9C%80%E8%A6%81%E9%85%8D%E5%90%88,-setStreamTableFilterColumn%20%E5%87%BD%E6%95%B0%E4%B8%80%E8%B5%B7 */
+        column?: DdbObj;
+        /** 过滤条件的 DolphinDB 表达式 https://dolphindb1.atlassian.net/wiki/spaces/dev/pages/760840447/WebSocketConsole */
+        expression?: string;
+    };
     handler(message: StreamingMessage): any;
 }
 export interface StreamingMessage extends StreamingParams {

package/browser.js

@@ -2291,8 +2291,11 @@ export class DDB {
                 reject(this.error /* 一定有，不需要再 || new DdbConnectionError(this)  */);
             };
             try {
+                let url = new URL(this.url);
+                if (this.streaming?.filters?.expression)
+                    url.searchParams.set('filter', this.streaming.filters.expression.trim());
                 // 连接建立之前应该不会有别的调用占用 this.lwebsocket
-                this.lwebsocket.resource = await connect_websocket(this.url, {
+                this.lwebsocket.resource = await connect_websocket(url, {
                     protocols: this.streaming ? ['streaming'] : this.python ? ['python'] : undefined,
                     on_message: (buffer, websocket) => {
                         this.on_message(new Uint8Array(buffer), websocket);
@@ -2691,6 +2694,7 @@ export class DDB {
             segments: [],
         };
         let schema;
+        let first_message = true;
         const { value: colnames } = await this.call('publishTable', [
             'localhost',
             new DdbInt(0),
@@ -2708,8 +2712,9 @@ export class DDB {
                     const i_topic_end = buffer.indexOf(0, 17);
                     // 首个 message 一定是 table schema, 后续消息是 column 片段组成的 any vector
                     const data = DdbObj.parse(buffer.subarray(i_topic_end + 1), this.le);
-                    if (data.form === DdbForm.table) {
+                    if (first_message) {
                         schema = data;
+                        first_message = false;
                         return;
                     }
                     assert(schema, t('流数据订阅后一定先返回 schema'));