@awsless/awsless 0.0.543 → 0.0.545

package/dist/build-json-schema.js

@@ -542,55 +542,52 @@ var RpcSchema = z19.record(ResourceIdSchema, z19.record(z19.string(), FunctionSc
 
 // src/feature/instance/schema.ts
 import { days as days3, toDays as toDays2 } from "@awsless/duration";
+import { toMebibytes } from "@awsless/size";
 import { z as z20 } from "zod";
-var CpuSizeSchema = z20.union([
-  z20.literal("0.25 vCPU"),
-  z20.literal("0.5 vCPU"),
-  z20.literal("1 vCPU"),
-  z20.literal("2 vCPU"),
-  z20.literal("4 vCPU"),
-  z20.literal("8 vCPU"),
-  z20.literal("16 vCPU")
-]).describe(
-  "The number of vCPU units used by the task. For tasks using the Fargate launch type, this field is required. Valid values: 0.25, 0.5, 1, 2, 4, 8, 16 vCPU."
+var CpuSchema = z20.union([z20.literal(0.25), z20.literal(0.5), z20.literal(1), z20.literal(2), z20.literal(4), z20.literal(8), z20.literal(16)]).transform((v) => `${v} vCPU`).describe(
+  "The number of virtual CPU units (vCPU) used by the task. For tasks using the Fargate launch type, this field is required. Valid values: 0.25, 0.5, 1, 2, 4, 8, 16 vCPU."
 );
-var MemorySizeSchema2 = z20.union([
+var validMemorySize = [
   // 0.25 vCPU
-  z20.literal(512),
-  z20.literal(1024),
-  z20.literal(2048),
+  512,
+  1024,
+  2048,
   // 0.5 vCPU
-  z20.literal(1024),
-  z20.literal(2048),
-  z20.literal(3072),
-  z20.literal(4096),
+  1024,
+  2048,
+  3072,
+  4096,
   // 1 vCPU
-  z20.literal(2048),
-  z20.literal(3072),
-  z20.literal(4096),
-  z20.literal(5120),
-  z20.literal(6144),
-  z20.literal(7168),
-  z20.literal(8192),
+  2048,
+  3072,
+  4096,
+  5120,
+  6144,
+  7168,
+  8192,
   // 2 vCPU
-  z20.literal(4096),
-  z20.literal(5120),
-  z20.literal(6144),
-  z20.literal(7168),
-  z20.literal(8192),
-  z20.literal(9216),
-  z20.literal(10240),
-  z20.literal(11264),
-  z20.literal(12288),
-  z20.literal(13312),
-  z20.literal(14336),
-  z20.literal(15360),
-  z20.literal(16384)
-]).describe(
+  4096,
+  5120,
+  6144,
+  7168,
+  8192,
+  9216,
+  10240,
+  11264,
+  12288,
+  13312,
+  14336,
+  15360,
+  16384
+];
+var MemorySizeSchema2 = SizeSchema.refine(
+  (s) => validMemorySize.includes(toMebibytes(s)),
+  `Invalid memory size. Allowed sizes: ${validMemorySize.join(", ")} MiB`
+).describe(
   "The amount of memory (in MiB) used by the task. For tasks using the Fargate launch type, this field is required and must be compatible with the CPU value. Valid memory values depend on the CPU configuration."
 );
 var HealthCheckSchema = z20.object({
-  command: z20.union([z20.string(), z20.string().array()]).describe("The command that the container runs to determine if it is healthy."),
+  path: z20.string().describe("The path that the container runs to determine if it is healthy."),
   interval: DurationSchema.describe("The time period in seconds between each health check execution."),
   retries: z20.number().int().min(1).max(10).describe(
     "The number of times to retry a failed health check before the container is considered unhealthy."
@@ -602,13 +599,6 @@ var HealthCheckSchema = z20.object({
     "The time period in seconds to wait for a health check to succeed before it is considered a failure."
   )
 }).describe("The health check command and associated configuration parameters for the container.");
-var RestartPolicySchema = z20.object({
-  enabled: z20.boolean().describe("Whether to enable the restart policy for the container."),
-  ignoredExitCodes: z20.number().int().array().optional().describe("A list of exit codes that Amazon ECS will ignore and not attempt a restart against."),
-  restartAttemptPeriod: z20.number().int().min(0).max(1800).optional().describe(
-    "A period of time (in seconds) that the container must run for before a restart can be attempted. A container can be restarted only once every restartAttemptPeriod seconds. If a container isn't able to run for this time period and exits early, it will not be restarted. You can set a minimum restartAttemptPeriod of 60 seconds and a maximum restartAttemptPeriod of 1800 seconds."
-  )
-}).describe("The restart policy for the container. This parameter maps to the --restart option to docker run.");
 var EnvironmentSchema2 = z20.record(z20.string(), z20.string()).optional().describe("Environment variable key-value pairs.");
 var ArchitectureSchema3 = z20.enum(["x86_64", "arm64"]).describe("The instruction set architecture that the function supports.");
 var ActionSchema2 = z20.string();
@@ -662,13 +652,13 @@ var ISchema = z20.object({
   description: DescriptionSchema2.optional(),
   image: ImageSchema.optional(),
   log: LogSchema2.optional(),
+  cpu: CpuSchema.optional(),
   memorySize: MemorySizeSchema2.optional(),
-  cpuSize: CpuSizeSchema.optional(),
   architecture: ArchitectureSchema3.optional(),
   environment: EnvironmentSchema2.optional(),
   permissions: PermissionsSchema2.optional(),
-  healthCheck: HealthCheckSchema.optional(),
-  restartPolicy: RestartPolicySchema.optional()
+  healthCheck: HealthCheckSchema.optional()
+  // restartPolicy: RestartPolicySchema.optional(),
 });
 var InstanceSchema = z20.union([
   LocalFileSchema.transform((code) => ({
@@ -679,13 +669,13 @@ var InstanceSchema = z20.union([
 var InstancesSchema = z20.record(ResourceIdSchema, InstanceSchema).optional().describe("Define the instances in your stack.");
 var InstanceDefaultSchema = z20.object({
   image: ImageSchema.default("public.ecr.aws/aws-cli/aws-cli:amd64"),
-  memorySize: MemorySizeSchema2.default(512),
-  cpuSize: CpuSizeSchema.default("0.25 vCPU"),
+  cpu: CpuSchema.default(0.25),
+  memorySize: MemorySizeSchema2.default("512 MB"),
   architecture: ArchitectureSchema3.default("arm64"),
   environment: EnvironmentSchema2.optional(),
   permissions: PermissionsSchema2.optional(),
   healthCheck: HealthCheckSchema.optional(),
-  restartPolicy: RestartPolicySchema.default({ enabled: true }),
+  // restartPolicy: RestartPolicySchema.default({ enabled: true }),
   log: LogSchema2.default(true).transform((log) => ({
     retention: log.retention ?? days3(7)
   }))

package/dist/chunk-W4ED7XCC.js

@@ -0,0 +1,9 @@
+// src/util/id.ts
+import { createHash } from "crypto";
+var shortId = (ns) => {
+  return createHash("md5").update(ns).digest("hex").substring(0, 10);
+};
+
+export {
+  shortId
+};

package/dist/server.d.ts

@@ -85,6 +85,10 @@ interface FunctionResources {
 declare const Function: FunctionResources;
 declare const Fn: FunctionResources;
 
+interface InstanceResources {
+}
+declare const Instance: InstanceResources;
+
 declare const getPubSubTopic: <N extends string>(name: N) => `app/pubsub/${N}`;
 
 type PublishOptions = {
@@ -159,4 +163,4 @@ declare const Topic: TopicResources;
 declare const APP: "app";
 declare const STACK: "stack";
 
-export { APP, Alert, type AlertMock, type AlertMockResponse, type AlertResources, Auth, type AuthResources, Cache, type CacheResources, type CommandContext, type CommandHandler, Config, type ConfigResources, Fn, Function, type FunctionMock, type FunctionMockResponse, type FunctionResources, PubSub, type PublishOptions, Queue, type QueueMock, type QueueMockResponse, type QueueResources, type RpcAuthorizerResponse, STACK, Search, type SearchResources, Store, type StoreResources, Table, type TableResources, Task, type TaskMock, type TaskMockResponse, type TaskResources, Topic, type TopicMock, type TopicMockResponse, type TopicResources, getAlertName, getAuthProps, getCacheProps, getConfigName, getConfigValue, getFunctionName, getPubSubTopic, getQueueName, getQueueUrl, getSearchName, getSearchProps, getSiteBucketName, getStoreName, getTableName, getTaskName, getTopicName, mockAlert, mockCache, mockFunction, mockPubSub, mockQueue, mockTask, mockTopic, pubsubAuthorizerHandle, pubsubAuthorizerResponse, setConfigValue };
+export { APP, Alert, type AlertMock, type AlertMockResponse, type AlertResources, Auth, type AuthResources, Cache, type CacheResources, type CommandContext, type CommandHandler, Config, type ConfigResources, Fn, Function, type FunctionMock, type FunctionMockResponse, type FunctionResources, Instance, type InstanceResources, PubSub, type PublishOptions, Queue, type QueueMock, type QueueMockResponse, type QueueResources, type RpcAuthorizerResponse, STACK, Search, type SearchResources, Store, type StoreResources, Table, type TableResources, Task, type TaskMock, type TaskMockResponse, type TaskResources, Topic, type TopicMock, type TopicMockResponse, type TopicResources, getAlertName, getAuthProps, getCacheProps, getConfigName, getConfigValue, getFunctionName, getPubSubTopic, getQueueName, getQueueUrl, getSearchName, getSearchProps, getSiteBucketName, getStoreName, getTableName, getTaskName, getTopicName, mockAlert, mockCache, mockFunction, mockPubSub, mockQueue, mockTask, mockTopic, pubsubAuthorizerHandle, pubsubAuthorizerResponse, setConfigValue };

package/dist/server.js

@@ -1,3 +1,6 @@
+import {
+  shortId
+} from "./chunk-W4ED7XCC.js";
 import {
   createProxy
 } from "./chunk-2LRBH7VV.js";
@@ -263,6 +266,11 @@ var mockTask = (cb) => {
   cb(mock);
   mockLambda2(list);
   mockScheduler(list);
+  beforeEach && beforeEach(() => {
+    for (const item of Object.values(list)) {
+      item.mockClear();
+    }
+  });
   return createProxy((stack) => {
     return createProxy((name) => {
       return list[getTaskName(name, stack)];
@@ -425,6 +433,13 @@ var Config = /* @__PURE__ */ new Proxy(
   }
 );
 
+// src/lib/server/instance.ts
+var Instance = /* @__PURE__ */ createProxy((stack) => {
+  return createProxy((name) => {
+    return `http://${shortId(`${stack}:${name}`)}.${APP}`;
+  });
+});
+
 // src/lib/server/pubsub.ts
 import { hours, toSeconds } from "@awsless/duration";
 import { publish as publish3, QoS } from "@awsless/iot";
@@ -590,6 +605,7 @@ export {
   Config,
   Fn,
   Function,
+  Instance,
   PubSub,
   QoS,
   Queue,