@enplug/scripts 1.11.4-dev6 → 1.11.4-dev61

package/bin/functions/translations/crowdin.js

@@ -1,6 +1,7 @@
 const axios = require('axios');
 const chalk = require('chalk');
 const fs = require('fs');
+const path = require('path');
 const FormData = require('form-data');
 const inquirer = require('inquirer');
 const loadDevPrivateFile = require('../loadDevPrivateFile');
@@ -13,9 +14,7 @@ const { catchError, switchMap, tap, filter } = require('rxjs/operators');
 const HTTP_UNAUTHORIZED_STATUS_CODE = 401;
 const HTTP_NOT_FOUND_STATUS_CODE = 404;
 
-// const CROWDIN_PROJECT_ID = 'enplug';
 const CROWDIN_PROJECT_ID = '401630';
-// const CROWDIN_PROJECT_URL = `https://api.crowdin.com/api/project/${CROWDIN_PROJECT_ID}`;
 const CROWDIN_PROJECT_URL = `https://api.crowdin.com/api/v2/projects/${CROWDIN_PROJECT_ID}`;
 const CROWDIN_STORAGE_URL = `https://api.crowdin.com/api/v2/storages`;
 const CROWDIN_DIRECTORY_NOT_FOUND_ERROR_CODE = 17;
@@ -108,115 +107,72 @@ function getCrowdinConfig() {
   return pkg.config.crowdin;
 }
 
-function generateFormData(crowdinPath, localPath) {
-  const formData = new FormData();
-
-  // formData.append('update_option', 'update_without_changes'); // Previous translations should remain valid
-  formData.append('json', '');
-  formData.append(`files[${crowdinPath}]`, fs.createReadStream(localPath));
-  formData.append(`export_patterns[${crowdinPath}]`, '%locale%.json');
-  return formData;
-}
-
-function postFileToCrowdin(operation, credentials, crowdinPath, localPath) {
-  const AuthStr = 'Bearer '.concat(credentials.token);
-  const formData = generateFormData(crowdinPath, localPath);
-
-  const url = `${CROWDIN_STORAGE_URL}`;
-
-  return from(axios.post(url, formData, { headers: { 
-    "Authorization": AuthStr,
-    "Content-Type": "application/json",
-    "Crowdin-API-FileName": "en.json" 
-  } }));
-}
-
-async function findCrowdinAppDirectoryId(credentials, crowdinPath) {
-  path = crowdinPath.startsWith('/') ? crowdinPath.substr(1) : crowdinPath;
-  if(path.startsWith('apps')){
-    const appName = path.split('/')[1];
-    const url = `${CROWDIN_PROJECT_URL}/directories?filter=${appName}`;
-    const AuthStr = 'Bearer '.concat(credentials.token);
-    const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('resp', resp.data.data);
-    console.log('appName', appName);
-    const directories = resp.data.data;
-    const appdata = directories.find(d => {
-      return d.data.name === appName
-    });
-    console.log('appdata', appdata);
-    return appdata.id
-  } else if(path.startsWith('dashboard')) {
-    const url = `${CROWDIN_PROJECT_URL}/directories?filter=dashboard`;
-    const AuthStr = 'Bearer '.concat(credentials.token);
-    const directories = axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('directories', directories.data.data)
-
-    return directories.data.data.find(d => d.data.name === 'dashboard' && d.data.title === 'Dashboard' && d.data.path === '/dashboard').id;
+async function findCrowdinAppDirectoryId(credentials, crowdinPath, appName) {
+  try {
+    if(crowdinPath.startsWith('apps') || appName !== 'en.json') { // path is apps/{app-name}/... or dashboard/{data-connector or regions-map or uploader}/en.json
+      const url = `${CROWDIN_PROJECT_URL}/directories?filter=${appName}`;
+      const AuthStr = 'Bearer '.concat(credentials.token);
+      const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+      const directory = resp.data.data.find(d => d.data.name === appName );
+      return directory ? directory.data.id : undefined;
+    } else if((crowdinPath.startsWith('dashboard') || crowdinPath.startsWith('player-web') || crowdinPath.startsWith('components')) && appName === 'en.json') { //path is dashboard/en.json or player-web/en.json or components/en.json
+      const url = `${CROWDIN_PROJECT_URL}/directories?filter=dashboard`;
+      const AuthStr = 'Bearer '.concat(credentials.token);
+      const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+      const directory = resp.data.data.find(d => d.data.name === 'dashboard' && d.data.title === 'Dashboard' && d.data.path === '/dashboard');
+      return directory ? directory.data.id : undefined;
+    }
+  } catch (err) {
+    if (err.response.status === HTTP_UNAUTHORIZED_STATUS_CODE) {
+      console.error(`\n${chalk.red.bold('Provided Crowdin token is invalid')}`);
+      console.log(`Check the ${chalk.default.yellow('dev.private.json')} file.`);
+      return throwError(err);
+    } 
   }
 }
 
 async function findCrowdinAppSubFolderId(credentials, directoryId, subfolderName) {
     const url = `${CROWDIN_PROJECT_URL}/directories?directoryId=${directoryId}`;
     const AuthStr = 'Bearer '.concat(credentials.token);
-    const directories = await axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('subdirectories', directories.data.data)
-
-    return directories.data.data.find(d => d.data.name === subfolderName).id;
+    const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+    const subdirectory = resp.data.data.find(d => d.data.name === subfolderName);
+    return subdirectory ? subdirectory.data.id : undefined;
 }
 
 async function getFileIdIfExists(credentials, directoryId, fileName) {
   const url = `${CROWDIN_PROJECT_URL}/files?directoryId=${directoryId}`;
   const AuthStr = 'Bearer '.concat(credentials.token);
-  const files = await axios.get(url, { headers: { Authorization: AuthStr } });
-  return files.data.find(d => d.data.name === fileName).id;
+  const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+  const file = resp.data.data.find(d => d.data.name === fileName);
+  return file ? file.data.id : undefined;
+}
+
+function postFileToCrowdin(credentials, localPath) {
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const file = fs.readFileSync(localPath);
+  const url = `${CROWDIN_STORAGE_URL}`;
+  
+  return from(axios.post(url, file, { headers: { 
+    "Authorization": AuthStr,
+    "Content-Type": 'application/json',
+    "Crowdin-API-FileName": 'en.json' 
+  } }));
 }
 
-async function uploadFileToCrowdinStorage(credentials, crowdinPath, localPath) {
+async function uploadFileToCrowdinStorage(credentials, localPath) {
   if (!fs.existsSync(localPath)) {
     console.error(`${chalk.red.bold('Local file does not exists')} ${chalk.yellow.bold(`[${localPath}]`)}`);
     throw new Error('Local file does not exist');
   }
-
-  return postFileToCrowdin('update', credentials, crowdinPath, localPath).pipe(
+  return postFileToCrowdin(credentials, localPath).pipe(
     catchError(error => {
-      if (error.response.status === HTTP_NOT_FOUND_STATUS_CODE) {
-        return promptAddFile(crowdinPath).pipe(
-          filter(({addFileConfirm}) => addFileConfirm === true),
-          switchMap(() => postFileToCrowdin('add', credentials, crowdinPath, localPath))
-        );
-      }
-      
+      console('ERROR could not upload file to crowdin storage')
       return throwError(error);
     }),
-    tap({
-      next: response => {
-        if (response.data) {
-          console.log(`${chalk.green.bold('Translations uploaded to Crowdin')} ${chalk.yellow.bold(`[${crowdinPath}]`)}`);
-        } else {
-          console.error('Unexpected result');
-          console.log(response);
-        }
-      },
-      error: error => {
-        const crowdinError = error.response && error.response.data && error.response.data.error;
-  
-        if (crowdinError && crowdinError.code === CROWDIN_DIRECTORY_NOT_FOUND_ERROR_CODE) {
-          console.error(`\n${chalk.red.bold('Directory does not exist')} ${chalk.yellow.bold(`[${crowdinPath}]`)}`);
-          console.log('Create the directory in the Crowdin panel first.');
-        } else if (error.response.status === HTTP_UNAUTHORIZED_STATUS_CODE) {
-          console.error(`\n${chalk.red.bold('Provided Crowdin credentials are incorrect')}`);
-          console.log(`Check the ${chalk.default.yellow('dev.private.json')} file.`);
-        } else {
-          console.error('\nUnexpected error:');
-          console.error(error);
-        }
-      }
-    })
   ).toPromise();
 }
 
-function updateCrowdinFile(credentials, storageId, fileId) {
+async function updateCrowdinFile(credentials, crowdinPath, storageId, fileId) {
   const url = `${CROWDIN_PROJECT_URL}/files/${fileId}`;
   const AuthStr = 'Bearer '.concat(credentials.token);
   const body = {
@@ -231,19 +187,66 @@ function updateCrowdinFile(credentials, storageId, fileId) {
     },
     "replaceModifiedContext": false
   }
-  return axios.put(url, body, { headers: { Authorization: AuthStr } });
+  return from(axios.put(url, body, { headers: { Authorization: AuthStr } })).pipe(tap({
+    next: response => {
+      if (response.data) {
+        console.log(`${chalk.green.bold('Translations uploaded to Crowdin')} ${chalk.yellow.bold(`[${crowdinPath}]`)}`);
+      } else {
+        console.error('Unexpected result');
+        console.log(response);
+      }
+    },
+    error: error => {
+      console.error('\nUnexpected error:');
+      console.error(error);
+    }
+  })).toPromise();
 }
 
-function fetchFileFromCrowdin(credentials, crowdinPath, language) {
-  const url = `${CROWDIN_PROJECT_URL}/export-file`;
-  const params = {
-    'login': credentials.login,
-    'account-key': credentials.accountKey,
-    'file': crowdinPath,
-    'language': language
+async function addCrowdinFile(credentials, crowdinPath, storageId, folderId) {
+  const url = `${CROWDIN_PROJECT_URL}/files`;
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const body = {
+    "storageId": storageId,
+    "name": "en.json",
+    "directoryId": folderId,
+    "context": null,
+    "type": "json",
+    "parserVersion": 1,
+    "importOptions": {
+        "contentSegmentation": false,
+        "customSegmentation": false
+    },
+    "exportOptions": {
+        "exportPattern": "%locale%.json"
+    },
+    "excludedTargetLanguages": null
+  }
+  return from(axios.post(url, body, { headers: { Authorization: AuthStr } })).pipe(tap({
+    next: response => {
+      if (response.data) {
+        console.log(`${chalk.green.bold('Translations uploaded to Crowdin')} ${chalk.yellow.bold(`[${crowdinPath}]`)}`);
+      } else {
+        console.error('Unexpected result');
+        console.log(response);
+      }
+    },
+    error: error => {
+      console.error('\nUnexpected error:');
+      console.error(error);
+    }
+  })).toPromise();
+}
+
+function fetchFileFromCrowdin(credentials, language, fileId) {
+  const url = `${CROWDIN_PROJECT_URL}/translations/exports`;
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const body = {
+    "targetLanguageId": language,
+    "fileIds": [fileId]
   };
 
-  return axios.get(url, { params });
+  return axios.post(url, body, { headers: { Authorization: AuthStr } });
 }
 
 function promptAddFile(crowdinPath) {
@@ -256,4 +259,4 @@ function promptAddFile(crowdinPath) {
   }));
 }
 
-module.exports = { getCrowdinCredentials, getCrowdinConfig, findCrowdinAppDirectoryId, findCrowdinAppSubFolderId, getFileIdIfExists, uploadFileToCrowdinStorage, updateCrowdinFile, uploadFileToCrowdin, fetchFileFromCrowdin };
+module.exports = { getCrowdinCredentials, getCrowdinConfig, findCrowdinAppDirectoryId, findCrowdinAppSubFolderId, getFileIdIfExists, uploadFileToCrowdinStorage, updateCrowdinFile, addCrowdinFile, uploadFileToCrowdin, fetchFileFromCrowdin };

package/bin/functions/translations/translations.js

@@ -5,7 +5,7 @@ const inquirer = require('inquirer');
 const fs = require('fs');
 const path = require('path');
 
-const { getCrowdinCredentials, getCrowdinConfig, findCrowdinAppDirectoryId, findCrowdinAppSubFolderId, getFileIdIfExists, uploadFileToCrowdinStorage, updateCrowdinFile, uploadFileToCrowdin, fetchFileFromCrowdin } = require('./crowdin');
+const { getCrowdinCredentials, getCrowdinConfig, findCrowdinAppDirectoryId, findCrowdinAppSubFolderId, getFileIdIfExists, uploadFileToCrowdinStorage, updateCrowdinFile, addCrowdinFile, uploadFileToCrowdin, fetchFileFromCrowdin } = require('./crowdin');
 const { checkKeys, validateTranslationFile } = require('./transloco');
 const { uploadTranslationToS3 } = require('./translation-s3');
 const getPackageJson = require('../getPackageJson');
@@ -61,34 +61,80 @@ async function syncTranslations(s3Client, bucket) {
       await uploadTranslationToS3(s3Client, bucket, s3EnPath, enTranslation);
 
       if (isProduction) {
-        const appDirectoryId = await findCrowdinAppDirectoryId(credentials, config.crowdinPath);
-        console.log('found directoryId', appDirectoryId);
-        if(config.crowdinPath.includes('apps')) {
-          const path = crowdinPath.startsWith('/') ? crowdinPath.substr(1) : crowdinPath;
-          const subfolderName = path.split('/')[2];
+        const crowdinPath = config.crowdinPath.startsWith('/') ? config.crowdinPath.substr(1) : config.crowdinPath;
+        const crowdinPathSections = crowdinPath.split('/');
+        const appName = crowdinPathSections[1];
+        const appDirectoryId = await findCrowdinAppDirectoryId(credentials, crowdinPath, appName);
+        if(appDirectoryId === undefined) {
+          console.error(`\n${chalk.red.bold('Directory does not exist')} ${chalk.yellow.bold(`${appName}`)}`);
+          console.log('Create the directory in the Crowdin panel first.');
+          return;
+        }
+        if(crowdinPathSections[0] === 'apps' && appDirectoryId) {
+          if(crowdinPathSections.length !== 4 && crowdinPathSections[3] !== 'en.json') {
+            console.error(`\n${chalk.red.bold('Crowdin path provided does not match defined format, make sure the path is as follows /apps/{app-id}/dashboard/en.json or /apps/{app-id}/app/en.json')}`);
+            return;
+          }
+          const subfolderName = crowdinPathSections[2]; //dashboard or app folder
           const folderId = await findCrowdinAppSubFolderId(credentials, appDirectoryId, subfolderName);
-          console.log('found folderId', folderId);
-          const fileId = await getFileIdIfExists(credentials, appDirectoryId, path.split('/')[3]);
-          console.log('found fileId', fileId);
-          const storageId = await uploadFileToCrowdinStorage(credentials, config.crowdinPath, config.localPath)
+          if(folderId === undefined) {
+            console.error(`Could not find ${chalk.yellow.bold(`[${subfolderName}]`)} folder`);
+          }
+          const fileId = await getFileIdIfExists(credentials, folderId, crowdinPathSections[3]); // en.json file id to update
           if(fileId) {
-            await updateCrowdinFile(credentials, storageId, fileId);
+            const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+            if(fileId && storageId) {
+              await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+              await updateFrakeTranslations(credentials, fileId);
+            }
+          } else {
+            const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+            if(storageId) {
+              const result = await addCrowdinFile(credentials, crowdinPath, storageId.data.data.id, folderId);
+              console.log('add result', result.data);
+              // await updateFrakeTranslations(credentials, fileId);
+            }
+          }
+        } else if((crowdinPathSections[0] === 'dashboard' || crowdinPathSections[0] === 'player-web' || crowdinPathSections[0] === 'components') && appDirectoryId) {
+          if(crowdinPathSections[1] === 'en.json') {
+            const fileId = await getFileIdIfExists(credentials, appDirectoryId, crowdinPathSections[1]); // en.json file id to update
+            if(fileId) {
+              const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+              if(fileId && storageId) {
+                await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+                await updateFrakeTranslations(credentials, fileId);
+              }
+            } else {
+              console.error(`Could not upload ${chalk.yellow.bold(`${rowdinPathSections[1]}`)}. Only en.json supported.`);
+            }
+          } else { // data-connector, regions-map and uploader in dashboard folder
+            const folderId = await findCrowdinAppDirectoryId(credentials, crowdinPath, crowdinPathSections[1]);
+            if(folderId === undefined) {
+              console.error(`Could not find ${chalk.yellow.bold(`${folderId}`)} folder`);
+            }
+            const fileId = await getFileIdIfExists(credentials, folderId, crowdinPathSections[2]); // en.json file id to update
+            const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+            if(fileId && storageId) {
+              await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+              await updateFrakeTranslations(credentials, fileId);
+            } 
           }
-        } else {
-          // TODO Update dashboard transtlations file
         }
-        // await uploadFileToCrowdin(credentials, config.crowdinPath, config.localPath);
-        // const { data: fakeTranslation } = await fetchFileFromCrowdin(credentials, config.crowdinPath, FAKE_IN_CONTEXT_LANGUAGE);
-
-        // const s3TranslationsPath = path.parse(s3EnPath).dir;
-        // const s3FakeTranslationPath = path.join(s3TranslationsPath, FAKE_IN_CONTEXT_LANGUAGE_FILE);
-
-        // await uploadTranslationToS3(s3Client, bucket, s3FakeTranslationPath, JSON.stringify(fakeTranslation));
       }
     }
   }
 }
 
+async function updateFrakeTranslations(credentials, fileId) {
+  const { data: fakeTranslation } = await fetchFileFromCrowdin(credentials, FAKE_IN_CONTEXT_LANGUAGE, fileId);
+  console.log('eo data', fakeTranslation);
+  const s3TranslationsPath = path.parse(s3EnPath).dir;
+  console.log('s3TranslationsPath', s3TranslationsPath);
+  const s3FakeTranslationPath = path.join(s3TranslationsPath, FAKE_IN_CONTEXT_LANGUAGE_FILE);
+  console.log('s3FakeTranslationPath', s3FakeTranslationPath);
+  // await uploadTranslationToS3(s3Client, bucket, s3FakeTranslationPath, JSON.stringify(fakeTranslation));
+}
+
 async function promptForceContinue() {
   return inquirer.prompt({
     type: 'confirm',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enplug/scripts",
-  "version": "1.11.4-dev6",
+  "version": "1.11.4-dev61",
   "description": "Enplug scripts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",