Update dependency p-retry to v7 (#5008)

* Update dependency p-retry to v7

* Iterate

Signed-off-by: Michael Telatynski <[email protected]>

* Make jest happier

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>

Author: renovate[bot]

jest.config.ts

@@ -23,6 +23,7 @@ const config: Config = {
     collectCoverageFrom: ["<rootDir>/src/**/*.{js,ts}"],
     coverageReporters: ["text-summary", "lcov"],
     testResultsProcessor: "@casualbot/jest-sonar-reporter",
+    transformIgnorePatterns: ["/node_modules/(?!(p-retry|is-network-error)).+$"],
 
     // Always print out a summary if there are any failing tests. Normally
     // a summary is only printed if there are more than 20 test *suites*.

package.json

@@ -58,7 +58,7 @@
         "matrix-events-sdk": "0.0.1",
         "matrix-widget-api": "^1.10.0",
         "oidc-client-ts": "^3.0.1",
-        "p-retry": "4",
+        "p-retry": "7",
         "sdp-transform": "^2.14.1",
         "unhomoglyph": "^1.0.6",
         "uuid": "11"

src/models/MSC3089TreeSpace.ts

@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import promiseRetry from "p-retry";
-
 import { type MatrixClient } from "../client.ts";
 import { EventType, MsgType, UNSTABLE_MSC3089_BRANCH, UNSTABLE_MSC3089_LEAF } from "../@types/event.ts";
 import { type Room } from "./room.ts";
@@ -31,7 +29,7 @@ import {
 } from "../utils.ts";
 import { MSC3089Branch } from "./MSC3089Branch.ts";
 import { type ISendEventResponse } from "../@types/requests.ts";
-import { type FileType } from "../http-api/index.ts";
+import { type FileType, MatrixError } from "../http-api/index.ts";
 import { KnownMembership } from "../@types/membership.ts";
 import { type RoomPowerLevelsEventContent, type SpaceChildEventContent } from "../@types/state_events.ts";
 import type { EncryptedFile, FileContent } from "../@types/media.ts";
@@ -146,16 +144,17 @@ export class MSC3089TreeSpace {
         await Promise.all(promises);
     }
 
-    private retryInvite(userId: string): Promise<void> {
-        return simpleRetryOperation(async () => {
-            await this.client.invite(this.roomId, userId).catch((e) => {
+    private async retryInvite(userId: string): Promise<void> {
+        await simpleRetryOperation(
+            () => this.client.invite(this.roomId, userId),
+            (e) => {
                 // We don't want to retry permission errors forever...
-                if (e?.errcode === "M_FORBIDDEN") {
-                    throw new promiseRetry.AbortError(e);
+                if (e instanceof MatrixError && e.errcode === "M_FORBIDDEN") {
+                    return false;
                 }
-                throw e;
-            });
-        });
+                return true;
+            },
+        );
     }
 
     /**

src/utils.ts

@@ -465,15 +465,21 @@ export async function chunkPromises<T>(fns: (() => Promise<T>)[], chunkSize: num
  * should always return a new promise.
  * @param promiseFn - The function to call to get a fresh promise instance. Takes an
  * attempt count as an argument, for logging/debugging purposes.
+ * @param shouldRetry - Optional function which is called with the error the latest rejection from promiseFn,
+ * retrying will ba aborted if this return false.
  * @returns The promise for the retried operation.
  */
-export function simpleRetryOperation<T>(promiseFn: (attempt: number) => Promise<T>): Promise<T> {
+export function simpleRetryOperation<T>(
+    promiseFn: (attempt: number) => Promise<T>,
+    shouldRetry?: (e: unknown) => boolean,
+): Promise<T> {
     return promiseRetry(
         (attempt: number) => {
             return promiseFn(attempt);
         },
         {
-            forever: true,
+            retries: Infinity,
+            shouldRetry: shouldRetry ? ({ error }): boolean => shouldRetry(error) : undefined,
             factor: 2,
             minTimeout: 3000, // ms
             maxTimeout: 15000, // ms

yarn.lock

@@ -2210,11 +2210,6 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
   integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
-"@types/[email protected]":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
-  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
-
 "@types/sdp-transform@^2.4.5":
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/@types/sdp-transform/-/sdp-transform-2.15.0.tgz#f59a33ec631374794c2affc4c63ef60613285983"
@@ -4572,6 +4567,11 @@ is-negative-zero@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
   integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
+is-network-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997"
+  integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==
+
 is-number-object@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
@@ -5790,13 +5790,12 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-retry@4:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
-  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
+p-retry@7:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-7.0.0.tgz#38dbee20149d94680fe0a022405839d995f95e7b"
+  integrity sha512-3BgO9rjULJYyr0Y0pcsG7FZ+7JB/hfOODO8kx9ppumiO5jprUF92WK/Y7Q0xppZtq4VhTcPiVq7qWLQfIV5aKQ==
   dependencies:
-    "@types/retry" "0.12.0"
-    retry "^0.13.1"
+    is-network-error "^1.1.0"
 
 p-try@^2.0.0:
   version "2.2.0"
@@ -6185,11 +6184,6 @@ restore-cursor@^5.0.0:
     onetime "^7.0.0"
     signal-exit "^4.1.0"
 
-retry@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
 reusify@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"