@kaspernj/api-maker 1.0.347 → 1.0.348

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.347",
+  "version": "1.0.348",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/api.mjs

@@ -1,9 +1,14 @@
 import config from "./config.mjs"
 import CustomError from "./custom-error.mjs"
 import FormDataObjectizer from "form-data-objectizer"
+import Logger from "./logger.mjs"
 import qs from "qs"
 import SessionStatusUpdater from "./session-status-updater.mjs"
 
+const logger = new Logger({name: "ApiMaker / Api"})
+
+// logger.setDebug(true)
+
 export default class Api {
   static get(path, pathParams = null) {
     return Api.requestLocal({path, pathParams, method: "GET"})
@@ -70,6 +75,8 @@ export default class Api {
 
     const token = await this._token()
 
+    logger.debug(() => `Got token: ${token}`)
+
     if (token) {
       args.headers["X-CSRF-Token"] = token
     }

package/src/commands-pool.mjs

@@ -14,7 +14,7 @@ import {ValidationErrors} from "./validation-errors.mjs"
 const shared = {}
 
 export default class ApiMakerCommandsPool {
-  static addCommand (data, args = {}) {
+  static addCommand(data, args = {}) {
     let pool
 
     if (args.instant) {
@@ -34,17 +34,17 @@ export default class ApiMakerCommandsPool {
     return promiseResult
   }
 
-  static current () {
+  static current() {
     if (!shared.currentApiMakerCommandsPool) shared.currentApiMakerCommandsPool = new ApiMakerCommandsPool()
 
     return shared.currentApiMakerCommandsPool
   }
 
-  static flush () {
+  static flush() {
     ApiMakerCommandsPool.current().flush()
   }
 
-  constructor () {
+  constructor() {
     this.flushCount = 0
     this.pool = {}
     this.poolData = {}
@@ -52,7 +52,7 @@ export default class ApiMakerCommandsPool {
     this.globalRequestData = {}
   }
 
-  addCommand (data) {
+  addCommand(data) {
     return new Promise((resolve, reject) => {
       const id = this.currentId
       this.currentId += 1
@@ -87,11 +87,11 @@ export default class ApiMakerCommandsPool {
     })
   }
 
-  commandsCount () {
+  commandsCount() {
     return Object.keys(this.pool)
   }
 
-  async sendRequest ({commandSubmitData, url}) {
+  async sendRequest({commandSubmitData, url}) {
     let response
 
     for (let i = 0; i < 3; i++) {
@@ -113,7 +113,7 @@ export default class ApiMakerCommandsPool {
     throw new Error("Couldnt successfully execute request")
   }
 
-  async flush () {
+  async flush() {
     if (this.commandsCount() == 0) {
       return
     }
@@ -166,7 +166,7 @@ export default class ApiMakerCommandsPool {
     }
   }
 
-  handleFailedResponse (commandData, commandResponseData) {
+  handleFailedResponse(commandData, commandResponseData) {
     let error
 
     if (commandResponseData.error_type == "destroy_error") {
@@ -190,13 +190,13 @@ export default class ApiMakerCommandsPool {
     commandData.reject(error)
   }
 
-  clearTimeout () {
+  clearTimeout() {
     if (this.flushTimeout) {
       clearTimeout(this.flushTimeout)
     }
   }
 
-  isActive () {
+  isActive() {
     if (this.commandsCount() > 0) {
       return true
     }
@@ -208,7 +208,7 @@ export default class ApiMakerCommandsPool {
     return false
   }
 
-  setFlushTimeout () {
+  setFlushTimeout() {
     this.clearTimeout()
     this.flushTimeout = setTimeout(() => this.flush(), 0)
   }

package/src/logger.mjs

@@ -12,7 +12,13 @@ export default class ApiMakerLogger {
   }
 
   debug(message) {
-    if (this.getDebug()) this.log(message)
+    if (this.getDebug()) {
+      this.log(message)
+    }
+  }
+
+  error(message) {
+    console.error(message)
   }
 
   log(message) {

package/src/session-status-updater.mjs

@@ -37,7 +37,7 @@ export default class ApiMakerSessionStatusUpdater {
 
   async getCsrfToken() {
     if (this.csrfToken) {
-      logger.debug("Get CSRF token from set variable")
+      logger.debug(`Get CSRF token from set variable: ${this.csrfToken}`)
 
       return this.csrfToken
     }
@@ -46,7 +46,7 @@ export default class ApiMakerSessionStatusUpdater {
       const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 
       if (csrfTokenElement) {
-        logger.debug("Get CSRF token from meta element")
+        logger.debug(() => `Get CSRF token from meta element: ${csrfTokenElement.getAttribute("content")}`)
 
         this.csrfToken = csrfTokenElement.getAttribute("content")
 
@@ -58,7 +58,7 @@ export default class ApiMakerSessionStatusUpdater {
     await this.updateSessionStatus()
 
     if (this.csrfToken) {
-      logger.debug("Returning CSRF token after updating session status")
+      logger.debug(() => `Returning CSRF token after updating session status: ${this.csrfToken}`)
 
       return this.csrfToken
     }