feat: use wait-on instead of wait-for

Author: alexey-yarmosh

package.json

@@ -13,7 +13,8 @@
 		"countries-list": "^3.1.1",
 		"knex": "^3.1.0",
 		"lodash": "^4.17.21",
-		"mysql": "^2.18.1"
+		"mysql": "^2.18.1",
+		"wait-on": "^9.0.1"
 	},
 	"devDependencies": {
 		"@martin-kolarik/eslint-config": "^8.0.4",

pnpm-lock.yaml

@@ -45,7 +45,7 @@ if [[ ("$DIRECTUS_URL" != *"localhost"* && "$DIRECTUS_URL" != *"127.0.0.1"*) ||
 	exit 1
 fi
 
-./scripts/wait-for.sh -t 30 $DIRECTUS_URL/admin/login
+npx wait-on -t 30s -l "$DIRECTUS_URL/admin/login"
 
 token=$(get_token)
 
@@ -70,6 +70,6 @@ docker compose --file "$compose_file" stop directus
 
 docker compose --file "$compose_file" up -d directus
 
-./scripts/wait-for.sh -t 30 $DIRECTUS_URL/admin/login
+npx wait-on -t 30s -l "$DIRECTUS_URL/admin/login"
 
 echo "Finished"

scripts/init.sh

@@ -2,22 +2,24 @@ import pm2, { StartOptions } from 'pm2';
 import { execa } from 'execa';
 import { test as setup } from '@playwright/test';
 import { promisify } from 'util';
+import waitOn from 'wait-on';
 
 const DIRECTUS_URL = process.env.DIRECTUS_URL!;
 const DASH_URL = process.env.DASH_URL!;
 const DASH_INDEX_FILE_PATH = process.env.DASH_INDEX_FILE_PATH!;
 
 const pm2Start = promisify(pm2.start.bind(pm2)) as (options: StartOptions) => Promise<void>;
 
-const waitFor = (url: string, timeout = 30) => execa({ stdout: 'inherit' })`./scripts/wait-for.sh -t ${timeout} ${url}`;
+const waitFor = (url: string, timeout = 30000) => waitOn({ resources: [ url ], timeout });
+
 
 const getIsRunning = async (url: string) => {
 	try {
-		await waitFor(url, 2);
+		await waitFor(url, 2000);
 		console.log(`Service at ${url} is already running.`);
 		return true;
 	} catch (err) {
-		if (err.stderr === 'Operation timed out') {
+		if (err.message.includes('Timed out')) {
 			console.log(`Service at ${url} not running. Starting...`);
 		} else {
 			throw err;