chore(release): publish new version

- @standardnotes/home-server@1.15.24
 - @standardnotes/revisions-server@1.30.14
 - @standardnotes/syncing-server@1.91.3

.github/dependabot.yml

@@ -30,6 +30,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/domain-core"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/domain-events"
     schedule:
@@ -50,6 +55,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/home-server"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/predicates"
     schedule:

.github/workflows/common-deploy.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v3
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

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

@@ -70,7 +70,7 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v3
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -90,7 +90,7 @@ jobs:
       uses: docker/setup-buildx-action@master
 
     - name: Publish Docker image
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v4
       with:
         builder: ${{ steps.buildx.outputs.name }}
         context: ${{ steps.bundle-dir.outputs.temp_dir }}

.github/workflows/common-e2e.yml

@@ -21,7 +21,7 @@ jobs:
   e2e:
     name: (Self Hosting) E2E Test Suite
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         secondary_db_enabled: [true, false]
         transition_mode_enabled: [true, false]
@@ -57,7 +57,7 @@ jobs:
       run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
 
     - name: Run E2E Test Suite
-      run: yarn dlx mocha-headless-chrome --timeout 1800000 -f http://localhost:9001/mocha/test.html
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
 
     - name: Show logs on failure
       if: ${{ failure() }}
@@ -70,7 +70,7 @@ jobs:
   e2e-home-server:
     name: (Home Server) E2E Test Suite
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         db_type: [mysql, sqlite]
         cache_type: [redis, memory]
@@ -162,7 +162,7 @@ jobs:
       run: for i in {1..30}; do curl -s http://localhost:3123/healthcheck && break || sleep 1; done
 
     - name: Run E2E Test Suite
-      run: yarn dlx mocha-headless-chrome --timeout 1800000 -f http://localhost:9001/mocha/test.html
+      run: yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html
 
     - name: Show logs on failure
       if: ${{ failure() }}

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

@@ -35,7 +35,7 @@ jobs:
       uses: docker/setup-buildx-action@master
 
     - name: Publish Docker image
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v4
       with:
         builder: ${{ steps.buildx.outputs.name }}
         context: .

docker/localstack_bootstrap.sh

@@ -122,6 +122,10 @@ echo "linking topic $FILES_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
 LINKING_RESULT=$(link_queue_and_topic $FILES_TOPIC_ARN $AUTH_QUEUE_ARN)
 echo "linking done:"
 echo "$LINKING_RESULT"
+echo "linking topic $REVISIONS_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $REVISIONS_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
 
 QUEUE_NAME="files-local-queue"
 
@@ -174,6 +178,11 @@ LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $REVISIONS_QUEUE
 echo "linking done:"
 echo "$LINKING_RESULT"
 
+echo "linking topic $REVISIONS_TOPIC_ARN to queue $REVISIONS_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $REVISIONS_TOPIC_ARN $REVISIONS_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
 QUEUE_NAME="scheduler-local-queue"
 
 echo "creating queue $QUEUE_NAME"

packages/analytics/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.26.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.2...@standardnotes/analytics@2.26.3) (2023-09-04)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.1...@standardnotes/analytics@2.26.2) (2023-09-01)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.26.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.26.0...@standardnotes/analytics@2.26.1) (2023-09-01)
+
+### Bug Fixes
+
+* inserting revisions instead of upsert ([#803](https://github.com/standardnotes/server/issues/803)) ([27ff25b](https://github.com/standardnotes/server/commit/27ff25b70e6b65dfe89aa35582422dce682a4105))
+
+# [2.26.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.21...@standardnotes/analytics@2.26.0) (2023-09-01)
+
+### Bug Fixes
+
+* **analytics:** throwing errors on unexisting users ([c511f25](https://github.com/standardnotes/server/commit/c511f259c765fe5cb5b022213d2a59d67390a3c4))
+* remove the alive and kicking info logs on workers ([1bef127](https://github.com/standardnotes/server/commit/1bef1279e6dbf3cbdfa87e44aa9108ed6dbb3b0f))
+
+### Features
+
+* send websocket event to user when a message is sent ([#802](https://github.com/standardnotes/server/issues/802)) ([9a568b0](https://github.com/standardnotes/server/commit/9a568b0f73078ab74d4771bac469903a124e67da))
+
+## [2.25.21](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.20...@standardnotes/analytics@2.25.21) (2023-08-31)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.25.20](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.19...@standardnotes/analytics@2.25.20) (2023-08-31)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.25.19](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.18...@standardnotes/analytics@2.25.19) (2023-08-30)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.25.18](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.25.17...@standardnotes/analytics@2.25.18) (2023-08-30)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/bin/worker.ts

@@ -22,6 +22,4 @@ void container.load().then((container) => {
 
   const subscriberFactory: DomainEventSubscriberFactoryInterface = container.get(TYPES.DomainEventSubscriberFactory)
   subscriberFactory.create().start()
-
-  setInterval(() => logger.info('Alive and kicking!'), 20 * 60 * 1000)
 })

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.25.18",
+  "version": "2.26.3",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -29,12 +29,12 @@
     "@types/jest": "^29.5.1",
     "@types/mixpanel": "^2.14.4",
     "@types/node": "^20.5.7",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
     "eslint": "^8.39.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.5.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.3",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },
@@ -53,7 +53,7 @@
     "mixpanel": "^0.17.0",
     "mysql2": "^3.0.1",
     "reflect-metadata": "^0.1.13",
-    "typeorm": "^0.3.15",
+    "typeorm": "^0.3.17",
     "winston": "^3.8.1"
   },
   "optionalDependencies": {

packages/analytics/src/Domain/Handler/AccountDeletionRequestedEventHandler.ts

@@ -41,13 +41,13 @@ export class AccountDeletionRequestedEventHandler implements DomainEventHandlerI
       Period.ThisMonth,
     ])
 
-    await this.analyticsEntityRepository.remove(analyticsEntity)
-
     if (this.mixpanelClient !== null) {
       this.mixpanelClient.track(event.type, {
         distinct_id: analyticsEntity.id.toString(),
         user_created_at: this.timer.convertMicrosecondsToDate(event.payload.userCreatedAtTimestamp),
       })
     }
+
+    await this.analyticsEntityRepository.remove(analyticsEntity)
   }
 }

packages/analytics/src/Domain/Handler/PaymentFailedEventHandler.ts

@@ -17,7 +17,11 @@ export class PaymentFailedEventHandler implements DomainEventHandlerInterface {
   ) {}
 
   async handle(event: PaymentFailedEvent): Promise<void> {
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.PaymentFailed], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/PaymentSuccessEventHandler.ts

@@ -88,7 +88,11 @@ export class PaymentSuccessEventHandler implements DomainEventHandlerInterface {
   ) {}
 
   async handle(event: PaymentSuccessEvent): Promise<void> {
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.PaymentSuccess], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/RefundProcessedEventHandler.ts

@@ -17,8 +17,11 @@ export class RefundProcessedEventHandler implements DomainEventHandlerInterface
   ) {}
 
   async handle(event: RefundProcessedEvent): Promise<void> {
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
-
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId } = analyticsMetadataOrError.getValue()
     await this.statisticsStore.incrementMeasure(StatisticMeasureName.NAMES.Refunds, event.payload.amount, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/SessionCreatedEventHandler.ts

@@ -13,7 +13,11 @@ export class SessionCreatedEventHandler implements DomainEventHandlerInterface {
   ) {}
 
   async handle(event: SessionCreatedEvent): Promise<void> {
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userUuid: event.payload.userUuid })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userUuid: event.payload.userUuid })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId } = analyticsMetadataOrError.getValue()
 
     if (this.mixpanelClient !== null) {
       this.mixpanelClient.track(event.type, {

packages/analytics/src/Domain/Handler/SessionRefreshedEventHandler.ts

@@ -13,7 +13,11 @@ export class SessionRefreshedEventHandler implements DomainEventHandlerInterface
   ) {}
 
   async handle(event: SessionRefreshedEvent): Promise<void> {
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userUuid: event.payload.userUuid })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userUuid: event.payload.userUuid })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId } = analyticsMetadataOrError.getValue()
 
     if (this.mixpanelClient !== null) {
       this.mixpanelClient.track(event.type, {

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.ts

@@ -29,7 +29,11 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
   ) {}
 
   async handle(event: SubscriptionCancelledEvent): Promise<void> {
-    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId, userUuid } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionCancelled], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/SubscriptionExpiredEventHandler.ts

@@ -27,7 +27,11 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
   ) {}
 
   async handle(event: SubscriptionExpiredEvent): Promise<void> {
-    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId, userUuid } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity(
       [AnalyticsActivity.SubscriptionExpired, AnalyticsActivity.ExistingCustomersChurn],
       analyticsId,

packages/analytics/src/Domain/Handler/SubscriptionPurchasedEventHandler.ts

@@ -29,7 +29,11 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
   ) {}
 
   async handle(event: SubscriptionPurchasedEvent): Promise<void> {
-    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId, userUuid } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionPurchased], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/SubscriptionReactivatedEventHandler.ts

@@ -19,7 +19,11 @@ export class SubscriptionReactivatedEventHandler implements DomainEventHandlerIn
   ) {}
 
   async handle(event: SubscriptionReactivatedEvent): Promise<void> {
-    const { analyticsId } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionReactivated], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.ts

@@ -27,7 +27,11 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
   ) {}
 
   async handle(event: SubscriptionRefundedEvent): Promise<void> {
-    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId, userUuid } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRefunded], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.ts

@@ -26,7 +26,11 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
   ) {}
 
   async handle(event: SubscriptionRenewedEvent): Promise<void> {
-    const { analyticsId, userUuid } = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    const analyticsMetadataOrError = await this.getUserAnalyticsId.execute({ userEmail: event.payload.userEmail })
+    if (analyticsMetadataOrError.isFailed()) {
+      return
+    }
+    const { analyticsId, userUuid } = analyticsMetadataOrError.getValue()
     await this.analyticsStore.markActivity([AnalyticsActivity.SubscriptionRenewed], analyticsId, [
       Period.Today,
       Period.ThisWeek,

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.spec.ts

@@ -24,23 +24,18 @@ describe('GetUserAnalyticsId', () => {
   })
 
   it('should return analytics id for a user by uuid', async () => {
-    expect((await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
+    expect((await createUseCase().execute({ userUuid: '1-2-3' })).getValue().analyticsId).toEqual(123)
   })
 
   it('should return analytics id for a user by email', async () => {
-    expect((await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
+    expect((await createUseCase().execute({ userEmail: 'test@test.te' })).getValue().analyticsId).toEqual(123)
   })
 
   it('should throw error if user is missing analytics entity', async () => {
     analyticsEntityRepository.findOneByUserUuid = jest.fn().mockReturnValue(null)
-    let error = null
 
-    try {
-      await createUseCase().execute({ userUuid: '1-2-3' })
-    } catch (caughtError) {
-      error = caughtError
-    }
+    const result = await createUseCase().execute({ userUuid: '1-2-3' })
 
-    expect(error).not.toBeNull()
+    expect(result.isFailed()).toEqual(true)
   })
 })

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.ts

@@ -1,19 +1,18 @@
 import { inject, injectable } from 'inversify'
-import { Username, Uuid } from '@standardnotes/domain-core'
+import { Result, UseCaseInterface, Username, Uuid } from '@standardnotes/domain-core'
 
 import TYPES from '../../../Bootstrap/Types'
 import { AnalyticsEntityRepositoryInterface } from '../../Entity/AnalyticsEntityRepositoryInterface'
-import { UseCaseInterface } from '../UseCaseInterface'
 import { GetUserAnalyticsIdDTO } from './GetUserAnalyticsIdDTO'
 import { GetUserAnalyticsIdResponse } from './GetUserAnalyticsIdResponse'
 
 @injectable()
-export class GetUserAnalyticsId implements UseCaseInterface {
+export class GetUserAnalyticsId implements UseCaseInterface<GetUserAnalyticsIdResponse> {
   constructor(
     @inject(TYPES.AnalyticsEntityRepository) private analyticsEntityRepository: AnalyticsEntityRepositoryInterface,
   ) {}
 
-  async execute(dto: GetUserAnalyticsIdDTO): Promise<GetUserAnalyticsIdResponse> {
+  async execute(dto: GetUserAnalyticsIdDTO): Promise<Result<GetUserAnalyticsIdResponse>> {
     let analyticsEntity = null
     if (dto.userUuid) {
       analyticsEntity = await this.analyticsEntityRepository.findOneByUserUuid(dto.userUuid)
@@ -22,13 +21,13 @@ export class GetUserAnalyticsId implements UseCaseInterface {
     }
 
     if (analyticsEntity === null) {
-      throw new Error(`Could not find analytics entity for user ${dto.userUuid}`)
+      return Result.fail(`Could not find analytics entity ${dto.userUuid}`)
     }
 
-    return {
+    return Result.ok({
       analyticsId: analyticsEntity.id,
       userUuid: Uuid.create(analyticsEntity.userUuid).getValue(),
       username: Username.create(analyticsEntity.username).getValue(),
-    }
+    })
   }
 }

packages/analytics/src/Infra/Redis/RedisAnalyticsStore.ts

@@ -6,7 +6,10 @@ import { AnalyticsActivity } from '../../Domain/Analytics/AnalyticsActivity'
 import { AnalyticsStoreInterface } from '../../Domain/Analytics/AnalyticsStoreInterface'
 
 export class RedisAnalyticsStore implements AnalyticsStoreInterface {
-  constructor(private periodKeyGenerator: PeriodKeyGeneratorInterface, private redisClient: IORedis.Redis) {}
+  constructor(
+    private periodKeyGenerator: PeriodKeyGeneratorInterface,
+    private redisClient: IORedis.Redis,
+  ) {}
 
   async calculateActivityTotalCountOverTime(activity: AnalyticsActivity, period: Period): Promise<number> {
     if (

packages/analytics/src/Infra/Redis/RedisStatisticsStore.ts

@@ -8,7 +8,10 @@ import { Period } from '../../Domain/Time/Period'
 import { PeriodKeyGeneratorInterface } from '../../Domain/Time/PeriodKeyGeneratorInterface'
 
 export class RedisStatisticsStore implements StatisticsStoreInterface, StatisticMeasureRepositoryInterface {
-  constructor(private periodKeyGenerator: PeriodKeyGeneratorInterface, private redisClient: IORedis.Redis) {}
+  constructor(
+    private periodKeyGenerator: PeriodKeyGeneratorInterface,
+    private redisClient: IORedis.Redis,
+  ) {}
 
   async save(statisticMeasure: StatisticMeasure): Promise<void> {
     const periodKey = this.periodKeyGenerator.getDailyKey(statisticMeasure.props.date)

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.73.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.6...@standardnotes/api-gateway@1.73.7) (2023-09-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.73.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.5...@standardnotes/api-gateway@1.73.6) (2023-09-01)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.73.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.4...@standardnotes/api-gateway@1.73.5) (2023-09-01)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.73.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.3...@standardnotes/api-gateway@1.73.4) (2023-09-01)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.73.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.2...@standardnotes/api-gateway@1.73.3) (2023-08-31)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.73.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.1...@standardnotes/api-gateway@1.73.2) (2023-08-31)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.73.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.73.0...@standardnotes/api-gateway@1.73.1) (2023-08-30)
+
+### Bug Fixes
+
+* **api-gateway:** transition triggering endpoint call for revisions ([ee656b8](https://github.com/standardnotes/api-gateway/commit/ee656b868b8ebcd63b568b48a450803c80fa78a6))
+
+# [1.73.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.72.3...@standardnotes/api-gateway@1.73.0) (2023-08-30)
+
+### Features
+
+* add a way to trigger transition procedure for revisions ([#798](https://github.com/standardnotes/api-gateway/issues/798)) ([25ffd6b](https://github.com/standardnotes/api-gateway/commit/25ffd6b8036117b33584c6d948bb0867b637ae65))
+
+## [1.72.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.72.2...@standardnotes/api-gateway@1.72.3) (2023-08-30)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.72.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.72.1...@standardnotes/api-gateway@1.72.2) (2023-08-30)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.72.2",
+  "version": "1.73.7",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -54,14 +54,13 @@
     "@types/jsonwebtoken": "^9.0.1",
     "@types/node": "^20.5.7",
     "@types/prettyjson": "^0.0.30",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
     "eslint": "^8.39.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.5.0",
-    "nodemon": "^2.0.19",
     "npm-check-updates": "^16.13.2",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.3",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts

@@ -1,23 +1,23 @@
 import { Request, Response } from 'express'
 import { inject } from 'inversify'
-import { BaseHttpController, controller, httpDelete, httpGet } from 'inversify-express-utils'
+import { BaseHttpController, controller, httpDelete, httpGet, httpPost } from 'inversify-express-utils'
 
 import { TYPES } from '../../Bootstrap/Types'
 import { ServiceProxyInterface } from '../../Service/Http/ServiceProxyInterface'
 import { EndpointResolverInterface } from '../../Service/Resolver/EndpointResolverInterface'
 
-@controller('/v2/items/:itemUuid/revisions', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
+@controller('/v2', TYPES.ApiGateway_RequiredCrossServiceTokenMiddleware)
 export class RevisionsControllerV2 extends BaseHttpController {
   constructor(
-    @inject(TYPES.ApiGateway_ServiceProxy) private httpService: ServiceProxyInterface,
+    @inject(TYPES.ApiGateway_ServiceProxy) private serviceProxy: ServiceProxyInterface,
     @inject(TYPES.ApiGateway_EndpointResolver) private endpointResolver: EndpointResolverInterface,
   ) {
     super()
   }
 
-  @httpGet('/')
+  @httpGet('/items/:itemUuid/revisions')
   async getRevisions(request: Request, response: Response): Promise<void> {
-    await this.httpService.callRevisionsServer(
+    await this.serviceProxy.callRevisionsServer(
       request,
       response,
       this.endpointResolver.resolveEndpointOrMethodIdentifier(
@@ -28,9 +28,9 @@ export class RevisionsControllerV2 extends BaseHttpController {
     )
   }
 
-  @httpGet('/:uuid')
+  @httpGet('/items/:itemUuid/revisions/:uuid')
   async getRevision(request: Request, response: Response): Promise<void> {
-    await this.httpService.callRevisionsServer(
+    await this.serviceProxy.callRevisionsServer(
       request,
       response,
       this.endpointResolver.resolveEndpointOrMethodIdentifier(
@@ -42,9 +42,9 @@ export class RevisionsControllerV2 extends BaseHttpController {
     )
   }
 
-  @httpDelete('/:uuid')
+  @httpDelete('/items/:itemUuid/revisions/:uuid')
   async deleteRevision(request: Request, response: Response): Promise<void> {
-    await this.httpService.callRevisionsServer(
+    await this.serviceProxy.callRevisionsServer(
       request,
       response,
       this.endpointResolver.resolveEndpointOrMethodIdentifier(
@@ -55,4 +55,14 @@ export class RevisionsControllerV2 extends BaseHttpController {
       ),
     )
   }
+
+  @httpPost('/revisions/transition')
+  async transition(request: Request, response: Response): Promise<void> {
+    await this.serviceProxy.callRevisionsServer(
+      request,
+      response,
+      this.endpointResolver.resolveEndpointOrMethodIdentifier('POST', 'revisions/transition'),
+      request.body,
+    )
+  }
 }

packages/api-gateway/src/Service/Proxy/DirectCallServiceProxy.ts

@@ -4,7 +4,10 @@ import { ServiceContainerInterface, ServiceIdentifier } from '@standardnotes/dom
 import { ServiceProxyInterface } from '../Http/ServiceProxyInterface'
 
 export class DirectCallServiceProxy implements ServiceProxyInterface {
-  constructor(private serviceContainer: ServiceContainerInterface, private filesServerUrl: string) {}
+  constructor(
+    private serviceContainer: ServiceContainerInterface,
+    private filesServerUrl: string,
+  ) {}
 
   async validateSession(headers: {
     authorization: string

packages/api-gateway/src/Service/Resolver/EndpointResolver.ts

@@ -65,6 +65,7 @@ export class EndpointResolver implements EndpointResolverInterface {
     ['[GET]:items/:itemUuid/revisions', 'revisions.revisions.getRevisions'],
     ['[GET]:items/:itemUuid/revisions/:id', 'revisions.revisions.getRevision'],
     ['[DELETE]:items/:itemUuid/revisions/:id', 'revisions.revisions.deleteRevision'],
+    ['[POST]:revisions/transition', 'revisions.revisions.transition'],
     // Messages Controller
     ['[GET]:messages/', 'sync.messages.get-received'],
     ['[GET]:messages/outbound', 'sync.messages.get-sent'],

packages/auth/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.137.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.5...@standardnotes/auth-server@1.137.6) (2023-09-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.137.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.4...@standardnotes/auth-server@1.137.5) (2023-09-01)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.137.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.3...@standardnotes/auth-server@1.137.4) (2023-09-01)
+
+### Bug Fixes
+
+* inserting revisions instead of upsert ([#803](https://github.com/standardnotes/server/issues/803)) ([27ff25b](https://github.com/standardnotes/server/commit/27ff25b70e6b65dfe89aa35582422dce682a4105))
+
+## [1.137.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.2...@standardnotes/auth-server@1.137.3) (2023-09-01)
+
+### Bug Fixes
+
+* remove the alive and kicking info logs on workers ([1bef127](https://github.com/standardnotes/server/commit/1bef1279e6dbf3cbdfa87e44aa9108ed6dbb3b0f))
+
+## [1.137.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.1...@standardnotes/auth-server@1.137.2) (2023-08-31)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.137.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.137.0...@standardnotes/auth-server@1.137.1) (2023-08-31)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.137.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.136.0...@standardnotes/auth-server@1.137.0) (2023-08-30)
+
+### Features
+
+* **revisions:** add procedure for transitioning data from primary to secondary database ([#787](https://github.com/standardnotes/server/issues/787)) ([fe273a9](https://github.com/standardnotes/server/commit/fe273a9107585b5953c8de1d0f8afb951f891bca))
+
 # [1.136.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.135.2...@standardnotes/auth-server@1.136.0) (2023-08-30)
 
 ### Features

packages/auth/bin/worker.ts

@@ -24,6 +24,4 @@ void container.load().then((container) => {
     TYPES.Auth_DomainEventSubscriberFactory,
   )
   subscriberFactory.create().start()
-
-  setInterval(() => logger.info('Alive and kicking!'), 20 * 60 * 1000)
 })

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.136.0",
+  "version": "1.137.6",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },
@@ -69,7 +69,7 @@
     "prettyjson": "^1.2.5",
     "reflect-metadata": "0.1.13",
     "sqlite3": "^5.1.6",
-    "typeorm": "^0.3.15",
+    "typeorm": "^0.3.17",
     "ua-parser-js": "^1.0.35",
     "uuid": "^9.0.0",
     "winston": "^3.8.1"
@@ -84,15 +84,14 @@
     "@types/otplib": "^10.0.0",
     "@types/prettyjson": "^0.0.30",
     "@types/ua-parser-js": "^0.7.36",
-    "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.59.2",
+    "@types/uuid": "^9.0.3",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
     "eslint": "^8.39.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.5.0",
-    "nodemon": "^2.0.19",
     "npm-check-updates": "^16.13.2",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.3",
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },

packages/auth/src/Domain/Error/MFAValidationError.ts

@@ -1,5 +1,9 @@
 export class MFAValidationError extends Error {
-  constructor(message: string, public tag: string, public payload?: Record<string, unknown>) {
+  constructor(
+    message: string,
+    public tag: string,
+    public payload?: Record<string, unknown>,
+  ) {
     super(message)
     Object.setPrototypeOf(this, MFAValidationError.prototype)
   }

packages/auth/src/Domain/Handler/EmailSubscriptionUnsubscribedEventHandler.ts

@@ -6,7 +6,10 @@ import { SettingServiceInterface } from '../Setting/SettingServiceInterface'
 import { UserRepositoryInterface } from '../User/UserRepositoryInterface'
 
 export class EmailSubscriptionUnsubscribedEventHandler implements DomainEventHandlerInterface {
-  constructor(private userRepository: UserRepositoryInterface, private settingsService: SettingServiceInterface) {}
+  constructor(
+    private userRepository: UserRepositoryInterface,
+    private settingsService: SettingServiceInterface,
+  ) {}
 
   async handle(event: EmailSubscriptionUnsubscribedEvent): Promise<void> {
     const usernameOrError = Username.create(event.payload.userEmail)

packages/auth/src/Domain/Handler/FileRemovedEventHandler.ts

@@ -4,7 +4,10 @@ import { Logger } from 'winston'
 import { UpdateStorageQuotaUsedForUser } from '../UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser'
 
 export class FileRemovedEventHandler implements DomainEventHandlerInterface {
-  constructor(private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser, private logger: Logger) {}
+  constructor(
+    private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser,
+    private logger: Logger,
+  ) {}
 
   async handle(event: FileRemovedEvent): Promise<void> {
     const result = await this.updateStorageQuotaUsedForUserUseCase.execute({

packages/auth/src/Domain/Handler/FileUploadedEventHandler.ts

@@ -4,7 +4,10 @@ import { Logger } from 'winston'
 import { UpdateStorageQuotaUsedForUser } from '../UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser'
 
 export class FileUploadedEventHandler implements DomainEventHandlerInterface {
-  constructor(private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser, private logger: Logger) {}
+  constructor(
+    private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser,
+    private logger: Logger,
+  ) {}
 
   async handle(event: FileUploadedEvent): Promise<void> {
     const result = await this.updateStorageQuotaUsedForUserUseCase.execute({

packages/auth/src/Domain/Handler/PaymentsAccountDeletedEventHandler.ts

@@ -4,7 +4,10 @@ import { Logger } from 'winston'
 import { DeleteAccount } from '../UseCase/DeleteAccount/DeleteAccount'
 
 export class PaymentsAccountDeletedEventHandler implements DomainEventHandlerInterface {
-  constructor(private deleteAccountUseCase: DeleteAccount, private logger: Logger) {}
+  constructor(
+    private deleteAccountUseCase: DeleteAccount,
+    private logger: Logger,
+  ) {}
 
   async handle(event: PaymentsAccountDeletedEvent): Promise<void> {
     const result = await this.deleteAccountUseCase.execute({

packages/auth/src/Domain/Handler/SharedVaultFileMovedEventHandler.ts

@@ -4,7 +4,10 @@ import { Logger } from 'winston'
 import { UpdateStorageQuotaUsedForUser } from '../UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser'
 
 export class SharedVaultFileMovedEventHandler implements DomainEventHandlerInterface {
-  constructor(private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser, private logger: Logger) {}
+  constructor(
+    private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser,
+    private logger: Logger,
+  ) {}
 
   async handle(event: SharedVaultFileMovedEvent): Promise<void> {
     const subtractResult = await this.updateStorageQuotaUsedForUserUseCase.execute({

packages/auth/src/Domain/Handler/SharedVaultFileRemovedEventHandler.ts

@@ -4,7 +4,10 @@ import { Logger } from 'winston'
 import { UpdateStorageQuotaUsedForUser } from '../UseCase/UpdateStorageQuotaUsedForUser/UpdateStorageQuotaUsedForUser'
 
 export class SharedVaultFileRemovedEventHandler implements DomainEventHandlerInterface {
-  constructor(private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser, private logger: Logger) {}
+  constructor(
+    private updateStorageQuotaUsedForUserUseCase: UpdateStorageQuotaUsedForUser,
+    private logger: Logger,
+  ) {}
 
   async handle(event: SharedVaultFileRemovedEvent): Promise<void> {
     const result = await this.updateStorageQuotaUsedForUserUseCase.execute({