@vtecx/vtecxnext 1.1.0 → 1.1.2

package/dist/vtecxnext.d.ts

@@ -130,13 +130,21 @@ export declare const log: (req: IncomingMessage, res: ServerResponse, message: s
  */
 export declare const getEntry: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<any>;
 /**
- * get entry
+ * get feed
  * @param req request (for authentication)
  * @param res response (for authentication)
  * @param uri key and conditions
  * @return feed (entry array)
  */
 export declare const getFeed: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<any>;
+/**
+ * get feed
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @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>;
 /**
  * get count
  * @param req request (for authentication)
@@ -145,6 +153,14 @@ export declare const getFeed: (req: IncomingMessage, res: ServerResponse, uri: s
  * @return count
  */
 export declare const count: (req: IncomingMessage, res: ServerResponse, uri: string, targetService?: string) => Promise<number | null>;
+/**
+ * get count
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @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>;
 /**
  * register entries
  * @param req request (for authentication)
@@ -784,6 +800,15 @@ export declare const deleteTotp: (req: IncomingMessage, res: ServerResponse, acc
  * @return message
  */
 export declare const changeTdid: (req: IncomingMessage, res: ServerResponse) => Promise<any>;
+/**
+ * response class
+ */
+export declare class VtecxResponse {
+    status: number;
+    header: any;
+    data: any;
+    constructor(status: number, header: any, data: any);
+}
 /**
  * Error returned from vte.cx
  */

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.putSignatures = exports.putSignature = 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.count = 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.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 = void 0;
+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;
 const sqlstring_1 = __importDefault(require("sqlstring"));
 const formidable_1 = __importDefault(require("formidable"));
 const fs_1 = __importDefault(require("fs"));
@@ -42,6 +42,7 @@ exports.hello = hello;
 const SERVLETPATH_DATA = '/d';
 const SERVLETPATH_PROVIDER = '/p';
 const SERVLETPATH_OAUTH = '/o';
+const HEADER_NEXTPAGE = 'x-vtecx-nextpage';
 /**
  * X-Requested-With header check.
  * If not specified, set status 417 to the response.
@@ -128,7 +129,6 @@ const loginWithRxid = async (req, res, rxid) => {
     catch (e) {
         throw newFetchError(e, true);
     }
-    const feed = await response.json();
     // vte.cxからのset-cookieを転記
     setCookie(response, res);
     const data = await response.json();
@@ -444,7 +444,7 @@ const getEntry = async (req, res, uri, targetService) => {
 };
 exports.getEntry = getEntry;
 /**
- * get entry
+ * get feed
  * @param req request (for authentication)
  * @param res response (for authentication)
  * @param uri key and conditions
@@ -452,6 +452,19 @@ exports.getEntry = getEntry;
  */
 const getFeed = async (req, res, uri, targetService) => {
     //console.log('[vtecxnext getFeed] start.')
+    const vtecxRes = await (0, exports.getFeedResponse)(req, res, uri, targetService);
+    return vtecxRes.data;
+};
+exports.getFeed = getFeed;
+/**
+ * get feed
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri key and conditions
+ * @return feed (entry array). Returns a cursor in the header if more data is available. (x-vtecx-nextpage)
+ */
+const getFeedResponse = async (req, res, uri, targetService) => {
+    //console.log('[vtecxnext getFeedResponse] start.')
     // キー入力値チェック
     checkUri(uri);
     // vte.cxへリクエスト
@@ -470,9 +483,15 @@ const getFeed = async (req, res, uri, targetService) => {
     // レスポンスのエラーチェック
     await checkVtecxResponse(response);
     // 戻り値
-    return await getJson(response);
+    const data = await getJson(response);
+    const header = {};
+    const nextpage = response.headers.get(HEADER_NEXTPAGE);
+    if (nextpage) {
+        header[HEADER_NEXTPAGE] = nextpage;
+    }
+    return new VtecxResponse(response.status, header, data);
 };
-exports.getFeed = getFeed;
+exports.getFeedResponse = getFeedResponse;
 /**
  * get count
  * @param req request (for authentication)
@@ -482,6 +501,21 @@ exports.getFeed = getFeed;
  */
 const count = async (req, res, uri, targetService) => {
     //console.log('[vtecxnext count] start.')
+    const vtecxRes = await (0, exports.countResponse)(req, res, uri, targetService);
+    // 戻り値
+    const data = vtecxRes.data;
+    return vtecxRes.data.feed.title ? Number(data.feed.title) : null;
+};
+exports.count = count;
+/**
+ * get count
+ * @param req request (for authentication)
+ * @param res response (for authentication)
+ * @param uri key and conditions
+ * @return feed. Returns a cursor in the header if more data is available. (x-vtecx-nextpage)
+ */
+const countResponse = async (req, res, uri, targetService) => {
+    //console.log('[vtecxnext countResponse] start.')
     // キー入力値チェック
     checkUri(uri);
     // vte.cxへリクエスト
@@ -501,9 +535,14 @@ const count = async (req, res, uri, targetService) => {
     await checkVtecxResponse(response);
     // 戻り値
     const data = await getJson(response);
-    return data.feed.title ? Number(data.feed.title) : null;
+    const header = {};
+    const nextpage = response.headers.get(HEADER_NEXTPAGE);
+    if (nextpage) {
+        header[HEADER_NEXTPAGE] = nextpage;
+    }
+    return new VtecxResponse(response.status, header, data);
 };
-exports.count = count;
+exports.countResponse = countResponse;
 /**
  * register entries
  * @param req request (for authentication)
@@ -2917,6 +2956,20 @@ const changeTdid = async (req, res) => {
 };
 exports.changeTdid = changeTdid;
 //---------------------------------------------
+/**
+ * response class
+ */
+class VtecxResponse {
+    status;
+    header;
+    data;
+    constructor(status, header, data) {
+        this.status = status;
+        this.header = header;
+        this.data = data;
+    }
+}
+exports.VtecxResponse = VtecxResponse;
 /**
  * Error returned from vte.cx
  */
@@ -2987,6 +3040,9 @@ const requestVtecx = async (method, url, req, body, additionalHeaders, targetSer
 const fetchVtecx = async (method, url, headers, body, mode) => {
     //console.log(`[vtecxnext fetchVtecx] url=${process.env.VTECX_URL}${url}`)
     headers['X-Requested-With'] = 'XMLHttpRequest';
+    if (VTECX_SERVICENAME) {
+        headers['X-SERVICENAME'] = VTECX_SERVICENAME;
+    }
     const apiKey = process.env.VTECX_APIKEY;
     if (apiKey && !url.startsWith(SERVLETPATH_DATA)) {
         //headers['Authorization'] = `APIKey ${apiKey}`
@@ -3017,6 +3073,7 @@ const fetchVtecx = async (method, url, headers, body, mode) => {
 };
 /** vte.cx URL */
 const VTECX_URL = process.env.VTECX_URL ?? '';
+const VTECX_SERVICENAME = process.env.VTECX_SERVICENAME ?? '';
 const newFetchError = (e, isVtecx) => {
     let errMsg;
     if (e instanceof Error) {
@@ -3051,12 +3108,8 @@ const setCookie = (response, res) => {
         //console.log(`[vtecxnext setCookie] value : ${setCookieVal}`)
         //res.setHeader('set-cookie', setCookieVal)
         const setCookieVals = splitCookieValue(setCookieVal);
+        //console.log(`[vtecxnext setCookie] values : ${setCookieVals}`)
         res.setHeader('set-cookie', setCookieVals);
-        /*
-        for (const val of setCookieVals) {
-          res.setHeader('set-cookie', val)
-        }
-        */
     }
 };
 /**

package/package.json

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