diff --git a/package-lock.json b/package-lock.json index b7de0296c..c7515867a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "ipaddr.js": "^2.0.1", "js-yaml": "^4.1.0", "jsonwebtoken": "^9.0.0", - "ms": "2.1.3", + "ms-tiny": "^1.1.0", "node-fetch": "2.6.7", "open": "8.4.0", "opentracing": "^0.14.7", @@ -71,7 +71,6 @@ "@types/jest": "29.2.2", "@types/js-yaml": "4.0.5", "@types/jsonwebtoken": "8.5.9", - "@types/ms": "0.7.31", "@types/node-fetch": "2.6.2", "@types/parse-gitignore": "1.0.0", "@types/redis": "4.0.10", @@ -89,7 +88,7 @@ "websocket": "1.0.34" }, "engines": { - "node": "14 || 15 || 16 || 17 || 18 || 19" + "node": "14 || 15 || 16 || 17 || 18 || 19 || 20" } }, "node_modules/@ampproject/remapping": { @@ -1904,12 +1903,6 @@ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", "dev": true }, - "node_modules/@types/ms": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz", - "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==", - "dev": true - }, "node_modules/@types/node": { "version": "14.6.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz", @@ -5502,6 +5495,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "node_modules/ms-tiny": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ms-tiny/-/ms-tiny-1.1.0.tgz", + "integrity": "sha512-ddz+lWOBVAjZ2XJ5GDxHeRuzmGNFH39+/BoDLCIkPHvoYNqAUee0qGW5Tx7NUql/pfA451SwTXG52mMNHqKIag==", + "license": "MIT" + }, "node_modules/mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -9016,12 +9015,6 @@ "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", "dev": true }, - "@types/ms": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz", - "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==", - "dev": true - }, "@types/node": { "version": "14.6.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz", @@ -11797,6 +11790,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "ms-tiny": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ms-tiny/-/ms-tiny-1.1.0.tgz", + "integrity": "sha512-ddz+lWOBVAjZ2XJ5GDxHeRuzmGNFH39+/BoDLCIkPHvoYNqAUee0qGW5Tx7NUql/pfA451SwTXG52mMNHqKIag==" + }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", diff --git a/package.json b/package.json index 1a640ab00..c1f900da2 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "@types/jest": "29.2.2", "@types/js-yaml": "4.0.5", "@types/jsonwebtoken": "8.5.9", - "@types/ms": "0.7.31", "@types/node-fetch": "2.6.2", "@types/parse-gitignore": "1.0.0", "@types/redis": "4.0.10", @@ -100,7 +99,7 @@ "ipaddr.js": "^2.0.1", "js-yaml": "^4.1.0", "jsonwebtoken": "^9.0.0", - "ms": "2.1.3", + "ms-tiny": "^1.1.0", "node-fetch": "2.6.7", "open": "8.4.0", "opentracing": "^0.14.7", diff --git a/src/client/index.ts b/src/client/index.ts index cc964b621..cf342ee39 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -4,7 +4,7 @@ import * as z from "zod"; import type { IsExact, AssertTrue } from "conditional-type-checks"; import Encryptor from "secure-e2ee"; import { symmetric, asymmetric } from "secure-webhooks"; -import ms from "ms"; +import ms from "ms-tiny"; import fetch from "cross-fetch"; import fetchRetry from "@vercel/fetch-retry"; import type { IncomingHttpHeaders } from "http"; @@ -225,7 +225,11 @@ function parseDuration(value: number | string | undefined): number | undefined { } if (typeof value === "string") { - return ms(value); + try { + return ms(value); + } catch { + return undefined; + } } return value;