@pikku/kysely 0.6.3 → 0.6.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @pikku/pino
 
+## 0.6.5
+
+### Patch Changes
+
+- 9541f42: fix: deleting ssl invalidation
+
+## 0.6.4
+
+### Patch Changes
+
+- 8a14f3a: refactor: removing user session from channel object
+- Updated dependencies [ebc04eb]
+- Updated dependencies [8a14f3a]
+- Updated dependencies [2c47386]
+  - @pikku/core@0.6.17
+
 ## 0.6.3
 
 ### Patch Changes

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

@@ -1,3 +1,4 @@
+import { CoreUserSession } from '@pikku/core';
 import { Channel, ChannelStore } from '@pikku/core/channel';
 import { Kysely } from 'kysely';
 export declare class KyselyChannelStore extends ChannelStore {
@@ -6,5 +7,7 @@ export declare class KyselyChannelStore extends ChannelStore {
     addChannel({ channelId, channelName, openingData, }: Channel): Promise<void>;
     removeChannels(channelIds: string[]): Promise<void>;
     setUserSession(channelId: string, session: any): Promise<void>;
-    getChannel(channelId: string): Promise<Channel>;
+    getChannelAndSession(channelId: string): Promise<Channel & {
+        session: CoreUserSession;
+    }>;
 }

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

@@ -28,7 +28,7 @@ export class KyselyChannelStore extends ChannelStore {
             .set('userSession', session)
             .executeTakeFirstOrThrow();
     }
-    async getChannel(channelId) {
+    async getChannelAndSession(channelId) {
         const result = await this.database
             .selectFrom('serverless.lambdaChannels')
             .selectAll()
@@ -36,7 +36,7 @@ export class KyselyChannelStore extends ChannelStore {
             .executeTakeFirstOrThrow();
         return {
             openingData: result.openingData,
-            userSession: result.userSession,
+            session: result.userSession,
             channelName: result.channelName,
         };
     }

package/dist/src/pikku-kysely.js

@@ -9,7 +9,6 @@ export class PikkuKysely {
     constructor(logger, poolConfig, defaultSchemaName) {
         this.logger = logger;
         this.poolConfig = poolConfig;
-        delete poolConfig.ssl;
         this.postgres = postgres(poolConfig);
         this.kysely = new Kysely({
             dialect: new PostgresJSDialect({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/kysely",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "module": "dist/src/index.js",
@@ -17,7 +17,7 @@
     "release": "npm run build && npm test"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.6.13"
+    "@pikku/core": "^0.6.17"
   },
   "dependencies": {
     "kysely": "^0.27.6",

package/sql/serverless-tables.sql

@@ -0,0 +1,16 @@
+CREATE SCHEMA serverless;
+
+CREATE TABLE serverless.lambda_channels (
+    channel_id TEXT PRIMARY KEY,
+    channel_name TEXT NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    opening_data JSONB NOT NULL DEFAULT '{}',
+    user_session JSONB,
+    last_interaction TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+CREATE TABLE serverless.lambda_channel_subscriptions (
+    channel_id TEXT NOT NULL REFERENCES serverless.lambda_channels(channel_id) ON DELETE CASCADE,
+    topic TEXT NOT NULL,
+    PRIMARY KEY (channel_id, topic)
+);

package/src/kysely-channel-store.ts

@@ -37,16 +37,17 @@ export class KyselyChannelStore extends ChannelStore {
       .executeTakeFirstOrThrow()
   }
 
-  public async getChannel(channelId: string) {
+  public async getChannelAndSession(channelId: string) {
     const result = await this.database
       .selectFrom('serverless.lambdaChannels')
       .selectAll()
       .where('channelId', '=', channelId)
       .executeTakeFirstOrThrow()
+
     return {
       openingData: result.openingData as any,
-      userSession: result.userSession as CoreUserSession,
+      session: result.userSession as CoreUserSession,
       channelName: result.channelName,
-    } as Channel
+    } as Channel & { session: CoreUserSession }
   }
 }

package/src/pikku-kysely.ts

@@ -12,7 +12,6 @@ export class PikkuKysely<DB> {
     private poolConfig: postgres.Options<{}>,
     defaultSchemaName: string
   ) {
-    delete poolConfig.ssl
     this.postgres = postgres(poolConfig)
     this.kysely = new Kysely<DB>({
       dialect: new PostgresJSDialect({