Update server.mjs

server.mjs

@@ -11,6 +11,96 @@ const WORK = path.join(ROOT, "work");
 const jobs = new Map();
 const MAX_BYTES = 250 * 1024 * 1024;
 
+const R2_ACCOUNT_ID = process.env.R2_ACCOUNT_ID || "";
+const R2_BUCKET = process.env.R2_BUCKET || "";
+const R2_ACCESS_KEY_ID = process.env.R2_ACCESS_KEY_ID || "";
+const R2_SECRET_ACCESS_KEY = process.env.R2_SECRET_ACCESS_KEY || "";
+const R2_PUBLIC_BASE_URL = process.env.R2_PUBLIC_BASE_URL || "";
+const R2_REGION = "auto";
+const R2_SERVICE = "s3";
+
+function r2Configured() {
+  return Boolean(R2_ACCOUNT_ID && R2_BUCKET && R2_ACCESS_KEY_ID && R2_SECRET_ACCESS_KEY && R2_PUBLIC_BASE_URL);
+}
+
+function encodeRfc3986(value) {
+  return encodeURIComponent(value).replace(/[!'()*]/g, char => "%" + char.charCodeAt(0).toString(16).toUpperCase());
+}
+
+function encodePath(value) {
+  return value.split("/").map(encodeRfc3986).join("/");
+}
+
+function canonicalQueryString(params) {
+  return Object.keys(params).sort().map(key => encodeRfc3986(key) + "=" + encodeRfc3986(params[key])).join("&");
+}
+
+function sha256Hex(value) {
+  return crypto.createHash("sha256").update(value, "utf8").digest("hex");
+}
+
+function hmac(key, value) {
+  return crypto.createHmac("sha256", key).update(value, "utf8").digest();
+}
+
+function hmacHex(key, value) {
+  return crypto.createHmac("sha256", key).update(value, "utf8").digest("hex");
+}
+
+function getSignatureKey(secret, dateStamp) {
+  const kDate = hmac("AWS4" + secret, dateStamp);
+  const kRegion = hmac(kDate, R2_REGION);
+  const kService = hmac(kRegion, R2_SERVICE);
+  return hmac(kService, "aws4_request");
+}
+
+function toAmzDate(date) {
+  return date.toISOString().replace(/[:-]|\\.\\d{3}/g, "").slice(0, 15) + "Z";
+}
+
+function buildR2PresignedPutUrl(key, contentType) {
+  if (!r2Configured()) throw new Error("R2 secrets are not configured");
+  const now = new Date();
+  const host = R2_ACCOUNT_ID + ".r2.cloudflarestorage.com";
+  const amzDate = toAmzDate(now);
+  const dateStamp = amzDate.slice(0, 8);
+  const credentialScope = dateStamp + "/" + R2_REGION + "/" + R2_SERVICE + "/aws4_request";
+  const canonicalUri = "/" + encodePath(R2_BUCKET) + "/" + encodePath(key);
+  const signedHeaders = "content-type;host";
+  const query = {
+    "X-Amz-Algorithm": "AWS4-HMAC-SHA256",
+    "X-Amz-Credential": R2_ACCESS_KEY_ID + "/" + credentialScope,
+    "X-Amz-Date": amzDate,
+    "X-Amz-Expires": "600",
+    "X-Amz-SignedHeaders": signedHeaders
+  };
+  const canonicalQuery = canonicalQueryString(query);
+  const canonicalHeaders = "content-type:" + contentType.trim().replace(/\\s+/g, " ") + "\\n" + "host:" + host + "\\n";
+  const canonicalRequest = ["PUT", canonicalUri, canonicalQuery, canonicalHeaders, signedHeaders, "UNSIGNED-PAYLOAD"].join("\\n");
+  const stringToSign = ["AWS4-HMAC-SHA256", amzDate, credentialScope, sha256Hex(canonicalRequest)].join("\\n");
+  const signature = hmacHex(getSignatureKey(R2_SECRET_ACCESS_KEY, dateStamp), stringToSign);
+  return "https://" + host + canonicalUri + "?" + canonicalQuery + "&X-Amz-Signature=" + signature;
+}
+
+function r2PublicUrl(key) {
+  return R2_PUBLIC_BASE_URL.replace(/\\/+$/, "") + "/" + encodePath(key);
+}
+
+async function uploadToR2(file, key) {
+  const contentType = "model/gltf-binary";
+  const data = await fs.readFile(file);
+  const uploadUrl = buildR2PresignedPutUrl(key, contentType);
+  const response = await fetch(uploadUrl, {
+    method: "PUT",
+    headers: { "content-type": contentType },
+    body: data,
+    signal: AbortSignal.timeout(180000)
+  });
+  if (!response.ok) throw new Error("R2 upload failed: HTTP " + response.status + " " + (await response.text()).slice(0, 1000));
+  return {key, url: r2PublicUrl(key), bytes: data.length};
+}
+
+
 await fs.mkdir(WORK, { recursive: true });
 
 function json(res, status, body) {
@@ -98,8 +188,12 @@ async function processJob(job) {
     const stat = await fs.stat(output);
     if (stat.size === 0) throw new Error("optimizer produced an empty file");
     job.outputBytes = stat.size;
+    const r2Key = "optimized-glb/" + job.id + ".glb";
+    const uploaded = await uploadToR2(output, r2Key);
+    job.r2Key = uploaded.key;
+    job.r2Url = uploaded.url;
     job.status = "ready";
-    job.downloadPath = "/download/" + job.id;
+    job.downloadPath = uploaded.url;
   } catch (error) {
     job.status = "failed";
     job.error = error instanceof Error ? error.message : String(error);
@@ -113,7 +207,7 @@ const server = http.createServer(async (req, res) => {
   const url = new URL(req.url || "/", "http://" + (req.headers.host || "localhost"));
 
   if (req.method === "GET" && url.pathname === "/health") {
-    return json(res, 200, { ok: true, service: "machesta-glb-optimizer", optimizer: "gltf-transform-draco" });
+    return json(res, 200, { ok: true, service: "machesta-glb-optimizer", optimizer: "gltf-transform-draco", r2Configured: r2Configured() });
   }
 
   if (req.method === "POST" && url.pathname === "/optimize") {