@pikku/lambda 0.6.7 → 0.6.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 0.6.1
 
+## 0.6.8
+
+### Patch Changes
+
+- 60b2265: refactor: supporting request and response objects
+- Updated dependencies [60b2265]
+  - @pikku/core@0.6.22
+
 ## 0.6.7
 
 ### Patch Changes

package/dist/http/index.d.ts

@@ -1,3 +1 @@
-export * from './anywhere-http.js';
-export * from './corsless-http.js';
-export * from './cors-http.js';
+export * from './run-fetch.js';

package/dist/http/index.js

@@ -1,4 +1,2 @@
-export * from './anywhere-http.js';
-export * from './corsless-http.js';
-export * from './cors-http.js';
+export * from './run-fetch.js';
 //# sourceMappingURL=index.js.map

package/dist/http/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA"}

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

@@ -0,0 +1,3 @@
+import { CoreSingletonServices, CoreServices, CreateSessionServices, 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, createSessionServices: CreateSessionServices<SingletonServices, Services, UserSession>, event: APIGatewayEvent) => Promise<APIGatewayProxyResult>;

package/dist/http/run-fetch.js

@@ -0,0 +1,23 @@
+import { PikkuFetchHTTPResponse, fetchData } from '@pikku/core/http';
+import { responseToLambdaResult } from '../response-converter.js';
+import { lambdaEventToRequest } from '../request-converter.js';
+export const runFetch = async (singletonServices, createSessionServices, event) => {
+    const request = lambdaEventToRequest(event);
+    const response = new PikkuFetchHTTPResponse();
+    if (request.method === 'options') {
+        response.header('Access-Control-Allow-Headers', 'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent');
+        response.header('Access-Control-Allow-Methods', 'OPTIONS,DELETE,GET,HEAD,PATCH,POST,PUT');
+        response.status(200);
+        return responseToLambdaResult(response.toResponse());
+    }
+    try {
+        await fetchData(request, response, {
+            singletonServices,
+            createSessionServices: createSessionServices,
+        });
+    }
+    catch {
+    }
+    return responseToLambdaResult(response.toResponse());
+};
+//# sourceMappingURL=run-fetch.js.map

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

@@ -0,0 +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,qBAIC,EACD,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,qBAAqB,EAAE,qBAA4B;SACpD,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;AACtD,CAAC,CAAA"}

package/dist/request-converter.d.ts

@@ -0,0 +1,2 @@
+import type { APIGatewayProxyEvent } from 'aws-lambda';
+export declare const lambdaEventToRequest: (event: APIGatewayProxyEvent) => Request;

package/dist/request-converter.js

@@ -0,0 +1,20 @@
+export const lambdaEventToRequest = (event) => {
+    const url = new URL(event.path, `https://${event.headers.host}`);
+    if (event.queryStringParameters) {
+        for (const [key, value] of Object.entries(event.queryStringParameters)) {
+            if (value !== undefined)
+                url.searchParams.set(key, value);
+        }
+    }
+    const body = event.body && event.isBase64Encoded
+        ? Buffer.from(event.body, 'base64')
+        : event.body || undefined;
+    return new Request(url.toString(), {
+        method: event.httpMethod,
+        headers: event.headers,
+        body: ['GET', 'HEAD'].includes(event.httpMethod.toUpperCase())
+            ? undefined
+            : body,
+    });
+};
+//# sourceMappingURL=request-converter.js.map

package/dist/request-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-converter.js","sourceRoot":"","sources":["../src/request-converter.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAA2B,EAAW,EAAE;IAC3E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IAEhE,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACvE,IAAI,KAAK,KAAK,SAAS;gBAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GACR,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,eAAe;QACjC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;QACnC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,SAAS,CAAA;IAE7B,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;QACjC,MAAM,EAAE,KAAK,CAAC,UAAU;QACxB,OAAO,EAAE,KAAK,CAAC,OAAsB;QACrC,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5D,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI;KACT,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/response-converter.d.ts

@@ -0,0 +1,2 @@
+import type { APIGatewayProxyResult } from 'aws-lambda';
+export declare const responseToLambdaResult: (response: Response) => Promise<APIGatewayProxyResult>;

package/dist/response-converter.js

@@ -0,0 +1,25 @@
+export const responseToLambdaResult = async (response) => {
+    const headers = {};
+    response.headers.forEach((value, key) => {
+        headers[key.toLowerCase()] = value;
+    });
+    let body;
+    let isBase64Encoded = false;
+    const contentType = response.headers.get('content-type') || '';
+    const isBinary = !/^text\/|application\/(json|javascript|xml)/.test(contentType);
+    const buffer = Buffer.from(await response.arrayBuffer());
+    if (isBinary) {
+        body = buffer.toString('base64');
+        isBase64Encoded = true;
+    }
+    else {
+        body = buffer.toString('utf-8');
+    }
+    return {
+        statusCode: response.status,
+        headers,
+        body,
+        isBase64Encoded,
+    };
+};
+//# sourceMappingURL=response-converter.js.map

package/dist/response-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-converter.js","sourceRoot":"","sources":["../src/response-converter.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,QAAkB,EACc,EAAE;IAClC,MAAM,OAAO,GAA2B,EAAE,CAAA;IAC1C,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,IAAI,IAAY,CAAA;IAChB,IAAI,eAAe,GAAG,KAAK,CAAA;IAE3B,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAA;IAC9D,MAAM,QAAQ,GAAG,CAAC,4CAA4C,CAAC,IAAI,CACjE,WAAW,CACZ,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAA;IACxD,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAChC,eAAe,GAAG,IAAI,CAAA;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAED,OAAO;QACL,UAAU,EAAE,QAAQ,CAAC,MAAM;QAC3B,OAAO;QACP,IAAI;QACJ,eAAe;KAChB,CAAA;AACH,CAAC,CAAA"}

package/dist/websocket/websocket-connect.js

@@ -1,11 +1,12 @@
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js';
+import { PikkuFetchHTTPRequest, PikkuFetchHTTPResponse, } from '@pikku/core';
+import { responseToLambdaResult } from '../response-converter.js';
 import { runChannelConnect } from '@pikku/core/channel/serverless';
 import { getServerlessDependencies } from './utils.js';
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js';
+import { lambdaEventToRequest } from '../request-converter.js';
 export const connectWebsocket = async (event, { singletonServices, createSessionServices, channelStore, }) => {
     const runnerParams = getServerlessDependencies(singletonServices.logger, channelStore, event);
-    const request = new PikkuAPIGatewayLambdaRequest(event);
-    const response = new PikkuAPIGatewayLambdaResponse();
+    const request = new PikkuFetchHTTPRequest(lambdaEventToRequest(event));
+    const response = new PikkuFetchHTTPResponse();
     await runChannelConnect({
         ...runnerParams,
         request,
@@ -14,6 +15,6 @@ export const connectWebsocket = async (event, { singletonServices, createSession
         createSessionServices: createSessionServices,
         route: event.path || '/',
     });
-    return response.getLambdaResponse();
+    return responseToLambdaResult(response.toResponse());
 };
 //# sourceMappingURL=websocket-connect.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"websocket-connect.js","sourceRoot":"","sources":["../../src/websocket/websocket-connect.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAEtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAA;AAErF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAKnC,KAAsB,EACtB,EACE,iBAAiB,EACjB,qBAAqB,EACrB,YAAY,GAC8C,EAC5B,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAC5C,iBAAiB,CAAC,MAAM,EACxB,YAAY,EACZ,KAAK,CACN,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,IAAI,6BAA6B,EAAE,CAAA;IACpD,MAAM,iBAAiB,CAAC;QACtB,GAAG,YAAY;QACf,OAAO;QACP,QAAQ;QACR,iBAAiB,EAAE,iBAAwB;QAC3C,qBAAqB,EAAE,qBAA4B;QACnD,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,GAAG;KACzB,CAAC,CAAA;IACF,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;AACrC,CAAC,CAAA"}
+{"version":3,"file":"websocket-connect.js","sourceRoot":"","sources":["../../src/websocket/websocket-connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,aAAa,CAAA;AAEpB,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,qBAAqB,EACrB,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,qBAAqB,EAAE,qBAA4B;QACnD,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-message.js

@@ -1,9 +1,10 @@
+import { PikkuFetchHTTPResponse, } from '@pikku/core';
 import { runChannelMessage } from '@pikku/core/channel/serverless';
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js';
 import { getServerlessDependencies } from './utils.js';
+import { responseToLambdaResult } from '../response-converter.js';
 export const processWebsocketMessage = async (event, { singletonServices, createSessionServices, channelStore, }) => {
     const runnerParams = getServerlessDependencies(singletonServices.logger, channelStore, event);
-    const response = new PikkuAPIGatewayLambdaResponse();
+    const response = new PikkuFetchHTTPResponse();
     try {
         const result = await runChannelMessage({
             ...runnerParams,
@@ -11,12 +12,12 @@ export const processWebsocketMessage = async (event, { singletonServices, create
             createSessionServices: createSessionServices,
         }, event.body);
         if (result) {
-            response.setJson(result);
+            response.json(result);
         }
     }
     catch (e) {
         console.error(e);
     }
-    return response.getLambdaResponse();
+    return responseToLambdaResult(response.toResponse());
 };
 //# sourceMappingURL=websocket-message.js.map

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,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAElE,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AACvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAGtD,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAK1C,KAA2B,EAC3B,EACE,iBAAiB,EACjB,qBAAqB,EACrB,YAAY,GAC8C,EAC5B,EAAE;IAClC,MAAM,YAAY,GAAG,yBAAyB,CAC5C,iBAAiB,CAAC,MAAM,EACxB,YAAY,EACZ,KAAK,CACN,CAAA;IACD,MAAM,QAAQ,GAAG,IAAI,6BAA6B,EAAE,CAAA;IACpD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,iBAAiB,CACpC;YACE,GAAG,YAAY;YACf,iBAAiB,EAAE,iBAAwB;YAC3C,qBAAqB,EAAE,qBAA4B;SACpD,EACD,KAAK,CAAC,IAAI,CACX,CAAA;QACD,IAAI,MAAM,EAAE,CAAC;YAEX,QAAQ,CAAC,OAAO,CAAC,MAAa,CAAC,CAAA;QACjC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QAEX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,QAAQ,CAAC,iBAAiB,EAAE,CAAA;AACrC,CAAC,CAAA"}
+{"version":3,"file":"websocket-message.js","sourceRoot":"","sources":["../../src/websocket/websocket-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,sBAAsB,GACvB,MAAM,aAAa,CAAA;AACpB,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,qBAAqB,EACrB,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,qBAAqB,EAAE,qBAA4B;SACpD,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/lambda",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "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.14",
+    "@pikku/core": "^0.6.22",
     "@types/aws-lambda": "^8.10.146"
   },
   "devDependencies": {

package/src/http/index.ts

@@ -1,3 +1 @@
-export * from './anywhere-http.js'
-export * from './corsless-http.js'
-export * from './cors-http.js'
+export * from './run-fetch.js'

package/src/http/run-fetch.ts

@@ -0,0 +1,51 @@
+import {
+  CoreSingletonServices,
+  CoreServices,
+  CreateSessionServices,
+  CoreUserSession,
+} from '@pikku/core'
+import { PikkuFetchHTTPResponse, fetchData } from '@pikku/core/http'
+import { 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,
+  createSessionServices: CreateSessionServices<
+    SingletonServices,
+    Services,
+    UserSession
+  >,
+  event: APIGatewayEvent
+): Promise<APIGatewayProxyResult> => {
+  const request = lambdaEventToRequest(event)
+  const response = new PikkuFetchHTTPResponse()
+
+  if (request.method === 'options') {
+    response.header(
+      'Access-Control-Allow-Headers',
+      'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token,X-Amz-User-Agent'
+    )
+    response.header(
+      'Access-Control-Allow-Methods',
+      'OPTIONS,DELETE,GET,HEAD,PATCH,POST,PUT'
+    )
+    response.status(200)
+    return responseToLambdaResult(response.toResponse())
+  }
+
+  try {
+    await fetchData(request, response, {
+      singletonServices,
+      createSessionServices: createSessionServices as any,
+    })
+  } catch {
+    // Error should have already been handled by fetch
+  }
+
+  return responseToLambdaResult(response.toResponse())
+}

package/src/request-converter.ts

@@ -0,0 +1,24 @@
+import type { APIGatewayProxyEvent } from 'aws-lambda'
+
+export const lambdaEventToRequest = (event: APIGatewayProxyEvent): Request => {
+  const url = new URL(event.path, `https://${event.headers.host}`)
+
+  if (event.queryStringParameters) {
+    for (const [key, value] of Object.entries(event.queryStringParameters)) {
+      if (value !== undefined) url.searchParams.set(key, value)
+    }
+  }
+
+  const body =
+    event.body && event.isBase64Encoded
+      ? Buffer.from(event.body, 'base64')
+      : event.body || undefined
+
+  return new Request(url.toString(), {
+    method: event.httpMethod,
+    headers: event.headers as HeadersInit,
+    body: ['GET', 'HEAD'].includes(event.httpMethod.toUpperCase())
+      ? undefined
+      : body,
+  })
+}

package/src/response-converter.ts

@@ -0,0 +1,33 @@
+import type { APIGatewayProxyResult } from 'aws-lambda'
+
+export const responseToLambdaResult = async (
+  response: Response
+): Promise<APIGatewayProxyResult> => {
+  const headers: Record<string, string> = {}
+  response.headers.forEach((value, key) => {
+    headers[key.toLowerCase()] = value
+  })
+
+  let body: string
+  let isBase64Encoded = false
+
+  const contentType = response.headers.get('content-type') || ''
+  const isBinary = !/^text\/|application\/(json|javascript|xml)/.test(
+    contentType
+  )
+
+  const buffer = Buffer.from(await response.arrayBuffer())
+  if (isBinary) {
+    body = buffer.toString('base64')
+    isBase64Encoded = true
+  } else {
+    body = buffer.toString('utf-8')
+  }
+
+  return {
+    statusCode: response.status,
+    headers,
+    body,
+    isBase64Encoded,
+  }
+}

package/src/websocket/websocket-connect.ts

@@ -2,13 +2,15 @@ import {
   CoreSingletonServices,
   CoreServices,
   CoreUserSession,
+  PikkuFetchHTTPRequest,
+  PikkuFetchHTTPResponse,
 } from '@pikku/core'
 import { APIGatewayEvent, APIGatewayProxyResult } from 'aws-lambda'
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js'
+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 { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js'
+import { lambdaEventToRequest } from '../request-converter.js'
 
 export const connectWebsocket = async <
   SingletonServices extends CoreSingletonServices,
@@ -27,8 +29,8 @@ export const connectWebsocket = async <
     channelStore,
     event
   )
-  const request = new PikkuAPIGatewayLambdaRequest(event)
-  const response = new PikkuAPIGatewayLambdaResponse()
+  const request = new PikkuFetchHTTPRequest(lambdaEventToRequest(event))
+  const response = new PikkuFetchHTTPResponse()
   await runChannelConnect({
     ...runnerParams,
     request,
@@ -37,5 +39,5 @@ export const connectWebsocket = async <
     createSessionServices: createSessionServices as any,
     route: event.path || '/',
   })
-  return response.getLambdaResponse()
+  return responseToLambdaResult(response.toResponse())
 }

package/src/websocket/websocket-message.ts

@@ -2,12 +2,13 @@ import {
   CoreSingletonServices,
   CoreServices,
   CoreUserSession,
+  PikkuFetchHTTPResponse,
 } from '@pikku/core'
 import { runChannelMessage } from '@pikku/core/channel/serverless'
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda'
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js'
 import { getServerlessDependencies } from './utils.js'
 import { WebsocketParams } from './websocket-types.js'
+import { responseToLambdaResult } from '../response-converter.js'
 
 export const processWebsocketMessage = async <
   SingletonServices extends CoreSingletonServices,
@@ -26,7 +27,7 @@ export const processWebsocketMessage = async <
     channelStore,
     event
   )
-  const response = new PikkuAPIGatewayLambdaResponse()
+  const response = new PikkuFetchHTTPResponse()
   try {
     const result = await runChannelMessage(
       {
@@ -38,11 +39,11 @@ export const processWebsocketMessage = async <
     )
     if (result) {
       // TODO: Support non json
-      response.setJson(result as any)
+      response.json(result as any)
     }
   } catch (e) {
-    // Error should have already been handled by runHTTPRoute
+    // Error should have already been handled by fetch
     console.error(e)
   }
-  return response.getLambdaResponse()
+  return responseToLambdaResult(response.toResponse())
 }

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/index.ts","./src/pikku-api-gateway-lambda-request.ts","./src/pikku-api-gateway-lambda-response.ts","./src/http/anywhere-http.ts","./src/http/cors-http.ts","./src/http/corsless-http.ts","./src/http/general-http-handler.ts","./src/http/index.ts","./src/websocket/index.ts","./src/websocket/lambda-channel-handler.ts","./src/websocket/lambda-eventhub-service.ts","./src/websocket/utils.ts","./src/websocket/websocket-connect.ts","./src/websocket/websocket-disconnect.ts","./src/websocket/websocket-message.ts","./src/websocket/websocket-types.ts"],"version":"5.7.3"}
+{"root":["./src/index.ts","./src/request-converter.ts","./src/response-converter.ts","./src/http/index.ts","./src/http/run-fetch.ts","./src/websocket/index.ts","./src/websocket/lambda-channel-handler.ts","./src/websocket/lambda-eventhub-service.ts","./src/websocket/utils.ts","./src/websocket/websocket-connect.ts","./src/websocket/websocket-disconnect.ts","./src/websocket/websocket-message.ts","./src/websocket/websocket-types.ts"],"version":"5.7.3"}

package/dist/http/anywhere-http.d.ts

@@ -1,3 +0,0 @@
-import { CoreSingletonServices, CoreServices, CreateSessionServices, CoreUserSession } from '@pikku/core';
-import { APIGatewayProxyEvent } from 'aws-lambda';
-export declare const anywhereHTTP: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>>(event: APIGatewayProxyEvent, singletonServices: SingletonServices, createSessionServices: CreateSessionServices<SingletonServices, Services, CoreUserSession>) => Promise<import("aws-lambda").APIGatewayProxyResult>;

package/dist/http/anywhere-http.js

@@ -1,13 +0,0 @@
-import { generalHTTPHandler } from './general-http-handler.js';
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js';
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js';
-export const anywhereHTTP = async (event, singletonServices, createSessionServices) => {
-    const request = new PikkuAPIGatewayLambdaRequest(event);
-    const response = new PikkuAPIGatewayLambdaResponse();
-    if (event.headers.origin) {
-        response.setHeader('Access-Control-Allow-Origin', event.headers.origin.toString());
-    }
-    response.setHeader('Access-Control-Allow-Credentials', true);
-    return await generalHTTPHandler(singletonServices, createSessionServices, request, response);
-};
-//# sourceMappingURL=anywhere-http.js.map

package/dist/http/anywhere-http.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"anywhere-http.js","sourceRoot":"","sources":["../../src/http/anywhere-http.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAA;AACrF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AAEvF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAI/B,KAA2B,EAC3B,iBAAoC,EACpC,qBAIC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,IAAI,6BAA6B,EAAE,CAAA;IACpD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACzB,QAAQ,CAAC,SAAS,CAChB,6BAA6B,EAC7B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAChC,CAAA;IACH,CAAC;IACD,QAAQ,CAAC,SAAS,CAAC,kCAAkC,EAAE,IAAI,CAAC,CAAA;IAC5D,OAAO,MAAM,kBAAkB,CAC7B,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACP,QAAQ,CACT,CAAA;AACH,CAAC,CAAA"}

package/dist/http/cors-http.d.ts

@@ -1,3 +0,0 @@
-import type { CoreSingletonServices, CoreServices, CreateSessionServices, CoreUserSession } from '@pikku/core';
-import type { APIGatewayProxyEvent } from 'aws-lambda';
-export declare const corsHTTP: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(event: APIGatewayProxyEvent, allowedOrigins: string[], singletonServices: SingletonServices, createSessionServices: CreateSessionServices<SingletonServices, Services, UserSession>) => Promise<import("aws-lambda").APIGatewayProxyResult>;

package/dist/http/cors-http.js

@@ -1,35 +0,0 @@
-import { generalHTTPHandler } from './general-http-handler.js';
-import { InvalidOriginError } from '@pikku/core/errors';
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js';
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js';
-const validateOrigin = (allowsOrigins, logger, event) => {
-    const origin = event.headers.origin;
-    if (!origin || allowsOrigins.every((domain) => !origin.includes(domain))) {
-        logger.error(`
-  CORS Error
-    - Recieved from origin: ${origin}
-    - Expected domain(s): ${allowsOrigins.join(', ')}
-    - Host: ${event.headers.host}
-    - Path: ${event.path}
-    - Headers: ${JSON.stringify(event.headers, null, '\t')}
-  `);
-        throw new InvalidOriginError();
-    }
-    return origin;
-};
-export const corsHTTP = async (event, allowedOrigins, singletonServices, createSessionServices) => {
-    const request = new PikkuAPIGatewayLambdaRequest(event);
-    const response = new PikkuAPIGatewayLambdaResponse();
-    let origin = false;
-    try {
-        origin = validateOrigin(allowedOrigins, singletonServices.logger, event);
-    }
-    catch {
-        response.setStatus(400);
-        response.setJson({ error: 'error.invalid_origin' });
-    }
-    response.setHeader('Access-Control-Allow-Origin', origin);
-    response.setHeader('Access-Control-Allow-Credentials', true);
-    return await generalHTTPHandler(singletonServices, createSessionServices, request, response);
-};
-//# sourceMappingURL=cors-http.js.map

package/dist/http/cors-http.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cors-http.js","sourceRoot":"","sources":["../../src/http/cors-http.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AACvF,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAA;AAErF,MAAM,cAAc,GAAG,CACrB,aAAuB,EACvB,MAAc,EACd,KAA2B,EACnB,EAAE;IACV,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAA;IACnC,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACzE,MAAM,CAAC,KAAK,CAAC;;8BAEa,MAAM;4BACR,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;cACtC,KAAK,CAAC,OAAO,CAAC,IAAI;cAClB,KAAK,CAAC,IAAI;iBACP,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC;GACvD,CAAC,CAAA;QACA,MAAM,IAAI,kBAAkB,EAAE,CAAA;IAChC,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAK3B,KAA2B,EAC3B,cAAwB,EACxB,iBAAoC,EACpC,qBAIC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,IAAI,6BAA6B,EAAE,CAAA;IAEpD,IAAI,MAAM,GAAmB,KAAK,CAAA;IAClC,IAAI,CAAC;QACH,MAAM,GAAG,cAAc,CAAC,cAAc,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC,CAAA;IACrD,CAAC;IAED,QAAQ,CAAC,SAAS,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAA;IACzD,QAAQ,CAAC,SAAS,CAAC,kCAAkC,EAAE,IAAI,CAAC,CAAA;IAE5D,OAAO,MAAM,kBAAkB,CAC7B,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACP,QAAQ,CACT,CAAA;AACH,CAAC,CAAA"}

package/dist/http/corsless-http.d.ts

@@ -1,3 +0,0 @@
-import { APIGatewayProxyEvent } from 'aws-lambda';
-import { CoreServices, CoreSingletonServices, CoreUserSession, CreateSessionServices } from '@pikku/core';
-export declare const corslessHTTP: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(event: APIGatewayProxyEvent, singletonServices: SingletonServices, createSessionServices: CreateSessionServices<SingletonServices, Services, UserSession>) => Promise<import("aws-lambda").APIGatewayProxyResult>;

package/dist/http/corsless-http.js

@@ -1,9 +0,0 @@
-import { generalHTTPHandler } from './general-http-handler.js';
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js';
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js';
-export const corslessHTTP = async (event, singletonServices, createSessionServices) => {
-    const request = new PikkuAPIGatewayLambdaRequest(event);
-    const response = new PikkuAPIGatewayLambdaResponse();
-    return await generalHTTPHandler(singletonServices, createSessionServices, request, response);
-};
-//# sourceMappingURL=corsless-http.js.map

package/dist/http/corsless-http.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"corsless-http.js","sourceRoot":"","sources":["../../src/http/corsless-http.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAA;AACrF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AAEvF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAK/B,KAA2B,EAC3B,iBAAoC,EACpC,qBAIC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAG,IAAI,6BAA6B,EAAE,CAAA;IACpD,OAAO,MAAM,kBAAkB,CAC7B,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACP,QAAQ,CACT,CAAA;AACH,CAAC,CAAA"}

package/dist/http/general-http-handler.d.ts

@@ -1,5 +0,0 @@
-import { CoreSingletonServices, CoreServices, CreateSessionServices, CoreUserSession } from '@pikku/core';
-import { APIGatewayProxyResult } from 'aws-lambda';
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js';
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js';
-export declare const generalHTTPHandler: <SingletonServices extends CoreSingletonServices, Services extends CoreServices<SingletonServices>, UserSession extends CoreUserSession>(singletonServices: SingletonServices, createSessionServices: CreateSessionServices<SingletonServices, Services, UserSession>, request: PikkuAPIGatewayLambdaRequest, response: PikkuAPIGatewayLambdaResponse) => Promise<APIGatewayProxyResult>;

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

@@ -1,28 +0,0 @@
-import { runHTTPRoute } from '@pikku/core/http';
-export const generalHTTPHandler = async (singletonServices, createSessionServices, request, response) => {
-    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.path.includes('health-check')) {
-        response.setStatus(200);
-        return response.getLambdaResponse();
-    }
-    try {
-        await runHTTPRoute({
-            request,
-            response,
-            singletonServices,
-            createSessionServices: createSessionServices,
-            route: request.path,
-            method: request.method,
-        });
-    }
-    catch {
-    }
-    return response.getLambdaResponse();
-};
-//# sourceMappingURL=general-http-handler.js.map

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

@@ -1 +0,0 @@
-{"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,10 +0,0 @@
-import type { APIGatewayProxyEvent } from 'aws-lambda';
-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);
-    getBody(): Promise<string | null>;
-    getHeader(headerName: string): string | undefined;
-    getQuery(): PikkuQuery;
-}

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

@@ -1,18 +0,0 @@
-import { PikkuHTTPAbstractRequest } from '@pikku/core/http/pikku-http-abstract-request';
-export class PikkuAPIGatewayLambdaRequest extends PikkuHTTPAbstractRequest {
-    event;
-    constructor(event) {
-        super(event.path || '/', event.httpMethod?.toLowerCase() || 'get');
-        this.event = event;
-    }
-    async getBody() {
-        return this.event.body;
-    }
-    getHeader(headerName) {
-        return this.event.headers[headerName];
-    }
-    getQuery() {
-        return this.event.queryStringParameters || {};
-    }
-}
-//# sourceMappingURL=pikku-api-gateway-lambda-request.js.map

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

@@ -1 +0,0 @@
-{"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/pikku-api-gateway-lambda-response.d.ts

@@ -1,15 +0,0 @@
-import { JSONValue } from '@pikku/core';
-import { PikkuHTTPAbstractResponse } from '@pikku/core/http/pikku-http-abstract-response';
-import { APIGatewayProxyResult } from 'aws-lambda';
-export declare class PikkuAPIGatewayLambdaResponse extends PikkuHTTPAbstractResponse {
-    headers: Record<string, string>;
-    private status;
-    private body;
-    constructor();
-    getLambdaResponse(): APIGatewayProxyResult;
-    setStatus(status: number): void;
-    setHeader(name: string, value: string | boolean | string[]): void;
-    setJson(value: JSONValue): void;
-    setResponse(response: string | Buffer): void;
-    setRedirect(path: string, status: number): void;
-}

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

@@ -1,32 +0,0 @@
-import { PikkuHTTPAbstractResponse } from '@pikku/core/http/pikku-http-abstract-response';
-export class PikkuAPIGatewayLambdaResponse extends PikkuHTTPAbstractResponse {
-    headers = {};
-    status = 200;
-    body;
-    constructor() {
-        super();
-    }
-    getLambdaResponse() {
-        return {
-            headers: this.headers,
-            statusCode: this.status,
-            body: this.body,
-        };
-    }
-    setStatus(status) {
-        this.status = status;
-    }
-    setHeader(name, value) {
-        this.headers[name] = value.toString();
-    }
-    setJson(value) {
-        this.body = JSON.stringify(value);
-    }
-    setResponse(response) {
-        this.body = response;
-    }
-    setRedirect(path, status) {
-        throw new Error('Method not implemented.');
-    }
-}
-//# sourceMappingURL=pikku-api-gateway-lambda-response.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"pikku-api-gateway-lambda-response.js","sourceRoot":"","sources":["../src/pikku-api-gateway-lambda-response.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAGzF,MAAM,OAAO,6BAA8B,SAAQ,yBAAyB;IACnE,OAAO,GAA2B,EAAE,CAAA;IACnC,MAAM,GAAW,GAAG,CAAA;IACpB,IAAI,CAAiB;IAE7B;QACE,KAAK,EAAE,CAAA;IACT,CAAC;IAEM,iBAAiB;QACtB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;IACH,CAAC;IAEM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEM,SAAS,CAAC,IAAY,EAAE,KAAkC;QAC/D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;IACvC,CAAC;IAEM,OAAO,CAAC,KAAgB;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;IAEM,WAAW,CAAC,QAAyB;QAC1C,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAA;IACtB,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,MAAc;QAC7C,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF"}

package/src/http/anywhere-http.ts

@@ -1,39 +0,0 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CreateSessionServices,
-  CoreUserSession,
-} from '@pikku/core'
-import { APIGatewayProxyEvent } from 'aws-lambda'
-import { generalHTTPHandler } from './general-http-handler.js'
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js'
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js'
-
-export const anywhereHTTP = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
->(
-  event: APIGatewayProxyEvent,
-  singletonServices: SingletonServices,
-  createSessionServices: CreateSessionServices<
-    SingletonServices,
-    Services,
-    CoreUserSession
-  >
-) => {
-  const request = new PikkuAPIGatewayLambdaRequest(event)
-  const response = new PikkuAPIGatewayLambdaResponse()
-  if (event.headers.origin) {
-    response.setHeader(
-      'Access-Control-Allow-Origin',
-      event.headers.origin.toString()
-    )
-  }
-  response.setHeader('Access-Control-Allow-Credentials', true)
-  return await generalHTTPHandler(
-    singletonServices,
-    createSessionServices,
-    request,
-    response
-  )
-}

package/src/http/cors-http.ts

@@ -1,70 +0,0 @@
-import type {
-  CoreSingletonServices,
-  CoreServices,
-  CreateSessionServices,
-  CoreUserSession,
-} from '@pikku/core'
-import type { APIGatewayProxyEvent } from 'aws-lambda'
-import type { Logger } from '@pikku/core/services'
-
-import { generalHTTPHandler } from './general-http-handler.js'
-import { InvalidOriginError } from '@pikku/core/errors'
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js'
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js'
-
-const validateOrigin = (
-  allowsOrigins: string[],
-  logger: Logger,
-  event: APIGatewayProxyEvent
-): string => {
-  const origin = event.headers.origin
-  if (!origin || allowsOrigins.every((domain) => !origin.includes(domain))) {
-    logger.error(`
-  CORS Error
-    - Recieved from origin: ${origin}
-    - Expected domain(s): ${allowsOrigins.join(', ')}
-    - Host: ${event.headers.host}
-    - Path: ${event.path}
-    - Headers: ${JSON.stringify(event.headers, null, '\t')}
-  `)
-    throw new InvalidOriginError()
-  }
-
-  return origin
-}
-
-export const corsHTTP = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
-  event: APIGatewayProxyEvent,
-  allowedOrigins: string[],
-  singletonServices: SingletonServices,
-  createSessionServices: CreateSessionServices<
-    SingletonServices,
-    Services,
-    UserSession
-  >
-) => {
-  const request = new PikkuAPIGatewayLambdaRequest(event)
-  const response = new PikkuAPIGatewayLambdaResponse()
-
-  let origin: string | false = false
-  try {
-    origin = validateOrigin(allowedOrigins, singletonServices.logger, event)
-  } catch {
-    response.setStatus(400)
-    response.setJson({ error: 'error.invalid_origin' })
-  }
-
-  response.setHeader('Access-Control-Allow-Origin', origin)
-  response.setHeader('Access-Control-Allow-Credentials', true)
-
-  return await generalHTTPHandler(
-    singletonServices,
-    createSessionServices,
-    request,
-    response
-  )
-}

package/src/http/corsless-http.ts

@@ -1,33 +0,0 @@
-import { APIGatewayProxyEvent } from 'aws-lambda'
-import {
-  CoreServices,
-  CoreSingletonServices,
-  CoreUserSession,
-  CreateSessionServices,
-} from '@pikku/core'
-import { generalHTTPHandler } from './general-http-handler.js'
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js'
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js'
-
-export const corslessHTTP = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
-  event: APIGatewayProxyEvent,
-  singletonServices: SingletonServices,
-  createSessionServices: CreateSessionServices<
-    SingletonServices,
-    Services,
-    UserSession
-  >
-) => {
-  const request = new PikkuAPIGatewayLambdaRequest(event)
-  const response = new PikkuAPIGatewayLambdaResponse()
-  return await generalHTTPHandler(
-    singletonServices,
-    createSessionServices,
-    request,
-    response
-  )
-}

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

@@ -1,59 +0,0 @@
-import {
-  CoreSingletonServices,
-  CoreServices,
-  CreateSessionServices,
-  CoreUserSession,
-} from '@pikku/core'
-import { runHTTPRoute } from '@pikku/core/http'
-import { APIGatewayProxyResult } from 'aws-lambda'
-import { PikkuAPIGatewayLambdaRequest } from '../pikku-api-gateway-lambda-request.js'
-import { PikkuAPIGatewayLambdaResponse } from '../pikku-api-gateway-lambda-response.js'
-
-export const generalHTTPHandler = async <
-  SingletonServices extends CoreSingletonServices,
-  Services extends CoreServices<SingletonServices>,
-  UserSession extends CoreUserSession,
->(
-  singletonServices: SingletonServices,
-  createSessionServices: CreateSessionServices<
-    SingletonServices,
-    Services,
-    UserSession
-  >,
-  request: PikkuAPIGatewayLambdaRequest,
-  response: PikkuAPIGatewayLambdaResponse
-): Promise<APIGatewayProxyResult> => {
-  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.path.includes('health-check')) {
-    response.setStatus(200)
-    return response.getLambdaResponse()
-  }
-
-  try {
-    await runHTTPRoute({
-      request,
-      response,
-      singletonServices,
-      createSessionServices: createSessionServices as any,
-      route: request.path,
-      method: request.method,
-    })
-  } catch {
-    // Error should have already been handled by runHTTPRoute
-  }
-
-  return response.getLambdaResponse()
-}

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

@@ -1,25 +0,0 @@
-import type { APIGatewayProxyEvent } from 'aws-lambda'
-import type { HTTPMethod, PikkuQuery } from '@pikku/core/http'
-import { PikkuHTTPAbstractRequest } from '@pikku/core/http/pikku-http-abstract-request'
-
-export class PikkuAPIGatewayLambdaRequest extends PikkuHTTPAbstractRequest {
-  constructor(protected event: APIGatewayProxyEvent) {
-    super(
-      event.path || '/',
-      (event.httpMethod?.toLowerCase() as HTTPMethod) || 'get'
-    )
-  }
-
-  public async getBody() {
-    return this.event.body
-  }
-
-  public getHeader(headerName: string): string | undefined {
-    return this.event.headers[headerName]
-  }
-
-  public getQuery() {
-    // TODO: If query isn't defined, it should be an empty object
-    return (this.event.queryStringParameters as PikkuQuery) || {}
-  }
-}

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

@@ -1,41 +0,0 @@
-import { JSONValue } from '@pikku/core'
-import { PikkuHTTPAbstractResponse } from '@pikku/core/http/pikku-http-abstract-response'
-import { APIGatewayProxyResult } from 'aws-lambda'
-
-export class PikkuAPIGatewayLambdaResponse extends PikkuHTTPAbstractResponse {
-  public headers: Record<string, string> = {}
-  private status: number = 200
-  private body: any | undefined
-
-  constructor() {
-    super()
-  }
-
-  public getLambdaResponse(): APIGatewayProxyResult {
-    return {
-      headers: this.headers,
-      statusCode: this.status,
-      body: this.body,
-    }
-  }
-
-  public setStatus(status: number): void {
-    this.status = status
-  }
-
-  public setHeader(name: string, value: string | boolean | string[]): void {
-    this.headers[name] = value.toString()
-  }
-
-  public setJson(value: JSONValue): void {
-    this.body = JSON.stringify(value)
-  }
-
-  public setResponse(response: string | Buffer): void {
-    this.body = response
-  }
-
-  public setRedirect(path: string, status: number) {
-    throw new Error('Method not implemented.')
-  }
-}