@pikku/kysely 0.10.0 → 0.11.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.11.0
+
+### Minor Changes
+
+- Remove Kysely-based channel and eventhub stores (use @pikku/pg instead)
+- Update to support shared connection instances
+
+
 # @pikku/kysely
 
 ## 0.10.0

package/dist/src/index.d.ts

@@ -1,3 +1 @@
-export { KyselyChannelStore } from './kysely-channel-store.js';
-export { KyselyEventHubStore } from './kysely-eventhub-store.js';
 export { PikkuKysely } from './pikku-kysely.js';

package/dist/src/index.js

@@ -1,3 +1 @@
-export { KyselyChannelStore } from './kysely-channel-store.js';
-export { KyselyEventHubStore } from './kysely-eventhub-store.js';
 export { PikkuKysely } from './pikku-kysely.js';

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

@@ -3,10 +3,11 @@ import { Kysely } from 'kysely';
 import postgres from 'postgres';
 export declare class PikkuKysely<DB> {
     private logger;
-    private poolConfig;
     kysely: Kysely<DB>;
     private postgres;
-    constructor(logger: Logger, poolConfig: postgres.Options<{}>, defaultSchemaName: string);
+    private poolConfig?;
+    private ownsConnection;
+    constructor(logger: Logger, connectionOrConfig: postgres.Sql<{}> | postgres.Options<{}>, defaultSchemaName?: string);
     init(): Promise<void>;
     close(): Promise<void>;
 }

package/dist/src/pikku-kysely.js

@@ -3,13 +3,24 @@ import { PostgresJSDialect } from 'kysely-postgres-js';
 import postgres from 'postgres';
 export class PikkuKysely {
     logger;
-    poolConfig;
     kysely;
     postgres;
-    constructor(logger, poolConfig, defaultSchemaName) {
+    poolConfig;
+    ownsConnection;
+    constructor(logger, connectionOrConfig, defaultSchemaName) {
         this.logger = logger;
-        this.poolConfig = poolConfig;
-        this.postgres = postgres(poolConfig);
+        // Check if it's a postgres.Sql instance or config options
+        if (typeof connectionOrConfig === 'function') {
+            // It's a postgres.Sql instance
+            this.postgres = connectionOrConfig;
+            this.ownsConnection = false;
+        }
+        else {
+            // It's a config object
+            this.poolConfig = connectionOrConfig;
+            this.postgres = postgres(connectionOrConfig);
+            this.ownsConnection = true;
+        }
         this.kysely = new Kysely({
             dialect: new PostgresJSDialect({
                 postgres: this.postgres,
@@ -21,7 +32,12 @@ export class PikkuKysely {
         }
     }
     async init() {
-        this.logger.info(`Connecting to database: ${this.poolConfig.host}:${this.poolConfig.port} with name ${this.poolConfig.database}`);
+        if (this.poolConfig) {
+            this.logger.info(`Connecting to database: ${this.poolConfig.host}:${this.poolConfig.port} with name ${this.poolConfig.database}`);
+        }
+        else {
+            this.logger.info('Using existing postgres connection');
+        }
         try {
             const response = await this.postgres `SELECT version();`;
             const version = response[0]?.version;
@@ -34,5 +50,9 @@ export class PikkuKysely {
     }
     async close() {
         await this.kysely.destroy();
+        // Only end the connection if we created it
+        if (this.ownsConnection) {
+            await this.postgres.end();
+        }
     }
 }

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/kysely-channel-store.ts","../src/kysely-eventhub-store.ts","../src/pikku-kysely.ts","../bin/pikku-kysely-pure.ts"],"version":"5.9.3"}
+{"root":["../src/index.ts","../src/pikku-kysely.ts","../bin/pikku-kysely-pure.ts"],"version":"5.9.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/kysely",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "module": "dist/src/index.js",
@@ -16,7 +16,7 @@
     "release": "npm run build && npm test"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.10.0"
+    "@pikku/core": "^0.11.0"
   },
   "dependencies": {
     "kysely": "^0.28.8",

package/src/index.ts

@@ -1,3 +1 @@
-export { KyselyChannelStore } from './kysely-channel-store.js'
-export { KyselyEventHubStore } from './kysely-eventhub-store.js'
 export { PikkuKysely } from './pikku-kysely.js'

package/src/pikku-kysely.ts

@@ -6,13 +6,26 @@ import postgres from 'postgres'
 export class PikkuKysely<DB> {
   public kysely: Kysely<DB>
   private postgres: postgres.Sql<{}>
+  private poolConfig?: postgres.Options<{}>
+  private ownsConnection: boolean
 
   constructor(
     private logger: Logger,
-    private poolConfig: postgres.Options<{}>,
-    defaultSchemaName: string
+    connectionOrConfig: postgres.Sql<{}> | postgres.Options<{}>,
+    defaultSchemaName?: string
   ) {
-    this.postgres = postgres(poolConfig)
+    // Check if it's a postgres.Sql instance or config options
+    if (typeof connectionOrConfig === 'function') {
+      // It's a postgres.Sql instance
+      this.postgres = connectionOrConfig as postgres.Sql<{}>
+      this.ownsConnection = false
+    } else {
+      // It's a config object
+      this.poolConfig = connectionOrConfig
+      this.postgres = postgres(connectionOrConfig)
+      this.ownsConnection = true
+    }
+
     this.kysely = new Kysely<DB>({
       dialect: new PostgresJSDialect({
         postgres: this.postgres,
@@ -26,9 +39,14 @@ export class PikkuKysely<DB> {
   }
 
   public async init() {
-    this.logger.info(
-      `Connecting to database: ${this.poolConfig.host}:${this.poolConfig.port} with name ${this.poolConfig.database}`
-    )
+    if (this.poolConfig) {
+      this.logger.info(
+        `Connecting to database: ${this.poolConfig.host}:${this.poolConfig.port} with name ${this.poolConfig.database}`
+      )
+    } else {
+      this.logger.info('Using existing postgres connection')
+    }
+
     try {
       const response = await this.postgres`SELECT version();`
       const version = response[0]?.version
@@ -41,5 +59,9 @@ export class PikkuKysely<DB> {
 
   public async close() {
     await this.kysely.destroy()
+    // Only end the connection if we created it
+    if (this.ownsConnection) {
+      await this.postgres.end()
+    }
   }
 }

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

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

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

@@ -1,43 +0,0 @@
-import { ChannelStore } from '@pikku/core/channel';
-export class KyselyChannelStore extends ChannelStore {
-    database;
-    constructor(database) {
-        super();
-        this.database = database;
-    }
-    async addChannel({ channelId, channelName, openingData, }) {
-        await this.database
-            .insertInto('serverless.lambdaChannels')
-            .values({
-            channelId,
-            channelName,
-            openingData: openingData,
-        })
-            .execute();
-    }
-    async removeChannels(channelIds) {
-        await this.database
-            .deleteFrom('serverless.lambdaChannels')
-            .where('channelId', 'in', channelIds)
-            .execute();
-    }
-    async setUserSession(channelId, session) {
-        await this.database
-            .updateTable('serverless.lambdaChannels')
-            .where('channelId', '=', channelId)
-            .set('userSession', session)
-            .executeTakeFirstOrThrow();
-    }
-    async getChannelAndSession(channelId) {
-        const result = await this.database
-            .selectFrom('serverless.lambdaChannels')
-            .selectAll()
-            .where('channelId', '=', channelId)
-            .executeTakeFirstOrThrow();
-        return {
-            openingData: result.openingData,
-            session: result.userSession,
-            channelName: result.channelName,
-        };
-    }
-}

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

@@ -1,9 +0,0 @@
-import { EventHubStore } from '@pikku/core/channel';
-import { Kysely } from 'kysely';
-export declare class KyselyEventHubStore implements EventHubStore {
-    private database;
-    constructor(database: Kysely<any>);
-    getChannelIdsForTopic(topic: string): Promise<string[]>;
-    subscribe(topic: string, channelId: string): Promise<boolean>;
-    unsubscribe(topic: string, channelId: string): Promise<boolean>;
-}

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

@@ -1,29 +0,0 @@
-export class KyselyEventHubStore {
-    database;
-    constructor(database) {
-        this.database = database;
-    }
-    async getChannelIdsForTopic(topic) {
-        const result = await this.database
-            .selectFrom('serverless.lambdaChannelSubscriptions')
-            .select('channelId')
-            .where('topic', '=', topic)
-            .execute();
-        return result.map((row) => row.channelId);
-    }
-    async subscribe(topic, channelId) {
-        await this.database
-            .insertInto('serverless.lambdaChannelSubscriptions')
-            .values({ channelId, topic })
-            .execute();
-        return true;
-    }
-    async unsubscribe(topic, channelId) {
-        await this.database
-            .deleteFrom('serverless.lambdaChannelSubscriptions')
-            .where('channelId', '=', channelId)
-            .where('topic', '=', topic)
-            .execute();
-        return true;
-    }
-}

package/sql/serverless-tables.sql

@@ -1,16 +0,0 @@
-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

@@ -1,53 +0,0 @@
-import { CoreUserSession } from '@pikku/core'
-import { Channel, ChannelStore } from '@pikku/core/channel'
-import { Kysely } from 'kysely'
-
-export class KyselyChannelStore extends ChannelStore {
-  constructor(private database: Kysely<any>) {
-    super()
-  }
-
-  public async addChannel({
-    channelId,
-    channelName,
-    openingData,
-  }: Channel): Promise<void> {
-    await this.database
-      .insertInto('serverless.lambdaChannels')
-      .values({
-        channelId,
-        channelName,
-        openingData: openingData as any,
-      })
-      .execute()
-  }
-
-  public async removeChannels(channelIds: string[]): Promise<void> {
-    await this.database
-      .deleteFrom('serverless.lambdaChannels')
-      .where('channelId', 'in', channelIds)
-      .execute()
-  }
-
-  public async setUserSession(channelId: string, session: any): Promise<void> {
-    await this.database
-      .updateTable('serverless.lambdaChannels')
-      .where('channelId', '=', channelId)
-      .set('userSession', session)
-      .executeTakeFirstOrThrow()
-  }
-
-  public async getChannelAndSession(channelId: string) {
-    const result = await this.database
-      .selectFrom('serverless.lambdaChannels')
-      .selectAll()
-      .where('channelId', '=', channelId)
-      .executeTakeFirstOrThrow()
-
-    return {
-      openingData: result.openingData as any,
-      session: result.userSession as CoreUserSession,
-      channelName: result.channelName,
-    } as Channel & { session: CoreUserSession }
-  }
-}

package/src/kysely-eventhub-store.ts

@@ -1,32 +0,0 @@
-import { EventHubStore } from '@pikku/core/channel'
-import { Kysely } from 'kysely'
-
-export class KyselyEventHubStore implements EventHubStore {
-  constructor(private database: Kysely<any>) {}
-
-  public async getChannelIdsForTopic(topic: string): Promise<string[]> {
-    const result = await this.database
-      .selectFrom('serverless.lambdaChannelSubscriptions')
-      .select('channelId')
-      .where('topic', '=', topic)
-      .execute()
-    return result.map((row) => row.channelId)
-  }
-
-  public async subscribe(topic: string, channelId: string): Promise<boolean> {
-    await this.database
-      .insertInto('serverless.lambdaChannelSubscriptions')
-      .values({ channelId, topic })
-      .execute()
-    return true
-  }
-
-  public async unsubscribe(topic: string, channelId: string): Promise<boolean> {
-    await this.database
-      .deleteFrom('serverless.lambdaChannelSubscriptions')
-      .where('channelId', '=', channelId)
-      .where('topic', '=', topic)
-      .execute()
-    return true
-  }
-}