@zyno-io/dk-server-foundation 26.216.430

package/package.json

@@ -0,0 +1,144 @@
+{
+    "name": "@zyno-io/dk-server-foundation",
+    "version": "26.216.430",
+    "description": "TypeScript server foundation built on the Deepkit framework",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/zyno-io/dk-server-foundation.git"
+    },
+    "homepage": "https://github.com/zyno-io/dk-server-foundation#readme",
+    "bugs": {
+        "url": "https://github.com/zyno-io/dk-server-foundation/issues"
+    },
+    "bin": {
+        "dksf-dev": "./dist/src/cli/dksf-dev.js",
+        "dksf-gen-proto": "./dist/src/cli/dksf-gen-proto.js",
+        "dksf-install": "./dist/src/cli/dksf-install.js",
+        "dksf-test": "./dist/src/cli/dksf-test.js",
+        "dksf-update": "./dist/src/cli/dksf-update.js"
+    },
+    "scripts": {
+        "clean": "rm -rf dist",
+        "build": "yarn clean && yarn gen:proto && yarn build:devconsole && tsc -p tsconfig.json && chmod +x dist/src/cli/*.js && date",
+        "build:devconsole": "cd devconsole && yarn install && yarn build",
+        "test": "tsc -p tsconfig.test.json && dksf-test",
+        "format": "npx oxlint --fix --fix-suggestions --fix-dangerously && prettier --write .",
+        "dev": "tsc -p tsconfig.json --watch",
+        "postinstall": "dksf-install || yarn postinstall:alt",
+        "postinstall:alt": "patch-package && deepkit-type-install",
+        "testapp": "yarn clean && tsc -p tsconfig.testapp.json && node dist/testapp/bootstrap server:start",
+        "demoapp": "yarn build:devconsole && dksf-dev run -p tsconfig.demoapp.json dist/demoapp/bootstrap",
+        "gen:proto": "ts-node src/cli/dksf-gen-proto.ts resources/proto/test.proto resources/proto/generated/test && ts-node src/cli/dksf-gen-proto.ts resources/proto/devconsole.proto resources/proto/generated/devconsole"
+    },
+    "author": {
+        "name": "Signal24 LLC dba Zyno Consulting",
+        "email": "support@zyno.io",
+        "url": "https://zyno.io"
+    },
+    "license": "MIT",
+    "dependencies": {
+        "@bufbuild/protobuf": "^2.11.0",
+        "@deepkit/app": "1.0.19",
+        "@deepkit/broker": "1.0.19",
+        "@deepkit/bson": "1.0.19",
+        "@deepkit/core": "1.0.19",
+        "@deepkit/core-rxjs": "1.0.19",
+        "@deepkit/event": "1.0.19",
+        "@deepkit/filesystem": "1.0.19",
+        "@deepkit/framework": "1.0.19",
+        "@deepkit/http": "1.0.19",
+        "@deepkit/injector": "1.0.19",
+        "@deepkit/logger": "1.0.19",
+        "@deepkit/mysql": "1.0.19",
+        "@deepkit/orm": "1.0.19",
+        "@deepkit/postgres": "1.0.19",
+        "@deepkit/rpc": "1.0.19",
+        "@deepkit/rpc-tcp": "1.0.19",
+        "@deepkit/sql": "1.0.19",
+        "@deepkit/stopwatch": "1.0.19",
+        "@deepkit/template": "1.0.19",
+        "@deepkit/type": "1.0.19",
+        "@deepkit/type-compiler": "1.0.19",
+        "@deepkit/workflow": "1.0.19",
+        "@jenniferplusplus/opentelemetry-instrumentation-bullmq": "^0.5.1",
+        "@opentelemetry/api": "^1.9.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "^0.212.0",
+        "@opentelemetry/exporter-prometheus": "^0.212.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.212.0",
+        "@opentelemetry/instrumentation": "^0.212.0",
+        "@opentelemetry/instrumentation-dns": "^0.54.0",
+        "@opentelemetry/instrumentation-http": "^0.212.0",
+        "@opentelemetry/instrumentation-ioredis": "^0.59.0",
+        "@opentelemetry/instrumentation-mysql": "^0.57.0",
+        "@opentelemetry/instrumentation-undici": "^0.21.0",
+        "@opentelemetry/node": "^0.24.0",
+        "@opentelemetry/resources": "^2.5.1",
+        "@opentelemetry/sdk-metrics": "^2.5.1",
+        "@opentelemetry/sdk-node": "^0.212.0",
+        "@opentelemetry/sdk-trace-base": "^2.5.1",
+        "@opentelemetry/sdk-trace-node": "^2.5.1",
+        "@opentelemetry/semantic-conventions": "^1.39.0",
+        "@sentry/node": "^10.38.0",
+        "@types/formidable": "^3.4.6",
+        "@zyno-io/config": "^1.10.0",
+        "bcrypt": "^6.0.0",
+        "bullmq": "^5.69.2",
+        "date-fns": "^4.1.0",
+        "debug": "^4.4.3",
+        "deepkit-openapi-core": "^0.0.9",
+        "fast-jwt": "^6.1.0",
+        "google-libphonenumber": "^3.2.44",
+        "ioredis": "^5.9.3",
+        "lodash": "^4.17.23",
+        "mariadb": "^3.4.5",
+        "nodemailer": "^8.0.1",
+        "opentelemetry-node-metrics": "^3.0.0",
+        "patch-package": "^8.0.1",
+        "pino": "^10.3.1",
+        "pino-pretty": "^13.1.3",
+        "postmark": "^4.0.5",
+        "rxjs": "~7.8.2",
+        "send": "^1.2.1",
+        "tiny-glob": "^0.2.9",
+        "ts-proto": "^2.11.2",
+        "uuidv7": "^1.1.0",
+        "ws": "^8.19.0",
+        "yaml": "^2.8.2"
+    },
+    "devDependencies": {
+        "@types/bcrypt": "^6.0.0",
+        "@types/debug": "^4.1.12",
+        "@types/google-libphonenumber": "^7.4.30",
+        "@types/lodash": "^4.17.23",
+        "@types/node": "^25.2.3",
+        "@types/nodemailer": "^7",
+        "lefthook": "^2.1.1",
+        "npm-run-all": "^4.1.5",
+        "oxlint": "^1.47.0",
+        "prettier": "^3.8.1",
+        "ts-essentials": "^10.1.1",
+        "ts-node": "^10.9.2",
+        "tslib": "^2.8.1",
+        "type-fest": "^5.4.4",
+        "typescript": "~5.9"
+    },
+    "files": [
+        "dist/src/",
+        "dist/devconsole/",
+        "dist/resources/",
+        "docs/",
+        "patches/",
+        "src/",
+        "types.d.ts",
+        "!**/*.tsbuildinfo",
+        "!**/CLAUDE.md",
+        "!**/*_MIGRATION_GUIDE.md"
+    ],
+    "main": "./dist/src/index.js",
+    "types": "./dist/src/index.d.ts",
+    "exports": {
+        ".": "./dist/src/index.js",
+        "./*": "./dist/src/*"
+    },
+    "packageManager": "yarn@4.12.0"
+}

package/patches/@deepkit+type+1.0.19.patch

@@ -0,0 +1,38 @@
+diff --git a/node_modules/@deepkit/type/dist/cjs/src/reflection/processor.js b/node_modules/@deepkit/type/dist/cjs/src/reflection/processor.js
+index 651e875..11fa7cf 100644
+--- a/node_modules/@deepkit/type/dist/cjs/src/reflection/processor.js
++++ b/node_modules/@deepkit/type/dist/cjs/src/reflection/processor.js
+@@ -1334,6 +1334,8 @@ class Processor {
+             if ((0, type_js_1.isPrimitive)(a) && (0, type_js_1.isPrimitive)(b) && a.kind !== b.kind) {
+                 return { kind: type_js_1.ReflectionKind.never };
+             }
++            if (b.kind === type_js_1.ReflectionKind.unknown)
++                return a;
+             if (a.kind === type_js_1.ReflectionKind.objectLiteral || a.kind === type_js_1.ReflectionKind.class || a.kind === type_js_1.ReflectionKind.never || a.kind === type_js_1.ReflectionKind.unknown)
+                 return b;
+             if (b.annotations) {
+diff --git a/node_modules/@deepkit/type/dist/esm/src/reflection/processor.js b/node_modules/@deepkit/type/dist/esm/src/reflection/processor.js
+index 46c2df3..83a9e21 100644
+--- a/node_modules/@deepkit/type/dist/esm/src/reflection/processor.js
++++ b/node_modules/@deepkit/type/dist/esm/src/reflection/processor.js
+@@ -1323,6 +1323,8 @@ export class Processor {
+             if (isPrimitive(a) && isPrimitive(b) && a.kind !== b.kind) {
+                 return { kind: ReflectionKind.never };
+             }
++            if (b.kind === ReflectionKind.unknown)
++                return a;
+             if (a.kind === ReflectionKind.objectLiteral || a.kind === ReflectionKind.class || a.kind === ReflectionKind.never || a.kind === ReflectionKind.unknown)
+                 return b;
+             if (b.annotations) {
+diff --git a/node_modules/@deepkit/type/src/reflection/processor.ts b/node_modules/@deepkit/type/src/reflection/processor.ts
+index 0c6a605..e76d78e 100644
+--- a/node_modules/@deepkit/type/src/reflection/processor.ts
++++ b/node_modules/@deepkit/type/src/reflection/processor.ts
+@@ -1422,6 +1422,7 @@ export class Processor {
+                 return { kind: ReflectionKind.never }
+             }
+
++            if (b.kind === ReflectionKind.unknown) return a;
+             if (a.kind === ReflectionKind.objectLiteral || a.kind === ReflectionKind.class || a.kind === ReflectionKind.never || a.kind === ReflectionKind.unknown) return b;
+
+             if (b.annotations) {

package/patches/deepkit-openapi-core+0.0.9.patch

@@ -0,0 +1,62 @@
+diff --git a/node_modules/deepkit-openapi-core/dist/cjs/src/OpenAPIDocument.js b/node_modules/deepkit-openapi-core/dist/cjs/src/OpenAPIDocument.js
+index 9b44c68..00f1483 100644
+--- a/node_modules/deepkit-openapi-core/dist/cjs/src/OpenAPIDocument.js
++++ b/node_modules/deepkit-openapi-core/dist/cjs/src/OpenAPIDocument.js
+@@ -27,7 +27,7 @@ const camelcase_1 = __importDefault(require("camelcase"));
+ const errors_1 = require("./errors");
+ const ParametersResolver_1 = require("./ParametersResolver");
+ const SchemaRegistry_1 = require("./SchemaRegistry");
+-const lodash_clonedeepwith_1 = __importDefault(require("lodash.clonedeepwith"));
++const lodash_1 = require("lodash");
+ const utils_1 = require("./utils");
+ const TypeSchemaResolver_1 = require("./TypeSchemaResolver");
+ const type_1 = require("@deepkit/type");
+@@ -100,7 +100,7 @@ class OpenAPIDocument {
+         return openapi;
+     }
+     serializeDocument() {
+-        return (0, lodash_clonedeepwith_1.default)(this.getDocument(), __assignType((c) => {
++        return (0, lodash_1.cloneDeepWith)(this.getDocument(), __assignType((c) => {
+             if (c && typeof c === "object") {
+                 if (c.__type === "schema" && c.__registryKey && !c.__isComponent) {
+                     const ret = {
+diff --git a/node_modules/deepkit-openapi-core/dist/cjs/src/SchemaRegistry.js b/node_modules/deepkit-openapi-core/dist/cjs/src/SchemaRegistry.js
+index 6a46ed3..15f1e9a 100644
+--- a/node_modules/deepkit-openapi-core/dist/cjs/src/SchemaRegistry.js
++++ b/node_modules/deepkit-openapi-core/dist/cjs/src/SchemaRegistry.js
+@@ -20,6 +20,7 @@ function __assignType(fn, args) {
+ }
+ const type_1 = require("@deepkit/type");
+ const camelcase_1 = __importDefault(require("camelcase"));
++const lodash_1 = require("lodash");
+ const errors_1 = require("./errors");
+ const __ΩSchemeEntry = ['name', () => __ΩSchema, 'schema', 'Type', 'type', 'SchemeEntry', 'P&4!n"4#"w$4%Mw&y'];
+ exports.__ΩSchemeEntry = __ΩSchemeEntry;
+@@ -88,7 +89,14 @@ class SchemaRegistry {
+     registerSchema(name, type, schema) {
+         const currentEntry = this.store.get(name);
+         if (currentEntry && !(0, type_1.isSameType)(type, currentEntry === null || currentEntry === void 0 ? void 0 : currentEntry.type)) {
+-            throw new errors_1.DeepKitOpenApiSchemaNameConflict(type, currentEntry.type, name);
++            // Types may differ in metadata (e.g. parent route context) while producing
++            // identical schemas, such as HttpBody<T> used across multiple routes.
++            // Only throw if the generated schemas actually differ.
++            const normalizedNew = { ...schema, nullable: undefined, __registryKey: undefined };
++            const normalizedExisting = { ...currentEntry.schema, __registryKey: undefined };
++            if (!(0, lodash_1.isEqual)(normalizedNew, normalizedExisting)) {
++                throw new errors_1.DeepKitOpenApiSchemaNameConflict(type, currentEntry.type, name);
++            }
+         }
+         this.store.set(name, {
+             type,
+diff --git a/node_modules/deepkit-openapi-core/dist/cjs/src/TypeSchemaResolver.d.ts b/node_modules/deepkit-openapi-core/dist/cjs/src/TypeSchemaResolver.d.ts
+index f6324ac..53ac6fd 100644
+--- a/node_modules/deepkit-openapi-core/dist/cjs/src/TypeSchemaResolver.d.ts
++++ b/node_modules/deepkit-openapi-core/dist/cjs/src/TypeSchemaResolver.d.ts
+@@ -15,6 +15,6 @@ export declare class TypeSchemaResolver {
+     resolveValidators(): void;
+     resolve(): this;
+ }
+-export declare const mapSimpleLiteralToType: (literal: any) => "number" | "string" | "boolean" | "integer" | undefined;
++export declare const mapSimpleLiteralToType: (literal: any) => "string" | "number" | "boolean" | "integer" | undefined;
+ export declare const unwrapTypeSchema: (t: Type, r?: SchemaRegistry) => Schema;
+ export declare const resolveTypeSchema: (t: Type, r?: SchemaRegistry) => TypeSchemaResolver;

package/src/app/base.ts

@@ -0,0 +1,253 @@
+import { App, AppModule, RootModuleDefinition } from '@deepkit/app';
+import { ClassType } from '@deepkit/core';
+import { eventDispatcher } from '@deepkit/event';
+import { BrokerConfig, FrameworkConfig, FrameworkModule, onServerBootstrapDone, onServerMainBootstrapDone, RpcServer } from '@deepkit/framework';
+import { HttpKernel, HttpListener, HttpModule } from '@deepkit/http';
+import { InjectorModule, ProviderWithScope, Token } from '@deepkit/injector';
+import { ConsoleTransport, Logger } from '@deepkit/logger';
+import { DatabaseRegistry } from '@deepkit/orm';
+
+import { BaseDatabase } from '../database';
+import { replaceMigrationCommands } from '../database/migration';
+import { getMigrationsDir } from '../database/migration/helpers';
+import { HealthModule } from '../health/health.module';
+import { HealthcheckService } from '../health/healthcheck.service';
+import { createSymbolAttachmentClassDecorator } from '../helpers/framework/decorators';
+import { CustomHttpKernel, HttpWorkflowListener, HttpWorkflowListenerOptions } from '../http';
+import { HttpCorsListener, HttpCorsOptions, HttpCorsOptionsMulti } from '../http/cors';
+import { ExtendedLogger, MailService, WorkerService } from '../services';
+import { ProviderInvokeCommand } from '../services/cli/invoke';
+import { ReplCommand } from '../services/cli/repl';
+import { installWorkerComponents } from '../services/worker/bootstrap';
+import { flushSentry, installSentry } from '../telemetry/sentry';
+import { BaseAppConfig } from './config';
+import { CustomConfigLoader } from './config.loader';
+import { isDevelopment, isTest } from './const';
+import { doDevPostAppStartup } from './dev';
+import { ShutdownListener } from './shutdown';
+import { DBProvider, globalState } from './state';
+import { r } from './resolver';
+
+export interface CreateAppOptions<C extends BaseAppConfig> extends RootModuleDefinition {
+    config: ClassType<C>;
+    defaultConfig?: Partial<C>;
+    db?: ClassType<BaseDatabase>;
+    frameworkConfig?: Partial<FrameworkConfig>;
+    cors?: (config: C) => HttpCorsOptions | HttpCorsOptions[];
+    enableWorker?: boolean;
+    enableDkRpc?: boolean;
+}
+// todo: figure out why the type won't pass through without conflict
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createApp<T extends CreateAppOptions<any>>(options: T) {
+    const { config, defaultConfig, db, frameworkConfig, cors: corsOptionsFactory, ...appOptions } = options;
+
+    const frameworkModule = new FrameworkModule({
+        port: 3000,
+        migrationDir: getMigrationsDir(),
+        httpLog: false, // don't use the default - we'll roll out own
+        gracefulShutdownTimeout: 30,
+
+        ...frameworkConfig,
+
+        broker: {
+            ...new BrokerConfig(),
+            startOnBootstrap: false,
+            ...frameworkConfig?.broker
+        },
+        http: {
+            ...frameworkConfig?.http,
+            parser: {
+                multipartJsonKey: '_payload',
+                ...frameworkConfig?.http?.parser
+            }
+        }
+    });
+
+    frameworkModule.getImportedModuleByClass(HttpModule).addProvider({ provide: HttpKernel, useClass: CustomHttpKernel });
+
+    const app = new App({
+        ...appOptions,
+        config: config,
+        controllers: [ReplCommand, ProviderInvokeCommand, ...(appOptions.controllers ?? [])],
+        imports: [...(appOptions.imports ?? []), frameworkModule, new HealthModule()],
+        providers: [
+            HttpListener,
+            HttpWorkflowListenerOptions,
+            WorkerService,
+            MailService,
+            ...(appOptions.providers ?? []),
+            ...(db ? [db] : []),
+            ...(appOptions.enableDkRpc ? [] : [{ provide: RpcServer, useValue: { start: () => {} } }])
+        ],
+        listeners: [HttpWorkflowListener, ShutdownListener, ...(appOptions.listeners ?? [])]
+    });
+
+    globalState.currentApp = app;
+
+    if (isDevelopment) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-require-imports
+            require('../devconsole/patches').initDevConsole(app);
+        } catch {
+            // DevConsole not available
+        }
+    }
+
+    replaceMigrationCommands(app, frameworkModule, db);
+
+    if (options.config) {
+        app.appModule.addProvider({
+            provide: options.config,
+            useFactory() {
+                return app.appModule.config;
+            }
+        });
+        app.appModule.addProvider({
+            provide: BaseAppConfig,
+            useExisting: options.config
+        });
+
+        app.addConfigLoader(new CustomConfigLoader(defaultConfig));
+
+        // reconfigure the framework module to use the port from the config
+        app.setup((module, config) => {
+            if (config.PORT && !isTest) {
+                module.getImportedModuleByClass(FrameworkModule).configure({
+                    port: config.PORT
+                });
+            }
+        });
+    }
+
+    if (options.db) {
+        app.appModule.addProvider({
+            provide: DBProvider,
+            useFactory() {
+                return new DBProvider(app.get(options.db));
+            }
+        });
+
+        class DBHealthSetupListener {
+            constructor(private hcSvc: HealthcheckService) {}
+
+            @eventDispatcher.listen(onServerBootstrapDone)
+            onServerBootstrapDone() {
+                const db = app.get(options.db);
+                this.hcSvc.register('Database', async () => {
+                    await db.rawFind('SELECT 1');
+                });
+            }
+        }
+        app.appModule.addListener(DBHealthSetupListener);
+    }
+
+    if (corsOptionsFactory) {
+        app.appModule.addProvider({
+            provide: HttpCorsOptionsMulti,
+            useFactory(): HttpCorsOptionsMulti {
+                const options = corsOptionsFactory(app.appModule.config);
+                return new HttpCorsOptionsMulti(Array.isArray(options) ? options : [options]);
+            }
+        });
+
+        app.appModule.addListener(HttpCorsListener);
+    }
+
+    // hijack the Logger injection to replace the factory with ExtendedLogger
+    // this is definitely not a good way to do this
+    const originalProcessProviderFn = app.appModule.processProvider;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    app.appModule.processProvider = function (module: AppModule<any>, token: Token, provider: ProviderWithScope) {
+        if (token === Logger) {
+            if (typeof provider === 'object' && 'useFactory' in provider) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                delete (provider as any).useFactory;
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                (provider as any).useClass = ExtendedLogger;
+            }
+        }
+        return originalProcessProviderFn.call(this, module, token, provider);
+    };
+
+    // Allow direct injection of ExtendedLogger by aliasing it to Logger
+    app.appModule.addProvider({
+        provide: ExtendedLogger,
+        useExisting: Logger
+    });
+
+    if (options.enableWorker) {
+        installWorkerComponents(app);
+    }
+
+    let started = false;
+    app.listen(onServerMainBootstrapDone, () => {
+        started = true;
+        doAppPostStartup(app, !!options.db);
+    });
+
+    app.setup((_module, config) => {
+        if (config.SENTRY_DSN) {
+            installSentry({
+                dsn: config.SENTRY_DSN
+            });
+        }
+    });
+
+    const makeErrorHandler = (type: string) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return (err: any, promise?: any) => {
+            const logger = started ? r(Logger) : new Logger([new ConsoleTransport()]);
+            logger.error(type, err, { promise });
+            flushSentry()
+                .catch(err => logger.error('Error flushing to Sentry', err))
+                .finally(() => process.exit(1));
+        };
+    };
+    process.on('uncaughtException', makeErrorHandler('uncaughtException'));
+    process.on('unhandledRejection', makeErrorHandler('unhandledRejection'));
+
+    return app;
+}
+
+const AutoStartSymbol = Symbol('AutoStart');
+export const AutoStart = createSymbolAttachmentClassDecorator(AutoStartSymbol);
+
+async function doAppPostStartup<T extends RootModuleDefinition>(app: App<T>, enableDb?: boolean) {
+    if (enableDb) {
+        // DK lazily starts the database registry, but we don't have any calls that
+        // would cause that. without the registry, the application shutdown hook to
+        // disconect from the database is never executed. thus, we'll invoke this manually.
+        app.get(DatabaseRegistry).init();
+    }
+
+    // let's do some things when we're running normally (not as a CLI service)
+    if (!globalState.isCliService) {
+        // there are cases where we want a provider to start automatically at application startup,
+        // rather than waiting for injection via DI -- such as services that connect to 3rd parties
+        // via sockets to process events.
+        createAutoStartInstances(app.appModule);
+
+        // development only
+        if (isDevelopment) {
+            doDevPostAppStartup(app);
+        }
+    }
+}
+
+async function createAutoStartInstances(aModule: InjectorModule) {
+    const injector = aModule.injector;
+
+    if (aModule.imports?.length) {
+        for (const anImport of aModule.imports) {
+            await createAutoStartInstances(anImport);
+        }
+    }
+
+    for (const provider of aModule.providers) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if ((provider as any)[AutoStartSymbol]) {
+            injector?.get(provider);
+        }
+    }
+}

package/src/app/config.loader.ts

@@ -0,0 +1,66 @@
+import { AppModule } from '@deepkit/app';
+import { ReflectionClass } from '@deepkit/type';
+import { loadConfig } from '@zyno-io/config';
+import { existsSync } from 'fs';
+import { compact } from 'lodash';
+
+import { isTest } from './const';
+
+export class CustomConfigLoader {
+    private configLoaded = false;
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    constructor(private defaultConfig?: { [p: string]: any }) {}
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    load(_module: AppModule<any>, config: { [p: string]: any }, schema: ReflectionClass<any>) {
+        if (this.configLoaded) {
+            return;
+        }
+
+        if (this.defaultConfig) {
+            Object.assign(config, this.defaultConfig);
+        }
+
+        const loadedConfig = this.loadConfigObject();
+
+        // copy the keys from the schema over, and DK will validate it after
+        for (const prop of schema.getProperties()) {
+            if (prop.name in loadedConfig) {
+                config[prop.name] = loadedConfig[prop.name];
+            }
+        }
+
+        this.configLoaded = true;
+    }
+
+    protected loadConfigObject() {
+        if (!process.env.APP_ENV) {
+            if (process.argv.includes('--test')) {
+                process.env.APP_ENV = 'test';
+            } else {
+                throw new Error('APP_ENV must be specified in the environment');
+            }
+        }
+
+        const cwd = process.cwd();
+        const configFiles = compact([
+            `.env`,
+            `.env.local`,
+            isTest && `.env.development`,
+            isTest && `.env.development.local`,
+            `.env.${process.env.APP_ENV}`,
+            `.env.${process.env.APP_ENV}.local`
+        ]);
+        const configPaths = configFiles.map(file => `${cwd}/${file}`);
+        const validConfigPaths = configPaths.filter(path => existsSync(path));
+
+        if (validConfigPaths.length === 0) {
+            return process.env;
+        }
+
+        return loadConfig({
+            file: validConfigPaths
+        });
+    }
+}