dank-ai 1.0.31 → 1.0.33

package/lib/docker/manager.js

@@ -1140,13 +1140,35 @@ class DockerManager {
     }
   }
 
+  /**
+   * Normalize Docker image name/tag components
+   * Docker allows: lowercase letters, digits, underscores, periods, and hyphens
+   * Cannot start or end with period or hyphen, max 128 chars for tags
+   */
+  normalizeDockerName(name) {
+    if (!name || typeof name !== 'string') return 'invalid';
+    const lower = String(name).toLowerCase();
+    let sanitized = lower.replace(/[^a-z0-9_.-]/g, '-');
+    sanitized = sanitized.replace(/\.{2,}/g, '.'); // Replace multiple periods with single
+    sanitized = sanitized.replace(/-{2,}/g, '-'); // Replace multiple hyphens with single
+    sanitized = sanitized.replace(/^[.-]+/, '').replace(/[.-]+$/, ''); // Remove leading/trailing . or -
+    if (!sanitized || !/^[a-z0-9]/.test(sanitized)) sanitized = `a${sanitized || ''}`;
+    if (sanitized.length > 128) sanitized = sanitized.slice(0, 128);
+    return sanitized;
+  }
+
   /**
    * Build agent-specific image
    */
   async buildAgentImage(agent, options = {}) {
-    const imageName = `dank-agent-${agent.name.toLowerCase()}`;
+    const normalizedName = this.normalizeDockerName(agent.name);
+    const imageName = `dank-agent-${normalizedName}`;
     this.logger.info(`Building image for agent: ${agent.name}`);
 
+    // Finalize agent configuration before building
+    // This ensures ports and other configs are properly set
+    agent.finalize();
+
     try {
       const buildContext = await this.createAgentBuildContext(agent);
       const dockerCmd = await this.resolveDockerCommand();
@@ -1178,6 +1200,17 @@ class DockerManager {
 
   /**
    * Build production image with custom naming and tagging
+   * 
+   * @param {Object} agent - The agent to build
+   * @param {Object} options - Build options
+   * @param {string} [options.tag="latest"] - Image tag
+   * @param {string} [options.registry] - Docker registry
+   * @param {string} [options.namespace] - Docker namespace
+   * @param {boolean} [options.tagByAgent=false] - Use agent name as tag
+   * @param {boolean} [options.force=false] - Force rebuild without cache
+   * @param {boolean} [options.push=false] - Push to registry after build
+   * @param {string} [options.baseImageOverride=null] - Production-only: Override base image for all agents (replaces agent's configured base image)
+   * @returns {Promise<Object>} Build result with imageName and pushed status
    */
   async buildProductionImage(agent, options = {}) {
     const {
@@ -1187,42 +1220,47 @@ class DockerManager {
       tagByAgent = false,
       force = false,
       push = false,
+      baseImageOverride = null, // Production-only: override base image for all agents
     } = options;
 
-    // Normalize a Docker tag from agent name when tagByAgent is enabled
-    const normalizeTag = (name) => {
-      const lower = String(name || '').toLowerCase();
-      let sanitized = lower.replace(/[^a-z0-9_.-]/g, '-');
-      sanitized = sanitized.replace(/^-+/, '').replace(/-+$/, '');
-      if (!sanitized || !/^[a-z0-9]/.test(sanitized)) sanitized = `a${sanitized || ''}`;
-      if (sanitized.length > 128) sanitized = sanitized.slice(0, 128);
-      return sanitized;
-    };
+    // Normalize all components
+    const normalizedAgentName = this.normalizeDockerName(agent.name);
+    const normalizedTag = this.normalizeDockerName(tag);
 
     //construct full repo name
     let repoName;
     if(!tagByAgent){
       // Per-agent repository: {registry}/{namespace}/{agent-name}
-      const agentRepoName = agent.name.toLowerCase().replace(/[^a-z0-9_.-]/g, '-');
-      repoName = `${registry?`${registry}/`:''}${namespace?`${namespace}/`:''}${agentRepoName}`;
+      repoName = `${registry?`${registry}/`:''}${namespace?`${namespace}/`:''}${normalizedAgentName}`;
     }else{
-      // Common repository: {registry}/{namespace}:agent-name
+      // Common repository: {registry}/{namespace}
       repoName = `${registry?`${registry}/`:''}${namespace?`${namespace}/`:''}`;
     }
     
     repoName = repoName.replace(/\/+$/, '');
 
-
-    // Final tag selection
-    const finalTag = tagByAgent ? normalizeTag(agent.name) : tag;
+    // Final tag selection - normalize both agent name tags and user-provided tags
+    const finalTag = tagByAgent ? normalizedAgentName : normalizedTag;
     const imageName = `${repoName}:${finalTag}`;
 
     this.logger.info(
       `Building production image for agent: ${agent.name} -> ${imageName}`
     );
 
+    // Finalize agent configuration before building
+    // This ensures ports and other configs are properly set
+    agent.finalize();
+
+    // Log base image override if provided
+    if (baseImageOverride) {
+      this.logger.info(`🔧 Production build: Using custom base image override: ${baseImageOverride}`);
+    }
+
     try {
-      const buildContext = await this.createAgentBuildContext(agent);
+      const buildContext = await this.createAgentBuildContext(agent, { 
+        isProductionBuild: true,
+        baseImageOverride: baseImageOverride
+      });
       const dockerCmd = await this.resolveDockerCommand();
 
       const buildCommand = [
@@ -1299,6 +1337,53 @@ class DockerManager {
     return `{\n${handlersEntries}\n  }`;
   }
 
+  /**
+   * Generate routes code from agent configuration
+   */
+  generateRoutesCode(agent) {
+    const routes = {};
+
+    // Add routes from agent HTTP configuration
+    if (agent.config?.http?.routes && agent.config.http.routes.size > 0) {
+      for (const [routeKey, routeList] of agent.config.http.routes) {
+        const [method, path] = routeKey.split(':');
+        if (!routes[path]) {
+          routes[path] = {};
+        }
+
+        // Convert route handlers to string representations
+        routeList.forEach((routeObj) => {
+          if (routeObj && typeof routeObj.handler === "function") {
+            const handlerStr = routeObj.handler.toString();
+            routes[path][method.toLowerCase()] = handlerStr;
+          }
+        });
+      }
+    }
+
+    // Generate the JavaScript object code
+    if (Object.keys(routes).length === 0) {
+      return '{}';
+    }
+
+    const routesEntries = Object.entries(routes)
+      .map(([path, methods]) => {
+        const methodsEntries = Object.entries(methods)
+          .map(([method, handler]) => {
+            return `      ${method}: ${handler}`;
+          })
+          .join(",\n");
+        // Quote paths that contain special characters
+        const quotedPath = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(path)
+          ? path
+          : JSON.stringify(path);
+        return `    ${quotedPath}: {\n${methodsEntries}\n    }`;
+      })
+      .join(",\n");
+
+    return `{\n${routesEntries}\n  }`;
+  }
+
   /**
    * Start agent container
    */
@@ -1341,12 +1426,12 @@ class DockerManager {
         name: containerName,
         Env: this.prepareEnvironmentVariables(agent),
         HostConfig: {
-          Memory: AgentConfig.parseMemory(agent.config.resources.memory),
-          CpuQuota: Math.floor(agent.config.resources.cpu * 100000),
+          Memory: AgentConfig.parseMemory(AgentConfig.getResourcesFromInstanceType(agent.config.instanceType).memory),
+          CpuQuota: Math.floor(AgentConfig.getResourcesFromInstanceType(agent.config.instanceType).cpu * 100000),
           CpuPeriod: 100000,
           RestartPolicy: {
             Name: "on-failure",
-            MaximumRetryCount: agent.config.resources.maxRestarts || 3,
+            MaximumRetryCount: 3, // Default max restarts
           },
           NetworkMode: this.networkName,
           ...this.preparePortConfiguration(agent),
@@ -1475,10 +1560,7 @@ class DockerManager {
         uptime: Date.now() - startTime.getTime(),
         health: containerData.State.Health?.Status || "unknown",
         restartCount: containerData.RestartCount,
-        resources: {
-          memory: agent.config.resources.memory,
-          cpu: agent.config.resources.cpu,
-        },
+        resources: AgentConfig.getResourcesFromInstanceType(agent.config.instanceType),
       };
     } catch (error) {
       return { status: "error", error: error.message };
@@ -1538,7 +1620,7 @@ class DockerManager {
   /**
    * Create build context for agent
    */
-  async createAgentBuildContext(agent) {
+  async createAgentBuildContext(agent, options = {}) {
     const contextDir = path.join(
       __dirname,
       `../../.build-context-${agent.name}`
@@ -1546,12 +1628,44 @@ class DockerManager {
     await fs.ensureDir(contextDir);
 
     // Get the base image for this agent
-    const baseImageName =
-      agent.config.docker?.baseImage || this.defaultBaseImageName;
+    // Production builds can override the base image via baseImageOverride option
+    let baseImageName;
+    if (options.isProductionBuild && options.baseImageOverride) {
+      baseImageName = options.baseImageOverride;
+      this.logger.info(`🔧 Using production base image override: ${baseImageName} (instead of ${agent.config.docker?.baseImage || this.defaultBaseImageName})`);
+    } else {
+      baseImageName = agent.config.docker?.baseImage || this.defaultBaseImageName;
+    }
+
+    // Generate environment variables
+    // For production builds, these need to be embedded in the image
+    // For normal builds, they're injected at container creation time via startAgent()
+    const env = AgentConfig.generateContainerEnv(agent);
+    
+    // Embed env vars in Dockerfile for production builds
+    // For normal builds, env vars are injected at container creation time
+    const isProductionBuild = options.isProductionBuild || false;
+    
+    let envStatements = '';
+    if (isProductionBuild) {
+      // Embed environment variables in Dockerfile for production builds
+      // This ensures they're available when the image is deployed elsewhere
+      envStatements = Object.entries(env)
+        .map(([key, value]) => {
+          // Escape special characters in values for Dockerfile ENV
+          const escapedValue = String(value).replace(/\$/g, '$$$$').replace(/"/g, '\\"');
+          return `ENV ${key}="${escapedValue}"`;
+        })
+        .join('\n');
+      
+      this.logger.info(`🔌 Production build: Embedding environment variables in Dockerfile`);
+      this.logger.info(`   - DOCKER_PORT: ${env.DOCKER_PORT || 'not set'}`);
+    }
 
     // Create Dockerfile for agent
     const dockerfile = `FROM ${baseImageName}
 COPY agent-code/ /app/agent-code/
+${envStatements}
 USER dankuser
 `;
 
@@ -1564,6 +1678,7 @@ USER dankuser
     // Create basic agent code structure
     // Generate handlers from agent configuration
     const handlersCode = this.generateHandlersCode(agent);
+    const routesCode = this.generateRoutesCode(agent);
 
     const agentCode = `
 // Agent: ${agent.name}
@@ -1605,7 +1720,8 @@ module.exports = {
     }, 10000);
   },
   
-  handlers: ${handlersCode}
+  handlers: ${handlersCode},
+  routes: ${routesCode}
 };
 `;
 
@@ -1632,19 +1748,21 @@ module.exports = {
 
     // Always bind the main agent port
     const mainPort = agent.config.docker?.port || DOCKER_CONFIG.defaultPort;
+    this.logger.info(`🔌 Binding main agent port: ${mainPort} (from docker.port: ${agent.config.docker?.port || 'default'})`);
     portBindings[`${mainPort}/tcp`] = [{ HostPort: mainPort.toString() }];
 
-    // Also bind HTTP port if HTTP is enabled and different from main port
-    if (agent.config.http && agent.config.http.enabled) {
-      const httpPort = agent.config.http.port;
-      if (httpPort !== mainPort) {
+    // Only bind HTTP port if HTTP is explicitly enabled AND different from main port
+    // Check both http.enabled and communication.httpApi.enabled to be safe
+    const httpEnabled = agent.config.http?.enabled === true;
+    const httpApiEnabled = agent.config.communication?.httpApi?.enabled === true;
+    if (httpEnabled || httpApiEnabled) {
+      const httpPort = agent.config.http?.port;
+      if (httpPort && httpPort !== mainPort) {
         portBindings[`${httpPort}/tcp`] = [{ HostPort: httpPort.toString() }];
       }
     }
 
-    // Always bind health check port
-    const healthPort = DOCKER_CONFIG.healthCheckPort;
-    portBindings[`${healthPort}/tcp`] = [{ HostPort: healthPort.toString() }];
+    // Health check uses the same port as the main agent port, so no separate binding needed
 
     portConfig.PortBindings = portBindings;
     return portConfig;
@@ -1660,17 +1778,18 @@ module.exports = {
     const mainPort = agent.config.docker?.port || DOCKER_CONFIG.defaultPort;
     exposedPorts[`${mainPort}/tcp`] = {};
 
-    // Also expose HTTP port if HTTP is enabled and different from main port
-    if (agent.config.http && agent.config.http.enabled) {
-      const httpPort = agent.config.http.port;
-      if (httpPort !== mainPort) {
+    // Only expose HTTP port if HTTP is explicitly enabled AND different from main port
+    // Check both http.enabled and communication.httpApi.enabled to be safe
+    const httpEnabled = agent.config.http?.enabled === true;
+    const httpApiEnabled = agent.config.communication?.httpApi?.enabled === true;
+    if (httpEnabled || httpApiEnabled) {
+      const httpPort = agent.config.http?.port;
+      if (httpPort && httpPort !== mainPort) {
         exposedPorts[`${httpPort}/tcp`] = {};
       }
     }
 
-    // Always expose health check port
-    const healthPort = DOCKER_CONFIG.healthCheckPort;
-    exposedPorts[`${healthPort}/tcp`] = {};
+    // Health check uses the same port as the main agent port, so no separate exposure needed
 
     return { ExposedPorts: exposedPorts };
   }

package/lib/project.js

@@ -85,10 +85,7 @@ module.exports = {
         protocol: 'http',
         port: 3000
       })
-      .setResources({
-        memory: '512m',
-        cpu: 1
-      })
+      .setInstanceType('small')
       // Event handlers for prompt modification and response enhancement
       .addHandler('request_output:start', (data) => {
         console.log('[Prompt Agent] Processing prompt:', data.conversationId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dank-ai",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "Dank Agent Service - Docker-based AI agent orchestration platform",
   "main": "lib/index.js",
   "exports": {