@awsless/awsless 0.0.399 → 0.0.401

package/dist/bin.js

@@ -278,13 +278,13 @@ var require_directives = __commonJS({
        * @param onError - May be called even if the action was successful
        * @returns `true` on success
        */
-      add(line, onError) {
+      add(line2, onError) {
         if (this.atNextDocument) {
           this.yaml = { explicit: _Directives.defaultYaml.explicit, version: "1.1" };
           this.tags = Object.assign({}, _Directives.defaultTags);
           this.atNextDocument = false;
         }
-        const parts = line.trim().split(/[ \t]+/);
+        const parts = line2.trim().split(/[ \t]+/);
         const name = parts.shift();
         switch (name) {
           case "%TAG": {
@@ -1645,7 +1645,7 @@ var require_log = __commonJS({
 var require_addPairToJSMap = __commonJS({
   "../../node_modules/.pnpm/yaml@2.5.0/node_modules/yaml/dist/nodes/addPairToJSMap.js"(exports) {
     "use strict";
-    var log11 = require_log();
+    var log12 = require_log();
     var stringify = require_stringify();
     var identity = require_identity();
     var Scalar = require_Scalar();
@@ -1724,7 +1724,7 @@ var require_addPairToJSMap = __commonJS({
           let jsonStr = JSON.stringify(strKey);
           if (jsonStr.length > 40)
             jsonStr = jsonStr.substring(0, 36) + '..."';
-          log11.warn(ctx.doc.options.logLevel, `Keys with collection values will be stringified due to JS Object restrictions: ${jsonStr}. Set mapAsMap: true to use object keys.`);
+          log12.warn(ctx.doc.options.logLevel, `Keys with collection values will be stringified due to JS Object restrictions: ${jsonStr}. Set mapAsMap: true to use object keys.`);
           ctx.mapKeyWarned = true;
         }
         return strKey;
@@ -1823,9 +1823,9 @@ var require_stringifyCollection = __commonJS({
       } else {
         str = lines[0];
         for (let i = 1; i < lines.length; ++i) {
-          const line = lines[i];
-          str += line ? `
-${indent}${line}` : "\n";
+          const line2 = lines[i];
+          str += line2 ? `
+${indent}${line2}` : "\n";
         }
       }
       if (comment) {
@@ -1892,14 +1892,14 @@ ${indent}${line}` : "\n";
         return start + end;
       } else {
         if (!reqNewline) {
-          const len = lines.reduce((sum, line) => sum + line.length + 2, 2);
+          const len = lines.reduce((sum, line2) => sum + line2.length + 2, 2);
           reqNewline = ctx.options.lineWidth > 0 && len > ctx.options.lineWidth;
         }
         if (reqNewline) {
           let str = start;
-          for (const line of lines)
-            str += line ? `
-${indentStep}${indent}${line}` : "\n";
+          for (const line2 of lines)
+            str += line2 ? `
+${indentStep}${indent}${line2}` : "\n";
           return `${str}
 ${indent}${end}`;
         } else {
@@ -3627,10 +3627,10 @@ var require_errors = __commonJS({
       if (error.pos[0] === -1)
         return;
       error.linePos = error.pos.map((pos) => lc.linePos(pos));
-      const { line, col } = error.linePos[0];
-      error.message += ` at line ${line}, column ${col}`;
+      const { line: line2, col } = error.linePos[0];
+      error.message += ` at line ${line2}, column ${col}`;
       let ci = col - 1;
-      let lineStr = src.substring(lc.lineStarts[line - 1], lc.lineStarts[line]).replace(/[\n\r]+$/, "");
+      let lineStr = src.substring(lc.lineStarts[line2 - 1], lc.lineStarts[line2]).replace(/[\n\r]+$/, "");
       if (ci >= 60 && lineStr.length > 80) {
         const trimStart = Math.min(ci - 39, lineStr.length - 79);
         lineStr = "\u2026" + lineStr.substring(trimStart);
@@ -3638,8 +3638,8 @@ var require_errors = __commonJS({
       }
       if (lineStr.length > 80)
         lineStr = lineStr.substring(0, 79) + "\u2026";
-      if (line > 1 && /^ *$/.test(lineStr.substring(0, ci))) {
-        let prev = src.substring(lc.lineStarts[line - 2], lc.lineStarts[line - 1]);
+      if (line2 > 1 && /^ *$/.test(lineStr.substring(0, ci))) {
+        let prev = src.substring(lc.lineStarts[line2 - 2], lc.lineStarts[line2 - 1]);
         if (prev.length > 80)
           prev = prev.substring(0, 79) + "\u2026\n";
         lineStr = prev + lineStr;
@@ -3647,7 +3647,7 @@ var require_errors = __commonJS({
       if (/[^ ]/.test(lineStr)) {
         let count = 1;
         const end = error.linePos[1];
-        if (end && end.line === line && end.col > col) {
+        if (end && end.line === line2 && end.col > col) {
           count = Math.max(1, Math.min(end.col - col, 80 - ci));
         }
         const pointer = " ".repeat(ci) + "^".repeat(count);
@@ -4588,13 +4588,13 @@ var require_resolve_flow_scalar = __commonJS({
       return foldLines(source.slice(1, -1)).replace(/''/g, "'");
     }
     function foldLines(source) {
-      let first, line;
+      let first, line2;
       try {
         first = new RegExp("(.*?)(?<![ 	])[ 	]*\r?\n", "sy");
-        line = new RegExp("[ 	]*(.*?)(?:(?<![ 	])[ 	]*)?\r?\n", "sy");
+        line2 = new RegExp("[ 	]*(.*?)(?:(?<![ 	])[ 	]*)?\r?\n", "sy");
       } catch (_) {
         first = /(.*?)[ \t]*\r?\n/sy;
-        line = /[ \t]*(.*?)[ \t]*\r?\n/sy;
+        line2 = /[ \t]*(.*?)[ \t]*\r?\n/sy;
       }
       let match = first.exec(source);
       if (!match)
@@ -4602,8 +4602,8 @@ var require_resolve_flow_scalar = __commonJS({
       let res = match[1];
       let sep = " ";
       let pos = first.lastIndex;
-      line.lastIndex = pos;
-      while (match = line.exec(source)) {
+      line2.lastIndex = pos;
+      while (match = line2.exec(source)) {
         if (match[1] === "") {
           if (sep === "\n")
             res += sep;
@@ -4613,7 +4613,7 @@ var require_resolve_flow_scalar = __commonJS({
           res += sep + match[1];
           sep = " ";
         }
-        pos = line.lastIndex;
+        pos = line2.lastIndex;
       }
       const last = /[ \t]*(.*)/sy;
       last.lastIndex = pos;
@@ -5720,40 +5720,40 @@ var require_lexer = __commonJS({
         }
       }
       *parseStream() {
-        let line = this.getLine();
-        if (line === null)
+        let line2 = this.getLine();
+        if (line2 === null)
           return this.setNext("stream");
-        if (line[0] === cst.BOM) {
+        if (line2[0] === cst.BOM) {
           yield* this.pushCount(1);
-          line = line.substring(1);
+          line2 = line2.substring(1);
         }
-        if (line[0] === "%") {
-          let dirEnd = line.length;
-          let cs = line.indexOf("#");
+        if (line2[0] === "%") {
+          let dirEnd = line2.length;
+          let cs = line2.indexOf("#");
           while (cs !== -1) {
-            const ch = line[cs - 1];
+            const ch = line2[cs - 1];
             if (ch === " " || ch === "	") {
               dirEnd = cs - 1;
               break;
             } else {
-              cs = line.indexOf("#", cs + 1);
+              cs = line2.indexOf("#", cs + 1);
             }
           }
           while (true) {
-            const ch = line[dirEnd - 1];
+            const ch = line2[dirEnd - 1];
             if (ch === " " || ch === "	")
               dirEnd -= 1;
             else
               break;
           }
           const n = (yield* this.pushCount(dirEnd)) + (yield* this.pushSpaces(true));
-          yield* this.pushCount(line.length - n);
+          yield* this.pushCount(line2.length - n);
           this.pushNewline();
           return "stream";
         }
         if (this.atLineEnd()) {
           const sp = yield* this.pushSpaces(true);
-          yield* this.pushCount(line.length - sp);
+          yield* this.pushCount(line2.length - sp);
           yield* this.pushNewline();
           return "stream";
         }
@@ -5794,13 +5794,13 @@ var require_lexer = __commonJS({
       }
       *parseDocument() {
         yield* this.pushSpaces(true);
-        const line = this.getLine();
-        if (line === null)
+        const line2 = this.getLine();
+        if (line2 === null)
           return this.setNext("doc");
         let n = yield* this.pushIndicators();
-        switch (line[n]) {
+        switch (line2[n]) {
           case "#":
-            yield* this.pushCount(line.length - n);
+            yield* this.pushCount(line2.length - n);
           // fallthrough
           case void 0:
             yield* this.pushNewline();
@@ -5825,7 +5825,7 @@ var require_lexer = __commonJS({
           case ">":
             n += yield* this.parseBlockScalarHeader();
             n += yield* this.pushSpaces(true);
-            yield* this.pushCount(line.length - n);
+            yield* this.pushCount(line2.length - n);
             yield* this.pushNewline();
             return yield* this.parseBlockScalar();
           default:
@@ -5845,11 +5845,11 @@ var require_lexer = __commonJS({
           }
           sp += yield* this.pushSpaces(true);
         } while (nl + sp > 0);
-        const line = this.getLine();
-        if (line === null)
+        const line2 = this.getLine();
+        if (line2 === null)
           return this.setNext("flow");
-        if (indent !== -1 && indent < this.indentNext && line[0] !== "#" || indent === 0 && (line.startsWith("---") || line.startsWith("...")) && isEmpty(line[3])) {
-          const atFlowEndMarker = indent === this.indentNext - 1 && this.flowLevel === 1 && (line[0] === "]" || line[0] === "}");
+        if (indent !== -1 && indent < this.indentNext && line2[0] !== "#" || indent === 0 && (line2.startsWith("---") || line2.startsWith("...")) && isEmpty(line2[3])) {
+          const atFlowEndMarker = indent === this.indentNext - 1 && this.flowLevel === 1 && (line2[0] === "]" || line2[0] === "}");
           if (!atFlowEndMarker) {
             this.flowLevel = 0;
             yield cst.FLOW_END;
@@ -5857,17 +5857,17 @@ var require_lexer = __commonJS({
           }
         }
         let n = 0;
-        while (line[n] === ",") {
+        while (line2[n] === ",") {
           n += yield* this.pushCount(1);
           n += yield* this.pushSpaces(true);
           this.flowKey = false;
         }
         n += yield* this.pushIndicators();
-        switch (line[n]) {
+        switch (line2[n]) {
           case void 0:
             return "flow";
           case "#":
-            yield* this.pushCount(line.length - n);
+            yield* this.pushCount(line2.length - n);
             return "flow";
           case "{":
           case "[":
@@ -7058,7 +7058,7 @@ var require_public_api = __commonJS({
     var composer = require_composer();
     var Document = require_Document();
     var errors = require_errors();
-    var log11 = require_log();
+    var log12 = require_log();
     var lineCounter = require_line_counter();
     var parser = require_parser();
     function parseOptions(options) {
@@ -7109,7 +7109,7 @@ var require_public_api = __commonJS({
       const doc = parseDocument(src, options);
       if (!doc)
         return null;
-      doc.warnings.forEach((warning) => log11.warn(doc.options.logLevel, warning));
+      doc.warnings.forEach((warning) => log12.warn(doc.options.logLevel, warning));
       if (doc.errors.length > 0) {
         if (doc.options.logLevel !== "silent")
           throw doc.errors[0];
@@ -7408,9 +7408,12 @@ var list = (data) => {
   const padName = padText(Object.keys(data));
   return Object.entries(data).map(([name, value]) => [color.label(padName(name + ":", 2)), value].join("")).join(char.br);
 };
+var line = (message) => {
+  console.log(color.line("\u2502 "), message);
+};
 var table = (props) => {
   console.log(color.line("\u2502"));
-  const table2 = new Table({
+  const table3 = new Table({
     // wordWrap: true,
     // wrapOnWordBoundary: false,
     // truncate: '...',
@@ -7433,7 +7436,7 @@ var table = (props) => {
       // 'right-mid': '',
     }
   });
-  table2.push(
+  table3.push(
     ...props.body.map(
       (row) => row.map((v) => {
         if (typeof v === "boolean") {
@@ -7443,7 +7446,7 @@ var table = (props) => {
       })
     )
   );
-  return table2.toString();
+  return table3.toString();
 };
 
 // src/cli/ui/complex/bootstrap-awsless.ts
@@ -7509,12 +7512,12 @@ var createStateBucket = (client, accountId) => {
 var bootstrapAwsless = async (props) => {
   const dynamo = new DynamoDB(props);
   const s3 = new S3Client(props);
-  const [table2, bucket] = await Promise.all([
+  const [table3, bucket] = await Promise.all([
     //
     hasLockTable(dynamo),
     hasStateBucket(s3, props.accountId)
   ]);
-  if (!table2 || !bucket) {
+  if (!table3 || !bucket) {
     log.warn(`Awsless hasn't been bootstrapped yet.`);
     if (!process.env.SKIP_PROMPT) {
       const confirmed = await confirm({
@@ -7525,7 +7528,7 @@ var bootstrapAwsless = async (props) => {
       }
     }
     await task("Bootstrapping", async (update) => {
-      if (!table2) {
+      if (!table3) {
         await createLockTable(dynamo);
       }
       if (!bucket) {
@@ -8021,19 +8024,22 @@ var DomainSchema = ResourceIdSchema.describe("The domain id to link your Pubsub
 var PubSubDefaultSchema = z14.record(
   ResourceIdSchema,
   z14.object({
+    auth: FunctionSchema,
     domain: DomainSchema.optional(),
-    subDomain: z14.string().optional(),
-    auth: z14.union([
-      ResourceIdSchema,
-      z14.object({
-        authorizer: FunctionSchema
-        // ttl: AuthorizerTtl.default('1 hour'),
-      })
-    ]),
-    policy: z14.object({
-      publish: z14.array(z14.string()).optional(),
-      subscribe: z14.array(z14.string()).optional()
-    }).optional()
+    subDomain: z14.string().optional()
+    // auth: z.union([
+    // 	ResourceIdSchema,
+    // 	z.object({
+    // 		authorizer: FunctionSchema,
+    // 		// ttl: AuthorizerTtl.default('1 hour'),
+    // 	}),
+    // ]),
+    // policy: z
+    // 	.object({
+    // 		publish: z.array(z.string()).optional(),
+    // 		subscribe: z.array(z.string()).optional(),
+    // 	})
+    // 	.optional(),
   })
 ).optional().describe("Define the pubsub subscriber in your stack.");
 var PubSubSchema = z14.record(
@@ -12273,10 +12279,7 @@ var pubsubFeature = defineFeature({
   onApp(ctx) {
     for (const [id, props] of Object.entries(ctx.appConfig.defaults.pubsub ?? {})) {
       const group = new Node12(ctx.base, "pubsub", id);
-      const functionProps = typeof props.auth === "string" ? { file: "" } : props.auth.authorizer;
-      const { lambda } = createLambdaFunction(group, ctx, "pubsub-authorizer", id, functionProps);
-      lambda.addEnvironment("PUBSUB_POLICY", JSON.stringify(props.policy));
-      lambda.addEnvironment("AWS_ACCOUNT_ID", ctx.accountId);
+      const { lambda } = createLambdaFunction(group, ctx, "pubsub-authorizer", id, props.auth);
       const name = formatGlobalResourceName({
         appName: ctx.app.name,
         resourceType: "pubsub",
@@ -12321,7 +12324,11 @@ var pubsubFeature = defineFeature({
     ctx.onGlobalPolicy((policy) => {
       policy.addStatement({
         actions: [`iot:Publish`],
-        resources: [`arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`]
+        resources: [
+          //
+          `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/*`,
+          `arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/${ctx.app.name}/pubsub/*`
+        ]
         // resources: [`arn:aws:iot:${ctx.appConfig.region}:${ctx.accountId}:topic/${ctx.app.name}/*`],
       });
     });
@@ -13370,14 +13377,14 @@ var tableFeature = defineFeature({
         resourceName: id
       });
       const deletionProtection = props.deletionProtection ?? ctx.appConfig.defaults.table?.deletionProtection;
-      const table2 = new aws22.dynamodb.Table(group, "table", {
+      const table3 = new aws22.dynamodb.Table(group, "table", {
         ...props,
         name,
         stream: props.stream?.type,
         deletionProtection
       });
       if (deletionProtection) {
-        table2.deletionPolicy = "retain";
+        table3.deletionPolicy = "retain";
       }
       if (props.stream) {
         const { lambda, policy } = createLambdaFunction(group, ctx, "table", id, props.stream.consumer);
@@ -13385,7 +13392,7 @@ var tableFeature = defineFeature({
         const onFailure = getGlobalOnFailure(ctx);
         const source = new aws22.lambda.EventSourceMapping(group, id, {
           functionArn: lambda.arn,
-          sourceArn: table2.streamArn,
+          sourceArn: table3.streamArn,
           batchSize: 100,
           bisectBatchOnError: true,
           // retryAttempts: props.stream.consumer.retryAttempts ?? -1,
@@ -13393,7 +13400,7 @@ var tableFeature = defineFeature({
           startingPosition: "latest",
           onFailure
         });
-        policy.addStatement(table2.streamPermissions);
+        policy.addStatement(table3.streamPermissions);
         source.dependsOn(policy);
         if (onFailure) {
           policy.addStatement({
@@ -13403,7 +13410,7 @@ var tableFeature = defineFeature({
         }
       }
       ctx.onStackPolicy((policy) => {
-        policy.addStatement(...table2.permissions);
+        policy.addStatement(...table3.permissions);
       });
     }
   }
@@ -13652,12 +13659,12 @@ var vpcFeature = defineFeature({
     const zones = ["a", "b"];
     const tables = [privateRouteTable, publicRouteTable];
     let block = 0n;
-    for (const table2 of tables) {
+    for (const table3 of tables) {
       for (const i in zones) {
         const index = Number(i) + 1;
-        const id = `${table2.identifier}-${index}`;
+        const id = `${table3.identifier}-${index}`;
         const subnet = new aws24.ec2.Subnet(group, id, {
-          name: `${ctx.app.name}--${table2.identifier}-${index}`,
+          name: `${ctx.app.name}--${table3.identifier}-${index}`,
           vpcId: vpc.id,
           cidrBlock: aws24.ec2.Peer.ipv4(`10.0.${block++}.0/24`),
           // ipv6CidrBlock: aws.ec2.Peer.ipv6(`fd00:10:20:${++block}::/64`),
@@ -13666,14 +13673,14 @@ var vpcFeature = defineFeature({
           // ipv6CidrBlock: slices.apply(list => aws.ec2.Peer.ipv6(list.get(block++).toString())),
           // assignIpv6AddressOnCreation: true,
           // ipv6Native: true,
-          mapPublicIpOnLaunch: table2.identifier === "public",
+          mapPublicIpOnLaunch: table3.identifier === "public",
           availabilityZone: ctx.appConfig.region + zones[i]
         });
         new aws24.ec2.SubnetRouteTableAssociation(group, id, {
-          routeTableId: table2.id,
+          routeTableId: table3.id,
           subnetId: subnet.id
         });
-        ctx.shared.set(`vpc-${table2.identifier}-subnet-id-${index}`, subnet.id);
+        ctx.shared.set(`vpc-${table3.identifier}-subnet-id-${index}`, subnet.id);
       }
     }
   }
@@ -14594,8 +14601,8 @@ var CustomReporter = class {
       this.cache = cache;
     }
   }
-  onUserConsoleLog(log11) {
-    this.logs.push(log11.content.trimEnd());
+  onUserConsoleLog(log12) {
+    this.logs.push(log12.content.trimEnd());
   }
   runningTask(tasks) {
     return tasks.find((t) => t.result?.state === "run");
@@ -14675,24 +14682,24 @@ var startTest = async (props) => {
 
 // src/cli/ui/complex/run-tests.ts
 var formatResult = (props) => {
-  const line = [`Test ${chalk6.magenta(props.stack)}`];
+  const line2 = [`Test ${chalk6.magenta(props.stack)}`];
   if (props.cached) {
-    line.push(color.warning(`(from cache)`));
+    line2.push(color.warning(`(from cache)`));
   }
   if (props.event.passed > 0) {
-    line.push(color.success(`${props.event.passed} passed`));
+    line2.push(color.success(`${props.event.passed} passed`));
   }
   if (props.event.failed > 0) {
-    line.push(color.error(`${props.event.failed} failed`));
+    line2.push(color.error(`${props.event.failed} failed`));
   }
-  return line.join(` `);
+  return line2.join(` `);
 };
 var logTestLogs = (event) => {
   if (event.logs.length > 0) {
     log8.message(color.info.bold.inverse(" LOGS "), {
       symbol: color.dim(icon.dot)
     });
-    log8.message(event.logs.map((log11) => wrap(log11, { hard: true })).join("\n"));
+    log8.message(event.logs.map((log12) => wrap(log12, { hard: true })).join("\n"));
   }
 };
 var logTestErrors = (event) => {
@@ -15095,9 +15102,10 @@ var dev = (program2) => {
 };
 
 // src/cli/command/resource/list.ts
+import { log as log11 } from "@clack/prompts";
 import chalk7 from "chalk";
 var list3 = (program2) => {
-  program2.command("list").description(`List all defined resources`).action(async () => {
+  program2.command("list").argument("[stacks...]", "Optionally filter stack resources to list").description(`List all defined resources`).action(async (filters) => {
     await layout("resource list", async ({ appConfig, stackConfigs }) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
@@ -15110,21 +15118,15 @@ var list3 = (program2) => {
         }).replaceAll(":", color.dim(":"));
       };
       for (const stack of app.stacks) {
+        if (filters.length > 0 && !filters.includes(stack.name)) {
+          continue;
+        }
+        log11.step(chalk7.magenta(stack.name));
+        line("");
         for (const resource2 of stack.resources) {
-          resources.push([
-            chalk7.magenta(stack.name),
-            // resource.type,
-            formatResource(stack, resource2.urn)
-          ]);
-        }
-      }
-      console.log(
-        table({
-          // colWidths,
-          head: ["stack", "urn"],
-          body: resources
-        })
-      );
+          line(formatResource(stack, resource2.urn));
+        }
+      }
     });
   });
 };

package/dist/build-json-schema.js

@@ -566,19 +566,22 @@ var DomainSchema = ResourceIdSchema.describe("The domain id to link your Pubsub
 var PubSubDefaultSchema = z17.record(
   ResourceIdSchema,
   z17.object({
+    auth: FunctionSchema,
     domain: DomainSchema.optional(),
-    subDomain: z17.string().optional(),
-    auth: z17.union([
-      ResourceIdSchema,
-      z17.object({
-        authorizer: FunctionSchema
-        // ttl: AuthorizerTtl.default('1 hour'),
-      })
-    ]),
-    policy: z17.object({
-      publish: z17.array(z17.string()).optional(),
-      subscribe: z17.array(z17.string()).optional()
-    }).optional()
+    subDomain: z17.string().optional()
+    // auth: z.union([
+    // 	ResourceIdSchema,
+    // 	z.object({
+    // 		authorizer: FunctionSchema,
+    // 		// ttl: AuthorizerTtl.default('1 hour'),
+    // 	}),
+    // ]),
+    // policy: z
+    // 	.object({
+    // 		publish: z.array(z.string()).optional(),
+    // 		subscribe: z.array(z.string()).optional(),
+    // 	})
+    // 	.optional(),
   })
 ).optional().describe("Define the pubsub subscriber in your stack.");
 var PubSubSchema = z17.record(

package/dist/client.d.ts

@@ -56,9 +56,10 @@ declare const createHttpClient: <S extends Schema>(fetcher: HttpFetcher) => {
 
 type MessageCallback = (payload: any) => void;
 type ClientProps = {
+    app: string;
     endpoint: string;
     authorizer: string;
-    token: string;
+    token?: string;
 };
 type ClientPropsProvider = () => Promise<ClientProps> | ClientProps;
 declare const createPubSubClient: (props: ClientProps | ClientPropsProvider) => {

package/dist/client.js

@@ -81,21 +81,26 @@ var createHttpClient = (fetcher) => {
 // src/lib/client/pubsub.ts
 import { createClient } from "@awsless/mqtt";
 var createPubSubClient = (props) => {
+  let app;
   const mqtt = createClient(async () => {
     const config = typeof props === "function" ? await props() : props;
+    app = config.app;
     return {
       endpoint: `wss://${config.endpoint}/mqtt`,
       username: `?x-amz-customauthorizer-name=${config.authorizer}`,
       password: config.token
     };
   });
+  const getPubSubTopic = (name) => {
+    return `${app}/pubsub/${name}`;
+  };
   return {
     ...mqtt,
     publish(topic, event, payload, qos) {
-      return mqtt.publish(topic, JSON.stringify([event, payload]), qos);
+      return mqtt.publish(getPubSubTopic(topic), JSON.stringify([event, payload]), qos);
     },
     subscribe(topic, event, callback) {
-      return mqtt.subscribe(topic, (message) => {
+      return mqtt.subscribe(getPubSubTopic(topic), (message) => {
         const [eventName, payload] = JSON.parse(message.toString("utf8"));
         if (event === eventName) {
           callback(payload);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.399",
+  "version": "0.0.401",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,17 +28,17 @@
     }
   },
   "peerDependencies": {
-    "@awsless/lambda": "^0.0.27",
-    "@awsless/mqtt": "^0.0.2",
     "@awsless/iot": "^0.0.2",
+    "@awsless/lambda": "^0.0.27",
     "@awsless/redis": "^0.0.13",
-    "@awsless/validate": "^0.0.16",
-    "@awsless/open-search": "^0.0.15",
-    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/mqtt": "^0.0.2",
     "@awsless/s3": "^0.0.18",
+    "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/sns": "^0.0.7"
+    "@awsless/open-search": "^0.0.15",
+    "@awsless/validate": "^0.0.16",
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -112,12 +112,12 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
+    "@awsless/code": "^0.0.10",
     "@awsless/duration": "^0.0.1",
     "@awsless/formation": "^0.0.57",
     "@awsless/size": "^0.0.1",
-    "@awsless/validate": "^0.0.16",
     "@awsless/ts-file-cache": "^0.0.10",
-    "@awsless/code": "^0.0.10",
+    "@awsless/validate": "^0.0.16",
     "@awsless/graphql": "^0.0.9"
   },
   "devDependencies": {