@talkpilot/core-db 1.3.5 → 1.3.7

package/src/talkpilot/sessions/__tests__/sessions.spec.ts

@@ -1,147 +1,147 @@
-import {
-  findSessionOfIncomingCall,
-  getSessionsCollection,
-} from "../sessions.getter";
-import { getFlowsCollection } from "../../flows";
-import { getPhoneNumbersCollection } from "../../phone_numbers";
-import {
-  createFlow,
-  createPhoneNumber,
-  createSession,
-} from "../../../test-utils/factories";
-import { faker } from "@faker-js/faker";
-import { ObjectId } from "mongodb";
-
-describe("sessions", () => {
-  describe("findSessionOfIncomingCall()", () => {
-    it("returns session by incoming phone number", async () => {
-      const to = "+972500000000";
-      const from = "+972540000000";
-      const flow = createFlow({
-        conversationSettings: {
-          interruptions: {
-            enableInterruptionDetection: true,
-            interruptionWindowSeconds: 60,
-            interruptionThresholdSeconds: 10,
-            interruptionInstruction:
-              "I am hearing background noise that makes it hard for me to focus on what you are saying. Please try to move to a quieter place or reduce the noise so I can better assist you.",
-          },
-          silence: {
-            enableSilenceDetection: true,
-            firstWarningSilenceSeconds: 5,
-            firstWarningInstruction:
-              "I have not heard you for a few seconds. If you are still on the line, please say something so we can continue.",
-            secondWarningSilenceSeconds: 10,
-            secondWarningInstruction:
-              "I still have not heard anything from you. If you do not respond in the next few seconds, I will have to end this call.",
-            disconnectSilenceSeconds: 30,
-          },
-        },
-      });
-      const phoneNumberData = createPhoneNumber({
-        phone_number: to,
-        flow_id: flow._id,
-      });
-      const json = { [faker.lorem.word()]: faker.lorem.sentence() };
-
-      const session = createSession({
-        flow_id: flow._id,
-        phone_numbers: [{ phoneNumber: from, gender: "male", name: "yakov" }],
-        json,
-      });
-
-      await getFlowsCollection().insertOne(flow);
-      await getPhoneNumbersCollection().insertOne(phoneNumberData);
-      await getSessionsCollection().insertOne(session);
-
-      const result = await findSessionOfIncomingCall(from, to);
-      expect(result).not.toBeNull();
-      expect(result?.phone_numbers[0].phoneNumber).toEqual(from);
-      expect(result?.flow_id).toEqual(flow._id);
-    });
-
-    it("works with different phone number formats (with/without plus)", async () => {
-      const toInDB = "972500000000";
-      const fromInDB = "+972540000000";
-      const flow = createFlow();
-      const phoneNumberData = createPhoneNumber({
-        phone_number: toInDB,
-        flow_id: flow._id,
-      });
-
-      const session = createSession({
-        flow_id: flow._id,
-        phone_numbers: [
-          { phoneNumber: fromInDB, gender: "female", name: "sara" },
-        ],
-      });
-
-      await getFlowsCollection().insertOne(flow);
-      await getPhoneNumbersCollection().insertOne(phoneNumberData);
-      await getSessionsCollection().insertOne(session);
-
-      // Search with from WITH plus (matches + in DB), to WITH plus (matches without + in DB)
-      const result = await findSessionOfIncomingCall(
-        "+972540000000",
-        "+972500000000",
-      );
-      expect(result).not.toBeNull();
-      expect(result?.phone_numbers[0].phoneNumber).toEqual(fromInDB);
-    });
-
-    it("works when flow_id is string in phone_numbers and ObjectId in session", async () => {
-      const to = "+972501111111";
-      const from = "+972541111111";
-      const flowId = new ObjectId();
-
-      // Store flow_id as string in phone_numbers
-      const phoneNumberData = createPhoneNumber({
-        phone_number: to,
-        flow_id: flowId.toHexString() as any,
-      });
-
-      const session = createSession({
-        flow_id: flowId, // stored as ObjectId
-        phone_numbers: [{ phoneNumber: from, gender: "male", name: "isaac" }],
-      });
-
-      await getPhoneNumbersCollection().insertOne(phoneNumberData);
-      await getSessionsCollection().insertOne(session);
-
-      const result = await findSessionOfIncomingCall(from, to);
-      expect(result).not.toBeNull();
-      expect(result?.flow_id?.toString()).toEqual(flowId.toHexString());
-    });
-
-    it("works when flow_id is string in session", async () => {
-      const to = "+972502222222";
-      const from = "+972542222222";
-      const flowId = new ObjectId();
-
-      const phoneNumberData = createPhoneNumber({
-        phone_number: to,
-        flow_id: flowId,
-      });
-
-      const session = createSession({
-        flow_id: flowId.toHexString(), // stored as string
-        phone_numbers: [{ phoneNumber: from, gender: "female", name: "rivka" }],
-      });
-
-      await getPhoneNumbersCollection().insertOne(phoneNumberData);
-      await getSessionsCollection().insertOne(session);
-
-      const result = await findSessionOfIncomingCall(from, to);
-      expect(result).not.toBeNull();
-      expect(result?.flow_id).toEqual(flowId.toHexString());
-    });
-
-    it("returns null if receiver phone number is not found", async () => {
-      const result = await findSessionOfIncomingCall(
-        "any-from",
-        "non-existent-to",
-      );
-      expect(result).toBeNull();
-    });
-  });
-});
+import {
+  findSessionOfIncomingCall,
+  getSessionsCollection,
+} from "../sessions.getter";
+import { getFlowsCollection } from "../../flows";
+import { getPhoneNumbersCollection } from "../../phone_numbers";
+import {
+  createFlow,
+  createPhoneNumber,
+  createSession,
+} from "../../../test-utils/factories";
+import { faker } from "@faker-js/faker";
+import { ObjectId } from "mongodb";
+
+describe("sessions", () => {
+  describe("findSessionOfIncomingCall()", () => {
+    it("returns session by incoming phone number", async () => {
+      const to = "+972500000000";
+      const from = "+972540000000";
+      const flow = createFlow({
+        conversationSettings: {
+          interruptions: {
+            enableInterruptionDetection: true,
+            interruptionWindowSeconds: 60,
+            interruptionThresholdSeconds: 10,
+            interruptionInstruction:
+              "I am hearing background noise that makes it hard for me to focus on what you are saying. Please try to move to a quieter place or reduce the noise so I can better assist you.",
+          },
+          silence: {
+            enableSilenceDetection: true,
+            firstWarningSilenceSeconds: 5,
+            firstWarningInstruction:
+              "I have not heard you for a few seconds. If you are still on the line, please say something so we can continue.",
+            secondWarningSilenceSeconds: 10,
+            secondWarningInstruction:
+              "I still have not heard anything from you. If you do not respond in the next few seconds, I will have to end this call.",
+            disconnectSilenceSeconds: 30,
+          },
+        },
+      });
+      const phoneNumberData = createPhoneNumber({
+        phone_number: to,
+        flow_id: flow._id,
+      });
+      const json = { [faker.lorem.word()]: faker.lorem.sentence() };
+
+      const session = createSession({
+        flow_id: flow._id,
+        phone_numbers: [{ phoneNumber: from, gender: "male", name: "yakov" }],
+        json,
+      });
+
+      await getFlowsCollection().insertOne(flow);
+      await getPhoneNumbersCollection().insertOne(phoneNumberData);
+      await getSessionsCollection().insertOne(session);
+
+      const result = await findSessionOfIncomingCall(from, to);
+      expect(result).not.toBeNull();
+      expect(result?.phone_numbers[0].phoneNumber).toEqual(from);
+      expect(result?.flow_id).toEqual(flow._id);
+    });
+
+    it("works with different phone number formats (with/without plus)", async () => {
+      const toInDB = "972500000000";
+      const fromInDB = "+972540000000";
+      const flow = createFlow();
+      const phoneNumberData = createPhoneNumber({
+        phone_number: toInDB,
+        flow_id: flow._id,
+      });
+
+      const session = createSession({
+        flow_id: flow._id,
+        phone_numbers: [
+          { phoneNumber: fromInDB, gender: "female", name: "sara" },
+        ],
+      });
+
+      await getFlowsCollection().insertOne(flow);
+      await getPhoneNumbersCollection().insertOne(phoneNumberData);
+      await getSessionsCollection().insertOne(session);
+
+      // Search with from WITH plus (matches + in DB), to WITH plus (matches without + in DB)
+      const result = await findSessionOfIncomingCall(
+        "+972540000000",
+        "+972500000000",
+      );
+      expect(result).not.toBeNull();
+      expect(result?.phone_numbers[0].phoneNumber).toEqual(fromInDB);
+    });
+
+    it("works when flow_id is string in phone_numbers and ObjectId in session", async () => {
+      const to = "+972501111111";
+      const from = "+972541111111";
+      const flowId = new ObjectId();
+
+      // Store flow_id as string in phone_numbers
+      const phoneNumberData = createPhoneNumber({
+        phone_number: to,
+        flow_id: flowId.toHexString() as any,
+      });
+
+      const session = createSession({
+        flow_id: flowId, // stored as ObjectId
+        phone_numbers: [{ phoneNumber: from, gender: "male", name: "isaac" }],
+      });
+
+      await getPhoneNumbersCollection().insertOne(phoneNumberData);
+      await getSessionsCollection().insertOne(session);
+
+      const result = await findSessionOfIncomingCall(from, to);
+      expect(result).not.toBeNull();
+      expect(result?.flow_id?.toString()).toEqual(flowId.toHexString());
+    });
+
+    it("works when flow_id is string in session", async () => {
+      const to = "+972502222222";
+      const from = "+972542222222";
+      const flowId = new ObjectId();
+
+      const phoneNumberData = createPhoneNumber({
+        phone_number: to,
+        flow_id: flowId,
+      });
+
+      const session = createSession({
+        flow_id: flowId.toHexString(), // stored as string
+        phone_numbers: [{ phoneNumber: from, gender: "female", name: "rivka" }],
+      });
+
+      await getPhoneNumbersCollection().insertOne(phoneNumberData);
+      await getSessionsCollection().insertOne(session);
+
+      const result = await findSessionOfIncomingCall(from, to);
+      expect(result).not.toBeNull();
+      expect(result?.flow_id).toEqual(flowId.toHexString());
+    });
+
+    it("returns null if receiver phone number is not found", async () => {
+      const result = await findSessionOfIncomingCall(
+        "any-from",
+        "non-existent-to",
+      );
+      expect(result).toBeNull();
+    });
+  });
+});

package/src/talkpilot/sessions/index.ts

@@ -1,2 +1,2 @@
-export * from "./sessions.getter";
-export * from "./sessions.types";
+export * from "./sessions.getter";
+export * from "./sessions.types";

package/src/talkpilot/sessions/sessions.getter.ts

@@ -1,92 +1,92 @@
-import { ObjectId } from "mongodb";
-import type { Collection, WithId } from "mongodb";
-import { getDb, getPhoneNumbersCollection } from "../index";
-import type { Session } from "./sessions.types";
-
-export const getSessionsCollection = (): Collection<Session> =>
-  getDb().collection<Session>("sessions");
-
-const buildPhoneCandidates = (phone: string): string[] => {
-  const raw = (phone ?? "").trim();
-  if (!raw) return [];
-
-  const noPlus = raw.startsWith("+") ? raw.slice(1) : raw;
-  const digitsOnly = raw.replace(/\D/g, "");
-  const digitsOnlyNoPlus = noPlus.replace(/\D/g, "");
-
-  return Array.from(
-    new Set([raw, noPlus, digitsOnly, digitsOnlyNoPlus].filter(Boolean)),
-  );
-};
-
-const buildFlowIdCandidates = (flowId: unknown): Array<string | ObjectId> => {
-  if (!flowId) return [];
-
-  // Some sessions store flow_id as string, others as ObjectId.
-  if (flowId instanceof ObjectId) {
-    return [flowId, flowId.toString()];
-  }
-
-  const asString = String(flowId);
-  if (!asString) return [];
-
-  if (ObjectId.isValid(asString)) {
-    return [new ObjectId(asString), asString];
-  }
-  return [asString];
-};
-
-export const findSessionById = (
-  sessionId: ObjectId,
-  clientId: string,
-): Promise<WithId<Session> | null> => {
-  return getSessionsCollection().findOne({
-    _id: sessionId,
-    clientId: clientId,
-  });
-};
-
-export const findSessionOfIncomingCall = async (from: string, to: string) => {
-  const toCandidates = buildPhoneCandidates(to);
-  const fromCandidates = buildPhoneCandidates(from);
-
-  const receiverPhoneData = await getPhoneNumbersCollection().findOne({
-    phone_number: { $in: toCandidates },
-  });
-  if (!receiverPhoneData) {
-    return null;
-  }
-
-  const flowIdCandidates = buildFlowIdCandidates(receiverPhoneData.flow_id);
-
-  const [session] = await getSessionsCollection()
-    .aggregate<WithId<Session>>([
-      {
-        $match: {
-          flow_id: { $in: flowIdCandidates },
-          phone_numbers: {
-            $elemMatch: { phoneNumber: { $in: fromCandidates } },
-          },
-        },
-      },
-      {
-        $addFields: {
-          phone_numbers: {
-            $filter: {
-              input: "$phone_numbers",
-              as: "pn",
-              cond: { $in: ["$$pn.phoneNumber", fromCandidates] },
-            },
-          },
-        },
-      },
-      { $limit: 1 },
-    ])
-    .toArray();
-
-  if (!session) {
-    console.info("No session found for incoming call");
-    return null;
-  }
-  return session;
-};
+import { ObjectId } from "mongodb";
+import type { Collection, WithId } from "mongodb";
+import { getDb, getPhoneNumbersCollection } from "../index";
+import type { Session } from "./sessions.types";
+
+export const getSessionsCollection = (): Collection<Session> =>
+  getDb().collection<Session>("sessions");
+
+const buildPhoneCandidates = (phone: string): string[] => {
+  const raw = (phone ?? "").trim();
+  if (!raw) return [];
+
+  const noPlus = raw.startsWith("+") ? raw.slice(1) : raw;
+  const digitsOnly = raw.replace(/\D/g, "");
+  const digitsOnlyNoPlus = noPlus.replace(/\D/g, "");
+
+  return Array.from(
+    new Set([raw, noPlus, digitsOnly, digitsOnlyNoPlus].filter(Boolean)),
+  );
+};
+
+const buildFlowIdCandidates = (flowId: unknown): Array<string | ObjectId> => {
+  if (!flowId) return [];
+
+  // Some sessions store flow_id as string, others as ObjectId.
+  if (flowId instanceof ObjectId) {
+    return [flowId, flowId.toString()];
+  }
+
+  const asString = String(flowId);
+  if (!asString) return [];
+
+  if (ObjectId.isValid(asString)) {
+    return [new ObjectId(asString), asString];
+  }
+  return [asString];
+};
+
+export const findSessionById = (
+  sessionId: ObjectId,
+  clientId: string,
+): Promise<WithId<Session> | null> => {
+  return getSessionsCollection().findOne({
+    _id: sessionId,
+    clientId: clientId,
+  });
+};
+
+export const findSessionOfIncomingCall = async (from: string, to: string) => {
+  const toCandidates = buildPhoneCandidates(to);
+  const fromCandidates = buildPhoneCandidates(from);
+
+  const receiverPhoneData = await getPhoneNumbersCollection().findOne({
+    phone_number: { $in: toCandidates },
+  });
+  if (!receiverPhoneData) {
+    return null;
+  }
+
+  const flowIdCandidates = buildFlowIdCandidates(receiverPhoneData.flow_id);
+
+  const [session] = await getSessionsCollection()
+    .aggregate<WithId<Session>>([
+      {
+        $match: {
+          flow_id: { $in: flowIdCandidates },
+          phone_numbers: {
+            $elemMatch: { phoneNumber: { $in: fromCandidates } },
+          },
+        },
+      },
+      {
+        $addFields: {
+          phone_numbers: {
+            $filter: {
+              input: "$phone_numbers",
+              as: "pn",
+              cond: { $in: ["$$pn.phoneNumber", fromCandidates] },
+            },
+          },
+        },
+      },
+      { $limit: 1 },
+    ])
+    .toArray();
+
+  if (!session) {
+    console.info("No session found for incoming call");
+    return null;
+  }
+  return session;
+};

package/src/talkpilot/sessions/sessions.schema.ts

@@ -1,34 +1,34 @@
-export const sessionMongoSchema = {
-  bsonType: "object",
-  required: ["session_name"],
-  properties: {
-    _id: { bsonType: "objectId" },
-    session_name: { bsonType: "string" },
-    company_name: { bsonType: ["string", "null"] },
-    flow_id: { bsonType: ["objectId", "string", "null"] },
-    metaKeys: {
-      bsonType: ["array", "null"],
-      items: {
-        bsonType: "object",
-        required: ["key"],
-        properties: {
-          key: { bsonType: "string" },
-          value: { bsonType: "string" },
-        },
-      },
-    },
-    phone_numbers: {
-      bsonType: "array",
-      items: {
-        bsonType: "object",
-        required: ["name", "phoneNumber"],
-        properties: {
-          name: { bsonType: "string" },
-          phoneNumber: { bsonType: "string" },
-        },
-      },
-    },
-    voice: { bsonType: ["string", "null"] },
-  },
-  additionalProperties: false,
-} as const;
+export const sessionMongoSchema = {
+  bsonType: "object",
+  required: ["session_name"],
+  properties: {
+    _id: { bsonType: "objectId" },
+    session_name: { bsonType: "string" },
+    company_name: { bsonType: ["string", "null"] },
+    flow_id: { bsonType: ["objectId", "string", "null"] },
+    metaKeys: {
+      bsonType: ["array", "null"],
+      items: {
+        bsonType: "object",
+        required: ["key"],
+        properties: {
+          key: { bsonType: "string" },
+          value: { bsonType: "string" },
+        },
+      },
+    },
+    phone_numbers: {
+      bsonType: "array",
+      items: {
+        bsonType: "object",
+        required: ["name", "phoneNumber"],
+        properties: {
+          name: { bsonType: "string" },
+          phoneNumber: { bsonType: "string" },
+        },
+      },
+    },
+    voice: { bsonType: ["string", "null"] },
+  },
+  additionalProperties: false,
+} as const;

package/src/talkpilot/sessions/sessions.types.ts

@@ -1,30 +1,30 @@
-import { ObjectId } from "mongodb";
-
-export type Session = {
-  _id?: ObjectId;
-
-  session_name: string;
-  company_name?: string | null;
-  flow_id?: ObjectId | string | null;
-  clientId: string;
-
-  metaKeys?: Array<{
-    key: string;
-    value?: string;
-  }> | null;
-
-  phone_numbers: Array<{
-    name: string;
-    phoneNumber: string;
-    gender: "male" | "female";
-  }>;
-
-  voice?: string | null;
-  json: Record<string, any> | null;
-
-  // Timestamps
-  createdAt?: Date;
-  updatedAt?: Date;
-};
-
-export type SessionDoc = Session & { _id: ObjectId };
+import { ObjectId } from "mongodb";
+
+export type Session = {
+  _id?: ObjectId;
+
+  session_name: string;
+  company_name?: string | null;
+  flow_id?: ObjectId | string | null;
+  clientId: string;
+
+  metaKeys?: Array<{
+    key: string;
+    value?: string;
+  }> | null;
+
+  phone_numbers: Array<{
+    name: string;
+    phoneNumber: string;
+    gender: "male" | "female";
+  }>;
+
+  voice?: string | null;
+  json: Record<string, any> | null;
+
+  // Timestamps
+  createdAt?: Date;
+  updatedAt?: Date;
+};
+
+export type SessionDoc = Session & { _id: ObjectId };