@awsless/cli 0.1.14 → 0.1.15

package/dist/bin.js

@@ -149982,6 +149982,7 @@ var preflightDeployment = async (props) => {
   }
 };
 var promoteDeployment = async (props) => {
+  const stores = props.stores ?? [];
   const deployment = await getDeployment(props.dynamo, props.appId, props.id);
   const functionVersion = deployment?.functionVersion;
   if (!deployment) {
@@ -149990,13 +149991,19 @@ var promoteDeployment = async (props) => {
   if (!functionVersion) {
     throw new ExpectedError(`Deployment "${props.id}" hasn't finished deploying.`);
   }
-  if (props.store && props.store.deployment.functionVersion !== functionVersion) {
-    throw new ExpectedError(`The routes don't share the deployed function version.`);
+  for (const store of stores) {
+    if (store.deployment.functionVersion !== functionVersion) {
+      throw new ExpectedError(`The routes don't share the deployed function version.`);
+    }
   }
   const alias = await getLambdaAlias(props.lambda, props.functionName, LIVE_LAMBDA_ALIAS);
   const liveId = alias?.Description || undefined;
-  const activeId = props.store ? await readActiveDeploymentId(props.kvs, props.store.arn) : undefined;
-  const active = props.store && activeId !== undefined ? await readRouteDeployment(props.kvs, props.store.arn, activeId) : undefined;
+  const activeRoutes = new Map;
+  for (const store of stores) {
+    const activeId = await readActiveDeploymentId(props.kvs, store.arn);
+    const active = activeId !== undefined ? await readRouteDeployment(props.kvs, store.arn, activeId) : undefined;
+    activeRoutes.set(store.arn, active);
+  }
   if (props.rejectStale && liveId && liveId !== props.id) {
     const live = await getDeployment(props.dynamo, props.appId, liveId);
     if (live?.promotedAt && live.promotedAt > deployment.createdAt) {
@@ -150014,8 +150021,8 @@ var promoteDeployment = async (props) => {
     }
     throw error3;
   }
-  let routesUpdateStarted = false;
   let aliasUpdateStarted = false;
+  const flippedStores = [];
   const flipped = [];
   try {
     for (const name of await listLambdaFunctions(props.lambda, getAppNamePrefix(props.appName))) {
@@ -150042,9 +150049,11 @@ var promoteDeployment = async (props) => {
         description: props.id
       });
     }
-    if (props.store && active?.id !== props.store.deployment.id) {
-      routesUpdateStarted = true;
-      await setActiveRouteDeployment(props.kvs, props.store.arn, props.store.deployment);
+    for (const store of stores) {
+      if (activeRoutes.get(store.arn)?.id !== store.deployment.id) {
+        flippedStores.push(store);
+        await setActiveRouteDeployment(props.kvs, store.arn, store.deployment);
+      }
     }
     if (alias?.FunctionVersion !== functionVersion || alias?.Description !== props.id) {
       aliasUpdateStarted = true;
@@ -150058,7 +150067,7 @@ var promoteDeployment = async (props) => {
     await markPromoted(props.dynamo, props.appId, props.id);
   } catch (error3) {
     const rollback = [
-      ...routesUpdateStarted && props.store ? [setActiveRouteDeployment(props.kvs, props.store.arn, active)] : [],
+      ...flippedStores.map((store) => setActiveRouteDeployment(props.kvs, store.arn, activeRoutes.get(store.arn))),
       ...aliasUpdateStarted && alias?.FunctionVersion ? [
         upsertLambdaAlias(props.lambda, {
           functionName: props.functionName,
@@ -150092,21 +150101,21 @@ var activateDeployment = async (props) => {
   const dynamo = new DynamoDBClient({ credentials: credentials2, region });
   const functionName = getBundleFunctionName(props.appConfig.name);
   const id = props.id ?? await previousDeploymentId({ lambda, dynamo, appId, functionName });
-  let store;
-  if (Object.keys(props.appConfig.router ?? {}).length > 0) {
+  const stores = [];
+  for (const routerId of Object.keys(props.appConfig.router ?? {})) {
     const storeArn = await getRouteStoreArn(cloudfront, formatGlobalResourceName({
       appName: props.appConfig.name,
       resourceType: "router",
-      resourceName: "store"
+      resourceName: routerId
     }));
     if (!storeArn) {
-      throw new ExpectedError(`The router hasn't been deployed yet. Run "awsless deploy" first.`);
+      throw new ExpectedError(`The "${routerId}" router hasn't been deployed yet. Run "awsless deploy" first.`);
     }
     const routes = await readRouteDeployment(kvs, storeArn, id);
     if (!routes) {
-      throw new ExpectedError(`Deployment "${id}" doesn't exist.`);
+      throw new ExpectedError(`Deployment "${id}" doesn't exist for the "${routerId}" router.`);
     }
-    store = { arn: storeArn, deployment: routes };
+    stores.push({ arn: storeArn, deployment: routes });
   }
   await promoteDeployment({
     kvs,
@@ -150116,7 +150125,7 @@ var activateDeployment = async (props) => {
     appName: props.appConfig.name,
     functionName,
     id,
-    store,
+    stores,
     rejectStale: props.rejectStale
   });
   return id;
@@ -162683,39 +162692,30 @@ var routerFeature = defineFeature({
   name: "router",
   onApp(ctx) {
     const routers = Object.entries(ctx.appConfig.router ?? {});
-    const defaultRouter = routers[0]?.[0];
     const routes = {};
-    const routeDependencies = new Set;
+    const routeDependencies = {};
+    const routeStores = {};
+    const routerGroups = {};
     const distributionIds = [];
     let hasLambdaRoutes = false;
-    let routeStore;
-    let sharedGroup;
-    if (routers.length > 0) {
-      const storeName = formatGlobalResourceName({
-        appName: ctx.app.name,
-        resourceType: "router",
-        resourceName: "store"
-      });
-      sharedGroup = new Group(ctx.base, "router", "shared");
-      routeStore = new aws2.cloudfront.KeyValueStore(sharedGroup, "routes", {
-        name: storeName,
-        comment: "Store for routes"
-      }, {
-        replaceOnChanges: ["name"],
-        createBeforeReplace: true,
-        import: ctx.import ? storeName : undefined
-      });
-    }
     for (const [id, props] of routers) {
       const group4 = new Group(ctx.base, "router", id);
+      routerGroups[id] = group4;
+      routes[id] = {};
+      routeDependencies[id] = new Set;
       const name = formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "router",
         resourceName: id
       });
-      const productionFunctionName = `${name.slice(0, 52)}--production`;
-      const productionFunction = new aws2.cloudfront.Function(group4, "production-function", {
-        name: productionFunctionName,
+      const routeStore = new aws2.cloudfront.KeyValueStore(group4, "routes", { name }, {
+        replaceOnChanges: ["name"],
+        createBeforeReplace: true,
+        import: ctx.import ? name : undefined
+      });
+      routeStores[id] = routeStore;
+      const cfFunction = new aws2.cloudfront.Function(group4, "function", {
+        name,
         runtime: "cloudfront-js-2.0",
         code: getViewerRequestFunctionCode({
           router: id,
@@ -162727,18 +162727,19 @@ var routerFeature = defineFeature({
         publish: true,
         keyValueStoreAssociations: [routeStore.arn]
       }, {
-        import: ctx.import ? productionFunctionName : undefined
+        import: ctx.import ? name : undefined
       });
       ctx.shared.add("router", "addRoutes", id, (newRoutes, options) => {
+        const routerRoutes = routes[id];
         for (const [key, route] of Object.entries(newRoutes)) {
-          if (Object.hasOwn(routes, `${id}:${key}`)) {
+          if (Object.hasOwn(routerRoutes, `${id}:${key}`)) {
             throw new ExpectedError(`Duplicate route key: ${key} in the "${id}" router`);
           }
           assertRouteValueSize(`${id}:${key}`, route);
-          routes[`${id}:${key}`] = route;
+          routerRoutes[`${id}:${key}`] = route;
         }
         for (const dependency of options?.dependsOn ?? []) {
-          routeDependencies.add(dependency);
+          routeDependencies[id].add(dependency);
         }
         if (Object.values(newRoutes).flat().some((route) => route.type === "lambda" && !route.domainName)) {
           hasLambdaRoutes = true;
@@ -163001,7 +163002,7 @@ var routerFeature = defineFeature({
             functionAssociation: [
               {
                 eventType: "viewer-request",
-                functionArn: productionFunction.arn
+                functionArn: cfFunction.arn
               }
             ],
             originRequestPolicyId: originRequest.id,
@@ -163018,38 +163019,6 @@ var routerFeature = defineFeature({
         ],
         webAclId: waf?.arn
       });
-      if (id === defaultRouter) {
-        ctx.onReadyLast(() => {
-          const bundle = ctx.shared.get("bundle", "main");
-          let lambdaUrlHost;
-          if (hasLambdaRoutes) {
-            const deployment = new FunctionDeployment(sharedGroup, "function-deployment", {
-              functionName: bundle.lambda.functionName,
-              id: ctx.deploymentId ?? "local-0",
-              sourceArns: distributionIds.map((distributionId) => distributionId.pipe((id2) => `arn:aws:cloudfront::${ctx.accountId}:distribution/${id2}`))
-            }, {
-              dependsOn: [bundle.deployment]
-            });
-            lambdaUrlHost = deployment.url.pipe((url) => url.split("/")[2]);
-            routeDependencies.add(bundle.policy);
-            routeDependencies.add(bundle.alias);
-            routeDependencies.add(deployment);
-          }
-          new RouteDeployment(sharedGroup, "deployment", {
-            deploymentId: ctx.deploymentId ?? "local-0",
-            storeArn: routeStore.arn,
-            functionVersion: bundle.lambda.version,
-            routes: $resolve([routes, lambdaUrlHost], (routes2, lambdaUrlHost2) => {
-              const withOrigin = (route) => {
-                return route.type === "lambda" && !route.domainName ? { ...route, domainName: lambdaUrlHost2 } : route;
-              };
-              return Object.entries(routes2).flatMap(([key, route]) => createRouteStoreEntries(key, Array.isArray(route) ? route.map(withOrigin) : withOrigin(route)));
-            })
-          }, {
-            dependsOn: Array.from(routeDependencies)
-          });
-        });
-      }
       ctx.shared.add("router", "id", id, distribution.id);
       distributionIds.push(distribution.id);
       if (props.domain) {
@@ -163105,6 +163074,44 @@ var routerFeature = defineFeature({
         ctx.shared.add("router", "endpoint", id, domainName);
       }
     }
+    if (routers.length > 0) {
+      ctx.onReadyLast(() => {
+        const bundle = ctx.shared.get("bundle", "main");
+        const sharedDependencies = [];
+        let lambdaUrlHost;
+        if (hasLambdaRoutes) {
+          const sharedGroup = new Group(ctx.base, "router", "shared");
+          const deployment = new FunctionDeployment(sharedGroup, "function-deployment", {
+            functionName: bundle.lambda.functionName,
+            id: ctx.deploymentId ?? "local-0",
+            sourceArns: distributionIds.map((distributionId) => distributionId.pipe((id) => `arn:aws:cloudfront::${ctx.accountId}:distribution/${id}`))
+          }, {
+            dependsOn: [bundle.deployment]
+          });
+          lambdaUrlHost = deployment.url.pipe((url) => url.split("/")[2]);
+          sharedDependencies.push(bundle.policy, bundle.alias, deployment);
+        }
+        for (const [id] of routers) {
+          const dependencies = routeDependencies[id];
+          for (const dependency of sharedDependencies) {
+            dependencies.add(dependency);
+          }
+          new RouteDeployment(routerGroups[id], "deployment", {
+            deploymentId: ctx.deploymentId ?? "local-0",
+            storeArn: routeStores[id].arn,
+            functionVersion: bundle.lambda.version,
+            routes: $resolve([routes[id], lambdaUrlHost], (routes2, lambdaUrlHost2) => {
+              const withOrigin = (route) => {
+                return route.type === "lambda" && !route.domainName ? { ...route, domainName: lambdaUrlHost2 } : route;
+              };
+              return Object.entries(routes2).flatMap(([key, route]) => createRouteStoreEntries(key, Array.isArray(route) ? route.map(withOrigin) : withOrigin(route)));
+            })
+          }, {
+            dependsOn: Array.from(dependencies)
+          });
+        }
+      });
+    }
   },
   onStack(ctx) {
     for (const [id, patterns] of Object.entries(ctx.stackConfig.routes ?? {})) {
@@ -187353,13 +187360,21 @@ var prune = (program3) => {
               await pruneFunctionVersion(lambda, name, version2);
             }
           }
-          const storeArn = await getRouteStoreArn(cloudfront, formatGlobalResourceName({
-            appName: appConfig.name,
-            resourceType: "router",
-            resourceName: "store"
-          }));
-          if (storeArn) {
-            const survivingRoutes = await pruneStoreDeployments(kvs, storeArn, prune2.map((item) => item.id));
+          const survivingRoutes = [];
+          let sweptStores = false;
+          for (const routerId of Object.keys(appConfig.router ?? {})) {
+            const storeArn = await getRouteStoreArn(cloudfront, formatGlobalResourceName({
+              appName: appConfig.name,
+              resourceType: "router",
+              resourceName: routerId
+            }));
+            if (!storeArn) {
+              continue;
+            }
+            sweptStores = true;
+            survivingRoutes.push(...await pruneStoreDeployments(kvs, storeArn, prune2.map((item) => item.id)));
+          }
+          if (sweptStores) {
             await pruneSiteVersions({
               s3,
               bucket: formatGlobalResourceName({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -43,14 +43,14 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.7",
+    "@awsless/json": "^0.0.11",
     "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.25",
-    "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.48",
-    "@awsless/validate": "^0.2.0",
+    "@awsless/s3": "^0.0.22",
     "@awsless/weak-cache": "^0.0.1",
-    "awsless": "^0.1.4",
-    "@awsless/s3": "^0.0.22"
+    "@awsless/validate": "^0.2.0",
+    "awsless": "^0.1.4"
   },
   "devDependencies": {
     "@aws-sdk/client-cloudformation": "^3.369.0",
@@ -110,23 +110,23 @@
     "zod-to-json-schema": "^3.24.3",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/big-float": "^0.1.7",
-    "@awsless/clui": "^0.0.9",
-    "@awsless/duration": "^0.0.4",
     "@awsless/dynamodb": "^0.3.25",
-    "@awsless/iot": "^0.0.5",
     "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.48",
-    "@awsless/open-search": "^0.0.28",
+    "@awsless/iot": "^0.0.5",
+    "@awsless/duration": "^0.0.4",
     "@awsless/redis": "^0.1.13",
+    "@awsless/clui": "^0.0.9",
     "@awsless/s3": "^0.0.22",
     "@awsless/scheduler": "^0.0.5",
     "@awsless/size": "^0.0.2",
-    "@awsless/sns": "^0.0.11",
-    "@awsless/ssm": "^0.0.8",
-    "@awsless/weak-cache": "^0.0.1",
     "@awsless/sqs": "^0.0.24",
+    "@awsless/open-search": "^0.0.28",
+    "@awsless/validate": "^0.2.0",
+    "@awsless/ssm": "^0.0.8",
+    "@awsless/sns": "^0.0.11",
     "awsless": "^0.1.4",
-    "@awsless/validate": "^0.2.0"
+    "@awsless/weak-cache": "^0.0.1"
   },
   "scripts": {
     "test": "bun cli/build-handlers.ts && pnpm vitest",