@vtecx/vtecxnext 2.2.2 → 2.2.4

package/dist/vtecxnext.d.ts

@@ -24,6 +24,11 @@ export type CreateGroupadminInfo = {
     group: string;
     uids: string[];
 };
+export type PaginationInfo = {
+    lastPageNumber: number;
+    countWithinRange: number;
+    hasNext: boolean;
+};
 export declare class VtecxNext {
     /** Request */
     readonly req: NextRequest | undefined;
@@ -35,6 +40,8 @@ export declare class VtecxNext {
     private bufferData;
     /** Access Token (for batch) */
     private accessToken;
+    /** login cookies */
+    private loginCookies;
     /**
      * constructor
      * @param req Request
@@ -381,9 +388,9 @@ export declare class VtecxNext {
      * @param uri key and conditions
      * @param pagerange page range
      * @param targetService target service name (for service linkage)
-     * @return feed Maximum number of pages in the specified page range, and total count.
+     * @return Maximum number of pages in the specified page range, and total count.
      */
-    pagination: (uri: string, pagerange: string, targetService?: string) => Promise<any>;
+    pagination: (uri: string, pagerange: string, targetService?: string) => Promise<PaginationInfo>;
     /**
      * get page
      * @param uri key and conditions
@@ -904,6 +911,16 @@ export declare class VtecxNext {
      * @param response vte.cxからのレスポンス
      */
     private setCookie;
+    /**
+     * ログイン時にレスポンスされたvte.cxからのset-cookieを保持する。
+     * @param response vte.cxからのレスポンス
+     */
+    private setLoginCookie;
+    /**
+     * ログイン後のCookie編集
+     * @returns cookie
+     */
+    private editRequestCookie;
     /**
      * vte.cxからのレスポンスヘッダを、ブラウザへレスポンスする。
      * コンテンツの戻し時に使用。

package/dist/vtecxnext.js

@@ -56,6 +56,8 @@ class VtecxNext {
     bufferData = null;
     /** Access Token (for batch) */
     accessToken;
+    /** login cookies */
+    loginCookies = {};
     /**
      * constructor
      * @param req Request
@@ -383,6 +385,8 @@ class VtecxNext {
         }
         // vte.cxからのset-cookieを転記
         this.setCookie(response);
+        // 引き続きAPIで処理を行う場合のため、set-cookie情報を保持しておく
+        this.setLoginCookie(response);
         const data = await response.json();
         return { status: response.status, message: data.feed.title };
     };
@@ -1352,7 +1356,7 @@ class VtecxNext {
      * @param uri key and conditions
      * @param pagerange page range
      * @param targetService target service name (for service linkage)
-     * @return feed Maximum number of pages in the specified page range, and total count.
+     * @return Maximum number of pages in the specified page range, and total count.
      */
     pagination = async (uri, pagerange, targetService) => {
         //console.log('[vtecxnext pagination] start.')
@@ -1373,8 +1377,18 @@ class VtecxNext {
         this.setCookie(response);
         // レスポンスのエラーチェック
         await checkVtecxResponse(response);
-        // 戻り値
-        return await getJson(response);
+        // 戻り値編集
+        const respJson = await getJson(response);
+        let hasNext = false;
+        if (respJson.feed.link && respJson.feed.link[0]?.___rel === 'next') {
+            hasNext = true;
+        }
+        const pagenationInfo = {
+            'lastPageNumber': Number(respJson.feed.title),
+            'countWithinRange': Number(respJson.feed.subtitle),
+            'hasNext': hasNext
+        };
+        return pagenationInfo;
     };
     /**
      * get page
@@ -3589,7 +3603,8 @@ class VtecxNext {
      */
     requestVtecx = async (method, url, body, additionalHeaders, targetService, mode) => {
         // cookieの値をvte.cxへのリクエストヘッダに設定
-        const cookie = this.req ? this.req.headers.get('cookie') : undefined;
+        const cookie = this.editRequestCookie();
+        //console.log(`[requestVtecx] cookie = ${cookie}`)
         const headers = cookie ? { 'Cookie': cookie } : {};
         if (this.accessToken) {
             headers.Authorization = `Token ${this.accessToken}`;
@@ -3634,6 +3649,50 @@ class VtecxNext {
             this.resHeaders['set-cookie'] = setCookieVal;
         }
     };
+    /**
+     * ログイン時にレスポンスされたvte.cxからのset-cookieを保持する。
+     * @param response vte.cxからのレスポンス
+     */
+    setLoginCookie = (response) => {
+        // set-cookieの値をレスポンスヘッダ格納変数にセット
+        let setCookieVal = response.headers.get('set-cookie');
+        if (setCookieVal) {
+            const tmpCookies = setCookieVal.split(';');
+            for (const tmpCookie of tmpCookies) {
+                const tmpKeyVal = tmpCookie.split('=');
+                this.loginCookies[tmpKeyVal[0]] = tmpKeyVal[1];
+            }
+        }
+    };
+    /**
+     * ログイン後のCookie編集
+     * @returns cookie
+     */
+    editRequestCookie = () => {
+        let cookie = this.req ? this.req.headers.get('cookie') : null;
+        if (!this.loginCookies) {
+            return cookie;
+        }
+        let retCookie = '';
+        if (cookie) {
+            const tmpCookies = cookie.split(';');
+            for (const tmpCookie of tmpCookies) {
+                const tmpKeyVal = tmpCookie.trim().split('=');
+                const tmpName = tmpKeyVal[0];
+                const tmpVal = tmpKeyVal[1];
+                if (!this.loginCookies.hasOwnProperty(tmpName)) {
+                    retCookie = `${retCookie}${tmpName}=${tmpVal}; `;
+                    //} else {
+                    //console.log(`[editRequestCookie] hasOwnProperty (not set) : ${tmpName}=${tmpVal}`)
+                }
+            }
+        }
+        for (const tmpName in this.loginCookies) {
+            const tmpVal = this.loginCookies[tmpName];
+            retCookie = `${retCookie}${tmpName}=${tmpVal};`;
+        }
+        return retCookie;
+    };
     /**
      * vte.cxからのレスポンスヘッダを、ブラウザへレスポンスする。
      * コンテンツの戻し時に使用。
@@ -3967,6 +4026,7 @@ const fetchVtecx = async (method, url, pHeaders, body, mode) => {
     const headers = [];
     if (pHeaders) {
         for (const key in pHeaders) {
+            //console.log(`[vtecxnext fetchVtecx] request header = ${key}: ${pHeaders[key]}`)
             headers.push([key, pHeaders[key]]);
         }
     }

package/package.json

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