dolphindb 3.0.105 → 3.0.107

package/i18n/dict.json

@@ -91,5 +91,8 @@
     },
     "pack 时字符串中间不能含有 \\0, 否则上传给 DolphinDB 会导致连接断开": {
         "en": "The string cannot contain \\0 in the middle when packing, otherwise uploading to DolphinDB will cause the connection to be disconnected"
+    },
+    "发送至 DolphinDB 执行的脚本中间不能含有 \\0": {
+        "en": "The script sent to DolphinDB for execution cannot contain \\0 in the middle"
     }
 }

package/index.d.ts

@@ -494,7 +494,7 @@ export declare function second2str(second: number | null, format?: string): stri
 export declare function datetime2ms(datetime: number | null): number | null;
 export declare function datetime2str(datetime: number | null, format?: string): string;
 /** _datetime_formatter.format 会在 date 为 Invalid Date 时抛出错误 */
-export declare function timestamp2ms(timestamp: bigint | null): number | null;
+export declare function timestamp2ms(timestamp: bigint | number | null): number | null;
 /** format timestamp (bigint) to string
     - timestamp: bigint value
     - format?:

package/index.js

@@ -2409,13 +2409,13 @@ export class DdbTable extends DdbObj {
     }
 }
 export function date2ms(date) {
-    // 将 server 的本地时间 (以 ms 为单位，1970.01.01 00:00:00 作为零点) 当成是客户端这里的本地的时间，然后根据本地的时区信息转换为 utc 时间
-    // 本地的时区与实际的时间值相关，timezone offset 可能会受到夏令时 (DST) 的影响
+    // 将 server 的本地时间 (以 ms 为单位，1970.01.01 00:00:00 作为零点) 作为 UTC-0 格式化为字符串，然后根据本地的时区解析这个字符串转换为 UTC-8
+    // 本地的时区与实际的时间值相关，getTimezoneOffset() 可能会受到夏令时 (DST) 的影响，不能使用
     // 得到的 utc 毫秒数交给 js date 或者 dayjs 去格式化
     if (date === null || date === nulls.int32)
         return null;
     const ms = 1000 * 3600 * 24 * date;
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return timestamp2ms(ms);
 }
 export function date2str(date, format = 'YYYY.MM.DD') {
     return (date === null || date === nulls.int32) ?
@@ -2442,7 +2442,7 @@ export function time2ms(time) {
     return (time === null || time === nulls.int32) ?
         null
         :
-            1000 * 60 * new Date(time).getTimezoneOffset() + time;
+            timestamp2ms(time);
 }
 export function time2str(time, format = 'HH:mm:ss.SSS') {
     return (time === null || time === nulls.int32) ?
@@ -2454,7 +2454,7 @@ export function minute2ms(minute) {
     if (minute === null || minute === nulls.int32)
         return null;
     const ms = 60 * 1000 * minute;
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return timestamp2ms(ms);
 }
 export function minute2str(minute, format = 'HH:mm[m]') {
     return (minute === null || minute === nulls.int32) ?
@@ -2466,7 +2466,7 @@ export function second2ms(second) {
     if (second === null || second === nulls.int32)
         return null;
     const ms = 1000 * second;
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return timestamp2ms(ms);
 }
 export function second2str(second, format = 'HH:mm:ss') {
     return (second === null || second === nulls.int32) ?
@@ -2508,13 +2508,13 @@ export function datehour2ms(datehour) {
     if (datehour === null || datehour === nulls.int32)
         return null;
     const ms = 1000 * 3600 * datehour;
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return timestamp2ms(ms);
 }
 export function datehour2str(datehour, format = 'YYYY.MM.DDTHH') {
     if (datehour === null || datehour === nulls.int32)
         return 'null';
     const ms = 1000 * 3600 * datehour;
-    return dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() + ms).format(format);
+    return dayjs(timestamp2ms(ms)).format(format);
 }
 /** parse timestamp string to bigint value
     - str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
@@ -2545,7 +2545,7 @@ export function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
     const i_nanosecond_start = format.indexOf('SSSSSSSSS', i_second_end);
     assert(i_nanosecond_start !== -1, t('格式串必须包含纳秒的格式 (SSSSSSSSS)'));
     const ms = Number(nanotime) / 1000000;
-    return (dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() + ms).format(format.slice(0, i_second_end)) +
+    return (dayjs(timestamp2ms(ms)).format(format.slice(0, i_second_end)) +
         format.slice(i_second_end, i_nanosecond_start) +
         String(nanotime % 1000000000n).padStart(9, '0'));
 }
@@ -2974,12 +2974,12 @@ export class DDB {
             if (this.error)
                 throw this.error;
             const args = DdbObj.to_ddbobjs(_args);
-            const rpc_id = ` (id = ${id})`;
+            const rpc_id = `(id = ${id})`;
             const command = this.enc.encode((() => {
                 switch (type) {
                     case 'function':
                         if (this.verbose)
-                            console.log(func + inspect(args, { colors: false }) + rpc_id);
+                            console.log(func, args.map(arg => arg.data()), rpc_id);
                         assert(!func.includes('\0'), t('发送至 DolphinDB 执行的脚本中间不能含有 \\0'));
                         return 'function\n' +
                             `${func}\n` +
@@ -2987,14 +2987,15 @@ export class DDB {
                             `${Number(DDB.le_client)}\n`;
                     case 'script':
                         if (this.verbose)
-                            console.log(script + rpc_id);
+                            console.log(script, rpc_id);
                         assert(!script.includes('\0'), t('发送至 DolphinDB 执行的脚本中间不能含有 \\0'));
                         return 'script\n' +
                             script;
                     case 'variable':
                         if (this.verbose)
-                            for (let i = 0; i < vars.length; i++)
-                                console.log(`${vars[i]} = ${inspect(args[i], { colors: false })}`);
+                            vars.forEach((v, i) => {
+                                console.log(v, '=', args[i].data());
+                            });
                         return 'variable\n' +
                             `${vars.join(',')}\n` +
                             `${vars.length}\n` +
@@ -3007,7 +3008,7 @@ export class DDB {
                                         `login(${this.username.quote()}, ${this.password.quote()})`
                                     :
                                         '') +
-                                rpc_id);
+                                ` ${rpc_id}`);
                         return 'connect\n' +
                             // 详见 InterProcessIO.cpp#APISocketConsole::parseScript 中的
                             // Util::startWith "connect"
@@ -3065,7 +3066,7 @@ export class DDB {
                 ]));
             });
             if (this.verbose)
-                console.log(inspect(result) + rpc_id);
+                console.log(result.data(), rpc_id);
             return result;
         });
     }