@rei-standard/amsg-server 2.0.1 → 2.1.0

package/dist/index.cjs

@@ -100,7 +100,7 @@ function validateScheduleMessagePayload(payload) {
   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)"] } };
   }
-  if (payload.messageSubtype && !["chat", "forum", "moment"].includes(payload.messageSubtype)) {
+  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"] } };
   }
   return { valid: true };
@@ -1235,15 +1235,21 @@ function verifyTenantToken(token, secret, options = {}) {
   const [encodedHeader, encodedPayload, receivedSignature] = parts;
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const expectedSignature = sign(signingInput, secret);
-  const receivedBuffer = Buffer.from(receivedSignature);
-  const expectedBuffer = Buffer.from(expectedSignature);
+  let receivedBuffer;
+  let expectedBuffer;
+  try {
+    receivedBuffer = base64UrlDecode2(receivedSignature);
+    expectedBuffer = base64UrlDecode2(expectedSignature);
+  } catch (e4) {
+    throw new Error("INVALID_TENANT_AUTH");
+  }
   if (receivedBuffer.length !== expectedBuffer.length || !_crypto.timingSafeEqual.call(void 0, receivedBuffer, expectedBuffer)) {
     throw new Error("INVALID_TENANT_AUTH");
   }
   let payload;
   try {
     payload = JSON.parse(base64UrlDecode2(encodedPayload).toString("utf8"));
-  } catch (e4) {
+  } catch (e5) {
     throw new Error("INVALID_TENANT_AUTH");
   }
   if (!payload || typeof payload !== "object" || payload.v !== 1) {
@@ -1300,7 +1306,7 @@ function parseTokenFromUrl(url) {
   try {
     const parsed = new URL(url, "https://dummy.local");
     return String(parsed.searchParams.get("token") || "").trim();
-  } catch (e5) {
+  } catch (e6) {
     return "";
   }
 }

package/dist/index.d.cts

@@ -174,7 +174,14 @@ function validateScheduleMessagePayload(payload) {
   if (payload.uuid && !isValidUUID(payload.uuid)) {
     return { valid: false, errorCode: 'INVALID_PARAMETERS', errorMessage: '缺少必需参数或参数格式错误', details: { invalidFields: ['uuid (invalid UUID format)'] } };
   }
-  if (payload.messageSubtype && !['chat', 'forum', 'moment'].includes(payload.messageSubtype)) {
+  // messageSubtype is a free-form string tag forwarded to SW-side push payload
+  // for classification. Only the type is enforced; the taxonomy is the
+  // consumer's call (previously the enum was chat/forum/moment).
+  if (
+    payload.messageSubtype !== undefined &&
+    payload.messageSubtype !== null &&
+    typeof payload.messageSubtype !== 'string'
+  ) {
     return { valid: false, errorCode: 'INVALID_PARAMETERS', errorMessage: '缺少必需参数或参数格式错误', details: { invalidFields: ['messageSubtype'] } };
   }
 
@@ -1792,8 +1799,17 @@ function verifyTenantToken(token, secret, options = {}) {
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const expectedSignature = sign(signingInput, secret);
 
-  const receivedBuffer = Buffer.from(receivedSignature);
-  const expectedBuffer = Buffer.from(expectedSignature);
+  // Compare raw HMAC bytes (decoded from base64url) rather than the
+  // encoded character bytes — semantically clearer and avoids the
+  // implicit-UTF-8 default of Buffer.from(string).
+  let receivedBuffer;
+  let expectedBuffer;
+  try {
+    receivedBuffer = base64UrlDecode(receivedSignature);
+    expectedBuffer = base64UrlDecode(expectedSignature);
+  } catch {
+    throw new Error('INVALID_TENANT_AUTH');
+  }
   if (
     receivedBuffer.length !== expectedBuffer.length ||
     !timingSafeEqual(receivedBuffer, expectedBuffer)

package/dist/index.d.ts

@@ -174,7 +174,14 @@ function validateScheduleMessagePayload(payload) {
   if (payload.uuid && !isValidUUID(payload.uuid)) {
     return { valid: false, errorCode: 'INVALID_PARAMETERS', errorMessage: '缺少必需参数或参数格式错误', details: { invalidFields: ['uuid (invalid UUID format)'] } };
   }
-  if (payload.messageSubtype && !['chat', 'forum', 'moment'].includes(payload.messageSubtype)) {
+  // messageSubtype is a free-form string tag forwarded to SW-side push payload
+  // for classification. Only the type is enforced; the taxonomy is the
+  // consumer's call (previously the enum was chat/forum/moment).
+  if (
+    payload.messageSubtype !== undefined &&
+    payload.messageSubtype !== null &&
+    typeof payload.messageSubtype !== 'string'
+  ) {
     return { valid: false, errorCode: 'INVALID_PARAMETERS', errorMessage: '缺少必需参数或参数格式错误', details: { invalidFields: ['messageSubtype'] } };
   }
 
@@ -1792,8 +1799,17 @@ function verifyTenantToken(token, secret, options = {}) {
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const expectedSignature = sign(signingInput, secret);
 
-  const receivedBuffer = Buffer.from(receivedSignature);
-  const expectedBuffer = Buffer.from(expectedSignature);
+  // Compare raw HMAC bytes (decoded from base64url) rather than the
+  // encoded character bytes — semantically clearer and avoids the
+  // implicit-UTF-8 default of Buffer.from(string).
+  let receivedBuffer;
+  let expectedBuffer;
+  try {
+    receivedBuffer = base64UrlDecode(receivedSignature);
+    expectedBuffer = base64UrlDecode(expectedSignature);
+  } catch {
+    throw new Error('INVALID_TENANT_AUTH');
+  }
   if (
     receivedBuffer.length !== expectedBuffer.length ||
     !timingSafeEqual(receivedBuffer, expectedBuffer)

package/dist/index.mjs

@@ -100,7 +100,7 @@ function validateScheduleMessagePayload(payload) {
   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)"] } };
   }
-  if (payload.messageSubtype && !["chat", "forum", "moment"].includes(payload.messageSubtype)) {
+  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"] } };
   }
   return { valid: true };
@@ -1235,8 +1235,14 @@ function verifyTenantToken(token, secret, options = {}) {
   const [encodedHeader, encodedPayload, receivedSignature] = parts;
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const expectedSignature = sign(signingInput, secret);
-  const receivedBuffer = Buffer.from(receivedSignature);
-  const expectedBuffer = Buffer.from(expectedSignature);
+  let receivedBuffer;
+  let expectedBuffer;
+  try {
+    receivedBuffer = base64UrlDecode2(receivedSignature);
+    expectedBuffer = base64UrlDecode2(expectedSignature);
+  } catch {
+    throw new Error("INVALID_TENANT_AUTH");
+  }
   if (receivedBuffer.length !== expectedBuffer.length || !timingSafeEqual(receivedBuffer, expectedBuffer)) {
     throw new Error("INVALID_TENANT_AUTH");
   }

package/package.json

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