dolphindb 2.0.515 → 2.0.518

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 + 基本类型
@@ -913,7 +917,7 @@ class DdbObj {
                 case DdbForm.dict:
                     return `dict<${DdbType[this.value[0].type]}, ${DdbType[this.value[1].type]}>`;
                 case DdbForm.matrix:
-                    return `matrix<${DdbType[this.type]}>[${this.rows}r][${this.cols}c]`;
+                    return `matrix<${tname}>[${this.rows}r][${this.cols}c]`;
                 default:
                     return `${DdbForm[this.form]} ${tname}`;
             }
@@ -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
@@ -1203,7 +1212,10 @@ function format(type, value, le, options) {
                 :
                     int1282str(value, le);
         case DdbType.blob:
-            return (0, utils_js_1.inspect)(DdbObj.dec.decode(value.subarray(0, 1000)), options);
+            return (0, utils_js_1.inspect)(value.length > 100 ?
+                DdbObj.dec.decode(value.subarray(0, 98)) + '…'
+                :
+                    DdbObj.dec.decode(value), options);
         case DdbType.point: {
             let [x, y] = value;
             if (x === exports.nulls.double)
@@ -1570,7 +1582,7 @@ function time2str(time, format = 'HH:mm:ss.SSS') {
                 .format(format);
 }
 exports.time2str = time2str;
-function minute2str(minute, format = 'HH:mm') {
+function minute2str(minute, format = 'HH:mm[m]') {
     return (minute === null || minute === exports.nulls.int32) ?
         'null'
         :
@@ -1705,14 +1717,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('.');
 }