@naisys/hub 3.0.0-beta.40 → 3.0.0-beta.42
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/handlers/hubAgentService.js +8 -4
- package/dist/naisysHub.js +1 -1
- package/npm-shrinkwrap.json +23 -23
- package/package.json +6 -6
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AgentPeekRequestSchema, AgentRunCommandRequestSchema, AgentRunPauseRequestSchema, AgentStartInboundSchema, AgentStopRequestSchema, HubEvents, } from "@naisys/hub-protocol";
|
|
2
2
|
/** Handles agent_start requests by routing them to the least-loaded eligible host */
|
|
3
|
-
export function createHubAgentService(naisysServer, { hubDb }, logService, heartbeatService, sendMailService, hostRegistrar, runtimeKeyService) {
|
|
3
|
+
export function createHubAgentService(naisysServer, { hubDb }, logService, heartbeatService, sendMailService, hostRegistrar, runtimeKeyService, configService) {
|
|
4
4
|
const { issueRuntimeApiKey, revokeRuntimeApiKey } = runtimeKeyService;
|
|
5
5
|
/** Find the least-loaded eligible host for a given user */
|
|
6
6
|
async function findBestHost(startUserId) {
|
|
@@ -235,12 +235,16 @@ export function createHubAgentService(naisysServer, { hubDb }, logService, heart
|
|
|
235
235
|
});
|
|
236
236
|
async function sendTaskMail(startUserId, requesterUserId, taskDescription) {
|
|
237
237
|
try {
|
|
238
|
+
const mailEnabled = !!configService.getConfig().config?.mailServiceEnabled;
|
|
238
239
|
await sendMailService.sendMail({
|
|
239
240
|
fromUserId: requesterUserId,
|
|
240
241
|
recipientUserIds: [startUserId],
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
242
|
+
// Agent will send a 'Session Completed' message when session is completed
|
|
243
|
+
subject: mailEnabled ? "Agent Start" : "",
|
|
244
|
+
body: mailEnabled
|
|
245
|
+
? taskDescription
|
|
246
|
+
: `Agent Start: ${taskDescription}`,
|
|
247
|
+
kind: mailEnabled ? "mail" : "chat",
|
|
244
248
|
});
|
|
245
249
|
}
|
|
246
250
|
catch (err) {
|
package/dist/naisysHub.js
CHANGED
|
@@ -89,7 +89,7 @@ export const startHub = async (startupType, startSupervisor, plugins, startupAge
|
|
|
89
89
|
// Register hub send mail service (pure mail sending, no auto-start logic)
|
|
90
90
|
const sendMailService = createHubSendMailService(naisysServer, hubDatabaseService, heartbeatService, redactionService);
|
|
91
91
|
// Register hub agent service for agent_start requests routed to target hosts
|
|
92
|
-
const agentService = createHubAgentService(naisysServer, hubDatabaseService, logService, heartbeatService, sendMailService, hostRegistrar, runtimeKeyService);
|
|
92
|
+
const agentService = createHubAgentService(naisysServer, hubDatabaseService, logService, heartbeatService, sendMailService, hostRegistrar, runtimeKeyService, configService);
|
|
93
93
|
// Register hub mail service for mail events from NAISYS instances
|
|
94
94
|
const mailService = createHubMailService(naisysServer, hubDatabaseService, logService, heartbeatService, sendMailService, agentService, costService, configService);
|
|
95
95
|
/**
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@naisys/hub",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.42",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@naisys/hub",
|
|
9
|
-
"version": "3.0.0-beta.
|
|
9
|
+
"version": "3.0.0-beta.42",
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@naisys/common": "3.0.0-beta.
|
|
12
|
-
"@naisys/common-node": "3.0.0-beta.
|
|
13
|
-
"@naisys/hub-database": "3.0.0-beta.
|
|
14
|
-
"@naisys/hub-protocol": "3.0.0-beta.
|
|
11
|
+
"@naisys/common": "3.0.0-beta.42",
|
|
12
|
+
"@naisys/common-node": "3.0.0-beta.42",
|
|
13
|
+
"@naisys/hub-database": "3.0.0-beta.42",
|
|
14
|
+
"@naisys/hub-protocol": "3.0.0-beta.42",
|
|
15
15
|
"commander": "^14.0.3",
|
|
16
16
|
"dotenv": "^17.3.1",
|
|
17
17
|
"fastify": "^5.8.2",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"node": ">=22.0.0"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@naisys/supervisor": "3.0.0-beta.
|
|
27
|
+
"@naisys/supervisor": "3.0.0-beta.42"
|
|
28
28
|
},
|
|
29
29
|
"peerDependenciesMeta": {
|
|
30
30
|
"@naisys/supervisor": {
|
|
@@ -189,32 +189,32 @@
|
|
|
189
189
|
"license": "MIT"
|
|
190
190
|
},
|
|
191
191
|
"node_modules/@naisys/common": {
|
|
192
|
-
"version": "3.0.0-beta.
|
|
193
|
-
"resolved": "https://registry.npmjs.org/@naisys/common/-/common-3.0.0-beta.
|
|
194
|
-
"integrity": "sha512-
|
|
192
|
+
"version": "3.0.0-beta.42",
|
|
193
|
+
"resolved": "https://registry.npmjs.org/@naisys/common/-/common-3.0.0-beta.42.tgz",
|
|
194
|
+
"integrity": "sha512-uF5qsHYTtG7KMzdkpSrvC8sJubiP1EMSYrdsDhC/7am6txIph+sYc+4YRDDEL+nsXyJZ0pzKlpsIqyA3n0VShA==",
|
|
195
195
|
"dependencies": {
|
|
196
196
|
"semver": "^7.7.4",
|
|
197
197
|
"zod": "^4.3.6"
|
|
198
198
|
}
|
|
199
199
|
},
|
|
200
200
|
"node_modules/@naisys/common-node": {
|
|
201
|
-
"version": "3.0.0-beta.
|
|
202
|
-
"resolved": "https://registry.npmjs.org/@naisys/common-node/-/common-node-3.0.0-beta.
|
|
203
|
-
"integrity": "sha512
|
|
201
|
+
"version": "3.0.0-beta.42",
|
|
202
|
+
"resolved": "https://registry.npmjs.org/@naisys/common-node/-/common-node-3.0.0-beta.42.tgz",
|
|
203
|
+
"integrity": "sha512-fnVLrTQolU5jzrDEF5t2JXVN3Cd9IJ7web6Gm6K61vqFreBE4jJpuH/IqlIK8J1Cx8YRKiGrpX8+M5JEiQ/GwQ==",
|
|
204
204
|
"dependencies": {
|
|
205
|
-
"@naisys/common": "3.0.0-beta.
|
|
205
|
+
"@naisys/common": "3.0.0-beta.42",
|
|
206
206
|
"better-sqlite3": "^12.6.2",
|
|
207
207
|
"js-yaml": "^4.1.1",
|
|
208
208
|
"pino": "^10.3.1"
|
|
209
209
|
}
|
|
210
210
|
},
|
|
211
211
|
"node_modules/@naisys/hub-database": {
|
|
212
|
-
"version": "3.0.0-beta.
|
|
213
|
-
"resolved": "https://registry.npmjs.org/@naisys/hub-database/-/hub-database-3.0.0-beta.
|
|
214
|
-
"integrity": "sha512-
|
|
212
|
+
"version": "3.0.0-beta.42",
|
|
213
|
+
"resolved": "https://registry.npmjs.org/@naisys/hub-database/-/hub-database-3.0.0-beta.42.tgz",
|
|
214
|
+
"integrity": "sha512-ioa6Tsu4rFkYbaClgdg+GK1+7ipIVYdPiUhQcreXUNDqg9yHIGuT9neS31DwfpEPwhhAlagHLtY2ncwbaIMQhA==",
|
|
215
215
|
"dependencies": {
|
|
216
|
-
"@naisys/common": "3.0.0-beta.
|
|
217
|
-
"@naisys/common-node": "3.0.0-beta.
|
|
216
|
+
"@naisys/common": "3.0.0-beta.42",
|
|
217
|
+
"@naisys/common-node": "3.0.0-beta.42",
|
|
218
218
|
"@prisma/adapter-better-sqlite3": "^7.5.0",
|
|
219
219
|
"@prisma/client": "^7.5.0",
|
|
220
220
|
"better-sqlite3": "^12.6.2",
|
|
@@ -222,11 +222,11 @@
|
|
|
222
222
|
}
|
|
223
223
|
},
|
|
224
224
|
"node_modules/@naisys/hub-protocol": {
|
|
225
|
-
"version": "3.0.0-beta.
|
|
226
|
-
"resolved": "https://registry.npmjs.org/@naisys/hub-protocol/-/hub-protocol-3.0.0-beta.
|
|
227
|
-
"integrity": "sha512-
|
|
225
|
+
"version": "3.0.0-beta.42",
|
|
226
|
+
"resolved": "https://registry.npmjs.org/@naisys/hub-protocol/-/hub-protocol-3.0.0-beta.42.tgz",
|
|
227
|
+
"integrity": "sha512-V+6hvtMksm2Tc2wbp/peDNwuaNKoD752ihEUK6W2puARFHpkrHK5AUdzHuvBvaAGE7xxMYULPN9coUwWjsqe4g==",
|
|
228
228
|
"dependencies": {
|
|
229
|
-
"@naisys/common": "3.0.0-beta.
|
|
229
|
+
"@naisys/common": "3.0.0-beta.42",
|
|
230
230
|
"zod": "^4.3.6"
|
|
231
231
|
}
|
|
232
232
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@naisys/hub",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.42",
|
|
4
4
|
"description": "NAISYS Hub - Adds persistence and multi-instance coordination to NAISYS",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/naisysHub.js",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"!dist/**/*.d.ts.map"
|
|
33
33
|
],
|
|
34
34
|
"peerDependencies": {
|
|
35
|
-
"@naisys/supervisor": "3.0.0-beta.
|
|
35
|
+
"@naisys/supervisor": "3.0.0-beta.42"
|
|
36
36
|
},
|
|
37
37
|
"peerDependenciesMeta": {
|
|
38
38
|
"@naisys/supervisor": {
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
}
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@naisys/common": "3.0.0-beta.
|
|
44
|
-
"@naisys/common-node": "3.0.0-beta.
|
|
45
|
-
"@naisys/hub-database": "3.0.0-beta.
|
|
46
|
-
"@naisys/hub-protocol": "3.0.0-beta.
|
|
43
|
+
"@naisys/common": "3.0.0-beta.42",
|
|
44
|
+
"@naisys/common-node": "3.0.0-beta.42",
|
|
45
|
+
"@naisys/hub-database": "3.0.0-beta.42",
|
|
46
|
+
"@naisys/hub-protocol": "3.0.0-beta.42",
|
|
47
47
|
"commander": "^14.0.3",
|
|
48
48
|
"dotenv": "^17.3.1",
|
|
49
49
|
"fastify": "^5.8.2",
|