fix: buffer event parse

Signed-off-by: seven <[email protected]>

Author: Blankll

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverless-adapter",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Adapter for web frame work express, koa, springboot to run in serverless function as backend of apigateway cross multi cloud provider like aliyun, huawei",
   "homepage": "https://www.geekfun.club/",
   "main": "dist/src/index.js",

package.json

@@ -1,4 +1,4 @@
-import { ServerlessEvent, Context, Event } from './types';
+import { Context, ServerlessEvent } from './types';
 import ServerlessRequest from './serverlessRequest';
 import url from 'node:url';
 import { debug } from './common';
@@ -11,7 +11,7 @@ import { debug } from './common';
 // };
 
 const requestBody = (event: ServerlessEvent) => {
-  if (event.body === undefined || event.body === null) {
+  if (!event.body) {
     return undefined;
   }
   const type = typeof event.body;
@@ -43,9 +43,9 @@ const requestHeaders = (event: ServerlessEvent) => {
   }, initialHeader);
 };
 
-export const constructFrameworkContext = (rawEvent: Event, rawContext: Context) => {
+export const constructFrameworkContext = (rawEvent: Buffer, rawContext: Context) => {
   debug(`constructFrameworkContext: ${JSON.stringify({ rawEvent, rawContext })}`);
-  const event = JSON.parse(Buffer.from(rawEvent['data']).toString()) as ServerlessEvent;
+  const event = JSON.parse(Buffer.from(rawEvent).toString()) as ServerlessEvent;
   const body = requestBody(event);
   const headers = requestHeaders(event);
 

src/context.ts

@@ -2,11 +2,6 @@ import { Express } from 'express';
 import Application from 'koa';
 import { IncomingHttpHeaders } from 'http';
 
-type AliyunApiGatewayEventEvent = {
-  type: 'Buffer';
-  data: Buffer;
-};
-
 type AliyunApiGatewayContext = {
   requestId: string;
   region: string;
@@ -45,7 +40,7 @@ type AliyunApiGatewayContext = {
   };
 };
 
-export type Event = AliyunApiGatewayEventEvent;
+export type Event = Buffer;
 export type Context = AliyunApiGatewayContext;
 
 export type ServerlessEvent = {
@@ -54,7 +49,7 @@ export type ServerlessEvent = {
   headers: Record<string, string>;
   queryParameters: Record<string, string>;
   pathParameters: Record<string, string>;
-  body?: string;
+  body: string | undefined;
   isBase64Encoded: boolean;
 };
 

src/types.ts

@@ -8,11 +8,5 @@ export const sendRequest = async (
   event: Record<string, unknown>,
   context: Record<string, unknown>,
 ) => {
-  return serverlessAdapter(app)(
-    {
-      type: 'Buffer',
-      data: Buffer.from(JSON.stringify(event)),
-    },
-    context as Context,
-  );
+  return serverlessAdapter(app)(Buffer.from(JSON.stringify(event)), context as Context);
 };