feat: file options

Signed-off-by: Sakul <sakulbudhathoki977@gmail.com>
berty · Dec 14, 2020 · 6139afa · 6139afa
1 parent 93d8ddd
commit 6139afa
Show file tree

Hide file tree

Showing 326 changed files with 25,612 additions and 17,481 deletions.
diff --git a/.crowdin.yml b/.crowdin.yml
@@ -5,14 +5,15 @@
 "commit_message": 'fix(i18n): new %language% translations
 
 
-Signed-off-by: Crowdin Bot <bot@crowdin.com>'
+Signed-off-by: Crowdin Bot <bot@crowdin.com>
+'
 
 "append_commit_message": false
 "preserve_hierarchy": true
 
 files: [
  {
-  "source" : "/js/packages/berty-i18n/locale/en/messages.json",
-  "translation" : "/js/packages/berty-i18n/locale/%two_letters_code%/%original_file_name%",
+  "source" : "/js/packages/berty-i18n/locale/en-US/messages.json",
+  "translation" : "/js/packages/berty-i18n/locale/%locale%/%original_file_name%",
  }
 ]
diff --git a/.dockerignore b/.dockerignore
@@ -16,3 +16,4 @@ js/
 out/
 profile.out
 vendor/
+tool/
diff --git a/.gitattributes b/.gitattributes
@@ -20,7 +20,7 @@ gen.sum linguist-generated merge=ours -diff
 *.pb.gw.go linguist-generated merge=ours -diff
 *.pb.js linguist-generated merge=ours -diff
 *pb_test.go linguist-generated merge=ours -diff
-docs/*/api.md linguist-generated merge=ours -diff
+docs/apis/*types.md linguist-generated merge=ours -diff
 *.swagger.json linguist-generated merge=ours -diff
 api/*.yaml linguist-generated merge=ours -diff
 /js/packages/store/protocol/grpc-web-gen/** linguist-generated merge=ours -diff

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -40,7 +40,7 @@ jobs:
           go-version: 1.15.x
 
       - name: Setup Node
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: 14.x
 
@@ -79,7 +79,7 @@ jobs:
           CI: "true"
         run: |
           make android.app_deps
-          (cd android && ./gradlew app:bundleReleaseYolo)
+          (yarn jetify && cd android && ./gradlew app:bundleReleaseYolo)
           ### TODO: move this part on Yolo and use release keystore ###
           mkdir -p $HOME/.android
           cp android/app/debug.keystore $HOME/.android

diff --git a/.github/workflows/dependent-issues.yml b/.github/workflows/dependent-issues.yml
@@ -0,0 +1,36 @@
+name: Dependent Issues
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+      - reopened
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
+  schedule:
+    - cron: "42 2 * * *" # schedule daily check
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: z0al/dependent-issues@v1
+        env:
+          # (Required) The token to use to make API calls to GitHub.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # (Optional) The label to use to mark dependent issues
+          label: dependent
+
+          # (Optional) Enable checking for dependencies in issues. Enable by
+          # setting the value to "on". Default "off"
+          check_issues: off
+
+          # (Optional) A comma-separated list of keywords. Default
+          # "depends on, blocked by"
+          keywords: depends on, blocked by
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -31,7 +31,8 @@ on:
 # * store performance logs for comparison
 
 jobs:
-  integration:
+  integration-prod:
+    if: github.event_name == 'schedule'
     name: "integration (production)"
     runs-on: ubuntu-latest
     env:
@@ -72,26 +73,43 @@ jobs:
         with:
           path: ./cache
           key: ${{runner.os}}-integration-benchmark
-      - name: Store benchmark result
-        if: github.event_name == 'push' || github.event_name == 'pull_request'
-        uses: rhysd/github-action-benchmark@v1
-        with:
-          tool: 'googlecpp'
-          output-file-path: benchmark_result.json
-          external-data-json-path: ./cache/benchmark-data.json
-          fail-on-alert: false
-          comment-on-alert: true
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          #alert-comment-cc-users: '@foobar'
-          #auto-push: true
       - name: Discord notification
-        if: github.event_name == 'schedule' && failure()
+        if: failure()
         env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_DEV_WEBHOOK }}
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_PROD_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.0
         with:
           args: 'Integration failed, see ${{ steps.url.outputs.runUrl }}'
-  doctor:
+
+  integration-local:
+    if: github.event_name == 'push' || github.event_name == 'pull_request'
+    name: "integration (local)"
+    runs-on: ubuntu-latest
+    env:
+      OS: ubuntu-latest
+      GOLANG: 1.15.x
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Build Docker images
+        working-directory: tool/compose-integration
+        run: docker-compose build
+      - name: Run integration test suite
+        working-directory: tool/compose-integration
+        run: make
+      #- name: Store benchmark result
+      #  uses: rhysd/github-action-benchmark@v1
+      #  with:
+      #    tool: 'googlecpp'
+      #    output-file-path: benchmark_result.json
+      #    external-data-json-path: ./cache/benchmark-data.json
+      #    fail-on-alert: false
+      #    comment-on-alert: true
+      #    github-token: ${{secrets.GITHUB_TOKEN}}
+      #    #alert-comment-cc-users: '@foobar'
+      #    #auto-push: true
+
+  doctor-production:
     name: "doctor (production)"
     runs-on: ubuntu-latest
     env:
@@ -127,7 +145,7 @@ jobs:
       - name: Discord notification
         if: github.event_name == 'schedule' && failure()
         env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_DEV_WEBHOOK }}
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_PROD_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.0
         with:
           args: 'Doctor failed, see ${{ steps.url.outputs.runUrl }}'
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -45,7 +45,7 @@ jobs:
           go-version: 1.15.3
 
       - name: Setup Node
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: 14.x
 

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Cache Node.js modules

diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml
@@ -132,7 +132,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: ${{ matrix.node-version }}
 

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ ARG             VCS_REF
 ARG             VERSION
 
 # build
-FROM            golang:1.15.5-alpine as builder
+FROM            golang:1.15.6-alpine as builder
 RUN             apk add --no-cache git gcc musl-dev make
 ENV             GO111MODULE=on
 WORKDIR         /go/src/berty.tech/berty
@@ -29,6 +29,6 @@ LABEL           org.label-schema.build-date=$BUILD_DATE \
                 org.label-schema.schema-version="1.0" \
                 org.label-schema.cmd="docker run -i -t --rm bertytech/berty" \
                 org.label-schema.help="docker exec -it $CONTAINER berty --help"
-COPY            --from=builder /go/bin/berty /go/bin/rdvp /go/bin/betabot /go/bin/testbot /bin/
+COPY            --from=builder /go/bin/berty /go/bin/rdvp /go/bin/betabot /go/bin/testbot /go/bin/berty-integration /bin/
 ENTRYPOINT      ["/bin/berty"]
 #CMD            []
diff --git a/api/bertyprotocol.proto b/api/bertyprotocol.proto
diff --git a/api/bertyreplication.proto b/api/bertyreplication.proto
@@ -2,13 +2,12 @@ syntax = "proto3";
 
 package berty.protocol.v1;
 
-import "bertytypes.proto";
+import "protocoltypes.proto";
 
 option go_package = "berty.tech/berty/go/pkg/bertyprotocol";
 
 // ReplicationService
 service ReplicationService {
   // ReplicateGroup
-  rpc ReplicateGroup(types.v1.ReplicationServiceReplicateGroup.Request) returns (types.v1.ReplicationServiceReplicateGroup.Reply);
+  rpc ReplicateGroup(protocol.v1.ReplicationServiceReplicateGroup.Request) returns (protocol.v1.ReplicationServiceReplicateGroup.Reply);
 }
-
diff --git a/api/errcode.proto b/api/errcode.proto
@@ -32,6 +32,12 @@ enum ErrCode {
   ErrDeserialization = 104;
   ErrStreamRead = 105;
   ErrStreamWrite = 106;
+  ErrStreamTransform = 110;
+  ErrStreamSendAndClose = 111;
+  ErrStreamHeaderWrite = 112;
+  ErrStreamHeaderRead = 115;
+  ErrStreamSink = 113;
+  ErrStreamCloseAndRecv = 114;
   ErrMissingMapKey = 107;
   ErrDBWrite = 108;
   ErrDBRead = 109;
@@ -129,6 +135,7 @@ enum ErrCode {
   //------------------
 
   ErrMessengerInvalidDeepLink = 2000;
+  ErrMessengerDeepLinkRequiresPassphrase = 2001;
 
   // DB errors
 
@@ -147,8 +154,8 @@ enum ErrCode {
   ErrReplayProcessGroupMessage = 2201;
 
   // API internals errors
-  ErrPrepareAttachment = 2300;
-  ErrRetrieveAttachment = 2301;
+  ErrAttachmentPrepare = 2300;
+  ErrAttachmentRetrieve = 2301;
   ErrProtocolSend = 2302;
 
   // -----------------