@yinuo-ngm/server 1.0.15 → 1.0.16

package/lib/plugins/error-handler.plugin.js

@@ -89,6 +89,11 @@ exports.ERROR_STATUS = {
     SPRITE_CONFIG_NOT_FOUND: 404,
     SPRITE_ICONS_ROOT_NOT_FOUND: 404,
     SPRITE_GROUP_NOT_FOUND: 404,
+    NO_VERSION_MANAGER: 503,
+    NO_AVAILABLE_VERSIONS: 409,
+    VERSION_REQUIRED: 400,
+    PROJECT_PATH_REQUIRED: 400,
+    SWITCH_VERSION_FAILED: 500,
 };
 function mapStatus(code) {
     return exports.ERROR_STATUS[code] ?? 400;

package/lib/routes/api-client/hub-token.routes.js

@@ -93,6 +93,28 @@ async function apiClientHubTokenRoutes(fastify) {
         }
         return reply.status(response.status).send(node_stream_1.Readable.fromWeb(body));
     });
+    fastify.get("/projects/:projectId/rd-items/:itemId/uploads/:uploadId/raw", async (req, reply) => {
+        const params = (req.params ?? {});
+        const projectId = normalizeNonEmptyString(params.projectId, "projectId");
+        const itemId = normalizeNonEmptyString(params.itemId, "itemId");
+        const uploadId = normalizeNonEmptyString(params.uploadId, "uploadId");
+        const { baseUrl, token, projectKey } = await resolveHubTokenConfig(fastify, { projectId }, "project");
+        const normalizedPath = normalizeHubTokenPath(`/rd-items/${itemId}/uploads/${uploadId}/raw`, projectKey);
+        const response = await requestHubApiRaw(baseUrl, "/api/token", token, "GET", normalizedPath);
+        if (!response.ok) {
+            const payload = await parseJson(response);
+            throw new core_1.AppError("BAD_REQUEST", payload?.message || `hub-v2 request failed (${response.status})`, {
+                status: response.status,
+                response: payload,
+            });
+        }
+        copyRawResponseHeaders(response, reply);
+        const body = response.body;
+        if (!body) {
+            return reply.status(response.status).send();
+        }
+        return reply.status(response.status).send(node_stream_1.Readable.fromWeb(body));
+    });
     fastify.post("/request", async (req) => {
         const body = (req.body ?? {});
         const path = normalizeNonEmptyString(body.path, "path");

package/lib/routes/index.js

@@ -19,6 +19,7 @@ const svn_routes_1 = __importDefault(require("./svn.routes"));
 const sprite_browse_routes_1 = __importDefault(require("./sprite-browse.routes"));
 const static_files_routes_1 = __importDefault(require("./static-files.routes"));
 const hub_routes_1 = __importDefault(require("./hub.routes"));
+const node_version_routes_1 = __importDefault(require("./node-version.routes"));
 async function routes(fastify) {
     await fastify.register(system_routes_1.default);
     await fastify.register(task_routes_1.default, { prefix: '/api/tasks' });
@@ -40,4 +41,5 @@ async function routes(fastify) {
     await fastify.register(api_client_1.apiClientCollectionsRoutes, { prefix: '/api/client/collections' });
     await fastify.register(api_client_1.apiClientHubTokenRoutes, { prefix: '/api/client/hub-token' });
     await fastify.register(nginx_routes_1.nginxRoutes, { prefix: '/api/nginx' });
+    await fastify.register(node_version_routes_1.default, { prefix: '/api/node-version' });
 }

package/lib/routes/node-version.routes.d.ts

@@ -0,0 +1,2 @@
+import type { FastifyInstance } from 'fastify';
+export default function nodeVersionRoutes(fastify: FastifyInstance): Promise<void>;

package/lib/routes/node-version.routes.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = nodeVersionRoutes;
+const core_1 = require("@yinuo-ngm/core");
+async function nodeVersionRoutes(fastify) {
+    fastify.get('/current', async () => {
+        const service = fastify.core.nodeVersion;
+        return await service.getCurrentVersion();
+    });
+    fastify.post('/switch', async (req) => {
+        const { version } = req.body || {};
+        if (!version) {
+            throw new core_1.AppError('VERSION_REQUIRED', '请指定要切换的 Node 版本', {});
+        }
+        const service = fastify.core.nodeVersion;
+        return await service.switchVersion(version);
+    });
+    fastify.post('/project-requirement', async (req) => {
+        const { projectPath } = req.body || {};
+        if (!projectPath) {
+            throw new core_1.AppError('PROJECT_PATH_REQUIRED', '请指定项目路径', {});
+        }
+        const service = fastify.core.nodeVersion;
+        return await service.detectProjectRequirement(projectPath);
+    });
+    fastify.post('/install', async (req) => {
+        const { version } = req.body || {};
+        if (!version) {
+            throw new core_1.AppError('VERSION_REQUIRED', '请指定要安装的 Node 版本', {});
+        }
+        const service = fastify.core.nodeVersion;
+        const result = await service.installNodeVersion(version);
+        return result;
+    });
+    fastify.post('/uninstall', async (req) => {
+        const { version } = req.body || {};
+        if (!version) {
+            throw new core_1.AppError('VERSION_REQUIRED', '请指定要卸载的 Node 版本', {});
+        }
+        const service = fastify.core.nodeVersion;
+        const success = await service.uninstallNodeVersion(version);
+        return { success };
+    });
+    fastify.post('/write-engine-config', async (req) => {
+        const { projectPath, version } = req.body || {};
+        if (!projectPath) {
+            throw new core_1.AppError('PROJECT_PATH_REQUIRED', '请指定项目路径', {});
+        }
+        if (!version) {
+            throw new core_1.AppError('VERSION_REQUIRED', '请指定版本要求', {});
+        }
+        const service = fastify.core.nodeVersion;
+        const success = await service.writeEngineConfig(projectPath, version);
+        return { success };
+    });
+}

package/lib/routes/project.routes.js

@@ -152,6 +152,11 @@ async function projectRoutes(fastify) {
         const updated = await fastify.core.project.rename(id, body.name.trim());
         return updated;
     });
+    fastify.post("/refreshScripts/:id", async (req) => {
+        const { id } = req.params;
+        const updated = await fastify.core.project.refreshScripts(id);
+        return updated;
+    });
     fastify.post("/edit/:id", async (req) => {
         const { id } = req.params;
         const body = req.body;

package/lib/routes/sprite-browse.routes.js

@@ -48,26 +48,40 @@ async function spriteBrowseRoutes(fastify) {
     fastify.get("/icons/groups/:projectId", async (req) => {
         const { projectId } = req.params;
         const project = await fastify.core.project.get(projectId);
-        const root = project?.assets?.iconsSvn?.localDir;
+        const cfg = await fastify.core.sprite.getConfig(projectId);
+        const localRoot = String(cfg?.localImageRoot ?? "").trim();
+        const root = localRoot || project?.assets?.iconsSvn?.localDir;
         if (!root) {
             return { root: "", entries: [] };
         }
-        return { root, entries: listDir(root).filter(e => e.kind === "dir") };
+        const entries = listDir(root).filter(e => e.kind === "dir");
+        if (localRoot) {
+            const rootFiles = listDir(root).filter((e) => e.kind === "file" && (e.ext === ".png" || e.ext === ".svg"));
+            if (rootFiles.length > 0) {
+                entries.unshift({ name: "root", kind: "dir", ext: undefined });
+            }
+        }
+        return { root, entries };
     });
     fastify.get("/icons/files/:projectId", async (req) => {
         const { projectId } = req.params;
         const group = req.query?.group;
         const project = await fastify.core.project.get(projectId);
-        const root = project?.assets?.iconsSvn?.localDir;
+        const cfg = await fastify.core.sprite.getConfig(projectId);
+        const localRoot = String(cfg?.localImageRoot ?? "").trim();
+        const root = localRoot || project?.assets?.iconsSvn?.localDir;
         if (!root) {
             return { root: "", entries: [] };
         }
-        const groupDir = safeJoin(root, group || '');
+        const isRootGroup = !!localRoot && (group === "root");
+        const groupDir = isRootGroup ? root : safeJoin(root, group || '');
         const entries = listDir(groupDir)
             .filter(e => e.kind === "file")
             .map(e => ({
             ...e,
-            url: `/api/static/svn/${projectId}/icons/${group}/${e.name}`,
+            url: localRoot
+                ? `/api/static/local/${projectId}/${isRootGroup ? e.name : `${group}/${e.name}`}`
+                : `/api/static/svn/${projectId}/icons/${group}/${e.name}`,
         }));
         return { root: groupDir, entries };
     });

package/lib/routes/sprite.routes.js

@@ -14,26 +14,30 @@ async function spriteRoutes(fastify) {
     fastify.post("/config/:projectId", async (req) => {
         const { projectId } = req.params;
         const body = req.body;
-        if (!body || !body.config || !body.assets) {
-            throw new core_1.AppError('BAD_REQUEST', 'Missing config or assets in request body');
+        if (!body || !body.config) {
+            throw new core_1.AppError('BAD_REQUEST', 'Missing config in request body');
         }
         const nextCfg = body.config;
-        const nextAssets = body.assets;
-        if (!nextAssets.iconsSvn) {
-            throw new core_1.AppError('BAD_REQUEST', 'iconsSvn asset is required');
+        const nextAssets = body.assets || {};
+        const hasLocalImageRoot = !!String(nextCfg.localImageRoot ?? "").trim();
+        if (!nextAssets.iconsSvn && !hasLocalImageRoot) {
+            throw new core_1.AppError('BAD_REQUEST', 'iconsSvn asset or localImageRoot is required');
         }
-        if (nextCfg.localDir) {
+        if (nextCfg.localDir && nextAssets.iconsSvn) {
             nextAssets.iconsSvn.localDir = node_path_1.default.join(nextCfg.localDir, nextAssets.iconsSvn.label || 'icons');
             if (nextAssets.cutImageSvn) {
                 nextAssets.cutImageSvn.localDir = node_path_1.default.join(nextCfg.localDir, nextAssets.cutImageSvn.label || 'images');
             }
         }
-        const p = await fastify.core.project.updateAssets(projectId, nextAssets);
-        if (p.assets?.iconsSvn) {
-            nextCfg.sourceId = p.assets.iconsSvn.id;
+        const shouldUpdateAssets = !!(nextAssets.iconsSvn || nextAssets.cutImageSvn);
+        const project = shouldUpdateAssets
+            ? await fastify.core.project.updateAssets(projectId, nextAssets)
+            : await fastify.core.project.get(projectId);
+        if (project.assets?.iconsSvn) {
+            nextCfg.sourceId = project.assets.iconsSvn.id;
         }
         const cfg = await fastify.core.sprite.createConfig(projectId, nextCfg);
-        return { cfg, project: p };
+        return { cfg, project };
     });
     fastify.post("/generate/:projectId", async (req) => {
         const { projectId } = req.params;
@@ -48,6 +52,8 @@ async function spriteRoutes(fastify) {
     });
     fastify.get("/list/:projectId", async (req) => {
         const { projectId } = req.params;
-        return await fastify.core.sprite.getSprites(projectId);
+        const query = req.query;
+        const local = String(query['local'] ?? '').toLowerCase() === 'true';
+        return await fastify.core.sprite.getSprites(projectId, local);
     });
 }

package/lib/routes/static-files.routes.js

@@ -80,4 +80,20 @@ async function staticFileRoutes(fastify) {
         reply.header("Content-Type", ct);
         return reply.send((0, node_fs_1.createReadStream)(filePath));
     });
+    fastify.get("/local/:projectId/*", async (req, reply) => {
+        const { projectId } = req.params;
+        const file = req.params["*"];
+        const cfg = await fastify.core.sprite.getConfig(projectId);
+        const root = String(cfg?.localImageRoot ?? "").trim();
+        if (!root) {
+            throw new core_1.AppError("ASSET_NOT_FOUND", "localImageRoot not configured");
+        }
+        const filePath = safeJoin(root, file);
+        if (!node_fs_1.default.existsSync(filePath)) {
+            throw new core_1.AppError("NOT_FOUND", "Requested file not found in local folder");
+        }
+        const ct = mime_types_1.default.lookup(filePath) || "application/octet-stream";
+        reply.header("Content-Type", ct);
+        return reply.send((0, node_fs_1.createReadStream)(filePath));
+    });
 }

package/lib/routes/task.routes.js

@@ -32,6 +32,13 @@ async function taskRoutes(fastify) {
             throw new core_1.AppError("TASK_ID_REQUIRED", "taskId is required", { body });
         return await fastify.core.task.stop(taskId);
     });
+    fastify.post("/restart", async (req) => {
+        const body = req.body;
+        const taskId = body?.taskId?.trim();
+        if (!taskId)
+            throw new core_1.AppError("TASK_ID_REQUIRED", "taskId is required", { body });
+        return await fastify.core.task.restart(taskId);
+    });
     fastify.get("/status/:taskId", async (req) => {
         const { taskId } = req.params;
         return await fastify.core.task.status(taskId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yinuo-ngm/server",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "a server package for Yinuo NG Manager",
   "author": "ZhangJing <892295834@qq.com>",
   "license": "ISC",
@@ -23,7 +23,7 @@
     "@fastify/static": "^9.0.0",
     "@fastify/websocket": "^11.2.0",
     "@yinuo-ngm/api": "^0.1.5",
-    "@yinuo-ngm/core": "^0.1.7",
+    "@yinuo-ngm/core": "^0.1.8",
     "@yinuo-ngm/nginx": "^0.1.1",
     "fastify": "^5.6.2",
     "fastify-plugin": "^5.1.0",
@@ -36,5 +36,5 @@
     "@types/mime-types": "^3.0.1",
     "tsx": "^4.21.0"
   },
-  "gitHead": "07115817f081c29298fc745d2e00ecdae3327a32"
+  "gitHead": "a460311e2e16b1287561f722b184d3533dc2849a"
 }

package/www/3rdpartylicenses.txt

@@ -509,32 +509,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
---------------------------------------------------------------------------------
-Package: date-fns
-License: "MIT"
-
-MIT License
-
-Copyright (c) 2021 Sasha Koss and Lesha Koss https://kossnocorp.mit-license.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 --------------------------------------------------------------------------------
 Package: @angular/router
 License: "MIT"
@@ -561,22 +535,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
---------------------------------------------------------------------------------
-Package: tslib
-License: "0BSD"
-
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------
 Package: rxjs
 License: "Apache-2.0"
@@ -785,29 +743,19 @@ License: "Apache-2.0"
  
 
 --------------------------------------------------------------------------------
-Package: @angular/compiler
-License: "MIT"
-
-The MIT License
-
-Copyright (c) 2010-2025 Google LLC. https://angular.dev/license
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Package: tslib
+License: "0BSD"
 
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 --------------------------------------------------------------------------------