@yinuo-ngm/server 1.0.16 → 1.0.17

package/lib/app.js

@@ -25,23 +25,11 @@ function normalizeLogLevel(v) {
 }
 function createFastifyLogger() {
     const level = normalizeLogLevel(env_1.env.logLevel);
-    console.log(`Logger initialized with level: ${level || "silent (disabled)"}`);
+    if (process.env.NGM_DEBUG === '1') {
+        console.log(`Logger initialized with level: ${level || 'silent (disabled)'}`);
+    }
     if (!level)
         return false;
-    const isDev = process.env.NODE_ENV !== "production";
-    if (isDev) {
-        return {
-            level,
-            transport: {
-                target: "pino-pretty",
-                options: {
-                    colorize: true,
-                    translateTime: "HH:MM:ss.l",
-                    ignore: "pid,hostname",
-                },
-            },
-        };
-    }
     return { level };
 }
 async function createServer() {

package/lib/common/editor.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openFolder = openFolder;
-const core_1 = require("@yinuo-ngm/core");
+const errors_1 = require("@yinuo-ngm/errors");
 const launch_editor_1 = __importDefault(require("launch-editor"));
 const path = __importStar(require("path"));
 async function openFolder(folder, opts = {}) {
@@ -60,7 +60,7 @@ async function openFolder(folder, opts = {}) {
             settled = true;
             clearTimeout(timer);
             if (errorMsg) {
-                reject(new core_1.AppError("EDITOR_NOT_FOUND", errorMsg, { fileName, editor, folder, file, target }));
+                reject(new errors_1.CoreError(errors_1.CoreErrorCodes.EDITOR_NOT_FOUND, errorMsg, { fileName, editor, folder, file, target }));
                 return;
             }
             resolve();

package/lib/env.d.ts

@@ -3,5 +3,6 @@ export declare const env: {
     host: string;
     dataDir: string;
     logLevel: string;
+    shutdownToken: string;
     sysLogCapacity: number;
 };

package/lib/env.js

@@ -12,5 +12,6 @@ exports.env = {
     dataDir: process.env.NGM_DATA_DIR ||
         path_1.default.join(os_1.default.homedir(), ".ng-manager"),
     logLevel: process.env.NGM_LOG_LEVEL || "info",
+    shutdownToken: process.env.NGM_SHUTDOWN_TOKEN || "",
     sysLogCapacity: 3000,
 };

package/lib/plugins/error-handler.plugin.d.ts

@@ -1,6 +1,6 @@
 import type { FastifyPluginAsync } from "fastify";
-import { type ErrorCode } from "@yinuo-ngm/core";
-export declare const ERROR_STATUS: Record<ErrorCode, number>;
+import { type ErrorCode } from "@yinuo-ngm/errors";
+export declare const ERROR_STATUS: Partial<Record<ErrorCode, number>>;
 export declare function mapStatus(code: ErrorCode): number;
 export declare const errorHandlerPlugin: FastifyPluginAsync;
 export default errorHandlerPlugin;

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

@@ -6,94 +6,99 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorHandlerPlugin = exports.ERROR_STATUS = void 0;
 exports.mapStatus = mapStatus;
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
-const core_1 = require("@yinuo-ngm/core");
+const errors_1 = require("@yinuo-ngm/errors");
 exports.ERROR_STATUS = {
-    PROJECT_NOT_FOUND: 404,
-    PROJECT_ROOT_INVALID: 400,
-    PROJECT_ALREADY_EXISTS: 409,
-    PROJECT_ID_REQUIRED: 400,
-    PROJECT_IMPORT_NOT_EXISTS: 404,
-    PROJECT_IMPORT_NOT_DIR: 400,
-    PROJECT_IMPORT_ALREADY_REGISTERED: 409,
-    PROJECT_IMPORT_NOT_RECOGNIZED: 422,
-    PROJECT_IMPORT_SCAN_FAILED: 500,
-    ASSET_NOT_FOUND: 404,
-    ASSET_KIND_NOT_SUPPORTED: 400,
-    ASSET_URL_REQUIRED: 400,
-    ASSET_LABEL_REQUIRED: 400,
-    ASSET_URL_INVALID: 400,
-    ASSET_MODE_INVALID: 400,
-    INVALID_NAME: 400,
-    TARGET_EXISTS: 409,
-    INVALID_REPO_URL: 400,
-    INVALID_PARENT_DIR: 400,
-    GIT_CHECKOUT_FAILED: 500,
-    BOOTSTRAP_NOT_IN_PICK_STATE: 400,
-    BOOTSTRAP_CTX_NOT_FOUND: 404,
-    BOOTSTRAP_INVALID_PICKED_ROOT: 400,
-    BOOTSTRAP_NOT_WAITING_PICK: 400,
-    PROJECT_ANGULAR_JSON_INVALID: 400,
-    PROJECT_ANGULAR_JSON_NOT_FOUND: 404,
-    PROJECT_VITE_CONFIG_INVALID: 400,
-    PROJECT_VUE_CONFIG_NOT_FOUND: 404,
-    CONFIG_BACKUP_NOT_FOUND: 404,
-    CONFIG_READ_FAILED: 500,
-    CONFIG_WRITE_FAILED: 500,
-    CONFIG_CONFLICT: 409,
-    CONFIG_OPEN_FAILED: 500,
-    CONFIG_SCHEMA_NOT_FOUND: 404,
-    CONFIG_DOMAIN_NOT_FOUND: 404,
-    CONFIG_DOC_NOT_FOUND: 404,
-    TASK_NOT_FOUND: 404,
-    TASK_ALREADY_RUNNING: 409,
-    PROCESS_SPAWN_FAILED: 500,
-    TASK_SPEC_NOT_FOUND: 404,
-    TASK_NOT_RUNNABLE: 400,
-    RUN_NOT_FOUND: 404,
-    TASK_ID_REQUIRED: 400,
-    COMMAND_NOT_FOUND: 404,
-    BAD_JSON: 400,
-    BAD_MSG: 400,
-    OP_NOT_SUPPORTED: 400,
-    HANDLER_FAILED: 500,
-    TOPIC_NOT_FOUND: 404,
-    OP_NOT_FOUND: 400,
-    FS_PATH_NOT_FOUND: 404,
-    FS_ALREADY_EXISTS: 409,
-    FS_PERMISSION_DENIED: 403,
-    FS_EXISTS_FAILED: 500,
-    FS_INVALID_NAME: 400,
-    FS_MKDIR_FAILED: 500,
-    EDITOR_NOT_FOUND: 404,
-    EDITOR_LAUNCH_FAILED: 500,
-    STORAGE_IO_ERROR: 500,
-    UNAUTHORIZED: 401,
-    INVALID_TIMESTAMP: 400,
-    DEP_INSTALL_FAILED: 500,
-    DEP_UNINSTALL_FAILED: 500,
-    DEP_NOT_FOUND: 404,
-    DASHBOARD_CONFLICT: 409,
-    WIDGET_NOT_FOUND: 404,
-    WIDGET_LOCKED: 423,
-    KILL_PORT_FAILED: 500,
-    INVALID_PORT: 400,
-    RSS_FETCH_FAILED: 500,
-    INVALID_RSS_URL: 400,
-    UNKNOWN_ERROR: 500,
-    BAD_REQUEST: 400,
-    NOT_IMPLEMENTED: 501,
-    NOT_FOUND: 404,
-    SVN_SYNC_ALREADY_RUNNING: 409,
-    SVN_SYNC_FAILED: 500,
-    SVN_SOURCE_ID_REQUIRED: 400,
-    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,
+    [errors_1.GlobalErrorCodes.UNKNOWN_ERROR]: 500,
+    [errors_1.GlobalErrorCodes.BAD_REQUEST]: 400,
+    [errors_1.GlobalErrorCodes.NOT_FOUND]: 404,
+    [errors_1.GlobalErrorCodes.NOT_IMPLEMENTED]: 501,
+    [errors_1.GlobalErrorCodes.STORAGE_IO_ERROR]: 500,
+    [errors_1.GlobalErrorCodes.FS_PATH_NOT_FOUND]: 404,
+    [errors_1.GlobalErrorCodes.FS_PERMISSION_DENIED]: 403,
+    [errors_1.GlobalErrorCodes.FS_ALREADY_EXISTS]: 409,
+    [errors_1.GlobalErrorCodes.FS_INVALID_NAME]: 400,
+    [errors_1.GlobalErrorCodes.FS_MKDIR_FAILED]: 500,
+    [errors_1.GlobalErrorCodes.BAD_JSON]: 400,
+    [errors_1.GlobalErrorCodes.BAD_MSG]: 400,
+    [errors_1.GlobalErrorCodes.OP_NOT_SUPPORTED]: 400,
+    [errors_1.GlobalErrorCodes.TOPIC_NOT_FOUND]: 404,
+    [errors_1.GlobalErrorCodes.HANDLER_FAILED]: 500,
+    [errors_1.GlobalErrorCodes.OP_NOT_FOUND]: 400,
+    [errors_1.GlobalErrorCodes.UNAUTHORIZED]: 401,
+    [errors_1.GlobalErrorCodes.INVALID_TIMESTAMP]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.PROJECT_ROOT_INVALID]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_ALREADY_EXISTS]: 409,
+    [errors_1.CoreErrorCodes.PROJECT_ID_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_IMPORT_NOT_EXISTS]: 404,
+    [errors_1.CoreErrorCodes.PROJECT_IMPORT_NOT_DIR]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_IMPORT_ALREADY_REGISTERED]: 409,
+    [errors_1.CoreErrorCodes.PROJECT_IMPORT_NOT_RECOGNIZED]: 422,
+    [errors_1.CoreErrorCodes.PROJECT_IMPORT_SCAN_FAILED]: 500,
+    [errors_1.CoreErrorCodes.BOOTSTRAP_NOT_IN_PICK_STATE]: 400,
+    [errors_1.CoreErrorCodes.BOOTSTRAP_CTX_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.BOOTSTRAP_INVALID_PICKED_ROOT]: 400,
+    [errors_1.CoreErrorCodes.BOOTSTRAP_NOT_WAITING_PICK]: 400,
+    [errors_1.CoreErrorCodes.INVALID_NAME]: 400,
+    [errors_1.CoreErrorCodes.TARGET_EXISTS]: 409,
+    [errors_1.CoreErrorCodes.INVALID_REPO_URL]: 400,
+    [errors_1.CoreErrorCodes.INVALID_PARENT_DIR]: 400,
+    [errors_1.CoreErrorCodes.GIT_CHECKOUT_FAILED]: 500,
+    [errors_1.CoreErrorCodes.PROJECT_ANGULAR_JSON_INVALID]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_ANGULAR_JSON_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.PROJECT_VITE_CONFIG_INVALID]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_VUE_CONFIG_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.ASSET_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.ASSET_KIND_NOT_SUPPORTED]: 400,
+    [errors_1.CoreErrorCodes.ASSET_URL_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.ASSET_LABEL_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.ASSET_URL_INVALID]: 400,
+    [errors_1.CoreErrorCodes.ASSET_MODE_INVALID]: 400,
+    [errors_1.CoreErrorCodes.CONFIG_BACKUP_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.CONFIG_READ_FAILED]: 500,
+    [errors_1.CoreErrorCodes.CONFIG_WRITE_FAILED]: 500,
+    [errors_1.CoreErrorCodes.CONFIG_CONFLICT]: 409,
+    [errors_1.CoreErrorCodes.CONFIG_OPEN_FAILED]: 500,
+    [errors_1.CoreErrorCodes.CONFIG_SCHEMA_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.CONFIG_DOMAIN_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.CONFIG_DOC_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.TASK_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.RUN_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.TASK_ID_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.TASK_ALREADY_RUNNING]: 409,
+    [errors_1.CoreErrorCodes.PROCESS_SPAWN_FAILED]: 500,
+    [errors_1.CoreErrorCodes.TASK_SPEC_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.TASK_NOT_RUNNABLE]: 400,
+    [errors_1.CoreErrorCodes.COMMAND_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.FS_EXISTS_FAILED]: 500,
+    [errors_1.CoreErrorCodes.FS_INVALID_NAME]: 400,
+    [errors_1.CoreErrorCodes.FS_ALREADY_EXISTS]: 409,
+    [errors_1.CoreErrorCodes.FS_PERMISSION_DENIED]: 403,
+    [errors_1.CoreErrorCodes.FS_MKDIR_FAILED]: 500,
+    [errors_1.CoreErrorCodes.FS_PATH_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.DASHBOARD_CONFLICT]: 409,
+    [errors_1.CoreErrorCodes.WIDGET_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.WIDGET_LOCKED]: 423,
+    [errors_1.CoreErrorCodes.SPRITE_CONFIG_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.SPRITE_GROUP_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.SPRITE_ICONS_ROOT_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.SVN_SYNC_ALREADY_RUNNING]: 409,
+    [errors_1.CoreErrorCodes.SVN_SYNC_FAILED]: 500,
+    [errors_1.CoreErrorCodes.SVN_SOURCE_ID_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.DEP_INSTALL_FAILED]: 500,
+    [errors_1.CoreErrorCodes.DEP_UNINSTALL_FAILED]: 500,
+    [errors_1.CoreErrorCodes.DEP_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.NO_VERSION_MANAGER]: 503,
+    [errors_1.CoreErrorCodes.SWITCH_VERSION_FAILED]: 500,
+    [errors_1.CoreErrorCodes.NO_AVAILABLE_VERSIONS]: 409,
+    [errors_1.CoreErrorCodes.VERSION_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.PROJECT_PATH_REQUIRED]: 400,
+    [errors_1.CoreErrorCodes.EDITOR_NOT_FOUND]: 404,
+    [errors_1.CoreErrorCodes.EDITOR_LAUNCH_FAILED]: 500,
+    [errors_1.CoreErrorCodes.RSS_FETCH_FAILED]: 500,
+    [errors_1.CoreErrorCodes.INVALID_RSS_URL]: 400,
+    [errors_1.CoreErrorCodes.KILL_PORT_FAILED]: 500,
+    [errors_1.CoreErrorCodes.INVALID_PORT]: 400,
 };
 function mapStatus(code) {
     return exports.ERROR_STATUS[code] ?? 400;
@@ -115,21 +120,20 @@ function buildErrorBody(reqId, code, message, details) {
 exports.errorHandlerPlugin = (0, fastify_plugin_1.default)(async (app) => {
     app.setErrorHandler((err, req, reply) => {
         const requestId = req.id;
-        if (err instanceof core_1.AppError || isCoreAppError(err)) {
+        if (err instanceof errors_1.AppError || isAppErrorLike(err)) {
             const status = mapStatus(err.code);
             return reply.status(status).send(buildErrorBody(requestId, err.code, err.message, err.meta));
         }
         if (err?.validation) {
             return reply
                 .status(400)
-                .send(buildErrorBody(requestId, "VALIDATION_ERROR", "参数不合法", err.validation));
+                .send(buildErrorBody(requestId, errors_1.GlobalErrorCodes.BAD_REQUEST, "参数不合法", err.validation));
         }
-        console.log('err', err);
         req.log.error({ err, requestId }, "Unhandled error");
-        return reply.status(500).send(buildErrorBody(requestId, "INTERNAL_ERROR", "服务异常，请稍后重试"));
+        return reply.status(500).send(buildErrorBody(requestId, errors_1.GlobalErrorCodes.UNKNOWN_ERROR, "服务异常，请稍后重试"));
     });
 });
-function isCoreAppError(err) {
-    return err && typeof err === "object" && typeof err.code === "string" && typeof err.message === "string";
+function isAppErrorLike(err) {
+    return err !== null && typeof err === 'object' && typeof err.code === 'number' && typeof err.message === 'string';
 }
 exports.default = exports.errorHandlerPlugin;

package/lib/plugins/ws/topics/nginx.ws.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNginxTopicHandler = createNginxTopicHandler;
+const errors_1 = require("@yinuo-ngm/errors");
 function createNginxTopicHandler(deps, getAllClients) {
     const { logService } = deps;
     const onLog = (entry) => {
@@ -24,7 +25,7 @@ function createNginxTopicHandler(deps, getAllClients) {
             if (!logType || (logType !== "error" && logType !== "access")) {
                 ctx.send({
                     op: "error",
-                    code: "BAD_MSG",
+                    code: errors_1.GlobalErrorCodes.BAD_MSG,
                     message: "logType must be 'error' or 'access'",
                     ts: Date.now()
                 });

package/lib/plugins/ws/topics/svn.ws.d.ts

@@ -1,4 +1,5 @@
-import type { SvnEventPayloadMap, SvnEventType, SvnRuntime } from "@yinuo-ngm/core";
+import type { SvnRuntime } from "@yinuo-ngm/core";
+import type { SvnEventPayloadMap, SvnEventType } from "@yinuo-ngm/protocol";
 import { WsContext } from "../ws.context";
 import { TopicHandler } from "../ws.router";
 export type SvnSyncWsDeps = {

package/lib/plugins/ws/topics/svn.ws.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSvnSyncTopicHandler = createSvnSyncTopicHandler;
+const errors_1 = require("@yinuo-ngm/errors");
 const keyOf = (projectId) => `svn:${projectId}`;
 function createSvnSyncTopicHandler(deps, getAllClients) {
     return {
@@ -8,7 +9,7 @@ function createSvnSyncTopicHandler(deps, getAllClients) {
         async sub(ctx, msg) {
             const projectId = String(msg?.projectId ?? "").trim();
             if (!projectId) {
-                ctx.send({ op: "error", code: "PROJECT_ID_REQUIRED", message: "projectId is required", ts: Date.now() });
+                ctx.send({ op: "error", code: errors_1.CoreErrorCodes.PROJECT_ID_REQUIRED, message: "projectId is required", ts: Date.now() });
                 return;
             }
             const t = Number(msg?.tail ?? 0) || 0;
@@ -31,7 +32,7 @@ function createSvnSyncTopicHandler(deps, getAllClients) {
         async unsub(ctx, msg) {
             const projectId = String(msg?.projectId ?? "").trim();
             if (!projectId) {
-                ctx.send({ op: "error", code: "PROJECT_ID_REQUIRED", message: "projectId is required", ts: Date.now() });
+                ctx.send({ op: "error", code: errors_1.CoreErrorCodes.PROJECT_ID_REQUIRED, message: "projectId is required", ts: Date.now() });
                 return;
             }
             ctx.delSub("svn", keyOf(projectId));

package/lib/plugins/ws/topics/syslog.ws.d.ts

@@ -1,4 +1,4 @@
-import type { LogLine } from "@yinuo-ngm/core";
+import type { LogLine } from "@yinuo-ngm/protocol";
 import { WsContext } from "../ws.context";
 import type { TopicHandler } from "../ws.router";
 export type SyslogWsDeps = {

package/lib/plugins/ws/topics/task.ws.d.ts

@@ -1,4 +1,5 @@
-import type { TaskEventPayloadMap, TaskEventType, TaskOutputPayload, LogLine, TaskRuntime } from "@yinuo-ngm/core";
+import type { TaskRuntime } from "@yinuo-ngm/core";
+import type { LogLine, TaskEventPayloadMap, TaskEventType, TaskOutputPayload } from "@yinuo-ngm/protocol";
 import { WsContext } from "../ws.context";
 import type { TopicHandler } from "../ws.router";
 export type TaskWsDeps = {

package/lib/plugins/ws/topics/task.ws.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTaskTopicHandler = createTaskTopicHandler;
+const errors_1 = require("@yinuo-ngm/errors");
 const keyOfTask = (taskId) => `task:${taskId}`;
 function createTaskTopicHandler(deps, getAllClients) {
     return {
@@ -9,7 +10,7 @@ function createTaskTopicHandler(deps, getAllClients) {
             const taskId = String(msg?.taskId ?? "").trim();
             const tail = Number(msg?.tail ?? 0);
             if (!taskId) {
-                ctx.send({ op: "error", code: "TASK_ID_REQUIRED", message: "taskId is required", ts: Date.now() });
+                ctx.send({ op: "error", code: errors_1.CoreErrorCodes.TASK_ID_REQUIRED, message: "taskId is required", ts: Date.now() });
                 return;
             }
             ctx.addSub("task", keyOfTask(taskId));

package/lib/plugins/ws/ws.context.d.ts

@@ -1,4 +1,4 @@
-import type { WsServerMsg, WsTopic } from "@yinuo-ngm/core";
+import type { WsServerMsg, WsTopic } from "@yinuo-ngm/protocol";
 export declare class WsContext {
     private socket;
     readonly connId: string;

package/lib/plugins/ws/ws.plugin.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@yinuo-ngm/core");
+const bootstrap_1 = require("@yinuo-ngm/bootstrap");
 const websocket_1 = __importDefault(require("@fastify/websocket"));
 const fastify_plugin_1 = __importDefault(require("fastify-plugin"));
 const topics_1 = require("./topics");
@@ -50,13 +51,13 @@ exports.default = (0, fastify_plugin_1.default)(async function wsPlugin(fastify)
     offs.push(events.on(core_1.Events.SYSLOG_APPENDED, (e) => {
         syslogHandler.push(e.entry);
     }));
-    offs.push(events.on(core_1.Events.PROJECT_BOOTSTRAP_DONE, (e) => {
+    offs.push(events.on(bootstrap_1.BootstrapEvents.DONE, (e) => {
         taskHandler.pushEvent("bootstrapDone", e);
     }));
-    offs.push(events.on(core_1.Events.PROJECT_BOOTSTRAP_FAILED, (e) => {
+    offs.push(events.on(bootstrap_1.BootstrapEvents.FAILED, (e) => {
         taskHandler.pushEvent("bootstrapFailed", e);
     }));
-    offs.push(events.on(core_1.Events.PROJECT_BOOTSTRAP_NEED_PICK_ROOT, (e) => {
+    offs.push(events.on(bootstrap_1.BootstrapEvents.NEED_PICK_ROOT, (e) => {
         taskHandler.pushEvent("bootstrapNeedPickRoot", e);
     }));
     offs.push(events.on(core_1.Events.SVN_SYNC_STARTED, (e) => {

package/lib/plugins/ws/ws.router.d.ts

@@ -1,4 +1,4 @@
-import { WsClientMsg, WsTopic } from "@yinuo-ngm/core";
+import type { WsClientMsg, WsTopic } from "@yinuo-ngm/protocol";
 import { WsContext } from "./ws.context";
 export type TopicHandler = {
     topic: WsTopic;
@@ -15,6 +15,6 @@ export type TopicHandler = {
 export declare class WsRouter {
     private handlers;
     register(handler: TopicHandler): void;
-    handleRaw(ctx: WsContext, raw: any): undefined;
+    handleRaw(ctx: WsContext, raw: unknown): undefined;
     private err;
 }

package/lib/plugins/ws/ws.router.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsRouter = void 0;
+const errors_1 = require("@yinuo-ngm/errors");
 class WsRouter {
     constructor() {
         this.handlers = new Map();
@@ -15,11 +16,11 @@ class WsRouter {
             msg = JSON.parse(text);
         }
         catch {
-            ctx.send(this.err("BAD_JSON", "Invalid JSON"));
+            ctx.send(this.err(errors_1.GlobalErrorCodes.BAD_JSON, "Invalid JSON"));
             return;
         }
         if (!msg || typeof msg !== "object" || !("op" in msg)) {
-            ctx.send(this.err("BAD_MSG", "Invalid message"));
+            ctx.send(this.err(errors_1.GlobalErrorCodes.BAD_MSG, "Invalid message"));
             return;
         }
         if (msg.op === "ping") {
@@ -30,14 +31,14 @@ class WsRouter {
             const topic = msg.topic;
             const h = this.handlers.get(topic);
             if (!h || !h.resize) {
-                ctx.send(this.err("OP_NOT_SUPPORTED", `resize not supported on topic: ${String(topic)}`, { topic }));
+                ctx.send(this.err(errors_1.GlobalErrorCodes.OP_NOT_SUPPORTED, `resize not supported on topic: ${String(topic)}`, { topic }));
                 return;
             }
             try {
                 return void h.resize(ctx, msg);
             }
             catch (e) {
-                ctx.send(this.err("HANDLER_FAILED", e?.message ?? "handler failed", { topic, op: msg.op }));
+                ctx.send(this.err(errors_1.GlobalErrorCodes.HANDLER_FAILED, e?.message ?? "handler failed", { topic, op: msg.op }));
                 return;
             }
         }
@@ -45,7 +46,7 @@ class WsRouter {
             const topic = msg.topic;
             const h = this.handlers.get(topic);
             if (!h) {
-                ctx.send(this.err("TOPIC_NOT_FOUND", `Unknown topic: ${String(topic)}`, { topic }));
+                ctx.send(this.err(errors_1.GlobalErrorCodes.TOPIC_NOT_FOUND, `Unknown topic: ${String(topic)}`, { topic }));
                 return;
             }
             try {
@@ -54,11 +55,11 @@ class WsRouter {
                 return void h.unsub(ctx, msg);
             }
             catch (e) {
-                ctx.send(this.err("HANDLER_FAILED", e?.message ?? "handler failed", { topic, op: msg.op }));
+                ctx.send(this.err(errors_1.GlobalErrorCodes.HANDLER_FAILED, e?.message ?? "handler failed", { topic, op: msg.op }));
             }
             return;
         }
-        ctx.send(this.err("OP_NOT_FOUND", `Unknown op: ${msg.op}`));
+        ctx.send(this.err(errors_1.GlobalErrorCodes.OP_NOT_FOUND, `Unknown op: ${msg.op}`));
     }
     err(code, message, details) {
         return { op: "error", code, message, details, ts: Date.now() };

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

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiClientCollectionsRoutes = apiClientCollectionsRoutes;
 const api_1 = require("@yinuo-ngm/api");
+const errors_1 = require("@yinuo-ngm/errors");
+const errors_2 = require("@yinuo-ngm/errors");
 function assertProjectScope(scope, projectId) {
     if (scope === "project" && !projectId)
-        throw new Error("projectId is required when scope=project");
+        throw new errors_2.GlobalError(errors_2.GlobalErrorCodes.BAD_REQUEST, "projectId is required when scope=project");
 }
 function now() { return Date.now(); }
 async function apiClientCollectionsRoutes(fastify) {
@@ -52,7 +54,7 @@ async function apiClientCollectionsRoutes(fastify) {
         await api.saveCollection(entity, scope, body.projectId);
         return entity;
     });
-    fastify.post("/:id", async (req, reply) => {
+    fastify.post("/:id", async (req) => {
         const params = req.params;
         const q = req.query;
         const body = req.body;
@@ -60,7 +62,7 @@ async function apiClientCollectionsRoutes(fastify) {
         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}` });
+            throw new errors_1.ApiError(errors_1.ApiErrorCodes.API_COLLECTION_NOT_FOUND, `collection not found: ${params.id}`);
         }
         const ts = now();
         const next = {
@@ -73,7 +75,7 @@ async function apiClientCollectionsRoutes(fastify) {
         await api.saveCollection(next, scope, q.projectId);
         return next;
     });
-    fastify.delete("/:id", async (req, reply) => {
+    fastify.delete("/:id", async (req) => {
         const params = req.params;
         const q = req.query;
         const scope = (q.scope ?? "project");
@@ -81,12 +83,12 @@ async function apiClientCollectionsRoutes(fastify) {
         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" });
+            throw new errors_1.ApiError(errors_1.ApiErrorCodes.API_COLLECTION_NOT_EMPTY, "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" });
+            throw new errors_1.ApiError(errors_1.ApiErrorCodes.API_COLLECTION_NOT_EMPTY, "collection has requests");
         }
         await api.deleteCollection(params.id, scope, q.projectId);
         return { ok: true };

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiClientEnvsRoutes = apiClientEnvsRoutes;
+const errors_1 = require("@yinuo-ngm/errors");
 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");
+        throw new errors_1.GlobalError(errors_1.GlobalErrorCodes.BAD_REQUEST, "projectId is required when scope=project");
     }
     return { scope, projectId };
 }
@@ -29,9 +30,9 @@ async function apiClientEnvsRoutes(fastify) {
         const body = req.body;
         const scope = body?.scope ?? "project";
         if (scope === "project" && !body.projectId)
-            throw new Error("projectId is required when scope=project");
+            throw new errors_1.GlobalError(errors_1.GlobalErrorCodes.BAD_REQUEST, "projectId is required when scope=project");
         if (!body?.env?.id)
-            throw new Error("env.id is required");
+            throw new errors_1.GlobalError(errors_1.GlobalErrorCodes.BAD_REQUEST, "env.id is required");
         await env.saveEnv(body.env, scope, body.projectId);
         return { id: body.env.id };
     });

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiClientHistoryRoutes = apiClientHistoryRoutes;
+const errors_1 = require("@yinuo-ngm/errors");
 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");
+        throw new errors_1.GlobalError(errors_1.GlobalErrorCodes.BAD_REQUEST, "projectId is required when scope=project");
     return { scope, projectId };
 }
 function parseNum(v, fallback) {
@@ -24,7 +25,7 @@ async function apiClientHistoryRoutes(fastify) {
         const body = req.body;
         const scope = body?.scope ?? "project";
         if (scope === "project" && !body.projectId)
-            throw new Error("projectId is required when scope=project");
+            throw new errors_1.GlobalError(errors_1.GlobalErrorCodes.BAD_REQUEST, "projectId is required when scope=project");
         const removed = await api.purgeHistory({
             scope,
             projectId: body.projectId,