dolphindb 3.1.24 → 3.1.25

package/index.d.ts

@@ -174,7 +174,7 @@ export interface InspectOptions extends UtilInspectOptions {
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
 /** 格式化向量、集合中的第 index 项为字符串，空值返回 'null' 字符串  formatted vector, the index-th item in the collection is a string, a null value returns a 'null' string */
 export declare function formati(obj: DdbVectorObj, index: number, options?: InspectOptions): string;
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | string[] | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | IotVectorItemValue | DdbDurationVectorValue | DdbDecimal128VectorValue | BigInt128Array | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | DdbArrayVectorValue | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbMatrixValue | DdbChartValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | string[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | IotVectorItemValue | DdbDurationVectorValue | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbArrayVectorValue | DdbDecimal128VectorValue | DdbMatrixValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 /** 构造 void 类型，默认为 `DdbVoidType.undefined` */
@@ -417,7 +417,6 @@ export declare class DDB {
     print_object_buffer: boolean;
     print_message: boolean;
     parse_object: boolean;
-    heartbeat_aborter?: AbortController;
     /** 在 websocket 收到的第一个 error 时，
         在 connect_websocket 的 on_error 回调中构造 DdbConnectionError 并保存到 DDB 对象上，
         这个 error 的错误信息最准确 */

package/index.js

@@ -1,4 +1,4 @@
-import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, seq, zip_object, WebSocketOpen, WebSocketClosed, WebSocketClosing, decode, delay, check, empty, colored } from 'xshell';
+import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, seq, zip_object, WebSocketOpen, WebSocketClosed, WebSocketClosing, decode, check, empty, colored } from 'xshell';
 import { t } from "./i18n/index.js";
 import { ddb_tensor_bytes, DdbChartType, DdbDurationUnit, DdbForm, generate_array_type, DdbFunctionType, DdbType, DdbVoidType, dictables, function_definition_patterns, get_big_int_128, get_time_ddbobj, get_duration_unit, get_type_name, int1282str, ipaddr2str, is_decimal_null_value, is_decimal_type, time_formatters, number_nulls, nulls, set_big_int_128, uuid2str, get_times_ddbobj, funcdefs, get_number_formatter } from "./common.js";
 export * from "./common.js";
@@ -2410,7 +2410,6 @@ export class DDB {
     print_object_buffer = false;
     print_message = true;
     parse_object = true;
-    heartbeat_aborter;
     /** 在 websocket 收到的第一个 error 时，
         在 connect_websocket 的 on_error 回调中构造 DdbConnectionError 并保存到 DDB 对象上，
         这个 error 的错误信息最准确 */
@@ -2522,16 +2521,13 @@ export class DDB {
                 this.lwebsocket.resource = await connect_websocket(url, {
                     protocols: this.streaming ? ['streaming'] : this.dolphindb ? undefined : [this.language],
                     proxy: this.proxy,
+                    keep_alive_duration: 30_000,
                     on_message: (buffer, websocket) => {
                         this.on_message(new Uint8Array(buffer), websocket);
                     },
                     on_error: error => {
                         this.error ??= new DdbConnectionError(this.url, error);
-                        this.heartbeat_aborter?.abort();
                         this.on_error();
-                    },
-                    on_close: () => {
-                        this.heartbeat_aborter?.abort();
                     }
                 });
             }
@@ -2545,30 +2541,6 @@ export class DDB {
                 await this.rpc('connect', { skip_connection_check: true });
                 if (this.streaming)
                     await this.subscribe();
-                else
-                    // 定时执行一次空脚本作为心跳检查，避免因为 nat 超时导致 tcp 连接断开
-                    (async () => {
-                        this.heartbeat_aborter = new AbortController();
-                        while (true) {
-                            // 连接主动关闭时从循环退出防止影响 node.js 退出
-                            try {
-                                await delay(1000 * 60 * 4.5, { signal: this.heartbeat_aborter.signal });
-                            }
-                            catch {
-                                break;
-                            }
-                            if (this.connected)
-                                try {
-                                    await this.eval('');
-                                }
-                                catch (error) {
-                                    console.log(t('{{time}} 心跳检测失败，连接已断开', { time: new Date().to_formal_str() }), error);
-                                    break;
-                                }
-                            else
-                                break;
-                        }
-                    })();
                 resolve();
             }
             catch (error) {
@@ -2614,7 +2586,6 @@ export class DDB {
         return options.join('_');
     }
     disconnect() {
-        this.heartbeat_aborter?.abort();
         const { resource } = this.lwebsocket;
         if (resource) {
             const { readyState } = resource;