@pikku/kysely 0.12.9 → 0.12.10

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## 0.12.0
 
+## 0.12.10
+
+### Patch Changes
+
+- 311c0c4: Unify session persistence through SessionStore, remove session blob from ChannelStore
+
+  - PikkuSessionService now persists sessions via SessionStore on set()/clear() instead of every function call
+  - ChannelStore no longer stores session data — maps channelId to pikkuUserId only
+  - ChannelStore API: setUserSession/getChannelAndSession replaced with setPikkuUserId/getChannel
+  - Serverless channel runner resolves sessions from SessionStore using pikkuUserId from ChannelStore
+
+- Updated dependencies [311c0c4]
+  - @pikku/core@0.12.18
+
 ## 0.12.9
 
 ### Patch Changes

package/dist/src/index.d.ts

@@ -10,6 +10,7 @@ export { KyselySecretService } from './kysely-secret-service.js';
 export type { KyselySecretServiceConfig } from './kysely-secret-service.js';
 export { KyselyCredentialService } from './kysely-credential-service.js';
 export type { KyselyCredentialServiceConfig } from './kysely-credential-service.js';
+export { KyselySessionStore } from './kysely-session-store.js';
 export type { KyselyPikkuDB } from './kysely-tables.js';
 export type { WorkflowRunService } from '@pikku/core/workflow';
 export type { AgentRunService, AgentRunRow } from '@pikku/core/ai-agent';

package/dist/src/index.js

@@ -8,3 +8,4 @@ export { KyselyAgentRunService } from './kysely-ai-agent-run-service.js';
 export { KyselyAIRunStateService } from './kysely-ai-run-state-service.js';
 export { KyselySecretService } from './kysely-secret-service.js';
 export { KyselyCredentialService } from './kysely-credential-service.js';
+export { KyselySessionStore } from './kysely-session-store.js';

package/dist/src/kysely-channel-store.d.ts

@@ -1,4 +1,3 @@
-import type { CoreUserSession } from '@pikku/core';
 import type { Channel } from '@pikku/core/channel';
 import { ChannelStore } from '@pikku/core/channel';
 import type { Kysely } from 'kysely';
@@ -10,9 +9,9 @@ export declare class KyselyChannelStore extends ChannelStore {
     init(): Promise<void>;
     addChannel({ channelId, channelName, openingData, }: Channel): Promise<void>;
     removeChannels(channelIds: string[]): Promise<void>;
-    setUserSession(channelId: string, session: CoreUserSession | null): Promise<void>;
-    getChannelAndSession(channelId: string): Promise<Channel & {
-        session: CoreUserSession;
+    setPikkuUserId(channelId: string, pikkuUserId: string | null): Promise<void>;
+    getChannel(channelId: string): Promise<Channel & {
+        pikkuUserId?: string;
     }>;
     close(): Promise<void>;
 }

package/dist/src/kysely-channel-store.js

@@ -19,7 +19,7 @@ export class KyselyChannelStore extends ChannelStore {
             .addColumn('channel_name', 'text', (col) => col.notNull())
             .addColumn('created_at', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
             .addColumn('opening_data', 'text', (col) => col.notNull().defaultTo('{}'))
-            .addColumn('user_session', 'text')
+            .addColumn('pikku_user_id', 'text')
             .addColumn('last_wire', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
             .execute();
         await this.db.schema
@@ -53,17 +53,17 @@ export class KyselyChannelStore extends ChannelStore {
             .where('channelId', 'in', channelIds)
             .execute();
     }
-    async setUserSession(channelId, session) {
+    async setPikkuUserId(channelId, pikkuUserId) {
         await this.db
             .updateTable('channels')
-            .set({ userSession: session ? JSON.stringify(session) : null })
+            .set({ pikkuUserId })
             .where('channelId', '=', channelId)
             .execute();
     }
-    async getChannelAndSession(channelId) {
+    async getChannel(channelId) {
         const row = await this.db
             .selectFrom('channels')
-            .select(['channelId', 'channelName', 'openingData', 'userSession'])
+            .select(['channelId', 'channelName', 'openingData', 'pikkuUserId'])
             .where('channelId', '=', channelId)
             .executeTakeFirst();
         if (!row) {
@@ -73,7 +73,7 @@ export class KyselyChannelStore extends ChannelStore {
             channelId: row.channelId,
             channelName: row.channelName,
             openingData: parseJson(row.openingData) ?? {},
-            session: (parseJson(row.userSession) ?? {}),
+            pikkuUserId: row.pikkuUserId ?? undefined,
         };
     }
     async close() { }

package/dist/src/kysely-session-store.d.ts

@@ -0,0 +1,13 @@
+import type { CoreUserSession } from '@pikku/core';
+import type { SessionStore } from '@pikku/core/services';
+import type { Kysely } from 'kysely';
+import type { KyselyPikkuDB } from './kysely-tables.js';
+export declare class KyselySessionStore implements SessionStore {
+    private db;
+    private initialized;
+    constructor(db: Kysely<KyselyPikkuDB>);
+    init(): Promise<void>;
+    get(pikkuUserId: string): Promise<CoreUserSession | undefined>;
+    set(pikkuUserId: string, session: CoreUserSession): Promise<void>;
+    clear(pikkuUserId: string): Promise<void>;
+}

package/dist/src/kysely-session-store.js

@@ -0,0 +1,54 @@
+import { sql } from 'kysely';
+import { parseJson } from './kysely-json.js';
+export class KyselySessionStore {
+    db;
+    initialized = false;
+    constructor(db) {
+        this.db = db;
+    }
+    async init() {
+        if (this.initialized) {
+            return;
+        }
+        await this.db.schema
+            .createTable('pikku_user_sessions')
+            .ifNotExists()
+            .addColumn('pikku_user_id', 'text', (col) => col.primaryKey())
+            .addColumn('session', 'text', (col) => col.notNull())
+            .addColumn('created_at', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
+            .addColumn('updated_at', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
+            .execute();
+        this.initialized = true;
+    }
+    async get(pikkuUserId) {
+        const row = await this.db
+            .selectFrom('pikkuUserSessions')
+            .select(['session'])
+            .where('pikkuUserId', '=', pikkuUserId)
+            .executeTakeFirst();
+        if (!row) {
+            return undefined;
+        }
+        return (parseJson(row.session) ?? undefined);
+    }
+    async set(pikkuUserId, session) {
+        await this.db
+            .insertInto('pikkuUserSessions')
+            .values({
+            pikkuUserId,
+            session: JSON.stringify(session),
+            updatedAt: new Date(),
+        })
+            .onConflict((oc) => oc.column('pikkuUserId').doUpdateSet({
+            session: JSON.stringify(session),
+            updatedAt: new Date(),
+        }))
+            .execute();
+    }
+    async clear(pikkuUserId) {
+        await this.db
+            .deleteFrom('pikkuUserSessions')
+            .where('pikkuUserId', '=', pikkuUserId)
+            .execute();
+    }
+}

package/dist/src/kysely-tables.d.ts

@@ -5,7 +5,7 @@ export interface ChannelsTable {
     channelName: string;
     createdAt: Generated<Date>;
     openingData: string;
-    userSession: string | null;
+    pikkuUserId: string | null;
     lastWire: Generated<Date>;
 }
 export interface ChannelSubscriptionsTable {
@@ -153,6 +153,12 @@ export interface CredentialsAuditTable {
     action: string;
     performedAt: Generated<Date>;
 }
+export interface UserSessionsTable {
+    pikkuUserId: string;
+    session: string;
+    createdAt: Generated<Date>;
+    updatedAt: Generated<Date>;
+}
 export interface KyselyPikkuDB {
     channels: ChannelsTable;
     channelSubscriptions: ChannelSubscriptionsTable;
@@ -171,4 +177,5 @@ export interface KyselyPikkuDB {
     secretsAudit: SecretsAuditTable;
     credentials: CredentialsTable;
     credentialsAudit: CredentialsAuditTable;
+    pikkuUserSessions: UserSessionsTable;
 }

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/kysely-ai-agent-run-service.ts","../src/kysely-ai-run-state-service.ts","../src/kysely-ai-storage-service.ts","../src/kysely-channel-store.ts","../src/kysely-credential-service.ts","../src/kysely-deployment-service.ts","../src/kysely-eventhub-store.ts","../src/kysely-json.ts","../src/kysely-secret-service.ts","../src/kysely-tables.ts","../src/kysely-workflow-run-service.ts","../src/kysely-workflow-service.ts","../bin/pikku-kysely-pure.ts"],"version":"5.9.3"}
+{"root":["../src/index.ts","../src/kysely-ai-agent-run-service.ts","../src/kysely-ai-run-state-service.ts","../src/kysely-ai-storage-service.ts","../src/kysely-channel-store.ts","../src/kysely-credential-service.ts","../src/kysely-deployment-service.ts","../src/kysely-eventhub-store.ts","../src/kysely-json.ts","../src/kysely-secret-service.ts","../src/kysely-session-store.ts","../src/kysely-tables.ts","../src/kysely-workflow-run-service.ts","../src/kysely-workflow-service.ts","../bin/pikku-kysely-pure.ts"],"version":"5.9.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/kysely",
-  "version": "0.12.9",
+  "version": "0.12.10",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "module": "dist/src/index.js",
@@ -20,7 +20,7 @@
     "prepublishOnly": "yarn build"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.12.15"
+    "@pikku/core": "^0.12.18"
   },
   "dependencies": {
     "kysely": "^0.28.12"

package/src/index.ts

@@ -10,6 +10,7 @@ export { KyselySecretService } from './kysely-secret-service.js'
 export type { KyselySecretServiceConfig } from './kysely-secret-service.js'
 export { KyselyCredentialService } from './kysely-credential-service.js'
 export type { KyselyCredentialServiceConfig } from './kysely-credential-service.js'
+export { KyselySessionStore } from './kysely-session-store.js'
 
 export type { KyselyPikkuDB } from './kysely-tables.js'
 export type { WorkflowRunService } from '@pikku/core/workflow'

package/src/kysely-channel-store.ts

@@ -1,4 +1,3 @@
-import type { CoreUserSession } from '@pikku/core'
 import type { Channel } from '@pikku/core/channel'
 import { ChannelStore } from '@pikku/core/channel'
 import type { Kysely } from 'kysely'
@@ -27,7 +26,7 @@ export class KyselyChannelStore extends ChannelStore {
         col.defaultTo(sql`CURRENT_TIMESTAMP`).notNull()
       )
       .addColumn('opening_data', 'text', (col) => col.notNull().defaultTo('{}'))
-      .addColumn('user_session', 'text')
+      .addColumn('pikku_user_id', 'text')
       .addColumn('last_wire', 'timestamp', (col) =>
         col.defaultTo(sql`CURRENT_TIMESTAMP`).notNull()
       )
@@ -75,23 +74,23 @@ export class KyselyChannelStore extends ChannelStore {
       .execute()
   }
 
-  public async setUserSession(
+  public async setPikkuUserId(
     channelId: string,
-    session: CoreUserSession | null
+    pikkuUserId: string | null
   ): Promise<void> {
     await this.db
       .updateTable('channels')
-      .set({ userSession: session ? JSON.stringify(session) : null })
+      .set({ pikkuUserId })
       .where('channelId', '=', channelId)
       .execute()
   }
 
-  public async getChannelAndSession(
+  public async getChannel(
     channelId: string
-  ): Promise<Channel & { session: CoreUserSession }> {
+  ): Promise<Channel & { pikkuUserId?: string }> {
     const row = await this.db
       .selectFrom('channels')
-      .select(['channelId', 'channelName', 'openingData', 'userSession'])
+      .select(['channelId', 'channelName', 'openingData', 'pikkuUserId'])
       .where('channelId', '=', channelId)
       .executeTakeFirst()
 
@@ -103,7 +102,7 @@ export class KyselyChannelStore extends ChannelStore {
       channelId: row.channelId,
       channelName: row.channelName,
       openingData: parseJson(row.openingData) ?? {},
-      session: (parseJson(row.userSession) ?? {}) as CoreUserSession,
+      pikkuUserId: row.pikkuUserId ?? undefined,
     }
   }
 

package/src/kysely-services.test.ts

@@ -17,6 +17,7 @@ import { KyselyAIStorageService } from './kysely-ai-storage-service.js'
 import { KyselyAgentRunService } from './kysely-ai-agent-run-service.js'
 import { KyselySecretService } from './kysely-secret-service.js'
 import { KyselyCredentialService } from './kysely-credential-service.js'
+import { KyselySessionStore } from './kysely-session-store.js'
 
 function createSqliteDb(): Kysely<KyselyPikkuDB> {
   return new Kysely<KyselyPikkuDB>({
@@ -109,6 +110,11 @@ function registerTests(
         await s.init()
         return s
       },
+      sessionStore: async () => {
+        const s = new KyselySessionStore(getDb())
+        await s.init()
+        return s
+      },
     },
   })
 

package/src/kysely-session-store.ts

@@ -0,0 +1,73 @@
+import type { CoreUserSession } from '@pikku/core'
+import type { SessionStore } from '@pikku/core/services'
+import type { Kysely } from 'kysely'
+import { sql } from 'kysely'
+import type { KyselyPikkuDB } from './kysely-tables.js'
+import { parseJson } from './kysely-json.js'
+
+export class KyselySessionStore implements SessionStore {
+  private initialized = false
+
+  constructor(private db: Kysely<KyselyPikkuDB>) {}
+
+  public async init(): Promise<void> {
+    if (this.initialized) {
+      return
+    }
+
+    await this.db.schema
+      .createTable('pikku_user_sessions')
+      .ifNotExists()
+      .addColumn('pikku_user_id', 'text', (col) => col.primaryKey())
+      .addColumn('session', 'text', (col) => col.notNull())
+      .addColumn('created_at', 'timestamp', (col) =>
+        col.defaultTo(sql`CURRENT_TIMESTAMP`).notNull()
+      )
+      .addColumn('updated_at', 'timestamp', (col) =>
+        col.defaultTo(sql`CURRENT_TIMESTAMP`).notNull()
+      )
+      .execute()
+
+    this.initialized = true
+  }
+
+  async get(pikkuUserId: string): Promise<CoreUserSession | undefined> {
+    const row = await this.db
+      .selectFrom('pikkuUserSessions')
+      .select(['session'])
+      .where('pikkuUserId', '=', pikkuUserId)
+      .executeTakeFirst()
+
+    if (!row) {
+      return undefined
+    }
+
+    return (parseJson(row.session) ?? undefined) as
+      | CoreUserSession
+      | undefined
+  }
+
+  async set(pikkuUserId: string, session: CoreUserSession): Promise<void> {
+    await this.db
+      .insertInto('pikkuUserSessions')
+      .values({
+        pikkuUserId,
+        session: JSON.stringify(session),
+        updatedAt: new Date(),
+      })
+      .onConflict((oc) =>
+        oc.column('pikkuUserId').doUpdateSet({
+          session: JSON.stringify(session),
+          updatedAt: new Date(),
+        })
+      )
+      .execute()
+  }
+
+  async clear(pikkuUserId: string): Promise<void> {
+    await this.db
+      .deleteFrom('pikkuUserSessions')
+      .where('pikkuUserId', '=', pikkuUserId)
+      .execute()
+  }
+}

package/src/kysely-tables.ts

@@ -10,7 +10,7 @@ export interface ChannelsTable {
   channelName: string
   createdAt: Generated<Date>
   openingData: string
-  userSession: string | null
+  pikkuUserId: string | null
   lastWire: Generated<Date>
 }
 
@@ -175,6 +175,13 @@ export interface CredentialsAuditTable {
   performedAt: Generated<Date>
 }
 
+export interface UserSessionsTable {
+  pikkuUserId: string
+  session: string
+  createdAt: Generated<Date>
+  updatedAt: Generated<Date>
+}
+
 export interface KyselyPikkuDB {
   channels: ChannelsTable
   channelSubscriptions: ChannelSubscriptionsTable
@@ -193,4 +200,5 @@ export interface KyselyPikkuDB {
   secretsAudit: SecretsAuditTable
   credentials: CredentialsTable
   credentialsAudit: CredentialsAuditTable
+  pikkuUserSessions: UserSessionsTable
 }