@vtecx/vtecxnext 1.1.10 → 1.1.12

package/dist/vtecxnext.d.ts

@@ -438,6 +438,38 @@ export declare const execBQ: (req: IncomingMessage, res: ServerResponse, sql: st
  * @return true
  */
 export declare const getBQCsv: (req: IncomingMessage, res: ServerResponse, sql: string, values?: any[], filename?: string, parent?: string) => Promise<boolean>;
+/**
+ * Execute a query SQL to the database and get the result.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param sql query sql
+ * @param values values of query arguments
+ * @param parent parent name of result json
+ * @return query results in JSON format
+ */
+export declare const queryRDB: (req: IncomingMessage, res: ServerResponse, sql: string, values?: any[], parent?: string) => Promise<any>;
+/**
+ * Search RDB and return results in CSV format.
+ * @param req request (for authentication)
+ * @param res response
+ * @param sql query sql
+ * @param values values of query arguments
+ * @param filename file name of csv
+ * @param parent parent name of result json
+ * @return true
+ */
+export declare const queryRDBCsv: (req: IncomingMessage, res: ServerResponse, sql: string, values?: any[], filename?: string, parent?: string) => Promise<boolean>;
+/**
+ * Execute SQL to the database.
+ * If there are multiple SQLs, they will be wrapped in a transaction.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param sqls sql list
+ * @param values values of query arguments
+ * @param async execute async
+ * @param isbulk execute with autocommit
+ */
+export declare const execRDB: (req: IncomingMessage, res: ServerResponse, sqls: string[], values?: any[][], async?: boolean, isbulk?: boolean) => Promise<any>;
 /**
  * Create PDF.
  * Writes a PDF to the response.

package/dist/vtecxnext.js

@@ -27,8 +27,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execBQ = exports.getBQ = exports.deleteBQ = exports.postBQ = exports.getPage = exports.pagination = exports.getSessionLong = exports.getSessionString = exports.getSessionEntry = exports.getSessionFeed = exports.deleteSessionLong = exports.deleteSessionString = exports.deleteSessionEntry = exports.deleteSessionFeed = exports.incrementSession = exports.setSessionLong = exports.setSessionString = exports.setSessionEntry = exports.setSessionFeed = exports.getRangeids = exports.rangeids = exports.setids = exports.getids = exports.addids = exports.allocids = exports.clearFolder = exports.deleteFolder = exports.deleteEntry = exports.put = exports.post = exports.countResponse = exports.count = exports.getFeedResponse = exports.getFeed = exports.getEntry = exports.log = exports.rxid = exports.service = exports.isLoggedin = exports.whoami = exports.account = exports.uid = exports.now = exports.logout = exports.loginWithTotp = exports.loginWithRxid = exports.login = exports.sendMessage = exports.checkXRequestedWith = exports.hello = void 0;
-exports.mergeOAuthUserLine = exports.changeTdid = exports.deleteTotp = exports.createTotp = exports.getTotpLink = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = exports.getcontenturl = exports.getcontent = exports.deletecontent = exports.putcontent = exports.savefiles = exports.deleteusers = exports.deleteuser = exports.canceluser = exports.activateusers = exports.activateuser = exports.revokeusers = exports.revokeuser = exports.userstatus = exports.changeaccount_verify = exports.changeaccount = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.isAdmin = exports.isGroupMember = exports.getGroups = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.getMessageQueueStatus = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = exports.getBQCsv = void 0;
-exports.FetchError = exports.VtecxNextError = exports.VtecxResponse = exports.isBlank = void 0;
+exports.createTotp = exports.getTotpLink = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = exports.getcontenturl = exports.getcontent = exports.deletecontent = exports.putcontent = exports.savefiles = exports.deleteusers = exports.deleteuser = exports.canceluser = exports.activateusers = exports.activateuser = exports.revokeusers = exports.revokeuser = exports.userstatus = exports.changeaccount_verify = exports.changeaccount = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.isAdmin = exports.isGroupMember = exports.getGroups = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.getMessageQueueStatus = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = exports.execRDB = exports.queryRDBCsv = exports.queryRDB = exports.getBQCsv = void 0;
+exports.FetchError = exports.VtecxNextError = exports.VtecxResponse = exports.isBlank = exports.mergeOAuthUserLine = exports.changeTdid = exports.deleteTotp = void 0;
 const sqlstring_1 = __importDefault(require("sqlstring"));
 const formidable_1 = __importDefault(require("formidable"));
 const fs_1 = __importDefault(require("fs"));
@@ -1513,7 +1513,7 @@ const execBQ = async (req, res, sql, values, parent) => {
     // 入力チェック
     checkNotNull(sql, 'Query SQL');
     // 引数生成
-    const feed = editGetBqArgument(sql, values, parent);
+    const feed = editSqlArgument(sql, values, parent);
     // vte.cxへリクエスト
     const method = 'PUT';
     const url = `${SERVLETPATH_PROVIDER}/?_querybq`;
@@ -1550,7 +1550,7 @@ const getBQCsv = async (req, res, sql, values, filename, parent) => {
     // 入力チェック
     checkNotNull(sql, 'Query SQL');
     // 引数生成
-    const feed = editGetBqArgument(sql, values, parent);
+    const feed = editSqlArgument(sql, values, parent);
     // vte.cxへリクエスト
     const method = 'PUT';
     const url = `${SERVLETPATH_PROVIDER}/?_querybq&_csv${filename ? '=' + filename : ''}`;
@@ -1580,6 +1580,124 @@ const getBQCsv = async (req, res, sql, values, filename, parent) => {
     return true;
 };
 exports.getBQCsv = getBQCsv;
+/**
+ * Execute a query SQL to the database and get the result.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param sql query sql
+ * @param values values of query arguments
+ * @param parent parent name of result json
+ * @return query results in JSON format
+ */
+const queryRDB = async (req, res, sql, values, parent) => {
+    //console.log(`[vtecxnext queryRDB] start. sql=${sql} values=${values}`)
+    // 入力チェック
+    checkNotNull(sql, 'Query SQL');
+    // 引数生成
+    const feed = editSqlArgument(sql, values, parent);
+    // vte.cxへリクエスト
+    const method = 'PUT';
+    const url = `${SERVLETPATH_PROVIDER}/?_queryrdb`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext execBQ] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    //console.log(`[vtecxnext execBQ] setCookie end.`)
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    //console.log(`[vtecxnext execBQ] checkVtecxResponse end.`)
+    // 戻り値
+    return await response.json();
+};
+exports.queryRDB = queryRDB;
+/**
+ * Search RDB and return results in CSV format.
+ * @param req request (for authentication)
+ * @param res response
+ * @param sql query sql
+ * @param values values of query arguments
+ * @param filename file name of csv
+ * @param parent parent name of result json
+ * @return true
+ */
+const queryRDBCsv = async (req, res, sql, values, filename, parent) => {
+    //console.log(`[vtecxnext queryRDBCsv] start. sql=${sql} values=${values}`)
+    // 入力チェック
+    checkNotNull(sql, 'Query SQL');
+    // 引数生成
+    const feed = editSqlArgument(sql, values, parent);
+    // vte.cxへリクエスト
+    const method = 'PUT';
+    const url = `${SERVLETPATH_PROVIDER}/?_queryrdb&_csv${filename ? '=' + filename : ''}`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext queryRDBCsv] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    //console.log(`[vtecxnext queryRDBCsv] setCookie end.`)
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    //console.log(`[vtecxnext queryRDBCsv] checkVtecxResponse end.`)
+    // 戻り値
+    const resData = await response.blob();
+    //console.log(`[vtecxnext queryRDBCsv] response.blob()`)
+    setResponseHeaders(response, res);
+    //console.log(`[vtecxnext queryRDBCsv] setResponseHeaders`)
+    const csvData = await resData.arrayBuffer();
+    //console.log(`[vtecxnext queryRDBCsv] await resData.arrayBuffer()`)
+    res.end(new Uint8Array(csvData));
+    //console.log(`[vtecxnext queryRDBCsv] res.end(new Uint8Array(csvData))`)
+    return true;
+};
+exports.queryRDBCsv = queryRDBCsv;
+/**
+ * Execute SQL to the database.
+ * If there are multiple SQLs, they will be wrapped in a transaction.
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param sqls sql list
+ * @param values values of query arguments
+ * @param async execute async
+ * @param isbulk execute with autocommit
+ */
+const execRDB = async (req, res, sqls, values, async, isbulk) => {
+    //console.log(`[vtecxnext execRDB] start. sql=${sql} values=${values}`)
+    // 入力チェック
+    checkNotNull(sqls, 'exec SQL');
+    // 引数生成
+    const feed = editSqlsArgument(sqls, values);
+    // vte.cxへリクエスト
+    const method = 'PUT';
+    const url = `${SERVLETPATH_PROVIDER}/?_execrdb${async ? '&_async' : ''}${isbulk ? '&_bulk' : ''}`;
+    let response;
+    try {
+        response = await requestVtecx(method, url, req, JSON.stringify(feed));
+    }
+    catch (e) {
+        throw newFetchError(e, true);
+    }
+    //console.log(`[vtecxnext execRDB] response. status=${response.status}`)
+    // vte.cxからのset-cookieを転記
+    setCookie(response, res);
+    //console.log(`[vtecxnext execBQ] setCookie end.`)
+    // レスポンスのエラーチェック
+    await checkVtecxResponse(response);
+    //console.log(`[vtecxnext execRDB] checkVtecxResponse end.`)
+    // 戻り値
+    return await response.json();
+};
+exports.execRDB = execRDB;
 /**
  * Create PDF.
  * Writes a PDF to the response.
@@ -3433,20 +3551,52 @@ const editBqTableNames = (tablenames) => {
     return result;
 };
 /**
- * BigQuery検索の引数を生成
+ * SQLインジェクション対策を行い、安全に値を設定した上で、feedにセットします.
  * @param sql SQL
  * @param values SQLに指定する値
  * @param parent 戻り値JSONの親項目(任意)か、CSVのヘッダ(任意)
- * @returns BigQuery検索の引数
+ * @returns SQLをセットしたfeed
  */
-const editGetBqArgument = (sql, values, parent) => {
+const editSqlArgument = (sql, values, parent) => {
     // SQLに引数を代入（SQLインジェクション対応）
     const editSql = values ? formatSql(sql, values) : sql;
-    //console.log(`[vtecxnext editGetBqArgument] sql=${editSql}`)
+    //console.log(`[vtecxnext editSqlArgument] sql=${editSql}`)
     // 引数
-    const feed = { 'feed': { 'title': editSql } };
+    const entry = { 'title': editSql };
     if (parent) {
-        feed.feed['subtitle'] = parent;
+        entry['subtitle'] = parent;
+    }
+    const feed = [entry];
+    return feed;
+};
+/**
+ * SQLインジェクション対策を行い、安全に値を設定した上で、feedにセットします.
+ * @param sqls SQLリスト
+ * @param values SQLに指定する値
+ * @returns SQLをセットしたfeed
+ */
+const editSqlsArgument = (sqls, values) => {
+    // SQLに引数を代入（SQLインジェクション対応）
+    const len = sqls.length;
+    let editedSqls;
+    if (values) {
+        if (sqls.length !== values.length) {
+            throw new VtecxNextError(400, ``);
+        }
+        editedSqls = new Array(len);
+        for (let i = 0; i < len; i++) {
+            editedSqls[i] = formatSql(sqls[i], values[i]);
+        }
+    }
+    else {
+        editedSqls = sqls;
+    }
+    const feed = [];
+    let i = 0;
+    for (const editSql of editedSqls) {
+        const entry = { 'title': editSql };
+        feed[i] = entry;
+        i++;
     }
     return feed;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [