@adminforth/rich-editor 1.0.15 → 1.0.16

package/dist/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AdminForthPlugin, Filters, getClientIp, RateLimiter } from "adminforth";
+import { AdminForthPlugin, Filters, RateLimiter } from "adminforth";
 import * as cheerio from 'cheerio';
 // options:
 // attachments: {
@@ -31,6 +31,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             _super.modifyResourceConfig.call(this, adminforth, resourceConfig);
+            this.adminforth = adminforth;
             const c = resourceConfig.columns.find(c => c.name === this.options.htmlFieldName);
             if (!c) {
                 throw new Error(`Column ${this.options.htmlFieldName} not found in resource ${resourceConfig.label}`);
@@ -160,6 +161,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
         });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
+        this.adminforth = adminforth;
         // optional method where you can safely check field types after database discovery was performed
         if (this.options.completion && this.options.completion.provider !== 'openai-chat-gpt') {
             throw new Error(`Invalid provider ${this.options.completion.provider}`);
@@ -208,7 +210,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
                 const { record } = body;
                 if ((_b = this.options.completion.rateLimit) === null || _b === void 0 ? void 0 : _b.limit) {
                     // rate limit
-                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_c = this.options.completion.rateLimit) === null || _c === void 0 ? void 0 : _c.limit, getClientIp(headers));
+                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_c = this.options.completion.rateLimit) === null || _c === void 0 ? void 0 : _c.limit, this.adminforth.auth.getClientIp(headers));
                     if (error) {
                         return {
                             completion: [],

package/index.ts

@@ -1,7 +1,7 @@
 
 import type { IAdminForth, IHttpServer, AdminForthResource, AdminUser, AfterSaveFunction } from "adminforth";
 import type { PluginOptions } from './types.js';
-import { AdminForthPlugin, Filters, getClientIp, RateLimiter } from "adminforth";
+import { AdminForthPlugin, Filters, RateLimiter } from "adminforth";
 import * as cheerio from 'cheerio';
 
 
@@ -22,6 +22,8 @@ export default class RichEditorPlugin extends AdminForthPlugin {
   activationOrder: number = 100000;
 
   attachmentResource: AdminForthResource = undefined;
+
+  adminforth: IAdminForth;
   
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
@@ -30,6 +32,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
 
   async modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     super.modifyResourceConfig(adminforth, resourceConfig);
+    this.adminforth = adminforth;
 
     const c = resourceConfig.columns.find(c => c.name === this.options.htmlFieldName);
     if (!c) {
@@ -204,6 +207,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
   }
   
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
+    this.adminforth = adminforth;
     // optional method where you can safely check field types after database discovery was performed
     if (this.options.completion && this.options.completion.provider !== 'openai-chat-gpt') {
       throw new Error(`Invalid provider ${this.options.completion.provider}`);
@@ -265,7 +269,7 @@ export default class RichEditorPlugin extends AdminForthPlugin {
           const { error } = RateLimiter.checkRateLimit(
             this.pluginInstanceId, 
             this.options.completion.rateLimit?.limit,
-            getClientIp(headers),
+            this.adminforth.auth.getClientIp(headers),
           );
           if (error) {
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/rich-editor",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "",
   "type": "module",
   "main": "dist/index.js",