@vtecx/vtecxnext 1.1.4 → 1.1.6

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"));
@@ -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)
@@ -3282,6 +3295,11 @@ const getJson = async (response) => {
     if (response.status === 204) {
         return null;
     }
+    // content-length=0の場合nullを返す
+    const contentLength = response.headers.get('content-length');
+    if (contentLength === '0') {
+        return null;
+    }
     try {
         return await response.json();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [
@@ -23,10 +23,10 @@
   "homepage": "https://github.com/reflexworks/vtecxnext#readme",
   "devDependencies": {
     "@types/formidable": "^2.0.5",
-    "@types/node": "^18.11.17",
+    "@types/node": "^18.16.12",
     "@types/sqlstring": "^2.3.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
     "formidable": "^2.1.1",