@accelbyte/sdk 0.0.0-dev-20240906023252 → 0.0.0-dev-20240910111050

package/dist/cjs/node/index.cjs

@@ -45,16 +45,15 @@ __export(index_node_exports, {
   IamErrorCode: () => IamErrorCode,
   Network: () => Network,
   RefreshSession: () => RefreshSession,
+  RefreshToken: () => RefreshToken,
   SdkDevice: () => SdkDevice,
   UrlHelper: () => UrlHelper,
   Validate: () => Validate,
+  createAuthInterceptor: () => createAuthInterceptor,
   createCustomPathInterceptor: () => createCustomPathInterceptor,
   createGetSessionInterceptor: () => createGetSessionInterceptor,
   createRefreshSessionInterceptor: () => createRefreshSessionInterceptor,
-  createSessionExpiredInterceptor: () => createSessionExpiredInterceptor,
-  doRefreshSession: () => doRefreshSession,
-  isType: () => isType,
-  refreshWithLock: () => refreshWithLock
+  isType: () => isType
 });
 module.exports = __toCommonJS(index_node_exports);
 
@@ -64,8 +63,29 @@ if (!global.crypto) {
   global.crypto = import_crypto.webcrypto;
 }
 
-// src/utils/Network.ts
+// src/utils/ApiUtils.ts
 var import_axios = __toESM(require("axios"), 1);
+var ApiUtils = class {
+};
+ApiUtils.mergeAxiosConfigs = (config, overrides) => {
+  return {
+    ...config,
+    ...overrides,
+    headers: {
+      ...config == null ? void 0 : config.headers,
+      ...overrides == null ? void 0 : overrides.headers
+    }
+  };
+};
+ApiUtils.is4xxError = (error) => {
+  if (import_axios.default.isAxiosError(error) && error.response) {
+    return error.response.status >= 400 && error.response.status <= 499;
+  }
+  return false;
+};
+
+// src/utils/Network.ts
+var import_axios2 = __toESM(require("axios"), 1);
 var import_query_string = __toESM(require("query-string"), 1);
 
 // src/utils/SdkDevice.ts
@@ -109,7 +129,7 @@ var isMobile = (opts) => {
 // src/utils/Network.ts
 var _Network = class _Network {
   static create(...configs) {
-    const axiosInstance = import_axios.default.create(
+    const axiosInstance = import_axios2.default.create(
       Object.assign(
         {
           paramsSerializer: import_query_string.default.stringify
@@ -173,9 +193,12 @@ var AccelByteSDK = class _AccelByteSDK {
         }
       }
     };
-    this.axiosInstance = Network.create({ baseURL: coreConfig.baseURL, ...this.axiosConfig.request });
+    this.axiosInstance = this.createAxiosInstance();
     this.token = {};
   }
+  createAxiosInstance() {
+    return Network.create({ baseURL: this.coreConfig.baseURL, ...this.axiosConfig.request });
+  }
   assembly() {
     return {
       axiosInstance: this.axiosInstance,
@@ -208,6 +231,7 @@ var AccelByteSDK = class _AccelByteSDK {
       return this;
     }
     this.axiosConfig.interceptors = this.axiosConfig.interceptors.filter(filterCallback);
+    this.axiosInstance = this.createAxiosInstance();
     return this;
   }
   setConfig({ coreConfig, axiosConfig }) {
@@ -219,6 +243,7 @@ var AccelByteSDK = class _AccelByteSDK {
       ...this.axiosConfig,
       ...axiosConfig
     };
+    this.axiosInstance = this.createAxiosInstance();
     return this;
   }
   setToken(token) {
@@ -226,6 +251,12 @@ var AccelByteSDK = class _AccelByteSDK {
       ...this.token,
       ...token
     };
+    const configOverride = { headers: { Authorization: this.token.accessToken ? `Bearer ${this.token.accessToken}` : "" } };
+    this.axiosConfig = {
+      ...this.axiosConfig,
+      request: ApiUtils.mergeAxiosConfigs(this.axiosInstance.defaults, configOverride)
+    };
+    this.axiosInstance = this.createAxiosInstance();
   }
   removeToken() {
     this.token = {};
@@ -262,7 +293,7 @@ var ERROR_CODE_TOKEN_EXPIRED = 10196;
 var ERROR_USER_BANNED = 10134;
 
 // src/interceptors/AuthInterceptors.ts
-var import_axios2 = __toESM(require("axios"), 1);
+var import_axios3 = __toESM(require("axios"), 1);
 
 // src/utils/DesktopChecker.ts
 var _DesktopChecker = class _DesktopChecker {
@@ -506,69 +537,83 @@ var LoginUrls = /* @__PURE__ */ ((LoginUrls2) => {
   LoginUrls2["REVOKE"] = "/iam/v3/oauth/revoke";
   return LoginUrls2;
 })(LoginUrls || {});
-var refreshSession = ({ axiosConfig, refreshToken, clientId, tokenUrl }) => {
-  const config = {
-    ...axiosConfig,
-    withCredentials: false,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      Authorization: `Basic ${Buffer.from(`${clientId}:`).toString("base64")}`
-    }
-  };
-  const axios4 = Network.create(config);
-  const payload = {
-    refresh_token: refreshToken || void 0,
-    client_id: clientId,
-    grant_type: "refresh_token"
-  };
-  if (tokenUrl === "/iam/v4/oauth/token" /* GRANT_TOKEN_V4 */) {
-    return new OAuth20V4$(axios4).postOauthToken_v4(payload);
-  }
-  const oauth20 = new OAuth20$(axios4);
-  return oauth20.postOauthToken(payload);
-};
-var refreshWithLock = ({
-  axiosConfig,
-  refreshToken,
-  clientId,
-  tokenUrl
-}) => {
-  if (RefreshSession.isLocked()) {
-    return Promise.resolve().then(async () => {
-      while (RefreshSession.isLocked()) {
-        await RefreshSession.sleepAsync(REFRESH_EXPIRY_CHECK_RATE);
+var noOp = () => {
+};
+var RefreshToken = class {
+  constructor({ config, interceptors }) {
+    // Return Promise<true> if refresh in any tab is successful;
+    this.runWithLock = () => {
+      if (RefreshSession.isLocked()) {
+        return Promise.resolve().then(async () => {
+          while (RefreshSession.isLocked()) {
+            await RefreshSession.sleepAsync(REFRESH_EXPIRY_CHECK_RATE);
+          }
+          return {};
+        });
       }
-      return {};
-    });
-  }
-  RefreshSession.lock(REFRESH_EXPIRY);
-  let isLocallyRefreshingToken = true;
-  (async () => {
-    while (isLocallyRefreshingToken) {
       RefreshSession.lock(REFRESH_EXPIRY);
-      await RefreshSession.sleepAsync(REFRESH_EXPIRY_UPDATE_RATE);
-    }
-  })();
-  return Promise.resolve().then(doRefreshSession({ axiosConfig, clientId, refreshToken, tokenUrl })).finally(() => {
-    isLocallyRefreshingToken = false;
-    RefreshSession.unlock();
-  });
-};
-var doRefreshSession = ({ axiosConfig, clientId, refreshToken, tokenUrl }) => async () => {
-  if (DesktopChecker.isDesktopApp() && !axiosConfig.withCredentials && !refreshToken) {
-    return false;
-  }
-  const result = await refreshSession({ axiosConfig, clientId, refreshToken, tokenUrl });
-  if (result.error) {
-    return false;
+      let isLocallyRefreshingToken = true;
+      (async () => {
+        while (isLocallyRefreshingToken) {
+          RefreshSession.lock(REFRESH_EXPIRY);
+          await RefreshSession.sleepAsync(REFRESH_EXPIRY_UPDATE_RATE);
+        }
+      })();
+      return Promise.resolve().then(() => this.run()).finally(() => {
+        isLocallyRefreshingToken = false;
+        RefreshSession.unlock();
+      });
+    };
+    this.run = async () => {
+      const { axiosConfig, refreshToken } = this.config;
+      if (DesktopChecker.isDesktopApp() && !axiosConfig.withCredentials && !refreshToken) {
+        return false;
+      }
+      const result = await this.refreshToken();
+      if (result.error) {
+        return false;
+      }
+      return result.response.data;
+    };
+    this.refreshToken = () => {
+      const { axiosConfig, refreshToken, clientId, tokenUrl } = this.config;
+      const config = {
+        ...axiosConfig,
+        withCredentials: false,
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          Authorization: `Basic ${Buffer.from(`${clientId}:`).toString("base64")}`
+        }
+      };
+      const axios4 = Network.create(config);
+      for (const interceptor of this.interceptors) {
+        if (interceptor.type === "request") {
+          axios4.interceptors.request.use(interceptor == null ? void 0 : interceptor.onRequest, interceptor.onError);
+        }
+        if (interceptor.type === "response") {
+          axios4.interceptors.response.use(interceptor == null ? void 0 : interceptor.onSuccess, interceptor.onError);
+        }
+      }
+      const payload = {
+        refresh_token: refreshToken || void 0,
+        client_id: clientId,
+        grant_type: "refresh_token"
+      };
+      if (tokenUrl === "/iam/v4/oauth/token" /* GRANT_TOKEN_V4 */) {
+        return new OAuth20V4$(axios4).postOauthToken_v4(payload);
+      }
+      const oauth20 = new OAuth20$(axios4);
+      return oauth20.postOauthToken(payload);
+    };
+    this.config = config;
+    this.interceptors = interceptors || [];
   }
-  return result.response.data;
 };
-var uponRefreshComplete = (error, tokenResponse, onSessionExpired, axiosConfig, errorConfig) => {
+var refreshComplete = (error, tokenResponse, onSessionExpired, axiosConfig, errorConfig) => {
   if (tokenResponse) {
     const { access_token } = tokenResponse;
     if (!axiosConfig.withCredentials && access_token) {
-      return (0, import_axios2.default)({
+      return (0, import_axios3.default)({
         ...errorConfig,
         headers: {
           ...errorConfig.headers,
@@ -576,7 +621,7 @@ var uponRefreshComplete = (error, tokenResponse, onSessionExpired, axiosConfig,
         }
       });
     } else {
-      return (0, import_axios2.default)(errorConfig);
+      return (0, import_axios3.default)(errorConfig);
     }
   }
   if (onSessionExpired) {
@@ -584,6 +629,49 @@ var uponRefreshComplete = (error, tokenResponse, onSessionExpired, axiosConfig,
   }
   throw error;
 };
+var createAuthInterceptor = ({
+  clientId,
+  onSessionExpired,
+  onGetUserSession,
+  expectedErrorUrls = Object.values({ ...LoginUrls, ...GrantTokenUrls }),
+  getRefreshToken,
+  tokenUrl = "/iam/v3/oauth/token" /* GRANT_TOKEN */
+}) => {
+  return {
+    type: "response",
+    name: "session-expired",
+    onError: (e) => {
+      const error = e;
+      const { config, response } = error;
+      if (import_axios3.default.isCancel(error)) {
+        return Promise.reject(error);
+      }
+      if (!response) {
+        console.warn(`sdk:ERR_INTERNET_DISCONNECTED ${config == null ? void 0 : config.baseURL}${config == null ? void 0 : config.url}. ${error.message}
+`);
+      }
+      if ((response == null ? void 0 : response.status) === 401) {
+        const { url } = config || {};
+        const axiosConfig = config;
+        const refreshToken = getRefreshToken();
+        if (!url || url && expectedErrorUrls.includes(url)) {
+          return Promise.reject(error);
+        }
+        const refresh = new RefreshToken({
+          config: { axiosConfig, clientId, refreshToken, tokenUrl },
+          interceptors: [
+            createRefreshSessionInterceptor({ tokenUrl }),
+            createGetSessionInterceptor({ onGetUserSession: onGetUserSession || noOp, tokenUrl })
+          ]
+        });
+        return refresh.runWithLock().then((tokenResponse) => {
+          return refreshComplete(error, tokenResponse, onSessionExpired, axiosConfig, config || {});
+        });
+      }
+      return Promise.reject(error);
+    }
+  };
+};
 var createRefreshSessionInterceptor = (options) => {
   const { tokenUrl = "/iam/v3/oauth/token" /* GRANT_TOKEN */ } = options || {};
   return {
@@ -617,41 +705,6 @@ var createGetSessionInterceptor = ({
     return response;
   }
 });
-var createSessionExpiredInterceptor = ({
-  clientId,
-  onSessionExpired,
-  expectedErrorUrls = Object.values({ ...LoginUrls, ...GrantTokenUrls }),
-  getRefreshToken,
-  tokenUrl = "/iam/v3/oauth/token" /* GRANT_TOKEN */
-}) => {
-  return {
-    type: "response",
-    name: "session-expired",
-    onError: (e) => {
-      const error = e;
-      const { config, response } = error;
-      if (import_axios2.default.isCancel(error)) {
-        return Promise.reject(error);
-      }
-      if (!response) {
-        console.warn(`sdk:ERR_INTERNET_DISCONNECTED ${config == null ? void 0 : config.baseURL}${config == null ? void 0 : config.url}. ${error.message}
-`);
-      }
-      if ((response == null ? void 0 : response.status) === 401) {
-        const { url } = config || {};
-        const axiosConfig = config;
-        const refreshToken = getRefreshToken();
-        if (!url || url && expectedErrorUrls.includes(url)) {
-          return Promise.reject(error);
-        }
-        return refreshWithLock({ axiosConfig, clientId, refreshToken, tokenUrl }).then((tokenResponse) => {
-          return uponRefreshComplete(error, tokenResponse, onSessionExpired, axiosConfig, config || {});
-        });
-      }
-      return Promise.reject(error);
-    }
-  };
-};
 
 // src/constants/paths.ts
 var INTERNAL_SERVICES = {
@@ -747,27 +800,6 @@ var ErrorInterceptors = [
   }
 ];
 
-// src/utils/ApiUtils.ts
-var import_axios3 = __toESM(require("axios"), 1);
-var ApiUtils = class {
-};
-ApiUtils.mergeAxiosConfigs = (config, overrides) => {
-  return {
-    ...config,
-    ...overrides,
-    headers: {
-      ...config == null ? void 0 : config.headers,
-      ...overrides == null ? void 0 : overrides.headers
-    }
-  };
-};
-ApiUtils.is4xxError = (error) => {
-  if (import_axios3.default.isAxiosError(error) && error.response) {
-    return error.response.status >= 400 && error.response.status <= 499;
-  }
-  return false;
-};
-
 // src/utils/Type.ts
 function isType(schema, data) {
   return schema.safeParse(data).success;
@@ -839,15 +871,14 @@ var UrlHelper = _UrlHelper;
   IamErrorCode,
   Network,
   RefreshSession,
+  RefreshToken,
   SdkDevice,
   UrlHelper,
   Validate,
+  createAuthInterceptor,
   createCustomPathInterceptor,
   createGetSessionInterceptor,
   createRefreshSessionInterceptor,
-  createSessionExpiredInterceptor,
-  doRefreshSession,
-  isType,
-  refreshWithLock
+  isType
 });
 //# sourceMappingURL=index.cjs.map