@kcuf/fetcher-interceptor-login 0.3.0 → 0.3.1

package/dist/cjs/helper/message-listen-interceptor-login.js

@@ -5,25 +5,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = messageListenInterceptorLogin;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _messenger = _interopRequireDefault(require("@kcuf/messenger"));
 var _const = require("../const");
 /**
  * 通常情况下，我们不需要这个，但如果一个应用里有两个不同实例的 fetcher，两个可能同时被调用，就有可能同时触发登录，
  * 这时候就需要用它在登录动作中使用 messageListenInterceptorLogin 来自动触发登录的返回
  */
 function messageListenInterceptorLogin(callback) {
-  function listener(e) {
-    if (!e.data || (0, _typeof2.default)(e.data) !== 'object') {
-      return;
-    }
-    if (e.data.type === _const.MESSAGE_TYPE_LOGIN_SUCCESS) {
-      callback(true, e.data.payload);
-    } else if (e.data.type === _const.MESSAGE_TYPE_LOGIN_ERROR) {
-      callback(false, e.data.payload);
-    }
-  }
-  window.addEventListener('message', listener);
+  var offSuccess = _messenger.default.on(_const.MESSAGE_TYPE_LOGIN_SUCCESS, function (payload) {
+    return callback(true, payload);
+  });
+  var offError = _messenger.default.on(_const.MESSAGE_TYPE_LOGIN_ERROR, function (payload) {
+    return callback(false, payload);
+  });
   return function () {
-    return window.removeEventListener('message', listener);
+    offSuccess();
+    offError();
   };
 }

package/dist/cjs/util/singleton-promise.js

@@ -1,24 +1,23 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = singletonPromise;
 var _fetcher = require("@kcuf/fetcher");
+var _messenger = _interopRequireDefault(require("@kcuf/messenger"));
 var _const = require("../const");
 function singletonPromise(fn) {
   var queue = null;
-  function resolveQueue(data) {
+  function resolveQueue(responseData) {
     if (queue) {
       queue.forEach(function (v) {
-        v.resolve((0, _fetcher.cloneResponseData)(data));
+        v.resolve((0, _fetcher.cloneResponseData)(responseData));
       });
       queue = null;
     }
-    window.postMessage({
-      type: _const.MESSAGE_TYPE_LOGIN_SUCCESS,
-      payload: data
-    }, location.origin);
+    _messenger.default.emit(_const.MESSAGE_TYPE_LOGIN_SUCCESS, responseData);
   }
   function rejectQueue(err) {
     if (queue) {
@@ -27,10 +26,7 @@ function singletonPromise(fn) {
       });
       queue = null;
     }
-    window.postMessage({
-      type: _const.MESSAGE_TYPE_LOGIN_ERROR,
-      payload: err
-    }, location.origin);
+    _messenger.default.emit(_const.MESSAGE_TYPE_LOGIN_ERROR, err);
   }
   return function () {
     if (!queue) {

package/dist/esm/helper/message-listen-interceptor-login.js

@@ -1,23 +1,20 @@
-import _typeof from "@babel/runtime/helpers/typeof";
+import messenger from '@kcuf/messenger';
 import { MESSAGE_TYPE_LOGIN_SUCCESS, MESSAGE_TYPE_LOGIN_ERROR } from '../const';
+
 /**
  * 通常情况下，我们不需要这个，但如果一个应用里有两个不同实例的 fetcher，两个可能同时被调用，就有可能同时触发登录，
  * 这时候就需要用它在登录动作中使用 messageListenInterceptorLogin 来自动触发登录的返回
  */
 export default function messageListenInterceptorLogin(callback) {
-  function listener(e) {
-    if (!e.data || _typeof(e.data) !== 'object') {
-      return;
-    }
-    if (e.data.type === MESSAGE_TYPE_LOGIN_SUCCESS) {
-      callback(true, e.data.payload);
-    } else if (e.data.type === MESSAGE_TYPE_LOGIN_ERROR) {
-      callback(false, e.data.payload);
-    }
-  }
-  window.addEventListener('message', listener);
+  var offSuccess = messenger.on(MESSAGE_TYPE_LOGIN_SUCCESS, function (payload) {
+    return callback(true, payload);
+  });
+  var offError = messenger.on(MESSAGE_TYPE_LOGIN_ERROR, function (payload) {
+    return callback(false, payload);
+  });
   return function () {
-    return window.removeEventListener('message', listener);
+    offSuccess();
+    offError();
   };
 }
 //# sourceMappingURL=message-listen-interceptor-login.js.map

package/dist/esm/helper/message-listen-interceptor-login.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-listen-interceptor-login.js","names":["MESSAGE_TYPE_LOGIN_SUCCESS","MESSAGE_TYPE_LOGIN_ERROR","messageListenInterceptorLogin","callback","listener","e","data","_typeof","type","payload","window","addEventListener","removeEventListener"],"sources":["../../../src/helper/message-listen-interceptor-login.ts"],"sourcesContent":["import {\n  MESSAGE_TYPE_LOGIN_SUCCESS,\n  MESSAGE_TYPE_LOGIN_ERROR\n} from '../const';\n\ninterface IMessageEventData {\n  source?: string;\n  type?: string;\n  payload: unknown;\n}\n\n/**\n * 通常情况下，我们不需要这个，但如果一个应用里有两个不同实例的 fetcher，两个可能同时被调用，就有可能同时触发登录，\n * 这时候就需要用它在登录动作中使用 messageListenInterceptorLogin 来自动触发登录的返回\n */\nexport default function messageListenInterceptorLogin(callback: (logged: boolean, info?: unknown) => void): () => void {\n  function listener(e: MessageEvent<IMessageEventData | undefined>): void {\n    if (!e.data || typeof e.data !== 'object') {\n      return;\n    }\n    \n    if (e.data.type === MESSAGE_TYPE_LOGIN_SUCCESS) {\n      callback(true, e.data.payload);\n    } else if (e.data.type === MESSAGE_TYPE_LOGIN_ERROR) {\n      callback(false, e.data.payload);\n    }\n  }\n  \n  window.addEventListener('message', listener);\n  \n  return () => window.removeEventListener('message', listener);\n}\n"],"mappings":";AAAA,SACEA,0BAA0B,EAC1BC,wBAAwB,QACnB,UAAU;AAQjB;AACA;AACA;AACA;AACA,eAAe,SAASC,6BAA6BA,CAACC,QAAmD,EAAc;EACrH,SAASC,QAAQA,CAACC,CAA8C,EAAQ;IACtE,IAAI,CAACA,CAAC,CAACC,IAAI,IAAIC,OAAA,CAAOF,CAAC,CAACC,IAAI,MAAK,QAAQ,EAAE;MACzC;IACF;IAEA,IAAID,CAAC,CAACC,IAAI,CAACE,IAAI,KAAKR,0BAA0B,EAAE;MAC9CG,QAAQ,CAAC,IAAI,EAAEE,CAAC,CAACC,IAAI,CAACG,OAAO,CAAC;IAChC,CAAC,MAAM,IAAIJ,CAAC,CAACC,IAAI,CAACE,IAAI,KAAKP,wBAAwB,EAAE;MACnDE,QAAQ,CAAC,KAAK,EAAEE,CAAC,CAACC,IAAI,CAACG,OAAO,CAAC;IACjC;EACF;EAEAC,MAAM,CAACC,gBAAgB,CAAC,SAAS,EAAEP,QAAQ,CAAC;EAE5C,OAAO;IAAA,OAAMM,MAAM,CAACE,mBAAmB,CAAC,SAAS,EAAER,QAAQ,CAAC;EAAA;AAC9D","ignoreList":[]}
+{"version":3,"file":"message-listen-interceptor-login.js","names":["messenger","MESSAGE_TYPE_LOGIN_SUCCESS","MESSAGE_TYPE_LOGIN_ERROR","messageListenInterceptorLogin","callback","offSuccess","on","payload","offError"],"sources":["../../../src/helper/message-listen-interceptor-login.ts"],"sourcesContent":["import messenger from '@kcuf/messenger';\n\nimport {\n  MESSAGE_TYPE_LOGIN_SUCCESS,\n  MESSAGE_TYPE_LOGIN_ERROR\n} from '../const';\n\n/**\n * 通常情况下，我们不需要这个，但如果一个应用里有两个不同实例的 fetcher，两个可能同时被调用，就有可能同时触发登录，\n * 这时候就需要用它在登录动作中使用 messageListenInterceptorLogin 来自动触发登录的返回\n */\nexport default function messageListenInterceptorLogin(callback: (logged: boolean, payload?: unknown) => void): () => void {\n  const offSuccess = messenger.on(MESSAGE_TYPE_LOGIN_SUCCESS, payload => callback(true, payload));\n  const offError = messenger.on(MESSAGE_TYPE_LOGIN_ERROR, payload => callback(false, payload));\n  \n  return () => {\n    offSuccess();\n    offError();\n  };\n}\n"],"mappings":"AAAA,OAAOA,SAAS,MAAM,iBAAiB;AAEvC,SACEC,0BAA0B,EAC1BC,wBAAwB,QACnB,UAAU;;AAEjB;AACA;AACA;AACA;AACA,eAAe,SAASC,6BAA6BA,CAACC,QAAsD,EAAc;EACxH,IAAMC,UAAU,GAAGL,SAAS,CAACM,EAAE,CAACL,0BAA0B,EAAE,UAAAM,OAAO;IAAA,OAAIH,QAAQ,CAAC,IAAI,EAAEG,OAAO,CAAC;EAAA,EAAC;EAC/F,IAAMC,QAAQ,GAAGR,SAAS,CAACM,EAAE,CAACJ,wBAAwB,EAAE,UAAAK,OAAO;IAAA,OAAIH,QAAQ,CAAC,KAAK,EAAEG,OAAO,CAAC;EAAA,EAAC;EAE5F,OAAO,YAAM;IACXF,UAAU,CAAC,CAAC;IACZG,QAAQ,CAAC,CAAC;EACZ,CAAC;AACH","ignoreList":[]}

package/dist/esm/util/singleton-promise.js

@@ -1,18 +1,16 @@
 import { cloneResponseData } from '@kcuf/fetcher';
+import messenger from '@kcuf/messenger';
 import { MESSAGE_TYPE_LOGIN_SUCCESS, MESSAGE_TYPE_LOGIN_ERROR } from '../const';
 export default function singletonPromise(fn) {
   var queue = null;
-  function resolveQueue(data) {
+  function resolveQueue(responseData) {
     if (queue) {
       queue.forEach(function (v) {
-        v.resolve(cloneResponseData(data));
+        v.resolve(cloneResponseData(responseData));
       });
       queue = null;
     }
-    window.postMessage({
-      type: MESSAGE_TYPE_LOGIN_SUCCESS,
-      payload: data
-    }, location.origin);
+    messenger.emit(MESSAGE_TYPE_LOGIN_SUCCESS, responseData);
   }
   function rejectQueue(err) {
     if (queue) {
@@ -21,10 +19,7 @@ export default function singletonPromise(fn) {
       });
       queue = null;
     }
-    window.postMessage({
-      type: MESSAGE_TYPE_LOGIN_ERROR,
-      payload: err
-    }, location.origin);
+    messenger.emit(MESSAGE_TYPE_LOGIN_ERROR, err);
   }
   return function () {
     if (!queue) {

package/dist/esm/util/singleton-promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"singleton-promise.js","names":["cloneResponseData","MESSAGE_TYPE_LOGIN_SUCCESS","MESSAGE_TYPE_LOGIN_ERROR","singletonPromise","fn","queue","resolveQueue","data","forEach","v","resolve","window","postMessage","type","payload","location","origin","rejectQueue","err","reject","promise","Promise","_queue","push","length","then"],"sources":["../../../src/util/singleton-promise.ts"],"sourcesContent":["import {\n  cloneResponseData\n} from '@kcuf/fetcher';\n\nimport {\n  MESSAGE_TYPE_LOGIN_SUCCESS,\n  MESSAGE_TYPE_LOGIN_ERROR\n} from '../const';\n\ninterface IPromiseQueueItem<T = void, E extends Error = Error> {\n  resolve(data: T): void;\n  reject(err: E): void;\n}\n\nexport default function singletonPromise<T>(fn: () => Promise<T>): () => Promise<T> {\n  let queue: IPromiseQueueItem<T>[] | null = null;\n  \n  function resolveQueue(data: T): void {\n    if (queue) {\n      queue.forEach(v => {\n        v.resolve(cloneResponseData(data));\n      });\n      \n      queue = null;\n    }\n    \n    window.postMessage({\n      type: MESSAGE_TYPE_LOGIN_SUCCESS,\n      payload: data\n    }, location.origin);\n  }\n  \n  function rejectQueue(err: Error): void {\n    if (queue) {\n      queue.forEach(v => {\n        v.reject(err);\n      });\n      \n      queue = null;\n    }\n    \n    window.postMessage({\n      type: MESSAGE_TYPE_LOGIN_ERROR,\n      payload: err\n    }, location.origin);\n  }\n  \n  return (): Promise<T> => {\n    if (!queue) {\n      queue = [];\n    }\n    \n    const promise = new Promise<T>((resolve, reject) => {\n      queue?.push({\n        resolve,\n        reject\n      });\n    });\n    \n    if (queue.length === 1) {\n      fn().then(data => resolveQueue(data), (err: unknown) => rejectQueue(err as Error));\n    }\n    \n    return promise;\n  };\n}\n"],"mappings":"AAAA,SACEA,iBAAiB,QACZ,eAAe;AAEtB,SACEC,0BAA0B,EAC1BC,wBAAwB,QACnB,UAAU;AAOjB,eAAe,SAASC,gBAAgBA,CAAIC,EAAoB,EAAoB;EAClF,IAAIC,KAAoC,GAAG,IAAI;EAE/C,SAASC,YAAYA,CAACC,IAAO,EAAQ;IACnC,IAAIF,KAAK,EAAE;MACTA,KAAK,CAACG,OAAO,CAAC,UAAAC,CAAC,EAAI;QACjBA,CAAC,CAACC,OAAO,CAACV,iBAAiB,CAACO,IAAI,CAAC,CAAC;MACpC,CAAC,CAAC;MAEFF,KAAK,GAAG,IAAI;IACd;IAEAM,MAAM,CAACC,WAAW,CAAC;MACjBC,IAAI,EAAEZ,0BAA0B;MAChCa,OAAO,EAAEP;IACX,CAAC,EAAEQ,QAAQ,CAACC,MAAM,CAAC;EACrB;EAEA,SAASC,WAAWA,CAACC,GAAU,EAAQ;IACrC,IAAIb,KAAK,EAAE;MACTA,KAAK,CAACG,OAAO,CAAC,UAAAC,CAAC,EAAI;QACjBA,CAAC,CAACU,MAAM,CAACD,GAAG,CAAC;MACf,CAAC,CAAC;MAEFb,KAAK,GAAG,IAAI;IACd;IAEAM,MAAM,CAACC,WAAW,CAAC;MACjBC,IAAI,EAAEX,wBAAwB;MAC9BY,OAAO,EAAEI;IACX,CAAC,EAAEH,QAAQ,CAACC,MAAM,CAAC;EACrB;EAEA,OAAO,YAAkB;IACvB,IAAI,CAACX,KAAK,EAAE;MACVA,KAAK,GAAG,EAAE;IACZ;IAEA,IAAMe,OAAO,GAAG,IAAIC,OAAO,CAAI,UAACX,OAAO,EAAES,MAAM,EAAK;MAAA,IAAAG,MAAA;MAClD,CAAAA,MAAA,GAAAjB,KAAK,cAAAiB,MAAA,eAALA,MAAA,CAAOC,IAAI,CAAC;QACVb,OAAO,EAAPA,OAAO;QACPS,MAAM,EAANA;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,IAAId,KAAK,CAACmB,MAAM,KAAK,CAAC,EAAE;MACtBpB,EAAE,CAAC,CAAC,CAACqB,IAAI,CAAC,UAAAlB,IAAI;QAAA,OAAID,YAAY,CAACC,IAAI,CAAC;MAAA,GAAE,UAACW,GAAY;QAAA,OAAKD,WAAW,CAACC,GAAY,CAAC;MAAA,EAAC;IACpF;IAEA,OAAOE,OAAO;EAChB,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"singleton-promise.js","names":["cloneResponseData","messenger","MESSAGE_TYPE_LOGIN_SUCCESS","MESSAGE_TYPE_LOGIN_ERROR","singletonPromise","fn","queue","resolveQueue","responseData","forEach","v","resolve","emit","rejectQueue","err","reject","promise","Promise","_queue","push","length","then","data"],"sources":["../../../src/util/singleton-promise.ts"],"sourcesContent":["import {\n  cloneResponseData\n} from '@kcuf/fetcher';\nimport messenger from '@kcuf/messenger';\n\nimport {\n  MESSAGE_TYPE_LOGIN_SUCCESS,\n  MESSAGE_TYPE_LOGIN_ERROR\n} from '../const';\n\ninterface IPromiseQueueItem<T = void, E extends Error = Error> {\n  resolve(data: T): void;\n  reject(err: E): void;\n}\n\nexport default function singletonPromise<T>(fn: () => Promise<T>): () => Promise<T> {\n  let queue: IPromiseQueueItem<T>[] | null = null;\n  \n  function resolveQueue(responseData: T): void {\n    if (queue) {\n      queue.forEach(v => {\n        v.resolve(cloneResponseData(responseData));\n      });\n      \n      queue = null;\n    }\n    \n    messenger.emit(MESSAGE_TYPE_LOGIN_SUCCESS, responseData);\n  }\n  \n  function rejectQueue(err: Error): void {\n    if (queue) {\n      queue.forEach(v => {\n        v.reject(err);\n      });\n      \n      queue = null;\n    }\n    \n    messenger.emit(MESSAGE_TYPE_LOGIN_ERROR, err);\n  }\n  \n  return (): Promise<T> => {\n    if (!queue) {\n      queue = [];\n    }\n    \n    const promise = new Promise<T>((resolve, reject) => {\n      queue?.push({\n        resolve,\n        reject\n      });\n    });\n    \n    if (queue.length === 1) {\n      fn().then(data => resolveQueue(data), (err: unknown) => rejectQueue(err as Error));\n    }\n    \n    return promise;\n  };\n}\n"],"mappings":"AAAA,SACEA,iBAAiB,QACZ,eAAe;AACtB,OAAOC,SAAS,MAAM,iBAAiB;AAEvC,SACEC,0BAA0B,EAC1BC,wBAAwB,QACnB,UAAU;AAOjB,eAAe,SAASC,gBAAgBA,CAAIC,EAAoB,EAAoB;EAClF,IAAIC,KAAoC,GAAG,IAAI;EAE/C,SAASC,YAAYA,CAACC,YAAe,EAAQ;IAC3C,IAAIF,KAAK,EAAE;MACTA,KAAK,CAACG,OAAO,CAAC,UAAAC,CAAC,EAAI;QACjBA,CAAC,CAACC,OAAO,CAACX,iBAAiB,CAACQ,YAAY,CAAC,CAAC;MAC5C,CAAC,CAAC;MAEFF,KAAK,GAAG,IAAI;IACd;IAEAL,SAAS,CAACW,IAAI,CAACV,0BAA0B,EAAEM,YAAY,CAAC;EAC1D;EAEA,SAASK,WAAWA,CAACC,GAAU,EAAQ;IACrC,IAAIR,KAAK,EAAE;MACTA,KAAK,CAACG,OAAO,CAAC,UAAAC,CAAC,EAAI;QACjBA,CAAC,CAACK,MAAM,CAACD,GAAG,CAAC;MACf,CAAC,CAAC;MAEFR,KAAK,GAAG,IAAI;IACd;IAEAL,SAAS,CAACW,IAAI,CAACT,wBAAwB,EAAEW,GAAG,CAAC;EAC/C;EAEA,OAAO,YAAkB;IACvB,IAAI,CAACR,KAAK,EAAE;MACVA,KAAK,GAAG,EAAE;IACZ;IAEA,IAAMU,OAAO,GAAG,IAAIC,OAAO,CAAI,UAACN,OAAO,EAAEI,MAAM,EAAK;MAAA,IAAAG,MAAA;MAClD,CAAAA,MAAA,GAAAZ,KAAK,cAAAY,MAAA,eAALA,MAAA,CAAOC,IAAI,CAAC;QACVR,OAAO,EAAPA,OAAO;QACPI,MAAM,EAANA;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,IAAIT,KAAK,CAACc,MAAM,KAAK,CAAC,EAAE;MACtBf,EAAE,CAAC,CAAC,CAACgB,IAAI,CAAC,UAAAC,IAAI;QAAA,OAAIf,YAAY,CAACe,IAAI,CAAC;MAAA,GAAE,UAACR,GAAY;QAAA,OAAKD,WAAW,CAACC,GAAY,CAAC;MAAA,EAAC;IACpF;IAEA,OAAOE,OAAO;EAChB,CAAC;AACH","ignoreList":[]}

package/dist/types/helper/message-listen-interceptor-login.d.ts

@@ -2,4 +2,4 @@
  * 通常情况下，我们不需要这个，但如果一个应用里有两个不同实例的 fetcher，两个可能同时被调用，就有可能同时触发登录，
  * 这时候就需要用它在登录动作中使用 messageListenInterceptorLogin 来自动触发登录的返回
  */
-export default function messageListenInterceptorLogin(callback: (logged: boolean, info?: unknown) => void): () => void;
+export default function messageListenInterceptorLogin(callback: (logged: boolean, payload?: unknown) => void): () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kcuf/fetcher-interceptor-login",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Fetcher interceptor seamless login and redo request.",
   "keywords": [],
   "license": "MIT",
@@ -27,19 +27,20 @@
     "@babel/plugin-transform-runtime": "^7.28.5",
     "@babel/preset-env": "^7.28.6",
     "@babel/preset-typescript": "^7.28.5",
-    "@vitest/coverage-v8": "^4.0.17",
+    "@vitest/coverage-v8": "^4.0.18",
     "fetch-mock": "^12.6.0",
     "jsdom": "^27.4.0",
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.17",
+    "vitest": "^4.0.18",
     "@kcuf/ts-config": "^0.1.0"
   },
   "peerDependencies": {
     "@babel/runtime": ">=7.0.0"
   },
   "dependencies": {
-    "@kcuf/fetcher": "^0.2.9"
+    "@kcuf/fetcher": "^0.2.9",
+    "@kcuf/messenger": "^0.0.2"
   },
   "scripts": {
     "build:clean": "rimraf dist",