@vtecx/vtecxnext 1.1.2 → 1.1.4

package/dist/vtecxnext.d.ts

@@ -119,7 +119,7 @@ export declare const rxid: (req: IncomingMessage, res: ServerResponse) => Promis
  * @param subtitle subtitle
  * @return true if successful
  */
-export declare const log: (req: IncomingMessage, res: ServerResponse, message: string, title?: string, subtitle?: string) => Promise<boolean>;
+export declare const log: (req: IncomingMessage | undefined, res: ServerResponse | undefined, message: string, title?: string, subtitle?: string) => Promise<boolean>;
 /**
  * get entry
  * @param req request (for authentication)
@@ -128,7 +128,7 @@ export declare const log: (req: IncomingMessage, res: ServerResponse, message: s
  * @param targetService target service name (for service linkage)
  * @return entry
  */
-export declare const getEntry: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<any>;
+export declare const getEntry: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, targetService?: string) => Promise<any>;
 /**
  * get feed
  * @param req request (for authentication)
@@ -136,7 +136,7 @@ export declare const getEntry: (req: IncomingMessage, res: ServerResponse, uri:
  * @param uri key and conditions
  * @return feed (entry array)
  */
-export declare const getFeed: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<any>;
+export declare const getFeed: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, targetService?: string) => Promise<any>;
 /**
  * get feed
  * @param req request (for authentication)
@@ -144,7 +144,7 @@ export declare const getFeed: (req: IncomingMessage, res: ServerResponse, uri: s
  * @param uri key and conditions
  * @return feed (entry array). Returns a cursor in the header if more data is available. (x-vtecx-nextpage)
  */
-export declare const getFeedResponse: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<VtecxResponse>;
+export declare const getFeedResponse: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, targetService?: string) => Promise<VtecxResponse>;
 /**
  * get count
  * @param req request (for authentication)
@@ -152,7 +152,7 @@ export declare const getFeedResponse: (req: IncomingMessage, res: ServerResponse
  * @param uri key and conditions
  * @return count
  */
-export declare const count: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<number | null>;
+export declare const count: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, targetService?: string) => Promise<number | null>;
 /**
  * get count
  * @param req request (for authentication)
@@ -160,7 +160,7 @@ export declare const count: (req: IncomingMessage, res: ServerResponse, uri: str
  * @param uri key and conditions
  * @return feed. Returns a cursor in the header if more data is available. (x-vtecx-nextpage)
  */
-export declare const countResponse: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<VtecxResponse>;
+export declare const countResponse: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, targetService?: string) => Promise<VtecxResponse>;
 /**
  * register entries
  * @param req request (for authentication)
@@ -169,7 +169,7 @@ export declare const countResponse: (req: IncomingMessage, res: ServerResponse,
  * @param uri parent key if not specified in entry
  * @return registed entries
  */
-export declare const post: (req: IncomingMessage, res: ServerResponse, feed: any, uri?: string, targetService?: string) => Promise<any>;
+export declare const post: (req: IncomingMessage | undefined, res: ServerResponse | undefined, feed: any, uri?: string, targetService?: string) => Promise<any>;
 /**
  * update entries
  * @param req request (for authentication)
@@ -180,7 +180,7 @@ export declare const post: (req: IncomingMessage, res: ServerResponse, feed: any
  * @param async Execute asynchronous if this param is true. Valid only if 'isbulk' is true.
  * @return updated entries
  */
-export declare const put: (req: IncomingMessage, res: ServerResponse, feed: any, isbulk?: boolean, parallel?: boolean, async?: boolean, targetService?: string) => Promise<any>;
+export declare const put: (req: IncomingMessage | undefined, res: ServerResponse | undefined, feed: any, isbulk?: boolean, parallel?: boolean, async?: boolean, targetService?: string) => Promise<any>;
 /**
  * delete entry
  * @param req request (for authentication)
@@ -189,7 +189,7 @@ export declare const put: (req: IncomingMessage, res: ServerResponse, feed: any,
  * @param revision number of revision
  * @return true if successful
  */
-export declare const deleteEntry: (req: IncomingMessage, res: ServerResponse, uri: string, revision?: number, targetService?: string) => Promise<boolean>;
+export declare const deleteEntry: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, revision?: number, targetService?: string) => Promise<boolean>;
 /**
  * delete folder
  * @param req request (for authentication)
@@ -198,7 +198,7 @@ export declare const deleteEntry: (req: IncomingMessage, res: ServerResponse, ur
  * @param async execute async
  * @return true if successful
  */
-export declare const deleteFolder: (req: IncomingMessage, res: ServerResponse, uri: string, async?: boolean, targetService?: string) => Promise<boolean>;
+export declare const deleteFolder: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, async?: boolean, targetService?: string) => Promise<boolean>;
 /**
  * allocate numbers
  * @param req request (for authentication)
@@ -207,7 +207,7 @@ export declare const deleteFolder: (req: IncomingMessage, res: ServerResponse, u
  * @param num number to allocate
  * @return allocated numbers. comma separated if multiple.
  */
-export declare const allocids: (req: IncomingMessage, res: ServerResponse, uri: string, num: number, targetService?: string) => Promise<string>;
+export declare const allocids: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, num: number, targetService?: string) => Promise<string>;
 /**
  * add a number
  * @param req request (for authentication)
@@ -216,7 +216,7 @@ export declare const allocids: (req: IncomingMessage, res: ServerResponse, uri:
  * @param num number to add
  * @return added number
  */
-export declare const addids: (req: IncomingMessage, res: ServerResponse, uri: string, num: number, targetService?: string) => Promise<number | null>;
+export declare const addids: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, num: number, targetService?: string) => Promise<number | null>;
 /**
  * get a added number
  * @param req request (for authentication)
@@ -224,7 +224,7 @@ export declare const addids: (req: IncomingMessage, res: ServerResponse, uri: st
  * @param uri key
  * @return added number
  */
-export declare const getids: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<number | null>;
+export declare const getids: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, targetService?: string) => Promise<number | null>;
 /**
  * set a number
  * @param req request (for authentication)
@@ -233,7 +233,7 @@ export declare const getids: (req: IncomingMessage, res: ServerResponse, uri: st
  * @param num number to set
  * @return set number
  */
-export declare const setids: (req: IncomingMessage, res: ServerResponse, uri: string, num: number, targetService?: string) => Promise<number | null>;
+export declare const setids: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, num: number, targetService?: string) => Promise<number | null>;
 /**
  * set a addition range
  * @param req request (for authentication)
@@ -242,7 +242,7 @@ export declare const setids: (req: IncomingMessage, res: ServerResponse, uri: st
  * @param range addition range
  * @return addition range
  */
-export declare const rangeids: (req: IncomingMessage, res: ServerResponse, uri: string, range: string) => Promise<string>;
+export declare const rangeids: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string, range: string) => Promise<string>;
 /**
  * get a addition range
  * @param req request (for authentication)
@@ -250,7 +250,7 @@ export declare const rangeids: (req: IncomingMessage, res: ServerResponse, uri:
  * @param uri key
  * @return addition range
  */
-export declare const getRangeids: (req: IncomingMessage, res: ServerResponse, uri: string) => Promise<string>;
+export declare const getRangeids: (req: IncomingMessage | undefined, res: ServerResponse | undefined, uri: string) => Promise<string>;
 /**
  * set feed to session
  * @param req request (for authentication)
@@ -718,6 +718,12 @@ export declare const deletecontent: (req: IncomingMessage, res: ServerResponse,
  * @return true
  */
 export declare const getcontent: (req: IncomingMessage, res: ServerResponse, uri: string) => Promise<boolean>;
+/**
+ * get content url.
+ * @param uri key
+ * @return content url
+ */
+export declare const getcontenturl: (uri: string) => Promise<string>;
 /**
  * add acl
  * @param req request (for authentication)

package/dist/vtecxnext.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (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.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.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;
 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';
@@ -405,7 +405,9 @@ const log = async (req, res, message, title, subtitle) => {
     }
     //console.log(`[vtecxnext log] response. status=${response.status}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 正常処理
@@ -436,7 +438,9 @@ const getEntry = async (req, res, uri, targetService) => {
     }
     //console.log(`[vtecxnext getEntry] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -479,7 +483,9 @@ const getFeedResponse = async (req, res, uri, targetService) => {
     }
     //console.log(`[vtecxnext getFeed] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -530,7 +536,9 @@ const countResponse = async (req, res, uri, targetService) => {
     }
     //console.log(`[vtecxnext count] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -571,7 +579,9 @@ const post = async (req, res, feed, uri, targetService) => {
     }
     //console.log(`[vtecxnext post] response. status=${response.status}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     return await getJson(response);
@@ -608,7 +618,9 @@ const put = async (req, res, feed, isbulk, parallel, async, targetService) => {
     }
     //console.log(`[vtecxnext put] response. status=${response.status}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     return await getJson(response);
@@ -639,7 +651,9 @@ const deleteEntry = async (req, res, uri, revision, targetService) => {
     }
     //console.log(`[vtecxnext deleteEntry] response. status=${response.status}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     return true;
@@ -669,7 +683,9 @@ const deleteFolder = async (req, res, uri, async, targetService) => {
     }
     //console.log(`[vtecxnext deleteFolder] response. status=${response.status}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     return true;
@@ -700,7 +716,9 @@ const allocids = async (req, res, uri, num, targetService) => {
     }
     //console.log(`[vtecxnext allocids] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -733,7 +751,9 @@ const addids = async (req, res, uri, num, targetService) => {
     }
     //console.log(`[vtecxnext addids] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -764,7 +784,9 @@ const getids = async (req, res, uri, targetService) => {
     }
     //console.log(`[vtecxnext getids] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -797,7 +819,9 @@ const setids = async (req, res, uri, num, targetService) => {
     }
     //console.log(`[vtecxnext setids] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -831,7 +855,9 @@ const rangeids = async (req, res, uri, range) => {
     }
     //console.log(`[vtecxnext rangeids] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -862,7 +888,9 @@ const getRangeids = async (req, res, uri) => {
     }
     //console.log(`[vtecxnext getrangeids] response=${response}`)
     // vte.cxからのset-cookieを転記
-    setCookie(response, res);
+    if (res) {
+        setCookie(response, res);
+    }
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
@@ -1497,9 +1525,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;
@@ -1536,8 +1568,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;
@@ -2671,8 +2703,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();
@@ -2680,6 +2712,19 @@ const getcontent = async (req, res, uri) => {
     return true;
 };
 exports.getcontent = getcontent;
+/**
+ * get content url.
+ * @param uri key
+ * @return content url
+ */
+const getcontenturl = async (uri) => {
+    //console.log(`[vtecxnext getcontenturl] start. uri=${uri}`)
+    // キー入力値チェック
+    checkUri(uri);
+    // urlを構築
+    return `${VTECX_URL}${SERVLETPATH_DATA}${uri}`;
+};
+exports.getcontenturl = getcontenturl;
 /**
  * add acl
  * @param req request (for authentication)
@@ -3171,7 +3216,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();
@@ -3184,10 +3229,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;
@@ -3255,17 +3303,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.2",
+  "version": "1.1.4",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [