@awsless/awsless 0.0.579 → 0.0.581

package/dist/bin.js

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
-import {
-  shortId
-} from "./chunk-W4ED7XCC.js";
 
 // src/cli/program.ts
 import { Command } from "commander";
@@ -874,6 +871,10 @@ var FileCodeSchema = z14.object({
 });
 var BundleCodeSchema = z14.object({
   bundle: LocalDirectorySchema.describe("The directory that needs to be bundled.")
+  // dir: z.string(),
+  // build: z.string(),
+  // run: z.string(),
+  // cacheKey:
 });
 var CodeSchema = z14.union([
   LocalFileSchema.transform((file) => ({
@@ -3105,6 +3106,12 @@ var listAllFiles = async (list3) => {
   return files;
 };
 
+// src/util/id.ts
+import { createHash as createHash3 } from "crypto";
+var shortId = (ns) => {
+  return createHash3("md5").update(ns).digest("hex").substring(0, 10);
+};
+
 // src/util/temp.ts
 import { mkdir as mkdir3, readdir as readdir2, rm as rm2 } from "fs/promises";
 import { join as join8 } from "path";
@@ -3963,7 +3970,7 @@ var onFailureFeature = defineFeature({
   }
 });
 
-// src/feature/pubsub/appsync/index.ts
+// src/feature/pubsub/index.ts
 import { $ as $9, Group as Group9 } from "@awsless/formation";
 import { constantCase as constantCase5 } from "change-case";
 
@@ -3985,141 +3992,90 @@ var formatFullDomainName = (config2, id, subDomain) => {
   return domain2;
 };
 
-// src/feature/pubsub/appsync/index.ts
+// src/feature/pubsub/index.ts
 var pubsubFeature = defineFeature({
   name: "pubsub",
   onApp(ctx) {
-    for (const [id, props] of Object.entries(ctx.appConfig.defaults?.pubsub ?? {})) {
+    ctx.addGlobalPermission({
+      actions: ["iot:Publish"],
+      resources: [
+        // `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`,
+        `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/${ctx.app.name}/pubsub/*`
+      ]
+    });
+    for (const [id, props] of Object.entries(ctx.appConfig.defaults.pubsub ?? {})) {
       const group = new Group9(ctx.base, "pubsub", id);
-      const shortName = `${ctx.app.name}--${id}`;
+      const { lambda } = createLambdaFunction(group, ctx, "pubsub-authorizer", id, props.auth);
       const name = formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "pubsub",
         resourceName: id
       });
-      const authGroup = new Group9(group, "auth", "lambda");
-      const { lambda: authLambda } = createLambdaFunction(authGroup, ctx, "pubsub", `${id}-auth`, {
-        ...props.auth,
-        description: `PubSub ${id} authorizer`
-      });
-      let loggingRole;
-      if (props.logLevel) {
-        loggingRole = new $9.aws.iam.Role(group, "logging-role", {
-          name: shortId(`${name}-logging-role`),
-          assumeRolePolicy: JSON.stringify({
-            Version: "2012-10-17",
-            Statement: [
-              {
-                Effect: "Allow",
-                Principal: {
-                  Service: "appsync.amazonaws.com"
-                },
-                Action: "sts:AssumeRole"
-              }
-            ]
-          })
-        });
-        new $9.aws.iam.RolePolicyAttachment(group, "logs-policy", {
-          role: loggingRole.name,
-          policyArn: "arn:aws:iam::aws:policy/service-role/AWSAppSyncPushToCloudWatchLogs"
-        });
-      }
-      const api = new $9.aws.appsync.Api(group, "api", {
-        name: shortName,
-        eventConfig: [
-          {
-            connectionAuthMode: [{ authType: "AWS_IAM" }, { authType: "AWS_LAMBDA" }],
-            authProvider: [
-              {
-                authType: "AWS_LAMBDA",
-                lambdaAuthorizerConfig: [
-                  {
-                    authorizerUri: authLambda.arn,
-                    authorizerResultTtlInSeconds: 300
-                  }
-                ]
-              },
-              {
-                authType: "AWS_IAM"
-              }
-            ],
-            defaultPublishAuthMode: [
-              {
-                authType: "AWS_IAM"
-              }
-            ],
-            defaultSubscribeAuthMode: [
-              {
-                authType: "AWS_LAMBDA"
-              },
-              {
-                authType: "AWS_IAM"
-              }
-            ],
-            logConfig: props.logLevel ? [
-              {
-                logLevel: props.logLevel.toUpperCase(),
-                cloudwatchLogsRoleArn: loggingRole.arn
-              }
-            ] : void 0
-          }
-        ]
+      const authorizer = new $9.aws.iot.Authorizer(group, "authorizer", {
+        name,
+        authorizerFunctionArn: lambda.arn,
+        status: "ACTIVE",
+        signingDisabled: true,
+        enableCachingForHttp: false
       });
-      const namespaces = props.namespaces ?? ["default"];
-      for (const namespace of namespaces) {
-        new $9.aws.appsync.ChannelNamespace(group, `namespace-${namespace}`, {
-          name: namespace,
-          apiId: api.apiId
-        });
-      }
-      new $9.aws.lambda.Permission(group, "auth-permission", {
+      new $9.aws.lambda.Permission(group, "permission", {
+        functionName: lambda.functionName,
         action: "lambda:InvokeFunction",
-        principal: "appsync.amazonaws.com",
-        functionName: authLambda.functionName,
-        sourceArn: api.apiArn
+        principal: "iot.amazonaws.com",
+        sourceArn: authorizer.arn
+      });
+      ctx.bind(`PUBSUB_${constantCase5(id)}_AUTHORIZER`, name);
+      const endpoint = $9.aws.iot.getEndpoint(group, "endpoint", {
+        endpointType: "iot:Data-ATS"
       });
       if (props.domain) {
         const domainName = formatFullDomainName(ctx.appConfig, props.domain, props.subDomain);
-        const zoneId = ctx.shared.entry("domain", `zone-id`, props.domain);
-        const certificateArn = ctx.shared.entry("domain", `certificate-arn`, props.domain);
-        const apiDomain = new $9.aws.appsync.DomainName(group, "domain", {
+        new $9.aws.iot.DomainConfiguration(group, "domain", {
+          name,
           domainName,
-          certificateArn
-        });
-        new $9.aws.appsync.DomainNameApiAssociation(group, "domain-association", {
-          apiId: api.apiArn,
-          domainName: apiDomain.domainName
+          serverCertificateArns: [ctx.shared.entry("domain", `certificate-arn`, props.domain)],
+          authorizerConfig: {
+            defaultAuthorizerName: authorizer.name
+          }
+          // validationCertificate: ctx.shared.get(`global-certificate-${props.domain}-arn`),
         });
         new $9.aws.route53.Record(group, "record", {
-          zoneId,
-          type: "CNAME",
+          zoneId: ctx.shared.entry("domain", `zone-id`, props.domain),
           name: domainName,
-          records: [apiDomain.appsyncDomainName],
-          ttl: 300
+          type: "CNAME",
+          records: [endpoint.endpointAddress]
         });
-        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, `${domainName}/event`);
-        ctx.bind(`PUBSUB_${constantCase5(id)}_REALTIME_ENDPOINT`, `${domainName}/event/realtime`);
+        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, domainName);
       } else {
-        ctx.bind(
-          `PUBSUB_${constantCase5(id)}_ENDPOINT`,
-          api.dns.pipe((dns) => dns.HTTP)
-        );
-        ctx.bind(
-          `PUBSUB_${constantCase5(id)}_REALTIME_ENDPOINT`,
-          api.dns.pipe((dns) => dns.REALTIME)
-        );
+        ctx.bind(`PUBSUB_${constantCase5(id)}_ENDPOINT`, endpoint.endpointAddress);
       }
     }
+  },
+  onStack(ctx) {
+    for (const [id, props] of Object.entries(ctx.stackConfig.pubsub ?? {})) {
+      const group = new Group9(ctx.stack, "pubsub", id);
+      const { lambda } = createAsyncLambdaFunction(group, ctx, `pubsub`, id, props.consumer);
+      const name = formatLocalResourceName({
+        appName: ctx.app.name,
+        stackName: ctx.stack.name,
+        resourceType: "pubsub",
+        resourceName: id
+      });
+      const topic = new $9.aws.iot.TopicRule(group, "rule", {
+        name: name.replaceAll("-", "_"),
+        enabled: true,
+        sql: props.sql,
+        sqlVersion: props.sqlVersion,
+        lambda: [{ functionArn: lambda.arn }]
+      });
+      new $9.aws.lambda.Permission(group, "permission", {
+        action: "lambda:InvokeFunction",
+        principal: "iot.amazonaws.com",
+        functionName: lambda.functionName,
+        sourceArn: topic.arn
+      });
+    }
   }
-  // Note: The onStack method would handle channel namespaces and subscriptions
-  // but is commented out for now as it needs to be refactored for AppSync Event API
-  // onStack(ctx) {
-  // 	// Channel namespaces and event handlers would be configured here
-  // 	// This would include:
-  // 	// 1. Creating channel namespaces with their own auth modes (overriding defaults)
-  // 	// 2. Setting up event handlers (Lambda functions) for specific channels
-  // 	// 3. Configuring event filtering and routing rules
-  // },
 });
 
 // src/feature/queue/index.ts
@@ -5143,7 +5099,7 @@ var execCommand = async ({ cwd, env, command }) => {
 };
 
 // src/feature/site/index.ts
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 import { Future as Future3 } from "@awsless/formation";
 var siteFeature = defineFeature({
   name: "site",
@@ -5448,7 +5404,7 @@ var siteFeature = defineFeature({
         version: new Future3((resolve) => {
           $combine(...versions).then((versions2) => {
             const combined = versions2.filter((v) => !!v).sort().join(",");
-            const version = createHash3("sha1").update(combined).digest("hex");
+            const version = createHash4("sha1").update(combined).digest("hex");
             resolve(version);
           });
         })
@@ -6947,7 +6903,7 @@ import deepmerge4 from "deepmerge";
 import { join as join16 } from "path";
 
 // src/feature/instance/build/executable.ts
-import { createHash as createHash4 } from "crypto";
+import { createHash as createHash5 } from "crypto";
 import { readFile as readFile4 } from "fs/promises";
 import { join as join15 } from "path";
 import { exec as exec2 } from "promisify-child-process";
@@ -6962,7 +6918,7 @@ var buildExecutable = async (input, outputPath, architecture) => {
   }
   const file = await readFile4(filePath);
   return {
-    hash: createHash4("sha1").update(file).update("x86_64").digest("hex"),
+    hash: createHash5("sha1").update(file).update("x86_64").digest("hex"),
     file
   };
 };
@@ -7166,9 +7122,10 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
                     // 'awslogs-group': `/aws/ecs/${name}`,
                     "awslogs-group": `/aws/lambda/${name}`,
                     "awslogs-region": ctx.appConfig.region,
-                    "awslogs-stream-prefix": "ecs"
-                    // mode: 'non-blocking',
-                    // 'max-buffer-size': '1m',
+                    "awslogs-stream-prefix": "ecs",
+                    mode: "non-blocking"
+                    // 'awslogs-multiline-pattern': '',
+                    // 'max-buffer-size': '100m',
                   }
                 }
               },
@@ -8073,6 +8030,7 @@ var createApp = (props) => {
   };
   return {
     app,
+    appId,
     base,
     zones,
     ready,
@@ -8361,7 +8319,7 @@ import { join as join19 } from "path";
 import wildstring3 from "wildstring";
 
 // src/build/__fingerprint.ts
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash6 } from "crypto";
 import { readdir as readdir4, readFile as readFile5, stat as stat4 } from "fs/promises";
 import { basename as basename4, dirname as dirname10, extname as extname4, join as join17 } from "path";
 import parseStaticImports from "parse-static-imports";
@@ -8372,7 +8330,7 @@ var generateFileHashes = async (file, hashes) => {
   }
   const code = await readModuleFile(file);
   const deps = await findDependencies(file, code);
-  const hash = createHash5("sha1").update(code).digest();
+  const hash = createHash6("sha1").update(code).digest();
   hashes.set(file, hash);
   for (const dep of deps) {
     if (dep.startsWith("/")) {
@@ -8389,7 +8347,7 @@ var fingerprintFromDirectory = async (dir) => {
     }
   }
   const merge2 = Buffer.concat(Array.from(hashes.values()).sort());
-  return createHash5("sha1").update(merge2).digest("hex");
+  return createHash6("sha1").update(merge2).digest("hex");
 };
 var readModuleFile = (file) => {
   if (file.endsWith(".js")) {
@@ -9098,7 +9056,7 @@ var run = (program2) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { commands: commands9 } = createApp({ appConfig, stackConfigs, accountId });
+      const { commands: commands9, appId } = createApp({ appConfig, stackConfigs, accountId });
       let command;
       if (selected) {
         command = commands9.find((cmd) => {
@@ -9119,6 +9077,7 @@ var run = (program2) => {
         throw new ExpectedError(`The provided command doesn't exist.`);
       }
       process.env.APP = appConfig.name;
+      process.env.APP_ID = appId;
       process.env.AWS_REGION = region;
       process.env.AWS_ACCOUNT_ID = accountId;
       const module = await tsImport(command.file, {

package/dist/build-json-schema.js

@@ -266,6 +266,10 @@ var FileCodeSchema = z11.object({
 });
 var BundleCodeSchema = z11.object({
   bundle: LocalDirectorySchema.describe("The directory that needs to be bundled.")
+  // dir: z.string(),
+  // build: z.string(),
+  // run: z.string(),
+  // cacheKey:
 });
 var CodeSchema = z11.union([
   LocalFileSchema.transform((file) => ({

package/dist/prebuild/rpc/HASH

@@ -1 +1 @@
-67cc66902e9b4f4a3b10b94784c0f0f88f247ce1
+809ac79b62f213f5ced66b7a051b247cda10444b

package/dist/server.d.ts

@@ -87,10 +87,6 @@ interface FunctionResources {
 declare const Function: FunctionResources;
 declare const Fn: FunctionResources;
 
-interface InstanceResources {
-}
-declare const Instance: InstanceResources;
-
 declare const getMetricName: (name: string) => string;
 declare const getMetricNamespace: (stack?: string, app?: string) => string;
 interface MetricResources {
@@ -171,4 +167,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, Instance, type InstanceResources, Metric, type MetricResources, 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, getMetricName, getMetricNamespace, getPubSubTopic, getQueueName, getQueueUrl, getSearchName, getSearchProps, getSiteBucketName, getStoreName, getTableName, getTaskName, getTopicName, mockAlert, mockCache, mockFunction, mockMetric, 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, Metric, type MetricResources, 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, getMetricName, getMetricNamespace, getPubSubTopic, getQueueName, getQueueUrl, getSearchName, getSearchProps, getSiteBucketName, getStoreName, getTableName, getTaskName, getTopicName, mockAlert, mockCache, mockFunction, mockMetric, mockPubSub, mockQueue, mockTask, mockTopic, pubsubAuthorizerHandle, pubsubAuthorizerResponse, setConfigValue };

package/dist/server.js

@@ -1,6 +1,3 @@
-import {
-  shortId
-} from "./chunk-W4ED7XCC.js";
 import {
   createProxy
 } from "./chunk-2LRBH7VV.js";
@@ -456,13 +453,6 @@ 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/metric.ts
 import {
   batchPutData,
@@ -678,7 +668,6 @@ export {
   Config,
   Fn,
   Function,
-  Instance,
   Metric,
   PubSub,
   QoS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.579",
+  "version": "0.0.581",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -33,23 +33,23 @@
     ]
   },
   "peerDependencies": {
-    "@awsless/big-float": "^0.1.4",
+    "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.3",
-    "@awsless/clui": "^0.0.7",
+    "@awsless/dynamodb": "^0.2.12",
     "@awsless/iot": "^0.0.3",
-    "@awsless/json": "^0.0.10",
-    "@awsless/dynamodb": "^0.2.10",
     "@awsless/lambda": "^0.0.33",
-    "@awsless/mqtt": "^0.0.2",
+    "@awsless/json": "^0.0.10",
+    "@awsless/clui": "^0.0.7",
     "@awsless/open-search": "^0.0.21",
     "@awsless/redis": "^0.0.14",
-    "@awsless/s3": "^0.0.21",
     "@awsless/sns": "^0.0.10",
-    "@awsless/sqs": "^0.0.15",
+    "@awsless/sqs": "^0.0.16",
     "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.19",
-    "@awsless/weak-cache": "^0.0.1"
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/mqtt": "^0.0.2",
+    "@awsless/s3": "^0.0.21"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -134,17 +134,17 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
-    "@awsless/big-float": "^0.1.4",
+    "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
-    "@awsless/clui": "^0.0.7",
-    "@awsless/formation": "^0.0.80",
     "@awsless/graphql": "^0.0.9",
     "@awsless/duration": "^0.0.3",
+    "@awsless/formation": "^0.0.80",
     "@awsless/json": "^0.0.10",
     "@awsless/scheduler": "^0.0.4",
-    "@awsless/size": "^0.0.2",
     "@awsless/validate": "^0.0.19",
-    "@awsless/ts-file-cache": "^0.0.12"
+    "@awsless/clui": "^0.0.7",
+    "@awsless/ts-file-cache": "^0.0.12",
+    "@awsless/size": "^0.0.2"
   },
   "devDependencies": {
     "@node-rs/bcrypt": "^1.10.5",

package/dist/chunk-W4ED7XCC.js

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