@yinuo-ngm/server 1.0.4 → 1.0.6

package/lib/app.js

@@ -12,6 +12,7 @@ const routes_plugin_1 = __importDefault(require("./plugins/routes.plugin"));
 const static_plugin_1 = __importDefault(require("./plugins/static.plugin"));
 const success_handle_plugin_1 = __importDefault(require("./plugins/success-handle.plugin"));
 const ws_plugin_1 = __importDefault(require("./plugins/ws/ws.plugin"));
+const api_client_plugin_1 = __importDefault(require("./plugins/api-client.plugin"));
 function normalizeLogLevel(v) {
     const lv = (v ?? "").toLowerCase().trim();
     if (!lv)
@@ -55,6 +56,7 @@ async function createServer() {
     await fastify.register(success_handle_plugin_1.default);
     await fastify.register(core_plugin_1.default);
     await fastify.register(ws_plugin_1.default);
+    await fastify.register(api_client_plugin_1.default);
     await fastify.register(routes_plugin_1.default);
     await fastify.register(static_plugin_1.default);
     fastify.addHook('onClose', async () => {

package/lib/plugins/api-client.plugin.d.ts

@@ -0,0 +1,3 @@
+import type { FastifyInstance } from "fastify";
+declare const _default: (fastify: FastifyInstance) => Promise<void>;
+export default _default;

package/lib/plugins/api-client.plugin.js

@@ -0,0 +1,56 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const api_1 = require("@yinuo-ngm/api");
+const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
+const path = __importStar(require("path"));
+const env_1 = require("../env");
+const json_collection_repo_1 = require("@yinuo-ngm/api/src/infra/storage/json/json-collection-repo");
+exports.default = (0, fastify_plugin_1.default)(async function apiClientPlugin(fastify) {
+    const rootDir = path.join(env_1.env.dataDir, "api");
+    const repo = new api_1.JsonRequestRepo({ rootDir });
+    const envRepo = new api_1.JsonEnvRepo({ rootDir });
+    const historyRepo = new api_1.JsonHistoryRepo({ rootDir });
+    const collectionRepo = new json_collection_repo_1.JsonCollectionRepo({ rootDir });
+    const http = new api_1.NodeHttpClient();
+    const resolver = new api_1.VariableResolver();
+    const sendService = new api_1.ApiSendService(repo, envRepo, historyRepo, http, resolver);
+    const apiClient = new api_1.ApiClient(repo, envRepo, historyRepo, collectionRepo, sendService);
+    fastify.decorate("api", apiClient);
+    fastify.log.info("[api] api client initialized");
+});

package/lib/plugins/core.plugin.d.ts

@@ -1,9 +1,3 @@
 import type { FastifyInstance } from "fastify";
-import { type CoreApp } from "@yinuo-ngm/core";
-declare module "fastify" {
-    interface FastifyInstance {
-        core: CoreApp;
-    }
-}
 declare const _default: (fastify: FastifyInstance) => Promise<void>;
 export default _default;

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

@@ -103,6 +103,7 @@ exports.errorHandlerPlugin = (0, fastify_plugin_1.default)(async (app) => {
                 .status(400)
                 .send(buildErrorBody(requestId, "VALIDATION_ERROR", "参数不合法", err.validation));
         }
+        console.log('err', err);
         req.log.error({ err, requestId }, "Unhandled error");
         return reply.status(500).send(buildErrorBody(requestId, "INTERNAL_ERROR", "服务异常，请稍后重试"));
     });

package/lib/plugins/routes.plugin.js

@@ -4,15 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
-const routes_1 = require("../routes");
+const routes_1 = __importDefault(require("../routes"));
 exports.default = (0, fastify_plugin_1.default)(async function routesPlugin(fastify) {
-    await fastify.register(routes_1.systemRoutes);
-    await fastify.register(routes_1.taskRoutes, { prefix: '/api/tasks' });
-    await fastify.register(routes_1.projectRoutes, { prefix: '/api/projects' });
-    await fastify.register(routes_1.depsRoutes, { prefix: '/api/deps' });
-    await fastify.register(routes_1.fsRoutes, { prefix: '/api/fs' });
-    await fastify.register(routes_1.configRoutes, { prefix: '/api/config' });
-    await fastify.register(routes_1.dashboardRoutes, { prefix: '/api/dashboard' });
-    await fastify.register(routes_1.rssRoutes, { prefix: '/api/rss' });
-    await fastify.register(routes_1.spriteRoutes, { prefix: '/api/sprite' });
+    await (0, routes_1.default)(fastify);
 });

package/lib/routes/api-client/collection.routes.d.ts

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

package/lib/routes/api-client/collection.routes.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiClientCollectionsRoutes = apiClientCollectionsRoutes;
+const api_1 = require("@yinuo-ngm/api");
+function assertProjectScope(scope, projectId) {
+    if (scope === "project" && !projectId)
+        throw new Error("projectId is required when scope=project");
+}
+function now() { return Date.now(); }
+async function apiClientCollectionsRoutes(fastify) {
+    const api = fastify.api;
+    fastify.get("/", async (req) => {
+        const q = req.query;
+        const scope = (q.scope ?? "project");
+        assertProjectScope(scope, q.projectId);
+        const items = await api.listCollections(scope, q.projectId);
+        return items.sort((a, b) => (a.parentId ?? "").localeCompare(b.parentId ?? "") || a.order - b.order || a.name.localeCompare(b.name));
+    });
+    fastify.post("/", async (req) => {
+        const body = req.body;
+        const scope = (body.scope ?? "project");
+        assertProjectScope(scope, body.projectId);
+        const ts = now();
+        const entity = {
+            id: (0, api_1.newId)("col"),
+            name: String(body.name ?? "").trim() || "New Collection",
+            kind: body.kind ?? "collection",
+            scope,
+            nodes: [],
+            projectId: scope === "project" ? body.projectId : undefined,
+            parentId: body.parentId ?? null,
+            order: body.order ?? ts,
+            createdAt: ts,
+            updatedAt: ts,
+        };
+        await api.saveCollection(entity, scope, body.projectId);
+        return entity;
+    });
+    fastify.post("/:id", async (req, reply) => {
+        const params = req.params;
+        const q = req.query;
+        const body = req.body;
+        const scope = (q.scope ?? "project");
+        assertProjectScope(scope, q.projectId);
+        const old = await api.getCollection(params.id, scope, q.projectId);
+        if (!old) {
+            return reply.code(404).send({ code: "COLLECTION_NOT_FOUND", message: `collection not found: ${params.id}` });
+        }
+        const ts = now();
+        const next = {
+            ...old,
+            name: body.name != null ? String(body.name).trim() || old.name : old.name,
+            parentId: body.parentId !== undefined ? body.parentId : old.parentId,
+            order: body.order !== undefined ? Number(body.order) : old.order,
+            updatedAt: ts,
+        };
+        await api.saveCollection(next, scope, q.projectId);
+        return next;
+    });
+    fastify.delete("/:id", async (req, reply) => {
+        const params = req.params;
+        const q = req.query;
+        const scope = (q.scope ?? "project");
+        assertProjectScope(scope, q.projectId);
+        const allCols = await api.listCollections(scope, q.projectId);
+        const hasChildCol = allCols.some(c => (c.parentId ?? null) === params.id);
+        if (hasChildCol) {
+            return reply.code(409).send({ code: "COLLECTION_NOT_EMPTY", message: "collection has child collections" });
+        }
+        const reqs = await api.listRequests(scope, q.projectId);
+        const hasReq = reqs.some((r) => (r.collectionId ?? null) === params.id);
+        if (hasReq) {
+            return reply.code(409).send({ code: "COLLECTION_NOT_EMPTY", message: "collection has requests" });
+        }
+        await api.deleteCollection(params.id, scope, q.projectId);
+        return { ok: true };
+    });
+}

package/lib/routes/api-client/env.routes.d.ts

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

package/lib/routes/api-client/env.routes.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiClientEnvsRoutes = apiClientEnvsRoutes;
+function parseScope(q) {
+    const scope = (q?.scope ?? "project");
+    const projectId = q?.projectId;
+    if (scope === "project" && !projectId) {
+        throw new Error("projectId is required when scope=project");
+    }
+    return { scope, projectId };
+}
+async function apiClientEnvsRoutes(fastify) {
+    const env = fastify.api;
+    fastify.get("/", async (req) => {
+        const { scope, projectId } = parseScope(req.query);
+        return await env.listEnvs(scope, projectId);
+    });
+    fastify.get("/:id", async (req, reply) => {
+        const { scope, projectId } = parseScope(req.query);
+        const id = req.params.id;
+        const item = await env.getEnv(id, scope, projectId);
+        if (!item) {
+            reply.code(404);
+            return { message: "env not found", id };
+        }
+        return item;
+    });
+    fastify.post("/", async (req) => {
+        const body = req.body;
+        const scope = body?.scope ?? "project";
+        if (scope === "project" && !body.projectId)
+            throw new Error("projectId is required when scope=project");
+        if (!body?.env?.id)
+            throw new Error("env.id is required");
+        await env.saveEnv(body.env, scope, body.projectId);
+        return { id: body.env.id };
+    });
+    fastify.delete("/:id", async (req) => {
+        const { scope, projectId } = parseScope(req.query);
+        const id = req.params.id;
+        await env.deleteEnv(id, scope, projectId);
+        return { id };
+    });
+}

package/lib/routes/api-client/history.routes.d.ts

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

package/lib/routes/api-client/history.routes.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiClientHistoryRoutes = apiClientHistoryRoutes;
+function parseScope(q) {
+    const scope = (q?.scope ?? "project");
+    const projectId = q?.projectId;
+    if (scope === "project" && !projectId)
+        throw new Error("projectId is required when scope=project");
+    return { scope, projectId };
+}
+function parseNum(v, fallback) {
+    const n = Number(v);
+    return Number.isFinite(n) ? n : fallback;
+}
+async function apiClientHistoryRoutes(fastify) {
+    const api = fastify.api;
+    fastify.get("/", async (req) => {
+        const { scope, projectId } = parseScope(req.query);
+        const limit = parseNum(req.query?.limit, 50);
+        const offset = parseNum(req.query?.offset, 0);
+        return await api.listHistory({ scope, projectId, limit, offset });
+    });
+    fastify.post("/purge", async (req) => {
+        const body = req.body;
+        const scope = body?.scope ?? "project";
+        if (scope === "project" && !body.projectId)
+            throw new Error("projectId is required when scope=project");
+        const removed = await api.purgeHistory({
+            scope,
+            projectId: body.projectId,
+            olderThan: body.olderThan,
+            maxCount: body.maxCount,
+        });
+        return { removed };
+    });
+}

package/lib/routes/api-client/index.d.ts

@@ -0,0 +1,5 @@
+export * from './env.routes';
+export * from './request.routes';
+export * from './history.routes';
+export * from './send.routes';
+export * from './collection.routes';

package/lib/routes/api-client/index.js

@@ -0,0 +1,21 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./env.routes"), exports);
+__exportStar(require("./request.routes"), exports);
+__exportStar(require("./history.routes"), exports);
+__exportStar(require("./send.routes"), exports);
+__exportStar(require("./collection.routes"), exports);

package/lib/routes/api-client/request.routes.d.ts

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

package/lib/routes/api-client/request.routes.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiClientRequestsRoutes = apiClientRequestsRoutes;
+function parseScope(q) {
+    const scope = (q?.scope ?? "project");
+    const projectId = q?.projectId;
+    if (scope === "project" && !projectId) {
+        throw new Error("projectId is required when scope=project");
+    }
+    return { scope, projectId };
+}
+async function apiClientRequestsRoutes(fastify) {
+    const api = fastify.api;
+    fastify.get("/", async (req) => {
+        const { scope, projectId } = parseScope(req.query);
+        const items = await api.listRequests(scope, projectId);
+        return items;
+    });
+    fastify.get("/:id", async (req, reply) => {
+        const { scope, projectId } = parseScope(req.query);
+        const id = req.params.id;
+        const item = await api.getRequest(id, scope, projectId);
+        if (!item) {
+            reply.code(404);
+            return { message: "request not found", id };
+        }
+        return item;
+    });
+    fastify.post("/", async (req) => {
+        const body = req.body;
+        const scope = body?.scope ?? "project";
+        if (scope === "project" && !body.projectId)
+            throw new Error("projectId is required when scope=project");
+        if (!body?.request?.id)
+            throw new Error("request.id is required");
+        await api.saveRequest(body.request, scope, body.projectId);
+        return { id: body.request.id };
+    });
+    fastify.post("/update", async (req) => {
+        const body = req.body;
+        const scope = body?.scope ?? "project";
+        if (scope === "project" && !body.projectId)
+            throw new Error("projectId is required when scope=project");
+        if (!body?.request?.id)
+            throw new Error("request.id is required");
+        const old = await api.getRequest(body.request.id, scope, body.projectId);
+        if (!old)
+            throw new Error("request not found: " + body.request.id);
+        const updated = {
+            ...old,
+            ...body.request,
+        };
+        await api.saveRequest(updated, scope, body.projectId);
+        return { id: body.request.id };
+    });
+    fastify.delete("/:id", async (req) => {
+        const { scope, projectId } = parseScope(req.query);
+        const id = req.params.id;
+        await api.deleteRequest(id, scope, projectId);
+        return { id };
+    });
+}

package/lib/routes/api-client/send.routes.d.ts

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

package/lib/routes/api-client/send.routes.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.apiClientSendRoutes = apiClientSendRoutes;
+async function apiClientSendRoutes(fastify) {
+    const api = fastify.api;
+    fastify.post("/", async (req) => {
+        const body = req.body;
+        const scope = body.scope ?? "project";
+        if (scope === "project" && !body.projectId)
+            throw new Error("projectId is required when scope=project");
+        if (!body.request && !body.requestId)
+            throw new Error("request or requestId is required");
+        return await api.send({
+            scope,
+            projectId: body.projectId,
+            requestId: body.requestId,
+            request: body.request,
+            envId: body.envId,
+            projectRoot: body.projectRoot,
+        });
+    });
+}

package/lib/routes/index.d.ts

@@ -1,10 +1,2 @@
-import configRoutes from './config.routes';
-import dashboardRoutes from './dashboard.routes';
-import depsRoutes from './deps.route';
-import fsRoutes from './fs.routes';
-import projectRoutes from './project.routes';
-import rssRoutes from './rss.routes';
-import { spriteRoutes } from './sprite.routes';
-import systemRoutes from './system.routes';
-import taskRoutes from './task.routes';
-export { configRoutes, depsRoutes, fsRoutes, projectRoutes, systemRoutes, taskRoutes, dashboardRoutes, rssRoutes, spriteRoutes };
+import { FastifyInstance } from 'fastify';
+export default function routes(fastify: FastifyInstance): Promise<void>;

package/lib/routes/index.js

@@ -3,22 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spriteRoutes = exports.rssRoutes = exports.dashboardRoutes = exports.taskRoutes = exports.systemRoutes = exports.projectRoutes = exports.fsRoutes = exports.depsRoutes = exports.configRoutes = void 0;
+exports.default = routes;
 const config_routes_1 = __importDefault(require("./config.routes"));
-exports.configRoutes = config_routes_1.default;
 const dashboard_routes_1 = __importDefault(require("./dashboard.routes"));
-exports.dashboardRoutes = dashboard_routes_1.default;
 const deps_route_1 = __importDefault(require("./deps.route"));
-exports.depsRoutes = deps_route_1.default;
 const fs_routes_1 = __importDefault(require("./fs.routes"));
-exports.fsRoutes = fs_routes_1.default;
 const project_routes_1 = __importDefault(require("./project.routes"));
-exports.projectRoutes = project_routes_1.default;
 const rss_routes_1 = __importDefault(require("./rss.routes"));
-exports.rssRoutes = rss_routes_1.default;
 const sprite_routes_1 = require("./sprite.routes");
-Object.defineProperty(exports, "spriteRoutes", { enumerable: true, get: function () { return sprite_routes_1.spriteRoutes; } });
 const system_routes_1 = __importDefault(require("./system.routes"));
-exports.systemRoutes = system_routes_1.default;
 const task_routes_1 = __importDefault(require("./task.routes"));
-exports.taskRoutes = task_routes_1.default;
+const api_client_1 = require("./api-client");
+async function routes(fastify) {
+    await fastify.register(system_routes_1.default);
+    await fastify.register(task_routes_1.default, { prefix: '/api/tasks' });
+    await fastify.register(project_routes_1.default, { prefix: '/api/projects' });
+    await fastify.register(deps_route_1.default, { prefix: '/api/deps' });
+    await fastify.register(fs_routes_1.default, { prefix: '/api/fs' });
+    await fastify.register(config_routes_1.default, { prefix: '/api/config' });
+    await fastify.register(dashboard_routes_1.default, { prefix: '/api/dashboard' });
+    await fastify.register(rss_routes_1.default, { prefix: '/api/rss' });
+    await fastify.register(sprite_routes_1.spriteRoutes, { prefix: '/api/sprite' });
+    await fastify.register(api_client_1.apiClientEnvsRoutes, { prefix: '/api/client/envs' });
+    await fastify.register(api_client_1.apiClientRequestsRoutes, { prefix: '/api/client/requests' });
+    await fastify.register(api_client_1.apiClientHistoryRoutes, { prefix: '/api/client/history' });
+    await fastify.register(api_client_1.apiClientSendRoutes, { prefix: '/api/client/send' });
+    await fastify.register(api_client_1.apiClientCollectionsRoutes, { prefix: '/api/client/collections' });
+}

package/package.json

@@ -1,37 +1,38 @@
-{
-  "name": "@yinuo-ngm/server",
-  "version": "1.0.4",
-  "description": "",
-  "main": "lib/index.js",
-  "keywords": [],
-  "author": "ZhangJing",
-  "license": "ISC",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib",
-    "www"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "dev": "tsx watch src/index.ts",
-    "build": "tsc -p tsconfig.json",
-    "start": "node lib/index.js"
-  },
-  "dependencies": {
-    "@fastify/static": "^9.0.0",
-    "@fastify/websocket": "^11.2.0",
-    "@yinuo-ngm/core": "^0.1.3",
-    "@yinuo-ngm/sprite": "^0.1.1",
-    "fastify": "^5.6.2",
-    "fastify-plugin": "^5.1.0",
-    "launch-editor": "^2.12.0",
-    "pino-pretty": "^13.1.3",
-    "rss-parser": "^3.13.0"
-  },
-  "devDependencies": {
-    "tsx": "^4.21.0"
-  },
-  "gitHead": "ebfaab3c1457d597f904b5d121292f5a84486609"
-}
+{
+  "name": "@yinuo-ngm/server",
+  "version": "1.0.6",
+  "description": "a server package for Yinuo NG Manager",
+  "author": "ZhangJing <892295834@qq.com>",
+  "license": "ISC",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "keywords": [],
+  "files": [
+    "lib",
+    "www"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "dev": "tsx watch src/index.ts",
+    "build": "tsc -p tsconfig.json",
+    "start": "node lib/index.js"
+  },
+  "dependencies": {
+    "@fastify/static": "^9.0.0",
+    "@fastify/websocket": "^11.2.0",
+    "@yinuo-ngm/api": "^0.1.1",
+    "@yinuo-ngm/core": "^0.1.4",
+    "@yinuo-ngm/sprite": "^0.1.2",
+    "fastify": "^5.6.2",
+    "fastify-plugin": "^5.1.0",
+    "launch-editor": "^2.12.0",
+    "pino-pretty": "^13.1.3",
+    "rss-parser": "^3.13.0"
+  },
+  "devDependencies": {
+    "tsx": "^4.21.0"
+  },
+  "gitHead": "ebfaab3c1457d597f904b5d121292f5a84486609"
+}