@nomad-media/public 1.1.11 → 1.1.13

package/dist/nomad-media-sdk-debug.js

@@ -286,6 +286,11 @@ class NomadMediaSDK {
         this.id = null
         this.debugMode = config.debugMode || false;
 
+        if (this.config.serviceApiUrl[this.config.serviceApiUrl.length - 1] === "/")
+        {
+            this.config.serviceApiUrl = this.config.serviceApiUrl.slice(0, -1);
+        }
+
         NomadMediaSDK.instance = this;
         
         return this;
@@ -303,9 +308,6 @@ class NomadMediaSDK {
     async _init() 
     {
         await this.login();
-
-        // Schedule token refresh
-        this.__scheduleTokenRefresh();
     }
     
     // account functions
@@ -328,7 +330,7 @@ class NomadMediaSDK {
                                             this.config.serviceApiUrl, this.debugMode);
             this.token = LOGIN_INFO["token"];
             this.refreshTokenVal = LOGIN_INFO["refreshToken"];
-            this.expirationSeconds = Date.now() + LOGIN_INFO["expirationSeconds"] * 1000;
+            this.expirationSeconds = LOGIN_INFO["expirationSeconds"];
             this.userSessionId = LOGIN_INFO["userSessionId"];
             this.id = LOGIN_INFO["id"];
             _printDatetime(`Login successful`);
@@ -388,10 +390,9 @@ class NomadMediaSDK {
 
         try
         {
-            const TOKEN_INFO = await _refreshToken(this, this.token, this.config.serviceApiUrl, 
+            const REFRESHED = await _refreshToken(this, this.token, this.config.serviceApiUrl, 
                 this.refreshTokenVal, this.debugMode);
-            this.token = TOKEN_INFO["token"];
-            _printDatetime(`Token refresh successful`);
+            if (REFRESHED) _printDatetime(`Token refresh successful`);
         }
         catch (error)
         {
@@ -400,31 +401,6 @@ class NomadMediaSDK {
         }
     }
 
-    /**
-     * @function scheduleTokenRefresh
-     * @private
-     * @description Schedules a token refresh for the duration set by the value returned in the login.
-     * @returns {Promise<void>} - A promise that resolves when the token is refreshed.
-     * Updates the token class variable.
-     * @throws {Error} - An error is thrown if the token refresh fails.
-     */ 
-    __scheduleTokenRefresh() {
-        if (this.token && this.expirationSeconds) {
-            const remainingTime = this.expirationSeconds - Date.now();
-            if (remainingTime > 0) {
-                // Clear existing timer (if any)
-                if (this.refreshTimer) {
-                    clearTimeout(this.refreshTimer);
-                }
-                // Schedule a refresh slightly before token expiration
-                this.refreshTimer = setTimeout(async () => {
-                    await this.refreshToken();
-                    this.__scheduleTokenRefresh();
-                }, remainingTime - 5000); // Refresh 5 seconds before expiration
-            }
-        }
-    }
-
     /**
      * @function forgotPassword
      * @async
@@ -591,7 +567,7 @@ class NomadMediaSDK {
         {
             const GET_FORMS_INFO = await _createForm(this, this.token, this.config.serviceApiUrl, 
                 CONTENT_DEFINITION_ID, FORM_INFO, this.debugMode);
-            _printDatetime(`Form created`);
+            if (GET_FORMS_INFO) _printDatetime(`Form created`);
             return GET_FORMS_INFO;
         }
         catch (error)
@@ -631,7 +607,7 @@ class NomadMediaSDK {
         {
             const GET_CONTENT_COOKIES_INFO = await _getContentCookies(this, this.token, 
                 this.config.serviceApiUrl, CONTENT_ID, this.debugMode);
-            _printDatetime(`Content cookies gotten`);
+            if (GET_CONTENT_COOKIES_INFO) _printDatetime(`Content cookies gotten`);
             return GET_CONTENT_COOKIES_INFO;
         }
         catch (error)
@@ -668,7 +644,7 @@ class NomadMediaSDK {
         {
             const GET_DYNAMIC_CONTENTS_INFO = await _getDefaultSiteConfig(this, this.token, 
                 this.config.serviceApiUrl, this.debugMode);
-            _printDatetime(`Default site config gotten`);
+            if (GET_DYNAMIC_CONTENTS_INFO) _printDatetime(`Default site config gotten`);
             return GET_DYNAMIC_CONTENTS_INFO;
         }
         catch (error)
@@ -701,7 +677,7 @@ class NomadMediaSDK {
         {
             const GET_DYNAMIC_CONTENT_INFO = await _getDynamicContent(this, this.token, 
                 this.config.serviceApiUrl, DYNAMIC_CONTENT_RECORD_ID, this.debugMode);
-            _printDatetime(`Dynamic content gotten: ${DYNAMIC_CONTENT_RECORD_ID}`);
+            if (GET_DYNAMIC_CONTENT_INFO) _printDatetime(`Dynamic content gotten: ${DYNAMIC_CONTENT_RECORD_ID}`);
             return GET_DYNAMIC_CONTENT_INFO;
         }
         catch (error)
@@ -738,7 +714,7 @@ class NomadMediaSDK {
         {
             const GET_DYNAMIC_CONTENTS_INFO = await _getDynamicContents(this, this.token, 
                 this.config.serviceApiUrl, this.debugMode);
-            _printDatetime(`Dynamic contents gotten`);
+            if (GET_DYNAMIC_CONTENTS_INFO) _printDatetime(`Dynamic contents gotten`);
             return GET_DYNAMIC_CONTENTS_INFO;
         }
         catch (error)
@@ -776,7 +752,7 @@ class NomadMediaSDK {
         {
             const GET_MEDIA_GROUP_INFO = await _getMediaGroup(this, this.token, this.config.serviceApiUrl, 
                 MEDIA_GROUP_ID, this.debugMode);
-            _printDatetime(`Media group gotten: ${MEDIA_GROUP_ID}`);
+            if (GET_MEDIA_GROUP_INFO) _printDatetime(`Media group gotten: ${MEDIA_GROUP_ID}`);
             return GET_MEDIA_GROUP_INFO;
         }
         catch (error)
@@ -814,7 +790,7 @@ class NomadMediaSDK {
         {
             const GET_MEDIA_ITEM_INFO = await _getMediaItem(this, this.token, this.config.serviceApiUrl, 
                 MEDIA_ITEM_ID, this.debugMode);
-            _printDatetime(`Media item gotten: ${MEDIA_ITEM_ID}`);
+            if (GET_MEDIA_ITEM_INFO) _printDatetime(`Media item gotten: ${MEDIA_ITEM_ID}`);
             return GET_MEDIA_ITEM_INFO;
         }
         catch (error)
@@ -853,7 +829,7 @@ class NomadMediaSDK {
         {
             const GET_MY_CONTENT_INFO = await _getMyContent(this, this.token, this.config.serviceApiUrl, 
                 this.debugMode);
-            _printDatetime(`My content gotten`);
+            if (GET_MY_CONTENT_INFO) _printDatetime(`My content gotten`);
             return GET_MY_CONTENT_INFO;
         }
         catch (error)
@@ -886,7 +862,7 @@ class NomadMediaSDK {
         {
             const GET_MY_GROUP_INFO = await _getMyGroup(this, this.token, this.config.serviceApiUrl, 
                 GROUP_ID, this.debugMode);
-            _printDatetime(`My group gotten: ${GROUP_ID}`);
+            if (GET_MY_GROUP_INFO) _printDatetime(`My group gotten: ${GROUP_ID}`);
             return GET_MY_GROUP_INFO;
         }
         catch (error)
@@ -919,7 +895,7 @@ class NomadMediaSDK {
         {
             const GET_DYNAMIC_CONTENT_INFO = await _getSiteConfig(this, this.token, 
                 this.config.serviceApiUrl, SITE_CONFIG_RECORD_ID, this.debugMode);
-            _printDatetime(`Site config gotten: ${SITE_CONFIG_RECORD_ID}`);
+            if (GET_DYNAMIC_CONTENT_INFO) _printDatetime(`Site config gotten: ${SITE_CONFIG_RECORD_ID}`);
             return GET_DYNAMIC_CONTENT_INFO;
         }
         catch (error)
@@ -962,7 +938,7 @@ class NomadMediaSDK {
         {
             const MEDIA_SEARCH_INFO = await _mediaSearch(this, this.token, this.config.serviceApiUrl, 
                 QUERY, IDS, SORT_FIELDS, OFFSET, SIZE, this.debugMode);
-            _printDatetime(`Media search complete`);
+            if (MEDIA_SEARCH_INFO) _printDatetime(`Media search complete`);
             return MEDIA_SEARCH_INFO;
         }
         catch (error)
@@ -1117,6 +1093,7 @@ async function _logout(instance, AUTH_TOKEN, URL, DEBUG_MODE)
 
 
 
+
 async function _refreshToken(instance, AUTH_TOKEN, URL, REFRESH_TOKEN, DEBUG_MODE) 
 {
     const API_URL = `${URL}/api/account/refresh-token`;
@@ -1126,7 +1103,9 @@ async function _refreshToken(instance, AUTH_TOKEN, URL, REFRESH_TOKEN, DEBUG_MOD
     };
 
     const TOKEN_INFO = await _sendRequest(instance, AUTH_TOKEN, "Refreshing Token", API_URL, "POST", null, BODY, DEBUG_MODE);
-    return TOKEN_INFO;
+    instance.token = TOKEN_INFO.token;
+
+    return true;
 }
 
 
@@ -1150,12 +1129,12 @@ async function _resetPassword(instance, URL, USERNAME, TOKEN, NEW_PASSWORD, DEBU
 function _apiExceptionHandler(error, message) {
     // Check if we have a response object and error message
     if (!error) {
-        throw new Error(message);
+        console.error(message);
     }
 
     // Check if error is a string
     if (typeof error === "string") {
-        throw new Error(`${message}: ${error}`);
+        console.error(`${message}: ${error}`);
     }
     else if (error.errors)
     {
@@ -1165,7 +1144,7 @@ function _apiExceptionHandler(error, message) {
             {
                 errorString += `${error.errors[errorIdx].code}: ${error.errors[errorIdx].field}: ${error.errors[errorIdx].message}\n`; 
             }
-            throw new Error(`${message}: ${errorString}`);
+            console.error(`${message}: ${errorString}`);
         } 
         else if (typeof error.errors === "object") {
             let errorString = "";
@@ -1174,13 +1153,15 @@ function _apiExceptionHandler(error, message) {
                     errorString += `${key}: ${error.errors[key]}\n`;
                 }
             }
-            throw new Error(`${message}: ${errorString}`);
+            console.error(`${message}: ${errorString}`);
         }
     }
     else
     {
-        throw new Error(`${message}: ${error.message}`);
+        console.error(`${message}: ${error.message}`);
     }
+
+    return null;
 }
 
 
@@ -1216,7 +1197,7 @@ import axios from 'axios';
 
 const MAX_RETRIES = 5;
 const TIMEOUT = 30000;
-const SLEEP_TIME = 60000;
+const SLEEP_TIME = .5;
 
 async function _sendRequest(instance, AUTH_TOKEN, FUNCTION_NAME, URL, METHOD_TYPE, PARAMS, BODY, DEBUG) 
 {
@@ -1226,20 +1207,22 @@ async function _sendRequest(instance, AUTH_TOKEN, FUNCTION_NAME, URL, METHOD_TYP
 
     if (AUTH_TOKEN) HEADERS["Authorization"] = `Bearer ${AUTH_TOKEN}`;
 
-    if (DEBUG) console.log(`URL: ${URL}\nMETHOD: ${METHOD_TYPE}` + (PARAMS && PARAMS.size === 0 ? `\nPARAMS: ${JSON.stringify(PARAMS, null, 4)}` : "")  + (BODY ? `\nBODY: ${JSON.stringify(BODY, null, 4)}` : ""));
+    if (DEBUG && FUNCTION_NAME !== "Login") console.log(`URL: ${URL}\nMETHOD: ${METHOD_TYPE}` + (PARAMS && PARAMS.size === 0 ? `\nPARAMS: ${JSON.stringify(PARAMS, null, 4)}` : "")  + (BODY ? `\nBODY: ${JSON.stringify(BODY, null, 4)}` : ""));
 
     let retries = 0;
     let RESPONSE = null;
+    let refreshedToken = false;
     do
     {
         try 
         {
+            refreshedToken = true;
             RESPONSE = await axios({
                 method: METHOD_TYPE,
                 url: URL,
                 headers: HEADERS,
-                params: PARAMS || {},
-                data: BODY || {},
+                params: PARAMS,
+                data: BODY,
                 timeout: TIMEOUT
             });
 
@@ -1248,29 +1231,27 @@ async function _sendRequest(instance, AUTH_TOKEN, FUNCTION_NAME, URL, METHOD_TYP
                 break;
             }
 
-            if (RESPONSE.status === 403 && FUNCTION_NAME !== "Refreshing Token") 
-            {
-                await instance.refreshToken();
-            } 
-            else 
-            {
-                throw new Error();
-            }
-            
+            throw new Error();
         } 
         catch (error) 
         {
-            if (error.code === 'ECONNABORTED' && retries < MAX_RETRIES) 
+            if (error?.response?.status === 403 && FUNCTION_NAME !== "Refresh Token" && !refreshedToken)
             {
-                retries++;
-                await _sleep(SLEEP_TIME);
-            } 
+                await instance.refreshToken();
+                HEADERS["Authorization"] = `Bearer ${instance.token}`;
+                refreshedToken = true;
+            }
+            else if (error.code === 'ECONNABORTED') 
+            {
+                await _sleep(SLEEP_TIME * 2 ** (retries - 1));
+            }
             else 
             {
-                _apiExceptionHandler(error.response?.data.message ? error.response.data.message : error.message, `${FUNCTION_NAME} failed`);
+                return _apiExceptionHandler(error.response?.data.message ? error.response.data.message : error.message, `${FUNCTION_NAME} failed`);
             }
+            ++retries;
         }
-    } while (!RESPONSE || RESPONSE.status < 200 || RESPONSE.status >= 300);
+    } while ((!RESPONSE || RESPONSE.status < 200 || RESPONSE.status >= 300) && retries < MAX_RETRIES);
     try { return RESPONSE.data; }
     catch (error) { return; }
 }
@@ -1351,7 +1332,7 @@ async function _getContentCookies(instance, AUTH_TOKEN, URL, ID, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/set-cookies/${ID}`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Content Cookies", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Content Cookies", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1361,7 +1342,7 @@ async function _getDefaultSiteConfig(instance, AUTH_TOKEN, URL, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/config`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Default Site Config", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Default Site Config", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1371,7 +1352,7 @@ async function _getDynamicContent(instance, AUTH_TOKEN, URL, ID, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/content/${ID}`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Dynamic Content", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Dynamic Content", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1381,7 +1362,7 @@ async function _getDynamicContents(instance, AUTH_TOKEN, URL, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/content`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Dynamic Contents", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Dynamic Contents", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1391,7 +1372,7 @@ async function _getMediaGroup(instance, AUTH_TOKEN, URL, ID, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/group/${ID}`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Media Group", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Media Group", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1401,7 +1382,7 @@ async function _getMediaItem(instance, AUTH_TOKEN, URL, ID, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/item/${ID}`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Media Item", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Media Item", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1411,7 +1392,7 @@ async function _getMyContent(instance, AUTH_TOKEN, URL, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/my-content`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get My Content", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get My Content", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1421,7 +1402,7 @@ async function _getMyGroup(instance, AUTH_TOKEN, URL, ID, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/my-group/${ID}`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get My Group", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get My Group", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 
@@ -1431,7 +1412,7 @@ async function _getSiteConfig(instance, AUTH_TOKEN, URL, ID, DEBUG_MODE)
 {
     const API_URL = `${URL}/api/media/config/${ID}`;
 
-    return await _sendRequest(instance, AUTH_TOKEN, "Get Site Config", API_URL, "GET", null, null, DEBUG_MODE);
+    return await _sendRequest(instance, AUTH_TOKEN, "Get Site Config", API_URL, "GET", undefined, undefined, DEBUG_MODE);
 }
 
 

package/dist/nomad-media-sdk.min.js

@@ -1,5 +1,5 @@
-import{promises as fs}from"fs";import path from"path";class NomadMediaSDK{constructor(t={}){return NomadMediaSDK.instance||(this.config=t,this.token=null,this.refreshTokenVal=null,this.expirationSeconds=null,this.userSessionId=null,this.id=null,this.debugMode=t.debugMode||!1,NomadMediaSDK.instance=this)}async _init(){await this.login(),this.__scheduleTokenRefresh()}async login(){_printDatetime("Logging in as "+this.config.username);try{var t=await _login(this,this.config.username,this.config.password,this.config.serviceApiUrl,this.debugMode);this.token=t.token,this.refreshTokenVal=t.refreshToken,this.expirationSeconds=Date.now()+1e3*t.expirationSeconds,this.userSessionId=t.userSessionId,this.id=t.id,_printDatetime("Login successful")}catch(t){throw _printDatetime("Login failed"),t}}async logout(){null===this.token&&this.config.username&&await this._init(),_printDatetime("Logging out");try{await _logout(this,this.token,this.config.serviceApiUrl,this.debugMode),this.token=null,this.refreshTokenVal=null,this.expirationSeconds=null,this.userSessionId=null,this.id=null,_printDatetime("Logout successful")}catch(t){throw _printDatetime("Loggout failed"),t}}async refreshToken(){_printDatetime("Refreshing token");try{var t=await _refreshToken(this,this.token,this.config.serviceApiUrl,this.refreshTokenVal,this.debugMode);this.token=t.token,_printDatetime("Token refresh successful")}catch(t){throw _printDatetime("Token refresh failed"),t}}__scheduleTokenRefresh(){var t;this.token&&this.expirationSeconds&&0<(t=this.expirationSeconds-Date.now())&&(this.refreshTimer&&clearTimeout(this.refreshTimer),this.refreshTimer=setTimeout(async()=>{await this.refreshToken(),this.__scheduleTokenRefresh()},t-5e3))}async forgotPassword(){var e=this.config.username;_printDatetime("Sending code to "+e);try{await _forgotPassword(this,this.config.serviceApiUrl,e,this.debugMode),_printDatetime("Code sent to "+e)}catch(t){throw _printDatetime("Code failed to send to "+e),t}}async resetPassword(t,e){var i=this.config.username;_printDatetime("Resetting password for "+i);try{await _resetPassword(this,this.config.serviceApiUrl,i,t,e,this.debugMode),_printDatetime("Password reset for "+i)}catch(t){throw _printDatetime("Password failed to reset for "+i),t}}async clearContinueWatching(t,e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Clearing continue watching");try{await _clearContinueWatching(this,this.token,this.config.serviceApiUrl,t,e,this.debugMode),_printDatetime("Continue watching cleared")}catch(t){throw _printDatetime("Continue watching failed to clear"),t}}async clearWatchlist(t){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Clearing watchlist");try{t=t||this.id,await _clearWatchlist(this,this.token,this.config.serviceApiUrl,t,this.debugMode),_printDatetime("Watchlist cleared")}catch(t){throw _printDatetime("Watchlist failed to clear"),t}}async createForm(t,e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Creating form");try{var i=await _createForm(this,this.token,this.config.serviceApiUrl,t,e,this.debugMode);return _printDatetime("Form created"),i}catch(t){throw _printDatetime("Form failed to create"),t}}async getContentCookies(t){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting content cookies");try{var e=await _getContentCookies(this,this.token,this.config.serviceApiUrl,t,this.debugMode);return _printDatetime("Content cookies gotten"),e}catch(t){throw _printDatetime("Content cookies failed to get"),t}}async getDefaultSiteConfig(){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting default site config");try{var t=await _getDefaultSiteConfig(this,this.token,this.config.serviceApiUrl,this.debugMode);return _printDatetime("Default site config gotten"),t}catch(t){throw _printDatetime("Default site config failed to get"),t}}async getDynamicContent(e){null===this.token&&this.config.username&&await this._init(),_printDatetime("Getting dynamic content: "+e);try{var t=await _getDynamicContent(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return _printDatetime("Dynamic content gotten: "+e),t}catch(t){throw _printDatetime("Dynamic content failed to get: "+e),t}}async getDynamicContents(){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting dynamic contents");try{var t=await _getDynamicContents(this,this.token,this.config.serviceApiUrl,this.debugMode);return _printDatetime("Dynamic contents gotten"),t}catch(t){throw _printDatetime("Dynamic contents failed to get"),t}}async getMediaGroup(e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting media group: "+e);try{var t=await _getMediaGroup(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return _printDatetime("Media group gotten: "+e),t}catch(t){throw _printDatetime("Media group failed to get: "+e),t}}async getMediaItem(e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting media item: "+e);try{var t=await _getMediaItem(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return _printDatetime("Media item gotten: "+e),t}catch(t){throw _printDatetime("Media item failed to get: "+e),t}}async getMyContent(){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is not available for portal API type.");_printDatetime("Getting my content");try{var t=await _getMyContent(this,this.token,this.config.serviceApiUrl,this.debugMode);return _printDatetime("My content gotten"),t}catch(t){throw _printDatetime("My content failed to get"),t}}async getMyGroup(e){null===this.token&&this.config.username&&await this._init(),_printDatetime("Getting my group: "+e);try{var t=await _getMyGroup(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return _printDatetime("My group gotten: "+e),t}catch(t){throw _printDatetime("My group failed to get: "+e),t}}async getSiteConfig(e){null===this.token&&this.config.username&&await this._init(),_printDatetime("Getting site config: "+e);try{var t=await _getSiteConfig(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return _printDatetime("Site config gotten: "+e),t}catch(t){throw _printDatetime("Site config failed to get: "+e),t}}async mediaSearch(t,e,i,n,r){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Searching media...");try{var a=await _mediaSearch(this,this.token,this.config.serviceApiUrl,t,e,i,n,r,this.debugMode);return _printDatetime("Media search complete"),a}catch(t){throw _printDatetime("Media search failed"),t}}async miscFunctions(e,i,n,r){null===this.token&&this.config.username&&await this._init(),_printDatetime("Calling function: "+e);try{let t=this.config.serviceApiUrl+"/"+e;r&&(t=(t=(t=t.replace("/api","")).replace("app-api.","")).replace("admin-app.",""));var a=new Headers,o=(a.append("Content-Type","application/json"),null!==this.token&&a.append("Authorization","Bearer "+this.token),this.debugMode&&(console.log(`URL: ${t}
-METHOD: `+i),n)&&console.log("BODY: "+JSON.stringify(n,null,4)),{method:i,headers:a}),s=(n&&(o.body=JSON.stringify(n)),await fetch(t,o)),c=await s.text();if(!s.ok)try{throw JSON.parse(c)}catch(t){throw c}try{return JSON.parse(c)}catch(t){return c}}catch(t){_apiExceptionHandler(t,"API call failed")}}}export default NomadMediaSDK;async function _forgotPassword(t,e,i,n){return _sendRequest(t,null,"Forgot Password",e+"/api/account/forgot-password","POST",null,{username:i},n)}async function _login(t,e,i,n,r){n+="/api/account/login",e={userName:e,password:i};try{return await _sendRequest(t,null,"Login",n,"POST",null,e,r)}catch(t){throw t.message.includes("409")?new Error("Invalid username or password"):t}}async function _logout(t,e,i,n){return _sendRequest(t,e,"Logout",i+"/api/account/logout","POST",null,null,n)}async function _refreshToken(t,e,i,n,r){return await _sendRequest(t,e,"Refreshing Token",i+"/api/account/refresh-token","POST",null,{refreshToken:n},r)}async function _resetPassword(t,e,i,n,r,a){return _sendRequest(t,null,"Reset Password",e+"/api/account/reset-password","POST",null,{userName:i,TOKEN:n,newPassword:r},a)}function _apiExceptionHandler(i,n){if(!i)throw new Error(n);if("string"==typeof i)throw new Error(n+": "+i);if(!i.errors)throw new Error(n+": "+i.message);if(Array.isArray(i.errors)){let e="";for(let t=0;t<i.errors.length;t++)e+=`${i.errors[t].code}: ${i.errors[t].field}: ${i.errors[t].message}\n`;throw new Error(n+": "+e)}if("object"==typeof i.errors){let t="";for(var e in i.errors)Object.prototype.hasOwnProperty.call(i.errors,e)&&(t+=`${e}: ${i.errors[e]}\n`);throw new Error(n+": "+t)}}import{getRandomValues}from"crypto";function _newGuid(){return([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g,t=>(t^getRandomValues(new Uint8Array(1))[0]&15>>t/4).toString(16))}function _printDatetime(t){var e=(new Date).toLocaleTimeString();console.log(e+": "+t)}import axios from"axios";let MAX_RETRIES=5,TIMEOUT=3e4,SLEEP_TIME=6e4;async function _sendRequest(t,e,i,n,r,a,o,s){var c={"Content-Type":"application/json"};e&&(c.Authorization="Bearer "+e),s&&console.log(`URL: ${n}
+import{promises as fs}from"fs";import path from"path";class NomadMediaSDK{constructor(t={}){return NomadMediaSDK.instance||(this.config=t,this.token=null,this.refreshTokenVal=null,this.expirationSeconds=null,this.userSessionId=null,this.id=null,this.debugMode=t.debugMode||!1,"/"===this.config.serviceApiUrl[this.config.serviceApiUrl.length-1]&&(this.config.serviceApiUrl=this.config.serviceApiUrl.slice(0,-1)),NomadMediaSDK.instance=this)}async _init(){await this.login()}async login(){_printDatetime("Logging in as "+this.config.username);try{var t=await _login(this,this.config.username,this.config.password,this.config.serviceApiUrl,this.debugMode);this.token=t.token,this.refreshTokenVal=t.refreshToken,this.expirationSeconds=t.expirationSeconds,this.userSessionId=t.userSessionId,this.id=t.id,_printDatetime("Login successful")}catch(t){throw _printDatetime("Login failed"),t}}async logout(){null===this.token&&this.config.username&&await this._init(),_printDatetime("Logging out");try{await _logout(this,this.token,this.config.serviceApiUrl,this.debugMode),this.token=null,this.refreshTokenVal=null,this.expirationSeconds=null,this.userSessionId=null,this.id=null,_printDatetime("Logout successful")}catch(t){throw _printDatetime("Loggout failed"),t}}async refreshToken(){_printDatetime("Refreshing token");try{await _refreshToken(this,this.token,this.config.serviceApiUrl,this.refreshTokenVal,this.debugMode)&&_printDatetime("Token refresh successful")}catch(t){throw _printDatetime("Token refresh failed"),t}}async forgotPassword(){var e=this.config.username;_printDatetime("Sending code to "+e);try{await _forgotPassword(this,this.config.serviceApiUrl,e,this.debugMode),_printDatetime("Code sent to "+e)}catch(t){throw _printDatetime("Code failed to send to "+e),t}}async resetPassword(t,e){var i=this.config.username;_printDatetime("Resetting password for "+i);try{await _resetPassword(this,this.config.serviceApiUrl,i,t,e,this.debugMode),_printDatetime("Password reset for "+i)}catch(t){throw _printDatetime("Password failed to reset for "+i),t}}async clearContinueWatching(t,e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Clearing continue watching");try{await _clearContinueWatching(this,this.token,this.config.serviceApiUrl,t,e,this.debugMode),_printDatetime("Continue watching cleared")}catch(t){throw _printDatetime("Continue watching failed to clear"),t}}async clearWatchlist(t){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Clearing watchlist");try{t=t||this.id,await _clearWatchlist(this,this.token,this.config.serviceApiUrl,t,this.debugMode),_printDatetime("Watchlist cleared")}catch(t){throw _printDatetime("Watchlist failed to clear"),t}}async createForm(t,e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Creating form");try{var i=await _createForm(this,this.token,this.config.serviceApiUrl,t,e,this.debugMode);return i&&_printDatetime("Form created"),i}catch(t){throw _printDatetime("Form failed to create"),t}}async getContentCookies(t){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting content cookies");try{var e=await _getContentCookies(this,this.token,this.config.serviceApiUrl,t,this.debugMode);return e&&_printDatetime("Content cookies gotten"),e}catch(t){throw _printDatetime("Content cookies failed to get"),t}}async getDefaultSiteConfig(){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting default site config");try{var t=await _getDefaultSiteConfig(this,this.token,this.config.serviceApiUrl,this.debugMode);return t&&_printDatetime("Default site config gotten"),t}catch(t){throw _printDatetime("Default site config failed to get"),t}}async getDynamicContent(e){null===this.token&&this.config.username&&await this._init(),_printDatetime("Getting dynamic content: "+e);try{var t=await _getDynamicContent(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return t&&_printDatetime("Dynamic content gotten: "+e),t}catch(t){throw _printDatetime("Dynamic content failed to get: "+e),t}}async getDynamicContents(){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting dynamic contents");try{var t=await _getDynamicContents(this,this.token,this.config.serviceApiUrl,this.debugMode);return t&&_printDatetime("Dynamic contents gotten"),t}catch(t){throw _printDatetime("Dynamic contents failed to get"),t}}async getMediaGroup(e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting media group: "+e);try{var t=await _getMediaGroup(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return t&&_printDatetime("Media group gotten: "+e),t}catch(t){throw _printDatetime("Media group failed to get: "+e),t}}async getMediaItem(e){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Getting media item: "+e);try{var t=await _getMediaItem(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return t&&_printDatetime("Media item gotten: "+e),t}catch(t){throw _printDatetime("Media item failed to get: "+e),t}}async getMyContent(){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is not available for portal API type.");_printDatetime("Getting my content");try{var t=await _getMyContent(this,this.token,this.config.serviceApiUrl,this.debugMode);return t&&_printDatetime("My content gotten"),t}catch(t){throw _printDatetime("My content failed to get"),t}}async getMyGroup(e){null===this.token&&this.config.username&&await this._init(),_printDatetime("Getting my group: "+e);try{var t=await _getMyGroup(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return t&&_printDatetime("My group gotten: "+e),t}catch(t){throw _printDatetime("My group failed to get: "+e),t}}async getSiteConfig(e){null===this.token&&this.config.username&&await this._init(),_printDatetime("Getting site config: "+e);try{var t=await _getSiteConfig(this,this.token,this.config.serviceApiUrl,e,this.debugMode);return t&&_printDatetime("Site config gotten: "+e),t}catch(t){throw _printDatetime("Site config failed to get: "+e),t}}async mediaSearch(t,e,i,n,r){if(null===this.token&&this.config.username&&await this._init(),"portal"!==this.config.apiType)throw new Error("This function is only available for portal API type.");_printDatetime("Searching media...");try{var a=await _mediaSearch(this,this.token,this.config.serviceApiUrl,t,e,i,n,r,this.debugMode);return a&&_printDatetime("Media search complete"),a}catch(t){throw _printDatetime("Media search failed"),t}}async miscFunctions(e,i,n,r){null===this.token&&this.config.username&&await this._init(),_printDatetime("Calling function: "+e);try{let t=this.config.serviceApiUrl+"/"+e;r&&(t=(t=(t=t.replace("/api","")).replace("app-api.","")).replace("admin-app.",""));var a=new Headers,o=(a.append("Content-Type","application/json"),null!==this.token&&a.append("Authorization","Bearer "+this.token),this.debugMode&&(console.log(`URL: ${t}
+METHOD: `+i),n)&&console.log("BODY: "+JSON.stringify(n,null,4)),{method:i,headers:a}),s=(n&&(o.body=JSON.stringify(n)),await fetch(t,o)),c=await s.text();if(!s.ok)try{throw JSON.parse(c)}catch(t){throw c}try{return JSON.parse(c)}catch(t){return c}}catch(t){_apiExceptionHandler(t,"API call failed")}}}export default NomadMediaSDK;async function _forgotPassword(t,e,i,n){return _sendRequest(t,null,"Forgot Password",e+"/api/account/forgot-password","POST",null,{username:i},n)}async function _login(t,e,i,n,r){n+="/api/account/login",e={userName:e,password:i};try{return await _sendRequest(t,null,"Login",n,"POST",null,e,r)}catch(t){throw t.message.includes("409")?new Error("Invalid username or password"):t}}async function _logout(t,e,i,n){return _sendRequest(t,e,"Logout",i+"/api/account/logout","POST",null,null,n)}async function _refreshToken(t,e,i,n,r){e=await _sendRequest(t,e,"Refreshing Token",i+"/api/account/refresh-token","POST",null,{refreshToken:n},r);return t.token=e.token,!0}async function _resetPassword(t,e,i,n,r,a){return _sendRequest(t,null,"Reset Password",e+"/api/account/reset-password","POST",null,{userName:i,TOKEN:n,newPassword:r},a)}function _apiExceptionHandler(i,n){if(i||console.error(n),"string"==typeof i)console.error(n+": "+i);else if(i.errors){if(Array.isArray(i.errors)){let e="";for(let t=0;t<i.errors.length;t++)e+=`${i.errors[t].code}: ${i.errors[t].field}: ${i.errors[t].message}\n`;console.error(n+": "+e)}else if("object"==typeof i.errors){let t="";for(var e in i.errors)Object.prototype.hasOwnProperty.call(i.errors,e)&&(t+=`${e}: ${i.errors[e]}\n`);console.error(n+": "+t)}}else console.error(n+": "+i.message);return null}import{getRandomValues}from"crypto";function _newGuid(){return([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g,t=>(t^getRandomValues(new Uint8Array(1))[0]&15>>t/4).toString(16))}function _printDatetime(t){var e=(new Date).toLocaleTimeString();console.log(e+": "+t)}import axios from"axios";let MAX_RETRIES=5,TIMEOUT=3e4,SLEEP_TIME=.5;async function _sendRequest(e,t,i,n,r,a,o,s){var c={"Content-Type":"application/json"};t&&(c.Authorization="Bearer "+t),s&&"Login"!==i&&console.log(`URL: ${n}
 METHOD: `+r+(a&&0===a.size?`
 PARAMS: `+JSON.stringify(a,null,4):"")+(o?`
-BODY: `+JSON.stringify(o,null,4):""));let l=0,h=null;do{try{if(200<=(h=await axios({method:r,url:n,headers:c,params:a||{},data:o||{},timeout:TIMEOUT})).status&&h.status<300)break;if(403!==h.status||"Refreshing Token"===i)throw new Error;await t.refreshToken()}catch(t){"ECONNABORTED"===t.code&&l<MAX_RETRIES?(l++,await _sleep(SLEEP_TIME)):_apiExceptionHandler((t.response?.data.message?t.response.data:t).message,i+" failed")}}while(!h||h.status<200||300<=h.status);try{return h.data}catch(t){}}async function _sleep(e){if(e&&0!==e)return new Promise(t=>{setTimeout(()=>{t()},1e3*e)})}function _slugify(t){return t&&0!==t.trim().length?t.toString().normalize("NFD").replace(/[\u0300-\u036f]/g,"").toLowerCase().trim().replace(/\s+/g,"-").replace(/[^\w-]+/g,"").replace(/--+/g,"-"):""}async function _clearContinueWatching(t,e,i,n,r,a){return _sendRequest(t,e,"Clear Continue Watching",i+"/api/media/clear-watching","POST",{userId:n,assetId:r},null,a)}async function _clearWatchlist(t,e,i,n,r){return _sendRequest(t,e,"Clear Watchlist",i+"/api/media/clear-watchlist?userId="+n,"POST",null,null,r)}async function _createForm(t,e,i,n,r,a){return _sendRequest(t,e,"Creating Form",i+"/api/media/form/"+n,"POST",null,r,a)}async function _getContentCookies(t,e,i,n,r){return _sendRequest(t,e,"Get Content Cookies",i+"/api/media/set-cookies/"+n,"GET",null,null,r)}async function _getDefaultSiteConfig(t,e,i,n){return _sendRequest(t,e,"Get Default Site Config",i+"/api/media/config","GET",null,null,n)}async function _getDynamicContent(t,e,i,n,r){return _sendRequest(t,e,"Get Dynamic Content",i+"/api/media/content/"+n,"GET",null,null,r)}async function _getDynamicContents(t,e,i,n){return _sendRequest(t,e,"Get Dynamic Contents",i+"/api/media/content","GET",null,null,n)}async function _getMediaGroup(t,e,i,n,r){return _sendRequest(t,e,"Get Media Group",i+"/api/media/group/"+n,"GET",null,null,r)}async function _getMediaItem(t,e,i,n,r){return _sendRequest(t,e,"Get Media Item",i+"/api/media/item/"+n,"GET",null,null,r)}async function _getMyContent(t,e,i,n){return _sendRequest(t,e,"Get My Content",i+"/api/media/my-content","GET",null,null,n)}async function _getMyGroup(t,e,i,n,r){return _sendRequest(t,e,"Get My Group",i+"/api/media/my-group/"+n,"GET",null,null,r)}async function _getSiteConfig(t,e,i,n,r){return _sendRequest(t,e,"Get Site Config",i+"/api/media/config/"+n,"GET",null,null,r)}async function _mediaSearch(t,e,i,n,r,a,o,s,c){i+="/api/media/search",n={searchQuery:n,ids:r,sortFields:a};return n.pageOffset=o||0,n.pageSize=s||100,_sendRequest(t,e,"Media Search",i,"POST",null,n,c)}
+BODY: `+JSON.stringify(o,null,4):""));let l=0,h=null,u=!1;do{try{if(u=!0,200<=(h=await axios({method:r,url:n,headers:c,params:a,data:o,timeout:TIMEOUT})).status&&h.status<300)break;throw new Error}catch(t){if(403!==t?.response?.status||"Refresh Token"===i||u){if("ECONNABORTED"!==t.code)return _apiExceptionHandler((t.response?.data.message?t.response.data:t).message,i+" failed");await _sleep(SLEEP_TIME*2**(l-1))}else await e.refreshToken(),c.Authorization="Bearer "+e.token,u=!0;++l}}while((!h||h.status<200||300<=h.status)&&l<MAX_RETRIES);try{return h.data}catch(t){}}async function _sleep(e){if(e&&0!==e)return new Promise(t=>{setTimeout(()=>{t()},1e3*e)})}function _slugify(t){return t&&0!==t.trim().length?t.toString().normalize("NFD").replace(/[\u0300-\u036f]/g,"").toLowerCase().trim().replace(/\s+/g,"-").replace(/[^\w-]+/g,"").replace(/--+/g,"-"):""}async function _clearContinueWatching(t,e,i,n,r,a){return _sendRequest(t,e,"Clear Continue Watching",i+"/api/media/clear-watching","POST",{userId:n,assetId:r},null,a)}async function _clearWatchlist(t,e,i,n,r){return _sendRequest(t,e,"Clear Watchlist",i+"/api/media/clear-watchlist?userId="+n,"POST",null,null,r)}async function _createForm(t,e,i,n,r,a){return _sendRequest(t,e,"Creating Form",i+"/api/media/form/"+n,"POST",null,r,a)}async function _getContentCookies(t,e,i,n,r){return _sendRequest(t,e,"Get Content Cookies",i+"/api/media/set-cookies/"+n,"GET",void 0,void 0,r)}async function _getDefaultSiteConfig(t,e,i,n){return _sendRequest(t,e,"Get Default Site Config",i+"/api/media/config","GET",void 0,void 0,n)}async function _getDynamicContent(t,e,i,n,r){return _sendRequest(t,e,"Get Dynamic Content",i+"/api/media/content/"+n,"GET",void 0,void 0,r)}async function _getDynamicContents(t,e,i,n){return _sendRequest(t,e,"Get Dynamic Contents",i+"/api/media/content","GET",void 0,void 0,n)}async function _getMediaGroup(t,e,i,n,r){return _sendRequest(t,e,"Get Media Group",i+"/api/media/group/"+n,"GET",void 0,void 0,r)}async function _getMediaItem(t,e,i,n,r){return _sendRequest(t,e,"Get Media Item",i+"/api/media/item/"+n,"GET",void 0,void 0,r)}async function _getMyContent(t,e,i,n){return _sendRequest(t,e,"Get My Content",i+"/api/media/my-content","GET",void 0,void 0,n)}async function _getMyGroup(t,e,i,n,r){return _sendRequest(t,e,"Get My Group",i+"/api/media/my-group/"+n,"GET",void 0,void 0,r)}async function _getSiteConfig(t,e,i,n,r){return _sendRequest(t,e,"Get Site Config",i+"/api/media/config/"+n,"GET",void 0,void 0,r)}async function _mediaSearch(t,e,i,n,r,a,o,s,c){i+="/api/media/search",n={searchQuery:n,ids:r,sortFields:a};return n.pageOffset=o||0,n.pageSize=s||100,_sendRequest(t,e,"Media Search",i,"POST",null,n,c)}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nomad-media/public",
-	"version": "1.1.11",
+	"version": "1.1.13",
 	"description": "Nomad Media NPM",
 	"main": "dist/nomad-media-sdk.min.js",
 	"type": "module",