Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: google-github-actions/auth@v2
- uses: google-github-actions/auth@v3
with:
workload_identity_provider: projects/129850122606/locations/global/workloadIdentityPools/github-pool/providers/github-provider
service_account: casecomp-deploy@casecomp-495718.iam.gserviceaccount.com

- uses: google-github-actions/setup-gcloud@v2
- uses: google-github-actions/setup-gcloud@v3

- name: Build and push
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- uses: actions/checkout@v5
- uses: actions/setup-node@v5
with:
node-version: 24
- run: npm install
Expand Down
72 changes: 47 additions & 25 deletions api.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import "dotenv/config";
import crypto from "crypto";
import express from "express";
import helmet from "helmet";
import rateLimit from "express-rate-limit";
import swaggerUi from "swagger-ui-express";
import { swaggerSpec } from "./lib/swagger.js";
Expand All @@ -21,8 +23,19 @@ import path from "path";
const __dirname = path.dirname(fileURLToPath(import.meta.url));

const app = express();

app.set("trust proxy", true);

app.use(helmet({
contentSecurityPolicy: false,
crossOriginEmbedderPolicy: false,
}));

app.use(express.json({ limit: "100kb" }));

app.use((req, res, next) => {
req.requestId = crypto.randomUUID().slice(0, 8);
res.setHeader("X-Request-Id", req.requestId);
res.setHeader("Access-Control-Allow-Origin", "*");
res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
Expand Down Expand Up @@ -60,9 +73,18 @@ app.use("/api", (req, res, next) => {
});
app.use("/v1", apiLimiter);

async function logError(type, message, detail = "") {
console.error(`[ERROR] ${type}: ${message}`);
try { await saveErrorLog({ type, message, detail, ts: new Date().toISOString() }); } catch {}
function safeErrorMessage(e) {
const msg = e.message || String(e);
if (/ECONNREFUSED|ETIMEDOUT|ENOTFOUND/.test(msg)) return "Upstream service unavailable";
if (/api[_-]?key|token|secret|credential/i.test(msg)) return "Authentication error";
if (/firestore|grpc|google/i.test(msg)) return "Internal storage error";
if (msg.length > 200) return msg.slice(0, 200);
return msg;
}

async function logError(type, message, detail = "", requestId = "") {
console.error(`[ERROR] [${requestId}] ${type}: ${message}`);
try { await saveErrorLog({ type, message, detail, requestId, ts: new Date().toISOString() }); } catch {}
}

const clientId = process.env.EBAY_CLIENT_ID;
Expand Down Expand Up @@ -210,8 +232,8 @@ app.get("/api/search", apiAuthMiddleware, (req, res, next) => { req._errorType =

res.json(result);
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down Expand Up @@ -252,8 +274,8 @@ app.get("/api/sold", apiAuthMiddleware, (req, res, next) => { req._errorType = "

res.json({ query: q, sold, soldSource, counts: { sold: sold.length } });
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand All @@ -265,8 +287,8 @@ app.get("/api/psa", authMiddleware, (req, res, next) => { req._errorType = "psa"
const signal = await getPsaGradingSignal(q);
res.json({ query: q, signal });
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down Expand Up @@ -304,8 +326,8 @@ app.post("/api/grade", authMiddleware, (req, res, next) => { req._errorType = "g

res.json({ grade, stored: !!(grade && !grade.error) });
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand All @@ -316,8 +338,8 @@ app.get("/api/grades", authMiddleware, async (req, res) => {
const records = await getGradeLogs({ limit, query: req.query.q, source: req.query.source });
res.json(records);
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down Expand Up @@ -393,8 +415,8 @@ v1.get("/drops", async (req, res) => {
const records = await getDrops({ limit, site: req.query.site, status: req.query.status });
res.json({ drops: records, count: records.length, limit });
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand All @@ -405,8 +427,8 @@ v1.get("/drops/:id", async (req, res) => {
if (!record) return res.status(404).json({ error: "Drop not found" });
res.json(record);
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down Expand Up @@ -448,8 +470,8 @@ v1.get("/comps", async (req, res) => {
sold: { items: sold, count: sold.length },
});
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down Expand Up @@ -478,8 +500,8 @@ v1.get("/webhooks", async (req, res) => {
const stored = await getWebhooks();
res.json({ webhooks: stored, count: stored.length });
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down Expand Up @@ -512,8 +534,8 @@ app.post("/api/drop-event", authMiddleware, (req, res, next) => { req._errorType
}
res.json(drop);
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand All @@ -525,8 +547,8 @@ app.post("/api/alerts", authMiddleware, async (req, res) => {
await saveAlert({ email, targetPrice: targetPrice || null, query, createdAt: new Date().toISOString() });
res.json({ ok: true });
} catch (e) {
logError(req._errorType || "api", e.message, req.originalUrl);
res.status(500).json({ error: e.message });
logError(req._errorType || "api", e.message, req.originalUrl, req.requestId);
res.status(500).json({ error: safeErrorMessage(e), requestId: req.requestId });
}
});

Expand Down
25 changes: 17 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"dotenv": "^16.4.7",
"express": "^5.2.1",
"express-rate-limit": "^8.3.2",
"helmet": "^8.1.0",
"ioredis": "^5.10.1",
"minimist": "^1.2.8",
"playwright": "^1.59.1",
Expand Down