chore(release): publish new version

- @standardnotes/analytics@2.20.2
 - @standardnotes/api-gateway@1.48.2
 - @standardnotes/auth-server@1.88.2
 - @standardnotes/domain-events-infra@1.9.69
 - @standardnotes/domain-events@2.107.0
 - @standardnotes/event-store@1.7.1
 - @standardnotes/files-server@1.10.2
 - @standardnotes/revisions-server@1.12.3
 - @standardnotes/scheduler-server@1.17.2
 - @standardnotes/syncing-server@1.31.2
 - @standardnotes/websockets-server@1.6.2
 - @standardnotes/workspace-server@1.20.2

.env.sample

@@ -8,7 +8,6 @@ DB_USERNAME=std_notes_user
 DB_PASSWORD=changeme123
 DB_DATABASE=standard_notes_db
 DB_DEBUG_LEVEL=all
-DB_MIGRATIONS_PATH=dist/migrations/*.js
 
 #########
 # CACHE #

.github/workflows/pr.yml

@@ -94,3 +94,81 @@ jobs:
     name: E2E
     uses: standardnotes/server/.github/workflows/common-e2e.yml@main
     secrets: inherit
+
+  legacy_e2e:
+    needs: build
+    name: Legacy E2E
+    strategy:
+      matrix:
+        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": "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
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Create Bundle Dir
+      id: bundle-dir
+      run: echo "temp_dir=$(mktemp -d -t ${{ matrix.application.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+          ${{ needs.legacy_e2e.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: Bundle
+      run: yarn workspace ${{ matrix.application.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.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: ${{ steps.bundle-dir.outputs.temp_dir }}
+        file: ${{ steps.bundle-dir.outputs.temp_dir }}/${{ matrix.application.package_path }}/Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: standardnotes/${{ matrix.application.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: '{"${{ matrix.application.e2e_tag_parameter_name }}": "${{ github.sha }}"}'
+        propagate_failure: true
+        trigger_workflow: true
+        wait_workflow: true

.pnp.cjs

@@ -4257,8 +4257,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"]\
@@ -13336,15 +13334,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/",\

Dockerfile

@@ -31,7 +31,8 @@ RUN mkdir -p \
   /opt/bundled/auth \
   /opt/bundled/files \
   /opt/bundled/revisions \
-  /opt/bundled/api-gateway
+  /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

docker-compose.example.yml

@@ -1,13 +1,14 @@
 services:
   server:
     image: standardnotes/server
-    env_file: .env.sample
+    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
 
@@ -23,7 +24,7 @@ services:
       - HOSTNAME_EXTERNAL=localstack
       - LS_LOG=warn
     volumes:
-      - ./docker/localstack_bootstrap.sh:/etc/localstack/init/ready.d/localstack_bootstrap.sh
+      - ./localstack_bootstrap.sh:/etc/localstack/init/ready.d/localstack_bootstrap.sh
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - standardnotes_self_hosted

docker/docker-entrypoint.sh

@@ -44,9 +44,7 @@ fi
 if [ -z "$DB_DEBUG_LEVEL" ]; then
   export DB_DEBUG_LEVEL="all"
 fi
-if [ -z "$DB_MIGRATIONS_PATH" ]; then
-  export DB_MIGRATIONS_PATH="dist/migrations/*.js"
-fi
+export DB_MIGRATIONS_PATH="dist/migrations/*.js"
 
 #########
 # CACHE #
@@ -235,9 +233,7 @@ 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
 
-if [ -z "$SYNCING_SERVER_FILE_UPLOAD_PATH" ]; then
-  export SYNCING_SERVER_FILE_UPLOAD_PATH="data/uploads"
-fi
+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
 
@@ -356,10 +352,9 @@ 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 API_GATEWAY_FILES_SERVER_URL=http://localhost:$FILES_SERVER_PORT
-else
-  export API_GATEWAY_FILES_SERVER_URL=$PUBLIC_FILES_SERVER_URL
+  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
 

packages/analytics/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

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.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.16",
+  "version": "2.20.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

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/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.47.1",
+  "version": "1.48.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -16,9 +16,7 @@
     "build": "tsc --build",
     "lint": "eslint . --ext .ts",
     "setup:env": "cp .env.sample .env",
-    "wait-for:revisions": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT && node dist/bin/server.js",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   "dependencies": {

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

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
-node supervisor/entrypoint-server.js
+node docker/entrypoint-server.js

packages/auth/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

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/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-content.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/content.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.sh

@@ -4,65 +4,60 @@ 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
+    node docker/entrypoint-backup.js one_drive daily
     ;;
 
   'content-recalculation' )
     echo "[Docker] Starting Content Size Recalculation..."
-    yarn workspace @standardnotes/auth-server content-recalculation
+    node docker/entrypoint-content.js
     ;;
 
    * )

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.87.15",
+  "version": "1.88.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -17,12 +17,8 @@
     "lint": "eslint . --ext .ts",
     "pretest": "yarn lint && yarn build",
     "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
-    "wait-for:syncing-server": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT",
-    "wait-for:auth": "docker/wait-for.sh localhost $AUTH_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT && node dist/bin/server.js",
     "worker": "yarn node dist/bin/worker.js",
-    "supervisor:worker": "docker/wait-for.sh localhost $AUTH_SERVER_PORT && node dist/bin/worker.js",
     "cleanup": "yarn node dist/bin/cleanup.js",
     "stats": "yarn node dist/bin/stats.js",
     "daily-backup:email": "yarn node dist/bin/backup.js email daily",

packages/auth/supervisor/supervisor-server.sh

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
-node supervisor/entrypoint-server.js
+node docker/entrypoint-server.js

packages/auth/supervisor/supervisor-worker.sh

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 sh supervisor/wait-for.sh localhost $AUTH_SERVER_PORT
-node supervisor/entrypoint-worker.js
+node docker/entrypoint-worker.js

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,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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.69",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-events/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.
 
+# [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.0",
   "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/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'

packages/event-store/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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" ]

packages/event-store/docker/entrypoint.sh

@@ -6,7 +6,7 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-worker' )
     echo "Starting Worker..."
-    yarn workspace @standardnotes/event-store worker
+    node docker/entrypoint-worker.js
     ;;
 
    * )

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.6.68",
+  "version": "1.7.1",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

packages/event-store/src/Bootstrap/Container.ts

@@ -81,6 +81,7 @@ export class ContainerConfigLoader {
       ['LISTED_ACCOUNT_CREATED', container.get(TYPES.EventHandler)],
       ['LISTED_ACCOUNT_DELETED', container.get(TYPES.EventHandler)],
       ['EMAIL_REQUESTED', container.get(TYPES.EventHandler)],
+      ['EMAIL_SENT', container.get(TYPES.EventHandler)],
       ['SHARED_SUBSCRIPTION_INVITATION_CREATED', container.get(TYPES.EventHandler)],
       ['EMAIL_BACKUP_REQUESTED', container.get(TYPES.EventHandler)],
       ['PAYMENT_FAILED', container.get(TYPES.EventHandler)],

packages/files/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.10.2](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.10.1...@standardnotes/files-server@1.10.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.10.1](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.10.0...@standardnotes/files-server@1.10.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+# [1.10.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.9.18...@standardnotes/files-server@1.10.0) (2023-02-15)
+
+### Features
+
+* optimize memory usage ([#444](https://github.com/standardnotes/files/issues/444)) ([fdf4b29](https://github.com/standardnotes/files/commit/fdf4b29ae2717e9b5d1fba2722beb7621a7e5c37))
+
 ## [1.9.18](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.9.17...@standardnotes/files-server@1.9.18) (2023-02-14)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/Dockerfile

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

packages/files/docker/entrypoint.sh

@@ -4,19 +4,14 @@ set -e
 COMMAND=$1 && shift 1
 
 case "$COMMAND" in
-  'start-local')
-    echo "Starting Web in Local Mode..."
-    yarn workspace @standardnotes/files-server start:local
-    ;;
-
   'start-web' )
     echo "Starting Web..."
-    yarn workspace @standardnotes/files-server start
+    node docker/entrypoint-server.js
     ;;
 
   'start-worker' )
     echo "Starting Worker..."
-    yarn workspace @standardnotes/files-server worker
+    node docker/entrypoint-worker.js
     ;;
 
    * )

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.9.18",
+  "version": "1.10.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -20,12 +20,8 @@
     "lint": "eslint . --ext .ts",
     "pretest": "yarn lint && yarn build",
     "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
-    "wait-for:auth": "docker/wait-for.sh localhost $AUTH_SERVER_PORT",
-    "wait-for:files": "docker/wait-for.sh localhost $FILES_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "docker/wait-for.sh localhost $AUTH_SERVER_PORT && node dist/bin/server.js",
     "worker": "yarn node dist/bin/worker.js",
-    "supervisor:worker": "docker/wait-for.sh localhost $FILES_SERVER_PORT && node dist/bin/worker.js",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   "dependencies": {

packages/files/supervisor/supervisor-server.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 
 sh supervisor/wait-for.sh $DB_HOST $DB_PORT
 sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
-node supervisor/entrypoint-server.js
+node docker/entrypoint-server.js

packages/files/supervisor/supervisor-worker.sh

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
-node supervisor/entrypoint-worker.js
+node docker/entrypoint-worker.js

packages/revisions/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.12.2...@standardnotes/revisions-server@1.12.3) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.12.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.12.1...@standardnotes/revisions-server@1.12.2) (2023-02-17)
+
+### Bug Fixes
+
+* **revisions:** initial migration to check if user_uuid exists on table ([85d0c12](https://github.com/standardnotes/server/commit/85d0c12dadffe3ed7b8c0717725813e168e20b6c))
+
+## [1.12.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.12.0...@standardnotes/revisions-server@1.12.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+# [1.12.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.11.6...@standardnotes/revisions-server@1.12.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.11.6](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.11.5...@standardnotes/revisions-server@1.11.6) (2023-02-14)
 
 **Note:** Version bump only for package @standardnotes/revisions-server

packages/revisions/Dockerfile

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

packages/revisions/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/revisions/docker/entrypoint.sh

@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-web' )
     echo "Starting Web..."
-    yarn workspace @standardnotes/revisions-server start
+    node docker/entrypoint-server.js
     ;;
 
   'start-worker' )
     echo "Starting Worker..."
-    yarn workspace @standardnotes/revisions-server worker
+    node docker/entrypoint-worker.js
     ;;
 
    * )

packages/revisions/migrations/1669113322388-init.ts

@@ -28,6 +28,14 @@ export class init1669113322388 implements MigrationInterface {
       return
     }
 
+    const revisionsTableHasUserUuidColumnQueryResult = await queryRunner.manager.query(
+      'SELECT COUNT(*) as count FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = "revisions" AND column_name = "user_uuid"',
+    )
+    const revisionsTableHasUserUuidColumn = revisionsTableHasUserUuidColumnQueryResult[0].count === 1
+    if (revisionsTableHasUserUuidColumn) {
+      return
+    }
+
     await queryRunner.query('ALTER TABLE `revisions` ADD COLUMN `user_uuid` varchar(36) NULL')
   }
 }

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.11.6",
+  "version": "1.12.3",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -19,11 +19,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "pretest": "yarn lint && yarn build",
     "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
-    "wait-for:files": "docker/wait-for.sh localhost $FILES_SERVER_PORT",
-    "wait-for:revisions": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "docker/wait-for.sh localhost $FILES_SERVER_PORT && node dist/bin/server.js",
-    "supervisor:worker": "docker/wait-for.sh localhost $REVISIONS_SERVER_PORT && node dist/bin/worker.js",
     "worker": "yarn node dist/bin/worker.js"
   },
   "dependencies": {

packages/revisions/supervisor/supervisor-server.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 
 sh supervisor/wait-for.sh $DB_HOST $DB_PORT
 sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
-node supervisor/entrypoint-server.js
+node docker/entrypoint-server.js

packages/revisions/supervisor/supervisor-worker.sh

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
-node supervisor/entrypoint-worker.js
+node docker/entrypoint-worker.js

packages/scheduler/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.2](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.17.1...@standardnotes/scheduler-server@1.17.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.17.1](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.17.0...@standardnotes/scheduler-server@1.17.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+# [1.17.0](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.16.19...@standardnotes/scheduler-server@1.17.0) (2023-02-15)
+
+### Features
+
+* optimize memory on server utilities ([881a696](https://github.com/standardnotes/server/commit/881a6967aca57d68795af0792114f848ddddf120))
+
 ## [1.16.19](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.16.18...@standardnotes/scheduler-server@1.16.19) (2023-02-06)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/Dockerfile

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

packages/scheduler/docker/entrypoint-verify.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/verify.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/scheduler/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/scheduler/docker/entrypoint.sh

@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-worker' )
     echo "Starting Worker..."
-    yarn workspace @standardnotes/scheduler-server worker
+    node docker/entrypoint-worker.js
     ;;
 
   'verify-jobs' )
     echo "Starting jobs verification..."
-    yarn workspace @standardnotes/scheduler-server verify:jobs
+    node docker/entrypoint-verify.js
     ;;
 
    * )

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.16.19",
+  "version": "1.17.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/syncing-server/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.31.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.31.1...@standardnotes/syncing-server@1.31.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.31.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.31.0...@standardnotes/syncing-server@1.31.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+# [1.31.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.30.2...@standardnotes/syncing-server@1.31.0) (2023-02-15)
+
+### Features
+
+* optimize memory usage ([#444](https://github.com/standardnotes/syncing-server-js/issues/444)) ([fdf4b29](https://github.com/standardnotes/syncing-server-js/commit/fdf4b29ae2717e9b5d1fba2722beb7621a7e5c37))
+
 ## [1.30.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.30.1...@standardnotes/syncing-server@1.30.2) (2023-02-14)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/Dockerfile

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

packages/syncing-server/docker/entrypoint-content.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/content.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/syncing-server/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/syncing-server/docker/entrypoint.sh

@@ -4,25 +4,20 @@ set -e
 COMMAND=$1 && shift 1
 
 case "$COMMAND" in
-  'start-local')
-    echo "[Docker] Starting Web in Local Mode..."
-    yarn workspace @standardnotes/syncing-server start:local
-    ;;
-
   'start-web' )
     echo "[Docker] Starting Web..."
-    yarn workspace @standardnotes/syncing-server start
+    node docker/entrypoint-server.js
     ;;
 
   'start-worker' )
     echo "[Docker] Starting Worker..."
-    yarn workspace @standardnotes/syncing-server worker
+    node docker/entrypoint-worker.js
     ;;
 
   'content-size-recalculate' )
     echo "[Docker] Starting Content Size Recalculation..."
     USER_UUID=$1 && shift 1
-    yarn workspace @standardnotes/syncing-server content-size $USER_UUID
+    node docker/entrypoint-content.js $USER_UUID
     ;;
 
    * )

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.30.2",
+  "version": "1.31.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -19,14 +19,8 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "pretest": "yarn lint && yarn build",
     "test": "jest --coverage --config=./jest.config.js --maxWorkers=50%",
-    "wait-for:db": "docker/wait-for.sh $DB_HOST $DB_PORT",
-    "wait-for:cache": "docker/wait-for.sh $REDIS_HOST $REDIS_PORT",
-    "wait-for:infra": "yarn wait-for:db && yarn wait-for:cache",
-    "wait-for:syncing-server": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT",
     "start": "yarn node dist/bin/server.js",
-    "supervisor:start": "docker/wait-for.sh $DB_HOST $DB_PORT && docker/wait-for.sh $REDIS_HOST $REDIS_PORT && node dist/bin/server.js",
     "worker": "yarn node dist/bin/worker.js",
-    "supervisor:worker": "docker/wait-for.sh localhost $SYNCING_SERVER_PORT && node dist/bin/worker.js",
     "content-size": "yarn node dist/bin/content.js",
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },

packages/syncing-server/supervisor/supervisor-server.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 
 sh supervisor/wait-for.sh $DB_HOST $DB_PORT
 sh supervisor/wait-for.sh $REDIS_HOST $REDIS_PORT
-node supervisor/entrypoint-server.js
+node docker/entrypoint-server.js

packages/syncing-server/supervisor/supervisor-worker.sh

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
-node supervisor/entrypoint-worker.js
+node docker/entrypoint-worker.js

packages/websockets/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.6.1...@standardnotes/websockets-server@1.6.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.6.1](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.6.0...@standardnotes/websockets-server@1.6.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+# [1.6.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.5.20...@standardnotes/websockets-server@1.6.0) (2023-02-15)
+
+### Features
+
+* optimize memory on server utilities ([881a696](https://github.com/standardnotes/server/commit/881a6967aca57d68795af0792114f848ddddf120))
+
 ## [1.5.20](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.5.19...@standardnotes/websockets-server@1.5.20) (2023-02-06)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/Dockerfile

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

packages/websockets/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/websockets/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/websockets/docker/entrypoint.sh

@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-web' )
     echo "Starting Web..."
-    yarn workspace @standardnotes/websockets-server start
+    node docker/entrypoint-server.js
     ;;
 
   'start-worker' )
     echo "Starting Worker..."
-    yarn workspace @standardnotes/websockets-server worker
+    node docker/entrypoint-worker.js
     ;;
 
    * )

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.5.20",
+  "version": "1.6.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/workspace/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.2](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.20.1...@standardnotes/workspace-server@1.20.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
+## [1.20.1](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.20.0...@standardnotes/workspace-server@1.20.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
+# [1.20.0](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.19.23...@standardnotes/workspace-server@1.20.0) (2023-02-15)
+
+### Features
+
+* optimize memory on server utilities ([881a696](https://github.com/standardnotes/server/commit/881a6967aca57d68795af0792114f848ddddf120))
+
 ## [1.19.23](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.19.22...@standardnotes/workspace-server@1.19.23) (2023-02-06)
 
 **Note:** Version bump only for package @standardnotes/workspace-server

packages/workspace/Dockerfile

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

packages/workspace/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/workspace/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/workspace/docker/entrypoint.sh

@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-web' )
     echo "Starting Web..."
-    yarn workspace @standardnotes/workspace-server start
+    node docker/entrypoint-server.js
     ;;
 
   'start-worker' )
     echo "Starting Worker..."
-    yarn workspace @standardnotes/workspace-server worker
+    node docker/entrypoint-worker.js
     ;;
 
    * )

packages/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/workspace-server",
-  "version": "1.19.23",
+  "version": "1.20.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

yarn.lock

@@ -3368,8 +3368,6 @@ __metadata:
     "@typescript-eslint/eslint-plugin": "npm:^5.48.2"
     eslint-plugin-prettier: "npm:^4.2.1"
     jest: "npm:^29.1.2"
-    reflect-metadata: "npm:^0.1.13"
-    shallow-equal-object: "npm:^1.1.1"
     ts-jest: "npm:^29.0.3"
     typescript: "npm:^4.8.4"
     uuid: "npm:^9.0.0"
@@ -11075,13 +11073,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shallow-equal-object@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "shallow-equal-object@npm:1.1.1"
-  checksum: 9e5e0cd10ba5447f85038d7b104e66c15603e164b2112366f044f9447512bfb6f0b71bd9869e76824e76fae76568e94df3d9871bf5af8ab2ff78eee9487baecf
-  languageName: node
-  linkType: hard
-
 "shebang-command@npm:^2.0.0":
   version: 2.0.0
   resolution: "shebang-command@npm:2.0.0"