@social-mail/social-mail-web-server 1.7.320 → 1.7.321

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.320",
+  "version": "1.7.321",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/StorePaymentAttempt.ts

@@ -6,8 +6,18 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { StoreAccount } from "./StoreAccount.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import StorePaymentGateway from "./StorePaymentGateway.js";
+import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 
 @Table("StorePaymentAttempt")
+@Index({
+    name: "IX_StorePaymentAttempt_Pending",
+    columns: [
+        { name: (x) => x.attemptID, descending: false },
+        { name: (x) => x.timedout, descending: false },
+        { name: (x) => x.success, descending: false }
+    ],
+    filter: (x) => x.timedout === false && x.success === false
+})
 export default class StorePaymentAttempt {
 
     @Column({ dataType: "BigInt", key: true, generated: "identity"})
@@ -47,6 +57,9 @@ export default class StorePaymentAttempt {
     @Column({ dataType: "Boolean", default: () => false})
     success: boolean;
 
+    @Column({ dataType: "Boolean", default: () => false})
+    timedout: boolean;
+
     order: StoreJournal;
 
     gateway: StorePaymentGateway;

package/src/server/services/store/StorePaymentGatewayService.ts

@@ -61,11 +61,6 @@ export default class StorePaymentGatewayService {
 
         const pg = await LedgerPaymentGateway.for(this, gateway.paymentGateway);
 
-        await this.context.queue(FetchCheckoutResultWorkflow, { paymentID: pa.attemptID }, {
-            id: `fetch-payment-${pa.attemptID}`,
-            eta: DateTime.now.addSeconds(60)
-        });
-
         return await pg.createPayment( host, gateway, order, pa);
     }
 

package/src/server/workflows/daily/DailyWorkflow.ts

@@ -12,6 +12,7 @@ import DbLockService from "../../services/db-lock/DbLockService.js";
 import PendingPostReceiveWorkflow from "../pending/PendingPostReceiveWorkflow.js";
 import PendingReferencesWorkflow from "../pending/PendingReferencesWorkflow.js";
 import MessagingService from "../../services/message-events/MessagingService.js";
+import FetchCheckoutResultWorkflow from "../store/FetchCheckoutResultWorkflow.js";
 
 export default class DailyWorkflow extends Workflow<any,any> {
 
@@ -63,6 +64,10 @@ export default class DailyWorkflow extends Workflow<any,any> {
             await SyncMailboxWorkflow.startSyncing(this.context, iterator.syncTargetID);
         }
 
+        await this.context.queue(FetchCheckoutResultWorkflow, null , {
+            id: `fetch-checkout-result-${Date.now()}`
+        });
+
         // const mbs = await db.mailboxes.where({}, (p) => (x) => x.indexAttachments === true)
         //     .select({}, (p) => ({ mailboxID}) => ({ mailboxID }))
         //     .toArray();

package/src/server/workflows/store/FetchCheckoutResultWorkflow.ts

@@ -3,28 +3,53 @@ import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/work
 import SocialMailContext from "../../model/SocialMailContext.js";
 import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
 import StorePaymentGatewayService from "../../services/store/StorePaymentGatewayService.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
-export default class FetchCheckoutResultWorkflow extends Workflow<{ paymentID }> {
+export default class FetchCheckoutResultWorkflow extends Workflow {
 
     async run() {
-        for (let index = 0; index < 100; index++) {
-            const r = await this.fetchResult(index);
-            if (r) {
-                return;
+        this.preserveTime = TimeSpan.fromMinutes(5);
+        let start = 0;
+        for(;;) {
+            start = await this.fetchResult(start);
+            if (!BigInt(start)) {
+                break;
             }
-            await this.delay(TimeSpan.fromSeconds((index + 1) * 5));
         }
     }
 
     @UniqueActivity
     async fetchResult(
-        index: number,
+        start: number,
+        @Inject db?: SocialMailContext,
         @Inject spg?: StorePaymentGatewayService
     ) {
-        const p = await spg.checkoutResult(this.input.paymentID);
-        if (p.success) {
-            return true;
+        for (let index = 0; index < 100; index++) {
+            const items = await db.storePaymentAttempts.where({ start }, (p) => (x) => x.attemptID > p.start
+                && x.success === false
+                && x.timedout === false)
+                .orderBy(void 0, (p) => (x) => x.attemptID)
+                .limit(10)
+                .toArray();
+
+            if (!items.length) {
+                return 0;
+            }
+
+            for (const item of items) {
+                start = item.attemptID;
+                const pmt = await spg.checkoutResult(this.input.paymentID);
+                if (pmt.success) {
+                    continue;
+                }
+                const started = DateTime.from(item.dateCreated);
+                const yesterday = DateTime.now.addDays(-1);
+                if (started.msSinceEpoch < yesterday.msSinceEpoch) {
+                    await db.storePaymentAttempts.statements.update({ timedout: true }, { attemptID: start });
+                }
+            }
+            db.changeSet.clear();
         }
-        return false;
+        return start;
     }
 }