dolphindb 2.0.957 → 2.0.959

package/i18n/dict.json

@@ -73,5 +73,8 @@
     },
     "new DdbBlob 不能传空的 value": {
         "en": "new DdbBlob cannot pass an empty value"
+    },
+    "vector<{{type}}> 暂时不支持解析": {
+        "en": "cannot parse vector<{{type}}>"
     }
 }

package/index.d.ts

@@ -116,6 +116,7 @@ export interface DdbDecimal64VectorValue {
     scale: number;
     data: BigInt64Array;
 }
+export type DdbDurationVectorValue = DdbDurationValue[];
 export interface DdbSymbolExtendedValue {
     base_id: number;
     base: string[];
@@ -176,10 +177,10 @@ export type DdbScalarValue = null | boolean | number | bigint | string | Uint8Ar
     number
 ] | // complex, point
 DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value;
-export type DdbVectorValue = Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | // string[]
+export type DdbVectorValue = null | Uint8Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | // string[]
 Uint8Array[] | // blob
 DdbObj[] | // any
-DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue;
+DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDurationVectorValue;
 export type DdbValue = DdbScalarValue | DdbVectorValue | DdbMatrixValue | DdbDictValue | DdbChartValue;
 export type DdbStringObj = DdbObj<string>;
 export type DdbVectorObj<TValue extends DdbVectorValue = DdbVectorValue> = DdbObj<TValue>;

package/index.js

@@ -610,6 +610,8 @@ class DdbObj {
     /** 有可能没有字节对齐，不能直接使用原有 message 的 arraybuffer, 统一复制出来，让原有 arraybuffer 被回收掉比较好 */
     static parse_vector_items(buf, le, type, length) {
         switch (type) {
+            case DdbType.void:
+                return [0, null];
             case DdbType.bool:
             case DdbType.char:
                 return [
@@ -775,15 +777,31 @@ class DdbObj {
                     }
                 ];
             }
-            // case DdbType.duration: -> 实际会返回一个 any vector
+            // 以下情况时, 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>
+            // 其余情况 (目前仅 pair) 下, 会返回特殊的 duration 序列化
+            // 4 bytes data 4 bytes unit
+            // 01 00 00 00 data: 1 
+            // 01 00 00 00 unit: 1
+            // 02 00 00 00 data: 2
+            // 02 00 00 00 unit: 2
+            case DdbType.duration: {
+                const dv = new DataView(buf.buffer, buf.byteOffset);
+                let durations = [];
+                for (let i = 0; i < length; i++)
+                    durations.push({
+                        data: dv.getInt32(0 + 8 * i, le),
+                        unit: dv.getInt32(4 + 8 * i, le)
+                    });
+                return [8 * length, durations];
+            }
             default:
-                return [0, buf];
+                throw new Error(t('vector<{{type}}> 暂时不支持解析', { type: String(DdbType[type] || type) }));
         }
     }
     pack() {
@@ -970,6 +988,8 @@ class DdbObj {
     }
     static pack_vector_body(value, type, length) {
         switch (type) {
+            case DdbType.void:
+                return [];
             case DdbType.bool:
                 return [value];
             case DdbType.char:
@@ -1140,6 +1160,8 @@ class DdbObj {
                                 items[i] = inspect(base[data[i]], options);
                             return format_array(items, data.length > limit);
                         }
+                        case DdbType.void:
+                            return format(this.type, this.value, this.le, options);
                         case DdbType.uuid:
                         case DdbType.int128:
                         case DdbType.ipaddr: {
@@ -2258,7 +2280,7 @@ class DDB {
             this.streaming = options.streaming;
     }
     on_message(buffer, websocket) {
-        throw t('这是在调用 this.rpc 之前默认的 on_message, 不应该被调用到，除非建立连接后 server 先推送了 message');
+        throw new Error(t('这是在调用 this.rpc 之前默认的 on_message, 不应该被调用到，除非建立连接后 server 先推送了 message'));
     }
     on_error() {
         // 这里的实现一定会被 connect, rpc 中的实现覆盖
@@ -2313,8 +2335,6 @@ class DDB {
             try {
                 assert(this.connected);
                 await this.rpc('connect', { skip_connection_check: true });
-                if (this.autologin)
-                    await this.call('login', [this.username, this.password], { urgent: true, skip_connection_check: true });
                 if (this.streaming)
                     await this.subscribe();
                 resolve();
@@ -2496,8 +2516,21 @@ class DDB {
                                 `${Number(DDB.le_client)}\n`;
                         case 'connect':
                             if (this.verbose)
-                                console.log('connect()');
-                            return 'connect\n';
+                                console.log('connect()' +
+                                    (this.autologin ?
+                                        '\n' +
+                                            `login(${this.username.quote()}, ${this.password.quote()})`
+                                        :
+                                            ''));
+                            return 'connect\n' +
+                                // 详见 InterProcessIO.cpp#APISocketConsole::parseScript 中的
+                                // Util::startWith "connect"
+                                (this.autologin ?
+                                    'login\n' +
+                                        this.username + '\n' +
+                                        this.password /* encrypted (可选参数) + '\n' + 'false' */
+                                    :
+                                        '');
                     }
                 })());
                 websocket.send(concat([