@social-mail/social-mail-web-server 1.8.448 → 1.8.449

package/package.json

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

package/src/common/AsyncTaskManager.ts

@@ -3,7 +3,7 @@ import sleep from "./sleep.js";
 
 export default class AsyncTaskManager {
 
-    public rateLimit = 10;
+public rateLimit = 10;
 
     private running: Set<any> = new Set();
 

package/src/server/workflows/email/index/IndexEmailContentWorkflow.ts

@@ -1,11 +1,12 @@
 /* eslint-disable no-console */
-import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
 import IndexEmailService from "../../../services/emails/IndexEmailService.js";
 import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
 import { globalEnv } from "../../../../common/globalEnv.js";
+import AsyncTaskManager from "../../../../common/AsyncTaskManager.js";
 
 export default class IndexEmailContentWorkflow extends Workflow {
 
@@ -24,13 +25,11 @@ export default class IndexEmailContentWorkflow extends Workflow {
 
     @UniqueActivity
     async index(
-        @Inject db?: SocialMailContext,
-        @Inject indexService?: IndexEmailService
+        @Inject db?: SocialMailContext
     ) {
 
         for(let i = 0;i<1000;i++) {
 
-
             const pending = await db.emails.where(void 0, (p) => (x) => x.searchIndexed === false
                 && x.statePostReceiveInvoked === true)
                 .orderByDescending(void 0, (p) => (x) => x.emailID)
@@ -43,17 +42,26 @@ export default class IndexEmailContentWorkflow extends Workflow {
                 return;
             }
 
-            for (const email of pending) {
-                try {
-                    await indexService.indexEmail(email);
-                } catch (error) {
-                    console.error(error);
-                }
-                const { emailID } = email;
-                await db.emails.statements.update({ searchIndexed: true }, { emailID });
-            }
+            const at = new AsyncTaskManager();
+            at.rateLimit = 5;
+
+            await Promise.all(pending.map((x) => at.run(() => this.indexEmail(x))));
+
             db.changeSet.clear();
         }
     }
 
+    async indexEmail(email: { emailID: number; textBody: string; }) {
+        using scope = ServiceProvider.createScope(this.context);
+        const db = scope.resolve(SocialMailContext);
+        const indexService = scope.resolve(IndexEmailService);
+        try {
+            await indexService.indexEmail(email);
+        } catch (error) {
+            console.error(error);
+        }
+        const { emailID } = email;
+        await db.emails.statements.update({ searchIndexed: true }, { emailID });
+    }
+
 }