@adminforth/bulk-ai-flow 1.14.3 → 1.14.5

package/dist/index.js

@@ -17,6 +17,7 @@ const jobs = new Map();
 export default class BulkAiFlowPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
+        this.rateLimiters = {};
         this.options = options;
         // for calculating average time
         this.totalCalls = 0;
@@ -47,13 +48,22 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         return this.compileTemplates(this.options.generateImages, record, v => String(v.prompt));
     }
     checkRateLimit(field, fieldNameRateLimit, headers) {
-        if (fieldNameRateLimit) {
-            // rate limit
-            const { error } = RateLimiter.checkRateLimit(field, fieldNameRateLimit, this.adminforth.auth.getClientIp(headers));
-            if (error) {
-                return { error: "Rate limit exceeded" };
+        return __awaiter(this, void 0, void 0, function* () {
+            if (fieldNameRateLimit) {
+                // rate limit
+                // const { error } = RateLimiter.checkRateLimit(
+                //   field,
+                //   fieldNameRateLimit,
+                //   this.adminforth.auth.getClientIp(headers),
+                // );
+                if (!this.rateLimiters[field]) {
+                    this.rateLimiters[field] = new RateLimiter(fieldNameRateLimit);
+                }
+                if (!(yield this.rateLimiters[field].consume(`${field}-${this.adminforth.auth.getClientIp(headers)}`))) {
+                    return { error: "Rate limit exceeded" };
+                }
             }
-        }
+        });
     }
     analyze_image(jobId, recordId, adminUser, headers) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -269,7 +279,7 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             var _a;
             const Id = recordId;
             let isError = false;
-            if (this.checkRateLimit(fieldName, this.options.generateImages[fieldName].rateLimit, headers)) {
+            if (yield this.checkRateLimit(fieldName, this.options.generateImages[fieldName].rateLimit, headers)) {
                 jobs.set(jobId, { status: 'failed', error: "Rate limit exceeded" });
                 return { error: "Rate limit exceeded" };
             }
@@ -702,17 +712,17 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
                 var _b, _c, _d;
                 const actionType = body.actionType;
                 if (actionType === 'analyze' && ((_b = this.options.rateLimits) === null || _b === void 0 ? void 0 : _b.fillFieldsFromImages)) {
-                    if (this.checkRateLimit("fillFieldsFromImages", this.options.rateLimits.fillFieldsFromImages, headers)) {
+                    if (yield this.checkRateLimit("fillFieldsFromImages", this.options.rateLimits.fillFieldsFromImages, headers)) {
                         return { ok: false, error: "Rate limit exceeded for image analyze" };
                     }
                 }
                 if (actionType === 'analyze_no_images' && ((_c = this.options.rateLimits) === null || _c === void 0 ? void 0 : _c.fillPlainFields)) {
-                    if (this.checkRateLimit("fillPlainFields", this.options.rateLimits.fillPlainFields, headers)) {
+                    if (yield this.checkRateLimit("fillPlainFields", this.options.rateLimits.fillPlainFields, headers)) {
                         return { ok: false, error: "Rate limit exceeded for plain field analyze" };
                     }
                 }
                 if (actionType === 'generate_images' && ((_d = this.options.rateLimits) === null || _d === void 0 ? void 0 : _d.generateImages)) {
-                    if (this.checkRateLimit("generateImages", this.options.rateLimits.generateImages, headers)) {
+                    if (yield this.checkRateLimit("generateImages", this.options.rateLimits.generateImages, headers)) {
                         return { ok: false, error: "Rate limit exceeded for image generation" };
                     }
                 }

package/index.ts

@@ -13,6 +13,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
   uploadPlugin: AdminForthPlugin;
   totalCalls: number;
   totalDuration: number;
+  rateLimiters: Record<string, RateLimiter> = {};
 
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
@@ -54,15 +55,18 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     return this.compileTemplates(this.options.generateImages, record, v => String(v.prompt));
   }
 
-  private checkRateLimit(field: string,fieldNameRateLimit: string | undefined, headers: Record<string, string | string[] | undefined>): { error?: string } | void {
+  private async checkRateLimit(field: string, fieldNameRateLimit: string | undefined, headers: Record<string, string | string[] | undefined>): Promise<void | { error?: string; }> {
     if (fieldNameRateLimit) {
       // rate limit
-      const { error } = RateLimiter.checkRateLimit(
-        field,
-        fieldNameRateLimit,
-        this.adminforth.auth.getClientIp(headers),
-      );
-      if (error) {
+      // const { error } = RateLimiter.checkRateLimit(
+      //   field,
+      //   fieldNameRateLimit,
+      //   this.adminforth.auth.getClientIp(headers),
+      // );
+      if (!this.rateLimiters[field]) {
+        this.rateLimiters[field] = new RateLimiter(fieldNameRateLimit);
+      }
+      if (!await this.rateLimiters[field].consume(`${field}-${this.adminforth.auth.getClientIp(headers)}`)) {
         return { error: "Rate limit exceeded" };
       }
     }
@@ -270,7 +274,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
   private async regenerateImage(jobId: string, recordId: string, fieldName: string, prompt: string, adminUser: any, headers: Record<string, string | string[] | undefined>) {
     const Id = recordId;
     let isError = false;
-    if (this.checkRateLimit(fieldName, this.options.generateImages[fieldName].rateLimit, headers)) {
+    if (await this.checkRateLimit(fieldName, this.options.generateImages[fieldName].rateLimit, headers)) {
       jobs.set(jobId, { status: 'failed', error: "Rate limit exceeded" });
       return { error: "Rate limit exceeded" };
     }
@@ -738,17 +742,17 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       handler: async ({ body, adminUser, headers }) => {
         const actionType = body.actionType;
         if (actionType === 'analyze' && this.options.rateLimits?.fillFieldsFromImages) {
-          if (this.checkRateLimit("fillFieldsFromImages" ,this.options.rateLimits.fillFieldsFromImages, headers)) {
+          if (await this.checkRateLimit("fillFieldsFromImages" ,this.options.rateLimits.fillFieldsFromImages, headers)) {
             return {ok: false, error: "Rate limit exceeded for image analyze" };
           }
         }
         if (actionType === 'analyze_no_images' && this.options.rateLimits?.fillPlainFields) {
-          if (this.checkRateLimit("fillPlainFields" ,this.options.rateLimits.fillPlainFields, headers)) {
+          if (await this.checkRateLimit("fillPlainFields" ,this.options.rateLimits.fillPlainFields, headers)) {
             return {ok: false, error: "Rate limit exceeded for plain field analyze" };
           }
         }
         if (actionType === 'generate_images' && this.options.rateLimits?.generateImages) {
-          if (this.checkRateLimit("generateImages" ,this.options.rateLimits.generateImages, headers)) {
+          if (await this.checkRateLimit("generateImages" ,this.options.rateLimits.generateImages, headers)) {
             return {ok: false, error: "Rate limit exceeded for image generation" };
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.14.3",
+  "version": "1.14.5",
   "publishConfig": {
     "access": "public"
   },
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@types/handlebars": "^4.0.40",
-    "adminforth": "^2.4.0-next.127",
+    "adminforth": "^2.4.0-next.222",
     "handlebars": "^4.7.8"
   },
   "release": {