@vtecx/vtecxnext 1.1.3 → 1.1.5

package/dist/vtecxnext.d.ts

@@ -408,6 +408,16 @@ export declare const deleteBQ: (req: IncomingMessage, res: ServerResponse, keys:
  * @return query results in JSON format
  */
 export declare const getBQ: (req: IncomingMessage, res: ServerResponse, sql: string, values?: any[], parent?: string) => Promise<any>;
+/**
+ * query bigquery
+ * @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 execBQ: (req: IncomingMessage, res: ServerResponse, sql: string, values?: any[], parent?: string) => Promise<any>;
 /**
  * Search BigQuery and return results in CSV format.
  * @param req request (for authentication)

package/dist/vtecxnext.js

@@ -26,8 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPdf = exports.getBQCsv = 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.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.FetchError = exports.VtecxNextError = exports.VtecxResponse = 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.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = void 0;
+exports.getBQCsv = 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.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.FetchError = exports.VtecxNextError = exports.VtecxResponse = 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.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = void 0;
 const sqlstring_1 = __importDefault(require("sqlstring"));
 const formidable_1 = __importDefault(require("formidable"));
 const fs_1 = __importDefault(require("fs"));
@@ -36,7 +36,7 @@ const url_1 = __importStar(require("url"));
  * Hello world.
  */
 const hello = () => {
-    console.log('Hello vtecxnext.');
+    console.log('[vtecxnext] Hello vtecxnext.');
 };
 exports.hello = hello;
 const SERVLETPATH_DATA = '/d';
@@ -1464,7 +1464,20 @@ exports.deleteBQ = deleteBQ;
  * @return query results in JSON format
  */
 const getBQ = async (req, res, sql, values, parent) => {
-    //console.log(`[vtecxnext getBQ] start. sql=${sql} values=${values}`)
+    return (0, exports.execBQ)(req, res, sql, values);
+};
+exports.getBQ = getBQ;
+/**
+ * query bigquery
+ * @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 execBQ = async (req, res, sql, values, parent) => {
+    //console.log(`[vtecxnext execBQ] start. sql=${sql} values=${values}`)
     // 入力チェック
     checkNotNull(sql, 'Query SQL');
     // 引数生成
@@ -1479,17 +1492,17 @@ const getBQ = async (req, res, sql, values, parent) => {
     catch (e) {
         throw newFetchError(e, true);
     }
-    //console.log(`[vtecxnext getBQ] response. status=${response.status}`)
+    //console.log(`[vtecxnext execBQ] response. status=${response.status}`)
     // vte.cxからのset-cookieを転記
     setCookie(response, res);
-    //console.log(`[vtecxnext getBQ] setCookie end.`)
+    //console.log(`[vtecxnext execBQ] setCookie end.`)
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
-    //console.log(`[vtecxnext getBQ] checkVtecxResponse end.`)
+    //console.log(`[vtecxnext execBQ] checkVtecxResponse end.`)
     // 戻り値
     return await response.json();
 };
-exports.getBQ = getBQ;
+exports.execBQ = execBQ;
 /**
  * Search BigQuery and return results in CSV format.
  * @param req request (for authentication)
@@ -1525,9 +1538,13 @@ const getBQCsv = async (req, res, sql, values, filename, parent) => {
     //console.log(`[vtecxnext getBQCsv] checkVtecxResponse end.`)
     // 戻り値
     const resData = await response.blob();
+    //console.log(`[vtecxnext getBQCsv] response.blob()`)
     setResponseHeaders(response, res);
+    //console.log(`[vtecxnext getBQCsv] setResponseHeaders`)
     const csvData = await resData.arrayBuffer();
-    res.end(csvData);
+    //console.log(`[vtecxnext getBQCsv] await resData.arrayBuffer()`)
+    res.end(new Uint8Array(csvData));
+    //console.log(`[vtecxnext getBQCsv] res.end(new Uint8Array(csvData))`)
     return true;
 };
 exports.getBQCsv = getBQCsv;
@@ -1564,8 +1581,8 @@ const toPdf = async (req, res, htmlTemplate, filename) => {
     // 戻り値
     const resData = await response.blob();
     setResponseHeaders(response, res);
-    const csvData = await resData.arrayBuffer();
-    res.end(new Uint8Array(csvData));
+    const pdfData = await resData.arrayBuffer();
+    res.end(new Uint8Array(pdfData));
     return true;
 };
 exports.toPdf = toPdf;
@@ -2699,8 +2716,8 @@ const getcontent = async (req, res, uri) => {
     setResponseHeaders(response, res);
     res.statusCode = response.status;
     if (response.status !== 204) {
-        const csvData = await resData.arrayBuffer();
-        res.end(new Uint8Array(csvData));
+        const contentData = await resData.arrayBuffer();
+        res.end(new Uint8Array(contentData));
     }
     else {
         res.end();
@@ -3212,7 +3229,7 @@ const setResponseHeaders = (response, res) => {
         const name = header.value[0];
         if (name.startsWith('content-') || name.startsWith('x-')) {
             const val = header.value[1];
-            //console.log(`[setResponseHeaders] ${name} = ${val}`)
+            //console.log(`[vtecxnext setResponseHeaders] ${name} = ${val}`)
             res.setHeader(name, val);
         }
         header = it.next();
@@ -3225,10 +3242,13 @@ const setResponseHeaders = (response, res) => {
  * @returns 戻り値はなし。エラーの場合VtecxNextErrorをスロー。
  */
 const checkVtecxResponse = async (response) => {
+    //console.log(`[vtecxnext checkVtecxResponse] status=${response.status}`)
     if (response.status < 400 && response.status !== 203) {
+        //console.log(`[vtecxnext checkVtecxResponse] return.`)
         return;
     }
     else {
+        //console.log(`[vtecxnext checkVtecxResponse] error.`)
         // エラー
         const data = await response.json();
         let message;
@@ -3296,17 +3316,17 @@ const getJson = async (response) => {
  * @returns BigQuery登録・削除時のテーブル名指定文字列 ({スキーマ第一階層名}:{テーブル名}, ...)
  */
 const editBqTableNames = (tablenames) => {
-    //console.log(`[editBqTableNames] tablenames = ${tablenames}`)
+    //console.log(`[vtecxnext editBqTableNames] tablenames = ${tablenames}`)
     if (!tablenames) {
         return null;
     }
     let result = '';
     for (const key in tablenames) {
         const value = tablenames[key];
-        //console.log(`[editBqTableNames] ${key}=${value}`)
+        //console.log(`[vtecxnext editBqTableNames] ${key}=${value}`)
         result = `${result ? result + ',' : ''}${key}:${value}`;
     }
-    //console.log(`[editBqTableNames] result=${result}`)
+    //console.log(`[vtecxnext editBqTableNames] result=${result}`)
     return result;
 };
 /**

package/package.json

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