@cloudnux/cli 0.11.0 → 0.15.0

package/dist/schema/entrypoint.schema.json

@@ -6,11 +6,16 @@
     "properties": {
         "entries": {
             "$ref": "#/definitions/Record"
+        },
+        "includes": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "description": "Relative paths to partial entrypoint files whose entries are merged into this one"
         }
     },
-    "required": [
-        "entries"
-    ],
+    "required": [],
     "definitions": {
         "MethodType": {
             "enum": [
@@ -32,6 +37,10 @@
                         },
                         "method": {
                             "$ref": "#/definitions/MethodType"
+                        },
+                        "gateway": {
+                            "type": "string",
+                            "description": "Tag value used to look up the target AWS API Gateway V2 (HTTP) instance"
                         }
                     },
                     "required": [
@@ -316,6 +325,10 @@
                         },
                         "routeKey": {
                             "type": "string"
+                        },
+                        "gateway": {
+                            "type": "string",
+                            "description": "Tag value used to look up the target AWS API Gateway V2 (WebSocket) instance"
                         }
                     },
                     "required": [

package/dist/templates/cloud/entrypoint-build.ts.ejs

@@ -6,8 +6,7 @@ import {
     scheduleHandler,
     websocketHandler,
     useCloudProvider,
-  } from "@cloudnux/cloud-sdk"; 
-import { initializeLogger, logger } from "@cloudnux/utils";
+  } from "@cloudnux/cloud-sdk";
 
 import * as src from "../../../packages/modules/<%=module%>/src";
 
@@ -47,26 +46,13 @@ router.event(
 router.websocket(
             "<%= wsRouteKey %>",
             (event, context) => {
-                return websocketHandler(src["<%= entry.handler %>"],event,context);
+                return websocketHandler(src["<%= entry.handler %>"],event,context, <%- JSON.stringify(entry.trigger, null, 2) %> );
             }
 );
     <%_ } _%>
 <%_ } _%>
 
 export async function handler(event, context) {
-    initializeLogger("<%=module%>",context.awsRequestId);
-    logger.info("request started", { requestId: context.awsRequestId });
-    logger.debug("Received event", { event, requestId: context.awsRequestId });
-   let response;
-    try {
-        response = await router.run(event, context);
-        return response;
-    }
-    catch (error) {
-        logger.error("Error occurred", { error, requestId: context.awsRequestId });
-        throw error;
-    }
-    finally {
-        logger.info("request finished", { response, requestId: context.awsRequestId });
-    }
+    const response = await router.run(event, context);
+    return response;
 }

package/dist/templates/cloud/entrypoint-triggers.tf.ejs

@@ -1,7 +1,7 @@
 terraform {
   backend "s3" {
-    key                  = "<%= module %>/terraform.state"
-    workspace_key_prefix = "state/<%= module %>"
+    key                  = "<%= namespace %>_<%= module %>/terraform.state"
+    workspace_key_prefix = "state/<%= namespace %>_<%= module %>"
   }
 
   required_providers {
@@ -15,71 +15,118 @@ terraform {
 }
 
 data "aws_lambda_function" "this" {
-    function_name = "<%= module %>"
+  function_name = "<%= namespace %>_<%= module %>"
 }
 
-data "aws_apigatewayv2_apis" "this" {
-   tags = {
-     application = "epf"
-   }
+<%_
+// ── HTTP triggers ────────────────────────────────────────────────────────────
+const httpEntries = Object.entries(entries).filter(([, e]) => e.trigger.type.toLowerCase() === "http");
+const httpByGateway = httpEntries.reduce((acc, entry) => {
+  const tag = entry[1].trigger.options.gateway;
+  if (tag) { if (!acc[tag]) acc[tag] = []; acc[tag].push(entry); }
+  return acc;
+}, {});
+_%>
+<%_ for (const [gatewayTag, gatewayEntries] of Object.entries(httpByGateway)) {
+  const safeName = gatewayTag.replace(/[^a-zA-Z0-9]/g, '_');
+_%>
+data "aws_apigatewayv2_apis" "http_<%= safeName %>" {
+  tags = {
+    Name = "<%= gatewayTag %>"
+  }
 }
 
-<% const httpEntries = Object.entries(entries).filter(([k,e]) => e.trigger.type.toLowerCase() === "http")  %>
-<% if(httpEntries.length > 0) { %>
-module "http_trigger_for_<%= module %>" {
-  source         = "../.deploy/aws/http"
-  api_gateway_id = sort(data.aws_apigatewayv2_apis.this.ids)[0]
+module "http_trigger_<%= safeName %>_for_<%= namespace %>_<%= module %>" {
+  source         = "<%= tfModules.http %>"
+  api_gateway_id = sort(data.aws_apigatewayv2_apis.http_<%= safeName %>.ids)[0]
   lambda_arn     = data.aws_lambda_function.this.arn
-  lambda_name    =   "<%= module %>"
+  lambda_name    = "<%= namespace %>_<%= module %>"
   entrypoints = {
-  <% for(const [key,entry] of httpEntries){ %>
+  <%_ for (const [key, entry] of gatewayEntries) { _%>
     "<%= key %>" = {
-      description        = "<% entry.trigger.options.description %>"
-      method             = "<%= entry.trigger.options.method %>"
-      path               = "<%= entry.trigger.options.route %>"
+      description = ""
+      method      = "<%= entry.trigger.options.method %>"
+      path        = "<%= entry.trigger.options.route %>"
     }
-    <% } %>
+  <%_ } _%>
   }
 }
+<%_ } _%>
 
-<% } %>
-
-<% const scheduleEntries = Object.entries(entries).filter(([k,e]) => e.trigger.type.toLowerCase() === "schedule") %>
-<% if(scheduleEntries.length > 0) { %>
-module "schedule_trigger_for_<%= module %>" {
-   source              = "../.deploy/aws/scheduler"
-   component           = "<%= module %>"
-   target_arn          = data.aws_lambda_function.this.arn
-   schedules = {
-   <% for(const [key,entry] of scheduleEntries) { %>
-     "<%= key %>" = {
-       name     = "<%= key %>"
-       pattern  = "<%= entry.trigger.options.pattern %>"
-       timezone = "UTC"
-       state    = "DISABLED"
-       retry_policy = {
-         maximum_retry_attempts = 3
-       }
-     }
-   <% } %>
- }
+<%_
+// ── Schedule triggers ────────────────────────────────────────────────────────
+const scheduleEntries = Object.entries(entries).filter(([, e]) => e.trigger.type.toLowerCase() === "schedule");
+_%>
+<%_ if (scheduleEntries.length > 0) { _%>
+module "schedule_trigger_for_<%= namespace %>_<%= module %>" {
+  source     = "<%= tfModules.scheduler %>"
+  module     = "<%= namespace %>_<%= module %>"
+  target_arn = data.aws_lambda_function.this.arn
+  schedules = {
+  <%_ for (const [key, entry] of scheduleEntries) { _%>
+    "<%= key %>" = {
+      name     = "<%= key %>"
+      pattern  = "<%= entry.trigger.options.pattern %>"
+      timezone = "UTC"
+      state    = "DISABLED"
+      retry_policy = {
+        maximum_retry_attempts = 3
+      }
+    }
+  <%_ } _%>
+  }
 }
-<% } %>
+<%_ } _%>
 
-<%_ const eventEntries = Object.entries(entries).filter(([k,e]) => e.trigger.type.toLowerCase() === "event" && e.trigger.options.sourceType?.toLowerCase() === "sqs") _%>
-<% if(eventEntries.length > 0) { %>
-module "sqs_trigger_for_<%= module %>" {
-  source      = "../.deploy/aws/sqs"
-  lambda_name = "<%= module %>"
+<%_
+// ── Event (SQS) triggers ─────────────────────────────────────────────────────
+const sqsEntries = Object.entries(entries).filter(([, e]) => e.trigger.type.toLowerCase() === "event" && e.trigger.options.sourceType?.toLowerCase() === "sqs");
+_%>
+<%_ if (sqsEntries.length > 0) { _%>
+module "sqs_trigger_for_<%= namespace %>_<%= module %>" {
+  source      = "<%= tfModules.sqs %>"
+  lambda_name = "<%= namespace %>_<%= module %>"
   event_sources = {
-  <% for(const [key,entry] of eventEntries) { %>
+  <%_ for (const [key, entry] of sqsEntries) { _%>
     "<%= key %>" = {
-      queue_name  = "<%= entry.trigger.options.source %>"
-      enabled     = true
-      batch_size  = 10
+      queue_name = "<%= entry.trigger.options.source %>"
+      enabled    = true
+      batch_size = 10
     }
-    <% } %>
+  <%_ } _%>
   }
 }
+<%_ } _%>
 
-<% } %>
+<%_
+// ── WebSocket triggers ───────────────────────────────────────────────────────
+const wsEntries = Object.entries(entries).filter(([, e]) => e.trigger.type.toLowerCase() === "websocket");
+const wsByGateway = wsEntries.reduce((acc, entry) => {
+  const tag = entry[1].trigger.options.gateway;
+  if (tag) { if (!acc[tag]) acc[tag] = []; acc[tag].push(entry); }
+  return acc;
+}, {});
+_%>
+<%_ for (const [gatewayTag, wsGatewayEntries] of Object.entries(wsByGateway)) {
+  const safeName = gatewayTag.replace(/[^a-zA-Z0-9]/g, '_');
+_%>
+data "aws_apigatewayv2_apis" "ws_<%= safeName %>" {
+  tags = {
+    Name = "<%= gatewayTag %>"
+  }
+}
+
+module "ws_trigger_<%= safeName %>_for_<%= namespace %>_<%= module %>" {
+  source         = "<%= tfModules.websocket %>"
+  api_gateway_id = sort(data.aws_apigatewayv2_apis.ws_<%= safeName %>.ids)[0]
+  lambda_arn     = data.aws_lambda_function.this.arn
+  lambda_name    = "<%= namespace %>_<%= module %>"
+  routes = {
+  <%_ for (const [key, entry] of wsGatewayEntries) { _%>
+    "<%= key %>" = {
+      event = "<%= entry.trigger.options.event %>"
+    }
+  <%_ } _%>
+  }
+}
+<%_ } _%>

package/dist/templates/local/dev-server.ts.ejs

@@ -1,21 +1,24 @@
+import path from 'node:path';
 import { useCloudProvider } from "@cloudnux/cloud-sdk";
 import { createRouter, localCloudProvider } from '@cloudnux/local-cloud-provider';
 import { queuesPlugin } from "@cloudnux/local-cloud-provider/queue-plugin";
 import { schedulerPlugin } from "@cloudnux/local-cloud-provider/schedule-plugin";
 import { devConsolePlugin } from "@cloudnux/local-cloud-provider/dev-console-plugin";
 import { websocketsPlugin } from "@cloudnux/local-cloud-provider/websocket-plugin";
-import { initializeLogger } from "@cloudnux/utils";
+
+// __dirname is injected by the esbuild banner and resolves to the workingDir/env folder
+process.env.DEV_CLOUD_LOCATION_PATH ??= path.join(__dirname, '.local-location');
 
 useCloudProvider(localCloudProvider);
 
 <%_ for(const module of moduleNames){ _%>
-import <%=module%>Entries from "./<%=module%>"  
+import <%=module%>Entries from "./<%=module%>"
 <%_ } _%>
 
 const router = createRouter({logger : true});
 
-router.register(queuesPlugin, { prefix: "queues" });
-router.register(schedulerPlugin, { prefix: "schedules" });
+router.register(queuesPlugin, { prefix: "queues", config: { persistence: { directory: path.join(__dirname, 'queue-data') } } });
+router.register(schedulerPlugin, { prefix: "schedules", config: { persistence: { directory: path.join(__dirname, 'scheduler-data') } } });
 router.register(devConsolePlugin, {  prefix: 'console' });
 router.register(websocketsPlugin, { prefix: "websockets" });
 
@@ -23,16 +26,7 @@ router.register(websocketsPlugin, { prefix: "websockets" });
   router.register(<%=module%>Entries, { prefix: "api" });
 <%_ } _%>
 
-router.addHook('onRequest', async (request, reply) => {
-  const [pathname] = request.url.split('?');
-  const match = pathname.match(/^\/api\/([^/]+)(?:\/([^/]+))?/);
-  initializeLogger(match?.[2] || "", request.id);
-});
-router.addHook('onResponse', async () => {
-  initializeLogger("default", undefined);
-});
-
-router.listen({ port: 3000, host: "::" }, (err) => {
+router.listen({ port: <%=port%>, host: "::" }, (err) => {
   if (err) {
     console.error('Error starting server:', err);
     process.exit(1);

package/dist/templates/local/module.ts.ejs

@@ -41,13 +41,14 @@ async function entries(app: RouterInstance) {
     <%_ } _%>
     <%_ if(entry.trigger.type === "websocket") { _%>
         app.websockets.registerHandler({
-          path: "<%= entry.trigger.options.path %>",
+          path: "<%= $$convertRouteParamstoFastifyRouteTemplate(entry.trigger.options.path) %>",
           event: "<%= entry.trigger.options.event %>",
+          module: "<%=module%>",
           <%_ if(entry.trigger.options.route) { _%>
           route: "<%= entry.trigger.options.route %>",
           <%_ } _%>
-          handler: async (connectionId, event, data) => {
-            return websocketHandler(src["<%= entry.handler %>"], connectionId, event, data);
+          handler: async (connectionId, event, data, request, reply) => {
+            return websocketHandler(src["<%= entry.handler %>"], connectionId, event, data, request, reply);
           }
         });
     <%_ } _%>

package/dist/types.d.ts

@@ -22,15 +22,6 @@ type TaskParam = {
      * environment name
      */
     environment: string;
-    /**
-     * logger function to log messages
-     */
-    logger: (arg: any, data?: any) => void;
-    /**
-     * event emitter function to emit events
-     */
-    eventEmitter: (type: string, data?: any) => void;
-    children?: Task[];
     [key: string]: any;
 };
 type TaskTitle = string | ((params: TaskParam) => string);
@@ -38,13 +29,16 @@ type Task<TTaskParams extends TaskParamBase = any> = {
     title: string | ((params: TTaskParams) => string);
     action: (params: TTaskParams) => any | Promise<any>;
     skip?: (params: TTaskParams) => boolean;
+};
+type TaskEntry<TTaskParams extends TaskParamBase = any> = {
+    task: Task<TTaskParams>;
     children?: Task<TTaskParams>[];
 };
 type Environment<TTaskParams extends TaskParamBase = any> = {
     /**
      * tasks to be executed for this environment
      */
-    tasks: Task<TTaskParams>[];
+    tasks: TaskEntry<TTaskParams>[];
     /**
      * watch task
      * if set, task will be executed and all logs will be routed to the watch view.
@@ -59,6 +53,11 @@ type Environment<TTaskParams extends TaskParamBase = any> = {
     [key: string]: any;
 };
 type Config<TTaskParams extends TaskParamBase = any> = {
+    /**
+     * Namespace prefix for all resources (lambdas, state keys, etc.)
+     * @default root package.json `name` field
+     */
+    namespace?: string;
     /**
      * glob Path to find all modules (package.json) having entrypoints
      * @default './packages/modules/**\/package.json'
@@ -162,4 +161,4 @@ interface DevServerStore {
     resetSelection: () => void;
 }
 
-export type { AppProps, Args, Config, DevServerStore, Environment, Log, Task, TaskManagerStore, TaskParam, TaskParamBase, TaskState, TaskStatus, TaskTitle };
+export type { AppProps, Args, Config, DevServerStore, Environment, Log, Task, TaskEntry, TaskManagerStore, TaskParam, TaskParamBase, TaskState, TaskStatus, TaskTitle };

package/package.json

@@ -1,7 +1,11 @@
 {
 	"name": "@cloudnux/cli",
-	"version": "0.11.0",
+	"version": "0.15.0",
 	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/cloudnux/cloudnux.git"
+	},
 	"bin": {
 		"nux": "dist/cli.mjs"
 	},
@@ -11,6 +15,10 @@
 		".": {
 			"types": "./dist/types.d.ts",
 			"import": "./dist/types.mjs"
+		},
+		"./defaults": {
+			"types": "./dist/index.d.ts",
+			"import": "./dist/index.mjs"
 		}
 	},
 	"type": "module",
@@ -33,25 +41,18 @@
 	"dependencies": {
 		"@types/findup-sync": "^4.0.5",
 		"ejs": "^3.1.10",
+		"esbuild": "0.25.4",
 		"fast-glob": "^3.3.2",
-		"fastify": "^5.2.1",
-		"fastify-raw-body": "^5.0.0",
 		"findup-sync": "^5.0.0",
 		"interpret": "^3.1.1",
-		"jsonwebtoken": "^9.0.2",
 		"meow": "^11.0.0",
-		"pino-pretty": "^13.0.0",
 		"rechoir": "^0.8.0",
-		"tsup": "^8.3.5",
-		"@cloudnux/aws-cloud-provider": "0.11.0",
-		"@cloudnux/local-cloud-provider": "0.11.0",
-		"@cloudnux/cloud-sdk": "0.11.0",
-		"@cloudnux/dev-console": "0.11.0"
+		"tsup": "^8.3.5"
 	},
 	"devDependencies": {
+		"@types/node": "^24.10.1",
 		"@types/ejs": "^3.1.5",
 		"@types/findup-sync": "^4.0.5",
-		"@types/jsonwebtoken": "^9.0.7",
 		"@types/rechoir": "^0.6.4",
 		"typescript": "^5.0.3"
 	},