@awsless/awsless 0.0.404 → 0.0.406

package/README.MD

@@ -186,7 +186,7 @@ We use AWS SNS to provide serverless pubsub topics.
 }
 ```
 
-## Realtime
+## Pubsub
 
 We use AWS IoT to provide a serverless mqtt pubsub channel.
 

package/dist/bin.js

@@ -7413,7 +7413,7 @@ var line = (message) => {
 };
 var table = (props) => {
   console.log(color.line("\u2502"));
-  const table3 = new Table({
+  const table2 = new Table({
     // wordWrap: true,
     // wrapOnWordBoundary: false,
     // truncate: '...',
@@ -7436,7 +7436,7 @@ var table = (props) => {
       // 'right-mid': '',
     }
   });
-  table3.push(
+  table2.push(
     ...props.body.map(
       (row) => row.map((v) => {
         if (typeof v === "boolean") {
@@ -7446,7 +7446,7 @@ var table = (props) => {
       })
     )
   );
-  return table3.toString();
+  return table2.toString();
 };
 
 // src/cli/ui/complex/bootstrap-awsless.ts
@@ -7512,12 +7512,12 @@ var createStateBucket = (client, accountId) => {
 var bootstrapAwsless = async (props) => {
   const dynamo = new DynamoDB(props);
   const s3 = new S3Client(props);
-  const [table3, bucket] = await Promise.all([
+  const [table2, bucket] = await Promise.all([
     //
     hasLockTable(dynamo),
     hasStateBucket(s3, props.accountId)
   ]);
-  if (!table3 || !bucket) {
+  if (!table2 || !bucket) {
     log.warn(`Awsless hasn't been bootstrapped yet.`);
     if (!process.env.SKIP_PROMPT) {
       const confirmed = await confirm({
@@ -7528,7 +7528,7 @@ var bootstrapAwsless = async (props) => {
       }
     }
     await task("Bootstrapping", async (update) => {
-      if (!table3) {
+      if (!table2) {
         await createLockTable(dynamo);
       }
       if (!bucket) {
@@ -13378,14 +13378,14 @@ var tableFeature = defineFeature({
         resourceName: id
       });
       const deletionProtection = props.deletionProtection ?? ctx.appConfig.defaults.table?.deletionProtection;
-      const table3 = new aws22.dynamodb.Table(group, "table", {
+      const table2 = new aws22.dynamodb.Table(group, "table", {
         ...props,
         name,
         stream: props.stream?.type,
         deletionProtection
       });
       if (deletionProtection) {
-        table3.deletionPolicy = "retain";
+        table2.deletionPolicy = "retain";
       }
       if (props.stream) {
         const { lambda, policy } = createLambdaFunction(group, ctx, "table", id, props.stream.consumer);
@@ -13393,7 +13393,7 @@ var tableFeature = defineFeature({
         const onFailure = getGlobalOnFailure(ctx);
         const source = new aws22.lambda.EventSourceMapping(group, id, {
           functionArn: lambda.arn,
-          sourceArn: table3.streamArn,
+          sourceArn: table2.streamArn,
           batchSize: 100,
           bisectBatchOnError: true,
           // retryAttempts: props.stream.consumer.retryAttempts ?? -1,
@@ -13401,7 +13401,7 @@ var tableFeature = defineFeature({
           startingPosition: "latest",
           onFailure
         });
-        policy.addStatement(table3.streamPermissions);
+        policy.addStatement(table2.streamPermissions);
         source.dependsOn(policy);
         if (onFailure) {
           policy.addStatement({
@@ -13411,7 +13411,7 @@ var tableFeature = defineFeature({
         }
       }
       ctx.onStackPolicy((policy) => {
-        policy.addStatement(...table3.permissions);
+        policy.addStatement(...table2.permissions);
       });
     }
   }
@@ -13660,12 +13660,12 @@ var vpcFeature = defineFeature({
     const zones = ["a", "b"];
     const tables = [privateRouteTable, publicRouteTable];
     let block = 0n;
-    for (const table3 of tables) {
+    for (const table2 of tables) {
       for (const i in zones) {
         const index = Number(i) + 1;
-        const id = `${table3.identifier}-${index}`;
+        const id = `${table2.identifier}-${index}`;
         const subnet = new aws24.ec2.Subnet(group, id, {
-          name: `${ctx.app.name}--${table3.identifier}-${index}`,
+          name: `${ctx.app.name}--${table2.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`),
@@ -13674,14 +13674,14 @@ var vpcFeature = defineFeature({
           // ipv6CidrBlock: slices.apply(list => aws.ec2.Peer.ipv6(list.get(block++).toString())),
           // assignIpv6AddressOnCreation: true,
           // ipv6Native: true,
-          mapPublicIpOnLaunch: table3.identifier === "public",
+          mapPublicIpOnLaunch: table2.identifier === "public",
           availabilityZone: ctx.appConfig.region + zones[i]
         });
         new aws24.ec2.SubnetRouteTableAssociation(group, id, {
-          routeTableId: table3.id,
+          routeTableId: table2.id,
           subnetId: subnet.id
         });
-        ctx.shared.set(`vpc-${table3.identifier}-subnet-id-${index}`, subnet.id);
+        ctx.shared.set(`vpc-${table2.identifier}-subnet-id-${index}`, subnet.id);
       }
     }
   }
@@ -15112,7 +15112,6 @@ var list3 = (program2) => {
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
       const { app } = createApp({ appConfig, stackConfigs, accountId });
-      const resources = [];
       const formatResource = (stack, urn) => {
         return urn.replace(stack.urn + ":", "").replace(/\{([a-z0-9\-\s\/\._]+)\}/gi, (_, v) => {
           return `${color.dim("{")}${color.warning(v)}${color.dim("}")}`;

package/dist/client.js

@@ -79,6 +79,7 @@ var createHttpClient = (fetcher) => {
 };
 
 // src/lib/client/pubsub.ts
+import { parse, stringify } from "@awsless/json";
 import { createClient } from "@awsless/mqtt";
 var createPubSubClient = (app, props) => {
   const mqtt = createClient(async () => {
@@ -104,11 +105,11 @@ var createPubSubClient = (app, props) => {
       return mqtt.topics.map(fromPubSubTopic);
     },
     publish(topic, event, payload, qos) {
-      return mqtt.publish(getPubSubTopic(topic), JSON.stringify([event, payload]), qos);
+      return mqtt.publish(getPubSubTopic(topic), stringify([event, payload]), qos);
     },
     subscribe(topic, event, callback) {
       return mqtt.subscribe(getPubSubTopic(topic), (message) => {
-        const [eventName, payload] = JSON.parse(message.toString("utf8"));
+        const [eventName, payload] = parse(message.toString("utf8"));
         if (event === eventName) {
           callback(payload);
         }

package/dist/prebuild/rpc/HASH

@@ -1 +1 @@
-97510d9a094a9b2d465e3a910caf3aa9b08ebf0d
+baa4f5591254516e6462b0b073ae7f4b638ea501

package/dist/server.js

@@ -365,6 +365,7 @@ var Config = /* @__PURE__ */ new Proxy(
 // src/lib/server/pubsub.ts
 import { hours, toSeconds } from "@awsless/duration";
 import { publish as publish2, QoS } from "@awsless/iot";
+import { stringify } from "@awsless/json";
 var getPubSubTopic = (name) => {
   return `${APP}/pubsub/${name}`;
 };
@@ -372,7 +373,7 @@ var PubSub = {
   async publish(topic, event, payload, opts = {}) {
     await publish2({
       topic: getPubSubTopic(topic),
-      payload: Buffer.from(JSON.stringify([event, payload])),
+      payload: Buffer.from(stringify([event, payload])),
       ...opts
     });
   }
@@ -406,14 +407,14 @@ var pubsubAuthorizerResponse = (props) => {
         Resource: props.subscribe.map((topic) => {
           return `${prefix}:topicfilter/${getPubSubTopic(topic)}`;
         })
-      },
-      {
-        Action: "iot:Receive",
-        Effect: "Allow",
-        Resource: props.subscribe.map((topic) => {
-          return `${prefix}:topic/${getPubSubTopic(topic)}`;
-        })
       }
+      // {
+      // 	Action: 'iot:Receive',
+      // 	Effect: 'Allow',
+      // 	Resource: props.subscribe.map(topic => {
+      // 		return `${prefix}:topic/${getPubSubTopic(topic)}`
+      // 	}),
+      // }
     );
   }
   return {
@@ -431,6 +432,11 @@ var pubsubAuthorizerResponse = (props) => {
             Resource: "*"
             // Resource: `${prefix}:client/\${iot:ClientId}`,
           },
+          {
+            Action: "iot:Receive",
+            Effect: "Allow",
+            Resource: "*"
+          },
           ...statements
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.404",
+  "version": "0.0.406",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,17 +28,18 @@
     }
   },
   "peerDependencies": {
+    "@awsless/lambda": "^0.0.29",
     "@awsless/iot": "^0.0.2",
-    "@awsless/lambda": "^0.0.27",
     "@awsless/mqtt": "^0.0.2",
+    "@awsless/sqs": "^0.0.7",
     "@awsless/open-search": "^0.0.15",
+    "@awsless/json": "^0.0.6",
     "@awsless/redis": "^0.0.13",
-    "@awsless/sns": "^0.0.7",
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/validate": "^0.0.16",
     "@awsless/s3": "^0.0.18",
-    "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/validate": "^0.0.16",
-    "@awsless/weak-cache": "^0.0.1"
+    "@awsless/sns": "^0.0.7"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -112,13 +113,14 @@
     "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/graphql": "^0.0.9",
-    "@awsless/ts-file-cache": "^0.0.10",
+    "@awsless/size": "^0.0.1",
+    "@awsless/json": "^0.0.6",
     "@awsless/validate": "^0.0.16",
-    "@awsless/size": "^0.0.1"
+    "@awsless/code": "^0.0.10",
+    "@awsless/graphql": "^0.0.9",
+    "@awsless/ts-file-cache": "^0.0.10"
   },
   "devDependencies": {
     "@node-rs/bcrypt": "^1.10.5"