@valbuild/server 0.28.0 → 0.30.0

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

@@ -24,4 +24,5 @@ export declare class LocalValServer implements ValServer {
     callback(req: express.Request, res: express.Response): Promise<void>;
     logout(req: express.Request, res: express.Response): Promise<void>;
     getFiles(req: express.Request, res: express.Response): Promise<void>;
+    getPatches(req: express.Request, res: express.Response): Promise<void>;
 }

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

@@ -12,4 +12,5 @@ export interface ValServer {
     disable(req: express.Request, res: express.Response): Promise<void>;
     getTree(req: express.Request, res: express.Response): Promise<void>;
     getFiles(req: express.Request, res: express.Response): Promise<void>;
+    getPatches(req: express.Request, res: express.Response): Promise<void>;
 }

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

@@ -1052,7 +1052,7 @@ function createRequestHandler(valServer) {
   router.post("/patches/*", express__default["default"].json({
     type: "application/json",
     limit: "10mb"
-  }), valServer.postPatches.bind(valServer));
+  }), valServer.postPatches.bind(valServer)).get("/patches/*", valServer.getPatches.bind(valServer));
   router.post("/commit", valServer.commit.bind(valServer));
   router.get("/enable", valServer.enable.bind(valServer));
   router.get("/disable", valServer.disable.bind(valServer));
@@ -1285,7 +1285,11 @@ class ProxyValServer {
         res.sendStatus(401);
         return;
       }
-      return handler(verification.data);
+      return handler(verification.data).catch(err => {
+        console.error(`Failed while processing: ${req.url}`, err);
+        res.sendStatus(500);
+        return undefined;
+      });
     } else {
       res.sendStatus(401);
     }
@@ -1329,10 +1333,41 @@ class ProxyValServer {
       const url = new URL(`/v1/tree/${this.options.valName}/heads/${this.options.gitBranch}/${req.params["0"]}/?${params}`, this.options.valContentUrl);
       const json = await fetch(url, {
         headers: this.getAuthHeaders(data.token, "application/json")
-      }).then(res => res.json());
+      }).then(res => res.json()).catch(err => {
+        console.error(err);
+        throw err;
+      });
       res.send(json);
     });
   }
+  async getPatches(req, res) {
+    const patchIds = typeof req.params["id"] === "string" ? [req.params["id"]] : Array.isArray(req.params["id"]) ? req.params["id"] : [];
+    const params = patchIds.length > 0 ? `?${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : "";
+    await this.withAuth(req, res, async ({
+      token
+    }) => {
+      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/${req.params["0"]}${params}`, this.options.valContentUrl);
+      console.log(url);
+      // Proxy patch to val.build
+      const fetchRes = await fetch(url, {
+        method: "GET",
+        headers: this.getAuthHeaders(token, "application/json")
+      });
+      if (fetchRes.ok) {
+        const json = await fetchRes.json();
+        res.status(fetchRes.status).json(json);
+      } else {
+        res.sendStatus(fetchRes.status);
+      }
+    }).catch(e => {
+      res.status(500).send({
+        error: {
+          message: e === null || e === void 0 ? void 0 : e.message,
+          status: 500
+        }
+      });
+    });
+  }
   async postPatches(req, res) {
     const commit = this.options.gitCommit;
     if (!commit) {
@@ -1344,7 +1379,7 @@ class ProxyValServer {
     const params = new URLSearchParams({
       commit
     });
-    this.withAuth(req, res, async ({
+    await this.withAuth(req, res, async ({
       token
     }) => {
       // First validate that the body has the right structure
@@ -1383,7 +1418,7 @@ class ProxyValServer {
     });
   }
   async commit(req, res) {
-    this.withAuth(req, res, async ({
+    await this.withAuth(req, res, async ({
       token
     }) => {
       const url = new URL(`/api/val/commit/${encodeURIComponent(this.options.gitBranch)}`, this.options.valBuildUrl);
@@ -1714,6 +1749,9 @@ class LocalValServer {
   getFiles(req, res) {
     return this.badRequest(req, res);
   }
+  getPatches(req, res) {
+    return this.badRequest(req, res);
+  }
 }
 
 async function _createRequestListener(route, opts) {

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

@@ -1052,7 +1052,7 @@ function createRequestHandler(valServer) {
   router.post("/patches/*", express__default["default"].json({
     type: "application/json",
     limit: "10mb"
-  }), valServer.postPatches.bind(valServer));
+  }), valServer.postPatches.bind(valServer)).get("/patches/*", valServer.getPatches.bind(valServer));
   router.post("/commit", valServer.commit.bind(valServer));
   router.get("/enable", valServer.enable.bind(valServer));
   router.get("/disable", valServer.disable.bind(valServer));
@@ -1285,7 +1285,11 @@ class ProxyValServer {
         res.sendStatus(401);
         return;
       }
-      return handler(verification.data);
+      return handler(verification.data).catch(err => {
+        console.error(`Failed while processing: ${req.url}`, err);
+        res.sendStatus(500);
+        return undefined;
+      });
     } else {
       res.sendStatus(401);
     }
@@ -1329,10 +1333,41 @@ class ProxyValServer {
       const url = new URL(`/v1/tree/${this.options.valName}/heads/${this.options.gitBranch}/${req.params["0"]}/?${params}`, this.options.valContentUrl);
       const json = await fetch(url, {
         headers: this.getAuthHeaders(data.token, "application/json")
-      }).then(res => res.json());
+      }).then(res => res.json()).catch(err => {
+        console.error(err);
+        throw err;
+      });
       res.send(json);
     });
   }
+  async getPatches(req, res) {
+    const patchIds = typeof req.params["id"] === "string" ? [req.params["id"]] : Array.isArray(req.params["id"]) ? req.params["id"] : [];
+    const params = patchIds.length > 0 ? `?${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : "";
+    await this.withAuth(req, res, async ({
+      token
+    }) => {
+      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/${req.params["0"]}${params}`, this.options.valContentUrl);
+      console.log(url);
+      // Proxy patch to val.build
+      const fetchRes = await fetch(url, {
+        method: "GET",
+        headers: this.getAuthHeaders(token, "application/json")
+      });
+      if (fetchRes.ok) {
+        const json = await fetchRes.json();
+        res.status(fetchRes.status).json(json);
+      } else {
+        res.sendStatus(fetchRes.status);
+      }
+    }).catch(e => {
+      res.status(500).send({
+        error: {
+          message: e === null || e === void 0 ? void 0 : e.message,
+          status: 500
+        }
+      });
+    });
+  }
   async postPatches(req, res) {
     const commit = this.options.gitCommit;
     if (!commit) {
@@ -1344,7 +1379,7 @@ class ProxyValServer {
     const params = new URLSearchParams({
       commit
     });
-    this.withAuth(req, res, async ({
+    await this.withAuth(req, res, async ({
       token
     }) => {
       // First validate that the body has the right structure
@@ -1383,7 +1418,7 @@ class ProxyValServer {
     });
   }
   async commit(req, res) {
-    this.withAuth(req, res, async ({
+    await this.withAuth(req, res, async ({
       token
     }) => {
       const url = new URL(`/api/val/commit/${encodeURIComponent(this.options.gitBranch)}`, this.options.valBuildUrl);
@@ -1714,6 +1749,9 @@ class LocalValServer {
   getFiles(req, res) {
     return this.badRequest(req, res);
   }
+  getPatches(req, res) {
+    return this.badRequest(req, res);
+  }
 }
 
 async function _createRequestListener(route, opts) {

package/dist/valbuild-server.esm.js

@@ -1021,7 +1021,7 @@ function createRequestHandler(valServer) {
   router.post("/patches/*", express.json({
     type: "application/json",
     limit: "10mb"
-  }), valServer.postPatches.bind(valServer));
+  }), valServer.postPatches.bind(valServer)).get("/patches/*", valServer.getPatches.bind(valServer));
   router.post("/commit", valServer.commit.bind(valServer));
   router.get("/enable", valServer.enable.bind(valServer));
   router.get("/disable", valServer.disable.bind(valServer));
@@ -1254,7 +1254,11 @@ class ProxyValServer {
         res.sendStatus(401);
         return;
       }
-      return handler(verification.data);
+      return handler(verification.data).catch(err => {
+        console.error(`Failed while processing: ${req.url}`, err);
+        res.sendStatus(500);
+        return undefined;
+      });
     } else {
       res.sendStatus(401);
     }
@@ -1298,10 +1302,41 @@ class ProxyValServer {
       const url = new URL(`/v1/tree/${this.options.valName}/heads/${this.options.gitBranch}/${req.params["0"]}/?${params}`, this.options.valContentUrl);
       const json = await fetch(url, {
         headers: this.getAuthHeaders(data.token, "application/json")
-      }).then(res => res.json());
+      }).then(res => res.json()).catch(err => {
+        console.error(err);
+        throw err;
+      });
       res.send(json);
     });
   }
+  async getPatches(req, res) {
+    const patchIds = typeof req.params["id"] === "string" ? [req.params["id"]] : Array.isArray(req.params["id"]) ? req.params["id"] : [];
+    const params = patchIds.length > 0 ? `?${patchIds.map(id => `id=${encodeURIComponent(id)}`).join("&")}` : "";
+    await this.withAuth(req, res, async ({
+      token
+    }) => {
+      const url = new URL(`/v1/patches/${this.options.valName}/heads/${this.options.gitBranch}/${req.params["0"]}${params}`, this.options.valContentUrl);
+      console.log(url);
+      // Proxy patch to val.build
+      const fetchRes = await fetch(url, {
+        method: "GET",
+        headers: this.getAuthHeaders(token, "application/json")
+      });
+      if (fetchRes.ok) {
+        const json = await fetchRes.json();
+        res.status(fetchRes.status).json(json);
+      } else {
+        res.sendStatus(fetchRes.status);
+      }
+    }).catch(e => {
+      res.status(500).send({
+        error: {
+          message: e === null || e === void 0 ? void 0 : e.message,
+          status: 500
+        }
+      });
+    });
+  }
   async postPatches(req, res) {
     const commit = this.options.gitCommit;
     if (!commit) {
@@ -1313,7 +1348,7 @@ class ProxyValServer {
     const params = new URLSearchParams({
       commit
     });
-    this.withAuth(req, res, async ({
+    await this.withAuth(req, res, async ({
       token
     }) => {
       // First validate that the body has the right structure
@@ -1352,7 +1387,7 @@ class ProxyValServer {
     });
   }
   async commit(req, res) {
-    this.withAuth(req, res, async ({
+    await this.withAuth(req, res, async ({
       token
     }) => {
       const url = new URL(`/api/val/commit/${encodeURIComponent(this.options.gitBranch)}`, this.options.valBuildUrl);
@@ -1683,6 +1718,9 @@ class LocalValServer {
   getFiles(req, res) {
     return this.badRequest(req, res);
   }
+  getPatches(req, res) {
+    return this.badRequest(req, res);
+  }
 }
 
 async function _createRequestListener(route, opts) {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.28.0",
+  "version": "0.30.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -25,8 +25,8 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.28.0",
-    "@valbuild/ui": "~0.28.0",
+    "@valbuild/core": "~0.30.0",
+    "@valbuild/ui": "~0.30.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "quickjs-emscripten": "^0.21.1",