@vtecx/vtecxnext 2.2.15 → 2.2.17

package/dist/vtecxnext.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -1438,9 +1448,9 @@ class VtecxNext {
         if (num === 1) {
             //console.log(`[getPageWithPagination] pagination start. uri=${uri}`)
             const paginationInfo = await this.pagination(uri, `1,${String(PAGINATION_NUM)}`, targetService);
-            // メモリソートの場合は全てのカーソルリストを作成する
+            // メモリソートの場合はvte.cx側で全てのカーソルリストを作成する
             if (paginationInfo.hasNext && !paginationInfo.isMemorysort) {
-                // 次のカーソルリスト作成 (非同期のまま)
+                // メモリソートでない場合、次のカーソルリスト作成 (非同期のまま)
                 this.nextPagination(uri, PAGINATION_NUM, targetService);
             }
             if (paginationInfo.lastPageNumber === 0) {
@@ -1473,10 +1483,21 @@ class VtecxNext {
      */
     nextPagination = async (uri, prevLastPage, targetService) => {
         const firstPage = prevLastPage + 1;
-        const lastPage = prevLastPage + prevLastPage;
-        const paginationInfo = await this.pagination(uri, `${String(firstPage)},${String(lastPage)}`, targetService);
-        if (paginationInfo.hasNext) {
-            await this.nextPagination(uri, lastPage, targetService);
+        const lastPage = prevLastPage + PAGINATION_NUM;
+        //console.log(`[vtecxnext getPageWithPagination - nextPagination] firstPage=${firstPage} lastPage=${lastPage}`)
+        try {
+            const paginationInfo = await this.pagination(uri, `${String(firstPage)},${String(lastPage)}`, targetService);
+            if (paginationInfo.hasNext) {
+                await this.nextPagination(uri, lastPage, targetService);
+            }
+        }
+        catch (e) {
+            // Do nothing.
+            //if (isVtecxNextError(e)) {
+            //console.log(`[vtecxnext getPageWithPagination - nextPagination] status=${e.status} message=${e.message}`)
+            //} else {
+            //console.log(`[vtecxnext getPageWithPagination - nextPagination] Error occured. ${e}`)
+            //}
         }
     };
     /**
@@ -2828,7 +2849,7 @@ class VtecxNext {
         checkNotNull(account, 'account');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_DATA}/?_revokeuser=${account}${isDeleteGroups ? '&_deletegroup=true' : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_revokeuser=${account}${isDeleteGroups ? '&_deletegroup=true' : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -2872,7 +2893,7 @@ class VtecxNext {
         }
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_DATA}/?_revokeuser${isDeleteGroups ? '&_deletegroup=true' : ''}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_revokeuser${isDeleteGroups ? '&_deletegroup=true' : ''}`;
         let response;
         try {
             response = await this.requestVtecx(method, url, JSON.stringify(feed));
@@ -2898,7 +2919,7 @@ class VtecxNext {
         checkNotNull(account, 'account');
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_DATA}/?_activateuser=${account}`;
+        const url = `${SERVLETPATH_PROVIDER}/?_activateuser=${account}`;
         let response;
         try {
             response = await this.requestVtecx(method, url);
@@ -2941,7 +2962,7 @@ class VtecxNext {
         }
         // vte.cxへリクエスト
         const method = 'PUT';
-        const url = `${SERVLETPATH_DATA}/?_activateuser`;
+        const url = `${SERVLETPATH_PROVIDER}/?_activateuser`;
         let response;
         try {
             response = await this.requestVtecx(method, url, JSON.stringify(feed));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "2.2.15",
+  "version": "2.2.17",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [
@@ -22,13 +22,13 @@
   },
   "homepage": "https://github.com/reflexworks/vtecxnext#readme",
   "devDependencies": {
-    "@types/node": "^22.8.2",
+    "@types/node": "^22.10.1",
     "@types/sqlstring": "^2.3.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   },
   "dependencies": {
-    "next": "^15.0.1",
+    "next": "^15.0.4",
     "sqlstring": "^2.3.2"
   }
 }