chore(release): publish new version

- @standardnotes/analytics@2.24.0
 - @standardnotes/api-gateway@1.63.0
 - @standardnotes/auth-server@1.116.0
 - @standardnotes/domain-core@1.18.0
 - @standardnotes/event-store@1.10.0
 - @standardnotes/files-server@1.17.0
 - @standardnotes/home-server@1.8.0
 - @standardnotes/revisions-server@1.21.0
 - @standardnotes/scheduler-server@1.20.0
 - @standardnotes/settings@1.21.8
 - @standardnotes/syncing-server@1.42.0
 - @standardnotes/websockets-server@1.9.0

.pnp.cjs

@@ -4802,6 +4802,7 @@ const RAW_RUNTIME_STATE =
         "packageDependencies": [\
           ["@standardnotes/event-store", "workspace:packages/event-store"],\
           ["@aws-sdk/client-sqs", "npm:3.342.0"],\
+          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/time", "workspace:packages/time"],\

packages/analytics/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.24.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.23.7...@standardnotes/analytics@2.24.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [2.23.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.23.6...@standardnotes/analytics@2.23.7) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.23.7",
+  "version": "2.24.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/analytics/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/api-gateway/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.63.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.62.4...@standardnotes/api-gateway@1.63.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/api-gateway/issues/621)) ([f0cbec0](https://github.com/standardnotes/api-gateway/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.62.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.62.3...@standardnotes/api-gateway@1.62.4) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.62.4",
+  "version": "1.63.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -24,8 +24,12 @@ import { OptionalCrossServiceTokenMiddleware } from '../Controller/OptionalCross
 import { Transform } from 'stream'
 
 export class ContainerConfigLoader {
-  async load(configuration?: { serviceContainer?: ServiceContainerInterface; logger?: Transform }): Promise<Container> {
-    const env: Env = new Env()
+  async load(configuration?: {
+    serviceContainer?: ServiceContainerInterface
+    logger?: Transform
+    environmentOverrides?: { [name: string]: string }
+  }): Promise<Container> {
+    const env: Env = new Env(configuration?.environmentOverrides)
     env.load()
 
     const container = new Container()

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

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

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

@@ -1,29 +1,28 @@
-import { ServiceContainerInterface, ServiceIdentifier, ServiceInterface } from '@standardnotes/domain-core'
+import {
+  ServiceConfiguration,
+  ServiceContainerInterface,
+  ServiceIdentifier,
+  ServiceInterface,
+} from '@standardnotes/domain-core'
 
 import { ContainerConfigLoader } from './Container'
-import { Transform } from 'stream'
 
 export class Service implements ServiceInterface {
-  private logger: Transform | undefined
-
   constructor(private serviceContainer: ServiceContainerInterface) {
     this.serviceContainer.register(this.getId(), this)
   }
 
-  setLogger(logger: Transform): void {
-    this.logger = logger
-  }
-
   async handleRequest(_request: never, _response: never, _endpointOrMethodIdentifier: string): Promise<unknown> {
     throw new Error('Requests are handled via inversify-express at ApiGateway level')
   }
 
-  async getContainer(): Promise<unknown> {
+  async getContainer(configuration?: ServiceConfiguration): Promise<unknown> {
     const config = new ContainerConfigLoader()
 
     return config.load({
       serviceContainer: this.serviceContainer,
-      logger: this.logger,
+      logger: configuration?.logger,
+      environmentOverrides: configuration?.environmentOverrides,
     })
   }
 

packages/auth/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.116.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.115.5...@standardnotes/auth-server@1.116.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.115.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.115.4...@standardnotes/auth-server@1.115.5) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/auth-server",
-  "version": "1.115.5",
+  "version": "1.116.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/auth/src/Bootstrap/Container.ts

@@ -257,11 +257,12 @@ export class ContainerConfigLoader {
     controllerConatiner?: ControllerContainerInterface
     directCallDomainEventPublisher?: DirectCallDomainEventPublisher
     logger?: Transform
+    environmentOverrides?: { [name: string]: string }
   }): Promise<Container> {
     const directCallDomainEventPublisher =
       configuration?.directCallDomainEventPublisher ?? new DirectCallDomainEventPublisher()
 
-    const env: Env = new Env()
+    const env: Env = new Env(configuration?.environmentOverrides)
     env.load()
 
     const container = new Container()

packages/auth/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/auth/src/Bootstrap/Service.ts

@@ -1,5 +1,6 @@
 import {
   ControllerContainerInterface,
+  ServiceConfiguration,
   ServiceContainerInterface,
   ServiceIdentifier,
   ServiceInterface,
@@ -7,11 +8,8 @@ import {
 
 import { ContainerConfigLoader } from './Container'
 import { DirectCallDomainEventPublisher } from '@standardnotes/domain-events-infra'
-import { Transform } from 'stream'
 
 export class Service implements ServiceInterface {
-  private logger: Transform | undefined
-
   constructor(
     private serviceContainer: ServiceContainerInterface,
     private controllerContainer: ControllerContainerInterface,
@@ -20,10 +18,6 @@ export class Service implements ServiceInterface {
     this.serviceContainer.register(this.getId(), this)
   }
 
-  setLogger(logger: Transform): void {
-    this.logger = logger
-  }
-
   async handleRequest(request: never, response: never, endpointOrMethodIdentifier: string): Promise<unknown> {
     const method = this.controllerContainer.get(endpointOrMethodIdentifier)
 
@@ -34,13 +28,14 @@ export class Service implements ServiceInterface {
     return method(request, response)
   }
 
-  async getContainer(): Promise<unknown> {
+  async getContainer(configuration?: ServiceConfiguration): Promise<unknown> {
     const config = new ContainerConfigLoader()
 
     return config.load({
       controllerConatiner: this.controllerContainer,
       directCallDomainEventPublisher: this.directCallDomainEventPublisher,
-      logger: this.logger,
+      logger: configuration?.logger,
+      environmentOverrides: configuration?.environmentOverrides,
     })
   }
 

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.18.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.17.0...@standardnotes/domain-core@1.18.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 # [1.17.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.16.2...@standardnotes/domain-core@1.17.0) (2023-05-31)
 
 ### Features

packages/domain-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/domain-core",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/domain-core/src/Domain/Env/AbstractEnv.ts

@@ -0,0 +1,26 @@
+export abstract class AbstractEnv {
+  protected env?: { [key: string]: string } = {}
+  protected overrides: { [key: string]: string }
+
+  constructor(overrides: { [key: string]: string } = {}) {
+    this.overrides = overrides
+  }
+
+  abstract load(): void
+
+  get(key: string, optional = false): string {
+    if (!this.env) {
+      this.load()
+    }
+
+    if (this.overrides[key]) {
+      return this.overrides[key]
+    }
+
+    if (!process.env[key] && !optional) {
+      throw new Error(`Environment variable ${key} not set`)
+    }
+
+    return <string>process.env[key]
+  }
+}

packages/domain-core/src/Domain/Service/ServiceConfiguration.ts

@@ -0,0 +1,6 @@
+import { Transform } from 'stream'
+
+export interface ServiceConfiguration {
+  logger?: Transform
+  environmentOverrides?: { [name: string]: string }
+}

packages/domain-core/src/Domain/Service/ServiceInterface.ts

@@ -1,9 +1,8 @@
+import { ServiceConfiguration } from './ServiceConfiguration'
 import { ServiceIdentifier } from './ServiceIdentifier'
-import { Transform } from 'stream'
 
 export interface ServiceInterface {
-  getContainer(): Promise<unknown>
-  setLogger(logger: Transform): void
+  getContainer(configuration?: ServiceConfiguration): Promise<unknown>
   getId(): ServiceIdentifier
   handleRequest(request: never, response: never, endpointOrMethodIdentifier: string): Promise<unknown>
 }

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

@@ -37,8 +37,11 @@ export * from './DI/ControllerContainerInterface'
 export * from './Email/EmailLevel'
 export * from './Email/EmailLevelProps'
 
+export * from './Env/AbstractEnv'
+
 export * from './Mapping/MapperInterface'
 
+export * from './Service/ServiceConfiguration'
 export * from './Service/ServiceContainer'
 export * from './Service/ServiceContainerInterface'
 export * from './Service/ServiceIdentifier'

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.10.0](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.9.6...@standardnotes/event-store@1.10.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.9.6](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.9.5...@standardnotes/event-store@1.9.6) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/event-store

packages/event-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/event-store",
-  "version": "1.9.6",
+  "version": "1.10.0",
   "description": "Event Store Service",
   "private": true,
   "main": "dist/src/index.js",
@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-sqs": "^3.332.0",
+    "@standardnotes/domain-core": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/time": "workspace:*",

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

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/files/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.17.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.16.5...@standardnotes/files-server@1.17.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/files/issues/621)) ([f0cbec0](https://github.com/standardnotes/files/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.16.5](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.16.4...@standardnotes/files-server@1.16.5) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/files-server

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files-server",
-  "version": "1.16.5",
+  "version": "1.17.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/files/src/Bootstrap/Container.ts

@@ -53,11 +53,12 @@ export class ContainerConfigLoader {
   async load(configuration?: {
     directCallDomainEventPublisher?: DirectCallDomainEventPublisher
     logger?: Transform
+    environmentOverrides?: { [name: string]: string }
   }): Promise<Container> {
     const directCallDomainEventPublisher =
       configuration?.directCallDomainEventPublisher ?? new DirectCallDomainEventPublisher()
 
-    const env: Env = new Env()
+    const env: Env = new Env(configuration?.environmentOverrides)
     env.load()
 
     const container = new Container()

packages/files/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/files/src/Bootstrap/Service.ts

@@ -1,12 +1,14 @@
-import { ServiceContainerInterface, ServiceIdentifier, ServiceInterface } from '@standardnotes/domain-core'
+import {
+  ServiceConfiguration,
+  ServiceContainerInterface,
+  ServiceIdentifier,
+  ServiceInterface,
+} from '@standardnotes/domain-core'
 import { DirectCallDomainEventPublisher } from '@standardnotes/domain-events-infra'
 
 import { ContainerConfigLoader } from './Container'
-import { Transform } from 'stream'
 
 export class Service implements ServiceInterface {
-  private logger: Transform | undefined
-
   constructor(
     private serviceContainer: ServiceContainerInterface,
     private directCallDomainEventPublisher: DirectCallDomainEventPublisher,
@@ -14,20 +16,17 @@ export class Service implements ServiceInterface {
     this.serviceContainer.register(this.getId(), this)
   }
 
-  setLogger(logger: Transform): void {
-    this.logger = logger
-  }
-
   async handleRequest(_request: never, _response: never, _endpointOrMethodIdentifier: string): Promise<unknown> {
     throw new Error('Requests are handled via inversify-express at ApiGateway level')
   }
 
-  async getContainer(): Promise<unknown> {
+  async getContainer(configuration?: ServiceConfiguration): Promise<unknown> {
     const config = new ContainerConfigLoader()
 
     return config.load({
       directCallDomainEventPublisher: this.directCallDomainEventPublisher,
-      logger: this.logger,
+      logger: configuration?.logger,
+      environmentOverrides: configuration?.environmentOverrides,
     })
   }
 

packages/home-server/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.8.0](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.7.5...@standardnotes/home-server@1.8.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.7.5](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.7.4...@standardnotes/home-server@1.7.5) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/home-server

packages/home-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/home-server",
-  "version": "1.7.5",
+  "version": "1.8.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/home-server/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/home-server/src/Server/HomeServer.ts

@@ -20,37 +20,48 @@ const robots = require('express-robots-txt')
 
 import { Env } from '../Bootstrap/Env'
 import { HomeServerInterface } from './HomeServerInterface'
+import { HomeServerConfiguration } from './HomeServerConfiguration'
 
 export class HomeServer implements HomeServerInterface {
   private serverInstance: http.Server | undefined
 
-  async start(): Promise<void> {
+  async start(configuration?: HomeServerConfiguration): Promise<void> {
     const controllerContainer = new ControllerContainer()
     const serviceContainer = new ServiceContainer()
     const directCallDomainEventPublisher = new DirectCallDomainEventPublisher()
 
-    const env: Env = new Env()
+    const env: Env = new Env(configuration?.environment)
     env.load()
 
     this.configureLoggers(env)
 
     const apiGatewayService = new ApiGatewayService(serviceContainer)
-    apiGatewayService.setLogger(winston.loggers.get('api-gateway'))
     const authService = new AuthService(serviceContainer, controllerContainer, directCallDomainEventPublisher)
-    authService.setLogger(winston.loggers.get('auth-server'))
     const syncingService = new SyncingService(serviceContainer, controllerContainer, directCallDomainEventPublisher)
-    syncingService.setLogger(winston.loggers.get('syncing-server'))
     const revisionsService = new RevisionsService(serviceContainer, controllerContainer, directCallDomainEventPublisher)
-    revisionsService.setLogger(winston.loggers.get('revisions-server'))
     const filesService = new FilesService(serviceContainer, directCallDomainEventPublisher)
-    filesService.setLogger(winston.loggers.get('files-server'))
 
     const container = Container.merge(
-      (await apiGatewayService.getContainer()) as Container,
-      (await authService.getContainer()) as Container,
-      (await syncingService.getContainer()) as Container,
-      (await revisionsService.getContainer()) as Container,
-      (await filesService.getContainer()) as Container,
+      (await apiGatewayService.getContainer({
+        logger: winston.loggers.get('api-gateway'),
+        environmentOverrides: configuration?.environment,
+      })) as Container,
+      (await authService.getContainer({
+        logger: winston.loggers.get('auth-server'),
+        environmentOverrides: configuration?.environment,
+      })) as Container,
+      (await syncingService.getContainer({
+        logger: winston.loggers.get('syncing-server'),
+        environmentOverrides: configuration?.environment,
+      })) as Container,
+      (await revisionsService.getContainer({
+        logger: winston.loggers.get('revisions-server'),
+        environmentOverrides: configuration?.environment,
+      })) as Container,
+      (await filesService.getContainer({
+        logger: winston.loggers.get('files-server'),
+        environmentOverrides: configuration?.environment,
+      })) as Container,
     )
 
     const server = new InversifyExpressServer(container)

packages/home-server/src/Server/HomeServerConfiguration.ts

@@ -0,0 +1,3 @@
+export interface HomeServerConfiguration {
+  environment: { [name: string]: string }
+}

packages/home-server/src/Server/HomeServerInterface.ts

@@ -1,5 +1,7 @@
+import { HomeServerConfiguration } from './HomeServerConfiguration'
+
 export interface HomeServerInterface {
-  start(): Promise<void>
+  start(configuration?: HomeServerConfiguration): Promise<void>
   stop(): Promise<void>
   restart(): Promise<void>
   isRunning(): Promise<boolean>

packages/home-server/src/Server/index.ts

@@ -1,2 +1,3 @@
 export * from './HomeServer'
+export * from './HomeServerConfiguration'
 export * from './HomeServerInterface'

packages/revisions/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.21.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.20.4...@standardnotes/revisions-server@1.21.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.20.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.20.3...@standardnotes/revisions-server@1.20.4) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/revisions-server

packages/revisions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/revisions-server",
-  "version": "1.20.4",
+  "version": "1.21.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/revisions/src/Bootstrap/Container.ts

@@ -53,11 +53,12 @@ export class ContainerConfigLoader {
     controllerConatiner?: ControllerContainerInterface
     directCallDomainEventPublisher?: DirectCallDomainEventPublisher
     logger?: Transform
+    environmentOverrides?: { [name: string]: string }
   }): Promise<Container> {
     const directCallDomainEventPublisher =
       configuration?.directCallDomainEventPublisher ?? new DirectCallDomainEventPublisher()
 
-    const env: Env = new Env()
+    const env: Env = new Env(configuration?.environmentOverrides)
     env.load()
 
     const isConfiguredForHomeServer = env.get('DB_TYPE') === 'sqlite'

packages/revisions/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/revisions/src/Bootstrap/Service.ts

@@ -1,5 +1,6 @@
 import {
   ControllerContainerInterface,
+  ServiceConfiguration,
   ServiceContainerInterface,
   ServiceIdentifier,
   ServiceInterface,
@@ -7,11 +8,8 @@ import {
 
 import { ContainerConfigLoader } from './Container'
 import { DirectCallDomainEventPublisher } from '@standardnotes/domain-events-infra'
-import { Transform } from 'stream'
 
 export class Service implements ServiceInterface {
-  private logger: Transform | undefined
-
   constructor(
     private serviceContainer: ServiceContainerInterface,
     private controllerContainer: ControllerContainerInterface,
@@ -20,10 +18,6 @@ export class Service implements ServiceInterface {
     this.serviceContainer.register(this.getId(), this)
   }
 
-  setLogger(logger: Transform): void {
-    this.logger = logger
-  }
-
   async handleRequest(request: never, response: never, endpointOrMethodIdentifier: string): Promise<unknown> {
     const method = this.controllerContainer.get(endpointOrMethodIdentifier)
 
@@ -34,13 +28,14 @@ export class Service implements ServiceInterface {
     return method(request, response)
   }
 
-  async getContainer(): Promise<unknown> {
+  async getContainer(configuration?: ServiceConfiguration): Promise<unknown> {
     const config = new ContainerConfigLoader()
 
     return config.load({
       controllerConatiner: this.controllerContainer,
       directCallDomainEventPublisher: this.directCallDomainEventPublisher,
-      logger: this.logger,
+      logger: configuration?.logger,
+      environmentOverrides: configuration?.environmentOverrides,
     })
   }
 

packages/scheduler/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.20.0](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.19.6...@standardnotes/scheduler-server@1.20.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.19.6](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.19.5...@standardnotes/scheduler-server@1.19.6) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/scheduler-server

packages/scheduler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/scheduler-server",
-  "version": "1.19.6",
+  "version": "1.20.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/scheduler/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

packages/settings/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.21.8](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.7...@standardnotes/settings@1.21.8) (2023-06-02)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.7](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.6...@standardnotes/settings@1.21.7) (2023-05-31)
 
 **Note:** Version bump only for package @standardnotes/settings

packages/settings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/settings",
-  "version": "1.21.7",
+  "version": "1.21.8",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/syncing-server/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.42.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.41.4...@standardnotes/syncing-server@1.42.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/syncing-server-js/issues/621)) ([f0cbec0](https://github.com/standardnotes/syncing-server-js/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.41.4](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.41.3...@standardnotes/syncing-server@1.41.4) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/syncing-server

packages/syncing-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/syncing-server",
-  "version": "1.41.4",
+  "version": "1.42.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

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

@@ -83,11 +83,12 @@ export class ContainerConfigLoader {
     controllerConatiner?: ControllerContainerInterface
     directCallDomainEventPublisher?: DirectCallDomainEventPublisher
     logger?: Transform
+    environmentOverrides?: { [name: string]: string }
   }): Promise<Container> {
     const directCallDomainEventPublisher =
       configuration?.directCallDomainEventPublisher ?? new DirectCallDomainEventPublisher()
 
-    const env: Env = new Env()
+    const env: Env = new Env(configuration?.environmentOverrides)
     env.load()
 
     const container = new Container({

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

@@ -1,22 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
 
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

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

@@ -1,5 +1,6 @@
 import {
   ControllerContainerInterface,
+  ServiceConfiguration,
   ServiceContainerInterface,
   ServiceIdentifier,
   ServiceInterface,
@@ -7,11 +8,8 @@ import {
 
 import { ContainerConfigLoader } from './Container'
 import { DirectCallDomainEventPublisher } from '@standardnotes/domain-events-infra'
-import { Transform } from 'stream'
 
 export class Service implements ServiceInterface {
-  private logger: Transform | undefined
-
   constructor(
     private serviceContainer: ServiceContainerInterface,
     private controllerContainer: ControllerContainerInterface,
@@ -20,10 +18,6 @@ export class Service implements ServiceInterface {
     this.serviceContainer.register(this.getId(), this)
   }
 
-  setLogger(logger: Transform): void {
-    this.logger = logger
-  }
-
   async handleRequest(request: never, response: never, endpointOrMethodIdentifier: string): Promise<unknown> {
     const method = this.controllerContainer.get(endpointOrMethodIdentifier)
 
@@ -34,13 +28,14 @@ export class Service implements ServiceInterface {
     return method(request, response)
   }
 
-  async getContainer(): Promise<unknown> {
+  async getContainer(configuration?: ServiceConfiguration): Promise<unknown> {
     const config = new ContainerConfigLoader()
 
     return config.load({
       controllerConatiner: this.controllerContainer,
       directCallDomainEventPublisher: this.directCallDomainEventPublisher,
-      logger: this.logger,
+      logger: configuration?.logger,
+      environmentOverrides: configuration?.environmentOverrides,
     })
   }
 

packages/websockets/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.9.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.8.6...@standardnotes/websockets-server@1.9.0) (2023-06-02)
+
+### Features
+
+* **home-server:** add overriding environment variables in underlying services ([#621](https://github.com/standardnotes/server/issues/621)) ([f0cbec0](https://github.com/standardnotes/server/commit/f0cbec07b87d60dfad92072944553f76e0bea164))
+
 ## [1.8.6](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.8.5...@standardnotes/websockets-server@1.8.6) (2023-06-01)
 
 **Note:** Version bump only for package @standardnotes/websockets-server

packages/websockets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/websockets-server",
-  "version": "1.8.6",
+  "version": "1.9.0",
   "engines": {
     "node": ">=18.0.0 <21.0.0"
   },

packages/websockets/src/Bootstrap/Env.ts

@@ -1,24 +1,9 @@
+import { AbstractEnv } from '@standardnotes/domain-core'
 import { config, DotenvParseOutput } from 'dotenv'
-import { injectable } from 'inversify'
 
-@injectable()
-export class Env {
-  private env?: DotenvParseOutput
-
-  public load(): void {
+export class Env extends AbstractEnv {
+  load(): void {
     const output = config()
     this.env = <DotenvParseOutput>output.parsed
   }
-
-  public get(key: string, optional = false): string {
-    if (!this.env) {
-      this.load()
-    }
-
-    if (!process.env[key] && !optional) {
-      throw new Error(`Environment variable ${key} not set`)
-    }
-
-    return <string>process.env[key]
-  }
 }

yarn.lock

@@ -3706,6 +3706,7 @@ __metadata:
   resolution: "@standardnotes/event-store@workspace:packages/event-store"
   dependencies:
     "@aws-sdk/client-sqs": "npm:^3.332.0"
+    "@standardnotes/domain-core": "workspace:^"
     "@standardnotes/domain-events": "workspace:*"
     "@standardnotes/domain-events-infra": "workspace:*"
     "@standardnotes/time": "workspace:*"