chore(release): publish new version

- @standardnotes/revisions-server@1.10.12

.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:

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.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
+
 ## [2.19.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.1...@standardnotes/analytics@2.19.2) (2023-01-13)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

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

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,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
 ## [1.81.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.81.8...@standardnotes/auth-server@1.81.9) (2023-01-13)
 
 **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.9",
+  "version": "1.82.0",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

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/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.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.11.0...@standardnotes/domain-core@1.11.1) (2023-01-16)
+
+### Bug Fixes
+
+* **revisions:** add required role to revisions list response ([e7beee2](https://github.com/standardnotes/server/commit/e7beee278871d2939b058d842404fd6980d7f48a))
+
 # [1.11.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.10.0...@standardnotes/domain-core@1.11.0) (2022-12-15)
 
 ### Features

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/domain-core/src/Domain/UseCase/SyncUseCaseInterface.ts

@@ -0,0 +1,5 @@
+import { Result } from '../Core/Result'
+
+export interface SyncUseCaseInterface<T> {
+  execute(...args: any[]): Result<T>
+}

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

@@ -35,4 +35,5 @@ export * from './Mapping/MapperInterface'
 export * from './Subscription/SubscriptionPlanName'
 export * from './Subscription/SubscriptionPlanNameProps'
 
+export * from './UseCase/SyncUseCaseInterface'
 export * from './UseCase/UseCaseInterface'

packages/event-store/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.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.58",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",

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,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+* **revisions:** add required role to revisions list response ([e7beee2](https://github.com/standardnotes/server/commit/e7beee278871d2939b058d842404fd6980d7f48a))
+
+## [1.10.7](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.6...@standardnotes/revisions-server@1.10.7) (2023-01-16)
+
+### Bug Fixes
+
+* **revisions:** remove redundant specs ([11b8b07](https://github.com/standardnotes/server/commit/11b8b078b4c72f393fd4e555501242ffe22cc06f))
+
 ## [1.10.6](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.10.5...@standardnotes/revisions-server@1.10.6) (2023-01-16)
 
 ### Bug Fixes

packages/revisions/jest.config.js

@@ -7,5 +7,5 @@ module.exports = {
   transform: {
     ...tsjPreset.transform,
   },
-  coveragePathIgnorePatterns: ['/Bootstrap/', 'HealthCheckController', '/Infra/', '/Mapping/'],
+  coveragePathIgnorePatterns: ['/Bootstrap/', '/Controller/', 'HealthCheckController', '/Infra/', '/Mapping/'],
 }

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.10.6",
+  "version": "1.10.12",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/revisions/src/Bootstrap/Container.ts

@@ -44,6 +44,8 @@ import { CopyRevisions } from '../Domain/UseCase/CopyRevisions/CopyRevisions'
 import { RevisionsOwnershipUpdateRequestedEventHandler } from '../Domain/Handler/RevisionsOwnershipUpdateRequestedEventHandler'
 import { RevisionHttpMapper } from '../Mapping/RevisionHttpMapper'
 import { RevisionMetadataHttpMapper } from '../Mapping/RevisionMetadataHttpMapper'
+import { GetRequiredRoleToViewRevision } from '../Domain/UseCase/GetRequiredRoleToViewRevision/GetRequiredRoleToViewRevision'
+import { Timer, TimerInterface } from '@standardnotes/time'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -104,6 +106,12 @@ export class ContainerConfigLoader {
     }
     container.bind<AWS.S3 | undefined>(TYPES.S3).toConstantValue(s3Client)
 
+    container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
+
+    container
+      .bind<GetRequiredRoleToViewRevision>(TYPES.GetRequiredRoleToViewRevision)
+      .toConstantValue(new GetRequiredRoleToViewRevision(container.get(TYPES.Timer)))
+
     // Map
     container
       .bind<MapperInterface<RevisionMetadata, TypeORMRevision>>(TYPES.RevisionMetadataPersistenceMapper)
@@ -144,7 +152,7 @@ export class ContainerConfigLoader {
           }
         >
       >(TYPES.RevisionMetadataHttpMapper)
-      .toConstantValue(new RevisionMetadataHttpMapper())
+      .toConstantValue(new RevisionMetadataHttpMapper(container.get(TYPES.GetRequiredRoleToViewRevision)))
 
     // ORM
     container
@@ -169,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/Bootstrap/Types.ts

@@ -30,6 +30,7 @@ const TYPES = {
   GetRevision: Symbol.for('GetRevision'),
   DeleteRevision: Symbol.for('DeleteRevision'),
   CopyRevisions: Symbol.for('CopyRevisions'),
+  GetRequiredRoleToViewRevision: Symbol.for('GetRequiredRoleToViewRevision'),
   // Controller
   RevisionsController: Symbol.for('RevisionsController'),
   // Handlers

packages/revisions/src/Controller/RevisionsController.spec.ts

@@ -1,70 +0,0 @@
-import { Result } from '@standardnotes/domain-core'
-import { Logger } from 'winston'
-
-import { DeleteRevision } from '../Domain/UseCase/DeleteRevision/DeleteRevision'
-import { GetRevision } from '../Domain/UseCase/GetRevision/GetRevision'
-import { GetRevisionsMetada } from '../Domain/UseCase/GetRevisionsMetada/GetRevisionsMetada'
-
-import { RevisionsController } from './RevisionsController'
-
-describe('RevisionsController', () => {
-  let getRevisionsMetadata: GetRevisionsMetada
-  let getRevision: GetRevision
-  let deleteRevision: DeleteRevision
-  let logger: Logger
-
-  const createController = () => new RevisionsController(getRevisionsMetadata, getRevision, deleteRevision, logger)
-
-  beforeEach(() => {
-    getRevisionsMetadata = {} as jest.Mocked<GetRevisionsMetada>
-    getRevisionsMetadata.execute = jest.fn().mockReturnValue(Result.ok())
-
-    getRevision = {} as jest.Mocked<GetRevision>
-    getRevision.execute = jest.fn().mockReturnValue(Result.ok())
-
-    deleteRevision = {} as jest.Mocked<DeleteRevision>
-    deleteRevision.execute = jest.fn().mockReturnValue(Result.ok())
-
-    logger = {} as jest.Mocked<Logger>
-    logger.warn = jest.fn()
-  })
-
-  it('should get revisions list', async () => {
-    const response = await createController().getRevisions({ itemUuid: '1-2-3', userUuid: '1-2-3' })
-
-    expect(response.status).toEqual(200)
-  })
-
-  it('should indicate failure to get revisions list', async () => {
-    getRevisionsMetadata.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
-    const response = await createController().getRevisions({ itemUuid: '1-2-3', userUuid: '1-2-3' })
-
-    expect(response.status).toEqual(400)
-  })
-
-  it('should get revision', async () => {
-    const response = await createController().getRevision({ revisionUuid: '1-2-3', userUuid: '1-2-3' })
-
-    expect(response.status).toEqual(200)
-  })
-
-  it('should indicate failure to get revision', async () => {
-    getRevision.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
-    const response = await createController().getRevision({ revisionUuid: '1-2-3', userUuid: '1-2-3' })
-
-    expect(response.status).toEqual(400)
-  })
-
-  it('should delete revision', async () => {
-    const response = await createController().deleteRevision({ revisionUuid: '1-2-3', userUuid: '1-2-3' })
-
-    expect(response.status).toEqual(200)
-  })
-
-  it('should indicate failure to delete revision', async () => {
-    deleteRevision.execute = jest.fn().mockReturnValue(Result.fail('Oops'))
-    const response = await createController().deleteRevision({ revisionUuid: '1-2-3', userUuid: '1-2-3' })
-
-    expect(response.status).toEqual(400)
-  })
-})

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/Domain/UseCase/GetRequiredRoleToViewRevision/GetRequiredRoleToViewRevision.spec.ts

@@ -0,0 +1,43 @@
+import { TimerInterface } from '@standardnotes/time'
+
+import { GetRequiredRoleToViewRevision } from './GetRequiredRoleToViewRevision'
+
+describe('GetRequiredRoleToViewRevision', () => {
+  let timer: TimerInterface
+
+  const createUseCase = () => new GetRequiredRoleToViewRevision(timer)
+
+  beforeEach(() => {
+    timer = {} as jest.Mocked<TimerInterface>
+  })
+
+  it('should return CoreUser if revision was created less than 30 days ago', () => {
+    timer.dateWasNDaysAgo = jest.fn().mockReturnValue(29)
+
+    const useCase = createUseCase()
+
+    const result = useCase.execute({ createdAt: new Date() })
+
+    expect(result.getValue()).toEqual('CORE_USER')
+  })
+
+  it('should return PlusUser if revision was created more than 30 days ago and less than 365 days ago', () => {
+    timer.dateWasNDaysAgo = jest.fn().mockReturnValue(31)
+
+    const useCase = createUseCase()
+
+    const result = useCase.execute({ createdAt: new Date() })
+
+    expect(result.getValue()).toEqual('PLUS_USER')
+  })
+
+  it('should return ProUser if revision was created more than 365 days ago', () => {
+    timer.dateWasNDaysAgo = jest.fn().mockReturnValue(366)
+
+    const useCase = createUseCase()
+
+    const result = useCase.execute({ createdAt: new Date() })
+
+    expect(result.getValue()).toEqual('PRO_USER')
+  })
+})

packages/revisions/src/Domain/UseCase/GetRequiredRoleToViewRevision/GetRequiredRoleToViewRevision.ts

@@ -0,0 +1,22 @@
+import { Result, RoleName, SyncUseCaseInterface } from '@standardnotes/domain-core'
+import { TimerInterface } from '@standardnotes/time'
+
+import { GetRequiredRoleToViewRevisionDTO } from './GetRequiredRoleToViewRevisionDTO'
+
+export class GetRequiredRoleToViewRevision implements SyncUseCaseInterface<string> {
+  constructor(private timer: TimerInterface) {}
+
+  execute(dto: GetRequiredRoleToViewRevisionDTO): Result<string> {
+    const revisionCreatedNDaysAgo = this.timer.dateWasNDaysAgo(dto.createdAt)
+
+    if (revisionCreatedNDaysAgo > 30 && revisionCreatedNDaysAgo < 365) {
+      return Result.ok(RoleName.NAMES.PlusUser)
+    }
+
+    if (revisionCreatedNDaysAgo > 365) {
+      return Result.ok(RoleName.NAMES.ProUser)
+    }
+
+    return Result.ok(RoleName.NAMES.CoreUser)
+  }
+}

packages/revisions/src/Domain/UseCase/GetRequiredRoleToViewRevision/GetRequiredRoleToViewRevisionDTO.ts

@@ -0,0 +1,3 @@
+export interface GetRequiredRoleToViewRevisionDTO {
+  createdAt: Date
+}

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/revisions/src/Mapping/RevisionMetadataHttpMapper.ts

@@ -1,4 +1,4 @@
-import { MapperInterface } from '@standardnotes/domain-core'
+import { MapperInterface, SyncUseCaseInterface } from '@standardnotes/domain-core'
 
 import { RevisionMetadata } from '../Domain/Revision/RevisionMetadata'
 
@@ -11,14 +11,18 @@ export class RevisionMetadataHttpMapper
         content_type: string
         created_at: string
         updated_at: string
+        required_role: string
       }
     >
 {
+  constructor(private getRequiredRoleToViewRevision: SyncUseCaseInterface<string>) {}
+
   toDomain(_projection: {
     uuid: string
     content_type: string
     created_at: string
     updated_at: string
+    required_role: string
   }): RevisionMetadata {
     throw new Error('Method not implemented.')
   }
@@ -28,12 +32,14 @@ export class RevisionMetadataHttpMapper
     content_type: string
     created_at: string
     updated_at: string
+    required_role: string
   } {
     return {
       uuid: domain.id.toString(),
       content_type: domain.props.contentType.value as string,
       created_at: domain.props.dates.createdAt.toISOString(),
       updated_at: domain.props.dates.updatedAt.toISOString(),
+      required_role: this.getRequiredRoleToViewRevision.execute({ createdAt: domain.props.dates.createdAt }).getValue(),
     }
   }
 }

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.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
+
 ## [1.16.6](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.16.5...@standardnotes/scheduler-server@1.16.6) (2023-01-13)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

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

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,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+* **syncing-server-js:** add debug logs for dumping items for revisions creation ([8db19c3](https://github.com/standardnotes/syncing-server-js/commit/8db19c3e2b55af9230b92621f01ae0d7c514913a))
+* **syncing-server-js:** creating directory for revision dumps ([9b926fb](https://github.com/standardnotes/syncing-server-js/commit/9b926fbad6c40a2e3792cc0d7c54987febd6dced))
+
+## [1.28.7](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.28.6...@standardnotes/syncing-server@1.28.7) (2023-01-16)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.28.6](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.28.5...@standardnotes/syncing-server@1.28.6) (2023-01-13)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.28.6",
+  "version": "1.28.9",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

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/Infra/FS/FSItemBackupService.ts

@@ -2,6 +2,8 @@ import { KeyParamsData } from '@standardnotes/responses'
 import { promises } from 'fs'
 import * as uuid from 'uuid'
 import { inject, injectable } from 'inversify'
+import { Logger } from 'winston'
+import { dirname } from 'path'
 
 import TYPES from '../../Bootstrap/Types'
 import { Item } from '../../Domain/Item/Item'
@@ -14,6 +16,7 @@ export class FSItemBackupService implements ItemBackupServiceInterface {
   constructor(
     @inject(TYPES.FILE_UPLOAD_PATH) private fileUploadPath: string,
     @inject(TYPES.ItemProjector) private itemProjector: ProjectorInterface<Item, ItemProjection>,
+    @inject(TYPES.Logger) private logger: Logger,
   ) {}
 
   async backup(_items: Item[], _authParams: KeyParamsData): Promise<string> {
@@ -27,6 +30,10 @@ export class FSItemBackupService implements ItemBackupServiceInterface {
 
     const path = `${this.fileUploadPath}/dumps/${uuid.v4()}`
 
+    this.logger.debug(`Dumping item ${item.uuid} to ${path}`)
+
+    await promises.mkdir(dirname(path), { recursive: true })
+
     await promises.writeFile(path, contents)
 
     return path

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.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
+
 ## [1.19.5](https://github.com/standardnotes/server/compare/@standardnotes/workspace-server@1.19.4...@standardnotes/workspace-server@1.19.5) (2023-01-13)
 
 **Note:** Version bump only for package @standardnotes/workspace-server

packages/workspace/package.json

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

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,