polystore 0.19.0 → 0.21.0

package/index.d.ts

@@ -45,6 +45,7 @@ interface ClientNonExpires {
     values?<T extends Serializable>(prefix: string): Promise<StoreData<T>[]> | StoreData<T>[];
     entries?<T extends Serializable>(prefix: string): Promise<[string, StoreData<T>][]> | [string, StoreData<T>][];
     all?<T extends Serializable>(prefix: string): Promise<Record<string, StoreData<T>>> | Record<string, StoreData<T>>;
+    prune?(): Promise<any> | any;
     clear?(prefix: string): Promise<any> | any;
     clearAll?(): Promise<any> | any;
     close?(): Promise<any> | any;

package/index.js

@@ -244,8 +244,10 @@ var File = class extends Client {
     }
   }
   // Bulk updates are worth creating a custom method here
-  clearAll = () => this.#withLock(() => this.#write({}));
   clear = async (prefix = "") => {
+    if (!prefix) {
+      await this.#withLock(() => this.#write({}));
+    }
     return this.#withLock(async () => {
       const data = await this.#read();
       for (let key in data) {
@@ -366,8 +368,10 @@ var Level = class extends Client {
       list.map(async (k) => [k, await this.get(k)])
     );
   };
-  clearAll = () => this.client.clear();
   clear = async (prefix = "") => {
+    if (!prefix) {
+      return await this.client.clear();
+    }
     const keys = await this.client.keys().all();
     const list = keys.filter((k) => k.startsWith(prefix));
     return this.client.batch(
@@ -395,6 +399,97 @@ var Memory = class extends Client {
   clearAll = () => this.client.clear();
 };
 
+// src/clients/postgres.ts
+var Postgres = class extends Client {
+  TYPE = "POSTGRES";
+  // This one is doing manual time management internally even though
+  // sqlite does not natively support expirations. This is because it does
+  // support creating a `expires_at:Date` column that makes managing
+  // expirations much easier, so it's really "somewhere in between"
+  HAS_EXPIRATION = true;
+  // The table name to use
+  table = "kv";
+  // Ensure schema exists before any operation
+  promise = (async () => {
+    if (!/^[a-zA-Z_]+$/.test(this.table)) {
+      throw new Error(`Invalid table name ${this.table}`);
+    }
+    await this.client.query(`
+      CREATE TABLE IF NOT EXISTS ${this.table} (
+        id TEXT PRIMARY KEY,
+        value TEXT NOT NULL,
+        expires_at TIMESTAMPTZ
+      )
+    `);
+    await this.client.query(
+      `CREATE INDEX IF NOT EXISTS idx_${this.table}_expires_at ON ${this.table} (expires_at)`
+    );
+  })();
+  static test = (client) => {
+    return client && client.query && !client.filename;
+  };
+  get = async (id) => {
+    const result = await this.client.query(
+      `SELECT value
+       FROM ${this.table}
+       WHERE id = $1 AND (expires_at IS NULL OR expires_at > NOW())`,
+      [id]
+    );
+    if (!result.rows.length) return null;
+    return this.decode(result.rows[0].value);
+  };
+  set = async (id, data, expires) => {
+    const value = this.encode(data);
+    const expires_at = expires ? new Date(Date.now() + expires * 1e3) : null;
+    await this.client.query(
+      `INSERT INTO ${this.table} (id, value, expires_at)
+       VALUES ($1, $2, $3)
+       ON CONFLICT (id) DO UPDATE
+       SET value = EXCLUDED.value, expires_at = EXCLUDED.expires_at`,
+      [id, value, expires_at]
+    );
+  };
+  del = async (id) => {
+    await this.client.query(`DELETE FROM ${this.table} WHERE id = $1`, [id]);
+  };
+  async *iterate(prefix = "") {
+    const result = await this.client.query(
+      `SELECT id, value FROM ${this.table}
+        WHERE (expires_at IS NULL OR expires_at > NOW()) ${prefix ? `AND id LIKE $1` : ""}`,
+      prefix ? [`${prefix}%`] : []
+    );
+    for (const row of result.rows) {
+      yield [row.id, this.decode(row.value)];
+    }
+  }
+  async keys(prefix = "") {
+    const result = await this.client.query(
+      `SELECT id FROM ${this.table}
+       WHERE (expires_at IS NULL OR expires_at > NOW())
+       ${prefix ? `AND id LIKE $1` : ""}`,
+      prefix ? [`${prefix}%`] : []
+    );
+    return result.rows.map((r) => r.id);
+  }
+  prune = async () => {
+    await this.client.query(
+      `DELETE FROM ${this.table}
+       WHERE expires_at IS NOT NULL AND expires_at <= NOW()`
+    );
+  };
+  clear = async (prefix = "") => {
+    await this.client.query(
+      `DELETE FROM ${this.table} ${prefix ? `WHERE id LIKE $1` : ""}`,
+      prefix ? [`${prefix}%`] : []
+    );
+  };
+  close = async () => {
+    if (this.client.end) {
+      await this.client.end();
+    }
+  };
+};
+
 // src/clients/redis.ts
 var Redis = class extends Client {
   TYPE = "REDIS";
@@ -470,13 +565,11 @@ var SQLite = class extends Client {
     return typeof client?.prepare === "function" && typeof client?.exec === "function";
   };
   get = (id) => {
-    const row = this.client.prepare(`SELECT value, expires_at FROM kv WHERE id = ?`).get(id);
-    if (!row) return null;
-    if (row.expires_at && row.expires_at < Date.now()) {
-      this.del(id);
-      return null;
-    }
-    return this.decode(row.value);
+    const value = this.client.prepare(
+      `SELECT value, expires_at FROM kv WHERE id = ? AND (expires_at IS NULL OR expires_at > ?)`
+    ).get(id, Date.now())?.value;
+    if (!value) return null;
+    return this.decode(value);
   };
   set = (id, data, expires) => {
     const value = this.encode(data);
@@ -485,8 +578,8 @@ var SQLite = class extends Client {
       `INSERT INTO kv (id, value, expires_at) VALUES (?, ?, ?) ON CONFLICT(id) DO UPDATE SET value = excluded.value, expires_at = excluded.expires_at`
     ).run(id, value, expires_at);
   };
-  del = async (id) => {
-    await this.client.prepare(`DELETE FROM kv WHERE id = ?`).run(id);
+  del = (id) => {
+    this.client.prepare(`DELETE FROM kv WHERE id = ?`).run(id);
   };
   has = (id) => {
     const row = this.client.prepare(`SELECT expires_at FROM kv WHERE id = ?`).get(id);
@@ -498,7 +591,6 @@ var SQLite = class extends Client {
     return true;
   };
   *iterate(prefix = "") {
-    this.#clearExpired();
     const sql = `SELECT id, value FROM kv WHERE (expires_at IS NULL OR expires_at > ?) ${prefix ? "AND id LIKE ?" : ""}
     `;
     const params = prefix ? [Date.now(), `${prefix}%`] : [Date.now()];
@@ -507,7 +599,6 @@ var SQLite = class extends Client {
     }
   }
   keys = (prefix = "") => {
-    this.#clearExpired();
     const sql = `SELECT id FROM kv WHERE (expires_at IS NULL OR expires_at > ?)
 ${prefix ? "AND id LIKE ?" : ""}
     `;
@@ -515,11 +606,15 @@ ${prefix ? "AND id LIKE ?" : ""}
     const rows = this.client.prepare(sql).all(...params);
     return rows.map((r) => r.id);
   };
-  #clearExpired = () => {
-    this.client.prepare(`DELETE FROM kv WHERE expires_at < ?`).run(Date.now());
+  prune = () => {
+    this.client.prepare(`DELETE FROM kv WHERE expires_at <= ?`).run(Date.now());
   };
-  clearAll = () => {
-    this.client.exec(`DELETE FROM kv`);
+  clear = (prefix = "") => {
+    if (!prefix) {
+      this.client.prepare(`DELETE FROM ${this.table}`).run();
+      return;
+    }
+    this.client.prepare(`DELETE FROM ${this.table} WHERE id LIKE ?`).run(`${prefix}%`);
   };
   close = () => {
     this.client.close?.();
@@ -564,8 +659,7 @@ var clients_default = {
   forage: Forage,
   level: Level,
   memory: Memory,
-  // postgres,
-  // prisma,
+  postgres: Postgres,
   redis: Redis,
   storage: WebStorage,
   sqlite: SQLite
@@ -932,13 +1026,8 @@ var Store = class _Store {
   async prune() {
     await this.promise;
     if (this.client.HAS_EXPIRATION) return;
-    for await (const [name, data] of this.client.iterate(
-      this.PREFIX
-    )) {
-      const key = name.slice(this.PREFIX.length);
-      if (!this.#isFresh(data, key)) {
-        await this.del(key);
-      }
+    if (this.client.prune) {
+      await this.client.prune();
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polystore",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "A small compatibility layer for many popular KV stores like localStorage, Redis, FileSystem, etc.",
   "homepage": "https://polystore.dev",
   "repository": "https://github.com/franciscop/polystore.git",
@@ -16,23 +16,36 @@
       "types": "./index.d.ts",
       "import": "./index.js"
     },
-    "./express": "./src/express.js"
+    "./express": {
+      "types": "./src/integrations/express.d.ts",
+      "import": "./src/integrations/express.js"
+    },
+    "./hono-sessions": {
+      "types": "./src/integrations/hono-sessions.d.ts",
+      "import": "./src/integrations/hono-sessions.js"
+    }
   },
   "files": [
     "index.js",
     "index.d.ts",
-    "src/express.js"
+    "src/integrations/express.js",
+    "src/integrations/express.d.ts",
+    "src/integrations/hono-sessions.js",
+    "src/integrations/hono-sessions.d.ts"
   ],
   "scripts": {
     "analyze": "npm run build && esbuild src/index.ts --bundle --packages=external --format=esm --minify --outfile=index.min.js && echo 'Final size:' && gzip-size index.min.js && rm index.min.js",
-    "build": "bunx tsup src/index.ts --format esm --dts --out-dir . --target node24",
+    "build": "bunx tsup src/index.ts --format esm --dts --out-dir . --target node24 && bunx tsup src/integrations/express.ts src/integrations/hono-sessions.ts --format esm --dts --out-dir src/integrations --target node24 --external polystore --external express-session --external hono-sessions",
     "lint": "npx tsc --noEmit",
     "start": "bun test --watch",
+    "service:db": "etcd",
+    "service:redis": "brew services start redis",
+    "service:postgres": "brew services start postgresql",
+    "service:server": "bun ./src/server.ts",
+    "services": "concurrently \"npm run service:db\" \"npm run service:redis\" \"npm run service:postgres\" \"npm run service:server\"",
     "test": "npm run test:bun && npm run test:jest",
-    "test:bun": "bun test ./test/index.test.ts",
-    "test:jest": "jest ./test/index.test.ts --detectOpenHandles --forceExit",
-    "run:db": "etcd",
-    "run:server": "bun ./src/server.ts"
+    "test:bun": "bun test ./test/index.test.ts ./src/integrations/",
+    "test:jest": "jest ./test/index.test.ts --detectOpenHandles --forceExit"
   },
   "keywords": [
     "kv",
@@ -47,21 +60,32 @@
     "@deno/kv": "^0.8.1",
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "^1.3.3",
+    "@types/express": "^5.0.6",
+    "@types/express-session": "^1.18.2",
     "@types/jest": "^30.0.0",
     "@types/jsdom": "^27.0.0",
+    "@types/pg": "^8.11.10",
+    "@types/supertest": "^7.2.0",
     "better-sqlite3": "^12.6.0",
     "check-dts": "^0.8.0",
+    "concurrently": "^9.2.1",
     "cross-fetch": "^4.1.0",
     "dotenv": "^16.3.1",
     "edge-mock": "^0.0.15",
     "esbuild": "^0.27.0",
     "etcd3": "^1.1.2",
+    "express": "^5.2.1",
+    "express-session": "^1.19.0",
     "gzip-size-cli": "^5.1.0",
+    "hono": "^4.12.10",
+    "hono-sessions": "^0.8.1",
     "jest": "^30.2.0",
     "jsdom": "^27.2.0",
     "level": "^8.0.1",
     "localforage": "^1.10.0",
+    "pg": "^8.13.1",
     "redis": "^4.6.10",
+    "supertest": "^7.2.2",
     "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "tsup": "^8.5.1",