Apply suggestions from code review

Co-Authored-By: Dominik Sokal <[email protected]>

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
     working_directory: ~/turtle
   mac:
     macos: # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
-      xcode: "11.1.0"
+      xcode: '11.1.0'
     working_directory: /Users/distiller/project
     shell: /bin/bash -leo pipefail
   android:
@@ -57,8 +57,8 @@ commands:
       - run:
           name: Configure aws-cli
           command: |
-            aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
-            aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
+              aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
+              aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
 
   setup_nix:
     steps:
@@ -141,7 +141,7 @@ commands:
         default: linux
     steps:
       - restore_cache:
-          key: yarn-v3-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v2-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
 
   save_yarn_cache:
     parameters:
@@ -153,7 +153,7 @@ commands:
         default: linux
     steps:
       - save_cache:
-          key: yarn-v3-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
+          key: yarn-v2-<< parameters.platform >>-{{ checksum "<< parameters.workingdir >>/yarn.lock" }}
           paths:
             - ~/.cache/yarn # `yarn cache dir`
 

.gitignore

@@ -6,7 +6,6 @@ google-cloud-credentials.json
 /workingdir/*
 /artifacts/*
 .history
-.vscode/
 
 shell.apk
 .secrets*

.release-it.json

@@ -10,9 +10,6 @@
     "release": true
   },
   "hooks": {
-    "before:init": [
-      "yarn"
-    ],
     "after:release": "yarn release:update:turtle-cli-example"
   }
 }

CHANGELOG.md

@@ -7,120 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Added
-
-- Added Android shell app for SDK 39.
-
-## [0.17.3] - 2020-09-14
-
-### Added
-
-- Added gradle 6.2 to `turtle-android-base`
-- Added `ANDROID_NDK_HOME` in `turtle-android-base`
-
-### Changed
-
-- Upgraded XDL so it processes root `build.gradle` of Android shell apps too
-
-## [0.17.2] - 2020-08-06
-
-### Changed
-
-- Updated iOS shell app for SDK 38 with fixed integer tagging in expo-gl for iOS 14. ([#245](https://github.com/expo/turtle/pull/245))
-
-## [0.17.1] - 2020-08-05
-
-### Changed
-
-- Updated Android shell app for SDK 38 with `targetSdkVersion` bumped to 29. ([#244](https://github.com/expo/turtle/pull/244))
-
-## [0.17.0] - 2020-07-16
-
-### Added
-
-- `--gradle-args` option for `turtle build:android` which makes it possible to specify custom Gradle arguments.
-
-### Changed
-
-- Gradle Wrapper doesn't print when dots when the appropriate version of Gradle is being downloaded.
-
-## [0.16.2] - 2020-07-01
-
-### Added
-
-- Added `--allow-non-https-public-url` to allow bypass of protocol validation on `--public-url`.
-- Added support for dynamic configs (`app.config.ts`, `app.config.js`).
-
-## [0.16.0] - 2020-06-25
-
-### Added
-
-- Added iOS shell app for Expo SDK38.
-- Added Android shell app for SDK 38.
-
-### Removed
-
-- Dropped support for SDK 34.
-
-## [0.15.1] - 2020-06-22
-
-### Changed
-
-- Configure Turtle to use the Redis CA certificate.
-
-### Fixed
-
-- Fix announcing supported SDK versions.
-
-## [0.15.0] - 2020-06-02
-
-### Changed
-
-- Updated `@expo/xdl` to 57.9.13 (added \*.bak files clean-up when building .ipa).
-
-## [0.14.12] - 2020-05-14
-
-### Changed
-
-- Update iOS custom client shell app with various fixes.
-
-## [0.14.11] - 2020-05-04
-
-### Changed
-
-- Update SDK 37 iOS shell app with various fixes.
-
-## [0.14.10] - 2020-05-01
-
-### Added
-
-- support for "android.enableDangerousExperimentalLeanBuilds" in app.json.
-
-## [0.14.9] - 2020-04-21
-
-### Changed
-
-- Updated `@expo/xdl` to 57.8.30 (scoped the build command so it only builds the `:app` Android sub-project and not all the sub-projects available, [PR](https://github.com/expo/expo-cli/pull/1937)).
-
-## [0.14.8] - 2020-04-20
-
-### Changed
-
-- Updated `@expo/xdl` to 57.8.29 (removed call to `check-dynamic-macros-android.sh`, [PR](https://github.com/expo/expo-cli/pull/1933)).
-
-## [0.14.7] - 2020-04-20
-
-### Changed
-
-- Turtle no longer installs all dependencies of shell apps projects — only the production dependencies are installed now.
-- Updated `@expo/xdl` to 57.8.25 (fixed unintuitive `google-services.json` handling for SDK37+, [PR](https://github.com/expo/expo-cli/pull/1897)).
-
-## [0.14.6] - 2020-04-09
-
-### Changed
-
-- Updated @expo/xdl to 57.8.17 (fixed downloading assets smaller than 10 bytes).
-
 ## [0.14.5] - 2020-04-06
 
 ### Changed

DEVELOPMENT.md

@@ -8,7 +8,7 @@
 ## Setup
 
 - Run `update-local-secrets` to populate the `.secrets*` files. You'll need to run this any time any secret changes (it shouldn't be very often).
-- Run `EXPO_UNIVERSE_DIR=/path/to/universe/dir yarn secrets:init-private YOUR_SQS_NICKNAME`. Alternatively, you can create `.secrets.local-queue` file with the SQS queues' urls yourself (`AWS_SQS_ANDROID_QUEUE_URL`, `AWS_SQS_ANDROID_PRIORITY_QUEUE_URL`, `AWS_SQS_IOS_QUEUE_URL`, `AWS_SQS_IOS_PRIORITY_QUEUE_URL`)
+- Run `EXPO_UNIVERSE_DIR=/path/to/universe/dir yarn secrets:init-private YOUR_SQS_NICKNAME`. Alternatively, you can create `.secrets.local-queue` file with the SQS queues' urls yourself (`AWS_SQS_OUT_QUEUE_URL`, `AWS_SQS_ANDROID_QUEUE_URL`, `AWS_SQS_ANDROID_PRIORITY_QUEUE_URL`, `AWS_SQS_IOS_QUEUE_URL`, `AWS_SQS_IOS_PRIORITY_QUEUE_URL`)
 - Run `yarn set-workingdir:local` or `yarn set-workingdir:remote`:
   - `:local` creates symlinks to the shell apps in `expo` repository (_unfortunately this is currently broken_)
   - `:remote` downloads precompiled shell apps

Dockerfile

@@ -1,5 +1,5 @@
 # see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.5.0
+FROM gcr.io/exponentjs/turtle-android-base:0.4.0
 
 ADD . /app/turtle
 
@@ -8,21 +8,17 @@ WORKDIR /app/turtle
 RUN ./scripts/fetchRemoteTarballs.sh android
 
 RUN ln -s /app/turtle/workingdir /app/workingdir && \
-  for SDK_VERSION in `ls /app/workingdir/android/`; do \
-  echo "preparing $SDK_VERSION shell app" && \
-  cd /app/workingdir/android/$SDK_VERSION && \
-  mv packages non-workspace-packages && \
-  # Keep in sync with src/bin/setup/android/index.ts#_installNodeModules
-  # --prod requires --ignore-scripts (otherwise
-  # expo-yarn-workspaces errors as missing)
-  yarn install --ignore-scripts --prod && \
-  mv non-workspace-packages packages ; \
-  done
+    for SDK_VERSION in `ls /app/workingdir/android/`; do \
+      echo "preparing $SDK_VERSION shell app" && \
+      cd /app/workingdir/android/$SDK_VERSION && \
+      mv packages non-workspace-packages && \
+      yarn install && \
+      mv non-workspace-packages packages ; \
+    done
 
 ENV NODE_ENV "production"
 ENV TURTLE_WORKING_DIR_PATH /app/turtle/workingdir/
 
 ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-ADD redislabs_ca.pem /var/run/config/redislabs-tls/redislabs_ca.pem
 
 CMD ["/usr/bin/supervisord"]

docker-base/Dockerfile

@@ -57,23 +57,10 @@ ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
 ADD configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
 RUN /tmp/configureAndroidSdk.sh --install-all-platforms
-ENV ANDROID_NDK_HOME /usr/local/android-sdk-linux/ndk/17.2.4988734
 
 # Support Gradle
 ENV TERM dumb
 
-# Install gradle 6.2
-RUN wget https://services.gradle.org/distributions/gradle-6.2-all.zip
-RUN unzip -qq gradle-6.2-all.zip
-RUN cp -r gradle-6.2 /usr/local
-
-RUN mkdir -p /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
-RUN mv gradle-6.2-all.zip /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
-RUN mv gradle-6.2 /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
-RUN touch /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2-all.zip.ok
-RUN touch /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2-all.zip.lck
-RUN chmod 755 /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2/bin/gradle
-
 # Install gradle 5.6.3
 RUN wget https://services.gradle.org/distributions/gradle-5.6.3-all.zip
 RUN unzip -qq gradle-5.6.3-all.zip

k8s/android/turtle-deployment.template.yml

@@ -88,6 +88,11 @@ spec:
               secretKeyRef:
                 name: turtle-js-config
                 key: aws_sqs_android_priority_queue_url
+          - name: AWS_SQS_OUT_QUEUE_URL
+            valueFrom:
+              secretKeyRef:
+                name: turtle-js-config
+                key: aws_sqs_out_queue_url
           - name: AWS_CLOUDWATCH_REGION
             valueFrom:
               secretKeyRef:
@@ -144,11 +149,9 @@ spec:
           - name: DISABLE_DEX_MAX_HEAP
             value: "true"
           - name: JAVA_OPTS
-            value: '-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC'
+            value: '-Xms2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC'
           - name: GRADLE_OPTS
-            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -Xmx8192m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC"'
-          - name: REDIS_CA_CERTIFICATE
-            value: '/var/run/config/redislabs-tls/redislabs_ca.pem'
+            value: '-Dorg.gradle.parallel=true -Dorg.gradle.configureondemand=true -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xms2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC"'
         resources:
           requests:
             memory: "8192Mi"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.17.3",
+  "version": "0.14.5",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {
@@ -70,11 +70,9 @@
     "@expo/babel-preset-cli": "^0.1.3",
     "@types/decompress": "^4.2.3",
     "@types/fs-extra": "^5.0.4",
-    "@types/ioredis": "^4.16.6",
     "@types/jest": "^23.3.9",
     "@types/joi": "^13.4.3",
     "@types/lodash": "^4.14.129",
-    "@types/node-forge": "^0.8.6",
     "@types/npm-package-arg": "^6.1.0",
     "@types/progress": "^2.0.1",
     "@types/raven": "^2.5.1",
@@ -88,25 +86,25 @@
     "@types/webpack-dev-server": "^3.1.7",
     "@types/which": "^1.3.1",
     "husky": "^1.3.1",
-    "jest": "^26.1.0",
+    "jest": "^25.1.0",
     "lint-staged": "^8.1.5",
     "nock": "^10.0.1",
     "nodemon": "^2.0.2",
     "release-it": "^12.3.4",
     "rimraf": "^2.6.2",
-    "ts-jest": "^26.1.2",
+    "ts-jest": "^25.2.1",
     "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",
     "ttypescript": "^1.5.6",
-    "typescript": "^3.9.5"
+    "typescript": "^3.4.2"
   },
   "dependencies": {
-    "@expo/config": "^3.2.14",
+    "@expo/config": "^3.0.5",
     "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "57.9.35",
+    "@expo/xdl": "57.5.2",
     "@google-cloud/logging-bunyan": "^2.0.3",
     "async-retry": "^1.2.1",
     "aws-sdk": "^2.226.1",
@@ -118,7 +116,7 @@
     "decompress": "^4.2.0",
     "dogapi": "^2.8.3",
     "fs-extra": "^6.0.0",
-    "ioredis": "^4.17.3",
+    "ioredis": "^3.2.2",
     "is-semver": "^1.0.8",
     "joi": "^13.2.0",
     "lodash": "^4.17.11",

redislabs_ca.pem

@@ -1 +0,0 @@
-this is just a placeholder to simplify deployments

scripts/initPrivateSecrets.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [ -z "$EXPO_UNIVERSE_DIR" ]; then
-  echo "You need to specify EXPO_UNIVERSE_DIR to use this script. Alternatively you can create .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL and AWS_SQS_IOS_QUEUE_URL variables."
+  echo "You need to specify EXPO_UNIVERSE_DIR to use this script. Alternatively you can create .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL and AWS_SQS_OUT_QUEUE_URL variables."
   exit 1
 fi
 
@@ -17,11 +17,13 @@ ANDROID_NORMAL=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_loc
 ANDROID_PRIORITY=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_android_in_priority | head -1 | cut -d"=" -f2 | xargs`
 IOS_NORMAL=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_ios_in | head -1 | cut -d"=" -f2 | xargs`
 IOS_PRIORITY=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_ios_in_priority | head -1 | cut -d"=" -f2 | xargs`
+OUT=`cd $TERRAFORM_DIR; terraform state show module.turtle_queues_local_$1.aws_sqs_queue.jobs_out | head -1 | cut -d"=" -f2 | xargs`
 
 cat << EOF > $TURTLE_DIR/.secrets.local-queue
 AWS_SQS_ANDROID_QUEUE_URL="$ANDROID_NORMAL"
 AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="$ANDROID_PRIORITY"
 AWS_SQS_IOS_QUEUE_URL="$IOS_NORMAL"
 AWS_SQS_IOS_PRIORITY_QUEUE_URL="$IOS_PRIORITY"
+AWS_SQS_OUT_QUEUE_URL="$OUT"
 EOF
 

scripts/setWorkingdirMode.sh

@@ -7,7 +7,7 @@ DOWNLOAD_DIR="${EXPO_DOWNLOAD_DIR:-$HOME/Downloads}"
 mkdir -p $DOWNLOAD_DIR
 
 if [ ! -f "$ROOT_DIR/.secrets.local-queue" ]; then
-  echo "You need to run \"yarn secrets:init-private [SQS_NAME]\" or create the .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_ANDROID_PRIORITY_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL, and AWS_SQS_IOS_PRIORITY_QUEUE_URL variables."
+  echo "You need to run \"yarn secrets:init-private [SQS_NAME]\" or create the .secrets.local-queue file yourself with AWS_SQS_ANDROID_QUEUE_URL, AWS_SQS_ANDROID_PRIORITY_QUEUE_URL, AWS_SQS_IOS_QUEUE_URL, AWS_SQS_IOS_PRIORITY_QUEUE_URL and AWS_SQS_OUT_QUEUE_URL variables."
   exit 1
 fi
 

scripts/tests/runAndroidSmokeTestsCI.sh

@@ -13,6 +13,7 @@ export AWS_SQS_ANDROID_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/2742511416
 export AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_android_in_priority.fifo"
 export AWS_SQS_IOS_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_ios_in.fifo"
 export AWS_SQS_IOS_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_ios_in_priority.fifo"
+export AWS_SQS_OUT_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_out.fifo"
 export AWS_SQS_REGION="aws.west2"
 export AWS_S3_BUCKET="exp-shell-app-assets"
 export AWS_S3_REGION="us-west-1"

scripts/tests/runIOSSmokeTestsCI.sh

@@ -9,6 +9,7 @@ export AWS_SQS_ANDROID_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/2742511416
 export AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_android_in_priority.fifo"
 export AWS_SQS_IOS_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_ios_in.fifo"
 export AWS_SQS_IOS_PRIORITY_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_ios_in_priority.fifo"
+export AWS_SQS_OUT_QUEUE_URL="https://sqs.us-west-2.amazonaws.com/274251141632/turtle_jobs_local_dominik_out.fifo"
 export AWS_SQS_REGION="aws.west2"
 export AWS_S3_BUCKET="exp-shell-app-assets"
 export AWS_S3_REGION="us-west-1"

scripts/tests/runUnitTestsCI.sh

@@ -9,6 +9,7 @@ export AWS_SQS_IOS_QUEUE_URL="noop"
 export AWS_SQS_ANDROID_QUEUE_URL="noop"
 export AWS_SQS_IOS_PRIORITY_QUEUE_URL="noop"
 export AWS_SQS_ANDROID_PRIORITY_QUEUE_URL="noop"
+export AWS_SQS_OUT_QUEUE_URL="noop"
 export AWS_ACCESS_KEY_ID="noop"
 export AWS_SECRET_ACCESS_KEY="noop"
 export AWS_SQS_REGION="noop"

shellTarballs/android/sdk34

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

shellTarballs/android/sdk37

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-3cf3cf0707925322bcd667d5ba79120136f9afd8.tar.gz
+s3://exp-artifacts/android-shell-builder-701650df1bf19da5e223688a3773a33f6f540fa3.tar.gz

shellTarballs/android/sdk38

@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-6cde8e00cd7bdf7a933cd8aad7f8e86981ea68a2.tar.gz

shellTarballs/android/sdk39

@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-29a8a376760deecc41efffc0d8ae420a63559654.tar.gz

shellTarballs/ios/client

@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-18a58afe742e63f1d2ac71ba21404d8b84e6563e.tar.gz
+s3://exp-artifacts/ios-expo-client-aadfc350d8e4ebf8dce9ce08723bb7e07d563846.tar.gz

shellTarballs/ios/sdk34

@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-latest-651588ff3445a5d87b3a5b81ec2977c02b22f3a2.tar.gz

shellTarballs/ios/sdk37

@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-30eb0558ff6a77acf56bb045e98b84f6a5e1478a.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-549b9da7f764c6b75741aad3cd29a53aba809516.tar.gz

shellTarballs/ios/sdk38

@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-6cde8e00cd7bdf7a933cd8aad7f8e86981ea68a2.tar.gz

src/__smoke__/fixtures/android/recording.json

@@ -1 +1 @@
-[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>f5017f35-ce75-4a6c-acaf-4ccc3d73899f</MessageId><ReceiptHandle>AQEBQjEPeX13Rkr+iSNEuh9J+WKCinb45vRFxWMojfZlD8f5gXi1fncRIotDjji9Q5lkhEK6hjXnALwGXZTstFj3/EPMVV2MKPNN/6NA3cQ7wSd5/+EqP8ZFOC+wBBK46KdS82t46NJ3c0DqkXPImlUE7O2n1WnFiRrjJ+I/G7yYhf+rnxLoNWD8ZPFzzInr6K0Q4Fae8Wqowyc9N8dw2kksnzW3qto+W/Ped1MyF4/Ia6KBqPLQswHRI5WRrqxxaVKdi37XxHW1J71xxEskicTlSBqQmre+3gaCja6cDpXkBtQSNp1LC7nvt/OXZTmXvwtM</ReceiptHandle><MD5OfBody>792da27a1e1bc549ed89f35a5f66e38c</MD5OfBody><Body>{&quot;id&quot;:&quot;cd9ff227-575b-4eec-874f-d2b9f6187f05&quot;,&quot;experienceId&quot;:&quot;da491dac-c6bf-4d54-b67a-ba7890e22fb2&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;fbd6360b-e85d-485e-bf20-ab66adfeea16&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;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&quot;,&quot;keystorePassword&quot;:&quot;28eeeda02db44ed9afc1c1d4a0f2caa6&quot;,&quot;keystoreAlias&quot;:&quot;QGV4cG8tdHVydGxlL3R1cnRsZS1jbGktZXhhbXBsZQ==&quot;,&quot;keyPassword&quot;:&quot;a6a53453c5534673900dac983e40a693&quot;},&quot;manifest&quot;:{&quot;ios&quot;:{&quot;buildNumber&quot;:&quot;13&quot;,&quot;supportsTablet&quot;:true,&quot;bundleIdentifier&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;icon&quot;:&quot;./assets/icon.png&quot;,&quot;namLine truncated
+[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>4372949a-cd3a-5f32-a3de-c39fc958c74a</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","4372949a-cd3a-5f32-a3de-c39fc958c74a","Date","Mon, 06 Apr 2020 10:19:19 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>38544970-726d-5e8f-a908-1e7576054ce7</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","38544970-726d-5e8f-a908-1e7576054ce7","Date","Mon, 06 Apr 2020 10:19:25 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_android_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>facd3e34-dbe0-40bb-bdbf-5d6f81c11303</MessageId><ReceiptHandle>AQEBNTZWurF8hlTOBOEyCIKulN/Jv2oAWYh2dk6xARn1Fdv6GXgLyhlYga1kwJ35KBem2Il3zoqGlWubQpILrhhnlbyGXEZdJpONyPwJWzWxCZIR2n+LvccD9vxo3EzOSUjw/HNKBP4RjUdZubrwI0D1rQQvsN6ZWgfZb4IPuPTpTJ7HkGjMPdNFObs52dEEoQKYBFXBT/QVRLxNwB0a9dqDQ1OBIj9oV9KFyneQB2ShUyibsxSTlBsoysX6luCLAX6rmfG5mk1e3FN0kfX5sBcquT2HTM3xX9Fh0Truy/5xY62UbhBsaBN/vdaxPdaZdE+7</ReceiptHandle><MD5OfBody>42e2ec8aba79a37fd6c036904518516a</MD5OfBody><Body>{&quot;id&quot;:&quot;0dc0bb61-db8d-453b-b193-4c4f4c9ebc2f&quot;,&quot;experienceId&quot;:&quot;0128bca1-78cf-4cb8-ac00-c07600500254&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;android&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;buildType&quot;:&quot;apk&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;9b473c78-6d0e-4b69-88a8-1c0960287b2f&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;keystore&quot;:&quot;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 truncated

src/__smoke__/fixtures/ios/recording.json

@@ -1 +1 @@
-[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>05cbd74e-0c64-486f-a7e4-607abc3aaf2a</MessageId><ReceiptHandle>AQEB+bslyZTn6YlgvfhEznBALIRLejznK2LRiyoEVQNtRiglGEQ1f8KWtEykEqCC49N3J2A9yQD2vPIsPz+2Ad2QuEqsQVnkrx3STeoqu6icQesfdDDtq89ma76A6qbTy74sp23yVb8J0N8acUCW5M9oHaqqeNjbC/OoyO7P3zDHXXkydub5Kn72NAzNtfFOwnxfNCwKuKR4MKlsSC96P2GSHfR7S0wcUtcLpwtLMrbprMxgzN00qVudMRFLzpG4AC1gpGHHjzWuyQ41eL0AQ73T82Gga5ZiPqZ/QD4n8MQ5El7gz/mMNUL+JiKM2KCU3Jx2</ReceiptHandle><MD5OfBody>c136cec4c14d07668b5975e69bcc3330</MD5OfBody><Body>{&quot;id&quot;:&quot;ffb51e07-7cde-4b8e-a293-a2232feab913&quot;,&quot;experienceId&quot;:&quot;dfddc5d4-1d2a-4106-bd45-cb476ffce76e&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;ios&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;usesNonExemptEncryption&quot;:false,&quot;buildType&quot;:&quot;archive&quot;,&quot;bundleIdentifier&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;fbd6360b-e85d-485e-bf20-ab66adfeea16&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;teamId&quot;:&quot;QL76XYH73P&quot;,&quot;teamName&quot;:&quot;Alicja Warchał (Individual)&quot;,&quot;apnsKeyId&quot;:&quot;Z2J59NHNCT&quot;,&quot;apnsKeyP8&quot;:&quot;-----BEGIN PRIVATE KEY-----\\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQguLC/A0xR+9Wl0iZu\\n3gI7vY7WdK43Gi/AmxaNd+ClqD+gCgYIKoZIzj0DAQehRANCAATo7Wnhxs2gr6mn\\nRUhOthWykpMudxrcVdfHmPDZBiP/W9gzhMso9vDJf8S7fJrYRV2V+DsZWL/hVll3\\net4AYU+X\\n-----END PRIVATE KEY-----&quot;,&quot;certP12&quot;:&quot;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 truncated
+[{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>b5f1eca9-a7d6-53ad-9c14-bbad5d8557b9</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","b5f1eca9-a7d6-53ad-9c14-bbad5d8557b9","Date","Mon, 06 Apr 2020 09:36:24 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in_priority.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult/><ResponseMetadata><RequestId>cf078dc6-ce98-5b15-bdef-dac234c1e80b</RequestId></ResponseMetadata></ReceiveMessageResponse>","rawHeaders":["x-amzn-RequestId","cf078dc6-ce98-5b15-bdef-dac234c1e80b","Date","Mon, 06 Apr 2020 09:36:30 GMT","Content-Type","text/xml","Content-Length","240"]},{"scope":"https://sqs.us-west-2.amazonaws.com:443","method":"POST","path":"/","body":"Action=ReceiveMessage&MaxNumberOfMessages=1&QueueUrl=https%3A%2F%2Fsqs.us-west-2.amazonaws.com%2F274251141632%2Fturtle_jobs_local_dominik_ios_in.fifo&Version=2012-11-05&VisibilityTimeout=30","status":200,"response":"<?xml version=\"1.0\"?><ReceiveMessageResponse xmlns=\"http://queue.amazonaws.com/doc/2012-11-05/\"><ReceiveMessageResult><Message><MessageId>f767ca39-904e-41bc-aae6-d2314c524da6</MessageId><ReceiptHandle>AQEBNQC6jpFEVmAFM4AirXD64vMnFlbNSRQYgv/FQMA2hVrLV4cfYCluFPUzMaJL/BKh59+S+UI9MACa+CLVnZwSYLXI5LY3zcSHYsQB1cm2Co/hD5K6kQoZjvtNhJY4eKdb9e9o3ahp7aSnGAb5tp0ixGmjwoQYTwGRO3eFdoJu1X15nh9RGoxYCyUk2ccpLEwlXMIh97q9NJI2qYQzxh5UfSuqrWeWhjhL63/Qk/nxvgeLDQ5g1QA0j4F/i9okIQVCMZcZDja89rf/3p6Q8d+9O6ZNuE3a40W/nObBNqF8zyJgmgjj4O5Q+7UNLS7tuBZm</ReceiptHandle><MD5OfBody>96a69b276272c38cd84a01641bf35ff1</MD5OfBody><Body>{&quot;id&quot;:&quot;eb22c2b4-fa97-40ac-a4ab-f371524223c5&quot;,&quot;experienceId&quot;:&quot;227025fc-a2bf-47fe-8569-d1c23aeeccf6&quot;,&quot;experienceName&quot;:&quot;@dsokal-local/turtle-cli-example&quot;,&quot;platform&quot;:&quot;ios&quot;,&quot;config&quot;:{&quot;releaseChannel&quot;:&quot;default&quot;,&quot;usesNonExemptEncryption&quot;:false,&quot;buildType&quot;:&quot;archive&quot;,&quot;bundleIdentifier&quot;:&quot;com.expo.turtle.cli.example&quot;},&quot;status&quot;:&quot;sent-to-queue&quot;,&quot;sdkVersion&quot;:&quot;37.0.0&quot;,&quot;accountId&quot;:&quot;9b473c78-6d0e-4b69-88a8-1c0960287b2f&quot;,&quot;priority&quot;:&quot;normal&quot;,&quot;credentials&quot;:{&quot;teamId&quot;:&quot;QL76XYH73P&quot;,&quot;teamName&quot;:null,&quot;apnsKeyId&quot;:&quot;QUY2MJ4A7X&quot;,&quot;apnsKeyP8&quot;:&quot;-----BEGIN PRIVATE KEY-----\\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgjVzFvGfxlJPfM3Wq\\nUa1L7D81yjTpGQEM3JIwFdDBfQ+gCgYIKoZIzj0DAQehRANCAASGhxIZHk2tDLzU\\nDWytVMl/TwZvOAeG8TBbWv/5vNpfC8o6/doi50rSCCzOwxoL9/7u3txDoB8chFvV\\nS8a0AwRT\\n-----END PRIVATE KEY-----&quot;,&quot;certP12&quot;:&quot;MIIMkQIBAzCCDFgGCSqGSIb3DQEHAaCCDEkEggxFMIIMQTCCBrcGCSqGSIb3DQEHBqCCBqgwggakAgEAMIIGnQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIfpexNY97M8MCAggAgIIGcCEvKC+4Z1kDm7KakEuaUlUYOpXBgiGUh61S+SYA2YWB0uzF5r3JIcvdxnBR96p78CxulLQzK+X8xC5HWSqR5YbbeaPhWQ9ZCqV3bOWSihmz0Ld3cBt9sxds0FOwWeo9XC4t1L6BJsskolO2jXkPY/6In7M3OFsxxR7M8uJdhfzqNJGdRLHWWaOYhQ5sfiObPluM+U0h0otNo3QNjI6EBx0Ra65U1MQWlh9r9pz1UXONWBBy8Np2DNsXrJb7vnLSNNiavfQ09Ahiu8UFH/7G41v8wUAqe1XRO3i+OarC692avplTHA6bfsHmdY2XPUc31Fo2FYpa0AT8lDG5mtlkfy9CawKM9wdKiFaw7/0HgMHuAaRF9pfGsb0yeecx31VPV5FBZ0MRc0xY3oBzSbmDNZaK0EzzwhFk0EPLQc9bHtQg+lYaH8/pNbyueP5mKifoQHaVlwEIrkqUy8eN1fXbugkd6gk05cxNVcF9WmxSax5r4BAlKWV3ISOBJl9YeCUVn2rWqy6w7eWF2QCHZ/IXPU62QZViIsdfB2HtKcWovp9b72ZNc3A7yv+LtqJkR3rutvE2d5LCnEgpztZV3fFYSQadNdixOW0039zhjXpncHJpEyQygT3OvPaPDRbdt35bBAF4TP9n+y3LGzcNUKGoVBekEQ063VEw8W/yWWGltteZO0tFf56Zxp6wXSn0wYGbAXDIkrYA47jgjfH9M4/eaY7nz50QR6X7B4DxhAp+ElInZt9a4x5pcOzHJVYIkfZkW0iDcYUNlCG1KnnmS+pdlV0ucA3PvxtLLDDmOJoGegeCJHpAgKn6ntoyacgNBwT52vj06tDXjWR5k8XCMcQEbtRokJhP2tdESxJoozrhDRoZUGHZUIBNnTen6rPsAdJTih0PDTbfHvXJJUXq23oD/23Tw81yjXQ2fAQDyTQozRQNO9TMwmULo5nuY/PsSCcvSVvSb9DLPkNWjKKiDGGTW5WSym6FBq732uM4XcyBMAUfz+9RMHL0giVA7sLGgQRJGFtry94O+g2SAn81wYdBeF/00DOyNKnzItGgqghz/6lPh07dp/sgm/d1rk+vb+8AMZ7LjpZOFPOluW6ZwQOB3ebptP1IsQvgR2DuDT0f7KHYd3CfOnUc/tSCPvzHGMGQNmca3uI/k5l/emQxL3MqFVD5lfYBP8T4f1RiBbZlm2Zj9IYCqSan3Rjx2Mtvls4IzOhhCW27XSp2B7O3e45KxxiXjLhRA2LxppKC+ofgJW9OHh+IDlO3+r8QMP8UvNbq5j/s9XQuYxl5N2bi51rou0RyOFCWAemkFz8eb5A0Gz87ZFK53uFq8NTb+fPgBUPHixThufe0tCo4Kt2xDq29yP9CemVFOthCtp1t6jjELine truncated

src/__smoke__/smoke.test.ts

@@ -17,7 +17,8 @@ jest.mock('../builders/utils/uploader.ts', () => ({
 async function performSmokeTest(recording: string) {
   jest.setTimeout(60 * 60 * 1000);
 
-  const fixtureExists = await fs.pathExists(recording);
+  // @ts-ignore
+  const fixtureExists = await fs.exists(recording);
   if (fixtureExists) {
     logger.info('Fixture exists, test will use existing one.');
 

src/aws/cloudwatch/index.ts

@@ -136,7 +136,7 @@ function _addEmptyMetrics(metrics: IMetric[]) {
       acc.add(i.MetricName);
     }
     return acc;
-  }, new Set<string>());
+  }, new Set());
 
   const nonEmptyMetrics = _.omitBy(state.registeredMetrics, ({ addEmpty }) => !addEmpty);
   const toAdd = _.difference(Object.keys(nonEmptyMetrics), Array.from(seenMetrics));

src/aws/cloudwatch/statistics.ts

@@ -19,10 +19,10 @@ export default function calculateStatistics(metrics: IMetric[]) {
       });
     }
 
-    result!.StatisticValues.Maximum = Math.max(result!.StatisticValues.Maximum, i.Value);
-    result!.StatisticValues.Minimum = Math.min(result!.StatisticValues.Minimum, i.Value);
-    result!.StatisticValues.SampleCount += 1;
-    result!.StatisticValues.Sum += i.Value;
+    result.StatisticValues.Maximum = Math.max(result.StatisticValues.Maximum, i.Value);
+    result.StatisticValues.Minimum = Math.min(result.StatisticValues.Minimum, i.Value);
+    result.StatisticValues.SampleCount += 1;
+    result.StatisticValues.Sum += i.Value;
     return result;
   }, null);
   return [reduced];

src/aws/sqs.ts

@@ -2,8 +2,9 @@ import retry from 'async-retry';
 import AWS from 'aws-sdk';
 import _ from 'lodash';
 
-import { QUEUE_URL } from 'turtle/aws/utils';
+import { OUTPUT_QUEUE_URL, QUEUE_URL } from 'turtle/aws/utils';
 import config from 'turtle/config';
+import { JOB_UPDATE_TYPE } from 'turtle/constants/build';
 import logger from 'turtle/logger';
 import { getCurrentJobId } from 'turtle/turtleContext';
 
@@ -72,3 +73,19 @@ export function changeMessageVisibilityRecurring(priority: string, receiptHandle
     }
   }, (VISIBILITY_TIMEOUT_SEC * 1000) / 3);
 }
+
+export async function sendMessage(jobId: string, status: JOB_UPDATE_TYPE, data = {}) {
+  const params = {
+    MessageBody: JSON.stringify({ jobId, status, ...data }),
+    QueueUrl: OUTPUT_QUEUE_URL(),
+    DelaySeconds: 0,
+    MessageGroupId: jobId,
+  };
+  try {
+    return await retry(async () => {
+      return await sqs.sendMessage(params).promise();
+    });
+  } catch (err) {
+    logger.error({ err }, `Error sending SQS message: ${JSON.stringify(params)}}`);
+  }
+}

src/aws/utils.ts

@@ -1,3 +1,4 @@
 import config from 'turtle/config';
 
 export const QUEUE_URL = (priority: string) => (config.sqs.queues as any)[priority][config.platform];
+export const OUTPUT_QUEUE_URL = () => config.sqs.queues.out;

src/bin/commands/build/android.ts

@@ -29,11 +29,6 @@ export default (program: any, setCommonCommandOptions: any) => {
       /^(debug|release)$/i,
       'release',
     )
-    .option(
-      '--gradle-args <gradle-args>',
-      'optional arguments passed to gradle, make sure to surround them with double quotes'
-      + ' (e.g.: --gradle-args "--stacktrace --debug")',
-    )
     .description(
       'Build a standalone APK or App Bundle for your project, either signed and ready for submission to'
       + ' the Google Play Store or in debug mode.',

src/bin/commands/build/index.ts

@@ -15,12 +15,7 @@ function setCommonCommandOptions(cmd: any) {
     .option('-o --output <output-file-path>', 'output file path')
     .option(
       '--public-url <url>',
-      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported unless '
-      + '--allow-non-https-public-url is also set!',
-    )
-    .option(
-      '--allow-non-https-public-url',
-      'allows non-HTTPS URLs in --public-url; this should only be used when building an unpublished application',
+      'the URL of an externally hosted manifest (for self-hosted apps), only HTTPS URLs are supported!',
     )
     .option(
       '--release-channel <channel-name>',

src/bin/setup/android/index.ts

@@ -101,9 +101,7 @@ async function _shellAppPostDownloadAction(sdkVersion: string, workingdir: strin
 async function _installNodeModules(cwd: string) {
   l.info(`installing dependencies in ${cwd} directory...`);
   const command = await _shouldUseYarnOrNpm();
-  // Keep in sync with /Dockerfile
-  // --prod requires --ignore-scripts (otherwise expo-yarn-workspaces errors as missing)
-  await ExponentTools.spawnAsyncThrowError(command, ['install', '--ignore-scripts', '--production'], {
+  await ExponentTools.spawnAsyncThrowError(command, ['install'], {
     pipeToLogger: true,
     loggerFields: LOGGER_FIELDS,
     cwd,

src/bin/utils/builder.ts

@@ -1,6 +1,6 @@
 import _url from 'url';
 
-import { ConfigError, getExpoSDKVersion, ProjectConfig } from '@expo/config';
+import { ConfigError, getExpoSDKVersion } from '@expo/config';
 import { ExponentTools } from '@expo/xdl';
 import _ from 'lodash';
 import uuid from 'uuid';
@@ -57,7 +57,7 @@ export function createBuilderAction({
         );
       }
 
-      if (cmd.publicUrl && !cmd.allowNonHttpsPublicUrl) {
+      if (cmd.publicUrl) {
         const parsedPublicUrl = _url.parse(cmd.publicUrl);
         if (parsedPublicUrl.protocol !== 'https:') {
           throw new ErrorWithCommandHelp('--public-url is invalid - only HTTPS urls are supported');
@@ -74,12 +74,12 @@ export function createBuilderAction({
         publicUrl: cmd.publicUrl,
       };
 
-      const projectConfig = await ProjectUtils.getConfig(projectDirArg, cmd.config);
-      const sdkVersion = getExpoSDKVersionSafely(projectAbsoluteDir, projectConfig);
+      const appJSON = await ProjectUtils.loadAppJSON(projectDirArg, cmd.config);
+      const sdkVersion = getExpoSDKVersionSafely(projectAbsoluteDir, appJSON);
       await setup(platform, sdkVersion);
       const credentials = await prepareCredentials(cmd);
       const rawJob = {
-        ...await buildJobObject(cmd, platform, projectConfig, args, credentials, sdkVersion),
+        ...await buildJobObject(platform, appJSON, args, credentials, sdkVersion),
         ...cmd.buildDir && { fakeUploadDir: ProjectUtils.resolveAbsoluteDir(cmd.buildDir) },
         ...cmd.output && { fakeUploadBuildPath: ProjectUtils.resolveAbsoluteDir(cmd.output) },
       };
@@ -97,9 +97,9 @@ export function createBuilderAction({
   };
 }
 
-function getExpoSDKVersionSafely(projectDir: string, projectConfig: ProjectConfig) {
+function getExpoSDKVersionSafely(projectDir: string, appJSON?: any) {
   try {
-    return getExpoSDKVersion(projectDir, projectConfig.exp);
+    return getExpoSDKVersion(projectDir, appJSON && appJSON.expo);
   } catch (err) {
     if (err instanceof ConfigError) {
       throw new Error(
@@ -113,25 +113,22 @@ function getExpoSDKVersionSafely(projectDir: string, projectConfig: ProjectConfi
 }
 
 const buildJobObject = async (
-  cmd: any,
   platform: 'android' | 'ios',
-  projectConfig: ProjectConfig,
+  appJSON: any,
   { releaseChannel, buildType, buildMode, username, publicUrl, projectDir }: any,
   credentials: any,
   sdkVersion: string,
 ) => {
-  const owner = projectConfig.exp.owner || username;
-  const experienceName = `@${owner}/${projectConfig.exp.slug}`;
+  const experienceName = `@${_.get(appJSON, 'expo.owner', username)}/${_.get(appJSON, 'expo.slug')}`;
   const job = {
     config: {
-      ...(projectConfig.exp?.[platform]?.config || {}),
+      ..._.get(appJSON, `expo.${platform}.config`, {}),
       buildType,
-      releaseChannel,
-      publicUrl,
-      ...(platform === 'android' && cmd.gradleArgs ? { gradleArgs: cmd.gradleArgs.split(' ') } : {}),
       ...(platform === 'android' ? { buildMode } : {}),
-      ...(platform === 'android' ? { androidPackage: projectConfig.exp?.android?.package } : {}),
-      ...(platform === 'ios' ? { bundleIdentifier: projectConfig.exp?.ios?.bundleIdentifier } : {}),
+      releaseChannel,
+      ...(platform === 'ios' ? { bundleIdentifier: _.get(appJSON, 'expo.ios.bundleIdentifier') } : {}),
+      ...(platform === 'android' ? { androidPackage: _.get(appJSON, 'expo.android.package') } : {}),
+      publicUrl,
     },
     id: uuid.v4(),
     platform,

src/bin/utils/project.ts

@@ -1,18 +1,20 @@
+import fs from 'fs-extra';
 import path from 'path';
 
-import { getConfig as getProjectConfig, setCustomConfigPath } from '@expo/config';
-import fs from 'fs-extra';
-
-export async function getConfig(projectDir: string, config: string | null) {
-  projectDir = resolveAbsoluteDir(projectDir);
+export async function loadAppJSON(projectDirArg: string, config: string | null) {
+  let appJSONPath;
   if (config) {
-    const pathToConfig = path.resolve(process.cwd(), config);
-    if (!await fs.pathExists(pathToConfig)) {
-      throw new Error(`File at provided config path does not exist: ${pathToConfig}`);
-    }
-    setCustomConfigPath(projectDir, pathToConfig);
+    appJSONPath = resolveAbsoluteDir(config);
+  } else {
+    const projectDir = resolveAbsoluteDir(projectDirArg);
+    appJSONPath = path.join(projectDir, 'app.json');
+  }
+  const appJSONExists = await fs.pathExists(appJSONPath);
+  if (!appJSONExists) {
+    throw new Error(`Couldn't find app.json.`);
+  } else {
+    return require(appJSONPath);
   }
-  return await getProjectConfig(projectDir, {});
 }
 
 export const resolveAbsoluteDir = (dir: string) => {

src/builders/android.ts

@@ -3,6 +3,7 @@ import path from 'path';
 import { AndroidShellApp, ImageUtils } from '@expo/xdl';
 import fs from 'fs-extra';
 import _ from 'lodash';
+import semver from 'semver';
 import { ANDROID_BUILD_TYPES } from 'turtle/constants';
 import uuidv4 from 'uuid/v4';
 
@@ -10,7 +11,7 @@ import getOrCreateCredentials from 'turtle/builders/utils/android/credentials';
 import { formatShellAppDirectory } from 'turtle/builders/utils/android/workingdir';
 import * as commonUtils from 'turtle/builders/utils/common';
 import * as imageHelpers from 'turtle/builders/utils/image';
-import { resolveExplicitOptIn, resolveNativeModules } from 'turtle/builders/utils/unimodules';
+import { resolveExplicitOptIn } from 'turtle/builders/utils/unimodules';
 import { uploadBuildToS3 } from 'turtle/builders/utils/uploader';
 import { ensureCanBuildSdkVersion } from 'turtle/builders/utils/version';
 import config from 'turtle/config';
@@ -34,8 +35,8 @@ export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
     ...config.builder.fakeUpload && {
       fakeUploadBuildPath:
         jobData.fakeUploadBuildPath
-          ? jobData.fakeUploadBuildPath
-          : path.join(jobData.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename),
+        ? jobData.fakeUploadBuildPath
+        : path.join(jobData.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename),
     },
   });
 
@@ -72,20 +73,15 @@ async function runShellAppBuilder(
   const sdkVersion = _.get(manifest, 'sdkVersion', sdkVersionFromJob);
   const workingDir = formatShellAppDirectory({ sdkVersion });
 
-  // Default behaviour:
-  // - load all modules except [expo-branch]
-  // - load expo-branch only if present in package.json dependencies
+  // (2019-07-31) We are explicitly choosing to disable this option until we have more
+  // infrastructure/tooling built around optional modules and OTA updates, as right now it's
+  // very easy for developers to break apps in production with optional modules.
   //
-  // Behaviour with "enableDangerousExperimentalLeanBuilds" flag enabled
-  // - add unimodules from `manifest.dependencies` (project package.json dependecies)
-  // - add unimodules from react-native-unimodules package.json
-  // - add unimodules from expo package package.json
-  // - add recusively all dependecies of already added unimodules
+  // to enable full resolver switch resolveExplicitOptIn to resolveNativeModules
   logger.info({ buildPhase: 'resolve native modules' }, 'Resolving universal modules dependencies');
-  const packageJsonDependecies = _.get(manifest, 'dependencies');
-  const enabledModules = _.get(manifest, 'android.enableDangerousExperimentalLeanBuilds')
-    ? await resolveNativeModules(workingDir, packageJsonDependecies)
-    : await resolveExplicitOptIn(workingDir, packageJsonDependecies);
+  const enabledModules = semver.satisfies(sdkVersion, '>= 33.0.0')
+    ? await resolveExplicitOptIn(workingDir, _.get(manifest, 'dependencies'))
+    : null;
 
   try {
     await AndroidShellApp.createAndroidShellAppAsync({
@@ -103,7 +99,6 @@ async function runShellAppBuilder(
       modules: enabledModules,
       buildType: jobData.config.buildType,
       buildMode: jobData.config.buildMode,
-      gradleArgs: jobData.config.gradleArgs,
     });
   } catch (err) {
     commonUtils.logErrorOnce(err);

src/builders/utils/android/credentials.ts

@@ -5,10 +5,11 @@ import fs from 'fs-extra';
 import get from 'lodash/get';
 import uuidv4 from 'uuid/v4';
 
+import * as sqs from 'turtle/aws/sqs';
+import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
 import { IAndroidCredentials, IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 import { isOffline } from 'turtle/turtleContext';
-import { sendCredentialsUpdate } from 'turtle/utils/www';
 
 async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredentials> {
   if (!jobData.credentials) {
@@ -49,7 +50,9 @@ async function getOrCreateCredentials(jobData: IJob): Promise<IAndroidCredential
       l.info(`Key password: ${credentials.keyPassword}`);
       l.info(`Please keep these credentials safe`);
     } else {
-      await sendCredentialsUpdate(jobData.id, 'android', credentials);
+      await sqs.sendMessage(jobData.id, UPDATE_CREDENTIALS, {
+        ...credentials,
+      });
       l.info('Keystore sent to storage successfully');
     }
     await fs.unlink(keystoreFilename);

src/builders/utils/ios/adhocBuild.ts

@@ -4,11 +4,12 @@ import spawnAsync from '@expo/spawn-async';
 import { IosCodeSigning } from '@expo/xdl';
 import fs from 'fs-extra';
 
+import * as sqs from 'turtle/aws/sqs';
 import BuildError, { BuildErrorReason } from 'turtle/builders/BuildError';
+import { UPDATE_CREDENTIALS } from 'turtle/constants/build';
 import { IJob } from 'turtle/job';
 import logger from 'turtle/logger';
 import { isOffline } from 'turtle/turtleContext';
-import { sendCredentialsUpdate } from 'turtle/utils/www';
 
 // tslint:disable-next-line:no-var-requires
 const travelingFastlane = process.platform === 'darwin' ? require('@expo/traveling-fastlane-darwin')() : null;
@@ -63,7 +64,7 @@ async function prepareAdHocBuildCredentials(job: IJob) {
       await fs.writeFile(provisioningProfilePath, Buffer.from(credentials.provisioningProfile, 'base64'));
       logger.info(`Saved provisioning profile to ${provisioningProfilePath}`);
     } else {
-      await sendCredentialsUpdate(job.id, 'ios', {
+      await sqs.sendMessage(job.id, UPDATE_CREDENTIALS, {
         provisioningProfileId: credentials.provisioningProfileId,
         provisioningProfile: credentials.provisioningProfile,
       });

src/config.ts

@@ -1,4 +1,3 @@
-import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
@@ -29,6 +28,7 @@ export default {
         ios: env('AWS_SQS_IOS_PRIORITY_QUEUE_URL'),
         android: env('AWS_SQS_ANDROID_PRIORITY_QUEUE_URL'),
       },
+      out: env('AWS_SQS_OUT_QUEUE_URL'),
     },
   },
   cloudwatch: {
@@ -44,17 +44,8 @@ export default {
     intervalMs: env('DATADOG_INTERVAL_MS', 5 * 60 * 1000),
   },
   redis: {
-    main: {
-      url: env('REDIS_URL'),
-      caCertificate: envTransform(
-        'REDIS_CA_CERTIFICATE',
-        null,
-        (caCertificate: string) => caCertificate && fs.readFileSync(caCertificate),
-      ),
-    },
-    turtle: {
-      url: env('REDIS_CONFIG_URL'),
-    },
+    url: env('REDIS_URL'),
+    configUrl: env('REDIS_CONFIG_URL'),
   },
   logger: {
     level: env('LOGGER_LEVEL', 'info'),
@@ -90,7 +81,7 @@ export default {
     androidDependenciesDir: env(
       'TURTLE_ANDROID_DEPENDENCIES_DIR',
       path.join(os.homedir(), '.turtle/androidDependencies'),
-    ),
+      ),
     tempS3LogsDir: env('TURTLE_TEMP_S3_LOGS_DIR', '/tmp/logs'),
     fakeUploadDir: envOptional('TURTLE_FAKE_UPLOAD_DIR'),
     temporaryFilesRoot: env(
@@ -99,10 +90,6 @@ export default {
     ),
   },
   www: {
-    secretToken: env('TURTLE_SDK_VERSIONS_SECRET_TOKEN'),
-  },
-  leader: {
-    redisKey: env('LEADER_REDIS_KEY', 'turtle-v1:leader'),
-    redisKeyTTLSec: envNum('LEADER_REDIS_KEY_TTL', 30),
+    sdkVersionsSecretToken: env('TURTLE_SDK_VERSIONS_SECRET_TOKEN'),
   },
 };

src/job.ts

@@ -15,7 +15,6 @@ export interface IJob {
     // android
     androidPackage?: string;
     buildMode?: ANDROID_BUILD_MODES;
-    gradleArgs?: string[];
   };
   credentials: {
     // android

src/jobManager.ts

@@ -10,9 +10,8 @@ import logger from 'turtle/logger';
 import * as buildDurationMetric from 'turtle/metrics/buildDuration';
 import * as buildStatusMetric from 'turtle/metrics/buildStatus';
 import { checkShouldExit, setCurrentJobId, turtleVersion } from 'turtle/turtleContext';
-import { getPriorities, labelConfiguration, TurtleMode } from 'turtle/utils/priorities';
+import { getPriorities } from 'turtle/utils/priorities';
 import * as redis from 'turtle/utils/redis';
-import { sendBuildStatusUpdate } from 'turtle/utils/www';
 import { sanitizeJob } from 'turtle/validator';
 
 function _maybeExit() {
@@ -23,8 +22,8 @@ function _maybeExit() {
 }
 
 export async function doJob() {
-  const { job, turtleMode } = await getJob();
-  await processJob(job, turtleMode);
+  const jobData = await getJob();
+  await processJob(jobData);
   _maybeExit();
 }
 
@@ -35,7 +34,6 @@ export async function getJob() {
     try {
       let job = null;
       const priorities = await getPriorities();
-      const turtleMode = labelConfiguration(priorities);
       for (const priority of priorities) {
         job = await sqs.receiveMessage(priority);
         _maybeExit();
@@ -46,7 +44,7 @@ export async function getJob() {
       }
       _maybeExit();
       if (job !== null) {
-        return { job, turtleMode };
+        return job;
       }
     } catch (err) {
       logger.error({ err }, 'Error at receiving messages');
@@ -54,7 +52,7 @@ export async function getJob() {
   }
 }
 
-async function processJob(jobData: any, turtleMode: TurtleMode) {
+async function processJob(jobData: any) {
   const receiptHandle = jobData.ReceiptHandle;
   const { priority } = jobData;
 
@@ -74,8 +72,7 @@ async function processJob(jobData: any, turtleMode: TurtleMode) {
       logger.error({ err, ...rawJob && { buildJobId: rawJob.id } }, 'The build job is invalid');
       // send message only if we've managed to parse the job json
       if (rawJob) {
-        await sendBuildStatusUpdate(rawJob.id, {
-          status: BUILD.JOB_STATES.ERRORED,
+        await sqs.sendMessage(rawJob.id, BUILD.JOB_STATES.ERRORED, {
           turtleVersion,
           buildDuration: 0,
           reason: 'The build job is invalid',
@@ -95,7 +92,7 @@ async function processJob(jobData: any, turtleMode: TurtleMode) {
       let buildFailed = false;
       const buildType = _.get(job, 'config.buildType', 'default');
       try {
-        const status = await build(job, turtleMode);
+        const status = await build(job);
         buildStatusMetric.add(buildType, priority, status);
         buildFailed = !status;
       } catch (err) {
@@ -130,7 +127,7 @@ async function processJob(jobData: any, turtleMode: TurtleMode) {
 function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any) {
   return setTimeout(async () => {
     try {
-      sendBuildStatusUpdate(job.id, { status: BUILD.JOB_STATES.ERRORED, turtleVersion });
+      sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, { turtleVersion });
       await deleteMessage(priority, receiptHandle);
     } finally {
       logger.error('Build timed out. Going to terminate turtle agent.');
@@ -140,33 +137,20 @@ function failAfterMaxJobTime(priority: string, receiptHandle: string, job: any)
   }, config.builder.maxJobTimeMs);
 }
 
-async function build(job: any, turtleMode: TurtleMode) {
+async function build(job: any) {
   const startTimestamp = Date.now();
   const s3Url = await logger.initForJob(job);
   const calculateBuildDuration = () => Math.ceil((Date.now() - startTimestamp) / 1000);
 
-  const commonPayload = {
-    logs: {
-      url: s3Url,
-      format: 'json',
-    },
-    extraData: {
-      turtleMode,
-    },
-  };
   try {
-    await sendBuildStatusUpdate(job.id, {
-      ...commonPayload,
-      status: BUILD.JOB_STATES.IN_PROGRESS,
+    await sqs.sendMessage(job.id, BUILD.JOB_STATES.IN_PROGRESS, {
+      logUrl: s3Url,
+      logFormat: 'json',
     });
-    const { artifactUrl } = await (builders as any)[job.platform](job);
+    const result = await (builders as any)[job.platform](job);
     const buildDuration = calculateBuildDuration();
-    sendBuildStatusUpdate(job.id, {
-      ...commonPayload,
-      artifacts: {
-        url: artifactUrl,
-      },
-      status: BUILD.JOB_STATES.FINISHED,
+    sqs.sendMessage(job.id, BUILD.JOB_STATES.FINISHED, {
+      ...result,
       turtleVersion,
       buildDuration,
     });
@@ -178,9 +162,7 @@ async function build(job: any, turtleMode: TurtleMode) {
     if (err instanceof BuildError) {
       reason = err.reason;
     }
-    sendBuildStatusUpdate(job.id, {
-      ...commonPayload,
-      status: BUILD.JOB_STATES.ERRORED,
+    sqs.sendMessage(job.id, BUILD.JOB_STATES.ERRORED, {
       turtleVersion,
       buildDuration,
       ...reason && { reason },

src/jobsSchemas/android.ts

@@ -15,7 +15,6 @@ export default baseJobSchema.concat(
     config: Joi.object().keys({
       buildMode: Joi.string().valid(Object.values(ANDROID_BUILD_MODES)).default(ANDROID_BUILD_MODES.RELEASE),
       buildType: Joi.string().valid(Object.values(ANDROID_BUILD_TYPES)).default(ANDROID_BUILD_TYPES.APK),
-      gradleArgs: Joi.array().items(Joi.string()),
     }),
   }),
 );

src/metrics/buildersConfig.ts

@@ -5,11 +5,11 @@ import take from 'lodash/take';
 import logger from 'turtle/logger';
 import { sendMetric } from 'turtle/metrics/datadog';
 import { getReplicaCount } from 'turtle/utils/metadata';
-import { getLabeledConfiguration, TurtleMode } from 'turtle/utils/priorities';
+import { getLabeledConfiguration, TurtleModeLabels } from 'turtle/utils/priorities';
 
 const createMetricName = () => `turtle.replicaCount`;
-const createModeMetricName = (mode: TurtleMode) => `${createMetricName()}.${mode}`;
-const createModeTag = (mode: TurtleMode) => `mode:${mode}`;
+const createModeMetricName = (mode: TurtleModeLabels) => `${createMetricName()}.${mode}`;
+const createModeTag = (mode: TurtleModeLabels) => `mode:${mode}`;
 
 export default async function sendConfigToDatadog() {
   let configuration;
@@ -30,28 +30,28 @@ export default async function sendConfigToDatadog() {
 
   const metricName = createMetricName();
 
-  const normalReplicaCount = replicaCounts[TurtleMode.Normal] || 0;
-  const highReplicaCount = replicaCounts[TurtleMode.High] || 0;
-  const highOnlyReplicaCount = replicaCounts[TurtleMode.HighOnly] || 0;
+  const normalReplicaCount = replicaCounts[TurtleModeLabels.Normal] || 0;
+  const highReplicaCount = replicaCounts[TurtleModeLabels.High] || 0;
+  const highOnlyReplicaCount = replicaCounts[TurtleModeLabels.HighOnly] || 0;
 
-  const normalTag = createModeTag(TurtleMode.Normal);
-  const normalMetricName = createModeMetricName(TurtleMode.Normal);
+  const normalTag = createModeTag(TurtleModeLabels.Normal);
+  const normalMetricName = createModeMetricName(TurtleModeLabels.Normal);
   logger.debug(
     `Sending ${metricName}=${normalReplicaCount} (${normalTag}), ${normalMetricName}=${normalReplicaCount} to Datadog`,
   );
   await sendMetric(metricName, normalReplicaCount, [normalTag]);
   await sendMetric(normalMetricName, normalReplicaCount);
 
-  const highTag = createModeTag(TurtleMode.High);
-  const highMetricName = createModeMetricName(TurtleMode.High);
+  const highTag = createModeTag(TurtleModeLabels.High);
+  const highMetricName = createModeMetricName(TurtleModeLabels.High);
   logger.debug(
     `Sending ${metricName}=${highReplicaCount} (${highTag}), ${highMetricName}=${highReplicaCount} to Datadog`,
   );
   await sendMetric(metricName, highReplicaCount, [highTag]);
   await sendMetric(highMetricName, highReplicaCount);
 
-  const highOnlyTag = createModeTag(TurtleMode.HighOnly);
-  const highOnlyMetricName = createModeMetricName(TurtleMode.HighOnly);
+  const highOnlyTag = createModeTag(TurtleModeLabels.HighOnly);
+  const highOnlyMetricName = createModeMetricName(TurtleModeLabels.HighOnly);
   logger.debug(
     `Sending ${metricName}=${highOnlyReplicaCount} (${highOnlyTag}),`
     + ` ${highOnlyMetricName}=${highOnlyReplicaCount} to Datadog`,

src/server.ts

@@ -6,8 +6,6 @@ import { doJob } from 'turtle/jobManager';
 import logger from 'turtle/logger';
 import setup from 'turtle/setup';
 import { checkShouldExit, setShouldExit, turtleVersion } from 'turtle/turtleContext';
-import { synchronizeFailedUpdates } from 'turtle/updatesManager';
-import Leader, { LeaderEvent } from 'turtle/utils/leader';
 import { setSupportedSdkVersions, setTurtleVersion } from 'turtle/utils/versions';
 
 process.on('unhandledRejection', (err) => logger.error({ err }, 'Unhandled promise rejection'));
@@ -35,8 +33,6 @@ async function main() {
     await setup[config.platform]();
   }
 
-  await electLeaderAndSynchronize();
-
   try {
     await setTurtleVersion(turtleVersion);
     logger.info(`Registered Turtle version (${turtleVersion}) in www`);
@@ -56,28 +52,6 @@ async function main() {
   }
 }
 
-async function electLeaderAndSynchronize() {
-  if (config.env === 'test') {
-    return;
-
-  }
-  const l = new Leader({
-    key: config.leader.redisKey,
-    id: config.hostname,
-    ttl: config.leader.redisKeyTTLSec,
-  });
-  let intervalId: NodeJS.Timeout;
-  l.on(LeaderEvent.elected, async () => {
-    intervalId = await synchronizeFailedUpdates();
-  });
-  l.on(LeaderEvent.revoked, () => {
-    if (intervalId) {
-      clearInterval(intervalId);
-    }
-  });
-  await l.elect();
-}
-
 main()
   .then(() => logger.error('This should never happen...'))
   .catch((err) => logger.error({ err }, 'Something went terribly wrong'))

src/types/declarations.d.ts

@@ -4,6 +4,7 @@ declare module 'bunyan-sentry-stream';
 declare module 'bunyan-debug-stream';
 declare module 'copy';
 declare module 'dogapi';
+declare module 'ioredis';
 declare module 'is-semver';
 declare module 'request-progress';
 declare module '@expo/xdl';

src/updatesManager.ts

@@ -1,83 +0,0 @@
-import Redis from 'ioredis';
-import chunk from 'lodash/chunk';
-
-import config from 'turtle/config';
-import { getRedisClient, RedisClient } from 'turtle/utils/redis';
-import { sendBuildStatusUpdate, sendCredentialsUpdate } from 'turtle/utils/www';
-
-const RETRY_COUNT = 5;
-
-type UpdateType = 'build' | 'credentials';
-interface IUpdate {
-  type: UpdateType;
-  buildId: string;
-  updateBody: any;
-  retried: number;
-}
-
-export async function saveUpdateFailure(buildId: string, type: UpdateType, updateBody: object): Promise<void> {
-  if (config.env === 'test') {
-    return;
-  }
-  const redis = await getRedisClient(RedisClient.Configuration) as Redis.Redis;
-  const update: IUpdate = {
-    type,
-    buildId,
-    updateBody,
-    retried: 0,
-  };
-  await redis.set(getFailedUpdateKey(buildId), JSON.stringify(update));
-}
-
-export async function synchronizeFailedUpdates(intervalMs = 3 * 60 * 1000): Promise<NodeJS.Timeout> {
-  try {
-    await _synchronizeFailedUpdates();
-  } catch (err) {
-    // don't do anything
-  }
-  return setInterval(() => _synchronizeFailedUpdates(), intervalMs);
-}
-
-async function _synchronizeFailedUpdates(): Promise<void> {
-  const redis = await getRedisClient(RedisClient.Configuration) as Redis.Redis;
-  const keys = await redis.keys(getFailedUpdateKey('*'));
-  const keyChunks = chunk(keys, 20);
-  for (const keyChunk of keyChunks) {
-    await Promise.all(keyChunk.map((key: string) => resendUpdateForKey(key)));
-  }
-}
-
-async function resendUpdateForKey(key: string): Promise<void> {
-  try {
-    const redis = await getRedisClient(RedisClient.Configuration) as Redis.Redis;
-    const updateRaw = await redis.get(key);
-    if (updateRaw) {
-      const update = JSON.parse(updateRaw) as IUpdate;
-      try {
-        await resendUpdateToWWW(update);
-        await redis.del(key);
-      } catch (err) {
-        update.retried += 1;
-        if (update.retried >= RETRY_COUNT) {
-          await redis.del(key);
-        } else {
-          await redis.set(key, JSON.stringify(update));
-        }
-      }
-    }
-  } catch (err) {
-    // don't do anything
-  }
-}
-
-async function resendUpdateToWWW(update: IUpdate): Promise<void> {
-  const { type, buildId, updateBody } = update;
-  if (type === 'build') {
-    await sendBuildStatusUpdate(buildId, updateBody);
-  } else if (type === 'credentials') {
-    const { platform, ...rest } = updateBody;
-    await sendCredentialsUpdate(buildId, platform, rest);
-  }
-}
-
-const getFailedUpdateKey = (buildId: string) => `${config.deploymentEnv}:failed-update:${buildId}`;

src/utils/leader.ts

@@ -1,164 +0,0 @@
-import { EventEmitter } from 'events';
-import Redis from 'ioredis';
-import { v4 as uuid } from 'uuid';
-
-import { getRedisClient, RedisClient } from 'turtle/utils/redis';
-
-interface ILeaderParams {
-  key: string;
-  id?: string;
-  ttl?: number;
-  wait?: number;
-}
-
-const RENEW_LEADER_SCRIPT = `
-  local leader_key = KEYS[1]
-  local leader_id = KEYS[2]
-  local leader_ttl = KEYS[3]
-
-  local current_leader
-
-  current_leader = redis.call("get", leader_key)
-  if (current_leader == leader_id) then
-    redis.call("pexpire", leader_key, leader_ttl)
-    return "ok"
-  else
-    return "you_are_not_the_leader"
-  end
-`;
-
-const STOP_BEING_LEADER_SCRIPT = `
-  local leader_key = KEYS[1]
-  local leader_id = KEYS[2]
-
-  local current_leader
-
-  current_leader = redis.call("get", leader_key)
-  if (current_leader == leader_id) then
-    redis.call("del", leader_key)
-    return "ok"
-  else
-    return "you_are_not_the_leader"
-  end
-`;
-
-interface IRedisCustom extends Redis.Redis {
-  renewLeader(key: string, id: string, ttl: number): Promise<string>;
-  stopBeingLeader(key: string, id: string): Promise<string>;
-}
-
-enum LeaderEvent {
-  elected = 'elected',
-  revoked = 'revoked',
-  error = 'error',
-}
-
-class Leader extends EventEmitter {
-  private key: string;
-  private id: string;
-  private ttl: number;
-  private wait: number;
-  private waitId?: NodeJS.Timeout;
-  private redisClientValue?: IRedisCustom;
-  private renewId?: NodeJS.Timeout;
-  private started = false;
-
-  constructor({ key, id, ttl = 30, wait = 1000 }: ILeaderParams) {
-    super();
-
-    this.key = key;
-    this.id = id || uuid();
-    this.ttl = ttl * 1000;
-    this.wait = wait;
-  }
-  public async elect(): Promise<void> {
-    if (!this.redisClientValue) {
-      await this.init();
-    }
-
-    if (!this.started) {
-      this.started = true;
-    }
-
-    try {
-      const res = await this.redisClient.set(this.key, this.id, 'PX', this.ttl, 'NX');
-      if (res === null) {
-        this.waitId = setTimeout(() => {
-          this.elect();
-        }, this.wait);
-      } else {
-        this.emit(LeaderEvent.elected);
-        this.renewId = setInterval(() => {
-          this.renew();
-        }, this.ttl / 2);
-      }
-    } catch (err) {
-      this.emit(LeaderEvent.error, err);
-    }
-  }
-
-  public async stop(): Promise<void> {
-    if (!this.started) {
-      throw new Error('You should start the election first!');
-    }
-    try {
-      const res = await this.redisClient.stopBeingLeader(this.key, this.id);
-      if (res === 'ok') {
-        this.emit(LeaderEvent.revoked);
-      }
-      if (this.renewId) {
-        clearInterval(this.renewId);
-      }
-      if (this.waitId) {
-        clearTimeout(this.waitId);
-      }
-      this.redisClientValue?.disconnect();
-      this.redisClientValue = undefined;
-    } catch (err) {
-      this.emit(LeaderEvent.error, err);
-    }
-  }
-
-  private get redisClient(): IRedisCustom {
-    if (!this.redisClientValue) {
-      throw new Error('Please run the init method first!');
-    }
-    return this.redisClientValue as IRedisCustom;
-  }
-
-  private async init(): Promise<void> {
-    if (this.redisClientValue) {
-      return;
-    }
-    this.redisClientValue = await getRedisClient(RedisClient.Configuration);
-    const redisClient = this.redisClient as IRedisCustom;
-    redisClient.defineCommand('renewLeader', {
-      numberOfKeys: 3,
-      lua: RENEW_LEADER_SCRIPT,
-    });
-    redisClient.defineCommand('stopBeingLeader', {
-      numberOfKeys: 2,
-      lua: STOP_BEING_LEADER_SCRIPT,
-    });
-  }
-
-  private async renew(): Promise<void> {
-    try {
-      const result = await this.redisClient.renewLeader(this.key, this.id, this.ttl);
-      if (result === 'you_are_not_the_leader') {
-        if (this.renewId) {
-          clearInterval(this.renewId);
-        }
-        this.waitId = setTimeout(() => {
-          this.elect();
-        }, this.wait);
-        this.emit(LeaderEvent.revoked);
-      }
-    } catch (err) {
-      this.emit(LeaderEvent.error, err);
-    }
-  }
-}
-
-export default Leader;
-export { LeaderEvent };

src/utils/priorities.ts

@@ -9,7 +9,7 @@ import { getRedisClient, RedisClient } from 'turtle/utils/redis';
 export const NORMAL = 'normalPriority';
 export const HIGH = 'highPriority';
 
-export enum TurtleMode {
+export enum TurtleModeLabels {
   Normal = 'normal',
   High = 'high',
   HighOnly = 'highOnly',
@@ -100,15 +100,13 @@ async function getConfiguration(currentRedisClient: any) {
 
 export async function getLabeledConfiguration(currentRedisClient?: any) {
   const configuration = await getConfiguration(currentRedisClient);
-  return configuration.map((i: string[]) => labelConfiguration(i));
-}
-
-export function labelConfiguration(configuration: string[]): TurtleMode {
-  if (isEqual(configuration, NORMAL_CONFIGURATION)) {
-    return TurtleMode.Normal;
-  } else if (isEqual(configuration, HIGH_CONFIGURATION)) {
-    return TurtleMode.High;
-  } else {
-    return TurtleMode.HighOnly;
-  }
+  return configuration.map((i: string[]) => {
+    if (isEqual(i, NORMAL_CONFIGURATION)) {
+      return TurtleModeLabels.Normal;
+    } else if (isEqual(i, HIGH_CONFIGURATION)) {
+      return TurtleModeLabels.High;
+    } else {
+      return TurtleModeLabels.HighOnly;
+    }
+  });
 }

src/utils/redis.ts

@@ -12,27 +12,18 @@ export enum RedisClient {
   Configuration = 'REDIS_CLIENT_CONFIGURATION',
 }
 
-interface IClientConfig {
-  [key: string]: {
-    url: string;
-    caCertificate?: string;
-  };
-}
+interface IClientConfig { [key: string]: string; }
 
-const clientConfigs: IClientConfig = {
-  [RedisClient.Subscriber]: config.redis.main,
-  [RedisClient.Default]: config.redis.main,
-  [RedisClient.Configuration]: config.redis.turtle,
+const clientToUrl: IClientConfig = {
+  [RedisClient.Subscriber]: config.redis.url,
+  [RedisClient.Default]: config.redis.url,
+  [RedisClient.Configuration]: config.redis.configUrl,
 };
 
 export function connect(timeoutMs: number, type: string): Promise<any> {
   return new Promise((resolve, reject) => {
-    const { url, caCertificate } = clientConfigs[type];
-    const redisClient = new Redis(url, {
+    const redisClient = new Redis(clientToUrl[type], {
       maxRetriesPerRequest: 2,
-      ...caCertificate && {
-        tls: { ca: caCertificate },
-      },
     });
     const timer = setTimeout(() => reject(new Error('Timeout at connecting to Redis')), timeoutMs);
     redisClient.on('ready', () => {

src/utils/versions.ts

@@ -10,7 +10,7 @@ async function setSupportedSdkVersions(platform: string, sdkVersions: string[])
     method: 'POST',
     uri: href,
     headers: {
-      'secret-token': config.www.secretToken,
+      'secret-token': config.www.sdkVersionsSecretToken,
     },
     body: {
       platform,
@@ -26,7 +26,7 @@ async function setTurtleVersion(version: string) {
     method: 'POST',
     uri: href,
     headers: {
-      'secret-token': config.www.secretToken,
+      'secret-token': config.www.sdkVersionsSecretToken,
     },
     body: {
       version,
@@ -38,9 +38,9 @@ async function setTurtleVersion(version: string) {
 function resolveWWWEndpoint() {
   const currentEnv = config.deploymentEnv;
   if (currentEnv === 'production') {
-    return 'https://exp.host';
+    return 'https://expo.io';
   } else if (currentEnv === 'staging') {
-    return 'https://staging.exp.host';
+    return 'https://staging.expo.io';
   } else {
     return 'http://127.0.0.1:3000';
   }

src/utils/www.ts

@@ -1,56 +0,0 @@
-import { URL } from 'url';
-
-import request from 'request-promise';
-
-import config from 'turtle/config';
-import { saveUpdateFailure } from 'turtle/updatesManager';
-
-async function sendBuildStatusUpdate(buildId: string, updateParams: object) {
-  const { href } = new URL(`/--/api/v2/turtle-legacy-builds/${buildId}`, resolveWWWEndpoint());
-  try {
-    await request({
-      method: 'PUT',
-      uri: href,
-      headers: {
-        'secret-token': config.www.secretToken,
-      },
-      body: updateParams,
-      json: true,
-    });
-  } catch (err) {
-    await saveUpdateFailure(buildId, 'build', updateParams);
-  }
-}
-
-async function sendCredentialsUpdate(buildId: string, platform: 'android' | 'ios', updateParams: object) {
-  const { href } = new URL(`/--/api/v2/turtle-legacy-builds/${buildId}/credentials`, resolveWWWEndpoint());
-  try {
-    await request({
-      method: 'PUT',
-      uri: href,
-      headers: {
-        'secret-token': config.www.secretToken,
-      },
-      body: {
-        platform,
-        ...updateParams,
-      },
-      json: true,
-    });
-  } catch (err) {
-    await saveUpdateFailure(buildId, 'credentials', updateParams);
-  }
-}
-
-function resolveWWWEndpoint() {
-  const currentEnv = config.deploymentEnv;
-  if (currentEnv === 'production') {
-    return 'https://exp.host';
-  } else if (currentEnv === 'staging') {
-    return 'https://staging.exp.host';
-  } else {
-    return 'http://127.0.0.1:3000';
-  }
-}
-
-export { sendBuildStatusUpdate, sendCredentialsUpdate };