refactor: Apply review changes

Signed-off-by: Dylan Kilkenny <dylankilkenny95@gmail.com>

Author: dylankilkenny

plugins/examples/kv-storage.ts

@@ -54,7 +54,7 @@ export async function handler({ kv, params }: PluginContext) {
 
     case 'scan': {
       const { pattern, batch } = params ?? {};
-      const keys = await kv.scan(pattern ?? '*', toInt(batch, 500));
+      const keys = await kv.listKeys(pattern ?? '*', toInt(batch, 500));
       return { keys };
     }
 
@@ -95,7 +95,7 @@ export async function handler({ kv, params }: PluginContext) {
       const deleted = await kv.del('example:to-delete');
 
       // 4) Scan keys under example:*
-      const list = await kv.scan('example:*');
+      const list = await kv.listKeys('example:*');
 
       // 5) Use a lock to protect an update
       const lockResult = await kv.withLock(

plugins/lib/kv.ts

@@ -26,17 +26,6 @@ import { randomUUID } from 'crypto';
  * Minimal async key-value store used by plugins.
  */
 export interface PluginKVStore {
-  /**
-   * Establish the connection. Call once before using the store.
-   * @returns Promise that resolves when the connection is established.
-   */
-  connect(): Promise<void>;
-  /**
-   * Close the connection gracefully. Safe to call multiple times.
-   * @returns Promise that resolves when the connection is closed.
-   */
-  disconnect(): Promise<void>;
-
   /**
    * Get and JSON-parse a value by key.
    * @typeParam T - Expected value type after JSON parse.
@@ -68,12 +57,12 @@ export interface PluginKVStore {
   exists(key: string): Promise<boolean>;
 
   /**
-   * Scan this namespace for keys matching `pattern`.
+   * List keys in this namespace matching `pattern`.
    * @param pattern - Glob-like match pattern (default '*').
    * @param batch - SCAN COUNT per iteration (default 500).
    * @returns Array of bare keys (without the namespace prefix).
    */
-  scan(pattern?: string, batch?: number): Promise<string[]>;
+  listKeys(pattern?: string, batch?: number): Promise<string[]>;
   /**
    * Remove all keys in this namespace.
    * @returns The number of keys deleted.
@@ -133,27 +122,6 @@ export class DefaultPluginKVStore implements PluginKVStore {
     this.ns = `plugin_kv:{${pid}}`;
   }
 
-  /**
-   * Connect the underlying Redis client. Call before any operation.
-   * @returns Promise that resolves when the Redis connection is established.
-   */
-  async connect(): Promise<void> {
-    await this.client.connect();
-  }
-
-  /**
-   * Close the Redis connection. Falls back to hard disconnect if graceful
-   * quit fails (e.g., when the connection is not fully established).
-   * @returns Promise that resolves when the connection is closed.
-   */
-  async disconnect(): Promise<void> {
-    try {
-      await this.client.quit();
-    } catch {
-      this.client.disconnect();
-    }
-  }
-
   /**
    * Build a namespaced Redis key for the given segment and user key.
    * Validates the user-provided key and throws on invalid input.
@@ -222,13 +190,13 @@ export class DefaultPluginKVStore implements PluginKVStore {
   }
 
   /**
-   * Iterate over keys in this store, matching `pattern` (glob-like, default '*').
+   * List keys in this store matching `pattern` (glob-like, default '*').
    * Returns bare keys (without namespace). Uses SCAN with COUNT=`batch`.
    * @param pattern - Glob-like match pattern (default '*').
    * @param batch - SCAN COUNT per iteration (default 500).
    * @returns Array of bare keys (without the namespace prefix).
    */
-  async scan(pattern = '*', batch = 500): Promise<string[]> {
+  async listKeys(pattern = '*', batch = 500): Promise<string[]> {
     const out: string[] = [];
     let cursor = '0';
     const prefix = `${this.ns}:data:`;

plugins/lib/plugin.ts

@@ -496,21 +496,14 @@ export async function runUserPlugin<T = any, R = any>(
   pluginParams: T,
   userScriptPath: string
 ): Promise<R> {
-  // Create both resources at the same level
   const plugin = new DefaultPluginAPI(socketPath);
   const kv = new DefaultPluginKVStore(pluginId);
 
   try {
-    // Connect KV before execution
-    await kv.connect();
-
-    // Pass both API and KV to loader
     const result: R = await loadAndExecutePlugin<T, R>(userScriptPath, plugin, kv, pluginParams);
 
     return result;
   } finally {
-    // Clean up both resources at the same level
-    await kv.disconnect();
     plugin.close();
   }
 }

plugins/tests/lib/kv.test.ts

@@ -75,13 +75,13 @@ describe('PluginKV', () => {
       await kv.set('user:2', { name: 'Bob' });
       // Hold a lock during scan to ensure lock keys are not included
       await kv.withLock('some-resource', async () => {
-        const userKeys = await kv.scan('user:*');
+        const userKeys = await kv.listKeys('user:*');
         expect(userKeys).toHaveLength(2);
         expect(userKeys).toContain('user:1');
         expect(userKeys).toContain('user:2');
       });
 
-      const allKeys = await kv.scan();
+      const allKeys = await kv.listKeys();
       expect(allKeys).toHaveLength(2);
     });
 
@@ -92,7 +92,7 @@ describe('PluginKV', () => {
       }
       const deleted = await kv.clear();
       expect(deleted).toBeGreaterThanOrEqual(n);
-      const keys = await kv.scan();
+      const keys = await kv.listKeys();
       expect(keys).toHaveLength(0);
     });
   });