dolphindb 3.0.1 → 3.0.3

package/i18n/dict.json

@@ -74,8 +74,8 @@
     "new DdbBlob 不能传空的 value": {
         "en": "new DdbBlob cannot pass an empty value"
     },
-    "vector<{{type}}> 暂时不支持解析": {
-        "en": "cannot parse vector<{{type}}>"
+    "{{form}}<{{type}}> 暂时不支持解析": {
+        "en": "cannot parse {{form}}<{{type}}>"
     },
     "流数据订阅后一定先返回 schema": {
         "en": "After subscribing to streaming data, the schema must be returned first."

package/index.d.ts

@@ -152,7 +152,7 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     ];
     pack(): Uint8Array;
     static pack_vector_body(value: DdbVectorValue, type: DdbType, length: number): ArrayBufferView[];
-    [inspect.custom](depth: number, _options: InspectOptions, _inspect: any): string | TValue;
+    [inspect.custom](depth: number, _options: InspectOptions, _inspect: any): string;
     inspect_type(): string;
     /** 自动转换 js string, boolean 为 DdbObj */
     static to_ddbobj(value: DdbObj | string | boolean): DdbObj;
@@ -176,13 +176,14 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     }): T;
 }
 export interface InspectOptions extends UtilInspectOptions {
+    /** `util.inspect.defaultOptions.colors` */
     colors?: boolean;
     /** `null` decimal places 小数位数 */
     decimals?: number;
     /** `true` 决定格式化后的数据是否有千分位 */
     grouping?: boolean;
 }
-/** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
+/** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串 */
 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;
@@ -400,6 +401,7 @@ export interface DdbOptions {
     sql?: SqlStandard;
     streaming?: StreamingParams;
     verbose?: boolean;
+    proxy?: string;
 }
 export declare class DDB {
     /** 当前的 session id (http 或 tcp) */
@@ -408,8 +410,7 @@ export declare class DDB {
     dec: TextDecoder;
     enc: TextEncoder;
     /** DolphinDB WebSocket URL
-        e.g. `ws://127.0.0.1:8848/`, `wss://dolphindb.com`
-    */
+        e.g. `ws://127.0.0.1:8848/`, `wss://dolphindb.com` */
     url: string;
     /** 为所有 websocket 操作加锁，包括设置 this.on_message, this.on_error, websocket.send */
     lwebsocket: Lock<WebSocket>;
@@ -431,6 +432,8 @@ export declare class DDB {
     streaming: StreamingParams;
     /** 是否打印每个 rpc 的信息用于调试 */
     verbose: boolean;
+    /** websocket 连接所使用的 http 代理 */
+    proxy: string;
     print_message_buffer: boolean;
     print_object_buffer: boolean;
     print_message: boolean;

package/index.js

@@ -16,7 +16,7 @@ BigInt128Array.prototype[inspect.custom] = function () {
     const values = [];
     for (const value of this)
         values.push(value);
-    const value_str = values.length ? ` ${values.map(v => v.toString() + 'n').join(', ')} ` : '';
+    const value_str = values.length ? ` ${values.map(v => String(v) + 'n').join(', ')} ` : '';
     return `${this[Symbol.toStringTag]}(${this.length}) [${value_str}]`;
 };
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
@@ -127,6 +127,8 @@ export class DdbObj {
                 let i_start = i_items_start + len_items;
                 for (let i = 0; i < cols; i++) {
                     const type = buf_data[i_start];
+                    if (type === DdbType.compress)
+                        throw new Error(t('{{form}}<{{type}}> 暂时不支持解析', { form: 'table', type: 'compress' }));
                     let col = this.parse_vector(buf_data.subarray(i_start + 2), le, type);
                     col.length += 2;
                     col.name = colnames[i];
@@ -708,8 +710,16 @@ export class DdbObj {
                     });
                 return [8 * length, durations];
             }
+            case DdbType.compress:
+                return [
+                    length,
+                    new Uint8Array(buf.buffer.slice(buf.byteOffset, buf.byteOffset + length))
+                ];
             default:
-                throw new Error(t('vector<{{type}}> 暂时不支持解析', { type: String(DdbType[type] || type) }));
+                throw new Error(t('{{form}}<{{type}}> 暂时不支持解析', {
+                    form: 'vector',
+                    type: String(DdbType[type] || type)
+                }));
         }
     }
     pack() {
@@ -940,6 +950,7 @@ export class DdbObj {
             case DdbType.uuid:
             case DdbType.ipaddr:
             case DdbType.int128:
+            case DdbType.compress:
                 return [value];
             case DdbType.blob: {
                 let bufs = new Array(length * 2);
@@ -997,16 +1008,12 @@ export class DdbObj {
         }
     }
     [inspect.custom](depth, _options, _inspect) {
-        const options = { nullstr: true, quote: true, ..._options };
+        const options = { nullstr: true, ..._options };
         const type = this.inspect_type();
         const data = (() => {
             switch (this.form) {
                 case DdbForm.scalar:
-                    // 如果类型为 string, 则不进行格式化处理
-                    if (this.type === DdbType.string)
-                        return this.value;
-                    else
-                        return format(this.type, this.value, this.le, options);
+                    return format(this.type, this.value, this.le, options);
                 case DdbForm.vector:
                 case DdbForm.pair:
                 case DdbForm.set: {
@@ -1120,7 +1127,7 @@ export class DdbObj {
                             return format_array(items, data.length > limit);
                         }
                         default: {
-                            const limit = 50;
+                            const limit = this.type === DdbType.compress ? 5 : 50;
                             let items = new Array(Math.min(limit, this.value.length));
                             for (let i = 0; i < items.length; i++)
                                 items[i] = format(this.type, this.value[i], this.le, options);
@@ -1282,7 +1289,7 @@ let _grouping = true;
 let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 /** 用来处理时差  To deal with jet lag */
 let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC', hour12: false });
-/** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
+/** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串 */
 export function format(type, value, le, options = {}) {
     const formatter = (() => {
         const { grouping = true } = options;
@@ -2145,14 +2152,8 @@ 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`
-    */
+        e.g. `ws://127.0.0.1:8848/`, `wss://dolphindb.com` */
     url;
     /** 为所有 websocket 操作加锁，包括设置 this.on_message, this.on_error, websocket.send */
     lwebsocket = new Lock();
@@ -2174,6 +2175,8 @@ export class DDB {
     streaming = null;
     /** 是否打印每个 rpc 的信息用于调试 */
     verbose = false;
+    /** websocket 连接所使用的 http 代理 */
+    proxy;
     // --- 内部选项, 状态
     print_message_buffer = false;
     print_object_buffer = false;
@@ -2232,6 +2235,8 @@ export class DDB {
             this.sql = options.sql;
         if (options.streaming !== undefined)
             this.streaming = options.streaming;
+        if (options.proxy)
+            this.proxy = options.proxy;
     }
     on_message(buffer, websocket) {
         throw new Error(t('这是在调用 this.rpc 之前默认的 on_message, 不应该被调用到，除非建立连接后 server 先推送了 message'));
@@ -2273,6 +2278,7 @@ export class DDB {
                 // 连接建立之前应该不会有别的调用占用 this.lwebsocket
                 this.lwebsocket.resource = await connect_websocket(url, {
                     protocols: this.streaming ? ['streaming'] : this.python ? ['python'] : undefined,
+                    proxy: this.proxy,
                     on_message: (buffer, websocket) => {
                         this.on_message(new Uint8Array(buffer), websocket);
                     },
@@ -2734,157 +2740,4 @@ export class DDB {
         colnames);
     }
 }
-// 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