Skip to content

Commit

Permalink
Merge pull request #39 from BouyguesTelecom/revert-37-feature/option-…
Browse files Browse the repository at this point in the history 
…upload-default-and-error-image

Revert "add upload default images on init if needed"
  • Loading branch information
@AmelieLoulergue
AmelieLoulergue authored Dec 18, 2024
2 parents 6a947ba + ad75dc3 commit 2c3c490
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 79 deletions.
Binary file removed local/default/default.webp
View file
Binary file not shown.
Binary file removed local/default/error.webp
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"scripts": {
"format": "prettier --write .",
"dev:api": "export IMAGES_UPLOAD_PATH=../../local/default && export IMAGES_UPLOAD_NAMESPACE=DEV && export IMAGES_UPLOAD_DESTINATION=default && cd src/api && npm run dev",
"dev:api": "cd src/api && npm run dev",
"docker:dev": "docker compose -f docker-compose.dev.yml up --build -d",
"docker": "docker compose up --build -d"
},
Expand Down
104 changes: 26 additions & 78 deletions src/api/server.ts
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,53 @@
import app from './app';
import { logger } from './utils/logs/winston';
import fs from 'fs';
import { redisHandler } from './catalog/redis/connection';
import { getLastDump } from './delegated-storage/index';
import { minioClient } from './delegated-storage/s3/connection';
import { deleteCatalogItem, getCatalog } from './catalog';
import { promisify } from 'util';
import FormData from 'form-data';
import fetch from 'node-fetch';
import fs from 'fs';
import path from 'path';

const readdir = promisify(fs.readdir);
const stat = promisify(fs.stat);
import { deleteCatalogItem, getCatalog } from './catalog';

const port = parseInt(process.env.PORT, 10) || 3001;
const standalone = process.env.DELEGATED_STORAGE_METHOD === 'STANDALONE';
const imagesUploadPath = process.env.IMAGES_UPLOAD_PATH || '';
const imagesUploadNamespace = process.env.IMAGES_UPLOAD_NAMESPACE || '';
const imagesUploadDestination = process.env.IMAGES_UPLOAD_DESTINATION || '';

const checkAccessToBackup = async () => {
const backupUrl = `${ process.env.DELEGATED_STORAGE_HOST }${ process.env.DELEGATED_STORAGE_READINESS_CHECK }`;
console.log('CHECK ACCESS BACKUP :::', process.env.DELEGATED_STORAGE_HOST)
const backupUrl = `${process.env.DELEGATED_STORAGE_HOST}${process.env.DELEGATED_STORAGE_READINESS_CHECK}`;
const checkBackup = await fetch(backupUrl);
if (checkBackup.status !== 200) {
logger.error(`Backup status response on ${ process.env.DELEGATED_STORAGE_READINESS_CHECK }: ${ checkBackup.status }`);
throw new Error(`Backup access failed: ${ checkBackup.status }`);
logger.error(`Backup status response on ${process.env.DELEGATED_STORAGE_READINESS_CHECK}: ${checkBackup.status}`);
throw new Error(`Backup access failed: ${checkBackup.status}`);
}
if (process.env.DELEGATED_STORAGE_METHOD === 'S3') {
const bucketName = process.env.S3_BUCKET_NAME;
const bucketExists = await minioClient.bucketExists(bucketName);
if (!bucketExists) {
await minioClient.makeBucket(bucketName, 'us-east-1');
logger.info(`Bucket check OK: "${ bucketName }" created successfully.`);
logger.info(`Bucket check OK: "${bucketName}" created successfully.`);
} else {
logger.info(`Bucket check OK: "${ bucketName }" already exists.`);
logger.info(`Bucket check OK: "${bucketName}" already exists.`);
}
}
logger.info(`Backup access OK: ${ backupUrl }`);
logger.info(`Backup access OK: ${backupUrl}`);
};

const connectToRedisWithRetry = async (maxRetries, delay) => {
let attempts = 0;
while ( attempts < maxRetries ) {
while (attempts < maxRetries) {
try {
await redisHandler.connectClient();
const { data: catalog } = await getCatalog();
if (catalog.length) {
for ( const item of catalog ) {
if (item.unique_name.includes('/tests/')) {
await deleteCatalogItem(item.unique_name);
const {data:catalog} = await getCatalog()
if(catalog.length){
for (const item of catalog){
if(item.unique_name.includes('/tests/')){
await deleteCatalogItem(item.unique_name)
}
}
}
return;
} catch ( err ) {
} catch (err) {
attempts++;
logger.error(`Failed to connect to Redis. Attempt ${ attempts } of ${ maxRetries }. Retrying in ${ delay / 1000 } seconds...`);
logger.error(`Failed to connect to Redis. Attempt ${attempts} of ${maxRetries}. Retrying in ${delay / 1000} seconds...`);
if (attempts < maxRetries) {
await new Promise((resolve) => setTimeout(resolve, delay));
} else {
Expand All @@ -76,79 +68,35 @@ const createStandaloneFolderAndCatalog = () => {
}
};

const uploadImages = async (dirPath) => {
if (!fs.existsSync(dirPath)) {
logger.error(`Path does not exist: ${ dirPath }`);
return;
}

const files = await readdir(dirPath);
for ( const file of files ) {
const filePath = path.join(dirPath, file);
const fileStat = await stat(filePath);
if (fileStat.isFile()) {
console.log(`Uploading file: ${ file }`);

const stream = fs.createReadStream(filePath);
const form = new FormData();
form.append('namespace', imagesUploadNamespace);
form.append('destination', imagesUploadDestination);
form.append('file', stream, { filename: file });
try {
const response = await fetch('http://localhost:3001/palpatine/file', {
method: 'POST',
body: form,
headers: {
'Authorization': 'Bearer cooltokenyeah'
}
});

if (response.status !== 200) {
const error = await response.json();
logger.error(`Failed to upload file: ${ file }, Error: ${ JSON.stringify(error) }`);
} else {
logger.info(`Successfully uploaded file: ${ file }`);
}
} catch ( error ) {
logger.error(`Error uploading file: ${ file }, ${ error }`);
}
}
}
};

( async () => {
(async () => {
try {
if (!standalone) {
await checkAccessToBackup();
await connectToRedisWithRetry(3, 10000);
await redisHandler.disconnectClient();
const dbDump = fs.existsSync(`${ process.env.DUMP_FOLDER_PATH }/dump.rdb`);
const dbDump = fs.existsSync(`${process.env.DUMP_FOLDER_PATH}/dump.rdb`);

if (!dbDump) {
logger.info('dump.rdb doesn\'t exist: getting latest dump from backup ✅');
logger.info("dump.rdb doesn't exists : getting latest dump from backup ✅");
await getLastDump();
} else {
logger.info('dump.rdb already exists: skipping getting latest dump from backup 🔆');
logger.info('dump.rdb already exists : skipping getting latest dump from backup 🔆');
}
}

if (standalone) {
createStandaloneFolderAndCatalog();
}

app.listen(port, async () => {
logger.info(`\n✨ ${ standalone ?
'Using fs in standalone mode' :
'Connected to Redis' }, server running => http://localhost:${ port }\n`);
await uploadImages(imagesUploadPath);
logger.info(`\n✨ ${standalone ? 'Using fs in standalone mode' : 'Connected to Redis'}, server running => http://localhost:${port}\n`);
});
} catch ( err ) {
logger.error(`Error starting app => ${ err }`);
} catch (err) {
logger.error(`Error starting app => ${err}`);
process.exit(1);
}
} )();
})();

app.on('error', (err) => {
logger.error(`${ err }`);
logger.error(`${err}`);
process.exit(1);
});

0 comments on commit 2c3c490

Please sign in to comment.