Signal and Docker updates

apps/bridge-worker/tasks/fetch-signal-messages.ts

@@ -16,13 +16,17 @@ const fetchSignalMessagesTask = async (): Promise<void> => {
 
     for (const msg of messages) {
       const { envelope } = msg as any;
-      const { source } = envelope;
-      const message = envelope?.dataMessage?.message;
+      const { source, sourceUuid, dataMessage } = envelope;
+      const messageID = sourceUuid;
+      const message = dataMessage?.message;
+      const timestamp = new Date(dataMessage?.timestamp);
       if (source !== number && message) {
         await worker.addJob("signal/receive-signal-message", {
           token: id,
           sender: source,
+          messageID,
           message,
+          timestamp: timestamp.toISOString(),
         });
       }
     }

apps/bridge-worker/tasks/signal/receive-signal-message.ts

@@ -4,14 +4,18 @@ interface ReceiveSignalMessageTaskOptions {
   token: string;
   sender: string;
   message: string;
+  messageID: string;
+  timestamp: string;
 }
 
 const receiveSignalMessageTask = async ({
   token,
   sender,
   message,
+  messageID,
+  timestamp,
 }: ReceiveSignalMessageTaskOptions): Promise<void> => {
-  console.log({ token, sender, message });
+  console.log({ token, sender, message, messageID, timestamp });
   const worker = await getWorkerUtils();
   const row = await db
     .selectFrom("SignalBot")
@@ -20,11 +24,14 @@ const receiveSignalMessageTask = async ({
     .executeTakeFirstOrThrow();
 
   console.log(row);
-
+  console.log(message);
   const backendId = row.id;
   const payload = {
+    to: row.phoneNumber,
+    from: sender,
+    sent_at: timestamp,
     message,
-    recipient: sender,
+    message_id: messageID,
   };
 
   await worker.addJob("common/notify-webhooks", { backendId, payload });

apps/link/middleware.ts

@@ -60,7 +60,8 @@ export default withAuth(checkRewrites, {
   },
   callbacks: {
     authorized: ({ token, req }) => {
-      if (req.nextUrl.pathname === "/api/v1") {
+      console.log({ p: req.nextUrl.pathname });
+      if (req.nextUrl.pathname.startsWith("/api/v1/")) {
         return true;
       }