Merge pull request #2834 from bluewave-labs/develop

develop -> master
Merge pull request #2831 from bluewave-labs/develop
2025-08-21 10:13:48 -07:00 · 2025-08-21 09:15:40 -07:00 · 2025-08-20 14:05:35 -07:00 · 2025-08-15 12:21:10 -07:00 · 2025-08-14 15:28:35 -07:00 · 2025-07-14 14:23:40 -07:00
28 changed files with 1779 additions and 570 deletions
@@ -1 +0,0 @@
-.vscode
@@ -491,6 +491,262 @@
 			"integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
 			"license": "MIT"
 		},
+		"node_modules/@esbuild/aix-ppc64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+			"integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+			"cpu": [
+				"ppc64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/android-arm": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+			"integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
+			"cpu": [
+				"arm"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/android-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+			"integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/android-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+			"integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/darwin-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+			"integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/darwin-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+			"integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/freebsd-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+			"integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-arm": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+			"integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+			"cpu": [
+				"arm"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+			"integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-ia32": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+			"integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+			"cpu": [
+				"ia32"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-loong64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+			"integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+			"cpu": [
+				"loong64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-mips64el": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+			"integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+			"cpu": [
+				"mips64el"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-ppc64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+			"integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+			"cpu": [
+				"ppc64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-riscv64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+			"integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
+			"cpu": [
+				"riscv64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-s390x": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+			"integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+			"cpu": [
+				"s390x"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@esbuild/linux-x64": {
 			"version": "0.25.5",
 			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
@@ -507,6 +763,134 @@
 				"node": ">=18"
 			}
 		},
+		"node_modules/@esbuild/netbsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/netbsd-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+			"integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openbsd-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+			"integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openbsd-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+			"integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/sunos-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+			"integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/win32-arm64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+			"integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/win32-ia32": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+			"integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+			"cpu": [
+				"ia32"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/win32-x64": {
+			"version": "0.25.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+			"integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@eslint-community/eslint-utils": {
 			"version": "4.7.0",
 			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
@@ -1679,6 +2063,123 @@
 				}
 			}
 		},
+		"node_modules/@rollup/rollup-android-arm-eabi": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.41.0.tgz",
+			"integrity": "sha512-KxN+zCjOYHGwCl4UCtSfZ6jrq/qi88JDUtiEFk8LELEHq2Egfc/FgW+jItZiOLRuQfb/3xJSgFuNPC9jzggX+A==",
+			"cpu": [
+				"arm"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			]
+		},
+		"node_modules/@rollup/rollup-android-arm64": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.41.0.tgz",
+			"integrity": "sha512-yDvqx3lWlcugozax3DItKJI5j05B0d4Kvnjx+5mwiUpWramVvmAByYigMplaoAQ3pvdprGCTCE03eduqE/8mPQ==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			]
+		},
+		"node_modules/@rollup/rollup-darwin-arm64": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.41.0.tgz",
+			"integrity": "sha512-2KOU574vD3gzcPSjxO0eyR5iWlnxxtmW1F5CkNOHmMlueKNCQkxR6+ekgWyVnz6zaZihpUNkGxjsYrkTJKhkaw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@rollup/rollup-darwin-x64": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.41.0.tgz",
+			"integrity": "sha512-gE5ACNSxHcEZyP2BA9TuTakfZvULEW4YAOtxl/A/YDbIir/wPKukde0BNPlnBiP88ecaN4BJI2TtAd+HKuZPQQ==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@rollup/rollup-freebsd-arm64": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.41.0.tgz",
+			"integrity": "sha512-GSxU6r5HnWij7FoSo7cZg3l5GPg4HFLkzsFFh0N/b16q5buW1NAWuCJ+HMtIdUEi6XF0qH+hN0TEd78laRp7Dg==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			]
+		},
+		"node_modules/@rollup/rollup-freebsd-x64": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.41.0.tgz",
+			"integrity": "sha512-KGiGKGDg8qLRyOWmk6IeiHJzsN/OYxO6nSbT0Vj4MwjS2XQy/5emsmtoqLAabqrohbgLWJ5GV3s/ljdrIr8Qjg==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.41.0.tgz",
+			"integrity": "sha512-46OzWeqEVQyX3N2/QdiU/CMXYDH/lSHpgfBkuhl3igpZiaB3ZIfSjKuOnybFVBQzjsLwkus2mjaESy8H41SzvA==",
+			"cpu": [
+				"arm"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.41.0.tgz",
+			"integrity": "sha512-lfgW3KtQP4YauqdPpcUZHPcqQXmTmH4nYU0cplNeW583CMkAGjtImw4PKli09NFi2iQgChk4e9erkwlfYem6Lg==",
+			"cpu": [
+				"arm"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-arm64-gnu": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.41.0.tgz",
+			"integrity": "sha512-nn8mEyzMbdEJzT7cwxgObuwviMx6kPRxzYiOl6o/o+ChQq23gfdlZcUNnt89lPhhz3BYsZ72rp0rxNqBSfqlqw==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
 		"node_modules/@rollup/rollup-linux-arm64-musl": {
 			"version": "4.41.0",
 			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.41.0.tgz",
@@ -1692,6 +2193,71 @@
 				"linux"
 			]
 		},
+		"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.41.0.tgz",
+			"integrity": "sha512-WbnJaxPv1gPIm6S8O/Wg+wfE/OzGSXlBMbOe4ie+zMyykMOeqmgD1BhPxZQuDqwUN+0T/xOFtL2RUWBspnZj3w==",
+			"cpu": [
+				"loong64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.41.0.tgz",
+			"integrity": "sha512-eRDWR5t67/b2g8Q/S8XPi0YdbKcCs4WQ8vklNnUYLaSWF+Cbv2axZsp4jni6/j7eKvMLYCYdcsv8dcU+a6QNFg==",
+			"cpu": [
+				"ppc64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.41.0.tgz",
+			"integrity": "sha512-TWrZb6GF5jsEKG7T1IHwlLMDRy2f3DPqYldmIhnA2DVqvvhY2Ai184vZGgahRrg8k9UBWoSlHv+suRfTN7Ua4A==",
+			"cpu": [
+				"riscv64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-riscv64-musl": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.41.0.tgz",
+			"integrity": "sha512-ieQljaZKuJpmWvd8gW87ZmSFwid6AxMDk5bhONJ57U8zT77zpZ/TPKkU9HpnnFrM4zsgr4kiGuzbIbZTGi7u9A==",
+			"cpu": [
+				"riscv64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@rollup/rollup-linux-s390x-gnu": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.41.0.tgz",
+			"integrity": "sha512-/L3pW48SxrWAlVsKCN0dGLB2bi8Nv8pr5S5ocSM+S0XCn5RCVCXqi8GVtHFsOBBCSeR+u9brV2zno5+mg3S4Aw==",
+			"cpu": [
+				"s390x"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
 			"version": "4.41.0",
 			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.41.0.tgz",
@@ -1718,6 +2284,45 @@
 				"linux"
 			]
 		},
+		"node_modules/@rollup/rollup-win32-arm64-msvc": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.41.0.tgz",
+			"integrity": "sha512-4yodtcOrFHpbomJGVEqZ8fzD4kfBeCbpsUy5Pqk4RluXOdsWdjLnjhiKy2w3qzcASWd04fp52Xz7JKarVJ5BTg==",
+			"cpu": [
+				"arm64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@rollup/rollup-win32-ia32-msvc": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.41.0.tgz",
+			"integrity": "sha512-tmazCrAsKzdkXssEc65zIE1oC6xPHwfy9d5Ta25SRCDOZS+I6RypVVShWALNuU9bxIfGA0aqrmzlzoM5wO5SPQ==",
+			"cpu": [
+				"ia32"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@rollup/rollup-win32-x64-msvc": {
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.41.0.tgz",
+			"integrity": "sha512-h1J+Yzjo/X+0EAvR2kIXJDuTuyT7drc+t2ALY0nIcGPbTatNOf0VWdhEA2Z4AAjv6X1NJV7SYo5oCTYRJhSlVA==",
+			"cpu": [
+				"x64"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
 		"node_modules/@sideway/address": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -3737,15 +4342,14 @@
 			}
 		},
 		"node_modules/form-data": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-			"integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+			"integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
 			"license": "MIT",
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
 				"es-set-tostringtag": "^2.1.0",
-				"hasown": "^2.0.2",
 				"mime-types": "^2.1.12"
 			},
 			"engines": {
@@ -3759,6 +4363,20 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -1,6 +1,5 @@
 export const tooltipDateFormatLookup = (dateRange) => {
 	const dateFormatLookup = {
-		recent: "ddd. MMMM D, YYYY, hh:mm A",
 		day: "ddd. MMMM D, YYYY, hh:mm A",
 		week: "ddd. MMMM D, YYYY, hh:mm A",
 		month: "ddd. MMMM D, YYYY",
@@ -7,7 +7,6 @@ import {
 	TableHead,
 	TableRow,
 } from "@mui/material";
-import Tooltip from "@mui/material/Tooltip";
 import SkeletonLayout from "./skeleton";
 import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
@@ -42,7 +41,6 @@ const DataTable = ({
 	data = [],
 	config = {
 		emptyView: "No data",
-		tooltipContent: null,
 		onRowClick: () => {},
 	},
 }) => {
@@ -103,54 +101,24 @@ const DataTable = ({
 						data.map((row) => {
 							const key = row.id || row._id || Math.random();
 							return (
-								<Tooltip
+								<TableRow
 									key={key}
-									followCursor
-									enterDelay={500}
-									enterNextDelay={500}
-									title={
-										typeof config.tooltipContent === "function"
-											? config.tooltipContent(row)
-											: config.tooltipContent
-									}
-									slotProps={{
-										tooltip: {
-											sx: {
-												background: "unset",
-											},
-										},
-										popper: {
-											modifiers: [
-												{
-													name: "offset",
-													options: {
-														offset: ({ popper }) => {
-															return [popper.width / 2 + 20, -popper.height / 8];
-														},
-													},
-												},
-											],
-										},
-									}}
+									sx={config?.rowSX ?? {}}
+									onClick={config?.onRowClick ? () => config.onRowClick(row) : null}
 								>
-									<TableRow
-										sx={config?.rowSX ?? {}}
-										onClick={config?.onRowClick ? () => config.onRowClick(row) : null}
-									>
-										{headers.map((header, index) => {
-											return (
-												<TableCell
-													align={index === 0 ? "left" : "center"}
-													key={header.id}
-													onClick={header.onClick ? (e) => header.onClick(e, row) : null}
-													sx={header.getCellSx ? header.getCellSx(row) : {}}
-												>
-													{header.render(row)}
-												</TableCell>
-											);
-										})}
-									</TableRow>
-								</Tooltip>
+									{headers.map((header, index) => {
+										return (
+											<TableCell
+												align={index === 0 ? "left" : "center"}
+												key={header.id}
+												onClick={header.onClick ? (e) => header.onClick(e, row) : null}
+												sx={header.getCellSx ? header.getCellSx(row) : {}}
+											>
+												{header.render(row)}
+											</TableCell>
+										);
+									})}
+								</TableRow>
 							);
 						})
 					)}
@@ -15,6 +15,9 @@ const useFetchLogs = () => {
 				setIsLoading(true);
 				const response = await networkService.getLogs();
 				setLogs(response.data.data);
+				createToast({
+					body: t("logsPage.toast.fetchLogsSuccess"),
+				});
 			} catch (error) {
 				setError(error);
 				createToast({
@@ -1,10 +1,5 @@
 //Components
-import Stack from "@mui/material/Stack";
-import DataTable from "../../../../Components/Table";
-import Table from "@mui/material/Table";
-import TableBody from "@mui/material/TableBody";
-import TableRow from "@mui/material/TableRow";
-import TableCell from "@mui/material/TableCell";
+import Table from "../../../../Components/Table";
 import TableSkeleton from "../../../../Components/Table/skeleton";
 import Pagination from "../../../../Components/Table/TablePagination";
 import { StatusLabel } from "../../../../Components/Label";
@@ -21,68 +16,7 @@ import { useTranslation } from "react-i18next";
 import { useFetchChecksTeam } from "../../../../Hooks/checkHooks";
 import { useFetchChecksByMonitor } from "../../../../Hooks/checkHooks";
 import { useResolveIncident } from "../../../../Hooks/checkHooks";
-import { Button, Typography, useTheme } from "@mui/material";
-import { lighten } from "@mui/material/styles";
-
-const GetTooltip = (row) => {
-	const theme = useTheme();
-	const phases = row?.timings?.phases;
-
-	const phaseKeyFormattingMap = {
-		firstByte: "first byte",
-	};
-	return (
-		<Stack
-			backgroundColor={lighten(theme.palette.primary.main, 0.1)}
-			border={`1px solid ${theme.palette.primary.lowContrast}`}
-			borderRadius={theme.shape.borderRadius}
-			py={theme.spacing(2)}
-			px={theme.spacing(4)}
-		>
-			<Typography
-				variant="body2"
-				color={theme.palette.primary.contrastText}
-			>{`Status code: ${row?.statusCode}`}</Typography>
-			<Typography
-				variant="body2"
-				color={theme.palette.primary.contrastText}
-			>{`Response time: ${row?.responseTime} ms`}</Typography>
-			{phases && (
-				<>
-					<Typography
-						variant="body2"
-						color={theme.palette.primary.contrastText}
-					>{`Request timing: `}</Typography>
-					<Table
-						size="small"
-						sx={{ ml: theme.spacing(2), mt: theme.spacing(2) }}
-					>
-						<TableBody>
-							{Object.keys(phases)?.map((phaseKey) => (
-								<TableRow key={phaseKey}>
-									<TableCell sx={{ border: "none", p: 0 }}>
-										<Typography
-											variant="body2"
-											color="success"
-										>
-											{`${phaseKeyFormattingMap[phaseKey] || phaseKey}:`}
-										</Typography>
-									</TableCell>
-									<TableCell sx={{ border: "none", p: 0 }}>
-										<Typography
-											color={theme.palette.primary.contrastText}
-											variant="body2"
-										>{`${phases[phaseKey]} ms`}</Typography>
-									</TableCell>
-								</TableRow>
-							))}
-						</TableBody>
-					</Table>
-				</>
-			)}
-		</Stack>
-	);
-};
+import { Button, Typography } from "@mui/material";

 const IncidentTable = ({
 	isLoading,
@@ -233,10 +167,9 @@ const IncidentTable = ({

 	return (
 		<>
-			<DataTable
+			<Table
 				headers={headers}
 				data={checks}
-				config={{ tooltipContent: GetTooltip }}
 			/>
 			<Pagination
 				paginationLabel={t("incidentsTablePaginationLabel")}
@@ -121,7 +121,6 @@ const InfrastructureDetails = () => {
 						<AreaChartBoxes
 							shouldRender={!isLoading}
 							monitor={monitor}
-							dateRange={dateRange}
 						/>
 					</>
 				)}
@@ -46,11 +46,6 @@ const JobTable = ({ jobs = [] }) => {
 			content: t("queuePage.jobTable.urlHeader"),
 			render: (row) => row.monitorUrl,
 		},
-		{
-			id: "interval",
-			content: t("queuePage.jobTable.intervalHeader"),
-			render: (row) => `${row.monitorInterval} ms`,
-		},
 		{
 			id: "type",
 			content: t("queuePage.jobTable.typeHeader"),
@@ -29,7 +29,7 @@ const SettingsURL = ({ HEADING_SX, handleChange, showURL = false }) => {
 				<Select
 					name="showURL"
 					label={t("settingsPage.urlSettings.label")}
-					value={showURL === true}
+					value={showURL || ""}
 					onChange={handleChange}
 					items={[
 						{ _id: true, name: t("settingsPage.urlSettings.selectEnabled") },
@@ -130,12 +130,10 @@ const monitorValidation = joi.object({
 		then: joi
 			.string()
 			.trim()
-			.regex(
-				/^(\/+)?([a-zA-Z0-9][a-zA-Z0-9_.-]*[a-zA-Z0-9]|[a-zA-Z0-9]+|[a-f0-9]{12,64})$/
-			)
+			.regex(/^[a-z0-9]{64}$/)
 			.messages({
 				"string.empty": "This field is required.",
-				"string.pattern.base": "Please enter a valid container name or ID.",
+				"string.pattern.base": "Please enter a valid 64-character Docker container ID.",
 			}),
 		otherwise: joi
 			.string()
@@ -251,7 +251,7 @@
 	"edit": "Edit",
 	"createA": "Create a",
 	"remove": "Remove",
-	"maintenanceWindowDescription": "During maintenance windows, all monitoring is suspended for selected monitors. No network checks will be performed, preventing any status updates or notifications from being triggered. Your monitors will appear frozen at their last known status, and status pages will display a maintenance indicator. Once the maintenance window ends, monitoring automatically resumes, and alerts will trigger if issues are detected. Maintenance periods do not count against uptime calculations.",
+	"maintenanceWindowDescription": "Your pings won't be sent during this time frame",
 	"startTime": "Start time",
 	"timeZoneInfo": "All dates and times are in GMT+0 time zone.",
 	"monitorsToApply": "Monitors to apply maintenance window to",
@@ -440,7 +440,7 @@
 	"uptimeGeneralInstructions": {
 		"http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.",
 		"ping": "Enter the IP address or hostname to ping (e.g., 192.168.1.100 or example.com) and add a clear display name that appears on the dashboard.",
-		"docker": "Enter the Docker container name or ID. You can use either the container name (e.g., my-app) or the container ID (full 64-char ID or short ID).",
+		"docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inspect <short_id> to get the full container ID.",
 		"port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard.",
 		"game": "Enter the IP address or hostname and the port number to ping (e.g., 192.168.1.100 or example.com) and choose game type."
 	},
@@ -740,7 +740,6 @@
 			"idHeader": "Monitor ID",
 			"urlHeader": "URL",
 			"typeHeader": "Type",
-			"intervalHeader": "Interval",
 			"activeHeader": "Active",
 			"lockedAtHeader": "Locked at",
 			"runCountHeader": "Run count",
@@ -1015,9 +1014,9 @@
 	},
 	"monitorType": {
 		"docker": {
-			"label": "Container Name/ID",
+			"label": "Container ID",
 			"namePlaceholder": "My Container",
-			"placeholder": "my-app or abcd1234"
+			"placeholder": "abcd1234"
 		},
 		"http": {
 			"label": "URL to monitor",
@@ -5,7 +5,7 @@ import { execSync } from "child_process";

 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version = "3.1.4";
+	let version = "3.1.1";

 	return {
 		base: "/",
@@ -15,8 +15,9 @@ services:
      - mongodb
  mongodb:
    image: mongo:4.4.18
+    container_name: checkmate-mongodb
    restart: always
-    command: ["mongod", "--quiet", --bind_ip_all"]
+    command: ["mongod", "--replSet", "rs0", "--bind_ip_all"]
    ports:
      - "27017:27017"
    volumes:
@@ -46,7 +46,7 @@
 		"ping": "0.4.4",
 		"sharp": "0.33.5",
 		"ssl-checker": "2.0.10",
-		"super-simple-scheduler": "1.4.0",
+		"super-simple-scheduler": "1.3.0",
 		"swagger-ui-express": "5.0.1",
 		"winston": "^3.13.0"
 	},
@@ -94,7 +94,7 @@ class AuthController extends BaseController {
 			await registrationBodyValidation.validateAsync(req.body);
 			const { user, token } = await this.userService.registerUser(req.body, req.file);
 			res.success({
-				msg: this.stringService.get("authCreateUser"),
+				msg: this.stringService.authCreateUser,
 				data: { user, token },
 			});
 		},
@@ -26,7 +26,7 @@ class StatusPageController extends BaseController {
 				teamId,
 			});
 			return res.success({
-				msg: this.stringService.get("statusPageCreate"),
+				msg: this.stringService.statusPageCreate,
 				data: statusPage,
 			});
 		},
@@ -41,10 +41,10 @@ class StatusPageController extends BaseController {

 			const statusPage = await this.db.statusPageModule.updateStatusPage(req.body, req.file);
 			if (statusPage === null) {
-				throw this.errorService.createNotFoundError(this.stringService.get("statusPageNotFound"));
+				throw this.errorService.createNotFoundError(this.stringService.statusPageNotFound);
 			}
 			return res.success({
-				msg: this.stringService.get("statusPageUpdate"),
+				msg: this.stringService.statusPageUpdate,
 				data: statusPage,
 			});
 		},
@@ -56,7 +56,7 @@ class StatusPageController extends BaseController {
 		async (req, res) => {
 			const statusPage = await this.db.statusPageModule.getStatusPage();
 			return res.success({
-				msg: this.stringService.get("statusPageByUrl"),
+				msg: this.stringService.statusPageByUrl,
 				data: statusPage,
 			});
 		},
@@ -71,7 +71,7 @@ class StatusPageController extends BaseController {

 			const statusPage = await this.db.statusPageModule.getStatusPageByUrl(req.params.url);
 			return res.success({
-				msg: this.stringService.get("statusPageByUrl"),
+				msg: this.stringService.statusPageByUrl,
 				data: statusPage,
 			});
 		},
@@ -85,7 +85,7 @@ class StatusPageController extends BaseController {
 			const statusPages = await this.db.statusPageModule.getStatusPagesByTeamId(teamId);

 			return res.success({
-				msg: this.stringService.get("statusPageByTeamId"),
+				msg: this.stringService.statusPageByTeamId,
 				data: statusPages,
 			});
 		},
@@ -95,9 +95,9 @@ class StatusPageController extends BaseController {

 	deleteStatusPage = this.asyncHandler(
 		async (req, res) => {
-			await this.db.statusPageModule.deleteStatusPage(req.params.url);
+			await this.db.deleteStatusPage(req.params.url);
 			return res.success({
-				msg: this.stringService.get("statusPageDelete"),
+				msg: this.stringService.statusPageDelete,
 			});
 		},
 		SERVICE_NAME,
@@ -72,7 +72,7 @@ const CheckSchema = new mongoose.Schema(
 		},
 		type: {
 			type: String,
-			enum: ["http", "ping", "pagespeed", "hardware", "docker", "port", "game"],
+			enum: ["http", "hardware", "pagespeed", "distributed"],
 			required: true,
 			index: true,
 		},
@@ -38,7 +38,7 @@ const MonitorSchema = mongoose.Schema(
 		},
 		statusWindowThreshold: {
 			type: Number,
-			default: 60,
+			default: 0.6,
 		},
 		type: {
 			type: String,
@@ -1,6 +1,6 @@
 import mongoose from "mongoose";
 import AppSettings from "../models/AppSettings.js";
-import { runMigrations } from "./migration/index.js";
+
 class MongoDB {
 	static SERVICE_NAME = "MongoDB";

@@ -65,8 +65,6 @@ class MongoDB {
 				service: this.SERVICE_NAME,
 				method: "connect",
 			});
-
-			await runMigrations();
 		} catch (error) {
 			this.logger.error({
 				message: error.message,
@@ -1,18 +0,0 @@
-import Monitor from "../../models/Monitor.js";
-async function migrateStatusWindowThreshold() {
-	try {
-		const monitors = await Monitor.find({ statusWindowThreshold: { $lt: 1 } });
-		for (const monitor of monitors) {
-			monitor.statusWindowThreshold = monitor.statusWindowThreshold * 100;
-			await monitor.save();
-			console.log(`Migrated monitor ${monitor._id}: statusWindowThreshold set to ${monitor.statusWindowThreshold}`);
-		}
-		console.log("StatusWindowThreshold migration complete.");
-		return true;
-	} catch (err) {
-		console.error("Migration error:", err);
-		return false;
-	}
-}
-
-export { migrateStatusWindowThreshold };
@@ -1,7 +0,0 @@
-import { migrateStatusWindowThreshold } from "./0001_migrateStatusWindowThreshold.js";
-
-const runMigrations = async () => {
-	await migrateStatusWindowThreshold();
-};
-
-export { runMigrations };
@@ -88,7 +88,7 @@ class SuperSimpleQueue {
 	};

 	updateJob = async (monitor) => {
-		this.scheduler.updateJob(monitor._id.toString(), { repeat: monitor.interval, data: monitor.toObject() });
+		this.scheduler.updateJob(monitor._id.toString(), monitor.interval);
 	};

 	shutdown = async () => {
@@ -141,7 +141,6 @@ class SuperSimpleQueue {
 				monitorId: job.id,
 				monitorUrl: job?.data?.url || null,
 				monitorType: job?.data?.type || null,
-				monitorInterval: job?.data?.interval || null,
 				active: job.active,
 				lockedAt: job.lockedAt,
 				runCount: job.runCount || 0,
@@ -1,5 +1,3 @@
-import { match } from "assert";
-
 const SERVICE_NAME = "NetworkService";

 class NetworkService {
@@ -149,24 +147,16 @@ class NetworkService {
 			httpResponse.payload = payload;
 			httpResponse.timings = response.timings || {};

-			if (!expectedValue && !jsonPath) {
+			if (!expectedValue) {
 				return httpResponse;
 			}

-			if (expectedValue) {
-				let ok = false;
-				if (matchMethod === "equal") ok = payload === expectedValue;
-				if (matchMethod === "include") ok = payload.includes(expectedValue);
-				if (matchMethod === "regex") ok = new RegExp(expectedValue).test(payload);
-
-				if (ok === true) {
-					return httpResponse;
-				} else {
-					httpResponse.code = 500;
-					httpResponse.status = false;
-					return httpResponse;
-				}
-			}
+			this.logger.info({
+				service: this.SERVICE_NAME,
+				method: "requestHttp",
+				message: `Job: [${name}](${_id}) match result with expected value`,
+				details: { expectedValue, payload, jsonPath, matchMethod },
+			});

 			if (jsonPath) {
 				const contentType = response.headers["content-type"];
@@ -253,76 +243,24 @@ class NetworkService {
 				handleError: true, // Enable error handling
 			});

+			const containers = await docker.listContainers({ all: true });
+			const containerExists = containers.some((c) => c.Id.startsWith(monitor.url));
+			if (!containerExists) {
+				throw new Error(this.stringService.dockerNotFound);
+			}
+
+			const container = docker.getContainer(monitor.url);
+			const { response, responseTime, error } = await this.timeRequest(() => container.inspect());
+
 			const dockerResponse = {
 				monitorId: monitor._id,
 				type: monitor.type,
+				responseTime,
+				status: response?.State?.Status === "running" ? true : false,
+				code: 200,
+				message: "Docker container status fetched successfully",
 			};

-			const containers = await docker.listContainers({ all: true });
-
-			// Normalize input: strip leading slashes and convert to lowercase for comparison
-			const normalizedInput = monitor.url.replace(/^\/+/, "").toLowerCase();
-
-			// Priority-based matching to avoid ambiguity:
-			// 1. Exact full ID match (64-char)
-			let exactIdMatch = containers.find((c) => c.Id.toLowerCase() === normalizedInput);
-
-			// 2. Exact container name match (case-insensitive)
-			let exactNameMatch = containers.find((c) =>
-				c.Names.some((name) => {
-					const cleanName = name.replace(/^\/+/, "").toLowerCase();
-					return cleanName === normalizedInput;
-				})
-			);
-
-			// 3. Partial ID match (fallback for backwards compatibility)
-			let partialIdMatch = containers.find((c) => c.Id.toLowerCase().startsWith(normalizedInput));
-
-			// Select container based on priority
-			let targetContainer = exactIdMatch || exactNameMatch || partialIdMatch;
-
-			// Return negative response if no container
-			if (!targetContainer) {
-				this.logger.warn({
-					message: `No container found for "${monitor.url}".`,
-					service: this.SERVICE_NAME,
-					method: "requestDocker",
-					details: { url: monitor.url },
-				});
-
-				dockerResponse.code = 404;
-				dockerResponse.status = false;
-				dockerResponse.message = this.stringService.dockerNotFound;
-				return dockerResponse;
-			}
-
-			// Return negative response if ambiguous matches exist
-			const matchTypes = [];
-			if (exactIdMatch) matchTypes.push("exact ID");
-			if (exactNameMatch) matchTypes.push("exact name");
-			if (partialIdMatch && !exactIdMatch) matchTypes.push("partial ID");
-
-			if (matchTypes.length > 1) {
-				this.logger.warn({
-					message: `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`,
-					service: this.SERVICE_NAME,
-					method: "requestDocker",
-					details: { url: monitor.url },
-				});
-				dockerResponse.status = 404;
-				dockerResponse.status = false;
-				dockerResponse.message = `Ambiguous container match for "${monitor.url}". Matched by: ${matchTypes.join(", ")}. Using ${exactIdMatch ? "exact ID" : exactNameMatch ? "exact name" : "partial ID"} match.`;
-				return dockerResponse;
-			}
-
-			const container = docker.getContainer(targetContainer.Id);
-			const { response, responseTime, error } = await this.timeRequest(() => container.inspect());
-
-			dockerResponse.responseTime = responseTime;
-			dockerResponse.status = response?.State?.Status === "running" ? true : false;
-			dockerResponse.code = 200;
-			dockerResponse.message = "Docker container status fetched successfully";
-
 			if (error) {
 				dockerResponse.status = false;
 				dockerResponse.code = error.statusCode || this.NETWORK_ERROR;
@@ -158,7 +158,7 @@ class StatusService {
 				statusChanged = true;
 			}
 			// If the failure rate is below the threshold and the monitor is down, recover:
-			else if (failureRate < monitor.statusWindowThreshold && monitor.status === false) {
+			else if (failureRate <= monitor.statusWindowThreshold && monitor.status === false) {
 				newStatus = true;
 				statusChanged = true;
 			}
@@ -25,24 +25,423 @@ class StringService {
 		return this._language;
 	}

-	/**
-	 * Get translation by key with optional parameters
-	 * @param {string} key - Translation key
-	 * @param {Object} params - Optional parameters to replace in the translation
-	 * @returns {string} Translated string with replaced parameters
-	 */
-	get(key, params = {}) {
-		let translation = this.translationService.getTranslation(key);
-		
-		// Replace parameters in the translation
-		Object.keys(params).forEach(paramKey => {
-			const paramValue = params[paramKey];
-			// Support both {param} and ${param} syntax
-			translation = translation.replace(new RegExp(`\\{${paramKey}\\}`, 'g'), paramValue);
-			translation = translation.replace(new RegExp(`\\$\\{${paramKey}\\}`, 'g'), paramValue);
-		});
-		
-		return translation;
+	// Auth Messages
+	get dontHaveAccount() {
+		return this.translationService.getTranslation("dontHaveAccount");
+	}
+
+	get email() {
+		return this.translationService.getTranslation("email");
+	}
+
+	get forgotPassword() {
+		return this.translationService.getTranslation("forgotPassword");
+	}
+
+	get password() {
+		return this.translationService.getTranslation("password");
+	}
+
+	get signUp() {
+		return this.translationService.getTranslation("signUp");
+	}
+
+	get submit() {
+		return this.translationService.getTranslation("submit");
+	}
+
+	get title() {
+		return this.translationService.getTranslation("title");
+	}
+
+	get continue() {
+		return this.translationService.getTranslation("continue");
+	}
+
+	get enterEmail() {
+		return this.translationService.getTranslation("enterEmail");
+	}
+
+	get authLoginTitle() {
+		return this.translationService.getTranslation("authLoginTitle");
+	}
+
+	get authLoginEnterPassword() {
+		return this.translationService.getTranslation("authLoginEnterPassword");
+	}
+
+	get commonPassword() {
+		return this.translationService.getTranslation("commonPassword");
+	}
+
+	get commonBack() {
+		return this.translationService.getTranslation("commonBack");
+	}
+
+	get authForgotPasswordTitle() {
+		return this.translationService.getTranslation("authForgotPasswordTitle");
+	}
+
+	get authForgotPasswordResetPassword() {
+		return this.translationService.getTranslation("authForgotPasswordResetPassword");
+	}
+
+	get createPassword() {
+		return this.translationService.getTranslation("createPassword");
+	}
+
+	get createAPassword() {
+		return this.translationService.getTranslation("createAPassword");
+	}
+
+	get authRegisterAlreadyHaveAccount() {
+		return this.translationService.getTranslation("authRegisterAlreadyHaveAccount");
+	}
+
+	get commonAppName() {
+		return this.translationService.getTranslation("commonAppName");
+	}
+
+	get authLoginEnterEmail() {
+		return this.translationService.getTranslation("authLoginEnterEmail");
+	}
+
+	get authRegisterTitle() {
+		return this.translationService.getTranslation("authRegisterTitle");
+	}
+
+	get monitorGetAll() {
+		return this.translationService.getTranslation("monitorGetAll");
+	}
+
+	get monitorGetById() {
+		return this.translationService.getTranslation("monitorGetById");
+	}
+
+	get monitorGetByIdSuccess() {
+		return this.translationService.getTranslation("monitorGetByIdSuccess");
+	}
+
+	get monitorCreate() {
+		return this.translationService.getTranslation("monitorCreate");
+	}
+
+	get bulkMonitorsCreate() {
+		return this.translationService.getTranslation("bulkMonitorsCreate");
+	}
+
+	get monitorEdit() {
+		return this.translationService.getTranslation("monitorEdit");
+	}
+
+	get monitorDelete() {
+		return this.translationService.getTranslation("monitorDelete");
+	}
+
+	get monitorPause() {
+		return this.translationService.getTranslation("monitorPause");
+	}
+
+	get monitorResume() {
+		return this.translationService.getTranslation("monitorResume");
+	}
+
+	get monitorDemoAdded() {
+		return this.translationService.getTranslation("monitorDemoAdded");
+	}
+
+	get monitorStatsById() {
+		return this.translationService.getTranslation("monitorStatsById");
+	}
+
+	get monitorCertificate() {
+		return this.translationService.getTranslation("monitorCertificate");
+	}
+
+	// Maintenance Window Messages
+	get maintenanceWindowCreate() {
+		return this.translationService.getTranslation("maintenanceWindowCreate");
+	}
+
+	get maintenanceWindowGetById() {
+		return this.translationService.getTranslation("maintenanceWindowGetById");
+	}
+
+	get maintenanceWindowGetByTeam() {
+		return this.translationService.getTranslation("maintenanceWindowGetByTeam");
+	}
+
+	get maintenanceWindowDelete() {
+		return this.translationService.getTranslation("maintenanceWindowDelete");
+	}
+
+	get maintenanceWindowEdit() {
+		return this.translationService.getTranslation("maintenanceWindowEdit");
+	}
+
+	// Webhook Messages
+	get webhookUnsupportedPlatform() {
+		return this.translationService.getTranslation("webhookUnsupportedPlatform");
+	}
+
+	get webhookSendError() {
+		return this.translationService.getTranslation("webhookSendError");
+	}
+
+	get webhookSendSuccess() {
+		return this.translationService.getTranslation("webhookSendSuccess");
+	}
+
+	get telegramRequiresBotTokenAndChatId() {
+		return this.translationService.getTranslation("telegramRequiresBotTokenAndChatId");
+	}
+
+	get webhookUrlRequired() {
+		return this.translationService.getTranslation("webhookUrlRequired");
+	}
+
+	get platformRequired() {
+		return this.translationService.getTranslation("platformRequired");
+	}
+
+	get testNotificationFailed() {
+		return this.translationService.getTranslation("testNotificationFailed");
+	}
+
+	get monitorUpAlert() {
+		return this.translationService.getTranslation("monitorUpAlert");
+	}
+
+	get monitorDownAlert() {
+		return this.translationService.getTranslation("monitorDownAlert");
+	}
+
+	getWebhookUnsupportedPlatform(platform) {
+		return this.translationService.getTranslation("webhookUnsupportedPlatform").replace("{platform}", platform);
+	}
+
+	getWebhookSendError(platform) {
+		return this.translationService.getTranslation("webhookSendError").replace("{platform}", platform);
+	}
+
+	getMonitorStatus(name, status, url) {
+		const translationKey = status === true ? "monitorStatusUp" : "monitorStatusDown";
+		return this.translationService.getTranslation(translationKey).replace("{name}", name).replace("{url}", url);
+	}
+
+	// Error Messages
+	get unknownError() {
+		return this.translationService.getTranslation("unknownError");
+	}
+
+	get friendlyError() {
+		return this.translationService.getTranslation("friendlyError");
+	}
+
+	get authIncorrectPassword() {
+		return this.translationService.getTranslation("authIncorrectPassword");
+	}
+
+	get unauthorized() {
+		return this.translationService.getTranslation("unauthorized");
+	}
+
+	get authAdminExists() {
+		return this.translationService.getTranslation("authAdminExists");
+	}
+
+	get authInviteNotFound() {
+		return this.translationService.getTranslation("authInviteNotFound");
+	}
+
+	get unknownService() {
+		return this.translationService.getTranslation("unknownService");
+	}
+
+	get noAuthToken() {
+		return this.translationService.getTranslation("noAuthToken");
+	}
+
+	get invalidAuthToken() {
+		return this.translationService.getTranslation("invalidAuthToken");
+	}
+
+	get expiredAuthToken() {
+		return this.translationService.getTranslation("expiredAuthToken");
+	}
+
+	// Queue Messages
+	get queueGetMetrics() {
+		return this.translationService.getTranslation("queueGetMetrics");
+	}
+
+	get queueGetJobs() {
+		return this.translationService.getTranslation("queueGetJobs");
+	}
+
+	get queueAddJob() {
+		return this.translationService.getTranslation("queueAddJob");
+	}
+
+	get queueObliterate() {
+		return this.translationService.getTranslation("queueObliterate");
+	}
+
+	// Job Queue Messages
+	get jobQueueDeleteJobSuccess() {
+		return this.translationService.getTranslation("jobQueueDeleteJobSuccess");
+	}
+
+	get jobQueuePauseJob() {
+		return this.translationService.getTranslation("jobQueuePauseJob");
+	}
+
+	get jobQueueResumeJob() {
+		return this.translationService.getTranslation("jobQueueResumeJob");
+	}
+
+	// Status Page Messages
+	get statusPageByUrl() {
+		return this.translationService.getTranslation("statusPageByUrl");
+	}
+
+	get statusPageCreate() {
+		return this.translationService.getTranslation("statusPageCreate");
+	}
+
+	get statusPageDelete() {
+		return this.translationService.getTranslation("statusPageDelete");
+	}
+
+	get statusPageUpdate() {
+		return this.translationService.getTranslation("statusPageUpdate");
+	}
+
+	get statusPageNotFound() {
+		return this.translationService.getTranslation("statusPageNotFound");
+	}
+
+	get statusPageByTeamId() {
+		return this.translationService.getTranslation("statusPageByTeamId");
+	}
+
+	get statusPageUrlNotUnique() {
+		return this.translationService.getTranslation("statusPageUrlNotUnique");
+	}
+
+	// Docker Messages
+	get dockerFail() {
+		return this.translationService.getTranslation("dockerFail");
+	}
+
+	get dockerNotFound() {
+		return this.translationService.getTranslation("dockerNotFound");
+	}
+
+	get dockerSuccess() {
+		return this.translationService.getTranslation("dockerSuccess");
+	}
+
+	// Port Messages
+	get portFail() {
+		return this.translationService.getTranslation("portFail");
+	}
+
+	get portSuccess() {
+		return this.translationService.getTranslation("portSuccess");
+	}
+
+	// Alert Messages
+	get alertCreate() {
+		return this.translationService.getTranslation("alertCreate");
+	}
+
+	get alertGetByUser() {
+		return this.translationService.getTranslation("alertGetByUser");
+	}
+
+	get alertGetByMonitor() {
+		return this.translationService.getTranslation("alertGetByMonitor");
+	}
+
+	get alertGetById() {
+		return this.translationService.getTranslation("alertGetById");
+	}
+
+	get alertEdit() {
+		return this.translationService.getTranslation("alertEdit");
+	}
+
+	get alertDelete() {
+		return this.translationService.getTranslation("alertDelete");
+	}
+
+	getDeletedCount(count) {
+		return this.translationService.getTranslation("deletedCount").replace("{count}", count);
+	}
+
+	get pingSuccess() {
+		return this.translationService.getTranslation("pingSuccess");
+	}
+
+	get getAppSettings() {
+		return this.translationService.getTranslation("getAppSettings");
+	}
+
+	get httpNetworkError() {
+		return this.translationService.getTranslation("httpNetworkError");
+	}
+
+	get httpNotJson() {
+		return this.translationService.getTranslation("httpNotJson");
+	}
+
+	get httpJsonPathError() {
+		return this.translationService.getTranslation("httpJsonPathError");
+	}
+
+	get httpEmptyResult() {
+		return this.translationService.getTranslation("httpEmptyResult");
+	}
+
+	get httpMatchSuccess() {
+		return this.translationService.getTranslation("httpMatchSuccess");
+	}
+
+	get httpMatchFail() {
+		return this.translationService.getTranslation("httpMatchFail");
+	}
+
+	get updateAppSettings() {
+		return this.translationService.getTranslation("updateAppSettings");
+	}
+
+	get insufficientPermissions() {
+		return this.translationService.getTranslation("insufficientPermissions");
+	}
+
+	getDbFindMonitorById(monitorId) {
+		return this.translationService.getTranslation("dbFindMonitorById").replace("${monitorId}", monitorId);
+	}
+
+	get dbUserExists() {
+		return this.translationService.getTranslation("dbUserExists");
+	}
+
+	get testEmailSubject() {
+		return this.translationService.getTranslation("testEmailSubject");
+	}
+
+	get verifyOwnerNotFound() {
+		return this.translationService.getTranslation("verifyOwnerNotFound");
+	}
+
+	get verifyOwnerUnauthorized() {
+		return this.translationService.getTranslation("verifyOwnerUnauthorized");
+	}
+
+	get dbUserNotFound() {
+		return this.translationService.getTranslation("dbUserNotFound");
 	}
 }

@@ -7,7 +7,7 @@ class TranslationService {
 		this.logger = logger;
 		this.translations = {};
 		this._language = "en";
-		this.localesDir = path.join(process.cwd(), "src/locales");
+		this.localesDir = path.join(process.cwd(), "locales");
 	}

 	get serviceName() {
@@ -580,31 +580,17 @@ const createNotificationBodyValidation = joi.object({
 	}),

 	address: joi.when("type", {
-		switch: [
-			{
-				is: "email",
-				then: joi.string().email().required().messages({
-					"string.empty": "E-mail address cannot be empty",
-					"any.required": "E-mail address is required",
-					"string.email": "Please enter a valid e-mail address",
-				}),
-			},
-			{
-				is: "pager_duty",
-				then: joi.string().required().messages({
-					"string.empty": "PagerDuty integration key cannot be empty",
-					"any.required": "PagerDuty integration key is required",
-				}),
-			},
-			{
-				is: joi.string().valid("webhook", "slack", "discord"),
-				then: joi.string().uri().required().messages({
-					"string.empty": "Webhook URL cannot be empty",
-					"any.required": "Webhook URL is required",
-					"string.uri": "Please enter a valid Webhook URL",
-				}),
-			},
-		],
+		is: "email",
+		then: joi.string().email().required().messages({
+			"string.empty": "E-mail address cannot be empty",
+			"any.required": "E-mail address is required",
+			"string.email": "Please enter a valid e-mail address",
+		}),
+		otherwise: joi.string().uri().required().messages({
+			"string.empty": "Webhook URL cannot be empty",
+			"any.required": "Webhook URL is required",
+			"string.uri": "Please enter a valid Webhook URL",
+		}),
 	}),
 });
Author	SHA1	Message	Date
Alexander Holliday	c2e2ae8dbd	Merge pull request #2834 from bluewave-labs/develop develop -> master	2025-08-21 10:13:48 -07:00
Alexander Holliday	25c66cff43	Merge pull request #2831 from bluewave-labs/develop develop -> master	2025-08-21 09:15:40 -07:00
Alexander Holliday	8f971cfb02	Merge pull request #2826 from bluewave-labs/develop develop -> master	2025-08-20 14:05:35 -07:00
Alexander Holliday	9b3ad54d0a	Merge pull request #2797 from bluewave-labs/develop develop -> master	2025-08-15 12:21:10 -07:00
Alexander Holliday	122a84b9e2	Merge pull request #2787 from bluewave-labs/develop develop -> master for 3.0-beta	2025-08-14 15:28:35 -07:00
Alexander Holliday	9716e64c93	Merge pull request #2612 from bluewave-labs/develop Develop -> Master	2025-07-14 14:23:40 -07:00
Alexander Holliday	eb8cf1b6da	Merge pull request #2584 from bluewave-labs/develop bump version	2025-07-08 09:51:08 -07:00
Alexander Holliday	c633a9ad8d	Merge pull request #2582 from bluewave-labs/develop develop -> master	2025-07-07 15:38:46 -07:00
Alexander Holliday	923eda1307	Merge pull request #2545 from bluewave-labs/develop develop -> master	2025-06-25 12:42:33 +08:00
Alexander Holliday	997342a31c	Merge pull request #2536 from bluewave-labs/develop Develop -> Master for 2.2 release	2025-06-25 09:38:08 +08:00