@recombine-ai/platform 0.2.6-test.5 → 0.2.6-test.6

package/build/postgres-analytics.d.ts

@@ -11,7 +11,6 @@ export interface ConversationRecord {
     durationSeconds?: number;
 }
 export interface PhoneCallRecord {
-    conversationId: string;
     phoneNumber?: string;
     recordingUrl?: string;
     endedReason?: string;

package/build/postgres-analytics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres-analytics.d.ts","sourceRoot":"","sources":["../src/postgres-analytics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,CAAA;AAE9D,OAAO,EACH,SAAS,EAGT,qBAAqB,EAGxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAA;AAI1E,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;IACf,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CAC3B;AAID,MAAM,WAAW,eAAe;IAC5B,cAAc,EAAE,MAAM,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;CACvB;AAID,UAAU,SAAS;IACf,KAAK,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnE,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACnB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;CACnC;AAgBD,qBAAa,iBAAkB,YAAW,SAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS;IAIhD,wBAAwB,CAAC,cAAc,EAAE,MAAM,GAAG,qBAAqB;CAqF1E;AAYD,qBAAa,8BAA8B;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAEjC,gBAAgB,CAClB,YAAY,EAAE,kBAAkB,EAChC,SAAS,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,IAAI,CAAC;YAmBF,kBAAkB;YAoClB,eAAe;CAsBhC;AA4DD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CxE;AAID,MAAM,WAAW,yBAAyB;IACtC,SAAS,EAAE,iBAAiB,CAAA;IAC5B,aAAa,EAAE,8BAA8B,CAAA;IAC7C,OAAO,EAAE,6BAA6B,CAAA;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB;AAID,wBAAsB,+BAA+B,CACjD,MAAM,EAAE,UAAU,GACnB,OAAO,CAAC,yBAAyB,CAAC,CAgBpC"}
+{"version":3,"file":"postgres-analytics.d.ts","sourceRoot":"","sources":["../src/postgres-analytics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,CAAA;AAE9D,OAAO,EACH,SAAS,EAGT,qBAAqB,EAGxB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAA;AAI1E,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;IACf,OAAO,CAAC,EAAE,IAAI,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CAC3B;AAID,MAAM,WAAW,eAAe;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;CACvB;AAID,UAAU,SAAS;IACf,KAAK,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnE,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,OAAO,EAAE,GACnB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;CACnC;AAgBD,qBAAa,iBAAkB,YAAW,SAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS;IAIhD,wBAAwB,CAAC,cAAc,EAAE,MAAM,GAAG,qBAAqB;CAqF1E;AAYD,qBAAa,8BAA8B;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAEjC,gBAAgB,CAClB,YAAY,EAAE,kBAAkB,EAChC,SAAS,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,IAAI,CAAC;YAmBF,kBAAkB;YAqClB,eAAe;CA0BhC;AA4DD,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAgDxE;AA6BD,MAAM,WAAW,yBAAyB;IACtC,SAAS,EAAE,iBAAiB,CAAA;IAC5B,aAAa,EAAE,8BAA8B,CAAA;IAC7C,OAAO,EAAE,6BAA6B,CAAA;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACzB;AAID,wBAAsB,+BAA+B,CACjD,MAAM,EAAE,UAAU,GACnB,OAAO,CAAC,yBAAyB,CAAC,CAgBpC"}

package/build/postgres-analytics.js

@@ -88,7 +88,7 @@ class PostgresConversationRepository {
             await client.query('BEGIN');
             await this.upsertConversation(client, conversation);
             if (phoneCall) {
-                await this.upsertPhoneCall(client, phoneCall);
+                await this.upsertPhoneCall(client, conversation.conversationId, phoneCall);
             }
             await client.query('COMMIT');
         }
@@ -111,12 +111,13 @@ class PostgresConversationRepository {
                  duration_seconds
              ) VALUES ($1, $2, $3, $4, $5, $6, $7)
              ON CONFLICT (conversation_id) DO UPDATE SET
-                 agent_id = EXCLUDED.agent_id,
-                 channel = EXCLUDED.channel,
-                 region = EXCLUDED.region,
-                 started_at = EXCLUDED.started_at,
-                 ended_at = EXCLUDED.ended_at,
-                 duration_seconds = EXCLUDED.duration_seconds,
+                 agent_id = COALESCE(conversations.agent_id, EXCLUDED.agent_id),
+                 region = COALESCE(conversations.region, EXCLUDED.region),
+                 ended_at = COALESCE(conversations.ended_at, EXCLUDED.ended_at),
+                 duration_seconds = COALESCE(
+                     conversations.duration_seconds,
+                     EXCLUDED.duration_seconds
+                 ),
                  updated_at = now()`, [
             conversation.conversationId,
             conversation.agentId ?? null,
@@ -127,7 +128,7 @@ class PostgresConversationRepository {
             conversation.durationSeconds ?? null,
         ]);
     }
-    async upsertPhoneCall(client, phoneCall) {
+    async upsertPhoneCall(client, conversationId, phoneCall) {
         await client.query(`INSERT INTO phone_calls (
                  conversation_id,
                  phone_number,
@@ -135,10 +136,10 @@ class PostgresConversationRepository {
                  ended_reason
              ) VALUES ($1, $2, $3, $4)
              ON CONFLICT (conversation_id) DO UPDATE SET
-                 phone_number = EXCLUDED.phone_number,
-                 recording_url = EXCLUDED.recording_url,
-                 ended_reason = EXCLUDED.ended_reason`, [
-            phoneCall.conversationId,
+                 phone_number = COALESCE(phone_calls.phone_number, EXCLUDED.phone_number),
+                 recording_url = COALESCE(phone_calls.recording_url, EXCLUDED.recording_url),
+                 ended_reason = COALESCE(phone_calls.ended_reason, EXCLUDED.ended_reason)`, [
+            conversationId,
             phoneCall.phoneNumber ?? null,
             phoneCall.recordingUrl ?? null,
             phoneCall.endedReason ?? null,
@@ -201,8 +202,11 @@ const migrations = [
 ];
 async function migrateAnalyticsDatabase(pool) {
     const client = await pool.connect();
+    let lockAcquired = false;
+    let migrationFailed = false;
     try {
         await client.query("SELECT pg_advisory_lock(hashtext('recombine_analytics_migrations'))");
+        lockAcquired = true;
         await client.query(`
             CREATE TABLE IF NOT EXISTS analytics_schema_migrations (
                 version integer PRIMARY KEY,
@@ -228,9 +232,29 @@ async function migrateAnalyticsDatabase(pool) {
             }
         }
     }
+    catch (error) {
+        migrationFailed = true;
+        throw error;
+    }
+    finally {
+        await releaseAnalyticsMigrationClient(client, lockAcquired, migrationFailed);
+    }
+}
+async function releaseAnalyticsMigrationClient(client, lockAcquired, migrationFailed) {
+    let discardClient = false;
+    try {
+        if (lockAcquired) {
+            await client.query("SELECT pg_advisory_unlock(hashtext('recombine_analytics_migrations'))");
+        }
+    }
+    catch (error) {
+        discardClient = true;
+        if (!migrationFailed) {
+            throw error;
+        }
+    }
     finally {
-        await client.query("SELECT pg_advisory_unlock(hashtext('recombine_analytics_migrations'))");
-        client.release();
+        client.release(discardClient);
     }
 }
 async function createPostgresAnalyticsServices(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recombine-ai/platform",
-  "version": "0.2.6-test.5",
+  "version": "0.2.6-test.6",
   "description": "Recombine AI: voice agent platform",
   "license": "EULA",
   "author": "recombine.ai",