dolphindb 2.0.903 → 2.0.904

package/index.d.ts

@@ -376,7 +376,7 @@ export declare function timestamp2str(timestamp: bigint | null, format?: string)
 export declare function datehour2ms(datehour: number | null): number | null;
 export declare function datehour2str(datehour: number | null, format?: string): string;
 /** parse timestamp string to bigint value
-    - str: str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
+    - str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
         timestamp string, If it is an empty string or 'null', it will return the corresponding empty value (nulls.int64)
     - format?:
         对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSS`

package/index.js

@@ -1,3 +1,4 @@
+// import { table, getBorderCharacters, type TableUserConfig } from 'table'
 import { WebSocket } from 'ws';
 import dayjs from 'dayjs';
 import DayjsCustomParseFormat from 'dayjs/plugin/customParseFormat.js';
@@ -1959,7 +1960,7 @@ export function datehour2str(datehour, format = 'YYYY.MM.DDTHH') {
             dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() + ms).format(format);
 }
 /** parse timestamp string to bigint value
-    - str: str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
+    - str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
         timestamp string, If it is an empty string or 'null', it will return the corresponding empty value (nulls.int64)
     - format?:
         对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSS`
@@ -2091,6 +2092,11 @@ export class DDB {
     /** utf-8 text decoder */
     dec = new TextDecoder('utf-8');
     enc = new TextEncoder();
+    // port = 8848
+    // /** ddb 连接状态 */
+    // state = '未连接'
+    // socket = null as Socket
+    // clients = new Set<Duplex>()
     /** DolphinDB WebSocket URL
         e.g. `ws://127.0.0.1:8848/`, `wss://dolphindb.com`
     */
@@ -2579,4 +2585,157 @@ export class DDB {
         return this.streaming;
     }
 }
+// const ddb_gateway = {
+//         server: null as SocketServer,
+//         clients: new Set<Socket>(),
+//         port: 8849,
+//         controllers: {
+//             /** alias */
+//             c0: {
+//                 hostname: '127.0.0.1',
+//                 port: 8850,
+//             },
+//             c1: {
+//                 hostname: '127.0.0.1',
+//                 port: 8851,
+//             },
+//             c2: {
+//                 hostname: '127.0.0.1',
+//                 port: 8852,
+//             }
+//         },
+//         master: '',
+//         sids: new Map<string, string>(),
+//         state: 'init',
+//         async start () {
+//             for (const alias in this.controllers) {
+//                 this.master = alias
+//                 break
+//             }
+//             this.server = create_socket_server(
+//                 {
+//                     allowHalfOpen: false,
+//                     pauseOnConnect: false,
+//                 },
+//                 this.accept.bind(this)
+//             )
+//             this.server.on('error', error => {
+//                 console.log(new Date(), 'gateway 出错:', error)
+//             })
+//             await new Promise<void>(resolve => {
+//                 this.server.listen(this.port, resolve)
+//             })
+//             this.auto_switch_master()
+//             console.log(new Date(), 'gateway 成功启动')
+//         },
+//         async stop () {
+//             this.state = 'stopping'
+//             console.log(new Date(), '正在停止 auto_switch_master')
+//             for (const client of this.clients)
+//                 client.end()
+//             await new Promise<void>((resolve, reject) => {
+//                 this.server.close(error => {
+//                     if (error) {
+//                         reject(error)
+//                         return
+//                     }
+//                     resolve()
+//                 })
+//             })
+//         },
+//         /** 接收到 client tcp 连接 */
+//         async accept (client: Socket) {
+//             this.clients.add(client)
+//             const port = client.remotePort
+//             // --- 
+//             console.log(port, new Date(), 'gateway accept client 连接，开始建立管道')
+//             let controller = new Socket({
+//                 allowHalfOpen: false,
+//                 readable: true,
+//                 writable: true,
+//             })
+//             controller.on('lookup', (error, address, family, host) => {
+//                 console.log(port, new Date(), 'controller 域名解析 (lookup) 完成', error, address, family, host)
+//             })
+//             controller.on('close', has_error => {
+//                 console.log(port, new Date(), 'controller 关闭连接，是否出错:', has_error)
+//             })
+//             controller.on('timeout', () => {
+//                 console.log(port, new Date(), 'controller 超时')
+//             })
+//             controller.on('error', error => {
+//                 console.log(port, new Date(), 'controller 出错了:', error)
+//                 client.end()
+//             })
+//             // --- client 错误处理
+//             client.on('error', error => {
+//                 console.log(port, new Date(), 'client 出错，关闭与 controller 的连接', error)
+//                 controller.end()
+//             })
+//             client.on('close', has_error => {
+//                 this.clients.delete(client)
+//                 console.log(port, new Date(), 'client 关闭连接，是否出错:', has_error)
+//             })
+//             // --- 
+//             console.log(port, new Date(), 'gateway 开始连接到 controller')
+//             const { hostname, port: master_port } = this.controllers[this.master]
+//             await new Promise<void>(resolve => {
+//                 // callback 会被 socket.once('connect', callback)
+//                 controller.connect({
+//                     port: master_port,
+//                     host: hostname,
+//                     // host: '127.0.0.1',
+//                     family: 0,
+//                 }, resolve)
+//             })
+//             console.log(port, new Date(), 'gateway 已连接到 controller')
+//             // --- 
+//             console.log(port, new Date(), 'gateway 建立 client <-> controller')
+//             client.pipe(controller)
+//             controller.pipe(client)
+//         },
+//         /** https://www.dolphindb.cn/cn/help/FunctionsandCommands/FunctionReferences/g/getActiveMaster.html?highlight=getactivemaster */
+//         async get_active_master () {
+//             for (const alias in this.controllers) {
+//                 const { hostname, port } = this.controllers[alias] as { hostname: string, port: number }
+//                 const sid = this.sids.get(alias)
+//                 try {
+//                     const master = (
+//                         await ddb.rpc_json('getActiveMaster()', { hostname, port, sid })
+//                     ).value as string
+//                     console.log(new Date(), `${alias}.getActiveMaster() -> ${this.master}`)
+//                     this.sids.set(alias, sid)
+//                     if (!master)
+//                         throw new Error(`${new Date().toString()} getActiveMaster 得到的 master 为空`)
+//                     return master
+//                 } catch (error) {
+//                     console.log(new Date(), error)
+//                 }
+//             }
+//             return this.master
+//         },
+//         async auto_switch_master () {
+//             if (this.state === 'stopping') {
+//                 this.state = 'running'
+//                 console.log('gateway 恢复 auto_switch_master')
+//                 return
+//             }
+//             this.state = 'running'
+//             for (;  this.state === 'running';  ) {
+//                 const master = this.master
+//                 const master_ = await this.get_active_master()
+//                 if (master === master_) {
+//                     await delay(10 * 1000)
+//                     continue
+//                 }
+//                 this.master = master_
+//                 console.log(new Date(), `master 从 ${master} 切换为 ${master_}, 断开所有 clients`)
+//                 for (const client of this.clients)
+//                     client.end()
+//                 await delay(3 * 1000)
+//             }
+//             console.log(new Date(), `gateway.state === ${this.state}, 停止 auto_switch_master`)
+//             this.state = 'stopped'
+//     }
+// }
 //# sourceMappingURL=index.js.map