chore(release): publish new version

- @standardnotes/api-gateway@1.49.0
 - @standardnotes/proxy-server@1.1.0

.dockerignore

@@ -0,0 +1,13 @@
+dist
+coverage
+
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/unplugged
+!.yarn/sdks
+!.yarn/versions
+
+data/*

.env.sample

@@ -1,6 +1,17 @@
+######
+# DB #
+######
+
+DB_HOST=db
 DB_PORT=3306
 DB_USERNAME=std_notes_user
 DB_PASSWORD=changeme123
 DB_DATABASE=standard_notes_db
+DB_DEBUG_LEVEL=all
+
+#########
+# CACHE #
+#########
 
 REDIS_PORT=6379
+REDIS_HOST=cache

.github/ci.env

@@ -0,0 +1,21 @@
+PUBLIC_FILES_SERVER_URL=http://localhost:3125
+DB_HOST=db
+DB_USERNAME=std_notes_user
+DB_PASSWORD=changeme123
+DB_DATABASE=standard_notes_db
+REDIS_PORT=6379
+REDIS_HOST=cache
+AUTH_SERVER_ACCESS_TOKEN_AGE=4
+AUTH_SERVER_REFRESH_TOKEN_AGE=10
+AUTH_SERVER_EPHEMERAL_SESSION_AGE=300
+SYNCING_SERVER_REVISIONS_FREQUENCY=5
+AUTH_SERVER_LOG_LEVEL=debug
+SYNCING_SERVER_LOG_LEVEL=debug
+FILES_SERVER_LOG_LEVEL=debug
+REVISIONS_SERVER_LOG_LEVEL=debug
+API_GATEWAY_LOG_LEVEL=debug
+
+MYSQL_DATABASE=standard_notes_db
+MYSQL_USER=std_notes_user
+MYSQL_PASSWORD=changeme123
+MYSQL_ROOT_PASSWORD=changeme123

.github/dependabot.yml

@@ -55,6 +55,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/revisions"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/scheduler"
     schedule:
@@ -85,6 +90,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/websockets"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/workspace"
     schedule:

.github/workflows/analytics.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: analytics
       workspace_name: "@standardnotes/analytics"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/api-gateway.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: api-gateway
       workspace_name: "@standardnotes/api-gateway"
-      e2e_tag_parameter_name: api_gateway_image_tag
       deploy_worker: false
       package_path: packages/api-gateway
     secrets: inherit

.github/workflows/auth.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: auth
       workspace_name: "@standardnotes/auth-server"
-      e2e_tag_parameter_name: auth_image_tag
       package_path: packages/auth
     secrets: inherit
 

.github/workflows/common-docker-image.yml

@@ -6,9 +6,6 @@ on:
       service_name:
         required: true
         type: string
-      bundle_dir:
-        required: true
-        type: string
       package_path:
         required: true
         type: string
@@ -32,13 +29,17 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Create Bundle Dir
+      id: bundle-dir
+      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
+
     - name: Cache build
       id: cache-build
       uses: actions/cache@v3
       with:
         path: |
           packages/**/dist
-          ${{ inputs.bundle_dir }}
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -53,7 +54,7 @@ jobs:
 
     - name: Bundle
       if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ inputs.bundle_dir }}
+      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
 
     - name: Login to Docker Hub
       uses: docker/login-action@v2
@@ -85,8 +86,8 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ inputs.bundle_dir }}
-        file: ${{ inputs.bundle_dir }}/${{ inputs.package_path }}/Dockerfile
+        context: ${{ steps.bundle-dir.outputs.temp_dir }}
+        file: ${{ steps.bundle-dir.outputs.temp_dir }}/${{ inputs.package_path }}/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
         tags: |

.github/workflows/common-e2e.yml

@@ -0,0 +1,66 @@
+name: Reusable Run E2E Test Suite Workflow
+
+on:
+  workflow_call:
+    inputs:
+      snjs_image_tag:
+        type: string
+        default: latest
+        description: The Docker image tag used for SNJS container
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+
+    services:
+      snjs:
+        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
+        ports:
+        - 9001:9001
+      mock-event-publisher:
+        image: standardnotes/mock-event-publisher
+        ports:
+        - 3124:3000
+        env:
+          LOG_LEVEL: debug
+          NODE_ENV: production
+          VERSION: snjs-test
+          SNS_TOPIC_ARN: arn:aws:sns:us-east-1:000000000000:payments-local-topic
+          SNS_ENDPOINT: http://localstack:4566
+          SNS_DISABLE_SSL: true
+          SNS_SECRET_ACCESS_KEY: x
+          SNS_ACCESS_KEY_ID: x
+          SNS_AWS_REGION: us-east-1
+          NEW_RELIC_ENABLED: false
+        options: >-
+          --name "mock-event-publisher"
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Run Server
+      run: docker compose -f docker-compose.ci.yml up -d
+
+    - name: Wait for server to start
+      run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
+
+    - name: Connect external containers to self-hosted network
+      run: docker network connect --alias mock-event-publisher standardnotes_self_hosted mock-event-publisher
+
+    - name: Run E2E Test Suite
+      run: yarn dlx mocha-headless-chrome --timeout 1200000 -f http://localhost:9001/mocha/test.html

.github/workflows/common-self-hosting.yml

@@ -0,0 +1,47 @@
+name: Reusable Publish Docker Self Hosting Image Workflow
+
+on:
+  workflow_call:
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@master
+      with:
+        platforms: all
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@master
+
+    - name: Publish Docker image
+      uses: docker/build-push-action@v3
+      with:
+        builder: ${{ steps.buildx.outputs.name }}
+        context: .
+        file: Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: |
+          standardnotes/server:latest
+          standardnotes/server:${{ github.sha }}

.github/workflows/common-server-application.yml

@@ -17,9 +17,6 @@ on:
         required: false
         default: true
         type: boolean
-      e2e_tag_parameter_name:
-        required: false
-        type: string
       package_path:
         required: true
         type: string
@@ -36,177 +33,11 @@ on:
         required: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    outputs:
-      temp_dir: ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ steps.bundle-dir.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-  lint:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Lint
-      run: yarn lint:${{ inputs.service_name }}
-
-  test:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Test
-      run: yarn test ${{ inputs.package_path }}
-
-  e2e:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ needs.build.outputs.temp_dir }}
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@master
-      with:
-        platforms: all
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@master
-
-    - name: Publish Docker image for E2E testing
-      uses: docker/build-push-action@v3
-      with:
-        builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ needs.build.outputs.temp_dir }}
-        file: ${{ needs.build.outputs.temp_dir }}/${{ inputs.package_path }}/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: standardnotes/${{ inputs.service_name }}:${{ github.sha }}
-
-    - name: Run E2E test suite
-      uses: convictional/trigger-workflow-and-wait@master
-      with:
-        owner: standardnotes
-        repo: self-hosted
-        github_token: ${{ secrets.CI_PAT_TOKEN }}
-        workflow_file_name: testing-with-updating-client-and-server.yml
-        wait_interval: 30
-        client_payload: '{"${{ inputs.e2e_tag_parameter_name }}": "${{ github.sha }}"}'
-        propagate_failure: true
-        trigger_workflow: true
-        wait_workflow: true
-
   publish:
-    needs: [ build, test, lint, e2e ]
-
     name: Publish Docker Image
     uses: standardnotes/server/.github/workflows/common-docker-image.yml@main
     with:
       service_name: ${{ inputs.service_name }}
-      bundle_dir: ${{ needs.build.outputs.temp_dir }}
       package_path: ${{ inputs.package_path }}
       workspace_name: ${{ inputs.workspace_name }}
     secrets: inherit

.github/workflows/common-server-utility.yml

@@ -1,164 +0,0 @@
-name: Reusable Server Utility Workflow
-
-on:
-  workflow_call:
-    inputs:
-      service_name:
-        required: true
-        type: string
-      workspace_name:
-        required: true
-        type: string
-      deploy_web:
-        required: false
-        default: true
-        type: boolean
-      deploy_worker:
-        required: false
-        default: true
-        type: boolean
-      package_path:
-        required: true
-        type: string
-    secrets:
-      DOCKER_USERNAME:
-        required: true
-      DOCKER_PASSWORD:
-        required: true
-      CI_PAT_TOKEN:
-        required: true
-      AWS_ACCESS_KEY_ID:
-        required: true
-      AWS_SECRET_ACCESS_KEY:
-        required: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    outputs:
-      temp_dir: ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ steps.bundle-dir.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-  lint:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Lint
-      run: yarn lint:${{ inputs.service_name }}
-
-  test:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Test
-      run: yarn test ${{ inputs.package_path }}
-
-  publish:
-    needs: [ build, test, lint ]
-
-    name: Publish Docker Image
-    uses: standardnotes/server/.github/workflows/common-docker-image.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}
-      bundle_dir: ${{ needs.build.outputs.temp_dir }}
-      package_path: ${{ inputs.package_path }}
-      workspace_name: ${{ inputs.workspace_name }}
-    secrets: inherit
-
-  deploy-web:
-    if: ${{ inputs.deploy_web }}
-
-    needs: publish
-
-    name: Deploy Web
-    uses: standardnotes/server/.github/workflows/common-deploy.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}
-      docker_image: ${{ inputs.service_name }}:${{ github.sha }}
-    secrets: inherit
-
-  deploy-worker:
-    if: ${{ inputs.deploy_worker }}
-
-    needs: publish
-
-    name: Deploy Worker
-    uses: standardnotes/server/.github/workflows/common-deploy.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}-worker
-      docker_image: ${{ inputs.service_name }}:${{ github.sha }}
-    secrets: inherit

.github/workflows/e2e-test-suite.yml

@@ -0,0 +1,17 @@
+name: E2E Test Suite On Self Hosted Server
+
+on:
+  workflow_dispatch:
+    inputs:
+      snjs_image_tag:
+        type: string
+        default: latest
+        description: The Docker image tag used for SNJS container
+
+jobs:
+  e2e:
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    with:
+      snjs_image_tag: ${{ inputs.snjs_image_tag }}
+    secrets: inherit

.github/workflows/event-store.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: event-store
       workspace_name: "@standardnotes/event-store"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/files.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: files
       workspace_name: "@standardnotes/files-server"
-      e2e_tag_parameter_name: files_image_tag
       package_path: packages/files
     secrets: inherit
 

.github/workflows/pr.yml

@@ -89,18 +89,25 @@ jobs:
       run: yarn test
 
   e2e:
+    needs: build
+
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
+
+  legacy_e2e:
+    needs: build
+    name: Legacy E2E
     strategy:
       matrix:
-        application: 
+        application:
           - { "service_name": "api-gateway", "workspace_name": "@standardnotes/api-gateway", "e2e_tag_parameter_name": "api_gateway_image_tag", "package_path": "packages/api-gateway" }
-          - { "service_name": "auth", "workspace_name": "@standardnotes/auth-server", "e2e_tag_parameter_name": "auth_image_tag", "package_path": "packages/auth" }  
+          - { "service_name": "auth", "workspace_name": "@standardnotes/auth-server", "e2e_tag_parameter_name": "auth_image_tag", "package_path": "packages/auth" }
           - { "service_name": "files", "workspace_name": "@standardnotes/files-server", "e2e_tag_parameter_name": "files_image_tag", "package_path": "packages/files" }
           - { "service_name": "revisions", "workspace_name": "@standardnotes/revisions-server", "e2e_tag_parameter_name": "revisions_image_tag", "package_path": "packages/revisions"}
           - { "service_name": "syncing-server-js",  "workspace_name": "@standardnotes/syncing-server", "e2e_tag_parameter_name": "syncing_server_js_image_tag", "package_path": "packages/syncing-server" }
     runs-on: ubuntu-latest
 
-    needs: build
-
     steps:
     - uses: actions/checkout@v3
 
@@ -114,7 +121,7 @@ jobs:
       with:
         path: |
           packages/**/dist
-          ${{ needs.e2e.outputs.temp_dir }}
+          ${{ needs.legacy_e2e.outputs.temp_dir }}
         key: ${{ runner.os }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -135,12 +142,10 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@master
       with:
         platforms: all
-
     - name: Set up Docker Buildx
       id: buildx
       uses: docker/setup-buildx-action@master

.github/workflows/proxy.yml

@@ -0,0 +1,21 @@
+name: Proxy Server
+
+concurrency:
+  group: proxy_server
+  cancel-in-progress: true
+
+on:
+  push:
+    tags:
+      - '*standardnotes/proxy-server*'
+  workflow_dispatch:
+
+jobs:
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
+    with:
+      service_name: proxy
+      workspace_name: "@standardnotes/proxy-server"
+      package_path: packages/proxy
+    secrets: inherit

.github/workflows/publish.yml

@@ -5,9 +5,106 @@ on:
     branches: [ main ]
 
 jobs:
-  release_and_publish:
+  build:
     if: contains(github.event.head_commit.message, 'chore(release)') == false
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Build
+      run: yarn build
+
+  lint:
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+          ${{ needs.build.outputs.temp_dir }}
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Build
+      if: steps.cache-build.outputs.cache-hit != 'true'
+      run: yarn build
+
+    - name: Lint
+      run: yarn lint
+
+  test:
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+          ${{ needs.build.outputs.temp_dir }}
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Build
+      if: steps.cache-build.outputs.cache-hit != 'true'
+      run: yarn build
+
+    - name: Test
+      run: yarn test
+
+  e2e:
+    needs: build
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
+
+  publish-self-hosting:
+    needs: [ test, lint, e2e ]
+    name: Publish Self Hosting Docker Image
+    uses: standardnotes/server/.github/workflows/common-self-hosting.yml@main
+    secrets: inherit
+
+  publish-services:
+    needs: [ test, lint, e2e ]
+
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -34,7 +131,8 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
 
-      - name: Build packages
+      - name: Build
+        if: steps.cache-build.outputs.cache-hit != 'true'
         run: yarn build
 
       - name: Bump version
@@ -44,4 +142,3 @@ jobs:
         run: yarn publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.CI_NPM_TOKEN }}
-

.github/workflows/revisions.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: revisions
       workspace_name: "@standardnotes/revisions-server"
-      e2e_tag_parameter_name: revisions_image_tag
       package_path: packages/revisions
     secrets: inherit
 

.github/workflows/scheduler.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: scheduler
       workspace_name: "@standardnotes/scheduler-server"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/syncing-server.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: syncing-server-js
       workspace_name: "@standardnotes/syncing-server"
-      e2e_tag_parameter_name: syncing_server_js_image_tag
       package_path: packages/syncing-server
     secrets: inherit
 

.github/workflows/websockets.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: websockets
       workspace_name: "@standardnotes/websockets-server"
@@ -21,7 +21,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/workspace.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: workspace
       workspace_name: "@standardnotes/workspace-server"
@@ -21,7 +21,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -20,3 +20,8 @@ packages/files/uploads/*
 
 data/*
 !data/.gitkeep
+
+logs/*
+!logs/.gitkeep
+
+docker-compose.yml

.pnp.cjs

@@ -53,6 +53,10 @@ const RAW_RUNTIME_STATE =
       "name": "@standardnotes/predicates",\
       "reference": "workspace:packages/predicates"\
     },\
+    {\
+      "name": "@standardnotes/proxy-server",\
+      "reference": "workspace:packages/proxy"\
+    },\
     {\
       "name": "@standardnotes/revisions-server",\
       "reference": "workspace:packages/revisions"\
@@ -103,6 +107,7 @@ const RAW_RUNTIME_STATE =
     ["@standardnotes/event-store", ["workspace:packages/event-store"]],\
     ["@standardnotes/files-server", ["workspace:packages/files"]],\
     ["@standardnotes/predicates", ["workspace:packages/predicates"]],\
+    ["@standardnotes/proxy-server", ["workspace:packages/proxy"]],\
     ["@standardnotes/revisions-server", ["workspace:packages/revisions"]],\
     ["@standardnotes/scheduler-server", ["workspace:packages/scheduler"]],\
     ["@standardnotes/security", ["workspace:packages/security"]],\
@@ -4257,8 +4262,6 @@ const RAW_RUNTIME_STATE =
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.48.2"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["reflect-metadata", "npm:0.1.13"],\
-          ["shallow-equal-object", "npm:1.1.1"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
           ["uuid", "npm:9.0.0"]\
@@ -4463,6 +4466,23 @@ const RAW_RUNTIME_STATE =
         "linkType": "SOFT"\
       }]\
     ]],\
+    ["@standardnotes/proxy-server", [\
+      ["workspace:packages/proxy", {\
+        "packageLocation": "./packages/proxy/",\
+        "packageDependencies": [\
+          ["@standardnotes/proxy-server", "workspace:packages/proxy"],\
+          ["@types/http-proxy", "npm:1.17.9"],\
+          ["@types/newrelic", "npm:9.4.0"],\
+          ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.48.2"],\
+          ["eslint", "npm:8.32.0"],\
+          ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
+          ["http-proxy", "npm:1.18.1"],\
+          ["newrelic", "npm:9.8.0"],\
+          ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"]\
+        ],\
+        "linkType": "SOFT"\
+      }]\
+    ]],\
     ["@standardnotes/responses", [\
       ["npm:1.13.4", {\
         "packageLocation": "./.yarn/cache/@standardnotes-responses-npm-1.13.4-70cbd72561-4803ee14bd.zip/node_modules/@standardnotes/responses/",\
@@ -4507,7 +4527,6 @@ const RAW_RUNTIME_STATE =
           ["@types/dotenv", "npm:8.2.0"],\
           ["@types/express", "npm:4.17.14"],\
           ["@types/inversify-express-utils", "npm:2.0.0"],\
-          ["@types/ioredis", "npm:5.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:9.4.0"],\
           ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.48.2"],\
@@ -4516,17 +4535,15 @@ const RAW_RUNTIME_STATE =
           ["eslint", "npm:8.32.0"],\
           ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
           ["express", "npm:4.18.2"],\
-          ["helmet", "npm:6.0.0"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.8.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
-          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
+          ["typeorm", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
           ["winston", "npm:3.8.2"]\
         ],\
@@ -4691,7 +4708,6 @@ const RAW_RUNTIME_STATE =
           ["@types/dotenv", "npm:8.2.0"],\
           ["@types/express", "npm:4.17.14"],\
           ["@types/inversify-express-utils", "npm:2.0.0"],\
-          ["@types/ioredis", "npm:5.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:9.0.1"],\
           ["@types/newrelic", "npm:9.4.0"],\
@@ -4708,7 +4724,6 @@ const RAW_RUNTIME_STATE =
           ["helmet", "npm:6.0.0"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:9.0.0"],\
           ["mysql2", "npm:3.0.1"],\
@@ -4718,7 +4733,7 @@ const RAW_RUNTIME_STATE =
           ["prettyjson", "npm:1.2.5"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
-          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
+          ["typeorm", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
           ["ua-parser-js", "npm:1.0.32"],\
           ["uuid", "npm:9.0.0"],\
@@ -5083,6 +5098,16 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["@types/http-proxy", [\
+      ["npm:1.17.9", {\
+        "packageLocation": "./.yarn/cache/@types-http-proxy-npm-1.17.9-fa2f5ce316-3ee577db82.zip/node_modules/@types/http-proxy/",\
+        "packageDependencies": [\
+          ["@types/http-proxy", "npm:1.17.9"],\
+          ["@types/node", "npm:18.0.3"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
     ["@types/inversify-express-utils", [\
       ["npm:2.0.0", {\
         "packageLocation": "./.yarn/cache/@types-inversify-express-utils-npm-2.0.0-e78182955d-9841bfddff.zip/node_modules/@types/inversify-express-utils/",\
@@ -9321,6 +9346,18 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["http-proxy", [\
+      ["npm:1.18.1", {\
+        "packageLocation": "./.yarn/cache/http-proxy-npm-1.18.1-a313c479c5-5d681e4231.zip/node_modules/http-proxy/",\
+        "packageDependencies": [\
+          ["http-proxy", "npm:1.18.1"],\
+          ["eventemitter3", "npm:4.0.7"],\
+          ["follow-redirects", "virtual:4b63965ac1b2157b91a1875529bea3b0bbc3068d3676d1bef28bff5cf6689705374a86cc3832f95ba8d934037a93cc0e09c3662c13ca0e747800d7ca279a53c0#npm:1.15.2"],\
+          ["requires-port", "npm:1.0.0"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
     ["http-proxy-agent", [\
       ["npm:5.0.0", {\
         "packageLocation": "./.yarn/cache/http-proxy-agent-npm-5.0.0-7f1f121b83-b59a9b4bdd.zip/node_modules/http-proxy-agent/",\
@@ -13013,6 +13050,15 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
+    ["requires-port", [\
+      ["npm:1.0.0", {\
+        "packageLocation": "./.yarn/cache/requires-port-npm-1.0.0-fd036b488a-28a1064f04.zip/node_modules/requires-port/",\
+        "packageDependencies": [\
+          ["requires-port", "npm:1.0.0"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
     ["resolve", [\
       ["patch:resolve@npm%3A1.22.1#optional!builtin<compat/resolve>::version=1.22.1&hash=07638b", {\
         "packageLocation": "./.yarn/cache/resolve-patch-bc26c25fbb-a6f214b97d.zip/node_modules/resolve/",\
@@ -13341,15 +13387,6 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["shallow-equal-object", [\
-      ["npm:1.1.1", {\
-        "packageLocation": "./.yarn/cache/shallow-equal-object-npm-1.1.1-a41b289b2e-9e5e0cd10b.zip/node_modules/shallow-equal-object/",\
-        "packageDependencies": [\
-          ["shallow-equal-object", "npm:1.1.1"]\
-        ],\
-        "linkType": "HARD"\
-      }]\
-    ]],\
     ["shebang-command", [\
       ["npm:2.0.0", {\
         "packageLocation": "./.yarn/cache/shebang-command-npm-2.0.0-eb2b01921d-5907a8d5fa.zip/node_modules/shebang-command/",\
@@ -14489,6 +14526,100 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
+      ["virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10", {\
+        "packageLocation": "./.yarn/__virtual__/typeorm-virtual-6480afe6bc/0/cache/typeorm-npm-0.3.10-4667857f33-749e1a6777.zip/node_modules/typeorm/",\
+        "packageDependencies": [\
+          ["typeorm", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10"],\
+          ["@google-cloud/spanner", null],\
+          ["@sap/hana-client", null],\
+          ["@sqltools/formatter", "npm:1.2.5"],\
+          ["@types/better-sqlite3", null],\
+          ["@types/google-cloud__spanner", null],\
+          ["@types/hdb-pool", null],\
+          ["@types/ioredis", null],\
+          ["@types/mongodb", null],\
+          ["@types/mssql", null],\
+          ["@types/mysql2", null],\
+          ["@types/oracledb", null],\
+          ["@types/pg", null],\
+          ["@types/pg-native", null],\
+          ["@types/pg-query-stream", null],\
+          ["@types/redis", null],\
+          ["@types/sap__hana-client", null],\
+          ["@types/sql.js", null],\
+          ["@types/sqlite3", null],\
+          ["@types/ts-node", null],\
+          ["@types/typeorm-aurora-data-api-driver", null],\
+          ["app-root-path", "npm:3.1.0"],\
+          ["better-sqlite3", null],\
+          ["buffer", "npm:6.0.3"],\
+          ["chalk", "npm:4.1.2"],\
+          ["cli-highlight", "npm:2.1.11"],\
+          ["date-fns", "npm:2.29.3"],\
+          ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
+          ["dotenv", "npm:16.0.3"],\
+          ["glob", "npm:7.2.3"],\
+          ["hdb-pool", null],\
+          ["ioredis", null],\
+          ["js-yaml", "npm:4.1.0"],\
+          ["mkdirp", "npm:1.0.4"],\
+          ["mongodb", null],\
+          ["mssql", null],\
+          ["mysql2", "npm:3.0.1"],\
+          ["oracledb", null],\
+          ["pg", null],\
+          ["pg-native", null],\
+          ["pg-query-stream", null],\
+          ["redis", null],\
+          ["reflect-metadata", "npm:0.1.13"],\
+          ["sha.js", "npm:2.4.11"],\
+          ["sql.js", null],\
+          ["sqlite3", null],\
+          ["ts-node", null],\
+          ["tslib", "npm:2.4.0"],\
+          ["typeorm-aurora-data-api-driver", null],\
+          ["uuid", "npm:8.3.2"],\
+          ["xml2js", "npm:0.4.23"],\
+          ["yargs", "npm:17.5.1"]\
+        ],\
+        "packagePeers": [\
+          "@google-cloud/spanner",\
+          "@sap/hana-client",\
+          "@types/better-sqlite3",\
+          "@types/google-cloud__spanner",\
+          "@types/hdb-pool",\
+          "@types/ioredis",\
+          "@types/mongodb",\
+          "@types/mssql",\
+          "@types/mysql2",\
+          "@types/oracledb",\
+          "@types/pg-native",\
+          "@types/pg-query-stream",\
+          "@types/pg",\
+          "@types/redis",\
+          "@types/sap__hana-client",\
+          "@types/sql.js",\
+          "@types/sqlite3",\
+          "@types/ts-node",\
+          "@types/typeorm-aurora-data-api-driver",\
+          "better-sqlite3",\
+          "hdb-pool",\
+          "ioredis",\
+          "mongodb",\
+          "mssql",\
+          "mysql2",\
+          "oracledb",\
+          "pg-native",\
+          "pg-query-stream",\
+          "pg",\
+          "redis",\
+          "sql.js",\
+          "sqlite3",\
+          "ts-node",\
+          "typeorm-aurora-data-api-driver"\
+        ],\
+        "linkType": "HARD"\
+      }],\
       ["virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10", {\
         "packageLocation": "./.yarn/__virtual__/typeorm-virtual-a38286c9d5/0/cache/typeorm-npm-0.3.10-4667857f33-749e1a6777.zip/node_modules/typeorm/",\
         "packageDependencies": [\

Dockerfile

@@ -0,0 +1,47 @@
+FROM node:18.13.0-alpine
+
+ENV NODE_ENV production
+
+RUN apk add --update --no-cache \
+  openssl \
+  curl \
+  bash \
+  py3-pip
+
+RUN pip install --no-cache-dir --upgrade supervisor
+
+RUN mkdir -p /var/lib/server/logs
+
+COPY docker/supervisord.conf /etc/supervisord.conf
+
+COPY docker/docker-entrypoint.sh /usr/local/bin/
+
+COPY . /opt/server
+
+WORKDIR /opt/server
+
+RUN corepack enable
+
+RUN yarn install --immutable
+
+RUN CI=true yarn build
+
+RUN mkdir -p \
+  /opt/bundled/syncing-server \
+  /opt/bundled/auth \
+  /opt/bundled/files \
+  /opt/bundled/revisions \
+  /opt/bundled/api-gateway \
+  /opt/shared/uploads
+
+RUN yarn workspace @standardnotes/syncing-server bundle --no-compress --output-directory /opt/bundled/syncing-server
+RUN yarn workspace @standardnotes/auth-server bundle --no-compress --output-directory /opt/bundled/auth
+RUN yarn workspace @standardnotes/files-server bundle --no-compress --output-directory /opt/bundled/files
+RUN yarn workspace @standardnotes/revisions-server bundle --no-compress --output-directory /opt/bundled/revisions
+RUN yarn workspace @standardnotes/api-gateway bundle --no-compress --output-directory /opt/bundled/api-gateway
+
+WORKDIR /opt/bundled
+
+RUN rm -rf /opt/server
+
+ENTRYPOINT ["docker-entrypoint.sh"]

docker-compose.ci.yml

@@ -0,0 +1,56 @@
+services:
+  server:
+    build: .
+    env_file: .github/ci.env
+    container_name: server-ci
+    ports:
+      - 3123:3000
+      - 3125:3104
+    volumes:
+      - ./logs:/var/lib/server/logs
+    networks:
+      - standardnotes_self_hosted
+
+  localstack:
+    image: localstack/localstack:1.3
+    container_name: localstack-ci
+    expose:
+      - 4566
+    restart: unless-stopped
+    environment:
+      - SERVICES=sns,sqs
+      - HOSTNAME_EXTERNAL=localstack
+      - LS_LOG=warn
+    volumes:
+      - ./docker/localstack_bootstrap.sh:/etc/localstack/init/ready.d/localstack_bootstrap.sh
+    networks:
+      - standardnotes_self_hosted
+
+  db:
+    image: mysql:8
+    container_name: db-ci
+    env_file: .github/ci.env
+    expose:
+      - 3306
+    restart: unless-stopped
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+      - ./data/import:/docker-entrypoint-initdb.d
+    networks:
+      - standardnotes_self_hosted
+
+  cache:
+    image: redis:6.0-alpine
+    container_name: cache-ci
+    volumes:
+      - ./data/redis/:/data
+    expose:
+      - 6379
+    restart: unless-stopped
+    networks:
+      - standardnotes_self_hosted
+
+networks:
+  standardnotes_self_hosted:
+    name: standardnotes_self_hosted

docker-compose.example.yml

@@ -0,0 +1,61 @@
+services:
+  server:
+    image: standardnotes/server
+    env_file: .env
+    container_name: server_self_hosted
+    ports:
+      - 3000:3000
+      - 3125:3104
+    volumes:
+      - ./logs:/var/lib/server/logs
+      - ./uploads:/opt/bundled/files/packages/files/dist/uploads
+    networks:
+      - standardnotes_self_hosted
+
+  localstack:
+    image: localstack/localstack:1.3
+    container_name: localstack_self_hosted
+    expose:
+      - 4566
+    restart: unless-stopped
+    environment:
+      - SERVICES=sns,sqs
+      - HOSTNAME_EXTERNAL=localstack
+      - LS_LOG=warn
+    volumes:
+      - ./localstack_bootstrap.sh:/etc/localstack/init/ready.d/localstack_bootstrap.sh
+    networks:
+      - standardnotes_self_hosted
+
+  db:
+    image: mysql:8
+    container_name: db_self_hosted
+    environment:
+      - MYSQL_DATABASE=standard_notes_db
+      - MYSQL_USER=std_notes_user
+      - MYSQL_ROOT_PASSWORD=changeme123
+      - MYSQL_PASSWORD=changeme123
+    expose:
+      - 3306
+    restart: unless-stopped
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+      - ./data/import:/docker-entrypoint-initdb.d
+    networks:
+      - standardnotes_self_hosted
+
+  cache:
+    image: redis:6.0-alpine
+    container_name: cache_self_hosted
+    volumes:
+      - ./data/redis/:/data
+    expose:
+      - 6379
+    restart: unless-stopped
+    networks:
+      - standardnotes_self_hosted
+
+networks:
+  standardnotes_self_hosted:
+    name: standardnotes_self_hosted

docker-compose.yml

@@ -1,24 +0,0 @@
-version: '3.8'
-services:
-  db:
-    image: mysql:5.6
-    environment:
-      MYSQL_DATABASE: '${DB_DATABASE}'
-      MYSQL_USER: '${DB_USERNAME}'
-      MYSQL_PASSWORD: '${DB_PASSWORD}'
-      MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-    expose:
-      - ${DB_PORT}:3306
-    restart: unless-stopped
-    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8 --collation-server=utf8_general_ci
-    volumes:
-      - ./data/mysql:/var/lib/mysql
-      - ./data/import:/docker-entrypoint-initdb.d
-
-  cache:
-    image: redis:6.0-alpine
-    volumes:
-      - ./data/redis/:/data
-    expose:
-      - ${REDIS_PORT}:6379
-    restart: unless-stopped

docker/docker-entrypoint.sh

@@ -0,0 +1,365 @@
+#!/bin/bash
+
+# Setup environment variables
+
+#########
+# PORTS #
+#########
+
+export API_GATEWAY_PORT=3000
+
+if [ -z "$SYNCING_SERVER_PORT" ]; then
+  export SYNCING_SERVER_PORT=3101
+fi
+
+if [ -z "$AUTH_SERVER_PORT" ]; then
+  export AUTH_SERVER_PORT=3103
+fi
+
+export FILES_SERVER_PORT=3104
+
+if [ -z "$REVISIONS_SERVER_PORT" ]; then
+  export REVISIONS_SERVER_PORT=3105
+fi
+
+######
+# DB #
+######
+
+if [ -z "$DB_HOST" ]; then
+  export DB_HOST="db"
+fi
+if [ -z "$DB_PORT" ]; then
+  export DB_PORT="3306"
+fi
+if [ -z "$DB_USERNAME" ]; then
+  export DB_USERNAME="std_notes_user"
+fi
+if [ -z "$DB_PASSWORD" ]; then
+  export DB_PASSWORD=$(openssl rand -hex 32)
+fi
+if [ -z "$DB_DATABASE" ]; then
+  export DB_DATABASE="standard_notes_db"
+fi
+if [ -z "$DB_DEBUG_LEVEL" ]; then
+  export DB_DEBUG_LEVEL="all"
+fi
+export DB_MIGRATIONS_PATH="dist/migrations/*.js"
+
+#########
+# CACHE #
+#########
+
+if [ -z "$REDIS_PORT" ]; then
+  export REDIS_PORT=6379
+fi
+
+if [ -z "$REDIS_HOST" ]; then
+  export REDIS_HOST="cache"
+fi
+
+export REDIS_URL="redis://$REDIS_HOST"
+
+##########
+# SHARED #
+##########
+
+if [ -z "$AUTH_JWT_SECRET" ]; then
+  export AUTH_JWT_SECRET=$(openssl rand -hex 32)
+fi
+
+if [ -z "$VALET_TOKEN_SECRET" ]; then
+  export VALET_TOKEN_SECRET=$(openssl rand -base64 32)
+fi
+
+########
+# AUTH #
+########
+
+if [ -z "$AUTH_SERVER_LOG_LEVEL" ]; then
+  export AUTH_SERVER_LOG_LEVEL="info"
+fi
+export AUTH_SERVER_NODE_ENV="production"
+export AUTH_SERVER_VERSION="local"
+
+if [ -z "$AUTH_SERVER_AUTH_JWT_TTL" ]; then
+  export AUTH_SERVER_AUTH_JWT_TTL=60000
+fi
+
+export AUTH_SERVER_JWT_SECRET=$AUTH_JWT_SECRET
+export AUTH_SERVER_LEGACY_JWT_SECRET=$(openssl rand -hex 32)
+
+export AUTH_SERVER_NEW_RELIC_ENABLED=false
+export AUTH_SERVER_NEW_RELIC_APP_NAME=Auth
+export AUTH_SERVER_NEW_RELIC_NO_CONFIG_FILE=true
+
+if [ -z "$AUTH_SERVER_DISABLE_USER_REGISTRATION" ]; then
+  export AUTH_SERVER_DISABLE_USER_REGISTRATION=false
+fi
+
+if [ -z "$AUTH_SERVER_PSEUDO_KEY_PARAMS_KEY" ]; then
+  export AUTH_SERVER_PSEUDO_KEY_PARAMS_KEY=$(openssl rand -hex 32)
+fi
+
+if [ -z "$AUTH_SERVER_ACCESS_TOKEN_AGE" ]; then
+  export AUTH_SERVER_ACCESS_TOKEN_AGE=5184000
+fi
+if [ -z "$AUTH_SERVER_REFRESH_TOKEN_AGE" ]; then
+  export AUTH_SERVER_REFRESH_TOKEN_AGE=31556926
+fi
+
+if [ -z "$AUTH_SERVER_MAX_LOGIN_ATTEMPTS" ]; then
+  export AUTH_SERVER_MAX_LOGIN_ATTEMPTS=6
+fi
+if [ -z "$AUTH_SERVER_FAILED_LOGIN_LOCKOUT" ]; then
+  export AUTH_SERVER_FAILED_LOGIN_LOCKOUT=3600
+fi
+
+if [ -z "$AUTH_SERVER_EPHEMERAL_SESSION_AGE" ]; then
+  export AUTH_SERVER_EPHEMERAL_SESSION_AGE=259200
+fi
+
+if [ -z "$AUTH_SERVER_ENCRYPTION_SERVER_KEY" ]; then
+  export AUTH_SERVER_ENCRYPTION_SERVER_KEY=$(openssl rand -hex 32)
+fi
+
+export AUTH_SERVER_SYNCING_SERVER_URL=http://localhost:$SYNCING_SERVER_PORT
+
+# File Uploads
+if [ -z "$AUTH_SERVER_VALET_TOKEN_TTL" ]; then
+  export AUTH_SERVER_VALET_TOKEN_TTL=7200
+fi
+
+# Localstack Setup
+if [ -z "$AUTH_SERVER_SNS_TOPIC_ARN" ]; then
+  export AUTH_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:auth-local-topic"
+fi
+if [ -z "$AUTH_SERVER_SNS_ENDPOINT" ]; then
+  export AUTH_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$AUTH_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export AUTH_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$AUTH_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export AUTH_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$AUTH_SERVER_SNS_AWS_REGION" ]; then
+  export AUTH_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$AUTH_SERVER_SQS_QUEUE_URL" ]; then
+  export AUTH_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/auth-local-queue"
+fi
+if [ -z "$AUTH_SERVER_SQS_AWS_REGION" ]; then
+  export AUTH_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$AUTH_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export AUTH_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$AUTH_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export AUTH_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$AUTH_SERVER_SQS_ENDPOINT" ]; then
+  export AUTH_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+# U2F Setup
+if [ -z "$AUTH_SERVER_U2F_RELYING_PARTY_ID" ]; then
+  export AUTH_SERVER_U2F_RELYING_PARTY_ID="localhost"
+fi
+if [ -z "$AUTH_SERVER_U2F_RELYING_PARTY_NAME" ]; then
+  export AUTH_SERVER_U2F_RELYING_PARTY_NAME="Standard Notes"
+fi
+if [ -z "$AUTH_SERVER_U2F_EXPECTED_ORIGIN" ]; then
+  export AUTH_SERVER_U2F_EXPECTED_ORIGIN="http://localhost,http://localhost:3001"
+fi
+if [ -z "$AUTH_SERVER_U2F_REQUIRE_USER_VERIFICATION" ]; then
+  export AUTH_SERVER_U2F_REQUIRE_USER_VERIFICATION=false
+fi
+
+printenv | grep AUTH_SERVER_ | sed 's/AUTH_SERVER_//g' > /opt/bundled/auth/packages/auth/.env
+
+##################
+# SYNCING SERVER #
+##################
+
+if [ -z "$SYNCING_SERVER_LOG_LEVEL" ]; then
+  export SYNCING_SERVER_LOG_LEVEL="info"
+fi
+export SYNCING_SERVER_NODE_ENV=production
+export SYNCING_SERVER_VERSION=local
+
+if [ -z "$SYNCING_SERVER_SNS_TOPIC_ARN" ]; then
+  export SYNCING_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:syncing-server-local-topic"
+fi
+if [ -z "$SYNCING_SERVER_SNS_ENDPOINT" ]; then
+  export SYNCING_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$SYNCING_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export SYNCING_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$SYNCING_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export SYNCING_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$SYNCING_SERVER_SNS_AWS_REGION" ]; then
+  export SYNCING_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$SYNCING_SERVER_SQS_QUEUE_URL" ]; then
+  export SYNCING_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/syncing-server-local-queue"
+fi
+if [ -z "$SYNCING_SERVER_SQS_AWS_REGION" ]; then
+  export SYNCING_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$SYNCING_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export SYNCING_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$SYNCING_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export SYNCING_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$SYNCING_SERVER_SQS_ENDPOINT" ]; then
+  export SYNCING_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+export SYNCING_SERVER_AUTH_SERVER_URL=http://localhost:$AUTH_SERVER_PORT
+
+if [ -z "$SYNCING_SERVER_EMAIL_ATTACHMENT_MAX_BYTE_SIZE" ]; then
+  export SYNCING_SERVER_EMAIL_ATTACHMENT_MAX_BYTE_SIZE=10485760
+fi
+
+if [ -z "$SYNCING_SERVER_REVISIONS_FREQUENCY" ]; then
+  export SYNCING_SERVER_REVISIONS_FREQUENCY=300
+fi
+
+export SYNCING_SERVER_NEW_RELIC_ENABLED=false
+export SYNCING_SERVER_NEW_RELIC_APP_NAME="Syncing Server JS"
+export SYNCING_SERVER_NEW_RELIC_NO_CONFIG_FILE=true
+
+export SYNCING_SERVER_FILE_UPLOAD_PATH="/opt/shared/uploads"
+
+printenv | grep SYNCING_SERVER_ | sed 's/SYNCING_SERVER_//g' > /opt/bundled/syncing-server/packages/syncing-server/.env
+
+
+################
+# FILES SERVER #
+################
+
+if [ -z "$FILES_SERVER_LOG_LEVEL" ]; then
+  export FILES_SERVER_LOG_LEVEL="info"
+fi
+export FILES_SERVER_NODE_ENV="production"
+export FILES_SERVER_VERSION="local"
+
+if [ -z "$FILES_SERVER_MAX_CHUNK_BYTES" ]; then
+  export FILES_SERVER_MAX_CHUNK_BYTES=100000000
+fi
+
+export FILES_SERVER_NEW_RELIC_ENABLED=false
+
+if [ -z "$FILES_SERVER_SNS_TOPIC_ARN" ]; then
+  export FILES_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:files-local-topic"
+fi
+if [ -z "$FILES_SERVER_SNS_ENDPOINT" ]; then
+  export FILES_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$FILES_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export FILES_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$FILES_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export FILES_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$FILES_SERVER_SNS_AWS_REGION" ]; then
+  export FILES_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$FILES_SERVER_SQS_QUEUE_URL" ]; then
+  export FILES_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/files-local-queue"
+fi
+if [ -z "$FILES_SERVER_SQS_AWS_REGION" ]; then
+  export FILES_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$FILES_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export FILES_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$FILES_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export FILES_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$FILES_SERVER_SQS_ENDPOINT" ]; then
+  export FILES_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+printenv | grep FILES_SERVER_ | sed 's/FILES_SERVER_//g' > /opt/bundled/files/packages/files/.env
+
+#############
+# REVISIONS #
+#############
+
+if [ -z "$REVISIONS_SERVER_LOG_LEVEL" ]; then
+  export REVISIONS_SERVER_LOG_LEVEL="info"
+fi
+
+export REVISIONS_SERVER_NODE_ENV="production"
+export REVISIONS_SERVER_VERSION="local"
+
+export REVISIONS_SERVER_NEW_RELIC_ENABLED=false
+
+if [ -z "$REVISIONS_SERVER_SNS_TOPIC_ARN" ]; then
+  export REVISIONS_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:revisions-server-local-topic"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_ENDPOINT" ]; then
+  export REVISIONS_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export REVISIONS_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export REVISIONS_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_AWS_REGION" ]; then
+  export REVISIONS_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_QUEUE_URL" ]; then
+  export REVISIONS_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/revisions-server-local-queue"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_AWS_REGION" ]; then
+  export REVISIONS_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export REVISIONS_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export REVISIONS_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_ENDPOINT" ]; then
+  export REVISIONS_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+printenv | grep REVISIONS_SERVER_ | sed 's/REVISIONS_SERVER_//g' > /opt/bundled/revisions/packages/revisions/.env
+
+###############
+# API GATEWAY #
+###############
+
+if [ -z "$API_GATEWAY_LOG_LEVEL" ]; then
+  export API_GATEWAY_LOG_LEVEL="info"
+fi
+export API_GATEWAY_NODE_ENV=production
+export API_GATEWAY_VERSION=local
+
+export API_GATEWAY_NEW_RELIC_ENABLED=false
+export API_GATEWAY_NEW_RELIC_APP_NAME="API Gateway"
+export API_GATEWAY_NEW_RELIC_NO_CONFIG_FILE=true
+
+export API_GATEWAY_SYNCING_SERVER_JS_URL=http://localhost:$SYNCING_SERVER_PORT
+export API_GATEWAY_AUTH_SERVER_URL=http://localhost:$AUTH_SERVER_PORT
+export API_GATEWAY_WORKSPACE_SERVER_URL=http://localhost:3004
+export API_GATEWAY_REVISIONS_SERVER_URL=http://localhost:3005
+if [ -z "$PUBLIC_FILES_SERVER_URL" ]; then
+  export PUBLIC_FILES_SERVER_URL=http://localhost:3125
+fi
+export API_GATEWAY_FILES_SERVER_URL=$PUBLIC_FILES_SERVER_URL
+
+printenv | grep API_GATEWAY_ | sed 's/API_GATEWAY_//g' > /opt/bundled/api-gateway/packages/api-gateway/.env
+
+# Run supervisor
+
+supervisord -c /etc/supervisord.conf
+
+exec "$@"

docker/is-available.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+WAIT_FOR_URL="$1"
+shift
+LOGS_PATH="$1"
+shift
+
+attempt=0
+while [ $attempt -le 120 ]; do
+    attempt=$(( $attempt + 1 ))
+    echo "# Waiting for all services to be up (attempt: $attempt) ..."
+    ping_api_gateway_result=`curl -s $WAIT_FOR_URL | grep "Welcome"`
+    if [ "$?" -eq "0" ]; then
+        sleep 2 # for warmup
+        echo "# All services are up!"
+        exit 0
+        break
+    fi
+    sleep 2
+done
+
+echo "# Failed to wait for all services to be up!"
+
+echo "# Errors:"
+tail -n 50 $LOGS_PATH/*.err
+
+echo "# Logs:"
+tail -n 50 $LOGS_PATH/*.log
+
+exit 1

docker/localstack_bootstrap.sh

@@ -0,0 +1,196 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo "configuring sns/sqs"
+echo "==================="
+LOCALSTACK_HOST=localhost
+AWS_REGION=us-east-1
+LOCALSTACK_DUMMY_ID=000000000000
+
+get_all_queues() {
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sqs list-queues
+}
+
+create_queue() {
+  local QUEUE_NAME_TO_CREATE=$1
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sqs create-queue --queue-name ${QUEUE_NAME_TO_CREATE}
+}
+
+get_all_topics() {
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sns list-topics
+}
+
+create_topic() {
+  local TOPIC_NAME_TO_CREATE=$1
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sns create-topic --name ${TOPIC_NAME_TO_CREATE}
+}
+
+link_queue_and_topic() {
+  local TOPIC_ARN_TO_LINK=$1
+  local QUEUE_ARN_TO_LINK=$2
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sns subscribe --topic-arn ${TOPIC_ARN_TO_LINK} --protocol sqs --notification-endpoint ${QUEUE_ARN_TO_LINK}
+}
+
+get_queue_arn_from_name() {
+  local QUEUE_NAME=$1
+  echo "arn:aws:sns:${AWS_REGION}:${LOCALSTACK_DUMMY_ID}:$QUEUE_NAME"
+}
+
+get_topic_arn_from_name() {
+  local TOPIC_NAME=$1
+  echo "arn:aws:sns:${AWS_REGION}:${LOCALSTACK_DUMMY_ID}:$TOPIC_NAME"
+}
+
+PAYMENTS_TOPIC_NAME="payments-local-topic"
+
+echo "creating topic $PAYMENTS_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${PAYMENTS_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+PAYMENTS_TOPIC_ARN=$(get_topic_arn_from_name $PAYMENTS_TOPIC_NAME)
+
+SYNCING_SERVER_TOPIC_NAME="syncing-server-local-topic"
+
+echo "creating topic $SYNCING_SERVER_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${SYNCING_SERVER_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+SYNCING_SERVER_TOPIC_ARN=$(get_topic_arn_from_name $SYNCING_SERVER_TOPIC_NAME)
+
+AUTH_TOPIC_NAME="auth-local-topic"
+
+echo "creating topic $AUTH_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${AUTH_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+AUTH_TOPIC_ARN=$(get_topic_arn_from_name $AUTH_TOPIC_NAME)
+
+FILES_TOPIC_NAME="files-local-topic"
+
+echo "creating topic $FILES_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${FILES_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+FILES_TOPIC_ARN=$(get_topic_arn_from_name $FILES_TOPIC_NAME)
+
+ANALYTICS_TOPIC_NAME="analytics-local-topic"
+
+echo "creating topic $ANALYTICS_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${ANALYTICS_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+ANALYTICS_TOPIC_ARN=$(get_topic_arn_from_name $ANALYTICS_TOPIC_NAME)
+
+REVISIONS_TOPIC_NAME="revisions-server-local-topic"
+
+echo "creating topic $REVISIONS_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${REVISIONS_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+REVISIONS_TOPIC_ARN=$(get_topic_arn_from_name $REVISIONS_TOPIC_NAME)
+
+SCHEDULER_TOPIC_NAME="scheduler-local-topic"
+
+echo "creating topic $SCHEDULER_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${SCHEDULER_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+SCHEDULER_TOPIC_ARN=$(get_topic_arn_from_name $SCHEDULER_TOPIC_NAME)
+
+WORKSPACE_TOPIC_NAME="workspace-local-topic"
+
+echo "creating topic $WORKSPACE_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${WORKSPACE_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+WORKSPACE_TOPIC_ARN=$(get_topic_arn_from_name $WORKSPACE_TOPIC_NAME)
+
+QUEUE_NAME="analytics-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+ANALYTICS_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $PAYMENTS_TOPIC_ARN to queue $ANALYTICS_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $PAYMENTS_TOPIC_ARN $ANALYTICS_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="auth-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+AUTH_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $PAYMENTS_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $PAYMENTS_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+echo "linking topic $AUTH_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+echo "linking topic $FILES_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $FILES_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="files-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+FILES_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $AUTH_TOPIC_ARN to queue $FILES_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $FILES_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="syncing-server-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+SYNCING_SERVER_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $SYNCING_SERVER_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $SYNCING_SERVER_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $SYNCING_SERVER_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $SYNCING_SERVER_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+echo "linking topic $AUTH_TOPIC_ARN to queue $SYNCING_SERVER_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $SYNCING_SERVER_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="revisions-server-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+REVISIONS_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $REVISIONS_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $REVISIONS_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="scheduler-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+SCHEDULER_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+QUEUE_NAME="workspace-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+WORKSPACE_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "all topics are:"
+echo "$(get_all_topics)"
+
+echo "all queues are:"
+echo "$(get_all_queues)"

docker/supervisord.conf

@@ -0,0 +1,75 @@
+[supervisord]
+nodaemon=true
+logfile=/var/lib/server/logs/supervisord.log
+
+[program:syncing-server]
+directory=/opt/bundled/syncing-server/packages/syncing-server
+command=/opt/bundled/syncing-server/packages/syncing-server/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/syncing-server.log
+stderr_logfile=/var/lib/server/logs/syncing-server.err
+
+[program:syncing-server-worker]
+directory=/opt/bundled/syncing-server/packages/syncing-server
+command=/opt/bundled/syncing-server/packages/syncing-server/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/syncing-server-worker.log
+stderr_logfile=/var/lib/server/logs/syncing-server-worker.err
+
+[program:auth]
+directory=/opt/bundled/auth/packages/auth
+command=/opt/bundled/auth/packages/auth/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/auth.log
+stderr_logfile=/var/lib/server/logs/auth.err
+
+[program:auth-worker]
+directory=/opt/bundled/auth/packages/auth
+command=/opt/bundled/auth/packages/auth/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/auth-worker.log
+stderr_logfile=/var/lib/server/logs/auth-worker.err
+
+[program:files]
+directory=/opt/bundled/files/packages/files
+command=/opt/bundled/files/packages/files/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/files.log
+stderr_logfile=/var/lib/server/logs/files.err
+
+[program:files-worker]
+directory=/opt/bundled/files/packages/files
+command=/opt/bundled/files/packages/files/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/files-worker.log
+stderr_logfile=/var/lib/server/logs/files-worker.err
+
+[program:revisions]
+directory=/opt/bundled/revisions/packages/revisions
+command=/opt/bundled/revisions/packages/revisions/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/revisions.log
+stderr_logfile=/var/lib/server/logs/revisions.err
+
+[program:revisions-worker]
+directory=/opt/bundled/revisions/packages/revisions
+command=/opt/bundled/revisions/packages/revisions/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/revisions-worker.log
+stderr_logfile=/var/lib/server/logs/revisions-worker.err
+
+[program:api-gateway]
+directory=/opt/bundled/api-gateway/packages/api-gateway
+command=/opt/bundled/api-gateway/packages/api-gateway/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/api-gateway.log
+stderr_logfile=/var/lib/server/logs/api-gateway.err

docker/wait-for.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+WAIT_FOR_HOST="$1"
+shift
+WAIT_FOR_PORT="$1"
+shift
+
+while ! nc -vz $WAIT_FOR_HOST $WAIT_FOR_PORT; do
+  echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is unavailable yet - waiting for it to start"
+  sleep 10
+done
+
+echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is up. Proceeding to startup."

package.json

@@ -12,30 +12,8 @@
   },
   "scripts": {
     "lint": "yarn workspaces foreach -p -j 10 --verbose run lint",
-    "lint:auth": "yarn workspace @standardnotes/auth-server lint",
-    "lint:scheduler": "yarn workspace @standardnotes/scheduler-server lint",
-    "lint:syncing-server-js": "yarn workspace @standardnotes/syncing-server lint",
-    "lint:files": "yarn workspace @standardnotes/files-server lint",
-    "lint:api-gateway": "yarn workspace @standardnotes/api-gateway lint",
-    "lint:event-store": "yarn workspace @standardnotes/event-store lint",
-    "lint:websockets": "yarn workspace @standardnotes/websockets-server lint",
-    "lint:workspace": "yarn workspace @standardnotes/workspace-server lint",
-    "lint:analytics": "yarn workspace @standardnotes/analytics lint",
-    "lint:revisions": "yarn workspace @standardnotes/revisions-server lint",
     "clean": "yarn workspaces foreach -p --verbose run clean",
     "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
-    "start:auth": "yarn workspace @standardnotes/auth-server start",
-    "start:auth-worker": "yarn workspace @standardnotes/auth-server worker",
-    "start:scheduler": "yarn workspace @standardnotes/scheduler-server worker",
-    "start:syncing-server": "yarn workspace @standardnotes/syncing-server start",
-    "start:syncing-server-worker": "yarn workspace @standardnotes/syncing-server worker",
-    "start:files": "yarn workspace @standardnotes/files-server start",
-    "start:files-worker": "yarn workspace @standardnotes/files-server worker",
-    "start:api-gateway": "yarn workspace @standardnotes/api-gateway start",
-    "start:websockets": "yarn workspace @standardnotes/websockets-server start",
-    "start:workspace": "yarn workspace @standardnotes/workspace-server start",
-    "start:analytics": "yarn workspace @standardnotes/analytics worker",
-    "start:revisions": "yarn workspace @standardnotes/revisions-server start",
     "release": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"",
     "publish": "lerna publish from-git --yes --no-verify-access --loglevel verbose",
     "postversion": "./scripts/push-tags-one-by-one.sh",

packages/analytics/.env.sample

@@ -13,7 +13,6 @@ DB_MIGRATIONS_PATH=dist/migrations/*.js
 ADMIN_EMAILS=test@standardnotes.com
 
 REDIS_URL=redis://cache
-REDIS_EVENTS_CHANNEL=events
 
 SNS_TOPIC_ARN=
 SNS_AWS_REGION=

packages/analytics/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.20.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.2...@standardnotes/analytics@2.20.3) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.20.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.1...@standardnotes/analytics@2.20.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.20.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.0...@standardnotes/analytics@2.20.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+# [2.20.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.16...@standardnotes/analytics@2.20.0) (2023-02-15)
+
+### Features
+
+* optimize memory on server utilities ([881a696](https://github.com/standardnotes/server/commit/881a6967aca57d68795af0792114f848ddddf120))
+
+## [2.19.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.15...@standardnotes/analytics@2.19.16) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.19.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.14...@standardnotes/analytics@2.19.15) (2023-01-30)
 
 ### Bug Fixes

packages/analytics/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/analytics
+
 ENTRYPOINT [ "/workspace/packages/analytics/docker/entrypoint.sh" ]
 
 CMD [ "start-worker" ]

packages/analytics/docker/entrypoint-report.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/report.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/analytics/docker/entrypoint-worker.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/analytics/docker/entrypoint.sh

@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-worker' )
     echo "[Docker] Starting Worker..."
-    yarn workspace @standardnotes/analytics worker
+    node docker/entrypoint-worker.js
     ;;
 
   'report' )
     echo "[Docker] Starting Usage Report Generation..."
-    yarn workspace @standardnotes/analytics report
+    node docker/entrypoint-report.js
     ;;
 
    * )

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.19.15",
+  "version": "2.20.3",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/analytics/src/Bootstrap/Container.ts

@@ -15,9 +15,6 @@ import TYPES from './Types'
 import { AppDataSource } from './DataSource'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
 import {
-  RedisDomainEventPublisher,
-  RedisDomainEventSubscriberFactory,
-  RedisEventMessageHandler,
   SNSDomainEventPublisher,
   SQSDomainEventSubscriberFactory,
   SQSEventMessageHandler,
@@ -95,22 +92,20 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      const snsConfig: SNSClientConfig = {
-        apiVersion: 'latest',
-        region: env.get('SNS_AWS_REGION', true),
-      }
-      if (env.get('SNS_ENDPOINT', true)) {
-        snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
-      }
-      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
-        snsConfig.credentials = {
-          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
-          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
-        }
-      }
-      container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
+    const snsConfig: SNSClientConfig = {
+      apiVersion: 'latest',
+      region: env.get('SNS_AWS_REGION', true),
     }
+    if (env.get('SNS_ENDPOINT', true)) {
+      snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
+    }
+    if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+      snsConfig.credentials = {
+        accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+        secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+      }
+    }
+    container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
 
     if (env.get('SQS_QUEUE_URL', true)) {
       const sqsConfig: SQSClientConfig = {
@@ -130,10 +125,9 @@ export class ContainerConfigLoader {
 
     // env vars
     container.bind(TYPES.REDIS_URL).toConstantValue(env.get('REDIS_URL'))
-    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN', true))
+    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN'))
     container.bind(TYPES.SNS_AWS_REGION).toConstantValue(env.get('SNS_AWS_REGION', true))
-    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL', true))
-    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
+    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL'))
     container.bind(TYPES.NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
     container.bind(TYPES.ADMIN_EMAILS).toConstantValue(env.get('ADMIN_EMAILS').split(','))
     container.bind(TYPES.MIXPANEL_TOKEN).toConstantValue(env.get('MIXPANEL_TOKEN', true))
@@ -149,17 +143,9 @@ export class ContainerConfigLoader {
       .toConstantValue(new RedisStatisticsStore(container.get(TYPES.PeriodKeyGenerator), container.get(TYPES.Redis)))
     container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      container
-        .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
-    } else {
-      container
-        .bind<RedisDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(
-          new RedisDomainEventPublisher(container.get(TYPES.Redis), container.get(TYPES.REDIS_EVENTS_CHANNEL)),
-        )
-    }
+    container
+      .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
+      .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
     if (env.get('MIXPANEL_TOKEN', true)) {
       container.bind<Mixpanel>(TYPES.MixpanelClient).toConstantValue(Mixpanel.init(env.get('MIXPANEL_TOKEN', true)))
     }
@@ -250,37 +236,22 @@ export class ContainerConfigLoader {
       ['STATISTIC_PERSISTENCE_REQUESTED', container.get(TYPES.StatisticPersistenceRequestedEventHandler)],
     ])
 
-    if (env.get('SQS_QUEUE_URL', true)) {
-      container
-        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-        .toConstantValue(
-          env.get('NEW_RELIC_ENABLED', true) === 'true'
-            ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
-            : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
-        )
-      container
-        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
-        .toConstantValue(
-          new SQSDomainEventSubscriberFactory(
-            container.get(TYPES.SQS),
-            container.get(TYPES.SQS_QUEUE_URL),
-            container.get(TYPES.DomainEventMessageHandler),
-          ),
-        )
-    } else {
-      container
-        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-        .toConstantValue(new RedisEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
-      container
-        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
-        .toConstantValue(
-          new RedisDomainEventSubscriberFactory(
-            container.get(TYPES.Redis),
-            container.get(TYPES.DomainEventMessageHandler),
-            container.get(TYPES.REDIS_EVENTS_CHANNEL),
-          ),
-        )
-    }
+    container
+      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+      .toConstantValue(
+        env.get('NEW_RELIC_ENABLED', true) === 'true'
+          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
+      )
+    container
+      .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
+      .toConstantValue(
+        new SQSDomainEventSubscriberFactory(
+          container.get(TYPES.SQS),
+          container.get(TYPES.SQS_QUEUE_URL),
+          container.get(TYPES.DomainEventMessageHandler),
+        ),
+      )
 
     return container
   }

packages/analytics/src/Bootstrap/Types.ts

@@ -9,7 +9,6 @@ const TYPES = {
   SNS_AWS_REGION: Symbol.for('SNS_AWS_REGION'),
   SQS_QUEUE_URL: Symbol.for('SQS_QUEUE_URL'),
   SQS_AWS_REGION: Symbol.for('SQS_AWS_REGION'),
-  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
   ADMIN_EMAILS: Symbol.for('ADMIN_EMAILS'),
   MIXPANEL_TOKEN: Symbol.for('MIXPANEL_TOKEN'),

packages/api-gateway/.env.sample

@@ -27,7 +27,6 @@ NEW_RELIC_LOG_ENABLED=false
 NEW_RELIC_LOG_LEVEL=info
 
 REDIS_URL=redis://cache
-REDIS_EVENTS_CHANNEL=events
 
 # (Optional) Caching Cross Service Tokens
 CROSS_SERVICE_TOKEN_CACHE_TTL=

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.49.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.3...@standardnotes/api-gateway@1.49.0) (2023-02-22)
+
+### Bug Fixes
+
+* **api-gateway:** proxy endpoint for request passing ([bc9182f](https://github.com/standardnotes/api-gateway/commit/bc9182f214c5386c5f1dd0bcbafbce34d413b6e8))
+
+### Features
+
+* **proxy:** add proxy server ([dfe30d7](https://github.com/standardnotes/api-gateway/commit/dfe30d7f5e8598ec1886db0e061b7d593cc27e29))
+
+## [1.48.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.2...@standardnotes/api-gateway@1.48.3) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.48.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.1...@standardnotes/api-gateway@1.48.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.48.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.0...@standardnotes/api-gateway@1.48.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.48.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.47.1...@standardnotes/api-gateway@1.48.0) (2023-02-15)
+
+### Features
+
+* optimize memory usage ([#444](https://github.com/standardnotes/api-gateway/issues/444)) ([fdf4b29](https://github.com/standardnotes/api-gateway/commit/fdf4b29ae2717e9b5d1fba2722beb7621a7e5c37))
+
+## [1.47.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.47.0...@standardnotes/api-gateway@1.47.1) (2023-02-14)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.47.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.13...@standardnotes/api-gateway@1.47.0) (2023-02-13)
+
+### Features
+
+* **syncing-server:** refactor container config into server and worker ([#443](https://github.com/standardnotes/api-gateway/issues/443)) ([993d311](https://github.com/standardnotes/api-gateway/commit/993d31167b8b0ac11e3df530d2d1ee566940df6e))
+
+## [1.46.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.12...@standardnotes/api-gateway@1.46.13) (2023-02-09)
+
+### Bug Fixes
+
+* performance of startup sequence in supervisor controlled self-hosting setup ([5bbdc7e](https://github.com/standardnotes/api-gateway/commit/5bbdc7e426c436b17dc130e3c6d9163080561c76))
+
+## [1.46.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.11...@standardnotes/api-gateway@1.46.12) (2023-02-09)
+
+### Bug Fixes
+
+* optimize memory usage ([e96fd6d](https://github.com/standardnotes/api-gateway/commit/e96fd6d69e1252842b5c91b1bedefa36e5d4a232))
+
+## [1.46.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.10...@standardnotes/api-gateway@1.46.11) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.46.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.9...@standardnotes/api-gateway@1.46.10) (2023-01-30)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/api-gateway
+
 ENTRYPOINT [ "/workspace/packages/api-gateway/docker/entrypoint.sh" ]
 
 CMD [ "start-web" ]

packages/api-gateway/bin/server.ts

@@ -22,6 +22,7 @@ import '../src/Controller/v1/SubscriptionInvitesController'
 import '../src/Controller/v1/WorkspacesController'
 import '../src/Controller/v1/InvitesController'
 import '../src/Controller/v1/AuthenticatorsController'
+import '../src/Controller/v1/ProxyController'
 
 import '../src/Controller/v2/PaymentsControllerV2'
 import '../src/Controller/v2/ActionsControllerV2'

packages/api-gateway/docker/entrypoint-server.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/api-gateway/docker/entrypoint.sh

@@ -4,16 +4,9 @@ set -e
 COMMAND=$1 && shift 1
 
 case "$COMMAND" in
-  'start-local' )
-    echo "Building the project..."
-    yarn workspace @standardnotes/api-gateway build
-    echo "Starting Web..."
-    yarn workspace @standardnotes/api-gateway start
-    ;;
-
   'start-web' )
     echo "Starting Web..."
-    yarn workspace @standardnotes/api-gateway start
+    node docker/entrypoint-server.js
     ;;
 
    * )

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.46.10",
+  "version": "1.49.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/api-gateway/src/Bootstrap/Container.ts

@@ -61,11 +61,11 @@ export class ContainerConfigLoader {
     container.bind(TYPES.AUTH_JWT_SECRET).toConstantValue(env.get('AUTH_JWT_SECRET'))
     container.bind(TYPES.WORKSPACE_SERVER_URL).toConstantValue(env.get('WORKSPACE_SERVER_URL', true))
     container.bind(TYPES.WEB_SOCKET_SERVER_URL).toConstantValue(env.get('WEB_SOCKET_SERVER_URL', true))
+    container.bind(TYPES.PROXY_SERVER_URL).toConstantValue(env.get('PROXY_SERVER_URL', true))
     container
       .bind(TYPES.HTTP_CALL_TIMEOUT)
       .toConstantValue(env.get('HTTP_CALL_TIMEOUT', true) ? +env.get('HTTP_CALL_TIMEOUT', true) : 60_000)
     container.bind(TYPES.VERSION).toConstantValue(env.get('VERSION'))
-    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
     container.bind(TYPES.CROSS_SERVICE_TOKEN_CACHE_TTL).toConstantValue(+env.get('CROSS_SERVICE_TOKEN_CACHE_TTL', true))
 
     // Middleware

packages/api-gateway/src/Bootstrap/Types.ts

@@ -11,10 +11,10 @@ const TYPES = {
   EMAIL_SERVER_URL: Symbol.for('EMAIL_SERVER_URL'),
   WORKSPACE_SERVER_URL: Symbol.for('WORKSPACE_SERVER_URL'),
   WEB_SOCKET_SERVER_URL: Symbol.for('WEB_SOCKET_SERVER_URL'),
+  PROXY_SERVER_URL: Symbol.for('PROXY_SERVER_URL'),
   AUTH_JWT_SECRET: Symbol.for('AUTH_JWT_SECRET'),
   HTTP_CALL_TIMEOUT: Symbol.for('HTTP_CALL_TIMEOUT'),
   VERSION: Symbol.for('VERSION'),
-  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   CROSS_SERVICE_TOKEN_CACHE_TTL: Symbol.for('CROSS_SERVICE_TOKEN_CACHE_TTL'),
   // Middleware
   AuthMiddleware: Symbol.for('AuthMiddleware'),

packages/api-gateway/src/Controller/v1/ProxyController.ts

@@ -0,0 +1,18 @@
+import { Request, Response } from 'express'
+import { inject } from 'inversify'
+import { all, BaseHttpController, controller } from 'inversify-express-utils'
+
+import TYPES from '../../Bootstrap/Types'
+import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
+
+@controller('/v1/proxy')
+export class ProxyController extends BaseHttpController {
+  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
+    super()
+  }
+
+  @all('*', TYPES.AuthMiddleware)
+  async createToken(request: Request, response: Response): Promise<void> {
+    await this.httpService.callProxyServer(request, response, request.path.replace('/v1/proxy', ''), request.body)
+  }
+}

packages/api-gateway/src/Controller/v1/RevisionsController.ts

@@ -1,35 +1,41 @@
-import { Request, Response } from 'express'
-import { inject } from 'inversify'
-import { BaseHttpController, controller, httpDelete, httpGet } from 'inversify-express-utils'
+import { BaseHttpController, controller, httpDelete, httpGet, results } from 'inversify-express-utils'
 import TYPES from '../../Bootstrap/Types'
-import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
 
 @controller('/v1/items/:item_id/revisions', TYPES.AuthMiddleware)
 export class RevisionsController extends BaseHttpController {
-  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
-    super()
-  }
-
   @httpGet('/')
-  async getRevisions(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(request, response, `items/${request.params.item_id}/revisions`)
+  async getRevisions(): Promise<results.JsonResult> {
+    return this.json(
+      {
+        error: {
+          message: 'Please update your client application.',
+        },
+      },
+      410,
+    )
   }
 
   @httpGet('/:id')
-  async getRevision(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(
-      request,
-      response,
-      `items/${request.params.item_id}/revisions/${request.params.id}`,
+  async getRevision(): Promise<results.JsonResult> {
+    return this.json(
+      {
+        error: {
+          message: 'Please update your client application.',
+        },
+      },
+      410,
     )
   }
 
   @httpDelete('/:id')
-  async deleteRevision(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(
-      request,
-      response,
-      `items/${request.params.item_id}/revisions/${request.params.id}`,
+  async deleteRevision(): Promise<results.JsonResult> {
+    return this.json(
+      {
+        error: {
+          message: 'Please update your client application.',
+        },
+      },
+      410,
     )
   }
 }

packages/api-gateway/src/Service/Http/HttpService.ts

@@ -20,6 +20,7 @@ export class HttpService implements HttpServiceInterface {
     @inject(TYPES.WEB_SOCKET_SERVER_URL) private webSocketServerUrl: string,
     @inject(TYPES.REVISIONS_SERVER_URL) private revisionsServerUrl: string,
     @inject(TYPES.EMAIL_SERVER_URL) private emailServerUrl: string,
+    @inject(TYPES.PROXY_SERVER_URL) private proxyServerUrl: string,
     @inject(TYPES.HTTP_CALL_TIMEOUT) private httpCallTimeout: number,
     @inject(TYPES.CrossServiceTokenCache) private crossServiceTokenCache: CrossServiceTokenCacheInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -111,6 +112,21 @@ export class HttpService implements HttpServiceInterface {
     await this.callServer(this.webSocketServerUrl, request, response, endpoint, payload)
   }
 
+  async callProxyServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void> {
+    if (!this.proxyServerUrl) {
+      this.logger.debug('Proxy Server URL not defined. Skipped request to Proxy.')
+
+      return
+    }
+
+    await this.callServer(this.proxyServerUrl, request, response, endpoint, payload)
+  }
+
   async callPaymentsServer(
     request: Request,
     response: Response,

packages/api-gateway/src/Service/Http/HttpServiceInterface.ts

@@ -55,4 +55,10 @@ export interface HttpServiceInterface {
     endpoint: string,
     payload?: Record<string, unknown> | string,
   ): Promise<void>
+  callProxyServer(
+    request: Request,
+    response: Response,
+    endpoint: string,
+    payload?: Record<string, unknown> | string,
+  ): Promise<void>
 }

packages/api-gateway/supervisor/supervisor-server.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node docker/entrypoint-server.js

packages/api-gateway/supervisor/wait-for.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+WAIT_FOR_HOST="$1"
+shift
+WAIT_FOR_PORT="$1"
+shift
+
+while ! nc -vz $WAIT_FOR_HOST $WAIT_FOR_PORT; do
+  echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is unavailable yet - waiting for it to start"
+  sleep 10
+done
+
+echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is up. Proceeding to startup."

packages/auth/.env.sample

@@ -43,8 +43,6 @@ SQS_AWS_REGION=
 
 SYNCING_SERVER_URL=http://syncing-server-js:3000
 
-REDIS_EVENTS_CHANNEL=events
-
 # (Optional) New Relic Setup
 NEW_RELIC_ENABLED=false
 NEW_RELIC_APP_NAME=Auth

packages/auth/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.88.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.2...@standardnotes/auth-server@1.88.3) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.88.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.1...@standardnotes/auth-server@1.88.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.88.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.0...@standardnotes/auth-server@1.88.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.88.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.15...@standardnotes/auth-server@1.88.0) (2023-02-15)
+
+### Features
+
+* optimize memory usage ([#444](https://github.com/standardnotes/server/issues/444)) ([fdf4b29](https://github.com/standardnotes/server/commit/fdf4b29ae2717e9b5d1fba2722beb7621a7e5c37))
+
+## [1.87.15](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.14...@standardnotes/auth-server@1.87.15) (2023-02-14)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.87.14](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.13...@standardnotes/auth-server@1.87.14) (2023-02-09)
+
+### Bug Fixes
+
+* performance of startup sequence in supervisor controlled self-hosting setup ([5bbdc7e](https://github.com/standardnotes/server/commit/5bbdc7e426c436b17dc130e3c6d9163080561c76))
+
+## [1.87.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.12...@standardnotes/auth-server@1.87.13) (2023-02-09)
+
+### Bug Fixes
+
+* optimize memory usage ([e96fd6d](https://github.com/standardnotes/server/commit/e96fd6d69e1252842b5c91b1bedefa36e5d4a232))
+
+## [1.87.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.11...@standardnotes/auth-server@1.87.12) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.87.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.10...@standardnotes/auth-server@1.87.11) (2023-02-02)
 
 ### Reverts

packages/auth/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/auth
+
 ENTRYPOINT [ "/workspace/packages/auth/docker/entrypoint.sh" ]
 
 CMD [ "start-web" ]

packages/auth/bin/content.ts

@@ -1,74 +0,0 @@
-import 'reflect-metadata'
-
-import 'newrelic'
-
-import { Logger } from 'winston'
-import * as dayjs from 'dayjs'
-import * as utc from 'dayjs/plugin/utc'
-
-import { ContainerConfigLoader } from '../src/Bootstrap/Container'
-import TYPES from '../src/Bootstrap/Types'
-import { Env } from '../src/Bootstrap/Env'
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
-import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
-import { Stream } from 'stream'
-
-const requestRecalculation = async (
-  userRepository: UserRepositoryInterface,
-  domainEventFactory: DomainEventFactoryInterface,
-  domainEventPublisher: DomainEventPublisherInterface,
-  logger: Logger,
-): Promise<void> => {
-  const stream = await userRepository.streamAll()
-
-  return new Promise((resolve, reject) => {
-    stream
-      .pipe(
-        new Stream.Transform({
-          objectMode: true,
-          transform: async (rawUserData, _encoding, callback) => {
-            try {
-              await domainEventPublisher.publish(
-                domainEventFactory.createUserContentSizeRecalculationRequestedEvent(rawUserData.user_uuid),
-              )
-            } catch (error) {
-              logger.error(`Could not process user ${rawUserData.user_uuid}: ${(error as Error).message}`)
-            }
-
-            callback()
-          },
-        }),
-      )
-      .on('finish', resolve)
-      .on('error', reject)
-  })
-}
-
-const container = new ContainerConfigLoader()
-void container.load().then((container) => {
-  dayjs.extend(utc)
-
-  const env: Env = new Env()
-  env.load()
-
-  const logger: Logger = container.get(TYPES.Logger)
-
-  logger.info('Starting content size recalculation requests ...')
-
-  const userRepository: UserRepositoryInterface = container.get(TYPES.UserRepository)
-  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
-  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
-
-  Promise.resolve(requestRecalculation(userRepository, domainEventFactory, domainEventPublisher, logger))
-    .then(() => {
-      logger.info('content size recalculation requesting complete')
-
-      process.exit(0)
-    })
-    .catch((error) => {
-      logger.error(`Could not finish content size recalculation requesting : ${error.message}`)
-
-      process.exit(1)
-    })
-})

packages/auth/docker/entrypoint-backup.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/backup.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-cleanup.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/cleanup.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-server.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-stats.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/stats.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-user-email-backup.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/user_email_backup.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-worker.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint.sh

@@ -4,65 +4,55 @@ set -e
 COMMAND=$1 && shift 1
 
 case "$COMMAND" in
-  'start-local' )
-    echo "[Docker] Starting Web..."
-    yarn workspace @standardnotes/auth-server start:local
-    ;;
-
   'start-web' )
     echo "[Docker] Starting Web..."
-    yarn workspace @standardnotes/auth-server start
+    node docker/entrypoint-server.js
     ;;
 
   'start-worker' )
     echo "[Docker] Starting Worker..."
-    yarn workspace @standardnotes/auth-server worker
+    node docker/entrypoint-worker.js
     ;;
 
   'cleanup' )
     echo "[Docker] Starting Cleanup..."
-    yarn workspace @standardnotes/auth-server cleanup
+    node docker/entrypoint-cleanup.js
     ;;
 
   'stats' )
     echo "[Docker] Starting Persisting Stats..."
-    yarn workspace @standardnotes/auth-server stats
+    node docker/entrypoint-stats.js
     ;;
 
   'email-daily-backup' )
     echo "[Docker] Starting Email Daily Backup..."
-    yarn workspace @standardnotes/auth-server daily-backup:email
+    node docker/entrypoint-backup.js email daily
     ;;
 
   'email-weekly-backup' )
     echo "[Docker] Starting Email Weekly Backup..."
-    yarn workspace @standardnotes/auth-server weekly-backup:email
+    node docker/entrypoint-backup.js email weekly
     ;;
 
   'email-backup' )
     echo "[Docker] Starting Email Backup For Single User..."
     EMAIL=$1 && shift 1
-    yarn workspace @standardnotes/auth-server user-email-backup $EMAIL
+    node docker/entrypoint-user-email-backup.js $EMAIL
     ;;
 
   'dropbox-daily-backup' )
     echo "[Docker] Starting Dropbox Daily Backup..."
-    yarn workspace @standardnotes/auth-server daily-backup:dropbox
+    node docker/entrypoint-backup.js dropbox daily
     ;;
 
   'google-drive-daily-backup' )
     echo "[Docker] Starting Google Drive Daily Backup..."
-    yarn workspace @standardnotes/auth-server daily-backup:google_drive
+    node docker/entrypoint-backup.js google_drive daily
     ;;
 
   'one-drive-daily-backup' )
     echo "[Docker] Starting One Drive Daily Backup..."
-    yarn workspace @standardnotes/auth-server daily-backup:one_drive
-    ;;
-
-  'content-recalculation' )
-    echo "[Docker] Starting Content Size Recalculation..."
-    yarn workspace @standardnotes/auth-server content-recalculation
+    node docker/entrypoint-backup.js one_drive daily
     ;;
 
    * )

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.87.11",
+  "version": "1.88.3",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/auth/src/Bootstrap/Container.ts

@@ -90,9 +90,6 @@ import { FeatureService } from '../Domain/Feature/FeatureService'
 import { SettingServiceInterface } from '../Domain/Setting/SettingServiceInterface'
 import { ExtensionKeyGrantedEventHandler } from '../Domain/Handler/ExtensionKeyGrantedEventHandler'
 import {
-  RedisDomainEventPublisher,
-  RedisDomainEventSubscriberFactory,
-  RedisEventMessageHandler,
   SNSDomainEventPublisher,
   SQSDomainEventSubscriberFactory,
   SQSEventMessageHandler,
@@ -258,37 +255,33 @@ export class ContainerConfigLoader {
 
     container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      const snsConfig: SNSClientConfig = {
-        region: env.get('SNS_AWS_REGION', true),
-      }
-      if (env.get('SNS_ENDPOINT', true)) {
-        snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
-      }
-      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
-        snsConfig.credentials = {
-          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
-          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
-        }
-      }
-      container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
+    const snsConfig: SNSClientConfig = {
+      region: env.get('SNS_AWS_REGION', true),
     }
+    if (env.get('SNS_ENDPOINT', true)) {
+      snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
+    }
+    if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+      snsConfig.credentials = {
+        accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+        secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+      }
+    }
+    container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
 
-    if (env.get('SQS_QUEUE_URL', true)) {
-      const sqsConfig: SQSClientConfig = {
-        region: env.get('SQS_AWS_REGION', true),
-      }
-      if (env.get('SQS_ENDPOINT', true)) {
-        sqsConfig.endpoint = env.get('SQS_ENDPOINT', true)
-      }
-      if (env.get('SQS_ACCESS_KEY_ID', true) && env.get('SQS_SECRET_ACCESS_KEY', true)) {
-        sqsConfig.credentials = {
-          accessKeyId: env.get('SQS_ACCESS_KEY_ID', true),
-          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
-        }
-      }
-      container.bind<SQSClient>(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig))
+    const sqsConfig: SQSClientConfig = {
+      region: env.get('SQS_AWS_REGION', true),
     }
+    if (env.get('SQS_ENDPOINT', true)) {
+      sqsConfig.endpoint = env.get('SQS_ENDPOINT', true)
+    }
+    if (env.get('SQS_ACCESS_KEY_ID', true) && env.get('SQS_SECRET_ACCESS_KEY', true)) {
+      sqsConfig.credentials = {
+        accessKeyId: env.get('SQS_ACCESS_KEY_ID', true),
+        secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
+      }
+    }
+    container.bind<SQSClient>(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig))
 
     // Mapping
     container
@@ -441,13 +434,12 @@ export class ContainerConfigLoader {
     container
       .bind(TYPES.DISABLE_USER_REGISTRATION)
       .toConstantValue(env.get('DISABLE_USER_REGISTRATION', true) === 'true')
-    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN', true))
+    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN'))
     container.bind(TYPES.SNS_AWS_REGION).toConstantValue(env.get('SNS_AWS_REGION', true))
-    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL', true))
+    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL'))
     container.bind(TYPES.USER_SERVER_REGISTRATION_URL).toConstantValue(env.get('USER_SERVER_REGISTRATION_URL', true))
     container.bind(TYPES.USER_SERVER_AUTH_KEY).toConstantValue(env.get('USER_SERVER_AUTH_KEY', true))
     container.bind(TYPES.USER_SERVER_CHANGE_EMAIL_URL).toConstantValue(env.get('USER_SERVER_CHANGE_EMAIL_URL', true))
-    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
     container.bind(TYPES.NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
     container.bind(TYPES.SYNCING_SERVER_URL).toConstantValue(env.get('SYNCING_SERVER_URL'))
     container.bind(TYPES.VERSION).toConstantValue(env.get('VERSION'))
@@ -535,17 +527,9 @@ export class ContainerConfigLoader {
       .toConstantValue(new DeterministicSelector<boolean>())
     container.bind<UserSubscriptionServiceInterface>(TYPES.UserSubscriptionService).to(UserSubscriptionService)
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      container
-        .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
-    } else {
-      container
-        .bind<RedisDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(
-          new RedisDomainEventPublisher(container.get(TYPES.Redis), container.get(TYPES.REDIS_EVENTS_CHANNEL)),
-        )
-    }
+    container
+      .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
+      .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
 
     // use cases
     container
@@ -803,37 +787,22 @@ export class ContainerConfigLoader {
       ['EMAIL_SUBSCRIPTION_UNSUBSCRIBED', container.get(TYPES.EmailSubscriptionUnsubscribedEventHandler)],
     ])
 
-    if (env.get('SQS_QUEUE_URL', true)) {
-      container
-        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-        .toConstantValue(
-          env.get('NEW_RELIC_ENABLED', true) === 'true'
-            ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
-            : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
-        )
-      container
-        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
-        .toConstantValue(
-          new SQSDomainEventSubscriberFactory(
-            container.get(TYPES.SQS),
-            container.get(TYPES.SQS_QUEUE_URL),
-            container.get(TYPES.DomainEventMessageHandler),
-          ),
-        )
-    } else {
-      container
-        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-        .toConstantValue(new RedisEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
-      container
-        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
-        .toConstantValue(
-          new RedisDomainEventSubscriberFactory(
-            container.get(TYPES.Redis),
-            container.get(TYPES.DomainEventMessageHandler),
-            container.get(TYPES.REDIS_EVENTS_CHANNEL),
-          ),
-        )
-    }
+    container
+      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+      .toConstantValue(
+        env.get('NEW_RELIC_ENABLED', true) === 'true'
+          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
+      )
+    container
+      .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
+      .toConstantValue(
+        new SQSDomainEventSubscriberFactory(
+          container.get(TYPES.SQS),
+          container.get(TYPES.SQS_QUEUE_URL),
+          container.get(TYPES.DomainEventMessageHandler),
+        ),
+      )
 
     return container
   }

packages/auth/src/Bootstrap/Types.ts

@@ -88,7 +88,6 @@ const TYPES = {
   USER_SERVER_REGISTRATION_URL: Symbol.for('USER_SERVER_REGISTRATION_URL'),
   USER_SERVER_AUTH_KEY: Symbol.for('USER_SERVER_AUTH_KEY'),
   USER_SERVER_CHANGE_EMAIL_URL: Symbol.for('USER_SERVER_CHANGE_EMAIL_URL'),
-  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
   SYNCING_SERVER_URL: Symbol.for('SYNCING_SERVER_URL'),
   VERSION: Symbol.for('VERSION'),

packages/auth/src/Domain/Event/DomainEventFactory.ts

@@ -16,7 +16,6 @@ import {
   DomainEventService,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
-  UserContentSizeRecalculationRequestedEvent,
   MuteEmailsSettingChangedEvent,
   EmailRequestedEvent,
   StatisticPersistenceRequestedEvent,
@@ -70,23 +69,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
     }
   }
 
-  createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent {
-    return {
-      type: 'USER_CONTENT_SIZE_RECALCULATION_REQUESTED',
-      createdAt: this.timer.getUTCDate(),
-      meta: {
-        correlation: {
-          userIdentifier: userUuid,
-          userIdentifierType: 'uuid',
-        },
-        origin: DomainEventService.Auth,
-      },
-      payload: {
-        userUuid,
-      },
-    }
-  }
-
   createExitDiscountApplyRequestedEvent(dto: {
     userEmail: string
     discountCode: string

packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -14,7 +14,6 @@ import {
   PredicateVerifiedEvent,
   WebSocketMessageRequestedEvent,
   ExitDiscountApplyRequestedEvent,
-  UserContentSizeRecalculationRequestedEvent,
   MuteEmailsSettingChangedEvent,
   EmailRequestedEvent,
   StatisticPersistenceRequestedEvent,
@@ -22,7 +21,6 @@ import {
 import { InviteeIdentifierType } from '../SharedSubscription/InviteeIdentifierType'
 
 export interface DomainEventFactoryInterface {
-  createUserContentSizeRecalculationRequestedEvent(userUuid: string): UserContentSizeRecalculationRequestedEvent
   createWebSocketMessageRequestedEvent(dto: { userUuid: string; message: JSONString }): WebSocketMessageRequestedEvent
   createEmailRequestedEvent(dto: {
     userEmail: string

packages/auth/supervisor/supervisor-server.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node docker/entrypoint-server.js

packages/auth/supervisor/supervisor-worker.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $AUTH_SERVER_PORT
+node docker/entrypoint-worker.js

packages/auth/supervisor/wait-for.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+WAIT_FOR_HOST="$1"
+shift
+WAIT_FOR_PORT="$1"
+shift
+
+while ! nc -vz $WAIT_FOR_HOST $WAIT_FOR_PORT; do
+  echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is unavailable yet - waiting for it to start"
+  sleep 10
+done
+
+echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is up. Proceeding to startup."

packages/domain-core/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.11.2...@standardnotes/domain-core@1.11.3) (2023-02-15)
+
+### Bug Fixes
+
+* **domain-core:** remove unnecessary dependencies ([16043a7](https://github.com/standardnotes/server/commit/16043a7d6881378ed3286e08dc9e21e5e6b89171))
+
 ## [1.11.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.11.1...@standardnotes/domain-core@1.11.2) (2023-01-20)
 
 **Note:** Version bump only for package @standardnotes/domain-core

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -23,8 +23,6 @@
     "test": "jest spec --coverage --passWithNoTests"
   },
   "dependencies": {
-    "reflect-metadata": "^0.1.13",
-    "shallow-equal-object": "^1.1.1",
     "uuid": "^9.0.0"
   },
   "devDependencies": {

packages/domain-core/src/Domain/Common/RoleNameCollection.ts

@@ -10,7 +10,7 @@ export class RoleNameCollection extends ValueObject<RoleNameCollectionProps> {
 
   includes(roleName: RoleName): boolean {
     for (const existingRoleName of this.props.value) {
-      if (existingRoleName.equals(roleName)) {
+      if (existingRoleName.value === roleName.value) {
         return true
       }
     }
@@ -28,7 +28,7 @@ export class RoleNameCollection extends ValueObject<RoleNameCollectionProps> {
     return false
   }
 
-  override equals(roleNameCollection: RoleNameCollection): boolean {
+  equals(roleNameCollection: RoleNameCollection): boolean {
     if (this.props.value.length !== roleNameCollection.value.length) {
       return false
     }

packages/domain-core/src/Domain/Core/ValueObject.ts

@@ -1,7 +1,4 @@
 /* istanbul ignore file */
-
-import { shallowEqual } from 'shallow-equal-object'
-
 import { ValueObjectProps } from './ValueObjectProps'
 
 export abstract class ValueObject<T extends ValueObjectProps> {
@@ -10,15 +7,4 @@ export abstract class ValueObject<T extends ValueObjectProps> {
   constructor(props: T) {
     this.props = Object.freeze(props)
   }
-
-  equals(valueObject?: ValueObject<T>): boolean {
-    if (valueObject === null || valueObject === undefined) {
-      return false
-    }
-    if (valueObject.props === undefined) {
-      return false
-    }
-
-    return shallowEqual(this.props, valueObject.props)
-  }
 }

packages/domain-events-infra/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.70](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.69...@standardnotes/domain-events-infra@1.9.70) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.9.69](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.68...@standardnotes/domain-events-infra@1.9.69) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
 ## [1.9.68](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.9.67...@standardnotes/domain-events-infra@1.9.68) (2023-01-30)
 
 **Note:** Version bump only for package @standardnotes/domain-events-infra

packages/domain-events-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events-infra",
-  "version": "1.9.68",
+  "version": "1.9.70",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.107.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.107.0...@standardnotes/domain-events@2.107.1) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/domain-events
+
+# [2.107.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.106.2...@standardnotes/domain-events@2.107.0) (2023-02-20)
+
+### Features
+
+* **domain-events:** add email sent event ([190595f](https://github.com/standardnotes/server/commit/190595febf935f0f47818a2d9f7926a5f351a458))
+
 ## [2.106.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events@2.106.1...@standardnotes/domain-events@2.106.2) (2023-01-20)
 
 ### Reverts

packages/domain-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-events",
-  "version": "2.106.2",
+  "version": "2.107.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/src/Domain/Event/EmailSentEvent.ts

@@ -0,0 +1,7 @@
+import { DomainEventInterface } from './DomainEventInterface'
+import { EmailSentEventPayload } from './EmailSentEventPayload'
+
+export interface EmailSentEvent extends DomainEventInterface {
+  type: 'EMAIL_SENT'
+  payload: EmailSentEventPayload
+}

packages/domain-events/src/Domain/Event/EmailSentEventPayload.ts

@@ -0,0 +1,15 @@
+export interface EmailSentEventPayload {
+  userEmail: string
+  messageIdentifier: string
+  level: string
+  subject: string
+  body: string
+  sender?: string
+  additionalStyles?: string
+  attachments?: Array<{
+    filePath: string
+    fileName: string
+    attachmentFileName: string
+    attachmentContentType: string
+  }>
+}

packages/domain-events/src/Domain/Event/RevisionsOwnershipUpdateRequestedEvent.ts

@@ -1,7 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-import { RevisionsOwnershipUpdateRequestedEventPayload } from './RevisionsOwnershipUpdateRequestedEventPayload'
-
-export interface RevisionsOwnershipUpdateRequestedEvent extends DomainEventInterface {
-  type: 'REVISIONS_OWNERSHIP_UPDATE_REQUESTED'
-  payload: RevisionsOwnershipUpdateRequestedEventPayload
-}

packages/domain-events/src/Domain/Event/RevisionsOwnershipUpdateRequestedEventPayload.ts

@@ -1,4 +0,0 @@
-export interface RevisionsOwnershipUpdateRequestedEventPayload {
-  itemUuid: string
-  userUuid: string
-}

packages/domain-events/src/Domain/Event/UserContentSizeRecalculationRequestedEvent.ts

@@ -1,7 +0,0 @@
-import { DomainEventInterface } from './DomainEventInterface'
-import { UserContentSizeRecalculationRequestedEventPayload } from './UserContentSizeRecalculationRequestedEventPayload'
-
-export interface UserContentSizeRecalculationRequestedEvent extends DomainEventInterface {
-  type: 'USER_CONTENT_SIZE_RECALCULATION_REQUESTED'
-  payload: UserContentSizeRecalculationRequestedEventPayload
-}

packages/domain-events/src/Domain/Event/UserContentSizeRecalculationRequestedEventPayload.ts

@@ -1,3 +0,0 @@
-export interface UserContentSizeRecalculationRequestedEventPayload {
-  userUuid: string
-}

packages/domain-events/src/Domain/index.ts

@@ -14,6 +14,8 @@ export * from './Event/EmailBackupRequestedEvent'
 export * from './Event/EmailBackupRequestedEventPayload'
 export * from './Event/EmailRequestedEvent'
 export * from './Event/EmailRequestedEventPayload'
+export * from './Event/EmailSentEvent'
+export * from './Event/EmailSentEventPayload'
 export * from './Event/EmailSubscriptionUnsubscribedEvent'
 export * from './Event/EmailSubscriptionUnsubscribedEventPayload'
 export * from './Event/ExitDiscountAppliedEvent'
@@ -52,8 +54,6 @@ export * from './Event/RefundProcessedEvent'
 export * from './Event/RefundProcessedEventPayload'
 export * from './Event/RevisionsCopyRequestedEvent'
 export * from './Event/RevisionsCopyRequestedEventPayload'
-export * from './Event/RevisionsOwnershipUpdateRequestedEvent'
-export * from './Event/RevisionsOwnershipUpdateRequestedEventPayload'
 export * from './Event/SharedSubscriptionInvitationCanceledEvent'
 export * from './Event/SharedSubscriptionInvitationCanceledEventPayload'
 export * from './Event/SharedSubscriptionInvitationCreatedEvent'
@@ -78,8 +78,6 @@ export * from './Event/SubscriptionRevertRequestedEvent'
 export * from './Event/SubscriptionRevertRequestedEventPayload'
 export * from './Event/SubscriptionSyncRequestedEvent'
 export * from './Event/SubscriptionSyncRequestedEventPayload'
-export * from './Event/UserContentSizeRecalculationRequestedEvent'
-export * from './Event/UserContentSizeRecalculationRequestedEventPayload'
 export * from './Event/UserDisabledSessionUserAgentLoggingEvent'
 export * from './Event/UserDisabledSessionUserAgentLoggingEventPayload'
 export * from './Event/UserEmailChangedEvent'

packages/event-store/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.7.2](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.7.1...@standardnotes/event-store@1.7.2) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.7.1](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.7.0...@standardnotes/event-store@1.7.1) (2023-02-20)
+
+### Bug Fixes
+
+* **event-store:** add handling of email sent events ([d023a27](https://github.com/standardnotes/server/commit/d023a2737772e01eca8dc2c848ddebe43bb58734))
+
+# [1.7.0](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.68...@standardnotes/event-store@1.7.0) (2023-02-15)
+
+### Features
+
+* optimize memory on server utilities ([881a696](https://github.com/standardnotes/server/commit/881a6967aca57d68795af0792114f848ddddf120))
+
 ## [1.6.68](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.67...@standardnotes/event-store@1.6.68) (2023-01-30)
 
 ### Bug Fixes

packages/event-store/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/event-store
+
 ENTRYPOINT [ "/workspace/packages/event-store/docker/entrypoint.sh" ]
 
 CMD [ "start-worker" ]