dolphindb 2.0.516 → 2.0.519

package/index.d.ts

@@ -10,7 +10,9 @@ export declare enum DdbForm {
     dict = 5,
     table = 6,
     chart = 7,
-    chunk = 8
+    chunk = 8,
+    /** sysobj */
+    object = 9
 }
 /** DolphinDB DataType
     对应的 array vector 类型为 64 + 基本类型
@@ -285,7 +287,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/index.js

@@ -6,6 +6,8 @@ const ws_1 = require("ws");
 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;
 const net_js_1 = require("xshell/net.js");
 const utils_js_1 = require("xshell/utils.js");
 var DdbForm;
@@ -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 + 基本类型
@@ -1070,7 +1074,12 @@ function format(type, value, le, options) {
             return (0, utils_js_1.inspect)((value === null || value === exports.nulls.int8) ?
                 null
                 :
-                    value, options);
+                    // ascii printable
+                    // http://facweb.cs.depaul.edu/sjost/it212/documents/ascii-pr.htm
+                    (32 <= value && value <= 126) ?
+                        String.fromCharCode(value)
+                        :
+                            value, options);
         case DdbType.short:
             return (0, utils_js_1.inspect)((value === null || value === exports.nulls.int16) ?
                 null
@@ -1244,7 +1253,6 @@ class DdbVoid extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.void,
-            length: 0,
             value: null,
         });
     }
@@ -1255,7 +1263,6 @@ class DdbBool extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.bool,
-            length: 1,
             value,
         });
     }
@@ -1266,7 +1273,6 @@ class DdbChar extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.char,
-            length: 1,
             value: typeof value === 'string' ?
                 value.charCodeAt(0)
                 :
@@ -1280,7 +1286,6 @@ class DdbInt extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.int,
-            length: 4,
             value,
         });
     }
@@ -1291,7 +1296,6 @@ class DdbString extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.string,
-            length: 0,
             value
         });
     }
@@ -1302,7 +1306,6 @@ class DdbLong extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.long,
-            length: 8,
             value
         });
     }
@@ -1313,7 +1316,6 @@ class DdbDouble extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.double,
-            length: 8,
             value
         });
     }
@@ -1324,7 +1326,6 @@ class DdbDateTime extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.datetime,
-            length: 4,
             value
         });
     }
@@ -1335,7 +1336,6 @@ class DdbTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.timestamp,
-            length: 8,
             value
         });
     }
@@ -1346,7 +1346,6 @@ class DdbNanoTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.nanotimestamp,
-            length: 8,
             value
         });
     }
@@ -1357,7 +1356,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)
@@ -1370,7 +1368,6 @@ class DdbFunction extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.functiondef,
-            length: 0,
             value: { type, name }
         });
     }
@@ -1381,7 +1378,6 @@ class DdbVectorInt extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.int,
-            length: 0,
             rows: ints.length,
             cols: 1,
             value: ints instanceof Int32Array ?
@@ -1401,7 +1397,6 @@ class DdbVectorDouble extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.double,
-            length: 0,
             rows: doubles.length,
             cols: 1,
             value: doubles instanceof Float64Array ?
@@ -1421,7 +1416,6 @@ class DdbVectorString extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.string,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: strings,
@@ -1435,7 +1429,6 @@ class DdbVectorAny extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.any,
-            length: 0,
             rows: objs.length,
             cols: 1,
             value: objs,
@@ -1462,7 +1455,6 @@ class DdbVectorSymbol extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.symbol_extended,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: {
@@ -1480,7 +1472,6 @@ class DdbSetInt extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.int,
-            length: 0,
             rows: ints instanceof Set ?
                 ints.size
                 :
@@ -1502,7 +1493,6 @@ class DdbSetDouble extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.double,
-            length: 0,
             rows: doubles instanceof Set ?
                 doubles.size
                 :
@@ -1526,7 +1516,6 @@ class DdbSetString extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.string,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: strings
@@ -1539,7 +1528,6 @@ class DdbTable extends DdbObj {
         super({
             form: DdbForm.table,
             type: DdbType.void,
-            length: 0,
             rows: columns[0].rows,
             cols: columns.length,
             name,
@@ -1708,14 +1696,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('.');
 }