maddo/Regalamiunsorriso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

www in docker support

Browse source
This commit is contained in:
MaddoScientisto 2026-04-22 18:41:37 +02:00
commit c227fce036
2145 changed files with 399596 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

43
faceai/tests/e2e/faceai-simulator.spec.js
View file

@ -2,6 +2,7 @@ const { test, expect } = require('@playwright/test');
const {
EXPECTED_MATCH_COUNT,
FACEAI_BASE_URL,
LEGACY_RACE_ID,
buildHandoffUrl,
buildSimulatorUrl,
getSearchArtifacts,
@ -19,7 +20,7 @@ const LEGACY_RETURN_TIMEOUT_MS = 75 * 1000;
const FILE_CHOOSER_TIMEOUT_MS = 8 * 1000;
function buildLegacySimulatorReturnMatcher(raceId) {
return new RegExp(`http:\\/\\/(localhost|127\\.0\\.0\\.1):8080\\/faceai_simulator\\.php\\?raceId=${raceId}.*`);
return new RegExp(`http://(localhost|127\\.0\\.0\\.1):8080/Foto2\\.abl\\?id_gara=${raceId}.*`);
}
function assertLogDoesNotContain(content, patterns, label) {
@ -55,7 +56,7 @@ async function readLaunchUrlFromLegacyPage(page) {
return typeof buildFaceAiLaunchUrl === 'function' ? buildFaceAiLaunchUrl() : '';
});
expect(launchUrl, 'Expected the simulator race page to expose a FaceAI handoff URL builder.').toBeTruthy();
expect(launchUrl, 'Expected the legacy race page to expose a FaceAI handoff URL builder.').toBeTruthy();
return new URL(launchUrl, 'http://127.0.0.1:8080');
}
@ -110,16 +111,16 @@ async function waitForLegacyResult(page, raceId, expectedMatchCount = null) {
await expect.poll(() => page.url(), {
timeout: 15 * 1000,
message: 'Expected the legacy simulator return URL to include FaceAI filter parameters.'
}).toMatch(/faceaiPhotoIds=/);
message: 'Expected the legacy race return URL to include FaceAI direct-return parameters.'
}).toMatch(/faceaiResultId=|faceaiMatchStorageKey=|faceaiPhotoIds=/);
if (expectedMatchCount === null) {
return;
}
const finalUrl = new URL(page.url());
const photoIds = (finalUrl.searchParams.get('faceaiPhotoIds') || '').split(',').map((value) => value.trim()).filter(Boolean);
expect(photoIds.length).toBe(expectedMatchCount);
await expect(page.locator('#faceAiPhotoCountValue')).toHaveText(String(expectedMatchCount), {
timeout: SHORT_UI_TIMEOUT_MS
});
}
async function verifySearchLogs(searchId, { expectedMatchCount, expectedSelfieName }) {
@ -159,19 +160,19 @@ async function closeContexts(contexts) {
}));
}
test('runs the simulator flow through FaceAI and returns to the filtered legacy result', async ({ page }) => {
test('runs the legacy Tomcat flow through FaceAI and returns to the filtered legacy result', async ({ page }) => {
test.slow();
await launchFromSimulator(page, {
raceId: '202',
raceSlug: 'mezza-di-pisa',
raceName: 'Mezza di Pisa',
raceFolder: 'PISA'
raceId: LEGACY_RACE_ID,
raceSlug: 'livorno',
raceName: 'Livorno',
raceFolder: 'LIVORNO'
});
const search = await startSearch(page, 'DSC_1960.JPG');
await waitForLegacyResult(page, '202', EXPECTED_MATCH_COUNT);
await waitForLegacyResult(page, LEGACY_RACE_ID, EXPECTED_MATCH_COUNT);
await verifySearchLogs(search.id, {
expectedMatchCount: EXPECTED_MATCH_COUNT,
@ -179,25 +180,25 @@ test('runs the simulator flow through FaceAI and returns to the filtered legacy
});
});
test('builds the simulator FaceAI handoff URL with the exact local race storage metadata', async ({ page }) => {
test('builds the legacy FaceAI handoff URL with the exact local race storage metadata', async ({ page }) => {
await page.goto(buildSimulatorUrl({
raceId: '202',
raceSlug: 'mezza-di-pisa',
raceName: 'Mezza di Pisa',
raceId: LEGACY_RACE_ID,
raceSlug: 'livorno',
raceName: 'Livorno',
raceYear: '2026',
raceMonthFolder: '04.APRILE',
raceFolder: 'PISA'
raceFolder: 'LIVORNO'
}), { waitUntil: 'domcontentloaded' });
await expect(page.locator('#faceAiRaceYear')).toHaveValue('2026');
await expect(page.locator('#faceAiRaceMonthFolder')).toHaveValue('04.APRILE');
await expect(page.locator('#faceAiRaceFolder')).toHaveValue('PISA');
await expect(page.locator('#faceAiRaceFolder')).toHaveValue('LIVORNO');
const launchUrl = await readLaunchUrlFromLegacyPage(page);
expect(launchUrl.searchParams.get('raceYear')).toBe('2026');
expect(launchUrl.searchParams.get('raceMonthFolder')).toBe('04.APRILE');
expect(launchUrl.searchParams.get('raceFolder')).toBe('PISA');
expect(launchUrl.searchParams.get('raceStorageRelativeDir')).toBe('2026/04.APRILE/PISA');
expect(launchUrl.searchParams.get('raceFolder')).toBe('LIVORNO');
expect(launchUrl.searchParams.get('raceStorageRelativeDir')).toBe('2026/04.APRILE/LIVORNO');
});
test('shows the unsupported-race message when the current race has no PKL data and lets the user go back', async ({ page }) => {

35
faceai/tests/e2e/faceai-test-utils.js
View file

@ -7,11 +7,12 @@ const WORKSPACE_ROOT = path.resolve(ROOT_DIR, '..');
const LOG_ROOT = path.join(ROOT_DIR, 'logs');
const SEARCH_LOG_ROOT = path.join(LOG_ROOT, 'searches');
const FACEAI_BASE_URL = process.env.FACEAI_E2E_BASE_URL || 'http://127.0.0.1:3001';
const SIMULATOR_URL = process.env.FACEAI_E2E_SIMULATOR_URL || 'http://127.0.0.1:8080/faceai_simulator.php?raceId=202&lang=it';
const SIMULATOR_URL = process.env.FACEAI_E2E_SIMULATOR_URL || 'http://127.0.0.1:8080/Foto2.abl?id_gara=1018557&pageRow=96&pageNumber=1';
const LEGACY_BASE_URL = process.env.FACEAI_E2E_LEGACY_BASE_URL || 'http://127.0.0.1:8080';
const LEGACY_HOME_URL = process.env.FACEAI_E2E_LEGACY_HOME_URL || `${LEGACY_BASE_URL}/index.jsp`;
const SELFIE_NAME = process.env.FACEAI_E2E_SELFIE || 'DSC_1960.JPG';
const EXPECTED_MATCH_COUNT = Number(process.env.FACEAI_E2E_EXPECTED_MATCH_COUNT || '6');
const LEGACY_RACE_ID = process.env.FACEAI_E2E_RACE_ID || '1018557';
function quoteShellArg(value) {
if (!/[\s"]/u.test(value)) {
@ -117,40 +118,39 @@ function getSelfiePath(fileName = SELFIE_NAME) {
}
function buildSimulatorUrl({
raceId = '202',
raceId = LEGACY_RACE_ID,
lang = 'it',
raceSlug = 'mezza-di-pisa',
raceName = 'Mezza di Pisa',
raceSlug = 'livorno',
raceName = 'Livorno',
raceYear = '2026',
raceMonthFolder = '04.APRILE',
raceFolder = 'PISA'
raceFolder = 'LIVORNO',
pageRow = '96',
pageNumber = '1'
} = {}) {
const url = new URL('/faceai_simulator.php', LEGACY_BASE_URL);
url.searchParams.set('raceId', raceId);
const url = new URL('/Foto2.abl', LEGACY_BASE_URL);
url.searchParams.set('id_gara', raceId);
url.searchParams.set('pageRow', pageRow);
url.searchParams.set('pageNumber', pageNumber);
url.searchParams.set('lang', lang);
url.searchParams.set('raceSlug', raceSlug);
url.searchParams.set('raceName', raceName);
url.searchParams.set('raceYear', raceYear);
url.searchParams.set('raceMonthFolder', raceMonthFolder);
url.searchParams.set('raceFolder', raceFolder);
return url.toString();
}
function buildHandoffUrl({
raceId = '202',
raceId = LEGACY_RACE_ID,
lang = 'it',
raceSlug = 'mezza-di-pisa',
raceName = 'Mezza di Pisa',
raceSlug = 'livorno',
raceName = 'Livorno',
raceYear = '2026',
raceMonthFolder = '04.APRILE',
raceFolder = 'PISA',
raceFolder = 'LIVORNO',
userId = '1',
displayName = `Local Test User ${userId}`,
email = `local-test-${userId}@example.invalid`,
membershipStatus = 'active',
returnUrl = buildSimulatorUrl({ raceId, lang, raceSlug, raceName, raceYear, raceMonthFolder, raceFolder })
} = {}) {
const url = new URL('/faceai_handoff.php', LEGACY_BASE_URL);
const url = new URL('/dev/legacy/launch', FACEAI_BASE_URL);
url.searchParams.set('raceId', raceId);
url.searchParams.set('raceSlug', raceSlug);
url.searchParams.set('raceName', raceName);
@ -191,6 +191,7 @@ module.exports = {
SIMULATOR_URL,
SELFIE_NAME,
EXPECTED_MATCH_COUNT,
LEGACY_RACE_ID,
buildHandoffUrl,
buildSimulatorUrl,
dockerCompose,

2
faceai/tests/e2e/global-setup.js
View file

@ -22,6 +22,6 @@ module.exports = async () => {
});
await waitForHttp(SIMULATOR_URL, ({ response, bodyText }) => {
return response.ok && bodyText.includes('FaceAI Legacy Simulator');
return response.ok && bodyText.includes('faceAiRaceYear') && bodyText.includes('faceAiRaceFolder');
});
};

7
faceai/tests/live-site/auth.setup.js
View file

@ -2,11 +2,16 @@ const { test } = require('@playwright/test');
const {
AUTH_FILE,
ensureAuthDirectory,
LIVE_SITE_REQUIRE_AUTH,
performLiveLoginRequest
} = require('./live-site-test-utils');
test('authenticate against the live site', async ({ request }) => {
ensureAuthDirectory();
await performLiveLoginRequest(request);
if (LIVE_SITE_REQUIRE_AUTH) {
await performLiveLoginRequest(request);
}
await request.storageState({ path: AUTH_FILE });
});

15
faceai/tests/live-site/live-site-test-utils.js
View file

@ -11,6 +11,7 @@ const LIVE_SITE_LOGIN_URL = process.env.LIVE_SITE_LOGIN_URL || `${LIVE_SITE_BASE
const LIVE_SITE_RACE_URL = process.env.LIVE_SITE_RACE_URL || `${LIVE_SITE_BASE_URL}/42%20HALF%20MARATHON%20FIRENZE_gara-1018545---96-1.html`;
const LIVE_FACEAI_BASE_URL = process.env.LIVE_FACEAI_BASE_URL || 'https://ai.regalamiunsorriso.it';
const LIVE_SITE_RESULT_URL_PATTERN = process.env.LIVE_SITE_RESULT_URL_PATTERN || `${LIVE_SITE_BASE_URL}/faceai_return.php`;
const LIVE_SITE_REQUIRE_AUTH = process.env.LIVE_SITE_REQUIRE_AUTH !== '0';
const LIVE_SITE_USERNAME = process.env.LIVE_SITE_USERNAME || '';
const LIVE_SITE_PASSWORD = process.env.LIVE_SITE_PASSWORD || '';
const LIVE_SITE_PORTRAIT_PATH = process.env.LIVE_SITE_PORTRAIT_PATH || path.join(WORKSPACE_ROOT, 'test_pkl', 'live', 'test_portrait_1.png');
@ -106,6 +107,10 @@ async function gotoWithRetry(page, url, options = {}, maxAttempts = 3) {
}
async function performLiveLogin(page) {
if (!LIVE_SITE_REQUIRE_AUTH) {
return;
}
requireCredentials();
await gotoWithRetry(page, LIVE_SITE_LOGIN_URL, { waitUntil: 'commit' });
@ -117,6 +122,10 @@ async function performLiveLogin(page) {
}
async function performLiveLoginRequest(requestContext) {
if (!LIVE_SITE_REQUIRE_AUTH) {
return;
}
const response = await requestContext.post(`${LIVE_SITE_BASE_URL}/Logon.abl`, {
form: buildLoginFormData(),
failOnStatusCode: false
@ -166,6 +175,11 @@ async function ensureLiveAuthenticatedRacePage(page) {
await gotoWithRetry(page, LIVE_SITE_RACE_URL, { waitUntil: 'commit' });
await dismissCookieBanner(page);
if (!LIVE_SITE_REQUIRE_AUTH) {
await expectRacePageLoaded(page);
return;
}
try {
await waitForLoggedInUi(page);
} catch (error) {
@ -192,6 +206,7 @@ module.exports = {
LIVE_SITE_LOGIN_URL,
LIVE_SITE_PASSWORD,
LIVE_SITE_PORTRAIT_PATH,
LIVE_SITE_REQUIRE_AUTH,
LIVE_SITE_EXPECT_RACE_DATA_AVAILABLE,
LIVE_SITE_EXPECT_UNAVAILABLE_REASON_CODE,
LIVE_SITE_RACE_ID,