@rei-standard/amsg-server 2.1.1 → 2.3.1

package/dist/index.mjs

@@ -47,6 +47,71 @@ function isValidUUIDv4(uuid) {
   const uuidV4Regex = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
   return uuidV4Regex.test(uuid);
 }
+var VALID_LLM_MESSAGE_ROLES = /* @__PURE__ */ new Set(["system", "user", "assistant", "tool"]);
+var AVATAR_URL_MAX_LENGTH = 2048;
+function validateAvatarUrl(value) {
+  if (value === void 0 || value === null) return null;
+  if (typeof value !== "string") {
+    return "avatarUrl \u5FC5\u987B\u662F\u5B57\u7B26\u4E32";
+  }
+  if (/^data:/i.test(value)) {
+    return "\u5934\u50CF\u4E0D\u652F\u6301\u4F20\u5165 data: URI\uFF0C\u8BF7\u6539\u4E3A\u516C\u7F51\u53EF\u8BBF\u95EE\u7684 https:// \u56FE\u7247 URL";
+  }
+  if (value.length > AVATAR_URL_MAX_LENGTH) {
+    return `\u5934\u50CF URL \u957F\u5EA6 ${value.length} \u5B57\u7B26\u8D85\u8FC7 ${AVATAR_URL_MAX_LENGTH} \u4E0A\u9650\uFF0C\u8BF7\u6539\u4E3A\u66F4\u77ED\u7684\u56FE\u7247 URL`;
+  }
+  if (!isValidUrl(value)) {
+    return "avatarUrl \u4E0D\u662F\u5408\u6CD5 URL";
+  }
+  return null;
+}
+var SPLIT_PATTERN_MAX_LENGTH = 200;
+var SPLIT_PATTERN_MAX_ITEMS = 10;
+function validateSplitPattern(value) {
+  if (value === void 0 || value === null) return null;
+  const isArray = Array.isArray(value);
+  const items = isArray ? value : [value];
+  if (isArray && items.length === 0) return null;
+  if (items.length > SPLIT_PATTERN_MAX_ITEMS) {
+    return `splitPattern \u6570\u7EC4\u6700\u591A ${SPLIT_PATTERN_MAX_ITEMS} \u9879`;
+  }
+  for (let i = 0; i < items.length; i++) {
+    const s = items[i];
+    const label = isArray ? `splitPattern[${i}]` : "splitPattern";
+    if (typeof s !== "string") return `${label} \u5FC5\u987B\u662F\u5B57\u7B26\u4E32`;
+    if (s.length > SPLIT_PATTERN_MAX_LENGTH) {
+      return `${label} \u4E0D\u80FD\u8D85\u8FC7 ${SPLIT_PATTERN_MAX_LENGTH} \u5B57\u7B26`;
+    }
+    try {
+      new RegExp(s);
+    } catch (_) {
+      return `${label} \u4E0D\u662F\u6709\u6548\u6B63\u5219\u8868\u8FBE\u5F0F`;
+    }
+  }
+  return null;
+}
+function validateLlmMessagesArray(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) {
+    return "messages must be a non-empty array";
+  }
+  for (let i = 0; i < messages.length; i++) {
+    const m = messages[i];
+    if (!m || typeof m !== "object" || Array.isArray(m)) {
+      return `messages[${i}] must be an object`;
+    }
+    if (!VALID_LLM_MESSAGE_ROLES.has(m.role)) {
+      return `messages[${i}].role must be one of system / user / assistant / tool`;
+    }
+    if (typeof m.content === "string") {
+      if (!m.content) return `messages[${i}].content must be a non-empty string`;
+    } else if (Array.isArray(m.content)) {
+      if (m.content.length === 0) return `messages[${i}].content array must be non-empty`;
+    } else {
+      return `messages[${i}].content must be a non-empty string or a non-empty array`;
+    }
+  }
+  return null;
+}
 function validateScheduleMessagePayload(payload) {
   if (!payload.contactName || typeof payload.contactName !== "string") {
     return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "\u7F3A\u5C11\u5FC5\u9700\u53C2\u6570\u6216\u53C2\u6570\u683C\u5F0F\u9519\u8BEF", details: { missingFields: ["contactName"] } };
@@ -74,9 +139,35 @@ function validateScheduleMessagePayload(payload) {
       return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "\u7F3A\u5C11\u5FC5\u9700\u53C2\u6570\u6216\u53C2\u6570\u683C\u5F0F\u9519\u8BEF", details: { missingFields: ["userMessage (required for fixed type)"] } };
     }
   }
+  const promptCheck = (() => {
+    const hasCompletePrompt = payload.completePrompt !== void 0 && payload.completePrompt !== null && payload.completePrompt !== "";
+    const hasMessages = payload.messages !== void 0 && payload.messages !== null;
+    if (hasCompletePrompt && hasMessages) {
+      return {
+        error: { code: "INVALID_PARAMETERS", message: "exactly one of `completePrompt` or `messages` must be provided\uFF08\u4E24\u8005\u4E0D\u80FD\u540C\u65F6\u51FA\u73B0\uFF09", details: { invalidFields: ["completePrompt", "messages"] } },
+        hasCompletePrompt: true,
+        hasMessages: true
+      };
+    }
+    if (hasMessages) {
+      const err = validateLlmMessagesArray(payload.messages);
+      if (err) {
+        return {
+          error: { code: "INVALID_PARAMETERS", message: err, details: { invalidFields: ["messages"] } },
+          hasCompletePrompt: false,
+          hasMessages: true
+        };
+      }
+    }
+    return { error: null, hasCompletePrompt, hasMessages };
+  })();
+  if (promptCheck.error) {
+    return { valid: false, errorCode: promptCheck.error.code, errorMessage: promptCheck.error.message, details: promptCheck.error.details };
+  }
+  const hasPrompt = promptCheck.hasCompletePrompt || promptCheck.hasMessages;
   if (payload.messageType === "prompted" || payload.messageType === "auto") {
     const missingAiFields = [];
-    if (!payload.completePrompt) missingAiFields.push("completePrompt");
+    if (!hasPrompt) missingAiFields.push("completePrompt or messages");
     if (!payload.apiUrl) missingAiFields.push("apiUrl");
     if (!payload.apiKey) missingAiFields.push("apiKey");
     if (!payload.primaryModel) missingAiFields.push("primaryModel");
@@ -88,14 +179,18 @@ function validateScheduleMessagePayload(payload) {
     if (payload.recurrenceType && payload.recurrenceType !== "none") {
       return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "instant \u7C7B\u578B\u7684 recurrenceType \u5FC5\u987B\u4E3A none", details: { invalidFields: ['recurrenceType (must be "none" for instant type)'] } };
     }
-    const hasAiConfig = payload.completePrompt && payload.apiUrl && payload.apiKey && payload.primaryModel;
+    const hasAiConfig = hasPrompt && payload.apiUrl && payload.apiKey && payload.primaryModel;
     const hasUserMessage = payload.userMessage;
     if (!hasAiConfig && !hasUserMessage) {
-      return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "instant \u7C7B\u578B\u5FC5\u987B\u63D0\u4F9B userMessage \u6216\u5B8C\u6574\u7684 AI \u914D\u7F6E", details: { missingFields: ["userMessage or (completePrompt + apiUrl + apiKey + primaryModel)"] } };
+      return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "instant \u7C7B\u578B\u5FC5\u987B\u63D0\u4F9B userMessage \u6216\u5B8C\u6574\u7684 AI \u914D\u7F6E", details: { missingFields: ["userMessage or ((completePrompt | messages) + apiUrl + apiKey + primaryModel)"] } };
     }
   }
-  if (payload.avatarUrl && !isValidUrl(payload.avatarUrl)) {
-    return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "\u7F3A\u5C11\u5FC5\u9700\u53C2\u6570\u6216\u53C2\u6570\u683C\u5F0F\u9519\u8BEF", details: { invalidFields: ["avatarUrl (invalid URL format)"] } };
+  if (payload.temperature !== void 0 && payload.temperature !== null && (typeof payload.temperature !== "number" || !Number.isFinite(payload.temperature))) {
+    return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "\u7F3A\u5C11\u5FC5\u9700\u53C2\u6570\u6216\u53C2\u6570\u683C\u5F0F\u9519\u8BEF", details: { invalidFields: ["temperature (must be a finite number)"] } };
+  }
+  const avatarErr = validateAvatarUrl(payload.avatarUrl);
+  if (avatarErr) {
+    return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: avatarErr, details: { invalidFields: ["avatarUrl"] } };
   }
   if (payload.uuid && !isValidUUID(payload.uuid)) {
     return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "\u7F3A\u5C11\u5FC5\u9700\u53C2\u6570\u6216\u53C2\u6570\u683C\u5F0F\u9519\u8BEF", details: { invalidFields: ["uuid (invalid UUID format)"] } };
@@ -103,6 +198,10 @@ function validateScheduleMessagePayload(payload) {
   if (payload.messageSubtype !== void 0 && payload.messageSubtype !== null && typeof payload.messageSubtype !== "string") {
     return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: "\u7F3A\u5C11\u5FC5\u9700\u53C2\u6570\u6216\u53C2\u6570\u683C\u5F0F\u9519\u8BEF", details: { invalidFields: ["messageSubtype"] } };
   }
+  const splitErr = validateSplitPattern(payload.splitPattern);
+  if (splitErr) {
+    return { valid: false, errorCode: "INVALID_PARAMETERS", errorMessage: splitErr, details: { invalidFields: ["splitPattern"] } };
+  }
   return { valid: true };
 }
 
@@ -383,6 +482,26 @@ function isUniqueViolation(error) {
 
 // src/server/lib/message-processor.js
 import { randomUUID } from "crypto";
+var DEFAULT_SPLIT_REGEX = /([。！？!?]+)/;
+function splitOnceByRegex(chunk, regex) {
+  const out = chunk.split(regex).reduce((acc, part, i, arr) => {
+    if (i % 2 === 0 && part.trim()) {
+      const punctuation = arr[i + 1] || "";
+      acc.push(part.trim() + punctuation);
+    }
+    return acc;
+  }, []).filter((s) => s.length > 0);
+  return out.length > 0 ? out : [chunk];
+}
+function splitMessageIntoSentences(messageContent, splitPattern = null) {
+  const sources = splitPattern == null ? null : Array.isArray(splitPattern) ? splitPattern : [splitPattern];
+  const regexes = sources && sources.length > 0 ? sources.map((s) => new RegExp(s)) : [DEFAULT_SPLIT_REGEX];
+  let chunks = [messageContent];
+  for (const regex of regexes) {
+    chunks = chunks.flatMap((c) => splitOnceByRegex(c, regex));
+  }
+  return chunks.length > 0 ? chunks : [messageContent];
+}
 async function processSingleMessage(task, ctx, providedMasterKey) {
   try {
     const masterKey = providedMasterKey || ctx.masterKey;
@@ -395,7 +514,8 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     if (decryptedPayload.messageType === "fixed") {
       messageContent = decryptedPayload.userMessage;
     } else if (decryptedPayload.messageType === "instant") {
-      if (decryptedPayload.completePrompt && decryptedPayload.apiUrl && decryptedPayload.apiKey && decryptedPayload.primaryModel) {
+      const hasPrompt = !!decryptedPayload.completePrompt || Array.isArray(decryptedPayload.messages) && decryptedPayload.messages.length > 0;
+      if (hasPrompt && decryptedPayload.apiUrl && decryptedPayload.apiKey && decryptedPayload.primaryModel) {
         messageContent = await _callAI(decryptedPayload);
       } else if (decryptedPayload.userMessage) {
         messageContent = decryptedPayload.userMessage;
@@ -407,14 +527,7 @@ async function processSingleMessage(task, ctx, providedMasterKey) {
     } else {
       throw new Error("Invalid message configuration: no content source available");
     }
-    const sentences = messageContent.split(/([。！？!?]+)/).reduce((acc, part, i, arr) => {
-      if (i % 2 === 0 && part.trim()) {
-        const punctuation = arr[i + 1] || "";
-        acc.push(part.trim() + punctuation);
-      }
-      return acc;
-    }, []).filter((s) => s.length > 0);
-    const messages = sentences.length > 0 ? sentences : [messageContent];
+    const messages = splitMessageIntoSentences(messageContent, decryptedPayload.splitPattern ?? null);
     if (!ctx.vapid.email || !ctx.vapid.publicKey || !ctx.vapid.privateKey) {
       throw new Error("VAPID configuration missing - push notifications cannot be sent");
     }
@@ -537,11 +650,16 @@ async function _callAI(payload) {
   return content.trim();
 }
 function buildAiRequestBody(payload) {
+  const llmMessages = Array.isArray(payload.messages) && payload.messages.length > 0 ? payload.messages : [{ role: "user", content: payload.completePrompt }];
   const requestBody = {
     model: payload.primaryModel,
-    messages: [{ role: "user", content: payload.completePrompt }],
-    temperature: 0.8
+    messages: llmMessages
   };
+  if (payload.temperature !== void 0 && payload.temperature !== null) {
+    requestBody.temperature = payload.temperature;
+  } else if (!Array.isArray(payload.messages)) {
+    requestBody.temperature = 0.8;
+  }
   if (payload.maxTokens === void 0 || payload.maxTokens === null) {
     return requestBody;
   }
@@ -641,8 +759,17 @@ function createScheduleMessageHandler(ctx) {
       apiUrl: payload.apiUrl || null,
       apiKey: payload.apiKey || null,
       primaryModel: payload.primaryModel || null,
+      // Prompt is one-of: legacy completePrompt (string) OR messages (OpenAI-
+      // style array). Validation has already enforced exactly-one-of, so
+      // exactly one of these will be non-null when an AI config is provided.
       completePrompt: payload.completePrompt || null,
+      messages: Array.isArray(payload.messages) ? payload.messages : null,
       maxTokens: payload.maxTokens ?? null,
+      temperature: payload.temperature ?? null,
+      // 0.6.0+: optional caller-provided regex (string or string[]) used by
+      // the message processor to chunk LLM output into individual pushes.
+      // null → processor falls back to the default /([。！？!?]+)/ regex.
+      splitPattern: payload.splitPattern ?? null,
       pushSubscription: payload.pushSubscription,
       metadata: payload.metadata || {}
     };
@@ -954,6 +1081,30 @@ function createUpdateMessageHandler(ctx) {
     if (Object.prototype.hasOwnProperty.call(updates, "maxTokens") && updates.maxTokens !== null && (!Number.isInteger(updates.maxTokens) || updates.maxTokens <= 0)) {
       return { status: 400, body: { success: false, error: { code: "INVALID_UPDATE_DATA", message: "\u66F4\u65B0\u6570\u636E\u683C\u5F0F\u9519\u8BEF", details: { invalidFields: ["maxTokens"] } } } };
     }
+    if (updates.completePrompt && updates.messages !== void 0 && updates.messages !== null) {
+      return { status: 400, body: { success: false, error: { code: "INVALID_UPDATE_DATA", message: "completePrompt \u4E0E messages \u4E0D\u80FD\u540C\u65F6\u66F4\u65B0\uFF08\u4E8C\u9009\u4E00\uFF09", details: { invalidFields: ["completePrompt", "messages"] } } } };
+    }
+    if (updates.messages !== void 0 && updates.messages !== null) {
+      const msgErr = validateLlmMessagesArray(updates.messages);
+      if (msgErr) {
+        return { status: 400, body: { success: false, error: { code: "INVALID_UPDATE_DATA", message: msgErr, details: { invalidFields: ["messages"] } } } };
+      }
+    }
+    if (Object.prototype.hasOwnProperty.call(updates, "temperature") && updates.temperature !== null && (typeof updates.temperature !== "number" || !Number.isFinite(updates.temperature))) {
+      return { status: 400, body: { success: false, error: { code: "INVALID_UPDATE_DATA", message: "\u66F4\u65B0\u6570\u636E\u683C\u5F0F\u9519\u8BEF", details: { invalidFields: ["temperature"] } } } };
+    }
+    if (Object.prototype.hasOwnProperty.call(updates, "splitPattern")) {
+      const splitErr = validateSplitPattern(updates.splitPattern);
+      if (splitErr) {
+        return { status: 400, body: { success: false, error: { code: "INVALID_UPDATE_DATA", message: splitErr, details: { invalidFields: ["splitPattern"] } } } };
+      }
+    }
+    if (Object.prototype.hasOwnProperty.call(updates, "avatarUrl")) {
+      const avatarErr = validateAvatarUrl(updates.avatarUrl);
+      if (avatarErr) {
+        return { status: 400, body: { success: false, error: { code: "INVALID_UPDATE_DATA", message: avatarErr, details: { invalidFields: ["avatarUrl"] } } } };
+      }
+    }
     const existingTask = await db.getTaskByUuid(taskUuid, userId);
     if (!existingTask) {
       const taskStatus = await db.getTaskStatus(taskUuid, userId);
@@ -963,14 +1114,27 @@ function createUpdateMessageHandler(ctx) {
       return { status: 409, body: { success: false, error: { code: "TASK_ALREADY_COMPLETED", message: "\u4EFB\u52A1\u5DF2\u5B8C\u6210\u6216\u5DF2\u5931\u8D25\uFF0C\u65E0\u6CD5\u66F4\u65B0" } } };
     }
     const existingData = JSON.parse(decryptFromStorage(existingTask.encrypted_payload, userKey));
+    const promptUpdates = {};
+    if (updates.completePrompt) {
+      promptUpdates.completePrompt = updates.completePrompt;
+      promptUpdates.messages = null;
+    } else if (updates.messages !== void 0 && updates.messages !== null) {
+      promptUpdates.messages = updates.messages;
+      promptUpdates.completePrompt = null;
+    }
     const updatedData = {
       ...existingData,
-      ...updates.completePrompt && { completePrompt: updates.completePrompt },
+      ...promptUpdates,
       ...updates.userMessage && { userMessage: updates.userMessage },
       ...updates.recurrenceType && { recurrenceType: updates.recurrenceType },
       ...updates.avatarUrl && { avatarUrl: updates.avatarUrl },
       ...updates.metadata && { metadata: updates.metadata },
-      ...Object.prototype.hasOwnProperty.call(updates, "maxTokens") && { maxTokens: updates.maxTokens ?? null }
+      ...Object.prototype.hasOwnProperty.call(updates, "maxTokens") && { maxTokens: updates.maxTokens ?? null },
+      ...Object.prototype.hasOwnProperty.call(updates, "temperature") && { temperature: updates.temperature ?? null },
+      // splitPattern: hasOwnProperty so that explicit `null` (= revert to
+      // default) doesn't get swallowed by truthy-spread the way the optional
+      // string fields above are.
+      ...Object.prototype.hasOwnProperty.call(updates, "splitPattern") && { splitPattern: updates.splitPattern ?? null }
     };
     const encryptedPayload = encryptForStorage(JSON.stringify(updatedData), userKey);
     const extraFields = updates.nextSendAt ? { next_send_at: updates.nextSendAt } : void 0;
@@ -1491,6 +1655,9 @@ export {
   isValidUUID,
   isValidUUIDv4,
   isValidUrl,
+  validateAvatarUrl,
+  validateLlmMessagesArray,
   validateScheduleMessagePayload,
+  validateSplitPattern,
   verifyTenantToken
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "description": "ReiStandard Active Messaging server SDK with pluggable database adapters",
   "repository": {
     "type": "git",