@hivemagnus/magnus-server 1.0.2 → 1.1.0

package/dist/services/webhook-service.js

@@ -1,4 +1,5 @@
 import { recordMonitorPulse } from './monitor-pulse.js';
+import { WEBHOOK_FORMATS, webhookFormat } from './webhook-types.js';
 import { redactUnknown } from '../utils/redact.js';
 import { createHmac, randomBytes, createCipheriv } from 'node:crypto';
 import { nanoid } from 'nanoid';
@@ -67,7 +68,7 @@ export async function reconcileWebhookDeliveries() {
         // replaced; failed jobs are finalized by the worker's failure bookkeeping.
         await addDurableJob(getWebhookQueue(), 'deliver', createWebhookJobPayload(delivery.endpointId), {
             jobId: delivery.id,
-            attempts: delivery.endpoint.type === 'mattermost' ? 1 : Math.max(1, Math.min(11, delivery.endpoint.retries + 1)),
+            attempts: webhookFormat(delivery.endpoint.type) === 'mattermost' ? 1 : Math.max(1, Math.min(11, delivery.endpoint.retries + 1)),
             backoff: { type: 'exponential', delay: 1000 },
             removeOnComplete: { age: 86400, count: 10000 }, removeOnFail: { age: 604800, count: 10000 },
         }, ['completed']);
@@ -254,9 +255,9 @@ export function startWebhookWorker() {
         const extraHeaders = parseStoredHeaders(endpoint.id, endpoint.headers);
         const shouldEncrypt = extraHeaders['x-magnus-encrypt'] === 'true';
         delete extraHeaders['x-magnus-encrypt'];
-        const { body: rawBody, contentType } = formatPayload(endpoint.type, delivery.event, delivery.payload);
+        const { body: rawBody, contentType } = formatPayload(webhookFormat(endpoint.type), delivery.event, delivery.payload);
         // Optionally encrypt the payload with AES-256-GCM
-        const encrypted = shouldEncrypt && secret !== null && endpoint.type === 'generic';
+        const encrypted = shouldEncrypt && secret !== null && webhookFormat(endpoint.type) === 'generic';
         const body = encrypted ? encryptPayload(rawBody, secret) : rawBody;
         const headers = {
             ...extraHeaders,
@@ -269,7 +270,7 @@ export function startWebhookWorker() {
         if (secret) {
             headers['X-Magnus-Signature'] = `sha256=${signPayload(body, secret)}`;
         }
-        if (endpoint.type === 'mattermost' && !(await claimMattermostAttempt(deliveryId)))
+        if (webhookFormat(endpoint.type) === 'mattermost' && !(await claimMattermostAttempt(deliveryId)))
             return;
         try {
             const res = await postWebhook(webhookUrl(endpoint), { headers, body, timeoutMs: endpoint.timeoutMs });
@@ -356,7 +357,8 @@ export async function getWebhookEndpoint(id) {
 export async function createWebhookEndpoint(data) {
     const db = getDb();
     const id = nanoid();
-    if (!['generic', 'slack', 'discord', 'mattermost'].includes(data.type ?? 'generic'))
+    const type = webhookFormat(data.type ?? 'generic');
+    if (!WEBHOOK_FORMATS.includes(type))
         throw new Error('Unsupported webhook format');
     await validateWebhookTarget(data.url);
     const headers = normalizeHeaders(data.headers ?? {});
@@ -366,7 +368,7 @@ export async function createWebhookEndpoint(data) {
             id,
             name: data.name,
             url: encryptWebhookCredential(data.url, id, 'url'),
-            type: data.type ?? 'generic',
+            type,
             secret: data.secret === undefined ? null : encryptWebhookCredential(data.secret, id, 'secret'),
             events: JSON.stringify(data.events ?? []),
             headers: encryptWebhookCredential(JSON.stringify(headers), id, 'headers'),
@@ -390,9 +392,10 @@ export async function updateWebhookEndpoint(id, data) {
         updateData['url'] = encryptWebhookCredential(data.url, id, 'url');
     }
     if (data.type !== undefined) {
-        if (!['generic', 'slack', 'discord', 'mattermost'].includes(data.type))
+        const type = webhookFormat(data.type);
+        if (!WEBHOOK_FORMATS.includes(type))
             throw new Error('Unsupported webhook format');
-        updateData['type'] = data.type;
+        updateData['type'] = type;
     }
     if (data.secret !== undefined) {
         updateData['secret'] = data.secret === null ? null : encryptWebhookCredential(data.secret, id, 'secret');
@@ -442,12 +445,12 @@ export async function testWebhookEndpoint(id) {
             message: 'This is a test webhook delivery from Magnus',
             timestamp: new Date().toISOString(),
         };
-        const { body: rawBody, contentType } = formatPayload(endpoint.type, 'webhook.test', JSON.stringify(testPayload));
+        const { body: rawBody, contentType } = formatPayload(webhookFormat(endpoint.type), 'webhook.test', JSON.stringify(testPayload));
         const secret = encryptedSecret(endpoint);
         const extraHeaders = parseStoredHeaders(endpoint.id, endpoint.headers);
         const shouldEncrypt = extraHeaders['x-magnus-encrypt'] === 'true';
         delete extraHeaders['x-magnus-encrypt'];
-        const encrypted = shouldEncrypt && secret !== null && endpoint.type === 'generic';
+        const encrypted = shouldEncrypt && secret !== null && webhookFormat(endpoint.type) === 'generic';
         const body = encrypted ? encryptPayload(rawBody, secret) : rawBody;
         const headers = {
             ...extraHeaders,

package/dist/services/webhook-types.js

@@ -0,0 +1,29 @@
+export const WEBHOOK_FORMATS = ['generic', 'slack', 'discord', 'mattermost'];
+/**
+ * Legacy webhook type names mapped to current formats, from
+ * `MAGNUS_WEBHOOK_TYPE_ALIASES` (comma-separated `legacy=format` pairs). Lets
+ * endpoints stored or submitted under an older type name keep their format.
+ */
+export function webhookTypeAliases(raw = process.env['MAGNUS_WEBHOOK_TYPE_ALIASES']) {
+    if (raw === undefined || raw.trim() === '')
+        return {};
+    const aliases = {};
+    for (const pair of raw.split(',').map(item => item.trim()).filter(Boolean)) {
+        const [from, to, extra] = pair.split('=').map(item => item.trim());
+        if (extra !== undefined || !from || !to || !/^[a-z][a-z0-9_-]{0,31}$/.test(from)
+            || WEBHOOK_FORMATS.includes(from) || !WEBHOOK_FORMATS.includes(to))
+            throw new Error('MAGNUS_WEBHOOK_TYPE_ALIASES must list legacy=format pairs, where format is generic, slack, discord or mattermost');
+        aliases[from] = to;
+    }
+    return aliases;
+}
+/** The current delivery format for a stored or submitted webhook type. */
+export function webhookFormat(type) {
+    let aliases = {};
+    try {
+        aliases = webhookTypeAliases();
+    }
+    catch { /* Startup validation reports a malformed list. */ }
+    return Object.hasOwn(aliases, type) ? aliases[type] : type;
+}
+//# sourceMappingURL=webhook-types.js.map

package/dist/utils/runtime-file.js

@@ -0,0 +1,23 @@
+import { mkdirSync, renameSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { magnusHome } from './magnus-home.js';
+/**
+ * `run/server-runtime.json` tells upgrade tooling which version is actually
+ * serving (the public health endpoints deliberately omit the version).
+ */
+export function runtimeFilePath(env = process.env) {
+    return env['MAGNUS_RUNTIME_FILE']?.trim() || join(magnusHome(env), 'run', 'server-runtime.json');
+}
+export function writeRuntimeFile(details, env = process.env) {
+    const path = runtimeFilePath(env);
+    try {
+        mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+        const temporary = `${path}.${process.pid}.tmp`;
+        writeFileSync(temporary, `${JSON.stringify({ ...details, pid: process.pid, startedAt: new Date().toISOString() })}\n`, { mode: 0o600 });
+        renameSync(temporary, path);
+    }
+    catch (error) {
+        console.warn(`[startup] could not write ${path}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+//# sourceMappingURL=runtime-file.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hivemagnus/magnus-server",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Magnus server: the fleet control plane API (Hono, PostgreSQL, Redis) for nodes running magnus-agent, with optional Hive IAM, Hive Router, HiveMem, Hermes Agent and external security console integrations.",
   "keywords": [
     "magnus",
@@ -84,7 +84,7 @@
     "prepublishOnly": "npm run db:generate && npm run clean && npm run build"
   },
   "dependencies": {
-    "@hivemagnus/magnus-contracts": "1.0.2",
+    "@hivemagnus/magnus-contracts": "1.1.0",
     "@hono/node-server": "^2.1.5",
     "@hono/swagger-ui": "^0.6.2",
     "@prisma/adapter-pg": "7.10.1",
@@ -102,7 +102,7 @@
     "ws": "^8.22.0",
     "yaml": "2.9.1",
     "zod": "^4.6.7",
-    "@hivemagnus/magnus-skills": "1.0.2",
+    "@hivemagnus/magnus-skills": "1.1.0",
     "prisma": "^7.10.1"
   },
   "devDependencies": {