dolphindb 3.0.25 → 3.0.26

package/browser.d.ts

@@ -357,7 +357,7 @@ export interface ConvertOptions {
     /** `'string'` blob 类型数据的格式 */
     blob?: 'string' | 'binary';
 }
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | Int32Array | DdbDecimal64VectorValue | BigInt64Array | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | string[] | Int8Array | Int16Array | Float32Array | Float64Array | DdbArrayVectorValue | DdbMatrixValue | Uint8Array[] | DdbObj<DdbValue>[] | DdbDurationVectorValue | DdbChartValue | number[];
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob }?: ConvertOptions): string | number | bigint | boolean | string[] | Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | Uint8Array[] | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbMatrixValue | DdbObj<DdbValue>[] | DdbDurationVectorValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[];
 export declare class DdbVoid extends DdbObj<undefined> {

package/browser.js

@@ -3060,14 +3060,18 @@ export class DDB {
     }
     /** 内部的流订阅方法  Internal stream subscription method */
     async subscribe() {
+        // 流表推送过来的第一条数据是 schema，需要特殊处理
+        let first = true;
         let win = {
             offset: 0,
             rows: 0,
             segments: [],
         };
-        // 流表推送过来的第一条数据是 schema，需要特殊处理
-        let first = true;
-        const { value: columns } = await this.call('publishTable', [
+        let schema;
+        console.log(t('订阅流表成功:'), 
+        // 普通流表结果为 columns (string[])
+        // 高可用流表为 [columns (string[]), node sites (string[])]
+        (await this.call('publishTable', [
             'localhost',
             new DdbInt(0),
             this.streaming.table,
@@ -3093,24 +3097,17 @@ export class DDB {
                         throw new Error(value.slice(value.indexOf(':') + 1).trim());
                     }
                     if (first) {
-                        data = obj.data();
+                        schema = data = obj.data();
                         data.name ||= this.streaming.table;
                         first = false;
                     }
                     else {
-                        const { rows } = obj.value[0];
-                        const types = [];
-                        const js_cols = [];
-                        // 遍历每一列
-                        obj.value.forEach(({ type, value }) => {
-                            types.push(type);
-                            js_cols.push(converts(type, value, rows, obj.le));
-                        });
+                        const _data = obj.data();
+                        const rows = _data[0].length;
+                        const { columns } = schema;
                         data = {
-                            name: this.streaming.table || '',
-                            columns,
-                            types,
-                            data: seq(rows, i => zip_object(columns, seq(columns.length, j => js_cols[j][i])))
+                            ...schema,
+                            data: seq(rows, i => zip_object(columns, seq(columns.length, j => _data[j][i])))
                         };
                         win.rows += rows;
                         win.segments.push(data);
@@ -3140,10 +3137,7 @@ export class DDB {
                     this.streaming.handler({ ...this.streaming, error });
                 }
             }
-        });
-        console.log(t('订阅流表成功') + ', columns:', 
-        // string[3](['time', 'stock', 'price'])
-        columns);
+        })).data());
     }
 }
 /** https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements