fix: oubsub working for distributed calendar

dapr-distributed-calendar/Dockerfile

@@ -2,5 +2,6 @@ FROM node:17-alpine
 WORKDIR /app
 COPY . .
 RUN npm install
+# RUN npm install cloudevents
 EXPOSE 3000
 CMD [ "node", "node_controller.js" ]

dapr-distributed-calendar/components/pubsub.yaml

@@ -9,4 +9,4 @@ spec:
   - name: redisHost
     value: redis:6379
   - name: redisPassword
-    value: ""
+    value: "Pa55w.rd"

dapr-distributed-calendar/components/statestore.yaml

@@ -9,6 +9,6 @@ spec:
   - name: redisHost
     value: redis:6379
   - name: redisPassword
-    value: ""
+    value: "Pa55w.rd"
   - name: actorStateStore
     value: "true"

dapr-distributed-calendar/docker-compose.yml

@@ -35,16 +35,20 @@ services:
     build: ./python
     ports:
       - "5000"
+      - "3501"
     depends_on:
       - redis
       - placement
     networks:
       - dapr-callendar-network
+    environment:
+      - FLASK_RUN_PORT=5000
   pythonapp-dapr:
     image: "daprio/daprd:edge"
     command: ["./daprd",
      "-app-id", "messages",
      "-app-port", "5000",    
+     "-dapr-http-port", "3501",
      "-placement-host-address", "placement:50006",
      "-components-path", "/components"]
     volumes:
@@ -59,8 +63,7 @@ services:
     build: ./go
     ports:
       - "6000"
-    deploy:
-      replicas: 2
+      - "3503"
     environment:
       - DAPR_HTTP_PORT=3503
     depends_on:
@@ -94,20 +97,15 @@ services:
   ############################
   # Redis state store
   ############################
-  # redis:
-  #   image: "redis:alpine"
-  #   ports:
-  #     - "6380:6379"
-  #   networks:
-  #     - dapr-callendar-network
   redis:
     image: docker.io/bitnami/redis:7.2
     environment:
       # ALLOW_EMPTY_PASSWORD is recommended only for development.
-      - ALLOW_EMPTY_PASSWORD=yes
+      # - ALLOW_EMPTY_PASSWORD=yes
       - REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL
+      - REDIS_PASSWORD=Pa55w.rd
     ports:
-      - '6379:6379'
+      - '6379'
     networks:
       - dapr-callendar-network
     volumes:

dapr-distributed-calendar/go/go_events.go

@@ -31,6 +31,7 @@ func addEvent(w http.ResponseWriter, r *http.Request) {
 	err := json.NewDecoder(r.Body).Decode(&event)
 	if err != nil {
 		log.Printf("Error while decoding: %e", err)
+		return
 	}
 	log.Printf("Event Name: %s", event.Name)
 	log.Printf("Event Date: %s", event.Date)
@@ -47,7 +48,7 @@ func addEvent(w http.ResponseWriter, r *http.Request) {
 	resp, err := http.Post(stateURL, "application/json", bytes.NewBuffer(state))
 	if err != nil {
 		log.Fatalln("Error posting to state", err)
-		http.Error(w, "Failed to write to store", http.StatusServiceUnavailable)
+		return
 	}
 	log.Printf("Response after posting to state: %s", resp.Status)
 	http.Error(w, "All Okay", http.StatusOK)
@@ -70,6 +71,7 @@ func deleteEvent(w http.ResponseWriter, r *http.Request) {
 	resp, err := client.Do(req)
 	if err != nil {
 		log.Fatalln("Error deleting event", err)
+		return
 	}
 	log.Printf("Response after delete call: %s", resp.Status)
 
@@ -81,25 +83,35 @@ func deleteEvent(w http.ResponseWriter, r *http.Request) {
 
 func getEvent(w http.ResponseWriter, r *http.Request) {
 	type Identity struct {
-		ID string
+		ID string `json:"id"`
 	}
 	var eventID Identity
 
 	err := json.NewDecoder(r.Body).Decode(&eventID)
 	if err != nil {
 		log.Printf("Error decoding id")
+		return
 	}
 	getURL := stateURL + "/" + eventID.ID
 	req, err := http.NewRequest(http.MethodGet, getURL, nil)
+	if err != nil {
+		log.Fatalln("Error creating get request", err)
+		return
+	}
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		log.Fatalln("Error getting event", err)
+		return
 	}
 	log.Printf("Response after get call: %s", resp.Status)
 
 	defer resp.Body.Close()
-	bodyBytes, _ := ioutil.ReadAll(resp.Body)
+	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Printf("Error reading response body: %v", err)
+		return
+	}
 
 	log.Printf(string(bodyBytes))
 }

dapr-distributed-calendar/node_controller.js

@@ -4,6 +4,7 @@ const bodyParser = require('body-parser');
 require('isomorphic-fetch');
 
 const app = express();
+// const { HTTP } = require("cloudevents");
 app.use(bodyParser.json());
 
 const daprPort = process.env.DAPR_HTTP_PORT || 3500;
@@ -17,6 +18,22 @@ const publishUrl = `http://localhost:${daprPort}/v1.0/publish/${pubsub_name}/${t
 
 const port = 3000;
 
+// app.get('/dapr/subscribe', (_req, res) => {
+//     res.json([
+//         {
+//             pubsubname: "pubsub",
+//             topic: "events-topic",
+//             route: "getmsg"
+//         }
+//     ]);
+// });
+
+// app.post('/getmsg', (req, res) => {
+//     const receivedEvent = HTTP.toEvent({ headers: req.headers, body: req.body });
+//     console.log(receivedEvent);
+//     res.sendStatus(200);
+//   });
+
 function send_notif(data) {
     var message = {
         "data": {
@@ -110,7 +127,6 @@ app.get('/event/:id', (req, res) =>{
         if (!response.ok) {
             throw "Failed to get state.";
         }
-
         console.log("Successfully got state.");
         res.status(200).send();
     }).catch((error) => {