@rei-standard/amsg-sw 2.1.0-next.4 → 2.1.1

package/README.md

@@ -92,9 +92,9 @@ navigator.serviceWorker.addEventListener('message', (e) => {
 
 当 `amsg-instant` 检测到 payload 超过 `maxInlineBytes` 时会改发 blob envelope `{ _blob: true, key, url, messageKind?, type? }`。SW **不会** 自动 fetch blob 内容（那是 client 的职责），但仍然会按 envelope 上的 `messageKind` 分发对应事件，让 client 知道有什么类型的内容即将到达，自己决定要不要拉取。Blob envelope 也只在 `messageKind === 'content'`（或缺失）时才渲染占位通知，与普通 push 行为一致。
 
-### Generic multipart transport（next）
+### Generic multipart transport（2.1.0+）
 
-next 阶段移除了旧 reasoning 专用 `chunkIndex` / `totalChunks` wire format。现在 `_multipart` 是统一 transport kind，任何原始 payload 都可以被包起来：
+2.1.0 移除了旧 reasoning 专用 `chunkIndex` / `totalChunks` wire format。现在 `_multipart` 是统一 transport kind，任何原始 payload 都可以被包起来：
 
 ```json
 {
@@ -128,7 +128,7 @@ installReiSW(self, {
     maxChunks: 128,
     cleanupIntervalMs: 15 * 60_000
   },
-  // （新增于 2.1.0-next.3）离线持久化等业务拦截钩子：
+  // （新增于 2.1.0）离线持久化等业务拦截钩子：
   onBusinessPayload: async (payload) => {
     // 收到完整 payload 时触发，由于内置在 event.waitUntil 中，能够确保离线写库完毕再允许 SW 休眠
     // await db.saveIncomingMessage(payload);
@@ -151,7 +151,7 @@ TTL 到期仍未收齐时，SW 会清理 pending 并广播：
 ### 升级注意事项
 
 - 想给 `reasoning` / `tool_request` / `error` 弹通知的业务：SW 默认不再为它们弹通知，但可以通过设置 `payload.notification.show = "always"` 或 `"when-hidden"` 来让 SW 在包层直接弹通知。无需再强求在 app 内自绘。
-- 应用级 SW 可以删除旧 reasoning `chunkIndex` / `totalChunks` 拼接逻辑；next 版本只会把完整还原后的 reasoning payload 发给 client。
+- 应用级 SW 可以删除旧 reasoning `chunkIndex` / `totalChunks` 拼接逻辑；2.1.0+ 版本只会把完整还原后的 reasoning payload 发给 client。
 - 客户端代码继续兼容只有 `installReiSW` + `REI_SW_MESSAGE_TYPE`（队列）的 2.0.x 写法——新增导出不破坏既有 API。
 - 想拿到 push 类型相关的 TS 类型：从 `@rei-standard/amsg-shared` 引 `AmsgPush` 等类型（本包通过 JSDoc 引用同一份类型）。
 

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-next.4",
+  "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",
@@ -33,7 +33,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@rei-standard/amsg-shared": "0.1.0-next.4"
+    "@rei-standard/amsg-shared": "0.1.0"
   },
   "devDependencies": {
     "tsup": "^8.0.0",