dolphindb 3.1.25 → 3.1.28

package/browser.d.ts

@@ -369,6 +369,7 @@ export declare enum SqlStandard {
 }
 export interface DdbOptions {
     autologin?: boolean;
+    ticket?: string;
     username?: string;
     password?: string;
     python?: boolean;
@@ -404,6 +405,8 @@ export declare class DDB {
     static le_client: boolean;
     /** 是否在建立连接后自动登录，默认 true  Whether to automatically log in after the connection is established, the default is true */
     autologin: boolean;
+    /** DolphinDB 登录 ticket，优先级比用户名密码更高，设置后不使用密码登录 */
+    ticket?: string;
     /** DolphinDB 登录用户名  DolphinDB username */
     username: string;
     /** DolphinDB 登录密码  DolphinDB password */
@@ -488,6 +491,10 @@ export declare class DDB {
         2. The session is stateful, and the previous state cannot be restored even after reconnection
         3. After disconnection, all previous ddb.call, ddb.eval should throw a connection error */
     connect(): Promise<void>;
+    /** 使用 ticket 登录
+        - ticket?: `this.ticket` 手动传入时会更新 this.ticket
+        - skip_connection_check? */
+    login_by_ticket(ticket?: string, skip_connection_check?: boolean): Promise<void>;
     get_rpc_options({ urgent, secondary, async: _async, pickle, clear, api, compress, cancellable, priority, parallelism, root_id, limit, }?: {
         urgent?: boolean;
         /** API 提交的任务, secondary 必须为 false */

package/browser.js

@@ -3,7 +3,7 @@ import { blue, cyan, green, grey, magenta } from 'xshell/chalk.browser.js';
 import { concat, assert, Lock, genid, seq, zip_object, decode, check } from 'xshell/utils.browser.js';
 import { connect_websocket } from 'xshell/net.browser.js';
 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";
+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, _urgent } from "./common.js";
 export * from "./common.js";
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
 export class DdbObj {
@@ -2425,6 +2425,8 @@ export class DDB {
     static le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
     /** 是否在建立连接后自动登录，默认 true  Whether to automatically log in after the connection is established, the default is true */
     autologin = true;
+    /** DolphinDB 登录 ticket，优先级比用户名密码更高，设置后不使用密码登录 */
+    ticket;
     /** DolphinDB 登录用户名  DolphinDB username */
     username = 'admin';
     /** DolphinDB 登录密码  DolphinDB password */
@@ -2499,6 +2501,8 @@ export class DDB {
             this.verbose = options.verbose;
         if (options.autologin !== undefined)
             this.autologin = options.autologin;
+        if (options.ticket)
+            this.ticket = options.ticket;
         if (options.username !== undefined)
             this.username = options.username;
         if (options.password !== undefined)
@@ -2573,6 +2577,8 @@ export class DDB {
             try {
                 assert(this.connected);
                 await this.rpc('connect', { skip_connection_check: true });
+                if (this.autologin && this.ticket)
+                    await this.login_by_ticket(undefined, true);
                 if (this.streaming)
                     await this.subscribe();
                 resolve();
@@ -2583,6 +2589,14 @@ export class DDB {
             }
         });
     }
+    /** 使用 ticket 登录
+        - ticket?: `this.ticket` 手动传入时会更新 this.ticket
+        - skip_connection_check? */
+    async login_by_ticket(ticket, skip_connection_check = false) {
+        if (ticket)
+            this.ticket = ticket;
+        await this.invoke('authenticateByTicket', [this.ticket], { urgent: true, skip_connection_check });
+    }
     get_rpc_options({ urgent = false, secondary = false, async: _async = false, pickle = false, clear = false, api = false, compress = false, cancellable = true, priority = urgent ? 8 : 4, parallelism = 64, root_id = '', limit, } = {}) {
         let flag = 0;
         if (urgent)
@@ -2649,7 +2663,7 @@ export class DDB {
         const { script, func, args: _args = [], vars = [], urgent, listener, on_more_messages, } = options;
         if (func === 'pnode_run')
             try {
-                await (this.ppnode_run ??= this.eval(funcdefs.pnode_run[this.language], { urgent: true }));
+                await (this.ppnode_run ??= this.eval(funcdefs.pnode_run[this.language], _urgent));
             }
             catch (error) {
                 this.ppnode_run = undefined;
@@ -2701,7 +2715,7 @@ export class DDB {
                     case 'connect':
                         if (this.verbose)
                             console.log('connect()' +
-                                (this.autologin ?
+                                (this.autologin && !this.ticket ?
                                     '\n' +
                                         `login(${this.username.quote()}, ${this.password.quote()})`
                                     :
@@ -2710,7 +2724,7 @@ export class DDB {
                         return 'connect\n' +
                             // 详见 InterProcessIO.cpp#APISocketConsole::parseScript 中的
                             // Util::startWith "connect"
-                            (this.autologin ?
+                            (this.autologin && !this.ticket ?
                                 'login\n' +
                                     this.username + '\n' +
                                     this.password /* encrypted (可选参数) + '\n' + 'false' */
@@ -2822,7 +2836,7 @@ export class DDB {
         let args_ = args;
         if (node) {
             try {
-                await (this.pjsrpc ??= this.eval(funcdefs.jsrpc[this.language], { urgent: true }));
+                await (this.pjsrpc ??= this.eval(funcdefs.jsrpc[this.language], _urgent));
             }
             catch (error) {
                 this.pjsrpc = undefined;
@@ -2896,7 +2910,7 @@ export class DDB {
             if (has_ddbobj)
                 throw new Error(t('调用 ddb.invoke 的参数中不能同时有 DdbObj 与复杂 js 原生对象'));
             try {
-                await (this.pinvoke ??= this.eval(funcdefs.invoke[this.language], { urgent: true }));
+                await (this.pinvoke ??= this.eval(funcdefs.invoke[this.language], _urgent));
             }
             catch (error) {
                 // invoke 没有正确执行时，重新将 pinvoke 赋值为 undefined
@@ -2929,6 +2943,7 @@ export class DDB {
     async cancel() {
         let ddb = new DDB(this.url, {
             autologin: this.autologin,
+            ticket: this.ticket,
             username: this.username,
             password: this.password,
             verbose: this.verbose
@@ -2937,7 +2952,7 @@ export class DDB {
             // 因为是新建的连接，而且执行完脚本之后马上就关闭了，所以不用考虑变量泄漏的问题
             await ddb.eval(`jobs = exec rootJobId from getConsoleJobs() where sessionId = ${this.sid}\n` +
                 'if (size(jobs))\n' +
-                '    cancelConsoleJob(jobs)\n', { urgent: true });
+                '    cancelConsoleJob(jobs)\n', _urgent);
         }
         finally {
             ddb.disconnect();