@vtecx/vtecxnext 3.0.6 → 3.1.0

package/dist/vtecxnext.d.ts

@@ -148,6 +148,8 @@ export declare class VtecxNext {
     private loginCookies;
     /** next cookies (for server action) */
     private cookieStore;
+    /** Whether server action cookies() should be used */
+    private useCookieStore;
     /** flag whether the next cookies should be created */
     private shouldBeCreatedCookieStore;
     /**
@@ -156,6 +158,7 @@ export declare class VtecxNext {
      * @param accessToken Access token (for batch)
      */
     constructor(req?: NextRequest, accessToken?: string);
+    constructor(accessToken?: string);
     /**
      * Initial processing for batch.
      */

package/dist/vtecxnext.js

@@ -59,23 +59,26 @@ class VtecxNext {
     loginCookies = {};
     /** next cookies (for server action) */
     cookieStore; // ReadonlyRequestCookies
+    /** Whether server action cookies() should be used */
+    useCookieStore = false;
     /** flag whether the next cookies should be created */
-    shouldBeCreatedCookieStore = true;
-    /**
-     * constructor
-     * @param req Request (for api)
-     * @param accessToken Access token (for batch)
-     */
-    constructor(req, accessToken) {
-        if (req) {
-            this.req = req;
-            this.shouldBeCreatedCookieStore = false;
-        }
-        else {
+    shouldBeCreatedCookieStore = false;
+    constructor(reqOrAccessToken, accessToken) {
+        if (typeof reqOrAccessToken === 'string') {
             this.req = undefined;
-            this.accessToken = accessToken;
+            this.accessToken = reqOrAccessToken;
             this.useAccessToken = true;
+            return;
         }
+        if (reqOrAccessToken) {
+            this.req = reqOrAccessToken;
+            return;
+        }
+        this.req = undefined;
+        this.accessToken = accessToken;
+        this.useAccessToken = accessToken ? true : undefined;
+        this.useCookieStore = true;
+        this.shouldBeCreatedCookieStore = true;
     }
     /**
      * Initial processing for batch.
@@ -96,6 +99,8 @@ class VtecxNext {
             //console.log(`[vtecxnext init] response. status=${response.status}`)
             // vte.cxからのset-cookieを転記
             this.setCookie(response);
+            // バッチ実行用にセッションCookieを保持する
+            this.setLoginCookie(response);
             // レスポンスのエラーチェック
             await checkVtecxResponse(response);
             // 以降アクセストークンは使用しない
@@ -4179,12 +4184,18 @@ class VtecxNext {
      */
     setLoginCookie = (response) => {
         // set-cookieの値をレスポンスヘッダ格納変数にセット
-        let setCookieVal = response.headers.get('set-cookie');
+        const 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];
+            for (const cookie of splitSetCookieHeader(setCookieVal)) {
+                const idx = cookie.indexOf('=');
+                if (idx <= 0) {
+                    continue;
+                }
+                const name = cookie.substring(0, idx).trim();
+                const value = cookie.substring(idx + 1).trim();
+                if (name) {
+                    this.loginCookies[name] = value;
+                }
             }
         }
     };
@@ -4211,7 +4222,7 @@ class VtecxNext {
             }
         }
         else {
-            if (this.shouldBeCreatedCookieStore) {
+            if (this.useCookieStore && this.shouldBeCreatedCookieStore) {
                 //console.log(`[editRequestCookie] shouldBeCreatedCookieStore === true`)
                 try {
                     this.cookieStore = await (0, headers_1.cookies)();
@@ -4222,7 +4233,7 @@ class VtecxNext {
                 }
                 this.shouldBeCreatedCookieStore = false;
             }
-            if (this.cookieStore) {
+            if (this.useCookieStore && this.cookieStore) {
                 //console.log(`[editRequestCookie] this.cookieStore === true. ${JSON.stringify(this.cookieStore)}`)
                 // server action用
                 const cookieArray = this.cookieStore.getAll();
@@ -4901,6 +4912,40 @@ const createURLSearchParams = (data) => {
     Object.keys(data).forEach((key) => params.append(key, data[key]));
     return params;
 };
+/**
+ * set-cookie header から Cookie 名と値だけを抽出する。
+ * @param setCookieVal set-cookie header value
+ * @returns cookie pair list
+ */
+const splitSetCookieHeader = (setCookieVal) => {
+    const cookies = [];
+    let current = '';
+    let inExpires = false;
+    for (let i = 0; i < setCookieVal.length; i++) {
+        const char = setCookieVal[i];
+        if (!inExpires && setCookieVal.substring(i, i + 8).toLowerCase() === 'expires=') {
+            inExpires = true;
+        }
+        if (char === ',' && !inExpires) {
+            if (current) {
+                cookies.push(current);
+            }
+            current = '';
+            continue;
+        }
+        current += char;
+        if (inExpires && char === ';') {
+            inExpires = false;
+        }
+    }
+    if (current) {
+        cookies.push(current);
+    }
+    return cookies.map((cookie) => {
+        const firstPart = cookie.split(';')[0];
+        return firstPart.trim();
+    }).filter((cookie) => cookie.length > 0);
+};
 /**
  * URIのパラメータ部分を連想配列にして返却
  * @param uri URI

package/package.json

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