redo pubsub

cmd/cart/main.go

@@ -80,6 +80,8 @@ func main() {
 
 	log.Printf("loaded %d promotions", len(promotionData.State.Promotions))
 
+	inventoryPubSub := actor.NewPubSub[inventory.InventoryChange]()
+
 	promotionService := promotions.NewPromotionService(nil)
 
 	reg := cart.NewCartMultationRegistry()
@@ -109,11 +111,20 @@ func main() {
 			grainSpawns.Inc()
 			ret := cart.NewCartGrain(id, time.Now())
 			// Set baseline lastChange at spawn; replay may update it to last event timestamp.
-
+			inventoryPubSub.Subscribe(ret.HandleInventoryChange)
 			err := diskStorage.LoadEvents(ctx, id, ret)
 
 			return ret, err
 		},
+		Destroy: func(grain actor.Grain[cart.CartGrain]) error {
+			cart, err := grain.GetCurrentState()
+			if err != nil {
+				return err
+			}
+			inventoryPubSub.Unsubscribe(cart.HandleInventoryChange)
+
+			return nil
+		},
 		SpawnHost: func(host string) (actor.Host, error) {
 			return proxy.NewRemoteHost(host)
 		},
@@ -127,13 +138,6 @@ func main() {
 		log.Fatalf("Error creating cart pool: %v\n", err)
 	}
 
-	pool.SetPubSub(actor.NewPubSub(func(id uint64, event actor.Event) {
-		grain, _ := pool.Get(context.Background(), id)
-		if sub, ok := any(grain).(actor.Subscribable); ok {
-			sub.Notify(event)
-		}
-	}))
-
 	klarnaClient := NewKlarnaClient(KlarnaPlaygroundUrl, os.Getenv("KLARNA_API_USERNAME"), os.Getenv("KLARNA_API_PASSWORD"))
 	rdb := redis.NewClient(&redis.Options{
 		Addr:     redisAddress,
@@ -245,6 +249,15 @@ func main() {
 		srvErr <- srv.ListenAndServe()
 	}()
 
+	listener := inventory.NewInventoryChangeListener(rdb, context.Background(), func(changes []inventory.InventoryChange) {
+		for _, change := range changes {
+			log.Printf("inventory change: %v", change)
+			inventoryPubSub.Publish(change)
+		}
+	})
+
+	go listener.Start()
+
 	log.Print("Server started at port 8080")
 
 	go http.ListenAndServe(":8081", debugMux)

cmd/cart/pool-server.go

@@ -43,10 +43,9 @@ var (
 
 type PoolServer struct {
 	actor.GrainPool[*cart.CartGrain]
-	pod_name          string
-	klarnaClient      *KlarnaClient
-	inventoryService  inventory.InventoryService
-	inventoryListener *inventory.InventoryChangeListener
+	pod_name         string
+	klarnaClient     *KlarnaClient
+	inventoryService inventory.InventoryService
 }
 
 func NewPoolServer(pool actor.GrainPool[*cart.CartGrain], pod_name string, klarnaClient *KlarnaClient, inventoryService inventory.InventoryService, inventoryRedisClient *redis.Client) *PoolServer {
@@ -56,16 +55,7 @@ func NewPoolServer(pool actor.GrainPool[*cart.CartGrain], pod_name string, klarn
 		klarnaClient:     klarnaClient,
 		inventoryService: inventoryService,
 	}
-	listener := inventory.NewInventoryChangeListener(inventoryRedisClient, context.Background(), func(changes []inventory.InventoryChange) {
-		for _, change := range changes {
-			srv.GrainPool.GetPubSub().Publish(actor.Event{
-				Topic:   fmt.Sprintf("inventory:%s", change.SKU),
-				Payload: change,
-			})
-		}
-	})
-	srv.inventoryListener = listener
-	go listener.Start()
+
 	return srv
 }