@pikku/lambda 0.6.5 → 0.6.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## 0.6.1
 
+## 0.6.7
+
+### Patch Changes
+
+- a234e33: fix: regressions in channels due to user session changes
+
+## 0.6.6
+
+### Patch Changes
+
+- ee5c874: feat: moving towards using middleware for http and channels
+- Updated dependencies [c1d8381]
+- Updated dependencies [ee5c874]
+  - @pikku/core@0.6.14
+
 ## 0.6.5
 
 ### Patch Changes

package/dist/http/general-http-handler.js

@@ -1,13 +1,13 @@
 import { runHTTPRoute } from '@pikku/core/http';
 export const generalHTTPHandler = async (singletonServices, createSessionServices, request, response) => {
-    if (request.getMethod() === 'options') {
+    if (request.method === 'options') {
         response.setHeader('Access-Control-Allow-Headers', 'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent');
         response.setHeader('Access-Control-Allow-Methods', 'OPTIONS,DELETE,GET,HEAD,PATCH,POST,PUT');
         response.setStatus(200);
         response.setJson({});
         return response.getLambdaResponse();
     }
-    if (request.getPath().includes('health-check')) {
+    if (request.path.includes('health-check')) {
         response.setStatus(200);
         return response.getLambdaResponse();
     }
@@ -17,8 +17,8 @@ export const generalHTTPHandler = async (singletonServices, createSessionService
             response,
             singletonServices,
             createSessionServices: createSessionServices,
-            route: request.getPath(),
-            method: request.getMethod(),
+            route: request.path,
+            method: request.method,
         });
     }
     catch {

package/dist/http/general-http-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"general-http-handler.js","sourceRoot":"","sources":["../../src/http/general-http-handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAK/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAKrC,iBAAoC,EACpC,qBAIC,EACD,OAAqC,EACrC,QAAuC,EACP,EAAE;IAClC,IAAI,OAAO,CAAC,SAAS,EAAE,KAAK,SAAS,EAAE,CAAC;QACtC,QAAQ,CAAC,SAAS,CAChB,8BAA8B,EAC9B,uFAAuF,CACxF,CAAA;QACD,QAAQ,CAAC,SAAS,CAChB,8BAA8B,EAC9B,wCAAwC,CACzC,CAAA;QACD,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACpB,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACrC,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/C,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACvB,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACrC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,YAAY,CAAC;YACjB,OAAO;YACP,QAAQ;YACR,iBAAiB;YACjB,qBAAqB,EAAE,qBAA4B;YACnD,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE;YACxB,MAAM,EAAE,OAAO,CAAC,SAAS,EAAS;SACnC,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;AACrC,CAAC,CAAA"}
+{"version":3,"file":"general-http-handler.js","sourceRoot":"","sources":["../../src/http/general-http-handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAK/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAKrC,iBAAoC,EACpC,qBAIC,EACD,OAAqC,EACrC,QAAuC,EACP,EAAE;IAClC,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,QAAQ,CAAC,SAAS,CAChB,8BAA8B,EAC9B,uFAAuF,CACxF,CAAA;QACD,QAAQ,CAAC,SAAS,CAChB,8BAA8B,EAC9B,wCAAwC,CACzC,CAAA;QACD,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACpB,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACrC,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACvB,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACrC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,YAAY,CAAC;YACjB,OAAO;YACP,QAAQ;YACR,iBAAiB;YACjB,qBAAqB,EAAE,qBAA4B;YACnD,KAAK,EAAE,OAAO,CAAC,IAAI;YACnB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;AACrC,CAAC,CAAA"}

package/dist/pikku-api-gateway-lambda-request.d.ts

@@ -1,11 +1,9 @@
 import type { APIGatewayProxyEvent } from 'aws-lambda';
-import type { HTTPMethod, PikkuQuery } from '@pikku/core/http';
+import type { PikkuQuery } from '@pikku/core/http';
 import { PikkuHTTPAbstractRequest } from '@pikku/core/http/pikku-http-abstract-request';
 export declare class PikkuAPIGatewayLambdaRequest extends PikkuHTTPAbstractRequest {
     protected event: APIGatewayProxyEvent;
     constructor(event: APIGatewayProxyEvent);
-    getPath(): string;
-    getMethod(): HTTPMethod;
     getBody(): Promise<string | null>;
     getHeader(headerName: string): string | undefined;
     getQuery(): PikkuQuery;

package/dist/pikku-api-gateway-lambda-request.js

@@ -2,15 +2,9 @@ import { PikkuHTTPAbstractRequest } from '@pikku/core/http/pikku-http-abstract-r
 export class PikkuAPIGatewayLambdaRequest extends PikkuHTTPAbstractRequest {
     event;
     constructor(event) {
-        super();
+        super(event.path || '/', event.httpMethod?.toLowerCase() || 'get');
         this.event = event;
     }
-    getPath() {
-        return this.event.path || '/';
-    }
-    getMethod() {
-        return this.event.httpMethod.toLowerCase();
-    }
     async getBody() {
         return this.event.body;
     }

package/dist/pikku-api-gateway-lambda-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"pikku-api-gateway-lambda-request.js","sourceRoot":"","sources":["../src/pikku-api-gateway-lambda-request.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AAEvF,MAAM,OAAO,4BAA6B,SAAQ,wBAAwB;IAClD;IAAtB,YAAsB,KAA2B;QAC/C,KAAK,EAAE,CAAA;QADa,UAAK,GAAL,KAAK,CAAsB;IAEjD,CAAC;IAEM,OAAO;QAEZ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,CAAA;IAC/B,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,EAAgB,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAA;IACxB,CAAC;IAEM,SAAS,CAAC,UAAkB;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACvC,CAAC;IAEM,QAAQ;QAEb,OAAQ,IAAI,CAAC,KAAK,CAAC,qBAAoC,IAAI,EAAE,CAAA;IAC/D,CAAC;CACF"}
+{"version":3,"file":"pikku-api-gateway-lambda-request.js","sourceRoot":"","sources":["../src/pikku-api-gateway-lambda-request.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AAEvF,MAAM,OAAO,4BAA6B,SAAQ,wBAAwB;IAClD;IAAtB,YAAsB,KAA2B;QAC/C,KAAK,CACH,KAAK,CAAC,IAAI,IAAI,GAAG,EAChB,KAAK,CAAC,UAAU,EAAE,WAAW,EAAiB,IAAI,KAAK,CACzD,CAAA;QAJmB,UAAK,GAAL,KAAK,CAAsB;IAKjD,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAA;IACxB,CAAC;IAEM,SAAS,CAAC,UAAkB;QACjC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACvC,CAAC;IAEM,QAAQ;QAEb,OAAQ,IAAI,CAAC,KAAK,CAAC,qBAAoC,IAAI,EAAE,CAAA;IAC/D,CAAC;CACF"}

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

@@ -2,18 +2,12 @@ import { PikkuAbstractChannelHandler, } from '@pikku/core/channel';
 import { sendMessage } from './utils.js';
 class LambdaChannelHandler extends PikkuAbstractChannelHandler {
     logger;
-    channelStore;
     callbackAPI;
-    constructor(logger, userSession, channelStore, callbackAPI, channelId, channelName, openingData) {
-        super(channelId, channelName, userSession, openingData);
+    constructor(logger, callbackAPI, channelId, channelName, openingData) {
+        super(channelId, channelName, openingData);
         this.logger = logger;
-        this.channelStore = channelStore;
         this.callbackAPI = callbackAPI;
     }
-    async setUserSession(userSession) {
-        this.userSession = userSession;
-        await this.channelStore.setUserSession(this.channelId, userSession);
-    }
     async send(message, isBinary) {
         if (isBinary) {
             throw new Error('Binary data is not supported on serverless lambdas');
@@ -23,7 +17,7 @@ class LambdaChannelHandler extends PikkuAbstractChannelHandler {
     }
 }
 export const createLambdaChannelHandlerFactory = (logger, channelStore, callbackAPI) => {
-    const factory = (channelId, channelName, openingData, userSession) => new LambdaChannelHandler(logger, userSession, channelStore, callbackAPI, channelId, channelName, openingData);
+    const factory = (channelId, channelName, openingData) => new LambdaChannelHandler(logger, callbackAPI, channelId, channelName, openingData);
     return factory;
 };
 //# sourceMappingURL=lambda-channel-handler.js.map

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,2BAA0D;IAExD;IAEA;IACA;IAJV,YACU,MAAc,EACtB,WAAoC,EAC5B,YAA0B,EAC1B,WAA0C,EAClD,SAAiB,EACjB,WAAmB,EACnB,WAAwB;QAExB,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QAR/C,WAAM,GAAN,MAAM,CAAQ;QAEd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAA+B;IAMpD,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,WAAwB;QAClD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IACrE,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,WAAW,EACX,EAAE,CACF,IAAI,oBAAoB,CACtB,MAAM,EACN,WAAW,EACX,YAAY,EACZ,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":"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"}

package/dist/websocket/utils.d.ts

@@ -9,5 +9,5 @@ export declare const getServerlessDependencies: (logger: Logger, channelStore: C
     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, import("@pikku/core/dist/index.js").CoreUserSession>>;
+    channelStore: ChannelStore<unknown, unknown, import("@pikku/core/dist/index.js").CoreUserSession, import("@pikku/core/channel").Channel<unknown, unknown>>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/lambda",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "license": "MIT",
   "author": "yasser.fadl@gmail.com",
   "module": "dist/index.js",
@@ -23,7 +23,7 @@
   },
   "peerDependencies": {
     "@aws-sdk/client-apigatewaymanagementapi": "^3.713.0",
-    "@pikku/core": "^0.6.11",
+    "@pikku/core": "^0.6.14",
     "@types/aws-lambda": "^8.10.146"
   },
   "devDependencies": {

package/src/http/general-http-handler.ts

@@ -23,7 +23,7 @@ export const generalHTTPHandler = async <
   request: PikkuAPIGatewayLambdaRequest,
   response: PikkuAPIGatewayLambdaResponse
 ): Promise<APIGatewayProxyResult> => {
-  if (request.getMethod() === 'options') {
+  if (request.method === 'options') {
     response.setHeader(
       'Access-Control-Allow-Headers',
       'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'
@@ -37,7 +37,7 @@ export const generalHTTPHandler = async <
     return response.getLambdaResponse()
   }
 
-  if (request.getPath().includes('health-check')) {
+  if (request.path.includes('health-check')) {
     response.setStatus(200)
     return response.getLambdaResponse()
   }
@@ -48,8 +48,8 @@ export const generalHTTPHandler = async <
       response,
       singletonServices,
       createSessionServices: createSessionServices as any,
-      route: request.getPath(),
-      method: request.getMethod() as any,
+      route: request.path,
+      method: request.method,
     })
   } catch {
     // Error should have already been handled by runHTTPRoute

package/src/pikku-api-gateway-lambda-request.ts

@@ -4,16 +4,10 @@ import { PikkuHTTPAbstractRequest } from '@pikku/core/http/pikku-http-abstract-r
 
 export class PikkuAPIGatewayLambdaRequest extends PikkuHTTPAbstractRequest {
   constructor(protected event: APIGatewayProxyEvent) {
-    super()
-  }
-
-  public getPath() {
-    // TODO: The path can be undefined, types are invalid
-    return this.event.path || '/'
-  }
-
-  public getMethod() {
-    return this.event.httpMethod.toLowerCase() as HTTPMethod
+    super(
+      event.path || '/',
+      (event.httpMethod?.toLowerCase() as HTTPMethod) || 'get'
+    )
   }
 
   public async getBody() {

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

@@ -12,22 +12,15 @@ class LambdaChannelHandler<
   UserSession extends CoreUserSession = CoreUserSession,
   OpeningData = unknown,
   Out = unknown,
-> extends PikkuAbstractChannelHandler<UserSession, OpeningData, Out> {
+> extends PikkuAbstractChannelHandler<OpeningData, Out> {
   constructor(
     private logger: Logger,
-    userSession: UserSession | undefined,
-    private channelStore: ChannelStore,
     private callbackAPI: ApiGatewayManagementApiClient,
     channelId: string,
     channelName: string,
     openingData: OpeningData
   ) {
-    super(channelId, channelName, userSession, openingData)
-  }
-
-  public async setUserSession(userSession: UserSession): Promise<void> {
-    this.userSession = userSession
-    await this.channelStore.setUserSession(this.channelId, userSession)
+    super(channelId, channelName, openingData)
   }
 
   public async send(message: Out, isBinary?: boolean) {
@@ -47,13 +40,10 @@ export const createLambdaChannelHandlerFactory = (
   const factory: PikkuChannelHandlerFactory = (
     channelId,
     channelName,
-    openingData,
-    userSession
+    openingData
   ) =>
     new LambdaChannelHandler(
       logger,
-      userSession,
-      channelStore,
       callbackAPI,
       channelId,
       channelName,