@kcuf/fetcher-interceptor-login 0.2.8 → 0.3.0

package/README.md

@@ -6,7 +6,7 @@
 
 ## 前提
 
-拦截器内部会判断 `error.name` 和 `error.code`，只有业务错误才会继续处理登录逻辑，因此需要 `@kcuf/fetcher-interceptor-biz`。
+拦截器内部使用 `error.code` 判断是否需要拦截。
 
 ## 使用
 

package/dist/cjs/const/index.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MESSAGE_TYPE_LOGIN_SUCCESS = exports.MESSAGE_TYPE_LOGIN_ERROR = void 0;
+var MESSAGE_TYPE_LOGIN_SUCCESS = exports.MESSAGE_TYPE_LOGIN_SUCCESS = 'fetcher-interceptor-login:success';
+var MESSAGE_TYPE_LOGIN_ERROR = exports.MESSAGE_TYPE_LOGIN_ERROR = 'fetcher-interceptor-login:error';

package/dist/cjs/helper/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "messageListenInterceptorLogin", {
+  enumerable: true,
+  get: function get() {
+    return _messageListenInterceptorLogin.default;
+  }
+});
+var _messageListenInterceptorLogin = _interopRequireDefault(require("./message-listen-interceptor-login"));

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

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = messageListenInterceptorLogin;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+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);
+  return function () {
+    return window.removeEventListener('message', listener);
+  };
+}

package/dist/cjs/index.js

@@ -4,10 +4,23 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {};
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
     return _intercept.default;
   }
 });
-var _intercept = _interopRequireDefault(require("./util/intercept"));
+var _intercept = _interopRequireDefault(require("./util/intercept"));
+var _helper = require("./helper");
+Object.keys(_helper).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _helper[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _helper[key];
+    }
+  });
+});

package/dist/cjs/util/create-interceptor-response-rejected.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = createInterceptorResponseRejected;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _fetcher = require("@kcuf/fetcher");
 var _singletonPromise = _interopRequireDefault(require("./singleton-promise"));
 function createInterceptorResponseRejected(_ref) {
@@ -14,36 +12,20 @@ function createInterceptorResponseRejected(_ref) {
     doLogin = _ref.doLogin,
     headerKeys = _ref.headerKeys;
   var singletonLogin = (0, _singletonPromise.default)(doLogin);
-  return /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(error, fetcherConfig, _, requestByInterceptor) {
-      var _error$code;
-      return (0, _regeneratorRuntime2.default)().wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (needLogin((_error$code = error.code) !== null && _error$code !== void 0 ? _error$code : '', error)) {
-              _context.next = 1;
-              break;
-            }
-            throw error;
-          case 1:
-            return _context.abrupt("return", singletonLogin().then(function () {
-              if (headerKeys) {
-                (0, _fetcher.deleteConfigHeaders)(fetcherConfig, headerKeys);
-              }
-              return requestByInterceptor(fetcherConfig); // 登录完成，重新发起原请求
-            }, function () {
-              // 一般登录弹窗在登录成功之前是不应该被关闭或取消的，但若真允许取消，这里需要修改错误为「取消登录」
-              error.name = _fetcher.FetcherErrorName.LOGIN_CANCELLED;
-              throw error; // 以新的 name 继续抛错
-            }));
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2, _x3, _x4) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+  return function (error, fetcherConfig, _, requestByInterceptor) {
+    var _error$code;
+    if (!needLogin((_error$code = error.code) !== null && _error$code !== void 0 ? _error$code : '', error)) {
+      throw error;
+    }
+    return singletonLogin().then(function () {
+      if (headerKeys) {
+        (0, _fetcher.deleteConfigHeaders)(fetcherConfig, headerKeys);
+      }
+      return requestByInterceptor(fetcherConfig); // 登录完成，重新发起原请求
+    }, function () {
+      // 一般登录弹窗在登录成功之前是不应该被关闭或取消的，但若真允许取消，这里需要修改错误为「取消登录」
+      error.name = _fetcher.FetcherErrorName.LOGIN_CANCELLED;
+      throw error; // 以新的 name 继续抛错
+    });
+  };
 }

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = singletonPromise;
 var _fetcher = require("@kcuf/fetcher");
+var _const = require("../const");
 function singletonPromise(fn) {
   var queue = null;
   function resolveQueue(data) {
@@ -14,6 +15,10 @@ function singletonPromise(fn) {
       });
       queue = null;
     }
+    window.postMessage({
+      type: _const.MESSAGE_TYPE_LOGIN_SUCCESS,
+      payload: data
+    }, location.origin);
   }
   function rejectQueue(err) {
     if (queue) {
@@ -22,6 +27,10 @@ function singletonPromise(fn) {
       });
       queue = null;
     }
+    window.postMessage({
+      type: _const.MESSAGE_TYPE_LOGIN_ERROR,
+      payload: err
+    }, location.origin);
   }
   return function () {
     if (!queue) {

package/dist/esm/const/index.js

@@ -0,0 +1,3 @@
+export var MESSAGE_TYPE_LOGIN_SUCCESS = 'fetcher-interceptor-login:success';
+export var MESSAGE_TYPE_LOGIN_ERROR = 'fetcher-interceptor-login:error';
+//# sourceMappingURL=index.js.map

package/dist/esm/const/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["MESSAGE_TYPE_LOGIN_SUCCESS","MESSAGE_TYPE_LOGIN_ERROR"],"sources":["../../../src/const/index.ts"],"sourcesContent":["export const MESSAGE_TYPE_LOGIN_SUCCESS = 'fetcher-interceptor-login:success';\nexport const MESSAGE_TYPE_LOGIN_ERROR = 'fetcher-interceptor-login:error';\n"],"mappings":"AAAA,OAAO,IAAMA,0BAA0B,GAAG,mCAAmC;AAC7E,OAAO,IAAMC,wBAAwB,GAAG,iCAAiC","ignoreList":[]}

package/dist/esm/helper/index.js

@@ -0,0 +1,2 @@
+export { default as messageListenInterceptorLogin } from './message-listen-interceptor-login';
+//# sourceMappingURL=index.js.map

package/dist/esm/helper/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["default","messageListenInterceptorLogin"],"sources":["../../../src/helper/index.ts"],"sourcesContent":["export { default as messageListenInterceptorLogin } from './message-listen-interceptor-login';\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,6BAA6B,QAAQ,oCAAoC","ignoreList":[]}

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

@@ -0,0 +1,23 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+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);
+  return function () {
+    return window.removeEventListener('message', listener);
+  };
+}
+//# sourceMappingURL=message-listen-interceptor-login.js.map

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

@@ -0,0 +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":[]}

package/dist/esm/index.js

@@ -1,2 +1,3 @@
 export { default } from './util/intercept';
+export * from './helper';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["default"],"sources":["../../src/index.ts"],"sourcesContent":["export { default } from './util/intercept';\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,kBAAkB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["default"],"sources":["../../src/index.ts"],"sourcesContent":["export { default } from './util/intercept';\n\nexport * from './helper';\n"],"mappings":"AAAA,SAASA,OAAO,QAAQ,kBAAkB;AAE1C,cAAc,UAAU","ignoreList":[]}

package/dist/esm/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../src/types/index.ts"],"sourcesContent":["import {\n  FetcherError\n} from '@kcuf/fetcher';\n\nexport interface ICreateInterceptorOptions {\n  needLogin(code: string, err: FetcherError): boolean;\n  doLogin(): Promise<void>;\n  headerKeys?: string[];\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"index.js","names":[],"sources":["../../../src/types/index.ts"],"sourcesContent":["import {\n  FetcherError\n} from '@kcuf/fetcher';\n\nexport interface ICreateInterceptorOptions {\n  needLogin(code: string, err: FetcherError): boolean;\n  doLogin(): Promise<unknown>;\n  headerKeys?: string[];\n}\n"],"mappings":"","ignoreList":[]}

package/dist/esm/util/create-interceptor-response-rejected.js

@@ -1,5 +1,3 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import { FetcherErrorName, deleteConfigHeaders } from '@kcuf/fetcher';
 import singletonPromise from './singleton-promise';
 export default function createInterceptorResponseRejected(_ref) {
@@ -7,37 +5,21 @@ export default function createInterceptorResponseRejected(_ref) {
     doLogin = _ref.doLogin,
     headerKeys = _ref.headerKeys;
   var singletonLogin = singletonPromise(doLogin);
-  return /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(error, fetcherConfig, _, requestByInterceptor) {
-      var _error$code;
-      return _regeneratorRuntime().wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (needLogin((_error$code = error.code) !== null && _error$code !== void 0 ? _error$code : '', error)) {
-              _context.next = 1;
-              break;
-            }
-            throw error;
-          case 1:
-            return _context.abrupt("return", singletonLogin().then(function () {
-              if (headerKeys) {
-                deleteConfigHeaders(fetcherConfig, headerKeys);
-              }
-              return requestByInterceptor(fetcherConfig); // 登录完成，重新发起原请求
-            }, function () {
-              // 一般登录弹窗在登录成功之前是不应该被关闭或取消的，但若真允许取消，这里需要修改错误为「取消登录」
-              error.name = FetcherErrorName.LOGIN_CANCELLED;
-              throw error; // 以新的 name 继续抛错
-            }));
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2, _x3, _x4) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+  return function (error, fetcherConfig, _, requestByInterceptor) {
+    var _error$code;
+    if (!needLogin((_error$code = error.code) !== null && _error$code !== void 0 ? _error$code : '', error)) {
+      throw error;
+    }
+    return singletonLogin().then(function () {
+      if (headerKeys) {
+        deleteConfigHeaders(fetcherConfig, headerKeys);
+      }
+      return requestByInterceptor(fetcherConfig); // 登录完成，重新发起原请求
+    }, function () {
+      // 一般登录弹窗在登录成功之前是不应该被关闭或取消的，但若真允许取消，这里需要修改错误为「取消登录」
+      error.name = FetcherErrorName.LOGIN_CANCELLED;
+      throw error; // 以新的 name 继续抛错
+    });
+  };
 }
 //# sourceMappingURL=create-interceptor-response-rejected.js.map

package/dist/esm/util/create-interceptor-response-rejected.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-interceptor-response-rejected.js","names":["FetcherErrorName","deleteConfigHeaders","singletonPromise","createInterceptorResponseRejected","_ref","needLogin","doLogin","headerKeys","singletonLogin","_ref2","_asyncToGenerator","_regeneratorRuntime","mark","_callee","error","fetcherConfig","_","requestByInterceptor","_error$code","wrap","_context","prev","next","code","abrupt","then","name","LOGIN_CANCELLED","stop","_x","_x2","_x3","_x4","apply","arguments"],"sources":["../../../src/util/create-interceptor-response-rejected.ts"],"sourcesContent":["import {\n  FetcherErrorName,\n  FetcherConfig,\n  FetcherError,\n  FetcherResponse,\n  FetcherCallRequest,\n  FetcherInterceptResponseRejected,\n  deleteConfigHeaders\n} from '@kcuf/fetcher';\n\nimport {\n  ICreateInterceptorOptions\n} from '../types';\n\nimport singletonPromise from './singleton-promise';\n\nexport default function createInterceptorResponseRejected({\n  needLogin,\n  doLogin,\n  headerKeys\n}: ICreateInterceptorOptions): FetcherInterceptResponseRejected {\n  const singletonLogin = singletonPromise(doLogin);\n  \n  return async (error: FetcherError, fetcherConfig: FetcherConfig, _: FetcherResponse<unknown> | undefined, requestByInterceptor: FetcherCallRequest) => {\n    if (!needLogin(error.code ?? '', error)) {\n      throw error;\n    }\n    \n    return singletonLogin().then(() => {\n      if (headerKeys) {\n        deleteConfigHeaders(fetcherConfig, headerKeys);\n      }\n      \n      return requestByInterceptor(fetcherConfig); // 登录完成，重新发起原请求\n    }, () => {\n      // 一般登录弹窗在登录成功之前是不应该被关闭或取消的，但若真允许取消，这里需要修改错误为「取消登录」\n      error.name = FetcherErrorName.LOGIN_CANCELLED;\n      \n      throw error; // 以新的 name 继续抛错\n    });\n  };\n}\n"],"mappings":";;AAAA,SACEA,gBAAgB,EAMhBC,mBAAmB,QACd,eAAe;AAMtB,OAAOC,gBAAgB,MAAM,qBAAqB;AAElD,eAAe,SAASC,iCAAiCA,CAAAC,IAAA,EAIO;EAAA,IAH9DC,SAAS,GAAAD,IAAA,CAATC,SAAS;IACTC,OAAO,GAAAF,IAAA,CAAPE,OAAO;IACPC,UAAU,GAAAH,IAAA,CAAVG,UAAU;EAEV,IAAMC,cAAc,GAAGN,gBAAgB,CAACI,OAAO,CAAC;EAEhD;IAAA,IAAAG,KAAA,GAAAC,iBAAA,cAAAC,mBAAA,GAAAC,IAAA,CAAO,SAAAC,QAAOC,KAAmB,EAAEC,aAA4B,EAAEC,CAAuC,EAAEC,oBAAwC;MAAA,IAAAC,WAAA;MAAA,OAAAP,mBAAA,GAAAQ,IAAA,WAAAC,QAAA;QAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;UAAA;YAAA,IAC3IjB,SAAS,EAAAa,WAAA,GAACJ,KAAK,CAACS,IAAI,cAAAL,WAAA,cAAAA,WAAA,GAAI,EAAE,EAAEJ,KAAK,CAAC;cAAAM,QAAA,CAAAE,IAAA;cAAA;YAAA;YAAA,MAC/BR,KAAK;UAAA;YAAA,OAAAM,QAAA,CAAAI,MAAA,WAGNhB,cAAc,CAAC,CAAC,CAACiB,IAAI,CAAC,YAAM;cACjC,IAAIlB,UAAU,EAAE;gBACdN,mBAAmB,CAACc,aAAa,EAAER,UAAU,CAAC;cAChD;cAEA,OAAOU,oBAAoB,CAACF,aAAa,CAAC,CAAC,CAAC;YAC9C,CAAC,EAAE,YAAM;cACP;cACAD,KAAK,CAACY,IAAI,GAAG1B,gBAAgB,CAAC2B,eAAe;cAE7C,MAAMb,KAAK,CAAC,CAAC;YACf,CAAC,CAAC;UAAA;UAAA;YAAA,OAAAM,QAAA,CAAAQ,IAAA;QAAA;MAAA,GAAAf,OAAA;IAAA,CACH;IAAA,iBAAAgB,EAAA,EAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;MAAA,OAAAvB,KAAA,CAAAwB,KAAA,OAAAC,SAAA;IAAA;EAAA;AACH","ignoreList":[]}
+{"version":3,"file":"create-interceptor-response-rejected.js","names":["FetcherErrorName","deleteConfigHeaders","singletonPromise","createInterceptorResponseRejected","_ref","needLogin","doLogin","headerKeys","singletonLogin","error","fetcherConfig","_","requestByInterceptor","_error$code","code","then","name","LOGIN_CANCELLED"],"sources":["../../../src/util/create-interceptor-response-rejected.ts"],"sourcesContent":["import {\n  FetcherErrorName,\n  FetcherConfig,\n  FetcherError,\n  FetcherResponse,\n  FetcherCallRequest,\n  FetcherInterceptResponseRejected,\n  deleteConfigHeaders\n} from '@kcuf/fetcher';\n\nimport {\n  ICreateInterceptorOptions\n} from '../types';\n\nimport singletonPromise from './singleton-promise';\n\nexport default function createInterceptorResponseRejected({\n  needLogin,\n  doLogin,\n  headerKeys\n}: ICreateInterceptorOptions): FetcherInterceptResponseRejected {\n  const singletonLogin = singletonPromise(doLogin);\n  \n  return (error: FetcherError, fetcherConfig: FetcherConfig, _: FetcherResponse | undefined, requestByInterceptor: FetcherCallRequest) => {\n    if (!needLogin(error.code ?? '', error)) {\n      throw error;\n    }\n    \n    return singletonLogin().then(() => {\n      if (headerKeys) {\n        deleteConfigHeaders(fetcherConfig, headerKeys);\n      }\n      \n      return requestByInterceptor(fetcherConfig); // 登录完成，重新发起原请求\n    }, () => {\n      // 一般登录弹窗在登录成功之前是不应该被关闭或取消的，但若真允许取消，这里需要修改错误为「取消登录」\n      error.name = FetcherErrorName.LOGIN_CANCELLED;\n      \n      throw error; // 以新的 name 继续抛错\n    });\n  };\n}\n"],"mappings":"AAAA,SACEA,gBAAgB,EAMhBC,mBAAmB,QACd,eAAe;AAMtB,OAAOC,gBAAgB,MAAM,qBAAqB;AAElD,eAAe,SAASC,iCAAiCA,CAAAC,IAAA,EAIO;EAAA,IAH9DC,SAAS,GAAAD,IAAA,CAATC,SAAS;IACTC,OAAO,GAAAF,IAAA,CAAPE,OAAO;IACPC,UAAU,GAAAH,IAAA,CAAVG,UAAU;EAEV,IAAMC,cAAc,GAAGN,gBAAgB,CAACI,OAAO,CAAC;EAEhD,OAAO,UAACG,KAAmB,EAAEC,aAA4B,EAAEC,CAA8B,EAAEC,oBAAwC,EAAK;IAAA,IAAAC,WAAA;IACtI,IAAI,CAACR,SAAS,EAAAQ,WAAA,GAACJ,KAAK,CAACK,IAAI,cAAAD,WAAA,cAAAA,WAAA,GAAI,EAAE,EAAEJ,KAAK,CAAC,EAAE;MACvC,MAAMA,KAAK;IACb;IAEA,OAAOD,cAAc,CAAC,CAAC,CAACO,IAAI,CAAC,YAAM;MACjC,IAAIR,UAAU,EAAE;QACdN,mBAAmB,CAACS,aAAa,EAAEH,UAAU,CAAC;MAChD;MAEA,OAAOK,oBAAoB,CAACF,aAAa,CAAC,CAAC,CAAC;IAC9C,CAAC,EAAE,YAAM;MACP;MACAD,KAAK,CAACO,IAAI,GAAGhB,gBAAgB,CAACiB,eAAe;MAE7C,MAAMR,KAAK,CAAC,CAAC;IACf,CAAC,CAAC;EACJ,CAAC;AACH","ignoreList":[]}

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

@@ -1,4 +1,5 @@
 import { cloneResponseData } from '@kcuf/fetcher';
+import { MESSAGE_TYPE_LOGIN_SUCCESS, MESSAGE_TYPE_LOGIN_ERROR } from '../const';
 export default function singletonPromise(fn) {
   var queue = null;
   function resolveQueue(data) {
@@ -8,6 +9,10 @@ export default function singletonPromise(fn) {
       });
       queue = null;
     }
+    window.postMessage({
+      type: MESSAGE_TYPE_LOGIN_SUCCESS,
+      payload: data
+    }, location.origin);
   }
   function rejectQueue(err) {
     if (queue) {
@@ -16,6 +21,10 @@ export default function singletonPromise(fn) {
       });
       queue = null;
     }
+    window.postMessage({
+      type: MESSAGE_TYPE_LOGIN_ERROR,
+      payload: err
+    }, location.origin);
   }
   return function () {
     if (!queue) {

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

@@ -1 +1 @@
-{"version":3,"file":"singleton-promise.js","names":["cloneResponseData","singletonPromise","fn","queue","resolveQueue","data","forEach","v","resolve","rejectQueue","err","reject","promise","Promise","_queue","push","length","then"],"sources":["../../../src/util/singleton-promise.ts"],"sourcesContent":["import {\n  cloneResponseData\n} from '@kcuf/fetcher';\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  \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  \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 => rejectQueue(err));\n    }\n    \n    return promise;\n  };\n}\n"],"mappings":"AAAA,SACEA,iBAAiB,QACZ,eAAe;AAOtB,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,CAACR,iBAAiB,CAACK,IAAI,CAAC,CAAC;MACpC,CAAC,CAAC;MAEFF,KAAK,GAAG,IAAI;IACd;EACF;EAEA,SAASM,WAAWA,CAACC,GAAU,EAAQ;IACrC,IAAIP,KAAK,EAAE;MACTA,KAAK,CAACG,OAAO,CAAC,UAAAC,CAAC,EAAI;QACjBA,CAAC,CAACI,MAAM,CAACD,GAAG,CAAC;MACf,CAAC,CAAC;MAEFP,KAAK,GAAG,IAAI;IACd;EACF;EAEA,OAAO,YAAkB;IACvB,IAAI,CAACA,KAAK,EAAE;MACVA,KAAK,GAAG,EAAE;IACZ;IAEA,IAAMS,OAAO,GAAG,IAAIC,OAAO,CAAI,UAACL,OAAO,EAAEG,MAAM,EAAK;MAAA,IAAAG,MAAA;MAClD,CAAAA,MAAA,GAAAX,KAAK,cAAAW,MAAA,eAALA,MAAA,CAAOC,IAAI,CAAC;QACVP,OAAO,EAAPA,OAAO;QACPG,MAAM,EAANA;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,IAAIR,KAAK,CAACa,MAAM,KAAK,CAAC,EAAE;MACtBd,EAAE,CAAC,CAAC,CAACe,IAAI,CAAC,UAAAZ,IAAI;QAAA,OAAID,YAAY,CAACC,IAAI,CAAC;MAAA,GAAE,UAAAK,GAAG;QAAA,OAAID,WAAW,CAACC,GAAG,CAAC;MAAA,EAAC;IAChE;IAEA,OAAOE,OAAO;EAChB,CAAC;AACH","ignoreList":[]}
+{"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":[]}

package/dist/types/const/index.d.ts

@@ -0,0 +1,2 @@
+export declare const MESSAGE_TYPE_LOGIN_SUCCESS = "fetcher-interceptor-login:success";
+export declare const MESSAGE_TYPE_LOGIN_ERROR = "fetcher-interceptor-login:error";

package/dist/types/helper/index.d.ts

@@ -0,0 +1 @@
+export { default as messageListenInterceptorLogin } from './message-listen-interceptor-login';

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

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

package/dist/types/index.d.ts

@@ -1 +1,2 @@
 export { default } from './util/intercept';
+export * from './helper';

package/dist/types/types/index.d.ts

@@ -1,6 +1,6 @@
 import { FetcherError } from '@kcuf/fetcher';
 export interface ICreateInterceptorOptions {
     needLogin(code: string, err: FetcherError): boolean;
-    doLogin(): Promise<void>;
+    doLogin(): Promise<unknown>;
     headerKeys?: string[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kcuf/fetcher-interceptor-login",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "description": "Fetcher interceptor seamless login and redo request.",
   "keywords": [],
   "license": "MIT",
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "git+https://github.com/justnewbee/kcuf.git"
   },
-  "homepage": "https://github.com/justnewbee/kcuf/tree/master/packages-fetcher/fetcher-interceptor-login",
+  "homepage": "https://github.com/justnewbee/kcuf/tree/main/packages-fetcher/fetcher-interceptor-login",
   "bugs": "https://github.com/justnewbee/kcuf/issues",
   "author": {
     "name": "Jianchun Wang",
@@ -22,21 +22,21 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/cli": "^7.28.0",
-    "@babel/core": "^7.28.0",
-    "@babel/plugin-transform-runtime": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
-    "@babel/preset-typescript": "^7.27.1",
-    "@vitest/coverage-v8": "^3.2.4",
-    "fetch-mock": "^12.5.2",
-    "jsdom": "^26.1.0",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.4",
-    "@kcuf/ts-config": "^0.0.1"
+    "@babel/cli": "^7.28.6",
+    "@babel/core": "^7.28.6",
+    "@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",
+    "fetch-mock": "^12.6.0",
+    "jsdom": "^27.4.0",
+    "rimraf": "^6.1.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.17",
+    "@kcuf/ts-config": "^0.1.0"
   },
   "peerDependencies": {
-    "@babel/runtime": "^7.x"
+    "@babel/runtime": ">=7.0.0"
   },
   "dependencies": {
     "@kcuf/fetcher": "^0.2.9"