diff --git a/CHANGELOG.md b/CHANGELOG.md index f73a5ed..1501e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # MMM-GooglePhotos Change Log +**`[2.1.6] - 2024/03/16`** +- Fixed: [#187](https://github.com/hermanho/MMM-GooglePhotos/issues/187) fix pageSize parameter +- Fixed: update follow-redirects to 1.15.6 [CVE-2024-28849](https://github.com/advisories/GHSA-cxjh-pqwp-8mfp) + **`[2.1.5] - 2024/03/08`** -- Added: Allow regular expression ([RE2 engine](https://github.com/google/re2)) in album names ([#179](https://github.com/hermanho/MMM-GooglePhotos/issues/179)) +- Added: Allow regular expression ([RE2 engine](https://github.com/google/re2)) in album names [#179](https://github.com/hermanho/MMM-GooglePhotos/issues/179) **`[2.1.4] - 2024/01/28`** - Changed: Update README.md and INSTALL.md @@ -15,7 +19,7 @@ - Changed: Use native async await instead of promise syntax. - Changed: Photo index will be included in logging and fine tune the logging data and messages. - Removed: remove generate_token.js (v1) -- Fixed: #170 fix photo showing when GPHOTO_PREVIOUS is triggered +- Fixed: [#170](https://github.com/hermanho/MMM-GooglePhotos/issues/170) fix photo showing when GPHOTO_PREVIOUS is triggered **`[2.1.1] - 2023/07/17`** diff --git a/GPhotos.js b/GPhotos.js index e9843d7..8d71858 100644 --- a/GPhotos.js +++ b/GPhotos.js @@ -238,7 +238,7 @@ class GPhotos { * @param {string} pageToken * @returns {Promise} MediaItem */ - const getImage = async (pageSize = 100, pageToken = "") => { + const getImage = async (pageSize = 50, pageToken = "") => { // this.log("Indexing photos now. total: ", list.length); try { let data = { @@ -263,7 +263,7 @@ class GPhotos { } else { if (response.data.nextPageToken) { await sleep(500); - return getImage(50, response.data.nextPageToken); + return getImage(pageSize, response.data.nextPageToken); } else { return list; // all found but lesser than maxNum } diff --git a/package-lock.json b/package-lock.json index 617fd4c..8171f60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mmm-googlephotos", - "version": "2.1.5", + "version": "2.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mmm-googlephotos", - "version": "2.1.5", + "version": "2.1.6", "license": "MIT", "dependencies": { "@google-cloud/local-auth": "^2.1.1", @@ -517,11 +517,11 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", - "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", "dependencies": { - "follow-redirects": "^1.15.4", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -1080,9 +1080,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", diff --git a/package.json b/package.json index ef83b2c..f442ec8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mmm-googlephotos", - "version": "2.1.5", + "version": "2.1.6", "description": "MagicMirror² module to display your photos from Google Photos", "license": "MIT", "author": "eouia0819@gmail.com", @@ -36,5 +36,8 @@ }, "engines": { "node": ">=18" + }, + "resolutions": { + "follow-redirects": "^1.15.6" } -} +} \ No newline at end of file