@vtecx/vtecxnext 2.2.22 → 2.3.1

package/dist/vtecxnext.d.ts

@@ -524,6 +524,7 @@ export declare class VtecxNext {
      * @param values values of query arguments
      * @param async execute async
      * @param isbulk execute with autocommit
+     * @return message
      */
     execRDB: (sqls: string[], values?: any[][], async?: boolean, isbulk?: boolean) => Promise<any>;
     /**
@@ -671,7 +672,7 @@ export declare class VtecxNext {
      * add user
      * @param adduserInfo adduser infomation
      * @param reCaptchaToken reCAPTCHA token
-     * @return message feed
+     * @return message feed (uid)
      */
     adduser: (adduserInfo: AdduserInfo, reCaptchaToken: string) => Promise<any>;
     /**

package/dist/vtecxnext.js

@@ -59,6 +59,8 @@ const HEADER_NEXTPAGE = 'x-vtecx-nextpage';
 const PAGINATION_NUM = 7;
 /** pagination memorysort */
 const MEMORYSORT = 'memorysort';
+/** parameter : nextpage */
+const PARAM_NEXTPAGE = 'p';
 class VtecxNext {
     /** Request */
     req;
@@ -625,11 +627,36 @@ class VtecxNext {
      * @return count
      */
     count = async (uri, targetService) => {
-        //console.log('[vtecxnext count] start.')
-        const vtecxRes = await this.countResponse(uri, targetService);
-        // 戻り値
-        const data = vtecxRes.data;
-        return vtecxRes.data.feed.title ? Number(data.feed.title) : null;
+        //console.log(`[vtecxnext count] start. uri=${uri}`)
+        let cnt = 0;
+        let noRepeat = false;
+        let nextpage = '';
+        const params = getParamMap(uri);
+        if (params[PARAM_NEXTPAGE]) {
+            noRepeat = true;
+        }
+        do {
+            const editedUri = noRepeat ? uri : addNextpage(uri, nextpage);
+            //console.log(`[vtecxnext count] editedUri=${editedUri}`)
+            nextpage = '';
+            const vtecxRes = await this.countResponse(editedUri, targetService);
+            if (vtecxRes.status === 200) {
+                const data = vtecxRes.data;
+                if (!data?.feed?.title) {
+                    if (!cnt) {
+                        return null;
+                    }
+                }
+                else {
+                    cnt += Number(data.feed.title);
+                }
+                if (vtecxRes.header.hasOwnProperty(HEADER_NEXTPAGE)) {
+                    nextpage = vtecxRes.header[HEADER_NEXTPAGE];
+                    //console.log(`[vtecxnext count] ${HEADER_NEXTPAGE}=${nextpage}`)
+                }
+            }
+        } while (!noRepeat && nextpage);
+        return cnt;
     };
     /**
      * get count
@@ -1950,6 +1977,7 @@ class VtecxNext {
      * @param values values of query arguments
      * @param async execute async
      * @param isbulk execute with autocommit
+     * @return message
      */
     execRDB = async (sqls, values, async, isbulk) => {
         //console.log(`[vtecxnext execRDB] start. sql=${sql} values=${values}`)
@@ -2009,7 +2037,6 @@ class VtecxNext {
         const resData = await response.blob();
         this.setResponseHeaders(response);
         this.bufferData = await resData.arrayBuffer();
-        //res.end(new Uint8Array(pdfData))
         return true;
     };
     /**
@@ -2616,7 +2643,7 @@ class VtecxNext {
      * add user
      * @param adduserInfo adduser infomation
      * @param reCaptchaToken reCAPTCHA token
-     * @return message feed
+     * @return message feed (uid)
      */
     adduser = async (adduserInfo, reCaptchaToken) => {
         //console.log(`[vtecxnext adduser] start. feed=${feed}`)
@@ -2668,7 +2695,6 @@ class VtecxNext {
      * @param feed entries (JSON)
      * @return message feed
      */
-    //adduserByAdmin = async (feed:any): Promise<any> => {
     adduserByAdmin = async (adduserInfos) => {
         //console.log(`[vtecxnext adduserByAdmin] start. feed=${feed}`)
         // 入力チェック
@@ -4591,3 +4617,52 @@ const createURLSearchParams = (data) => {
     Object.keys(data).forEach((key) => params.append(key, data[key]));
     return params;
 };
+/**
+ * URIのパラメータ部分を連想配列にして返却
+ * @param uri URI
+ * @returns パラメータを連想配列にしたオブジェクト
+ */
+const getParamMap = (uri) => {
+    if (!uri) {
+        return {};
+    }
+    const idxQ = uri.indexOf('?');
+    if (idxQ < 0) {
+        return {};
+    }
+    const paramStr = uri.substring(idxQ + 1);
+    if (!paramStr) {
+        return {};
+    }
+    const params = {};
+    const paramStrParts = paramStr.split('&');
+    for (const paramStrPart of paramStrParts) {
+        let name = '';
+        let value = '';
+        const idxE = paramStrPart.indexOf('=');
+        if (idxE < 0) {
+            name = paramStrPart;
+        }
+        else {
+            name = paramStrPart.substring(0, idxE);
+            value = paramStrPart.substring(idxE + 1);
+        }
+        params[name] = value;
+    }
+    return params;
+};
+/**
+ * URIにカーソルを付加
+ * @param uri URI
+ * @param nextpage カーソル
+ * @returns URIにカーソルを付加した文字列
+ */
+const addNextpage = (uri, nextpage) => {
+    if (nextpage) {
+        const rchar = uri.indexOf('?') < 0 ? '?' : '&';
+        return `${uri}${rchar}${PARAM_NEXTPAGE}=${nextpage}`;
+    }
+    else {
+        return uri;
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "2.2.22",
+  "version": "2.3.1",
   "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": "^24.0.4",
+    "@types/node": "^24.10.1",
     "@types/sqlstring": "^2.3.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "next": "^15.3.4",
+    "next": "^16.0.7",
     "sqlstring": "^2.3.3"
   },
   "scripts": {