dolphindb 2.0.1022 → 2.0.1025

package/index.js

@@ -1176,6 +1176,7 @@ export class DdbObj {
     static to_ddbobjs(values) {
         return values.map(value => this.to_ddbobj(value));
     }
+    /** 将 table 转换为 rows，空值转换为 null */
     to_rows() {
         assert(this.form === DdbForm.table, t('form 必须是 DdbForm.table, 否则不能 to_rows'));
         let rows = new Array(this.rows);
@@ -1192,6 +1193,42 @@ export class DdbObj {
                                 Boolean(value);
                         break;
                     }
+                    case DdbType.char:
+                        row[name] = values[i] === nulls.int8 ? null : values[i];
+                        break;
+                    case DdbType.short:
+                        row[name] = values[i] === nulls.int16 ? null : values[i];
+                        break;
+                    case DdbType.int:
+                    case DdbType.date:
+                    case DdbType.month:
+                    case DdbType.time:
+                    case DdbType.minute:
+                    case DdbType.second:
+                    case DdbType.datetime:
+                    case DdbType.datehour:
+                        row[name] = values[i] === nulls.int32 ? null : values[i];
+                        break;
+                    case DdbType.long:
+                    case DdbType.timestamp:
+                    case DdbType.nanotime:
+                    case DdbType.nanotimestamp:
+                        row[name] = values[i] === nulls.int64 ? null : values[i];
+                        break;
+                    case DdbType.int128:
+                        row[name] = values[i] === nulls.int128 ? null : values[i];
+                        break;
+                    case DdbType.float:
+                        row[name] = values[i] === nulls.float32 ? null : values[i];
+                        break;
+                    case DdbType.double:
+                        row[name] = values[i] === nulls.double ? null : values[i];
+                        break;
+                    case DdbType.decimal32:
+                    case DdbType.decimal64:
+                    case DdbType.decimal128:
+                        row[name] = is_decimal_null_value(type, values[i]) ? null : values[i];
+                        break;
                     case DdbType.ipaddr:
                         row[name] = values.subarray(16 * i, 16 * (i + 1));
                         break;
@@ -2255,7 +2292,7 @@ export class DDB {
                 this.lwebsocket.resource = await connect_websocket(this.url, {
                     protocols: this.streaming ? ['streaming'] : this.python ? ['python'] : undefined,
                     on_message: (buffer, websocket) => {
-                        this.on_message(buffer, websocket);
+                        this.on_message(new Uint8Array(buffer), websocket);
                     },
                     on_error: error => {
                         this.error ??= new DdbConnectionError(this.url, error);
@@ -2341,7 +2378,7 @@ export class DDB {
         let error = new DdbDatabaseError('', this.url, type, options, id);
         if (!options.skip_connection_check)
             await this.connect();
-        const { script, func, args: _args = [], vars = [], urgent, listener, } = options;
+        const { script, func, args: _args = [], vars = [], urgent, listener, on_more_messages, } = options;
         if (func === 'pnode_run')
             await (this.ppnode_run ??= this.eval(this.python ?
                 '\n' +
@@ -2442,37 +2479,42 @@ export class DDB {
             })());
             // 使用资源发送请求并等待请求完成
             const result = await new Promise((resolve, reject) => {
+                let first_message = true;
                 this.on_error = () => {
                     // 这里一定有了 this.error, 不需要再 || new DdbConnectionError(this)
                     reject(this.error);
                 };
                 this.on_message = buffer => {
-                    try {
-                        const buf = new Uint8Array(buffer);
-                        if (this.print_message_buffer)
-                            console.log(typed_array_to_buffer(buf));
-                        const message = this.parse_message(buf, error);
-                        listener?.(message, this);
-                        for (const listener of _listeners)
-                            listener(message, this);
-                        const { type, data } = message;
-                        switch (type) {
-                            case 'print':
-                                if (this.print_message)
-                                    console.log(data);
-                                break;
-                            case 'object':
-                                resolve(data);
-                                break;
-                            case 'error':
-                                reject(data);
-                                break;
+                    if (!on_more_messages || first_message)
+                        try {
+                            if (this.print_message_buffer)
+                                console.log(typed_array_to_buffer(buffer));
+                            const message = this.parse_message(buffer, error);
+                            listener?.(message, this);
+                            for (const listener of _listeners)
+                                listener(message, this);
+                            const { type, data } = message;
+                            switch (type) {
+                                case 'print':
+                                    if (this.print_message)
+                                        console.log(data);
+                                    break;
+                                case 'object':
+                                    first_message = false;
+                                    resolve(data);
+                                    break;
+                                case 'error':
+                                    first_message = false;
+                                    reject(data);
+                                    break;
+                            }
                         }
-                    }
-                    catch (error) {
-                        // 这里的错误并非 websocket 错误，而是 rpc 错误
-                        reject(error);
-                    }
+                        catch (error) {
+                            // 这里的错误并非 websocket 错误，而是 rpc 错误
+                            reject(error);
+                        }
+                    else
+                        on_more_messages(buffer);
                 };
                 websocket.send(concat([
                     this.enc.encode(`API2 ${this.sid} ${command.length} / ${this.get_rpc_options({ urgent })}\n`),
@@ -2526,7 +2568,7 @@ export class DDB {
                 将这个 flag 设为 true 跳过连接状态检查
                 (internal use) When await ddb.connect() establishes a connection for the first time, you cannot call await this.connect() again to ensure the connection status, which will lead to circular dependencies.
                  Set this flag to true to skip connection status checks */
-    async call(func, args = [], { urgent, node, nodes, func_type, add_node_alias, listener, parse_object, skip_connection_check } = {}) {
+    async call(func, args = [], { urgent, node, nodes, func_type, add_node_alias, listener, parse_object, skip_connection_check, on_more_messages } = {}) {
         if (node) {
             assert(func_type in DdbFunctionType, t('指定 node 时必须设置 func_type'));
             args = [
@@ -2557,7 +2599,8 @@ export class DDB {
             urgent,
             listener,
             parse_object,
-            skip_connection_check
+            skip_connection_check,
+            on_more_messages
         });
     }
     /** upload variable through websocket (variable command) */
@@ -2639,6 +2682,12 @@ export class DDB {
     }
     /** 内部的流订阅方法  Internal stream subscription method */
     async subscribe() {
+        let win = {
+            offset: 0,
+            rows: 0,
+            segments: [],
+        };
+        let schema;
         const { value: colnames } = await this.call('publishTable', [
             'localhost',
             new DdbInt(0),
@@ -2647,58 +2696,54 @@ export class DDB {
             // new DdbInt(-1),  // offset
             // filter
             // allow exists
-        ], { skip_connection_check: true });
-        console.log(t('订阅流表成功') + ', colnames:', 
-        // string[3](['time', 'stock', 'price'])
-        colnames);
-        let win = {
-            offset: 0,
-            rows: 0,
-            segments: [],
-        };
-        let schema;
-        // 先准备好收到 websocket message 的 callback
-        this.on_message = buffer => {
-            try {
-                const dv = new DataView(buffer);
-                const buf = new Uint8Array(buffer);
-                const i_topic_end = buf.indexOf(0, 17);
-                // 首个 message 可能是 table schema, 后续消息是 column 片段组成的 any vector
-                const data = DdbObj.parse(buf.subarray(i_topic_end + 1), this.le);
-                if (data.form === DdbForm.table) {
-                    schema = data;
-                    return;
+        ], {
+            skip_connection_check: true,
+            // 先准备好收到 websocket message 的 callback
+            on_more_messages: buffer => {
+                try {
+                    const dv = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+                    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) {
+                        schema = data;
+                        return;
+                    }
+                    assert(schema, t('流数据订阅后一定先返回 schema'));
+                    const { rows } = data.value[0];
+                    win.rows += rows;
+                    win.segments.push(data);
+                    if (win.rows >= winsize * 2 && win.segments.length >= 2) {
+                        let winsize_ = 0;
+                        let i = win.segments.length - 1;
+                        // 往前移动至首个累计 winsize_ 超过 winsize 的位置
+                        for (; winsize_ < winsize; i--)
+                            winsize_ += win.segments[i].value[0].rows;
+                        win.segments = win.segments.slice(i);
+                        win.offset += win.rows - winsize_;
+                        win.rows = winsize_;
+                    }
+                    this.streaming.handler({
+                        ...this.streaming,
+                        id: dv.getBigInt64(9, this.le),
+                        time: dv.getBigInt64(1, this.le),
+                        rows,
+                        topic: this.dec.decode(buffer.subarray(17, i_topic_end)),
+                        colnames,
+                        schema,
+                        data,
+                        window: win,
+                    });
                 }
-                const { rows } = data.value[0];
-                win.rows += rows;
-                win.segments.push(data);
-                if (win.rows >= winsize * 2 && win.segments.length >= 2) {
-                    let winsize_ = 0;
-                    let i = win.segments.length - 1;
-                    // 往前移动至首个累计 winsize_ 超过 winsize 的位置
-                    for (; winsize_ < winsize; i--)
-                        winsize_ += win.segments[i].value[0].rows;
-                    win.segments = win.segments.slice(i);
-                    win.offset += win.rows - winsize_;
-                    win.rows = winsize_;
+                catch (error) {
+                    // 将 error 交给 handler 处理
+                    this.streaming.handler({ ...this.streaming, error });
                 }
-                this.streaming.handler({
-                    ...this.streaming,
-                    id: dv.getBigInt64(9, this.le),
-                    time: dv.getBigInt64(1, this.le),
-                    rows,
-                    topic: this.dec.decode(buf.subarray(17, i_topic_end)),
-                    colnames,
-                    schema,
-                    data,
-                    window: win,
-                });
-            }
-            catch (error) {
-                // 将 error 交给 handler 处理
-                this.streaming.handler({ ...this.streaming, error });
             }
-        };
+        });
+        console.log(t('订阅流表成功') + ', colnames:', 
+        // string[3](['time', 'stock', 'price'])
+        colnames);
     }
 }
 // const ddb_gateway = {