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

package/dist/es/browser/index.browser.js

@@ -2,8 +2,29 @@
 import { Buffer as Buffer2 } from "buffer";
 window.Buffer = Buffer2;
 
-// src/utils/Network.ts
+// src/utils/ApiUtils.ts
 import axios from "axios";
+var ApiUtils = class {
+};
+ApiUtils.mergeAxiosConfigs = (config, overrides) => {
+  return {
+    ...config,
+    ...overrides,
+    headers: {
+      ...config?.headers,
+      ...overrides?.headers
+    }
+  };
+};
+ApiUtils.is4xxError = (error) => {
+  if (axios.isAxiosError(error) && error.response) {
+    return error.response.status >= 400 && error.response.status <= 499;
+  }
+  return false;
+};
+
+// src/utils/Network.ts
+import axios2 from "axios";
 import qs from "query-string";
 
 // src/utils/SdkDevice.ts
@@ -47,7 +68,7 @@ var isMobile = (opts) => {
 // src/utils/Network.ts
 var _Network = class _Network {
   static create(...configs) {
-    const axiosInstance = axios.create(
+    const axiosInstance = axios2.create(
       Object.assign(
         {
           paramsSerializer: qs.stringify
@@ -110,9 +131,27 @@ var AccelByteSDK = class _AccelByteSDK {
         }
       }
     };
-    this.axiosInstance = Network.create({ baseURL: coreConfig.baseURL, ...this.axiosConfig.request });
+    this.axiosInstance = this.createAxiosInstance();
     this.token = {};
   }
+  createAxiosInstance() {
+    const axiosInstance = Network.create({ baseURL: this.coreConfig.baseURL, ...this.axiosConfig.request });
+    const interceptors = this.axiosConfig.interceptors;
+    if (interceptors) {
+      for (const interceptor of interceptors) {
+        if (interceptor.type === "request") {
+          axiosInstance.interceptors.request.use(interceptor?.onRequest, interceptor.onError);
+        }
+        if (interceptor.type === "response") {
+          axiosInstance.interceptors.response.use(interceptor?.onSuccess, interceptor.onError);
+        }
+      }
+    }
+    return axiosInstance;
+  }
+  /**
+   * Assembles and returns the current Axios instance along with core and Axios configurations.
+   */
   assembly() {
     return {
       axiosInstance: this.axiosInstance,
@@ -120,6 +159,12 @@ var AccelByteSDK = class _AccelByteSDK {
       axiosConfig: this.axiosConfig
     };
   }
+  /**
+   * Creates a new instance of AccelByteSDK with a shallow copy of the current configurations.
+   * Optionally allows excluding interceptors.
+   * @param {boolean} [opts.interceptors] - Whether to include interceptors in the clone. Default is true.
+   * @returns {AccelByteSDK} A new instance of AccelByteSDK with the cloned configuration.
+   */
   clone(opts) {
     const newConfigs = {
       coreConfig: { ...this.coreConfig },
@@ -130,6 +175,9 @@ var AccelByteSDK = class _AccelByteSDK {
     }
     return new _AccelByteSDK(newConfigs);
   }
+  /**
+   * Adds interceptors to the current Axios configuration.
+   */
   addInterceptors(interceptors) {
     if (!this.axiosConfig.interceptors) {
       this.axiosConfig.interceptors = [];
@@ -141,11 +189,18 @@ var AccelByteSDK = class _AccelByteSDK {
     if (!this.axiosConfig?.interceptors) return this;
     if (!filterCallback) {
       this.axiosConfig.interceptors = void 0;
+      this.axiosInstance.interceptors.request.clear();
+      this.axiosInstance.interceptors.response.clear();
       return this;
     }
     this.axiosConfig.interceptors = this.axiosConfig.interceptors.filter(filterCallback);
+    this.axiosInstance = this.createAxiosInstance();
     return this;
   }
+  /**
+   * Updates the SDK's core and Axios configurations.
+   * Merges the provided configurations with the current ones.
+   */
   setConfig({ coreConfig, axiosConfig }) {
     this.coreConfig = {
       ...this.coreConfig,
@@ -153,19 +208,36 @@ var AccelByteSDK = class _AccelByteSDK {
     };
     this.axiosConfig = {
       ...this.axiosConfig,
-      ...axiosConfig
+      ...axiosConfig?.interceptors,
+      request: ApiUtils.mergeAxiosConfigs(this.axiosConfig.request, axiosConfig?.request)
     };
+    this.axiosInstance = this.createAxiosInstance();
     return this;
   }
+  /**
+   * Set accessToken and refreshToken and updates the Axios request headers to use Bearer authentication.
+   */
   setToken(token) {
     this.token = {
       ...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();
   }
+  /**
+   * Removes the currently set token.
+   */
   removeToken() {
     this.token = {};
   }
+  /**
+   * Retrieves the current token configuration.
+   */
   getToken() {
     return this.token;
   }
@@ -198,7 +270,7 @@ var ERROR_CODE_TOKEN_EXPIRED = 10196;
 var ERROR_USER_BANNED = 10134;
 
 // src/interceptors/AuthInterceptors.ts
-import axios2 from "axios";
+import axios3 from "axios";
 
 // src/utils/DesktopChecker.ts
 var _DesktopChecker = class _DesktopChecker {
@@ -441,69 +513,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?.onRequest, interceptor.onError);
+        }
+        if (interceptor.type === "response") {
+          axios4.interceptors.response.use(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 axios2({
+      return axios3({
         ...errorConfig,
         headers: {
           ...errorConfig.headers,
@@ -511,7 +597,7 @@ var uponRefreshComplete = (error, tokenResponse, onSessionExpired, axiosConfig,
         }
       });
     } else {
-      return axios2(errorConfig);
+      return axios3(errorConfig);
     }
   }
   if (onSessionExpired) {
@@ -519,6 +605,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 (axios3.isCancel(error)) {
+        return Promise.reject(error);
+      }
+      if (!response) {
+        console.warn(`sdk:ERR_INTERNET_DISCONNECTED ${config?.baseURL}${config?.url}. ${error.message}
+`);
+      }
+      if (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 {
@@ -552,41 +681,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 (axios2.isCancel(error)) {
-        return Promise.reject(error);
-      }
-      if (!response) {
-        console.warn(`sdk:ERR_INTERNET_DISCONNECTED ${config?.baseURL}${config?.url}. ${error.message}
-`);
-      }
-      if (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 = {
@@ -681,27 +775,6 @@ var ErrorInterceptors = [
   }
 ];
 
-// src/utils/ApiUtils.ts
-import axios3 from "axios";
-var ApiUtils = class {
-};
-ApiUtils.mergeAxiosConfigs = (config, overrides) => {
-  return {
-    ...config,
-    ...overrides,
-    headers: {
-      ...config?.headers,
-      ...overrides?.headers
-    }
-  };
-};
-ApiUtils.is4xxError = (error) => {
-  if (axios3.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;
@@ -772,15 +845,14 @@ export {
   IamErrorCode,
   Network,
   RefreshSession,
+  RefreshToken,
   SdkDevice,
   UrlHelper,
   Validate,
+  createAuthInterceptor,
   createCustomPathInterceptor,
   createGetSessionInterceptor,
   createRefreshSessionInterceptor,
-  createSessionExpiredInterceptor,
-  doRefreshSession,
-  isType,
-  refreshWithLock
+  isType
 };
 //# sourceMappingURL=index.browser.js.map