@thexjs/core 1.2.2 → 1.2.3
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.
- package/dist/adapter.js +1 -1
- package/dist/{chunk-Y3MLOFAG.js → chunk-O6SIM7EF.js} +8 -1
- package/dist/data.js +17 -3
- package/dist/index.js +73 -20
- package/package.json +1 -1
package/dist/adapter.js
CHANGED
|
@@ -160,12 +160,19 @@ function extractParams(routePath, paramNames, url) {
|
|
|
160
160
|
for (const name of paramNames) {
|
|
161
161
|
const value = match[idx];
|
|
162
162
|
if (value !== void 0) {
|
|
163
|
-
params[name] = value;
|
|
163
|
+
params[name] = safeDecodeURIComponent(value);
|
|
164
164
|
}
|
|
165
165
|
idx++;
|
|
166
166
|
}
|
|
167
167
|
return params;
|
|
168
168
|
}
|
|
169
|
+
function safeDecodeURIComponent(value) {
|
|
170
|
+
try {
|
|
171
|
+
return decodeURIComponent(value);
|
|
172
|
+
} catch {
|
|
173
|
+
return value;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
169
176
|
function generateManifestSource(routes) {
|
|
170
177
|
const routeEntries = routes.map((r) => {
|
|
171
178
|
const paramsType = r.paramNames.length === 0 ? "Record<string, never>" : `{ ${r.paramNames.map((n) => `${n}: string`).join("; ")} }`;
|
package/dist/data.js
CHANGED
|
@@ -78,7 +78,12 @@ function connectPostgres(options = {}) {
|
|
|
78
78
|
return primed;
|
|
79
79
|
};
|
|
80
80
|
const run = async (work) => {
|
|
81
|
-
|
|
81
|
+
try {
|
|
82
|
+
await prime();
|
|
83
|
+
} catch (error) {
|
|
84
|
+
primed = null;
|
|
85
|
+
throw error;
|
|
86
|
+
}
|
|
82
87
|
return work();
|
|
83
88
|
};
|
|
84
89
|
return new Proxy(sql, {
|
|
@@ -102,6 +107,15 @@ function connectPostgres(options = {}) {
|
|
|
102
107
|
// src/data/migrate.ts
|
|
103
108
|
import { readFileSync, readdirSync } from "fs";
|
|
104
109
|
import { join } from "path";
|
|
110
|
+
function compareMigrationNames(a, b) {
|
|
111
|
+
const numA = /^(\d+)/.exec(a)?.[1];
|
|
112
|
+
const numB = /^(\d+)/.exec(b)?.[1];
|
|
113
|
+
if (numA !== void 0 && numB !== void 0) {
|
|
114
|
+
const diff = Number(numA) - Number(numB);
|
|
115
|
+
if (diff !== 0) return diff;
|
|
116
|
+
}
|
|
117
|
+
return a < b ? -1 : a > b ? 1 : 0;
|
|
118
|
+
}
|
|
105
119
|
function runSQLiteMigrations(db, migrationsDir) {
|
|
106
120
|
db.run(`CREATE TABLE IF NOT EXISTS _x_migrations (
|
|
107
121
|
name TEXT PRIMARY KEY,
|
|
@@ -111,7 +125,7 @@ function runSQLiteMigrations(db, migrationsDir) {
|
|
|
111
125
|
const applied = new Set(stmt.all().map((r) => r.name));
|
|
112
126
|
let files;
|
|
113
127
|
try {
|
|
114
|
-
files = readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).sort();
|
|
128
|
+
files = readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).sort(compareMigrationNames);
|
|
115
129
|
} catch {
|
|
116
130
|
return { applied: [], skipped: [] };
|
|
117
131
|
}
|
|
@@ -140,7 +154,7 @@ async function runPostgresMigrations(client, migrationsDir) {
|
|
|
140
154
|
const applied = new Set(rows.map((r) => r.name));
|
|
141
155
|
let files;
|
|
142
156
|
try {
|
|
143
|
-
files = readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).sort();
|
|
157
|
+
files = readdirSync(migrationsDir).filter((f) => f.endsWith(".sql")).sort(compareMigrationNames);
|
|
144
158
|
} catch {
|
|
145
159
|
return { applied: [], skipped: [] };
|
|
146
160
|
}
|
package/dist/index.js
CHANGED
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
scanPages,
|
|
13
13
|
scanRoutes,
|
|
14
14
|
writeManifest
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-O6SIM7EF.js";
|
|
16
16
|
|
|
17
17
|
// src/not-found.tsx
|
|
18
18
|
import { jsx, jsxs } from "react/jsx-runtime";
|
|
@@ -610,7 +610,6 @@ var ALLOWED_CONTENT_TYPES = /* @__PURE__ */ new Set([
|
|
|
610
610
|
"image/jpeg",
|
|
611
611
|
"image/gif",
|
|
612
612
|
"image/webp",
|
|
613
|
-
"image/svg+xml",
|
|
614
613
|
"image/avif",
|
|
615
614
|
"image/x-icon"
|
|
616
615
|
]);
|
|
@@ -628,15 +627,34 @@ function createImageProxyHandler(options = {}) {
|
|
|
628
627
|
} catch {
|
|
629
628
|
return new Response("invalid url param", { status: 400 });
|
|
630
629
|
}
|
|
631
|
-
|
|
630
|
+
const allowedUrl = (u) => (u.protocol === "http:" || u.protocol === "https:") && allowedHosts.has(u.hostname);
|
|
631
|
+
if (!allowedUrl(parsed)) {
|
|
632
632
|
return new Response("host not allow-listed for image proxy", { status: 403 });
|
|
633
633
|
}
|
|
634
|
+
const isRedirect = (status) => status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
|
|
634
635
|
let upstream;
|
|
635
636
|
try {
|
|
636
|
-
upstream = await fetch(parsed);
|
|
637
|
+
upstream = await fetch(parsed, { redirect: "manual" });
|
|
638
|
+
for (let hop = 0; hop < 5; hop++) {
|
|
639
|
+
if (!isRedirect(upstream.status)) break;
|
|
640
|
+
const location = upstream.headers.get("location");
|
|
641
|
+
let next;
|
|
642
|
+
try {
|
|
643
|
+
next = new URL(location ?? "", parsed);
|
|
644
|
+
} catch {
|
|
645
|
+
return new Response("upstream redirect was not a valid URL", { status: 502 });
|
|
646
|
+
}
|
|
647
|
+
if (!allowedUrl(next)) {
|
|
648
|
+
return new Response("upstream redirected off the allow-list", { status: 403 });
|
|
649
|
+
}
|
|
650
|
+
upstream = await fetch(next, { redirect: "manual" });
|
|
651
|
+
}
|
|
637
652
|
} catch (err) {
|
|
638
653
|
return new Response(`upstream fetch failed: ${String(err)}`, { status: 502 });
|
|
639
654
|
}
|
|
655
|
+
if (isRedirect(upstream.status)) {
|
|
656
|
+
return new Response("too many upstream redirects", { status: 502 });
|
|
657
|
+
}
|
|
640
658
|
if (!upstream.ok) {
|
|
641
659
|
return new Response("upstream error", { status: 502 });
|
|
642
660
|
}
|
|
@@ -970,12 +988,19 @@ function extractActionParams(routePath, paramNames, url) {
|
|
|
970
988
|
for (const name of paramNames) {
|
|
971
989
|
const value = match[idx];
|
|
972
990
|
if (value !== void 0) {
|
|
973
|
-
params[name] = value;
|
|
991
|
+
params[name] = safeDecodeURIComponent(value);
|
|
974
992
|
}
|
|
975
993
|
idx++;
|
|
976
994
|
}
|
|
977
995
|
return params;
|
|
978
996
|
}
|
|
997
|
+
function safeDecodeURIComponent(value) {
|
|
998
|
+
try {
|
|
999
|
+
return decodeURIComponent(value);
|
|
1000
|
+
} catch {
|
|
1001
|
+
return value;
|
|
1002
|
+
}
|
|
1003
|
+
}
|
|
979
1004
|
|
|
980
1005
|
// src/island-bundle.ts
|
|
981
1006
|
function actionsRewritePlugin(actionModules) {
|
|
@@ -1487,6 +1512,18 @@ function createRedisRateLimitStoreFromClient(clientFactory) {
|
|
|
1487
1512
|
}
|
|
1488
1513
|
|
|
1489
1514
|
// src/createApp.ts
|
|
1515
|
+
function sortRoutes(handlers) {
|
|
1516
|
+
return handlers.sort((a, b) => {
|
|
1517
|
+
const bp = routeMatchesForSort(b.entry);
|
|
1518
|
+
const ap = routeMatchesForSort(a.entry);
|
|
1519
|
+
return ap - bp;
|
|
1520
|
+
});
|
|
1521
|
+
}
|
|
1522
|
+
function routeMatchesForSort(entry) {
|
|
1523
|
+
const isStatic = entry.paramNames.length === 0;
|
|
1524
|
+
const isCatchAll = entry.routePath.includes("*");
|
|
1525
|
+
return isStatic ? 0 : isCatchAll ? 2 : 1;
|
|
1526
|
+
}
|
|
1490
1527
|
function projectRootFromRoutesDir(routesDir) {
|
|
1491
1528
|
return join4(routesDir, "..", "..");
|
|
1492
1529
|
}
|
|
@@ -1657,18 +1694,19 @@ async function createApp(options) {
|
|
|
1657
1694
|
try {
|
|
1658
1695
|
const params = extractParams(route.routePath, route.paramNames, new URL(req.url).pathname) ?? {};
|
|
1659
1696
|
const baseHandler = async (ctx) => {
|
|
1660
|
-
|
|
1661
|
-
if (loader) {
|
|
1662
|
-
const result = await loader(ctx);
|
|
1663
|
-
if (result instanceof Response) return result;
|
|
1664
|
-
loaderData = result;
|
|
1665
|
-
}
|
|
1697
|
+
const cacheKey = new URL(ctx.request.url).pathname;
|
|
1666
1698
|
if (mode === "server") {
|
|
1699
|
+
let loaderData2 = {};
|
|
1700
|
+
if (loader) {
|
|
1701
|
+
const result = await loader(ctx);
|
|
1702
|
+
if (result instanceof Response) return result;
|
|
1703
|
+
loaderData2 = result;
|
|
1704
|
+
}
|
|
1667
1705
|
const registry2 = createIslandRegistry();
|
|
1668
1706
|
const content2 = createElement(
|
|
1669
1707
|
IslandProvider,
|
|
1670
1708
|
{ registry: registry2 },
|
|
1671
|
-
wrapWithLayouts(Component, ctx.params,
|
|
1709
|
+
wrapWithLayouts(Component, ctx.params, loaderData2, layoutModules)
|
|
1672
1710
|
);
|
|
1673
1711
|
let scripts2 = islandScripts;
|
|
1674
1712
|
if (scripts2 === void 0) {
|
|
@@ -1688,12 +1726,23 @@ async function createApp(options) {
|
|
|
1688
1726
|
headers: { "Content-Type": "text/html; charset=utf-8" }
|
|
1689
1727
|
});
|
|
1690
1728
|
}
|
|
1691
|
-
const cached = staticCache.get(route.routePath);
|
|
1692
1729
|
const revalidateSeconds = revalidate ?? 0;
|
|
1693
|
-
if (revalidateSeconds > 0
|
|
1694
|
-
|
|
1695
|
-
|
|
1696
|
-
|
|
1730
|
+
if (revalidateSeconds > 0) {
|
|
1731
|
+
const cached = staticCache.get(cacheKey);
|
|
1732
|
+
if (cached && Date.now() - cached.timestamp < revalidateSeconds * 1e3) {
|
|
1733
|
+
return new Response(cached.html, {
|
|
1734
|
+
headers: {
|
|
1735
|
+
"Content-Type": "text/html; charset=utf-8",
|
|
1736
|
+
"X-Revalidated": "hit"
|
|
1737
|
+
}
|
|
1738
|
+
});
|
|
1739
|
+
}
|
|
1740
|
+
}
|
|
1741
|
+
let loaderData = {};
|
|
1742
|
+
if (loader) {
|
|
1743
|
+
const result = await loader(ctx);
|
|
1744
|
+
if (result instanceof Response) return result;
|
|
1745
|
+
loaderData = result;
|
|
1697
1746
|
}
|
|
1698
1747
|
const registry = createIslandRegistry();
|
|
1699
1748
|
const content = createElement(
|
|
@@ -1712,7 +1761,7 @@ async function createApp(options) {
|
|
|
1712
1761
|
islandScripts: scripts
|
|
1713
1762
|
});
|
|
1714
1763
|
if (revalidateSeconds > 0) {
|
|
1715
|
-
staticCache.set(
|
|
1764
|
+
staticCache.set(cacheKey, { html, timestamp: Date.now() });
|
|
1716
1765
|
}
|
|
1717
1766
|
return new Response(html, {
|
|
1718
1767
|
headers: {
|
|
@@ -1787,7 +1836,7 @@ async function createApp(options) {
|
|
|
1787
1836
|
})
|
|
1788
1837
|
});
|
|
1789
1838
|
}
|
|
1790
|
-
handlers = loaded2;
|
|
1839
|
+
handlers = sortRoutes(loaded2);
|
|
1791
1840
|
return;
|
|
1792
1841
|
}
|
|
1793
1842
|
resetServerFunctions();
|
|
@@ -1927,7 +1976,7 @@ async function createApp(options) {
|
|
|
1927
1976
|
})
|
|
1928
1977
|
});
|
|
1929
1978
|
}
|
|
1930
|
-
handlers = loaded;
|
|
1979
|
+
handlers = sortRoutes(loaded);
|
|
1931
1980
|
if (options.contentDir) {
|
|
1932
1981
|
const content = scanContent(options.contentDir);
|
|
1933
1982
|
const loadedContent = content.map((entry) => ({
|
|
@@ -1946,6 +1995,10 @@ async function createApp(options) {
|
|
|
1946
1995
|
async function handleRevalidation(req) {
|
|
1947
1996
|
if (new URL(req.url).pathname !== "/__x/revalidate") return null;
|
|
1948
1997
|
if (req.method !== "POST") return new Response("Method not allowed", { status: 405 });
|
|
1998
|
+
const csrfResult = checkCsrf(req, options.security?.csrf);
|
|
1999
|
+
if (!csrfResult.ok) {
|
|
2000
|
+
return new Response(`Forbidden: ${csrfResult.reason}`, { status: 403 });
|
|
2001
|
+
}
|
|
1949
2002
|
const body = await req.json();
|
|
1950
2003
|
if (body.path) {
|
|
1951
2004
|
staticCache.delete(body.path);
|
package/package.json
CHANGED