Skip to content

Support concurrent blocking asks #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidmoshal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support concurrent blocking asks #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 59 additions & 46 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ interface InboundMessageEntry {
bodyText: string;
}

interface ReplyWaiter {
from: string;
replyTo: string;
resolve: (message: Message) => void;
reject: (error: Error) => void;
}

type ContactSupervisorReason = "need_decision" | "progress_update" | "interview_request";

interface SupervisorInterviewQuestion extends Record<string, unknown> {
Expand Down Expand Up @@ -430,36 +437,32 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
const replyTracker = new ReplyTracker();
const pendingIdleMessages: InboundMessageEntry[] = [];
let inboundFlushTimer: NodeJS.Timeout | null = null;
let replyWaiter: {
from: string;
replyTo: string;
resolve: (message: Message) => void;
reject: (error: Error) => void;
} | null = null;
const replyWaiters = new Map<string, ReplyWaiter>();
function waitForReply(from: string, replyTo: string, signal?: AbortSignal): Promise<Message> {
if (replyWaiter) {
return Promise.reject(new Error("Already waiting for a reply"));
if (replyWaiters.has(replyTo)) {
throw new Error(`Already waiting for reply ${replyTo}`);
}
if (signal?.aborted) {
return Promise.reject(new Error("Cancelled"));
throw new Error("Cancelled");
}
return new Promise((resolve, reject) => {
const timeout = setTimeout(() => {
rejectReplyWaiter(new Error(`No reply from "${from}" within 10 minutes`));
rejectReplyWaiter(replyTo, new Error(`No reply from "${from}" within 10 minutes`));
}, 10 * 60 * 1000);
let waiter: ReplyWaiter;
const cleanup = () => {
clearTimeout(timeout);
signal?.removeEventListener("abort", onAbort);
if (replyWaiter?.replyTo === replyTo) {
replyWaiter = null;
if (replyWaiters.get(replyTo) === waiter) {
replyWaiters.delete(replyTo);
}
};
const onAbort = () => {
cleanup();
reject(new Error("Cancelled"));
};
signal?.addEventListener("abort", onAbort, { once: true });
replyWaiter = {
waiter = {
from,
replyTo,
resolve: (message) => {
Expand All @@ -471,10 +474,16 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
reject(error);
},
};
replyWaiters.set(replyTo, waiter);
});
}
function rejectReplyWaiter(error: Error): void {
replyWaiter?.reject(error);
function rejectReplyWaiter(replyTo: string, error: Error): void {
replyWaiters.get(replyTo)?.reject(error);
}
function rejectAllReplyWaiters(error: Error): void {
for (const waiter of [...replyWaiters.values()]) {
waiter.reject(error);
}
}
function clearReconnectTimer(): void {
if (!reconnectTimer) {
Expand Down Expand Up @@ -642,12 +651,15 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
if (!liveContext) {
return;
}
if (replyWaiter) {
const senderTarget = from.name || from.id;
const fromMatches = senderTarget.toLowerCase() === replyWaiter.from.toLowerCase()
|| from.id === replyWaiter.from;
const replyMatches = message.replyTo === replyWaiter.replyTo;
if (fromMatches && replyMatches) {
if (message.replyTo) {
const replyWaiter = replyWaiters.get(message.replyTo);
if (replyWaiter) {
const senderTarget = from.name || from.id;
const fromMatches = senderTarget.toLowerCase() === replyWaiter.from.toLowerCase()
|| from.id === replyWaiter.from;
if (!fromMatches) {
return;
}
replyWaiter.resolve(message);
return;
}
Expand Down Expand Up @@ -704,7 +716,7 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
if (client !== nextClient) {
return;
}
rejectReplyWaiter(new Error(`Disconnected while waiting for reply: ${error.message}`, { cause: error }));
rejectAllReplyWaiters(new Error(`Disconnected while waiting for reply: ${error.message}`, { cause: error }));
client = null;
if (!shuttingDown && !disposed) {
clearReconnectTimer();
Expand Down Expand Up @@ -946,7 +958,7 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
runtimeGeneration += 1;
clearStartupConnectTimer();
clearReconnectTimer();
rejectReplyWaiter(new Error("Session shutting down"));
rejectAllReplyWaiters(new Error("Session shutting down"));
replyTracker.reset();
pendingIdleMessages.length = 0;
clearInboundFlushTimer();
Expand Down Expand Up @@ -1169,21 +1181,18 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
}
}

if (replyWaiter) {
return {
content: [{ type: "text", text: "Already waiting for a reply" }],
isError: true,
details: { error: true },
};
}

let replyPromise: Promise<Message> | null = null;
let ownsReplyWaiter = false;
let questionId: string | null = null;
try {
const questionId = randomUUID();
questionId = randomUUID();
replyPromise = waitForReply(sendTo, questionId, signal);
ownsReplyWaiter = true;
replyPromise.catch(() => undefined);
if (signal?.aborted) {
rejectReplyWaiter(new Error("Cancelled"));
if (ownsReplyWaiter && questionId) {
rejectReplyWaiter(questionId, new Error("Cancelled"));
}
try {
await replyPromise;
} catch {
Expand All @@ -1205,7 +1214,9 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
});
if (!sendResult.delivered) {
const errorText = sendResult.reason ?? "Session may not exist or has disconnected.";
rejectReplyWaiter(new Error(`Message to "${metadata.orchestratorTarget}" was not delivered: ${errorText}`));
if (ownsReplyWaiter && questionId) {
rejectReplyWaiter(questionId, new Error(`Message to "${metadata.orchestratorTarget}" was not delivered: ${errorText}`));
}
if (replyPromise) {
try {
await replyPromise;
Expand Down Expand Up @@ -1251,7 +1262,9 @@ export default function piIntercomExtension(pi: ExtensionAPI) {
: {}),
};
} catch (error) {
rejectReplyWaiter(toError(error));
if (ownsReplyWaiter && questionId) {
rejectReplyWaiter(questionId, toError(error));
}
if (replyPromise) {
try {
await replyPromise;
Expand Down Expand Up @@ -1464,14 +1477,6 @@ Usage:
};
}

if (replyWaiter) {
return {
content: [{ type: "text", text: "Already waiting for a reply" }],
isError: true,
details: { error: true },
};
}

if (_signal?.aborted) {
return {
content: [{ type: "text", text: "Cancelled" }],
Expand All @@ -1480,6 +1485,8 @@ Usage:
};
}
let replyPromise: Promise<Message> | null = null;
let ownsReplyWaiter = false;
let questionId: string | null = null;

try {
const sendTo = await resolveSessionTarget(connectedClient, to) ?? to;
Expand All @@ -1497,8 +1504,10 @@ Usage:
details: { error: true },
};
}
const questionId = randomUUID();
questionId = randomUUID();
replyPromise = waitForReply(sendTo, questionId, _signal);
ownsReplyWaiter = true;
replyPromise.catch(() => undefined);
const sendResult = await connectedClient.send(sendTo, {
messageId: questionId,
text: message,
Expand All @@ -1509,7 +1518,9 @@ Usage:

if (!sendResult.delivered) {
const errorText = sendResult.reason ?? "Session may not exist or has disconnected.";
rejectReplyWaiter(new Error(`Message to "${to}" was not delivered: ${errorText}`));
if (ownsReplyWaiter && questionId) {
rejectReplyWaiter(questionId, new Error(`Message to "${to}" was not delivered: ${errorText}`));
}
if (replyPromise) {
try {
await replyPromise;
Expand Down Expand Up @@ -1545,7 +1556,9 @@ Usage:
isError: false,
};
} catch (error) {
rejectReplyWaiter(toError(error));
if (ownsReplyWaiter && questionId) {
rejectReplyWaiter(questionId, toError(error));
}
if (replyPromise) {
try {
await replyPromise;
Expand Down
Loading