@norcy/react-native-toolkit 0.2.15 → 0.2.16

package/lib/commonjs/Notification.js

@@ -6,32 +6,53 @@ Object.defineProperty(exports, "__esModule", {
 exports.Notification = void 0;
 const EventEmitter = require('events').EventEmitter;
 const eventEmitter = new EventEmitter();
-const ListenerToEvent = {};
+const callbackToEvent = new WeakMap();
+const isCallbackRegistered = (callback, event) => {
+  return eventEmitter.listeners(event).includes(callback);
+};
 const Notification = exports.Notification = {
   addListener: (event, callback, skipCache) => {
-    const key = callback.toString();
-    if (skipCache || !ListenerToEvent[key]) {
-      eventEmitter.on(event, callback);
-      ListenerToEvent[key] = event;
+    if (!skipCache) {
+      const existingEvent = callbackToEvent.get(callback);
+      if (existingEvent && isCallbackRegistered(callback, existingEvent)) {
+        if (existingEvent === event) {
+          return callback;
+        }
+        // 本类的设计只允许，同一个 callback 对应一个 eventKey，不允许多个 eventKey 对应同一个 callback
+        // Notification.addListener('Theme_Update', callback); // ✅ 成功
+        // Notification.addListener('Theme_Update', callback); // ✅ 跳过，返回 callback
+        // Notification.addListener('Language_Update', callback); // ❌ 抛错！
+        throw new Error(`[Notification] callback 已注册到事件 "${existingEvent}"，不能重复注册到 "${event}"`);
+      }
     }
+    eventEmitter.on(event, callback);
+    callbackToEvent.set(callback, event);
     return callback;
   },
   addListenerOnce: (event, callback) => {
     eventEmitter.once(event, callback);
   },
   removeListener: callback => {
-    const key = callback.toString();
-    const event = ListenerToEvent[key];
-    delete ListenerToEvent[key];
+    const event = callbackToEvent.get(callback);
+    if (!event) return;
     eventEmitter.removeListener(event, callback);
+    callbackToEvent.delete(callback);
   },
   removeAllListeners: event => {
-    const keys = Object.keys(ListenerToEvent);
-    for (const key of keys) {
-      if (ListenerToEvent[key] === event) {
-        delete ListenerToEvent[key];
-      }
-    }
+    // 只清理 EventEmitter，不清理 callbackToEvent（残留 callback -> event 映射）
+    // 不清理原因：WeakMap 无法反向查找，清理需维护额外映射（复杂度高，不值得）
+    // 残留无任何影响：
+    // 1. 内存：WeakMap 弱引用，callback 被 GC 后自动清理，无泄漏
+    // 2. removeListener：即使 eventEmitter 中已无此 callback，removeListener 调用也安全
+    // 3. postNotification：真正的 callback 已经从 eventEmitter 中移除，不会被调用
+    // 4. 逻辑：addListener 通过 isCallbackRegistered 双重检查，脏数据不影响判断，如下
+    // 例：addListener('A', cb) 后调用 removeAllListeners('A')
+    //   - eventEmitter 中 cb 已被移除
+    //   - callbackToEvent 仍记录 cb -> 'A'（脏数据）
+    //
+    // 后续 addListener('A', cb) 时：
+    //   - callbackToEvent.get(cb) 返回 'A'
+    //   - isCallbackRegistered(cb, 'A') 检查 eventEmitter.listeners('A')，发现 cb 不在，会重新更新 Map 并注册
     eventEmitter.removeAllListeners(event);
   },
   postNotification: (event, args) => {

package/lib/commonjs/Notification.js.map

@@ -1 +1 @@
-{"version":3,"names":["EventEmitter","require","eventEmitter","ListenerToEvent","Notification","exports","addListener","event","callback","skipCache","key","toString","on","addListenerOnce","once","removeListener","removeAllListeners","keys","Object","postNotification","args","emit"],"sourceRoot":"../../src","sources":["Notification.ts"],"mappings":";;;;;;AAAA,MAAMA,YAAY,GAAGC,OAAO,CAAC,QAAQ,CAAC,CAACD,YAAY;AACnD,MAAME,YAAY,GAAG,IAAIF,YAAY,CAAC,CAAC;AAMvC,MAAMG,eAA6B,GAAG,CAAC,CAAC;AAEjC,MAAMC,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAG;EAC1BE,WAAW,EAAEA,CAACC,KAAa,EAAEC,QAAkB,EAAEC,SAAmB,KAAK;IACvE,MAAMC,GAAG,GAAGF,QAAQ,CAACG,QAAQ,CAAC,CAAC;IAC/B,IAAIF,SAAS,IAAI,CAACN,eAAe,CAACO,GAAG,CAAC,EAAE;MACtCR,YAAY,CAACU,EAAE,CAACL,KAAK,EAAEC,QAAQ,CAAC;MAChCL,eAAe,CAACO,GAAG,CAAC,GAAGH,KAAK;IAC9B;IACA,OAAOC,QAAQ;EACjB,CAAC;EAEDK,eAAe,EAAEA,CAACN,KAAa,EAAEC,QAAkB,KAAK;IACtDN,YAAY,CAACY,IAAI,CAACP,KAAK,EAAEC,QAAQ,CAAC;EACpC,CAAC;EAEDO,cAAc,EAAGP,QAAkB,IAAK;IACtC,MAAME,GAAG,GAAGF,QAAQ,CAACG,QAAQ,CAAC,CAAC;IAC/B,MAAMJ,KAAK,GAAGJ,eAAe,CAACO,GAAG,CAAC;IAClC,OAAOP,eAAe,CAACO,GAAG,CAAC;IAC3BR,YAAY,CAACa,cAAc,CAACR,KAAK,EAAEC,QAAQ,CAAC;EAC9C,CAAC;EAEDQ,kBAAkB,EAAGT,KAAa,IAAK;IACrC,MAAMU,IAAI,GAAGC,MAAM,CAACD,IAAI,CAACd,eAAe,CAAC;IACzC,KAAK,MAAMO,GAAG,IAAIO,IAAI,EAAE;MACtB,IAAId,eAAe,CAACO,GAAG,CAAC,KAAKH,KAAK,EAAE;QAClC,OAAOJ,eAAe,CAACO,GAAG,CAAC;MAC7B;IACF;IACAR,YAAY,CAACc,kBAAkB,CAACT,KAAK,CAAC;EACxC,CAAC;EAEDY,gBAAgB,EAAEA,CAACZ,KAAa,EAAEa,IAAa,KAAK;IAClDlB,YAAY,CAACmB,IAAI,CAACd,KAAK,EAAEa,IAAI,CAAC;EAChC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["EventEmitter","require","eventEmitter","callbackToEvent","WeakMap","isCallbackRegistered","callback","event","listeners","includes","Notification","exports","addListener","skipCache","existingEvent","get","Error","on","set","addListenerOnce","once","removeListener","delete","removeAllListeners","postNotification","args","emit"],"sourceRoot":"../../src","sources":["Notification.ts"],"mappings":";;;;;;AAAA,MAAMA,YAAY,GAAGC,OAAO,CAAC,QAAQ,CAAC,CAACD,YAAY;AACnD,MAAME,YAAY,GAAG,IAAIF,YAAY,CAAC,CAAC;AAEvC,MAAMG,eAAe,GAAG,IAAIC,OAAO,CAAmB,CAAC;AAEvD,MAAMC,oBAAoB,GAAGA,CAACC,QAAkB,EAAEC,KAAa,KAAc;EAC3E,OAAOL,YAAY,CAACM,SAAS,CAACD,KAAK,CAAC,CAACE,QAAQ,CAACH,QAAQ,CAAC;AACzD,CAAC;AAEM,MAAMI,YAAY,GAAAC,OAAA,CAAAD,YAAA,GAAG;EAC1BE,WAAW,EAAEA,CAACL,KAAa,EAAED,QAAkB,EAAEO,SAAmB,KAAK;IACvE,IAAI,CAACA,SAAS,EAAE;MACd,MAAMC,aAAa,GAAGX,eAAe,CAACY,GAAG,CAACT,QAAQ,CAAC;MAEnD,IAAIQ,aAAa,IAAIT,oBAAoB,CAACC,QAAQ,EAAEQ,aAAa,CAAC,EAAE;QAClE,IAAIA,aAAa,KAAKP,KAAK,EAAE;UAC3B,OAAOD,QAAQ;QACjB;QACA;QACA;QACA;QACA;QACA,MAAM,IAAIU,KAAK,CACb,mCAAmCF,aAAa,cAAcP,KAAK,GACrE,CAAC;MACH;IACF;IAEAL,YAAY,CAACe,EAAE,CAACV,KAAK,EAAED,QAAQ,CAAC;IAChCH,eAAe,CAACe,GAAG,CAACZ,QAAQ,EAAEC,KAAK,CAAC;IACpC,OAAOD,QAAQ;EACjB,CAAC;EAEDa,eAAe,EAAEA,CAACZ,KAAa,EAAED,QAAkB,KAAK;IACtDJ,YAAY,CAACkB,IAAI,CAACb,KAAK,EAAED,QAAQ,CAAC;EACpC,CAAC;EAEDe,cAAc,EAAGf,QAAkB,IAAK;IACtC,MAAMC,KAAK,GAAGJ,eAAe,CAACY,GAAG,CAACT,QAAQ,CAAC;IAC3C,IAAI,CAACC,KAAK,EAAE;IAEZL,YAAY,CAACmB,cAAc,CAACd,KAAK,EAAED,QAAQ,CAAC;IAC5CH,eAAe,CAACmB,MAAM,CAAChB,QAAQ,CAAC;EAClC,CAAC;EAEDiB,kBAAkB,EAAGhB,KAAa,IAAK;IACrC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACAL,YAAY,CAACqB,kBAAkB,CAAChB,KAAK,CAAC;EACxC,CAAC;EAEDiB,gBAAgB,EAAEA,CAACjB,KAAa,EAAEkB,IAAa,KAAK;IAClDvB,YAAY,CAACwB,IAAI,CAACnB,KAAK,EAAEkB,IAAI,CAAC;EAChC;AACF,CAAC","ignoreList":[]}

package/lib/module/Notification.js

@@ -2,32 +2,53 @@
 
 const EventEmitter = require('events').EventEmitter;
 const eventEmitter = new EventEmitter();
-const ListenerToEvent = {};
+const callbackToEvent = new WeakMap();
+const isCallbackRegistered = (callback, event) => {
+  return eventEmitter.listeners(event).includes(callback);
+};
 export const Notification = {
   addListener: (event, callback, skipCache) => {
-    const key = callback.toString();
-    if (skipCache || !ListenerToEvent[key]) {
-      eventEmitter.on(event, callback);
-      ListenerToEvent[key] = event;
+    if (!skipCache) {
+      const existingEvent = callbackToEvent.get(callback);
+      if (existingEvent && isCallbackRegistered(callback, existingEvent)) {
+        if (existingEvent === event) {
+          return callback;
+        }
+        // 本类的设计只允许，同一个 callback 对应一个 eventKey，不允许多个 eventKey 对应同一个 callback
+        // Notification.addListener('Theme_Update', callback); // ✅ 成功
+        // Notification.addListener('Theme_Update', callback); // ✅ 跳过，返回 callback
+        // Notification.addListener('Language_Update', callback); // ❌ 抛错！
+        throw new Error(`[Notification] callback 已注册到事件 "${existingEvent}"，不能重复注册到 "${event}"`);
+      }
     }
+    eventEmitter.on(event, callback);
+    callbackToEvent.set(callback, event);
     return callback;
   },
   addListenerOnce: (event, callback) => {
     eventEmitter.once(event, callback);
   },
   removeListener: callback => {
-    const key = callback.toString();
-    const event = ListenerToEvent[key];
-    delete ListenerToEvent[key];
+    const event = callbackToEvent.get(callback);
+    if (!event) return;
     eventEmitter.removeListener(event, callback);
+    callbackToEvent.delete(callback);
   },
   removeAllListeners: event => {
-    const keys = Object.keys(ListenerToEvent);
-    for (const key of keys) {
-      if (ListenerToEvent[key] === event) {
-        delete ListenerToEvent[key];
-      }
-    }
+    // 只清理 EventEmitter，不清理 callbackToEvent（残留 callback -> event 映射）
+    // 不清理原因：WeakMap 无法反向查找，清理需维护额外映射（复杂度高，不值得）
+    // 残留无任何影响：
+    // 1. 内存：WeakMap 弱引用，callback 被 GC 后自动清理，无泄漏
+    // 2. removeListener：即使 eventEmitter 中已无此 callback，removeListener 调用也安全
+    // 3. postNotification：真正的 callback 已经从 eventEmitter 中移除，不会被调用
+    // 4. 逻辑：addListener 通过 isCallbackRegistered 双重检查，脏数据不影响判断，如下
+    // 例：addListener('A', cb) 后调用 removeAllListeners('A')
+    //   - eventEmitter 中 cb 已被移除
+    //   - callbackToEvent 仍记录 cb -> 'A'（脏数据）
+    //
+    // 后续 addListener('A', cb) 时：
+    //   - callbackToEvent.get(cb) 返回 'A'
+    //   - isCallbackRegistered(cb, 'A') 检查 eventEmitter.listeners('A')，发现 cb 不在，会重新更新 Map 并注册
     eventEmitter.removeAllListeners(event);
   },
   postNotification: (event, args) => {

package/lib/module/Notification.js.map

@@ -1 +1 @@
-{"version":3,"names":["EventEmitter","require","eventEmitter","ListenerToEvent","Notification","addListener","event","callback","skipCache","key","toString","on","addListenerOnce","once","removeListener","removeAllListeners","keys","Object","postNotification","args","emit"],"sourceRoot":"../../src","sources":["Notification.ts"],"mappings":";;AAAA,MAAMA,YAAY,GAAGC,OAAO,CAAC,QAAQ,CAAC,CAACD,YAAY;AACnD,MAAME,YAAY,GAAG,IAAIF,YAAY,CAAC,CAAC;AAMvC,MAAMG,eAA6B,GAAG,CAAC,CAAC;AAExC,OAAO,MAAMC,YAAY,GAAG;EAC1BC,WAAW,EAAEA,CAACC,KAAa,EAAEC,QAAkB,EAAEC,SAAmB,KAAK;IACvE,MAAMC,GAAG,GAAGF,QAAQ,CAACG,QAAQ,CAAC,CAAC;IAC/B,IAAIF,SAAS,IAAI,CAACL,eAAe,CAACM,GAAG,CAAC,EAAE;MACtCP,YAAY,CAACS,EAAE,CAACL,KAAK,EAAEC,QAAQ,CAAC;MAChCJ,eAAe,CAACM,GAAG,CAAC,GAAGH,KAAK;IAC9B;IACA,OAAOC,QAAQ;EACjB,CAAC;EAEDK,eAAe,EAAEA,CAACN,KAAa,EAAEC,QAAkB,KAAK;IACtDL,YAAY,CAACW,IAAI,CAACP,KAAK,EAAEC,QAAQ,CAAC;EACpC,CAAC;EAEDO,cAAc,EAAGP,QAAkB,IAAK;IACtC,MAAME,GAAG,GAAGF,QAAQ,CAACG,QAAQ,CAAC,CAAC;IAC/B,MAAMJ,KAAK,GAAGH,eAAe,CAACM,GAAG,CAAC;IAClC,OAAON,eAAe,CAACM,GAAG,CAAC;IAC3BP,YAAY,CAACY,cAAc,CAACR,KAAK,EAAEC,QAAQ,CAAC;EAC9C,CAAC;EAEDQ,kBAAkB,EAAGT,KAAa,IAAK;IACrC,MAAMU,IAAI,GAAGC,MAAM,CAACD,IAAI,CAACb,eAAe,CAAC;IACzC,KAAK,MAAMM,GAAG,IAAIO,IAAI,EAAE;MACtB,IAAIb,eAAe,CAACM,GAAG,CAAC,KAAKH,KAAK,EAAE;QAClC,OAAOH,eAAe,CAACM,GAAG,CAAC;MAC7B;IACF;IACAP,YAAY,CAACa,kBAAkB,CAACT,KAAK,CAAC;EACxC,CAAC;EAEDY,gBAAgB,EAAEA,CAACZ,KAAa,EAAEa,IAAa,KAAK;IAClDjB,YAAY,CAACkB,IAAI,CAACd,KAAK,EAAEa,IAAI,CAAC;EAChC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["EventEmitter","require","eventEmitter","callbackToEvent","WeakMap","isCallbackRegistered","callback","event","listeners","includes","Notification","addListener","skipCache","existingEvent","get","Error","on","set","addListenerOnce","once","removeListener","delete","removeAllListeners","postNotification","args","emit"],"sourceRoot":"../../src","sources":["Notification.ts"],"mappings":";;AAAA,MAAMA,YAAY,GAAGC,OAAO,CAAC,QAAQ,CAAC,CAACD,YAAY;AACnD,MAAME,YAAY,GAAG,IAAIF,YAAY,CAAC,CAAC;AAEvC,MAAMG,eAAe,GAAG,IAAIC,OAAO,CAAmB,CAAC;AAEvD,MAAMC,oBAAoB,GAAGA,CAACC,QAAkB,EAAEC,KAAa,KAAc;EAC3E,OAAOL,YAAY,CAACM,SAAS,CAACD,KAAK,CAAC,CAACE,QAAQ,CAACH,QAAQ,CAAC;AACzD,CAAC;AAED,OAAO,MAAMI,YAAY,GAAG;EAC1BC,WAAW,EAAEA,CAACJ,KAAa,EAAED,QAAkB,EAAEM,SAAmB,KAAK;IACvE,IAAI,CAACA,SAAS,EAAE;MACd,MAAMC,aAAa,GAAGV,eAAe,CAACW,GAAG,CAACR,QAAQ,CAAC;MAEnD,IAAIO,aAAa,IAAIR,oBAAoB,CAACC,QAAQ,EAAEO,aAAa,CAAC,EAAE;QAClE,IAAIA,aAAa,KAAKN,KAAK,EAAE;UAC3B,OAAOD,QAAQ;QACjB;QACA;QACA;QACA;QACA;QACA,MAAM,IAAIS,KAAK,CACb,mCAAmCF,aAAa,cAAcN,KAAK,GACrE,CAAC;MACH;IACF;IAEAL,YAAY,CAACc,EAAE,CAACT,KAAK,EAAED,QAAQ,CAAC;IAChCH,eAAe,CAACc,GAAG,CAACX,QAAQ,EAAEC,KAAK,CAAC;IACpC,OAAOD,QAAQ;EACjB,CAAC;EAEDY,eAAe,EAAEA,CAACX,KAAa,EAAED,QAAkB,KAAK;IACtDJ,YAAY,CAACiB,IAAI,CAACZ,KAAK,EAAED,QAAQ,CAAC;EACpC,CAAC;EAEDc,cAAc,EAAGd,QAAkB,IAAK;IACtC,MAAMC,KAAK,GAAGJ,eAAe,CAACW,GAAG,CAACR,QAAQ,CAAC;IAC3C,IAAI,CAACC,KAAK,EAAE;IAEZL,YAAY,CAACkB,cAAc,CAACb,KAAK,EAAED,QAAQ,CAAC;IAC5CH,eAAe,CAACkB,MAAM,CAACf,QAAQ,CAAC;EAClC,CAAC;EAEDgB,kBAAkB,EAAGf,KAAa,IAAK;IACrC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACAL,YAAY,CAACoB,kBAAkB,CAACf,KAAK,CAAC;EACxC,CAAC;EAEDgB,gBAAgB,EAAEA,CAAChB,KAAa,EAAEiB,IAAa,KAAK;IAClDtB,YAAY,CAACuB,IAAI,CAAClB,KAAK,EAAEiB,IAAI,CAAC;EAChC;AACF,CAAC","ignoreList":[]}

package/lib/typescript/Notification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Notification.d.ts","sourceRoot":"","sources":["../../src/Notification.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY;yBACF,MAAM,YAAY,QAAQ,cAAc,OAAO;6BAS3C,MAAM,YAAY,QAAQ;+BAIxB,QAAQ;gCAOP,MAAM;8BAUR,MAAM,SAAS,MAAM;CAGhD,CAAC"}
+{"version":3,"file":"Notification.d.ts","sourceRoot":"","sources":["../../src/Notification.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY;yBACF,MAAM,YAAY,QAAQ,cAAc,OAAO;6BAuB3C,MAAM,YAAY,QAAQ;+BAIxB,QAAQ;gCAQP,MAAM;8BAkBR,MAAM,SAAS,MAAM;CAGhD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norcy/react-native-toolkit",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "private": false,
   "description": "My Toolkit",
   "main": "lib/commonjs/index",

package/src/Notification.ts

@@ -1,19 +1,33 @@
 const EventEmitter = require('events').EventEmitter;
 const eventEmitter = new EventEmitter();
 
-interface ListenerType {
-  [key: string]: string;
-}
+const callbackToEvent = new WeakMap<Function, string>();
 
-const ListenerToEvent: ListenerType = {};
+const isCallbackRegistered = (callback: Function, event: string): boolean => {
+  return eventEmitter.listeners(event).includes(callback);
+};
 
 export const Notification = {
   addListener: (event: string, callback: Function, skipCache?: boolean) => {
-    const key = callback.toString();
-    if (skipCache || !ListenerToEvent[key]) {
-      eventEmitter.on(event, callback);
-      ListenerToEvent[key] = event;
+    if (!skipCache) {
+      const existingEvent = callbackToEvent.get(callback);
+
+      if (existingEvent && isCallbackRegistered(callback, existingEvent)) {
+        if (existingEvent === event) {
+          return callback;
+        }
+        // 本类的设计只允许，同一个 callback 对应一个 eventKey，不允许多个 eventKey 对应同一个 callback
+        // Notification.addListener('Theme_Update', callback); // ✅ 成功
+        // Notification.addListener('Theme_Update', callback); // ✅ 跳过，返回 callback
+        // Notification.addListener('Language_Update', callback); // ❌ 抛错！
+        throw new Error(
+          `[Notification] callback 已注册到事件 "${existingEvent}"，不能重复注册到 "${event}"`
+        );
+      }
     }
+
+    eventEmitter.on(event, callback);
+    callbackToEvent.set(callback, event);
     return callback;
   },
 
@@ -22,19 +36,28 @@ export const Notification = {
   },
 
   removeListener: (callback: Function) => {
-    const key = callback.toString();
-    const event = ListenerToEvent[key];
-    delete ListenerToEvent[key];
+    const event = callbackToEvent.get(callback);
+    if (!event) return;
+
     eventEmitter.removeListener(event, callback);
+    callbackToEvent.delete(callback);
   },
 
   removeAllListeners: (event: string) => {
-    const keys = Object.keys(ListenerToEvent);
-    for (const key of keys) {
-      if (ListenerToEvent[key] === event) {
-        delete ListenerToEvent[key];
-      }
-    }
+    // 只清理 EventEmitter，不清理 callbackToEvent（残留 callback -> event 映射）
+    // 不清理原因：WeakMap 无法反向查找，清理需维护额外映射（复杂度高，不值得）
+    // 残留无任何影响：
+    // 1. 内存：WeakMap 弱引用，callback 被 GC 后自动清理，无泄漏
+    // 2. removeListener：即使 eventEmitter 中已无此 callback，removeListener 调用也安全
+    // 3. postNotification：真正的 callback 已经从 eventEmitter 中移除，不会被调用
+    // 4. 逻辑：addListener 通过 isCallbackRegistered 双重检查，脏数据不影响判断，如下
+    // 例：addListener('A', cb) 后调用 removeAllListeners('A')
+    //   - eventEmitter 中 cb 已被移除
+    //   - callbackToEvent 仍记录 cb -> 'A'（脏数据）
+    //
+    // 后续 addListener('A', cb) 时：
+    //   - callbackToEvent.get(cb) 返回 'A'
+    //   - isCallbackRegistered(cb, 'A') 检查 eventEmitter.listeners('A')，发现 cb 不在，会重新更新 Map 并注册
     eventEmitter.removeAllListeners(event);
   },