dolphindb 2.0.508 → 2.0.511

package/browser.d.ts

@@ -60,10 +60,28 @@ export declare enum DdbFunctionType {
     JitFunc = 7,
     JitPartialFunc = 8
 }
+export declare enum DdbDurationUnit {
+    ns = 0,
+    us = 1,
+    ms = 2,
+    s = 3,
+    m = 4,
+    H = 5,
+    d = 6,
+    w = 7,
+    M = 8,
+    y = 9,
+    B = 10
+}
 export interface DdbFunctionDefValue {
     type: DdbFunctionType;
     name: string;
 }
+export interface DdbDurationValue {
+    unit: DdbDurationUnit;
+    /** int32 */
+    data: number;
+}
 export interface DdbSymbolExtendedValue {
     base_id: number;
     base: string[];
@@ -76,12 +94,21 @@ export interface DdbArrayVectorBlock {
     data: DdbVectorValue;
 }
 export interface DdbMatrixValue {
-    rows: DdbObj;
-    cols: DdbObj;
+    rows: DdbObj<DdbVectorValue>;
+    cols: DdbObj<DdbVectorValue>;
     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[] | DdbMatrixValue;
-export declare type DdbVectorValue = string | string[] | Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | Uint8Array[] | DdbObj[] | DdbSymbolExtendedValue | DdbArrayVectorBlock[];
+export declare type DdbScalarValue = null | boolean | number | bigint | string | Uint8Array | // uuid, ipaddr, int128, blob
+[
+    number,
+    number
+] | // complex, point
+DdbFunctionDefValue | DdbDurationValue;
+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;
@@ -134,7 +161,7 @@ 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
     */

package/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbTable = exports.DdbSetString = exports.DdbSetDouble = exports.DdbSetInt = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorString = exports.DdbVectorDouble = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
+exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbTable = exports.DdbSetString = exports.DdbSetDouble = exports.DdbSetInt = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorString = exports.DdbVectorDouble = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbDurationUnit = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const customParseFormat_js_1 = tslib_1.__importDefault(require("dayjs/plugin/customParseFormat.js"));
@@ -72,6 +72,20 @@ var DdbFunctionType;
     DdbFunctionType[DdbFunctionType["JitFunc"] = 7] = "JitFunc";
     DdbFunctionType[DdbFunctionType["JitPartialFunc"] = 8] = "JitPartialFunc";
 })(DdbFunctionType = exports.DdbFunctionType || (exports.DdbFunctionType = {}));
+var DdbDurationUnit;
+(function (DdbDurationUnit) {
+    DdbDurationUnit[DdbDurationUnit["ns"] = 0] = "ns";
+    DdbDurationUnit[DdbDurationUnit["us"] = 1] = "us";
+    DdbDurationUnit[DdbDurationUnit["ms"] = 2] = "ms";
+    DdbDurationUnit[DdbDurationUnit["s"] = 3] = "s";
+    DdbDurationUnit[DdbDurationUnit["m"] = 4] = "m";
+    DdbDurationUnit[DdbDurationUnit["H"] = 5] = "H";
+    DdbDurationUnit[DdbDurationUnit["d"] = 6] = "d";
+    DdbDurationUnit[DdbDurationUnit["w"] = 7] = "w";
+    DdbDurationUnit[DdbDurationUnit["M"] = 8] = "M";
+    DdbDurationUnit[DdbDurationUnit["y"] = 9] = "y";
+    DdbDurationUnit[DdbDurationUnit["B"] = 10] = "B";
+})(DdbDurationUnit = exports.DdbDurationUnit || (exports.DdbDurationUnit = {}));
 exports.nulls = {
     int8: -0x80,
     int16: -32768,
@@ -369,6 +383,16 @@ class DdbObj {
                     ]
                 ];
             }
+            case DdbType.duration: {
+                const dv = new DataView(buf.buffer, buf.byteOffset);
+                return [
+                    8,
+                    {
+                        unit: dv.getUint32(4, le),
+                        data: dv.getInt32(0, le)
+                    }
+                ];
+            }
             default:
                 return [0, buf];
         }
@@ -483,6 +507,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))
@@ -601,6 +626,13 @@ class DdbObj {
                     values
                 ];
             }
+            // case DdbType.duration: -> 实际会返回一个 any vector
+            // [2y, 1M, 3d, 7H, 11m, 12s, 15ms, 16us, 17ns]
+            // <Buffer 19 01 type = any, form = vector
+            // 09 00 00 00 01 00 00 00 rows = 9, cols = 1
+            // 24 00 type = DdbType.duration, form = scalar
+            // 02 00 00 00 09 00 00 00 
+            // 24 00 01 00 00 00 08 00 00 00 24 00 03 00 00 00 06 00 00 00 24 00 07 00 00 00 05 00 00 00 ... 50 more bytes>
             default:
                 return [0, buf];
         }
@@ -702,8 +734,10 @@ class DdbObj {
                         case DdbType.complex:
                         case DdbType.point:
                             return [Float64Array.from(this.value)];
-                        case DdbType.duration:
-                            return [value];
+                        case DdbType.duration: {
+                            const { unit, data } = this.value;
+                            return [Int32Array.of(data, unit)];
+                        }
                         case DdbType.handle:
                             throw new Error('DolphinDB Server 不支持 handle 的反序列化');
                         default:
@@ -786,6 +820,7 @@ class DdbObj {
             case DdbType.minute:
             case DdbType.second:
             case DdbType.datetime:
+            case DdbType.datehour:
                 return [value];
             case DdbType.float:
                 return [value];
@@ -885,6 +920,10 @@ class DdbObj {
                     switch (this.type) {
                         case DdbType.functiondef:
                             return `'${this.value.name}'`;
+                        case DdbType.duration: {
+                            const { data, unit } = this.value;
+                            return `${data}${DdbDurationUnit[unit]}`;
+                        }
                         case DdbType.string:
                             return `'${this.value}'`;
                     }
@@ -1572,25 +1611,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(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(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);