Release 0.6.1

# Why

To make it easier to find logs in GCloud Console.

# How

Basically, I copy-pasted `HackyLogglyStream` that we previously used in the project - https://github.com/expo/turtle/blob/de4837f36105c03be9afb4028241cff7459da974/src/logger/hackyLogglyStream.ts

# Test Plan

Tested locally.
<img width="487" alt="Screenshot 2019-04-15 at 15 09 37" src="https://user-images.githubusercontent.com/5256730/56135267-a3d3b200-5f90-11e9-9c96-505380b9f10c.png">

.babelrc

@@ -1,16 +0,0 @@
-{
-  "presets": [
-    ["env", {
-      "targets": {
-        "node": "8.9"
-      }
-    }]
-  ],
-  "plugins": [
-    ["module-resolver", {
-      "alias": {
-        "turtle": "./build"
-      }
-    }]
-  ]
-}

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   nix: &nix
     docker:
-      - image: lnl7/nix:2.1.2
+      - image: lnl7/nix:2.2
     # Symlink to the readline-enabled bash which is the default command of the container
     shell: /run/current-system/sw/bin/bash -leo pipefail
     working_directory: ~/turtle
@@ -137,11 +137,12 @@ commands:
 
 jobs:
   build:
-    docker:
-      - image: circleci/node:8.12
+    executor: nix
     steps:
-      - checkout
+      - setup
+      - restore_yarn_cache
       - run: yarn
+      - save_yarn_cache
       - run: yarn lint
       - run: yarn build
 
@@ -153,7 +154,7 @@ jobs:
       - run: yarn
       - save_yarn_cache
       - run:
-          name: Run iOS smoke tests
+          name: Run unit tests
           command: ./scripts/tests/runUnitTestsCI.sh
 
   ios_smoke_tests:

.envrc

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 source_local() {
   file=./.envrc.local
@@ -18,3 +18,7 @@ export EXPO_TURTLE_TOOLS_DIR="$(pwd)/tools"
 if [ -z "$EXPO_UNIVERSE_DIR" ]; then
   PATH_add $EXPO_TURTLE_TOOLS_DIR/bin
 fi
+
+if [[ $CI = "true" ]]; then
+  PATH_add $EXPO_TURTLE_TOOLS_DIR/ci/bin
+fi

.gitignore

@@ -2,6 +2,7 @@
 
 node_modules
 yarn-error.log
+google-cloud-credentials.json
 
 /build/
 /workingdir/*

.ignore

@@ -0,0 +1 @@
+fixtures/

.nvmrc

@@ -0,0 +1 @@
+v8.15.1

CHANGELOG.md

@@ -6,8 +6,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+- Checking fastlane version before running build (turtle-cli).
+### Changed
+- Updated iOS shell app for SDK 32 to fix AppAuth issue.
+- Babel replaced by ttypescript.
+- Updated xdl to 53.5.3 and @expo/spawn-async to 1.4.2, so that error stack traces should be more informative now.
+### Fixed
+- Brought back `jobID` and `experienceName` fields to GCloud logs.
+### Removed
+- `buidAndroidTarballLocally.sh` script (it has been moved to expo repository - [expo/expo#4022](https://github.com/expo/expo/pull/4022)).
+
+## [0.6.0] - 2019-04-09
+### Changed
+- Removed Branch module from Android shell apps for all SDK versions.
+
+## [0.5.15] - 2019-04-03
+### Added
 - Turtle smoke tests are now being executed on CircleCI from the context of this repository.
 ### Changed
+- Updated iOS shell app for SDK 32 (fixes [this loading issue for slow connections](https://github.com/expo/expo/issues/3574)).
 - Minor infra changes (doesn't affect users).
 - Error logs format - error objects are now passed in an object being passed as the first argument to logger function.
 ### Removed

Dockerfile

@@ -99,9 +99,6 @@ RUN rm gradle-4.4-all.zip
 ENV GRADLE_HOME /usr/local/gradle-4.4
 ENV PATH ${GRADLE_HOME}/bin:$PATH
 
-# Install Gulp
-RUN npm install -g gulp-cli
-
 ADD . /app
 
 RUN for SDK_VERSION in `ls /app/workingdir/android/`; do \

gulpfile.js

@@ -1,91 +0,0 @@
-'use strict';
-
-const childProcess = require('child_process');
-const util = require('util');
-const path = require('path');
-
-const gulp = require('gulp');
-const babel = require('gulp-babel');
-const changed = require('gulp-changed');
-const nodemon = require('gulp-nodemon');
-const plumber = require('gulp-plumber');
-const sourcemaps = require('gulp-sourcemaps');
-const ts = require('gulp-typescript');
-const rimraf = require('rimraf');
-
-const rimrafAsync = util.promisify(rimraf);
-
-const tsProject = ts.createProject('tsconfig.json');
-
-gulp.task('clean', async () => {
-  console.log(`Removing build directories...`);
-  await rimrafAsync('build');
-});
-
-gulp.task('build:server', () => {
-  console.log(`Compiling the Node.js server JavaScript...`);
-  return tsProject
-    .src()
-    .pipe(plumber())
-    .pipe(changed('build'))
-    .pipe(sourcemaps.init())
-    .pipe(tsProject())
-    .pipe(babel())
-    .pipe(
-      sourcemaps.write('.', {
-        includeContent: false,
-        sourceRoot: '../src',
-      })
-    )
-    .pipe(gulp.dest('build'));
-});
-
-gulp.task('watch:source', async () => {
-  console.log(`Watching for changes to the Node.js server JavaScript...`);
-  gulp.watch('src/**/*.(t|j)s', gulp.series('build:server'));
-});
-
-gulp.task('watch:local', createWatchTask('development'));
-gulp.task('watch:server', createWatchTask('production'));
-
-function createWatchTask(nodeEnv) {
-  return async () => {
-    console.log(`Starting the Node.js server and watching for changes (NODE_ENV=${nodeEnv})...`);
-    // Run nodemon in a separate process to isolate its side effects on stdio streams
-    let nodeCmd = 'node';
-    if (nodeEnv === 'development') {
-      nodeCmd += ' --inspect=:9315';
-    }
-    nodemon({
-      script: './build/server.js',
-      execMap: {
-        js: nodeCmd,
-      },
-      env: {
-        NODE_ENV: nodeEnv,
-      },
-
-      watch: ['./build'],
-      stdout: false,
-      readable: false,
-    }).on('readable', function() {
-      const bunyan = childProcess.fork(
-        path.join('.', 'node_modules', '.bin', 'bunyan'),
-        ['-o', 'short', '-l', 'debug', '--color'],
-        { silent: true }
-      );
-
-      bunyan.stdout.pipe(process.stdout);
-      bunyan.stderr.pipe(process.stderr);
-      this.stdout.pipe(bunyan.stdin);
-      this.stderr.pipe(bunyan.stdin);
-    });
-  };
-}
-
-gulp.task(
-  'watch',
-  gulp.series('clean', 'build:server', gulp.parallel('watch:source', 'watch:local'))
-);
-
-gulp.task('default', gulp.series('watch'));

nodemon.json

@@ -0,0 +1,6 @@
+{
+  "watch": ["src"],
+  "ext": "ts",
+  "ignore": ["src/**/*.test.ts"],
+  "exec": "ts-node -r tsconfig-paths/register --files src/server.ts"
+}

package.json

@@ -1,19 +1,18 @@
 {
   "name": "turtle-cli",
-  "version": "0.5.14",
+  "version": "0.6.1",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
-    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp",
+    "start": "EXPENV_OVERRIDES=local-common,local,local-queue expenv nodemon | bunyan -o short -l debug --color",
     "start:ios": "PLATFORM=ios yarn start",
     "start:android": "PLATFORM=android yarn start",
-    "watch": "EXPENV_OVERRIDES=local-common,local,local-queue expenv gulp watch:source",
     "bin:turtle": "./bin/turtle.js",
     "lint": "tslint -c tslint.json 'src/**/*.ts'",
-    "prepare": "yarn build",
-    "build": "gulp build:server",
+    "lint:fix": "yarn lint --fix",
+    "prepare": "rimraf ./build && yarn build",
+    "build": "ttsc",
     "build:production": "./scripts/build.sh",
-    "build:android-tarball:local": "./scripts/android/buildAndroidTarballLocally.sh",
     "secrets:init-private": "./scripts/initPrivateSecrets.sh",
     "set-workingdir:remote": "./scripts/setWorkingdirMode.sh remote",
     "set-workingdir:local": "./scripts/setWorkingdirMode.sh local",
@@ -34,9 +33,21 @@
     "ssh:android:connect": "./scripts/ssh/connectToAndroidPod.sh",
     "ssh:ios:ips": "./scripts/ssh/findIosIps.sh",
     "set-priorities": "yarn set-priorities:local",
-    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue expenv babel-node scripts/setConfigurations.js",
-    "set-priorities:staging": "expenv babel-node scripts/setConfigurations.js",
-    "set-priorities:production": "EXPENV_OVERRIDES=prod expenv babel-node scripts/setConfigurations.js"
+    "set-priorities:default": "expenv ts-node -r tsconfig-paths/register --files src/scripts/setConfigurations.ts",
+    "set-priorities:local": "EXPENV_OVERRIDES=local-common,local,local-queue yarn set-priorities:default",
+    "set-priorities:staging": "yarn set-priorities:default",
+    "set-priorities:production": "EXPENV_OVERRIDES=prod yarn set-priorities:default"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.ts": [
+      "yarn lint:fix",
+      "git add"
+    ]
   },
   "bin": {
     "turtle": "./bin/turtle.js"
@@ -72,35 +83,29 @@
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
     "@types/request": "^2.47.1",
+    "@types/semver": "^6.0.0",
     "@types/sharp": "^0.17.8",
     "@types/tar": "^4.0.0",
     "@types/uuid": "^3.4.3",
     "@types/which": "^1.3.1",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-jest": "^23.6.0",
-    "babel-plugin-module-resolver": "^3.1.1",
-    "babel-preset-env": "^1.6.1",
-    "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-babel": "^7.0.1",
-    "gulp-changed": "^3.2.0",
-    "gulp-nodemon": "^2.4.1",
-    "gulp-plumber": "^1.2.0",
-    "gulp-sourcemaps": "^2.6.4",
-    "gulp-typescript": "^4.0.2",
+    "husky": "^1.3.1",
     "jest": "^23.6.0",
+    "lint-staged": "^8.1.5",
     "nock": "^10.0.1",
-    "nodemon": "^1.18.7",
+    "nodemon": "^1.18.11",
     "release-it": "^10.0.0",
     "rimraf": "^2.6.2",
-    "source-map-loader": "^0.2.3",
     "ts-jest": "^23.10.4",
+    "ts-node": "^8.0.3",
+    "ts-transformer-imports": "^0.4.1",
+    "tsconfig-paths": "^3.8.0",
     "tslint": "^5.10.0",
     "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^3.0.1"
+    "ttypescript": "^1.5.6",
+    "typescript": "^3.4.2"
   },
   "dependencies": {
-    "@expo/spawn-async": "^1.4.0",
+    "@expo/spawn-async": "^1.4.2",
     "@google-cloud/logging-bunyan": "^0.9.5",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -119,12 +124,13 @@
     "raven": "^2.6.2",
     "request": "^2.88.0",
     "request-progress": "^3.0.0",
+    "semver": "^6.0.0",
     "sharp": "^0.21.0",
     "source-map-support": "^0.5.6",
     "tar": "^4.4.6",
     "uuid": "^3.2.1",
     "which": "^1.3.1",
-    "xdl": "53.1.6-alpha.2"
+    "xdl": "53.5.3"
   },
   "optionalDependencies": {
     "@expo/traveling-fastlane-darwin": "^1.8.1"

scripts/android/buildAndroidTarballLocally.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeo pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
-ARTIFACTS_DIR="$ROOT_DIR/artifacts"
-TEMP_DIR="/tmp/android-shell-app"
-
-mkdir -p $ARTIFACTS_DIR
-rm -rf $TEMP_DIR
-mkdir -p $TEMP_DIR
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/tools-public $TEMP_DIR/tools-public
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/secrets $TEMP_DIR/secrets
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/template-files $TEMP_DIR/template-files
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/android $TEMP_DIR/android
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/package.json $TEMP_DIR/package.json
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/expokit-npm-package $TEMP_DIR/expokit-npm-package
-ln -s ${EXPO_UNIVERSE_DIR}/exponent/packages $TEMP_DIR/packages
-ln -s ${EXPO_UNIVERSE_DIR}/libraries/eslint-config-universe $TEMP_DIR/eslint-config-universe
-ln -s ${EXPO_UNIVERSE_DIR}/libraries/json-file $TEMP_DIR/json-file
-ln -s ${EXPO_UNIVERSE_DIR}/libraries/osascript $TEMP_DIR/osascript
-ln -s ${EXPO_UNIVERSE_DIR}/libraries/schemer $TEMP_DIR/schemer
-ln -s ${EXPO_UNIVERSE_DIR}/package.json $TEMP_DIR/universe-package.json
-
-# generate dynamic macros
-mkdir -p $TEMP_DIR/android/expoview/src/main/java/host/exp/exponent/generated/
-cd $TEMP_DIR/tools-public
-./generate-dynamic-macros-android.sh
-rm -rf $TEMP_DIR/secrets
-
-cd $TEMP_DIR; tar -czhf $ARTIFACTS_DIR/android-shell-builder.tar.gz .
-rm -rf $TEMP_DIR

shellTarballs/android/sdk26

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
+s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz

shellTarballs/android/sdk27

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
+s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz

shellTarballs/android/sdk28

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
+s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz

shellTarballs/android/sdk29

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
+s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz

shellTarballs/android/sdk30

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-67bd02667e29221707f8c1dd11e739eada25ef55.tar.gz
+s3://exp-artifacts/android-shell-builder-c19ce0d88a153f481fd790e23bdcd6f2d5ea7fd6.tar.gz

shellTarballs/android/sdk31

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-5c339ff7bab6f2161d378cc70e1bf04d32ad98dd.tar.gz
+s3://exp-artifacts/android-shell-builder-89b2d24c86737d5a489c6a18467e31b2f9ce9005.tar.gz

shellTarballs/android/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-a4bd3bd26b1b31bdfa66c39b6b4d0d1d138c32fc.tar.gz
+s3://exp-artifacts/android-shell-builder-0cab68670fc50ce1dc16b7d86ca7976870062c39.tar.gz

shellTarballs/ios/sdk32

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-d9cabffbcba20e074e91e4d7f8d862c98acfc680.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-dc981c7110b7d508de8e9c352064dc3d745c9f72.tar.gz

src/bin/setup/ios.ts

@@ -1,4 +1,7 @@
+import last from 'lodash/last';
+import trim from 'lodash/trim';
 import path from 'path';
+import semver from 'semver';
 
 import { ExponentTools } from 'xdl';
 
@@ -16,6 +19,19 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
   {
     command: 'fastlane',
     missingDescription: 'Please check https://docs.fastlane.tools/getting-started/ios/setup/',
+    versionCheckFn: async () => {
+      const MINIMAL_VERSION = '2.99.0';
+
+      const { stdout } = await ExponentTools.spawnAsyncThrowError(
+        'fastlane',
+        ['--version'],
+        { stdio: 'pipe', env: { ...process.env, FASTLANE_SKIP_UPDATE_CHECK: '1' } },
+      );
+      const fastlaneVersion = parseFastlaneVersion(stdout);
+      if (fastlaneVersion && !semver.satisfies(fastlaneVersion, `>= ${MINIMAL_VERSION}`)) {
+        throw new Error(`Please install newer version of fastlane (>= ${MINIMAL_VERSION})`);
+      }
+    },
   },
   {
     command: 'xcode',
@@ -47,3 +63,11 @@ export default async function setup(sdkVersion?: string) {
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {
   return path.join(config.directories.shellTarballsDir, PLATFORMS.IOS, `sdk${sdkMajorVersion}`);
 }
+
+function parseFastlaneVersion(stdout: string) {
+  const lastLine = last(trim(stdout).split('\n'));
+  if (!lastLine) {
+    return null;
+  }
+  return last(lastLine.split(' ')) || null;
+}

src/bin/setup/utils/toolsDetector.ts

@@ -10,11 +10,12 @@ export interface IToolDefinition {
   command: string;
   missingDescription: string;
   testFn?: () => Promise<boolean>;
+  versionCheckFn?: () => void;
 }
 
 export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
   let isAnyToolMissing = false;
-  for (const { command, missingDescription, testFn } of tools) {
+  for (const { command, missingDescription, testFn, versionCheckFn } of tools) {
     try {
       if (testFn) {
         if (!await testFn()) {
@@ -30,6 +31,14 @@ export async function ensureToolsAreInstalled(tools: IToolDefinition[]) {
       }
       l.error({ err }, missingDescription);
     }
+    if (versionCheckFn) {
+      try {
+        await versionCheckFn();
+      } catch (err) {
+        isAnyToolMissing = true;
+        l.error({ err }, `wrong version of ${command} installed`);
+      }
+    }
   }
   if (isAnyToolMissing) {
     throw new Error('Tools required to perform standalone app build are missing. Please install them.');

src/logger/gcloudStream.ts

@@ -0,0 +1,58 @@
+import EventEmitter from 'events';
+
+import { IJob } from 'turtle/job';
+
+// type error when using import
+// https://github.com/googleapis/nodejs-logging-bunyan/issues/241
+// tslint:disable-next-line:no-var-requires
+const { LoggingBunyan } = require('@google-cloud/logging-bunyan');
+
+export interface IGCloudConfig {
+  name: string;
+  resource: {
+    type: string;
+    labels: {
+      node_id: string;
+      location: string;
+      namespace: string;
+    };
+  };
+}
+
+interface IGCloudExtraFields {
+  jobID: string;
+  experienceName: string;
+}
+
+export default class GCloudStream extends EventEmitter {
+  private logsStream: any;
+  private extraFields: IGCloudExtraFields | null;
+
+   constructor(gcloudConfig: IGCloudConfig) {
+    super();
+
+    const { name, resource } = gcloudConfig;
+    this.logsStream = new LoggingBunyan({ name, resource });
+    this.extraFields = null;
+  }
+
+  public init(job: IJob) {
+    this.extraFields = {
+      jobID: job.id,
+      experienceName: job.experienceName,
+    };
+  }
+
+  public cleanup() {
+    this.extraFields = null;
+  }
+
+  public write(rec: any) {
+    const { msg: message, ...other } = rec;
+    this.logsStream.write({
+      message,
+      ...other,
+      data: this.extraFields || {},
+    });
+  }
+}

src/logger/index.ts

@@ -6,14 +6,10 @@ import { Client as RavenClient } from 'raven';
 import config from 'turtle/config';
 import * as constants from 'turtle/constants/logger';
 import { IJob } from 'turtle/job';
+import GCloudStream from 'turtle/logger/gcloudStream';
 import S3Stream from 'turtle/logger/s3Stream';
 import { isOffline } from 'turtle/turtleContext';
 
-// type error when using import
-// https://github.com/googleapis/nodejs-logging-bunyan/issues/241
-// tslint:disable-next-line:no-var-requires
-const { LoggingBunyan } = require('@google-cloud/logging-bunyan');
-
 interface IStream {
   stream: any;
   type?: string;
@@ -22,6 +18,7 @@ interface IStream {
 }
 
 export const s3logger = new S3Stream();
+let gcloudStream: GCloudStream;
 
 const streams: IStream[] = [];
 
@@ -51,15 +48,23 @@ if (config.sentry.dsn && config.deploymentEnv !== 'development') {
 }
 
 if (config.google.credentials) {
-  const resource = {
-    type: 'generic_node',
-    labels: {
-      node_id: config.hostname,
-      location: '', // default value
-      namespace: '', // default value
+  const gcloudConfig = {
+    name: 'turtle',
+    resource: {
+      type: 'generic_node',
+      labels: {
+        node_id: config.hostname,
+        location: '', // default value
+        namespace: '', // default value
+      },
     },
   };
-  streams.push(new LoggingBunyan({ name: 'turtle', resource }).stream('info'));
+  gcloudStream = new GCloudStream(gcloudConfig);
+  streams.push({
+    level: 'info',
+    type: 'raw',
+    stream: gcloudStream,
+  });
 }
 
 const logger = bunyan.createLogger({
@@ -73,12 +78,18 @@ const logger = bunyan.createLogger({
 logger.withFields = (extraFields: any) => withFields(logger, extraFields);
 
 logger.init = async (job: IJob) => {
+  if (gcloudStream) {
+    gcloudStream.init(job);
+  }
   return await s3logger.init(job);
 };
 
 logger.cleanup = async () => {
   // a little hacky, but works
   logger.info({ lastBuildLog: true }, 'this is the last log from this build');
+  if (gcloudStream) {
+    gcloudStream.cleanup();
+  }
   await s3logger.waitForLogger();
 };
 

src/scripts/setConfigurations.ts

@@ -1,12 +1,13 @@
-import { env } from 'turtle/utils/env';
-import { connect, RedisClient } from 'turtle/utils/redis';
+
 import { PLATFORMS } from 'turtle/constants';
+import logger from 'turtle/logger';
 import {
   createConfigurationsKey,
   createDefaultConfigurationKey,
   HIGH_CONFIGURATION,
   NORMAL_CONFIGURATION,
 } from 'turtle/utils/priorities';
+import { connect, RedisClient } from 'turtle/utils/redis';
 
 const TIMEOUT = 3000;
 
@@ -25,7 +26,6 @@ const TIMEOUT = 3000;
 // they should come back to using configurations no. 1 and 2.
 // If there are no more available configurations from the table, the default configuration is used.
 
-
 const AVAILABLE_CONFIGURATIONS_IOS = [
   HIGH_CONFIGURATION,
   HIGH_CONFIGURATION,
@@ -54,7 +54,6 @@ const AVAILABLE_CONFIGURATIONS_ANDROID = [
   NORMAL_CONFIGURATION,
 ];
 
-
 const DEFAULT_CONFIGURATION = HIGH_CONFIGURATION;
 
 async function run() {
@@ -68,6 +67,8 @@ async function run() {
   redis.disconnect();
 }
 
-run()
-  .then(() => console.log('All done'))
-  .catch(err => console.error('Error:', err));
+if (require.main === module) {
+  run()
+    .then(() => logger.info('All done'))
+    .catch((err) => logger.error('Error:', err));
+}

src/utils/redis.ts

@@ -20,7 +20,7 @@ const clientToUrl: IClientConfig = {
   [RedisClient.Configuration]: config.redis.configUrl,
 };
 
-export function connect(timeoutMs: number, type: string) {
+export function connect(timeoutMs: number, type: string): Promise<any> {
   return new Promise((resolve, reject) => {
     const redisClient = new Redis(clientToUrl[type], {
       maxRetriesPerRequest: 2,

tools/bin/node

@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../nix" nodejs-8_x --command node "$@"

tools/bin/npm

@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../nix" nodejs-8_x --command npm "$@"

tools/bin/npx

@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../nix" nodejs-8_x --command npx "$@"

tools/bin/yarn

@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../nix" yarn --command yarn "$@"

tools/bin/yarnpkg

@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-# This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../nix" yarn --command yarnpkg "$@"

tools/ci/bin/node

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command node "$@"

tools/ci/bin/npm

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command npm "$@"

tools/ci/bin/npx

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command npx "$@"

tools/ci/bin/yarn

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../../nix" yarn --command yarn "$@"

tools/ci/bin/yarnpkg

@@ -0,0 +1,3 @@
+#! /usr/bin/env bash
+# This file was generated by nix-binstubs
+exec nix run -f "$(dirname "$0")/../../../nix" yarn --command yarnpkg "$@"

tsconfig.json

@@ -6,17 +6,20 @@
     "sourceMap": true,
     "inlineSources": true,
     "outDir": "./build",
-    "rootDir": "./src",
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
     "esModuleInterop": true,
-    "baseUrl": "./",
+    "baseUrl": ".",
     "paths": {
       "turtle/*": ["src/*"],
     },
-    "allowJs": true
+    "allowJs": true,
+    "plugins": [
+      { "transform": "ts-transformer-imports" }
+    ]
   },
+  "include": ["src"],
   "exclude": ["node_modules", "build", "workingdir"]
 }