deletion (#70)

README.md

@@ -95,6 +95,15 @@ data:
 
 The hub and agent must reference the same bucket and have appropriate permissions to it.
 
+For instance, in S3, the shortest deletion period is one day. In fuyuu-router, since object storage is used only temporarily, if you want to reduce costs, you can have the hub delete objects by using the `deletion` settings.
+
+```toml
+[storage_relay]
+objstore_file = "/app/config/objstore.yaml"
+threshold_bytes = 128000
+deletion = true
+```
+
 ## limitation
 
 - Currently only HTTP 1.1 is supported. Perhaps HTTP2 is the next roadmap.

internal/agent/agent.go

@@ -478,7 +478,7 @@ func Start(c AgentConfig) {
 						}
 					} else {
 						if s.commonConfig.Networking.LargeDataPolicy == "storage_relay" && len(httpResponse) > s.commonConfig.StorageRelay.ThresholdBytes {
-							objectName = s.id + "/" + processChPayload.requestPacket.RequestId + "/response"
+							objectName = common.ResponseObjectName(s.id, processChPayload.requestPacket.RequestId)
 							err := s.bucket.Upload(context.Background(), objectName, bytes.NewReader(httpResponse))
 							if err != nil {
 								s.logger.Error("Error uploading object to object storage", zap.Error(err))

internal/common/config.go

@@ -33,6 +33,7 @@ type Networking struct {
 type StorageRelay struct {
 	ThresholdBytes int    `mapstructure:"threshold_bytes"`
 	ObjstoreFile   string `mapstructure:"objstore_file"`
+	Deletion       bool   `mapstructure:"deletion"`
 }
 
 type Split struct {

internal/common/object.go

@@ -0,0 +1,8 @@
+package common
+
+func RequestObjectName(agentID, requstID string) string {
+	return agentID + "/" + requstID + "/request"
+}
+func ResponseObjectName(agentID, requstID string) string {
+	return agentID + "/" + requstID + "/response"
+}

internal/hub/server.go

@@ -281,7 +281,7 @@ func (s *server) handleRequest(w http.ResponseWriter, r *http.Request) {
 
 	var objectName string
 	if s.commonConfig.Networking.LargeDataPolicy == "storage_relay" && r.ContentLength > int64(s.commonConfig.StorageRelay.ThresholdBytes) {
-		objectName = agentID + "/" + uuid + "/request"
+		objectName = common.RequestObjectName(agentID, uuid)
 		s.logger.Debug("Uploading object to object storage...")
 		err := s.bucket.Upload(context.Background(), objectName, r.Body)
 		if err != nil {
@@ -463,6 +463,16 @@ func (s *server) handleRequest(w http.ResponseWriter, r *http.Request) {
 	}
 	s.bus.DeregisterHandler(uuid)
 	s.bus.DeregisterTopics(uuid)
+	if s.commonConfig.Networking.LargeDataPolicy == "storage_relay" && s.commonConfig.StorageRelay.Deletion {
+		err = s.bucket.Delete(context.Background(), common.RequestObjectName(agentID, uuid))
+		if err != nil {
+			s.logger.Error("Error deleting object from object storage", zap.Error(err))
+		}
+		err = s.bucket.Delete(context.Background(), common.ResponseObjectName(agentID, uuid))
+		if err != nil {
+			s.logger.Error("Error deleting object from object storage", zap.Error(err))
+		}
+	}
 }
 
 func Start(c HubConfig) {