@pikku/lambda 0.12.0 → 0.12.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## 0.12.0
 
+## 0.12.1
+
+### Patch Changes
+
+- 62a8725: Update `@types/aws-lambda` peer and dev dependency to `^8.10.161` to resolve a `Duplicate identifier 'HttpResponseStream'` TypeScript error that appeared when bundling alongside other AWS SDK packages.
+- Updated dependencies [62a8725]
+- Updated dependencies [a3bdb0d]
+- Updated dependencies [e0349ff]
+- Updated dependencies [62a8725]
+- Updated dependencies [e04531f]
+- Updated dependencies [62a8725]
+- Updated dependencies [a83efb8]
+- Updated dependencies [8eed717]
+- Updated dependencies [62a8725]
+- Updated dependencies [62a8725]
+- Updated dependencies [62a8725]
+  - @pikku/core@0.12.1
+
 ### New Features
 
 - `createWireServices` and `createConfig` are now optional

package/dist/http/run-fetch.d.ts

@@ -1,3 +1,2 @@
-import { CoreSingletonServices, CoreServices, CreateWireServices, CoreUserSession } from '@pikku/core';
-import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
-export declare const runFetch: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(singletonServices: SingletonServices, createWireServices: CreateWireServices<SingletonServices, Services, UserSession> | undefined, event: APIGatewayEvent) => Promise<APIGatewayProxyResult>;
+import type { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
+export declare const runFetch: (event: APIGatewayEvent) => Promise<APIGatewayProxyResult>;

package/dist/http/run-fetch.js

@@ -1,7 +1,7 @@
 import { PikkuFetchHTTPResponse, fetchData } from '@pikku/core/http';
 import { responseToLambdaResult } from '../response-converter.js';
 import { lambdaEventToRequest } from '../request-converter.js';
-export const runFetch = async (singletonServices, createWireServices, event) => {
+export const runFetch = async (event) => {
     const request = lambdaEventToRequest(event);
     const response = new PikkuFetchHTTPResponse();
     if (request.method === 'options') {
@@ -11,10 +11,7 @@ export const runFetch = async (singletonServices, createWireServices, event) =>
         return responseToLambdaResult(response.toResponse());
     }
     try {
-        await fetchData(request, response, {
-            singletonServices,
-            createWireServices: createWireServices,
-        });
+        await fetchData(request, response);
     }
     catch {
     }

package/dist/http/run-fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-fetch.js","sourceRoot":"","sources":["../../src/http/run-fetch.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAK3B,iBAAoC,EACpC,kBAEa,EACb,KAAsB,EACU,EAAE;IAClC,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;IAE7C,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,QAAQ,CAAC,MAAM,CACb,8BAA8B,EAC9B,uFAAuF,CACxF,CAAA;QACD,QAAQ,CAAC,MAAM,CACb,8BAA8B,EAC9B,wCAAwC,CACzC,CAAA;QACD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE;YACjC,iBAAiB;YACjB,kBAAkB,EAAE,kBAAyB;SAC9C,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}
+{"version":3,"file":"run-fetch.js","sourceRoot":"","sources":["../../src/http/run-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,KAAsB,EACU,EAAE;IAClC,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;IAE7C,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,QAAQ,CAAC,MAAM,CACb,8BAA8B,EAC9B,uFAAuF,CACxF,CAAA;QACD,QAAQ,CAAC,MAAM,CACb,8BAA8B,EAC9B,wCAAwC,CACzC,CAAA;QACD,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpB,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}

package/dist/queue/sqs-worker.d.ts

@@ -1,5 +1,5 @@
-import { SQSBatchResponse, SQSEvent, SQSRecord } from 'aws-lambda';
-import type { CoreSingletonServices, CreateWireServices } from '@pikku/core';
+import type { SQSBatchResponse, SQSEvent, SQSRecord } from 'aws-lambda';
+import type { Logger } from '@pikku/core/services';
 import type { QueueJob } from '@pikku/core/queue';
 export declare function mapSQSRecordToQueueJob(record: SQSRecord, maxAttempts?: number): QueueJob;
-export declare const runSQSQueueWorker: (singletonServices: CoreSingletonServices, createWireServices: CreateWireServices<any, any, any> | undefined, event: SQSEvent) => Promise<SQSBatchResponse>;
+export declare const runSQSQueueWorker: (logger: Logger, event: SQSEvent) => Promise<SQSBatchResponse>;

package/dist/queue/sqs-worker.js

@@ -1,4 +1,4 @@
-import { createQueueJobRunner, QueueJobFailedError, QueueJobDiscardedError, } from '@pikku/core/queue';
+import { runQueueJob, QueueJobFailedError, QueueJobDiscardedError, } from '@pikku/core/queue';
 export function mapSQSRecordToQueueJob(record, maxAttempts) {
     let data;
     try {
@@ -33,25 +33,19 @@ export function mapSQSRecordToQueueJob(record, maxAttempts) {
     };
     return job;
 }
-export const runSQSQueueWorker = async (singletonServices, createWireServices, event) => {
+export const runSQSQueueWorker = async (logger, event) => {
     console.log(JSON.stringify(event, null, 2));
     const jobs = event.Records.map(mapSQSRecordToQueueJob);
-    const runJob = createQueueJobRunner({
-        singletonServices,
-        createWireServices,
-    });
     const results = await Promise.allSettled(jobs.map(async (job) => {
         try {
-            return await runJob({
-                job,
-            });
+            return await runQueueJob({ job });
         }
         catch (error) {
             if (error instanceof QueueJobFailedError) {
                 throw error;
             }
             else if (error instanceof QueueJobDiscardedError) {
-                singletonServices.logger.info(`SQS job ${job.id} discarded: ${error.message}`);
+                logger.info(`SQS job ${job.id} discarded: ${error.message}`);
                 return;
             }
             throw error;
@@ -59,7 +53,7 @@ export const runSQSQueueWorker = async (singletonServices, createWireServices, e
     }));
     results.forEach((result, index) => {
         if (result.status === 'rejected') {
-            singletonServices.logger.error(`Failed to process SQS message ${jobs[index].id}:`, result.reason);
+            logger.error(`Failed to process SQS message ${jobs[index].id}:`, result.reason);
         }
     });
     return {

package/dist/queue/sqs-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqs-worker.js","sourceRoot":"","sources":["../../src/queue/sqs-worker.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,mBAAmB,CAAA;AAO1B,MAAM,UAAU,sBAAsB,CACpC,MAAiB,EACjB,WAAoB;IAEpB,IAAI,IAAS,CAAA;IAEb,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAA;IAEzD,MAAM,GAAG,GAAa;QACpB,SAAS;QACT,IAAI;QACJ,EAAE,EAAE,MAAM,CAAC,SAAS;QACpB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,QAA0B;QAC9C,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,WAAW,EAAE,IAAI,IAAI,EAAE;YACvB,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,GAAG,CAAC;YACrE,WAAW;YACX,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,CAAC;YACX,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC9D,WAAW,EAAE,SAAS;YACtB,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,SAAS;SACjB,CAAC;QACF,iBAAiB,EAAE,KAAK,IAAI,EAAE;YAC5B,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAA;QACH,CAAC;KACF,CAAA;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAKD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,iBAAwC,EACxC,kBAAiE,EACjE,KAAe,EACY,EAAE;IAC7B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;IACtD,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,iBAAiB;QACjB,kBAAkB;KACnB,CAAC,CAAA;IAGF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,IAAI,CAAC;YACH,OAAO,MAAM,MAAM,CAAC;gBAClB,GAAG;aACJ,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,KAAK,YAAY,mBAAmB,EAAE,CAAC;gBAEzC,MAAM,KAAK,CAAA;YACb,CAAC;iBAAM,IAAI,KAAK,YAAY,sBAAsB,EAAE,CAAC;gBAEnD,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAC3B,WAAW,GAAG,CAAC,EAAE,eAAe,KAAK,CAAC,OAAO,EAAE,CAChD,CAAA;gBACD,OAAM;YACR,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IAGD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAChC,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAC5B,iCAAiC,IAAI,CAAC,KAAK,CAAE,CAAC,EAAE,GAAG,EACnD,MAAM,CAAC,MAAM,CACd,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,iBAAiB,EAAE,OAAO;aACvB,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACvB,MAAM;YACN,cAAc,EAAE,IAAI,CAAC,KAAK,CAAE,CAAC,EAAE,IAAI,WAAW,KAAK,EAAE;SACtD,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC;aACpD,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;KACrD,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"sqs-worker.js","sourceRoot":"","sources":["../../src/queue/sqs-worker.ts"],"names":[],"mappings":"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"}

package/dist/websocket/lambda-channel-handler.d.ts

@@ -1,4 +1,4 @@
-import { ChannelStore, PikkuChannelHandlerFactory } from '@pikku/core/channel';
-import { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi';
-import { Logger } from '@pikku/core/services';
+import type { ChannelStore, PikkuChannelHandlerFactory } from '@pikku/core/channel';
+import type { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi';
+import type { Logger } from '@pikku/core/services';
 export declare const createLambdaChannelHandlerFactory: (logger: Logger, channelStore: ChannelStore, callbackAPI: ApiGatewayManagementApiClient) => PikkuChannelHandlerFactory;

package/dist/websocket/lambda-channel-handler.js

@@ -1,4 +1,4 @@
-import { PikkuAbstractChannelHandler, } from '@pikku/core/channel';
+import { PikkuAbstractChannelHandler } from '@pikku/core/channel';
 import { sendMessage } from './utils.js';
 class LambdaChannelHandler extends PikkuAbstractChannelHandler {
     logger;

package/dist/websocket/lambda-channel-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda-channel-handler.js","sourceRoot":"","sources":["../../src/websocket/lambda-channel-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,2BAA2B,GAE5B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAIxC,MAAM,oBAIJ,SAAQ,2BAA6C;IAE3C;IACA;IAFV,YACU,MAAc,EACd,WAA0C,EAClD,SAAiB,EACjB,WAAmB,EACnB,WAAwB;QAExB,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QANlC,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAA+B;IAMpD,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAY,EAAE,QAAkB;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACvE,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACxE,CAAC;CACF;AAED,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,MAAc,EACd,YAA0B,EAC1B,WAA0C,EAC1C,EAAE;IACF,MAAM,OAAO,GAA+B,CAC1C,SAAS,EACT,WAAW,EACX,WAAW,EACX,EAAE,CACF,IAAI,oBAAoB,CACtB,MAAM,EACN,WAAW,EACX,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAA;IACH,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"lambda-channel-handler.js","sourceRoot":"","sources":["../../src/websocket/lambda-channel-handler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAIxC,MAAM,oBAIJ,SAAQ,2BAA6C;IAE3C;IACA;IAFV,YACU,MAAc,EACd,WAA0C,EAClD,SAAiB,EACjB,WAAmB,EACnB,WAAwB;QAExB,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QANlC,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAA+B;IAMpD,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAY,EAAE,QAAkB;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACvE,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACxE,CAAC;CACF;AAED,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,MAAc,EACd,YAA0B,EAC1B,WAA0C,EAC1C,EAAE;IACF,MAAM,OAAO,GAA+B,CAC1C,SAAS,EACT,WAAW,EACX,WAAW,EACX,EAAE,CACF,IAAI,oBAAoB,CACtB,MAAM,EACN,WAAW,EACX,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAA;IACH,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/dist/websocket/lambda-eventhub-service.d.ts

@@ -1,6 +1,6 @@
-import { ChannelStore, EventHubService, EventHubStore } from '@pikku/core/channel';
-import { Logger } from '@pikku/core/services';
-import { APIGatewayEvent } from 'aws-lambda';
+import type { ChannelStore, EventHubService, EventHubStore } from '@pikku/core/channel';
+import type { Logger } from '@pikku/core/services';
+import type { APIGatewayEvent } from 'aws-lambda';
 export declare class LambdaEventHubService<EventTopics extends Record<string, any> = {}> implements EventHubService<EventTopics> {
     private logger;
     private channelStore;

package/dist/websocket/utils.d.ts

@@ -1,13 +1,13 @@
 import { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi';
-import { Logger } from '@pikku/core/services';
-import { APIGatewayEvent } from 'aws-lambda';
-import { ChannelStore } from '@pikku/core/channel';
+import type { Logger } from '@pikku/core/services';
+import type { APIGatewayEvent } from 'aws-lambda';
+import type { ChannelStore } from '@pikku/core/channel';
 export declare const sendMessage: (logger: Logger, callbackAPI: ApiGatewayManagementApiClient, ConnectionId: string, Data: string) => Promise<boolean>;
 export declare const sendMessages: (logger: Logger, channelStore: ChannelStore, callbackAPI: ApiGatewayManagementApiClient, fromChannelId: string, channelIds: string[], data: unknown, isBinary?: boolean) => Promise<void>;
 export declare const getApiGatewayManagementApiClient: (logger: Logger, event: APIGatewayEvent) => ApiGatewayManagementApiClient;
-export declare const getServerlessDependencies: (logger: Logger, channelStore: ChannelStore, event: APIGatewayEvent) => {
+export declare const getServerlessDependencies: (channelStore: ChannelStore, event: APIGatewayEvent) => {
     channelId: string;
     callbackAPI: ApiGatewayManagementApiClient;
     channelHandlerFactory: import("@pikku/core/channel").PikkuChannelHandlerFactory;
-    channelStore: ChannelStore<unknown, unknown, import("@pikku/core/dist/index.js").CoreUserSession, import("@pikku/core/channel").Channel<unknown, unknown>>;
+    channelStore: ChannelStore<unknown, unknown, import("@pikku/core").CoreUserSession, import("@pikku/core/channel").Channel<unknown, unknown>>;
 };

package/dist/websocket/utils.js

@@ -1,4 +1,5 @@
 import { ApiGatewayManagementApiClient, PostToConnectionCommand, } from '@aws-sdk/client-apigatewaymanagementapi';
+import { getSingletonServices } from '@pikku/core';
 import { createLambdaChannelHandlerFactory } from './lambda-channel-handler.js';
 export const sendMessage = async (logger, callbackAPI, ConnectionId, Data) => {
     try {
@@ -47,7 +48,8 @@ export const getApiGatewayManagementApiClient = (logger, event) => {
         endpoint,
     });
 };
-export const getServerlessDependencies = (logger, channelStore, event) => {
+export const getServerlessDependencies = (channelStore, event) => {
+    const { logger } = getSingletonServices();
     const channelId = event.requestContext.connectionId;
     if (!channelId) {
         throw new Error('No connectionId found in requestContext');

package/dist/websocket/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/websocket/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,yCAAyC,CAAA;AAGhD,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAA;AAG/E,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,MAAc,EACd,WAA0C,EAC1C,YAAoB,EACpB,IAAY,EACM,EAAE;IACpB,IAAI,CAAC;QACH,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAC3E,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAGhB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvB,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAc,EACd,YAA0B,EAC1B,WAA0C,EAC1C,aAAqB,EACrB,UAAoB,EACpB,IAAa,EACb,QAAkB,EACH,EAAE;IACjB,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;IACvE,CAAC;IACD,MAAM,eAAe,GAAa,EAAE,CAAA;IACpC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QACjC,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;YACvE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IACD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,YAAY,CAAC,cAAc,CAAC,eAAe,CAAC,CAAA;IACpD,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC9C,MAAc,EACd,KAAsB,EACtB,EAAE;IACF,IAAI,QAAgB,CAAA;IACpB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAA;QACjE,QAAQ,GAAG,uBAAuB,CAAA;IACpC,CAAC;SAAM,IAAI,KAAK,CAAC,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;QACtE,MAAM,CAAC,IAAI,CACT,6EAA6E,CAC9E,CAAA;QACD,QAAQ,GAAG,WAAW,KAAK,CAAC,cAAc,CAAC,UAAU,IAAI,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;IACvF,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAA;QACzD,QAAQ,GAAG,WAAW,KAAK,CAAC,cAAc,CAAC,UAAU,EAAE,CAAA;IACzD,CAAC;IACD,OAAO,IAAI,6BAA6B,CAAC;QACvC,UAAU,EAAE,YAAY;QACxB,QAAQ;KACT,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,MAAc,EACd,YAA0B,EAC1B,KAAsB,EACtB,EAAE;IACF,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,YAAY,CAAA;IACnD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;IAC5D,CAAC;IACD,MAAM,WAAW,GAAG,gCAAgC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACnE,MAAM,qBAAqB,GAAG,iCAAiC,CAC7D,MAAM,EACN,YAAY,EACZ,WAAW,CACZ,CAAA;IACD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,qBAAqB,EAAE,YAAY,EAAE,CAAA;AACxE,CAAC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/websocket/utils.ts"],"names":[],"mappings":"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"}

package/dist/websocket/websocket-connect.d.ts

@@ -1,4 +1,3 @@
-import { CoreSingletonServices, CoreServices, CoreUserSession } from '@pikku/core';
-import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
-import { WebsocketParams } from './websocket-types.js';
-export declare const connectWebsocket: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(event: APIGatewayEvent, { singletonServices, createWireServices, channelStore, }: WebsocketParams<SingletonServices, Services, UserSession>) => Promise<APIGatewayProxyResult>;
+import type { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda';
+import type { WebsocketParams } from './websocket-types.js';
+export declare const connectWebsocket: (event: APIGatewayEvent, { channelStore }: WebsocketParams) => Promise<APIGatewayProxyResult>;

package/dist/websocket/websocket-connect.js

@@ -3,16 +3,14 @@ import { responseToLambdaResult } from '../response-converter.js';
 import { runChannelConnect } from '@pikku/core/channel/serverless';
 import { getServerlessDependencies } from './utils.js';
 import { lambdaEventToRequest } from '../request-converter.js';
-export const connectWebsocket = async (event, { singletonServices, createWireServices, channelStore, }) => {
-    const runnerParams = getServerlessDependencies(singletonServices.logger, channelStore, event);
+export const connectWebsocket = async (event, { channelStore }) => {
+    const runnerParams = getServerlessDependencies(channelStore, event);
     const request = new PikkuFetchHTTPRequest(lambdaEventToRequest(event));
     const response = new PikkuFetchHTTPResponse();
     await runChannelConnect({
         ...runnerParams,
         request,
         response,
-        singletonServices: singletonServices,
-        createWireServices: createWireServices,
         route: event.path || '/',
     });
     return responseToLambdaResult(response.toResponse());

package/dist/websocket/websocket-connect.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-connect.js","sourceRoot":"","sources":["../../src/websocket/websocket-connect.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAKnC,KAAsB,EACtB,EACE,iBAAiB,EACjB,kBAAkB,EAClB,YAAY,GAC8C,EAC5B,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAC5C,iBAAiB,CAAC,MAAM,EACxB,YAAY,EACZ,KAAK,CACN,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,qBAAqB,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAA;IACtE,MAAM,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;IAC7C,MAAM,iBAAiB,CAAC;QACtB,GAAG,YAAY;QACf,OAAO;QACP,QAAQ;QACR,iBAAiB,EAAE,iBAAwB;QAC3C,kBAAkB,EAAE,kBAAyB;QAC7C,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,GAAG;KACzB,CAAC,CAAA;IACF,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}
+{"version":3,"file":"websocket-connect.js","sourceRoot":"","sources":["../../src/websocket/websocket-connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAEhF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,KAAsB,EACtB,EAAE,YAAY,EAAmB,EACD,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IACnE,MAAM,OAAO,GAAG,IAAI,qBAAqB,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAA;IACtE,MAAM,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;IAC7C,MAAM,iBAAiB,CAAC;QACtB,GAAG,YAAY;QACf,OAAO;QACP,QAAQ;QACR,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,GAAG;KACzB,CAAC,CAAA;IACF,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}

package/dist/websocket/websocket-disconnect.d.ts

@@ -1,4 +1,3 @@
-import { CoreSingletonServices, CoreServices, CoreUserSession } from '@pikku/core';
-import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
-import { WebsocketParams } from './websocket-types.js';
-export declare const disconnectWebsocket: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(event: APIGatewayProxyEvent, { singletonServices, createWireServices, channelStore, }: WebsocketParams<SingletonServices, Services, UserSession>) => Promise<APIGatewayProxyResult>;
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
+import type { WebsocketParams } from './websocket-types.js';
+export declare const disconnectWebsocket: (event: APIGatewayProxyEvent, { channelStore }: WebsocketParams) => Promise<APIGatewayProxyResult>;

package/dist/websocket/websocket-disconnect.js

@@ -1,12 +1,8 @@
 import { runChannelDisconnect } from '@pikku/core/channel/serverless';
 import { getServerlessDependencies } from './utils.js';
-export const disconnectWebsocket = async (event, { singletonServices, createWireServices, channelStore, }) => {
-    const runnerParams = getServerlessDependencies(singletonServices.logger, channelStore, event);
-    await runChannelDisconnect({
-        ...runnerParams,
-        singletonServices: singletonServices,
-        createWireServices: createWireServices,
-    });
+export const disconnectWebsocket = async (event, { channelStore }) => {
+    const runnerParams = getServerlessDependencies(channelStore, event);
+    await runChannelDisconnect(runnerParams);
     return { statusCode: 200, body: '' };
 };
 //# sourceMappingURL=websocket-disconnect.js.map

package/dist/websocket/websocket-disconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-disconnect.js","sourceRoot":"","sources":["../../src/websocket/websocket-disconnect.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAGrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAGtD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAKtC,KAA2B,EAC3B,EACE,iBAAiB,EACjB,kBAAkB,EAClB,YAAY,GAC8C,EAC5B,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAC5C,iBAAiB,CAAC,MAAM,EACxB,YAAY,EACZ,KAAK,CACN,CAAA;IACD,MAAM,oBAAoB,CAAC;QACzB,GAAG,YAAY;QACf,iBAAiB,EAAE,iBAAwB;QAC3C,kBAAkB,EAAE,kBAAyB;KAC9C,CAAC,CAAA;IACF,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;AACtC,CAAC,CAAA"}
+{"version":3,"file":"websocket-disconnect.js","sourceRoot":"","sources":["../../src/websocket/websocket-disconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAGrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAGtD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,KAA2B,EAC3B,EAAE,YAAY,EAAmB,EACD,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IACnE,MAAM,oBAAoB,CAAC,YAAY,CAAC,CAAA;IACxC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;AACtC,CAAC,CAAA"}

package/dist/websocket/websocket-message.d.ts

@@ -1,4 +1,3 @@
-import { CoreSingletonServices, CoreServices, CoreUserSession } from '@pikku/core';
-import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
-import { WebsocketParams } from './websocket-types.js';
-export declare const processWebsocketMessage: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(event: APIGatewayProxyEvent, { singletonServices, createWireServices, channelStore, }: WebsocketParams<SingletonServices, Services, UserSession>) => Promise<APIGatewayProxyResult>;
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
+import type { WebsocketParams } from './websocket-types.js';
+export declare const processWebsocketMessage: (event: APIGatewayProxyEvent, { channelStore }: WebsocketParams) => Promise<APIGatewayProxyResult>;

package/dist/websocket/websocket-message.js

@@ -2,15 +2,11 @@ import { PikkuFetchHTTPResponse } from '@pikku/core/http';
 import { runChannelMessage } from '@pikku/core/channel/serverless';
 import { getServerlessDependencies } from './utils.js';
 import { responseToLambdaResult } from '../response-converter.js';
-export const processWebsocketMessage = async (event, { singletonServices, createWireServices, channelStore, }) => {
-    const runnerParams = getServerlessDependencies(singletonServices.logger, channelStore, event);
+export const processWebsocketMessage = async (event, { channelStore }) => {
+    const runnerParams = getServerlessDependencies(channelStore, event);
     const response = new PikkuFetchHTTPResponse();
     try {
-        const result = await runChannelMessage({
-            ...runnerParams,
-            singletonServices: singletonServices,
-            createWireServices: createWireServices,
-        }, event.body);
+        const result = await runChannelMessage(runnerParams, event.body);
         if (result) {
             response.json(result);
         }

package/dist/websocket/websocket-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-message.js","sourceRoot":"","sources":["../../src/websocket/websocket-message.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAK1C,KAA2B,EAC3B,EACE,iBAAiB,EACjB,kBAAkB,EAClB,YAAY,GAC8C,EAC5B,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAC5C,iBAAiB,CAAC,MAAM,EACxB,YAAY,EACZ,KAAK,CACN,CAAA;IACD,MAAM,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;IAC7C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC;YACE,GAAG,YAAY;YACf,iBAAiB,EAAE,iBAAwB;YAC3C,kBAAkB,EAAE,kBAAyB;SAC9C,EACD,KAAK,CAAC,IAAI,CACX,CAAA;QACD,IAAI,MAAM,EAAE,CAAC;YAEX,QAAQ,CAAC,IAAI,CAAC,MAAa,CAAC,CAAA;QAC9B,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QAEX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}
+{"version":3,"file":"websocket-message.js","sourceRoot":"","sources":["../../src/websocket/websocket-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,KAA2B,EAC3B,EAAE,YAAY,EAAmB,EACD,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IACnE,MAAM,QAAQ,GAAG,IAAI,sBAAsB,EAAE,CAAA;IAC7C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QAChE,IAAI,MAAM,EAAE,CAAC;YACX,QAAQ,CAAC,IAAI,CAAC,MAAa,CAAC,CAAA;QAC9B,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}

package/dist/websocket/websocket-types.d.ts

@@ -1,7 +1,4 @@
-import { CoreSingletonServices, CoreServices, CoreUserSession, CreateWireServices } from '@pikku/core';
-import { ChannelStore } from '@pikku/core/channel';
-export type WebsocketParams<SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession> = {
+import type { ChannelStore } from '@pikku/core/channel';
+export type WebsocketParams = {
     channelStore: ChannelStore;
-    singletonServices: SingletonServices;
-    createWireServices?: CreateWireServices<SingletonServices, Services, UserSession>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/lambda",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "license": "MIT",
   "author": "yasser.fadl@gmail.com",
   "module": "dist/index.js",
@@ -23,12 +23,12 @@
   },
   "peerDependencies": {
     "@aws-sdk/client-apigatewaymanagementapi": "^3.713.0",
-    "@pikku/core": "^0.12.0",
-    "@types/aws-lambda": "^8.10.159"
+    "@pikku/core": "^0.12.1",
+    "@types/aws-lambda": "^8.10.161"
   },
   "devDependencies": {
     "@aws-sdk/client-apigatewaymanagementapi": "^3.985.0",
-    "@types/aws-lambda": "^8.10.160",
+    "@types/aws-lambda": "^8.10.161",
     "typescript": "^5.9.3"
   },
   "engines": {

package/src/http/run-fetch.ts

@@ -1,23 +1,9 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CreateWireServices,
-  CoreUserSession,
-} from '@pikku/core'
 import { PikkuFetchHTTPResponse, fetchData } from '@pikku/core/http'
-import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda'
+import type { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda'
 import { responseToLambdaResult } from '../response-converter.js'
 import { lambdaEventToRequest } from '../request-converter.js'
 
-export const runFetch = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
-  singletonServices: SingletonServices,
-  createWireServices:
-    | CreateWireServices<SingletonServices, Services, UserSession>
-    | undefined,
+export const runFetch = async (
   event: APIGatewayEvent
 ): Promise<APIGatewayProxyResult> => {
   const request = lambdaEventToRequest(event)
@@ -37,10 +23,7 @@ export const runFetch = async <
   }
 
   try {
-    await fetchData(request, response, {
-      singletonServices,
-      createWireServices: createWireServices as any,
-    })
+    await fetchData(request, response)
   } catch {
     // Error should have already been handled by fetch
   }

package/src/queue/sqs-worker.ts

@@ -1,10 +1,10 @@
-import { SQSBatchResponse, SQSEvent, SQSRecord } from 'aws-lambda'
+import type { SQSBatchResponse, SQSEvent, SQSRecord } from 'aws-lambda'
 import {
-  createQueueJobRunner,
+  runQueueJob,
   QueueJobFailedError,
   QueueJobDiscardedError,
 } from '@pikku/core/queue'
-import type { CoreSingletonServices, CreateWireServices } from '@pikku/core'
+import type { Logger } from '@pikku/core/services'
 import type { QueueJob, QueueJobStatus } from '@pikku/core/queue'
 
 /**
@@ -57,34 +57,25 @@ export function mapSQSRecordToQueueJob(
  * Create an SQS handler that processes queue jobs using Pikku
  */
 export const runSQSQueueWorker = async (
-  singletonServices: CoreSingletonServices,
-  createWireServices: CreateWireServices<any, any, any> | undefined,
+  logger: Logger,
   event: SQSEvent
 ): Promise<SQSBatchResponse> => {
   console.log(JSON.stringify(event, null, 2))
   const jobs = event.Records.map(mapSQSRecordToQueueJob)
-  const runJob = createQueueJobRunner({
-    singletonServices,
-    createWireServices,
-  })
 
   // Process all jobs in parallel
   const results = await Promise.allSettled(
     jobs.map(async (job) => {
       try {
-        return await runJob({
-          job,
-        })
+        return await runQueueJob({ job })
       } catch (error: unknown) {
         if (error instanceof QueueJobFailedError) {
           // Let SQS handle this as a failed job (will go to retry or DLQ)
           throw error
         } else if (error instanceof QueueJobDiscardedError) {
           // For SQS, discarding means completing successfully (no retry)
-          singletonServices.logger.info(
-            `SQS job ${job.id} discarded: ${error.message}`
-          )
-          return // Successfully "completed" by discarding
+          logger.info(`SQS job ${job.id} discarded: ${error.message}`)
+          return
         }
         throw error
       }
@@ -94,7 +85,7 @@ export const runSQSQueueWorker = async (
   // Log any failures but don't throw (SQS will handle retries)
   results.forEach((result, index) => {
     if (result.status === 'rejected') {
-      singletonServices.logger.error(
+      logger.error(
         `Failed to process SQS message ${jobs[index]!.id}:`,
         result.reason
       )

package/src/websocket/lambda-channel-handler.ts

@@ -1,12 +1,12 @@
-import { CoreUserSession } from '@pikku/core'
-import {
+import type { CoreUserSession } from '@pikku/core'
+import type {
   ChannelStore,
-  PikkuAbstractChannelHandler,
   PikkuChannelHandlerFactory,
 } from '@pikku/core/channel'
+import { PikkuAbstractChannelHandler } from '@pikku/core/channel'
 import { sendMessage } from './utils.js'
-import { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi'
-import { Logger } from '@pikku/core/services'
+import type { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi'
+import type { Logger } from '@pikku/core/services'
 
 class LambdaChannelHandler<
   UserSession extends CoreUserSession = CoreUserSession,

package/src/websocket/lambda-eventhub-service.ts

@@ -1,12 +1,12 @@
-import { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi'
-import {
+import type { ApiGatewayManagementApiClient } from '@aws-sdk/client-apigatewaymanagementapi'
+import type {
   ChannelStore,
   EventHubService,
   EventHubStore,
 } from '@pikku/core/channel'
 import { getApiGatewayManagementApiClient, sendMessages } from './utils.js'
-import { Logger } from '@pikku/core/services'
-import { APIGatewayEvent } from 'aws-lambda'
+import type { Logger } from '@pikku/core/services'
+import type { APIGatewayEvent } from 'aws-lambda'
 
 export class LambdaEventHubService<EventTopics extends Record<string, any> = {}>
   implements EventHubService<EventTopics>

package/src/websocket/utils.ts

@@ -2,10 +2,11 @@ import {
   ApiGatewayManagementApiClient,
   PostToConnectionCommand,
 } from '@aws-sdk/client-apigatewaymanagementapi'
-import { Logger } from '@pikku/core/services'
-import { APIGatewayEvent } from 'aws-lambda'
+import type { Logger } from '@pikku/core/services'
+import { getSingletonServices } from '@pikku/core'
+import type { APIGatewayEvent } from 'aws-lambda'
 import { createLambdaChannelHandlerFactory } from './lambda-channel-handler.js'
-import { ChannelStore } from '@pikku/core/channel'
+import type { ChannelStore } from '@pikku/core/channel'
 
 export const sendMessage = async (
   logger: Logger,
@@ -77,10 +78,10 @@ export const getApiGatewayManagementApiClient = (
 }
 
 export const getServerlessDependencies = (
-  logger: Logger,
   channelStore: ChannelStore,
   event: APIGatewayEvent
 ) => {
+  const { logger } = getSingletonServices()
   const channelId = event.requestContext.connectionId
   if (!channelId) {
     throw new Error('No connectionId found in requestContext')

package/src/websocket/websocket-connect.ts

@@ -1,41 +1,22 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CoreUserSession,
-} from '@pikku/core'
 import { PikkuFetchHTTPRequest, PikkuFetchHTTPResponse } from '@pikku/core/http'
-import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda'
+import type { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda'
 import { responseToLambdaResult } from '../response-converter.js'
 import { runChannelConnect } from '@pikku/core/channel/serverless'
 import { getServerlessDependencies } from './utils.js'
-import { WebsocketParams } from './websocket-types.js'
+import type { WebsocketParams } from './websocket-types.js'
 import { lambdaEventToRequest } from '../request-converter.js'
 
-export const connectWebsocket = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
+export const connectWebsocket = async (
   event: APIGatewayEvent,
-  {
-    singletonServices,
-    createWireServices,
-    channelStore,
-  }: WebsocketParams<SingletonServices, Services, UserSession>
+  { channelStore }: WebsocketParams
 ): Promise<APIGatewayProxyResult> => {
-  const runnerParams = getServerlessDependencies(
-    singletonServices.logger,
-    channelStore,
-    event
-  )
+  const runnerParams = getServerlessDependencies(channelStore, event)
   const request = new PikkuFetchHTTPRequest(lambdaEventToRequest(event))
   const response = new PikkuFetchHTTPResponse()
   await runChannelConnect({
     ...runnerParams,
     request,
     response,
-    singletonServices: singletonServices as any,
-    createWireServices: createWireServices as any,
     route: event.path || '/',
   })
   return responseToLambdaResult(response.toResponse())

package/src/websocket/websocket-disconnect.ts

@@ -1,35 +1,14 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CoreUserSession,
-} from '@pikku/core'
 import { runChannelDisconnect } from '@pikku/core/channel/serverless'
-import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda'
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda'
 
 import { getServerlessDependencies } from './utils.js'
-import { WebsocketParams } from './websocket-types.js'
+import type { WebsocketParams } from './websocket-types.js'
 
-export const disconnectWebsocket = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
+export const disconnectWebsocket = async (
   event: APIGatewayProxyEvent,
-  {
-    singletonServices,
-    createWireServices,
-    channelStore,
-  }: WebsocketParams<SingletonServices, Services, UserSession>
+  { channelStore }: WebsocketParams
 ): Promise<APIGatewayProxyResult> => {
-  const runnerParams = getServerlessDependencies(
-    singletonServices.logger,
-    channelStore,
-    event
-  )
-  await runChannelDisconnect({
-    ...runnerParams,
-    singletonServices: singletonServices as any,
-    createWireServices: createWireServices as any,
-  })
+  const runnerParams = getServerlessDependencies(channelStore, event)
+  await runChannelDisconnect(runnerParams)
   return { statusCode: 200, body: '' }
 }

package/src/websocket/websocket-message.ts

@@ -1,48 +1,22 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CoreUserSession,
-} from '@pikku/core'
 import { PikkuFetchHTTPResponse } from '@pikku/core/http'
 import { runChannelMessage } from '@pikku/core/channel/serverless'
-import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda'
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda'
 import { getServerlessDependencies } from './utils.js'
-import { WebsocketParams } from './websocket-types.js'
+import type { WebsocketParams } from './websocket-types.js'
 import { responseToLambdaResult } from '../response-converter.js'
 
-export const processWebsocketMessage = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
+export const processWebsocketMessage = async (
   event: APIGatewayProxyEvent,
-  {
-    singletonServices,
-    createWireServices,
-    channelStore,
-  }: WebsocketParams<SingletonServices, Services, UserSession>
+  { channelStore }: WebsocketParams
 ): Promise<APIGatewayProxyResult> => {
-  const runnerParams = getServerlessDependencies(
-    singletonServices.logger,
-    channelStore,
-    event
-  )
+  const runnerParams = getServerlessDependencies(channelStore, event)
   const response = new PikkuFetchHTTPResponse()
   try {
-    const result = await runChannelMessage(
-      {
-        ...runnerParams,
-        singletonServices: singletonServices as any,
-        createWireServices: createWireServices as any,
-      },
-      event.body
-    )
+    const result = await runChannelMessage(runnerParams, event.body)
     if (result) {
-      // TODO: Support non json
       response.json(result as any)
     }
   } catch (e) {
-    // Error should have already been handled by fetch
     console.error(e)
   }
   return responseToLambdaResult(response.toResponse())

package/src/websocket/websocket-types.ts

@@ -1,21 +1,5 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CoreUserSession,
-  CreateWireServices,
-} from '@pikku/core'
-import { ChannelStore } from '@pikku/core/channel'
+import type { ChannelStore } from '@pikku/core/channel'
 
-export type WebsocketParams<
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
-> = {
+export type WebsocketParams = {
   channelStore: ChannelStore
-  singletonServices: SingletonServices
-  createWireServices?: CreateWireServices<
-    SingletonServices,
-    Services,
-    UserSession
-  >
 }