@enplug/scripts 1.11.4-dev3 → 1.11.4-dev30

package/bin/functions/translations/crowdin.js

@@ -6,6 +6,7 @@ const inquirer = require('inquirer');
 const loadDevPrivateFile = require('../loadDevPrivateFile');
 const rootPath = __dirname.split('node_modules')[0];
 const getPackageJson = require('../getPackageJson');
+const { Blob } = require('buffer');
 
 const { from, throwError } = require('rxjs');
 const { catchError, switchMap, tap, filter } = require('rxjs/operators');
@@ -109,26 +110,31 @@ function getCrowdinConfig() {
 }
 
 function generateFormData(crowdinPath, localPath) {
+  // const reader = new FileReader();
   const formData = new FormData();
-
+  console.log('localPath', localPath);
+  const file = fs.readFileSync('./'+localPath);
+  console.log('file', file);
+  let blob = new Blob([file]);
+  console.log('blob', blob);
   // 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');
+  // formData.append('json', '');
+  formData.append('file', blob, 'en.json');
+  // formData.append(`export_patterns[${crowdinPath}]`, '%locale%.json');
   return formData;
 }
 
-function postFileToCrowdin(operation, credentials, crowdinPath, localPath) {
+ function postFileToCrowdin(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: { 
+  console.log('formData', formData);
+  return axios.post(url, formData, { headers: { 
     "Authorization": AuthStr,
     "Content-Type": "application/json",
     "Crowdin-API-FileName": "en.json" 
-  } }));
+  } });
 }
 
 async function findCrowdinAppDirectoryId(credentials, crowdinPath) {
@@ -137,33 +143,32 @@ async function findCrowdinAppDirectoryId(credentials, crowdinPath) {
     const appName = path.split('/')[1];
     const url = `${CROWDIN_PROJECT_URL}/directories?filter=${appName}`;
     const AuthStr = 'Bearer '.concat(credentials.token);
-    const directories = await axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('directories', directories)
-    return directories.data.find(d => d.data.name === appName).id;
+    const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+    const directory = resp.data.data.find(d => d.data.name === appName );
+    return directory.data.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)
-
-    return directories.data.find(d => d.data.name === 'dashboard' && d.data.title === 'Dashboard' && d.data.path === '/dashboard').id;
+    const resp = 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.data.id;
   }
 }
 
 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)
-
-    return directories.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.data.id;
 }
 
 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.data.id;
 }
 
 async function uploadFileToCrowdinStorage(credentials, crowdinPath, localPath) {
@@ -172,45 +177,49 @@ async function uploadFileToCrowdinStorage(credentials, crowdinPath, localPath) {
     throw new Error('Local file does not exist');
   }
 
-  return postFileToCrowdin('update', credentials, crowdinPath, 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))
-        );
-      }
-      
-      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;
+  const response = await postFileToCrowdin(credentials, crowdinPath, localPath)
+  return response
+  // return postFileToCrowdin(credentials, crowdinPath, localPath).pipe(
+  //   catchError(error => {
+  //     // if (error.response.status === HTTP_NOT_FOUND_STATUS_CODE) {
+  //     //   return promptAddFile(crowdinPath).pipe(
+  //     //     filter(({addFileConfirm}) => addFileConfirm === true),
+  //     //     switchMap(() => postFileToCrowdin(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();
+  //       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) {
+  console.log('storageId', storageId);
+  console.log('fileId', fileId);
   const url = `${CROWDIN_PROJECT_URL}/files/${fileId}`;
   const AuthStr = 'Bearer '.concat(credentials.token);
   const body = {

package/bin/functions/translations/translations.js

@@ -62,17 +62,15 @@ async function syncTranslations(s3Client, bucket) {
 
       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 path = config.crowdinPath.startsWith('/') ? config.crowdinPath.substr(1) : config.crowdinPath;
           const subfolderName = path.split('/')[2];
           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(fileId) {
-            await updateCrowdinFile(credentials, storageId, fileId);
+          const fileId = await getFileIdIfExists(credentials, folderId, path.split('/')[3]);
+          const storageId = await uploadFileToCrowdinStorage(credentials, config.crowdinPath, config.localPath);
+          if(fileId && storageId) {
+            const response = await updateCrowdinFile(credentials, storageId.data.data.id, fileId);
+            console.log('response', response.data);
           }
         } else {
           // TODO Update dashboard transtlations file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enplug/scripts",
-  "version": "1.11.4-dev3",
+  "version": "1.11.4-dev30",
   "description": "Enplug scripts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -29,6 +29,7 @@
   "dependencies": {
     "aws-sdk": "^2.474.0",
     "axios": "^0.19.2",
+    "buffer": "^6.0.3",
     "chalk": "2.4.1",
     "command-line-args": "5.0.2",
     "fs": "0.0.1-security",