temporal functions

aboutphilippe · aboutphilippe · commit 7082f16f3dd0 · 2024-08-10T13:07:38.000+02:00
Former-commit-id: c759b87 Former-commit-id: 9db1b23db97b33258667eb56dd1b79352a4e2a9b
diff --git a/examples/twilio/src/functions/openai/answer.ts b/examples/twilio/src/functions/openai/answer.ts
@@ -36,9 +36,10 @@ export async function questionAnswer({
         runId,
         updateName: answerEvent.name,
         input: {
+          streamSid,
+          trackName: "agent",
           gptReply,
           interactionCount,
-          trackName: "agent",
         },
       });
       log.info(`Interaction ${interactionCount}: OpenAI:`, event);
diff --git a/examples/twilio/src/pods.ts b/examples/twilio/src/pods.ts
@@ -5,7 +5,7 @@ import {
   transcribe,
   textToAudio,
 } from "./functions";
-import { websocket, streamQuestion, sendAudio } from "./streams";
+import { websocket, streamQuestion, sendAudio, sendEvent } from "./streams";
 
 async function main() {
   const workflowsPath = require.resolve("./workflows");
@@ -27,7 +27,7 @@ async function main() {
       restack.pod({
         name: "websocket",
         workflowsPath,
-        functions: { websocket, sendAudio },
+        functions: { websocket, sendAudio, sendEvent },
       }),
       restack.pod({
         name: "openai",
diff --git a/examples/twilio/src/server.ts b/examples/twilio/src/server.ts
@@ -13,7 +13,18 @@ const wss = new WebSocketServer({ server });
 const PORT = process.env.PORT || 4000;
 export const websocketAddress = `wss://${process.env.SERVER}/connection`;
 
-app.use(cors());
+app.use(
+  cors({
+    origin: "*",
+    methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
+    allowedHeaders: [
+      "Content-Type",
+      "Authorization",
+      "X-Requested-With",
+      "Accept",
+    ],
+  })
+);
 app.use(express.json());
 
 app.post("/start", async (req, res) => {
@@ -117,9 +128,6 @@ wss.on("connection", (ws) => {
 
     if (message.event === "stop") {
       console.log(`Twilio -> Media stream ${streamSid} ended.`);
-      if (runId) {
-        restack.update({ workflowId, runId, updateName: "streamEnd" });
-      }
     }
   });
 });
diff --git a/examples/twilio/src/streams/index.ts b/examples/twilio/src/streams/index.ts
@@ -3,3 +3,4 @@ export * from "../functions/deepgram/textToAudio";
 export * from "../functions/openai/answer";
 export * from "./websocket";
 export * from "./sendAudio";
+export * from "./sendEvent";
diff --git a/examples/twilio/src/streams/sendAudio.ts b/examples/twilio/src/streams/sendAudio.ts
@@ -22,4 +22,5 @@ export async function sendAudio({
   };
   ws.send(JSON.stringify(audioEvent));
   ws.close();
+  return true;
 }
diff --git a/examples/twilio/src/streams/sendEvent.ts b/examples/twilio/src/streams/sendEvent.ts
@@ -0,0 +1,23 @@
+import { webSocketConnect } from "./connect";
+
+export async function sendEvent({
+  streamSid,
+  eventName,
+  data,
+}: {
+  streamSid: string;
+  eventName: string;
+  data: { text?: string };
+}) {
+  const ws = await webSocketConnect();
+
+  const audioEvent = {
+    streamSid: streamSid,
+    event: eventName,
+    data: data,
+  };
+
+  ws.send(JSON.stringify(audioEvent));
+  ws.close();
+  return true;
+}
diff --git a/examples/twilio/src/streams/websocket.ts b/examples/twilio/src/streams/websocket.ts
@@ -4,7 +4,7 @@ import {
   log,
 } from "@restackio/restack-sdk-ts/function";
 import { webSocketConnect } from "./connect";
-import { audioInEvent, TrackName } from "../workflows/twilioStream";
+import { audioInEvent, streamEnd, TrackName } from "../workflows/twilioStream";
 import Restack from "@restackio/restack-sdk-ts";
 
 type StreamInput = {
@@ -13,16 +13,15 @@ type StreamInput = {
 };
 
 export async function websocket({ streamSid }: StreamInput) {
-  return new Promise<void>(async (resolve, reject) => {
+  return new Promise<void>(async (resolve) => {
     const ws = await webSocketConnect();
-
+    const restack = new Restack();
+    const { workflowId, runId } = currentWorkflow().workflowExecution;
     ws.on("message", (data) => {
       const message = JSON.parse(data.toString());
-      if (message.event === "media") {
-        if (message.streamSid === streamSid) {
+      if (message.streamSid === streamSid) {
+        if (message.event === "media") {
           if (message.media.track === "inbound") {
-            const restack = new Restack();
-            const { workflowId, runId } = currentWorkflow().workflowExecution;
             log.info("send payload", {
               streamSid,
               payload: message.media.payload.length,
@@ -40,14 +39,11 @@ export async function websocket({ streamSid }: StreamInput) {
           }
         }
       }
-      if (message.streamSid === streamSid) heartbeat(message.streamSid);
+      heartbeat(message.streamSid);
       if (message.event === "stop") {
+        restack.update({ workflowId, runId, updateName: streamEnd.name });
         resolve();
       }
     });
-
-    ws.on("close", () => {
-      resolve();
-    });
   });
 }
diff --git a/examples/twilio/src/workflows/twilioStream.ts b/examples/twilio/src/workflows/twilioStream.ts
@@ -43,7 +43,7 @@ export const questionEvent = defineUpdate<Question>("question");
 
 export const answerEvent = defineUpdate<Answer>("answer");
 
-const streamEnd = defineUpdate("streamEnd");
+export const streamEnd = defineUpdate("streamEnd");
 
 export async function twilioStreamWorkflow() {
   let currentstreamSid: string;
@@ -76,9 +76,18 @@ export async function twilioStreamWorkflow() {
 
     await step<typeof streams>({
       podName: `websocket`,
-      scheduleToCloseTimeout: "2 minutes",
+      scheduleToCloseTimeout: "1 minute",
     }).sendAudio({ streamSid, trackName: "agent", audio });
 
+    await step<typeof streams>({
+      podName: `websocket`,
+      scheduleToCloseTimeout: "2 minutes",
+    }).sendEvent({
+      streamSid,
+      eventName: answerEvent.name,
+      data: { text: welcomeMessage.partialResponse },
+    });
+
     currentstreamSid = streamSid;
     return { streamSid };
   });
@@ -92,6 +101,15 @@ export async function twilioStreamWorkflow() {
 
     interactionCount += 1;
 
+    await step<typeof streams>({
+      podName: `websocket`,
+      scheduleToCloseTimeout: "1 minute",
+    }).sendEvent({
+      streamSid,
+      eventName: questionEvent.name,
+      data: { text: finalResult },
+    });
+
     await step<typeof functions>({
       podName: `openai`,
       scheduleToCloseTimeout: "2 minutes",
@@ -109,6 +127,15 @@ export async function twilioStreamWorkflow() {
         scheduleToCloseTimeout: "2 minutes",
       }).textToAudio({ streamSid, trackName, gptReply, interactionCount });
 
+      await step<typeof streams>({
+        podName: `websocket`,
+        scheduleToCloseTimeout: "1 minute",
+      }).sendEvent({
+        streamSid,
+        eventName: answerEvent.name,
+        data: { text: gptReply.partialResponse },
+      });
+
       log.info("audio", { audio: audio?.length });
 
       if (audio) {

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@ export async function sendAudio({`
`22`	`22`	`};`
`23`	`23`	`ws.send(JSON.stringify(audioEvent));`
`24`	`24`	`ws.close();`
	`25`	`+ return true;`
`25`	`26`	`}`