dolphindb 0.0.15 → 2.0.500

package/index.d.ts

@@ -81,17 +81,24 @@ export interface DdbArrayVectorBlock {
 export declare type DdbValue = null | boolean | number | [number, number] | bigint | string | string[] | Uint8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | Uint8Array[] | DdbObj[] | DdbFunctionDefValue | DdbSymbolExtendedValue | DdbArrayVectorBlock[];
 export declare type DdbVectorValue = string | string[] | Uint8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | Uint8Array[] | DdbObj[] | DdbSymbolExtendedValue | DdbArrayVectorBlock[];
 export declare const nulls: {
+    readonly bool: 128;
     readonly char: "€";
     readonly int16: -32768;
     readonly int32: -2147483648;
     readonly int64: -9223372036854775808n;
+    readonly float32: -3.4028234663852886e+38;
+    /** -Number.MAX_VALUE */
+    readonly double: number;
+    readonly bytes16: Uint8Array;
 };
 export declare const timezone_offset: number;
 /** 可以表示所有 DolphinDB 数据库中的数据类型 */
 export declare class DdbObj<T extends DdbValue = DdbValue> {
     static dec: TextDecoder;
     static enc: TextEncoder;
-    /** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base */
+    /** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base ？
+        只是暂存，如果一张表有多个 symbol 列，可能这个 symbol base 会被复用，不同的对象之间 symbol base 一般不复用
+    */
     static symbol_bases: Record<number, string[]>;
     /** little endian (client) */
     static le_client: boolean;
@@ -147,46 +154,49 @@ export declare class DdbVoid extends DdbObj<undefined> {
     constructor();
 }
 export declare class DdbBool extends DdbObj<boolean> {
-    constructor(value: boolean);
+    constructor(value: boolean | null);
 }
 export declare class DdbChar extends DdbObj<string> {
-    constructor(value: string);
+    constructor(value: string | null);
 }
 export declare class DdbInt extends DdbObj<number> {
-    constructor(value: number);
+    constructor(value: number | null);
 }
 export declare class DdbString extends DdbObj<string> {
     constructor(value: string);
 }
 export declare class DdbLong extends DdbObj<bigint> {
-    constructor(value: bigint);
+    constructor(value: bigint | null);
 }
 export declare class DdbDouble extends DdbObj<number> {
-    constructor(value: number);
+    constructor(value: number | null);
 }
 export declare class DdbDateTime extends DdbObj<number> {
-    constructor(value: number);
+    constructor(value: number | null);
 }
 export declare class DdbTimeStamp extends DdbObj<bigint> {
-    constructor(value: bigint);
+    constructor(value: bigint | null);
 }
 export declare class DdbNanoTimeStamp extends DdbObj<bigint> {
-    constructor(value: bigint);
+    constructor(value: bigint | null);
 }
 export declare class DdbVectorInt extends DdbObj<Int32Array> {
-    constructor(value: number[], name?: string);
+    constructor(value: (number | null)[] | Int32Array, name?: string);
 }
 export declare class DdbVectorString extends DdbObj<string[]> {
     constructor(value: string[], name?: string);
 }
 export declare class DdbVectorDouble extends DdbObj<Float64Array> {
-    constructor(value: number[], name?: string);
+    constructor(value: (number | null)[] | Float64Array, name?: string);
 }
 export declare class DdbVectorAny extends DdbObj {
     constructor(value: DdbObj<DdbValue>[], name?: string);
 }
+export declare class DdbVectorSymbol extends DdbObj<DdbSymbolExtendedValue> {
+    constructor(value: string[], name?: string);
+}
 export declare class DdbPair extends DdbObj<Int32Array> {
-    constructor(l: number, r?: number);
+    constructor(l: number | null, r?: number | null);
 }
 export declare class DdbFunction extends DdbObj<DdbFunctionDefValue> {
     constructor(name: string, type: DdbFunctionType);
@@ -248,6 +258,7 @@ export declare class DDB {
     presolver(buf: Uint8Array): void;
     prejector(error: Error): void;
     presult: Promise<Uint8Array>;
+    get connected(): boolean;
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL
         (without establishing an actual network connection)
@@ -348,7 +359,7 @@ export declare class DDB {
     };
     /** 自动转换 js string, boolean 为 DdbObj */
     to_ddbobj(value: DdbObj | string | boolean): DdbObj;
-    /** 转换 js 数组为 DdbObj[] (in place, 会修改原数组) */
+    /** 转换 js 数组为 DdbObj[] */
     to_ddbobjs(values: any[]): DdbObj<DdbValue>[];
 }
 export default DDB;

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbFunction = exports.DdbPair = exports.DdbVectorAny = exports.DdbVectorDouble = exports.DdbVectorString = exports.DdbVectorInt = 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.ddb_sizes = exports.DdbType = exports.DdbForm = void 0;
+exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbFunction = exports.DdbPair = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorDouble = exports.DdbVectorString = exports.DdbVectorInt = 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.ddb_sizes = exports.DdbType = exports.DdbForm = void 0;
 const tslib_1 = require("tslib");
 const ws_1 = require("ws");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
@@ -109,10 +109,15 @@ var DdbFunctionType;
     DdbFunctionType[DdbFunctionType["JitPartialFunc"] = 8] = "JitPartialFunc";
 })(DdbFunctionType = exports.DdbFunctionType || (exports.DdbFunctionType = {}));
 exports.nulls = {
+    bool: 0x80,
     char: '\x80',
     int16: -32768,
     int32: -2147483648,
-    int64: -0x8000000000000000n, // -922_3372_0368_5477_5808
+    int64: -0x8000000000000000n,
+    float32: -3.4028234663852886e+38,
+    /** -Number.MAX_VALUE */
+    double: -Number.MAX_VALUE,
+    bytes16: Uint8Array.from(new Array(16).fill(0))
 };
 exports.timezone_offset = 1000 * 60 * new Date().getTimezoneOffset();
 /** 可以表示所有 DolphinDB 数据库中的数据类型 */
@@ -129,7 +134,7 @@ class DdbObj {
                 form: DdbForm.scalar,
                 type: DdbType.void,
                 length: 0,
-                value: undefined
+                value: null
             });
         const type = buf[0];
         const form = buf[1];
@@ -278,13 +283,18 @@ class DdbObj {
         switch (type) {
             case DdbType.void:
                 return [1, null];
-            case DdbType.bool:
-                return [1, Boolean(buf[0])];
-            case DdbType.char:
-                return [1, String.fromCharCode(buf[0])];
+            case DdbType.bool: {
+                const value = buf[0];
+                return [1, value === exports.nulls.bool ? null : Boolean(value)];
+            }
+            case DdbType.char: {
+                const value = String.fromCharCode(buf[0]);
+                return [1, value === exports.nulls.char ? null : value];
+            }
             case DdbType.short: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
-                return [2, dv.getInt16(0, le)];
+                const value = dv.getInt16(0, le);
+                return [2, value === exports.nulls.int16 ? null : value];
             }
             case DdbType.int:
             // datetime
@@ -296,15 +306,18 @@ class DdbObj {
             case DdbType.datetime:
             case DdbType.datehour: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
-                return [4, dv.getInt32(0, le)];
+                const value = dv.getInt32(0, le);
+                return [4, value === exports.nulls.int32 ? null : value];
             }
             case DdbType.float: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
-                return [4, dv.getFloat32(0, le)];
+                const value = dv.getFloat32(0, le);
+                return [4, value === exports.nulls.float32 ? null : value];
             }
             case DdbType.double: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
-                return [8, dv.getFloat64(0, le)];
+                const value = dv.getFloat64(0, le);
+                return [8, value === exports.nulls.double ? null : value];
             }
             case DdbType.long:
             // timestamp
@@ -312,7 +325,8 @@ class DdbObj {
             case DdbType.nanotime:
             case DdbType.nanotimestamp: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
-                return [8, dv.getBigInt64(0, le)];
+                const value = dv.getBigInt64(0, le);
+                return [8, value === exports.nulls.int64 ? null : value];
             }
             case DdbType.string:
             case DdbType.symbol:
@@ -613,11 +627,26 @@ class DdbObj {
                         case DdbType.void:
                             return [Uint8Array.of(1)];
                         case DdbType.bool:
-                            return [Uint8Array.of(Number(value))];
+                            return [
+                                Uint8Array.of(value === null ?
+                                    exports.nulls.bool
+                                    :
+                                        Number(value))
+                            ];
                         case DdbType.char:
-                            return [Uint8Array.of(value.charCodeAt(0))];
+                            return [
+                                Uint8Array.of((value === null ?
+                                    exports.nulls.char
+                                    :
+                                        value).charCodeAt(0))
+                            ];
                         case DdbType.short:
-                            return [Int16Array.of(value)];
+                            return [
+                                Int16Array.of(value === null ?
+                                    exports.nulls.int16
+                                    :
+                                        value)
+                            ];
                         case DdbType.int:
                         // datetime
                         case DdbType.date:
@@ -627,17 +656,37 @@ class DdbObj {
                         case DdbType.second:
                         case DdbType.datetime:
                         case DdbType.datehour:
-                            return [Int32Array.of(value)];
+                            return [
+                                Int32Array.of(value === null ?
+                                    exports.nulls.int32
+                                    :
+                                        value)
+                            ];
                         case DdbType.float:
-                            return [Float32Array.of(value)];
+                            return [
+                                Float32Array.of(value === null ?
+                                    exports.nulls.float32
+                                    :
+                                        value)
+                            ];
                         case DdbType.double:
-                            return [Float64Array.of(value)];
+                            return [
+                                Float64Array.of(value === null ?
+                                    exports.nulls.double
+                                    :
+                                        value)
+                            ];
                         case DdbType.long:
                         // timestamp
                         case DdbType.timestamp:
                         case DdbType.nanotime:
                         case DdbType.nanotimestamp:
-                            return [BigInt64Array.of(this.value)];
+                            return [
+                                BigInt64Array.of(value === null ?
+                                    exports.nulls.int64
+                                    :
+                                        value)
+                            ];
                         case DdbType.string:
                         case DdbType.symbol:
                         case DdbType.code:
@@ -801,7 +850,7 @@ class DdbObj {
             case DdbType.symbol_extended: {
                 const { base_id, base, data } = value;
                 return [
-                    Uint32Array.of(base_id, base.length),
+                    Uint32Array.of(base_id || 0, base.length),
                     ...this.pack_vector_body(base, DdbType.string, base.length),
                     data
                 ];
@@ -888,7 +937,9 @@ class DdbObj {
 exports.DdbObj = DdbObj;
 DdbObj.dec = new TextDecoder('utf-8');
 DdbObj.enc = new TextEncoder();
-/** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base */
+/** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base ？
+    只是暂存，如果一张表有多个 symbol 列，可能这个 symbol base 会被复用，不同的对象之间 symbol base 一般不复用
+*/
 DdbObj.symbol_bases = {};
 /** little endian (client) */
 DdbObj.le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
@@ -898,6 +949,7 @@ class DdbVoid extends DdbObj {
             form: DdbForm.scalar,
             type: DdbType.void,
             length: 0,
+            value: null,
         });
     }
 }
@@ -930,7 +982,7 @@ class DdbInt extends DdbObj {
             form: DdbForm.scalar,
             type: DdbType.int,
             length: 4,
-            value
+            value,
         });
     }
 }
@@ -1009,7 +1061,13 @@ class DdbVectorInt extends DdbObj {
             length: 0,
             rows: value.length,
             cols: 1,
-            value: Int32Array.from(value),
+            value: value instanceof Int32Array ?
+                value
+                :
+                    Int32Array.from(value, v => v === null ?
+                        exports.nulls.int32
+                        :
+                            v),
             name,
         });
     }
@@ -1037,7 +1095,13 @@ class DdbVectorDouble extends DdbObj {
             length: 0,
             rows: value.length,
             cols: 1,
-            value: Float64Array.from(value),
+            value: value instanceof Float64Array ?
+                value
+                :
+                    Float64Array.from(value, v => v === null ?
+                        exports.nulls.double
+                        :
+                            v),
             name,
         });
     }
@@ -1057,15 +1121,46 @@ class DdbVectorAny extends DdbObj {
     }
 }
 exports.DdbVectorAny = DdbVectorAny;
+class DdbVectorSymbol extends DdbObj {
+    constructor(value, name) {
+        let map = new Map([
+            ['', 0]
+        ]);
+        let data = new Uint32Array(value.length);
+        for (let i = 0; i < value.length; i++) {
+            const x = value[i];
+            let index = map.get(x);
+            if (index === undefined) {
+                index = map.size;
+                map.set(x, index);
+            }
+            data[i] = index;
+        }
+        super({
+            form: DdbForm.vector,
+            type: DdbType.symbol_extended,
+            length: 0,
+            rows: value.length,
+            cols: 1,
+            value: {
+                base: [...map.keys()],
+                base_id: null,
+                data,
+            },
+            name
+        });
+    }
+}
+exports.DdbVectorSymbol = DdbVectorSymbol;
 class DdbPair extends DdbObj {
-    constructor(l, r = -2147483648) {
+    constructor(l, r = null) {
         super({
             form: DdbForm.pair,
             type: DdbType.int,
             length: 0,
             rows: 2,
             cols: 1,
-            value: Int32Array.of(l, r)
+            value: Int32Array.of(l === null ? exports.nulls.int32 : l, r === null ? exports.nulls.int32 : r)
         });
     }
 }
@@ -1201,12 +1296,14 @@ class DDB {
     /** resolver, rejector, promise of last rpc */
     presolver(buf) { }
     prejector(error) { }
+    get connected() {
+        return this.websocket?.readyState === ws_1.WebSocket.OPEN;
+    }
     /** Establish the actual WebSocket connection to the DolphinDB corresponding to the URL */
     async connect({ url = this.url, login = true, username = 'admin', password = '123456', python = false, } = {}) {
         this.url = url;
         this.python = python;
-        if (this.websocket?.readyState === ws_1.WebSocket.OPEN)
-            this.disconnect();
+        this.disconnect();
         let websocket = new ws_1.WebSocket(url, python ? ['python'] : [], {
             maxPayload: 2 ** 33 // 8 GB
         });
@@ -1299,7 +1396,11 @@ class DDB {
         return `/ ${options.join('_')}`;
     }
     disconnect() {
-        this.websocket?.close(1000);
+        if (this.connected)
+            this.websocket.close(1000);
+        this.presolver = buf => { };
+        this.prejector = error => { };
+        this.presult = Promise.resolve(null);
     }
     /** rpc through websocket (function/script/variable command)
         - type: API 类型: 'script' | 'function' | 'variable'
@@ -1310,7 +1411,7 @@ class DDB {
     async rpc(type, { script, func, args = [], vars = [], urgent, }) {
         if (!this.websocket)
             await this.connect();
-        if (this.websocket.readyState !== ws_1.WebSocket.OPEN)
+        if (!this.connected)
             throw new Error(`${this.url} is already disconnected`);
         // 临界区：保证多个 rpc 并发时形成 promise 链
         // ddb 世界观：需要等待上一个 rpc 结果从 server 返回之后才能发起下一个调用  
@@ -1333,7 +1434,7 @@ class DDB {
         // 临界区结束，只有一个 rpc 请求可以写 WebSocket
         if (urgent && type !== 'script' && type !== 'function')
             throw new Error('urgent 只适用于 script 和 funciton');
-        this.to_ddbobjs(args);
+        args = this.to_ddbobjs(args);
         const command = this.enc.encode((() => {
             switch (type) {
                 case 'function':
@@ -1479,11 +1580,9 @@ class DDB {
                 throw new Error(`不能自动转换 ${type} 至 DdbObj`);
         }
     }
-    /** 转换 js 数组为 DdbObj[] (in place, 会修改原数组) */
+    /** 转换 js 数组为 DdbObj[] */
     to_ddbobjs(values) {
-        for (let i = 0; i < values.length; i++)
-            values[i] = this.to_ddbobj(values[i]);
-        return values;
+        return values.map(value => this.to_ddbobj(value));
     }
 }
 exports.DDB = DDB;