@crossdelta/infrastructure 0.1.35 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.1.35",
+  "version": "0.1.38",
   "type": "module",
   "license": "MIT",
   "publishConfig": {
@@ -9,18 +9,15 @@
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "files": [
-    "dist",
-    "lib"
+    "dist"
   ],
   "exports": {
     ".": {
-      "bun": "./lib/index.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     },
     "./env": {
-      "bun": "./lib/env.ts",
       "import": "./dist/env.js",
       "require": "./dist/env.cjs",
       "types": "./dist/env.d.ts"

package/lib/env.ts

@@ -1,10 +0,0 @@
-/**
- * Environment helpers for services to read configuration.
- * Use this entry point in production services (Node.js, NestJS, etc.)
- *
- * @example
- * import { getServicePort, getServiceUrl } from '@crossdelta/infrastructure/env'
- */
-
-export * from './helpers/service-runtime'
-export type { ServiceName } from './types/service-names'

package/lib/helpers/config.ts

@@ -1,45 +0,0 @@
-import type { Input } from '@pulumi/pulumi'
-
-/**
- * Ensures that a string ends with a dot (useful for DNS CNAME values).
- */
-export const ensureDot = (str: string) => {
-  return str.endsWith('.') ? str : `${str}.`
-}
-
-/**
- * Common alert configuration for services
- */
-export const defaultAlerts = [
-  {
-    rule: 'CPU_UTILIZATION',
-    operator: 'GREATER_THAN',
-    value: 70,
-    window: 'FIVE_MINUTES',
-  },
-  {
-    rule: 'MEM_UTILIZATION',
-    operator: 'GREATER_THAN',
-    value: 70,
-    window: 'FIVE_MINUTES',
-  },
-]
-
-/**
- * Creates log destinations config with Logtail token
- */
-export const createLogDestinations = (logtailToken: Input<string>) => [
-  {
-    name: 'better-stacks-logs',
-    logtail: {
-      token: logtailToken,
-    },
-  },
-]
-
-/**
- * Default health check configuration
- */
-export const defaultHealthCheck = {
-  httpPath: '/health',
-}

package/lib/helpers/discover-services.ts

@@ -1,57 +0,0 @@
-import { readdirSync } from 'node:fs'
-import { join } from 'node:path'
-import type { ServiceConfig } from '../types'
-
-/**
- * Get the primary port for a service (for validation).
- * Prefers httpPort, falls back to first internalPort, then 8080.
- */
-function getServicePort(config: ServiceConfig): number {
-  if (config.httpPort) return config.httpPort as number
-  const internalPorts = config.internalPorts as number[] | undefined
-  if (internalPorts?.[0]) return internalPorts[0]
-  return 8080
-}
-
-/**
- * Validates that no two services use the same port.
- * @throws Error if duplicate ports are found
- */
-function validateNoDuplicatePorts(configs: ServiceConfig[]): void {
-  const portMap = new Map<number, string[]>()
-
-  for (const config of configs) {
-    const port = getServicePort(config)
-    const existing = portMap.get(port) || []
-    existing.push(config.name)
-    portMap.set(port, existing)
-  }
-
-  const conflicts = [...portMap.entries()]
-    .filter(([, services]) => services.length > 1)
-    .map(([port, services]) => `Port ${port}: ${services.join(', ')}`)
-
-  if (conflicts.length > 0) {
-    throw new Error(`Port conflicts detected:\n${conflicts.join('\n')}`)
-  }
-}
-
-/**
- * Auto-discovers all service configurations from a directory.
- * Each .ts file (except index.ts) should export a ServiceConfig as default.
- * @throws Error if duplicate ports are detected
- */
-export function discoverServices(servicesDir: string): ServiceConfig[] {
-  const files = readdirSync(servicesDir).filter(
-    (file) => file.endsWith('.ts') && file !== 'index.ts'
-  )
-
-  const configs = files.map((file) => {
-    const module = require(join(servicesDir, file))
-    return module.default as ServiceConfig
-  })
-
-  validateNoDuplicatePorts(configs)
-
-  return configs
-}

package/lib/helpers/docker-hub-image.ts

@@ -1,24 +0,0 @@
-import { type ImageConfig, RegistryType } from '../types'
-
-/**
- * Helper to create a Docker Hub image config.
- * For official images, use 'library' as the registry.
- *
- * @example
- * // Official image: library/nats:2.10-alpine
- * dockerHubImage('nats', '2.10-alpine')
- *
- * @example
- * // User image: bitnami/redis:7.0
- * dockerHubImage('redis', '7.0', 'bitnami')
- */
-export const dockerHubImage = (
-  repository: string,
-  tag: string,
-  registry = 'library',
-): ImageConfig => ({
-  registryType: RegistryType.DOCKER_HUB,
-  registry,
-  repository,
-  tag,
-})

package/lib/helpers/image.ts

@@ -1,54 +0,0 @@
-import type { Output } from '@pulumi/pulumi'
-
-const scopeImageTagsRaw = process.env.SCOPE_IMAGE_TAGS ?? ''
-const scopeImageTags = (() => {
-  if (!scopeImageTagsRaw.trim()) {
-    return {} as Record<string, string>
-  }
-
-  try {
-    const parsed = JSON.parse(scopeImageTagsRaw) as Record<string, unknown>
-    const tags: Record<string, string> = {}
-    for (const [key, value] of Object.entries(parsed ?? {})) {
-      if (typeof value === 'string' && value.trim().length > 0) {
-        tags[key] = value.trim()
-      }
-    }
-    return tags
-  } catch (error) {
-    console.warn('Unable to parse scope image tags from environment:', error)
-    return {} as Record<string, string>
-  }
-})()
-
-const resolveImageTag = (scopeName: string) => {
-  const tag = scopeImageTags[scopeName]
-  if (!tag) {
-    // Use 'latest' as fallback for local development/preview
-    console.warn(`No image tag for "${scopeName}", using "latest" as fallback`)
-    return 'latest'
-  }
-
-  return tag
-}
-
-/**
- * Gets the image configuration for a given repository.
- * @param repository - The name of the repository.
- * @returns The image configuration.
- */
-export const getImage = (repository: string, registryCredentials: Output<string>) => {
-  const scopeName = repository.split('/').pop()
-
-  if (!scopeName) {
-    throw new Error(`Invalid repository name: ${repository}`)
-  }
-
-  return {
-    registryType: 'GHCR' as any,
-    registry: 'orderboss',
-    repository,
-    registryCredentials,
-    tag: resolveImageTag(scopeName),
-  }
-}

package/lib/helpers/index.ts

@@ -1,7 +0,0 @@
-export * from './config'
-export * from './discover-services'
-export * from './docker-hub-image'
-export * from './image'
-export * from './service-builder'
-export * from './service-runtime'
-export * from './service-urls'

package/lib/helpers/service-builder.ts

@@ -1,61 +0,0 @@
-import type { AppSpecService } from '@pulumi/digitalocean/types/input'
-import type { Output } from '@pulumi/pulumi'
-import type { ServiceConfig } from '../types'
-import { createLogDestinations, defaultAlerts, defaultHealthCheck } from './config'
-import { getImage } from './image'
-
-export interface BuildServicesOptions {
-  serviceConfigs: ServiceConfig[]
-  registryCredentials: Output<string>
-  logtailToken: Output<string>
-}
-
-/**
- * Builds the services array from service configs.
- */
-export function buildServices(options: BuildServicesOptions): AppSpecService[] {
-  const { serviceConfigs, registryCredentials, logtailToken } = options
-  const logDestinations = createLogDestinations(logtailToken)
-
-  return serviceConfigs.map((config) => {
-    // Remove custom properties that shouldn't be passed to DO API
-    const { 
-      ingressPrefix: _ingressPrefix, 
-      skip: _skip, 
-      image: configImage, 
-      internalUrl: _internalUrl,
-      ...serviceConfig 
-    } = config
-    
-    // Use provided image or default to GHCR
-    const image = configImage ?? getImage(`platform/${config.name}`, registryCredentials)
-    
-    return {
-      healthCheck: defaultHealthCheck,
-      alerts: defaultAlerts,
-      logDestinations,
-      ...serviceConfig,
-      image,
-    }
-  })
-}
-
-/**
- * Builds the ingress rules from service configs.
- * Only includes services that have both an ingressPrefix AND httpPort defined.
- * Services with only internalPorts cannot have ingress rules.
- */
-export function buildIngressRules(serviceConfigs: ServiceConfig[]) {
-  return serviceConfigs
-    .filter((config): config is ServiceConfig & { ingressPrefix: string; httpPort: number } => 
-      config.ingressPrefix !== undefined && config.httpPort !== undefined
-    )
-    .map((config) => ({
-      component: { name: config.name },
-      match: {
-        path: {
-          prefix: config.ingressPrefix,
-        },
-      },
-    }))
-}

package/lib/helpers/service-runtime.ts

@@ -1,62 +0,0 @@
-/**
- * Runtime helpers for services to access their configuration.
- * These functions read from environment variables set by generate-env (local)
- * or injected by DO App Platform (production).
- */
-
-import type { ServiceName } from '../types'
-
-/**
- * Convert service name to valid env var key (e.g., api-gateway -> API_GATEWAY)
- */
-const toEnvKey = (name: string) => name.toUpperCase().replace(/-/g, '_')
-
-/**
- * Get the port for a service from environment variables.
- * Reads from <SERVICE_NAME>_PORT (e.g., ORDERS_PORT, API_GATEWAY_PORT)
- *
- * @param serviceName - The service name (e.g., 'orders', 'api-gateway')
- * @param defaultPort - Fallback port if env var is not set (default: 8080)
- * @returns The configured port number
- *
- * @example
- * ```typescript
- * import { getServicePort } from '@crossdelta/infrastructure/env'
- *
- * const port = getServicePort('orders', 3001)
- * // Reads process.env.ORDERS_PORT, falls back to 3001
- * ```
- */
-export function getServicePort(serviceName: ServiceName, defaultPort = 8080): number {
-  const envKey = `${toEnvKey(serviceName)}_PORT`
-  const envValue = process.env[envKey]
-
-  if (envValue) {
-    const parsed = Number(envValue)
-    if (!Number.isNaN(parsed)) {
-      return parsed
-    }
-  }
-
-  return defaultPort
-}
-
-/**
- * Get the URL for a service from environment variables.
- * Reads from <SERVICE_NAME>_URL (e.g., ORDERS_URL, API_GATEWAY_URL)
- *
- * @param serviceName - The service name (e.g., 'orders', 'api-gateway')
- * @returns The service URL or undefined if not set
- *
- * @example
- * ```typescript
- * import { getServiceUrl } from '@crossdelta/infrastructure/env'
- *
- * const ordersUrl = getServiceUrl('orders')
- * // Returns process.env.ORDERS_URL
- * ```
- */
-export function getServiceUrl(serviceName: ServiceName): string | undefined {
-  const envKey = `${toEnvKey(serviceName)}_URL`
-  return process.env[envKey]
-}

package/lib/helpers/service-urls.ts

@@ -1,82 +0,0 @@
-import type { AppSpecEnv } from '@pulumi/digitalocean/types/input'
-import type { ServiceConfig } from '../types'
-
-/**
- * Get the primary port for a service.
- * Prefers httpPort, falls back to first internalPort, then 8080.
- */
-function getServicePort(config: ServiceConfig): number {
-  if (config.httpPort) return config.httpPort as number
-  // internalPorts is Input<Input<number>[]> at type level, but plain number[] at runtime
-  const internalPorts = config.internalPorts as number[] | undefined
-  if (internalPorts?.[0]) return internalPorts[0]
-  return 8080
-}
-
-/**
- * Generate internal service URLs for service-to-service communication.
- * Uses DigitalOcean App Platform's internal DNS (e.g., http://orders:3001)
- * Uses internalUrl if defined, otherwise defaults to http://{name}:{port}
- */
-export function buildInternalUrls(serviceConfigs: ServiceConfig[]): Record<string, string> {
-  return Object.fromEntries(
-    serviceConfigs.map((config) => {
-      const url = config.internalUrl ?? `http://${config.name}:${getServicePort(config)}`
-      return [config.name, url]
-    }),
-  )
-}
-
-/**
- * Generate external service URLs based on primary domain and ingress prefix.
- */
-export function buildExternalUrls(
-  serviceConfigs: ServiceConfig[],
-  baseUrl: string,
-): Record<string, string> {
-  return Object.fromEntries(
-    serviceConfigs
-      .filter((config) => config.ingressPrefix !== undefined)
-      .map((config) => {
-        const path = config.ingressPrefix === '/' ? '' : config.ingressPrefix
-        return [config.name, `${baseUrl}${path}`]
-      }),
-  )
-}
-
-/**
- * Generate local development URLs (localhost with configured ports).
- */
-export function buildLocalUrls(serviceConfigs: ServiceConfig[]): Record<string, string> {
-  return Object.fromEntries(
-    serviceConfigs.map((config) => {
-      const port = getServicePort(config)
-      return [config.name, `http://localhost:${port}`]
-    }),
-  )
-}
-
-/**
- * Generate environment variables for service URLs.
- * Used to inject service URLs into DO App Platform.
- * Uses internalUrl if defined, otherwise defaults to http://{name}:{port}
- */
-export function buildServiceUrlEnvs(serviceConfigs: ServiceConfig[]): AppSpecEnv[] {
-  return serviceConfigs.map((config) => ({
-    key: `${config.name.toUpperCase().replace(/-/g, '_')}_URL`,
-    scope: 'RUN_TIME' as const,
-    value: config.internalUrl ?? `http://${config.name}:${getServicePort(config)}`,
-  }))
-}
-
-/**
- * Generate environment variables for service ports.
- * Used to inject service ports into DO App Platform.
- */
-export function buildServicePortEnvs(serviceConfigs: ServiceConfig[]): AppSpecEnv[] {
-  return serviceConfigs.map((config) => ({
-    key: `${config.name.toUpperCase().replace(/-/g, '_')}_PORT`,
-    scope: 'RUN_TIME' as const,
-    value: String(getServicePort(config)),
-  }))
-}

package/lib/index.ts

@@ -1,2 +0,0 @@
-export * from './helpers'
-export * from './types'

package/lib/types/index.ts

@@ -1,87 +0,0 @@
-import type { AppSpecService } from '@pulumi/digitalocean/types/input'
-
-/**
- * Supported container registry types for DigitalOcean App Platform.
- */
-export const RegistryType = {
-  /** Docker Hub - public or private images */
-  DOCKER_HUB: 'DOCKER_HUB',
-  /** GitHub Container Registry */
-  GHCR: 'GHCR',
-  /** DigitalOcean Container Registry */
-  DOCR: 'DOCR',
-} as const
-
-export type RegistryType = (typeof RegistryType)[keyof typeof RegistryType]
-
-/**
- * Image configuration for a service.
- */
-export interface ImageConfig {
-  /** Registry type */
-  registryType: RegistryType
-  /** Registry name (e.g., 'library' for official Docker Hub images, 'orderboss' for GHCR) */
-  registry: string
-  /** Repository name (e.g., 'nats', 'platform/storefront') */
-  repository: string
-  /** Image tag (e.g., '2.10-alpine', 'latest') */
-  tag: string
-}
-
-/**
- * Configuration for a service that will be deployed to DigitalOcean App Platform.
- * Each service in infra/services/*.ts should export a default object of this type.
- *
- * ## Port Configuration
- *
- * Services can expose ports in two ways:
- *
- * - `httpPort`: Public HTTP port with ingress routing (requires `ingressPrefix`)
- * - `internalPorts`: Internal-only ports, not publicly accessible
- *
- * The **first port** (httpPort or internalPorts[0]) is used as the primary port for:
- * - `<SERVICE>_PORT` environment variable
- * - `<SERVICE>_URL` environment variable (unless `internalUrl` is set)
- *
- * ## Examples
- *
- * ```ts
- * // Public service (API Gateway)
- * { httpPort: 4000, ingressPrefix: '/api' }
- *
- * // Internal-only service (Orders)
- * { internalPorts: [4001] }
- *
- * // Internal service with custom protocol (NATS)
- * { internalPorts: [4222, 8222], internalUrl: 'nats://nats:4222' }
- * ```
- *
- * @see https://docs.digitalocean.com/reference/api/digitalocean/#tag/Apps
- */
-export type ServiceConfig = Partial<Omit<AppSpecService, 'image'>> & {
-  /** Unique name of the service (required) */
-  name: string
-  /**
-   * Ingress path prefix for public routing (e.g., '/api').
-   * Only used when `httpPort` is set. Services with only `internalPorts` cannot have ingress.
-   */
-  ingressPrefix?: string
-  /** Set to true to exclude this service from deployment */
-  skip?: boolean
-  /** Custom image configuration (defaults to GHCR image based on service name) */
-  image?: ImageConfig
-  /**
-   * Override the internal URL for service-to-service communication.
-   * Use this for non-HTTP protocols (e.g., 'nats://nats:4222').
-   * If not set, defaults to `http://{name}:{primaryPort}`.
-   */
-  internalUrl?: string
-}
-
-/**
- * Full service spec after merging with common config.
- * This is what gets passed to the DigitalOcean App spec.
- */
-export type FullServiceSpec = AppSpecService
-
-export * from './service-names'

package/lib/types/service-names.ts

@@ -1,10 +0,0 @@
-/**
- * Auto-generated file - do not edit manually!
- * Generated by: bun run generate-env
- */
-
-/**
- * Known service names in the platform.
- * This type is auto-generated from infra/services/*.ts
- */
-export type ServiceName = 'nats' | 'orders' | 'storefront' | 'api-gateway'