@awsless/awsless 0.0.465 → 0.0.467

package/dist/bin.js

@@ -713,11 +713,11 @@ var FunctionDefaultSchema = z9.object({
   // container
   warm: WarmSchema.default(0),
   vpc: VPCSchema.default(false),
-  log: LogSchema.default(true).transform((log15) => ({
-    retention: log15.retention ?? days(7),
-    level: "level" in log15 ? log15.level : "error",
-    system: "system" in log15 ? log15.system : "warn",
-    format: "format" in log15 ? log15.format : "json"
+  log: LogSchema.default(true).transform((log16) => ({
+    retention: log16.retention ?? days(7),
+    level: "level" in log16 ? log16.level : "error",
+    system: "system" in log16 ? log16.system : "warn",
+    format: "format" in log16 ? log16.format : "json"
   })),
   timeout: TimeoutSchema.default("10 seconds"),
   memorySize: MemorySizeSchema.default("128 MB"),
@@ -3772,7 +3772,7 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
 };
 
 // src/feature/rpc/index.ts
-import { days as days4, seconds as seconds5, toSeconds as toSeconds5 } from "@awsless/duration";
+import { days as days4, minutes as minutes4, seconds as seconds5, toSeconds as toSeconds5 } from "@awsless/duration";
 var __dirname = dirname6(fileURLToPath(import.meta.url));
 var rpcFeature = defineFeature({
   name: "rpc",
@@ -3830,13 +3830,18 @@ var rpcFeature = defineFeature({
         bundleFile: join10(__dirname, "/prebuild/rpc/bundle.zip"),
         bundleHash: join10(__dirname, "/prebuild/rpc/HASH"),
         memorySize: mebibytes3(256),
+        timeout: minutes4(3),
         handler: "index.default",
         runtime: "nodejs22.x",
         warm: 3,
         log: props.log
       });
-      const table2 = new $13.aws.dynamodb.Table(group, "schema", {
-        name,
+      const schemaTable = new $13.aws.dynamodb.Table(group, "schema", {
+        name: formatGlobalResourceName({
+          appName: ctx.app.name,
+          resourceType: "rpc-schema",
+          resourceName: id
+        }),
         hashKey: "query",
         billingMode: "PAY_PER_REQUEST",
         attribute: [
@@ -3846,13 +3851,38 @@ var rpcFeature = defineFeature({
           }
         ]
       });
-      result.setEnvironment("SCHEMA_TABLE", table2.name);
+      result.setEnvironment("SCHEMA_TABLE", schemaTable.name);
       result.addPermission({
         effect: "allow",
         actions: ["dynamodb:GetItem"],
-        resources: [table2.arn]
+        resources: [schemaTable.arn]
+      });
+      ctx.shared.add("rpc", `schema-table`, id, schemaTable);
+      const lockTable = new $13.aws.dynamodb.Table(group, "lock", {
+        name: formatGlobalResourceName({
+          appName: ctx.app.name,
+          resourceType: "rpc-lock",
+          resourceName: id
+        }),
+        hashKey: "key",
+        billingMode: "PAY_PER_REQUEST",
+        ttl: {
+          enabled: true,
+          attributeName: "ttl"
+        },
+        attribute: [
+          {
+            name: "key",
+            type: "S"
+          }
+        ]
+      });
+      result.setEnvironment("LOCK_TABLE", lockTable.name);
+      result.addPermission({
+        effect: "allow",
+        actions: ["dynamodb:UpdateItem", "dynamodb:DeleteItem"],
+        resources: [lockTable.arn]
       });
-      ctx.shared.add("rpc", `schema-table`, id, table2);
       if (props.auth) {
         const authGroup = new Group13(group, "auth", "authorizer");
         const auth2 = createLambdaFunction(authGroup, ctx, "rpc", `${id}-auth`, props.auth);
@@ -6226,8 +6256,8 @@ var CustomReporter = class {
       this.cache = cache;
     }
   }
-  onUserConsoleLog(log15) {
-    this.logs.push(log15.content.trimEnd());
+  onUserConsoleLog(log16) {
+    this.logs.push(log16.content.trimEnd());
   }
   runningTask(tasks) {
     return tasks.find((t) => t.result?.state === "run");
@@ -6324,7 +6354,7 @@ var logTestLogs = (event) => {
     log9.message(color.info.bold.inverse(" LOGS "), {
       symbol: color.dim(icon.dot)
     });
-    log9.message(event.logs.map((log15) => wrap(log15, { hard: true })).join("\n"));
+    log9.message(event.logs.map((log16) => wrap(log16, { hard: true })).join("\n"));
   }
 };
 var logTestErrors = (event) => {
@@ -7047,6 +7077,144 @@ var domain = (program2) => {
   commands6.forEach((cb) => cb(command));
 };
 
+// src/cli/command/logs.ts
+import { CloudWatchLogsClient, StartLiveTailCommand } from "@aws-sdk/client-cloudwatch-logs";
+import { log as log15 } from "@clack/prompts";
+import chalk7 from "chalk";
+import chunk from "chunk";
+import { formatDate } from "date-fns";
+import wildstring6 from "wildstring";
+var logs = (program2) => {
+  program2.command("logs").argument(`<stacks...>`, "Provide a list of stacks to stream logs from.").description("Stream the latest logs from you app.").action(async (filters) => {
+    await layout(`logs`, async ({ appConfig, stackConfigs }) => {
+      const region = appConfig.region;
+      const profile = appConfig.profile;
+      const credentials = getCredentials(profile);
+      const accountId = await getAccountId(credentials, region);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const { workspace } = await createWorkSpace({
+        credentials,
+        accountId,
+        profile,
+        region
+      });
+      await workspace.hydrate(app);
+      const logGroupArns = [];
+      for (const stack of app.stacks) {
+        if (filters.find((f) => wildstring6.match(f, stack.name))) {
+          for (const resource2 of stack.resources) {
+            if (resource2.$.type === "aws_cloudwatch_log_group") {
+              const logGroup = resource2;
+              logGroupArns.push(await logGroup.arn);
+            }
+          }
+        }
+      }
+      const client = new CloudWatchLogsClient({
+        credentials,
+        region
+      });
+      const abort = new AbortController();
+      process.once("exit", () => {
+        abort.abort();
+      });
+      process.once("SIGINT", () => {
+        abort.abort();
+      });
+      const streams = await task("Connecting to the log stream...", async (update) => {
+        const result = await Promise.all(
+          chunk(logGroupArns, 10).map(async (arns) => {
+            const command = new StartLiveTailCommand({
+              logGroupIdentifiers: arns
+            });
+            const response = await client.send(command, {
+              abortSignal: abort.signal
+            });
+            if (!response.responseStream) {
+              throw new Error("Failed to connect to the log stream.");
+            }
+            return response.responseStream;
+          })
+        );
+        update(
+          `Connected to ${result.length} log stream${plural(result.length)} for ${logGroupArns.length} function${plural(logGroupArns.length)}.`
+        );
+        return result;
+      });
+      await Promise.all(
+        streams.map(async (stream) => {
+          for await (const event of stream) {
+            if (event.sessionUpdate) {
+              for (const result of event.sessionUpdate.sessionResults ?? []) {
+                const group = result.logGroupIdentifier?.split(":").at(1) ?? "";
+                const timestamp = result.timestamp ?? Date.now();
+                const date = new Date(timestamp);
+                const message = result.message ?? "";
+                const data = parseJsonLog(message);
+                formatLog(data.level, data.date ?? date, group, data.message);
+              }
+            }
+          }
+        })
+      );
+    });
+  });
+};
+var plural = (count) => {
+  return count > 1 ? "s" : "";
+};
+var formatLog = (level, date, group, message) => {
+  const levels = {
+    INFO: chalk7.cyan,
+    DEBUG: chalk7.cyan,
+    TRACE: chalk7.cyan,
+    WARN: chalk7.yellow,
+    ERROR: chalk7.red,
+    FATAL: chalk7.magenta,
+    SYSTEM: chalk7.blue
+  };
+  const levelColor = levels[level] ?? chalk7.cyan;
+  log15.message(
+    [
+      [
+        //
+        levelColor(level),
+        color.dim(formatDate(date, "HH:mm:ss")),
+        color.info(group)
+      ].join(" "),
+      wrap(message)
+    ].join("\n"),
+    {
+      symbol: levelColor(icon.dot)
+    }
+  );
+};
+var parseJsonLog = (message) => {
+  let json3;
+  try {
+    json3 = JSON.parse(message);
+  } catch (error) {
+  }
+  if ("level" in json3 && typeof json3.level === "string" && "message" in json3 && typeof json3.message === "string" && "timestamp" in json3 && typeof json3.timestamp === "string") {
+    return {
+      level: json3.level,
+      message: json3.message,
+      date: new Date(json3.timestamp)
+    };
+  }
+  if ("type" in json3 && typeof json3.type === "string" && json3.type.startsWith("platform") && "time" in json3 && typeof json3.time === "string" && "record" in json3) {
+    return {
+      level: "SYSTEM",
+      message: JSON.stringify(json3.record, void 0, 2),
+      date: new Date(json3.time)
+    };
+  }
+  return {
+    level: "INFO",
+    message: JSON.stringify(json3, void 0, 2)
+  };
+};
+
 // src/cli/command/index.ts
 var commands7 = [
   bootstrap,
@@ -7058,6 +7226,7 @@ var commands7 = [
   dev,
   bind,
   run,
+  logs,
   auth,
   domain,
   state,

package/dist/prebuild/rpc/HASH

@@ -1 +1 @@
-1b67cb66296cd56b7cc9cbddf3e7859cc9d3fad9
+483f8461993bfc3a205450c45d2a96bd1be0f53c

package/dist/server.d.ts

@@ -132,6 +132,7 @@ type RpcAuthorizerResponse = {
 } | {
     authorized: true;
     context?: unknown;
+    lockKey?: string;
     ttl: DurationFormat;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.465",
+  "version": "0.0.467",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -32,12 +32,12 @@
     "@awsless/iot": "^0.0.3",
     "@awsless/json": "^0.0.8",
     "@awsless/lambda": "^0.0.32",
-    "@awsless/mqtt": "^0.0.2",
     "@awsless/open-search": "^0.0.17",
+    "@awsless/mqtt": "^0.0.2",
+    "@awsless/sns": "^0.0.10",
     "@awsless/redis": "^0.0.14",
     "@awsless/s3": "^0.0.20",
     "@awsless/sqs": "^0.0.8",
-    "@awsless/sns": "^0.0.10",
     "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.19",
     "@awsless/weak-cache": "^0.0.1"
@@ -47,6 +47,7 @@
     "@aws-appsync/utils": "^1.5.0",
     "@aws-sdk/client-cloudformation": "^3.369.0",
     "@aws-sdk/client-cloudfront": "^3.425.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.806.0",
     "@aws-sdk/client-cognito-identity-provider": "^3.441.0",
     "@aws-sdk/client-dynamodb": "3.363.0",
     "@aws-sdk/client-lambda": "3.329.0",
@@ -118,14 +119,14 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
+    "@awsless/duration": "^0.0.3",
     "@awsless/code": "^0.0.10",
-    "@awsless/formation": "^0.0.72",
-    "@awsless/graphql": "^0.0.9",
+    "@awsless/formation": "^0.0.73",
     "@awsless/json": "^0.0.8",
+    "@awsless/graphql": "^0.0.9",
     "@awsless/size": "^0.0.2",
     "@awsless/ts-file-cache": "^0.0.12",
-    "@awsless/validate": "^0.0.19",
-    "@awsless/duration": "^0.0.3"
+    "@awsless/validate": "^0.0.19"
   },
   "devDependencies": {
     "@node-rs/bcrypt": "^1.10.5"