@kaspernj/api-maker 1.0.346 → 1.0.348

package/package.json

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

package/src/api.mjs

@@ -1,7 +1,13 @@
 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) {
@@ -62,12 +68,14 @@ export default class Api {
     })
   }
 
-  static requestLocal(args) {
+  static async requestLocal(args) {
     if (!args.headers) {
       args.headers = {}
     }
 
-    const token = this._token()
+    const token = await this._token()
+
+    logger.debug(() => `Got token: ${token}`)
 
     if (token) {
       args.headers["X-CSRF-Token"] = token
@@ -82,19 +90,14 @@ export default class Api {
       args.data = args.rawData
     }
 
-    return this.request(args)
+    return await this.request(args)
   }
 
   static put(path, data = {}) {
     return this.requestLocal({path, data, method: "PUT"})
   }
 
-  static _token() {
-    const tokenElement = document.querySelector("meta[name='csrf-token']")
-
-    if (tokenElement)
-      return tokenElement.getAttribute("content")
-  }
+  static _token = async () => await SessionStatusUpdater.current().getCsrfToken()
 
   static _parseResponse(xhr) {
     const responseType = xhr.getResponseHeader("content-type")

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

@@ -5,32 +5,68 @@ import Logger from "./logger.mjs"
 import wakeEvent from "wake-event"
 
 const logger = new Logger({name: "ApiMaker / SessionStatusUpdater"})
+const shared = {}
+
+// logger.setDebug(true)
 
 export default class ApiMakerSessionStatusUpdater {
-  static current () {
-    if (!globalThis.apiMakerSessionStatusUpdater)
-      globalThis.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater()
+  static current(args) {
+    if (!shared.apiMakerSessionStatusUpdater) {
+      shared.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater(args)
+    }
 
-    return globalThis.apiMakerSessionStatusUpdater
+    return shared.apiMakerSessionStatusUpdater
   }
 
-  constructor (args = {}) {
+  constructor(args = {}) {
     this.events = {}
     this.timeout = args.timeout || 600000
+    this.useMetaElement = ("useMetaElement" in args) ? args.useMetaElement : true
 
     this.connectOnlineEvent()
     this.connectWakeEvent()
   }
 
-  connectOnlineEvent () {
+  connectOnlineEvent() {
     window.addEventListener("online", this.updateSessionStatus, false)
   }
 
-  connectWakeEvent () {
+  connectWakeEvent() {
     wakeEvent(this.updateSessionStatus)
   }
 
-  async sessionStatus () {
+  async getCsrfToken() {
+    if (this.csrfToken) {
+      logger.debug(`Get CSRF token from set variable: ${this.csrfToken}`)
+
+      return this.csrfToken
+    }
+
+    if (this.useMetaElement) {
+      const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
+
+      if (csrfTokenElement) {
+        logger.debug(() => `Get CSRF token from meta element: ${csrfTokenElement.getAttribute("content")}`)
+
+        this.csrfToken = csrfTokenElement.getAttribute("content")
+
+        return this.csrfToken
+      }
+    }
+
+    logger.debug("Updating session status because no CSRF token set yet")
+    await this.updateSessionStatus()
+
+    if (this.csrfToken) {
+      logger.debug(() => `Returning CSRF token after updating session status: ${this.csrfToken}`)
+
+      return this.csrfToken
+    }
+
+    throw new Error("CSRF token hasn't been set")
+  }
+
+  sessionStatus() {
     return new Promise((resolve) => {
       let requestPath = ""
 
@@ -48,11 +84,11 @@ export default class ApiMakerSessionStatusUpdater {
     })
   }
 
-  onSignedOut (callback) {
+  onSignedOut(callback) {
     this.addEvent("onSignedOut", callback)
   }
 
-  startTimeout () {
+  startTimeout() {
     logger.debug("startTimeout")
 
     if (this.updateTimeout)
@@ -67,7 +103,7 @@ export default class ApiMakerSessionStatusUpdater {
     )
   }
 
-  stopTimeout () {
+  stopTimeout() {
     if (this.updateTimeout)
       clearTimeout(this.updateTimeout)
   }
@@ -82,25 +118,30 @@ export default class ApiMakerSessionStatusUpdater {
     this.updateUserSessionsFromResult(result)
   }
 
-  updateMetaElementsFromResult (result) {
+  updateMetaElementsFromResult(result) {
     logger.debug("updateMetaElementsFromResult")
-    const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 
-    if (csrfTokenElement) {
-      logger.debug(() => `Changing token from "${csrfTokenElement.getAttribute("content")}" to "${result.csrf_token}"`)
-      csrfTokenElement.setAttribute("content", result.csrf_token)
-    } else {
-      logger.debug("csrf token element couldn't be found")
+    this.csrfToken = result.csrf_token
+
+    if (this.useMetaElement) {
+      const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
+
+      if (csrfTokenElement) {
+        logger.debug(() => `Changing token from "${csrfTokenElement.getAttribute("content")}" to "${result.csrf_token}"`)
+        csrfTokenElement.setAttribute("content", result.csrf_token)
+      } else {
+        logger.debug("csrf token element couldn't be found")
+      }
     }
   }
 
-  updateUserSessionsFromResult (result) {
+  updateUserSessionsFromResult(result) {
     for (const scopeName in result.scopes) {
       this.updateUserSessionScopeFromResult(scopeName, result.scopes[scopeName])
     }
   }
 
-  updateUserSessionScopeFromResult (scopeName, scope) {
+  updateUserSessionScopeFromResult(scopeName, scope) {
     const deviseIsSignedInMethodName = `is${inflection.camelize(scopeName)}SignedIn`
 
     if (!(deviseIsSignedInMethodName in Devise)) {