dolphindb 3.0.29 → 3.0.31

package/i18n/dict.json

@@ -85,5 +85,8 @@
     },
     " 暂时不支持转换为 js 对象": {
         "en": " conversion to js object is not supported at the moment"
+    },
+    "{{time}} 心跳检测失败，连接已断开": {
+        "en": "{{time}} heartbeat detection failed, the connection has been disconnected"
     }
 }

package/index.js

@@ -3,7 +3,7 @@ import DayjsCustomParseFormat from 'dayjs/plugin/customParseFormat.js';
 dayjs.extend(DayjsCustomParseFormat);
 import ipaddrjs from 'ipaddr.js';
 const { fromByteArray: buf2ipaddr } = ipaddrjs;
-import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, seq, zip_object, WebSocketOpen, WebSocketClosed, WebSocketClosing, decode, } from 'xshell';
+import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, seq, zip_object, WebSocketOpen, WebSocketClosed, WebSocketClosing, decode, delay } from 'xshell';
 import { t } from './i18n/index.js';
 export const nulls = {
     int8: -0x80, // -128
@@ -2628,6 +2628,23 @@ export class DDB {
                 await this.rpc('connect', { skip_connection_check: true });
                 if (this.streaming)
                     await this.subscribe();
+                else
+                    // 定时执行一次空脚本作为心跳检查，避免因为 nat 超时导致 tcp 连接断开
+                    (async () => {
+                        while (true) {
+                            await delay(1000 * 60 * 4.5);
+                            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) {
@@ -3081,13 +3098,22 @@ export class DDB {
                         first = false;
                     }
                     else {
-                        const _data = obj.data();
-                        const rows = _data[0].length;
-                        const { columns } = schema;
-                        data = {
-                            ...schema,
-                            data: seq(rows, i => zip_object(columns, seq(columns.length, j => _data[j][i])))
-                        };
+                        let rows;
+                        // 用了流数据过滤功能后，必然发 table
+                        if (obj.form === DdbForm.table) {
+                            data = obj.data();
+                            data.name ||= schema.name;
+                            rows = data.data.length;
+                        }
+                        else {
+                            const _data = obj.data();
+                            const { columns } = schema;
+                            rows = _data[0]?.length || 0;
+                            data = {
+                                ...schema,
+                                data: seq(rows, i => zip_object(columns, seq(columns.length, j => _data[j][i])))
+                            };
+                        }
                         win.rows += rows;
                         win.segments.push(data);
                         win.objs.push(obj);