@awsless/cli 0.1.8 → 0.1.10

package/dist/bin.js

@@ -108408,6 +108408,7 @@ import { join, normalize, relative } from "path";
 var root = process.cwd();
 var directories = {
   root,
+  buildFolder: "build",
   get output() {
     return join(this.root, ".awsless");
   },
@@ -108418,7 +108419,7 @@ var directories = {
     return join(this.output, "state");
   },
   get build() {
-    return join(this.output, "build");
+    return join(this.output, this.buildFolder);
   },
   get types() {
     return join(this.output, "types");
@@ -108433,6 +108434,9 @@ var directories = {
 var setRoot = (path = root) => {
   directories.root = path;
 };
+var useDevBuildDir = () => {
+  directories.buildFolder = "build-dev";
+};
 var findRootDir = async (path, configFiles, level = 5) => {
   if (!level) {
     throw new TypeError("No awsless project found");
@@ -143971,6 +143975,14 @@ var createOpenSearchProvider = ({ credentials: credentials2, region }) => {
       async updateResource(props) {
         return apply(props.proposedState);
       },
+      async planResourceChange(props) {
+        const prior = props.priorState;
+        const proposed = props.proposedState;
+        return {
+          state: props.proposedState,
+          requiresReplacement: !!prior && (prior.endpoint !== proposed?.endpoint || prior.index !== proposed?.index)
+        };
+      },
       async deleteResource(props) {
         const state = inputSchema.parse(props.state);
         await getClient(state.endpoint).indices.delete({ index: state.index }, { ignore: [404] });
@@ -151140,7 +151152,7 @@ var JobDefaultSchema = exports_external.object({
 
 // src/feature/search/schema.ts
 var VersionSchema = exports_external.union([
-  exports_external.enum(["2.13", "2.11", "2.9", "2.7", "2.5", "2.3", "1.3"]),
+  exports_external.enum(["3.7", "3.5", "3.3", "3.1", "2.19", "2.17", "2.15", "2.13", "2.11", "2.9", "2.7", "2.5", "2.3", "1.3"]),
   exports_external.string()
 ]).describe("Specify the OpenSearch engine version.");
 var TypeSchema = exports_external.union([
@@ -151182,7 +151194,7 @@ var StorageSizeSchema = SizeSchema.refine(sizeMin(gibibytes(10)), "Minimum stora
 var SearchDefaultSchema = exports_external.object({
   type: TypeSchema.default("t3.small"),
   count: CountSchema.default(1),
-  version: VersionSchema.default("2.13"),
+  version: VersionSchema.default("3.7"),
   storage: StorageSizeSchema.default("10 GB")
 }).strict().default({}).describe("Configure the shared OpenSearch domain that backs every search index in your app.");
 var IndexNameSchema = exports_external.string().regex(/^[a-z0-9][a-z0-9\-_.]*$/, 'Index names must be lowercase & start with a letter or number, like "users" or "game-events".');
@@ -155701,7 +155713,8 @@ var createDnsValidatedCertificate = (group4, id, props) => {
   }, {
     ...props.dependsOn ? { dependsOn: props.dependsOn } : {},
     ...props.provider ? { provider: props.provider } : {},
-    replaceOnChanges: ["certificateArn", "validationRecordFqdns"]
+    replaceOnChanges: ["certificateArn", "validationRecordFqdns"],
+    createBeforeReplace: true
   });
   return validation;
 };
@@ -158963,7 +158976,8 @@ var searchFeature = defineFeature({
       })
     }, {
       retainOnDelete: ctx.appConfig.removal === "retain",
-      import: ctx.import ? name : undefined
+      import: ctx.import ? name : undefined,
+      replaceOnChanges: ["engineVersion", "domainName"]
     });
     ctx.addEnv("SEARCH_DOMAIN", openSearch.endpointV2);
     ctx.addPermission({
@@ -158977,7 +158991,8 @@ var searchFeature = defineFeature({
         mappings: JSON.stringify(resolveSearchMappings(indexProps) ?? {}),
         settings: JSON.stringify(indexProps.settings ?? {})
       }, {
-        retainOnDelete: ctx.appConfig.removal === "retain"
+        retainOnDelete: ctx.appConfig.removal === "retain",
+        replaceOnChanges: ["endpoint", "index"]
       });
     }
   }
@@ -164714,11 +164729,16 @@ var startTest = async (props) => {
     }
     for (const error3 of module.errors()) {
       const stack = error3.stacks?.[0];
+      const { code, syscall, address, port } = error3;
       errors3.push({
         type: error3.name,
         message: error3.message,
         location: stack ? { line: stack.line, column: stack.column } : undefined,
-        stack: error3.stack
+        stack: error3.stack,
+        code,
+        syscall,
+        address,
+        port
       });
     }
   }
@@ -164814,6 +164834,11 @@ var logTestErrors = (event) => {
     }
   }
 };
+var formatModuleError = (error3) => {
+  const syscall = [error3.syscall, error3.address, error3.port && `port ${error3.port}`].filter(Boolean).join(" ");
+  return [error3.message, syscall && `(${syscall})`, `
+`, error3.stack ?? "(no stack captured)"].filter(Boolean).join(" ");
+};
 var runTest = async (stack, dir, filters, workspace, opts) => {
   await mkdir8(directories.test, { recursive: true });
   const file2 = join49(directories.test, `${stack}.json`);
@@ -164841,15 +164866,26 @@ var runTest = async (stack, dir, filters, workspace, opts) => {
     initialMessage: `Run tests for the ${color2.info(stack)} stack`,
     errorMessage: `Running tests for the ${color2.info(stack)} stack failed`,
     async task(ctx) {
-      const result2 = await startTest({
+      const transient = (error3) => ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EPIPE"].includes(error3.code ?? "") || ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EPIPE"].some((code) => error3.message.includes(code));
+      let result2 = await startTest({
         dir,
         filters,
         env: opts.env
       });
+      if (result2.errors.length > 0 && result2.errors.every(transient)) {
+        for (const error3 of result2.errors) {
+          debug(`Transient module error in ${stack} tests, retrying once: ${formatModuleError(error3)}`);
+        }
+        await new Promise((resolve5) => setTimeout(resolve5, 1000));
+        result2 = await startTest({
+          dir,
+          filters,
+          env: opts.env
+        });
+      }
       if (result2.errors.length > 0) {
         for (const error3 of result2.errors) {
-          debug(`Module error in ${stack} tests: ${error3.message}
-${error3.stack ?? "(no stack captured)"}`);
+          debug(`Module error in ${stack} tests: ${formatModuleError(error3)}`);
         }
         throw result2.errors.map((error3) => new ExpectedError(error3.type && error3.type !== "Error" ? `${error3.type}: ${error3.message}` : error3.message));
       }
@@ -167722,6 +167758,26 @@ var dashboardHtml = `<!doctype html>
 	.health .chip.down { border-color: var(--bad); }
 	.health .chip.down .dot { background: var(--bad); }
 	.health .chip .detail-text { color: var(--muted); }
+	.home-cols {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(380px, 1fr));
+		gap: 0 20px;
+		align-items: start;
+	}
+	/* The activity feed reads like the log cards. */
+	.activity-card {
+		background: var(--panel);
+		border: 1px solid var(--border);
+		border-radius: 6px;
+		padding: 8px;
+		margin-top: 8px;
+		max-height: 420px;
+		overflow-y: auto;
+		font-size: 12px;
+	}
+	.activity-card .rows { grid-template-columns: fit-content(110px) 1fr auto; }
+	.activity-card .row { padding: 3px 4px; gap: 8px; }
+	.activity-card .empty { padding: 4px; }
 	.row.problem .id { color: var(--bad); }
 	.empty.good { color: var(--good); }
 	.row .stack {
@@ -167897,7 +167953,7 @@ const ICONS = {
 	route: svg('<circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/>'),
 	site: svg('<rect x="2" y="3" width="20" height="14" rx="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/>'),
 	seed: svg('<path d="M12 22V8"/><path d="M12 8C12 5 9 2 5 2c0 4 3 6 7 6z"/><path d="M12 12c0-3 3-6 7-6 0 4-3 6-7 6z"/>'),
-	auth: svg('<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/>'),
+	auth: svg('<rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0 1 10 0v4"/>'),
 	worker: svg('<polyline points="4 17 10 11 4 5"/><line x1="12" y1="19" x2="20" y2="19"/>'),
 }
 
@@ -169260,11 +169316,22 @@ const renderHome = main => {
 	// ----------------------------------------------------------------
 	// Activity: every dispatch through the bundle, newest first.
 
-	main.append($('h3', {}, 'Activity'))
+	// Activity & the handler logs sit side by side, both as cards.
+	const cols = $('div', { className: 'home-cols' })
+	const activityCol = $('div', {})
+	const logsCol = $('div', {})
 
+	cols.append(activityCol, logsCol)
+	main.append(cols)
+
+	activityCol.append($('h3', {}, 'Activity'))
+
+	const card = $('div', { className: 'activity-card' })
 	const activity = $('div', { className: 'rows' })
 	const idle = $('p', { className: 'empty' }, 'Nothing ran yet.')
-	main.append(idle, activity)
+
+	card.append(idle, activity)
+	activityCol.append(card)
 
 	const activityRows = []
 
@@ -169274,8 +169341,8 @@ const renderHome = main => {
 		const resource = state.resources.find(r => r.routeKey === data.route)
 		const row = $('button', { className: 'row' + (data.ok ? '' : ' problem') }, [
 			$('span', { className: 'stack' }, new Date(data.date).toLocaleTimeString()),
-			$('span', { className: 'id' }, (data.ok ? '' : '\\u2717 ') + data.route),
-			$('span', { className: 'info' }, data.ok ? data.ms + 'ms' : (data.error ?? 'failed').slice(0, 80)),
+			$('span', { className: 'id', title: data.route }, (data.ok ? '' : '\\u2717 ') + data.route),
+			$('span', { className: 'info', title: data.ok ? '' : (data.error ?? '') }, data.ok ? data.ms + 'ms' : (data.error ?? 'failed').slice(0, 80)),
 		])
 
 		if (resource) {
@@ -169301,7 +169368,7 @@ const renderHome = main => {
 	// Logs: the handlers' own console output, live - the full feed
 	// (incl. the dev server stream) lives on the Logs tab.
 
-	const logsFeed = attachLogFeed(main, 'worker', undefined, 'Logs')
+	const logsFeed = attachLogFeed(logsCol, 'worker', undefined, 'Logs')
 
 	cleanupPanel = () => {
 		clearInterval(uptimeTimer)
@@ -169924,6 +169991,7 @@ var startDev = async (props) => {
   const phase = props.phase ?? (async ({ start }, fn) => (log(start), fn(() => {})));
   const { appConfig, stackConfigs } = props;
   const startedAt = Date.now();
+  useDevBuildDir();
   const { builders, appId, ready: ready2 } = createApp({
     appConfig,
     stackConfigs,

package/dist/handlers/pubsub-publisher.js

@@ -9934,19 +9934,25 @@ import { stringify } from "@awsless/json";
 import { lambda } from "@awsless/lambda";
 import { maxLength, minLength, object, optional, pipe, string, unknown } from "@awsless/validate";
 import { getRouteEnv } from "awsless";
-var createClient = () => {
-  return new import_ioredis.Redis({
-    host: getRouteEnv("REDIS_HOST"),
-    port: Number(getRouteEnv("REDIS_PORT") ?? 6379),
-    tls: getRouteEnv("REDIS_TLS") === "disabled" ? undefined : {},
-    lazyConnect: true,
-    keepAlive: 0,
-    noDelay: true,
-    enableReadyCheck: false,
-    maxRetriesPerRequest: 3,
-    connectTimeout: 5000,
-    commandTimeout: 5000
-  });
+var client;
+var getClient = () => {
+  if (!client || client.status === "end") {
+    client = new import_ioredis.Redis({
+      host: getRouteEnv("REDIS_HOST"),
+      port: Number(getRouteEnv("REDIS_PORT") ?? 6379),
+      tls: getRouteEnv("REDIS_TLS") === "disabled" ? undefined : {},
+      lazyConnect: true,
+      keepAlive: 0,
+      noDelay: true,
+      enableReadyCheck: false,
+      maxRetriesPerRequest: 10,
+      retryStrategy: (times) => times > 20 ? null : Math.min(times * 250, 2000),
+      connectTimeout: 1e4,
+      commandTimeout: 1e4
+    });
+    client.on("error", () => {});
+  }
+  return client;
 };
 var handle_default = lambda({
   schema: object({
@@ -9954,14 +9960,8 @@ var handle_default = lambda({
     event: pipe(string(), minLength(1), maxLength(64)),
     payload: optional(unknown())
   }),
-  async handle({ topic, event, payload }, ctx) {
-    const redis = createClient();
-    ctx.onFinally(() => {
-      return redis.quit().catch(() => {
-        redis.disconnect();
-      });
-    });
-    await redis.publish(getRouteEnv("CHANNEL"), stringify({
+  async handle({ topic, event, payload }) {
+    await getClient().publish(getRouteEnv("CHANNEL"), stringify({
       topic,
       event,
       payload: typeof payload === "undefined" ? undefined : stringify(payload)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -42,13 +42,13 @@
     "@awsless/ts-file-cache": "^0.0.16"
   },
   "peerDependencies": {
-    "@awsless/big-float": "^0.1.7",
     "@awsless/duration": "^0.0.4",
-    "@awsless/dynamodb": "^0.3.23",
     "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.48",
-    "@awsless/s3": "^0.0.22",
+    "@awsless/big-float": "^0.1.7",
+    "@awsless/dynamodb": "^0.3.23",
     "@awsless/validate": "^0.2.0",
+    "@awsless/s3": "^0.0.22",
     "awsless": "^0.1.4",
     "@awsless/weak-cache": "^0.0.1"
   },
@@ -111,22 +111,22 @@
     "@awsless/big-float": "^0.1.7",
     "@awsless/clui": "^0.0.9",
     "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.23",
-    "@awsless/iot": "^0.0.5",
+    "@awsless/duration": "^0.0.4",
     "@awsless/json": "^0.0.11",
-    "@awsless/lambda": "^0.0.48",
     "@awsless/open-search": "^0.0.28",
-    "@awsless/s3": "^0.0.22",
+    "@awsless/iot": "^0.0.5",
     "@awsless/redis": "^0.1.13",
+    "@awsless/s3": "^0.0.22",
     "@awsless/size": "^0.0.2",
+    "@awsless/lambda": "^0.0.48",
     "@awsless/sns": "^0.0.11",
-    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/scheduler": "^0.0.5",
     "@awsless/sqs": "^0.0.24",
-    "awsless": "^0.1.4",
     "@awsless/ssm": "^0.0.8",
-    "@awsless/scheduler": "^0.0.5",
-    "@awsless/validate": "^0.2.0"
+    "@awsless/validate": "^0.2.0",
+    "@awsless/weak-cache": "^0.0.1",
+    "awsless": "^0.1.4"
   },
   "scripts": {
     "test": "bun cli/build-handlers.ts && pnpm vitest",