cleanup

Author: anunaym14

magefile.go

@@ -79,11 +79,6 @@ func Proto() error {
 		"rpc/whip_signal.proto",
 		"rpc/sip.proto",
 	}
-	connectorProtoFiles := []string{
-		"connectors/whatsapp_api.proto",
-		"connectors/whatsapp_common.proto",
-		"connectors/whatsapp_webhook.proto",
-	}
 
 	fmt.Println("generating protobuf")
 	target := "livekit"
@@ -199,19 +194,6 @@ func Proto() error {
 		return err
 	}
 
-	fmt.Println("generating connector protobuf")
-	args = append([]string{
-		"--go_out", ".",
-		"--go_opt=paths=source_relative",
-		"--plugin=go=" + protocGoPath,
-		"-I=./protobufs",
-	}, connectorProtoFiles...)
-	cmd = exec.Command(protoc, args...)
-	connectStd(cmd)
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-
 	return nil
 }
 

protobufs/connectors/whatsapp_api.proto

@@ -19,9 +19,6 @@ option go_package = "github.com/livekit/protocol/livekit";
 option csharp_namespace = "LiveKit.Proto";
 option ruby_package = "LiveKit::Proto";
 
-import "connectors/whatsapp_webhook.proto";
-import "connectors/whatsapp_common.proto";
-
 service ConnectorsService {
   rpc CreateWhatsAppParticipant(CreateWhatsAppParticipantRequest) returns (CreateWhatsAppParticipantResponse);
 
@@ -35,37 +32,74 @@ service ConnectorsService {
 }
 
 message CreateWhatsAppParticipantRequest {
+  // The number of the business that is initiating the call
   string from_phone_number_id = 1;
+  // The number of the user that is supossed to receive the call
   string to_phone_number_id = 2;
-  optional string biz_opaque_callback_data = 3; // for logging purposes
+  // The API key of the business that is initiating the call
+  string whatsapp_api_key = 3;
+  // An arbitrary string you can pass in that is useful for tracking and logging purposes.
+  optional string biz_opaque_callback_data = 4;
 }
 
 message CreateWhatsAppParticipantResponse {
 }
 
 message DeleteWhatsAppParticipantRequest {
-  optional string whatsapp_call_id = 1;
-  optional livekit.connectors.WhatsAppCallWebhook call_terminate_webhook = 2;
-  optional bool is_call_rejected = 3;
+  oneof request {
+    DeleteWhatsAppParticipantWithCallId call_id = 1;
+    DeleteWhatsAppParticipantForRejectedCall rejected_call = 2;
+    // when the call is rejected by the other side, we receive a webhook: 
+    // https://developers.facebook.com/docs/whatsapp/cloud-api/calling/business-initiated-calls#call-status-webhook
+    string call_status_rejected_webhook = 3;
+    // when the call is terminated by the other side, we receive a webhook: 
+    // https://developers.facebook.com/docs/whatsapp/cloud-api/calling/business-initiated-calls#call-terminate-webhook
+    // terminate webhook is the same for both user and business initiated calls
+    string call_terminate_webhook = 4;
+  }
 }
 
+message DeleteWhatsAppParticipantWithCallId {
+  // when the call is rejected or terminated by the other side, we don't need to make any API calls
+  // we only need to do it when we are terminating the call
+  string phone_number_id = 1;
+  string whatsapp_call_id = 2;
+  string whatsapp_api_key = 3;
+  
+}
+
+message DeleteWhatsAppParticipantForRejectedCall {
+  string whatsapp_call_id = 1;
+}
+
+
 message DeleteWhatsAppParticipantResponse {
 }
 
 message ConnectWhatsAppCallRequest {
-  string livekit_participant_identity= 1;
-  map<string, string> participant_attributes = 2;
-  livekit.connectors.WhatsAppCallWebhook call_connect_webhook = 3;
-  ConnectorsDispatchRule dispatch_rule = 4;
+  string phone_number_id = 1;
+  string whatsapp_api_key = 2;
+  string livekit_participant_identity= 3;
+  map<string, string> livekit_participant_attributes = 4;
+  ConnectorsDispatchRule dispatch_rule = 5;
+  oneof request {
+    string whatsapp_call_id = 6;
+    string call_connect_webhook = 7;
+  }
+  
 }
 
 message ConnectWhatsAppCallResponse {
   string whatsapp_call_id = 1;
 }
 
 message RejectWhatsAppCallRequest {
-  optional string whatsapp_call_id = 1;
-  optional livekit.connectors.WhatsAppCallWebhook call_connect_webhook = 2;
+  string phone_number_id = 1;
+  string whatsapp_api_key = 2;
+  oneof request {
+    string whatsapp_call_id = 3;
+    string call_connect_webhook = 4;
+  }
 }
 
 message RejectWhatsAppCallResponse {
@@ -76,7 +110,8 @@ message ListWhatsAppCallsRequest {
 }
 
 message ListWhatsAppCallsResponse {
-  repeated livekit.connectors.WhatsAppCall calls = 1;
+  // list of call ids that are currently active
+  repeated string calls = 1;
 }
 
 message ConnectorsDispatchRule {