@enplug/scripts 1.11.4 → 1.11.6

package/bin/functions/createS3Client.js

@@ -1,45 +1,10 @@
-const path = require('path');
-const fs = require('fs');
-const chalk = require('chalk');
-const rootPath = process.cwd();
 const AWS = require('aws-sdk');
 
-function getAwsPrivateFile() {
-  const fileName = 'aws.private.json';
-  let prefix = '';
-  let file = null;
-  let maxDepth = 2;
-  do {
-    file = path.resolve(rootPath, prefix + fileName);
-    prefix += '../';
-  } while (!fs.existsSync(file) && maxDepth--);
-
-  return file;
-}
-
 function createS3Client(pkg) {
-  let creds;
   const s3Options = Object.assign({}, pkg.config.aws.s3);
-  const credsFile = getAwsPrivateFile();
-
-  try {
-    creds = JSON.parse(fs.readFileSync(credsFile, 'utf8'));
-  } catch (e) {
-    console.error(`Error finding/parsing ${chalk.default.cyan(credsFile)}`);
-    return;
-  }
-
-  if (creds.accessKeyId == null || creds.secretAccessKey == null) {
-    console.error(`Error could not fine accessKeyId or secretAccessKey in ${chalk.default.cyan(credsFile)} file.`);
-    return;
-  }
 
-  // Setting up the credentials globally
-  AWS.config.update({
-    accessKeyId: creds.accessKeyId,
-    secretAccessKey: creds.secretAccessKey,
-    maxRetries: 3,
-  });
+  const credentials = new AWS.SharedIniFileCredentials({ profile: pkg.config.aws.profile });
+  AWS.config.credentials = credentials;
 
   return new AWS.S3(s3Options);
 }

package/bin/functions/translations/crowdin.js

@@ -1,7 +1,6 @@
 const axios = require('axios');
 const chalk = require('chalk');
 const fs = require('fs');
-const FormData = require('form-data');
 const inquirer = require('inquirer');
 const loadDevPrivateFile = require('../loadDevPrivateFile');
 const rootPath = __dirname.split('node_modules')[0];
@@ -13,59 +12,9 @@ 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_URL = `https://api.crowdin.com/api/project/${CROWDIN_PROJECT_ID}`;
-const CROWDIN_DIRECTORY_NOT_FOUND_ERROR_CODE = 17;
-
-async function uploadFileToCrowdin(credentials, crowdinPath, localPath) {
-  if (!credentials || !credentials.login || !credentials.accountKey) {
-    console.error(`${chalk.red.bold('Crowdin credentials not provided')}`);
-    console.log(`Make sure that the ${chalk.default.yellow('dev.private.json')} file contains ${chalk.default.yellow('crowdinCredentials: { login, accountKey }')}`);
-    throw new Error('Crowdin credentials not provided');
-  }
-
-  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(
-    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.success) {
-          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();
-}
+const CROWDIN_PROJECT_ID = '401630';
+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`;
 
 function getCrowdinCredentials() {
   try {
@@ -105,38 +54,149 @@ function getCrowdinConfig() {
   return pkg.config.crowdin;
 }
 
-function generateFormData(credentials, crowdinPath, localPath) {
-  const formData = new FormData();
+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);
+    } 
+  }
+}
 
-  formData.append('login', credentials.login);
-  formData.append('account-key', credentials.accountKey);
-  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');
+async function findCrowdinAppSubFolderId(credentials, directoryId, subfolderName) {
+    const url = `${CROWDIN_PROJECT_URL}/directories?directoryId=${directoryId}`;
+    const AuthStr = 'Bearer '.concat(credentials.token);
+    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;
+}
 
-  return formData;
+async function getFileIdIfExists(credentials, directoryId, fileName) {
+  const url = `${CROWDIN_PROJECT_URL}/files?directoryId=${directoryId}`;
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  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(operation, credentials, crowdinPath, localPath) {
-  const formData = generateFormData(credentials, crowdinPath, localPath);
+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, 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(credentials, localPath).pipe(
+    catchError(error => {
+      console('ERROR could not upload file to crowdin storage')
+      return throwError(error);
+    }),
+  ).toPromise();
+}
 
-  const operationEndpoint = operation === 'update' ? `update-file` : 'add-file';
-  const url = `${CROWDIN_PROJECT_URL}/${operationEndpoint}`;
+async function updateCrowdinFile(credentials, crowdinPath, storageId, fileId) {
+  const url = `${CROWDIN_PROJECT_URL}/files/${fileId}`;
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const body = {
+    "storageId": storageId,
+    "updateOption": "keep_translations_and_approvals",
+    "importOptions": {
+        "contentSegmentation": false,
+        "customSegmentation": false
+    },
+    "exportOptions": {
+        "exportPattern": "%locale%.json"
+    },
+    "replaceModifiedContext": false
+  }
+  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();
+}
 
-  return from(axios.post(url, formData, { headers: formData.getHeaders() }));
+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, crowdinPath, language) {
-  const url = `${CROWDIN_PROJECT_URL}/export-file`;
-  const params = {
-    'login': credentials.login,
-    'account-key': credentials.accountKey,
-    'file': crowdinPath,
-    'language': language
+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.post(url, body, { headers: { Authorization: AuthStr } });
+}
 
-  return axios.get(url, { params });
+function readFakeTranslationsFile(url) {
+  return axios.get(url);
 }
 
 function promptAddFile(crowdinPath) {
@@ -149,4 +209,4 @@ function promptAddFile(crowdinPath) {
   }));
 }
 
-module.exports = { getCrowdinCredentials, getCrowdinConfig, uploadFileToCrowdin, fetchFileFromCrowdin };
+module.exports = { getCrowdinCredentials, getCrowdinConfig, findCrowdinAppDirectoryId, findCrowdinAppSubFolderId, getFileIdIfExists, uploadFileToCrowdinStorage, updateCrowdinFile, addCrowdinFile, fetchFileFromCrowdin, readFakeTranslationsFile };

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, uploadFileToCrowdin, fetchFileFromCrowdin } = require('./crowdin');
+const { getCrowdinCredentials, getCrowdinConfig, findCrowdinAppDirectoryId, findCrowdinAppSubFolderId, getFileIdIfExists, uploadFileToCrowdinStorage, updateCrowdinFile, addCrowdinFile, fetchFileFromCrowdin, readFakeTranslationsFile } = require('./crowdin');
 const { checkKeys, validateTranslationFile } = require('./transloco');
 const { uploadTranslationToS3 } = require('./translation-s3');
 const getPackageJson = require('../getPackageJson');
@@ -43,6 +43,12 @@ async function syncTranslations(s3Client, bucket) {
     config = getCrowdinConfig();
   } catch {}
 
+  if (!credentials || !credentials.token) {
+    console.error(`${chalk.red.bold('Crowdin credentials not provided')}`);
+    console.log(`Make sure that the ${chalk.default.yellow('dev.private.json')} file contains ${chalk.default.yellow('crowdinCredentials: { token }')}`);
+    throw new Error('Crowdin credentials not provided');
+  }
+  
   if (credentials && config) {
     const { confirmUpload } = await promptUpload(config.crowdinPath, isProduction);
    
@@ -55,18 +61,77 @@ async function syncTranslations(s3Client, bucket) {
       await uploadTranslationToS3(s3Client, bucket, s3EnPath, enTranslation);
 
       if (isProduction) {
-        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));
+        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);
+          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) {
+            const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+            if(fileId && storageId) {
+              await updateCrowdinFile(credentials, crowdinPath, storageId.data.data.id, fileId);
+              await updateFrakeTranslations(credentials, fileId, s3EnPath, s3Client, bucket);
+            }
+          } else {
+            const storageId = await uploadFileToCrowdinStorage(credentials, config.localPath);
+            if(storageId) {
+              const result = await addCrowdinFile(credentials, crowdinPath, storageId.data.data.id, folderId);
+              await updateFrakeTranslations(credentials, result.data.data.id, s3EnPath, s3Client, bucket);
+            }
+          }
+        } 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, s3EnPath, s3Client, bucket);
+              }
+            } 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, s3EnPath, s3Client, bucket);
+            } 
+          }
+        }
       }
     }
   }
 }
 
+async function updateFrakeTranslations(credentials, fileId, s3EnPath, s3Client, bucket) {
+  const { data: fakeTranslationUrl } = await fetchFileFromCrowdin(credentials, FAKE_IN_CONTEXT_LANGUAGE, fileId);
+  const s3TranslationsPath = path.parse(s3EnPath).dir;
+  const s3FakeTranslationPath = path.join(s3TranslationsPath, FAKE_IN_CONTEXT_LANGUAGE_FILE);
+  const fakeTranslation = await readFakeTranslationsFile(fakeTranslationUrl.data.url);
+  await uploadTranslationToS3(s3Client, bucket, s3FakeTranslationPath, JSON.stringify(fakeTranslation.data));
+}
+
 async function promptForceContinue() {
   return inquirer.prompt({
     type: 'confirm',

package/enplug_device/commands.py

@@ -1,23 +1,23 @@
-
-# sqs_is_prod = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"select * from Settings;\""
-adb_devices = "adb devices"
-build_binary = "pyinstaller --onefile enplug_device.py --distpath ../bin/"
-change_env_to_development = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from settings where key='eduid';delete from settings where key='eduid';delete from settings where key='edutoken';delete from settings where key='eduname';insert into settings (key, value) values ('environment', 'development');update settings set value='development' where key='environment';\""
-change_env_to_production = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from settings where key='eduid';delete from settings where key='eduid';delete from settings where key='edutoken';delete from settings where key='eduname';insert into settings (key, value) values ('environment', 'development');update settings set value='development' where key='environment';\""
-change_env_to_staging = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from settings where key='eduid';delete from settings where key='eduid';delete from settings where key='edutoken';delete from settings where key='eduname';insert into settings (key, value) values ('environment', 'staging');update settings set value='staging' where key='environment';\""
-clear_cache = "adb shell pm clear com.enplug.player"
-copy_player_file_to_device = "adb push Player.apk '/sdcard/Download'"
-disable_webview = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='UseWebView'; insert into Settings values ('UseWebView', 'false');\""
-enable_web_debugger = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"insert into settings values('WebRemoteDebugging','true')\""
-enable_webview = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='UseWebView'; insert into Settings values ('UseWebView', 'true');\""
-get_environment = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"select value from Settings where key='environment';\""
-install_package = "adb install Player.apk"
-logs_delete_all = "adb shell rm /sdcard/LogWriter/*"
-make_sdcard_writable = "adb shell mount -o rw,remount rootfs /"
-reboot = "adb shell reboot"
-set_zoning_version_development = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='ZoningHostUrl'; insert into Settings values ('ZoningHostUrl', 'https://dev-player.enplug.in/{0}/');\""
-set_zoning_version_production = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='ZoningHostUrl'; insert into Settings values ('ZoningHostUrl', 'https://player.enplug.com/{0}/');\""
-set_zoning_version_staging = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='ZoningHostUrl'; insert into Settings values ('ZoningHostUrl', 'https://player.enplug.in/{0}/');\""
-show_settings="adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"select * from Settings;\""
-uninstall_package = "adb uninstall com.enplug.player"
+
+# sqs_is_prod = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"select * from Settings;\""
+adb_devices = "adb devices"
+build_binary = "pyinstaller --onefile enplug_device.py --distpath ../bin/"
+change_env_to_development = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from settings where key='eduid';delete from settings where key='eduid';delete from settings where key='edutoken';delete from settings where key='eduname';insert into settings (key, value) values ('environment', 'development');update settings set value='development' where key='environment';\""
+change_env_to_production = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from settings where key='eduid';delete from settings where key='eduid';delete from settings where key='edutoken';delete from settings where key='eduname';insert into settings (key, value) values ('environment', 'development');update settings set value='development' where key='environment';\""
+change_env_to_staging = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from settings where key='eduid';delete from settings where key='eduid';delete from settings where key='edutoken';delete from settings where key='eduname';insert into settings (key, value) values ('environment', 'staging');update settings set value='staging' where key='environment';\""
+clear_cache = "adb shell pm clear com.enplug.player"
+copy_player_file_to_device = "adb push Player.apk '/sdcard/Download'"
+disable_webview = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='UseWebView'; insert into Settings values ('UseWebView', 'false');\""
+enable_web_debugger = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"insert into settings values('WebRemoteDebugging','true')\""
+enable_webview = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='UseWebView'; insert into Settings values ('UseWebView', 'true');\""
+get_environment = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"select value from Settings where key='environment';\""
+install_package = "adb install Player.apk"
+logs_delete_all = "adb shell rm /sdcard/LogWriter/*"
+make_sdcard_writable = "adb shell mount -o rw,remount rootfs /"
+reboot = "adb shell reboot"
+set_zoning_version_development = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='ZoningHostUrl'; insert into Settings values ('ZoningHostUrl', 'https://dev-player.enplug.in/{0}/');\""
+set_zoning_version_production = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='ZoningHostUrl'; insert into Settings values ('ZoningHostUrl', 'https://player.enplug.com/{0}/');\""
+set_zoning_version_staging = "adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"delete from Settings where key='ZoningHostUrl'; insert into Settings values ('ZoningHostUrl', 'https://player.enplug.in/{0}/');\""
+show_settings="adb shell sqlite3 /data/data/com.enplug.player/databases/settings.db \"select * from Settings;\""
+uninstall_package = "adb uninstall com.enplug.player"
 test_elevator="adb shell am broadcast -a com.enplug.player.LIFT --es Floor \"2\" --ei Arrow 1 --ei Status 0"

package/enplug_device/enplug_device.py

@@ -1,256 +1,256 @@
-#!/usr/bin/python -u
-
-import getopt
-import json
-import os
-import shutil
-import sys
-import time
-from urllib.request import Request
-from urllib.request import urlopen
-from urllib.request import urlretrieve
-import subprocess
-
-
-import commands as cmd
-
-DEVELOPMENT_DEPLOYMENTS_URL = "https://dev-devices.enplug.in/devices/app/deployments?platform=Edu"
-PROD_DEPLOYMENTS_URL = "https://devices.enplug.com/devices/app/deployments?platform=Edu"
-STAGING_DEPLOYMENTS_URL = "https://staging-devices.enplug.in/devices/app/deployments?platform=Edu"
-KONE_STAGING_URL = "https://s3-us-west-2.amazonaws.com/enplug-android-image/test/StagingPlayer.apk"
-
-
-def main(argv):
-    run_command(cmd.adb_devices)
-    showOptions()
-
-
-def showOptions():
-    environment = run_command(cmd.get_environment)
-    print('\nEnvironment is set to: ' + environment.upper() + '\n')
-
-    print('[1] Reboot')
-    print('[2] Clear Device Cache')
-    print('[3] Set Custom Zoning Host Version')
-    print('[4] Logs')
-    print('[5] Change Environment')
-    print('[6] Enable Web Debugger')
-    print('[7] Enable/Disable WebView')
-    print('[8] Show settings table')
-    print('[9] Test elevator')
-    print('')
-    # print ('[B] Build .exe File')
-    print('[Q] Quit')
-    sys.stdout.flush()
-
-    option = input().strip().lower()
-
-    if option == "1":
-        reboot()
-    elif option == "2":
-        clearCache()
-    elif option == "3":
-        setZoningVersion()
-    elif option == "4":
-        showLogOptions()
-    elif option == "5":
-        changeEnvironment()
-    elif option == "6":
-        enableWebDebugger()
-    elif option == "7":
-        enableDisableWebView()
-    elif option == "8":
-        showSettingsTable()
-    elif option == "9":
-        sendElevatorIntent()
-    elif option == "b":
-        build()
-
-    elif option == "q":
-        sys.exit(0)
-
-    sys.stdout.flush()
-    log('------------------------')
-    time.sleep(5)
-    showOptions()
-
-
-def build():
-    run_command(cmd.build_binary)
-    shutil.rmtree('build')
-    os.remove('commands.pyc')
-    os.remove('enplug_device.spec')
-
-
-def changeEnvironment():
-    log("Select target environment", True)
-    log('[1] Development')
-    log('[2] Staging')
-    log('[3] Production')
-    log('[4] KONE Staging')
-    option = input().strip().lower()
-    is_kone = False
-
-    if option == "1":
-        log("Changing device environment to: DEVELOPMENT", True)
-        url = DEVELOPMENT_DEPLOYMENTS_URL
-    elif option == "2":
-        log("Changing device environment to: STAGING", True)
-        url = STAGING_DEPLOYMENTS_URL
-    elif option == "3":
-        log("Changing device environment to: PRODUCTION")
-        url = PROD_DEPLOYMENTS_URL
-    elif option == "4":
-        log("Changing KONE device environment to STAGING", True)
-        is_kone = True
-    else:
-        log("Invalid input. Exiting.")
-        sys.exit()
-
-    if is_kone:
-        downloadFile(KONE_STAGING_URL, "Player.apk")
-        run_command(cmd.uninstall_package)
-        run_command(cmd.install_package)
-        log("Please wait (20s) while the script makes appropriate database changes...", True)
-        time.sleep(20)
-        run_command(cmd.change_env_to_staging)
-        run_command(cmd.reboot)
-        return
-
-    log("Fetching deployment URLs from " + url)
-
-    response = urlopen(url)
-    html = response.read()
-    package_json_data = json.loads(html)
-    player_packages = package_json_data["Result"]
-
-    for pkg in player_packages:
-        if pkg["AppName"] == "Player":
-            pkg_url = pkg["PackageUrl"]
-            log("Original URL: " + pkg_url)
-            pkg_url = pkg_url.replace('https://staging-eduapps.enplug.in', 'http://staging-eduapps.enplug.in.s3-website-us-west-2.amazonaws.com')
-            pkg_url = pkg_url.replace('https://eduapps.enplug.com', 'https://s3-us-west-2.amazonaws.com/eduapps.enplug.com')
-            pkg_url = pkg_url.replace('https://dev-eduapps.enplug.in', 'http://dev-eduapps.enplug.in.s3-website-us-west-2.amazonaws.com')
-
-            downloadFile(pkg_url, "Player.apk")
-            run_command(cmd.uninstall_package)
-            run_command(cmd.install_package)
-            if (option == "1"):     # Development
-                log("Please wait (20s) while the script makes appropriate database changes (dev)...", True)
-                time.sleep(20)
-                run_command(cmd.change_env_to_development)
-            if (option == "2"):     # Staging
-                log("Please wait (20s) while the script makes appropriate database changes (staging)...", True)
-                time.sleep(20)
-                run_command(cmd.change_env_to_staging)
-            if (option == "3"):     # Production
-                log("Please wait (20s) while the script makes appropriate database changes (prod)...", True)
-                time.sleep(20)
-                run_command(cmd.change_env_to_production)
-            clearCache()
-
-
-def clearCache():
-    log("Clearing cache...")
-    sys.stdout.flush()
-    run_command(cmd.clear_cache)
-
-
-def downloadFile(url, filename):
-    log("Downloading package file: " + url)
-    urlretrieve(url, filename)
-    log("Downloaded file and saved as " + filename)
-
-
-def deleteAllLogFiles():
-    run_command(cmd.logs_delete_all)
-
-
-def enableDisableWebView():
-    log('[1] Enable WebView')
-    log('[2] Disable WebView')
-    option = input().strip().lower()
-
-    if option == "1":
-        log("Enabling WebView setting...", True)
-        run_command(cmd.enable_webview)
-    elif option == "2":
-        log("Disabling WebView setting...", True)
-        run_command(cmd.disable_webview)
-    else:
-        log("Invalid input. Exiting.")
-        sys.exit()
-
-def enableWebDebugger():
-    run_command(cmd.enable_web_debugger)
-
-
-def log(message, new_line=False):
-    if new_line:
-        print()
-    print(message)
-    sys.stdout.flush()
-
-
-def reboot():
-    log("Rebooting device...")
-    sys.stdout.flush()
-    run_command(cmd.reboot)
-
-
-def run_command(command, *params):
-    command = command.format(*params)
-    # log("Executing command: ", True)
-    # log('  ' + command)
-    command = command.split()
-    p = subprocess.Popen(command, stdout=subprocess.PIPE)
-    out, err = p.communicate()
-    return out.strip().decode('utf-8')
-
-
-def setZoningVersion():
-    environment = run_command(cmd.get_environment)
-    log("Enter new version: ")
-    ver = input().strip()
-    if not environment:
-        environment = run_command(cmd.get_environment)
-
-    if environment == "production":
-        run_command(cmd.set_zoning_version_production, ver)
-    elif environment == "staging":
-        run_command(cmd.set_zoning_version_staging, ver)
-    elif environment == "dev":
-        run_command(cmd.set_zoning_version_development, ver)
-    else:
-        print("Error: Unable to change version. Unknown current environment")
-    run_command(cmd.reboot)
-
-
-def showLogOptions():
-    log('[1] Download Logs Directory')
-    log('[2] Download Logs as One File')
-    log('[3] Delete All Logs')
-    option = input().strip().lower()
-
-    if option == "1":
-        log("Downloading logs directory...", True)
-    elif option == "2":
-        log("Downloading and concatenating available logs...")
-    elif option == "3":
-        log("Deleting all logs...")
-        deleteAllLogFiles()
-    else:
-        log("Invalid input. Exiting.")
-        sys.exit()
-
-
-def showSettingsTable():
-    settingsOut = run_command(cmd.show_settings)
-    print(settingsOut)
-
-def sendElevatorIntent():
-    elevator = run_command(cmd.test_elevator)
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
+#!/usr/bin/python -u
+
+import getopt
+import json
+import os
+import shutil
+import sys
+import time
+from urllib.request import Request
+from urllib.request import urlopen
+from urllib.request import urlretrieve
+import subprocess
+
+
+import commands as cmd
+
+DEVELOPMENT_DEPLOYMENTS_URL = "https://dev-devices.enplug.in/devices/app/deployments?platform=Edu"
+PROD_DEPLOYMENTS_URL = "https://devices.enplug.com/devices/app/deployments?platform=Edu"
+STAGING_DEPLOYMENTS_URL = "https://staging-devices.enplug.in/devices/app/deployments?platform=Edu"
+KONE_STAGING_URL = "https://s3-us-west-2.amazonaws.com/enplug-android-image/test/StagingPlayer.apk"
+
+
+def main(argv):
+    run_command(cmd.adb_devices)
+    showOptions()
+
+
+def showOptions():
+    environment = run_command(cmd.get_environment)
+    print('\nEnvironment is set to: ' + environment.upper() + '\n')
+
+    print('[1] Reboot')
+    print('[2] Clear Device Cache')
+    print('[3] Set Custom Zoning Host Version')
+    print('[4] Logs')
+    print('[5] Change Environment')
+    print('[6] Enable Web Debugger')
+    print('[7] Enable/Disable WebView')
+    print('[8] Show settings table')
+    print('[9] Test elevator')
+    print('')
+    # print ('[B] Build .exe File')
+    print('[Q] Quit')
+    sys.stdout.flush()
+
+    option = input().strip().lower()
+
+    if option == "1":
+        reboot()
+    elif option == "2":
+        clearCache()
+    elif option == "3":
+        setZoningVersion()
+    elif option == "4":
+        showLogOptions()
+    elif option == "5":
+        changeEnvironment()
+    elif option == "6":
+        enableWebDebugger()
+    elif option == "7":
+        enableDisableWebView()
+    elif option == "8":
+        showSettingsTable()
+    elif option == "9":
+        sendElevatorIntent()
+    elif option == "b":
+        build()
+
+    elif option == "q":
+        sys.exit(0)
+
+    sys.stdout.flush()
+    log('------------------------')
+    time.sleep(5)
+    showOptions()
+
+
+def build():
+    run_command(cmd.build_binary)
+    shutil.rmtree('build')
+    os.remove('commands.pyc')
+    os.remove('enplug_device.spec')
+
+
+def changeEnvironment():
+    log("Select target environment", True)
+    log('[1] Development')
+    log('[2] Staging')
+    log('[3] Production')
+    log('[4] KONE Staging')
+    option = input().strip().lower()
+    is_kone = False
+
+    if option == "1":
+        log("Changing device environment to: DEVELOPMENT", True)
+        url = DEVELOPMENT_DEPLOYMENTS_URL
+    elif option == "2":
+        log("Changing device environment to: STAGING", True)
+        url = STAGING_DEPLOYMENTS_URL
+    elif option == "3":
+        log("Changing device environment to: PRODUCTION")
+        url = PROD_DEPLOYMENTS_URL
+    elif option == "4":
+        log("Changing KONE device environment to STAGING", True)
+        is_kone = True
+    else:
+        log("Invalid input. Exiting.")
+        sys.exit()
+
+    if is_kone:
+        downloadFile(KONE_STAGING_URL, "Player.apk")
+        run_command(cmd.uninstall_package)
+        run_command(cmd.install_package)
+        log("Please wait (20s) while the script makes appropriate database changes...", True)
+        time.sleep(20)
+        run_command(cmd.change_env_to_staging)
+        run_command(cmd.reboot)
+        return
+
+    log("Fetching deployment URLs from " + url)
+
+    response = urlopen(url)
+    html = response.read()
+    package_json_data = json.loads(html)
+    player_packages = package_json_data["Result"]
+
+    for pkg in player_packages:
+        if pkg["AppName"] == "Player":
+            pkg_url = pkg["PackageUrl"]
+            log("Original URL: " + pkg_url)
+            pkg_url = pkg_url.replace('https://staging-eduapps.enplug.in', 'http://staging-eduapps.enplug.in.s3-website-us-west-2.amazonaws.com')
+            pkg_url = pkg_url.replace('https://eduapps.enplug.com', 'https://s3-us-west-2.amazonaws.com/eduapps.enplug.com')
+            pkg_url = pkg_url.replace('https://dev-eduapps.enplug.in', 'http://dev-eduapps.enplug.in.s3-website-us-west-2.amazonaws.com')
+
+            downloadFile(pkg_url, "Player.apk")
+            run_command(cmd.uninstall_package)
+            run_command(cmd.install_package)
+            if (option == "1"):     # Development
+                log("Please wait (20s) while the script makes appropriate database changes (dev)...", True)
+                time.sleep(20)
+                run_command(cmd.change_env_to_development)
+            if (option == "2"):     # Staging
+                log("Please wait (20s) while the script makes appropriate database changes (staging)...", True)
+                time.sleep(20)
+                run_command(cmd.change_env_to_staging)
+            if (option == "3"):     # Production
+                log("Please wait (20s) while the script makes appropriate database changes (prod)...", True)
+                time.sleep(20)
+                run_command(cmd.change_env_to_production)
+            clearCache()
+
+
+def clearCache():
+    log("Clearing cache...")
+    sys.stdout.flush()
+    run_command(cmd.clear_cache)
+
+
+def downloadFile(url, filename):
+    log("Downloading package file: " + url)
+    urlretrieve(url, filename)
+    log("Downloaded file and saved as " + filename)
+
+
+def deleteAllLogFiles():
+    run_command(cmd.logs_delete_all)
+
+
+def enableDisableWebView():
+    log('[1] Enable WebView')
+    log('[2] Disable WebView')
+    option = input().strip().lower()
+
+    if option == "1":
+        log("Enabling WebView setting...", True)
+        run_command(cmd.enable_webview)
+    elif option == "2":
+        log("Disabling WebView setting...", True)
+        run_command(cmd.disable_webview)
+    else:
+        log("Invalid input. Exiting.")
+        sys.exit()
+
+def enableWebDebugger():
+    run_command(cmd.enable_web_debugger)
+
+
+def log(message, new_line=False):
+    if new_line:
+        print()
+    print(message)
+    sys.stdout.flush()
+
+
+def reboot():
+    log("Rebooting device...")
+    sys.stdout.flush()
+    run_command(cmd.reboot)
+
+
+def run_command(command, *params):
+    command = command.format(*params)
+    # log("Executing command: ", True)
+    # log('  ' + command)
+    command = command.split()
+    p = subprocess.Popen(command, stdout=subprocess.PIPE)
+    out, err = p.communicate()
+    return out.strip().decode('utf-8')
+
+
+def setZoningVersion():
+    environment = run_command(cmd.get_environment)
+    log("Enter new version: ")
+    ver = input().strip()
+    if not environment:
+        environment = run_command(cmd.get_environment)
+
+    if environment == "production":
+        run_command(cmd.set_zoning_version_production, ver)
+    elif environment == "staging":
+        run_command(cmd.set_zoning_version_staging, ver)
+    elif environment == "dev":
+        run_command(cmd.set_zoning_version_development, ver)
+    else:
+        print("Error: Unable to change version. Unknown current environment")
+    run_command(cmd.reboot)
+
+
+def showLogOptions():
+    log('[1] Download Logs Directory')
+    log('[2] Download Logs as One File')
+    log('[3] Delete All Logs')
+    option = input().strip().lower()
+
+    if option == "1":
+        log("Downloading logs directory...", True)
+    elif option == "2":
+        log("Downloading and concatenating available logs...")
+    elif option == "3":
+        log("Deleting all logs...")
+        deleteAllLogFiles()
+    else:
+        log("Invalid input. Exiting.")
+        sys.exit()
+
+
+def showSettingsTable():
+    settingsOut = run_command(cmd.show_settings)
+    print(settingsOut)
+
+def sendElevatorIntent():
+    elevator = run_command(cmd.test_elevator)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enplug/scripts",
-  "version": "1.11.4",
+  "version": "1.11.6",
   "description": "Enplug scripts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -27,7 +27,7 @@
     "check-packages": "bin/check-packages.js"
   },
   "dependencies": {
-    "aws-sdk": "^2.474.0",
+    "aws-sdk": "2.1692.0",
     "axios": "^0.19.2",
     "chalk": "2.4.1",
     "command-line-args": "5.0.2",