dolphindb 2.0.516 → 2.0.519

package/README.md

@@ -128,12 +128,12 @@ class DdbObj <T extends DdbValue = DdbValue> {
     /** 2nd dimension */
     cols?: number
     
-    /** the type of the value in matrix (only matrix has this field) */
-    datatype?: DdbType
-    
     /** the actual data. Different DdbForm, DdbType use different types in DdbValue to represent actual data */
     value: T
     
+    /** raw binary data, only top-level objects generated by parse_message when parse_object is false have this attribute */
+    buffer?: Uint8Array
+    
     constructor (data: Partial<DdbObj> & { form: DdbForm, type: DdbType, length: number }) {
         Object.assign(this, data)
     }

package/README.zh.md

@@ -129,12 +129,12 @@ class DdbObj <T extends DdbValue = DdbValue> {
     /** 第 2 维 */
     cols?: number
     
-    /** matrix 中值的类型，仅 matrix 才有 */
-    datatype?: DdbType
-    
     /** 实际数据。不同的 DdbForm, DdbType 使用 DdbValue 中不同的类型来表示实际数据 */
     value: T
     
+    /** 原始二进制数据，仅在 parse_object 为 false 时通过 parse_message 生成的顶层对象有这个属性 */
+    buffer?: Uint8Array
+    
     constructor (data: Partial<DdbObj> & { form: DdbForm, type: DdbType, length: number }) {
         Object.assign(this, data)
     }

package/browser.d.ts

@@ -8,7 +8,9 @@ export declare enum DdbForm {
     dict = 5,
     table = 6,
     chart = 7,
-    chunk = 8
+    chunk = 8,
+    /** sysobj */
+    object = 9
 }
 /** DolphinDB DataType
     对应的 array vector 类型为 64 + 基本类型
@@ -288,7 +290,7 @@ export declare function nanotimestamp2str(nanotimestamp: bigint, format?: string
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
 export declare function str2nanotimestamp(str: string, format?: string): bigint;
-export declare function ipaddr2str(buffer: Uint8Array, le?: boolean): string;
+export declare function ipaddr2str(buffer: Uint8Array, le?: boolean, ipv6?: boolean): string;
 export declare function uuid2str(buffer: Uint8Array, le?: boolean): string;
 export declare function int1282str(buffer: Uint8Array, le?: boolean): string;
 export declare class DDB {

package/browser.js

@@ -5,6 +5,8 @@ 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"));
 dayjs_1.default.extend(customParseFormat_js_1.default);
+const ipaddr_js_1 = tslib_1.__importDefault(require("ipaddr.js"));
+const { fromByteArray: buf2ipaddr } = ipaddr_js_1.default;
 require("xshell/prototype.browser");
 const utils_browser_1 = require("xshell/utils.browser");
 const net_browser_js_1 = require("xshell/net.browser.js");
@@ -19,6 +21,8 @@ var DdbForm;
     DdbForm[DdbForm["table"] = 6] = "table";
     DdbForm[DdbForm["chart"] = 7] = "chart";
     DdbForm[DdbForm["chunk"] = 8] = "chunk";
+    /** sysobj */
+    DdbForm[DdbForm["object"] = 9] = "object";
 })(DdbForm = exports.DdbForm || (exports.DdbForm = {}));
 /** DolphinDB DataType
     对应的 array vector 类型为 64 + 基本类型
@@ -1088,7 +1092,12 @@ function format(type, value, le) {
             return String((value === null || value === exports.nulls.int8) ?
                 null
                 :
-                    value);
+                    // ascii printable
+                    // http://facweb.cs.depaul.edu/sjost/it212/documents/ascii-pr.htm
+                    (32 <= value && value <= 126) ?
+                        String.fromCharCode(value).quote()
+                        :
+                            value);
         case DdbType.short:
             return String((value === null || value === exports.nulls.int16) ?
                 null
@@ -1165,7 +1174,7 @@ function format(type, value, le) {
         case DdbType.uuid:
             return uuid2str(value, le);
         case DdbType.functiondef:
-            return value.quote('single');
+            return value.name.quote('single');
         case DdbType.handle:
         case DdbType.code:
             return value.quote('single');
@@ -1213,7 +1222,6 @@ class DdbVoid extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.void,
-            length: 0,
             value: null,
         });
     }
@@ -1224,7 +1232,6 @@ class DdbBool extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.bool,
-            length: 1,
             value,
         });
     }
@@ -1235,7 +1242,6 @@ class DdbChar extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.char,
-            length: 1,
             value: typeof value === 'string' ?
                 value.charCodeAt(0)
                 :
@@ -1249,7 +1255,6 @@ class DdbInt extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.int,
-            length: 4,
             value,
         });
     }
@@ -1260,7 +1265,6 @@ class DdbString extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.string,
-            length: 0,
             value
         });
     }
@@ -1271,7 +1275,6 @@ class DdbLong extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.long,
-            length: 8,
             value
         });
     }
@@ -1282,7 +1285,6 @@ class DdbDouble extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.double,
-            length: 8,
             value
         });
     }
@@ -1293,7 +1295,6 @@ class DdbDateTime extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.datetime,
-            length: 4,
             value
         });
     }
@@ -1304,7 +1305,6 @@ class DdbTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.timestamp,
-            length: 8,
             value
         });
     }
@@ -1315,7 +1315,6 @@ class DdbNanoTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.nanotimestamp,
-            length: 8,
             value
         });
     }
@@ -1326,7 +1325,6 @@ class DdbPair extends DdbObj {
         super({
             form: DdbForm.pair,
             type: DdbType.int,
-            length: 0,
             rows: 2,
             cols: 1,
             value: Int32Array.of(l === null ? exports.nulls.int32 : l, r === null ? exports.nulls.int32 : r)
@@ -1339,7 +1337,6 @@ class DdbFunction extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.functiondef,
-            length: 0,
             value: { type, name }
         });
     }
@@ -1350,7 +1347,6 @@ class DdbVectorInt extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.int,
-            length: 0,
             rows: ints.length,
             cols: 1,
             value: ints instanceof Int32Array ?
@@ -1370,7 +1366,6 @@ class DdbVectorDouble extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.double,
-            length: 0,
             rows: doubles.length,
             cols: 1,
             value: doubles instanceof Float64Array ?
@@ -1390,7 +1385,6 @@ class DdbVectorString extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.string,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: strings,
@@ -1404,7 +1398,6 @@ class DdbVectorAny extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.any,
-            length: 0,
             rows: objs.length,
             cols: 1,
             value: objs,
@@ -1431,7 +1424,6 @@ class DdbVectorSymbol extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.symbol_extended,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: {
@@ -1449,7 +1441,6 @@ class DdbSetInt extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.int,
-            length: 0,
             rows: ints instanceof Set ?
                 ints.size
                 :
@@ -1471,7 +1462,6 @@ class DdbSetDouble extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.double,
-            length: 0,
             rows: doubles instanceof Set ?
                 doubles.size
                 :
@@ -1495,7 +1485,6 @@ class DdbSetString extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.string,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: strings
@@ -1508,7 +1497,6 @@ class DdbTable extends DdbObj {
         super({
             form: DdbForm.table,
             type: DdbType.void,
-            length: 0,
             rows: columns[0].rows,
             cols: columns.length,
             name,
@@ -1677,14 +1665,14 @@ function str2nanotimestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSSS') {
             BigInt(str.slice(i_nanosecond_start, i_nanosecond_start + 9)));
 }
 exports.str2nanotimestamp = str2nanotimestamp;
-function ipaddr2str(buffer, le = true) {
+function ipaddr2str(buffer, le = true, ipv6) {
     let buf = buffer;
     if (le)
         buf = buffer.slice().reverse();
     const i_non_zero = buf.findIndex(x => x);
-    if (i_non_zero !== -1 && i_non_zero < 12) // ipv6 (i_non_zero === -1 或 0 < i_non_zero < 12)
-        return [...buf].map(x => x.toString(16)
-            .padStart(2, '0')).join(':');
+    if (ipv6 ||
+        i_non_zero !== -1 && i_non_zero < 12) // ipv6
+        return buf2ipaddr([...buf]).toString();
     else // ipv4
         return buf.subarray(12).join('.');
 }