@f2a/openclaw-f2a 0.3.3 → 0.3.4

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.
Files changed (120) hide show
  1. package/dist/F2AComponentRegistry.d.ts +195 -0
  2. package/dist/F2AComponentRegistry.d.ts.map +1 -0
  3. package/dist/F2AComponentRegistry.js +385 -0
  4. package/dist/F2AComponentRegistry.js.map +1 -0
  5. package/dist/F2ACore.d.ts +227 -0
  6. package/dist/F2ACore.d.ts.map +1 -0
  7. package/dist/F2ACore.js +648 -0
  8. package/dist/F2ACore.js.map +1 -0
  9. package/dist/F2AMessageRouter.d.ts +108 -0
  10. package/dist/F2AMessageRouter.d.ts.map +1 -0
  11. package/dist/F2AMessageRouter.js +157 -0
  12. package/dist/F2AMessageRouter.js.map +1 -0
  13. package/dist/F2AToolRegistry.d.ts +45 -0
  14. package/dist/F2AToolRegistry.d.ts.map +1 -0
  15. package/dist/F2AToolRegistry.js +79 -0
  16. package/dist/F2AToolRegistry.js.map +1 -0
  17. package/dist/F2AWebhookManager.d.ts +79 -0
  18. package/dist/F2AWebhookManager.d.ts.map +1 -0
  19. package/dist/F2AWebhookManager.js +241 -0
  20. package/dist/F2AWebhookManager.js.map +1 -0
  21. package/dist/agent-manager.js +6 -6
  22. package/dist/agent-manager.js.map +1 -1
  23. package/dist/announcement-queue.d.ts +1 -8
  24. package/dist/announcement-queue.d.ts.map +1 -1
  25. package/dist/announcement-queue.js +19 -19
  26. package/dist/announcement-queue.js.map +1 -1
  27. package/dist/claim-handlers.d.ts +13 -4
  28. package/dist/claim-handlers.d.ts.map +1 -1
  29. package/dist/claim-handlers.js +42 -13
  30. package/dist/claim-handlers.js.map +1 -1
  31. package/dist/connector-helpers.d.ts +143 -0
  32. package/dist/connector-helpers.d.ts.map +1 -0
  33. package/dist/connector-helpers.js +398 -0
  34. package/dist/connector-helpers.js.map +1 -0
  35. package/dist/connector.d.ts +87 -265
  36. package/dist/connector.d.ts.map +1 -1
  37. package/dist/connector.js +334 -2037
  38. package/dist/connector.js.map +1 -1
  39. package/dist/contact-manager.d.ts +1 -1
  40. package/dist/contact-manager.d.ts.map +1 -1
  41. package/dist/contact-manager.js +12 -5
  42. package/dist/contact-manager.js.map +1 -1
  43. package/dist/contact-tool-handlers.d.ts +72 -0
  44. package/dist/contact-tool-handlers.d.ts.map +1 -0
  45. package/dist/contact-tool-handlers.js +413 -0
  46. package/dist/contact-tool-handlers.js.map +1 -0
  47. package/dist/f2a-client.d.ts +168 -0
  48. package/dist/f2a-client.d.ts.map +1 -0
  49. package/dist/f2a-client.js +425 -0
  50. package/dist/f2a-client.js.map +1 -0
  51. package/dist/handshake-protocol.d.ts +3 -2
  52. package/dist/handshake-protocol.d.ts.map +1 -1
  53. package/dist/handshake-protocol.js +15 -6
  54. package/dist/handshake-protocol.js.map +1 -1
  55. package/dist/index.d.ts +12 -16
  56. package/dist/index.d.ts.map +1 -1
  57. package/dist/index.js +13 -45
  58. package/dist/index.js.map +1 -1
  59. package/dist/logger.d.ts +31 -9
  60. package/dist/logger.d.ts.map +1 -1
  61. package/dist/logger.js +268 -12
  62. package/dist/logger.js.map +1 -1
  63. package/dist/network-client.d.ts +1 -8
  64. package/dist/network-client.d.ts.map +1 -1
  65. package/dist/network-client.js.map +1 -1
  66. package/dist/node-manager.d.ts +8 -8
  67. package/dist/node-manager.d.ts.map +1 -1
  68. package/dist/node-manager.js +100 -36
  69. package/dist/node-manager.js.map +1 -1
  70. package/dist/plugin.d.ts +2 -2
  71. package/dist/plugin.d.ts.map +1 -1
  72. package/dist/plugin.js +43 -23
  73. package/dist/plugin.js.map +1 -1
  74. package/dist/task-guard.d.ts.map +1 -1
  75. package/dist/task-guard.js +44 -38
  76. package/dist/task-guard.js.map +1 -1
  77. package/dist/task-queue.d.ts +2 -8
  78. package/dist/task-queue.d.ts.map +1 -1
  79. package/dist/task-queue.js +144 -119
  80. package/dist/task-queue.js.map +1 -1
  81. package/dist/tool-handlers.d.ts +15 -3
  82. package/dist/tool-handlers.d.ts.map +1 -1
  83. package/dist/tool-handlers.js +85 -54
  84. package/dist/tool-handlers.js.map +1 -1
  85. package/dist/tools/contact-tools.d.ts +18 -0
  86. package/dist/tools/contact-tools.d.ts.map +1 -0
  87. package/dist/tools/contact-tools.js +176 -0
  88. package/dist/tools/contact-tools.js.map +1 -0
  89. package/dist/tools/index.d.ts +9 -0
  90. package/dist/tools/index.d.ts.map +1 -0
  91. package/dist/tools/index.js +15 -0
  92. package/dist/tools/index.js.map +1 -0
  93. package/dist/tools/network-tools.d.ts +17 -0
  94. package/dist/tools/network-tools.d.ts.map +1 -0
  95. package/dist/tools/network-tools.js +106 -0
  96. package/dist/tools/network-tools.js.map +1 -0
  97. package/dist/tools/task-tools.d.ts +25 -0
  98. package/dist/tools/task-tools.d.ts.map +1 -0
  99. package/dist/tools/task-tools.js +275 -0
  100. package/dist/tools/task-tools.js.map +1 -0
  101. package/dist/types.d.ts +376 -12
  102. package/dist/types.d.ts.map +1 -1
  103. package/dist/types.js.map +1 -1
  104. package/dist/webhook-handlers.d.ts +50 -0
  105. package/dist/webhook-handlers.d.ts.map +1 -0
  106. package/dist/webhook-handlers.js +183 -0
  107. package/dist/webhook-handlers.js.map +1 -0
  108. package/dist/webhook-pusher.d.ts +1 -8
  109. package/dist/webhook-pusher.d.ts.map +1 -1
  110. package/dist/webhook-pusher.js.map +1 -1
  111. package/dist/webhook-server.d.ts +3 -8
  112. package/dist/webhook-server.d.ts.map +1 -1
  113. package/dist/webhook-server.js +21 -4
  114. package/dist/webhook-server.js.map +1 -1
  115. package/openclaw.plugin.json +1 -1
  116. package/package.json +7 -4
  117. package/dist/reputation.d.ts +0 -156
  118. package/dist/reputation.d.ts.map +0 -1
  119. package/dist/reputation.js +0 -432
  120. package/dist/reputation.js.map +0 -1
package/dist/index.js CHANGED
@@ -1,53 +1,21 @@
1
1
  "use strict";
2
2
  /**
3
- * F2A OpenClaw Adapter - 主入口
3
+ * F2A OpenClaw Plugin - 公共 API 入口
4
4
  * OpenClaw 适配器,用于接入 F2A P2P Agent 网络
5
+ *
6
+ * Issue #106: 精简导出,只导出公共 API
5
7
  */
6
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
7
- if (k2 === undefined) k2 = k;
8
- var desc = Object.getOwnPropertyDescriptor(m, k);
9
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
10
- desc = { enumerable: true, get: function() { return m[k]; } };
11
- }
12
- Object.defineProperty(o, k2, desc);
13
- }) : (function(o, m, k, k2) {
14
- if (k2 === undefined) k2 = k;
15
- o[k2] = m[k];
16
- }));
17
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
18
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
19
- };
20
8
  Object.defineProperty(exports, "__esModule", { value: true });
21
- exports.default = exports.HANDSHAKE_MESSAGE_TYPES = exports.HandshakeProtocol = exports.ContactManager = exports.taskGuard = exports.TaskGuard = exports.AnnouncementQueue = exports.TaskQueue = exports.CapabilityDetector = exports.ReputationSystem = exports.WebhookServer = exports.F2ANetworkClient = exports.F2ANodeManager = exports.F2AOpenClawAdapter = void 0;
9
+ exports.F2AClient = exports.FriendStatus = exports.default = exports.F2APlugin = void 0;
10
+ // 主入口
22
11
  var connector_js_1 = require("./connector.js");
23
- Object.defineProperty(exports, "F2AOpenClawAdapter", { enumerable: true, get: function () { return connector_js_1.F2AOpenClawAdapter; } });
24
- var node_manager_js_1 = require("./node-manager.js");
25
- Object.defineProperty(exports, "F2ANodeManager", { enumerable: true, get: function () { return node_manager_js_1.F2ANodeManager; } });
26
- var network_client_js_1 = require("./network-client.js");
27
- Object.defineProperty(exports, "F2ANetworkClient", { enumerable: true, get: function () { return network_client_js_1.F2ANetworkClient; } });
28
- var webhook_server_js_1 = require("./webhook-server.js");
29
- Object.defineProperty(exports, "WebhookServer", { enumerable: true, get: function () { return webhook_server_js_1.WebhookServer; } });
30
- var reputation_js_1 = require("./reputation.js");
31
- Object.defineProperty(exports, "ReputationSystem", { enumerable: true, get: function () { return reputation_js_1.ReputationSystem; } });
32
- var capability_detector_js_1 = require("./capability-detector.js");
33
- Object.defineProperty(exports, "CapabilityDetector", { enumerable: true, get: function () { return capability_detector_js_1.CapabilityDetector; } });
34
- var task_queue_js_1 = require("./task-queue.js");
35
- Object.defineProperty(exports, "TaskQueue", { enumerable: true, get: function () { return task_queue_js_1.TaskQueue; } });
36
- var announcement_queue_js_1 = require("./announcement-queue.js");
37
- Object.defineProperty(exports, "AnnouncementQueue", { enumerable: true, get: function () { return announcement_queue_js_1.AnnouncementQueue; } });
38
- var task_guard_js_1 = require("./task-guard.js");
39
- Object.defineProperty(exports, "TaskGuard", { enumerable: true, get: function () { return task_guard_js_1.TaskGuard; } });
40
- Object.defineProperty(exports, "taskGuard", { enumerable: true, get: function () { return task_guard_js_1.taskGuard; } });
41
- __exportStar(require("./types.js"), exports);
42
- // Issue #98: 通讯录模块
43
- var contact_manager_js_1 = require("./contact-manager.js");
44
- Object.defineProperty(exports, "ContactManager", { enumerable: true, get: function () { return contact_manager_js_1.ContactManager; } });
45
- __exportStar(require("./contact-types.js"), exports);
46
- // Issue #99: 握手协议模块
47
- var handshake_protocol_js_1 = require("./handshake-protocol.js");
48
- Object.defineProperty(exports, "HandshakeProtocol", { enumerable: true, get: function () { return handshake_protocol_js_1.HandshakeProtocol; } });
49
- Object.defineProperty(exports, "HANDSHAKE_MESSAGE_TYPES", { enumerable: true, get: function () { return handshake_protocol_js_1.HANDSHAKE_MESSAGE_TYPES; } });
50
- // 默认导出
12
+ Object.defineProperty(exports, "F2APlugin", { enumerable: true, get: function () { return connector_js_1.F2APlugin; } });
51
13
  var connector_js_2 = require("./connector.js");
52
- Object.defineProperty(exports, "default", { enumerable: true, get: function () { return connector_js_2.F2AOpenClawAdapter; } });
14
+ Object.defineProperty(exports, "default", { enumerable: true, get: function () { return connector_js_2.F2APlugin; } });
15
+ // 通讯录公共类型(Issue #98)
16
+ var contact_types_js_1 = require("./contact-types.js");
17
+ Object.defineProperty(exports, "FriendStatus", { enumerable: true, get: function () { return contact_types_js_1.FriendStatus; } });
18
+ // Phase 3: Daemon 模式客户端
19
+ var f2a_client_js_1 = require("./f2a-client.js");
20
+ Object.defineProperty(exports, "F2AClient", { enumerable: true, get: function () { return f2a_client_js_1.F2AClient; } });
53
21
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;AAEH,+CAAoD;AAA3C,kHAAA,kBAAkB,OAAA;AAC3B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,yDAAuD;AAA9C,qHAAA,gBAAgB,OAAA;AACzB,yDAAoE;AAA3D,kHAAA,aAAa,OAAA;AACtB,iDAAmD;AAA1C,iHAAA,gBAAgB,OAAA;AACzB,mEAA8D;AAArD,4HAAA,kBAAkB,OAAA;AAC3B,iDAAwE;AAA/D,0GAAA,SAAS,OAAA;AAClB,iEAAoF;AAA3E,0HAAA,iBAAiB,OAAA;AAC1B,iDAAwG;AAA/F,0GAAA,SAAS,OAAA;AAAmD,0GAAA,SAAS,OAAA;AAC9E,6CAA2B;AAE3B,mBAAmB;AACnB,2DAAsD;AAA7C,oHAAA,cAAc,OAAA;AACvB,qDAAmC;AAEnC,oBAAoB;AACpB,iEAAqF;AAA5E,0HAAA,iBAAiB,OAAA;AAAE,gIAAA,uBAAuB,OAAA;AAGnD,OAAO;AACP,+CAA+D;AAAtD,uGAAA,kBAAkB,OAAW"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,MAAM;AACN,+CAA2C;AAAlC,yGAAA,SAAS,OAAA;AAClB,+CAAsD;AAA7C,uGAAA,SAAS,OAAW;AA8B7B,qBAAqB;AACrB,uDAAkD;AAAzC,gHAAA,YAAY,OAAA;AASrB,wBAAwB;AACxB,iDAA4C;AAAnC,0GAAA,SAAS,OAAA"}
package/dist/logger.d.ts CHANGED
@@ -1,25 +1,47 @@
1
1
  /**
2
- * OpenClaw Adapter 统一日志模块
2
+ * OpenClaw Plugin 统一日志模块
3
3
  *
4
4
  * 设计说明:
5
- * - 提供统一的日志接口,便于维护和测试
6
- * - 支持结构化日志输出
7
- * - 默认使用 console,未来可扩展为其他日志系统
5
+ * - 提供统一的日志接口,与 core 包的 Logger 保持一致
6
+ * - 支持结构化日志输出 (message, meta) 格式
7
+ * - 默认使用 console,支持文件持久化和日志轮转
8
8
  */
9
9
  export interface Logger {
10
- debug(message: string, ...args: unknown[]): void;
10
+ debug?(message: string, ...args: unknown[]): void;
11
11
  info(message: string, ...args: unknown[]): void;
12
12
  warn(message: string, ...args: unknown[]): void;
13
13
  error(message: string, ...args: unknown[]): void;
14
14
  }
15
+ /** 日志配置选项 */
16
+ export interface LoggerOptions {
17
+ /** 组件名称 */
18
+ component?: string;
19
+ /** 是否启用控制台输出(默认 true) */
20
+ enableConsole?: boolean;
21
+ /** 是否启用文件输出(默认 false) */
22
+ enableFile?: boolean;
23
+ /** 日志文件目录(默认 ~/.openclaw/logs) */
24
+ logDir?: string;
25
+ /** 日志文件名(默认 f2a.log) */
26
+ logFileName?: string;
27
+ /** 日志轮转:最大文件大小(字节),默认 10MB */
28
+ maxFileSize?: number;
29
+ /** 日志轮转:最大文件数量,默认 5 */
30
+ maxFiles?: number;
31
+ }
15
32
  /**
16
33
  * 创建日志记录器
17
- * @param component 组件名称(可选)
34
+ * @param optionsOrComponent 组件名称或完整配置选项
35
+ */
36
+ export declare function createLogger(optionsOrComponent?: string | LoggerOptions): Logger;
37
+ /**
38
+ * 创建带文件输出的日志记录器
39
+ * @param options 配置选项
18
40
  */
19
- export declare function createLogger(component?: string): Logger;
20
- /** 默认日志记录器 */
41
+ export declare function createFileLogger(options?: LoggerOptions): Logger;
42
+ /** 默认日志记录器(仅控制台) */
21
43
  export declare const logger: Logger;
22
- /** 组件专用日志记录器 */
44
+ /** 组件专用日志记录器(仅控制台) */
23
45
  export declare const webhookLogger: Logger;
24
46
  export declare const taskGuardLogger: Logger;
25
47
  export declare const queueLogger: Logger;
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAClD;AAKD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAiBvD;AAED,cAAc;AACd,eAAO,MAAM,MAAM,QAAiB,CAAC;AAErC,gBAAgB;AAChB,eAAO,MAAM,aAAa,QAA0B,CAAC;AACrD,eAAO,MAAM,eAAe,QAA4B,CAAC;AACzD,eAAO,MAAM,WAAW,QAAwB,CAAC;AACjD,eAAO,MAAM,UAAU,QAAuB,CAAC;AAC/C,eAAO,MAAM,YAAY,QAAyB,CAAC"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAClD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAClD;AAED,aAAa;AACb,MAAM,WAAW,aAAa;IAC5B,WAAW;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yBAAyB;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yBAAyB;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAmMD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,CA8DhF;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,aAAkB,GAAG,MAAM,CAEpE;AAED,oBAAoB;AACpB,eAAO,MAAM,MAAM,QAAiB,CAAC;AAErC,sBAAsB;AACtB,eAAO,MAAM,aAAa,QAA0B,CAAC;AACrD,eAAO,MAAM,eAAe,QAA4B,CAAC;AACzD,eAAO,MAAM,WAAW,QAAwB,CAAC;AACjD,eAAO,MAAM,UAAU,QAAuB,CAAC;AAC/C,eAAO,MAAM,YAAY,QAAyB,CAAC"}
package/dist/logger.js CHANGED
@@ -1,41 +1,297 @@
1
1
  "use strict";
2
2
  /**
3
- * OpenClaw Adapter 统一日志模块
3
+ * OpenClaw Plugin 统一日志模块
4
4
  *
5
5
  * 设计说明:
6
- * - 提供统一的日志接口,便于维护和测试
7
- * - 支持结构化日志输出
8
- * - 默认使用 console,未来可扩展为其他日志系统
6
+ * - 提供统一的日志接口,与 core 包的 Logger 保持一致
7
+ * - 支持结构化日志输出 (message, meta) 格式
8
+ * - 默认使用 console,支持文件持久化和日志轮转
9
9
  */
10
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
11
+ if (k2 === undefined) k2 = k;
12
+ var desc = Object.getOwnPropertyDescriptor(m, k);
13
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
14
+ desc = { enumerable: true, get: function() { return m[k]; } };
15
+ }
16
+ Object.defineProperty(o, k2, desc);
17
+ }) : (function(o, m, k, k2) {
18
+ if (k2 === undefined) k2 = k;
19
+ o[k2] = m[k];
20
+ }));
21
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
22
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
23
+ }) : function(o, v) {
24
+ o["default"] = v;
25
+ });
26
+ var __importStar = (this && this.__importStar) || (function () {
27
+ var ownKeys = function(o) {
28
+ ownKeys = Object.getOwnPropertyNames || function (o) {
29
+ var ar = [];
30
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
31
+ return ar;
32
+ };
33
+ return ownKeys(o);
34
+ };
35
+ return function (mod) {
36
+ if (mod && mod.__esModule) return mod;
37
+ var result = {};
38
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
39
+ __setModuleDefault(result, mod);
40
+ return result;
41
+ };
42
+ })();
10
43
  Object.defineProperty(exports, "__esModule", { value: true });
11
44
  exports.pluginLogger = exports.nodeLogger = exports.queueLogger = exports.taskGuardLogger = exports.webhookLogger = exports.logger = void 0;
12
45
  exports.createLogger = createLogger;
46
+ exports.createFileLogger = createFileLogger;
47
+ const fs = __importStar(require("fs"));
48
+ const path = __importStar(require("path"));
13
49
  /** 默认日志前缀 */
14
50
  const DEFAULT_PREFIX = '[F2A]';
51
+ /** 默认配置 */
52
+ const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024; // 10MB
53
+ const DEFAULT_MAX_FILES = 5;
54
+ const DEFAULT_LOG_DIR = path.join(process.env.HOME || '/tmp', '.openclaw', 'logs');
55
+ const DEFAULT_LOG_FILE_NAME = 'f2a.log';
56
+ /**
57
+ * 格式化时间戳 (HH:MM:SS)
58
+ */
59
+ function formatTimestamp() {
60
+ const now = new Date();
61
+ return now.toTimeString().split(' ')[0];
62
+ }
63
+ /**
64
+ * 格式化输出 (开发环境人类可读)
65
+ */
66
+ function formatOutput(level, prefix, message, meta) {
67
+ const timestamp = formatTimestamp();
68
+ const levelStr = `[${level}]`;
69
+ if (meta && Object.keys(meta).length > 0) {
70
+ // 结构化输出:时间 + 前缀 + 级别 + 消息 + meta
71
+ const metaStr = JSON.stringify(meta);
72
+ return `${timestamp} ${prefix} ${levelStr} ${message} ${metaStr}`;
73
+ }
74
+ return `${timestamp} ${prefix} ${levelStr} ${message}`;
75
+ }
76
+ /**
77
+ * 格式化 JSON 日志条目(用于文件输出)
78
+ */
79
+ function formatJsonLog(level, component, message, meta) {
80
+ const entry = {
81
+ level,
82
+ msg: message,
83
+ timestamp: new Date().toISOString(),
84
+ component,
85
+ ...meta
86
+ };
87
+ return JSON.stringify(entry);
88
+ }
89
+ /**
90
+ * 文件日志管理器
91
+ */
92
+ class FileLogManager {
93
+ filePath;
94
+ maxFileSize;
95
+ maxFiles;
96
+ fileStream;
97
+ currentFileSize = 0;
98
+ constructor(logDir, logFileName, maxFileSize, maxFiles) {
99
+ this.filePath = path.join(logDir, logFileName);
100
+ this.maxFileSize = maxFileSize;
101
+ this.maxFiles = maxFiles;
102
+ this.initFileStream();
103
+ }
104
+ /**
105
+ * 初始化文件写入流
106
+ */
107
+ initFileStream() {
108
+ try {
109
+ // 确保目录存在
110
+ const dir = path.dirname(this.filePath);
111
+ if (!fs.existsSync(dir)) {
112
+ fs.mkdirSync(dir, { recursive: true });
113
+ // 设置目录权限为 700(仅所有者可访问)
114
+ try {
115
+ fs.chmodSync(dir, 0o700);
116
+ }
117
+ catch {
118
+ // 忽略权限设置错误(某些文件系统可能不支持)
119
+ }
120
+ }
121
+ // 创建写入流(追加模式)
122
+ this.fileStream = fs.createWriteStream(this.filePath, {
123
+ flags: 'a',
124
+ encoding: 'utf8'
125
+ });
126
+ // 文件打开后设置权限为 600(仅所有者可读写)
127
+ this.fileStream.on('open', () => {
128
+ try {
129
+ fs.chmodSync(this.filePath, 0o600);
130
+ }
131
+ catch {
132
+ // 忽略权限设置错误
133
+ }
134
+ });
135
+ this.fileStream.on('error', (err) => {
136
+ console.error(`[Logger] File stream error: ${err.message}`);
137
+ });
138
+ // 获取当前文件大小
139
+ if (fs.existsSync(this.filePath)) {
140
+ const stats = fs.statSync(this.filePath);
141
+ this.currentFileSize = stats.size;
142
+ }
143
+ else {
144
+ this.currentFileSize = 0;
145
+ }
146
+ }
147
+ catch (err) {
148
+ console.error(`[Logger] Failed to initialize file stream: ${err}`);
149
+ this.fileStream = undefined;
150
+ }
151
+ }
152
+ /**
153
+ * 检查并执行日志轮转
154
+ */
155
+ checkRotation(lineSize) {
156
+ if (this.currentFileSize + lineSize > this.maxFileSize) {
157
+ this.rotateLogFiles();
158
+ }
159
+ }
160
+ /**
161
+ * 轮转日志文件
162
+ */
163
+ rotateLogFiles() {
164
+ try {
165
+ // 关闭当前流
166
+ if (this.fileStream) {
167
+ this.fileStream.end();
168
+ this.fileStream = undefined;
169
+ }
170
+ // 删除最旧的文件(如果存在)
171
+ const oldestFile = `${this.filePath}.${this.maxFiles}`;
172
+ if (fs.existsSync(oldestFile)) {
173
+ fs.unlinkSync(oldestFile);
174
+ }
175
+ // 轮转现有文件:.4 -> .5, .3 -> .4, ... .1 -> .2, current -> .1
176
+ for (let i = this.maxFiles - 1; i >= 1; i--) {
177
+ const oldFile = `${this.filePath}.${i}`;
178
+ const newFile = `${this.filePath}.${i + 1}`;
179
+ if (fs.existsSync(oldFile)) {
180
+ fs.renameSync(oldFile, newFile);
181
+ }
182
+ }
183
+ // 重命名当前文件为 .1
184
+ if (fs.existsSync(this.filePath)) {
185
+ fs.renameSync(this.filePath, `${this.filePath}.1`);
186
+ }
187
+ // 重新打开文件流
188
+ this.initFileStream();
189
+ this.currentFileSize = 0;
190
+ }
191
+ catch (err) {
192
+ console.error(`[Logger] Failed to rotate log files: ${err}`);
193
+ }
194
+ }
195
+ /**
196
+ * 写入日志
197
+ */
198
+ write(level, component, message, meta) {
199
+ if (!this.fileStream || !this.fileStream.writable) {
200
+ return;
201
+ }
202
+ const line = formatJsonLog(level, component, message, meta);
203
+ const lineSize = Buffer.byteLength(line + '\n', 'utf8');
204
+ // 检查是否需要轮转
205
+ this.checkRotation(lineSize);
206
+ // 写入日志
207
+ this.fileStream.write(line + '\n');
208
+ this.currentFileSize += lineSize;
209
+ }
210
+ /**
211
+ * 关闭文件流
212
+ */
213
+ close() {
214
+ if (this.fileStream) {
215
+ this.fileStream.end();
216
+ this.fileStream = undefined;
217
+ }
218
+ }
219
+ }
15
220
  /**
16
221
  * 创建日志记录器
17
- * @param component 组件名称(可选)
222
+ * @param optionsOrComponent 组件名称或完整配置选项
18
223
  */
19
- function createLogger(component) {
224
+ function createLogger(optionsOrComponent) {
225
+ // 处理参数:支持旧的字符串参数形式和新的配置对象形式
226
+ let options;
227
+ if (typeof optionsOrComponent === 'string') {
228
+ options = { component: optionsOrComponent };
229
+ }
230
+ else {
231
+ options = optionsOrComponent || {};
232
+ }
233
+ const component = options.component || '';
20
234
  const prefix = component ? `[F2A:${component}]` : DEFAULT_PREFIX;
235
+ const enableConsole = options.enableConsole !== false;
236
+ const enableFile = options.enableFile ?? false;
237
+ const logDir = options.logDir || DEFAULT_LOG_DIR;
238
+ const logFileName = options.logFileName || DEFAULT_LOG_FILE_NAME;
239
+ const maxFileSize = options.maxFileSize || DEFAULT_MAX_FILE_SIZE;
240
+ const maxFiles = options.maxFiles || DEFAULT_MAX_FILES;
241
+ // 文件日志管理器(仅在启用文件输出时创建)
242
+ let fileManager;
243
+ if (enableFile) {
244
+ fileManager = new FileLogManager(logDir, logFileName, maxFileSize, maxFiles);
245
+ }
21
246
  return {
22
247
  debug(message, ...args) {
23
- console.log(`${prefix} ${message}`, ...args);
248
+ const meta = args.length > 0 ? args[0] : undefined;
249
+ if (enableConsole) {
250
+ console.debug(formatOutput('DEBUG', prefix, message, meta));
251
+ }
252
+ if (fileManager) {
253
+ fileManager.write('DEBUG', `F2A:${component}`, message, meta);
254
+ }
24
255
  },
25
256
  info(message, ...args) {
26
- console.log(`${prefix} ${message}`, ...args);
257
+ const meta = args.length > 0 ? args[0] : undefined;
258
+ if (enableConsole) {
259
+ console.log(formatOutput('INFO', prefix, message, meta));
260
+ }
261
+ if (fileManager) {
262
+ fileManager.write('INFO', `F2A:${component}`, message, meta);
263
+ }
27
264
  },
28
265
  warn(message, ...args) {
29
- console.warn(`${prefix} ${message}`, ...args);
266
+ const meta = args.length > 0 ? args[0] : undefined;
267
+ if (enableConsole) {
268
+ console.warn(formatOutput('WARN', prefix, message, meta));
269
+ }
270
+ if (fileManager) {
271
+ fileManager.write('WARN', `F2A:${component}`, message, meta);
272
+ }
30
273
  },
31
274
  error(message, ...args) {
32
- console.error(`${prefix} ${message}`, ...args);
275
+ const meta = args.length > 0 ? args[0] : undefined;
276
+ if (enableConsole) {
277
+ console.error(formatOutput('ERROR', prefix, message, meta));
278
+ }
279
+ if (fileManager) {
280
+ fileManager.write('ERROR', `F2A:${component}`, message, meta);
281
+ }
33
282
  }
34
283
  };
35
284
  }
36
- /** 默认日志记录器 */
285
+ /**
286
+ * 创建带文件输出的日志记录器
287
+ * @param options 配置选项
288
+ */
289
+ function createFileLogger(options = {}) {
290
+ return createLogger({ ...options, enableFile: true });
291
+ }
292
+ /** 默认日志记录器(仅控制台) */
37
293
  exports.logger = createLogger();
38
- /** 组件专用日志记录器 */
294
+ /** 组件专用日志记录器(仅控制台) */
39
295
  exports.webhookLogger = createLogger('Webhook');
40
296
  exports.taskGuardLogger = createLogger('TaskGuard');
41
297
  exports.queueLogger = createLogger('Queue');
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAgBH,oCAiBC;AAxBD,aAAa;AACb,MAAM,cAAc,GAAG,OAAO,CAAC;AAE/B;;;GAGG;AACH,SAAgB,YAAY,CAAC,SAAkB;IAC7C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,SAAS,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC;IAEjE,OAAO;QACL,KAAK,CAAC,OAAe,EAAE,GAAG,IAAe;YACvC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,OAAe,EAAE,GAAG,IAAe;YACtC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,OAAe,EAAE,GAAG,IAAe;YACtC,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,KAAK,CAAC,OAAe,EAAE,GAAG,IAAe;YACvC,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;AACJ,CAAC;AAED,cAAc;AACD,QAAA,MAAM,GAAG,YAAY,EAAE,CAAC;AAErC,gBAAgB;AACH,QAAA,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AACxC,QAAA,eAAe,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;AAC5C,QAAA,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;AACpC,QAAA,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AAClC,QAAA,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
@@ -4,13 +4,7 @@
4
4
  */
5
5
  import type { F2ANodeConfig, AgentInfo, PeerInfo, TaskRequest, TaskResponse, DelegateOptions } from './types.js';
6
6
  import { Result } from './types.js';
7
- /** Logger 接口 */
8
- interface Logger {
9
- info(message: string, ...args: unknown[]): void;
10
- warn(message: string, ...args: unknown[]): void;
11
- error(message: string, ...args: unknown[]): void;
12
- debug?(message: string, ...args: unknown[]): void;
13
- }
7
+ import type { Logger } from './logger.js';
14
8
  export declare class F2ANetworkClient {
15
9
  private baseUrl;
16
10
  private token;
@@ -69,5 +63,4 @@ export declare class F2ANetworkClient {
69
63
  */
70
64
  rejectConnection(peerId: string, reason?: string): Promise<Result<void>>;
71
65
  }
72
- export {};
73
66
  //# sourceMappingURL=network-client.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"network-client.d.ts","sourceRoot":"","sources":["../src/network-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAiC,MAAM,YAAY,CAAC;AAGnE,gBAAgB;AAChB,UAAU,MAAM;IACd,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjD,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CACnD;AAuBD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM;IASlD;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;OAEG;IACH,OAAO,CAAC,cAAc;IAMtB;;OAEG;IACH,OAAO,CAAC,KAAK;YAIC,OAAO;IA8FrB;;OAEG;IACG,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAIvE;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAItD;;OAEG;IACG,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAItE;;OAEG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAOxB;;OAEG;IACG,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAOhE;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAI3E;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAIvD;;OAEG;IACG,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAI9D;;OAEG;IACG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAG/E"}
1
+ {"version":3,"file":"network-client.d.ts","sourceRoot":"","sources":["../src/network-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAiC,MAAM,YAAY,CAAC;AAGnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAuB1C,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM;IASlD;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;OAEG;IACH,OAAO,CAAC,cAAc;IAMtB;;OAEG;IACH,OAAO,CAAC,KAAK;YAIC,OAAO;IA8FrB;;OAEG;IACG,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAIvE;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAItD;;OAEG;IACG,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAItE;;OAEG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAOxB;;OAEG;IACG,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAOhE;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAI3E;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAIvD;;OAEG;IACG,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAI9D;;OAEG;IACG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAG/E"}
@@ -1 +1 @@
1
- {"version":3,"file":"network-client.js","sourceRoot":"","sources":["../src/network-client.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAUH,yCAAmE;AACnE,0CAA4D;AAU5D,iBAAiB;AACjB,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEjC,aAAa;AACb,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAEnC,cAAc;AACd,MAAM,qBAAqB,GAAG;IAC5B,YAAY;IACZ,WAAW;IACX,WAAW;IACX,cAAc;IACd,cAAc;IACd,aAAa;IACb,WAAW;CACZ,CAAC;AAEF,oBAAoB;AACpB,MAAM,sBAAsB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAEpD,MAAa,gBAAgB;IACnB,OAAO,CAAS;IAChB,KAAK,CAAS;IACd,SAAS,CAAS;IAClB,UAAU,CAAS;IACnB,WAAW,CAAS;IACpB,MAAM,CAAS;IAEvB,YAAY,MAAqB,EAAE,MAAe;QAChD,IAAI,CAAC,OAAO,GAAG,oBAAoB,MAAM,CAAC,WAAW,EAAE,CAAC;QACxD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,kBAAkB,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,mBAAmB,CAAC;QAC3D,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,qBAAqB,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,KAAc;QACrC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO;YACP,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO;YACP,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,OAAe;QACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;QACtD,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU;IAC/D,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,EAAU;QACtB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,MAAc,EACd,IAAY,EACZ,IAAc;QAEd,0CAA0C;QAC1C,IAAI,SAAS,GAAU,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEtE,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;YAC5D,0BAA0B;YAC1B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAEvE,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,EAAE;oBACrD,MAAM;oBACN,OAAO,EAAE;wBACP,eAAe,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE;wBACvC,cAAc,EAAE,kBAAkB;qBACnC;oBACD,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC7C,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBAExC,oBAAoB;oBACpB,IAAI,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;wBAClF,SAAS,GAAG,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC,CAAC;wBAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;wBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,UAAU,OAAO,eAAe,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;wBAC7H,YAAY,CAAC,SAAS,CAAC,CAAC;wBACxB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC1B,SAAS;oBACX,CAAC;oBAED,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,QAAQ,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CACxC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAO,CAAC;gBACxC,OAAO,IAAA,kBAAO,EAAC,IAAI,CAAC,CAAC;YAEvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,SAAS;gBACT,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC1D,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;wBAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;wBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,mBAAmB,OAAO,eAAe,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;wBACtI,YAAY,CAAC,SAAS,CAAC,CAAC;wBACxB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC1B,SAAS;oBACX,CAAC;oBACD,aAAa;oBACb,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,2BAA2B,IAAI,CAAC,SAAS,IAAI,CAC9C,CAAC,CAAC;gBACL,CAAC;gBAED,UAAU;gBACV,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC9D,SAAS,GAAG,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;oBAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;oBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,UAAU,OAAO,eAAe,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;oBAC7H,YAAY,CAAC,SAAS,CAAC,CAAC;oBACxB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC1B,SAAS;gBACX,CAAC;gBAED,qBAAqB;gBACrB,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAC;gBAC5C,SAAS,GAAG,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;gBAE/B,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,YAAY,CACb,CAAC,CAAC;YACL,CAAC;oBAAS,CAAC;gBACT,YAAY,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,WAAW;QACX,gDAAgD;QAChD,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,SAAS,CAAC,OAAO,CAClB,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAc,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAa,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,OAAwB;QACzC,OAAO,IAAI,CAAC,OAAO,CAAU,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CACpB,MAAc,EACd,QAAsB;QAEtB,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,gBAAgB,EAAE;YAClD,MAAM;YACN,GAAG,QAAQ;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,UAAkB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,mBAAmB,EAAE;YACrD,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC;SAC3C,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,SAA6B;QACjD,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe;QACnB,OAAO,IAAI,CAAC,OAAO,CAAgB,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAAc;QACpC,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,MAAe;QACpD,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9E,CAAC;CACF;AAvND,4CAuNC"}
1
+ {"version":3,"file":"network-client.js","sourceRoot":"","sources":["../src/network-client.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAUH,yCAAmE;AACnE,0CAA4D;AAI5D,iBAAiB;AACjB,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAEjC,aAAa;AACb,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAEnC,cAAc;AACd,MAAM,qBAAqB,GAAG;IAC5B,YAAY;IACZ,WAAW;IACX,WAAW;IACX,cAAc;IACd,cAAc;IACd,aAAa;IACb,WAAW;CACZ,CAAC;AAEF,oBAAoB;AACpB,MAAM,sBAAsB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAEpD,MAAa,gBAAgB;IACnB,OAAO,CAAS;IAChB,KAAK,CAAS;IACd,SAAS,CAAS;IAClB,UAAU,CAAS;IACnB,WAAW,CAAS;IACpB,MAAM,CAAS;IAEvB,YAAY,MAAqB,EAAE,MAAe;QAChD,IAAI,CAAC,OAAO,GAAG,oBAAoB,MAAM,CAAC,WAAW,EAAE,CAAC;QACxD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,kBAAkB,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,mBAAmB,CAAC;QAC3D,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,qBAAqB,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,KAAc;QACrC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO;YACP,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO;YACP,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrE,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,OAAe;QACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;QACtD,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU;IAC/D,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,EAAU;QACtB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,MAAc,EACd,IAAY,EACZ,IAAc;QAEd,0CAA0C;QAC1C,IAAI,SAAS,GAAU,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEtE,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;YAC5D,0BAA0B;YAC1B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAEvE,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,EAAE,EAAE;oBACrD,MAAM;oBACN,OAAO,EAAE;wBACP,eAAe,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE;wBACvC,cAAc,EAAE,kBAAkB;qBACnC;oBACD,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC7C,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBAExC,oBAAoB;oBACpB,IAAI,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;wBAClF,SAAS,GAAG,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC,CAAC;wBAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;wBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,UAAU,OAAO,eAAe,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;wBAC7H,YAAY,CAAC,SAAS,CAAC,CAAC;wBACxB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC1B,SAAS;oBACX,CAAC;oBAED,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,QAAQ,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CACxC,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAO,CAAC;gBACxC,OAAO,IAAA,kBAAO,EAAC,IAAI,CAAC,CAAC;YAEvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,SAAS;gBACT,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC1D,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;wBAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;wBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,mBAAmB,OAAO,eAAe,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;wBACtI,YAAY,CAAC,SAAS,CAAC,CAAC;wBACxB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC1B,SAAS;oBACX,CAAC;oBACD,aAAa;oBACb,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,2BAA2B,IAAI,CAAC,SAAS,IAAI,CAC9C,CAAC,CAAC;gBACL,CAAC;gBAED,UAAU;gBACV,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC9D,SAAS,GAAG,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;oBAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;oBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,IAAI,UAAU,OAAO,eAAe,OAAO,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;oBAC7H,YAAY,CAAC,SAAS,CAAC,CAAC;oBACxB,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC1B,SAAS;gBACX,CAAC;gBAED,qBAAqB;gBACrB,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAC;gBAC5C,SAAS,GAAG,IAAA,qBAAW,EAAC,KAAK,CAAC,CAAC;gBAE/B,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,YAAY,CACb,CAAC,CAAC;YACL,CAAC;oBAAS,CAAC;gBACT,YAAY,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,WAAW;QACX,gDAAgD;QAChD,OAAO,IAAA,kBAAO,EAAC,IAAA,sBAAW,EACxB,mBAAmB,EACnB,SAAS,CAAC,OAAO,CAClB,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,UAAmB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAc,MAAM,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACxE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAa,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,OAAwB;QACzC,OAAO,IAAI,CAAC,OAAO,CAAU,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CACpB,MAAc,EACd,QAAsB;QAEtB,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,gBAAgB,EAAE;YAClD,MAAM;YACN,GAAG,QAAQ;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,UAAkB;QACtC,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,mBAAmB,EAAE;YACrD,GAAG,EAAE,UAAU;YACf,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC;SAC3C,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,SAA6B;QACjD,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe;QACnB,OAAO,IAAI,CAAC,OAAO,CAAgB,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAAc;QACpC,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,MAAe;QACpD,OAAO,IAAI,CAAC,OAAO,CAAO,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9E,CAAC;CACF;AAvND,4CAuNC"}
@@ -3,13 +3,7 @@
3
3
  * 管理 F2A Network 服务的生命周期
4
4
  */
5
5
  import type { F2ANodeConfig, Result } from './types.js';
6
- /** Logger 接口 */
7
- interface Logger {
8
- info(message: string, ...args: unknown[]): void;
9
- warn(message: string, ...args: unknown[]): void;
10
- error(message: string, ...args: unknown[]): void;
11
- debug?(message: string, ...args: unknown[]): void;
12
- }
6
+ import type { Logger } from './logger.js';
13
7
  export declare class F2ANodeManager {
14
8
  private process;
15
9
  private config;
@@ -20,10 +14,12 @@ export declare class F2ANodeManager {
20
14
  private consecutiveRestarts;
21
15
  private lastRestartTime;
22
16
  private isRestarting;
17
+ private restartStartTime;
23
18
  constructor(config: Partial<F2ANodeConfig>, logger?: Logger);
24
19
  /**
25
20
  * 清理孤儿进程
26
21
  * 检查 PID 文件中记录的进程是否仍在运行,如果是则尝试清理
22
+ * P2-Round2 修复:检查文件创建时间,避免终止刚启动的实例
27
23
  */
28
24
  private cleanupOrphanProcesses;
29
25
  /**
@@ -67,13 +63,17 @@ export declare class F2ANodeManager {
67
63
  * 启动健康检查
68
64
  *
69
65
  * P1 修复:添加重启次数限制和冷却期,防止无限重启循环
66
+ * P0-2 修复:添加超时机制强制恢复 isRestarting 状态,防止死锁
70
67
  */
71
68
  private startHealthCheck;
72
69
  /**
73
70
  * 生成随机 Token
74
71
  */
72
+ /**
73
+ * 生成 Token
74
+ * P1-1 修复:使用 connector-helpers 中加密安全的 generateToken()
75
+ */
75
76
  private generateToken;
76
77
  getConfig(): F2ANodeConfig;
77
78
  }
78
- export {};
79
79
  //# sourceMappingURL=node-manager.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"node-manager.d.ts","sourceRoot":"","sources":["../src/node-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGxD,gBAAgB;AAChB,UAAU,MAAM;IACd,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACjD,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CACnD;AA2BD,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAC7C,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;IAGvB,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,eAAe,CAAa;IACpC,OAAO,CAAC,YAAY,CAAkB;gBAE1B,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM;IAiB3D;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IA+C9B;;OAEG;IACH,OAAO,CAAC,OAAO;IASf;;OAEG;IACH,OAAO,CAAC,aAAa;IAUrB;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAS5C;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IA6EpC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD3B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAoBnC;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;QAChC,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IAwBH;;OAEG;YACW,YAAY;IAa1B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IA8DxB;;OAEG;IACH,OAAO,CAAC,aAAa;IASrB,SAAS,IAAI,aAAa;CAG3B"}
1
+ {"version":3,"file":"node-manager.d.ts","sourceRoot":"","sources":["../src/node-manager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAKxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AA2B1C,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAC7C,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;IAGvB,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,eAAe,CAAa;IACpC,OAAO,CAAC,YAAY,CAAkB;IAEtC,OAAO,CAAC,gBAAgB,CAAa;gBAEzB,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM;IAiB3D;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IA0D9B;;OAEG;IACH,OAAO,CAAC,OAAO;IASf;;OAEG;IACH,OAAO,CAAC,aAAa;IAUrB;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAS5C;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IA+EpC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD3B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAoBnC;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;QAChC,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IAwBH;;OAEG;YACW,YAAY;IAa1B;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IA+ExB;;OAEG;IACH;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB,SAAS,IAAI,aAAa;CAG3B"}