upgrade translation fetcher to transifex API v3

see https://www.transifex.com/blog/2020/transifex-api-version-3/

Author: tyrasd

dist/locales/br.min.json

@@ -1 +1 @@
-{"af":{"rtl":false,"pct":0.04},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":1},"ar-AA":{"rtl":true,"pct":0.01},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.14},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.19},"bg":{"rtl":false,"pct":0.42},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"br":{"rtl":false,"pct":0.57},"bs":{"rtl":false,"pct":0.02},"ca":{"rtl":false,"pct":0.51},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":1},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.02},"da":{"rtl":false,"pct":0.46},"de":{"rtl":false,"pct":1},"de-AT":{"rtl":false,"pct":0},"de-CH":{"rtl":false,"pct":0},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.34},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-CA":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.22},"en-IE":{"rtl":false,"pct":0},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.69},"es":{"rtl":false,"pct":1},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.05},"fa":{"rtl":true,"pct":0.56},"fa-IR":{"rtl":true,"pct":0},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.38},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.99},"fr-FR":{"rtl":false,"pct":0.09},"fy":{"rtl":false,"pct":0.01},"ga":{"rtl":false,"pct":0},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.56},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.66},"he-IL":{"rtl":true,"pct":0},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.16},"hu":{"rtl":false,"pct":0.93},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.07},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.31},"it":{"rtl":false,"pct":0.59},"ja":{"rtl":false,"pct":0.99},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0.01},"kn":{"rtl":false,"pct":0.06},"ko":{"rtl":false,"pct":0.37},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0},"ky":{"rtl":false,"pct":0},"lb":{"rtl":false,"pct":0.17},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.14},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.24},"mg":{"rtl":false,"pct":0.06},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.37},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.12},"my":{"rtl":false,"pct":0},"nb":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.01},"nl":{"rtl":false,"pct":0.72},"nl-BE":{"rtl":false,"pct":0},"nl-NL":{"rtl":false,"pct":0},"nn":{"rtl":false,"pct":0.02},"no":{"rtl":false,"pct":0.48},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pa-PK":{"rtl":true,"pct":0.12},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.75},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.62},"pt-BR":{"rtl":false,"pct":0.56},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.12},"ru":{"rtl":false,"pct":0.48},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.03},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.54},"sl":{"rtl":false,"pct":0.15},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.01},"sq":{"rtl":false,"pct":0.07},"sr":{"rtl":false,"pct":0.36},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":0.9},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.08},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.01},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.03},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.66},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":1},"ur":{"rtl":true,"pct":0.05},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.86},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.1},"zh":{"rtl":false,"pct":0.02},"zh-CN":{"rtl":false,"pct":0.74},"zh-HK":{"rtl":false,"pct":0.31},"zh-TW":{"rtl":false,"pct":0.91},"zu":{"rtl":false,"pct":0}}
+{"af":{"rtl":false,"pct":0.22},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0.02},"ar":{"rtl":true,"pct":0.93},"ar-AA":{"rtl":true,"pct":0},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.27},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0},"bg":{"rtl":false,"pct":0.22},"bn":{"rtl":false,"pct":0.05},"bo":{"rtl":false,"pct":0},"br":{"rtl":false,"pct":0.35},"bs":{"rtl":false,"pct":0.14},"ca":{"rtl":false,"pct":0.63},"ckb":{"rtl":true,"pct":0.05},"cs":{"rtl":false,"pct":0.98},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.01},"da":{"rtl":false,"pct":0.61},"de":{"rtl":false,"pct":1},"de-AT":{"rtl":false,"pct":0},"de-CH":{"rtl":false,"pct":0},"dv":{"rtl":true,"pct":0.02},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.67},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0.02},"en-CA":{"rtl":false,"pct":0.04},"en-GB":{"rtl":false,"pct":0.31},"en-IE":{"rtl":false,"pct":0},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0.02},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.87},"es":{"rtl":false,"pct":0.99},"et":{"rtl":false,"pct":0.37},"eu":{"rtl":false,"pct":0.17},"fa":{"rtl":true,"pct":0.74},"fa-IR":{"rtl":true,"pct":0},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.62},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.98},"fr-FR":{"rtl":false,"pct":0},"fy":{"rtl":false,"pct":0.02},"ga":{"rtl":false,"pct":0},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.61},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.82},"he-IL":{"rtl":true,"pct":0},"hi":{"rtl":false,"pct":0.02},"hr":{"rtl":false,"pct":0.34},"hu":{"rtl":false,"pct":0.81},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.24},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.34},"it":{"rtl":false,"pct":0.78},"ja":{"rtl":false,"pct":0.86},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0},"kn":{"rtl":false,"pct":0.08},"ko":{"rtl":false,"pct":0.63},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0.01},"ky":{"rtl":false,"pct":0},"lb":{"rtl":false,"pct":0},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.29},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.22},"mg":{"rtl":false,"pct":0},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.99},"ml":{"rtl":false,"pct":0},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.14},"my":{"rtl":false,"pct":0},"nb":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.02},"nl":{"rtl":false,"pct":0.94},"nl-BE":{"rtl":false,"pct":0},"nl-NL":{"rtl":false,"pct":0},"nn":{"rtl":false,"pct":0.05},"no":{"rtl":false,"pct":0.72},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pa-PK":{"rtl":true,"pct":0.11},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.87},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.96},"pt-BR":{"rtl":false,"pct":0.85},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.28},"ru":{"rtl":false,"pct":0.61},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0},"sk":{"rtl":false,"pct":0.71},"sl":{"rtl":false,"pct":0.34},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.04},"sq":{"rtl":false,"pct":0.02},"sr":{"rtl":false,"pct":0.39},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":0.88},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.24},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.21},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.04},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.8},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":0.99},"ur":{"rtl":true,"pct":0},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.86},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.28},"zh":{"rtl":false,"pct":0.06},"zh-CN":{"rtl":false,"pct":0.89},"zh-HK":{"rtl":false,"pct":0.57},"zh-TW":{"rtl":false,"pct":1},"zu":{"rtl":false,"pct":0}}

dist/locales/index.min.json

@@ -76,8 +76,8 @@
     "@ideditor/temaki": "~5.2.0",
     "@mapbox/maki": "^8.0.0",
     "@openstreetmap/id-tagging-schema": "^5.0.1",
+    "@transifex/api": "^4.2.5",
     "autoprefixer": "^10.0.1",
-    "btoa": "^1.2.1",
     "chai": "^4.3.4",
     "chalk": "^4.1.2",
     "cldr-core": "^41.0.0",

package.json

@@ -3,44 +3,31 @@
 const chalk = require('chalk');
 const fs = require('fs');
 const fetch = require('node-fetch');
-const btoa = require('btoa');
 const YAML = require('js-yaml');
+const transifexApi = require('@transifex/api').transifexApi;
 
 const resourceIds = ['core', 'imagery', 'community'];
 const reviewedOnlyLangs = ['vi'];
 const outdir = 'dist/locales/';
-const apiroot = 'https://www.transifex.com/api/2';
-const projectURL = `${apiroot}/project/id-editor`;
 
 const languageNames = require('./language_names.js');
 
 
 // Transifex doesn't allow anonymous downloading
-let auth;
-/* eslint-disable no-process-env */
 if (process.env.transifex_password) {
   // Deployment scripts may prefer environment variables
-  auth = {
-    user: process.env.transifex_user || 'api',
-    password: process.env.transifex_password
-  };
+  /* eslint-disable no-process-env */
+  transifexApi.setup({ auth: process.env.transifex_password });
+  /* eslint-enable no-process-env */
 } else {
   // Credentials can be stored in transifex.auth as a json object. This file is gitignored.
-  // You can use an API key instead of your password: https://docs.transifex.com/api/introduction#authentication
-  // in which case for user parameter value should be: "api"
+  // You must use an API key as your password: You can generate one at
+  // https://www.transifex.com/user/settings/api/.
   // {
-  //   "user": "username",
-  //   "password": "password"
+  //   "password": "<api_key>"
   // }
-  auth = JSON.parse(fs.readFileSync('./transifex.auth', 'utf8'));
+  transifexApi.setup({ auth: JSON.parse(fs.readFileSync('./transifex.auth', 'utf8')).password });
 }
-/* eslint-enable no-process-env */
-
-const fetchOpts = {
-  headers: {
-    'Authorization': 'Basic ' + btoa(auth.user + ':' + auth.password),
-  }
-};
 
 const dataShortcuts = JSON.parse(fs.readFileSync('data/shortcuts.json', 'utf8'));
 
@@ -69,33 +56,36 @@ let coverageByLocaleCode = {};
 asyncMap(resourceIds, getResourceInfo, gotResourceInfo);
 asyncMap(resourceIds, getResource, gotResource);
 
-function getResourceInfo(resourceId, callback) {
-  let url = 'https://api.transifex.com/organizations/openstreetmap/projects/id-editor/resources/' + resourceId;
-  fetch(url, fetchOpts)
-    .then(res => {
-      console.log(`${res.status}: ${url}`);
-      return res.json();
-    })
-    .then(json => {
-      callback(null, json);
-    })
-    .catch(err => callback(err));
+async function getResourceInfo(resourceId, callback) {
+  try {
+    const result = [];
+    for await (const stat of transifexApi.ResourceLanguageStats.filter({
+      project: 'o:openstreetmap:p:id-editor',
+      resource: 'o:openstreetmap:p:id-editor:r:presets'
+    }).all()) {
+      result.push(stat);
+    }
+    console.log(`got resource language stats collection for ${resourceId}`);
+    callback(null, result);
+  } catch(err) {
+    console.error(`error while getting resource language stats collection for ${resourceId}`);
+    callback(err);
+  }
 }
 function gotResourceInfo(err, results) {
   if (err) return console.log(err);
-  results.forEach(function(info) {
-    for (let code in info.stats) {
-      let type = 'translated';
+  results.forEach(info => {
+    info.forEach(stat => {
+      let code = stat.relationships.language.data.id.substr(2).replace(/_/g, '-');
+      let type = 'translated_strings';
       if (reviewedOnlyLangs.indexOf(code) !== -1) {
-        // reviewed_1 = reviewed, reviewed_2 = proofread
-        type = 'reviewed_1';
+        type = 'reviewed_strings';
       }
-      let coveragePart = info.stats[code][type].percentage / results.length;
+      let coveragePart = (stat.attributes[type] /  stat.attributes.total_strings) / results.length;
 
-      code = code.replace(/_/g, '-');
       if (coverageByLocaleCode[code] === undefined) coverageByLocaleCode[code] = 0;
       coverageByLocaleCode[code] += coveragePart;
-    }
+    });
   });
 }
 
@@ -135,7 +125,9 @@ function gotResource(err, results) {
         fs.writeFileSync(`${outdir}${code}.min.json`, JSON.stringify(obj));
 
         getLanguageInfo(code, (err, info) => {
-          let rtl = info && info.rtl;
+          if (err) return console.log(err);
+
+          let rtl = info && info.attributes && info.attributes.rtl;
           // exceptions: see #4783
           if (code === 'ckb') {
             rtl = true;
@@ -145,7 +137,7 @@ function gotResource(err, results) {
 
           let coverage = coverageByLocaleCode[code];
           if (coverage === undefined) {
-            console.log('Could not get language coverage');
+            console.log(`Could not get language coverage for ${code}`, coverageByLocaleCode);
             process.exit(1);
           }
           // we don't need high precision here, but we need to know if it's exactly 100% or not
@@ -173,12 +165,11 @@ function gotResource(err, results) {
 }
 
 
-function getResource(resourceId, callback) {
-  let resourceURL = `${projectURL}/resource/${resourceId}`;
-  getLanguages(resourceURL, (err, codes) => {
+async function getResource(resourceId, callback) {
+  getLanguages((err, codes) => {
     if (err) return callback(err);
 
-    asyncMap(codes, getLanguage(resourceURL), (err, results) => {
+    asyncMap(codes, getLanguage(resourceId), (err, results) => {
       if (err) return callback(err);
 
       let locale = {};
@@ -229,56 +220,60 @@ function getResource(resourceId, callback) {
 }
 
 
-function getLanguage(resourceURL) {
-  return (code, callback) => {
-    code = code.replace(/-/g, '_');
-    let url = `${resourceURL}/translation/${code}`;
-    // fetch only reviewed strings for some languages
-    if (reviewedOnlyLangs.indexOf(code) !== -1) {
-      url += '?mode=reviewed';
+function getLanguage(resourceId) {
+  return async (code, callback) => {
+    try {
+      code = code.replace(/-/g, '_');
+      const url = await transifexApi.ResourceTranslationsAsyncDownload.download({
+        resource: {data:{type:'resources', id:`o:openstreetmap:p:id-editor:r:${resourceId}`}},
+        language: {data:{type:'languages', id:`l:${code}`}},
+        // fetch only reviewed strings for some languages
+        mode: reviewedOnlyLangs.indexOf(code) !== -1 ? 'reviewed' : 'default'
+      });
+      const data = await fetch(url).then(d => d.text());
+      console.log(`got translations for ${resourceId}, language ${code}`);
+      callback(null, YAML.load(data)[code]);
+    } catch(err) {
+      console.error(`error while getting translations for ${resourceId}, language ${code}`, err);
+      callback(err);
     }
-    fetch(url, fetchOpts)
-      .then(res => {
-        console.log(`${res.status}: ${url}`);
-        return res.json();
-      })
-      .then(json => {
-        callback(null, YAML.load(json.content)[code]);
-      })
-      .catch(err => callback(err));
   };
 }
 
 
-function getLanguageInfo(code, callback) {
+async function getLanguageInfo(code, callback) {
   code = code.replace(/-/g, '_');
-  let url = `${apiroot}/language/${code}`;
-  fetch(url, fetchOpts)
-    .then(res => {
-      console.log(`${res.status}: ${url}`);
-      return res.json();
-    })
-    .then(json => {
-      callback(null, json);
-    })
-    .catch(err => callback(err));
+  try {
+    const lng = await transifexApi.Language.get({
+      code: code
+    });
+    console.log(`got language details for ${code}`);
+    callback(null, lng);
+  } catch(err) {
+    console.error(`error while getting language details for ${code}`);
+    callback(err);
+  }
 }
 
 
-function getLanguages(resourceURL, callback) {
-  let url = `${resourceURL}?details`;
-  fetch(url, fetchOpts)
-    .then(res => {
-      console.log(`${res.status}: ${url}`);
-      return res.json();
-    })
-    .then(json => {
-      callback(null, json.available_languages
-        .map(d => d.code.replace(/_/g, '-'))
-        .filter(d => d !== 'en')
-      );
-    })
-    .catch(err => callback(err));
+async function getLanguages(callback) {
+  try {
+    const result = [];
+    const project = await transifexApi.Project.get({
+      organization: 'o:openstreetmap',
+      slug: 'id-editor'
+    });
+    const lngs = await project.fetch('languages');
+    for await (const lng of lngs.all()) {
+      if (lng.attributes.code === 'en') continue;
+      result.push(lng.attributes.code.replace(/_/g, '-'));
+    }
+    console.log('got project languages');
+    callback(null, result);
+  } catch(err) {
+    console.error('error while getting project languages');
+    callback(err);
+  }
 }
 
 
@@ -293,7 +288,7 @@ function asyncMap(inputs, func, callback) {
   function next() {
     callFunc(index++);
     if (index < inputs.length) {
-      setTimeout(next, 200);
+      setTimeout(next, 50);
     }
   }