@awsless/cli 0.0.46-local.2 → 0.0.46-local.4

package/dist/bin.js

@@ -151268,7 +151268,7 @@ var IndexSchema = exports_external.object({
   strict: exports_external.boolean().optional().describe("Reject documents with fields that are missing from the schema."),
   mappings: MappingsSchema.optional(),
   settings: exports_external.record(exports_external.string(), exports_external.unknown()).optional().describe("The OpenSearch index settings, applied when the index is created.")
-}).refine((props) => !(props.schema && props.mappings), {
+}).strict().refine((props) => !(props.schema && props.mappings), {
   message: 'Define either "schema" or "mappings" for an index, not both.'
 }).refine((props) => !(props.strict && !props.schema), {
   message: 'The "strict" option only works together with "schema".'
@@ -154974,6 +154974,21 @@ var configFeature = defineFeature({
   },
   async onDev(ctx) {
     const names = new Set(ctx.appConfig.configs ?? []);
+    for (const stack of ctx.stackConfigs) {
+      for (const props of Object.values(stack.functions ?? {})) {
+        for (const name of props.sandbox?.configs ?? []) {
+          names.add(name);
+        }
+      }
+      for (const site of Object.values(stack.sites ?? {})) {
+        for (const name of site.build?.configs ?? []) {
+          names.add(name);
+        }
+        for (const name of site.ssr?.sandbox?.configs ?? []) {
+          names.add(name);
+        }
+      }
+    }
     if (names.size === 0) {
       return;
     }
@@ -154982,17 +154997,17 @@ var configFeature = defineFeature({
       ctx.registerResource({ kind: "config", id: name });
     }
     const file2 = join18(directories.output, "local", "config.json");
-    const server = createSsmServer({ file: file2 });
-    const port = await server.listen();
+    const { server, port } = await ctx.keep("shim:ssm", file2, async () => {
+      const server2 = createSsmServer({ file: file2 });
+      const port2 = await server2.listen();
+      return { value: { server: server2, port: port2 }, stop: () => server2.stop() };
+    });
     ctx.addEnv("AWS_ENDPOINT_URL_SSM", `http://127.0.0.1:${port}`);
     ctx.restartOnChange(file2);
     ctx.registerServer({
       name: "config",
       start({ log }) {
         server.connect(log);
-      },
-      stop() {
-        return server.stop();
       }
     });
   }
@@ -155947,7 +155962,7 @@ var functionFeature = defineFeature({
   onStack(ctx) {
     for (const [id, props] of Object.entries(ctx.stackConfig.functions ?? {})) {
       const routeKey = formatRouteKey(ctx.stack.name, "function", id);
-      if (!isStandaloneFunction(props)) {
+      if (!isStandaloneFunction(props) || ctx.dev) {
         registerBundleFunction(ctx, routeKey, props);
         continue;
       }
@@ -157407,12 +157422,15 @@ var queueFeature = defineFeature({
       queueRoutes.set(name, formatRouteKey(stackName, "queue", id));
       return { stackName, id, name };
     });
-    const server = createSqsServer({
-      region: ctx.appConfig.region,
-      accountId: "000000000000",
-      queues: queueRoutes
+    const { server, port } = await ctx.keep("shim:sqs", queueRoutes, async () => {
+      const server2 = createSqsServer({
+        region: ctx.appConfig.region,
+        accountId: "000000000000",
+        queues: queueRoutes
+      });
+      const port2 = await server2.listen();
+      return { value: { server: server2, port: port2 }, stop: () => server2.stop() };
     });
-    const port = await server.listen();
     ctx.addEnv("AWS_ENDPOINT_URL_SQS", `http://127.0.0.1:${port}`);
     for (const { stackName, id, name } of named) {
       ctx.addEnv(`QUEUE_${constantCase(stackName)}_${constantCase(id)}_URL`, `http://127.0.0.1:${port}/000000000000/${name}`);
@@ -157428,9 +157446,6 @@ var queueFeature = defineFeature({
       name: "sqs",
       start({ dispatch, reportFailure }) {
         server.connect(dispatch, reportFailure);
-      },
-      stop() {
-        return server.stop();
       }
     });
   },
@@ -157582,6 +157597,8 @@ var formatWebEvent = (request, route, body, url, sourceIp) => {
     headers[name] = value;
   }
   headers[ROUTE_HEADER] = route.routeKey;
+  headers["cloudfront-viewer-address"] ??= `${sourceIp}:0`;
+  headers["cloudfront-viewer-country"] ??= "US";
   for (const [name, value] of Object.entries(route.params)) {
     headers[`x-param-${name.toLowerCase()}`] = value;
   }
@@ -158707,7 +158724,7 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
           });
         });
       }
-      if (props.ssr && isStandaloneFunction(props.ssr)) {
+      if (props.ssr && isStandaloneFunction(props.ssr) && !ctx.dev) {
         const fn = createLambdaFunction(ctx, `${id}-ssr`, props.ssr);
         if (ctx.shared.has("router", "endpoint", props.router)) {
           fn.setEnvironment(`ROUTER_${constantCase(props.router)}_ENDPOINT`, ctx.shared.entry("router", "endpoint", props.router));
@@ -159496,16 +159513,16 @@ var taskFeature = defineFeature({
         routeKey: formatRouteKey(stackName, "task", id)
       });
     }
-    const server = createSchedulerServer();
-    const port = await server.listen();
+    const { server, port } = await ctx.keep("shim:scheduler", null, async () => {
+      const server2 = createSchedulerServer();
+      const port2 = await server2.listen();
+      return { value: { server: server2, port: port2 }, stop: () => server2.stop() };
+    });
     ctx.addEnv("AWS_ENDPOINT_URL_SCHEDULER", `http://127.0.0.1:${port}`);
     ctx.registerServer({
       name: "scheduler",
       start({ dispatch, reportFailure }) {
         server.connect(dispatch, reportFailure);
-      },
-      stop() {
-        return server.stop();
       }
     });
   },
@@ -159689,16 +159706,16 @@ var topicFeature = defineFeature({
         });
       }
     }
-    const server = createSnsServer();
-    const port = await server.listen();
+    const { server, port } = await ctx.keep("shim:sns", null, async () => {
+      const server2 = createSnsServer();
+      const port2 = await server2.listen();
+      return { value: { server: server2, port: port2 }, stop: () => server2.stop() };
+    });
     ctx.addEnv("AWS_ENDPOINT_URL_SNS", `http://127.0.0.1:${port}`);
     ctx.registerServer({
       name: "sns",
       start({ dispatch, reportFailure }) {
         server.connect(dispatch, reportFailure);
-      },
-      stop() {
-        return server.stop();
       }
     });
   },
@@ -163272,6 +163289,7 @@ var createApp = (props) => {
     feature.onBefore?.({
       ...props,
       import: props.import ?? false,
+      dev: props.dev ?? false,
       app,
       appId,
       base,
@@ -163286,6 +163304,7 @@ var createApp = (props) => {
     feature.onApp?.({
       ...props,
       import: props.import ?? false,
+      dev: props.dev ?? false,
       app,
       appId,
       base,
@@ -163347,6 +163366,7 @@ var createApp = (props) => {
       feature.onStack?.({
         ...props,
         import: props.import ?? false,
+        dev: props.dev ?? false,
         stackConfig,
         app,
         appId,
@@ -167783,7 +167803,8 @@ var startDev = async (props) => {
   const { builders, appId } = createApp({
     appConfig,
     stackConfigs,
-    accountId: LOCAL_ACCOUNT_ID
+    accountId: LOCAL_ACCOUNT_ID,
+    dev: true
   });
   await mkdir10(join53(directories.output, "local"), { recursive: true });
   const routerPorts = {};
@@ -167798,6 +167819,8 @@ var startDev = async (props) => {
   for (const feature of features) {
     await feature.onDev?.(dev.context);
   }
+  props.pool.retain("blocked");
+  props.pool.retain("lambda");
   await props.pool.sweep();
   const blocked = await props.pool.keep("blocked", null, async () => {
     const server = createBlockedServer({ onLog: (message4) => debug(message4) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.46-local.2",
+  "version": "0.0.46-local.4",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -43,14 +43,14 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.7",
-    "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.22",
+    "@awsless/duration": "^0.0.4",
     "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.47",
-    "@awsless/s3": "^0.0.22",
     "@awsless/validate": "^0.1.7",
+    "@awsless/s3": "^0.0.22",
     "@awsless/weak-cache": "^0.0.1",
-    "awsless": "^0.0.15-local.1"
+    "awsless": "^0.0.15-local.3"
   },
   "devDependencies": {
     "@aws-sdk/client-cloudformation": "^3.369.0",
@@ -121,24 +121,24 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.7",
-    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/clui": "^0.0.9",
     "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.22",
-    "@awsless/json": "^0.0.11",
     "@awsless/iot": "^0.0.5",
-    "@awsless/redis": "^0.1.13",
-    "@awsless/s3": "^0.0.22",
+    "@awsless/json": "^0.0.11",
     "@awsless/open-search": "^0.0.24",
-    "@awsless/sns": "^0.0.11",
+    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/lambda": "^0.0.47",
-    "@awsless/sqs": "^0.0.24",
+    "@awsless/redis": "^0.1.13",
+    "@awsless/s3": "^0.0.22",
     "@awsless/size": "^0.0.2",
+    "@awsless/scheduler": "^0.0.5",
+    "@awsless/sns": "^0.0.11",
     "@awsless/validate": "^0.1.7",
     "@awsless/ssm": "^0.0.8",
     "@awsless/weak-cache": "^0.0.1",
-    "awsless": "^0.0.15-local.1",
-    "@awsless/scheduler": "^0.0.5"
+    "@awsless/sqs": "^0.0.24",
+    "awsless": "^0.0.15-local.3"
   },
   "scripts": {
     "test": "bun cli/build-handlers.ts && pnpm vitest",