arcanajs 2.5.4 → 3.0.0
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/README.md +7 -22
- package/bin/arcanajs.js +1 -1
- package/dist/arcanajs.js +2 -0
- package/dist/arcanajs.js.map +1 -0
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -0
- package/{framework → dist}/lib/client/index.d.ts +6 -26
- package/{framework → dist}/lib/global.d.ts +6 -10
- package/dist/lib/index.d.ts +38 -0
- package/{framework → dist}/lib/server/ArcanaJSServer.d.ts +4 -4
- package/dist/lib/server/DefaultTemplate.d.ts +1 -0
- package/{framework → dist}/lib/shared/components/Body.d.ts +2 -2
- package/{framework → dist}/lib/shared/components/Head.d.ts +2 -1
- package/{framework → dist}/lib/shared/components/Link.d.ts +2 -2
- package/{framework → dist}/lib/shared/components/NavLink.d.ts +2 -2
- package/dist/lib/shared/components/Page.d.ts +7 -0
- package/{framework → dist}/lib/shared/context/RouterContext.d.ts +1 -0
- package/dist/lib/shared/core/ArcanaJSApp.d.ts +20 -0
- package/{framework → dist}/lib/shared/hooks/useLocation.d.ts +2 -1
- package/dist/lib/shared/hooks/usePage.d.ts +2 -0
- package/dist/lib/shared/hooks/useParams.d.ts +2 -0
- package/dist/lib/shared/hooks/useQuery.d.ts +2 -0
- package/dist/lib/shared/hooks/useRouter.d.ts +2 -0
- package/package.json +16 -26
- package/framework/cli/index.js +0 -204
- package/framework/cli/templates.d.ts +0 -6
- package/framework/cli/templates.js +0 -60
- package/framework/cli/webpack.config.js +0 -310
- package/framework/lib/client/index.js +0 -97
- package/framework/lib/config/index.d.ts +0 -46
- package/framework/lib/config/index.js +0 -115
- package/framework/lib/index.d.ts +0 -19
- package/framework/lib/index.js +0 -59
- package/framework/lib/server/ArcanaJSMiddleware.js +0 -114
- package/framework/lib/server/ArcanaJSServer.js +0 -441
- package/framework/lib/server/ControllerBinder.js +0 -32
- package/framework/lib/server/CsrfMiddleware.js +0 -34
- package/framework/lib/server/DynamicRouter.js +0 -50
- package/framework/lib/server/ResponseHandlerMiddleware.js +0 -30
- package/framework/lib/server/Router.js +0 -203
- package/framework/lib/server/default-index.html +0 -12
- package/framework/lib/server.d.ts +0 -33
- package/framework/lib/server.js +0 -69
- package/framework/lib/shared/components/Body.js +0 -8
- package/framework/lib/shared/components/Head.js +0 -125
- package/framework/lib/shared/components/Link.js +0 -27
- package/framework/lib/shared/components/NavLink.js +0 -13
- package/framework/lib/shared/components/Page.d.ts +0 -6
- package/framework/lib/shared/components/Page.js +0 -10
- package/framework/lib/shared/context/HeadContext.js +0 -5
- package/framework/lib/shared/context/PageContext.js +0 -5
- package/framework/lib/shared/context/RouterContext.js +0 -10
- package/framework/lib/shared/core/ArcanaJSApp.d.ts +0 -14
- package/framework/lib/shared/core/ArcanaJSApp.js +0 -153
- package/framework/lib/shared/hooks/useHead.js +0 -7
- package/framework/lib/shared/hooks/useLocation.js +0 -13
- package/framework/lib/shared/hooks/usePage.d.ts +0 -1
- package/framework/lib/shared/hooks/usePage.js +0 -7
- package/framework/lib/shared/hooks/useParams.d.ts +0 -1
- package/framework/lib/shared/hooks/useParams.js +0 -13
- package/framework/lib/shared/hooks/useQuery.d.ts +0 -1
- package/framework/lib/shared/hooks/useQuery.js +0 -9
- package/framework/lib/shared/hooks/useRouter.d.ts +0 -1
- package/framework/lib/shared/hooks/useRouter.js +0 -13
- package/framework/lib/shared/utils/createSingletonContext.js +0 -21
- package/framework/lib/shared/views/ErrorPage.js +0 -12
- package/framework/lib/shared/views/NotFoundPage.js +0 -11
- package/framework/lib/types.d.ts +0 -174
- package/framework/lib/types.js +0 -8
- package/framework/templates/arcanajs.config.ts +0 -44
- package/framework/templates/package.json +0 -15
- package/framework/templates/postcss.config.js +0 -6
- package/framework/templates/public/arcanajs.png +0 -0
- package/framework/templates/public/arcanajs.svg +0 -12
- package/framework/templates/public/favicon.ico +0 -0
- package/framework/templates/src/arcanajs.d.ts +0 -8
- package/framework/templates/src/client/globals.css +0 -199
- package/framework/templates/src/client/index.tsx +0 -7
- package/framework/templates/src/db/mongo.ts +0 -10
- package/framework/templates/src/db/mongoose.ts +0 -12
- package/framework/templates/src/db/mysql.ts +0 -15
- package/framework/templates/src/db/postgres.ts +0 -8
- package/framework/templates/src/server/controllers/HomeController.ts +0 -7
- package/framework/templates/src/server/controllers/UsersController.ts +0 -37
- package/framework/templates/src/server/index.ts +0 -38
- package/framework/templates/src/server/routes/api.ts +0 -6
- package/framework/templates/src/server/routes/web.ts +0 -7
- package/framework/templates/src/views/ErrorPage.tsx +0 -136
- package/framework/templates/src/views/HomePage.tsx +0 -344
- package/framework/templates/src/views/NotFoundPage.tsx +0 -108
- package/framework/templates/tsconfig.json +0 -27
- /package/{framework → dist}/cli/index.d.ts +0 -0
- /package/{framework → dist}/cli/webpack.config.d.ts +0 -0
- /package/{framework → dist}/lib/server/ArcanaJSMiddleware.d.ts +0 -0
- /package/{framework → dist}/lib/server/ControllerBinder.d.ts +0 -0
- /package/{framework → dist}/lib/server/CsrfMiddleware.d.ts +0 -0
- /package/{framework → dist}/lib/server/DynamicRouter.d.ts +0 -0
- /package/{framework → dist}/lib/server/ResponseHandlerMiddleware.d.ts +0 -0
- /package/{framework → dist}/lib/server/Router.d.ts +0 -0
- /package/{framework → dist}/lib/shared/context/HeadContext.d.ts +0 -0
- /package/{framework → dist}/lib/shared/context/PageContext.d.ts +0 -0
- /package/{framework → dist}/lib/shared/hooks/useHead.d.ts +0 -0
- /package/{framework → dist}/lib/shared/utils/createSingletonContext.d.ts +0 -0
- /package/{framework → dist}/lib/shared/views/ErrorPage.d.ts +0 -0
- /package/{framework → dist}/lib/shared/views/NotFoundPage.d.ts +0 -0
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createArcanaJSMiddleware = void 0;
|
|
7
|
-
const fs_1 = __importDefault(require("fs"));
|
|
8
|
-
const react_1 = __importDefault(require("react"));
|
|
9
|
-
const server_1 = require("react-dom/server");
|
|
10
|
-
const HeadContext_1 = require("../shared/context/HeadContext");
|
|
11
|
-
const ArcanaJSApp_1 = require("../shared/core/ArcanaJSApp");
|
|
12
|
-
const DEFAULT_HTML_TEMPLATE = `<!DOCTYPE html>
|
|
13
|
-
<html lang="en">
|
|
14
|
-
<head>
|
|
15
|
-
<meta charset="UTF-8" />
|
|
16
|
-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
17
|
-
<!--HEAD_CONTENT-->
|
|
18
|
-
</head>
|
|
19
|
-
<body>
|
|
20
|
-
<div id="root"><!--APP_CONTENT--></div>
|
|
21
|
-
<!--ARCANAJS_DATA_SCRIPT-->
|
|
22
|
-
</body>
|
|
23
|
-
</html>`;
|
|
24
|
-
// Helper to prevent XSS in initial data
|
|
25
|
-
const safeStringify = (obj) => {
|
|
26
|
-
return JSON.stringify(obj).replace(/</g, "\\u003c");
|
|
27
|
-
};
|
|
28
|
-
const createArcanaJSMiddleware = (options) => {
|
|
29
|
-
const { views, indexFile, layout } = options;
|
|
30
|
-
let cachedIndexHtml = null;
|
|
31
|
-
const getIndexHtml = (callback) => {
|
|
32
|
-
if (process.env.NODE_ENV === "production" && cachedIndexHtml) {
|
|
33
|
-
return callback(null, cachedIndexHtml);
|
|
34
|
-
}
|
|
35
|
-
if (indexFile && fs_1.default.existsSync(indexFile)) {
|
|
36
|
-
fs_1.default.readFile(indexFile, "utf8", (err, htmlData) => {
|
|
37
|
-
if (!err && process.env.NODE_ENV === "production") {
|
|
38
|
-
cachedIndexHtml = htmlData;
|
|
39
|
-
}
|
|
40
|
-
callback(err, htmlData);
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
if (process.env.NODE_ENV === "production") {
|
|
45
|
-
cachedIndexHtml = DEFAULT_HTML_TEMPLATE;
|
|
46
|
-
}
|
|
47
|
-
callback(null, DEFAULT_HTML_TEMPLATE);
|
|
48
|
-
}
|
|
49
|
-
};
|
|
50
|
-
return (req, res, next) => {
|
|
51
|
-
res.renderPage = (page, data = {}, params = {}) => {
|
|
52
|
-
const csrfToken = res.locals.csrfToken;
|
|
53
|
-
if (req.get("X-ArcanaJS-Request") || req.query.format === "json") {
|
|
54
|
-
return res.json({ page, data, params, csrfToken });
|
|
55
|
-
}
|
|
56
|
-
try {
|
|
57
|
-
const headTags = [];
|
|
58
|
-
const headManager = {
|
|
59
|
-
tags: headTags,
|
|
60
|
-
push: (nodes) => headTags.push(nodes),
|
|
61
|
-
};
|
|
62
|
-
const appHtml = (0, server_1.renderToString)(react_1.default.createElement(HeadContext_1.HeadContext.Provider, { value: headManager }, react_1.default.createElement(ArcanaJSApp_1.ArcanaJSApp, {
|
|
63
|
-
initialPage: page,
|
|
64
|
-
initialData: data,
|
|
65
|
-
initialParams: params,
|
|
66
|
-
initialUrl: req.path,
|
|
67
|
-
csrfToken: csrfToken,
|
|
68
|
-
views: views,
|
|
69
|
-
layout: layout,
|
|
70
|
-
})));
|
|
71
|
-
const headHtml = (0, server_1.renderToString)(react_1.default.createElement(react_1.default.Fragment, null, ...headTags));
|
|
72
|
-
getIndexHtml((err, htmlData) => {
|
|
73
|
-
if (err) {
|
|
74
|
-
console.error("Error reading index.html", err);
|
|
75
|
-
return res.status(500).send("Server Error");
|
|
76
|
-
}
|
|
77
|
-
const scriptContent = safeStringify({
|
|
78
|
-
page,
|
|
79
|
-
data,
|
|
80
|
-
params,
|
|
81
|
-
csrfToken,
|
|
82
|
-
});
|
|
83
|
-
const scriptTag = `<script id="__ARCANAJS_DATA__" type="application/json">${scriptContent}</script>`;
|
|
84
|
-
const hmrScript = process.env.ARCANA_HMR_PORT
|
|
85
|
-
? `
|
|
86
|
-
<script>
|
|
87
|
-
(function() {
|
|
88
|
-
const socket = new WebSocket("ws://localhost:${process.env.ARCANA_HMR_PORT}");
|
|
89
|
-
socket.onmessage = function(event) {
|
|
90
|
-
const data = JSON.parse(event.data);
|
|
91
|
-
if (data.type === "reload") {
|
|
92
|
-
window.location.reload();
|
|
93
|
-
}
|
|
94
|
-
};
|
|
95
|
-
})();
|
|
96
|
-
</script>`
|
|
97
|
-
: "";
|
|
98
|
-
const html = htmlData
|
|
99
|
-
.replace("<!--HEAD_CONTENT-->", headHtml)
|
|
100
|
-
.replace("<!--APP_CONTENT-->", appHtml)
|
|
101
|
-
.replace("<!--ARCANAJS_DATA_SCRIPT-->", scriptTag + hmrScript);
|
|
102
|
-
res.send(html);
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
catch (error) {
|
|
106
|
-
console.error("SSR Error:", error);
|
|
107
|
-
return res.status(500).send("Internal Server Error");
|
|
108
|
-
}
|
|
109
|
-
return res;
|
|
110
|
-
};
|
|
111
|
-
next();
|
|
112
|
-
};
|
|
113
|
-
};
|
|
114
|
-
exports.createArcanaJSMiddleware = createArcanaJSMiddleware;
|
|
@@ -1,441 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ArcanaJSServer = void 0;
|
|
7
|
-
const compression_1 = __importDefault(require("compression"));
|
|
8
|
-
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
9
|
-
const express_1 = __importDefault(require("express"));
|
|
10
|
-
const fs_1 = __importDefault(require("fs"));
|
|
11
|
-
const helmet_1 = __importDefault(require("helmet"));
|
|
12
|
-
const path_1 = __importDefault(require("path"));
|
|
13
|
-
const ErrorPage_1 = __importDefault(require("../shared/views/ErrorPage"));
|
|
14
|
-
const NotFoundPage_1 = __importDefault(require("../shared/views/NotFoundPage"));
|
|
15
|
-
const ArcanaJSMiddleware_1 = require("./ArcanaJSMiddleware");
|
|
16
|
-
const CsrfMiddleware_1 = require("./CsrfMiddleware");
|
|
17
|
-
const DynamicRouter_1 = require("./DynamicRouter");
|
|
18
|
-
const ResponseHandlerMiddleware_1 = require("./ResponseHandlerMiddleware");
|
|
19
|
-
class ArcanaJSServer {
|
|
20
|
-
constructor(config) {
|
|
21
|
-
this.config = config;
|
|
22
|
-
this.app = (0, express_1.default)();
|
|
23
|
-
this.initialize();
|
|
24
|
-
}
|
|
25
|
-
/**
|
|
26
|
-
* Normalize different DB client shapes into a single object exposing:
|
|
27
|
-
* { client?: any, db?: any, close: async () => void }
|
|
28
|
-
*/
|
|
29
|
-
normalizeDb(obj) {
|
|
30
|
-
if (!obj)
|
|
31
|
-
return obj;
|
|
32
|
-
// If already normalized (has close function), return as-is
|
|
33
|
-
if (typeof obj.close === "function") {
|
|
34
|
-
return obj;
|
|
35
|
-
}
|
|
36
|
-
// Mongoose instance
|
|
37
|
-
if (typeof obj.disconnect === "function") {
|
|
38
|
-
return {
|
|
39
|
-
client: obj,
|
|
40
|
-
close: async () => {
|
|
41
|
-
await obj.disconnect();
|
|
42
|
-
},
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
// If object contains { client, db }
|
|
46
|
-
if (obj.client && obj.db) {
|
|
47
|
-
const client = obj.client;
|
|
48
|
-
return {
|
|
49
|
-
client,
|
|
50
|
-
db: obj.db,
|
|
51
|
-
close: async () => {
|
|
52
|
-
if (client && typeof client.close === "function") {
|
|
53
|
-
await client.close();
|
|
54
|
-
}
|
|
55
|
-
else if (client && typeof client.disconnect === "function") {
|
|
56
|
-
await client.disconnect();
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
throw new Error("No close method on client");
|
|
60
|
-
}
|
|
61
|
-
},
|
|
62
|
-
};
|
|
63
|
-
}
|
|
64
|
-
// Native MongoClient instance
|
|
65
|
-
if (obj && typeof obj.close === "function" && obj.connect) {
|
|
66
|
-
return {
|
|
67
|
-
client: obj,
|
|
68
|
-
close: async () => {
|
|
69
|
-
await obj.close();
|
|
70
|
-
},
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
|
-
// Pg/mysql client with end()/query()
|
|
74
|
-
if (typeof obj.end === "function" || typeof obj.query === "function") {
|
|
75
|
-
return {
|
|
76
|
-
client: obj,
|
|
77
|
-
close: async () => {
|
|
78
|
-
if (typeof obj.end === "function") {
|
|
79
|
-
await obj.end();
|
|
80
|
-
}
|
|
81
|
-
else if (typeof obj.close === "function") {
|
|
82
|
-
await obj.close();
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
throw new Error("No close/end method on SQL client");
|
|
86
|
-
}
|
|
87
|
-
},
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
// Try internal mongo client path { s: { client } }
|
|
91
|
-
if (obj.s && obj.s.client && typeof obj.s.client.close === "function") {
|
|
92
|
-
return {
|
|
93
|
-
client: obj.s.client,
|
|
94
|
-
db: obj,
|
|
95
|
-
close: async () => {
|
|
96
|
-
await obj.s.client.close();
|
|
97
|
-
},
|
|
98
|
-
};
|
|
99
|
-
}
|
|
100
|
-
// Fallback: wrap with a close that throws to surface the issue
|
|
101
|
-
return {
|
|
102
|
-
client: obj,
|
|
103
|
-
close: async () => {
|
|
104
|
-
throw new Error("No known close method on DB client");
|
|
105
|
-
},
|
|
106
|
-
};
|
|
107
|
-
}
|
|
108
|
-
initialize() {
|
|
109
|
-
const { staticDir = "public", distDir = "dist/public", indexFile = "dist/public/index.html", views, viewsContext, routes, layout, apiRoutes, apiBase = "/api", } = this.config;
|
|
110
|
-
const root = process.cwd();
|
|
111
|
-
// 1. Resolve views once and in priority order
|
|
112
|
-
let resolvedViews = views;
|
|
113
|
-
if (!resolvedViews && viewsContext)
|
|
114
|
-
resolvedViews = this.loadViewsFromContext(viewsContext);
|
|
115
|
-
if (!resolvedViews)
|
|
116
|
-
resolvedViews = this.loadViewsFromAlias();
|
|
117
|
-
if (!resolvedViews)
|
|
118
|
-
resolvedViews = this.discoverViews();
|
|
119
|
-
if (!resolvedViews || Object.keys(resolvedViews).length === 0) {
|
|
120
|
-
console.warn("No views found. Please check your views directory.");
|
|
121
|
-
resolvedViews = {};
|
|
122
|
-
}
|
|
123
|
-
resolvedViews.NotFoundPage = resolvedViews.NotFoundPage || NotFoundPage_1.default;
|
|
124
|
-
resolvedViews.ErrorPage = resolvedViews.ErrorPage || ErrorPage_1.default;
|
|
125
|
-
// Security headers
|
|
126
|
-
this.app.use((0, helmet_1.default)({ contentSecurityPolicy: false }));
|
|
127
|
-
this.app.use((0, cookie_parser_1.default)());
|
|
128
|
-
this.app.use((0, CsrfMiddleware_1.createCsrfMiddleware)());
|
|
129
|
-
this.app.use(ResponseHandlerMiddleware_1.responseHandler);
|
|
130
|
-
// Expose `req.db` for convenience
|
|
131
|
-
this.app.use((req, _res, next) => {
|
|
132
|
-
req.db = this.app.locals.db;
|
|
133
|
-
next();
|
|
134
|
-
});
|
|
135
|
-
// Static files: resolve and dedupe paths, serve before compression to avoid recompressing static files
|
|
136
|
-
const isProduction = process.env.NODE_ENV === "production";
|
|
137
|
-
const staticOptions = { index: false, maxAge: isProduction ? "1y" : "0" };
|
|
138
|
-
const staticPaths = [
|
|
139
|
-
path_1.default.resolve(root, distDir),
|
|
140
|
-
path_1.default.resolve(root, staticDir),
|
|
141
|
-
].filter((p, i, a) => a.indexOf(p) === i);
|
|
142
|
-
for (const p of staticPaths) {
|
|
143
|
-
this.app.use(express_1.default.static(p, staticOptions));
|
|
144
|
-
}
|
|
145
|
-
// Compression for dynamic responses (after static middleware)
|
|
146
|
-
this.app.use((0, compression_1.default)());
|
|
147
|
-
// ArcanaJS Middleware
|
|
148
|
-
this.app.use((0, ArcanaJSMiddleware_1.createArcanaJSMiddleware)({
|
|
149
|
-
views: resolvedViews,
|
|
150
|
-
indexFile: path_1.default.resolve(root, indexFile),
|
|
151
|
-
layout,
|
|
152
|
-
}));
|
|
153
|
-
// Establish DB connection if provided (normalize eagerly where possible)
|
|
154
|
-
if (this.config.dbConnect) {
|
|
155
|
-
try {
|
|
156
|
-
const maybe = this.config.dbConnect();
|
|
157
|
-
const handleDb = (db) => {
|
|
158
|
-
try {
|
|
159
|
-
this.app.locals.db = this.normalizeDb(db) || db;
|
|
160
|
-
console.log("Database connection attached to app.locals.db");
|
|
161
|
-
}
|
|
162
|
-
catch (e) {
|
|
163
|
-
this.app.locals.db = db;
|
|
164
|
-
console.warn("DB connection attached without full normalization", e);
|
|
165
|
-
}
|
|
166
|
-
};
|
|
167
|
-
if (maybe &&
|
|
168
|
-
maybe.then &&
|
|
169
|
-
typeof maybe.then === "function") {
|
|
170
|
-
maybe
|
|
171
|
-
.then(handleDb)
|
|
172
|
-
.catch((err) => console.error("Error establishing DB connection:", err));
|
|
173
|
-
}
|
|
174
|
-
else {
|
|
175
|
-
handleDb(maybe);
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
catch (err) {
|
|
179
|
-
console.error("Error calling dbConnect:", err);
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
// Helper to mount arrays or single route objects
|
|
183
|
-
const mount = (target, base) => {
|
|
184
|
-
if (!target)
|
|
185
|
-
return;
|
|
186
|
-
const items = Array.isArray(target) ? target : [target];
|
|
187
|
-
for (const r of items) {
|
|
188
|
-
if (!r)
|
|
189
|
-
continue;
|
|
190
|
-
if (typeof r.getRouter === "function") {
|
|
191
|
-
this.app.use(base || "/", r.getRouter());
|
|
192
|
-
}
|
|
193
|
-
else {
|
|
194
|
-
this.app.use(base || "/", r);
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
};
|
|
198
|
-
try {
|
|
199
|
-
mount(apiRoutes, apiBase);
|
|
200
|
-
if (apiRoutes)
|
|
201
|
-
console.log(`API routes mounted at ${apiBase}`);
|
|
202
|
-
}
|
|
203
|
-
catch (err) {
|
|
204
|
-
console.error("Error mounting apiRoutes:", err);
|
|
205
|
-
}
|
|
206
|
-
try {
|
|
207
|
-
mount(routes);
|
|
208
|
-
}
|
|
209
|
-
catch (err) {
|
|
210
|
-
console.error("Error mounting routes:", err);
|
|
211
|
-
}
|
|
212
|
-
// Dynamic Router
|
|
213
|
-
this.app.use((0, DynamicRouter_1.createDynamicRouter)(resolvedViews));
|
|
214
|
-
// 404 and error handlers
|
|
215
|
-
this.app.use((req, res) => {
|
|
216
|
-
if (req.get("X-ArcanaJS-Request") || req.query.format === "json") {
|
|
217
|
-
res.status(404).json({
|
|
218
|
-
page: "NotFoundPage",
|
|
219
|
-
data: {},
|
|
220
|
-
params: {},
|
|
221
|
-
csrfToken: res.locals.csrfToken,
|
|
222
|
-
});
|
|
223
|
-
}
|
|
224
|
-
else {
|
|
225
|
-
res.status(404).renderPage("NotFoundPage");
|
|
226
|
-
}
|
|
227
|
-
});
|
|
228
|
-
this.app.use((err, req, res, next) => {
|
|
229
|
-
console.error(err);
|
|
230
|
-
const message = process.env.NODE_ENV === "production"
|
|
231
|
-
? "Internal Server Error"
|
|
232
|
-
: err.message;
|
|
233
|
-
if (req.get("X-ArcanaJS-Request") || req.query.format === "json") {
|
|
234
|
-
res.status(500).json({
|
|
235
|
-
page: "ErrorPage",
|
|
236
|
-
data: { message },
|
|
237
|
-
params: {},
|
|
238
|
-
csrfToken: res.locals.csrfToken,
|
|
239
|
-
});
|
|
240
|
-
}
|
|
241
|
-
else {
|
|
242
|
-
res.status(500).renderPage("ErrorPage", { message });
|
|
243
|
-
}
|
|
244
|
-
});
|
|
245
|
-
}
|
|
246
|
-
loadViewsFromContext(context) {
|
|
247
|
-
const views = {};
|
|
248
|
-
context.keys().forEach((key) => {
|
|
249
|
-
const viewName = key.replace(/^\.\/(.*)\.tsx$/, "$1");
|
|
250
|
-
views[viewName] = context(key).default;
|
|
251
|
-
});
|
|
252
|
-
return views;
|
|
253
|
-
}
|
|
254
|
-
loadViewsFromAlias() {
|
|
255
|
-
try {
|
|
256
|
-
// @ts-ignore - This alias is injected by Webpack
|
|
257
|
-
const injectedViews = require("arcana-views");
|
|
258
|
-
if (injectedViews) {
|
|
259
|
-
return this.loadViewsFromContext(injectedViews);
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
catch (e) {
|
|
263
|
-
// Ignore
|
|
264
|
-
}
|
|
265
|
-
return undefined;
|
|
266
|
-
}
|
|
267
|
-
discoverViews() {
|
|
268
|
-
const views = {};
|
|
269
|
-
const viewsDir = this.config.viewsDir
|
|
270
|
-
? path_1.default.resolve(process.cwd(), this.config.viewsDir)
|
|
271
|
-
: path_1.default.resolve(process.cwd(), "src/views");
|
|
272
|
-
if (!fs_1.default.existsSync(viewsDir))
|
|
273
|
-
return views;
|
|
274
|
-
const traverse = (dir) => {
|
|
275
|
-
const files = fs_1.default.readdirSync(dir);
|
|
276
|
-
files.forEach((file) => {
|
|
277
|
-
const fullPath = path_1.default.join(dir, file);
|
|
278
|
-
const stat = fs_1.default.statSync(fullPath);
|
|
279
|
-
if (stat.isDirectory()) {
|
|
280
|
-
traverse(fullPath);
|
|
281
|
-
}
|
|
282
|
-
else if (file.endsWith(".tsx") || file.endsWith(".jsx")) {
|
|
283
|
-
const relativePath = path_1.default.relative(viewsDir, fullPath);
|
|
284
|
-
const viewName = relativePath.replace(/\.(tsx|jsx)$/, "");
|
|
285
|
-
try {
|
|
286
|
-
// Use __non_webpack_require__ if available to avoid Webpack bundling issues
|
|
287
|
-
// or standard require if running in Node directly
|
|
288
|
-
const requireFunc = typeof __non_webpack_require__ !== "undefined"
|
|
289
|
-
? __non_webpack_require__
|
|
290
|
-
: eval("require");
|
|
291
|
-
// Register ts-node if needed
|
|
292
|
-
if (file.endsWith(".tsx") || file.endsWith(".ts")) {
|
|
293
|
-
try {
|
|
294
|
-
requireFunc("ts-node/register");
|
|
295
|
-
}
|
|
296
|
-
catch (e) {
|
|
297
|
-
// Ignore
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
const pageModule = requireFunc(fullPath);
|
|
301
|
-
views[viewName] = pageModule.default || pageModule;
|
|
302
|
-
}
|
|
303
|
-
catch (error) {
|
|
304
|
-
console.error(`Failed to load view ${viewName}:`, error);
|
|
305
|
-
}
|
|
306
|
-
}
|
|
307
|
-
});
|
|
308
|
-
};
|
|
309
|
-
traverse(viewsDir);
|
|
310
|
-
return views;
|
|
311
|
-
}
|
|
312
|
-
start() {
|
|
313
|
-
const PORT = this.config.port || process.env.PORT || 3000;
|
|
314
|
-
this.serverInstance = this.app.listen(PORT, () => {
|
|
315
|
-
console.log(`Server is running on http://localhost:${PORT}`);
|
|
316
|
-
});
|
|
317
|
-
// Optionally register process signal handlers per-instance to gracefully shutdown
|
|
318
|
-
const autoHandle = this.config.autoHandleSignals !== false;
|
|
319
|
-
if (autoHandle) {
|
|
320
|
-
const shutdown = async () => {
|
|
321
|
-
try {
|
|
322
|
-
await this.stop();
|
|
323
|
-
process.exit(0);
|
|
324
|
-
}
|
|
325
|
-
catch (err) {
|
|
326
|
-
console.error("Error during shutdown:", err);
|
|
327
|
-
process.exit(1);
|
|
328
|
-
}
|
|
329
|
-
};
|
|
330
|
-
this._sigintHandler = shutdown;
|
|
331
|
-
this._sigtermHandler = shutdown;
|
|
332
|
-
process.on("SIGINT", this._sigintHandler);
|
|
333
|
-
process.on("SIGTERM", this._sigtermHandler);
|
|
334
|
-
}
|
|
335
|
-
}
|
|
336
|
-
/**
|
|
337
|
-
* Stop the HTTP server and close DB connection if present.
|
|
338
|
-
*/
|
|
339
|
-
async stop() {
|
|
340
|
-
// Close HTTP server
|
|
341
|
-
if (this.serverInstance) {
|
|
342
|
-
await new Promise((resolve, reject) => {
|
|
343
|
-
this.serverInstance.close((err) => {
|
|
344
|
-
if (err)
|
|
345
|
-
return reject(err);
|
|
346
|
-
resolve();
|
|
347
|
-
});
|
|
348
|
-
});
|
|
349
|
-
this.serverInstance = undefined;
|
|
350
|
-
console.log("HTTP server stopped");
|
|
351
|
-
}
|
|
352
|
-
// Close DB connection if attached to app.locals.db
|
|
353
|
-
const db = this.app.locals.db;
|
|
354
|
-
if (db) {
|
|
355
|
-
let closed = false;
|
|
356
|
-
// Try mongoose.disconnect()
|
|
357
|
-
try {
|
|
358
|
-
if (typeof db.disconnect === "function") {
|
|
359
|
-
await db.disconnect();
|
|
360
|
-
closed = true;
|
|
361
|
-
console.log("Database connection closed via disconnect().");
|
|
362
|
-
}
|
|
363
|
-
}
|
|
364
|
-
catch (err) {
|
|
365
|
-
console.error("Error calling disconnect() on DB client:", err);
|
|
366
|
-
}
|
|
367
|
-
// Try db.close()
|
|
368
|
-
if (!closed) {
|
|
369
|
-
try {
|
|
370
|
-
if (typeof db.close === "function") {
|
|
371
|
-
await db.close();
|
|
372
|
-
closed = true;
|
|
373
|
-
console.log("Database connection closed via close().");
|
|
374
|
-
}
|
|
375
|
-
}
|
|
376
|
-
catch (err) {
|
|
377
|
-
console.error("Error calling close() on DB client:", err);
|
|
378
|
-
}
|
|
379
|
-
}
|
|
380
|
-
// Try db.end()
|
|
381
|
-
if (!closed) {
|
|
382
|
-
try {
|
|
383
|
-
if (typeof db.end === "function") {
|
|
384
|
-
await db.end();
|
|
385
|
-
closed = true;
|
|
386
|
-
console.log("Database connection closed via end().");
|
|
387
|
-
}
|
|
388
|
-
}
|
|
389
|
-
catch (err) {
|
|
390
|
-
console.error("Error calling end() on DB client:", err);
|
|
391
|
-
}
|
|
392
|
-
}
|
|
393
|
-
// Try db.client?.close()
|
|
394
|
-
if (!closed) {
|
|
395
|
-
try {
|
|
396
|
-
const clientClose = db.client && db.client.close;
|
|
397
|
-
if (clientClose && typeof clientClose === "function") {
|
|
398
|
-
await db.client.close();
|
|
399
|
-
closed = true;
|
|
400
|
-
console.log("Database connection closed via db.client.close().");
|
|
401
|
-
}
|
|
402
|
-
}
|
|
403
|
-
catch (err) {
|
|
404
|
-
console.error("Error calling db.client.close() on DB client:", err);
|
|
405
|
-
}
|
|
406
|
-
}
|
|
407
|
-
// Try db.s?.client?.close() (internal Mongo client path)
|
|
408
|
-
if (!closed) {
|
|
409
|
-
try {
|
|
410
|
-
const maybeInternal = db.s && db.s.client && db.s.client.close;
|
|
411
|
-
if (maybeInternal && typeof maybeInternal === "function") {
|
|
412
|
-
await db.s.client.close();
|
|
413
|
-
closed = true;
|
|
414
|
-
console.log("Database connection closed via db.s.client.close().");
|
|
415
|
-
}
|
|
416
|
-
}
|
|
417
|
-
catch (err) {
|
|
418
|
-
console.error("Error calling db.s.client.close() on DB client:", err);
|
|
419
|
-
}
|
|
420
|
-
}
|
|
421
|
-
if (!closed) {
|
|
422
|
-
console.warn("Could not find a supported close method on the DB client; connection may remain open.");
|
|
423
|
-
}
|
|
424
|
-
}
|
|
425
|
-
// Remove signal handlers registered by this instance
|
|
426
|
-
try {
|
|
427
|
-
if (this._sigintHandler) {
|
|
428
|
-
process.removeListener("SIGINT", this._sigintHandler);
|
|
429
|
-
this._sigintHandler = undefined;
|
|
430
|
-
}
|
|
431
|
-
if (this._sigtermHandler) {
|
|
432
|
-
process.removeListener("SIGTERM", this._sigtermHandler);
|
|
433
|
-
this._sigtermHandler = undefined;
|
|
434
|
-
}
|
|
435
|
-
}
|
|
436
|
-
catch (err) {
|
|
437
|
-
// ignore errors while removing listeners
|
|
438
|
-
}
|
|
439
|
-
}
|
|
440
|
-
}
|
|
441
|
-
exports.ArcanaJSServer = ArcanaJSServer;
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
class ControllerBinder {
|
|
4
|
-
static handle(controller, method) {
|
|
5
|
-
// Instantiate the controller once (Singleton pattern) for performance
|
|
6
|
-
// This assumes controllers are stateless, which is best practice.
|
|
7
|
-
let instance;
|
|
8
|
-
try {
|
|
9
|
-
instance = new controller();
|
|
10
|
-
}
|
|
11
|
-
catch (e) {
|
|
12
|
-
// Fallback if controller is not a class or fails to instantiate
|
|
13
|
-
console.warn(`Failed to instantiate controller ${controller.name}`, e);
|
|
14
|
-
instance = controller;
|
|
15
|
-
}
|
|
16
|
-
return async (req, res, next) => {
|
|
17
|
-
try {
|
|
18
|
-
// Call the method
|
|
19
|
-
if (typeof instance[method] === "function") {
|
|
20
|
-
await instance[method](req, res, next);
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
throw new Error(`Method ${method} not found on controller ${controller.name}`);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
catch (error) {
|
|
27
|
-
next(error);
|
|
28
|
-
}
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
exports.default = ControllerBinder;
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createCsrfMiddleware = void 0;
|
|
7
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
8
|
-
const CSRF_COOKIE_NAME = "_csrf";
|
|
9
|
-
const createCsrfMiddleware = () => {
|
|
10
|
-
return (req, res, next) => {
|
|
11
|
-
// 1. Generate or retrieve token
|
|
12
|
-
let token = req.cookies[CSRF_COOKIE_NAME];
|
|
13
|
-
if (!token) {
|
|
14
|
-
token = crypto_1.default.randomBytes(32).toString("hex");
|
|
15
|
-
res.cookie(CSRF_COOKIE_NAME, token, {
|
|
16
|
-
httpOnly: true,
|
|
17
|
-
secure: process.env.NODE_ENV === "production",
|
|
18
|
-
sameSite: "strict",
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
// 2. Expose token to the response locals (for injection into the view)
|
|
22
|
-
res.locals.csrfToken = token;
|
|
23
|
-
// 3. Verify token on state-changing methods
|
|
24
|
-
const method = req.method.toUpperCase();
|
|
25
|
-
if (["POST", "PUT", "DELETE", "PATCH"].includes(method)) {
|
|
26
|
-
const headerToken = req.headers["x-csrf-token"];
|
|
27
|
-
if (!headerToken || headerToken !== token) {
|
|
28
|
-
return res.status(403).json({ error: "Invalid CSRF Token" });
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
next();
|
|
32
|
-
};
|
|
33
|
-
};
|
|
34
|
-
exports.createCsrfMiddleware = createCsrfMiddleware;
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createDynamicRouter = void 0;
|
|
4
|
-
const createDynamicRouter = (views) => {
|
|
5
|
-
return (req, res, next) => {
|
|
6
|
-
// Remove leading slash
|
|
7
|
-
let path = req.path.substring(1);
|
|
8
|
-
// Handle root path mapping to "index" if not handled elsewhere
|
|
9
|
-
if (path === "") {
|
|
10
|
-
path = "index";
|
|
11
|
-
}
|
|
12
|
-
// 1. Exact match
|
|
13
|
-
if (views[path]) {
|
|
14
|
-
return res.renderPage(path, {});
|
|
15
|
-
}
|
|
16
|
-
// 2. Dynamic match
|
|
17
|
-
for (const viewName of Object.keys(views)) {
|
|
18
|
-
if (!viewName.includes("["))
|
|
19
|
-
continue;
|
|
20
|
-
// Convert view path to regex
|
|
21
|
-
// e.g., "users/[id]" -> "^users/([^/]+)$"
|
|
22
|
-
// We need to escape special regex characters first, but keep [ and ] for our logic
|
|
23
|
-
// Actually, simpler: split by '/' and match segments
|
|
24
|
-
const pageParts = viewName.split("/");
|
|
25
|
-
const pathParts = path.split("/");
|
|
26
|
-
if (pageParts.length !== pathParts.length)
|
|
27
|
-
continue;
|
|
28
|
-
let match = true;
|
|
29
|
-
const params = {};
|
|
30
|
-
for (let i = 0; i < pageParts.length; i++) {
|
|
31
|
-
const pagePart = pageParts[i];
|
|
32
|
-
const pathPart = pathParts[i];
|
|
33
|
-
if (pagePart.startsWith("[") && pagePart.endsWith("]")) {
|
|
34
|
-
const paramName = pagePart.slice(1, -1);
|
|
35
|
-
params[paramName] = pathPart;
|
|
36
|
-
}
|
|
37
|
-
else if (pagePart !== pathPart) {
|
|
38
|
-
match = false;
|
|
39
|
-
break;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
if (match) {
|
|
43
|
-
return res.renderPage(viewName, {}, params);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
// If not found, pass to the next middleware (usually 404 handler)
|
|
47
|
-
next();
|
|
48
|
-
};
|
|
49
|
-
};
|
|
50
|
-
exports.createDynamicRouter = createDynamicRouter;
|