@zintrust/core 0.1.5 → 0.1.7

package/src/templates/project/basic/config/env.ts.tpl

@@ -6,11 +6,7 @@
  * Safe for both Node.js and serverless runtimes (Cloudflare Workers, Deno, Lambda)
  */
 
-type ProcessLike = {
-  env?: Record<string, string | undefined>;
-  execPath?: string;
-  platform?: string;
-};
+import { ProcessLike } from '@config/type';
 
 const getProcessLike = (): ProcessLike | undefined => {
   return typeof process === 'undefined' ? undefined : (process as unknown as ProcessLike);
@@ -35,6 +31,7 @@ const getInt = (key: string, defaultValue?: number): number => {
   const env = proc?.env ?? {};
   const value = env[key];
   if (value === undefined || value === null) return defaultValue ?? 0;
+  if (typeof value === 'string' && value.trim() === '') return defaultValue ?? 0;
   return Number.parseInt(value, 10);
 };
 
@@ -62,7 +59,8 @@ export const Env = Object.freeze({
 
   // Core
   NODE_ENV: get('NODE_ENV', 'development'),
-  PORT: getInt('APP_PORT', 3000),
+  // Prefer PORT, fallback to APP_PORT for compatibility
+  PORT: getInt('PORT', getInt('APP_PORT', 3000)),
   HOST: get('HOST', 'localhost'),
   APP_NAME: get('APP_NAME', 'ZinTrust'),
   APP_KEY: get('APP_KEY', ''),
@@ -71,7 +69,8 @@ export const Env = Object.freeze({
   DB_CONNECTION: get('DB_CONNECTION', 'sqlite'),
   DB_HOST: get('DB_HOST', 'localhost'),
   DB_PORT: getInt('DB_PORT', 5432),
-  DB_DATABASE: get('DB_DATABASE', 'zintrust'),
+  // Accept DB_PATH as an alias for sqlite file path (many env templates use it).
+  DB_DATABASE: get('DB_DATABASE', get('DB_PATH', 'zintrust')),
   DB_USERNAME: get('DB_USERNAME', 'postgres'),
   DB_PASSWORD: get('DB_PASSWORD', ''),
   DB_READ_HOSTS: get('DB_READ_HOSTS', ''),

package/src/templates/project/basic/config/features.ts.tpl

@@ -1,4 +1,4 @@
-import { Env } from '@config/env';
+import { Env } from '@zintrust/core';
 import { Logger } from '@config/logger';
 
 /**

package/src/templates/project/basic/config/index.ts.tpl

@@ -16,7 +16,7 @@ export { appConfig, type AppConfig } from '@config/app';
 export { cacheConfig, type CacheConfig } from '@config/cache';
 export { databaseConfig, type DatabaseConfig } from '@config/database';
 export { microservicesConfig, type MicroservicesConfig } from '@config/microservices';
-export { middlewareConfig, type MiddlewareConfig } from '@config/middleware';
+export { middlewareConfig } from '@config/middleware';
 export { queueConfig, type QueueConfig } from '@config/queue';
 export { securityConfig } from '@config/security';
 export { storageConfig, type StorageConfig } from '@config/storage';

package/src/templates/project/basic/config/logger.ts.tpl

@@ -100,7 +100,9 @@ const getFileWriter = (): void => {
 
 const shouldLogToFile = (): boolean => {
   // Prefer dynamic lookup so late-bound env (tests, some runtimes) is respected.
-  if (!Env.getBool('LOG_TO_FILE', false)) return false;
+  const channel = Env.get('LOG_CHANNEL', '').trim().toLowerCase();
+  const channelWantsFile = channel === 'file' || channel === 'all';
+  if (!Env.getBool('LOG_TO_FILE', false) && !channelWantsFile) return false;
   if (typeof process === 'undefined') return false;
   return true;
 };

package/src/templates/project/basic/config/logging/HttpLogger.ts.tpl

@@ -10,7 +10,7 @@
  */
 
 import { delay } from '@zintrust/core';
-import { Env } from '@config/env';
+import { Env } from '@zintrust/core';
 import { ErrorFactory } from '@zintrust/core';
 import { HttpClient } from '@zintrust/core';
 

package/src/templates/project/basic/config/logging/KvLogger.ts.tpl

@@ -9,7 +9,7 @@
  */
 
 import { Cloudflare } from '@config/cloudflare';
-import { Env } from '@config/env';
+import { Env } from '@zintrust/core';
 
 export type KvLogEvent = {
   timestamp: string;

package/src/templates/project/basic/config/logging/SlackLogger.ts.tpl

@@ -9,7 +9,7 @@
  *  - SLACK_LOG_BATCH_WINDOW_MS (default: 5000)
  */
 
-import { Env } from '@config/env';
+import { Env } from '@zintrust/core';
 import { ErrorFactory } from '@zintrust/core';
 import { HttpClient } from '@zintrust/core';
 

package/src/templates/project/basic/config/mail.ts.tpl

@@ -5,63 +5,7 @@
  */
 
 import { Env } from '@config/env';
-
-export type MailDriverName = 'disabled' | 'sendgrid' | 'smtp' | 'ses' | 'mailgun';
-
-export type DisabledMailDriverConfig = {
-  driver: 'disabled';
-};
-
-export type SendGridMailDriverConfig = {
-  driver: 'sendgrid';
-  apiKey: string;
-};
-
-export type MailgunMailDriverConfig = {
-  driver: 'mailgun';
-  apiKey: string;
-  domain: string;
-  baseUrl: string;
-};
-
-// Placeholders for future drivers (kept config-first)
-export type SmtpMailDriverConfig = {
-  driver: 'smtp';
-  host: string;
-  port: number;
-  username: string;
-  password: string;
-  secure: boolean | 'starttls';
-};
-
-export type SesMailDriverConfig = {
-  driver: 'ses';
-  region: string;
-};
-
-export type MailDriverConfig =
-  | DisabledMailDriverConfig
-  | SendGridMailDriverConfig
-  | MailgunMailDriverConfig
-  | SmtpMailDriverConfig
-  | SesMailDriverConfig;
-
-type MailDrivers = {
-  disabled: DisabledMailDriverConfig;
-  sendgrid: SendGridMailDriverConfig;
-  mailgun: MailgunMailDriverConfig;
-  smtp: SmtpMailDriverConfig;
-  ses: SesMailDriverConfig;
-};
-
-type MailConfigInput = {
-  default: MailDriverName;
-  from: {
-    address: string;
-    name: string;
-  };
-  drivers: MailDrivers;
-};
+import type { MailConfigInput, MailDriverConfig, MailDriverName, MailDrivers } from '@config/type';
 
 const getMailDriver = (config: MailConfigInput): MailDriverConfig => {
   const defaultDriver = config.default;

package/src/templates/project/basic/config/microservices.ts.tpl

@@ -4,7 +4,7 @@
  * Sealed namespace for immutability
  */
 
-import { Env } from '@config/env';
+import { Env } from '@zintrust/core';
 
 const microservicesConfigObj = {
   /**

package/src/templates/project/basic/config/middleware.ts.tpl

@@ -1,3 +1,4 @@
+import { MiddlewareConfigType } from '@config/type';
 import { CsrfMiddleware } from '@middleware/CsrfMiddleware';
 import { ErrorHandlerMiddleware } from '@middleware/ErrorHandlerMiddleware';
 import { LoggingMiddleware } from '@middleware/LoggingMiddleware';
@@ -5,11 +6,6 @@ import type { Middleware } from '@middleware/MiddlewareStack';
 import { RateLimiter } from '@middleware/RateLimiter';
 import { SecurityMiddleware } from '@middleware/SecurityMiddleware';
 
-export type MiddlewareConfig = {
-  global: Middleware[];
-  route: Record<string, Middleware>;
-};
-
 const shared = Object.freeze({
   log: LoggingMiddleware.create(),
   error: ErrorHandlerMiddleware.create(),
@@ -18,7 +14,7 @@ const shared = Object.freeze({
   csrf: CsrfMiddleware.create(),
 } satisfies Record<string, Middleware>);
 
-const middlewareConfigObj: MiddlewareConfig = {
+const middlewareConfigObj: MiddlewareConfigType = {
   global: [shared.log, shared.error, shared.security, shared.rateLimit, shared.csrf],
   route: shared,
 };

package/src/templates/project/basic/config/notification.ts.tpl

@@ -6,42 +6,7 @@
  */
 
 import { Env } from '@config/env';
-
-export type KnownNotificationDriverName = 'console' | 'termii' | 'twilio' | 'slack';
-
-export type ConsoleNotificationDriverConfig = { driver: 'console' };
-
-export type TermiiNotificationDriverConfig = {
-  driver: 'termii';
-  apiKey: string;
-  sender: string;
-  endpoint: string;
-};
-
-export type TwilioNotificationDriverConfig = {
-  driver: 'twilio';
-  accountSid: string;
-  authToken: string;
-  fromNumber: string;
-};
-
-export type SlackNotificationDriverConfig = {
-  driver: 'slack';
-  webhookUrl: string;
-};
-
-export type KnownNotificationDriverConfig =
-  | ConsoleNotificationDriverConfig
-  | TermiiNotificationDriverConfig
-  | TwilioNotificationDriverConfig
-  | SlackNotificationDriverConfig;
-
-type NotificationProviders = {
-  console: ConsoleNotificationDriverConfig;
-  termii: TermiiNotificationDriverConfig;
-  twilio: TwilioNotificationDriverConfig;
-  slack: SlackNotificationDriverConfig;
-};
+import type { NotificationProviders } from '@config/type';
 
 const notificationConfigObj = {
   /**

package/src/templates/project/basic/config/queue.ts.tpl

@@ -6,55 +6,7 @@
 
 import { Env } from '@config/env';
 
-type QueueDriverName = 'sync' | 'database' | 'redis' | 'rabbitmq' | 'sqs';
-
-type SyncQueueDriverConfig = {
-  driver: 'sync';
-};
-
-type DatabaseQueueDriverConfig = {
-  driver: 'database';
-  table: string;
-  connection: string;
-};
-
-type RedisQueueDriverConfig = {
-  driver: 'redis';
-  host: string;
-  port: number;
-  password?: string;
-  database: number;
-};
-
-type RabbitMqQueueDriverConfig = {
-  driver: 'rabbitmq';
-  host: string;
-  port: number;
-  username: string;
-  password: string;
-  vhost: string;
-};
-
-type SqsQueueDriverConfig = {
-  driver: 'sqs';
-  key?: string;
-  secret?: string;
-  region: string;
-  queueUrl?: string;
-};
-
-type QueueDriversConfig = {
-  sync: SyncQueueDriverConfig;
-  database: DatabaseQueueDriverConfig;
-  redis: RedisQueueDriverConfig;
-  rabbitmq: RabbitMqQueueDriverConfig;
-  sqs: SqsQueueDriverConfig;
-};
-
-type QueueConfigWithDrivers = {
-  default: QueueDriverName;
-  drivers: QueueDriversConfig;
-};
+import type { QueueConfigWithDrivers, QueueDriverName, QueueDriversConfig } from '@config/type';
 
 const getQueueDriver = (config: QueueConfigWithDrivers): QueueDriversConfig[QueueDriverName] => {
   const driverName = config.default;

package/src/templates/project/basic/config/security.ts.tpl

@@ -2,6 +2,18 @@
  * Security Configuration
  * JWT, CSRF, encryption and other security settings
  * Sealed namespace for immutability
+ *
+ * APP_KEY: Primary encryption key for storage signing and app-level encryption.
+ *          Set automatically during project scaffolding.
+ *
+ * Security keys can be configured per domain:
+ * - APP_KEY: Default encryption key for all operations (auto-generated)
+ * - API_KEY_SECRET: Optional API key authentication (if API_KEY_ENABLED=true)
+ * - ENCRYPTION_KEY: Optional separate encryption key (overrides APP_KEY if set)
+ * - JWT_SECRET: JWT token signing key
+ *
+ * Developers can use a single APP_KEY or configure separate keys for different
+ * security domains (e.g., different keys for different microservices).
  */
 
 import { appConfig } from '@config/app';
@@ -72,7 +84,7 @@ const securityConfigObj = {
    * API Key Authentication
    */
   apiKey: {
-    enabled: Env.getBool('API_KEY_ENABLED', true),
+    enabled: Env.getBool('API_KEY_ENABLED', false),
     headerName: Env.get('API_KEY_HEADER', 'x-api-key'),
     secret: Env.get('API_KEY_SECRET'),
   },

package/src/templates/project/basic/config/startup.ts.tpl

@@ -9,6 +9,7 @@ import { Env } from '@config/env';
 export type StartupConfig = {
   healthChecksEnabled: boolean;
   validateSecrets: boolean;
+  requireEnv: boolean;
   checkDatabase: boolean;
   checkCache: boolean;
   timeoutMs: number;
@@ -18,6 +19,7 @@ export type StartupConfig = {
 export const startupConfig = Object.freeze({
   healthChecksEnabled: Env.getBool('STARTUP_HEALTH_CHECKS', true),
   validateSecrets: Env.getBool('STARTUP_VALIDATE_SECRETS', true),
+  requireEnv: Env.getBool('STARTUP_REQUIRE_ENV', false),
   checkDatabase: Env.getBool('STARTUP_CHECK_DB', false),
   checkCache: Env.getBool('STARTUP_CHECK_CACHE', false),
   timeoutMs: Env.getInt('STARTUP_HEALTH_TIMEOUT_MS', 2500),

package/src/templates/project/basic/config/storage.ts.tpl

@@ -5,60 +5,12 @@
  */
 
 import { Env } from '@config/env';
-
-type EnvGetValue = ReturnType<typeof Env.get>;
-type EnvGetBoolValue = ReturnType<typeof Env.getBool>;
-
-type LocalStorageDriverConfig = {
-  driver: 'local';
-  root: EnvGetValue;
-  url: EnvGetValue;
-  visibility: EnvGetValue;
-};
-
-type S3StorageDriverConfig = {
-  driver: 's3';
-  accessKeyId: EnvGetValue;
-  secretAccessKey: EnvGetValue;
-  region: typeof Env.AWS_REGION;
-  bucket: EnvGetValue;
-  url: EnvGetValue;
-  endpoint: EnvGetValue;
-  usePathStyleUrl: EnvGetBoolValue;
-};
-
-type R2StorageDriverConfig = {
-  driver: 'r2';
-  accessKeyId: EnvGetValue;
-  secretAccessKey: EnvGetValue;
-  region: EnvGetValue;
-  bucket: EnvGetValue;
-  endpoint: EnvGetValue;
-  url: EnvGetValue;
-};
-
-type GcsStorageDriverConfig = {
-  driver: 'gcs';
-  projectId: EnvGetValue;
-  keyFile: EnvGetValue;
-  bucket: EnvGetValue;
-  url: EnvGetValue;
-};
-
-type StorageDrivers = {
-  local: LocalStorageDriverConfig;
-  s3: S3StorageDriverConfig;
-  r2: R2StorageDriverConfig;
-  gcs: GcsStorageDriverConfig;
-};
-
-type StorageDriverName = keyof StorageDrivers;
-type StorageDriverConfig = StorageDrivers[StorageDriverName];
-
-type StorageConfigRuntime = {
-  readonly default: string;
-  readonly drivers: StorageDrivers;
-};
+import type {
+  StorageConfigRuntime,
+  StorageDriverConfig,
+  StorageDriverName,
+  StorageDrivers,
+} from '@config/type';
 
 const isStorageDriverName = (
   value: string,