@naisys/erp 3.0.0-beta.6 → 3.0.0-beta.8
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/client-dist/assets/{index-Dffms7F_.js → index-C9uuPHLH.js} +4 -4
- package/client-dist/index.html +1 -1
- package/dist/api-reference.js +3 -3
- package/dist/auth-middleware.js +4 -4
- package/dist/erpServer.js +37 -37
- package/dist/hateoas.js +1 -1
- package/dist/routes/admin.js +1 -1
- package/dist/routes/root.js +14 -14
- package/package.json +6 -6
package/client-dist/index.html
CHANGED
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
<meta name="format-detection" content="telephone=no" />
|
|
34
34
|
|
|
35
35
|
<title>NAISYS ERP</title>
|
|
36
|
-
<script type="module" crossorigin src="/erp/assets/index-
|
|
36
|
+
<script type="module" crossorigin src="/erp/assets/index-C9uuPHLH.js"></script>
|
|
37
37
|
<link rel="stylesheet" crossorigin href="/erp/assets/index-45dVo30p.css">
|
|
38
38
|
</head>
|
|
39
39
|
<body>
|
package/dist/api-reference.js
CHANGED
|
@@ -10,11 +10,11 @@ import path from "path";
|
|
|
10
10
|
*/
|
|
11
11
|
export function registerApiReference(fastify) {
|
|
12
12
|
// Serve ERP OpenAPI spec filtered to ERP paths only
|
|
13
|
-
fastify.get("/api/
|
|
13
|
+
fastify.get("/erp/api/openapi.json", () => {
|
|
14
14
|
const spec = fastify.swagger();
|
|
15
15
|
const filteredPaths = {};
|
|
16
16
|
for (const [p, value] of Object.entries(spec.paths || {})) {
|
|
17
|
-
if (p.startsWith("/api/
|
|
17
|
+
if (p.startsWith("/erp/api/")) {
|
|
18
18
|
filteredPaths[p] = value;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -90,7 +90,7 @@ export function registerApiReference(fastify) {
|
|
|
90
90
|
<script src="/erp/api-reference/js/scalar.js"><\/script>
|
|
91
91
|
<script type="text/javascript">
|
|
92
92
|
Scalar.createApiReference('#app', {
|
|
93
|
-
url: "/api/
|
|
93
|
+
url: "/erp/api/openapi.json",
|
|
94
94
|
theme: "kepler"
|
|
95
95
|
})
|
|
96
96
|
<\/script>
|
package/dist/auth-middleware.js
CHANGED
|
@@ -4,7 +4,7 @@ import { findAgentByApiKey } from "@naisys/hub-database";
|
|
|
4
4
|
import { findSession, findUserByApiKey } from "@naisys/supervisor-database";
|
|
5
5
|
import erpDb from "./erpDb.js";
|
|
6
6
|
import { isSupervisorAuth } from "./supervisorAuth.js";
|
|
7
|
-
const PUBLIC_PREFIXES = ["/api/
|
|
7
|
+
const PUBLIC_PREFIXES = ["/erp/api/auth/login", "/erp/api/client-config"];
|
|
8
8
|
export const authCache = new AuthCache();
|
|
9
9
|
async function loadPermissions(userId) {
|
|
10
10
|
const perms = await erpDb.userPermission.findMany({
|
|
@@ -41,7 +41,7 @@ export function requirePermission(permission) {
|
|
|
41
41
|
}
|
|
42
42
|
function isPublicRoute(url) {
|
|
43
43
|
// Exact match: API root
|
|
44
|
-
if (url === "/api/
|
|
44
|
+
if (url === "/erp/api/" || url === "/erp/api")
|
|
45
45
|
return true;
|
|
46
46
|
// Prefix matches
|
|
47
47
|
for (const prefix of PUBLIC_PREFIXES) {
|
|
@@ -49,10 +49,10 @@ function isPublicRoute(url) {
|
|
|
49
49
|
return true;
|
|
50
50
|
}
|
|
51
51
|
// Schema routes
|
|
52
|
-
if (url.startsWith("/api/
|
|
52
|
+
if (url.startsWith("/erp/api/schemas"))
|
|
53
53
|
return true;
|
|
54
54
|
// Non-ERP-API paths (static files, supervisor routes, etc.)
|
|
55
|
-
if (!url.startsWith("/api
|
|
55
|
+
if (!url.startsWith("/erp/api"))
|
|
56
56
|
return true;
|
|
57
57
|
return false;
|
|
58
58
|
}
|
package/dist/erpServer.js
CHANGED
|
@@ -75,7 +75,7 @@ export const erpPlugin = async (fastify) => {
|
|
|
75
75
|
await fastify.register(rateLimit, {
|
|
76
76
|
max: 500,
|
|
77
77
|
timeWindow: "1 minute",
|
|
78
|
-
allowList: (request) => !request.url.
|
|
78
|
+
allowList: (request) => !request.url.match(/^\/(supervisor|erp)\/api\//),
|
|
79
79
|
});
|
|
80
80
|
// Auto-migrate ERP database
|
|
81
81
|
const erpServerDir = path.join(__dirname, "..");
|
|
@@ -107,7 +107,7 @@ export const erpPlugin = async (fastify) => {
|
|
|
107
107
|
const erpFileLogger = pino({ level: "info" }, pino.destination({ dest: erpLogDest, mkdir: true }));
|
|
108
108
|
erpFileLogger.info("ERP plugin initialized");
|
|
109
109
|
fastify.addHook("onResponse", async (request, reply) => {
|
|
110
|
-
if (!request.url.startsWith("/api
|
|
110
|
+
if (!request.url.startsWith("/erp/api"))
|
|
111
111
|
return;
|
|
112
112
|
const logFn = reply.statusCode >= 400 ? erpFileLogger.error : erpFileLogger.info;
|
|
113
113
|
logFn.call(erpFileLogger, {
|
|
@@ -116,90 +116,90 @@ export const erpPlugin = async (fastify) => {
|
|
|
116
116
|
}, `${request.method} ${request.url}`);
|
|
117
117
|
});
|
|
118
118
|
fastify.addHook("onError", async (request, _reply, error) => {
|
|
119
|
-
if (!request.url.startsWith("/api
|
|
119
|
+
if (!request.url.startsWith("/erp/api"))
|
|
120
120
|
return;
|
|
121
121
|
erpFileLogger.error({
|
|
122
122
|
err: { message: error.message, stack: error.stack },
|
|
123
123
|
}, `${request.method} ${request.url} error`);
|
|
124
124
|
});
|
|
125
125
|
}
|
|
126
|
-
// API routes under /api
|
|
127
|
-
fastify.register(adminRoutes, { prefix: "/api/
|
|
128
|
-
fastify.register(auditRoutes, { prefix: "/api/
|
|
129
|
-
fastify.register(authRoutes, { prefix: "/api/
|
|
130
|
-
fastify.register(dispatchRoutes, { prefix: "/api/
|
|
131
|
-
fastify.register(inventoryRoutes, { prefix: "/api/
|
|
132
|
-
fastify.register(rootRoute, { prefix: "/api
|
|
133
|
-
fastify.register(itemRoutes, { prefix: "/api/
|
|
126
|
+
// API routes under /erp/api prefix
|
|
127
|
+
fastify.register(adminRoutes, { prefix: "/erp/api/admin" });
|
|
128
|
+
fastify.register(auditRoutes, { prefix: "/erp/api/audit" });
|
|
129
|
+
fastify.register(authRoutes, { prefix: "/erp/api/auth" });
|
|
130
|
+
fastify.register(dispatchRoutes, { prefix: "/erp/api/dispatch" });
|
|
131
|
+
fastify.register(inventoryRoutes, { prefix: "/erp/api/inventory" });
|
|
132
|
+
fastify.register(rootRoute, { prefix: "/erp/api" });
|
|
133
|
+
fastify.register(itemRoutes, { prefix: "/erp/api/items" });
|
|
134
134
|
fastify.register(itemFieldRoutes, {
|
|
135
|
-
prefix: "/api/
|
|
135
|
+
prefix: "/erp/api/items/:key/fields",
|
|
136
136
|
});
|
|
137
137
|
fastify.register(itemInstanceRoutes, {
|
|
138
|
-
prefix: "/api/
|
|
138
|
+
prefix: "/erp/api/items/:key/instances",
|
|
139
139
|
});
|
|
140
140
|
fastify.register(orderRoutes, {
|
|
141
|
-
prefix: "/api/
|
|
141
|
+
prefix: "/erp/api/orders",
|
|
142
142
|
});
|
|
143
143
|
fastify.register(orderRevisionRoutes, {
|
|
144
|
-
prefix: "/api/
|
|
144
|
+
prefix: "/erp/api/orders/:orderKey/revs",
|
|
145
145
|
});
|
|
146
146
|
fastify.register(orderRevisionTransitionRoutes, {
|
|
147
|
-
prefix: "/api/
|
|
147
|
+
prefix: "/erp/api/orders/:orderKey/revs",
|
|
148
148
|
});
|
|
149
149
|
fastify.register(orderRunRoutes, {
|
|
150
|
-
prefix: "/api/
|
|
150
|
+
prefix: "/erp/api/orders/:orderKey/runs",
|
|
151
151
|
});
|
|
152
152
|
fastify.register(orderRunTransitionRoutes, {
|
|
153
|
-
prefix: "/api/
|
|
153
|
+
prefix: "/erp/api/orders/:orderKey/runs",
|
|
154
154
|
});
|
|
155
155
|
fastify.register(operationRoutes, {
|
|
156
|
-
prefix: "/api/
|
|
156
|
+
prefix: "/erp/api/orders/:orderKey/revs/:revNo/ops",
|
|
157
157
|
});
|
|
158
158
|
fastify.register(operationDependencyRoutes, {
|
|
159
|
-
prefix: "/api/
|
|
159
|
+
prefix: "/erp/api/orders/:orderKey/revs/:revNo/ops/:seqNo/deps",
|
|
160
160
|
});
|
|
161
161
|
fastify.register(operationFieldRefRoutes, {
|
|
162
|
-
prefix: "/api/
|
|
162
|
+
prefix: "/erp/api/orders/:orderKey/revs/:revNo/ops/:seqNo/field-refs",
|
|
163
163
|
});
|
|
164
164
|
fastify.register(operationRunRoutes, {
|
|
165
|
-
prefix: "/api/
|
|
165
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops",
|
|
166
166
|
});
|
|
167
167
|
fastify.register(operationRunTransitionRoutes, {
|
|
168
|
-
prefix: "/api/
|
|
168
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops",
|
|
169
169
|
});
|
|
170
170
|
fastify.register(laborTicketRoutes, {
|
|
171
|
-
prefix: "/api/
|
|
171
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/labor",
|
|
172
172
|
});
|
|
173
173
|
fastify.register(operationRunCommentRoutes, {
|
|
174
|
-
prefix: "/api/
|
|
174
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/comments",
|
|
175
175
|
});
|
|
176
176
|
fastify.register(stepRunRoutes, {
|
|
177
|
-
prefix: "/api/
|
|
177
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/steps",
|
|
178
178
|
});
|
|
179
179
|
fastify.register(stepRunTransitionRoutes, {
|
|
180
|
-
prefix: "/api/
|
|
180
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/steps",
|
|
181
181
|
});
|
|
182
182
|
fastify.register(stepRunFieldRoutes, {
|
|
183
|
-
prefix: "/api/
|
|
183
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/steps",
|
|
184
184
|
});
|
|
185
185
|
fastify.register(stepFieldAttachmentRoutes, {
|
|
186
|
-
prefix: "/api/
|
|
186
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/steps/:stepSeqNo/fields/:fieldSeqNo/attachments",
|
|
187
187
|
});
|
|
188
188
|
fastify.register(stepFieldAttachmentRoutes, {
|
|
189
|
-
prefix: "/api/
|
|
189
|
+
prefix: "/erp/api/orders/:orderKey/runs/:runNo/ops/:seqNo/steps/:stepSeqNo/sets/:setIndex/fields/:fieldSeqNo/attachments",
|
|
190
190
|
});
|
|
191
191
|
fastify.register(stepRoutes, {
|
|
192
|
-
prefix: "/api/
|
|
192
|
+
prefix: "/erp/api/orders/:orderKey/revs/:revNo/ops/:seqNo/steps",
|
|
193
193
|
});
|
|
194
194
|
fastify.register(stepFieldRoutes, {
|
|
195
|
-
prefix: "/api/
|
|
195
|
+
prefix: "/erp/api/orders/:orderKey/revs/:revNo/ops/:seqNo/steps/:stepSeqNo/fields",
|
|
196
196
|
});
|
|
197
|
-
fastify.register(schemaRoutes, { prefix: "/api/
|
|
198
|
-
fastify.register(userRoutes, { prefix: "/api/
|
|
199
|
-
fastify.register(userPermissionRoutes, { prefix: "/api/
|
|
200
|
-
fastify.register(workCenterRoutes, { prefix: "/api/
|
|
197
|
+
fastify.register(schemaRoutes, { prefix: "/erp/api/schemas" });
|
|
198
|
+
fastify.register(userRoutes, { prefix: "/erp/api/users" });
|
|
199
|
+
fastify.register(userPermissionRoutes, { prefix: "/erp/api/users" });
|
|
200
|
+
fastify.register(workCenterRoutes, { prefix: "/erp/api/work-centers" });
|
|
201
201
|
// Public endpoint to expose client configuration (publicRead, etc.)
|
|
202
|
-
fastify.get("/api/
|
|
202
|
+
fastify.get("/erp/api/client-config", { schema: { hide: true } }, () => ({
|
|
203
203
|
publicRead: process.env.PUBLIC_READ === "true",
|
|
204
204
|
supervisorAuth: isSupervisorAuth(),
|
|
205
205
|
}));
|
package/dist/hateoas.js
CHANGED
package/dist/routes/admin.js
CHANGED
|
@@ -8,7 +8,7 @@ import erpDb from "../erpDb.js";
|
|
|
8
8
|
import { notFound } from "../error-handler.js";
|
|
9
9
|
import { paginationLinks } from "../hateoas.js";
|
|
10
10
|
import { getErpLogPath, tailLogFile } from "../services/log-file-service.js";
|
|
11
|
-
const API_PREFIX = "/api
|
|
11
|
+
const API_PREFIX = "/erp/api";
|
|
12
12
|
function adminActions(hasAdminPermission) {
|
|
13
13
|
const actions = [];
|
|
14
14
|
if (hasAdminPermission) {
|
package/dist/routes/root.js
CHANGED
|
@@ -15,25 +15,25 @@ export default function rootRoute(fastify) {
|
|
|
15
15
|
const readLinks = [
|
|
16
16
|
{
|
|
17
17
|
rel: "orders",
|
|
18
|
-
href: "/api/
|
|
18
|
+
href: "/erp/api/orders",
|
|
19
19
|
title: "Orders",
|
|
20
20
|
method: "GET",
|
|
21
21
|
},
|
|
22
22
|
{
|
|
23
23
|
rel: "items",
|
|
24
|
-
href: "/api/
|
|
24
|
+
href: "/erp/api/items",
|
|
25
25
|
title: "Items",
|
|
26
26
|
method: "GET",
|
|
27
27
|
},
|
|
28
28
|
{
|
|
29
29
|
rel: "dispatch",
|
|
30
|
-
href: "/api/
|
|
30
|
+
href: "/erp/api/dispatch",
|
|
31
31
|
title: "Dispatch (open order runs)",
|
|
32
32
|
method: "GET",
|
|
33
33
|
},
|
|
34
34
|
{
|
|
35
35
|
rel: "schemas",
|
|
36
|
-
href: "/api/
|
|
36
|
+
href: "/erp/api/schemas/",
|
|
37
37
|
title: "Schema Catalog",
|
|
38
38
|
},
|
|
39
39
|
{
|
|
@@ -46,31 +46,31 @@ export default function rootRoute(fastify) {
|
|
|
46
46
|
const authLinks = [
|
|
47
47
|
{
|
|
48
48
|
rel: "self",
|
|
49
|
-
href: "/api/
|
|
49
|
+
href: "/erp/api/",
|
|
50
50
|
title: "API Root",
|
|
51
51
|
},
|
|
52
52
|
{
|
|
53
53
|
rel: "me",
|
|
54
|
-
href: "/api/
|
|
54
|
+
href: "/erp/api/auth/me",
|
|
55
55
|
title: "Current User",
|
|
56
56
|
},
|
|
57
57
|
...readLinks,
|
|
58
58
|
];
|
|
59
59
|
authLinks.push({
|
|
60
60
|
rel: "work-centers",
|
|
61
|
-
href: "/api/
|
|
61
|
+
href: "/erp/api/work-centers",
|
|
62
62
|
title: "Work Centers",
|
|
63
63
|
method: "GET",
|
|
64
64
|
});
|
|
65
65
|
if (hasPermission(request.erpUser, "erp_admin")) {
|
|
66
66
|
authLinks.push({
|
|
67
67
|
rel: "users",
|
|
68
|
-
href: "/api/
|
|
68
|
+
href: "/erp/api/users",
|
|
69
69
|
title: "Users",
|
|
70
70
|
method: "GET",
|
|
71
71
|
}, {
|
|
72
72
|
rel: "admin",
|
|
73
|
-
href: "/api/
|
|
73
|
+
href: "/erp/api/admin",
|
|
74
74
|
title: "Admin",
|
|
75
75
|
method: "GET",
|
|
76
76
|
});
|
|
@@ -81,7 +81,7 @@ export default function rootRoute(fastify) {
|
|
|
81
81
|
_actions: [
|
|
82
82
|
{
|
|
83
83
|
rel: "logout",
|
|
84
|
-
href: "/api/
|
|
84
|
+
href: "/erp/api/auth/logout",
|
|
85
85
|
method: "POST",
|
|
86
86
|
title: "Logout",
|
|
87
87
|
},
|
|
@@ -93,7 +93,7 @@ export default function rootRoute(fastify) {
|
|
|
93
93
|
_links: [
|
|
94
94
|
{
|
|
95
95
|
rel: "self",
|
|
96
|
-
href: "/api/
|
|
96
|
+
href: "/erp/api/",
|
|
97
97
|
title: "API Root",
|
|
98
98
|
},
|
|
99
99
|
...(publicRead
|
|
@@ -101,7 +101,7 @@ export default function rootRoute(fastify) {
|
|
|
101
101
|
: [
|
|
102
102
|
{
|
|
103
103
|
rel: "schemas",
|
|
104
|
-
href: "/api/
|
|
104
|
+
href: "/erp/api/schemas/",
|
|
105
105
|
title: "Schema Catalog",
|
|
106
106
|
},
|
|
107
107
|
]),
|
|
@@ -109,10 +109,10 @@ export default function rootRoute(fastify) {
|
|
|
109
109
|
_actions: [
|
|
110
110
|
{
|
|
111
111
|
rel: "login",
|
|
112
|
-
href: "/api/
|
|
112
|
+
href: "/erp/api/auth/login",
|
|
113
113
|
method: "POST",
|
|
114
114
|
title: "Login",
|
|
115
|
-
schema: "/api/
|
|
115
|
+
schema: "/erp/api/schemas/LoginRequest",
|
|
116
116
|
body: { username: "", password: "" },
|
|
117
117
|
},
|
|
118
118
|
],
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@naisys/erp",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.8",
|
|
4
4
|
"description": "NAISYS ERP - Web UI for AI-driven order and work management",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/erpServer.js",
|
|
@@ -45,11 +45,11 @@
|
|
|
45
45
|
"@fastify/rate-limit": "^10.3.0",
|
|
46
46
|
"@fastify/static": "^9.0.0",
|
|
47
47
|
"@fastify/swagger": "^9.7.0",
|
|
48
|
-
"@naisys/erp-shared": "3.0.0-beta.
|
|
49
|
-
"@naisys/common": "3.0.0-beta.
|
|
50
|
-
"@naisys/common-node": "3.0.0-beta.
|
|
51
|
-
"@naisys/hub-database": "3.0.0-beta.
|
|
52
|
-
"@naisys/supervisor-database": "3.0.0-beta.
|
|
48
|
+
"@naisys/erp-shared": "3.0.0-beta.8",
|
|
49
|
+
"@naisys/common": "3.0.0-beta.8",
|
|
50
|
+
"@naisys/common-node": "3.0.0-beta.8",
|
|
51
|
+
"@naisys/hub-database": "3.0.0-beta.8",
|
|
52
|
+
"@naisys/supervisor-database": "3.0.0-beta.8",
|
|
53
53
|
"@prisma/adapter-better-sqlite3": "^7.5.0",
|
|
54
54
|
"@prisma/client": "^7.5.0",
|
|
55
55
|
"@scalar/fastify-api-reference": "^1.48.7",
|