@awsless/awsless 0.0.402 → 0.0.404

package/dist/client.d.ts

@@ -62,10 +62,10 @@ type ClientProps = {
 };
 type ClientPropsProvider = () => Promise<ClientProps> | ClientProps;
 declare const createPubSubClient: (app: string, props: ClientProps | ClientPropsProvider) => {
-    publish(topic: string, event: string, payload: unknown, qos: QoS): Promise<void>;
-    subscribe(topic: string, event: string, callback: MessageCallback): Promise<_awsless_mqtt.Unsubscribe>;
     connected: boolean;
     topics: string[];
+    publish(topic: string, event: string, payload: unknown, qos: QoS): Promise<void>;
+    subscribe(topic: string, event: string, callback: MessageCallback): Promise<_awsless_mqtt.Unsubscribe>;
     destroy(): Promise<void>;
 };
 

package/dist/client.js

@@ -92,8 +92,17 @@ var createPubSubClient = (app, props) => {
   const getPubSubTopic = (name) => {
     return `${app}/pubsub/${name}`;
   };
+  const fromPubSubTopic = (name) => {
+    return name.replace(`${app}/pubsub/`, "");
+  };
   return {
     ...mqtt,
+    get connected() {
+      return mqtt.connected;
+    },
+    get topics() {
+      return mqtt.topics.map(fromPubSubTopic);
+    },
     publish(topic, event, payload, qos) {
       return mqtt.publish(getPubSubTopic(topic), JSON.stringify([event, payload]), qos);
     },

package/dist/server.js

@@ -394,7 +394,7 @@ var pubsubAuthorizerResponse = (props) => {
       Action: "iot:Publish",
       Effect: "Allow",
       Resource: props.publish.map((topic) => {
-        return `${prefix}:topic/${topic}`;
+        return `${prefix}:topic/${getPubSubTopic(topic)}`;
       })
     });
   }
@@ -404,14 +404,14 @@ var pubsubAuthorizerResponse = (props) => {
         Action: "iot:Subscribe",
         Effect: "Allow",
         Resource: props.subscribe.map((topic) => {
-          return `${prefix}:topicfilter/${topic}`;
+          return `${prefix}:topicfilter/${getPubSubTopic(topic)}`;
         })
       },
       {
         Action: "iot:Receive",
         Effect: "Allow",
         Resource: props.subscribe.map((topic) => {
-          return `${prefix}:topic/${topic}`;
+          return `${prefix}:topic/${getPubSubTopic(topic)}`;
         })
       }
     );
@@ -428,7 +428,8 @@ var pubsubAuthorizerResponse = (props) => {
           {
             Action: "iot:Connect",
             Effect: "Allow",
-            Resource: `${prefix}:client/\${iot:ClientId}`
+            Resource: "*"
+            // Resource: `${prefix}:client/\${iot:ClientId}`,
           },
           ...statements
         ]

package/package.json

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