@adminforth/upload 2.3.4 → 2.3.6

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 46,954 bytes  received 134 bytes  94,176.00 bytes/sec
+sent 46,940 bytes  received 134 bytes  94,148.00 bytes/sec
 total size is 46,465  speedup is 0.99

package/dist/index.js

@@ -13,11 +13,15 @@ import { RateLimiter } from "adminforth";
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 export default class UploadPlugin extends AdminForthPlugin {
     constructor(options) {
+        var _a, _b, _c;
         super(options, import.meta.url);
         this.options = options;
         // for calcualting average time
         this.totalCalls = 0;
         this.totalDuration = 0;
+        if ((_b = (_a = this.options.generation) === null || _a === void 0 ? void 0 : _a.rateLimit) === null || _b === void 0 ? void 0 : _b.limit) {
+            this.rateLimiter = new RateLimiter((_c = this.options.generation.rateLimit) === null || _c === void 0 ? void 0 : _c.limit);
+        }
     }
     instanceUniqueRepresentation(pluginOptions) {
         return `${pluginOptions.pathColumnName}`;
@@ -303,17 +307,16 @@ export default class UploadPlugin extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/generate_images`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers }) {
-                var _b, _c, _d;
+                var _b;
                 const { prompt, recordId } = body;
-                if ((_b = this.options.generation.rateLimit) === null || _b === void 0 ? void 0 : _b.limit) {
+                if (this.rateLimiter) {
                     // rate limit
                     // const { error } = RateLimiter.checkRateLimit(
                     //   this.pluginInstanceId, 
                     //   this.options.generation.rateLimit?.limit,
                     //   this.adminforth.auth.getClientIp(headers),
                     // );
-                    const rateLimiter = new RateLimiter((_c = this.options.generation.rateLimit) === null || _c === void 0 ? void 0 : _c.limit);
-                    if (!rateLimiter.consume(`${this.pluginInstanceId}-${this.adminforth.auth.getClientIp(headers)}`)) {
+                    if (!(yield this.rateLimiter.consume(`${this.pluginInstanceId}-${this.adminforth.auth.getClientIp(headers)}`))) {
                         return { error: this.options.generation.rateLimit.errorMessage };
                     }
                 }
@@ -321,7 +324,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                 if (this.options.generation.attachFiles) {
                     // TODO - does it require additional allowed action to check this record id has access to get the image?
                     // or should we mention in docs that user should do validation in method itself
-                    const record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ((_d = this.resourceConfig.columns.find((column) => column.primaryKey)) === null || _d === void 0 ? void 0 : _d.name, recordId)]);
+                    const record = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ((_b = this.resourceConfig.columns.find((column) => column.primaryKey)) === null || _b === void 0 ? void 0 : _b.name, recordId)]);
                     if (!record) {
                         return { error: `Record with id ${recordId} not found` };
                     }

package/index.ts

@@ -16,6 +16,8 @@ export default class UploadPlugin extends AdminForthPlugin {
 
   resourceConfig: AdminForthResource;
 
+  rateLimiter: RateLimiter;
+
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
@@ -23,6 +25,9 @@ export default class UploadPlugin extends AdminForthPlugin {
     // for calcualting average time
     this.totalCalls = 0;
     this.totalDuration = 0;
+    if (this.options.generation?.rateLimit?.limit) {
+    this.rateLimiter = new RateLimiter(this.options.generation.rateLimit?.limit)
+    }
   }
 
   instanceUniqueRepresentation(pluginOptions: any) : string {
@@ -344,15 +349,14 @@ export default class UploadPlugin extends AdminForthPlugin {
       path: `/plugin/${this.pluginInstanceId}/generate_images`,
       handler: async ({ body, adminUser, headers }) => {
         const { prompt, recordId } = body;
-        if (this.options.generation.rateLimit?.limit) {
+        if (this.rateLimiter) {
           // rate limit
           // const { error } = RateLimiter.checkRateLimit(
           //   this.pluginInstanceId, 
           //   this.options.generation.rateLimit?.limit,
           //   this.adminforth.auth.getClientIp(headers),
           // );
-          const rateLimiter = new RateLimiter(this.options.generation.rateLimit?.limit);
-          if (!rateLimiter.consume(`${this.pluginInstanceId}-${this.adminforth.auth.getClientIp(headers)}`)) {
+          if (!await this.rateLimiter.consume(`${this.pluginInstanceId}-${this.adminforth.auth.getClientIp(headers)}`)) {
             return { error: this.options.generation.rateLimit.errorMessage };
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",