@arkyn/server 1.4.10 → 1.4.12

package/dist/services/sendFileToS3.d.ts

@@ -5,7 +5,11 @@ type AWSConfig = {
     AWS_SECRET_ACCESS_KEY: string;
     AWS_S3_BUCKET: string;
 };
-declare function sendFileToS3(props: ActionFunctionArgs, awsS3Config: AWSConfig): Promise<{
+type Config = {
+    maxPartSize?: number;
+    fileName?: string;
+};
+declare function sendFileToS3(props: ActionFunctionArgs, awsS3Config: AWSConfig, config?: Config): Promise<{
     error: string;
     url?: undefined;
 } | {

package/dist/services/sendFileToS3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendFileToS3.d.ts","sourceRoot":"","sources":["../../src/services/sendFileToS3.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,kBAAkB,EAExB,MAAM,iBAAiB,CAAC;AAOzB,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAmDF,iBAAe,YAAY,CAAC,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,SAAS;;;;;;GAuC5E;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"sendFileToS3.d.ts","sourceRoot":"","sources":["../../src/services/sendFileToS3.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,kBAAkB,EAExB,MAAM,iBAAiB,CAAC;AAOzB,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAmDF,iBAAe,YAAY,CACzB,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,SAAS,EACtB,MAAM,GAAE,MAGP;;;;;;GA2CF;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/services/sendFileToS3.js

@@ -39,20 +39,25 @@ async function s3_upload(fileStream, contentType, awsS3Config) {
         location: `https://${AWS_S3_BUCKET}.s3.amazonaws.com/${uploadParams.Key}`,
     };
 }
-async function sendFileToS3(props, awsS3Config) {
+async function sendFileToS3(props, awsS3Config, config = {
+    maxPartSize: 5_000_000,
+    fileName: "file",
+}) {
+    const { fileName = "file", maxPartSize = 5_000_000 } = config;
     const { request } = props;
     const uploadHandler = composeUploadHandlers(createFileUploadHandler({
-        maxPartSize: 5_000_000,
+        maxPartSize,
         file: ({ filename }) => filename,
     }));
     const formData = await parseMultipartFormData(request, uploadHandler);
-    const file = formData.get("file");
+    const file = formData.get(fileName);
     if (!file)
         throw new BadRequestError("No file uploaded");
     const filterParams = getScopedParams(request);
     const width = filterParams.get("w");
     const height = filterParams.get("h");
-    if (width && height) {
+    const isImage = file.type.startsWith("image");
+    if (isImage && width && height) {
         const image = sharp(file.getFilePath());
         const metadata = await image.metadata();
         if (metadata.width && metadata.height) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkyn/server",
-  "version": "1.4.10",
+  "version": "1.4.12",
   "main": "./dist/bundle.js",
   "module": "./src/index.ts",
   "type": "module",

package/src/services/sendFileToS3.ts

@@ -19,6 +19,11 @@ type AWSConfig = {
   AWS_S3_BUCKET: string;
 };
 
+type Config = {
+  maxPartSize?: number;
+  fileName?: string;
+};
+
 async function s3_upload(
   fileStream: fs.ReadStream,
   contentType: string,
@@ -68,18 +73,26 @@ async function s3_upload(
   };
 }
 
-async function sendFileToS3(props: ActionFunctionArgs, awsS3Config: AWSConfig) {
+async function sendFileToS3(
+  props: ActionFunctionArgs,
+  awsS3Config: AWSConfig,
+  config: Config = {
+    maxPartSize: 5_000_000,
+    fileName: "file",
+  }
+) {
+  const { fileName = "file", maxPartSize = 5_000_000 } = config;
   const { request } = props;
 
   const uploadHandler = composeUploadHandlers(
     createFileUploadHandler({
-      maxPartSize: 5_000_000,
+      maxPartSize,
       file: ({ filename }) => filename,
     })
   );
 
   const formData = await parseMultipartFormData(request, uploadHandler);
-  const file = formData.get("file") as unknown as NodeOnDiskFile;
+  const file = formData.get(fileName) as unknown as NodeOnDiskFile;
 
   if (!file) throw new BadRequestError("No file uploaded");
 
@@ -87,7 +100,9 @@ async function sendFileToS3(props: ActionFunctionArgs, awsS3Config: AWSConfig) {
   const width = filterParams.get("w");
   const height = filterParams.get("h");
 
-  if (width && height) {
+  const isImage = file.type.startsWith("image");
+
+  if (isImage && width && height) {
     const image = sharp(file.getFilePath());
     const metadata = await image.metadata();