libre-webui 0.21.3 → 0.22.1

package/backend/dist/services/pluginCredentialsService.d.ts

@@ -13,7 +13,7 @@ declare class PluginCredentialsService {
     getStoredApiKey(pluginId: string, userId: string | undefined, options: {
         expectedRoutingAuthFingerprint: string;
         allowLegacyUnboundCredential: boolean;
-    }): string | null;
+    }): Promise<string | null>;
     /**
      * Get an API key for a specific plugin and user.
      * Environment fallback must be disabled when the effective route comes from
@@ -23,31 +23,32 @@ declare class PluginCredentialsService {
         allowEnvironmentFallback: boolean;
         expectedRoutingAuthFingerprint: string;
         allowLegacyUnboundCredential: boolean;
-    }): string | null;
+    }): Promise<string | null>;
     /**
      * Get all credentials for a user (API keys are masked for security)
      */
-    getCredentials(userId?: string): Array<{
+    getCredentials(userId?: string): Promise<Array<{
         plugin_id: string;
         has_api_key: boolean;
         updated_at: number;
-    }>;
+    }>>;
     /**
      * Set or update API key for a plugin
      */
-    setApiKey(pluginId: string, apiKey: string, userId: string | undefined, routingAuthFingerprint: string): boolean;
+    setApiKey(pluginId: string, apiKey: string, userId: string | undefined, routingAuthFingerprint: string): Promise<boolean>;
     /**
      * Delete API key for a plugin
      */
-    deleteApiKey(pluginId: string, userId?: string): boolean;
+    deleteApiKey(pluginId: string, userId?: string): Promise<boolean>;
     /**
      * Delete all credentials for a user (used when user account is deleted)
      */
-    deleteAllUserCredentials(userId: string): boolean;
+    deleteAllUserCredentials(userId: string): Promise<boolean>;
     /**
      * Delete all credentials for a plugin (used when plugin is deleted)
      */
-    deleteAllPluginCredentials(pluginId: string): boolean;
+    deleteAllPluginCredentials(pluginId: string): Promise<boolean>;
+    private repository;
 }
 declare const pluginCredentialsService: PluginCredentialsService;
 export default pluginCredentialsService;

package/backend/dist/services/pluginCredentialsService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginCredentialsService.d.ts","sourceRoot":"","sources":["../../src/services/pluginCredentialsService.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAYD,cAAM,wBAAwB;IAC5B;;OAEG;IACH,eAAe,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE;QACP,8BAA8B,EAAE,MAAM,CAAC;QACvC,4BAA4B,EAAE,OAAO,CAAC;KACvC,GACA,MAAM,GAAG,IAAI,CAuDf;IAED;;;;OAIG;IACH,SAAS,CACP,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE;QACP,wBAAwB,EAAE,OAAO,CAAC;QAClC,8BAA8B,EAAE,MAAM,CAAC;QACvC,4BAA4B,EAAE,OAAO,CAAC;KACvC,GACA,MAAM,GAAG,IAAI,CAKf;IAED;;OAEG;IACH,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QACrC,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,OAAO,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CA4BD;IAED;;OAEG;IACH,SAAS,CACP,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,sBAAsB,EAAE,MAAM,GAC7B,OAAO,CA0DT;IAED;;OAEG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CA0BvD;IAED;;OAEG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAoBhD;IAED;;OAEG;IACH,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAoBpD;CACF;AAED,QAAA,MAAM,wBAAwB,0BAAiC,CAAC;eACjD,wBAAwB"}
+{"version":3,"file":"pluginCredentialsService.d.ts","sourceRoot":"","sources":["../../src/services/pluginCredentialsService.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,cAAM,wBAAwB;IAC5B;;OAEG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE;QACP,8BAA8B,EAAE,MAAM,CAAC;QACvC,4BAA4B,EAAE,OAAO,CAAC;KACvC,GACA,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoCxB;IAED;;;;OAIG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE;QACP,wBAAwB,EAAE,OAAO,CAAC;QAClC,8BAA8B,EAAE,MAAM,CAAC;QACvC,4BAA4B,EAAE,OAAO,CAAC;KACvC,GACA,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKxB;IAED;;OAEG;IACG,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAC5C,KAAK,CAAC;QACJ,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,OAAO,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CACH,CAeA;IAED;;OAEG;IACG,SAAS,CACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,sBAAsB,EAAE,MAAM,GAC7B,OAAO,CAAC,OAAO,CAAC,CA8BlB;IAED;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBtE;IAED;;OAEG;IACG,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAY/D;IAED;;OAEG;IACG,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAYnE;IAED,OAAO,CAAC,UAAU;CAInB;AAED,QAAA,MAAM,wBAAwB,0BAAiC,CAAC;eACjD,wBAAwB"}

package/backend/dist/services/pluginCredentialsService.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { v4 as uuidv4 } from 'uuid';
-import { getDatabaseSafe } from '../db.js';
+import { getPersistence } from '../persistence/index.js';
 import { encryptionService } from './encryptionService.js';
 import { createLogger } from '../utils/logger.js';
 const logger = createLogger('services:plugin-credentials-service');
@@ -23,45 +23,33 @@ class PluginCredentialsService {
     /**
      * Get only the API key stored for a specific plugin and user.
      */
-    getStoredApiKey(pluginId, userId, options) {
+    async getStoredApiKey(pluginId, userId, options) {
         const effectiveUserId = userId || 'default';
-        const db = getDatabaseSafe();
-        if (db) {
-            try {
-                const row = db
-                    .prepare(`SELECT id, api_key, routing_auth_fingerprint
-             FROM plugin_credentials
-             WHERE plugin_id = ? AND user_id = ?`)
-                    .get(pluginId, effectiveUserId);
-                if (row?.api_key) {
-                    const bindingMatches = row.routing_auth_fingerprint ===
-                        options.expectedRoutingAuthFingerprint;
-                    const trustedLegacyCredential = row.routing_auth_fingerprint === null &&
-                        options.allowLegacyUnboundCredential;
-                    if (!bindingMatches && !trustedLegacyCredential) {
+        try {
+            const row = await this.repository().find(pluginId, effectiveUserId);
+            if (row?.api_key) {
+                const bindingMatches = row.routing_auth_fingerprint ===
+                    options.expectedRoutingAuthFingerprint;
+                const trustedLegacyCredential = row.routing_auth_fingerprint === null &&
+                    options.allowLegacyUnboundCredential;
+                if (!bindingMatches && !trustedLegacyCredential) {
+                    return null;
+                }
+                if (trustedLegacyCredential) {
+                    if (!(await this.repository().bindLegacy(row.id, options.expectedRoutingAuthFingerprint))) {
                         return null;
                     }
-                    if (trustedLegacyCredential) {
-                        const result = db
-                            .prepare(`UPDATE plugin_credentials
-                 SET routing_auth_fingerprint = ?
-                 WHERE id = ? AND routing_auth_fingerprint IS NULL`)
-                            .run(options.expectedRoutingAuthFingerprint, row.id);
-                        if (result.changes !== 1) {
-                            return null;
-                        }
-                    }
-                    // Decrypt the API key
-                    const decryptedKey = encryptionService.decrypt(row.api_key);
-                    if (decryptedKey) {
-                        return decryptedKey;
-                    }
                 }
-            }
-            catch (error) {
-                logger.error('Failed to get API key for plugin %s:', pluginId, error);
+                // Decrypt the API key
+                const decryptedKey = encryptionService.decrypt(row.api_key);
+                if (decryptedKey) {
+                    return decryptedKey;
+                }
             }
         }
+        catch (error) {
+            logger.error('Failed to get API key for plugin %s:', pluginId, error);
+        }
         return null;
     }
     /**
@@ -69,8 +57,8 @@ class PluginCredentialsService {
      * Environment fallback must be disabled when the effective route comes from
      * a user-stored connection override.
      */
-    getApiKey(pluginId, keyEnv, userId, options) {
-        const storedApiKey = this.getStoredApiKey(pluginId, userId, options);
+    async getApiKey(pluginId, keyEnv, userId, options) {
+        const storedApiKey = await this.getStoredApiKey(pluginId, userId, options);
         if (storedApiKey)
             return storedApiKey;
         if (!options.allowEnvironmentFallback)
@@ -80,16 +68,10 @@ class PluginCredentialsService {
     /**
      * Get all credentials for a user (API keys are masked for security)
      */
-    getCredentials(userId) {
+    async getCredentials(userId) {
         const effectiveUserId = userId || 'default';
-        const db = getDatabaseSafe();
-        if (!db) {
-            return [];
-        }
         try {
-            const rows = db
-                .prepare('SELECT plugin_id, api_key, updated_at FROM plugin_credentials WHERE user_id = ?')
-                .all(effectiveUserId);
+            const rows = await this.repository().listByUser(effectiveUserId);
             return rows.map(row => ({
                 plugin_id: row.plugin_id,
                 has_api_key: Boolean(row.api_key),
@@ -104,13 +86,8 @@ class PluginCredentialsService {
     /**
      * Set or update API key for a plugin
      */
-    setApiKey(pluginId, apiKey, userId, routingAuthFingerprint) {
+    async setApiKey(pluginId, apiKey, userId, routingAuthFingerprint) {
         const effectiveUserId = userId || 'default';
-        const db = getDatabaseSafe();
-        if (!db) {
-            logger.error('Database not available for storing plugin credentials');
-            return false;
-        }
         if (!routingAuthFingerprint) {
             logger.error('Routing/auth binding is required for plugin credentials');
             return false;
@@ -118,24 +95,16 @@ class PluginCredentialsService {
         try {
             const now = Date.now();
             const encryptedKey = encryptionService.encrypt(apiKey);
-            // Check if credential already exists
-            const existing = db
-                .prepare('SELECT id FROM plugin_credentials WHERE plugin_id = ? AND user_id = ?')
-                .get(pluginId, effectiveUserId);
-            if (existing) {
-                // Update existing credential
-                db.prepare(`UPDATE plugin_credentials
-           SET api_key = ?, routing_auth_fingerprint = ?, updated_at = ?
-           WHERE id = ?`).run(encryptedKey, routingAuthFingerprint, now, existing.id);
-            }
-            else {
-                // Insert new credential
-                const id = uuidv4();
-                db.prepare(`INSERT INTO plugin_credentials
-             (id, user_id, plugin_id, api_key, routing_auth_fingerprint,
-              created_at, updated_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?)`).run(id, effectiveUserId, pluginId, encryptedKey, routingAuthFingerprint, now, now);
-            }
+            const existing = await this.repository().find(pluginId, effectiveUserId);
+            await this.repository().upsert({
+                id: existing?.id ?? uuidv4(),
+                user_id: effectiveUserId,
+                plugin_id: pluginId,
+                api_key: encryptedKey,
+                routing_auth_fingerprint: routingAuthFingerprint,
+                created_at: existing?.created_at ?? now,
+                updated_at: now,
+            });
             logger.debug(`API key ${existing ? 'updated' : 'set'} for plugin ${pluginId} (user: ${effectiveUserId})`);
             return true;
         }
@@ -147,17 +116,11 @@ class PluginCredentialsService {
     /**
      * Delete API key for a plugin
      */
-    deleteApiKey(pluginId, userId) {
+    async deleteApiKey(pluginId, userId) {
         const effectiveUserId = userId || 'default';
-        const db = getDatabaseSafe();
-        if (!db) {
-            return false;
-        }
         try {
-            const result = db
-                .prepare('DELETE FROM plugin_credentials WHERE plugin_id = ? AND user_id = ?')
-                .run(pluginId, effectiveUserId);
-            if (result.changes > 0) {
+            const deleted = await this.repository().delete(pluginId, effectiveUserId);
+            if (deleted) {
                 logger.debug(`API key deleted for plugin ${pluginId} (user: ${effectiveUserId})`);
                 return true;
             }
@@ -171,13 +134,9 @@ class PluginCredentialsService {
     /**
      * Delete all credentials for a user (used when user account is deleted)
      */
-    deleteAllUserCredentials(userId) {
-        const db = getDatabaseSafe();
-        if (!db) {
-            return false;
-        }
+    async deleteAllUserCredentials(userId) {
         try {
-            db.prepare('DELETE FROM plugin_credentials WHERE user_id = ?').run(userId);
+            await this.repository().deleteByUser(userId);
             logger.debug(`All plugin credentials deleted for user ${userId}`);
             return true;
         }
@@ -189,13 +148,9 @@ class PluginCredentialsService {
     /**
      * Delete all credentials for a plugin (used when plugin is deleted)
      */
-    deleteAllPluginCredentials(pluginId) {
-        const db = getDatabaseSafe();
-        if (!db) {
-            return false;
-        }
+    async deleteAllPluginCredentials(pluginId) {
         try {
-            db.prepare('DELETE FROM plugin_credentials WHERE plugin_id = ?').run(pluginId);
+            await this.repository().deleteByPlugin(pluginId);
             logger.debug(`All credentials deleted for plugin ${pluginId}`);
             return true;
         }
@@ -204,6 +159,10 @@ class PluginCredentialsService {
             return false;
         }
     }
+    repository() {
+        return getPersistence(encryptionService).repositories.extensions
+            .pluginCredentials;
+    }
 }
 const pluginCredentialsService = new PluginCredentialsService();
 export default pluginCredentialsService;

package/backend/dist/services/pluginCredentialsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"pluginCredentialsService.js","sourceRoot":"","sources":["../../src/services/pluginCredentialsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pluginCredentialsService.js","sourceRoot":"","sources":["../../src/services/pluginCredentialsService.ts"],"names":[],"mappings":"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"}

package/backend/dist/services/pluginEmbeddingService.d.ts

@@ -1,26 +1,27 @@
 import { EmbeddingModel, OllamaEmbeddingsResponse, Plugin } from '../types/index.js';
 import type { PluginUsageEventInput } from './pluginUsageService.js';
 type PluginVariables = Record<string, string | number | boolean>;
+type MaybePromise<T> = T | Promise<T>;
 export interface PluginEmbeddingServiceDependencies {
-    getAllPlugins(userId?: string): Plugin[];
-    getApiKey(plugin: Plugin, userId?: string): string | null;
-    getPluginVariables(plugin: Plugin, userId?: string): PluginVariables;
+    getAllPlugins(userId?: string): MaybePromise<Plugin[]>;
+    getApiKey(plugin: Plugin, userId?: string): MaybePromise<string | null>;
+    getPluginVariables(plugin: Plugin, userId?: string): MaybePromise<PluginVariables>;
     validateEndpointUrl(endpoint: string): string;
     recordUsage?(usage: PluginUsageEventInput): void;
 }
 export declare class PluginEmbeddingService {
     private readonly deps;
     constructor(deps: PluginEmbeddingServiceDependencies);
-    getPluginForEmbedding(model: string, pluginId?: string, userId?: string): Plugin | null;
-    getAvailableEmbeddingModels(userId?: string): Array<{
+    getPluginForEmbedding(model: string, pluginId?: string, userId?: string): Promise<Plugin | null>;
+    getAvailableEmbeddingModels(userId?: string): Promise<Array<{
         model: string;
         plugin: string;
         pluginName: string;
         provider: EmbeddingModel['provider'];
         description?: string;
         fromEmbeddingCapability?: boolean;
-    }>;
-    executeEmbeddingRequest(model: string, input: string | string[], pluginId?: string, userId?: string): Promise<OllamaEmbeddingsResponse>;
+    }>>;
+    executeEmbeddingRequest(model: string, input: string | string[], pluginId?: string, userId?: string, signal?: AbortSignal): Promise<OllamaEmbeddingsResponse>;
     private getEmbeddingCapability;
 }
 export declare function getEmbeddingEndpoint(endpoint: string): string;

package/backend/dist/services/pluginEmbeddingService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginEmbeddingService.d.ts","sourceRoot":"","sources":["../../src/services/pluginEmbeddingService.ts"],"names":[],"mappings":"AAkBA,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAEjE,MAAM,WAAW,kCAAkC;IACjD,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1D,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IACrE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9C,WAAW,CAAC,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAClD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,kCAAkC,EAAI;IAEzE,qBAAqB,CACnB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CA8Bf;IAED,2BAA2B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QAClD,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;QACrC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;KACnC,CAAC,CA+CD;IAEK,uBAAuB,CAC3B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,wBAAwB,CAAC,CAmInC;IAED,OAAO,CAAC,sBAAsB;CAS/B;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B7D"}
+{"version":3,"file":"pluginEmbeddingService.d.ts","sourceRoot":"","sources":["../../src/services/pluginEmbeddingService.ts"],"names":[],"mappings":"AAkBA,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AACjE,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEtC,MAAM,WAAW,kCAAkC;IACjD,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxE,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,YAAY,CAAC,eAAe,CAAC,CAAC;IACjC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9C,WAAW,CAAC,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAClD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,kCAAkC,EAAI;IAEnE,qBAAqB,CACzB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8BxB;IAEK,2BAA2B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CACzD,KAAK,CAAC;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;QACrC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;KACnC,CAAC,CACH,CA+CA;IAEK,uBAAuB,CAC3B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EACxB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,wBAAwB,CAAC,CAqInC;IAED,OAAO,CAAC,sBAAsB;CAS/B;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B7D"}

package/backend/dist/services/pluginEmbeddingService.js

@@ -20,8 +20,8 @@ export class PluginEmbeddingService {
     constructor(deps) {
         this.deps = deps;
     }
-    getPluginForEmbedding(model, pluginId, userId) {
-        const allPlugins = this.deps.getAllPlugins(userId);
+    async getPluginForEmbedding(model, pluginId, userId) {
+        const allPlugins = await this.deps.getAllPlugins(userId);
         for (const plugin of allPlugins) {
             if (pluginId && plugin.id !== pluginId) {
                 continue;
@@ -37,21 +37,21 @@ export class PluginEmbeddingService {
             }
             const noAuthRequired = embeddingCapability?.config
                 ?.no_auth_required === true;
-            const apiKey = this.deps.getApiKey(plugin, userId);
+            const apiKey = await this.deps.getApiKey(plugin, userId);
             if (apiKey || noAuthRequired) {
                 return plugin;
             }
         }
         return null;
     }
-    getAvailableEmbeddingModels(userId) {
+    async getAvailableEmbeddingModels(userId) {
         const models = [];
-        const allPlugins = this.deps.getAllPlugins(userId);
+        const allPlugins = await this.deps.getAllPlugins(userId);
         for (const plugin of allPlugins) {
             const embeddingCapability = this.getEmbeddingCapability(plugin);
             const noAuthRequired = embeddingCapability?.config
                 ?.no_auth_required === true;
-            const apiKey = this.deps.getApiKey(plugin, userId);
+            const apiKey = await this.deps.getApiKey(plugin, userId);
             if (!apiKey && !noAuthRequired) {
                 continue;
             }
@@ -78,16 +78,16 @@ export class PluginEmbeddingService {
         }
         return models;
     }
-    async executeEmbeddingRequest(model, input, pluginId, userId) {
+    async executeEmbeddingRequest(model, input, pluginId, userId, signal) {
         validatePluginModel(model);
-        const plugin = this.getPluginForEmbedding(model, pluginId, userId);
+        const plugin = await this.getPluginForEmbedding(model, pluginId, userId);
         if (!plugin) {
             throw new Error(`No embedding plugin found for model: ${model}`);
         }
         const embeddingCapability = this.getEmbeddingCapability(plugin);
         const noAuthRequired = embeddingCapability?.config
             ?.no_auth_required === true;
-        const pluginVars = this.deps.getPluginVariables(plugin, userId);
+        const pluginVars = await this.deps.getPluginVariables(plugin, userId);
         const endpointVariable = embeddingCapability?.config?.endpoint_variable ||
             (embeddingCapability && plugin.type !== 'embedding'
                 ? 'embedding_endpoint'
@@ -105,7 +105,7 @@ export class PluginEmbeddingService {
             ? applyModelEndpointTemplate(effectiveEndpoint, model)
             : getEmbeddingEndpoint(effectiveEndpoint);
         assertSafePluginEndpoint(processedEndpoint, 'embedding endpoint');
-        const apiKey = this.deps.getApiKey(plugin, userId);
+        const apiKey = await this.deps.getApiKey(plugin, userId);
         if (!apiKey && !noAuthRequired) {
             throw new Error(`API key not found for plugin ${plugin.id} (save a provider credential in Settings)`);
         }
@@ -116,6 +116,7 @@ export class PluginEmbeddingService {
                 headers,
                 timeout: 60000,
                 maxRedirects: 0,
+                signal,
             });
             let result;
             if (Array.isArray(response.data) &&
@@ -163,13 +164,14 @@ export class PluginEmbeddingService {
             return result;
         }
         catch (error) {
+            const cancelled = signal?.aborted === true || axios.isCancel(error);
             this.deps.recordUsage?.({
                 userId,
                 pluginId: plugin.id,
                 pluginName: plugin.name,
                 capability: 'embedding',
                 model,
-                status: 'error',
+                status: cancelled ? 'cancelled' : 'error',
                 durationMs: Date.now() - startedAt,
                 inputUnits: Array.isArray(input) ? input.length : 1,
                 unitKind: 'inputs',

package/backend/dist/services/pluginEmbeddingService.js.map

@@ -1 +1 @@
-{"version":3,"file":"pluginEmbeddingService.js","sourceRoot":"","sources":["../../src/services/pluginEmbeddingService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pluginEmbeddingService.js","sourceRoot":"","sources":["../../src/services/pluginEmbeddingService.ts"],"names":[],"mappings":"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"}

package/backend/dist/services/pluginImageGenerationService.d.ts

@@ -1,24 +1,25 @@
 import { ImageGenConfig, ImageGenResponse, Plugin } from '../types/index.js';
 import type { PluginUsageEventInput } from './pluginUsageService.js';
 type PluginVariables = Record<string, string | number | boolean>;
+type MaybePromise<T> = T | Promise<T>;
 type ImageGenImage = ImageGenResponse['images'][number];
 export interface PluginImageGenerationServiceDependencies {
-    getAllPlugins(userId?: string): Plugin[];
-    getPlugin(id: string, userId?: string): Plugin | null;
-    getApiKey(plugin: Plugin, userId?: string): string | null;
-    getPluginVariables(plugin: Plugin, userId?: string): PluginVariables;
+    getAllPlugins(userId?: string): MaybePromise<Plugin[]>;
+    getPlugin(id: string, userId?: string): MaybePromise<Plugin | null>;
+    getApiKey(plugin: Plugin, userId?: string): MaybePromise<string | null>;
+    getPluginVariables(plugin: Plugin, userId?: string): MaybePromise<PluginVariables>;
     validateEndpointUrl(endpoint: string): string;
     recordUsage?(usage: PluginUsageEventInput): void;
 }
 export declare class PluginImageGenerationService {
     private readonly deps;
     constructor(deps: PluginImageGenerationServiceDependencies);
-    getPluginForImageGen(model: string, pluginId: string, userId?: string): Plugin | null;
-    getAvailableImageGenModels(userId?: string): {
+    getPluginForImageGen(model: string, pluginId: string, userId?: string): Promise<Plugin | null>;
+    getAvailableImageGenModels(userId?: string): Promise<{
         model: string;
         plugin: string;
         config?: ImageGenConfig;
-    }[];
+    }[]>;
     executeImageGenRequest(model: string, prompt: string, options: {
         size?: string;
         quality?: string;
@@ -27,8 +28,9 @@ export declare class PluginImageGenerationService {
         response_format?: 'url' | 'b64_json';
         pluginId: string;
         userId?: string;
+        signal?: AbortSignal;
     }): Promise<ImageGenResponse>;
-    getImageGenConfig(pluginId: string, userId?: string): ImageGenConfig | null;
+    getImageGenConfig(pluginId: string, userId?: string): Promise<ImageGenConfig | null>;
 }
 export declare function normalizeImageGenerationResponse(responseData: unknown): ImageGenImage[];
 export {};

package/backend/dist/services/pluginImageGenerationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pluginImageGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/pluginImageGenerationService.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAY7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AACjE,KAAK,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,MAAM,WAAW,wCAAwC;IACvD,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACtD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1D,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IACrE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9C,WAAW,CAAC,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAClD;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,IAAI;IADvB,YACmB,IAAI,EAAE,wCAAwC,EAC7D;IAEJ,oBAAoB,CAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAYf;IAED,0BAA0B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG;QAC3C,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;KACzB,EAAE,CA+BF;IAEK,sBAAsB,CAC1B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,eAAe,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC;QACrC,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GACA,OAAO,CAAC,gBAAgB,CAAC,CA+M3B;IAED,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAS1E;CACF;AAED,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,OAAO,GACpB,aAAa,EAAE,CAYjB"}
+{"version":3,"file":"pluginImageGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/pluginImageGenerationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAa7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AACjE,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,aAAa,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAGxD,MAAM,WAAW,wCAAwC;IACvD,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACpE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxE,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,YAAY,CAAC,eAAe,CAAC,CAAC;IACjC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9C,WAAW,CAAC,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,CAAC;CAClD;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,IAAI;IADvB,YACmB,IAAI,EAAE,wCAAwC,EAC7D;IAEE,oBAAoB,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAYxB;IAEK,0BAA0B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CACxD;QACE,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;KACzB,EAAE,CACJ,CA+BA;IAEK,sBAAsB,CAC1B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,eAAe,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC;QACrC,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,GACA,OAAO,CAAC,gBAAgB,CAAC,CA6N3B;IAEK,iBAAiB,CACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAShC;CACF;AAED,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,OAAO,GACpB,aAAa,EAAE,CAYjB"}