@awsless/awsless 0.0.623 → 0.0.625

package/dist/bin.js

@@ -168,8 +168,15 @@ import { log as log2, prompt as prompt2 } from "@awsless/clui";
 
 // src/util/workspace.ts
 import { aws } from "@terraforge/aws";
-import { DynamoLockBackend, enableDebug, S3StateBackend, WorkSpace } from "@terraforge/core";
+import {
+  DynamoActivityLogBackend,
+  DynamoLockBackend,
+  enableDebug,
+  S3StateBackend,
+  WorkSpace
+} from "@terraforge/core";
 import { mkdir, readFile, rm, writeFile } from "fs/promises";
+import { userInfo } from "node:os";
 import { dirname, join as join2 } from "path";
 
 // src/formation/cloudfront-kvs.ts
@@ -346,35 +353,112 @@ var Invalidation = createCustomResourceClass2(
   "invalidation"
 );
 var createCloudFrontProvider = (props) => {
+  const client = new CloudFrontClient(props);
   return createCustomProvider2("cloudfront", {
+    // distribution: {
+    // 	async createResource(input) {
+    // 		// tags: {
+    // 		// 	name,
+    // 		// },
+    // 		// comment: name,
+    // 		// enabled: true,
+    // 		// viewerCertificate: [{ cloudfrontDefaultCertificate: true }],
+    // 		// origin: [
+    // 		// 	{
+    // 		// 		id: 'default',
+    // 		// 		domainName: 'placeholder.awsless.dev',
+    // 		// 		customOriginConfig: [
+    // 		// 			{
+    // 		// 				httpPort: 80,
+    // 		// 				httpsPort: 443,
+    // 		// 				originProtocolPolicy: 'http-only',
+    // 		// 				originReadTimeout: 20,
+    // 		// 				originSslProtocols: ['TLSv1.2'],
+    // 		// 			},
+    // 		// 		],
+    // 		// 	},
+    // 		// ],
+    // 		// customErrorResponse: Object.entries(props.errors ?? {}).map(([errorCode, item]) => {
+    // 		// 	if (typeof item === 'string') {
+    // 		// 		return {
+    // 		// 			errorCode: Number(errorCode),
+    // 		// 			responseCode: errorCode,
+    // 		// 			responsePagePath: item,
+    // 		// 		}
+    // 		// 	}
+    // 		// 	return {
+    // 		// 		errorCode: Number(errorCode),
+    // 		// 		errorCachingMinTtl: item.minTTL ? toSeconds(item.minTTL) : undefined,
+    // 		// 		responseCode: item.statusCode?.toString() ?? errorCode,
+    // 		// 		responsePagePath: item.path,
+    // 		// 	}
+    // 		// }),
+    // 		// restrictions: [
+    // 		// 	{
+    // 		// 		geoRestriction: [
+    // 		// 			{
+    // 		// 				restrictionType: props.geoRestrictions.length > 0 ? 'blacklist' : 'none',
+    // 		// 				items: props.geoRestrictions,
+    // 		// 			},
+    // 		// 		],
+    // 		// 	},
+    // 		// ],
+    // 		// defaultCacheBehavior: [
+    // 		// 	{
+    // 		// 		compress: true,
+    // 		// 		targetOriginId: 'default',
+    // 		// 		functionAssociation: [
+    // 		// 			{
+    // 		// 				eventType: 'viewer-request',
+    // 		// 				functionArn: viewerRequest.arn,
+    // 		// 			},
+    // 		// 		],
+    // 		// 		originRequestPolicyId: originRequest.id,
+    // 		// 		cachePolicyId: cache.id,
+    // 		// 		responseHeadersPolicyId: responseHeaders.id,
+    // 		// 		viewerProtocolPolicy: 'redirect-to-https',
+    // 		// 		allowedMethods: [
+    // 		// 			{
+    // 		// 				items: ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE'],
+    // 		// 				cachedMethods: ['GET', 'HEAD'],
+    // 		// 			},
+    // 		// 		],
+    // 		// 	},
+    // 		// ],
+    // 		// 	webAclId: waf?.arn,
+    // 		// client.send(
+    // 		// 	new CreateDistributionCommand({
+    // 		// 		DistributionConfig: {
+    // 		// 			Enabled: true,
+    // 		// 			ConnectionMode: 'tenant-only',
+    // 		// 			''
+    // 		// 		},
+    // 		// 	})
+    // 		// )
+    // 		// new UpdateDistributionCommand({
+    // 		// 	'Id'
+    // 		// })
+    // 	},
+    // },
     invalidation: {
       async updateResource(input) {
         const state2 = z2.object({
           distributionId: z2.string(),
           paths: z2.string().array().min(1)
         }).parse(input.proposedState);
-        await createInvalidationForDistributionTenants({
-          ...props,
-          ...state2
-        });
+        await createInvalidationForDistributionTenants(client, state2);
         return {};
       }
     }
   });
 };
-var createInvalidationForDistributionTenants = async ({
-  distributionId,
-  credentials,
-  region,
-  paths
-}) => {
-  const client = new CloudFrontClient({ credentials, region });
+var createInvalidationForDistributionTenants = async (client, props) => {
   let cursor;
   do {
     const result = await client.send(
       new ListDistributionTenantsCommand({
         AssociationFilter: {
-          DistributionId: distributionId
+          DistributionId: props.distributionId
         },
         MaxItems: 10,
         Marker: cursor
@@ -387,8 +471,8 @@ var createInvalidationForDistributionTenants = async ({
           Id: tenant.Id,
           InvalidationBatch: {
             Paths: {
-              Quantity: paths.length,
-              Items: paths
+              Quantity: props.paths.length,
+              Items: props.paths
             },
             CallerReference: randomUUID()
           }
@@ -585,6 +669,11 @@ var createWorkSpace = async (props) => {
     ...props,
     bucket: getStateBucketName(props.region, props.accountId)
   });
+  const activityLog = new DynamoActivityLogBackend({
+    ...props,
+    tableName: "awsless-logs",
+    user: userInfo().username
+  });
   if (process.env.VERBOSE) {
     enableDebug();
   }
@@ -625,12 +714,14 @@ var createWorkSpace = async (props) => {
     ],
     concurrency: 15,
     backend: {
+      activityLog,
       state: state2,
       lock
     }
   });
   return {
     workspace,
+    activityLog,
     lock,
     state: state2
   };
@@ -671,6 +762,21 @@ var hasLockTable = async (client) => {
     throw error;
   }
 };
+var hasActivityLogTable = async (client) => {
+  try {
+    const result = await client.send(
+      new DescribeTableCommand({
+        TableName: "awsless-logs"
+      })
+    );
+    return !!result.Table;
+  } catch (error) {
+    if (error instanceof ResourceNotFoundException) {
+      return false;
+    }
+    throw error;
+  }
+};
 var hasStateBucket = async (client, region, accountId) => {
   try {
     const result = await client.send(
@@ -708,6 +814,34 @@ var createLockTable = (client) => {
     })
   );
 };
+var createActivityLogTable = (client) => {
+  return client.send(
+    new CreateTableCommand({
+      TableName: "awsless-logs",
+      BillingMode: BillingMode.PAY_PER_REQUEST,
+      KeySchema: [
+        {
+          AttributeName: "urn",
+          KeyType: KeyType.HASH
+        },
+        {
+          AttributeName: "date",
+          KeyType: KeyType.RANGE
+        }
+      ],
+      AttributeDefinitions: [
+        {
+          AttributeName: "urn",
+          AttributeType: ScalarAttributeType.S
+        },
+        {
+          AttributeName: "date",
+          AttributeType: ScalarAttributeType.N
+        }
+      ]
+    })
+  );
+};
 var createStateBucket = async (client, region, accountId) => {
   const name = getStateBucketName(region, accountId);
   await client.send(
@@ -743,12 +877,13 @@ var createStateBucket = async (client, region, accountId) => {
 var bootstrapAwsless = async (props) => {
   const dynamo = new DynamoDB(props);
   const s3 = new S3Client(props);
-  const [table, bucket] = await Promise.all([
+  const [lockTable, logTable, stateBucket] = await Promise.all([
     //
     hasLockTable(dynamo),
+    hasActivityLogTable(dynamo),
     hasStateBucket(s3, props.region, props.accountId)
   ]);
-  if (!table || !bucket) {
+  if (!lockTable || !stateBucket || !logTable) {
     log2.warning(`Awsless hasn't been bootstrapped yet.`);
     if (!process.env.SKIP_PROMPT) {
       const confirmed = await prompt2.confirm({
@@ -763,10 +898,13 @@ var bootstrapAwsless = async (props) => {
       successMessage: "Done deploying the bootstrap stack.",
       errorMessage: "Failed to bootstrap Awsless.",
       async task() {
-        if (!table) {
+        if (!lockTable) {
           await createLockTable(dynamo);
         }
-        if (!bucket) {
+        if (!logTable) {
+          await createActivityLogTable(dynamo);
+        }
+        if (!stateBucket) {
           await createStateBucket(s3, props.region, props.accountId);
         }
       }
@@ -1120,11 +1258,11 @@ var FunctionDefaultSchema = z15.object({
   // container
   warm: WarmSchema.default(0),
   vpc: VPCSchema.default(false),
-  log: LogSchema.default(true).transform((log31) => ({
-    retention: log31.retention ?? days(7),
-    level: "level" in log31 ? log31.level : "error",
-    system: "system" in log31 ? log31.system : "warn",
-    format: "format" in log31 ? log31.format : "json"
+  log: LogSchema.default(true).transform((log32) => ({
+    retention: log32.retention ?? days(7),
+    level: "level" in log32 ? log32.level : "error",
+    system: "system" in log32 ? log32.system : "warn",
+    format: "format" in log32 ? log32.format : "json"
   })),
   timeout: TimeoutSchema.default("10 seconds"),
   memorySize: MemorySizeSchema.default("128 MB"),
@@ -1652,8 +1790,8 @@ var InstanceDefaultSchema = z25.object({
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional(),
   // restartPolicy: RestartPolicySchema.default({ enabled: true }),
-  log: LogSchema2.default(true).transform((log31) => ({
-    retention: log31.retention ?? days4(7)
+  log: LogSchema2.default(true).transform((log32) => ({
+    retention: log32.retention ?? days4(7)
   }))
 }).default({});
 
@@ -3321,7 +3459,7 @@ import { createHash as createHash2 } from "crypto";
 import { rolldown } from "rolldown";
 import { importAsString } from "rollup-plugin-string-import";
 var bundleTypeScriptWithRolldown = async ({
-  format: format2 = "esm",
+  format: format3 = "esm",
   minify = true,
   file,
   nativeDir,
@@ -3354,9 +3492,9 @@ var bundleTypeScriptWithRolldown = async ({
       }) : void 0
     ]
   });
-  const ext = format2 === "esm" ? "mjs" : "js";
+  const ext = format3 === "esm" ? "mjs" : "js";
   const result = await bundle.generate({
-    format: format2,
+    format: format3,
     sourcemap: "hidden",
     exports: "auto",
     entryFileNames: `index.${ext}`,
@@ -5173,7 +5311,8 @@ var siteFeature = defineFeature({
             }
             const instance = Bun.spawn(buildProps.command.split(" "), {
               cwd,
-              env
+              env,
+              stdout: "ignore"
               // stdout: 'inherit',
               // stderr: 'inherit',
             });
@@ -6574,7 +6713,7 @@ var buildExecutable = async (input, outputPath, architecture) => {
   }
   if (!result.success) {
     throw new ExpectedError(`Executable build failed:
-${result.logs?.map((log31) => log31.message).join("\n")}`);
+${result.logs?.map((log32) => log32.message).join("\n")}`);
   }
   const file = await readFile4(filePath);
   return {
@@ -8074,7 +8213,7 @@ var createApp = (props) => {
     region: props.appConfig.region,
     appName: props.appConfig.name
   });
-  const commands10 = [];
+  const commands11 = [];
   const configs = /* @__PURE__ */ new Set();
   const functionsByConfig = {};
   const tests = [];
@@ -8142,7 +8281,7 @@ var createApp = (props) => {
         });
       },
       registerCommand(command) {
-        commands10.push(command);
+        commands11.push(command);
       },
       registerDomainZone(zone) {
         domainZones.push(zone);
@@ -8243,7 +8382,7 @@ var createApp = (props) => {
           configs.add(name);
         },
         registerCommand(command) {
-          commands10.push(command);
+          commands11.push(command);
         },
         registerDomainZone(zone) {
           domainZones.push(zone);
@@ -8339,7 +8478,7 @@ var createApp = (props) => {
     functionsByConfig,
     warnings,
     builders,
-    commands: commands10
+    commands: commands11
     // deploymentLine,
   };
 };
@@ -8802,10 +8941,10 @@ var startTest = async (props) => {
       tests.push(entry);
       if ("task" in test2) {
         const task2 = test2.task;
-        for (const log31 of task2.logs ?? []) {
+        for (const log32 of task2.logs ?? []) {
           entry.logs.push({
-            time: log31.time,
-            text: log31.content
+            time: log32.time,
+            text: log32.content
           });
         }
       }
@@ -8873,7 +9012,7 @@ var logTestLogs = (event) => {
         ].join(" "),
         color.line(icon.dot)
       );
-      log16.message(test2.logs.map((log31) => log31.text).join("\n"));
+      log16.message(test2.logs.map((log32) => log32.text).join("\n"));
     }
   }
 };
@@ -9514,7 +9653,7 @@ import { log as log22 } from "@awsless/clui";
 import chalk4 from "chalk";
 import { constantCase as constantCase15 } from "change-case";
 var bind = (program2) => {
-  program2.command("bind").argument("[command...]", "The command to execute").option("--config <string...>", "List of config values that will be accessable", (v) => v.split(",")).description(`Bind your site environment variables to a command`).action(async (commands10 = [], opts) => {
+  program2.command("bind").argument("[command...]", "The command to execute").option("--config <string...>", "List of config values that will be accessable", (v) => v.split(",")).description(`Bind your site environment variables to a command`).action(async (commands11 = [], opts) => {
     await layout("bind", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const profile = appConfig.profile;
@@ -9544,14 +9683,14 @@ var bind = (program2) => {
       if (configList.length ?? 0 > 0) {
         log22.note("Bind Config", configList.map((v) => color.label(constantCase15(v))).join("\n"));
       }
-      if (commands10.length === 0) {
+      if (commands11.length === 0) {
         return "No command to execute.";
       }
       const freshCred = await credentials();
       console.log(chalk4.black(`\u2502`));
-      console.log(chalk4.black(`\u2514  ${chalk4.yellow(commands10.join(" "))}`));
+      console.log(chalk4.black(`\u2514  ${chalk4.yellow(commands11.join(" "))}`));
       console.log("");
-      const instance = Bun.spawn(commands10, {
+      const instance = Bun.spawn(commands11, {
         // cwd: process.cwd(),
         env: {
           // Pass the process env vars
@@ -9741,17 +9880,17 @@ var run = (program2) => {
       const region = appConfig.region;
       const credentials = await getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { commands: commands10, appId } = createApp({ appConfig, stackConfigs, accountId });
+      const { commands: commands11, appId } = createApp({ appConfig, stackConfigs, accountId });
       let command;
       if (selected) {
-        command = commands10.find((cmd) => {
+        command = commands11.find((cmd) => {
           return cmd.name === selected;
         });
       } else {
         command = await prompt11.select({
           message: "Pick the command you want to run:",
-          initialValue: commands10[0],
-          options: commands10.map((cmd) => ({
+          initialValue: commands11[0],
+          options: commands11.map((cmd) => ({
             value: cmd,
             label: cmd.name,
             hint: cmd.description
@@ -9808,7 +9947,7 @@ var push = (program2) => {
     await layout("state pull", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const profile = appConfig.profile;
-      const credentials = await getCredentials(appConfig.profile);
+      const credentials = await getCredentials(profile);
       const accountId = await getAccountId(credentials, region);
       const { app } = createApp({ appConfig, stackConfigs, accountId });
       const { state: state2 } = await createWorkSpace({ credentials, region, accountId });
@@ -10441,8 +10580,49 @@ var cron = (program2) => {
   commands8.forEach((cb) => cb(command));
 };
 
+// src/cli/command/activity/logs.ts
+import { log as log31 } from "@awsless/clui";
+import { format as format2 } from "date-fns";
+var logs2 = (program2) => {
+  program2.command("logs").option("--limit <number>", "The size limit of logs to tail", "10").description("Tail the activity logs").action(async (options) => {
+    await layout("activity logs", async ({ appConfig, stackConfigs }) => {
+      const region = appConfig.region;
+      const profile = appConfig.profile;
+      const credentials = await getCredentials(profile);
+      const accountId = await getAccountId(credentials, region);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const { activityLog } = await createWorkSpace({ credentials, region, accountId });
+      const limit = parseInt(options.limit, 10) ?? 10;
+      const logs3 = await activityLog.tail(app.urn, limit);
+      for (const item of logs3) {
+        log31.info(
+          [
+            //
+            [
+              color.line(format2(new Date(item.date), "yyyy-MM-dd HH:mm:ss")),
+              color.line.dim(icon.arrow.right),
+              color.warning(item.user)
+            ].join(" "),
+            [
+              item.action === "deploy" ? color.success("deploy") : color.error("delete"),
+              ...item.filters?.map((f) => color.info(f)) ?? []
+            ].join(" ")
+          ].join("\n")
+        );
+      }
+    });
+  });
+};
+
+// src/cli/command/activity/index.ts
+var commands9 = [logs2];
+var activity = (program2) => {
+  const command = program2.command("activity").description(`Manage activity logs`);
+  commands9.forEach((cb) => cb(command));
+};
+
 // src/cli/command/index.ts
-var commands9 = [
+var commands10 = [
   bootstrap,
   types,
   build2,
@@ -10453,6 +10633,7 @@ var commands9 = [
   bind,
   run,
   logs,
+  activity,
   auth,
   domain,
   state,
@@ -10484,7 +10665,7 @@ program.on("option:skip-prompt", () => {
 program.on("option:no-cache", () => {
   process.env.NO_CACHE = program.opts().cache === false ? "1" : void 0;
 });
-commands9.forEach((fn) => fn(program));
+commands10.forEach((fn) => fn(program));
 
 // src/bin.ts
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.623",
+  "version": "0.0.625",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -34,22 +34,22 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.5",
-    "@awsless/clui": "^0.0.8",
-    "@awsless/json": "^0.0.11",
     "@awsless/cloudwatch": "^0.0.1",
+    "@awsless/clui": "^0.0.8",
     "@awsless/dynamodb": "^0.3.14",
-    "@awsless/iot": "^0.0.3",
+    "@awsless/duration": "^0.0.4",
+    "@awsless/json": "^0.0.11",
     "@awsless/lambda": "^0.0.36",
+    "@awsless/mqtt": "^0.0.2",
+    "@awsless/iot": "^0.0.3",
+    "@awsless/redis": "^0.0.14",
     "@awsless/open-search": "^0.0.21",
     "@awsless/s3": "^0.0.21",
-    "@awsless/sns": "^0.0.10",
     "@awsless/sqs": "^0.0.16",
-    "@awsless/validate": "^0.1.4",
+    "@awsless/sns": "^0.0.10",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/duration": "^0.0.4",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/mqtt": "^0.0.2",
-    "@awsless/redis": "^0.0.14"
+    "@awsless/validate": "^0.1.5",
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -75,7 +75,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@swc/core": "^1.3.70",
     "@terraforge/aws": "^6.28.0",
-    "@terraforge/core": "^0.0.19",
+    "@terraforge/core": "^0.0.21",
     "@terraforge/terraform": "^0.0.14",
     "@types/aws-lambda": "^8.10.110",
     "@types/bun": "1.3.9",
@@ -139,16 +139,16 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
-    "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/json": "^0.0.11",
     "@awsless/big-float": "^0.1.5",
+    "@awsless/clui": "^0.0.8",
+    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
-    "@awsless/size": "^0.0.2",
     "@awsless/graphql": "^0.0.9",
-    "@awsless/validate": "^0.1.4",
+    "@awsless/json": "^0.0.11",
     "@awsless/scheduler": "^0.0.4",
-    "@awsless/ts-file-cache": "^0.0.12",
-    "@awsless/clui": "^0.0.8"
+    "@awsless/size": "^0.0.2",
+    "@awsless/validate": "^0.1.5",
+    "@awsless/ts-file-cache": "^0.0.12"
   },
   "devDependencies": {
     "@hono/node-server": "1.19.9",