@vtecx/vtecxnext 3.0.4 → 3.0.6

package/dist/vtecxnext.d.ts

@@ -142,6 +142,8 @@ export declare class VtecxNext {
     private bufferData;
     /** Access Token (for batch) */
     private accessToken;
+    /** Whether or not to use accesstoken (for batch) */
+    private useAccessToken;
     /** login cookies */
     private loginCookies;
     /** next cookies (for server action) */
@@ -154,6 +156,10 @@ export declare class VtecxNext {
      * @param accessToken Access token (for batch)
      */
     constructor(req?: NextRequest, accessToken?: string);
+    /**
+     * Initial processing for batch.
+     */
+    init: () => Promise<void>;
     /**
      * get url parameter.
      * @param name parameter name
@@ -1077,6 +1083,16 @@ export declare class VtecxNext {
      * @param indexInfos delete index information
      */
     deleteIndex: (indexInfos: IndexInfo[]) => Promise<void>;
+    /**
+     * get access count
+     * @return access count
+     */
+    accesscount: () => Promise<number>;
+    /**
+     * get storage usage
+     * @return storage usage
+     */
+    storageusage: () => Promise<number>;
     /**
      * convert index informations to argument entry
      * @param indexInfos index informations

package/dist/vtecxnext.js

@@ -53,6 +53,8 @@ class VtecxNext {
     bufferData = null;
     /** Access Token (for batch) */
     accessToken;
+    /** Whether or not to use accesstoken (for batch) */
+    useAccessToken;
     /** login cookies */
     loginCookies = {};
     /** next cookies (for server action) */
@@ -72,8 +74,34 @@ class VtecxNext {
         else {
             this.req = undefined;
             this.accessToken = accessToken;
+            this.useAccessToken = true;
         }
     }
+    /**
+     * Initial processing for batch.
+     */
+    init = async () => {
+        //console.log(`[vtecxnext init] start.`)
+        if (this.accessToken && this.useAccessToken) {
+            // vte.cxへリクエスト
+            const method = 'POST';
+            const url = `${SERVLETPATH_DATA}/?_createsession`;
+            let response;
+            try {
+                response = await this.requestVtecx(method, url);
+            }
+            catch (e) {
+                throw newFetchError(e, true);
+            }
+            //console.log(`[vtecxnext init] response. status=${response.status}`)
+            // vte.cxからのset-cookieを転記
+            this.setCookie(response);
+            // レスポンスのエラーチェック
+            await checkVtecxResponse(response);
+            // 以降アクセストークンは使用しない
+            this.useAccessToken = false;
+        }
+    };
     /**
      * get url parameter.
      * @param name parameter name
@@ -244,7 +272,7 @@ class VtecxNext {
         //console.log('[vtecxnext now] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = '/d/?_now';
+        const url = `${SERVLETPATH_DATA}/?_now`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -267,7 +295,7 @@ class VtecxNext {
         //console.log('[vtecxnext uid] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = '/d/?_uid';
+        const url = `${SERVLETPATH_DATA}/?_uid`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -292,7 +320,7 @@ class VtecxNext {
         //console.log('[vtecxnext account] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = '/d/?_account';
+        const url = `${SERVLETPATH_DATA}/?_account`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -318,7 +346,7 @@ class VtecxNext {
         //console.log('[vtecxnext service] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = '/d/?_service';
+        const url = `${SERVLETPATH_DATA}/?_service`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -343,7 +371,7 @@ class VtecxNext {
         //console.log('[vtecxnext rxid] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = '/d/?_getrxid';
+        const url = `${SERVLETPATH_DATA}/?_getrxid`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -462,7 +490,7 @@ class VtecxNext {
         //console.log('[vtecxnext logout] start.')
         // vte.cxへリクエスト
         const method = 'POST';
-        const url = '/d/?_logout';
+        const url = `${SERVLETPATH_DATA}/?_logout`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -490,7 +518,7 @@ class VtecxNext {
         //console.log('[vtecxnext whoami] start.')
         // vte.cxへリクエスト
         const method = 'GET';
-        const url = '/d/?_whoami';
+        const url = `${SERVLETPATH_DATA}/?_whoami`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -3938,6 +3966,62 @@ class VtecxNext {
         // 戻り値
         return await getJson(response);
     };
+    /**
+     * get access count
+     * @return access count
+     */
+    accesscount = async () => {
+        //console.log('[vtecxnext accesscount] start.')
+        // vte.cxへリクエスト
+        const method = 'GET';
+        const url = `${SERVLETPATH_DATA}/?_accesscount`;
+        let response;
+        try {
+            response = await this.requestVtecx(method, url);
+        }
+        catch (e) {
+            throw newFetchError(e, true);
+        }
+        //console.log(`[vtecxnext accesscount] response=${response}`)
+        // vte.cxからのset-cookieを転記
+        this.setCookie(response);
+        // レスポンスのエラーチェック
+        await checkVtecxResponse(response);
+        // 戻り値
+        const data = await getJson(response);
+        if (isIntegerString(data.feed.title)) {
+            return Number(data.feed.title);
+        }
+        return 0;
+    };
+    /**
+     * get storage usage
+     * @return storage usage
+     */
+    storageusage = async () => {
+        //console.log('[vtecxnext storageusage] start.')
+        // vte.cxへリクエスト
+        const method = 'GET';
+        const url = `${SERVLETPATH_DATA}/?_storageusage`;
+        let response;
+        try {
+            response = await this.requestVtecx(method, url);
+        }
+        catch (e) {
+            throw newFetchError(e, true);
+        }
+        //console.log(`[vtecxnext storageusage] response=${response}`)
+        // vte.cxからのset-cookieを転記
+        this.setCookie(response);
+        // レスポンスのエラーチェック
+        await checkVtecxResponse(response);
+        // 戻り値
+        const data = await getJson(response);
+        if (isIntegerString(data.feed.title)) {
+            return Number(data.feed.title);
+        }
+        return 0;
+    };
     /**
      * convert index informations to argument entry
      * @param indexInfos index informations
@@ -3995,8 +4079,8 @@ class VtecxNext {
         const cookie = await this.editRequestCookie();
         //console.log(`[requestVtecx] cookie = ${cookie}`)
         const headers = cookie ? { Cookie: cookie } : {};
-        if (this.accessToken) {
-            headers.Authorization = `Token ${this.accessToken}`;
+        if (this.accessToken && this.useAccessToken) {
+            headers.Authorization = `Bearer ${this.accessToken}`;
         }
         if (additionalHeaders) {
             //console.log(`[vtecxnext requestVtecx] additionalHeaders for`)
@@ -4596,6 +4680,12 @@ const isBlank = (val) => {
     }
     return false;
 };
+/**
+ * 文字列の数字判定
+ * @param s 文字列
+ * @returns 文字列が数字であればtrue
+ */
+const isIntegerString = (s) => /^[0-9]+$/.test(s);
 /**
  * vte.cxからのレスポンスが正常かエラーかをチェックする。
  * エラーの場合 VtecxNextError をスローする。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [
@@ -18,13 +18,13 @@
   },
   "homepage": "https://github.com/reflexworks/vtecxnext#readme",
   "devDependencies": {
-    "@types/node": "^25.2.3",
+    "@types/node": "^25.9.1",
     "@types/sqlstring": "^2.3.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   },
   "dependencies": {
-    "next": "^16.1.6",
+    "next": "^16.2.6",
     "sqlstring": "^2.3.3"
   },
   "scripts": {