@rei-standard/amsg-sw 2.1.0 → 2.1.1

package/dist/index.cjs

@@ -46,6 +46,7 @@ var DEFAULT_MULTIPART_OPTIONS = Object.freeze({
 var memoryMultipartPending = /* @__PURE__ */ new Map();
 var memoryMultipartDone = /* @__PURE__ */ new Map();
 var memoryMultipartChunks = /* @__PURE__ */ new Map();
+var multipartLocks = /* @__PURE__ */ new Map();
 var REI_AMSG_POSTMESSAGE_TYPE = "REI_AMSG_PUSH";
 var REI_SW_EVENT = Object.freeze({
   CONTENT_RECEIVED: "rei-amsg-content-received",
@@ -146,8 +147,8 @@ async function dispatchBusinessPayload(sw, payload, defaults) {
   if (typeof defaults.onBusinessPayload === "function") {
     try {
       const result = defaults.onBusinessPayload(payload);
-      if (result instanceof Promise) {
-        work.push(result.catch((error) => {
+      if (result && typeof result.then === "function") {
+        work.push(Promise.resolve(result).catch((error) => {
           console.error("[rei-standard-amsg-sw] onBusinessPayload promise rejected:", error);
         }));
       }
@@ -222,7 +223,7 @@ function createNotificationFromPayload(payload, defaults) {
     };
   }
   const pushNotification = payload.notification && typeof payload.notification === "object" ? payload.notification : {};
-  const title = pushNotification.title || payload.title || payload.contactName || "New notification";
+  const title = pushNotification.title || payload.title || payload.contactName && `\u6765\u81EA ${payload.contactName}` || "New notification";
   const body = pushNotification.body || payload.body || payload.message || "";
   const data = pushNotification.data && typeof pushNotification.data === "object" ? { ...pushNotification.data } : payload.data && typeof payload.data === "object" ? { ...payload.data } : {};
   if (data.payload == null) data.payload = payload;
@@ -266,6 +267,18 @@ function isMultipartPush(payload) {
 async function acceptMultipartChunk(sw, payload, options) {
   const normalized = normalizeMultipartChunk(payload, options);
   if (!normalized) return null;
+  const previous = multipartLocks.get(normalized.id) || Promise.resolve();
+  const current = previous.catch(() => void 0).then(() => acceptMultipartChunkInternal(sw, normalized, options));
+  multipartLocks.set(normalized.id, current);
+  try {
+    return await current;
+  } finally {
+    if (multipartLocks.get(normalized.id) === current) {
+      multipartLocks.delete(normalized.id);
+    }
+  }
+}
+async function acceptMultipartChunkInternal(sw, normalized, options) {
   if (normalized.expiresAt <= Date.now()) {
     await dispatchMultipartExpired(sw, {
       id: normalized.id,

package/dist/index.d.cts

@@ -66,6 +66,7 @@ const DEFAULT_MULTIPART_OPTIONS = Object.freeze({
 const memoryMultipartPending = new Map();
 const memoryMultipartDone = new Map();
 const memoryMultipartChunks = new Map();
+const multipartLocks = new Map();
 
 /**
  * Wire-level message type for SW → client postMessage envelopes.
@@ -220,8 +221,8 @@ async function dispatchBusinessPayload(sw, payload, defaults) {
   if (typeof defaults.onBusinessPayload === 'function') {
     try {
       const result = defaults.onBusinessPayload(payload);
-      if (result instanceof Promise) {
-        work.push(result.catch(error => {
+      if (result && typeof result.then === 'function') {
+        work.push(Promise.resolve(result).catch(error => {
           console.error('[rei-standard-amsg-sw] onBusinessPayload promise rejected:', error);
         }));
       }
@@ -345,7 +346,7 @@ function createNotificationFromPayload(payload, defaults) {
   const title =
     pushNotification.title ||
     payload.title ||
-    payload.contactName ||
+    (payload.contactName && `来自 ${payload.contactName}`) ||
     'New notification';
   const body = pushNotification.body || payload.body || payload.message || '';
   const data = pushNotification.data && typeof pushNotification.data === 'object'
@@ -404,14 +405,31 @@ function isMultipartPush(payload) {
 }
 
 async function acceptMultipartChunk(sw, payload, options) {
+  const normalized = normalizeMultipartChunk(payload, options);
+  if (!normalized) return null;
+
+  const previous = multipartLocks.get(normalized.id) || Promise.resolve();
+  const current = previous
+    .catch(() => undefined)
+    .then(() => acceptMultipartChunkInternal(sw, normalized, options));
+
+  multipartLocks.set(normalized.id, current);
+  try {
+    return await current;
+  } finally {
+    if (multipartLocks.get(normalized.id) === current) {
+      multipartLocks.delete(normalized.id);
+    }
+  }
+}
+
+async function acceptMultipartChunkInternal(sw, normalized, options) {
   // State machine:
   // 1. Validate the transport envelope and reject expired chunks before storage.
   // 2. Drop already-completed multipart ids using the short-lived done marker.
   // 3. Expire any stale pending record for this id before accepting a new one.
   // 4. Store only new chunk indexes, track total received bytes, and wait.
   // 5. Once all indexes are present, restore original JSON and mark done.
-  const normalized = normalizeMultipartChunk(payload, options);
-  if (!normalized) return null;
   if (normalized.expiresAt <= Date.now()) {
     await dispatchMultipartExpired(sw, {
       id: normalized.id,

package/dist/index.d.ts

@@ -66,6 +66,7 @@ const DEFAULT_MULTIPART_OPTIONS = Object.freeze({
 const memoryMultipartPending = new Map();
 const memoryMultipartDone = new Map();
 const memoryMultipartChunks = new Map();
+const multipartLocks = new Map();
 
 /**
  * Wire-level message type for SW → client postMessage envelopes.
@@ -220,8 +221,8 @@ async function dispatchBusinessPayload(sw, payload, defaults) {
   if (typeof defaults.onBusinessPayload === 'function') {
     try {
       const result = defaults.onBusinessPayload(payload);
-      if (result instanceof Promise) {
-        work.push(result.catch(error => {
+      if (result && typeof result.then === 'function') {
+        work.push(Promise.resolve(result).catch(error => {
           console.error('[rei-standard-amsg-sw] onBusinessPayload promise rejected:', error);
         }));
       }
@@ -345,7 +346,7 @@ function createNotificationFromPayload(payload, defaults) {
   const title =
     pushNotification.title ||
     payload.title ||
-    payload.contactName ||
+    (payload.contactName && `来自 ${payload.contactName}`) ||
     'New notification';
   const body = pushNotification.body || payload.body || payload.message || '';
   const data = pushNotification.data && typeof pushNotification.data === 'object'
@@ -404,14 +405,31 @@ function isMultipartPush(payload) {
 }
 
 async function acceptMultipartChunk(sw, payload, options) {
+  const normalized = normalizeMultipartChunk(payload, options);
+  if (!normalized) return null;
+
+  const previous = multipartLocks.get(normalized.id) || Promise.resolve();
+  const current = previous
+    .catch(() => undefined)
+    .then(() => acceptMultipartChunkInternal(sw, normalized, options));
+
+  multipartLocks.set(normalized.id, current);
+  try {
+    return await current;
+  } finally {
+    if (multipartLocks.get(normalized.id) === current) {
+      multipartLocks.delete(normalized.id);
+    }
+  }
+}
+
+async function acceptMultipartChunkInternal(sw, normalized, options) {
   // State machine:
   // 1. Validate the transport envelope and reject expired chunks before storage.
   // 2. Drop already-completed multipart ids using the short-lived done marker.
   // 3. Expire any stale pending record for this id before accepting a new one.
   // 4. Store only new chunk indexes, track total received bytes, and wait.
   // 5. Once all indexes are present, restore original JSON and mark done.
-  const normalized = normalizeMultipartChunk(payload, options);
-  if (!normalized) return null;
   if (normalized.expiresAt <= Date.now()) {
     await dispatchMultipartExpired(sw, {
       id: normalized.id,

package/dist/index.mjs

@@ -20,6 +20,7 @@ var DEFAULT_MULTIPART_OPTIONS = Object.freeze({
 var memoryMultipartPending = /* @__PURE__ */ new Map();
 var memoryMultipartDone = /* @__PURE__ */ new Map();
 var memoryMultipartChunks = /* @__PURE__ */ new Map();
+var multipartLocks = /* @__PURE__ */ new Map();
 var REI_AMSG_POSTMESSAGE_TYPE = "REI_AMSG_PUSH";
 var REI_SW_EVENT = Object.freeze({
   CONTENT_RECEIVED: "rei-amsg-content-received",
@@ -120,8 +121,8 @@ async function dispatchBusinessPayload(sw, payload, defaults) {
   if (typeof defaults.onBusinessPayload === "function") {
     try {
       const result = defaults.onBusinessPayload(payload);
-      if (result instanceof Promise) {
-        work.push(result.catch((error) => {
+      if (result && typeof result.then === "function") {
+        work.push(Promise.resolve(result).catch((error) => {
           console.error("[rei-standard-amsg-sw] onBusinessPayload promise rejected:", error);
         }));
       }
@@ -196,7 +197,7 @@ function createNotificationFromPayload(payload, defaults) {
     };
   }
   const pushNotification = payload.notification && typeof payload.notification === "object" ? payload.notification : {};
-  const title = pushNotification.title || payload.title || payload.contactName || "New notification";
+  const title = pushNotification.title || payload.title || payload.contactName && `\u6765\u81EA ${payload.contactName}` || "New notification";
   const body = pushNotification.body || payload.body || payload.message || "";
   const data = pushNotification.data && typeof pushNotification.data === "object" ? { ...pushNotification.data } : payload.data && typeof payload.data === "object" ? { ...payload.data } : {};
   if (data.payload == null) data.payload = payload;
@@ -240,6 +241,18 @@ function isMultipartPush(payload) {
 async function acceptMultipartChunk(sw, payload, options) {
   const normalized = normalizeMultipartChunk(payload, options);
   if (!normalized) return null;
+  const previous = multipartLocks.get(normalized.id) || Promise.resolve();
+  const current = previous.catch(() => void 0).then(() => acceptMultipartChunkInternal(sw, normalized, options));
+  multipartLocks.set(normalized.id, current);
+  try {
+    return await current;
+  } finally {
+    if (multipartLocks.get(normalized.id) === current) {
+      multipartLocks.delete(normalized.id);
+    }
+  }
+}
+async function acceptMultipartChunkInternal(sw, normalized, options) {
   if (normalized.expiresAt <= Date.now()) {
     await dispatchMultipartExpired(sw, {
       id: normalized.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-sw",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "ReiStandard Active Messaging service worker SDK — three-axis push schema (content / reasoning / tool_request / error) with per-kind client postMessage events",
   "repository": {
     "type": "git",