feat(config): extend RouteResult with DialplanHints for enhanced routing

Author: shenjinti

src/callrecord/mod.rs

@@ -1467,6 +1467,18 @@ fn merge_metadata(record: &CallRecord, extra_metadata: Option<Value>) -> Option<
         "status_code".to_string(),
         Value::Number(JsonNumber::from(record.status_code)),
     );
+    if let Some(ring_time) = record.ring_time {
+        map.insert(
+            "ring_time".to_string(),
+            Value::String(ring_time.to_rfc3339()),
+        );
+    }
+    if let Some(answer_time) = record.answer_time {
+        map.insert(
+            "answer_time".to_string(),
+            Value::String(answer_time.to_rfc3339()),
+        );
+    }
     if let Some(reason) = record
         .hangup_reason
         .as_ref()

src/config.rs

@@ -383,13 +383,21 @@ pub struct ProxyConfig {
     pub addons: Option<Vec<String>>,
 }
 
+#[derive(Debug, Clone, Default)]
+pub struct DialplanHints {
+    pub enable_recording: Option<bool>,
+    pub bypass_media: Option<bool>,
+    pub max_duration: Option<std::time::Duration>,
+}
+
 pub enum RouteResult {
-    Forward(InviteOption),
+    Forward(InviteOption, Option<DialplanHints>),
     Queue {
         option: InviteOption,
         queue: QueuePlan,
+        hints: Option<DialplanHints>,
     },
-    NotHandled(InviteOption),
+    NotHandled(InviteOption, Option<DialplanHints>),
     Abort(StatusCode, Option<String>),
 }
 

src/console/handlers/call_record.rs

@@ -30,11 +30,6 @@ use tokio_util::io::ReaderStream;
 use tracing::warn;
 use urlencoding::encode;
 
-const BILLING_STATUS_CHARGED: &str = "charged";
-const BILLING_STATUS_INCLUDED: &str = "included";
-const BILLING_STATUS_ZERO_DURATION: &str = "zero-duration";
-const BILLING_STATUS_UNRATED: &str = "unrated";
-
 use crate::models::{
     call_record::{
         ActiveModel as CallRecordActiveModel, Column as CallRecordColumn,
@@ -1000,13 +995,6 @@ async fn load_filters(db: &DatabaseConnection) -> Result<Value, DbErr> {
         "departments": departments,
         "sip_trunks": sip_trunks,
         "tags": [],
-        "billing_status": [
-            "any",
-            BILLING_STATUS_CHARGED,
-            BILLING_STATUS_INCLUDED,
-            BILLING_STATUS_ZERO_DURATION,
-            BILLING_STATUS_UNRATED,
-        ],
     }))
 }
 
@@ -1017,16 +1005,11 @@ fn build_condition(filters: &Option<QueryCallRecordFilters>) -> Condition {
         if let Some(q_raw) = filters.q.as_ref() {
             let trimmed = q_raw.trim();
             if !trimmed.is_empty() {
-                let mut any_match = Condition::any();
-                any_match = any_match.add(CallRecordColumn::CallId.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::DisplayId.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::FromNumber.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::ToNumber.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::CallerName.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::AgentName.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::Queue.contains(trimmed));
-                any_match = any_match.add(CallRecordColumn::SipGateway.contains(trimmed));
-                condition = condition.add(any_match);
+                let mut q_condition = Condition::any();
+                q_condition = q_condition.add(CallRecordColumn::CallId.eq(trimmed));
+                q_condition = q_condition.add(CallRecordColumn::ToNumber.eq(trimmed));
+                q_condition = q_condition.add(CallRecordColumn::FromNumber.eq(trimmed));
+                condition = condition.add(q_condition);
             }
         }
 
@@ -1045,10 +1028,18 @@ fn build_condition(filters: &Option<QueryCallRecordFilters>) -> Condition {
             }
         }
 
-        if let Some(from) = parse_date(filters.date_from.as_ref(), false) {
+        let date_from = parse_date(filters.date_from.as_ref(), false);
+        let date_to = parse_date(filters.date_to.as_ref(), true);
+
+        if let Some(from) = date_from {
             condition = condition.add(CallRecordColumn::StartedAt.gte(from));
+        } else if filters.q.is_some() {
+            // Default to 30 days if searching without date range to prevent full table scan
+            let thirty_days_ago = Utc::now() - chrono::Duration::days(30);
+            condition = condition.add(CallRecordColumn::StartedAt.gte(thirty_days_ago));
         }
-        if let Some(to) = parse_date(filters.date_to.as_ref(), true) {
+
+        if let Some(to) = date_to {
             condition = condition.add(CallRecordColumn::StartedAt.lte(to));
         }
 
@@ -1469,6 +1460,8 @@ fn build_record_payload(
     let rewrite_destination = json_lookup_nested_str(&record.metadata, &["rewrite", "destination"]);
     let billing = build_billing_payload(record);
     let status_code = json_lookup_u16(&record.metadata, "status_code");
+    let ring_time = json_lookup_str(&record.metadata, "ring_time");
+    let answer_time = json_lookup_str(&record.metadata, "answer_time");
     let hangup_reason = json_lookup_str(&record.metadata, "hangup_reason");
     let hangup_messages = extract_hangup_messages(&record.metadata);
 
@@ -1497,6 +1490,8 @@ fn build_record_payload(
         "recording": recording,
         "quality": quality,
         "started_at": record.started_at.to_rfc3339(),
+        "ring_time": ring_time,
+        "answer_time": answer_time,
         "ended_at": record.ended_at.map(|dt| dt.to_rfc3339()),
         "detail_url": state.url_for(&format!("/call-records/{}", record.id)),
         "billing": billing,

src/console/handlers/diagnostics.rs

@@ -1274,7 +1274,7 @@ async fn route_evaluate(
     };
 
     let (outcome, caller_render, callee_render, request_render, rewrites) = match result {
-        RouteResult::Forward(option) => {
+        RouteResult::Forward(option, _) => {
             let rewrites = collect_rewrite_diff(&original_option, &option);
             (
                 RouteOutcomeView::Forward(RouteForwardOutcome {
@@ -1296,7 +1296,7 @@ async fn route_evaluate(
                 rewrites,
             )
         }
-        RouteResult::Queue { option, queue } => {
+        RouteResult::Queue { option, queue, .. } => {
             let rewrites = collect_rewrite_diff(&original_option, &option);
             let forward = RouteForwardOutcome {
                 destination: option.destination.map(|d| d.addr.to_string()),
@@ -1322,7 +1322,7 @@ async fn route_evaluate(
                 rewrites,
             )
         }
-        RouteResult::NotHandled(option) => {
+        RouteResult::NotHandled(option, _) => {
             let rewrites = collect_rewrite_diff(&original_option, &option);
             (
                 RouteOutcomeView::NotHandled,

src/handler/ami.rs

@@ -19,6 +19,7 @@ use tracing::{info, warn};
 
 pub fn router(app_state: AppState) -> Router<AppState> {
     Router::new()
+        .route("/health", get(health_handler))
         .route("/dialogs", get(list_dialogs))
         .route("/hangup/{id}", get(hangup_dialog))
         .route("/transactions", get(list_transactions))

src/handler/handler.rs

@@ -1,4 +1,3 @@
-pub mod handler;
-pub mod middleware;
-pub use handler::router;
 pub mod ami;
+pub mod middleware;
+pub use ami::router;

src/handler/mod.rs

@@ -0,0 +1,108 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let table = crate::models::call_record::Entity;
+        let col_started_at = crate::models::call_record::Column::StartedAt;
+        let col_from_number = crate::models::call_record::Column::FromNumber;
+        let col_to_number = crate::models::call_record::Column::ToNumber;
+
+        // Index on from_number
+        if !manager
+            .has_index(
+                "rustpbx_call_records",
+                "idx_rustpbx_call_records_from_number",
+            )
+            .await?
+        {
+            manager
+                .create_index(
+                    Index::create()
+                        .name("idx_rustpbx_call_records_from_number")
+                        .table(table)
+                        .col(col_from_number)
+                        .to_owned(),
+                )
+                .await?;
+        }
+
+        // Composite index on started_at + from_number
+        if !manager
+            .has_index(
+                "rustpbx_call_records",
+                "idx_rustpbx_call_records_started_from",
+            )
+            .await?
+        {
+            manager
+                .create_index(
+                    Index::create()
+                        .name("idx_rustpbx_call_records_started_from")
+                        .table(table)
+                        .col(col_started_at)
+                        .col(col_from_number)
+                        .to_owned(),
+                )
+                .await?;
+        }
+
+        // Composite index on started_at + to_number
+        if !manager
+            .has_index(
+                "rustpbx_call_records",
+                "idx_rustpbx_call_records_started_to",
+            )
+            .await?
+        {
+            manager
+                .create_index(
+                    Index::create()
+                        .name("idx_rustpbx_call_records_started_to")
+                        .table(table)
+                        .col(col_started_at)
+                        .col(col_to_number)
+                        .to_owned(),
+                )
+                .await?;
+        }
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let table = crate::models::call_record::Entity;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("idx_rustpbx_call_records_from_number")
+                    .table(table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("idx_rustpbx_call_records_started_from")
+                    .table(table)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("idx_rustpbx_call_records_started_to")
+                    .table(table)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+}

src/models/call_record_from_number_index.rs

@@ -17,6 +17,7 @@ impl MigratorTrait for Migrator {
             Box::new(super::call_record_indices::Migration),
             Box::new(super::call_record_optimization_indices::Migration),
             Box::new(super::call_record_dashboard_index::Migration),
+            Box::new(super::call_record_from_number_index::Migration),
         ]
     }
 }

src/models/migration.rs

@@ -6,6 +6,7 @@ use url::Url;
 
 pub mod call_record;
 pub mod call_record_dashboard_index;
+pub mod call_record_from_number_index;
 pub mod call_record_indices;
 pub mod call_record_optimization_indices;
 pub mod department;