lambder 1.0.124 → 1.0.125

package/Readme.md

@@ -43,7 +43,7 @@ lambder.enableDdbSession({
 });
 
 // Enable Cors
-lambder.setIsCorsEnabled(true);
+lambder.enableCors(true);
 
 // Define a simple api
 lambder.addApi("getCompanyPage", async ({ apiPayload }, res) => {

package/dist/Lambder.d.ts

@@ -17,6 +17,7 @@ export type LambderRenderContext = {
     apiPayload: any;
     headers: APIGatewayProxyEventHeaders;
     session: LambderSessionContext | null;
+    event: APIGatewayProxyEvent;
     lambdaContext: Context;
     _otherInternal: {
         isApiCall: boolean;
@@ -63,7 +64,7 @@ export default class Lambder {
         ejsPath?: string;
         apiVersion?: string;
     });
-    setIsCorsEnabled(isCorsEnabled: boolean): void;
+    enableCors(isCorsEnabled: boolean): void;
     enableDdbSession({ tableName, tableRegion, sessionSalt }: {
         tableName: string;
         tableRegion: string;

package/dist/Lambder.js

@@ -33,7 +33,7 @@ export const createContext = (event, lambdaContext, apiPath) => {
     const apiPayload = isApiCall ? post.payload : null;
     return {
         host, path, pathParams, method,
-        get, post, cookie,
+        get, post, cookie, event,
         apiName, apiPayload,
         headers, session, lambdaContext,
         _otherInternal: {
@@ -72,7 +72,7 @@ export default class Lambder {
         };
         this.utils = new LambderUtils({ ejsPath });
     }
-    setIsCorsEnabled(isCorsEnabled) {
+    enableCors(isCorsEnabled) {
         this.isCorsEnabled = isCorsEnabled;
     }
     enableDdbSession({ tableName, tableRegion, sessionSalt }, { partitionKey, sortKey } = { partitionKey: "pk", sortKey: "sk" }) {

package/dist/LambderCaller.js

@@ -51,10 +51,16 @@ export default class LambderCaller {
                 credentials: 'same-origin', redirect: 'follow', referrerPolicy: 'origin',
                 headers: { 'Content-Type': 'application/json', ...(headers || {}) },
                 body: JSON.stringify({ apiName, version, token, siteHost, payload, }),
-            }).then(res => {
+            }).then(async (res) => {
                 if (res.status >= 500)
                     throw new Error("Request failed: " + res.status + " - " + res.statusText);
-                return res.json();
+                if (res.headers.get("Content-Type")?.includes("application/lambder-json-stream")) {
+                    const decompressed = res.json();
+                    return decompressed;
+                }
+                else {
+                    return res.json();
+                }
             });
             fetchTracker.done = true;
             if (this.fetchEndedHandler) {
@@ -95,7 +101,7 @@ export default class LambderCaller {
                     await this.notAuthorizedHandler();
                 }
                 else if (this.errorHandler) {
-                    await this.errorHandler(new Error("Version Expired; Please refresh;"));
+                    await this.errorHandler(new Error("Not Authorized;"));
                 }
                 return null;
             }

package/dist/LambderResponseBuilder.d.ts

@@ -47,4 +47,5 @@ export default class LambderResponseBuilder {
     ejsTemplate(template: string, pageData: Record<string, any>, headers?: Record<string, string | string[]>): Promise<LambderResolverResponse>;
     ejsFile(filePath: string, pageData: Record<string, any>, headers?: Record<string, string | string[]>): Promise<LambderResolverResponse>;
     api<T = any>(payload: T | null, { versionExpired, sessionExpired, notAuthorized, message, errorMessage, logList, }?: LambderApiResponseConfig, headers?: Record<string, string | string[]>): LambderResolverResponse;
+    private apiBinary;
 }

package/dist/LambderResponseBuilder.js

@@ -144,7 +144,11 @@ export default class LambderResponseBuilder {
         }
         const mimeType = mimeTypeResolver.lookup(filePath);
         const body = this.readPublicFileSync(filePath);
-        const bodyBase64 = Buffer.from(body).toString("base64");
+        if (body === "forbidden-public-path") {
+            throw { error: "Forbidden public path: " + filePath };
+        }
+        const bodyBuffer = Buffer.isBuffer(body) ? body : Buffer.from(body);
+        const bodyBase64 = bodyBuffer.toString("base64");
         console.log("bodyBase64.length", bodyBase64.length);
         return this.fileBase64(bodyBase64, mimeType || "", headers);
     }
@@ -186,5 +190,32 @@ export default class LambderResponseBuilder {
         }, headers);
     }
     ;
+    apiBinary(payload, { versionExpired, sessionExpired, notAuthorized, message, errorMessage, logList, } = {
+        versionExpired: undefined, sessionExpired: undefined, notAuthorized: undefined,
+        message: null, errorMessage: null, logList: undefined
+    }, headers) {
+        const finalLogList = logList || this.ctx?._otherInternal?.logToApiResponseAccumulator;
+        const result = {
+            apiVersion: this.apiVersion,
+            payload,
+            ...(versionExpired ? { versionExpired } : {}),
+            ...(sessionExpired ? { sessionExpired } : {}),
+            ...(notAuthorized ? { notAuthorized } : {}),
+            ...(message ? { message } : {}),
+            ...(errorMessage ? { errorMessage } : {}),
+            ...(finalLogList?.length ? { logList: finalLogList } : {}),
+        };
+        return this.raw({
+            statusCode: 200,
+            isBase64Encoded: true,
+            multiValueHeaders: {
+                "Content-Type": ["application/lambder-json-stream"],
+                "Content-Encoding": ["gzip"],
+                ...convertToMultiHeader(headers)
+            },
+            body: Buffer.from(JSON.stringify(result)).toString("base64"),
+        });
+    }
+    ;
 }
 ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambder",
-  "version": "1.0.124",
+  "version": "1.0.125",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Lambder.ts

@@ -23,6 +23,7 @@ export type LambderRenderContext = {
     apiPayload: any;
     headers: APIGatewayProxyEventHeaders;
     session: LambderSessionContext|null;
+    event: APIGatewayProxyEvent;
     lambdaContext: Context;
     _otherInternal: { 
         isApiCall: boolean,
@@ -78,7 +79,7 @@ export const createContext = (
 
     return { 
         host, path, pathParams, method, 
-        get, post, cookie, 
+        get, post, cookie, event,
         apiName, apiPayload, 
         headers, session, lambdaContext, 
         _otherInternal: { 
@@ -133,7 +134,7 @@ export default class Lambder {
         this.utils = new LambderUtils({ ejsPath });
     }
 
-    setIsCorsEnabled(isCorsEnabled: boolean){
+    enableCors(isCorsEnabled: boolean){
         this.isCorsEnabled = isCorsEnabled;
     }
 

package/src/LambderCaller.ts

@@ -117,9 +117,14 @@ export default class LambderCaller {
                 credentials: 'same-origin', redirect: 'follow', referrerPolicy: 'origin',
                 headers: { 'Content-Type': 'application/json', ...(headers || {}) },
                 body: JSON.stringify({ apiName, version, token, siteHost, payload, }),
-            }).then(res=>{
+            }).then(async (res)=>{
                 if(res.status >= 500) throw new Error("Request failed: " + res.status + " - " + res.statusText);
-                return res.json();
+                if(res.headers.get("Content-Type")?.includes("application/lambder-json-stream")){ 
+                    const decompressed = res.json();
+                    return decompressed;
+                }else{
+                    return res.json();
+                }
             }) as LambderApiResponse<T>;
             fetchTracker.done = true;
             if(this.fetchEndedHandler){
@@ -157,7 +162,7 @@ export default class LambderCaller {
                 if(this.notAuthorizedHandler){
                     await this.notAuthorizedHandler();
                 }else if(this.errorHandler){
-                    await this.errorHandler(new Error("Version Expired; Please refresh;"));
+                    await this.errorHandler(new Error("Not Authorized;"));
                 }
                 return null;
             }

package/src/LambderResponseBuilder.ts

@@ -199,7 +199,11 @@ export default class LambderResponseBuilder {
         }
         const mimeType = mimeTypeResolver.lookup(filePath);
         const body = this.readPublicFileSync(filePath);
-        const bodyBase64 = Buffer.from(body).toString("base64");
+        if (body === "forbidden-public-path") {
+            throw { error: "Forbidden public path: " + filePath };
+        }
+        const bodyBuffer: Buffer =  Buffer.isBuffer(body) ? body : Buffer.from(body);
+        const bodyBase64 = bodyBuffer.toString("base64");
         console.log("bodyBase64.length",bodyBase64.length);
         return this.fileBase64(bodyBase64, mimeType || "", headers);
     };
@@ -258,4 +262,39 @@ export default class LambderResponseBuilder {
         }, headers);
     };
 
+    private apiBinary<T=any>(
+        payload: T | null, 
+        {
+            versionExpired, sessionExpired, notAuthorized, 
+            message, errorMessage, logList,
+        }: LambderApiResponseConfig = {
+            versionExpired: undefined, sessionExpired: undefined, notAuthorized: undefined, 
+            message: null, errorMessage: null, logList: undefined
+        }, 
+        headers?: Record<string, string|string[]>,
+    ): LambderResolverResponse {
+        const finalLogList = logList || this.ctx?._otherInternal?.logToApiResponseAccumulator;
+        const result = { 
+            apiVersion: this.apiVersion,
+            payload,
+            ...(versionExpired ? {versionExpired} : {}),
+            ...(sessionExpired ? {sessionExpired} : {}),
+            ...(notAuthorized ? {notAuthorized} : {}),
+            ...(message ? {message} : {}),
+            ...(errorMessage ? {errorMessage} : {}),
+            ...(finalLogList?.length ? {logList: finalLogList} : {}),
+        };
+
+        return this.raw({ 
+            statusCode: 200, 
+            isBase64Encoded: true, 
+            multiValueHeaders: { 
+                "Content-Type": ["application/lambder-json-stream"],
+                "Content-Encoding": ["gzip"],
+                ...convertToMultiHeader(headers) 
+            }, 
+            body: Buffer.from(JSON.stringify(result)).toString("base64"), 
+        });
+    };
+
 };