fix: collection items count with cache (resolve #88)

Author: muety

package.json

@@ -1,6 +1,6 @@
 {
     "name": "anchr-multi-webservice",
-    "version": "3.5.1",
+    "version": "3.5.2",
     "description": "⚓️ Anchr provides you with a toolbox for tiny tasks on the internet, especially bookmark collections",
     "private": true,
     "scripts": {
@@ -27,10 +27,10 @@
         "memory-cache": "^0.2.0",
         "method-override": "^3.0.0",
         "mime-types": "^3.0.1",
-        "mongoose": "^8.18.1",
+        "mongoose": "^8.19.3",
         "morgan": "^1.10.1",
         "node-cron": "^4.2.1",
-        "nodemailer": "^7.0.6",
+        "nodemailer": "^7.0.10",
         "passport": "^0.7.0",
         "passport-facebook": "^3.0.0",
         "passport-google-oauth": "^2.0.0",

public/app/scripts/controllers/collection.js

@@ -4,7 +4,7 @@ angular.module('anchrClientApp')
     .controller('CollectionCtrl', ['$scope', '$rootScope', 'Collection', 'Remote', 'Snackbar', '$window', '$timeout', function ($scope, $rootScope, Collection, Remote, Snackbar, $window, $timeout) {
 
         var collections = [];
-        var collectionsPagesCache = [];
+        var collectionsPagesCache = [];  // [links, numPages, numItems]
         var fetchTitleDebounce = null;
         var searchDebounce = null;
 
@@ -19,6 +19,7 @@ angular.module('anchrClientApp')
                 $scope.data.search = '';
             }
 
+            var collection = collections[findCollection(collections, id)]
             var isNonFiltered = $scope.data.search === '';
             var hasCache = collectionsPagesCache[id] && collectionsPagesCache[id][$scope.data.currentPage - 1] && collectionsPagesCache[id][$scope.data.currentPage - 1][0].length;
 
@@ -30,17 +31,17 @@ angular.module('anchrClientApp')
             if (isNonFiltered && hasCache) {
                 var cacheEntry = collectionsPagesCache[id][$scope.data.currentPage - 1];
                 $scope.data.numPages = cacheEntry[1];
-                collections[findCollection(collections, id)].links = angular.copy(cacheEntry[0]);
+                collection.links = angular.copy(cacheEntry[0]);
+                collection.size = cacheEntry[2];
                 setActive()
             } else {
                 Collection.links.query({ collId: id, page: $scope.data.currentPage, pageSize: 25, q: $scope.data.search || undefined }, function (result, headers) {
                     $scope.data.numPages = parseNumPages(headers('link'));
-                    var c = collections[findCollection(collections, id)]
-                    c.links = result;
-                    c.size = parseNumItems(headers('link'));
+                    collection.links = result;
+                    collection.size = parseNumItems(headers('link'));
                     if (isNonFiltered) {
                         if (!collectionsPagesCache[id]) collectionsPagesCache[id] = [];
-                        collectionsPagesCache[id][$scope.data.currentPage - 1] = [angular.copy(result), $scope.data.numPages];
+                        collectionsPagesCache[id][$scope.data.currentPage - 1] = [angular.copy(result), $scope.data.numPages, collection.size];
                     }
                     setActive();
                 }, function (err) {
@@ -244,7 +245,7 @@ angular.module('anchrClientApp')
 
         function parseNumItems(linkHeader) {
             var match = /[\?&]pageSize=(\d+)&page=\d+>; rel="all"/gi.exec(linkHeader)
-            if (match.length !== 2) return 1
-            return parseInt(match[1]) || 1
+            if (match.length !== 2) return 0
+            return parseInt(match[1]) || 0
         }
     }]);

yarn.lock

@@ -208,12 +208,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mongodb-js/saslprep@npm:^1.1.9":
-  version: 1.1.9
-  resolution: "@mongodb-js/saslprep@npm:1.1.9"
+"@mongodb-js/saslprep@npm:^1.3.0":
+  version: 1.3.2
+  resolution: "@mongodb-js/saslprep@npm:1.3.2"
   dependencies:
     sparse-bitfield: "npm:^3.0.3"
-  checksum: 10/6a0d5e9068635fff59815de387d71be0e3b9d683f1d299876b2760ac18bbf0a1d4b26eff6b1ab89ff8802c20ffb15c047ba675b2cc306a51077a013286c2694a
+  checksum: 10/c26e35ed9927e4e2fe33c19bdb410de7f7da3057040291e85a33846bc5c907c6a132cf438f8589b522f374ed5184459f8de1278ad5443941d08d75d70e5fe33f
   languageName: node
   linkType: hard
 
@@ -455,10 +455,10 @@ __metadata:
     memory-cache: "npm:^0.2.0"
     method-override: "npm:^3.0.0"
     mime-types: "npm:^3.0.1"
-    mongoose: "npm:^8.18.1"
+    mongoose: "npm:^8.19.3"
     morgan: "npm:^1.10.1"
     node-cron: "npm:^4.2.1"
-    nodemailer: "npm:^7.0.6"
+    nodemailer: "npm:^7.0.10"
     passport: "npm:^0.7.0"
     passport-facebook: "npm:^3.0.0"
     passport-google-oauth: "npm:^2.0.0"
@@ -4615,30 +4615,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mongodb-connection-string-url@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mongodb-connection-string-url@npm:3.0.0"
+"mongodb-connection-string-url@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "mongodb-connection-string-url@npm:3.0.2"
   dependencies:
     "@types/whatwg-url": "npm:^11.0.2"
-    whatwg-url: "npm:^13.0.0"
-  checksum: 10/85a8b51c0c2814bdf3a13709e8c2bacbaefae73f9c38fb20709cb64138948682c17d12eb88168085519535dbb6faede6125eb8061aa1d74e95a0d8883241938d
+    whatwg-url: "npm:^14.1.0 || ^13.0.0"
+  checksum: 10/99ac939a67cc963b90cfe70a8e45250a8386c531be7d22ffa5d1f3e5dd2406b149fb823b91ac161e4a4a29dfac754b49bca8f6dd786cfc66ae0ca80db5f5f23d
   languageName: node
   linkType: hard
 
-"mongodb@npm:~6.18.0":
-  version: 6.18.0
-  resolution: "mongodb@npm:6.18.0"
+"mongodb@npm:~6.20.0":
+  version: 6.20.0
+  resolution: "mongodb@npm:6.20.0"
   dependencies:
-    "@mongodb-js/saslprep": "npm:^1.1.9"
+    "@mongodb-js/saslprep": "npm:^1.3.0"
     bson: "npm:^6.10.4"
-    mongodb-connection-string-url: "npm:^3.0.0"
+    mongodb-connection-string-url: "npm:^3.0.2"
   peerDependencies:
     "@aws-sdk/credential-providers": ^3.188.0
     "@mongodb-js/zstd": ^1.1.0 || ^2.0.0
     gcp-metadata: ^5.2.0
     kerberos: ^2.0.1
     mongodb-client-encryption: ">=6.0.0 <7"
-    snappy: ^7.2.2
+    snappy: ^7.3.2
     socks: ^2.7.1
   peerDependenciesMeta:
     "@aws-sdk/credential-providers":
@@ -4655,22 +4655,22 @@ __metadata:
       optional: true
     socks:
       optional: true
-  checksum: 10/559bfe87bb9a4945d81380c31cc89730c4a4c806a2e6ed06086dcacabd1caee32f711427abf93627b649f189e9464b67318ba65baccc07670bb30bac74dab933
+  checksum: 10/2718cdd4433bc3847f01a2ffae3a7e7ea8499035be4fccaf76278cbe3f915f2dd6c53135be0e3cc2cdd8e27a0b957da49e337d9b96b53e6287ec8971cea96b4b
   languageName: node
   linkType: hard
 
-"mongoose@npm:^8.18.1":
-  version: 8.18.1
-  resolution: "mongoose@npm:8.18.1"
+"mongoose@npm:^8.19.3":
+  version: 8.19.3
+  resolution: "mongoose@npm:8.19.3"
   dependencies:
     bson: "npm:^6.10.4"
     kareem: "npm:2.6.3"
-    mongodb: "npm:~6.18.0"
+    mongodb: "npm:~6.20.0"
     mpath: "npm:0.9.0"
     mquery: "npm:5.0.0"
     ms: "npm:2.1.3"
     sift: "npm:17.1.3"
-  checksum: 10/86a8240dab09cd2c873dd39cc7ef3a2c55bf956a3b1cded4dc6d0686461b108546a977193ae640c01c9da3658f6dacaa1c235f51998f4357182715cb82198e10
+  checksum: 10/cfdb3c99b40681267420db873e065f0a7b360cbf8f14cdc53c965d8d49c1e84e3e1e8149bdfbee345fa4dec9368aae880db32276d5f61bef92332b75b41581ec
   languageName: node
   linkType: hard
 
@@ -4884,10 +4884,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nodemailer@npm:^7.0.6":
-  version: 7.0.6
-  resolution: "nodemailer@npm:7.0.6"
-  checksum: 10/c61563fcc8ea25fa5eec8ec3107ec9d212abc54c29cc9f23fe6cd65f355f712daae4832358a776cad63f5f909c96ab42ce0b61d8a28887e18635025747c6a5d7
+"nodemailer@npm:^7.0.10":
+  version: 7.0.10
+  resolution: "nodemailer@npm:7.0.10"
+  checksum: 10/b9b8794ffc6c0d84440a9dd422664908e9c2003a15cb0e6bdd240a3625121de3978323c2ba4af78080fd735ef514d6caed376bd5f5dd6c17cf0d2c399d0dc354
   languageName: node
   linkType: hard
 
@@ -5702,7 +5702,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.3.0":
+"punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
   checksum: 10/febdc4362bead22f9e2608ff0171713230b57aff9dddc1c273aa2a651fbd366f94b7d6a71d78342a7c0819906750351ca7f2edd26ea41b626d87d6a13d1bd059
@@ -6861,12 +6861,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "tr46@npm:4.1.1"
+"tr46@npm:^5.1.0":
+  version: 5.1.1
+  resolution: "tr46@npm:5.1.1"
   dependencies:
-    punycode: "npm:^2.3.0"
-  checksum: 10/ca811409c46de84618e4e7f90469184b50d16618b2f027a5ebeccb0d83ee7f51eca229e71f5b15cdec008ca247ad2ccabfdd3daf861604fcc7e341d0c35c30ca
+    punycode: "npm:^2.3.1"
+  checksum: 10/833a0e1044574da5790148fd17866d4ddaea89e022de50279967bcd6b28b4ce0d30d59eb3acf9702b60918975b3bad481400337e3a2e6326cffa5c77b874753d
   languageName: node
   linkType: hard
 
@@ -7229,13 +7229,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "whatwg-url@npm:13.0.0"
+"whatwg-url@npm:^14.1.0 || ^13.0.0":
+  version: 14.2.0
+  resolution: "whatwg-url@npm:14.2.0"
   dependencies:
-    tr46: "npm:^4.1.1"
+    tr46: "npm:^5.1.0"
     webidl-conversions: "npm:^7.0.0"
-  checksum: 10/1675f5b786bbc2809de8bde5e0c99790cd50c36227942c851b1c2445cc1860a26fd15a4d6eca2cd996882bfde93b66fbc88864cd9b84f2c725427afd81e0f024
+  checksum: 10/f0a95b0601c64f417c471536a2d828b4c16fe37c13662483a32f02f183ed0f441616609b0663fb791e524e8cd56d9a86dd7366b1fc5356048ccb09b576495e7c
   languageName: node
   linkType: hard