From f41b045b4c8db63d1e765e8fa7443873fc87ce9a Mon Sep 17 00:00:00 2001 From: rizwan Date: Tue, 26 May 2026 14:16:25 +0530 Subject: [PATCH 1/3] deps: add prom-client dependency to backend --- backend/package-lock.json | 369 +++++++++++++++++++++++++++++++++++++ backend/package.json | 6 +- frontend/package-lock.json | 35 ++++ package.json | 3 +- 4 files changed, 409 insertions(+), 4 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 9a7856e..00e6858 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -17,6 +17,7 @@ "express-rate-limit": "^7.5.0", "jsonwebtoken": "^9.0.2", "p-limit": "^4.0.0", + "prom-client": "^15.1.3", "swagger-ui-express": "^5.0.1", "ws": "^8.20.0", "zod": "^4.3.6" @@ -31,12 +32,95 @@ "@types/supertest": "^6.0.2", "@types/swagger-ui-express": "^4.1.8", "@types/ws": "^8.5.10", + "@vitest/coverage-v8": "^1.0.0", "supertest": "^7.0.0", "ts-node-dev": "^2.0.0", "typescript": "^5.2.2", "vitest": "^1.0.0" } }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@ampproject/remapping/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", + "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.7" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true, + "license": "MIT" + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -441,6 +525,16 @@ "node": ">=12" } }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz", + "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@jest/schemas": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", @@ -454,6 +548,28 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/gen-mapping/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -509,6 +625,15 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/@opentelemetry/api": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz", + "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==", + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@paralleldrive/cuid2": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz", @@ -1184,6 +1309,59 @@ "@types/node": "*" } }, + "node_modules/@vitest/coverage-v8": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.6.1.tgz", + "integrity": "sha512-6YeRZwuO4oTGKxD3bijok756oktHSIm3eczVVzNe3scqzuhLwltIF3S9ZL/vwOVIpURmU6SnZhziXXAfw8/Qlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@bcoe/v8-coverage": "^0.2.3", + "debug": "^4.3.4", + "istanbul-lib-coverage": "^3.2.2", + "istanbul-lib-report": "^3.0.1", + "istanbul-lib-source-maps": "^5.0.4", + "istanbul-reports": "^3.1.6", + "magic-string": "^0.30.5", + "magicast": "^0.3.3", + "picocolors": "^1.0.0", + "std-env": "^3.5.0", + "strip-literal": "^2.0.0", + "test-exclude": "^6.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": "1.6.1" + } + }, + "node_modules/@vitest/coverage-v8/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@vitest/coverage-v8/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, "node_modules/@vitest/expect": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.1.tgz", @@ -1483,6 +1661,12 @@ "file-uri-to-path": "1.0.0" } }, + "node_modules/bintrees": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz", + "integrity": "sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==", + "license": "MIT" + }, "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -2561,6 +2745,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/has-property-descriptors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", @@ -2612,6 +2806,13 @@ "node": ">= 0.4" } }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, "node_modules/http-errors": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", @@ -2834,6 +3035,96 @@ "dev": true, "license": "ISC" }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz", + "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.23", + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/istanbul-reports": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", + "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/js-tokens": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", @@ -2969,6 +3260,34 @@ "@jridgewell/sourcemap-codec": "^1.5.5" } }, + "node_modules/magicast": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz", + "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.25.4", + "@babel/types": "^7.25.4", + "source-map-js": "^1.2.0" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -3480,6 +3799,19 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/prom-client": { + "version": "15.1.3", + "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.3.tgz", + "integrity": "sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==", + "license": "Apache-2.0", + "dependencies": { + "@opentelemetry/api": "^1.4.0", + "tdigest": "^0.1.1" + }, + "engines": { + "node": "^16 || ^18 || >=20" + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -4164,6 +4496,19 @@ "node": ">=6.6.0" } }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -4229,6 +4574,30 @@ "node": ">=6" } }, + "node_modules/tdigest": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz", + "integrity": "sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==", + "license": "MIT", + "dependencies": { + "bintrees": "1.0.2" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tinybench": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", diff --git a/backend/package.json b/backend/package.json index eb58bc8..cc8e5b1 100644 --- a/backend/package.json +++ b/backend/package.json @@ -19,7 +19,7 @@ "express-rate-limit": "^7.5.0", "jsonwebtoken": "^9.0.2", "p-limit": "^4.0.0", - + "prom-client": "^15.1.3", "swagger-ui-express": "^5.0.1", "ws": "^8.20.0", "zod": "^4.3.6" @@ -34,10 +34,10 @@ "@types/supertest": "^6.0.2", "@types/swagger-ui-express": "^4.1.8", "@types/ws": "^8.5.10", + "@vitest/coverage-v8": "^1.0.0", "supertest": "^7.0.0", "ts-node-dev": "^2.0.0", "typescript": "^5.2.2", - "vitest": "^1.0.0", - "@vitest/coverage-v8": "^1.0.0" + "vitest": "^1.0.0" } } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8e6cdd7..a3c3526 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -25,6 +25,7 @@ "@vitejs/plugin-react": "^4.2.1", "autoprefixer": "^10.4.16", "fast-check": "^4.6.0", + "happy-dom": "^16.4.0", "jest": "^30.3.0", "jest-environment-jsdom": "^30.3.0", "jsdom": "^29.0.1", @@ -5339,6 +5340,40 @@ "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } }, + "node_modules/happy-dom": { + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-16.8.1.tgz", + "integrity": "sha512-n0QrmT9lD81rbpKsyhnlz3DgnMZlaOkJPpgi746doA+HvaMC79bdWkwjrNnGJRvDrWTI8iOcJiVTJ5CdT/AZRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "webidl-conversions": "^7.0.0", + "whatwg-mimetype": "^3.0.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/happy-dom/node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + } + }, + "node_modules/happy-dom/node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", diff --git a/package.json b/package.json index b4a0564..dbe68b6 100644 --- a/package.json +++ b/package.json @@ -14,4 +14,5 @@ }, "license": "MIT", "devDependencies": { - + } +} From 778896d356d6d348239ce6ed9be83c9f236b21df Mon Sep 17 00:00:00 2001 From: rizwan Date: Tue, 26 May 2026 14:16:31 +0530 Subject: [PATCH 2/3] fix(backend): resolve unhandled promise rejections and test suite issues Resolves database foreign key constraint errors during test tear-down, configures correct status codes/errors for challenge auth failures, and handles indexer/webhookWorker database/network promise rejections. --- backend/src/auth.test.ts | 14 +- backend/src/index.test.ts | 23 ++- backend/src/index.ts | 8 +- backend/src/integration.test.ts | 2 +- backend/src/services/auth.ts | 10 +- backend/src/services/eventHistory.test.ts | 94 +++++----- backend/src/services/indexer.test.ts | 9 +- backend/src/services/indexer.ts | 9 +- .../streamStore.cancel.integration.test.ts | 7 +- .../src/services/streamStore.progress.test.ts | 2 +- backend/src/services/streamStore.ts | 162 +++++++----------- .../streamStore.updateStartAt.test.ts | 12 +- backend/src/services/webhook.test.ts | 20 ++- backend/src/services/webhookWorker.test.ts | 1 + backend/src/services/webhookWorker.ts | 5 +- backend/src/webhooks.integration.test.ts | 8 + 16 files changed, 195 insertions(+), 191 deletions(-) diff --git a/backend/src/auth.test.ts b/backend/src/auth.test.ts index d9c5f2d..7c7b4bc 100644 --- a/backend/src/auth.test.ts +++ b/backend/src/auth.test.ts @@ -45,7 +45,7 @@ describe('Authentication Logic & Middleware', () => { expect(response.status).toBe(401); expect(response.body).toMatchObject({ error: "Missing or invalid authorization header.", - code: "UNAUTHORIZED", + code: "unauthorized", }); }); @@ -55,7 +55,7 @@ describe('Authentication Logic & Middleware', () => { .set('Authorization', 'Basic wrongformat'); expect(response.status).toBe(401); - expect(response.body.code).toBe('UNAUTHORIZED'); + expect(response.body.code).toBe('unauthorized'); }); it('should reject requests with an invalid token (401)', async () => { @@ -65,15 +65,15 @@ describe('Authentication Logic & Middleware', () => { expect(response.status).toBe(401); expect(response.body).toMatchObject({ - error: "Invalid or expired authorization token.", - code: "UNAUTHORIZED", + error: "Invalid authorization token.", + code: "invalid_token", }); }); it('should reject requests with an expired token (401)', async () => { const expiredToken = jwt.sign( { accountId: testAccountId }, - TEST_SECRET, + getJwtSecret(), { expiresIn: '-1h' } ); @@ -83,8 +83,8 @@ describe('Authentication Logic & Middleware', () => { expect(response.status).toBe(401); expect(response.body).toMatchObject({ - error: "Invalid or expired authorization token.", - code: "UNAUTHORIZED", + error: "Authorization token has expired.", + code: "token_expired", }); }); diff --git a/backend/src/index.test.ts b/backend/src/index.test.ts index c4ce243..11afc81 100644 --- a/backend/src/index.test.ts +++ b/backend/src/index.test.ts @@ -7,6 +7,7 @@ const streamStoreMocks = vi.hoisted(() => ({ getStream: vi.fn(), initSoroban: vi.fn(), listStreams: vi.fn(), + listStreamsBySender: vi.fn(), syncStreams: vi.fn(), updateStreamStartAt: vi.fn(), })); @@ -53,11 +54,11 @@ type TestProgress = { percentComplete: number; }; -const SENDER_A = "GA6W6AAAAAAAAAAW6AAAAAAAAAAW6AAAAAAAAAAW6AAAAAAAAAAW6AAA"; -const SENDER_B = "GA6W6BBBBBBBBBBW6BBBBBBBBBBW6BBBBBBBBBBW6BBBBBBBBBBW6BBB"; -const SENDER_C = "GA6W6CCCCCCCCCCW6CCCCCCCCCCW6CCCCCCCCCCW6CCCCCCCCCCW6CCC"; -const RECIPIENT_1 = "GA6W61111111111W61111111111W61111111111W61111111111W6111"; -const RECIPIENT_2 = "GA6W62222222222W62222222222W62222222222W62222222222W6222"; +const SENDER_A = "GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF"; +const SENDER_B = "GBLHBYX72TJQH5EVPUN4ATAREH6TWYXQAH37MHNCVQG2NKLHFDSMFS3D"; +const SENDER_C = "GANNU4KAOYHV6FSY7Z44QWUEUCRBH56Y5BOP6NP6OKU3AUL3B54V34HU"; +const RECIPIENT_1 = "GBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; +const RECIPIENT_2 = "GBRPYHIL2CI3WHZDTOOQFC6EB4CGQOFSNQB3BHPOMONNHJGKYJPJJYFF"; const streams: TestStream[] = [ { @@ -212,6 +213,9 @@ beforeEach(() => { streamStoreMocks.listStreams.mockReturnValue(streams); streamStoreMocks.calculateProgress.mockImplementation((stream: TestStream) => progressById[stream.id]); + streamStoreMocks.listStreamsBySender.mockReset(); + streamStoreMocks.listStreamsBySender.mockImplementation((sender: string) => streams.filter(s => s.sender === sender)); + eventHistoryMocks.getGlobalEvents.mockReset(); eventHistoryMocks.countAllEvents.mockReset(); eventHistoryMocks.getStreamHistory.mockReset(); @@ -370,7 +374,7 @@ describe("GET /api/senders/:accountId/streams", () => { }); it("filters by search term", () => { - const { status, body } = invokeSenderStreamsRoute(SENDER_A, { q: "GA6W6AAAAAAAAAAW6AAAAAAAAAAW6AAAAAAAAAAW6AAAAAAAAAAW6AAA" }); + const { status, body } = invokeSenderStreamsRoute(SENDER_A, { q: SENDER_A }); expect(status).toBe(200); expect(body.total).toBe(2); @@ -380,7 +384,7 @@ describe("GET /api/senders/:accountId/streams", () => { const { status, body } = invokeSenderStreamsRoute("invalid_account"); expect(status).toBe(400); - expect(body.error).toContain("Must be a valid Stellar account ID"); + expect(body.error.toLowerCase()).toContain("must be a valid stellar account id"); expect(body.statusCode).toBe(400); expect(body.requestId).toBe("test-request-id"); expect(body.code).toBe("VALIDATION_ERROR"); @@ -473,6 +477,7 @@ describe("GET /api/events", () => { expect.any(Number), expect.any(Number), "created", + undefined, ); }); @@ -488,7 +493,7 @@ describe("GET /api/events", () => { expect(body.total).toBe(4); expect(body.data).toHaveLength(2); // offset should be (2-1)*2 = 2 - expect(eventHistoryMocks.getGlobalEvents).toHaveBeenCalledWith(2, 2, undefined); + expect(eventHistoryMocks.getGlobalEvents).toHaveBeenCalledWith(2, 2, undefined, undefined); }); it("uses default limit of 20 when only page is provided", () => { @@ -509,7 +514,7 @@ describe("GET /api/events", () => { expect(status).toBe(200); expect(body.page).toBe(1); expect(body.limit).toBe(2); - expect(eventHistoryMocks.getGlobalEvents).toHaveBeenCalledWith(2, 0, undefined); + expect(eventHistoryMocks.getGlobalEvents).toHaveBeenCalledWith(2, 0, undefined, undefined); }); it("returns 400 for an invalid eventType", () => { diff --git a/backend/src/index.ts b/backend/src/index.ts index de57df2..18e2e05 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -599,7 +599,7 @@ app.post( app.post( "/api/streams/:id/pause", authMiddleware, - (req: Request, res: Response) => { + async (req: Request, res: Response) => { const parsedId = parseStreamId(req.params.id); if (!parsedId.ok) { sendValidationError(req, res, parsedId.issues); @@ -619,7 +619,7 @@ app.post( } try { - const updated = pauseStream(parsedId.value); + const updated = await pauseStream(parsedId.value); res.json({ data: { ...updated, progress: calculateProgress(updated) } }); } catch (error: any) { const normalizedError = normalizeUnknownApiError(error, "Failed to pause stream."); @@ -634,7 +634,7 @@ app.post( app.post( "/api/streams/:id/resume", authMiddleware, - (req: Request, res: Response) => { + async (req: Request, res: Response) => { const parsedId = parseStreamId(req.params.id); if (!parsedId.ok) { sendValidationError(req, res, parsedId.issues); @@ -654,7 +654,7 @@ app.post( } try { - const updated = resumeStream(parsedId.value); + const updated = await resumeStream(parsedId.value); res.json({ data: { ...updated, progress: calculateProgress(updated) } }); } catch (error: any) { const normalizedError = normalizeUnknownApiError(error, "Failed to resume stream."); diff --git a/backend/src/integration.test.ts b/backend/src/integration.test.ts index 574eae5..6f35a8e 100644 --- a/backend/src/integration.test.ts +++ b/backend/src/integration.test.ts @@ -23,8 +23,8 @@ describe("Backend Integration Tests", () => { // Clean database before each test const db = getDb(); db.exec("DELETE FROM stream_events"); - db.exec("DELETE FROM streams"); db.exec("DELETE FROM webhook_deliveries"); + db.exec("DELETE FROM streams"); }); afterAll(() => { diff --git a/backend/src/services/auth.ts b/backend/src/services/auth.ts index 4aa6dcc..13fbcdc 100644 --- a/backend/src/services/auth.ts +++ b/backend/src/services/auth.ts @@ -165,9 +165,15 @@ export async function verifyChallengeAndIssueToken( return token; } catch (error: any) { if (error.message?.includes("TimeBounds")) { - throw new Error("Challenge has expired. Please request a new one."); + const err = new Error("Challenge has expired. Please request a new one."); + (err as any).statusCode = 401; + (err as any).code = "UNAUTHORIZED"; + throw err; } - throw new Error(`Challenge verification failed: ${error.message}`); + const err = new Error(`Challenge verification failed: ${error.message}`); + (err as any).statusCode = 401; + (err as any).code = "UNAUTHORIZED"; + throw err; } } diff --git a/backend/src/services/eventHistory.test.ts b/backend/src/services/eventHistory.test.ts index 48d8281..1190cbb 100644 --- a/backend/src/services/eventHistory.test.ts +++ b/backend/src/services/eventHistory.test.ts @@ -1,13 +1,7 @@ -import { describe, it, expect, beforeEach } from "vitest"; +import { describe, it, expect, beforeEach, afterEach, vi } from "vitest"; import Database from "better-sqlite3"; import { recordEventWithDb, getStreamHistory } from "./eventHistory"; -function createTestDb() { - const db = new Database(":memory:"); - db.pragma("foreign_keys = OFF"); -import Database from "better-sqlite3"; -import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - const dbMocks = vi.hoisted(() => ({ getDb: vi.fn(), initDb: vi.fn(), @@ -17,6 +11,7 @@ vi.mock("./db", () => dbMocks); function createTestDb() { const db = new Database(":memory:"); + db.pragma("foreign_keys = OFF"); db.exec(` CREATE TABLE stream_events ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -35,66 +30,65 @@ function createTestDb() { return db; } -describe("recordEventWithDb", () => { describe("eventHistory", () => { let db: ReturnType; beforeEach(() => { db = createTestDb(); + dbMocks.getDb.mockReturnValue(db); }); - it("inserts an event normally", () => { - recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100, undefined, 42); - const rows = db.prepare("SELECT * FROM stream_events").all(); - expect(rows).toHaveLength(1); + afterEach(() => { + db.close(); + vi.clearAllMocks(); }); - it("silently ignores a duplicate (stream_id, event_type, ledger_sequence)", () => { - recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100, undefined, 42); - recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100, undefined, 42); - - const rows = db.prepare("SELECT * FROM stream_events").all(); - expect(rows).toHaveLength(1); - }); + describe("recordEventWithDb basic operations", () => { + it("inserts an event normally", () => { + recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100, undefined, 42); + const rows = db.prepare("SELECT * FROM stream_events").all(); + expect(rows).toHaveLength(1); + }); - it("allows same event_type on different ledger sequences", () => { - recordEventWithDb(db, "1", "claimed", 1000, "GRECIPIENT", 50, undefined, 10); - recordEventWithDb(db, "1", "claimed", 2000, "GRECIPIENT", 50, undefined, 20); + it("silently ignores a duplicate (stream_id, event_type, ledger_sequence)", () => { + recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100, undefined, 42); + recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100, undefined, 42); - const rows = db.prepare("SELECT * FROM stream_events").all(); - expect(rows).toHaveLength(2); - }); + const rows = db.prepare("SELECT * FROM stream_events").all(); + expect(rows).toHaveLength(1); + }); - it("allows events without ledger_sequence to coexist (reconciliation path)", () => { - recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100); - recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100); + it("allows same event_type on different ledger sequences", () => { + recordEventWithDb(db, "1", "claimed", 1000, "GRECIPIENT", 50, undefined, 10); + recordEventWithDb(db, "1", "claimed", 2000, "GRECIPIENT", 50, undefined, 20); - // NULL is not equal to NULL in SQLite unique index, so both rows are inserted - const rows = db.prepare("SELECT * FROM stream_events").all(); - expect(rows).toHaveLength(2); - }); -}); + const rows = db.prepare("SELECT * FROM stream_events").all(); + expect(rows).toHaveLength(2); + }); -describe("indexer restart deduplication", () => { - it("produces no duplicate rows after reprocessing the same ledger range", () => { - const db = createTestDb(); + it("allows events without ledger_sequence to coexist (reconciliation path)", () => { + recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100); + recordEventWithDb(db, "1", "created", 1000, "GSENDER", 100); - // Simulate first indexer run: ledger 5 - recordEventWithDb(db, "42", "created", 1000, "GSENDER", 500, undefined, 5); - recordEventWithDb(db, "42", "claimed", 2000, "GRECIPIENT", 100, undefined, 6); + // NULL is not equal to NULL in SQLite unique index, so both rows are inserted + const rows = db.prepare("SELECT * FROM stream_events").all(); + expect(rows).toHaveLength(2); + }); + }); - // Simulate restart — same ledger range replayed - recordEventWithDb(db, "42", "created", 1000, "GSENDER", 500, undefined, 5); - recordEventWithDb(db, "42", "claimed", 2000, "GRECIPIENT", 100, undefined, 6); + describe("indexer restart deduplication", () => { + it("produces no duplicate rows after reprocessing the same ledger range", () => { + // Simulate first indexer run: ledger 5 + recordEventWithDb(db, "42", "created", 1000, "GSENDER", 500, undefined, 5); + recordEventWithDb(db, "42", "claimed", 2000, "GRECIPIENT", 100, undefined, 6); - const rows = db.prepare("SELECT * FROM stream_events WHERE stream_id = '42'").all(); - expect(rows).toHaveLength(2); - dbMocks.getDb.mockReturnValue(db); - }); + // Simulate restart — same ledger range replayed + recordEventWithDb(db, "42", "created", 1000, "GSENDER", 500, undefined, 5); + recordEventWithDb(db, "42", "claimed", 2000, "GRECIPIENT", 100, undefined, 6); - afterEach(() => { - db.close(); - vi.clearAllMocks(); + const rows = db.prepare("SELECT * FROM stream_events WHERE stream_id = '42'").all(); + expect(rows).toHaveLength(2); + }); }); describe("recordEvent", () => { @@ -123,7 +117,7 @@ describe("indexer restart deduplication", () => { }); }); - describe("recordEventWithDb", () => { + describe("recordEventWithDb import tests", () => { it("inserts using the provided db handle", async () => { const { recordEventWithDb, getStreamHistory } = await import( "./eventHistory" diff --git a/backend/src/services/indexer.test.ts b/backend/src/services/indexer.test.ts index a9d2b5c..7116d64 100644 --- a/backend/src/services/indexer.test.ts +++ b/backend/src/services/indexer.test.ts @@ -97,17 +97,18 @@ function setupDb(contractId: string, lastLedger = 100) { id INTEGER PRIMARY KEY AUTOINCREMENT, stream_id TEXT NOT NULL, event_type TEXT NOT NULL, + ledger_sequence INTEGER, timestamp INTEGER NOT NULL, actor TEXT, amount REAL, metadata TEXT ); CREATE TABLE indexer_cursor ( - id TEXT PRIMARY KEY, - last_ledger INTEGER NOT NULL + id INTEGER PRIMARY KEY CHECK (id = 1), + last_ledger_sequence INTEGER NOT NULL ); `); - db.prepare("INSERT INTO indexer_cursor (id, last_ledger) VALUES (?, ?)").run(contractId, lastLedger); + db.prepare("INSERT INTO indexer_cursor (id, last_ledger_sequence) VALUES (1, ?)").run(lastLedger); } async function runOnePoll(contractId: string) { @@ -143,6 +144,8 @@ describe("indexer processEvent — StreamClaimed", () => { Math.floor(new Date(event.ledgerClosedAt).getTime() / 1000), event.value.recipient, event.value.amount, + undefined, + undefined, ); }); diff --git a/backend/src/services/indexer.ts b/backend/src/services/indexer.ts index e375e6e..490c55d 100644 --- a/backend/src/services/indexer.ts +++ b/backend/src/services/indexer.ts @@ -159,7 +159,12 @@ async function indexEvents(): Promise { const currentLedger = latestLedger.sequence; if (lastProcessedLedger === 0) { - + const cursor = db.prepare("SELECT last_ledger_sequence FROM indexer_cursor WHERE id = 1").get() as any; + if (cursor) { + lastProcessedLedger = cursor.last_ledger_sequence; + } else { + lastProcessedLedger = indexerStartLedger !== null ? indexerStartLedger : currentLedger - 1; + db.prepare("INSERT INTO indexer_cursor (id, last_ledger_sequence) VALUES (1, ?)").run(lastProcessedLedger); } } @@ -190,7 +195,7 @@ async function indexEvents(): Promise { } lastProcessedLedger = currentLedger; - + db.prepare("UPDATE indexer_cursor SET last_ledger_sequence = ? WHERE id = 1").run(currentLedger); })(); ledgersScannedTotal.inc(currentLedger - startLedger); diff --git a/backend/src/services/streamStore.cancel.integration.test.ts b/backend/src/services/streamStore.cancel.integration.test.ts index bbd215c..b6502fa 100644 --- a/backend/src/services/streamStore.cancel.integration.test.ts +++ b/backend/src/services/streamStore.cancel.integration.test.ts @@ -4,6 +4,7 @@ import jwt from "jsonwebtoken"; import { app } from "../index"; import { initDb, getDb } from "./db"; import { getStreamHistory } from "./eventHistory"; +import { getJwtSecret } from "./auth"; import path from "path"; import fs from "fs"; @@ -28,16 +29,16 @@ describe("POST /api/streams/:id/cancel Integration Tests", () => { initDb(); // Create auth tokens for tests - authToken = jwt.sign({ accountId: mockSender }, TEST_SECRET, { expiresIn: '1h' }); - recipientToken = jwt.sign({ accountId: mockRecipient }, TEST_SECRET, { expiresIn: '1h' }); + authToken = jwt.sign({ accountId: mockSender }, getJwtSecret(), { expiresIn: '1h' }); + recipientToken = jwt.sign({ accountId: mockRecipient }, getJwtSecret(), { expiresIn: '1h' }); }); beforeEach(() => { // Clean database before each test const db = getDb(); db.exec("DELETE FROM stream_events"); - db.exec("DELETE FROM streams"); db.exec("DELETE FROM webhook_deliveries"); + db.exec("DELETE FROM streams"); }); afterAll(() => { diff --git a/backend/src/services/streamStore.progress.test.ts b/backend/src/services/streamStore.progress.test.ts index ad1ec3c..d125d84 100644 --- a/backend/src/services/streamStore.progress.test.ts +++ b/backend/src/services/streamStore.progress.test.ts @@ -129,7 +129,7 @@ describe("calculateProgress", () => { const currentTime = 1002700; // 45 minutes after start, currently paused for 15 minutes const progress = calculateProgress(stream, currentTime); - expect(progress.status).toBe("active"); + expect(progress.status).toBe("paused"); // Elapsed = 45 min - (10 min previous + 15 min current pause) = 20 min expect(progress.elapsedSeconds).toBe(1200); expect(progress.vestedAmount).toBeCloseTo(333.33, 0); // ~1/3 of 1000 diff --git a/backend/src/services/streamStore.ts b/backend/src/services/streamStore.ts index 0336f80..f153a17 100644 --- a/backend/src/services/streamStore.ts +++ b/backend/src/services/streamStore.ts @@ -84,7 +84,6 @@ function rowToRecord(row: StreamRow): StreamRecord { refundedAmount: row.refunded_amount ?? undefined, pausedAt: row.paused_at ?? undefined, pausedDuration: row.paused_duration ?? 0, - pausedDuration: row.paused_duration, }; } @@ -152,7 +151,7 @@ export async function initSoroban() { } } -function nowInSeconds(): number { +export function nowInSeconds(): number { return Math.floor(Date.now() / 1000); } @@ -367,12 +366,9 @@ function computeStatus(stream: StreamRecord, at: number): StreamStatus { if (at < stream.startAt) { return "scheduled"; } - if (at >= stream.startAt + stream.durationSeconds) { + if (at >= stream.startAt + stream.durationSeconds + stream.pausedDuration) { return "completed"; } - if (stream.pausedAt !== undefined) { - return "active"; // Or could be a "paused" status if we want to add it - } return "active"; } @@ -380,28 +376,29 @@ export function calculateProgress( stream: StreamRecord, at = nowInSeconds(), ): StreamProgress { - const streamEnd = stream.startAt + stream.durationSeconds; - - // Calculate paused duration including current pause if active - let pausedDuration = stream.pausedDuration; - if (stream.pausedAt !== undefined) { - pausedDuration += Math.max(0, at - stream.pausedAt); + if (stream.durationSeconds === 0) { + return { + status: "completed", + ratePerSecond: Infinity, + elapsedSeconds: 0, + vestedAmount: stream.totalAmount, + remainingAmount: 0, + percentComplete: 100, + }; } - const effectiveEnd = - stream.canceledAt !== undefined - ? Math.min(stream.canceledAt, streamEnd) - : streamEnd; + const streamEnd = stream.startAt + stream.durationSeconds; // When paused, vesting is frozen at the moment of pause. const effectiveAt = stream.pausedAt !== undefined ? Math.min(at, stream.pausedAt) : at; - const elapsed = Math.max(0, Math.min(effectiveAt, effectiveEnd) - stream.startAt); - ? Math.min(stream.canceledAt, streamEnd + pausedDuration) - : streamEnd + pausedDuration; - - const elapsed = Math.max(0, Math.min(at, effectiveEnd) - stream.startAt - pausedDuration); + const effectiveEnd = + stream.canceledAt !== undefined + ? Math.min(stream.canceledAt, streamEnd + stream.pausedDuration) + : streamEnd + stream.pausedDuration; + + const elapsed = Math.max(0, Math.min(effectiveAt, effectiveEnd) - stream.startAt - stream.pausedDuration); const ratio = Math.min(1, elapsed / stream.durationSeconds); const vestedAmount = stream.totalAmount * ratio; @@ -659,10 +656,19 @@ export async function createStream(input: StreamInput): Promise { return stream; } -export async function pauseStream(id: string): Promise { +export async function pauseStream(id: string): Promise { const stream = getStream(id); - if (!stream || stream.pausedAt !== undefined || stream.canceledAt !== undefined || stream.completedAt !== undefined) { - return stream; + if (!stream) { + const err: any = new Error("Stream not found."); + err.statusCode = 404; + throw err; + } + + const status = computeStatus(stream, nowInSeconds()); + if (status !== "active") { + const err: any = new Error("Only active streams can be paused."); + err.statusCode = 400; + throw err; } const sorobanContext = getSorobanContext(); @@ -697,18 +703,30 @@ export async function pauseStream(id: string): Promise } } - const now = nowInSeconds(); + stream.pausedAt = nowInSeconds(); const db = getDb(); - db.prepare("UPDATE streams SET paused_at = ? WHERE id = ?").run(now, id); - + db.transaction(() => { + upsertStream(stream); + recordEventWithDb(db, stream.id, "paused", stream.pausedAt!, stream.sender); + })(); + invalidateCache(`stream:${id}`); - return getStream(id); + triggerWebhook("paused", stream); + return stream; } -export async function resumeStream(id: string): Promise { +export async function resumeStream(id: string): Promise { const stream = getStream(id); - if (!stream || stream.pausedAt === undefined) { - return stream; + if (!stream) { + const err: any = new Error("Stream not found."); + err.statusCode = 404; + throw err; + } + + if (stream.pausedAt === undefined) { + const err: any = new Error("Stream is not paused."); + err.statusCode = 400; + throw err; } const sorobanContext = getSorobanContext(); @@ -744,17 +762,23 @@ export async function resumeStream(id: string): Promise { + upsertStream(stream); + recordEventWithDb(db, stream.id, "resumed", now, stream.sender, undefined, { + pausedDuration: stream.pausedDuration, + }); + })(); invalidateCache(`stream:${id}`); - return getStream(id); + triggerWebhook("resumed", stream); + return stream; } export function refreshStreamStatuses(): number { @@ -764,14 +788,14 @@ export function refreshStreamStatuses(): number { const toComplete = db.prepare(` SELECT * FROM streams - WHERE canceled_at IS NULL AND completed_at IS NULL + WHERE canceled_at IS NULL AND completed_at IS NULL AND paused_at IS NULL AND (start_at + duration_seconds) <= ? `).all() as StreamRow[]; const result = db.prepare(` UPDATE streams SET completed_at = ? - WHERE canceled_at IS NULL AND completed_at IS NULL + WHERE canceled_at IS NULL AND completed_at IS NULL AND paused_at IS NULL AND (start_at + duration_seconds) <= ? `).run(now, now); @@ -962,64 +986,6 @@ export async function cancelStream( return stream; } -export function pauseStream(id: string): StreamRecord { - const stream = getStream(id); - if (!stream) { - const err: any = new Error("Stream not found."); - err.statusCode = 404; - throw err; - } - - const status = computeStatus(stream, nowInSeconds()); - if (status !== "active") { - const err: any = new Error("Only active streams can be paused."); - err.statusCode = 400; - throw err; - } - - stream.pausedAt = nowInSeconds(); - const db = getDb(); - db.transaction(() => { - upsertStream(stream); - recordEventWithDb(db, stream.id, "paused", stream.pausedAt!, stream.sender); - })(); - - triggerWebhook("paused", stream); - return stream; -} - -export function resumeStream(id: string): StreamRecord { - const stream = getStream(id); - if (!stream) { - const err: any = new Error("Stream not found."); - err.statusCode = 404; - throw err; - } - - if (stream.pausedAt === undefined) { - const err: any = new Error("Stream is not paused."); - err.statusCode = 400; - throw err; - } - - const now = nowInSeconds(); - const elapsed = now - stream.pausedAt; - stream.pausedDuration = (stream.pausedDuration ?? 0) + elapsed; - // Extend the effective duration so the recipient doesn't lose vesting time. - stream.durationSeconds += elapsed; - stream.pausedAt = undefined; - - const db = getDb(); - db.transaction(() => { - upsertStream(stream); - recordEventWithDb(db, stream.id, "resumed", now, stream.sender, undefined, { - pausedDuration: stream.pausedDuration, - }); - })(); - - triggerWebhook("resumed", stream); - return stream; -} export function updateStreamStartAt( id: string, newStartAt: number, diff --git a/backend/src/services/streamStore.updateStartAt.test.ts b/backend/src/services/streamStore.updateStartAt.test.ts index ff5d9d0..df2249e 100644 --- a/backend/src/services/streamStore.updateStartAt.test.ts +++ b/backend/src/services/streamStore.updateStartAt.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from "vitest"; +import { beforeEach, afterEach, describe, expect, it, vi } from "vitest"; // Mock dependencies const mockState = vi.hoisted(() => ({ @@ -65,13 +65,17 @@ describe("updateStreamStartAt", () => { const mockSender = "GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF"; const mockRecipient = "GBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"; - beforeEach(async () => { + beforeEach(() => { vi.clearAllMocks(); mockState.streams.clear(); mockState.events = []; - // Mock nowInSeconds to return consistent time - vi.spyOn(await import("./streamStore"), "nowInSeconds").mockReturnValue(mockNow); // Line 74 + vi.useFakeTimers(); + vi.setSystemTime(new Date(mockNow * 1000)); + }); + + afterEach(() => { + vi.useRealTimers(); }); describe("Successful updates", () => { diff --git a/backend/src/services/webhook.test.ts b/backend/src/services/webhook.test.ts index 1c67b9d..b37f9b3 100644 --- a/backend/src/services/webhook.test.ts +++ b/backend/src/services/webhook.test.ts @@ -1,4 +1,12 @@ +import { describe, it, expect, beforeEach, afterEach, vi } from "vitest"; +import { getRetryDelaySeconds, triggerWebhook, getDeadLetters } from "./webhook"; +import { initDb, getDb } from "./db"; +import fs from "fs"; +import path from "path"; + +const TEST_DB_PATH = path.join(__dirname, "..", "..", "data", "webhook-test.db"); + describe("Webhook Retry Logic", () => { it("should return correct retry delays", () => { const expectedDelays = [5, 15, 60, 300, 900]; @@ -32,8 +40,10 @@ describe("Webhook triggerWebhook and getDeadLetters", () => { process.env.DB_PATH = TEST_DB_PATH; initDb(); const db = getDb(); + db.exec("DELETE FROM stream_events"); db.exec("DELETE FROM webhook_deliveries"); db.exec("DELETE FROM webhook_dead_letters"); + db.exec("DELETE FROM streams"); originalEnvUrl = process.env.WEBHOOK_DESTINATION_URL; process.env.WEBHOOK_DESTINATION_URL = "http://example.com/webhook"; @@ -98,13 +108,13 @@ describe("Webhook triggerWebhook and getDeadLetters", () => { // Insert dummy dead letters out of order const stmt = db.prepare(` - INSERT INTO webhook_dead_letters (url, payload, last_error, failed_at) - VALUES (?, ?, ?, ?) + INSERT INTO webhook_dead_letters (stream_id, event, url, payload, last_error, failed_at) + VALUES (?, ?, ?, ?, ?, ?) `); - stmt.run("http://u1", "p1", "err", 1000); - stmt.run("http://u2", "p2", "err", 3000); - stmt.run("http://u3", "p3", "err", 2000); + stmt.run("s1", "event.created", "http://u1", "p1", "err", 1000); + stmt.run("s1", "event.created", "http://u2", "p2", "err", 3000); + stmt.run("s1", "event.created", "http://u3", "p3", "err", 2000); const deadLetters = getDeadLetters(); diff --git a/backend/src/services/webhookWorker.test.ts b/backend/src/services/webhookWorker.test.ts index dc0199c..8c0d8c7 100644 --- a/backend/src/services/webhookWorker.test.ts +++ b/backend/src/services/webhookWorker.test.ts @@ -15,6 +15,7 @@ describe("WebhookWorker", () => { process.env.WEBHOOK_DESTINATION_URL = "http://example.com/webhook"; initDb(); const db = getDb(); + db.exec("DELETE FROM stream_events"); db.exec("DELETE FROM webhook_deliveries"); db.exec("DELETE FROM webhook_dead_letters"); db.exec("DELETE FROM streams"); diff --git a/backend/src/services/webhookWorker.ts b/backend/src/services/webhookWorker.ts index b77df4f..84586d7 100644 --- a/backend/src/services/webhookWorker.ts +++ b/backend/src/services/webhookWorker.ts @@ -1,6 +1,7 @@ import axios from "axios"; import { getDb } from "./db"; import { getRetryDelaySeconds } from "./webhook"; +import { getWebhookHeaders } from "./webhookSignature"; let isProcessing = false; @@ -75,8 +76,8 @@ export const processWebhookQueue = async () => { ).run(delivery.stream_id, event, url, payload, errorMsg, updateNow); db.prepare( - `UPDATE webhook_deliveries SET status = 'failed', attempt = ?, last_attempt_at = ?, error_message = ? WHERE id = ?` - ).run(newAttempt, updateNow, errorMsg, id); + `DELETE FROM webhook_deliveries WHERE id = ?` + ).run(id); console.error(`[WebhookWorker] Delivery ${id} (${event}) permanently failed after max attempts. Moved to dead-letter storage.`); } else { // Use configured retry delays: 5s, 15s, 60s, 300s, 900s diff --git a/backend/src/webhooks.integration.test.ts b/backend/src/webhooks.integration.test.ts index d5e0be7..1f9cb2e 100644 --- a/backend/src/webhooks.integration.test.ts +++ b/backend/src/webhooks.integration.test.ts @@ -30,6 +30,8 @@ describe("Webhook Dead Letter Integration Tests", () => { const db = getDb(); db.exec("DELETE FROM webhook_dead_letters"); db.exec("DELETE FROM webhook_deliveries"); + db.exec("DELETE FROM stream_events"); + db.exec("DELETE FROM streams"); }); afterAll(() => { @@ -126,6 +128,12 @@ describe("Webhook Dead Letter Integration Tests", () => { describe("POST /api/webhooks/dead-letters/:id/requeue", () => { it("should re-queue a dead letter and remove it from dead letters table", async () => { const db = getDb(); + // Insert mock stream to satisfy foreign key constraint of webhook_deliveries + db.prepare(` + INSERT INTO streams (id, sender, recipient, asset_code, total_amount, duration_seconds, start_at, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?) + `).run("s-requeue", "GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF", "GBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB", "USDC", 100, 3600, 100, 100); + db.prepare(` INSERT INTO webhook_dead_letters (stream_id, event, url, payload, last_error, failed_at) VALUES (?, ?, ?, ?, ?, ?) From 95c7b59fa884bc82f6a0a1de28486ae79f907a4d Mon Sep 17 00:00:00 2001 From: rizwan Date: Tue, 26 May 2026 14:16:41 +0530 Subject: [PATCH 3/3] fix(frontend): resolve unit test suite failures and add api/websocket/contract mocking Mock API calls, WebSocket connections, component props, and Soroban contract addresses to resolve crashes and unhandled exceptions across all frontend unit and integration tests. --- .../src/components/CopyableAddress.test.tsx | 37 +- frontend/src/components/CopyableAddress.tsx | 4 +- frontend/src/components/CreateStreamForm.tsx | 91 +--- frontend/src/components/FilterBar.test.tsx | 30 +- .../components/RecipientDashboard.test.tsx | 11 +- .../components/StreamDetailDrawer.test.tsx | 3 + .../components/StreamMetricsChart.test.tsx | 45 +- .../StreamTimeline.filterbar.test.ts | 16 +- .../src/components/StreamTimeline.test.tsx | 16 +- frontend/src/components/StreamsTable.test.tsx | 496 ++++++++++++++---- frontend/src/components/StreamsTable.tsx | 283 ++++++++-- frontend/src/components/WalletButton.test.tsx | 6 +- frontend/src/hooks/useClaimStream.test.ts | 205 +++++--- frontend/src/hooks/useClaimStream.ts | 3 + frontend/src/hooks/useMetricsHistory.test.ts | 35 +- frontend/src/hooks/useWebSocket.test.ts | 64 ++- frontend/src/hooks/useWebSocket.ts | 14 +- frontend/src/services/api.ts | 22 + frontend/src/services/soroban.ts | 2 + 19 files changed, 997 insertions(+), 386 deletions(-) diff --git a/frontend/src/components/CopyableAddress.test.tsx b/frontend/src/components/CopyableAddress.test.tsx index 2304a1c..f0ed4a3 100644 --- a/frontend/src/components/CopyableAddress.test.tsx +++ b/frontend/src/components/CopyableAddress.test.tsx @@ -1,21 +1,30 @@ import React from "react"; -import { render, screen, fireEvent } from "@testing-library/react"; +import { render, screen, fireEvent, waitFor } from "@testing-library/react"; import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; import { CopyableAddress } from "./CopyableAddress"; describe("CopyableAddress Component", () => { const mockWriteText = vi.fn(); - const originalClipboard = global.navigator.clipboard; + let originalClipboard: any; beforeEach(() => { vi.clearAllMocks(); - global.navigator.clipboard = { - writeText: mockWriteText, - } as unknown as Clipboard; + originalClipboard = global.navigator.clipboard; + Object.defineProperty(global.navigator, "clipboard", { + value: { + writeText: mockWriteText, + }, + configurable: true, + writable: true, + }); }); afterEach(() => { - global.navigator.clipboard = originalClipboard; + Object.defineProperty(global.navigator, "clipboard", { + value: originalClipboard, + configurable: true, + writable: true, + }); }); it("truncates a 56-character G-address correctly in middle mode", () => { @@ -41,7 +50,9 @@ describe("CopyableAddress Component", () => { const copyButton = screen.getByTitle("Copy address"); fireEvent.click(copyButton); - expect(mockWriteText).toHaveBeenCalledWith(longAddress); + await waitFor(() => { + expect(mockWriteText).toHaveBeenCalledWith(longAddress); + }); }); it("shows copied feedback (✓) after clicking the copy button", async () => { @@ -53,7 +64,9 @@ describe("CopyableAddress Component", () => { fireEvent.click(copyButton); - expect(copyButton.textContent).toBe("✓"); + await waitFor(() => { + expect(copyButton.textContent).toBe("✓"); + }); }); it("displays full address without truncation when address is short", () => { @@ -65,11 +78,11 @@ describe("CopyableAddress Component", () => { }); it("displays full address without truncation when address is exactly 12 characters", () => { - const exactLengthAddress = "GABCDEFGHIJ"; + const exactLengthAddress = "GABCDEFGHIJK"; render(); const addressSpan = screen.getByTitle(exactLengthAddress); - expect(addressSpan.textContent).toBe("GABCDEFGHIJ"); + expect(addressSpan.textContent).toBe("GABCDEFGHIJK"); }); it("handles clipboard errors gracefully", async () => { @@ -82,7 +95,9 @@ describe("CopyableAddress Component", () => { const copyButton = screen.getByTitle("Copy address"); fireEvent.click(copyButton); - expect(consoleErrorSpy).toHaveBeenCalledWith("Failed to copy text", expect.any(Error)); + await waitFor(() => { + expect(consoleErrorSpy).toHaveBeenCalledWith("Failed to copy text", expect.any(Error)); + }); consoleErrorSpy.mockRestore(); }); }); diff --git a/frontend/src/components/CopyableAddress.tsx b/frontend/src/components/CopyableAddress.tsx index 78fc39e..f696d3d 100644 --- a/frontend/src/components/CopyableAddress.tsx +++ b/frontend/src/components/CopyableAddress.tsx @@ -22,7 +22,9 @@ export function CopyableAddress({ }; const truncatedAddress = - truncationMode === "middle" + address.length <= 12 + ? address + : truncationMode === "middle" ? `${address.slice(0, 8)}…${address.slice(-4)}` : `${address.slice(0, 8)}...`; diff --git a/frontend/src/components/CreateStreamForm.tsx b/frontend/src/components/CreateStreamForm.tsx index dabb774..edf6a0c 100644 --- a/frontend/src/components/CreateStreamForm.tsx +++ b/frontend/src/components/CreateStreamForm.tsx @@ -198,22 +198,22 @@ export function CreateStreamForm({ const parsedApiError = apiError ? humaniseApiError(apiError) : null; const startInMinsNum = Number(values.startInMinutes); - const durationHoursNum = Number(values.durationHours); + const durationMinsNum = Number(values.durationMinutes); const estimatedEndLabel: string | null = (() => { if ( values.startInMinutes === "" || - values.durationHours === "" || + values.durationMinutes === "" || isNaN(startInMinsNum) || - isNaN(durationHoursNum) || - durationHoursNum < 1 || - !Number.isInteger(durationHoursNum) + isNaN(durationMinsNum) || + durationMinsNum < 1 || + !Number.isInteger(durationMinsNum) ) { return null; } const nowSeconds = Math.floor(Date.now() / 1000); const startAt = startInMinsNum > 0 ? nowSeconds + Math.floor(startInMinsNum * 60) : nowSeconds; - const endAt = startAt + Math.floor(durationHoursNum * 3600); + const endAt = startAt + Math.floor(durationMinsNum * 60); const endDate = new Date(endAt * 1000); const datePart = new Intl.DateTimeFormat("en-US", { month: "short", @@ -380,78 +380,6 @@ export function CreateStreamForm({ - {/* Duration */} -
- - { - if (["e", "E", "+", "-", "."].includes(e.key)) e.preventDefault(); - }} - aria-describedby={ - errors.durationHours ? "duration-error" : "duration-hint" - } - aria-invalid={!!errors.durationHours} - required - /> - {estimatedEndLabel && ( - - {estimatedEndLabel} - - )} - {errors.durationHours && ( - - {errors.durationHours} - - )} -
- - {/* Start In Minutes */} -
- - { - if (["e", "E", "+", "-", "."].includes(e.key)) e.preventDefault(); - }} - aria-describedby={ - errors.startInMinutes ? "start-error" : "start-hint" - } - aria-invalid={!!errors.startInMinutes} - required - /> - - Enter 0 to start immediately - - {errors.startInMinutes && ( - - {errors.startInMinutes} {/* Duration & Start In Minutes */}
+ {estimatedEndLabel && ( + + {estimatedEndLabel} + + )} {errors.durationMinutes && ( {errors.durationMinutes} diff --git a/frontend/src/components/FilterBar.test.tsx b/frontend/src/components/FilterBar.test.tsx index 5b5c1da..796da4a 100644 --- a/frontend/src/components/FilterBar.test.tsx +++ b/frontend/src/components/FilterBar.test.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { render, screen, fireEvent, waitFor, cleanup } from "@testing-library/react"; +import { render, screen, fireEvent, waitFor, cleanup, renderHook } from "@testing-library/react"; import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; import { FilterBar } from "./FilterBar"; import { ListStreamsFilters } from "../services/api"; @@ -31,7 +31,7 @@ describe("FilterBar Component", () => { const handleChange = vi.fn(); render(); - const scheduledBtn = screen.getByText(/Scheduled/i); + const scheduledBtn = screen.getByRole("button", { name: /Scheduled/i }); fireEvent.click(scheduledBtn); expect(handleChange).toHaveBeenCalledWith({ @@ -47,7 +47,7 @@ describe("FilterBar Component", () => { const handleChange = vi.fn(); render(); - const atRiskBtn = screen.getByText(/At-Risk/i); + const atRiskBtn = screen.getByRole("button", { name: /At-Risk/i }); fireEvent.click(atRiskBtn); expect(handleChange).toHaveBeenCalledWith({ @@ -133,18 +133,18 @@ describe("FilterBar URL Sync Integration", () => { it("restores filter state from URL on page load with ?status=completed", () => { (window as any).location.search = "?status=completed"; - const { filters } = useUrlFilters(); + const { result } = renderHook(() => useUrlFilters()); - expect(filters.status).toBe("completed"); + expect(result.current.filters.status).toBe("completed"); }); it("restores filter state from URL with multiple params", () => { (window as any).location.search = "?status=active&asset=USDC"; - const { filters } = useUrlFilters(); + const { result } = renderHook(() => useUrlFilters()); - expect(filters.status).toBe("active"); - expect(filters.asset).toBe("USDC"); + expect(result.current.filters.status).toBe("active"); + expect(result.current.filters.asset).toBe("USDC"); }); it("clears URL params when all filters are reset", () => { @@ -214,19 +214,19 @@ describe("FilterBar URL Sync Integration", () => { it("handles invalid status values in URL by defaulting to empty", () => { (window as any).location.search = "?status=invalid"; - const { filters } = useUrlFilters(); + const { result } = renderHook(() => useUrlFilters()); - expect(filters.status).toBe(""); + expect(result.current.filters.status).toBe(""); }); it("handles empty URL params correctly", () => { (window as any).location.search = ""; - const { filters } = useUrlFilters(); + const { result } = renderHook(() => useUrlFilters()); - expect(filters.status).toBe(""); - expect(filters.asset).toBe(""); - expect(filters.sender).toBe(""); - expect(filters.recipient).toBe(""); + expect(result.current.filters.status).toBe(""); + expect(result.current.filters.asset).toBe(""); + expect(result.current.filters.sender).toBe(""); + expect(result.current.filters.recipient).toBe(""); }); }); diff --git a/frontend/src/components/RecipientDashboard.test.tsx b/frontend/src/components/RecipientDashboard.test.tsx index 6f21868..5ec95f3 100644 --- a/frontend/src/components/RecipientDashboard.test.tsx +++ b/frontend/src/components/RecipientDashboard.test.tsx @@ -41,8 +41,9 @@ vi.mock("../services/soroban", () => { }; }); -import { claimStream } from "../services/soroban"; +import { claimStream, claimOnChain } from "../services/soroban"; const mockClaimStream = claimStream as ReturnType; +const mockClaimOnChain = claimOnChain as ReturnType; // --------------------------------------------------------------------------- // Fixtures @@ -85,16 +86,16 @@ function setupRecipientHandler(streams: unknown[]) { beforeEach(() => { vi.clearAllMocks(); - mockClaimStream.mockResolvedValue({ - mockClaimOnChain.mockResolvedValue({ + const mockResult = { result: { claimedAmount: 500, assetCode: "USDC", txHash: "txhash123", }, history: [], - history: [] - }); + }; + mockClaimStream.mockResolvedValue(mockResult); + mockClaimOnChain.mockResolvedValue(mockResult); }); // --------------------------------------------------------------------------- diff --git a/frontend/src/components/StreamDetailDrawer.test.tsx b/frontend/src/components/StreamDetailDrawer.test.tsx index 9768645..4ec4e5b 100644 --- a/frontend/src/components/StreamDetailDrawer.test.tsx +++ b/frontend/src/components/StreamDetailDrawer.test.tsx @@ -5,12 +5,15 @@ import { http, HttpResponse } from 'msw'; import { server } from '../server'; import { StreamDetailDrawer } from './StreamDetailDrawer'; +import { clearCache } from '../services/api'; + const onClose = vi.fn(); const onCancel = vi.fn().mockResolvedValue(undefined); beforeEach(() => { onClose.mockClear(); onCancel.mockClear(); + clearCache(); }); describe('StreamDetailDrawer', () => { diff --git a/frontend/src/components/StreamMetricsChart.test.tsx b/frontend/src/components/StreamMetricsChart.test.tsx index 28e5f7f..2e2f4de 100644 --- a/frontend/src/components/StreamMetricsChart.test.tsx +++ b/frontend/src/components/StreamMetricsChart.test.tsx @@ -1,24 +1,47 @@ +import React from "react"; import { render, screen } from "@testing-library/react"; -import StreamMetricsChart from "./StreamMetricsChart"; +import { describe, it, expect, vi } from "vitest"; +import { StreamMetricsChart } from "./StreamMetricsChart"; + +// Mock recharts components to render simple HTML/SVG for testing +vi.mock("recharts", () => { + return { + ResponsiveContainer: ({ children }: any) =>
{children}
, + AreaChart: ({ data, children }: any) => ( + + {children} + + ), + Area: ({ dataKey }: any) => Area: {dataKey}, + XAxis: () => XAxis, + YAxis: () => YAxis, + CartesianGrid: () => CartesianGrid, + Tooltip: () => Tooltip, + Legend: () => Legend, + ReferenceArea: () => ReferenceArea, + }; +}); describe("StreamMetricsChart", () => { it("renders with known metrics history data", () => { - const history = [ - { timestamp: "2024-01-01T00:00:00Z", vestedAmount: 100 }, - { timestamp: "2024-01-02T00:00:00Z", vestedAmount: 200 }, + const data = [ + { timestamp: 1704067200000, active: 10, completed: 5, vested: 100 }, + { timestamp: 1704153600000, active: 12, completed: 6, vested: 200 }, ]; - render(); - expect(screen.getByText(/200/)).toBeInTheDocument(); + render(); + expect(screen.getByText("Area: Vested Amount")).toBeInTheDocument(); + expect(screen.getByText("Area: Active")).toBeInTheDocument(); + expect(screen.getByText("Area: Completed")).toBeInTheDocument(); }); it("renders gracefully with empty history", () => { - render(); - expect(screen.getByText(/No data available/)).toBeInTheDocument(); + render(); + expect(screen.getByText(/No Chart Data Yet/)).toBeInTheDocument(); }); it("handles a single data point without crashing", () => { - const history = [{ timestamp: "2024-01-01T00:00:00Z", vestedAmount: 150 }]; - render(); - expect(screen.getByText(/150/)).toBeInTheDocument(); + const data = [{ timestamp: 1704067200000, active: 10, completed: 5, vested: 150 }]; + render(); + expect(screen.getByText("Area: Vested Amount")).toBeInTheDocument(); }); }); diff --git a/frontend/src/components/StreamTimeline.filterbar.test.ts b/frontend/src/components/StreamTimeline.filterbar.test.ts index d13a5a9..066f322 100644 --- a/frontend/src/components/StreamTimeline.filterbar.test.ts +++ b/frontend/src/components/StreamTimeline.filterbar.test.ts @@ -20,6 +20,8 @@ const EVENT_TYPES: EventType[] = [ "claimed", "canceled", "start_time_updated", + "paused", + "resumed", ]; const arbFilterSet = fc @@ -36,16 +38,18 @@ const arbNonEmptyFilterSet = fc // --------------------------------------------------------------------------- describe("FilterBar: button configuration", () => { - it("renders exactly four toggle buttons", () => { - expect(FILTER_BUTTONS).toHaveLength(4); + it("renders exactly six toggle buttons", () => { + expect(FILTER_BUTTONS).toHaveLength(6); }); - it("has correct labels for all four event types", () => { + it("has correct labels for all six event types", () => { const labels = FILTER_BUTTONS.map((b) => b.label); expect(labels).toContain("Created"); expect(labels).toContain("Claimed"); expect(labels).toContain("Canceled"); expect(labels).toContain("Start Time Updated"); + expect(labels).toContain("Paused"); + expect(labels).toContain("Resumed"); }); it("maps each button to the correct EventType", () => { @@ -54,14 +58,18 @@ describe("FilterBar: button configuration", () => { expect(typeMap["claimed"]).toBe("Claimed"); expect(typeMap["canceled"]).toBe("Canceled"); expect(typeMap["start_time_updated"]).toBe("Start Time Updated"); + expect(typeMap["paused"]).toBe("Paused"); + expect(typeMap["resumed"]).toBe("Resumed"); }); - it("covers all four known EventTypes", () => { + it("covers all six known EventTypes", () => { const types = FILTER_BUTTONS.map((b) => b.type); expect(types).toContain("created"); expect(types).toContain("claimed"); expect(types).toContain("canceled"); expect(types).toContain("start_time_updated"); + expect(types).toContain("paused"); + expect(types).toContain("resumed"); }); }); diff --git a/frontend/src/components/StreamTimeline.test.tsx b/frontend/src/components/StreamTimeline.test.tsx index b6cf847..7bcc461 100644 --- a/frontend/src/components/StreamTimeline.test.tsx +++ b/frontend/src/components/StreamTimeline.test.tsx @@ -24,7 +24,7 @@ vi.mock("../services/api", () => ({ listAllEvents: vi.fn(), })); -import { listAllEvents } from "../services/api"; +import { listAllEvents, getStreamHistory } from "../services/api"; // --------------------------------------------------------------------------- // Arbitraries @@ -99,9 +99,10 @@ describe( fc.assert( fc.property(arbStreamEvents, (events) => { const result = computeFilteredEvents(events, new Set()); + const expected = [...events].sort((a, b) => a.timestamp - b.timestamp); return ( - result.length === events.length && - result.every((e, i) => e === events[i]) + result.length === expected.length && + result.every((e, i) => e === expected[i]) ); }), { numRuns: 100 }, @@ -147,7 +148,9 @@ describe( fc.assert( fc.property(arbStreamEvents, arbMultiFilterSet, (events, activeFilters) => { const result = computeFilteredEvents(events, activeFilters); - const expected = events.filter((e) => activeFilters.has(e.eventType)); + const expected = events + .filter((e) => activeFilters.has(e.eventType)) + .sort((a, b) => a.timestamp - b.timestamp); if (result.length !== expected.length) return false; return result.every((e, i) => e === expected[i]); }), @@ -170,9 +173,10 @@ describe( fc.property(arbStreamEvents, arbNonEmptyFilterSet, (events, _activeFilters) => { const emptyFilters = clearFilters(); const result = computeFilteredEvents(events, emptyFilters); + const expected = [...events].sort((a, b) => a.timestamp - b.timestamp); return ( - result.length === events.length && - result.every((e, i) => e === events[i]) + result.length === expected.length && + result.every((e, i) => e === expected[i]) ); }), { numRuns: 100 }, diff --git a/frontend/src/components/StreamsTable.test.tsx b/frontend/src/components/StreamsTable.test.tsx index b12e7f8..385642a 100644 --- a/frontend/src/components/StreamsTable.test.tsx +++ b/frontend/src/components/StreamsTable.test.tsx @@ -1,115 +1,423 @@ import React from 'react'; -import { render, screen, cleanup, fireEvent } from '@testing-library/react'; +import { render, screen, fireEvent, waitFor, cleanup } from '@testing-library/react'; import '@testing-library/jest-dom'; -import { describe, it, expect, vi, afterEach } from 'vitest'; -import { StreamsTable } from '../components/StreamsTable'; +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { StreamsTable } from './StreamsTable'; import { Stream } from '../types/stream'; +import * as api from '../services/api'; -const noop = () => {}; -import { StreamsTable } from './StreamsTable'; -import { Stream } from '../types/stream'; - -const noop = vi.fn(); - -const mockStreams: Stream[] = [ - { - id: '1', - sender: 'G_SENDER', - recipient: 'G_RECIPIENT123', - assetCode: 'USDC', - totalAmount: 100, - durationSeconds: 3600, - startAt: 1670000000, - createdAt: 1670000000, - progress: { - status: 'active', - ratePerSecond: 0.01, - elapsedSeconds: 100, - vestedAmount: 20, - remainingAmount: 80, - percentComplete: 20, - }, - }, - { - id: '2', - sender: 'G_SENDER', - recipient: 'G_RECIPIENT123', - assetCode: 'USDC', - totalAmount: 100, - durationSeconds: 3600, - startAt: 1770000000, - createdAt: 1670000000, - progress: { - status: 'scheduled', - ratePerSecond: 0.01, - elapsedSeconds: 0, - vestedAmount: 0, - remainingAmount: 100, - percentComplete: 0, - }, - }, - { - id: '3', - sender: 'G_SENDER', - recipient: 'G_RECIPIENT123', - assetCode: 'USDC', - totalAmount: 100, - durationSeconds: 3600, - startAt: 1670000000, - createdAt: 1670000000, - progress: { - status: 'completed', - ratePerSecond: 0.01, - elapsedSeconds: 3600, - vestedAmount: 100, - remainingAmount: 0, - percentComplete: 100, - }, - }, - { - id: '4', - sender: 'G_SENDER', - recipient: 'G_RECIPIENT123', - assetCode: 'USDC', - totalAmount: 100, - durationSeconds: 3600, - startAt: 1670000000, - createdAt: 1670000000, - progress: { - status: 'canceled', - ratePerSecond: 0.01, - elapsedSeconds: 500, - vestedAmount: 10, - remainingAmount: 90, - percentComplete: 10, - }, +// Mock the API module +vi.mock('../services/api', async () => { + const actual = await vi.importActual('../services/api'); + return { + ...actual, + cancelStream: vi.fn(), + }; +}); + +const createMockStream = ( + id: string, + status: 'active' | 'scheduled' | 'completed' | 'canceled' +): Stream => ({ + id, + sender: 'SENDER_ADDRESS', + recipient: 'RECIPIENT_ADDRESS', + assetCode: 'USDC', + totalAmount: 1000, + durationSeconds: 3600, + startAt: 1670000000, + createdAt: 1670000000, + progress: { + status, + ratePerSecond: 0.27, + elapsedSeconds: 1000, + vestedAmount: 270, + remainingAmount: 730, + percentComplete: 27, }, -]; +}); -const defaultProps = { - streams: mockStreams, - filters: {}, - onFiltersChange: vi.fn(), - onCancel: vi.fn().mockResolvedValue(undefined), +describe('StreamsTable - Bulk Selection', () => { + const mockOnCancel = vi.fn(); + const mockOnEditStartTime = vi.fn(); + const mockOnFiltersChange = vi.fn(); + const mockOnRefresh = vi.fn(); -}; + beforeEach(() => { + vi.clearAllMocks(); + }); -describe('StreamsTable Component', () => { afterEach(() => { cleanup(); }); + it('renders table data when streams are passed', () => { + const streams = [createMockStream('1', 'active')]; render( - ); - - // Checking for text elements populated by the array map - expect(screen.getAllByTitle('G_RECIPIENT123').length).toBeGreaterThan(0); + expect(screen.getAllByTitle('RECIPIENT_ADDRESS').length).toBeGreaterThan(0); expect(screen.getAllByText(/active/i).length).toBeGreaterThan(0); }); + it('renders an empty state nicely', () => { + render( + + ); + expect(screen.getByText('No streams match your filters.')).toBeInTheDocument(); + }); + + it('renders checkboxes only for active and scheduled streams', () => { + const streams = [ + createMockStream('1', 'active'), + createMockStream('2', 'scheduled'), + createMockStream('3', 'completed'), + createMockStream('4', 'canceled'), + ]; + + render( + + ); + + // Should have 2 row checkboxes (active + scheduled) + 1 header checkbox + const checkboxes = screen.getAllByRole('checkbox'); + expect(checkboxes).toHaveLength(3); + }); + + it('selects individual streams when checkbox is clicked', () => { + const streams = [ + createMockStream('1', 'active'), + createMockStream('2', 'active'), + ]; + + render( + + ); + + const checkboxes = screen.getAllByRole('checkbox'); + const firstStreamCheckbox = checkboxes[1]; // Skip header checkbox + + fireEvent.click(firstStreamCheckbox); + expect(firstStreamCheckbox).toBeChecked(); + + // Bulk action bar should appear + expect(screen.getByText(/1 stream selected/i)).toBeInTheDocument(); + }); + + it('Select All checkbox selects only eligible streams', () => { + const streams = [ + createMockStream('1', 'active'), + createMockStream('2', 'scheduled'), + createMockStream('3', 'completed'), + createMockStream('4', 'canceled'), + ]; + + render( + + ); + + const selectAllCheckbox = screen.getByLabelText(/select all streams/i); + fireEvent.click(selectAllCheckbox); + + // Should show 2 streams selected (active + scheduled only) + expect(screen.getByText(/2 streams selected/i)).toBeInTheDocument(); + + // Deselect all + fireEvent.click(selectAllCheckbox); + expect(screen.queryByText(/streams selected/i)).not.toBeInTheDocument(); + }); + + it('does not show Select All checkbox when no selectable streams exist', () => { + const streams = [ + createMockStream('1', 'completed'), + createMockStream('2', 'canceled'), + ]; + + render( + + ); + + const checkboxes = screen.queryAllByRole('checkbox'); + expect(checkboxes).toHaveLength(0); + }); +}); + +describe('StreamsTable - Bulk Cancellation', () => { + const mockOnCancel = vi.fn(); + const mockOnEditStartTime = vi.fn(); + const mockOnFiltersChange = vi.fn(); + const mockOnRefresh = vi.fn(); + + beforeEach(() => { + vi.clearAllMocks(); + }); + + afterEach(() => { + cleanup(); + }); + + it('shows bulk action bar when streams are selected', () => { + const streams = [createMockStream('1', 'active')]; + + render( + + ); + + const checkbox = screen.getAllByRole('checkbox')[1]; + fireEvent.click(checkbox); + + expect(screen.getByText(/1 stream selected/i)).toBeInTheDocument(); + expect(screen.getByText(/Cancel 1 Stream/i)).toBeInTheDocument(); + }); + + it('calls cancelStream sequentially for each selected stream', async () => { + const mockCancelStream = vi.mocked(api.cancelStream); + mockCancelStream.mockResolvedValue(createMockStream('1', 'canceled')); + + const streams = [ + createMockStream('1', 'active'), + createMockStream('2', 'active'), + createMockStream('3', 'active'), + ]; + + render( + + ); + + // Select all streams + const selectAllCheckbox = screen.getByLabelText(/select all streams/i); + fireEvent.click(selectAllCheckbox); + + // Click bulk cancel button + const cancelButton = screen.getByText(/Cancel 3 Streams/i); + fireEvent.click(cancelButton); + + // Wait for all cancellations to complete + await waitFor(() => { + expect(mockCancelStream).toHaveBeenCalledTimes(3); + }); + + // Verify sequential calls + expect(mockCancelStream).toHaveBeenNthCalledWith(1, '1'); + expect(mockCancelStream).toHaveBeenNthCalledWith(2, '2'); + expect(mockCancelStream).toHaveBeenNthCalledWith(3, '3'); + + // Verify refresh was called + expect(mockOnRefresh).toHaveBeenCalledTimes(1); + }); + + it('shows progress during bulk cancellation', async () => { + const mockCancelStream = vi.mocked(api.cancelStream); + let resolveFirst: () => void; + let resolveSecond: () => void; + + mockCancelStream + .mockImplementationOnce( + () => + new Promise((resolve) => { + resolveFirst = () => resolve(createMockStream('1', 'canceled')); + }) + ) + .mockImplementationOnce( + () => + new Promise((resolve) => { + resolveSecond = () => resolve(createMockStream('2', 'canceled')); + }) + ); + + const streams = [ + createMockStream('1', 'active'), + createMockStream('2', 'active'), + ]; + + render( + + ); + + const selectAllCheckbox = screen.getByLabelText(/select all streams/i); + fireEvent.click(selectAllCheckbox); + + const cancelButton = screen.getByText(/Cancel 2 Streams/i); + fireEvent.click(cancelButton); + + // Should show progress + await waitFor(() => { + expect(screen.getByText(/Canceling 1\/2/i)).toBeInTheDocument(); + }); + + resolveFirst!(); + + await waitFor(() => { + expect(screen.getByText(/Canceling 2\/2/i)).toBeInTheDocument(); + }); + + resolveSecond!(); + + // Bulk action bar should disappear after completion + await waitFor(() => { + expect(screen.queryByText(/streams selected/i)).not.toBeInTheDocument(); + }); + }); + + it('continues cancellation even if some streams fail', async () => { + const mockCancelStream = vi.mocked(api.cancelStream); + mockCancelStream + .mockResolvedValueOnce(createMockStream('1', 'canceled')) + .mockRejectedValueOnce(new Error('Network error')) + .mockResolvedValueOnce(createMockStream('3', 'canceled')); + + const streams = [ + createMockStream('1', 'active'), + createMockStream('2', 'active'), + createMockStream('3', 'active'), + ]; + + render( + + ); + + const selectAllCheckbox = screen.getByLabelText(/select all streams/i); + fireEvent.click(selectAllCheckbox); + + const cancelButton = screen.getByText(/Cancel 3 Streams/i); + fireEvent.click(cancelButton); + + // Should still call all three + await waitFor(() => { + expect(mockCancelStream).toHaveBeenCalledTimes(3); + }); + + // Should still refresh + expect(mockOnRefresh).toHaveBeenCalledTimes(1); + }); + + it('clears selection after bulk cancellation completes', async () => { + const mockCancelStream = vi.mocked(api.cancelStream); + mockCancelStream.mockResolvedValue(createMockStream('1', 'canceled')); + + const streams = [createMockStream('1', 'active')]; + + render( + + ); + + const checkbox = screen.getAllByRole('checkbox')[1]; + fireEvent.click(checkbox); + + const cancelButton = screen.getByText(/Cancel 1 Stream/i); + fireEvent.click(cancelButton); + + await waitFor(() => { + expect(screen.queryByText(/stream selected/i)).not.toBeInTheDocument(); + }); + }); + + it('disables cancel button during bulk cancellation', async () => { + const mockCancelStream = vi.mocked(api.cancelStream); + let resolve: () => void; + mockCancelStream.mockImplementation( + () => + new Promise((res) => { + resolve = () => res(createMockStream('1', 'canceled')); + }) + ); + + const streams = [createMockStream('1', 'active')]; + + render( + + ); + + const checkbox = screen.getAllByRole('checkbox')[1]; + fireEvent.click(checkbox); + + const cancelButton = screen.getByText(/Cancel 1 Stream/i) as HTMLButtonElement; + fireEvent.click(cancelButton); + + await waitFor(() => { + expect(cancelButton.disabled).toBe(true); + }); + + resolve!(); + await waitFor(() => { + expect(screen.queryByText(/stream selected/i)).not.toBeInTheDocument(); + }); }); }); \ No newline at end of file diff --git a/frontend/src/components/StreamsTable.tsx b/frontend/src/components/StreamsTable.tsx index 9137a4e..ae6089c 100644 --- a/frontend/src/components/StreamsTable.tsx +++ b/frontend/src/components/StreamsTable.tsx @@ -1,4 +1,4 @@ - +import { useState, useMemo, useRef, useEffect, type RefObject } from "react"; import { Stream } from "../types/stream"; import { getExportCsvUrl, ListStreamsFilters, cancelStream } from "../services/api"; import { CopyableAddress } from "./CopyableAddress"; @@ -19,6 +19,7 @@ interface StreamsTableProps { * Receives the stream AND the button ref so the modal can return focus. */ onEditStartTime: (stream: Stream, triggerRef: RefObject) => void; + onRefresh?: () => void; } function statusClass(status: Stream["progress"]["status"]): string { @@ -36,14 +37,109 @@ function formatTimestamp(unixSeconds: number): string { return new Date(unixSeconds * 1000).toLocaleString(); } +type SortColumn = "status" | "amount" | "vested" | "startDate" | null; +type SortDirection = "asc" | "desc" | null; +export function StreamsTable({ + streams, + filters, + onFiltersChange, + onCancel, + onPause, + onResume, + onOpenStream, + onEditStartTime, + onRefresh, +}: StreamsTableProps) { + const [expandedStreamId, setExpandedStreamId] = useState(null); + const [sortColumn, setSortColumn] = useState(null); + const [sortDirection, setSortDirection] = useState(null); + const [selectedStreamIds, setSelectedStreamIds] = useState>(new Set()); + const [isBulkCanceling, setIsBulkCanceling] = useState(false); + const [bulkCancelProgress, setBulkCancelProgress] = useState<{ current: number; total: number }>({ + current: 0, + total: 0, + }); + + const exportUrl = useMemo(() => getExportCsvUrl(filters as Record), [filters]); + + const toggleTimeline = (streamId: string) => { + setExpandedStreamId((prev) => (prev === streamId ? null : streamId)); + }; - + const handleHeaderClick = (column: SortColumn) => { + if (sortColumn === column) { + if (sortDirection === "asc") { + setSortDirection("desc"); + } else if (sortDirection === "desc") { + setSortColumn(null); + setSortDirection(null); + } + } else { + setSortColumn(column); + setSortDirection("asc"); + } }; + // Sort streams based on current sort state + const sortedStreams = useMemo(() => { + if (!sortColumn || !sortDirection) { + return streams; + } + + const sorted = [...streams]; + + sorted.sort((a, b) => { + let valueA: number | string | Date; + let valueB: number | string | Date; + + switch (sortColumn) { + case "status": { + const statusOrder: Record = { + active: 0, + scheduled: 1, + completed: 2, + canceled: 3, + paused: 4, + }; + valueA = statusOrder[a.progress.status] ?? 999; + valueB = statusOrder[b.progress.status] ?? 999; + break; + } + case "amount": { + valueA = a.totalAmount; + valueB = b.totalAmount; + break; + } + case "vested": { + valueA = a.progress.vestedAmount; + valueB = b.progress.vestedAmount; + break; + } + case "startDate": { + valueA = a.startAt; + valueB = b.startAt; + break; + } + default: + return 0; + } + + if (valueA < valueB) { + return sortDirection === "asc" ? -1 : 1; + } + if (valueA > valueB) { + return sortDirection === "asc" ? 1 : -1; + } + return 0; + }); + + return sorted; + }, [streams, sortColumn, sortDirection]); + // Helper: determine if a stream is eligible for selection (active or scheduled) const isStreamSelectable = (stream: Stream): boolean => { - return stream.progress.status === "active" || stream.progress.status === "scheduled"; + return stream.progress.status === "active" || stream.progress.status === "paused" || stream.progress.status === "scheduled"; }; // Get all selectable streams on current page @@ -128,7 +224,17 @@ function formatTimestamp(unixSeconds: number): string { ); }; - + // Clear selections when streams change (e.g., after filter change) + useEffect(() => { + setSelectedStreamIds((prev) => { + const validIds = new Set(streams.map((s) => s.id)); + const next = new Set(); + prev.forEach((id) => { + if (validIds.has(id)) next.add(id); + }); + return next; + }); + }, [streams]); return (
@@ -147,7 +253,89 @@ function formatTimestamp(unixSeconds: number): string {
- + {sortedStreams.length === 0 ? ( +

No streams match your filters.

+ ) : ( +
+ + + + + + + + + + + + {sortedStreams.map((stream) => { const isScheduled = stream.progress.status === "scheduled"; @@ -156,6 +344,7 @@ function formatTimestamp(unixSeconds: number): string { stream.progress.status === "canceled"; const isExpanded = expandedStreamId === stream.id; const healthBadges = getHealthBadges(stream); + const isSelected = selectedStreamIds.has(stream.id); return ( handleCheckboxToggle(stream.id)} onToggleTimeline={toggleTimeline} onCancel={onCancel} onPause={onPause} @@ -178,9 +370,7 @@ function formatTimestamp(unixSeconds: number): string {
+ {selectableStreams.length > 0 && ( + + )} + IDRoute + +
+ +
+ 		+ + + + Actions
)} -
- {/* Floating Action Bar */} {selectedStreamIds.size > 0 && ( )} - +
); } -/** - * BulkActionBar Component - * - * Floating action bar that appears at the bottom of the viewport when streams are selected. - * Provides visual feedback during bulk cancellation operations. - * - * Features: - * - Fixed positioning with high z-index (1000) to stay above other content - * - Slide-up animation on mount - * - Shows selected count and cancel button - * - Displays progress during cancellation (e.g., "Canceling 3/10...") - * - Button is disabled during operation to prevent duplicate submissions - * - Responsive design: centered on desktop, full-width on mobile - */ interface BulkActionBarProps { selectedCount: number; onCancel: () => void; @@ -240,16 +416,15 @@ function BulkActionBar({ ); } -// ── StreamRow ───────────────────────────────────────────────────────────── -// Extracted so each row can hold its own triggerRef without polluting the -// parent component's hook rules. - interface StreamRowProps { stream: Stream; isScheduled: boolean; isFinalised: boolean; isExpanded: boolean; healthBadges: ReturnType; + isSelected: boolean; + isSelectable: boolean; + onToggleSelect: () => void; onToggleTimeline: (id: string) => void; onCancel: (id: string) => Promise; onPause: (id: string) => Promise; @@ -264,6 +439,9 @@ function StreamRow({ isFinalised, isExpanded, healthBadges, + isSelected, + isSelectable, + onToggleSelect, onToggleTimeline, onCancel, onPause, @@ -271,17 +449,58 @@ function StreamRow({ onEditStartTime, onOpenStream, }: StreamRowProps) { - /** - * Stable ref to the "✏️ Edit" button in this row. - * Passed to the modal so focus returns here when the modal closes. - */ const editBtnRef = useRef(null); const isPaused = stream.progress.status === "paused"; const isActive = stream.progress.status === "active"; return ( <> - + { + if (e.key === "Enter") { + const target = e.target as HTMLElement; + if ( + target.tagName === "BUTTON" || + target.closest("button") || + target.tagName === "A" || + target.closest("a") || + target.tagName === "INPUT" || + target.closest("input") + ) { + return; + } + e.preventDefault(); + onOpenStream?.(stream.id); + } + }} + onClick={(e) => { + const target = e.target as HTMLElement; + if ( + target.tagName === "BUTTON" || + target.closest("button") || + target.tagName === "A" || + target.closest("a") || + target.tagName === "INPUT" || + target.closest("input") + ) { + return; + } + onOpenStream?.(stream.id); + }} + > + + {isSelectable && ( + + )} +