chore(release): publish new version

- @standardnotes/auth-server@1.82.2

.github/workflows/analytics.yml

@@ -11,19 +11,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_application_workflow:
-    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
+  call_server_utility_workflow:
+    name: Server Utility
+    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
     with:
       service_name: analytics
       workspace_name: "@standardnotes/analytics"
-      e2e_tag_parameter_name: analytics_image_tag
       deploy_web: false
       package_path: packages/analytics
     secrets: inherit
 
   newrelic:
-    needs: call_server_application_workflow
+    needs: call_server_utility_workflow
 
     runs-on: ubuntu-latest
 

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

@@ -0,0 +1,164 @@
+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/event-store.yml

@@ -11,19 +11,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_application_workflow:
-    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
+  call_server_utility_workflow:
+    name: Server Utility
+    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
     with:
       service_name: event-store
       workspace_name: "@standardnotes/event-store"
-      e2e_tag_parameter_name: event_store_image_tag
       deploy_web: false
       package_path: packages/event-store
     secrets: inherit
 
   newrelic:
-    needs: call_server_application_workflow
+    needs: call_server_utility_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/scheduler.yml

@@ -11,19 +11,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_application_workflow:
-    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
+  call_server_utility_workflow:
+    name: Server Utility
+    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
     with:
       service_name: scheduler
       workspace_name: "@standardnotes/scheduler-server"
-      e2e_tag_parameter_name: scheduler_image_tag
       deploy_web: false
       package_path: packages/scheduler
     secrets: inherit
 
   newrelic:
-    needs: call_server_application_workflow
+    needs: call_server_utility_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/websockets.yml

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

.github/workflows/workspace.yml

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

.pnp.cjs

@@ -2647,7 +2647,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mixpanel", "npm:0.17.0"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
@@ -2778,7 +2778,7 @@ const RAW_RUNTIME_STATE =
           ["inversify-express-utils", "npm:6.4.3"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["nodemon", "npm:2.0.20"],\
           ["npm-check-updates", "npm:16.0.1"],\
@@ -2924,7 +2924,7 @@ const RAW_RUNTIME_STATE =
           ["inversify", "npm:6.0.1"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
@@ -3127,7 +3127,7 @@ const RAW_RUNTIME_STATE =
           ["inversify-express-utils", "npm:6.4.3"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
@@ -3165,7 +3165,7 @@ const RAW_RUNTIME_STATE =
           ["inversify", "npm:6.0.1"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
@@ -3308,7 +3308,7 @@ const RAW_RUNTIME_STATE =
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:9.0.0"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["nodemon", "npm:2.0.20"],\
           ["npm-check-updates", "npm:16.0.1"],\
@@ -3396,7 +3396,7 @@ const RAW_RUNTIME_STATE =
           ["inversify-express-utils", "npm:6.4.3"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
@@ -3438,7 +3438,7 @@ const RAW_RUNTIME_STATE =
           ["inversify-express-utils", "npm:6.4.3"],\
           ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
@@ -10184,6 +10184,13 @@ const RAW_RUNTIME_STATE =
           ["long", "npm:4.0.0"]\
         ],\
         "linkType": "HARD"\
+      }],\
+      ["npm:5.2.1", {\
+        "packageLocation": "./.yarn/cache/long-npm-5.2.1-3a12730171-f81b18ff29.zip/node_modules/long/",\
+        "packageDependencies": [\
+          ["long", "npm:5.2.1"]\
+        ],\
+        "linkType": "HARD"\
       }]\
     ]],\
     ["lowercase-keys", [\
@@ -10203,15 +10210,6 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["lru-cache", [\
-      ["npm:4.1.5", {\
-        "packageLocation": "./.yarn/cache/lru-cache-npm-4.1.5-ede304cc43-796f26ad92.zip/node_modules/lru-cache/",\
-        "packageDependencies": [\
-          ["lru-cache", "npm:4.1.5"],\
-          ["pseudomap", "npm:1.0.2"],\
-          ["yallist", "npm:2.1.2"]\
-        ],\
-        "linkType": "HARD"\
-      }],\
       ["npm:6.0.0", {\
         "packageLocation": "./.yarn/cache/lru-cache-npm-6.0.0-b4c8668fe1-b2d72088dd.zip/node_modules/lru-cache/",\
         "packageDependencies": [\
@@ -10226,6 +10224,13 @@ const RAW_RUNTIME_STATE =
           ["lru-cache", "npm:7.12.0"]\
         ],\
         "linkType": "HARD"\
+      }],\
+      ["npm:7.14.1", {\
+        "packageLocation": "./.yarn/cache/lru-cache-npm-7.14.1-d3ba9407b6-e4c8c073d9.zip/node_modules/lru-cache/",\
+        "packageDependencies": [\
+          ["lru-cache", "npm:7.14.1"]\
+        ],\
+        "linkType": "HARD"\
       }]\
     ]],\
     ["lru_map", [\
@@ -10683,16 +10688,16 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["mysql2", [\
-      ["npm:2.3.3", {\
-        "packageLocation": "./.yarn/cache/mysql2-npm-2.3.3-fa543fff43-dda663a631.zip/node_modules/mysql2/",\
+      ["npm:3.0.1", {\
+        "packageLocation": "./.yarn/cache/mysql2-npm-3.0.1-ceda50bb4d-6bbee1ee05.zip/node_modules/mysql2/",\
         "packageDependencies": [\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["denque", "npm:2.1.0"],\
           ["generate-function", "npm:2.3.1"],\
           ["iconv-lite", "npm:0.6.3"],\
-          ["long", "npm:4.0.0"],\
-          ["lru-cache", "npm:6.0.0"],\
-          ["named-placeholders", "npm:1.1.2"],\
+          ["long", "npm:5.2.1"],\
+          ["lru-cache", "npm:7.14.1"],\
+          ["named-placeholders", "npm:1.1.3"],\
           ["seq-queue", "npm:0.0.5"],\
           ["sqlstring", "npm:2.3.3"]\
         ],\
@@ -10712,11 +10717,11 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["named-placeholders", [\
-      ["npm:1.1.2", {\
-        "packageLocation": "./.yarn/cache/named-placeholders-npm-1.1.2-5d4cbc92b0-24477df960.zip/node_modules/named-placeholders/",\
+      ["npm:1.1.3", {\
+        "packageLocation": "./.yarn/cache/named-placeholders-npm-1.1.3-1b385febe5-1cd77eb10c.zip/node_modules/named-placeholders/",\
         "packageDependencies": [\
-          ["named-placeholders", "npm:1.1.2"],\
-          ["lru-cache", "npm:4.1.5"]\
+          ["named-placeholders", "npm:1.1.3"],\
+          ["lru-cache", "npm:7.14.1"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -11880,15 +11885,6 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["pseudomap", [\
-      ["npm:1.0.2", {\
-        "packageLocation": "./.yarn/cache/pseudomap-npm-1.0.2-0d0e40fee0-33cfbb99ac.zip/node_modules/pseudomap/",\
-        "packageDependencies": [\
-          ["pseudomap", "npm:1.0.2"]\
-        ],\
-        "linkType": "HARD"\
-      }]\
-    ]],\
     ["pstree.remy", [\
       ["npm:1.1.8", {\
         "packageLocation": "./.yarn/cache/pstree.remy-npm-1.1.8-2dd5d55de2-f144e436fd.zip/node_modules/pstree.remy/",\
@@ -13846,7 +13842,7 @@ const RAW_RUNTIME_STATE =
           ["mkdirp", "npm:1.0.4"],\
           ["mongodb", null],\
           ["mssql", null],\
-          ["mysql2", "npm:2.3.3"],\
+          ["mysql2", "npm:3.0.1"],\
           ["oracledb", null],\
           ["pg", null],\
           ["pg-native", null],\
@@ -14547,13 +14543,6 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["yallist", [\
-      ["npm:2.1.2", {\
-        "packageLocation": "./.yarn/cache/yallist-npm-2.1.2-2e38c366a3-f3ace13bed.zip/node_modules/yallist/",\
-        "packageDependencies": [\
-          ["yallist", "npm:2.1.2"]\
-        ],\
-        "linkType": "HARD"\
-      }],\
       ["npm:4.0.0", {\
         "packageLocation": "./.yarn/cache/yallist-npm-4.0.0-b493d9e907-cd7fe32508.zip/node_modules/yallist/",\
         "packageDependencies": [\

packages/analytics/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.19.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.4...@standardnotes/analytics@2.19.5) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.19.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.3...@standardnotes/analytics@2.19.4) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/server/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
 ## [2.19.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.2...@standardnotes/analytics@2.19.3) (2023-01-16)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.19.3",
+  "version": "2.19.5",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -51,7 +51,7 @@
     "inversify": "^6.0.1",
     "ioredis": "^5.2.4",
     "mixpanel": "^0.17.0",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "reflect-metadata": "^0.1.13",
     "typeorm": "^0.3.10",

packages/analytics/src/Bootstrap/DataSource.ts

@@ -12,31 +12,41 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
 export const AppDataSource = new DataSource({
   type: 'mysql',
   charset: 'utf8mb4',
   supportBigNumbers: true,
   bigNumberStrings: false,
   maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
-      port: parseInt(env.get('DB_PORT')),
-      username: env.get('DB_USERNAME'),
-      password: env.get('DB_PASSWORD'),
-      database: env.get('DB_DATABASE'),
-    },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-  },
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [AnalyticsEntity, TypeORMRevenueModification],
   migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
   migrationsRun: true,

packages/auth/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.82.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.82.1...@standardnotes/auth-server@1.82.2) (2023-01-18)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.82.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.82.0...@standardnotes/auth-server@1.82.1) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.82.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.81.11...@standardnotes/auth-server@1.82.0) (2023-01-17)
+
+### Features
+
+* super editor permissions migration ([#414](https://github.com/standardnotes/server/issues/414)) ([7d45667](https://github.com/standardnotes/server/commit/7d456671c2b234f6570261b84d67fc3468cbc654))
+
+## [1.81.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.81.10...@standardnotes/auth-server@1.81.11) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/server/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
 ## [1.81.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.81.9...@standardnotes/auth-server@1.81.10) (2023-01-16)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/migrations/1673951291148-add_super_editor.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class addSuperEditor1673951291148 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      'INSERT INTO `permissions` (uuid, name) VALUES ("717ae814-a7f3-433c-a302-ea8736df3546", "editor:super-editor")',
+    )
+
+    // Pro User Permissions
+    await queryRunner.query(
+      'INSERT INTO `role_permissions` (role_uuid, permission_uuid) VALUES ("8047edbb-a10a-4ff8-8d53-c2cae600a8e8", "717ae814-a7f3-433c-a302-ea8736df3546")',
+    )
+
+    // Plus User Permissions
+    await queryRunner.query(
+      'INSERT INTO `role_permissions` (role_uuid, permission_uuid) VALUES ("dee6e144-724b-4450-86d1-cc784770b2e2", "717ae814-a7f3-433c-a302-ea8736df3546")',
+    )
+  }
+
+  public async down(): Promise<void> {
+    return
+  }
+}

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.81.10",
+  "version": "1.82.2",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -42,7 +42,7 @@
     "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
-    "@standardnotes/features": "^1.52.1",
+    "@standardnotes/features": "^1.58.0",
     "@standardnotes/predicates": "workspace:*",
     "@standardnotes/responses": "^1.6.39",
     "@standardnotes/security": "workspace:*",
@@ -60,7 +60,7 @@
     "inversify": "^6.0.1",
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.4",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "otplib": "12.0.1",
     "prettyjson": "^1.2.5",

packages/auth/src/Bootstrap/DataSource.ts

@@ -22,31 +22,41 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
 export const AppDataSource = new DataSource({
   type: 'mysql',
   charset: 'utf8mb4',
   supportBigNumbers: true,
   bigNumberStrings: false,
   maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
-      port: parseInt(env.get('DB_PORT')),
-      username: env.get('DB_USERNAME'),
-      password: env.get('DB_PASSWORD'),
-      database: env.get('DB_DATABASE'),
-    },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-  },
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [
     User,
     UserSubscription,

packages/event-store/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.
 
+## [1.6.59](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.58...@standardnotes/event-store@1.6.59) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.6.58](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.57...@standardnotes/event-store@1.6.58) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/server/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
 ## [1.6.57](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.6.56...@standardnotes/event-store@1.6.57) (2023-01-13)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.6.57",
+  "version": "1.6.59",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",
@@ -38,7 +38,7 @@
     "dotenv": "^16.0.1",
     "inversify": "^6.0.1",
     "ioredis": "^5.2.4",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "reflect-metadata": "0.1.13",
     "typeorm": "^0.3.10",

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

@@ -9,31 +9,41 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
 export const AppDataSource = new DataSource({
   type: 'mysql',
   charset: 'utf8mb4',
   supportBigNumbers: true,
   bigNumberStrings: false,
   maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
-      port: parseInt(env.get('DB_PORT')),
-      username: env.get('DB_USERNAME'),
-      password: env.get('DB_PASSWORD'),
-      database: env.get('DB_DATABASE'),
-    },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-  },
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [Event],
   migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
   migrationsRun: true,

packages/revisions/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.10.13](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.12...@standardnotes/revisions-server@1.10.13) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.10.12](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.11...@standardnotes/revisions-server@1.10.12) (2023-01-17)
+
+### Bug Fixes
+
+* **revisions:** fetching revisions metadata ([51c7773](https://github.com/standardnotes/server/commit/51c777304be96d317f95e9787b51e8489f9998b4))
+
+## [1.10.11](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.10...@standardnotes/revisions-server@1.10.11) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/server/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
+## [1.10.10](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.9...@standardnotes/revisions-server@1.10.10) (2023-01-17)
+
+### Bug Fixes
+
+* **revisions:** add debug logs for retrieving revisions metadata from mysql ([c579864](https://github.com/standardnotes/server/commit/c5798640fffbbf29f30db11dcc10b8cd3f11839e))
+
+## [1.10.9](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.8...@standardnotes/revisions-server@1.10.9) (2023-01-17)
+
+### Bug Fixes
+
+* **revisions:** response structure ([e2aae8a](https://github.com/standardnotes/server/commit/e2aae8ac8a98dff9f618709c33f7b80479747ec9))
+
 ## [1.10.8](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.7...@standardnotes/revisions-server@1.10.8) (2023-01-16)
 
 ### Bug Fixes

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.10.8",
+  "version": "1.10.13",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -40,7 +40,7 @@
     "inversify": "^6.0.1",
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.4",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "reflect-metadata": "0.1.13",
     "typeorm": "^0.3.10",

packages/revisions/src/Bootstrap/Container.ts

@@ -177,6 +177,7 @@ export class ContainerConfigLoader {
           container.get(TYPES.ORMRevisionRepository),
           container.get(TYPES.RevisionMetadataPersistenceMapper),
           container.get(TYPES.RevisionPersistenceMapper),
+          container.get(TYPES.Logger),
         ),
       )
     if (env.get('S3_AWS_REGION', true)) {

packages/revisions/src/Bootstrap/DataSource.ts

@@ -11,34 +11,45 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
-export const AppDataSource = new DataSource({
-  type: 'mysql',
-  charset: 'utf8mb4',
-  supportBigNumbers: true,
-  bigNumberStrings: false,
-  maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
       port: parseInt(env.get('DB_PORT')),
       username: env.get('DB_USERNAME'),
       password: env.get('DB_PASSWORD'),
       database: env.get('DB_DATABASE'),
     },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-    restoreNodeTimeout: 5,
-  },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
+const dataSource = new DataSource({
+  type: 'mysql',
+  charset: 'utf8mb4',
+  supportBigNumbers: true,
+  bigNumberStrings: false,
+  maxQueryExecutionTime,
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [TypeORMRevision],
   migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
   migrationsRun: true,
   logging: <LoggerOptions>env.get('DB_DEBUG_LEVEL'),
 })
+
+export const AppDataSource = dataSource

packages/revisions/src/Controller/RevisionsController.ts

@@ -63,12 +63,14 @@ export class RevisionsController {
       }
     }
 
+    const revisions = revisionMetadataOrError.getValue()
+
+    this.logger.debug(`Found ${revisions.length} revisions for item ${params.itemUuid}`)
+
     return {
       status: HttpStatusCode.Success,
       data: {
-        revisions: revisionMetadataOrError
-          .getValue()
-          .map((revision) => this.revisionMetadataHttpMapper.toProjection(revision)),
+        revisions: revisions.map((revision) => this.revisionMetadataHttpMapper.toProjection(revision)),
       },
     }
   }

packages/revisions/src/Infra/InversifyExpress/InversifyExpressRevisionsController.ts

@@ -18,7 +18,7 @@ export class InversifyExpressRevisionsController extends BaseHttpController {
       userUuid: response.locals.user.uuid,
     })
 
-    return this.json(result.data.error ? result.data : result.data.revisions, result.status)
+    return this.json(result.data, result.status)
   }
 
   @httpGet('/:uuid')
@@ -28,7 +28,7 @@ export class InversifyExpressRevisionsController extends BaseHttpController {
       userUuid: response.locals.user.uuid,
     })
 
-    return this.json(result.data.error ? result.data : result.data.revision, result.status)
+    return this.json(result.data, result.status)
   }
 
   @httpDelete('/:uuid')

packages/revisions/src/Infra/MySQL/MySQLRevisionRepository.ts

@@ -1,5 +1,6 @@
 import { MapperInterface, Uuid } from '@standardnotes/domain-core'
 import { Repository } from 'typeorm'
+import { Logger } from 'winston'
 
 import { Revision } from '../../Domain/Revision/Revision'
 import { RevisionMetadata } from '../../Domain/Revision/RevisionMetadata'
@@ -11,6 +12,7 @@ export class MySQLRevisionRepository implements RevisionRepositoryInterface {
     private ormRepository: Repository<TypeORMRevision>,
     private revisionMetadataMapper: MapperInterface<RevisionMetadata, TypeORMRevision>,
     private revisionMapper: MapperInterface<Revision, TypeORMRevision>,
+    private logger: Logger,
   ) {}
 
   async updateUserUuid(itemUuid: Uuid, userUuid: Uuid): Promise<void> {
@@ -92,7 +94,12 @@ export class MySQLRevisionRepository implements RevisionRepositoryInterface {
       .andWhere('user_uuid = :userUuid', { userUuid: userUuid.value })
       .orderBy('created_at', 'DESC')
 
-    const simplifiedRevisions = await queryBuilder.getMany()
+    const simplifiedRevisions = await queryBuilder.getRawMany()
+
+    this.logger.debug(
+      `Found ${simplifiedRevisions.length} revisions MySQL entries for item ${itemUuid.value}`,
+      simplifiedRevisions,
+    )
 
     const metadata = []
     for (const simplifiedRevision of simplifiedRevisions) {

packages/scheduler/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.
 
+## [1.16.9](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.16.8...@standardnotes/scheduler-server@1.16.9) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.16.8](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.16.7...@standardnotes/scheduler-server@1.16.8) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/server/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
 ## [1.16.7](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.16.6...@standardnotes/scheduler-server@1.16.7) (2023-01-16)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.16.7",
+  "version": "1.16.9",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -37,7 +37,7 @@
     "dotenv": "^16.0.1",
     "inversify": "^6.0.1",
     "ioredis": "^5.2.4",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "reflect-metadata": "^0.1.13",
     "typeorm": "^0.3.10",

packages/scheduler/src/Bootstrap/DataSource.ts

@@ -10,31 +10,41 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
 export const AppDataSource = new DataSource({
   type: 'mysql',
   charset: 'utf8mb4',
   supportBigNumbers: true,
   bigNumberStrings: false,
   maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
-      port: parseInt(env.get('DB_PORT')),
-      username: env.get('DB_USERNAME'),
-      password: env.get('DB_PASSWORD'),
-      database: env.get('DB_DATABASE'),
-    },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-  },
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [Job, Predicate],
   migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
   migrationsRun: true,

packages/syncing-server/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.29.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.28.10...@standardnotes/syncing-server@1.29.0) (2023-01-18)
+
+### Features
+
+* **syncing-server:** remove saving revisions in syncing-server database in favour of the revisions server ([7c393b1](https://github.com/standardnotes/syncing-server-js/commit/7c393b1125ee9838fd10ae9d3220f1da8790f94f))
+
+## [1.28.10](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.28.9...@standardnotes/syncing-server@1.28.10) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.28.9](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.28.8...@standardnotes/syncing-server@1.28.9) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/syncing-server-js/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
 ## [1.28.8](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.28.7...@standardnotes/syncing-server@1.28.8) (2023-01-17)
 
 ### Bug Fixes

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.28.8",
+  "version": "1.29.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -48,7 +48,7 @@
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.4",
     "jsonwebtoken": "^9.0.0",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "nodemon": "^2.0.19",
     "prettyjson": "^1.2.5",

packages/syncing-server/src/Bootstrap/DataSource.ts

@@ -10,32 +10,41 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
 export const AppDataSource = new DataSource({
   type: 'mysql',
   charset: 'utf8mb4',
   supportBigNumbers: true,
   bigNumberStrings: false,
   maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
-      port: parseInt(env.get('DB_PORT')),
-      username: env.get('DB_USERNAME'),
-      password: env.get('DB_PASSWORD'),
-      database: env.get('DB_DATABASE'),
-    },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-    restoreNodeTimeout: 5,
-  },
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [Item, Revision],
   migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
   migrationsRun: true,

packages/syncing-server/src/Domain/Handler/DuplicateItemSyncedEventHandler.spec.ts

@@ -9,12 +9,10 @@ import { Logger } from 'winston'
 import { Item } from '../Item/Item'
 import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
 import { DuplicateItemSyncedEventHandler } from './DuplicateItemSyncedEventHandler'
-import { RevisionServiceInterface } from '../Revision/RevisionServiceInterface'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
 
 describe('DuplicateItemSyncedEventHandler', () => {
   let itemRepository: ItemRepositoryInterface
-  let revisionService: RevisionServiceInterface
   let logger: Logger
   let duplicateItem: Item
   let originalItem: Item
@@ -23,13 +21,7 @@ describe('DuplicateItemSyncedEventHandler', () => {
   let domainEventPublisher: DomainEventPublisherInterface
 
   const createHandler = () =>
-    new DuplicateItemSyncedEventHandler(
-      itemRepository,
-      revisionService,
-      domainEventFactory,
-      domainEventPublisher,
-      logger,
-    )
+    new DuplicateItemSyncedEventHandler(itemRepository, domainEventFactory, domainEventPublisher, logger)
 
   beforeEach(() => {
     originalItem = {
@@ -50,9 +42,6 @@ describe('DuplicateItemSyncedEventHandler', () => {
     logger = {} as jest.Mocked<Logger>
     logger.warn = jest.fn()
 
-    revisionService = {} as jest.Mocked<RevisionServiceInterface>
-    revisionService.copyRevisions = jest.fn()
-
     event = {} as jest.Mocked<DuplicateItemSyncedEvent>
     event.createdAt = new Date(1)
     event.payload = {
@@ -72,7 +61,7 @@ describe('DuplicateItemSyncedEventHandler', () => {
   it('should copy revisions from original item to the duplicate item', async () => {
     await createHandler().handle(event)
 
-    expect(revisionService.copyRevisions).toHaveBeenCalledWith('1-2-3', '2-3-4')
+    expect(domainEventPublisher.publish).toHaveBeenCalled()
   })
 
   it('should not copy revisions if original item does not exist', async () => {
@@ -80,7 +69,7 @@ describe('DuplicateItemSyncedEventHandler', () => {
 
     await createHandler().handle(event)
 
-    expect(revisionService.copyRevisions).not.toHaveBeenCalled()
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
   it('should not copy revisions if duplicate item does not exist', async () => {
@@ -88,13 +77,13 @@ describe('DuplicateItemSyncedEventHandler', () => {
 
     await createHandler().handle(event)
 
-    expect(revisionService.copyRevisions).not.toHaveBeenCalled()
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 
   it('should not copy revisions if duplicate item is not pointing to duplicate anything', async () => {
     duplicateItem.duplicateOf = null
     await createHandler().handle(event)
 
-    expect(revisionService.copyRevisions).not.toHaveBeenCalled()
+    expect(domainEventPublisher.publish).not.toHaveBeenCalled()
   })
 })

packages/syncing-server/src/Domain/Handler/DuplicateItemSyncedEventHandler.ts

@@ -8,13 +8,11 @@ import { Logger } from 'winston'
 import TYPES from '../../Bootstrap/Types'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
 import { ItemRepositoryInterface } from '../Item/ItemRepositoryInterface'
-import { RevisionServiceInterface } from '../Revision/RevisionServiceInterface'
 
 @injectable()
 export class DuplicateItemSyncedEventHandler implements DomainEventHandlerInterface {
   constructor(
     @inject(TYPES.ItemRepository) private itemRepository: ItemRepositoryInterface,
-    @inject(TYPES.RevisionService) private revisionService: RevisionServiceInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -41,8 +39,6 @@ export class DuplicateItemSyncedEventHandler implements DomainEventHandlerInterf
     )
 
     if (existingOriginalItem !== null) {
-      await this.revisionService.copyRevisions(existingOriginalItem.uuid, item.uuid)
-
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createRevisionsCopyRequestedEvent(event.payload.userUuid, {
           originalItemUuid: existingOriginalItem.uuid,

packages/syncing-server/src/Domain/Item/ItemService.spec.ts

@@ -17,7 +17,6 @@ import { ItemConflict } from './ItemConflict'
 import { ItemTransferCalculatorInterface } from './ItemTransferCalculatorInterface'
 import { ProjectorInterface } from '../../Projection/ProjectorInterface'
 import { ItemProjection } from '../../Projection/ItemProjection'
-import { RevisionServiceInterface } from '../Revision/RevisionServiceInterface'
 
 describe('ItemService', () => {
   let itemRepository: ItemRepositoryInterface
@@ -39,7 +38,6 @@ describe('ItemService', () => {
   let timeHelper: Timer
   let itemTransferCalculator: ItemTransferCalculatorInterface
   let itemProjector: ProjectorInterface<Item, ItemProjection>
-  let revisionService: RevisionServiceInterface
   const maxItemsSyncLimit = 300
 
   const createService = () =>
@@ -47,7 +45,6 @@ describe('ItemService', () => {
       itemSaveValidator,
       itemFactory,
       itemRepository,
-      revisionService,
       domainEventPublisher,
       domainEventFactory,
       revisionFrequency,
@@ -125,9 +122,6 @@ describe('ItemService', () => {
     itemRepository.countAll = jest.fn().mockReturnValue(2)
     itemRepository.save = jest.fn().mockImplementation((item: Item) => item)
 
-    revisionService = {} as jest.Mocked<RevisionServiceInterface>
-    revisionService.createRevision = jest.fn()
-
     timer = {} as jest.Mocked<TimerInterface>
     timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1616164633241568)
     timer.getUTCDate = jest.fn().mockReturnValue(new Date())

packages/syncing-server/src/Domain/Item/ItemService.ts

@@ -22,7 +22,6 @@ import { ConflictType } from '@standardnotes/responses'
 import { ItemTransferCalculatorInterface } from './ItemTransferCalculatorInterface'
 import { ProjectorInterface } from '../../Projection/ProjectorInterface'
 import { ItemProjection } from '../../Projection/ItemProjection'
-import { RevisionServiceInterface } from '../Revision/RevisionServiceInterface'
 
 @injectable()
 export class ItemService implements ItemServiceInterface {
@@ -33,7 +32,6 @@ export class ItemService implements ItemServiceInterface {
     @inject(TYPES.ItemSaveValidator) private itemSaveValidator: ItemSaveValidatorInterface,
     @inject(TYPES.ItemFactory) private itemFactory: ItemFactoryInterface,
     @inject(TYPES.ItemRepository) private itemRepository: ItemRepositoryInterface,
-    @inject(TYPES.RevisionService) private revisionService: RevisionServiceInterface,
     @inject(TYPES.DomainEventPublisher) private domainEventPublisher: DomainEventPublisherInterface,
     @inject(TYPES.DomainEventFactory) private domainEventFactory: DomainEventFactoryInterface,
     @inject(TYPES.REVISIONS_FREQUENCY) private revisionFrequency: number,
@@ -253,8 +251,6 @@ export class ItemService implements ItemServiceInterface {
     const savedItem = await this.itemRepository.save(dto.existingItem)
 
     if (secondsFromLastUpdate >= this.revisionFrequency) {
-      await this.revisionService.createRevision(savedItem)
-
       if ([ContentType.Note, ContentType.File].includes(savedItem.contentType as ContentType)) {
         await this.domainEventPublisher.publish(
           this.domainEventFactory.createItemRevisionCreationRequested(savedItem.uuid, savedItem.userUuid),
@@ -276,8 +272,6 @@ export class ItemService implements ItemServiceInterface {
 
     const savedItem = await this.itemRepository.save(newItem)
 
-    await this.revisionService.createRevision(savedItem)
-
     if ([ContentType.Note, ContentType.File].includes(savedItem.contentType as ContentType)) {
       await this.domainEventPublisher.publish(
         this.domainEventFactory.createItemRevisionCreationRequested(savedItem.uuid, savedItem.userUuid),

packages/syncing-server/src/Domain/Revision/RevisionService.spec.ts

@@ -1,4 +1,6 @@
-import { ContentType, RoleName } from '@standardnotes/common'
+import 'reflect-metadata'
+
+import { RoleName } from '@standardnotes/common'
 import { TimerInterface } from '@standardnotes/time'
 
 import { Item } from '../Item/Item'
@@ -12,7 +14,6 @@ describe('RevisionService', () => {
   let revisionRepository: RevisionRepositoryInterface
   let timer: TimerInterface
   let itemRepository: ItemRepositoryInterface
-  let item: Item
   let revision1: Revision
   let revision2: Revision
 
@@ -54,15 +55,6 @@ describe('RevisionService', () => {
     revisionRepository.findMetadataByItemId = jest.fn().mockReturnValue([{} as jest.Mocked<RevisionMetadata>])
     revisionRepository.findOneById = jest.fn().mockReturnValue(revision1)
     revisionRepository.removeByUuid = jest.fn()
-
-    item = {
-      authHash: 'test-hash',
-      content: 'test-content',
-      contentType: ContentType.Note,
-      encItemKey: 'test-enc-item-key',
-      uuid: '1-2-3',
-      itemsKeyId: 'test-items-key-id',
-    } as jest.Mocked<Item>
   })
 
   it('should not remove a revision for a non existing item', async () => {
@@ -198,60 +190,4 @@ describe('RevisionService', () => {
 
     expect(revisionRepository.findMetadataByItemId).not.toHaveBeenCalled()
   })
-
-  it('should save a revision for a note item', async () => {
-    await createService().createRevision(item)
-
-    expect(revisionRepository.save).toHaveBeenCalledWith({
-      uuid: '3-4-5',
-      authHash: 'test-hash',
-      content: 'test-content',
-      contentType: 'Note',
-      encItemKey: 'test-enc-item-key',
-      item: Promise.resolve(item),
-      itemsKeyId: 'test-items-key-id',
-      createdAt: expect.any(Date),
-      creationDate: expect.any(Date),
-      updatedAt: expect.any(Date),
-    })
-  })
-
-  it('should not save a revision for a non note item', async () => {
-    item.contentType = ContentType.ItemsKey
-    await createService().createRevision(item)
-
-    expect(revisionRepository.save).not.toHaveBeenCalled()
-  })
-
-  it('should copy revisions from one item unto another', async () => {
-    revisionRepository.save = jest.fn().mockImplementation((revision) => revision)
-
-    await createService().copyRevisions('1-2-3', '2-3-4')
-
-    expect(revisionRepository.findByItemId).toHaveBeenCalledWith({ itemUuid: '1-2-3' })
-
-    expect(revisionRepository.save).toHaveBeenNthCalledWith(1, {
-      item: Promise.resolve(expect.any(Item)),
-      content: 'content1',
-      uuid: undefined,
-    })
-    expect(revisionRepository.save).toHaveBeenNthCalledWith(2, {
-      item: Promise.resolve(expect.any(Item)),
-      content: 'content2',
-      uuid: undefined,
-    })
-  })
-
-  it('should throw while copying revisions from one item unto another if the target item does not exist', async () => {
-    itemRepository.findByUuid = jest.fn().mockReturnValue(null)
-
-    let error = null
-    try {
-      await createService().copyRevisions('1-2-3', '2-3-4')
-    } catch (caughtError) {
-      error = caughtError
-    }
-
-    expect(error).not.toBeNull()
-  })
 })

packages/syncing-server/src/Domain/Revision/RevisionService.ts

@@ -1,9 +1,8 @@
 import { inject, injectable } from 'inversify'
-import { RoleName, ContentType } from '@standardnotes/common'
+import { RoleName } from '@standardnotes/common'
 import { TimerInterface } from '@standardnotes/time'
 
 import TYPES from '../../Bootstrap/Types'
-import { Item } from '../Item/Item'
 import { Revision } from './Revision'
 import { RevisionRepositoryInterface } from './RevisionRepositoryInterface'
 import { RevisionServiceInterface } from './RevisionServiceInterface'
@@ -58,53 +57,6 @@ export class RevisionService implements RevisionServiceInterface {
     return revision
   }
 
-  async copyRevisions(fromItemUuid: string, toItemUuid: string): Promise<void> {
-    const revisions = await this.revisionRepository.findByItemId({
-      itemUuid: fromItemUuid,
-    })
-
-    const toItem = await this.itemRepository.findByUuid(toItemUuid)
-    if (toItem === null) {
-      throw Error(`Item ${toItemUuid} does not exist`)
-    }
-
-    for (const existingRevision of revisions) {
-      const revisionCopy = new Revision()
-      revisionCopy.authHash = existingRevision.authHash
-      revisionCopy.content = existingRevision.content
-      revisionCopy.contentType = existingRevision.contentType
-      revisionCopy.encItemKey = existingRevision.encItemKey
-      revisionCopy.item = Promise.resolve(toItem)
-      revisionCopy.itemsKeyId = existingRevision.itemsKeyId
-      revisionCopy.creationDate = existingRevision.creationDate
-      revisionCopy.createdAt = existingRevision.createdAt
-      revisionCopy.updatedAt = existingRevision.updatedAt
-
-      await this.revisionRepository.save(revisionCopy)
-    }
-  }
-
-  async createRevision(item: Item): Promise<void> {
-    if (![ContentType.Note, ContentType.File].includes(item.contentType as ContentType)) {
-      return
-    }
-
-    const now = new Date()
-
-    const revision = new Revision()
-    revision.authHash = item.authHash
-    revision.content = item.content
-    revision.contentType = item.contentType
-    revision.encItemKey = item.encItemKey
-    revision.item = Promise.resolve(item)
-    revision.itemsKeyId = item.itemsKeyId
-    revision.creationDate = now
-    revision.createdAt = now
-    revision.updatedAt = now
-
-    await this.revisionRepository.save(revision)
-  }
-
   calculateRequiredRoleBasedOnRevisionDate(createdAt: Date): RoleName {
     const revisionCreatedNDaysAgo = this.timer.dateWasNDaysAgo(createdAt)
 

packages/syncing-server/src/Domain/Revision/RevisionServiceInterface.ts

@@ -1,11 +1,8 @@
 import { RoleName } from '@standardnotes/common'
-import { Item } from '../Item/Item'
 import { Revision } from './Revision'
 import { RevisionMetadata } from './RevisionMetadata'
 
 export interface RevisionServiceInterface {
-  createRevision(item: Item): Promise<void>
-  copyRevisions(fromItemUuid: string, toItemUuid: string): Promise<void>
   getRevisionsMetadata(userUuid: string, itemUuid: string): Promise<RevisionMetadata[]>
   getRevision(dto: {
     userUuid: string

packages/websockets/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.5.5](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.5.4...@standardnotes/websockets-server@1.5.5) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.5.4](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.5.3...@standardnotes/websockets-server@1.5.4) (2023-01-13)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -37,7 +37,7 @@
     "inversify": "^6.0.1",
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.4",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "reflect-metadata": "0.1.13",
     "typeorm": "^0.3.10",

packages/workspace/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.
 
+## [1.19.8](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.19.7...@standardnotes/workspace-server@1.19.8) (2023-01-17)
+
+**Note:** Version bump only for package @standardnotes/workspace-server
+
+## [1.19.7](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.19.6...@standardnotes/workspace-server@1.19.7) (2023-01-17)
+
+### Bug Fixes
+
+* allow to run typeorm in non-replica mode ([f73129c](https://github.com/standardnotes/server/commit/f73129cd7e7d6a9b8a63e5c80284467597557982))
+
 ## [1.19.6](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.19.5...@standardnotes/workspace-server@1.19.6) (2023-01-16)
 
 **Note:** Version bump only for package @standardnotes/workspace-server

packages/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/workspace-server",
-  "version": "1.19.6",
+  "version": "1.19.8",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },
@@ -39,7 +39,7 @@
     "inversify": "^6.0.1",
     "inversify-express-utils": "^6.4.3",
     "ioredis": "^5.2.4",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.0.1",
     "newrelic": "^9.6.0",
     "reflect-metadata": "0.1.13",
     "typeorm": "^0.3.10",

packages/workspace/src/Bootstrap/DataSource.ts

@@ -11,31 +11,41 @@ const maxQueryExecutionTime = env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   ? +env.get('DB_MAX_QUERY_EXECUTION_TIME', true)
   : 45_000
 
+const inReplicaMode = env.get('DB_REPLICA_HOST', true) ? true : false
+
+const replicationConfig = {
+  master: {
+    host: env.get('DB_HOST'),
+    port: parseInt(env.get('DB_PORT')),
+    username: env.get('DB_USERNAME'),
+    password: env.get('DB_PASSWORD'),
+    database: env.get('DB_DATABASE'),
+  },
+  slaves: [
+    {
+      host: env.get('DB_REPLICA_HOST', true),
+      port: parseInt(env.get('DB_PORT')),
+      username: env.get('DB_USERNAME'),
+      password: env.get('DB_PASSWORD'),
+      database: env.get('DB_DATABASE'),
+    },
+  ],
+  removeNodeErrorCount: 10,
+  restoreNodeTimeout: 5,
+}
+
 export const AppDataSource = new DataSource({
   type: 'mysql',
   charset: 'utf8mb4',
   supportBigNumbers: true,
   bigNumberStrings: false,
   maxQueryExecutionTime,
-  replication: {
-    master: {
-      host: env.get('DB_HOST'),
-      port: parseInt(env.get('DB_PORT')),
-      username: env.get('DB_USERNAME'),
-      password: env.get('DB_PASSWORD'),
-      database: env.get('DB_DATABASE'),
-    },
-    slaves: [
-      {
-        host: env.get('DB_REPLICA_HOST'),
-        port: parseInt(env.get('DB_PORT')),
-        username: env.get('DB_USERNAME'),
-        password: env.get('DB_PASSWORD'),
-        database: env.get('DB_DATABASE'),
-      },
-    ],
-    removeNodeErrorCount: 10,
-  },
+  replication: inReplicaMode ? replicationConfig : undefined,
+  host: inReplicaMode ? undefined : env.get('DB_HOST'),
+  port: inReplicaMode ? undefined : parseInt(env.get('DB_PORT')),
+  username: inReplicaMode ? undefined : env.get('DB_USERNAME'),
+  password: inReplicaMode ? undefined : env.get('DB_PASSWORD'),
+  database: inReplicaMode ? undefined : env.get('DB_DATABASE'),
   entities: [Workspace, WorkspaceUser, WorkspaceInvite],
   migrations: [env.get('DB_MIGRATIONS_PATH', true) ?? 'dist/migrations/*.js'],
   migrationsRun: true,

yarn.lock

@@ -1893,7 +1893,7 @@ __metadata:
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
     mixpanel: "npm:^0.17.0"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     reflect-metadata: "npm:^0.1.13"
     ts-jest: "npm:^29.0.3"
@@ -2008,7 +2008,7 @@ __metadata:
     inversify-express-utils: "npm:^6.4.3"
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     nodemon: "npm:^2.0.19"
     npm-check-updates: "npm:^16.0.1"
@@ -2152,7 +2152,7 @@ __metadata:
     inversify: "npm:^6.0.1"
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     reflect-metadata: "npm:0.1.13"
     ts-jest: "npm:^29.0.3"
@@ -2348,7 +2348,7 @@ __metadata:
     inversify-express-utils: "npm:^6.4.3"
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     npm-check-updates: "npm:^16.0.1"
     reflect-metadata: "npm:0.1.13"
@@ -2384,7 +2384,7 @@ __metadata:
     inversify: "npm:^6.0.1"
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     npm-check-updates: "npm:^16.0.1"
     reflect-metadata: "npm:^0.1.13"
@@ -2516,7 +2516,7 @@ __metadata:
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
     jsonwebtoken: "npm:^9.0.0"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     nodemon: "npm:^2.0.19"
     npm-check-updates: "npm:^16.0.1"
@@ -2600,7 +2600,7 @@ __metadata:
     inversify-express-utils: "npm:^6.4.3"
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     reflect-metadata: "npm:0.1.13"
     ts-jest: "npm:^29.0.3"
@@ -2640,7 +2640,7 @@ __metadata:
     inversify-express-utils: "npm:^6.4.3"
     ioredis: "npm:^5.2.4"
     jest: "npm:^29.1.2"
-    mysql2: "npm:^2.3.3"
+    mysql2: "npm:^3.0.1"
     newrelic: "npm:^9.6.0"
     reflect-metadata: "npm:0.1.13"
     ts-jest: "npm:^29.0.3"
@@ -4930,7 +4930,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"denque@npm:^2.0.1":
+"denque@npm:^2.0.1, denque@npm:^2.1.0":
   version: 2.1.0
   resolution: "denque@npm:2.1.0"
   checksum: 7e1c278144b7c5047ff46783edf7d736193644abbdea1c788e1b686b402b7669fcf417e168c9a9ccd8a346ff0d1e1b15696177e2b231fd1af66ee03c072b4066
@@ -8109,6 +8109,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"long@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "long@npm:5.2.1"
+  checksum: f81b18ff295bd2c97e6704ba9d38d787db014e26ccdb897f37a4448d8562a2fdd040bc19ba8aa20708cfd369fa051a001e22e23dbcf0fc85fcb8968e11ce1ee3
+  languageName: node
+  linkType: hard
+
 "lowercase-keys@npm:^2.0.0":
   version: 2.0.0
   resolution: "lowercase-keys@npm:2.0.0"
@@ -8123,16 +8130,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^4.1.3":
-  version: 4.1.5
-  resolution: "lru-cache@npm:4.1.5"
-  dependencies:
-    pseudomap: "npm:^1.0.2"
-    yallist: "npm:^2.1.2"
-  checksum: 796f26ad9207f9f8654ff8784dcfcb6b86ec3fc5110389eb03ac0e898da22af566cefd5821062e3edba267ae869f86078aa9b74e5b74962c7cf8f943182f87dc
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^6.0.0":
   version: 6.0.0
   resolution: "lru-cache@npm:6.0.0"
@@ -8142,6 +8139,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^7.14.1":
+  version: 7.14.1
+  resolution: "lru-cache@npm:7.14.1"
+  checksum: e4c8c073d9632585dde73bb2c857c22866f61f3ee75fea6e1dcc5412b59eca4107bc511c4b4ae4e038c7f59a15488b67448b24a3a1154def46c8ab1d07935d85
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
   version: 7.12.0
   resolution: "lru-cache@npm:7.12.0"
@@ -8553,19 +8557,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mysql2@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "mysql2@npm:2.3.3"
+"mysql2@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "mysql2@npm:3.0.1"
   dependencies:
-    denque: "npm:^2.0.1"
+    denque: "npm:^2.1.0"
     generate-function: "npm:^2.3.1"
     iconv-lite: "npm:^0.6.3"
-    long: "npm:^4.0.0"
-    lru-cache: "npm:^6.0.0"
-    named-placeholders: "npm:^1.1.2"
+    long: "npm:^5.2.1"
+    lru-cache: "npm:^7.14.1"
+    named-placeholders: "npm:^1.1.3"
     seq-queue: "npm:^0.0.5"
     sqlstring: "npm:^2.3.2"
-  checksum: dda663a63195f6e7336155e585b185ce5c64e810d8f1b51969c7fa5bf2bb29dabde4fd7b81b5872812728fd4e32c4fdf3421bad7325fc8e80525b4df184d27f7
+  checksum: 6bbee1ee05826ef665ef01b3a9ebeb5e811a3b793f4dacc5ae8faf86c5756fc7c8549715fdd6640bb33bd2771e42ce68d94819637339367761b3d64ae687bcb7
   languageName: node
   linkType: hard
 
@@ -8580,12 +8584,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"named-placeholders@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "named-placeholders@npm:1.1.2"
+"named-placeholders@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "named-placeholders@npm:1.1.3"
   dependencies:
-    lru-cache: "npm:^4.1.3"
-  checksum: 24477df960b120c1eb814efbeb7d7b6e859b788b922129f43f48ee95ae89a14e249dd37d67594cbb30dcea9283e9af40fc526e615c57b2a30788b63e497baba0
+    lru-cache: "npm:^7.14.1"
+  checksum: 1cd77eb10c4b2cc9b9d0a9d014542df5cda61118e682cffccc896769f74cf17f46225205d868be6a7c4aad7ae92ede7f1d435a76314f1a1c07618ff29fe7a9d5
   languageName: node
   linkType: hard
 
@@ -9636,13 +9640,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pseudomap@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "pseudomap@npm:1.0.2"
-  checksum: 33cfbb99ac85cfad587ebd29aef15343a570aa2208fa68a3036ee317ef2ef4345cf1a20f7311177393558937cafdf981be4c125e47a90cbd7400d942352239a4
-  languageName: node
-  linkType: hard
-
 "pstree.remy@npm:^1.1.8":
   version: 1.1.8
   resolution: "pstree.remy@npm:1.1.8"
@@ -11964,13 +11961,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "yallist@npm:2.1.2"
-  checksum: f3ace13bed59d5f6cf13142e65482c0992f0ed3ef2c9e20331efe44774586fc5eb9cb80dd431118948a5366f351afabc48d1572a636ce1ef45f57b8cb93340be
-  languageName: node
-  linkType: hard
-
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"