@valbuild/server 0.48.1 → 0.50.0

package/dist/declarations/src/LocalValServer.d.ts

@@ -31,7 +31,7 @@ export declare class LocalValServer implements ValServer {
     private badRequest;
     postCommit(): Promise<ValServerJsonResult<{}>>;
     authorize(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE>>;
-    callback(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    callback(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE | VAL_ENABLE_COOKIE_NAME>>;
     logout(): Promise<ValServerResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
     getFiles(): Promise<ValServerResult<never, ReadableStream<Uint8Array>>>;
     getPatches(): Promise<ValServerJsonResult<ApiGetPatchResponse>>;

package/dist/declarations/src/ValServer.d.ts

@@ -22,7 +22,7 @@ export interface ValServer {
     callback(query: {
         code?: string;
         state?: string;
-    }, cookies: ValCookies<VAL_STATE_COOKIE>): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    }, cookies: ValCookies<VAL_STATE_COOKIE>): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE | VAL_ENABLE_COOKIE_NAME>>;
     enable(query: {
         redirect_to?: string;
     }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;

package/dist/valbuild-server.cjs.dev.js

@@ -320,7 +320,6 @@ const printer = ts__default["default"].createPrinter({
   newLine: newLine
   // neverAsciiEscape: true,
 });
-
 function replaceNodeValue(document, node, value) {
   const replacementText = printer.printNode(ts__default["default"].EmitHint.Unspecified, toExpression(value), document);
   const span = ts__default["default"].createTextSpanFromBounds(node.getStart(document, false), node.end);
@@ -663,7 +662,6 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
   sourceFileHandler.writeSourceFile(newSourceFile.value);
   // console.timeEnd("patchValFile" + timeId);
 };
-
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -888,7 +886,6 @@ class ValModuleLoader {
         }
       }
     }
-
     return compiledCode;
   }
   resolveModulePath(containingFilePath, requestedModuleName) {
@@ -1218,7 +1215,7 @@ class LocalValServer {
           if (treePath && !path__namespace["default"].join(dir, file).replace(rootDir, "").startsWith(treePath)) {
             continue;
           }
-          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", ""));
+          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", "").split(path__namespace["default"].sep).join("/"));
         }
       }
     };
@@ -1308,7 +1305,6 @@ class LocalValServer {
       json: {} // no patch ids created
     };
   }
-
   badRequest() {
     return {
       status: 400,
@@ -1382,7 +1378,6 @@ function decodeJwt(token, secretKey) {
 function getExpire() {
   return Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 4; // 4 days
 }
-
 const JwtHeaderSchema = z.z.object({
   alg: z.z.literal("HS256"),
   typ: z.z.literal("JWT")
@@ -1422,12 +1417,12 @@ class ProxyValServer {
               "Content-Type": fetchRes.headers.get("Content-Type") || "",
               "Content-Length": fetchRes.headers.get("Content-Length") || "0"
             },
-            body: fetchRes.body
+            json: fetchRes.body
           };
         } else {
           return {
             status: 500,
-            body: {
+            json: {
               message: "No body in response"
             }
           };
@@ -1435,7 +1430,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get files"
           }
         };
@@ -1468,7 +1463,6 @@ class ProxyValServer {
           }
         }
       },
-
       status: 302,
       redirectTo: appAuthorizeUrl
     };
@@ -1542,6 +1536,7 @@ class ProxyValServer {
         [internal.VAL_STATE_COOKIE]: {
           value: null
         },
+        [internal.VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [internal.VAL_SESSION_COOKIE]: {
           value: cookie,
           options: {
@@ -1553,7 +1548,6 @@ class ProxyValServer {
           }
         }
       },
-
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
@@ -1596,7 +1590,7 @@ class ProxyValServer {
         console.error(`Failed while processing: ${errorMessageType}`, err);
         return {
           status: 500,
-          body: {
+          json: {
             message: err.message
           }
         };
@@ -1628,8 +1622,9 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
-            message: "Failed to get session"
+          json: {
+            message: "Failed to authorize",
+            ...(await fetchRes.json())
           }
         };
       }
@@ -1646,7 +1641,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1690,7 +1685,7 @@ class ProxyValServer {
       } catch (err) {
         return {
           status: 500,
-          body: {
+          json: {
             message: "Failed to fetch: check network connection"
           }
         };
@@ -1705,7 +1700,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1726,7 +1721,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get patches"
           }
         };
@@ -1754,7 +1749,7 @@ class ProxyValServer {
       if (!patchJSON.success) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Invalid patch",
             details: patchJSON.error.issues
           }
@@ -2273,7 +2268,17 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
-    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    let mimeType = null;
+    if (imageSize.type) {
+      const possibleMimeType = `image/${imageSize.type}`;
+      if (internal.MIME_TYPES_TO_EXT[possibleMimeType]) {
+        mimeType = possibleMimeType;
+      }
+      const filenameBasedLookup = internal.filenameToMimeType(filename);
+      if (filenameBasedLookup) {
+        mimeType = filenameBasedLookup;
+      }
+    }
     if (!mimeType) {
       throw Error("Cannot determine mimetype of image");
     }
@@ -2294,6 +2299,26 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       mimeType
     };
   }
+  async function getFileMetadata() {
+    const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
+    if (!maybeRef) {
+      // TODO:
+      throw Error("Cannot fix image without a file reference");
+    }
+    const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
+    const buffer = fs__default["default"].readFileSync(filename);
+    let mimeType = internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      mimeType = "application/octet-stream";
+    }
+    const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
+    return {
+      sha256,
+      mimeType
+    };
+  }
   const remainingErrors = [];
   const patch$1 = [];
   for (const fix of validationError.fixes || []) {
@@ -2379,6 +2404,72 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           }
         });
       }
+    } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
+      const fileMetadata = await getFileMetadata();
+      if (fileMetadata.sha256 === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get image metadata",
+          fixes: undefined
+        });
+      } else if (fix === "file:check-metadata") {
+        const currentValue = validationError.value;
+        const metadataIsCorrect =
+        // metadata is a prop that is an object
+        typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object" &&
+        // sha256 is correct
+        "sha256" in currentValue.metadata && currentValue.metadata.sha256 === fileMetadata.sha256 &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === fileMetadata.mimeType;
+
+        // skips if the metadata is already correct
+        if (!metadataIsCorrect) {
+          if (apply) {
+            patch$1.push({
+              op: "replace",
+              path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+              value: {
+                sha256: fileMetadata.sha256,
+                ...(fileMetadata.mimeType ? {
+                  mimeType: fileMetadata.mimeType
+                } : {})
+              }
+            });
+          } else {
+            if (typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object") {
+              if (!("sha256" in currentValue.metadata) || currentValue.metadata.sha256 !== fileMetadata.sha256) {
+                remainingErrors.push({
+                  message: "File metadata sha256 is incorrect! Found: " + ("sha256" in currentValue.metadata ? currentValue.metadata.sha256 : "<empty>") + ". Expected: " + fileMetadata.sha256 + ".",
+                  fixes: undefined
+                });
+              }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== fileMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "File metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + fileMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: "Image metadata is not an object!",
+                fixes: undefined
+              });
+            }
+          }
+        }
+      } else if (fix === "file:add-metadata") {
+        patch$1.push({
+          op: "add",
+          path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+          value: {
+            sha256: fileMetadata.sha256,
+            ...(fileMetadata.mimeType ? {
+              mimeType: fileMetadata.mimeType
+            } : {})
+          }
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {

package/dist/valbuild-server.cjs.prod.js

@@ -320,7 +320,6 @@ const printer = ts__default["default"].createPrinter({
   newLine: newLine
   // neverAsciiEscape: true,
 });
-
 function replaceNodeValue(document, node, value) {
   const replacementText = printer.printNode(ts__default["default"].EmitHint.Unspecified, toExpression(value), document);
   const span = ts__default["default"].createTextSpanFromBounds(node.getStart(document, false), node.end);
@@ -663,7 +662,6 @@ const patchValFile = async (id, valConfigPath, patch$1, sourceFileHandler, runti
   sourceFileHandler.writeSourceFile(newSourceFile.value);
   // console.timeEnd("patchValFile" + timeId);
 };
-
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -888,7 +886,6 @@ class ValModuleLoader {
         }
       }
     }
-
     return compiledCode;
   }
   resolveModulePath(containingFilePath, requestedModuleName) {
@@ -1218,7 +1215,7 @@ class LocalValServer {
           if (treePath && !path__namespace["default"].join(dir, file).replace(rootDir, "").startsWith(treePath)) {
             continue;
           }
-          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", ""));
+          moduleIds.push(path__namespace["default"].join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", "").split(path__namespace["default"].sep).join("/"));
         }
       }
     };
@@ -1308,7 +1305,6 @@ class LocalValServer {
       json: {} // no patch ids created
     };
   }
-
   badRequest() {
     return {
       status: 400,
@@ -1382,7 +1378,6 @@ function decodeJwt(token, secretKey) {
 function getExpire() {
   return Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 4; // 4 days
 }
-
 const JwtHeaderSchema = z.z.object({
   alg: z.z.literal("HS256"),
   typ: z.z.literal("JWT")
@@ -1422,12 +1417,12 @@ class ProxyValServer {
               "Content-Type": fetchRes.headers.get("Content-Type") || "",
               "Content-Length": fetchRes.headers.get("Content-Length") || "0"
             },
-            body: fetchRes.body
+            json: fetchRes.body
           };
         } else {
           return {
             status: 500,
-            body: {
+            json: {
               message: "No body in response"
             }
           };
@@ -1435,7 +1430,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get files"
           }
         };
@@ -1468,7 +1463,6 @@ class ProxyValServer {
           }
         }
       },
-
       status: 302,
       redirectTo: appAuthorizeUrl
     };
@@ -1542,6 +1536,7 @@ class ProxyValServer {
         [internal.VAL_STATE_COOKIE]: {
           value: null
         },
+        [internal.VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [internal.VAL_SESSION_COOKIE]: {
           value: cookie,
           options: {
@@ -1553,7 +1548,6 @@ class ProxyValServer {
           }
         }
       },
-
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
@@ -1596,7 +1590,7 @@ class ProxyValServer {
         console.error(`Failed while processing: ${errorMessageType}`, err);
         return {
           status: 500,
-          body: {
+          json: {
             message: err.message
           }
         };
@@ -1628,8 +1622,9 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
-            message: "Failed to get session"
+          json: {
+            message: "Failed to authorize",
+            ...(await fetchRes.json())
           }
         };
       }
@@ -1646,7 +1641,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1690,7 +1685,7 @@ class ProxyValServer {
       } catch (err) {
         return {
           status: 500,
-          body: {
+          json: {
             message: "Failed to fetch: check network connection"
           }
         };
@@ -1705,7 +1700,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1726,7 +1721,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get patches"
           }
         };
@@ -1754,7 +1749,7 @@ class ProxyValServer {
       if (!patchJSON.success) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Invalid patch",
             details: patchJSON.error.issues
           }
@@ -2273,7 +2268,17 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
     const buffer = fs__default["default"].readFileSync(filename);
     const imageSize = sizeOf__default["default"](buffer);
-    const mimeType = imageSize.type ? internal.imageTypeToMimeType(imageSize.type) : internal.filenameToMimeType(filename);
+    let mimeType = null;
+    if (imageSize.type) {
+      const possibleMimeType = `image/${imageSize.type}`;
+      if (internal.MIME_TYPES_TO_EXT[possibleMimeType]) {
+        mimeType = possibleMimeType;
+      }
+      const filenameBasedLookup = internal.filenameToMimeType(filename);
+      if (filenameBasedLookup) {
+        mimeType = filenameBasedLookup;
+      }
+    }
     if (!mimeType) {
       throw Error("Cannot determine mimetype of image");
     }
@@ -2294,6 +2299,26 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       mimeType
     };
   }
+  async function getFileMetadata() {
+    const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
+    if (!maybeRef) {
+      // TODO:
+      throw Error("Cannot fix image without a file reference");
+    }
+    const filename = path__namespace["default"].join(config.projectRoot, maybeRef);
+    const buffer = fs__default["default"].readFileSync(filename);
+    let mimeType = internal.filenameToMimeType(filename);
+    if (!mimeType) {
+      mimeType = "application/octet-stream";
+    }
+    const sha256 = core.Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
+    return {
+      sha256,
+      mimeType
+    };
+  }
   const remainingErrors = [];
   const patch$1 = [];
   for (const fix of validationError.fixes || []) {
@@ -2379,6 +2404,72 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           }
         });
       }
+    } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
+      const fileMetadata = await getFileMetadata();
+      if (fileMetadata.sha256 === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get image metadata",
+          fixes: undefined
+        });
+      } else if (fix === "file:check-metadata") {
+        const currentValue = validationError.value;
+        const metadataIsCorrect =
+        // metadata is a prop that is an object
+        typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object" &&
+        // sha256 is correct
+        "sha256" in currentValue.metadata && currentValue.metadata.sha256 === fileMetadata.sha256 &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === fileMetadata.mimeType;
+
+        // skips if the metadata is already correct
+        if (!metadataIsCorrect) {
+          if (apply) {
+            patch$1.push({
+              op: "replace",
+              path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+              value: {
+                sha256: fileMetadata.sha256,
+                ...(fileMetadata.mimeType ? {
+                  mimeType: fileMetadata.mimeType
+                } : {})
+              }
+            });
+          } else {
+            if (typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object") {
+              if (!("sha256" in currentValue.metadata) || currentValue.metadata.sha256 !== fileMetadata.sha256) {
+                remainingErrors.push({
+                  message: "File metadata sha256 is incorrect! Found: " + ("sha256" in currentValue.metadata ? currentValue.metadata.sha256 : "<empty>") + ". Expected: " + fileMetadata.sha256 + ".",
+                  fixes: undefined
+                });
+              }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== fileMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "File metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + fileMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: "Image metadata is not an object!",
+                fixes: undefined
+              });
+            }
+          }
+        }
+      } else if (fix === "file:add-metadata") {
+        patch$1.push({
+          op: "add",
+          path: patch.sourceToPatchPath(sourcePath).concat("metadata"),
+          value: {
+            sha256: fileMetadata.sha256,
+            ...(fileMetadata.mimeType ? {
+              mimeType: fileMetadata.mimeType
+            } : {})
+          }
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {

package/dist/valbuild-server.esm.js

@@ -8,7 +8,7 @@ import path__default from 'path';
 import fs, { promises } from 'fs';
 import { transform } from 'sucrase';
 import z, { z as z$1 } from 'zod';
-import { VAL_ENABLE_COOKIE_NAME, VAL_STATE_COOKIE as VAL_STATE_COOKIE$1, VAL_SESSION_COOKIE as VAL_SESSION_COOKIE$1, imageTypeToMimeType, filenameToMimeType } from '@valbuild/shared/internal';
+import { VAL_ENABLE_COOKIE_NAME, VAL_STATE_COOKIE as VAL_STATE_COOKIE$1, VAL_SESSION_COOKIE as VAL_SESSION_COOKIE$1, MIME_TYPES_TO_EXT, filenameToMimeType } from '@valbuild/shared/internal';
 import crypto from 'crypto';
 import { createUIRequestHandler } from '@valbuild/ui/server';
 import sizeOf from 'image-size';
@@ -290,7 +290,6 @@ const printer = ts.createPrinter({
   newLine: newLine
   // neverAsciiEscape: true,
 });
-
 function replaceNodeValue(document, node, value) {
   const replacementText = printer.printNode(ts.EmitHint.Unspecified, toExpression(value), document);
   const span = ts.createTextSpanFromBounds(node.getStart(document, false), node.end);
@@ -633,7 +632,6 @@ const patchValFile = async (id, valConfigPath, patch, sourceFileHandler, runtime
   sourceFileHandler.writeSourceFile(newSourceFile.value);
   // console.timeEnd("patchValFile" + timeId);
 };
-
 function convertDataUrlToBase64(dataUrl) {
   const base64 = dataUrl.slice(dataUrl.indexOf(",") + 1);
   return Buffer.from(base64, "base64");
@@ -858,7 +856,6 @@ class ValModuleLoader {
         }
       }
     }
-
     return compiledCode;
   }
   resolveModulePath(containingFilePath, requestedModuleName) {
@@ -1188,7 +1185,7 @@ class LocalValServer {
           if (treePath && !path__default.join(dir, file).replace(rootDir, "").startsWith(treePath)) {
             continue;
           }
-          moduleIds.push(path__default.join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", ""));
+          moduleIds.push(path__default.join(dir, file).replace(rootDir, "").replace(".val.js", "").replace(".val.ts", "").split(path__default.sep).join("/"));
         }
       }
     };
@@ -1278,7 +1275,6 @@ class LocalValServer {
       json: {} // no patch ids created
     };
   }
-
   badRequest() {
     return {
       status: 400,
@@ -1352,7 +1348,6 @@ function decodeJwt(token, secretKey) {
 function getExpire() {
   return Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 4; // 4 days
 }
-
 const JwtHeaderSchema = z$1.object({
   alg: z$1.literal("HS256"),
   typ: z$1.literal("JWT")
@@ -1392,12 +1387,12 @@ class ProxyValServer {
               "Content-Type": fetchRes.headers.get("Content-Type") || "",
               "Content-Length": fetchRes.headers.get("Content-Length") || "0"
             },
-            body: fetchRes.body
+            json: fetchRes.body
           };
         } else {
           return {
             status: 500,
-            body: {
+            json: {
               message: "No body in response"
             }
           };
@@ -1405,7 +1400,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get files"
           }
         };
@@ -1438,7 +1433,6 @@ class ProxyValServer {
           }
         }
       },
-
       status: 302,
       redirectTo: appAuthorizeUrl
     };
@@ -1512,6 +1506,7 @@ class ProxyValServer {
         [VAL_STATE_COOKIE$1]: {
           value: null
         },
+        [VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [VAL_SESSION_COOKIE$1]: {
           value: cookie,
           options: {
@@ -1523,7 +1518,6 @@ class ProxyValServer {
           }
         }
       },
-
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
@@ -1566,7 +1560,7 @@ class ProxyValServer {
         console.error(`Failed while processing: ${errorMessageType}`, err);
         return {
           status: 500,
-          body: {
+          json: {
             message: err.message
           }
         };
@@ -1598,8 +1592,9 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
-            message: "Failed to get session"
+          json: {
+            message: "Failed to authorize",
+            ...(await fetchRes.json())
           }
         };
       }
@@ -1616,7 +1611,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1660,7 +1655,7 @@ class ProxyValServer {
       } catch (err) {
         return {
           status: 500,
-          body: {
+          json: {
             message: "Failed to fetch: check network connection"
           }
         };
@@ -1675,7 +1670,7 @@ class ProxyValServer {
       if (!commit) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Could not detect the git commit. Check if env is missing VAL_GIT_COMMIT."
           }
         };
@@ -1696,7 +1691,7 @@ class ProxyValServer {
       } else {
         return {
           status: fetchRes.status,
-          body: {
+          json: {
             message: "Failed to get patches"
           }
         };
@@ -1724,7 +1719,7 @@ class ProxyValServer {
       if (!patchJSON.success) {
         return {
           status: 400,
-          body: {
+          json: {
             message: "Invalid patch",
             details: patchJSON.error.issues
           }
@@ -2243,7 +2238,17 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
     const filename = path__default.join(config.projectRoot, maybeRef);
     const buffer = fs.readFileSync(filename);
     const imageSize = sizeOf(buffer);
-    const mimeType = imageSize.type ? imageTypeToMimeType(imageSize.type) : filenameToMimeType(filename);
+    let mimeType = null;
+    if (imageSize.type) {
+      const possibleMimeType = `image/${imageSize.type}`;
+      if (MIME_TYPES_TO_EXT[possibleMimeType]) {
+        mimeType = possibleMimeType;
+      }
+      const filenameBasedLookup = filenameToMimeType(filename);
+      if (filenameBasedLookup) {
+        mimeType = filenameBasedLookup;
+      }
+    }
     if (!mimeType) {
       throw Error("Cannot determine mimetype of image");
     }
@@ -2264,6 +2269,26 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
       mimeType
     };
   }
+  async function getFileMetadata() {
+    const maybeRef = validationError.value && typeof validationError.value === "object" && FILE_REF_PROP in validationError.value && typeof validationError.value[FILE_REF_PROP] === "string" ? validationError.value[FILE_REF_PROP] : undefined;
+    if (!maybeRef) {
+      // TODO:
+      throw Error("Cannot fix image without a file reference");
+    }
+    const filename = path__default.join(config.projectRoot, maybeRef);
+    const buffer = fs.readFileSync(filename);
+    let mimeType = filenameToMimeType(filename);
+    if (!mimeType) {
+      mimeType = "application/octet-stream";
+    }
+    const sha256 = Internal.getSHA256Hash(textEncoder.encode(
+    // TODO: we should probably store the mimetype in the metadata and reuse it here
+    `data:${mimeType};base64,${buffer.toString("base64")}`));
+    return {
+      sha256,
+      mimeType
+    };
+  }
   const remainingErrors = [];
   const patch = [];
   for (const fix of validationError.fixes || []) {
@@ -2349,6 +2374,72 @@ async function createFixPatch(config, apply, sourcePath, validationError) {
           }
         });
       }
+    } else if (fix === "file:add-metadata" || fix === "file:check-metadata") {
+      const fileMetadata = await getFileMetadata();
+      if (fileMetadata.sha256 === undefined) {
+        remainingErrors.push({
+          ...validationError,
+          message: "Failed to get image metadata",
+          fixes: undefined
+        });
+      } else if (fix === "file:check-metadata") {
+        const currentValue = validationError.value;
+        const metadataIsCorrect =
+        // metadata is a prop that is an object
+        typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object" &&
+        // sha256 is correct
+        "sha256" in currentValue.metadata && currentValue.metadata.sha256 === fileMetadata.sha256 &&
+        // mimeType is correct
+        "mimeType" in currentValue.metadata && currentValue.metadata.mimeType === fileMetadata.mimeType;
+
+        // skips if the metadata is already correct
+        if (!metadataIsCorrect) {
+          if (apply) {
+            patch.push({
+              op: "replace",
+              path: sourceToPatchPath(sourcePath).concat("metadata"),
+              value: {
+                sha256: fileMetadata.sha256,
+                ...(fileMetadata.mimeType ? {
+                  mimeType: fileMetadata.mimeType
+                } : {})
+              }
+            });
+          } else {
+            if (typeof currentValue === "object" && currentValue && "metadata" in currentValue && currentValue.metadata && typeof currentValue.metadata === "object") {
+              if (!("sha256" in currentValue.metadata) || currentValue.metadata.sha256 !== fileMetadata.sha256) {
+                remainingErrors.push({
+                  message: "File metadata sha256 is incorrect! Found: " + ("sha256" in currentValue.metadata ? currentValue.metadata.sha256 : "<empty>") + ". Expected: " + fileMetadata.sha256 + ".",
+                  fixes: undefined
+                });
+              }
+              if (!("mimeType" in currentValue.metadata) || currentValue.metadata.mimeType !== fileMetadata.mimeType) {
+                remainingErrors.push({
+                  message: "File metadata mimeType is incorrect! Found: " + ("mimeType" in currentValue.metadata ? currentValue.metadata.mimeType : "<empty>") + ". Expected: " + fileMetadata.mimeType,
+                  fixes: undefined
+                });
+              }
+            } else {
+              remainingErrors.push({
+                ...validationError,
+                message: "Image metadata is not an object!",
+                fixes: undefined
+              });
+            }
+          }
+        }
+      } else if (fix === "file:add-metadata") {
+        patch.push({
+          op: "add",
+          path: sourceToPatchPath(sourcePath).concat("metadata"),
+          value: {
+            sha256: fileMetadata.sha256,
+            ...(fileMetadata.mimeType ? {
+              mimeType: fileMetadata.mimeType
+            } : {})
+          }
+        });
+      }
     }
   }
   if (!validationError.fixes || validationError.fixes.length === 0) {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.48.1",
+  "version": "0.50.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -24,9 +24,9 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.48.1",
-    "@valbuild/shared": "~0.48.1",
-    "@valbuild/ui": "~0.48.1",
+    "@valbuild/core": "~0.50.0",
+    "@valbuild/shared": "~0.50.0",
+    "@valbuild/ui": "~0.50.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "queue": "^6.0.2",