@owlmeans/kluster 0.1.2 → 0.1.3

package/README.md

@@ -1,640 +1,67 @@
 # @owlmeans/kluster
 
-The **@owlmeans/kluster** package provides Kubernetes integration for OwlMeans Common Libraries, enabling applications to interact with Kubernetes clusters for service discovery, pod management, and configuration resolution in cloud-native environments.
+Kubernetes integration service — service discovery and pod/service IP resolution for cloud-native OwlMeans apps.
 
-## Purpose
+## Overview
 
-This package serves as a Kubernetes integration layer for OwlMeans applications, specifically designed for:
-
-- **Service Discovery**: Automatically discover and connect to services running in Kubernetes clusters
-- **Pod Management**: Query and interact with pods using label selectors
-- **Configuration Resolution**: Resolve configuration values from Kubernetes resources at runtime
-- **Cloud-native Deployment**: Enable applications to work seamlessly in Kubernetes environments
-- **Dynamic Service Endpoints**: Automatically resolve service hostnames and endpoints
-- **Network API Integration**: Access Kubernetes networking APIs for advanced operations
-
-## Key Concepts
-
-### Kubernetes Service Discovery
-The package provides automatic service discovery within Kubernetes clusters, allowing applications to find and connect to other services without hardcoded endpoints.
-
-### Configuration Directives
-Special configuration syntax (`kluster:directive:query`) that gets resolved at runtime using Kubernetes API calls, enabling dynamic configuration based on cluster state.
-
-### Lazy Initialization
-Kubernetes client is initialized lazily when first accessed, reducing startup time and resource usage when Kubernetes features are not immediately needed.
-
-### Label Selector Queries
-Uses Kubernetes label selectors to query for pods and services, providing flexible and powerful resource discovery capabilities.
+- `makeKlusterService(alias?)` — creates a Kubernetes API client service
+- `klusterize(context, alias?)` — registers the service and its config-resolution middleware
+- `KlusterService` — resolves pod hostnames and service cluster IPs, dispatches `kluster:` directives
+- Used to resolve `kluster:<selector>` config values to actual pod IPs at runtime
 
 ## Installation
 
 ```bash
-npm install @owlmeans/kluster
-```
-
-## API Reference
-
-### Types
-
-#### `KlusterService`
-Main service interface for Kubernetes operations.
-
-```typescript
-interface KlusterService extends LazyService {
-  config?: KubeConfig
-  api?: CoreV1Api
-  
-  getHostnames(selector: string): Promise<string[]>
-  getServiceHostname(selector: string): Promise<string>
-  dispatch<T>(action: string, query: string): Promise<T>
-  makeNetworkingApi(): NetworkingV1Api
-}
-```
-
-#### `KlusterConfig`
-Configuration interface extending ServerConfig.
-
-```typescript
-interface KlusterConfig extends ServerConfig {
-  kluster?: {
-    namespace?: string
-  }
-}
-```
-
-### Core Functions
-
-#### `makeKlusterService(alias?: string): KlusterService`
-
-Creates a Kubernetes service instance with lazy initialization.
-
-**Parameters:**
-- `alias`: Service alias (defaults to 'kluster')
-
-**Returns:** KlusterService instance
-
-```typescript
-import { makeKlusterService } from '@owlmeans/kluster'
-
-const klusterService = makeKlusterService('k8s-client')
+bun add @owlmeans/kluster
 ```
 
-#### `klusterize<C extends KlusterConfig, T extends BasicContext<C>>(context: T, alias?: string): T`
-
-Enhances a context with Kubernetes capabilities and registers necessary middleware.
-
-**Parameters:**
-- `context`: Application context to enhance
-- `alias`: Service alias (defaults to 'kluster')
+## Usage
 
-**Returns:** Enhanced context with Kubernetes support
+Register in server context setup:
 
 ```typescript
-import { klusterize } from '@owlmeans/kluster'
-import { makeServerContext } from '@owlmeans/server-context'
+import { klusterize, DEFAULT_ALIAS as KLUSTER_SERVICE } from '@owlmeans/kluster'
+import type { KlusterService } from '@owlmeans/kluster'
 
-const context = makeServerContext(config)
-const k8sContext = klusterize(context)
-```
-
-#### `createMiddleware(alias?: string): Middleware`
-
-Creates middleware for processing Kubernetes configuration directives.
-
-**Parameters:**
-- `alias`: Service alias (defaults to 'kluster')
-
-**Returns:** Middleware instance
+klusterize<C, T>(context)
 
-```typescript
-import { createMiddleware } from '@owlmeans/kluster'
-
-const middleware = createMiddleware('k8s-client')
-context.registerMiddleware(middleware)
+// Access in context type
+context.kluster = () => context.service<KlusterService>(KLUSTER_SERVICE)
 ```
 
-### Service Methods
-
-#### `getHostnames(selector: string): Promise<string[]>`
-
-Retrieves pod IP addresses using a label selector.
-
-**Parameters:**
-- `selector`: Kubernetes label selector
-
-**Returns:** Promise resolving to array of pod IP addresses
-
-```typescript
-const klusterService = context.service<KlusterService>('kluster')
-const podIPs = await klusterService.getHostnames('app=redis,tier=cache')
-```
-
-#### `getServiceHostname(selector: string): Promise<string>`
-
-Retrieves service hostname using a label selector.
-
-**Parameters:**
-- `selector`: Kubernetes label selector
-
-**Returns:** Promise resolving to service hostname
-
-```typescript
-const serviceName = await klusterService.getServiceHostname('app=database')
-```
-
-#### `dispatch<T>(action: string, query: string): Promise<T>`
-
-Dispatches actions for configuration resolution.
-
-**Parameters:**
-- `action`: Action type ('hostname' or 'service')
-- `query`: Query string (label selector or config path)
-
-**Returns:** Promise resolving to action result
-
-```typescript
-const result = await klusterService.dispatch('service', 'app=api-gateway')
-```
-
-#### `makeNetworkingApi(): NetworkingV1Api`
-
-Creates a Kubernetes Networking API client.
-
-**Returns:** NetworkingV1Api instance
-
-```typescript
-const networkingApi = klusterService.makeNetworkingApi()
-const ingresses = await networkingApi.listIngressForAllNamespaces()
-```
-
-### Constants
-
-#### Service Configuration
-```typescript
-const DEFAULT_ALIAS = 'kluster'
-const DEFAULT_NAMESPACE = 'default'
-```
-
-#### Configuration Directives
-```typescript
-const DIRECTIVE = 'kluster'
-const SEP = ':'
-const ACT_HOST = 'hostname'
-const ACT_SERVICE = 'service'
-```
-
-## Usage Examples
-
-### Basic Kubernetes Integration
-
-```typescript
-import { klusterize } from '@owlmeans/kluster'
-import { makeServerContext, makeServerConfig } from '@owlmeans/server-context'
-
-// Create server configuration with Kubernetes settings
-const config = makeServerConfig('k8s-app', {
-  kluster: {
-    namespace: 'production'
-  },
-  port: 8080
-})
-
-// Create and enhance context with Kubernetes capabilities
-const context = makeServerContext(config)
-const k8sContext = klusterize(context)
-
-await k8sContext.configure().init()
-```
+Config values can reference Kubernetes selectors:
 
-### Service Discovery
-
-```typescript
-import { KlusterService } from '@owlmeans/kluster'
-
-// Get Kubernetes service
-const klusterService = context.service<KlusterService>('kluster')
-
-// Discover database service
-const dbServiceName = await klusterService.getServiceHostname('app=postgres,tier=database')
-console.log('Database service:', dbServiceName)
-
-// Get all Redis cache pod IPs
-const redisIPs = await klusterService.getHostnames('app=redis,tier=cache')
-console.log('Redis pods:', redisIPs)
-
-// Connect to discovered service
-const dbConnection = createConnection({
-  host: dbServiceName,
-  port: 5432,
-  database: 'myapp'
-})
-```
-
-### Configuration Directives
-
-```typescript
-// Configuration with Kubernetes directives
-const config = makeServerConfig('microservice', {
-  kluster: {
-    namespace: 'production'
-  },
-  services: {
-    // These will be resolved at runtime using Kubernetes API
-    database: 'kluster:service:app=postgres',
-    cache: 'kluster:service:app=redis',
-    messageQueue: 'kluster:service:app=rabbitmq'
-  },
-  externalServices: {
-    // Resolve to actual pod IPs for load balancing
-    apiNodes: 'kluster:hostname:app=api,tier=backend'
-  }
-})
-
-// After context initialization, directives are resolved
-await context.configure().init()
-
-// Now services contain actual Kubernetes service names
-console.log(context.cfg.services.database) // e.g., "postgres-service"
-console.log(context.cfg.externalServices.apiNodes) // e.g., ["10.1.1.5", "10.1.1.6"]
-```
-
-### Microservice Communication
-
-```typescript
-import { klusterize, KlusterService } from '@owlmeans/kluster'
-
-// Setup microservice with Kubernetes discovery
-const config = makeServerConfig('user-service', {
-  kluster: { namespace: 'microservices' },
-  downstream: {
-    authService: 'kluster:service:app=auth-service',
-    emailService: 'kluster:service:app=email-service',
-    notificationService: 'kluster:service:app=notification-service'
-  }
-})
-
-const context = klusterize(makeServerContext(config))
-await context.configure().init()
-
-// Use discovered services
-async function createUser(userData: UserData) {
-  // Call authentication service
-  const authResponse = await fetch(`http://${context.cfg.downstream.authService}/validate`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(userData)
-  })
-  
-  if (authResponse.ok) {
-    const user = await saveUser(userData)
-    
-    // Send welcome email
-    await fetch(`http://${context.cfg.downstream.emailService}/send`, {
-      method: 'POST',
-      body: JSON.stringify({
-        to: user.email,
-        template: 'welcome',
-        data: { userName: user.name }
-      })
-    })
-    
-    return user
-  }
-  
-  throw new Error('Authentication failed')
-}
-```
-
-### Load Balancing with Pod Discovery
-
-```typescript
-import { KlusterService } from '@owlmeans/kluster'
-
-class LoadBalancedClient {
-  private klusterService: KlusterService
-  private endpoints: string[] = []
-  private currentIndex = 0
-  
-  constructor(klusterService: KlusterService, private selector: string) {
-    this.klusterService = klusterService
-    this.refreshEndpoints()
-  }
-  
-  private async refreshEndpoints() {
-    try {
-      this.endpoints = await this.klusterService.getHostnames(this.selector)
-      console.log(`Discovered ${this.endpoints.length} endpoints`)
-    } catch (error) {
-      console.error('Failed to refresh endpoints:', error)
-    }
-  }
-  
-  private getNextEndpoint(): string {
-    if (this.endpoints.length === 0) {
-      throw new Error('No available endpoints')
-    }
-    
-    const endpoint = this.endpoints[this.currentIndex]
-    this.currentIndex = (this.currentIndex + 1) % this.endpoints.length
-    return endpoint
-  }
-  
-  async makeRequest(path: string, options: RequestInit = {}) {
-    const endpoint = this.getNextEndpoint()
-    const url = `http://${endpoint}:8080${path}`
-    
-    try {
-      const response = await fetch(url, options)
-      return response
-    } catch (error) {
-      console.error(`Request to ${endpoint} failed:`, error)
-      // Refresh endpoints and retry
-      await this.refreshEndpoints()
-      throw error
-    }
-  }
-}
-
-// Usage
-const klusterService = context.service<KlusterService>('kluster')
-const apiClient = new LoadBalancedClient(klusterService, 'app=api,tier=backend')
-
-const response = await apiClient.makeRequest('/health')
-```
-
-### Health Monitoring
-
-```typescript
-import { KlusterService } from '@owlmeans/kluster'
-
-class HealthMonitor {
-  constructor(
-    private klusterService: KlusterService,
-    private services: Record<string, string>
-  ) {}
-  
-  async checkServiceHealth(): Promise<Record<string, boolean>> {
-    const healthStatus: Record<string, boolean> = {}
-    
-    for (const [serviceName, selector] of Object.entries(this.services)) {
-      try {
-        const serviceHost = await this.klusterService.getServiceHostname(selector)
-        const response = await fetch(`http://${serviceHost}/health`, {
-          timeout: 5000
-        })
-        healthStatus[serviceName] = response.ok
-      } catch (error) {
-        console.error(`Health check failed for ${serviceName}:`, error)
-        healthStatus[serviceName] = false
-      }
-    }
-    
-    return healthStatus
-  }
-  
-  async checkPodHealth(): Promise<Record<string, number>> {
-    const podCounts: Record<string, number> = {}
-    
-    for (const [serviceName, selector] of Object.entries(this.services)) {
-      try {
-        const podIPs = await this.klusterService.getHostnames(selector)
-        podCounts[serviceName] = podIPs.length
-      } catch (error) {
-        console.error(`Pod discovery failed for ${serviceName}:`, error)
-        podCounts[serviceName] = 0
-      }
-    }
-    
-    return podCounts
-  }
-}
-
-// Setup health monitoring
-const healthMonitor = new HealthMonitor(klusterService, {
-  'database': 'app=postgres',
-  'cache': 'app=redis',
-  'api': 'app=api,tier=backend'
-})
-
-// Monitor health every 30 seconds
-setInterval(async () => {
-  const serviceHealth = await healthMonitor.checkServiceHealth()
-  const podCounts = await healthMonitor.checkPodHealth()
-  
-  console.log('Service Health:', serviceHealth)
-  console.log('Pod Counts:', podCounts)
-}, 30000)
-```
-
-### Ingress Management
-
-```typescript
-import { KlusterService } from '@owlmeans/kluster'
-
-async function manageIngress(klusterService: KlusterService) {
-  const networkingApi = klusterService.makeNetworkingApi()
-  
-  // List all ingresses
-  const ingresses = await networkingApi.listIngressForAllNamespaces()
-  console.log('Available ingresses:', ingresses.body.items.map(i => i.metadata?.name))
-  
-  // Create new ingress
-  const ingressManifest = {
-    apiVersion: 'networking.k8s.io/v1',
-    kind: 'Ingress',
-    metadata: {
-      name: 'api-ingress',
-      namespace: 'production'
-    },
-    spec: {
-      rules: [{
-        host: 'api.example.com',
-        http: {
-          paths: [{
-            path: '/',
-            pathType: 'Prefix',
-            backend: {
-              service: {
-                name: 'api-service',
-                port: { number: 80 }
-              }
-            }
-          }]
-        }
-      }]
-    }
-  }
-  
-  try {
-    await networkingApi.createNamespacedIngress('production', ingressManifest)
-    console.log('Ingress created successfully')
-  } catch (error) {
-    console.error('Failed to create ingress:', error)
+```json
+{
+  "dbs": {
+    "mongo": { "url": "kluster:app=mongo-svc" }
   }
 }
 ```
 
-### Configuration File Resolution
-
-```typescript
-// config.yaml
-const yamlConfig = `
-database:
-  host: kluster:service:app=postgres
-  port: 5432
-  replicas: kluster:hostname:app=postgres
-
-cache:
-  primary: kluster:service:app=redis-primary
-  replicas: kluster:hostname:app=redis-replica
+The middleware resolves `kluster:` prefixed values to real cluster IPs at startup.
 
-services:
-  auth: kluster:service:app=auth-service
-  notification: kluster:service:app=notification-service
-`
+## API
 
-// Load and process configuration
-import yaml from 'yaml'
+### `makeKlusterService(alias?): KlusterService`
 
-const config = yaml.parse(yamlConfig)
-const context = klusterize(makeServerContext(config))
+Creates the Kubernetes service. Reads in-cluster config or `~/.kube/config`.
 
-// After initialization, all kluster directives are resolved
-await context.configure().init()
-
-console.log('Resolved configuration:', context.cfg)
-// Output:
-// {
-//   database: { host: 'postgres-service', port: 5432, replicas: ['10.1.1.10', '10.1.1.11'] },
-//   cache: { primary: 'redis-primary-service', replicas: ['10.1.2.20', '10.1.2.21'] },
-//   services: { auth: 'auth-service', notification: 'notification-service' }
-// }
-```
-
-## Error Handling
-
-```typescript
-import { KlusterService } from '@owlmeans/kluster'
+### `klusterize<C, T>(context, alias?): T`
 
-async function robustServiceDiscovery(klusterService: KlusterService) {
-  try {
-    // Attempt service discovery
-    const serviceName = await klusterService.getServiceHostname('app=api')
-    return serviceName
-  } catch (error) {
-    console.error('Service discovery failed:', error)
-    
-    // Fallback to default service name
-    return 'api-service'
-  }
-}
-
-// Handle network errors gracefully
-async function resilientPodDiscovery(klusterService: KlusterService, selector: string) {
-  const maxRetries = 3
-  let retries = 0
-  
-  while (retries < maxRetries) {
-    try {
-      const pods = await klusterService.getHostnames(selector)
-      if (pods.length > 0) {
-        return pods
-      }
-      throw new Error('No pods found')
-    } catch (error) {
-      retries++
-      console.warn(`Pod discovery attempt ${retries} failed:`, error.message)
-      
-      if (retries < maxRetries) {
-        // Exponential backoff
-        await new Promise(resolve => setTimeout(resolve, Math.pow(2, retries) * 1000))
-      }
-    }
-  }
-  
-  throw new Error(`Failed to discover pods after ${maxRetries} attempts`)
-}
-```
-
-## Integration Patterns
-
-### Deployment Configuration
-
-```yaml
-# kubernetes-config.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: app-config
-  namespace: production
-data:
-  config.json: |
-    {
-      "database": "kluster:service:app=postgres",
-      "cache": "kluster:service:app=redis",
-      "messageQueue": "kluster:service:app=rabbitmq"
-    }
-```
-
-```typescript
-// Application code
-import { klusterize } from '@owlmeans/kluster'
-
-const config = makeServerConfig('app', {
-  kluster: { namespace: 'production' },
-  // Configuration loaded from ConfigMap
-  database: 'kluster:service:app=postgres',
-  cache: 'kluster:service:app=redis'
-})
-
-const context = klusterize(makeServerContext(config))
-```
-
-### Helm Chart Integration
-
-```yaml
-# values.yaml
-app:
-  namespace: {{ .Values.namespace }}
-  services:
-    database: "kluster:service:app=postgres"
-    cache: "kluster:service:app=redis"
-
-# deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-spec:
-  template:
-    spec:
-      containers:
-      - name: app
-        env:
-        - name: KLUSTER_NAMESPACE
-          value: {{ .Values.namespace }}
-```
+Registers the kluster service and a middleware that resolves `kluster:` directives in config.
 
-## Best Practices
+### `KlusterService`
 
-1. **Namespace Management**: Always specify appropriate namespaces for service discovery
-2. **Label Consistency**: Use consistent labeling conventions across services
-3. **Error Handling**: Implement robust error handling for network operations
-4. **Caching**: Consider caching service discovery results to reduce API calls
-5. **Security**: Ensure proper RBAC permissions for Kubernetes API access
-6. **Monitoring**: Monitor service discovery operations and cluster health
-7. **Fallbacks**: Provide fallback mechanisms when service discovery fails
+- `getHostnames(selector, namespace?): Promise<string[]>` — list pod IPs matching a label selector
+- `getServiceHostname(selector, namespace?): Promise<string | null>` — get a service's cluster IP
+- `dispatch<T>(action, query): Promise<T>` — dispatch a kluster directive query
 
-## Dependencies
+### `KlusterConfig`
 
-This package depends on:
-- `@owlmeans/config` - Configuration management
-- `@owlmeans/context` - Context management system
-- `@owlmeans/server-config` - Server configuration utilities
-- `@owlmeans/server-context` - Server context management
-- `@kubernetes/client-node` - Official Kubernetes client library
+Extends `ServerConfig` with optional `namespace: string`.
 
 ## Related Packages
 
-- [`@owlmeans/server-app`](../server-app) - Server application framework
-- [`@owlmeans/server-context`](../server-context) - Server context management
-- [`@owlmeans/config`](../config) - Configuration management system
+- [`@owlmeans/server-app`](../server-app) — `makeContext` where `klusterize` is typically called
+- [`@owlmeans/mongo`](../mongo) — MongoDB URL can be a `kluster:` directive

package/build/service.d.ts

@@ -1,3 +1,4 @@
 import type { KlusterService } from './types.js';
+export declare const isNotFoundError: (e: unknown) => boolean;
 export declare const makeKlusterService: (alias?: string) => KlusterService;
 //# sourceMappingURL=service.d.ts.map

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,YAAY,CAAA;AAW/D,eAAO,MAAM,kBAAkB,GAAI,QAAO,MAAsB,KAAG,cAyElE,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,YAAY,CAAA;AAS/D,eAAO,MAAM,eAAe,GAAI,GAAG,OAAO,KAAG,OAa5C,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,QAAO,MAAsB,KAAG,cAqElE,CAAA"}

package/build/service.js

@@ -1,7 +1,26 @@
 import { ACT_HOST, ACT_SERVICE, DEFAULT_ALIAS, DEFAULT_NAMESPACE } from './consts.js';
 import { assertContext, createLazyService } from '@owlmeans/context';
-import { KubeConfig, CoreV1Api, HttpError, NetworkingV1Api, AppsV1Api } from '@kubernetes/client-node';
+import { KubeConfig, CoreV1Api, ApiException, NetworkingV1Api, AppsV1Api } from '@kubernetes/client-node';
 import { readConfigValue } from '@owlmeans/server-config';
+export const isNotFoundError = (e) => {
+    if (e == null || typeof e !== 'object')
+        return false;
+    const err = e;
+    // 1.4.0 ApiException uses .code
+    if (err['code'] === 404)
+        return true;
+    // 0.22.x HttpError used .statusCode
+    if (err['statusCode'] === 404)
+        return true;
+    // Some shapes nest status in .response or .body
+    const body = err['body'];
+    if (body?.['code'] === 404)
+        return true;
+    const response = err['response'];
+    if (response?.['statusCode'] === 404)
+        return true;
+    return false;
+};
 export const makeKlusterService = (alias = DEFAULT_ALIAS) => {
     const location = `kluster:${alias}`;
     const updateSelector = (selector) => selector.startsWith('/') || selector.startsWith('file:')
@@ -11,11 +30,11 @@ export const makeKlusterService = (alias = DEFAULT_ALIAS) => {
             try {
                 const ctx = assertContext(service.ctx, location);
                 namespace ??= ctx.cfg.kluster?.namespace ?? DEFAULT_NAMESPACE;
-                const { body } = await service.api.listNamespacedPod(namespace, undefined, undefined, undefined, undefined, selector);
-                return body.items.map(item => item.status?.podIP).filter(name => name != null);
+                const result = await service.api.listNamespacedPod({ namespace, labelSelector: selector });
+                return result.items.map(item => item.status?.podIP).filter(name => name != null);
             }
             catch (e) {
-                if (e instanceof HttpError) {
+                if (e instanceof ApiException) {
                     console.error(e.name, e.cause, e.message, e.body);
                 }
                 else {
@@ -28,12 +47,11 @@ export const makeKlusterService = (alias = DEFAULT_ALIAS) => {
             try {
                 const ctx = assertContext(service.ctx, location);
                 namespace ??= ctx.cfg.kluster?.namespace ?? DEFAULT_NAMESPACE;
-                const { body } = await service.api.listNamespacedService(namespace, undefined, undefined, undefined, undefined, selector);
-                // console.log(util.inspect(body, { depth: null, colors: true }))
-                return body.items?.[0]?.spec?.clusterIP ?? null;
+                const result = await service.api.listNamespacedService({ namespace, labelSelector: selector });
+                return result.items?.[0]?.spec?.clusterIP ?? null;
             }
             catch (e) {
-                if (e instanceof HttpError) {
+                if (e instanceof ApiException) {
                     console.error(e.name, e.cause, e.message, e.body);
                 }
                 else {

package/build/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/kluster",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -21,16 +21,17 @@
     }
   },
   "dependencies": {
-    "@kubernetes/client-node": "^0.22.0",
-    "@owlmeans/config": "^0.1.2",
-    "@owlmeans/context": "^0.1.2",
-    "@owlmeans/server-config": "^0.1.2",
-    "@owlmeans/server-context": "^0.1.2"
+    "@kubernetes/client-node": "^1.4.0",
+    "@owlmeans/config": "^0.1.3",
+    "@owlmeans/context": "^0.1.3",
+    "@owlmeans/server-config": "^0.1.3",
+    "@owlmeans/server-context": "^0.1.3"
   },
   "devDependencies": {
+    "@owlmeans/dep-config": "workspace:*",
     "@types/node": "^24.10.1",
     "nodemon": "^3.1.11",
-    "typescript": "^5.8.3"
+    "typescript": "^6.0.2"
   },
   "publishConfig": {
     "access": "public"

package/src/service.ts

@@ -1,15 +1,28 @@
 import { ACT_HOST, ACT_SERVICE, DEFAULT_ALIAS, DEFAULT_NAMESPACE } from './consts.js'
 import type { KlusterConfig, KlusterService } from './types.js'
 import { assertContext, createLazyService } from '@owlmeans/context'
-import { KubeConfig, CoreV1Api, HttpError, NetworkingV1Api, AppsV1Api } from '@kubernetes/client-node'
+import { KubeConfig, CoreV1Api, ApiException, NetworkingV1Api, AppsV1Api } from '@kubernetes/client-node'
 import { ServerContext } from '@owlmeans/server-context'
 import { readConfigValue } from '@owlmeans/server-config'
 
-// import util from 'node:util'
-
 type Config = KlusterConfig
 type Context = ServerContext<Config>
 
+export const isNotFoundError = (e: unknown): boolean => {
+  if (e == null || typeof e !== 'object') return false
+  const err = e as Record<string, unknown>
+  // 1.4.0 ApiException uses .code
+  if (err['code'] === 404) return true
+  // 0.22.x HttpError used .statusCode
+  if (err['statusCode'] === 404) return true
+  // Some shapes nest status in .response or .body
+  const body = err['body'] as Record<string, unknown> | undefined
+  if (body?.['code'] === 404) return true
+  const response = err['response'] as Record<string, unknown> | undefined
+  if (response?.['statusCode'] === 404) return true
+  return false
+}
+
 export const makeKlusterService = (alias: string = DEFAULT_ALIAS): KlusterService => {
   const location = `kluster:${alias}`
 
@@ -23,13 +36,11 @@ export const makeKlusterService = (alias: string = DEFAULT_ALIAS): KlusterServic
         const ctx = assertContext<Config, Context>(service.ctx as Context, location)
         namespace ??= ctx.cfg.kluster?.namespace ?? DEFAULT_NAMESPACE
 
-        const { body } = await service.api!.listNamespacedPod(
-          namespace, undefined, undefined, undefined, undefined, selector
-        )
+        const result = await service.api!.listNamespacedPod({ namespace, labelSelector: selector })
 
-        return body.items.map(item => item.status?.podIP).filter(name => name != null)
+        return result.items.map(item => item.status?.podIP).filter(name => name != null)
       } catch (e) {
-        if (e instanceof HttpError) {
+        if (e instanceof ApiException) {
           console.error(e.name, e.cause, e.message, e.body)
         } else {
           throw e
@@ -43,13 +54,11 @@ export const makeKlusterService = (alias: string = DEFAULT_ALIAS): KlusterServic
         const ctx = assertContext<Config, Context>(service.ctx as Context, location)
         namespace ??= ctx.cfg.kluster?.namespace ?? DEFAULT_NAMESPACE
 
-        const { body } = await service.api!.listNamespacedService(namespace, undefined, undefined, undefined, undefined, selector)
-
-        // console.log(util.inspect(body, { depth: null, colors: true }))
+        const result = await service.api!.listNamespacedService({ namespace, labelSelector: selector })
 
-        return body.items?.[0]?.spec?.clusterIP ?? null
+        return result.items?.[0]?.spec?.clusterIP ?? null
       } catch (e) {
-        if (e instanceof HttpError) {
+        if (e instanceof ApiException) {
           console.error(e.name, e.cause, e.message, e.body)
         } else {
           throw e

package/tsconfig.json

@@ -1,15 +1,15 @@
 {
   "extends": [
-    "../tsconfig.default.json",
+    "@owlmeans/dep-config/tsconfig.base.json",
+    "@owlmeans/dep-config/tsconfig.node.json"
   ],
   "compilerOptions": {
-    "rootDir": "./src/", /* Specify the root folder within your source files. */
-    "outDir": "./build/", /* Specify an output folder for all emitted files. */
-    "moduleResolution": "Bundler"
+    "rootDir": "./src/",
+    "outDir": "./build/"
   },
   "exclude": [
     "./dist/**/*",
     "./build/**/*",
     "./*.ts"
   ]
-}
+}