@elizaos/plugin-sql 1.7.0 → 1.7.1-alpha.10

package/dist/node/index.node.js

@@ -11661,8 +11661,9 @@ class PgliteDatabaseAdapter extends BaseDrizzleAdapter {
   }
   async withDatabase(operation) {
     if (this.manager.isShuttingDown()) {
-      logger11.warn({ src: "plugin:sql" }, "Database is shutting down");
-      return null;
+      const error = new Error("Database is shutting down - operation rejected");
+      logger11.warn({ src: "plugin:sql", error: error.message }, "Database operation rejected during shutdown");
+      throw error;
     }
     return operation();
   }
@@ -11718,6 +11719,110 @@ class PGliteClientManager {
 
 // src/pg/adapter.ts
 import { logger as logger12 } from "@elizaos/core";
+class PgDatabaseAdapter extends BaseDrizzleAdapter {
+  embeddingDimension = DIMENSION_MAP[384];
+  manager;
+  constructor(agentId, manager, _schema) {
+    super(agentId);
+    this.manager = manager;
+    this.db = manager.getDatabase();
+  }
+  getManager() {
+    return this.manager;
+  }
+  async withEntityContext(entityId, callback) {
+    return await this.manager.withEntityContext(entityId, callback);
+  }
+  async getEntityByIds(entityIds) {
+    return this.getEntitiesByIds(entityIds);
+  }
+  async getMemoriesByServerId(_params) {
+    logger12.warn({ src: "plugin:sql" }, "getMemoriesByServerId called but not implemented");
+    return [];
+  }
+  async ensureAgentExists(agent) {
+    const existingAgent = await this.getAgent(this.agentId);
+    if (existingAgent) {
+      return existingAgent;
+    }
+    const newAgent = {
+      id: this.agentId,
+      name: agent.name || "Unknown Agent",
+      username: agent.username,
+      bio: agent.bio || "An AI agent",
+      createdAt: agent.createdAt || Date.now(),
+      updatedAt: agent.updatedAt || Date.now()
+    };
+    await this.createAgent(newAgent);
+    const createdAgent = await this.getAgent(this.agentId);
+    if (!createdAgent) {
+      throw new Error("Failed to create agent");
+    }
+    return createdAgent;
+  }
+  async withDatabase(operation) {
+    return await this.withRetry(async () => {
+      return await operation();
+    });
+  }
+  async init() {
+    logger12.debug({ src: "plugin:sql" }, "PgDatabaseAdapter initialized");
+  }
+  async isReady() {
+    return this.manager.testConnection();
+  }
+  async close() {
+    await this.manager.close();
+  }
+  async getConnection() {
+    return this.manager.getConnection();
+  }
+  async createAgent(agent) {
+    return super.createAgent(agent);
+  }
+  getAgent(agentId) {
+    return super.getAgent(agentId);
+  }
+  updateAgent(agentId, agent) {
+    return super.updateAgent(agentId, agent);
+  }
+  deleteAgent(agentId) {
+    return super.deleteAgent(agentId);
+  }
+  createEntities(entities) {
+    return super.createEntities(entities);
+  }
+  getEntitiesByIds(entityIds) {
+    return super.getEntitiesByIds(entityIds).then((result) => result || []);
+  }
+  updateEntity(entity2) {
+    return super.updateEntity(entity2);
+  }
+  createMemory(memory, tableName) {
+    return super.createMemory(memory, tableName);
+  }
+  getMemoryById(memoryId) {
+    return super.getMemoryById(memoryId);
+  }
+  updateMemory(memory) {
+    return super.updateMemory(memory);
+  }
+  deleteMemory(memoryId) {
+    return super.deleteMemory(memoryId);
+  }
+  createComponent(component) {
+    return super.createComponent(component);
+  }
+  getComponent(entityId, type, worldId, sourceEntityId) {
+    return super.getComponent(entityId, type, worldId, sourceEntityId);
+  }
+  updateComponent(component) {
+    return super.updateComponent(component);
+  }
+  deleteComponent(componentId) {
+    return super.deleteComponent(componentId);
+  }
+}
 
 // ../../node_modules/drizzle-orm/node-postgres/driver.js
 init_entity();
@@ -11741,12 +11846,12 @@ var { Pool, types: types3 } = pg;
 var NativePool = pg.native ? pg.native.Pool : undefined;
 
 class NodePgPreparedQuery extends PgPreparedQuery {
-  constructor(client, queryString, params, logger12, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper) {
+  constructor(client, queryString, params, logger13, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper) {
     super({ sql: queryString, params }, cache, queryMetadata, cacheConfig);
     this.client = client;
     this.queryString = queryString;
     this.params = params;
-    this.logger = logger12;
+    this.logger = logger13;
     this.fields = fields;
     this._isResponseInArrayMode = _isResponseInArrayMode;
     this.customResultMapper = customResultMapper;
@@ -11956,11 +12061,11 @@ class NodePgDatabase extends PgDatabase {
 }
 function construct2(client, config = {}) {
   const dialect2 = new PgDialect({ casing: config.casing });
-  let logger12;
+  let logger13;
   if (config.logger === true) {
-    logger12 = new DefaultLogger;
+    logger13 = new DefaultLogger;
   } else if (config.logger !== false) {
-    logger12 = config.logger;
+    logger13 = config.logger;
   }
   let schema2;
   if (config.schema) {
@@ -11971,7 +12076,7 @@ function construct2(client, config = {}) {
       tableNamesMap: tablesConfig.tableNamesMap
     };
   }
-  const driver = new NodePgDriver(client, dialect2, { logger: logger12, cache: config.cache });
+  const driver = new NodePgDriver(client, dialect2, { logger: logger13, cache: config.cache });
   const session2 = driver.createSession(schema2);
   const db2 = new NodePgDatabase(dialect2, session2, schema2);
   db2.$client = client;
@@ -12006,134 +12111,32 @@ function drizzle2(...params) {
   drizzle22.mock = mock;
 })(drizzle2 || (drizzle2 = {}));
 
-// src/pg/adapter.ts
-class PgDatabaseAdapter extends BaseDrizzleAdapter {
-  embeddingDimension = DIMENSION_MAP[384];
-  manager;
-  constructor(agentId, manager, _schema) {
-    super(agentId);
-    this.manager = manager;
-    this.db = manager.getDatabase();
-  }
-  getManager() {
-    return this.manager;
-  }
-  async withEntityContext(entityId, callback) {
-    return await this.manager.withEntityContext(entityId, callback);
-  }
-  async getEntityByIds(entityIds) {
-    return this.getEntitiesByIds(entityIds);
-  }
-  async getMemoriesByServerId(_params) {
-    logger12.warn({ src: "plugin:sql" }, "getMemoriesByServerId called but not implemented");
-    return [];
-  }
-  async ensureAgentExists(agent) {
-    const existingAgent = await this.getAgent(this.agentId);
-    if (existingAgent) {
-      return existingAgent;
-    }
-    const newAgent = {
-      id: this.agentId,
-      name: agent.name || "Unknown Agent",
-      username: agent.username,
-      bio: agent.bio || "An AI agent",
-      createdAt: agent.createdAt || Date.now(),
-      updatedAt: agent.updatedAt || Date.now()
-    };
-    await this.createAgent(newAgent);
-    const createdAgent = await this.getAgent(this.agentId);
-    if (!createdAgent) {
-      throw new Error("Failed to create agent");
-    }
-    return createdAgent;
-  }
-  async withDatabase(operation) {
-    return await this.withRetry(async () => {
-      const client = await this.manager.getClient();
-      try {
-        const db2 = drizzle2(client);
-        this.db = db2;
-        return await operation();
-      } finally {
-        client.release();
-      }
-    });
-  }
-  async init() {
-    logger12.debug({ src: "plugin:sql" }, "PgDatabaseAdapter initialized");
-  }
-  async isReady() {
-    return this.manager.testConnection();
-  }
-  async close() {
-    await this.manager.close();
-  }
-  async getConnection() {
-    return this.manager.getConnection();
-  }
-  async createAgent(agent) {
-    return super.createAgent(agent);
-  }
-  getAgent(agentId) {
-    return super.getAgent(agentId);
-  }
-  updateAgent(agentId, agent) {
-    return super.updateAgent(agentId, agent);
-  }
-  deleteAgent(agentId) {
-    return super.deleteAgent(agentId);
-  }
-  createEntities(entities) {
-    return super.createEntities(entities);
-  }
-  getEntitiesByIds(entityIds) {
-    return super.getEntitiesByIds(entityIds).then((result) => result || []);
-  }
-  updateEntity(entity2) {
-    return super.updateEntity(entity2);
-  }
-  createMemory(memory, tableName) {
-    return super.createMemory(memory, tableName);
-  }
-  getMemoryById(memoryId) {
-    return super.getMemoryById(memoryId);
-  }
-  updateMemory(memory) {
-    return super.updateMemory(memory);
-  }
-  deleteMemory(memoryId) {
-    return super.deleteMemory(memoryId);
-  }
-  createComponent(component) {
-    return super.createComponent(component);
-  }
-  getComponent(entityId, type, worldId, sourceEntityId) {
-    return super.getComponent(entityId, type, worldId, sourceEntityId);
-  }
-  updateComponent(component) {
-    return super.updateComponent(component);
-  }
-  deleteComponent(componentId) {
-    return super.deleteComponent(componentId);
-  }
-}
-
 // src/pg/manager.ts
 init_drizzle_orm();
 import { Pool as Pool2 } from "pg";
-import { logger as logger13 } from "@elizaos/core";
+import { logger as logger13, validateUuid as validateUuid2 } from "@elizaos/core";
 
 class PostgresConnectionManager {
   pool;
   db;
   constructor(connectionString, rlsServerId) {
-    const poolConfig = { connectionString };
+    const poolConfig = {
+      connectionString,
+      max: 20,
+      min: 2,
+      idleTimeoutMillis: 30000,
+      connectionTimeoutMillis: 5000,
+      keepAlive: true,
+      keepAliveInitialDelayMillis: 1e4
+    };
     if (rlsServerId) {
       poolConfig.application_name = rlsServerId;
       logger13.debug({ src: "plugin:sql", rlsServerId: rlsServerId.substring(0, 8) }, "Pool configured with RLS server");
     }
     this.pool = new Pool2(poolConfig);
+    this.pool.on("error", (err) => {
+      logger13.warn({ src: "plugin:sql", error: err?.message || String(err) }, "Pool client error (connection will be replaced)");
+    });
     this.db = drizzle2(this.pool, { casing: "snake_case" });
   }
   getDatabase() {
@@ -12164,8 +12167,11 @@ class PostgresConnectionManager {
     const dataIsolationEnabled = process.env.ENABLE_DATA_ISOLATION === "true";
     return await this.db.transaction(async (tx) => {
       if (dataIsolationEnabled && entityId) {
+        if (!validateUuid2(entityId)) {
+          throw new Error(`Invalid UUID format for entity context: ${entityId}`);
+        }
         try {
-          await tx.execute(sql`SET LOCAL app.entity_id = ${entityId}`);
+          await tx.execute(sql.raw(`SET LOCAL app.entity_id = '${entityId}'`));
           logger13.debug(`[Entity Context] Set app.entity_id = ${entityId}`);
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
@@ -12324,5 +12330,5 @@ export {
   DatabaseMigrationService
 };
 
-//# debugId=D2C87E4D9A59EC5564756E2164756E21
+//# debugId=E1AE4E5A3724400564756E2164756E21
 //# sourceMappingURL=index.node.js.map