Merge pull request #1776 from Giveth/feat/stellar_integration

fix: reduce timer to 15 mins & update renew draft donation expiration…

package.json

@@ -69,7 +69,8 @@
     "twitter-api-sdk": "^1.0.9",
     "type-graphql": "2.0.0-beta.1",
     "typedi": "0.8.0",
-    "typeorm": "0.3.20"
+    "typeorm": "0.3.20",
+    "ws": "^8.18.0"
   },
   "lint-staged": {
     "*.ts": [

src/resolvers/draftDonationResolver.ts

@@ -168,7 +168,7 @@ export class DraftDonationResolver {
             : fromAddress.toLowerCase();
 
       const expiresAt = isQRDonation
-        ? new Date(Date.now() + 30 * 60 * 1000)
+        ? new Date(Date.now() + 15 * 60 * 1000)
         : undefined;
 
       const draftDonationId = await DraftDonation.createQueryBuilder(
@@ -418,6 +418,12 @@ export class DraftDonationResolver {
         { status: DRAFT_DONATION_STATUS.FAILED },
       );
 
+      // Notify clients of new donation
+      (global as any).notifyDraftDonationFailed({
+        draftDonationId: id,
+        expiresAt: draftDonation.expiresAt,
+      });
+
       return true;
     } catch (e) {
       logger.error(
@@ -432,16 +438,16 @@ export class DraftDonationResolver {
     @Arg('id', _type => Int) id: number,
   ): Promise<DraftDonation | null> {
     try {
-      const expiresAt = new Date(Date.now() + 30 * 60 * 1000);
+      const expiresAt = new Date(Date.now() + 15 * 60 * 1000);
       const draftDonation = await DraftDonation.createQueryBuilder(
         'draftDonation',
       )
         .where('draftDonation.id = :id', { id })
         .andWhere('draftDonation.isQRDonation = :isQRDonation', {
           isQRDonation: true,
         })
-        .andWhere('draftDonation.status = :status', {
-          status: DRAFT_DONATION_STATUS.PENDING,
+        .andWhere('draftDonation.status != :status', {
+          status: DRAFT_DONATION_STATUS.MATCHED,
         })
         .getOne();
 

src/server/bootstrap.ts

@@ -68,6 +68,7 @@ import { runDraftDonationMatchWorkerJob } from '../services/cronJobs/draftDonati
 import { runCheckUserSuperTokenBalancesJob } from '../services/cronJobs/checkUserSuperTokenBalancesJob';
 import { runCheckPendingRecurringDonationsCronJob } from '../services/cronJobs/syncRecurringDonationsWithNetwork';
 import { runCheckQRTransactionJob } from '../services/cronJobs/checkQRTransactionJob';
+import { startWebSocketServer } from '../services/ws/webSocketServer';
 
 Resource.validate = validate;
 
@@ -291,6 +292,12 @@ export async function bootstrap() {
 
     const httpServer = http.createServer(app);
 
+    // Start WebSocket server
+    const { notifyDonationAdded, notifyDraftDonationFailed } =
+      startWebSocketServer(httpServer);
+    (global as any).notifyDonationAdded = notifyDonationAdded;
+    (global as any).notifyDraftDonationFailed = notifyDraftDonationFailed;
+
     await new Promise<void>((resolve, reject) => {
       httpServer
         .listen({ port: 4000 }, () => {

src/services/cronJobs/checkQRTransactionJob.ts

@@ -181,6 +181,12 @@ export async function checkTransactions(
           donationId: returnedDonation.id,
         });
 
+        // Notify clients of new donation
+        (global as any).notifyDonationAdded({
+          donationId: returnedDonation.id,
+          draftDonationId: donation.id,
+        });
+
         return;
       }
     }

src/services/ws/webSocketServer.ts

@@ -0,0 +1,46 @@
+import WebSocket from 'ws';
+import { logger } from '../../utils/logger';
+
+export function startWebSocketServer(server) {
+  const wss = new WebSocket.Server({ server });
+
+  // Handle WebSocket connections
+  wss.on('connection', ws => {
+    ws.on('message', message => {
+      logger.info(`Received message: ${message}`);
+    });
+  });
+
+  // Broadcast a message to all connected clients
+  function broadcastMessage(message) {
+    wss.clients.forEach(client => {
+      if (client.readyState === WebSocket.OPEN) {
+        client.send(message);
+      }
+    });
+  }
+
+  // Exported function to be called from cron job
+  function notifyDonationAdded(donation) {
+    const message = JSON.stringify({
+      type: 'new-donation',
+      data: donation,
+    });
+    broadcastMessage(message);
+  }
+
+  // Exported function to to be called when marking draft donation as failed
+  function notifyDraftDonationFailed(donation) {
+    const message = JSON.stringify({
+      type: 'draft-donation-failed',
+      data: donation,
+    });
+    broadcastMessage(message);
+  }
+
+  // Export the notifyDonationAdded function so it can be used externally
+  return {
+    notifyDonationAdded,
+    notifyDraftDonationFailed,
+  };
+}