@taico/adk-session-store 0.4.1 → 0.5.1

package/README.md

@@ -1,6 +1,6 @@
 # @taico/adk-session-store
 
-[![Socket Badge](https://badge.socket.dev/npm/package/@taico/adk-session-store/0.4.1)](https://badge.socket.dev/npm/package/@taico/adk-session-store/0.4.1)
+[![Socket Badge](https://badge.socket.dev/npm/package/@taico/adk-session-store/0.5.1)](https://badge.socket.dev/npm/package/@taico/adk-session-store/0.5.1)
 
 PostgreSQL and SQLite session storage for Google ADK. Taico production uses
 `PostgresSessionService`; the SQLite implementation remains available to package

package/dist/paginate-sessions.d.ts

@@ -0,0 +1,8 @@
+import { ListSessionsRequest, ListSessionsResponse, Session } from '@google/adk';
+type Pagination = Pick<ListSessionsRequest, 'limit' | 'offset' | 'page' | 'order'>;
+/**
+ * Applies the ordering and pagination contract of ADK's `listSessions`
+ * (matching `InMemorySessionService`) to an already-fetched list of sessions.
+ */
+export declare function paginateSessions(sessions: Session[], { limit, offset, page, order }: Pagination): ListSessionsResponse;
+export {};

package/dist/paginate-sessions.js

@@ -0,0 +1,32 @@
+/**
+ * Applies the ordering and pagination contract of ADK's `listSessions`
+ * (matching `InMemorySessionService`) to an already-fetched list of sessions.
+ */
+export function paginateSessions(sessions, { limit, offset, page, order }) {
+    const all = [...sessions];
+    if (order === 'asc') {
+        all.sort((a, b) => a.lastUpdateTime - b.lastUpdateTime || a.id.localeCompare(b.id));
+    }
+    else if (order === 'desc') {
+        all.sort((a, b) => b.lastUpdateTime - a.lastUpdateTime || a.id.localeCompare(b.id));
+    }
+    const totalItems = all.length;
+    if (limit === undefined) {
+        return {
+            sessions: offset ? all.slice(offset) : all,
+            page: 1,
+            limit: totalItems,
+            totalItems,
+            totalPages: totalItems === 0 ? 0 : 1,
+        };
+    }
+    const effectiveOffset = page !== undefined ? (page - 1) * limit : offset ?? 0;
+    const effectivePage = page !== undefined ? page : limit === 0 ? 1 : Math.floor(effectiveOffset / limit) + 1;
+    return {
+        sessions: all.slice(effectiveOffset, effectiveOffset + limit),
+        page: effectivePage,
+        limit,
+        totalItems,
+        totalPages: limit === 0 ? 0 : Math.ceil(totalItems / limit),
+    };
+}

package/dist/postgres-session-service.d.ts

@@ -9,7 +9,7 @@ export declare class PostgresSessionService extends BaseSessionService {
     constructor(options: PostgresSessionServiceOptions);
     createSession({ appName, userId, state, sessionId, }: CreateSessionRequest): Promise<Session>;
     getSession({ appName, userId, sessionId, config, }: GetSessionRequest): Promise<Session | undefined>;
-    listSessions({ appName, userId, }: ListSessionsRequest): Promise<ListSessionsResponse>;
+    listSessions({ appName, userId, ...pagination }: ListSessionsRequest): Promise<ListSessionsResponse>;
     deleteSession({ appName, userId, sessionId, }: DeleteSessionRequest): Promise<void>;
     appendEvent({ session, event }: AppendEventRequest): Promise<Event>;
     close(): Promise<void>;

package/dist/postgres-session-service.js

@@ -1,6 +1,7 @@
 import { BaseSessionService, State, createSession, } from "@google/adk";
 import { randomUUID } from "node:crypto";
 import { Pool } from "pg";
+import { paginateSessions } from "./paginate-sessions.js";
 export class PostgresSessionService extends BaseSessionService {
     pool;
     ready;
@@ -62,20 +63,18 @@ export class PostgresSessionService extends BaseSessionService {
             lastUpdateTime: Number(sessionRow.last_update_time),
         }));
     }
-    async listSessions({ appName, userId, }) {
+    async listSessions({ appName, userId, ...pagination }) {
         await this.ready;
         const rows = await this.many(`SELECT app_name, user_id, session_id, state_json, last_update_time
-       FROM adk_sessions WHERE app_name = $1 AND user_id = $2`, [appName, userId]);
-        return {
-            sessions: rows.map((row) => createSession({
-                id: row.session_id,
-                appName: row.app_name,
-                userId: row.user_id,
-                state: {},
-                events: [],
-                lastUpdateTime: Number(row.last_update_time),
-            })),
-        };
+       FROM adk_sessions WHERE app_name = $1${userId === undefined ? "" : " AND user_id = $2"}`, userId === undefined ? [appName] : [appName, userId]);
+        return paginateSessions(rows.map((row) => createSession({
+            id: row.session_id,
+            appName: row.app_name,
+            userId: row.user_id,
+            state: {},
+            events: [],
+            lastUpdateTime: Number(row.last_update_time),
+        })), pagination);
     }
     async deleteSession({ appName, userId, sessionId, }) {
         await this.ready;

package/dist/sqlite-session-service.d.ts

@@ -8,7 +8,7 @@ export declare class SqliteSessionService extends BaseSessionService {
     constructor(options?: SqliteSessionServiceOptions);
     createSession({ appName, userId, state, sessionId }: CreateSessionRequest): Promise<Session>;
     getSession({ appName, userId, sessionId, config }: GetSessionRequest): Promise<Session | undefined>;
-    listSessions({ appName, userId }: ListSessionsRequest): Promise<ListSessionsResponse>;
+    listSessions({ appName, userId, ...pagination }: ListSessionsRequest): Promise<ListSessionsResponse>;
     deleteSession({ appName, userId, sessionId }: DeleteSessionRequest): Promise<void>;
     appendEvent({ session, event }: AppendEventRequest): Promise<Event>;
     close(): Promise<void>;

package/dist/sqlite-session-service.js

@@ -1,5 +1,6 @@
 import { BaseSessionService, State, createSession, } from '@google/adk';
 import * as sqlite3 from 'sqlite3';
+import { paginateSessions } from './paginate-sessions.js';
 import { randomUUID } from 'node:crypto';
 const sqlite3Module = sqlite3.default ?? sqlite3;
 export class SqliteSessionService extends BaseSessionService {
@@ -56,19 +57,19 @@ export class SqliteSessionService extends BaseSessionService {
         });
         return this.mergeState(session);
     }
-    async listSessions({ appName, userId }) {
+    async listSessions({ appName, userId, ...pagination }) {
         await this.ready;
-        const rows = await this.all('SELECT app_name, user_id, session_id, last_update_time FROM sessions WHERE app_name = ? AND user_id = ?', [appName, userId]);
-        return {
-            sessions: rows.map((row) => createSession({
-                id: row.session_id,
-                appName: row.app_name,
-                userId: row.user_id,
-                state: {},
-                events: [],
-                lastUpdateTime: row.last_update_time,
-            })),
-        };
+        const rows = await this.all(userId === undefined
+            ? 'SELECT app_name, user_id, session_id, last_update_time FROM sessions WHERE app_name = ?'
+            : 'SELECT app_name, user_id, session_id, last_update_time FROM sessions WHERE app_name = ? AND user_id = ?', userId === undefined ? [appName] : [appName, userId]);
+        return paginateSessions(rows.map((row) => createSession({
+            id: row.session_id,
+            appName: row.app_name,
+            userId: row.user_id,
+            state: {},
+            events: [],
+            lastUpdateTime: row.last_update_time,
+        })), pagination);
     }
     async deleteSession({ appName, userId, sessionId }) {
         await this.ready;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taico/adk-session-store",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "type": "module",
   "private": false,
   "license": "PolyForm-Small-Business-1.0.0",
@@ -27,9 +27,10 @@
     "release": "npm run build && npm publish --access public"
   },
   "dependencies": {
-    "@google/adk": "^0.2.5",
+    "@google/adk": "^2.2.1",
     "pg": "^8.16.3",
-    "sqlite3": "^5.1.7"
+    "sqlite3": "^6.0.1",
+    "uuid": "^11.1.1"
   },
   "devDependencies": {
     "@types/pg": "^8.15.5",