dolphindb 2.0.507 → 2.0.510

package/index.d.ts

@@ -78,8 +78,22 @@ export interface DdbArrayVectorBlock {
     lengths: Uint8Array | Uint16Array | Uint32Array;
     data: DdbVectorValue;
 }
-export declare type DdbValue = null | boolean | number | [number, number] | bigint | string | string[] | Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | Uint8Array[] | DdbObj[] | DdbFunctionDefValue | DdbSymbolExtendedValue | DdbArrayVectorBlock[];
-export declare type DdbVectorValue = string | string[] | Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | Uint8Array[] | DdbObj[] | DdbSymbolExtendedValue | DdbArrayVectorBlock[];
+export interface DdbMatrixValue {
+    rows: DdbObj<DdbVectorValue>;
+    cols: DdbObj<DdbVectorValue>;
+    data: DdbVectorValue;
+}
+export declare type DdbScalarValue = null | boolean | number | bigint | string | Uint8Array | // uuid, ipaddr, int128, blob
+[
+    number,
+    number
+] | // complex, point
+DdbFunctionDefValue;
+export declare type DdbVectorValue = Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | // string[]
+Uint8Array[] | // blob
+DdbObj[] | // any
+DdbSymbolExtendedValue | DdbArrayVectorBlock[];
+export declare type DdbValue = DdbScalarValue | DdbVectorValue | DdbMatrixValue;
 export declare const nulls: {
     readonly int8: -128;
     readonly int16: -32768;
@@ -123,8 +137,6 @@ export declare class DdbObj<T extends DdbValue = DdbValue> {
     rows?: number;
     /** 第 2 维 */
     cols?: number;
-    /** matrix 中值的类型，仅 matrix 才有 */
-    datatype?: DdbType;
     /** 实际数据。不同的 DdbForm, DdbType 使用 DdbValue 中不同的类型来表示实际数据 */
     value: T;
     /** 原始二进制数据，仅在 parse_object 为 false 时通过 parse_message 生成的顶层对象有这个属性 */
@@ -134,11 +146,11 @@ export declare class DdbObj<T extends DdbValue = DdbValue> {
         type: DdbType;
     });
     static parse(buf: Uint8Array, le: boolean): DdbObj<DdbValue>;
-    static parse_scalar(buf: Uint8Array, le: boolean, type: DdbType): [number, DdbValue];
+    static parse_scalar(buf: Uint8Array, le: boolean, type: DdbType): [number, DdbScalarValue];
     /** parse: rows, cols, items
         返回的 ddbobj.length 不包括 vector 的 type 和 form
     */
-    static parse_vector(buf: Uint8Array, le: boolean, type: DdbType): DdbObj;
+    static parse_vector(buf: Uint8Array, le: boolean, type: DdbType): DdbObj<DdbVectorValue>;
     /** 有可能没有字节对齐，不能直接使用原有 message 的 arraybuffer, 统一复制出来，让原有 arraybuffer 被回收掉比较好 */
     static parse_vector_items(buf: Uint8Array, le: boolean, type: DdbType, length: number): [
         number,

package/index.js

@@ -239,34 +239,60 @@ class DdbObj {
                 });
             }
             case DdbForm.matrix: {
-                // matrix([
+                // rename!(
+                //     1..9$3:3,
                 //     [1, 2, 3],
-                //     [3, 2, 1]
-                // ])
-                // <Buffer 00 has_row_label = , has_col_label = 
-                // 04 03 type = int, form = matrix
-                // 03 00 00 00 02 00 00 00 rows = 3, cols = 2
-                // 01 00 00 00 02 00 00 00 03 00 00 00 03 00 00 00 02 00 00 00 01 00 00 00>
+                //     ['c1', 'c2', 'c3']
+                // )
+                // <Buffer 04 03 type = int, form = matrix
+                // 03 has_row_label (& 0x01) = 1, has_col_label (& 0x02) = 1
+                // row labels
+                // 04 01 type = int, form = vector
+                // 03 00 00 00 01 00 00 00 rows = 3, cols = 1
+                // 01 00 00 00 02 00 00 00 03 00 00 00 vector values
+                // col labels
+                // 12 01 type = string, form = vector
+                // 03 00 00 00 01 00 00 00 rows = 3, cols = 1
+                // 63 31 00 63 32 00 63 33 00 
+                // matrix data
+                // 04 03 type = matrix.type, form = matrix
+                // 03 00 00 00 03 00 00 00 rows = 3, cols = 3
                 const dv = new DataView(buf.buffer, buf.byteOffset + i_data);
                 const label_flags = buf_data[0];
                 const has_row_labels = Boolean(label_flags & 0x01);
                 const has_col_labels = Boolean(label_flags & 0x02);
-                if (has_row_labels || has_col_labels)
-                    throw new Error('matrix 暂不支持 row labels 和 col labels');
-                const datatype = buf_data[1];
-                const rows = dv.getUint32(3, le);
-                const cols = dv.getUint32(7, le);
-                const [len_items, value] = this.parse_vector_items(buf_data.subarray(11), le, datatype, rows * cols // 假设小于 2**32
+                let row_labels = null;
+                let col_labels = null;
+                let offset = 1;
+                if (has_row_labels) {
+                    row_labels = this.parse_vector(buf_data.subarray(offset + 2), le, buf_data[offset]);
+                    row_labels.length += 2;
+                    offset += row_labels.length;
+                }
+                if (has_col_labels) {
+                    col_labels = this.parse_vector(buf_data.subarray(offset + 2), le, buf_data[offset]);
+                    col_labels.length += 2;
+                    offset += col_labels.length;
+                }
+                if (buf_data[offset] !== type)
+                    throw new Error('matrix.datatype !== matrix.type');
+                const rows = dv.getUint32(offset + 2, le);
+                const cols = dv.getUint32(offset + 6, le);
+                const [len_items, data] = this.parse_vector_items(buf_data.subarray(offset + 10), le, type, rows * cols // 假设小于 2**32
                 );
+                offset += 10 + len_items;
                 return new this({
                     le,
                     form,
                     type,
-                    length: i_data + 11 + len_items,
+                    length: i_data + offset,
                     rows,
                     cols,
-                    datatype,
-                    value,
+                    value: {
+                        rows: row_labels,
+                        cols: col_labels,
+                        data,
+                    },
                 });
             }
             default:
@@ -494,6 +520,7 @@ class DdbObj {
             case DdbType.minute:
             case DdbType.second:
             case DdbType.datetime:
+            case DdbType.datehour:
                 return [
                     4 * length,
                     new Int32Array(buf.buffer.slice(buf.byteOffset, buf.byteOffset + 4 * length))
@@ -618,7 +645,7 @@ class DdbObj {
     }
     pack() {
         const { form, type, value } = this;
-        let header = new Uint8Array(new ArrayBuffer(2));
+        let header = new Uint8Array(2);
         header[0] = type;
         header[1] = form;
         const body = (() => {
@@ -759,12 +786,17 @@ class DdbObj {
                         value[0].pack(),
                         value[1].pack(),
                     ];
-                case DdbForm.matrix:
+                case DdbForm.matrix: {
+                    const { rows, cols, data } = value;
                     return [
-                        Uint8Array.of(0, this.datatype, this.form),
+                        Uint8Array.of((rows && 0x01) | (cols && 0x02)),
+                        ...rows ? [rows.pack()] : [],
+                        ...cols ? [cols.pack()] : [],
+                        Uint8Array.of(this.type, this.form),
                         Uint32Array.of(this.rows, this.cols),
-                        ...DdbObj.pack_vector_body(value, this.datatype, this.rows * this.cols)
+                        ...DdbObj.pack_vector_body(data, this.type, this.rows * this.cols)
                     ];
+                }
                 default:
                     throw new Error(`${DdbForm[form]} 暂不支持序列化`);
             }
@@ -792,6 +824,7 @@ class DdbObj {
             case DdbType.minute:
             case DdbType.second:
             case DdbType.datetime:
+            case DdbType.datehour:
                 return [value];
             case DdbType.float:
                 return [value];
@@ -878,7 +911,7 @@ class DdbObj {
                 case DdbForm.dict:
                     return `dict<${DdbType[this.value[0].type]}, ${DdbType[this.value[1].type]}>`;
                 case DdbForm.matrix:
-                    return `matrix<${DdbType[this.datatype]}>[${this.rows} rows][${this.cols} cols]`;
+                    return `matrix<${DdbType[this.type]}>[${this.rows} rows][${this.cols} cols]`;
                 default:
                     return `${DdbForm[this.form]} ${tname}`;
             }
@@ -1552,25 +1585,30 @@ class DDB {
         catch { }
         // 临界区结束，只有一个 rpc 函数调用运行到这里，可以独占 this.on_message 然后写 WebSocket
         this.on_message = ({ data: buffer }) => {
-            const buf = new Uint8Array(buffer);
-            if (this.print_message_buffer)
-                console.log((0, utils_js_1.typed_array_to_buffer)(buf));
-            const message = this.parse_message(buf, parse_object);
-            listener?.(message, this);
-            for (const listener of _handlers)
-                listener(message, this);
-            const { type, data } = message;
-            switch (type) {
-                case 'print':
-                    if (this.print_message)
-                        console.log(data);
-                    return;
-                case 'object':
-                    resolve(data);
-                    return;
-                case 'error':
-                    reject(data);
-                    return;
+            try {
+                const buf = new Uint8Array(buffer);
+                if (this.print_message_buffer)
+                    console.log((0, utils_js_1.typed_array_to_buffer)(buf));
+                const message = this.parse_message(buf, parse_object);
+                listener?.(message, this);
+                for (const listener of _handlers)
+                    listener(message, this);
+                const { type, data } = message;
+                switch (type) {
+                    case 'print':
+                        if (this.print_message)
+                            console.log(data);
+                        return;
+                    case 'object':
+                        resolve(data);
+                        return;
+                    case 'error':
+                        reject(data);
+                        return;
+                }
+            }
+            catch (error) {
+                reject(error);
             }
         };
         args = this.to_ddbobjs(args);