@vtecx/vtecxnext 2.2.1 → 2.2.3

package/dist/vtecxnext.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { NextRequest } from 'next/server';
 import type { Readable } from 'node:stream';
 /**
@@ -27,18 +26,23 @@ export type CreateGroupadminInfo = {
 };
 export declare class VtecxNext {
     /** Request */
-    readonly req: NextRequest;
+    readonly req: NextRequest | undefined;
     /** Response status */
     private resStatus;
     /** Response headers */
     private resHeaders;
     /** binary data */
     private bufferData;
+    /** Access Token (for batch) */
+    private accessToken;
+    /** login cookies */
+    private loginCookies;
     /**
      * constructor
      * @param req Request
+     * @param accessToken Access token (for batch)
      */
-    constructor(req: NextRequest);
+    constructor(req?: NextRequest, accessToken?: string);
     /**
      * get url parameter.
      * @param name parameter name
@@ -773,14 +777,16 @@ export declare class VtecxNext {
      * @param uri key
      * @param bysize true if registering with specified size
      * @param filename attachment file name
+     * @param arrayBuffer content (for batch)
      * @return message
      */
-    putcontent: (uri: string, filename?: string) => Promise<any>;
+    putcontent: (uri: string, filename?: string, arrayBuffer?: ArrayBuffer) => Promise<any>;
     /**
      * upload content
      * @param uri key
      * @param bysize true if registering with specified size
      * @param filename attachment file name
+     * @param arrayBuffer content (for batch)
      * @return message
      */
     private putcontentProc;
@@ -900,6 +906,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

@@ -54,12 +54,23 @@ class VtecxNext {
     resHeaders = {};
     /** binary data */
     bufferData = null;
+    /** Access Token (for batch) */
+    accessToken;
+    /** login cookies */
+    loginCookies = {};
     /**
      * constructor
      * @param req Request
+     * @param accessToken Access token (for batch)
      */
-    constructor(req) {
-        this.req = req;
+    constructor(req, accessToken) {
+        if (req) {
+            this.req = req;
+        }
+        else {
+            this.req = undefined;
+            this.accessToken = accessToken;
+        }
     }
     /**
      * get url parameter.
@@ -67,6 +78,9 @@ class VtecxNext {
      * @returns parameter value
      */
     getParameter = (name) => {
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         const url = new URL(this.req.url);
         const params = url.searchParams;
         const val = params.get(name);
@@ -91,6 +105,9 @@ class VtecxNext {
      * @returns buffer
      */
     buffer = async (readable) => {
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         let tmpReadable;
         if (readable === undefined || readable === null) {
             const arrayBuffer = await this.req.arrayBuffer();
@@ -127,6 +144,9 @@ class VtecxNext {
      */
     checkXRequestedWith = () => {
         //console.log(`[vtecxnext checkXRequestedWith] start.`)
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         let hasX = false;
         this.req.headers.forEach((value, key, parent) => {
             //console.log(`[vtecxnext checkXRequestedWith] key=${key} value=${value}`)
@@ -365,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 };
     };
@@ -3039,6 +3061,9 @@ class VtecxNext {
      */
     savefiles = async (uri, bysize) => {
         //console.log(`[vtecxnext savefiles] start. uri=${uri}`)
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         // キー入力値チェック
         checkUri(uri);
         const formData = await this.req.formData();
@@ -3092,32 +3117,43 @@ class VtecxNext {
      * @param uri key
      * @param bysize true if registering with specified size
      * @param filename attachment file name
+     * @param arrayBuffer content (for batch)
      * @return message
      */
-    putcontent = async (uri, filename) => {
-        return this.putcontentProc(uri, false, filename);
+    putcontent = async (uri, filename, arrayBuffer) => {
+        return this.putcontentProc(uri, false, filename, arrayBuffer);
     };
     /**
      * upload content
      * @param uri key
      * @param bysize true if registering with specified size
      * @param filename attachment file name
+     * @param arrayBuffer content (for batch)
      * @return message
      */
-    putcontentProc = async (uri, bysize, filename) => {
+    putcontentProc = async (uri, bysize, filename, arrayBuffer) => {
         //console.log(`[vtecxnext putcontent] start. uri=${uri} content-type:${req.headers['content-type']} content-length:${req.headers['content-length']}`)
+        if (!this.req && !arrayBuffer) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         // キー入力値チェック
         checkUri(uri);
         // vte.cxへリクエスト
         const method = 'PUT';
         const url = `${SERVLETPATH_PROVIDER}${uri}?_content${bysize ? '&_bysize' : ''}`;
         //console.log(`[vtecxnext putcontent] request. url=${url}`)
-        const headers = { 'Content-Type': this.req.headers.get('content-type') };
+        const headers = { 'Content-Type': this.req?.headers.get('content-type') };
         if (filename) {
             headers['Content-Disposition'] = `attachment; filename="${encodeURIComponent(filename)}"`;
         }
         //const buf = await buffer(this.req)
-        const buf = await this.req.arrayBuffer();
+        let buf;
+        if (arrayBuffer) {
+            buf = arrayBuffer;
+        }
+        else if (this.req) {
+            buf = await this.req.arrayBuffer();
+        }
         let response;
         try {
             response = await this.requestVtecx(method, url, buf, headers);
@@ -3149,6 +3185,9 @@ class VtecxNext {
      */
     postcontent = async (parenturi, extension, filename) => {
         //console.log(`[vtecxnext postcontent] start. parenturi=${parenturi} extension=${extension} filename=${filename}`)
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         // キー入力値チェック
         checkUri(parenturi);
         // vte.cxへリクエスト
@@ -3256,7 +3295,7 @@ class VtecxNext {
         const method = 'PUT';
         const url = `${SERVLETPATH_PROVIDER}${uri}?_content&_signedurl`;
         //console.log(`[vtecxnext getSignedUrlToPutContent] request. url=${url}`)
-        const headers = { 'Content-Type': this.req.headers.get('content-type') };
+        const headers = { 'Content-Type': this.req?.headers?.get('content-type') };
         if (filename) {
             headers['Content-Disposition'] = `attachment; filename="${encodeURIComponent(filename)}"`;
         }
@@ -3288,7 +3327,7 @@ class VtecxNext {
         const method = 'POST';
         const url = `${SERVLETPATH_PROVIDER}${parenturi}?_content&_signedurl${extension ? '&_ext=' + extension : ''}`;
         //console.log(`[vtecxnext getSignedUrlToPostContent] request. url=${url}`)
-        const headers = { 'Content-Type': this.req.headers.get('content-type') };
+        const headers = { 'Content-Type': this.req?.headers?.get('content-type') };
         if (filename) {
             headers['Content-Disposition'] = `attachment; filename="${encodeURIComponent(filename)}"`;
         }
@@ -3554,8 +3593,12 @@ 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}`;
+        }
         if (additionalHeaders) {
             //console.log(`[vtecxnext requestVtecx] additionalHeaders for`)
             for (const key in additionalHeaders) {
@@ -3596,6 +3639,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からのレスポンスヘッダを、ブラウザへレスポンスする。
      * コンテンツの戻し時に使用。
@@ -3623,6 +3710,9 @@ class VtecxNext {
      */
     oauth = async (provider, oauthUrl) => {
         //console.log(`[vtecxnext oauth] start. provider=${provider} oauthUrl=${oauthUrl}`)
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         // TODO reCAPTCHAを必須とすべき?
         // 入力チェック
         checkNotNull(provider, 'OAuth provider');
@@ -3672,6 +3762,9 @@ class VtecxNext {
      */
     oauthGetAccesstoken = async (provider, accesstokenUrl) => {
         //console.log(`[vtecxnext oauthGetAccesstoken] start. provider=${provider} oauthUrl=${accesstokenUrl}`)
+        if (!this.req) {
+            throw new VtecxNextError(421, 'Request is required.');
+        }
         // stateチェック
         const parseUrl = url_1.default.parse(this.req.url ?? '', true);
         const state = parseUrl.query.state;
@@ -3721,12 +3814,16 @@ class VtecxNext {
             'client_id': client_id,
             'client_secret': client_secret
         };
-        const accesstokenBody = createURLSearchParams(accessTokenData);
+        const accesstokenBody = createURLSearchParams(accessTokenData).toString();
         //const accesstokenBodyStr = `grant_type=authorization_code&code=${code}&redirect_uri=${encodeRedirect_uri}&client_id=${client_id}&client_secret=${client_secret}`
         //console.log(`[vtecxnext oauthGetAccesstoken] accesstokenUrl=${accesstokenUrl}`)
         //console.log(`[vtecxnext oauthGetAccesstoken] accesstokenBodyStr=${accesstokenBodyStr}`)
         //const accesstokenBody = Buffer.from(accesstokenBodyStr, 'utf-8')
         const requestInit = {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Content-Length': String(accesstokenBody.length),
+            },
             body: accesstokenBody,
             method: accesstokenMethod,
             cache: 'no-cache',
@@ -3909,33 +4006,28 @@ exports.FetchError = FetchError;
  * vte.cxへリクエスト
  * @param method メソッド
  * @param url サーブレットパス以降のURL
- * @param headers リクエストヘッダ。連想配列で指定。
+ * @param pHeaders リクエストヘッダ。連想配列で指定。
  * @param body リクエストデータ
  * @param mode RequestMode ("cors" | "navigate" | "no-cors" | "same-origin")
  * @returns promise
  */
-const fetchVtecx = async (method, url, headers, body, mode) => {
+const fetchVtecx = async (method, url, pHeaders, body, mode) => {
     //console.log(`[vtecxnext fetchVtecx] url=${process.env.VTECX_URL}${url}`)
-    headers['X-Requested-With'] = 'XMLHttpRequest';
+    const headers = [];
+    if (pHeaders) {
+        for (const key in pHeaders) {
+            //console.log(`[vtecxnext fetchVtecx] request header = ${key}: ${pHeaders[key]}`)
+            headers.push([key, pHeaders[key]]);
+        }
+    }
+    headers.push(['X-Requested-With', 'XMLHttpRequest']);
     if (VTECX_SERVICENAME) {
-        headers['X-SERVICENAME'] = VTECX_SERVICENAME;
+        headers.push(['X-SERVICENAME', VTECX_SERVICENAME]);
     }
     const apiKey = process.env.VTECX_APIKEY;
     if (apiKey && !url.startsWith(SERVLETPATH_DATA)) {
-        //headers['Authorization'] = `APIKey ${apiKey}`
         const apiKeyVal = `APIKey ${apiKey}`;
-        if (headers.Authorization) {
-            if (Array.isArray(headers.Authorization)) {
-                headers.Authorization.push(apiKeyVal);
-            }
-            else {
-                const tmp = headers.Authorization;
-                headers.Authorization = [tmp, apiKeyVal];
-            }
-        }
-        else {
-            headers.Authorization = apiKeyVal;
-        }
+        headers.push(['Authorization', apiKeyVal]);
     }
     //console.log(`[vtecxnext fetchVtecx] headers = ${JSON.stringify(headers)}`)
     const requestInit = {

package/package.json

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