@elizaos/plugin-sql 1.0.0-beta.51 → 1.0.0-beta.53

package/README.md

@@ -112,7 +112,7 @@ The plugin uses the following environment variables:
 
 - `POSTGRES_URL`: Connection string for PostgreSQL database (e.g., `postgresql://user:password@localhost:5432/dbname`)
   - If not provided, the plugin will use PGlite as a fallback
-- `PGLITE_DATA_DIR`: (Optional) Directory for PGlite data storage (default: `../../pglite`)
+- `PGLITE_DATA_DIR`: (Optional) Directory for PGlite data storage (default: `./pglite`)
 
 These variables should be defined in a `.env` file at the root of your project.
 
@@ -225,7 +225,7 @@ export default defineConfig({
   schema: './src/schema/index.ts',
   out: './drizzle/migrations',
   dbCredentials: {
-    url: process.env.POSTGRES_URL || 'file://../../pglite',
+    url: process.env.POSTGRES_URL || 'file:../../.pglite',
   },
   breakpoints: true,
 });

package/dist/{chunk-EYE2J2N6.js → chunk-C7MPSX4Y.js}

@@ -61,17 +61,26 @@ var PGliteClientManager = class {
     const timeout = setTimeout(() => {
       logger.warn("Shutdown timeout reached, forcing database connection closure...");
       this.client.close().finally(() => {
-        process.exit(1);
+        logger.warn("Forced database connection closure complete.");
+        if (process.env.NODE_ENV !== "test") {
+          process.exit(1);
+        }
       });
     }, this.shutdownTimeout);
     try {
       await this.client.close();
       clearTimeout(timeout);
       logger.info("PGlite client shutdown completed successfully");
-      process.exit(0);
+      if (process.env.NODE_ENV !== "test") {
+        process.exit(0);
+      }
     } catch (error) {
       logger.error("Error during graceful shutdown:", error);
-      process.exit(1);
+      if (process.env.NODE_ENV !== "test") {
+        process.exit(1);
+      } else {
+        throw error;
+      }
     }
   }
   /**
@@ -343,4 +352,4 @@ export {
   PGliteClientManager,
   PostgresConnectionManager
 };
-//# sourceMappingURL=chunk-EYE2J2N6.js.map
+//# sourceMappingURL=chunk-C7MPSX4Y.js.map

package/dist/chunk-C7MPSX4Y.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/pglite/manager.ts","../src/pg/manager.ts"],"sourceRoot":"./","sourcesContent":["import { dirname as pathDirname, resolve as pathResolve } from 'node:path';\nimport { fileURLToPath } from 'node:url';\nimport { PGlite, type PGliteOptions } from '@electric-sql/pglite';\nimport { fuzzystrmatch } from '@electric-sql/pglite/contrib/fuzzystrmatch';\nimport { vector } from '@electric-sql/pglite/vector';\nimport { logger } from '@elizaos/core';\nimport { drizzle } from 'drizzle-orm/pglite';\nimport { migrate } from 'drizzle-orm/pglite/migrator';\nimport type { IDatabaseClientManager } from '../types';\n\n/**\n * Class representing a database client manager for PGlite.\n * @implements { IDatabaseClientManager }\n */\nexport class PGliteClientManager implements IDatabaseClientManager<PGlite> {\n  private client: PGlite;\n  private shuttingDown = false;\n  private readonly shutdownTimeout = 500;\n\n  /**\n   * Constructor for creating a new instance of PGlite with the provided options.\n   * Initializes the PGlite client with additional extensions.\n   * @param {PGliteOptions} options - The options to configure the PGlite client.\n   */\n  constructor(options: PGliteOptions) {\n    this.client = new PGlite({\n      ...options,\n      extensions: {\n        vector,\n        fuzzystrmatch,\n      },\n    });\n    this.setupShutdownHandlers();\n  }\n\n  /**\n   * Retrieves the PostgreSQL lite connection.\n   *\n   * @returns {PGlite} The PostgreSQL lite connection.\n   * @throws {Error} If the client manager is currently shutting down.\n   */\n  public getConnection(): PGlite {\n    if (this.shuttingDown) {\n      throw new Error('Client manager is shutting down');\n    }\n    return this.client;\n  }\n\n  /**\n   * Initiates a graceful shutdown of the PGlite client.\n   * Checks if the client is already in the process of shutting down.\n   * Logs the start of shutdown process and sets shuttingDown flag to true.\n   * Sets a timeout for the shutdown process and forces closure of database connection if timeout is reached.\n   * Handles the shutdown process, closes the client connection, clears the timeout, and logs the completion of shutdown.\n   * Logs any errors that occur during the shutdown process.\n   */\n  private async gracefulShutdown() {\n    if (this.shuttingDown) {\n      return;\n    }\n\n    this.shuttingDown = true;\n    logger.info('Starting graceful shutdown of PGlite client...');\n\n    const timeout = setTimeout(() => {\n      logger.warn('Shutdown timeout reached, forcing database connection closure...');\n      this.client.close().finally(() => {\n        logger.warn('Forced database connection closure complete.');\n        if (process.env.NODE_ENV !== 'test') {\n          process.exit(1);\n        }\n      });\n    }, this.shutdownTimeout);\n\n    try {\n      await this.client.close();\n      clearTimeout(timeout);\n      logger.info('PGlite client shutdown completed successfully');\n      if (process.env.NODE_ENV !== 'test') {\n        process.exit(0);\n      }\n    } catch (error) {\n      logger.error('Error during graceful shutdown:', error);\n      if (process.env.NODE_ENV !== 'test') {\n        process.exit(1);\n      } else {\n        throw error;\n      }\n    }\n  }\n\n  /**\n   * Sets up shutdown handlers for SIGINT, SIGTERM, and beforeExit events to gracefully shutdown the application.\n   * @private\n   */\n  private setupShutdownHandlers() {\n    process.on('SIGINT', async () => {\n      await this.gracefulShutdown();\n    });\n\n    process.on('SIGTERM', async () => {\n      await this.gracefulShutdown();\n    });\n\n    process.on('beforeExit', async () => {\n      await this.gracefulShutdown();\n    });\n  }\n\n  /**\n   * Initializes the client for PGlite.\n   *\n   * @returns {Promise<void>} A Promise that resolves when the client is initialized successfully\n   */\n  public async initialize(): Promise<void> {\n    try {\n      await this.client.waitReady;\n      logger.info('PGlite client initialized successfully');\n    } catch (error) {\n      logger.error('Failed to initialize PGlite client:', error);\n      throw error;\n    }\n  }\n\n  /**\n   * Asynchronously closes the resource. If the resource is not already shutting down,\n   * it performs a graceful shutdown before closing.\n   *\n   * @returns A promise that resolves once the resource has been closed.\n   */\n  public async close(): Promise<void> {\n    if (!this.shuttingDown) {\n      await this.gracefulShutdown();\n    }\n  }\n\n  /**\n   * Check if the system is currently shutting down.\n   *\n   * @returns {boolean} True if the system is shutting down, false otherwise.\n   */\n  public isShuttingDown(): boolean {\n    return this.shuttingDown;\n  }\n\n  /**\n   * Asynchronously runs database migrations using Drizzle.\n   *\n   * Drizzle will first check if the migrations are already applied.\n   * If there is a diff between database schema and migrations, it will apply the migrations.\n   * If they are already applied, it will skip them.\n   *\n   * @returns {Promise<void>} A Promise that resolves once the migrations are completed successfully.\n   */\n  async runMigrations(): Promise<void> {\n    try {\n      const db = drizzle(this.client);\n\n      const packageJsonUrl = await import.meta.resolve('@elizaos/plugin-sql/package.json');\n      const packageJsonPath = fileURLToPath(packageJsonUrl);\n      const packageRoot = pathDirname(packageJsonPath);\n      const migrationsPath = pathResolve(packageRoot, 'drizzle/migrations');\n      logger.debug(\n        `Resolved migrations path (pglite) using import.meta.resolve: ${migrationsPath}`\n      );\n\n      await migrate(db, {\n        migrationsFolder: migrationsPath,\n        migrationsSchema: 'public',\n      });\n    } catch (error) {\n      logger.error('Failed to run database migrations (pglite):', error);\n    }\n  }\n}\n","import path from 'node:path';\nimport { fileURLToPath } from 'node:url';\nimport { logger } from '@elizaos/core';\nimport { drizzle } from 'drizzle-orm/node-postgres';\nimport { migrate } from 'drizzle-orm/node-postgres/migrator';\nimport pkg, { type Pool as PgPool } from 'pg';\nimport type { IDatabaseClientManager } from '../types';\n\nconst { Pool } = pkg;\n\n/**\n * Manages connections to a PostgreSQL database using a connection pool.\n * Implements IDatabaseClientManager interface.\n */\n\nexport class PostgresConnectionManager implements IDatabaseClientManager<PgPool> {\n  private pool: PgPool;\n  private isShuttingDown = false;\n  private readonly connectionTimeout: number = 5000;\n\n  /**\n   * Constructor for creating a connection pool.\n   * @param {string} connectionString - The connection string used to connect to the database.\n   */\n  constructor(connectionString: string) {\n    const defaultConfig = {\n      max: 20,\n      idleTimeoutMillis: 30000,\n      connectionTimeoutMillis: this.connectionTimeout,\n    };\n\n    this.pool = new Pool({\n      ...defaultConfig,\n      connectionString,\n    });\n\n    this.pool.on('error', (err) => {\n      logger.error('Unexpected pool error', err);\n      this.handlePoolError(err);\n    });\n\n    this.setupPoolErrorHandling();\n    this.testConnection();\n  }\n\n  /**\n   * Handles a pool error by attempting to reconnect the pool.\n   *\n   * @param {Error} error The error that occurred in the pool.\n   * @throws {Error} If failed to reconnect the pool.\n   */\n  private async handlePoolError(error: Error) {\n    logger.error('Pool error occurred, attempting to reconnect', {\n      error: error.message,\n    });\n\n    try {\n      await this.pool.end();\n\n      this.pool = new Pool({\n        ...this.pool.options,\n        connectionTimeoutMillis: this.connectionTimeout,\n      });\n\n      await this.testConnection();\n      logger.success('Pool reconnection successful');\n    } catch (reconnectError) {\n      logger.error('Failed to reconnect pool', {\n        error: reconnectError instanceof Error ? reconnectError.message : String(reconnectError),\n      });\n      throw reconnectError;\n    }\n  }\n\n  /**\n   * Asynchronously tests the database connection by executing a query to get the current timestamp.\n   *\n   * @returns {Promise<boolean>} - A Promise that resolves to true if the database connection test is successful.\n   */\n  async testConnection(): Promise<boolean> {\n    let client: pkg.PoolClient | null = null;\n    try {\n      client = await this.pool.connect();\n      const result = await client.query('SELECT NOW()');\n      logger.success('Database connection test successful:', result.rows[0]);\n      return true;\n    } catch (error) {\n      logger.error('Database connection test failed:', error);\n      throw new Error(`Failed to connect to database: ${(error as Error).message}`);\n    } finally {\n      if (client) client.release();\n    }\n  }\n\n  /**\n   * Sets up event listeners to handle pool cleanup on SIGINT, SIGTERM, and beforeExit events.\n   */\n  private setupPoolErrorHandling() {\n    process.on('SIGINT', async () => {\n      await this.cleanup();\n      process.exit(0);\n    });\n\n    process.on('SIGTERM', async () => {\n      await this.cleanup();\n      process.exit(0);\n    });\n\n    process.on('beforeExit', async () => {\n      await this.cleanup();\n    });\n  }\n\n  /**\n   * Get the connection pool.\n   * @returns {PgPool} The connection pool\n   * @throws {Error} If the connection manager is shutting down or an error occurs when trying to get the connection from the pool\n   */\n  public getConnection(): PgPool {\n    if (this.isShuttingDown) {\n      throw new Error('Connection manager is shutting down');\n    }\n\n    try {\n      return this.pool;\n    } catch (error) {\n      logger.error('Failed to get connection from pool:', error);\n      throw error;\n    }\n  }\n\n  /**\n   * Asynchronously acquires a database client from the connection pool.\n   *\n   * @returns {Promise<pkg.PoolClient>} A Promise that resolves with the acquired database client.\n   * @throws {Error} If an error occurs while acquiring the database client.\n   */\n  public async getClient(): Promise<pkg.PoolClient> {\n    try {\n      return await this.pool.connect();\n    } catch (error) {\n      logger.error('Failed to acquire a database client:', error);\n      throw error;\n    }\n  }\n\n  /**\n   * Initializes the PostgreSQL connection manager by testing the connection and logging the result.\n   *\n   * @returns {Promise<void>} A Promise that resolves once the manager is successfully initialized\n   * @throws {Error} If there is an error initializing the connection manager\n   */\n  public async initialize(): Promise<void> {\n    try {\n      await this.testConnection();\n      logger.debug('PostgreSQL connection manager initialized successfully');\n    } catch (error) {\n      logger.error('Failed to initialize connection manager:', error);\n      throw error;\n    }\n  }\n\n  /**\n   * Asynchronously close the current process by executing a cleanup function.\n   * @returns A promise that resolves once the cleanup is complete.\n   */\n  public async close(): Promise<void> {\n    await this.cleanup();\n  }\n\n  /**\n   * Cleans up and closes the database pool.\n   * @returns {Promise<void>} A Promise that resolves when the database pool is closed.\n   */\n  async cleanup(): Promise<void> {\n    try {\n      await this.pool.end();\n      logger.info('Database pool closed');\n    } catch (error) {\n      logger.error('Error closing database pool:', error);\n    }\n  }\n\n  /**\n   * Asynchronously runs database migrations using the Drizzle library.\n   *\n   * Drizzle will first check if the migrations are already applied.\n   * If there is a diff between database schema and migrations, it will apply the migrations.\n   * If they are already applied, it will skip them.\n   *\n   * @returns {Promise<void>} A Promise that resolves once the migrations are completed successfully.\n   */\n  async runMigrations(): Promise<void> {\n    try {\n      const db = drizzle(this.pool);\n\n      const packageJsonUrl = await import.meta.resolve('@elizaos/plugin-sql/package.json');\n      const packageJsonPath = fileURLToPath(packageJsonUrl);\n      const packageRoot = path.dirname(packageJsonPath);\n      const migrationsPath = path.resolve(packageRoot, 'drizzle/migrations');\n      logger.debug(`Resolved migrations path (pg) using import.meta.resolve: ${migrationsPath}`);\n\n      await migrate(db, {\n        migrationsFolder: migrationsPath,\n        migrationsSchema: 'public',\n      });\n    } catch (error) {\n      logger.error('Failed to run database migrations (pg):', error);\n    }\n  }\n}\n"],"mappings":"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","names":["fileURLToPath","logger","drizzle","migrate","logger","drizzle","fileURLToPath","migrate"]}

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   PGliteClientManager,
   PostgresConnectionManager,
   __name
-} from "./chunk-EYE2J2N6.js";
+} from "./chunk-C7MPSX4Y.js";
 
 // src/index.ts
 import * as os from "node:os";
@@ -497,15 +497,17 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
    * @returns {Promise<void>} - Resolves once the embedding dimension is ensured.
    */
   async ensureEmbeddingDimension(dimension) {
-    const existingMemory = await this.db.select({
-      embedding: embeddingTable
-    }).from(memoryTable).innerJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(eq(memoryTable.agentId, this.agentId)).limit(1);
-    if (existingMemory.length > 0) {
-      const usedDimension = Object.entries(DIMENSION_MAP).find(
-        ([_, colName]) => existingMemory[0].embedding[colName] !== null
-      );
-    }
-    this.embeddingDimension = DIMENSION_MAP[dimension];
+    return this.withDatabase(async () => {
+      const existingMemory = await this.db.select({
+        embedding: embeddingTable
+      }).from(memoryTable).innerJoin(embeddingTable, eq(embeddingTable.memoryId, memoryTable.id)).where(eq(memoryTable.agentId, this.agentId)).limit(1);
+      if (existingMemory.length > 0) {
+        const usedDimension = Object.entries(DIMENSION_MAP).find(
+          ([_, colName]) => existingMemory[0].embedding[colName] !== null
+        );
+      }
+      this.embeddingDimension = DIMENSION_MAP[dimension];
+    });
   }
   /**
    * Asynchronously retrieves an agent by their ID from the database.
@@ -520,7 +522,9 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
       return {
         ...row,
         username: row.username || "",
-        id: row.id
+        id: row.id,
+        system: !row.system ? void 0 : row.system,
+        bio: !row.bio ? "" : row.bio
       };
     });
   }
@@ -538,7 +542,8 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
       }).from(agentTable);
       return rows.map((row) => ({
         ...row,
-        id: row.id
+        id: row.id,
+        bio: row.bio === null ? "" : row.bio
       }));
     });
   }
@@ -616,27 +621,42 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
    */
   async mergeAgentSettings(tx, agentId, updatedSettings) {
     const currentAgent = await tx.select({ settings: agentTable.settings }).from(agentTable).where(eq(agentTable.id, agentId)).limit(1);
-    if (currentAgent.length === 0 || !currentAgent[0].settings) {
-      return updatedSettings;
-    }
-    const currentSettings = currentAgent[0].settings;
-    if (updatedSettings.secrets) {
-      const currentSecrets = currentSettings.secrets || {};
-      const updatedSecrets = updatedSettings.secrets;
-      const mergedSecrets = { ...currentSecrets };
-      for (const [key, value] of Object.entries(updatedSecrets)) {
-        if (value === null) {
-          delete mergedSecrets[key];
+    const currentSettings = currentAgent.length > 0 && currentAgent[0].settings ? currentAgent[0].settings : {};
+    const deepMerge = /* @__PURE__ */ __name((target, source) => {
+      if (source === null) {
+        return void 0;
+      }
+      if (Array.isArray(source) || typeof source !== "object") {
+        return source;
+      }
+      const output = typeof target === "object" && target !== null && !Array.isArray(target) ? { ...target } : {};
+      let isEmpty = true;
+      for (const key of Object.keys(source)) {
+        const sourceValue = source[key];
+        if (sourceValue === null) {
+          delete output[key];
+        } else if (typeof sourceValue === "object" && !Array.isArray(sourceValue)) {
+          const nestedMergeResult = deepMerge(output[key], sourceValue);
+          if (nestedMergeResult === void 0) {
+            delete output[key];
+          } else {
+            output[key] = nestedMergeResult;
+            isEmpty = false;
+          }
         } else {
-          mergedSecrets[key] = value;
+          output[key] = sourceValue;
+          isEmpty = false;
         }
       }
-      updatedSettings.secrets = mergedSecrets;
-    }
-    return {
-      ...currentSettings,
-      ...updatedSettings
-    };
+      if (Object.keys(output).length === 0) {
+        if (!(typeof source === "object" && source !== null && Object.keys(source).length === 0)) {
+          return void 0;
+        }
+      }
+      return output;
+    }, "deepMerge");
+    const finalSettings = deepMerge(currentSettings, updatedSettings);
+    return finalSettings === void 0 ? {} : finalSettings;
   }
   /**
    * Asynchronously deletes an agent with the specified UUID and all related entries.
@@ -1193,6 +1213,7 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
         agentId: row.memory.agentId,
         roomId: row.memory.roomId,
         unique: row.memory.unique,
+        metadata: row.memory.metadata,
         embedding: row.embedding ?? void 0
       };
     });
@@ -1708,23 +1729,31 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
     return this.withDatabase(async () => {
       const result = await this.db.select({
         id: roomTable.id,
+        name: roomTable.name,
+        // Added name
         channelId: roomTable.channelId,
         agentId: roomTable.agentId,
         serverId: roomTable.serverId,
         worldId: roomTable.worldId,
         type: roomTable.type,
-        source: roomTable.source
+        source: roomTable.source,
+        metadata: roomTable.metadata
+        // Added metadata
       }).from(roomTable).where(and(eq(roomTable.id, roomId), eq(roomTable.agentId, this.agentId))).limit(1);
       if (result.length === 0) return null;
       const room = result[0];
       return {
         ...room,
         id: room.id,
+        name: room.name ?? void 0,
+        // Corrected to handle null
         agentId: room.agentId,
         serverId: room.serverId,
         worldId: room.worldId,
         channelId: room.channelId,
-        type: room.type
+        type: room.type,
+        metadata: room.metadata
+        // Added metadata
       };
     });
   }
@@ -2276,7 +2305,7 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
         return result.map((row) => ({
           id: row.id,
           name: row.name,
-          description: row.description,
+          description: row.description ?? "",
           roomId: row.roomId,
           worldId: row.worldId,
           tags: row.tags || [],
@@ -2297,7 +2326,7 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
         return result.map((row) => ({
           id: row.id,
           name: row.name,
-          description: row.description,
+          description: row.description ?? "",
           roomId: row.roomId,
           worldId: row.worldId,
           tags: row.tags || [],
@@ -2322,7 +2351,7 @@ var BaseDrizzleAdapter = class extends DatabaseAdapter {
         return {
           id: row.id,
           name: row.name,
-          description: row.description,
+          description: row.description ?? "",
           roomId: row.roomId,
           worldId: row.worldId,
           tags: row.tags || [],
@@ -2572,7 +2601,6 @@ var PgDatabaseAdapter = class extends BaseDrizzleAdapter {
 
 // src/index.ts
 import path from "node:path";
-import { stringToUuid as stringToUuid2 } from "@elizaos/core";
 var GLOBAL_SINGLETONS = Symbol.for("@elizaos/plugin-sql/global-singletons");
 var globalSymbols = global;
 if (!globalSymbols[GLOBAL_SINGLETONS]) {
@@ -2598,7 +2626,7 @@ function createDatabaseAdapter(config, agentId) {
     }
     return new PgDatabaseAdapter(agentId, globalSingletons.postgresConnectionManager);
   }
-  const dataDir = config.dataDir ?? path.join(os.homedir(), ".eliza", stringToUuid2(process.cwd()), "pglite");
+  const dataDir = config.dataDir ?? path.join(process.cwd(), ".pglite");
   if (!globalSingletons.pgLiteClientManager) {
     globalSingletons.pgLiteClientManager = new PGliteClientManager({ dataDir });
   }
@@ -2610,7 +2638,7 @@ var sqlPlugin = {
   description: "SQL database adapter plugin using Drizzle ORM",
   init: /* @__PURE__ */ __name(async (_, runtime) => {
     const config = {
-      dataDir: runtime.getSetting("PGLITE_DATA_DIR") ?? path.join(os.homedir(), ".eliza", stringToUuid2(process.cwd()), "pglite"),
+      dataDir: runtime.getSetting("PGLITE_DATA_DIR") ?? path.join(process.cwd(), ".pglite"),
       postgresUrl: runtime.getSetting("POSTGRES_URL")
     };
     try {