npm - @vesk/vesk-cli - Versions diffs - 0.1.0 → 0.1.14 - Mend

@vesk/vesk-cli 0.1.0 → 0.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/sidecar.js CHANGED Viewed

@@ -7442,21 +7442,13 @@ var scanApiRoutes;
 var collectMiddlewareChain;
 async function ensureModules() {
   if (compileClient2) return;
-  console.log("sidecar: loading client-codegen");
   const clientCodegen = await loadCompilerModule("client-codegen.js");
-  console.log("sidecar: loading server-codegen");
   const serverCodegen = await loadCompilerModule("server-codegen.js");
-  console.log("sidecar: loading vsk-tsx");
   const vskTsx = await loadCompilerModule("vsk-tsx.js");
-  console.log("sidecar: loading typecheck");
   const typecheck = await loadCompilerModule("typecheck.js");
-  console.log("sidecar: loading router");
   const router = await loadCompilerModule("router.js");
-  console.log("sidecar: loading middleware");
   const middleware = await loadCompilerModule("middleware.js");
-  console.log("sidecar: loading api-routes");
   const apiRoutes = await loadCompilerModule("api-routes.js");
-  console.log("sidecar: all modules loaded");
   compileClient2 = clientCodegen.compileClient;
   compileServer = serverCodegen.compileServer;
   generateVskDts = vskTsx.generateVskDts;
@@ -7496,6 +7488,10 @@ async function processCssWithPlugins(css, filePath, projectDir) {
   }
   return result;
 }
+function errorStatusCode(e) {
+  const s = e?.statusCode ?? e?.status;
+  return typeof s === "number" && s >= 100 && s < 600 ? s : 500;
+}
 function err(id, message) {
   return { jsonrpc: "2.0", id, error: { code: 1, message } };
 }
@@ -8185,7 +8181,8 @@ ${devMods.prettifyHtml(body)}
             } catch (e) {
               const msg = e instanceof Error ? e.message : String(e);
               if (forData) {
-                return new Response(JSON.stringify({ error: msg }), { status: 500, headers: { "Content-Type": "application/json", "Cache-Control": "no-store", "Vary": "x-vesk-data" } });
+                const code = errorStatusCode(e);
+                return new Response(JSON.stringify({ error: msg, statusCode: code }), { status: code, headers: { "Content-Type": "application/json", "Cache-Control": "no-store", "Vary": "x-vesk-data" } });
               }
               throw e;
             }
@@ -8268,7 +8265,7 @@ ${devMods.prettifyHtml(body)}
             try {
               const errSrc = readFileSync3(errPath, "utf-8");
               const errCompName = extractCompName(errSrc) || node.error;
-              const errProps = { error: err2.message, stack: err2.stack, statusCode: 500, url: url.pathname };
+              const errProps = { error: err2.message, stack: err2.stack, statusCode: errorStatusCode(err2), url: url.pathname };
               const html = await devMods.renderFullPage(errSrc, errCompName, errProps, /* @__PURE__ */ new Map(), {
                 hydrate: true,
                 cssUrls: ["/_vesk/static/_tailwind.css", "/_vesk/static/global.css"],
@@ -8286,10 +8283,11 @@ ${devMods.prettifyHtml(body)}
     }
     const message = err2.message || String(e);
     const stack = err2.stack || "";
+    const errCode = errorStatusCode(err2);
     return {
-      status: 500,
+      status: errCode,
       headers: [["Content-Type", "text/html"]],
-      bodyB64: Buffer.from(errorHtml || `<!DOCTYPE html><html><body><h1>500</h1><pre>${message}
+      bodyB64: Buffer.from(errorHtml || `<!DOCTYPE html><html><body><h1>${errCode}</h1><pre>${message}
 ${stack}</pre></body></html>`).toString("base64")
     };
   }
@@ -8308,8 +8306,7 @@ async function handleDevRequest(p) {
     const headers = Object.entries({ ...corsAllowed, "Content-Length": "0" });
     return { status: 204, headers, bodyB64: "" };
   }
-  const proto = p.headers["x-forwarded-proto"] && state.security?.trustProxy ? p.headers["x-forwarded-proto"] : "http";
-  globalThis.__vesk_ssr_base_url = `${proto}://${reqHost}`;
+  globalThis.__vesk_ssr_base_url = `http://127.0.0.1:${p.port || state.port}`;
   const req = {
     method: p.method,
     url: url.pathname + url.search,
@@ -8798,6 +8795,7 @@ async function prodRenderNotFound(urlPath) {
     return await rtMod.renderFullPage(src, compName, { params: {}, url: urlPath }, /* @__PURE__ */ new Map(), {
       hydrate: true,
       cssUrls: ["/_vesk/static/_tailwind.css", "/_vesk/static/global.css"],
+      clientScriptUrl: "/_vesk/static/client.js",
       security: state.securityConfig.security || {},
       externalDataScript: prodStoreDataScript,
       sourcePath: nfPath
@@ -8827,6 +8825,7 @@ async function prodRenderError(props) {
     return await rtMod.renderFullPage(src, compName, props, /* @__PURE__ */ new Map(), {
       hydrate: true,
       cssUrls: ["/_vesk/static/_tailwind.css", "/_vesk/static/global.css"],
+      clientScriptUrl: "/_vesk/static/client.js",
       security: state.securityConfig.security || {},
       externalDataScript: prodStoreDataScript,
       sourcePath: errPath
@@ -8887,7 +8886,13 @@ function installSsrFetchHook() {
         clientIp: prodIpStore.getStore()?.clientIp || "127.0.0.1",
         port: state.port
       };
-      const resp = await handleProdRequest(devReq);
+      const savedBase = globalThis.__vesk_ssr_base_url;
+      let resp;
+      try {
+        resp = await handleProdRequest(devReq);
+      } finally {
+        globalThis.__vesk_ssr_base_url = savedBase;
+      }
       const bodyBuf = resp.bodyB64 ? Buffer.from(resp.bodyB64, "base64") : Buffer.alloc(0);
       const hdrs = new Headers();
       for (const [k, v] of resp.headers) {
@@ -8906,6 +8911,7 @@ async function handleProdRequest(p) {
   if (!state) {
     return { status: 500, headers: [["Content-Type", "application/json"]], bodyB64: Buffer.from(JSON.stringify({ error: "prod server not initialized" })).toString("base64") };
   }
+  let mwLocals = {};
   const url = new URL(p.url, `http://localhost:${p.port || state.port}`);
   const bodyBuffer = p.bodyB64 ? Buffer.from(p.bodyB64, "base64") : Buffer.alloc(0);
   const req = {
@@ -9006,10 +9012,26 @@ async function handleProdRequest(p) {
         return withSec({ status: mwResult.response.status, headers, bodyB64: Buffer.from(body).toString("base64") });
       }
       if (mwResult.rewriteUrl) url.pathname = mwResult.rewriteUrl;
+      mwLocals = mwCtx.locals || {};
     } catch (e) {
       console.error("prod: middleware error:", e.message);
     }
   }
+  const withVeskRequest = (fn) => {
+    const prev = globalThis.__vesk_request;
+    globalThis.__vesk_request = {
+      request: req,
+      params: {},
+      url,
+      locals: mwLocals,
+      cookies: {}
+    };
+    try {
+      return fn();
+    } finally {
+      globalThis.__vesk_request = prev;
+    }
+  };
   if (url.pathname.startsWith("/_vesk/action/")) {
     const actionId = url.pathname.replace("/_vesk/action/", "");
     const actionEntry = state.buildConfig.actions && state.buildConfig.actions.find((a) => a.id === actionId);
@@ -9022,7 +9044,7 @@ async function handleProdRequest(p) {
     }
     try {
       const webRequest = makeWebRequest(req, url);
-      const response = await withProdClientIp(p.clientIp, () => mod.handleAction(webRequest, actionId));
+      const response = await withVeskRequest(() => withProdClientIp(p.clientIp, () => mod.handleAction(webRequest, actionId)));
       const body = await response.text();
       const headers = [];
       for (const [k, v] of response.headers.entries()) headers.push([k, v]);
@@ -9037,17 +9059,14 @@ async function handleProdRequest(p) {
       if (route.type === "api") {
         const params = prodMatchPath(route.path, url.pathname);
         if (params) {
-          const t0 = Date.now();
           const mod = await prodLoadFunction(route.function);
-          const t1 = Date.now();
           if (mod) {
             try {
               const webRequest = makeWebRequest(req, url);
-              const response = await withProdClientIp(p.clientIp, () => mod.handle(webRequest));
+              const response = await withVeskRequest(() => withProdClientIp(p.clientIp, () => mod.handle(webRequest)));
               const body = await response.text();
               const headers = [];
               for (const [k, v] of response.headers.entries()) headers.push([k, v]);
-              console.error(`sidecar: prod_api ${url.pathname} load=${t1 - t0}ms handle=${Date.now() - t1}ms`);
               return withSec({ status: response.status, headers, bodyB64: Buffer.from(body).toString("base64") });
             } catch (e) {
               const message = e instanceof Error ? e.message : String(e);
@@ -9069,7 +9088,7 @@ async function handleProdRequest(p) {
             let cachedResult = null;
             if (route.revalidate && route.revalidate > 0) {
               cachedResult = await devMods.runtimeServer.pageIsr(url.pathname, async () => {
-                const response2 = await withProdClientIp(p.clientIp, () => mod.handle(webRequest));
+                const response2 = await withVeskRequest(() => withProdClientIp(p.clientIp, () => mod.handle(webRequest)));
                 return { html: await response2.text(), headers: Object.fromEntries(response2.headers) };
               }, { revalidate: route.revalidate, tags: route.tags || [] });
             }
@@ -9077,7 +9096,7 @@ async function handleProdRequest(p) {
               const headers2 = Object.entries(cachedResult.headers || { "Content-Type": "text/html" });
               return withSec({ status: 200, headers: headers2, bodyB64: Buffer.from(cachedResult.html).toString("base64") });
             }
-            const response = await withProdClientIp(p.clientIp, () => mod.handle(webRequest));
+            const response = await withVeskRequest(() => withProdClientIp(p.clientIp, () => mod.handle(webRequest)));
             const headers = Object.fromEntries(response.headers);
             if (!headers["content-type"] && !headers["Content-Type"]) headers["Content-Type"] = "text/html";
             const body = await response.text();
@@ -9086,15 +9105,15 @@ async function handleProdRequest(p) {
             const err2 = e instanceof Error ? e : new Error(String(e));
             if (err2.name === "NotFoundError") {
               const nfHtml2 = await prodRenderNotFoundCached(url.pathname);
-              return withSec({ status: 404, headers: [["Content-Type", "text/html"]], bodyB64: Buffer.from(nfHtml2 || "<!DOCTYPE html><html><body><h1>404</h1><p>Not Found</p></body></html>").toString("base64") });
+              return withSec({ status: 404, headers: [["Content-Type", "text/html"]], bodyB64: Buffer.from(nfHtml2 || '<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="/_vesk/static/_tailwind.css" /><link rel="stylesheet" href="/_vesk/static/global.css" /></head><body><h1>404</h1><p>Not Found</p><script type="module" src="/_vesk/static/client.js"></script></body></html>').toString("base64") });
             }
             console.error("haul ssr error:", err2.message);
             let errorHtml = null;
             try {
-              errorHtml = await prodRenderError({ error: err2.message, stack: err2.stack, statusCode: 500, url: url.pathname });
+              errorHtml = await prodRenderError({ error: err2.message, stack: err2.stack, statusCode: errorStatusCode(err2), url: url.pathname });
             } catch {
             }
-            return withSec({ status: 500, headers: [["Content-Type", "text/html"]], bodyB64: Buffer.from(errorHtml || "<!DOCTYPE html><html><body><h1>500</h1><pre>Internal Server Error</pre></body></html>").toString("base64") });
+            return withSec({ status: errorStatusCode(err2), headers: [["Content-Type", "text/html"]], bodyB64: Buffer.from(errorHtml || '<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="/_vesk/static/_tailwind.css" /><link rel="stylesheet" href="/_vesk/static/global.css" /></head><body><div style="font-family:system-ui;padding:2rem"><h1>' + errorStatusCode(err2) + " \u2014 Internal Server Error</h1><pre>" + String(err2.message).replace(/</g, "&lt;") + '</pre></div><script type="module" src="/_vesk/static/client.js"></script></body></html>').toString("base64") });
           }
         }
       }
@@ -9321,9 +9340,7 @@ ${extracted.body}
             return;
           }
           case "prod_render": {
-            const t0 = Date.now();
             const result = await handleProdRequest(rpcReq.params[0] || {});
-            console.error(`sidecar: prod_render ${(rpcReq.params[0] || {}).url} ${Date.now() - t0}ms`);
             respond({ jsonrpc: "2.0", id: rpcReq.id, result });
             return;
           }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.1.0",
+  "version": "0.1.14",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -9,10 +9,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.1.0",
-    "@vesk/compiler": "^0.1.0",
-    "@vesk/plugin-tailwind": "^0.1.0",
-    "@vesk/runtime": "^0.1.0",
+    "@vesk/adapter": "^0.1.14",
+    "@vesk/compiler": "^0.1.14",
+    "@vesk/plugin-tailwind": "^0.1.14",
+    "@vesk/runtime": "^0.1.14",
     "esbuild": "^0.25.0",
     "esrap": "^2.3.0",
     "sharp": "^0.35.3",
@@ -46,10 +46,10 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "@vesk/haul-darwin-arm64": "^0.1.0",
-    "@vesk/haul-darwin-x64": "^0.1.0",
-    "@vesk/haul-linux-arm64": "^0.1.0",
-    "@vesk/haul-linux-x64": "^0.1.0",
-    "@vesk/haul-win32-x64": "^0.1.0"
+    "@vesk/haul-darwin-arm64": "^0.1.14",
+    "@vesk/haul-darwin-x64": "^0.1.14",
+    "@vesk/haul-linux-arm64": "^0.1.14",
+    "@vesk/haul-linux-x64": "^0.1.14",
+    "@vesk/haul-win32-x64": "^0.1.14"
   }
 }