ngx-rendering-service-lib 0.0.19 → 0.0.21

package/assets/edu-service-worker.js

@@ -5,9 +5,10 @@ const H5P_PATH = "public/h5p"
 const ASSET_PATH = "public/asset"
 const DB_NAME = "Edu-Sharing-Rendering"
 const DB_STORE = "SessionIds"
+/** @type {IDBDatabase} */
+let db
 
-/** @type {FetchEvent}  */
-self.addEventListener('install', function (event) {
+self.addEventListener('install', async function (event) {
   // Skip the 'waiting' lifecycle phase, to go directly from 'installed' to 'activated', even if
   // there are still previous incarnations of this service worker registration active.
   console.log('install')
@@ -29,17 +30,17 @@ self.addEventListener('message', (event) => {
   }
 });
 
-self.addEventListener('fetch', (event) => {
+self.addEventListener('fetch', async (event) => {
+  await getDb().catch(error => {
+    console.error(error)
+    event.respondWith(handleStandardRequest(request))
+  })
   const request = event.request
   const url = request.url
   if (url.includes(RENDER_DATA_PATH)) {
-    event.respondWith(
-      handleRenderDataRequest(request)
-    )
-  } else if(url.includes(JOB_INFO_PATH) || url.includes(H5P_PATH) || url.includes(ASSET_PATH)) {
-    event.respondWith(
-      handleSessionRequest(request)
-    )
+    event.respondWith(handleRenderDataRequest(request))
+  } else if (url.includes(JOB_INFO_PATH) || url.includes(H5P_PATH) || url.includes(ASSET_PATH)) {
+    event.respondWith(handleSessionRequest(request))
   } else {
     event.respondWith(handleStandardRequest(request))
   }
@@ -52,20 +53,14 @@ self.addEventListener('fetch', (event) => {
  * @returns {Promise<Response>}
  */
 const handleSessionRequest = async (request) => {
-  const dbRequest = await buildDbRequest()
-  if (dbRequest === undefined) {
-    return handleStandardRequest(request)
-  }
-  const sessionId = await retrieveSessionIdFromDb(dbRequest)
+  const sessionId = await retrieveSessionIdFromDb()
   if (sessionId === "") {
     return handleStandardRequest(request)
   }
   const modifiedHeaders = new Headers(request.headers)
   modifiedHeaders.set(SESSION_HEADER_NAME, sessionId)
   const modifiedRequest = new Request(request, {
-    mode: 'cors',
-    credentials: 'include',
-    headers: modifiedHeaders,
+    mode: 'cors', credentials: 'include', headers: modifiedHeaders,
   });
   return await fetch(modifiedRequest)
 }
@@ -78,14 +73,10 @@ const handleSessionRequest = async (request) => {
  */
 const handleRenderDataRequest = async (request) => {
   const response = await fetch(request)
-  const dbRequestGet = buildDbRequest()
-  const dbRequestWrite = buildDbRequest()
-  if (dbRequestGet !== undefined && dbRequestWrite !== undefined) {
-    const existingSessionId = await retrieveSessionIdFromDb(dbRequestGet)
-    const newSessionId = response.headers.get(SESSION_HEADER_NAME)
-    if (newSessionId !== null && newSessionId !== "" && newSessionId !== existingSessionId) {
-      await storeSessionIdToDb(dbRequestWrite, newSessionId)
-    }
+  const existingSessionId = await retrieveSessionIdFromDb()
+  const newSessionId = response.headers.get(SESSION_HEADER_NAME)
+  if (newSessionId !== null && newSessionId !== "" && newSessionId !== existingSessionId) {
+    await storeSessionIdToDb(newSessionId)
   }
   return response
 }
@@ -101,60 +92,59 @@ const handleStandardRequest = async (request) => {
 }
 
 /**
- * Function buildDbRequest
- *
- * Prepares an IDBOpenDBRequest and assigns callbacks for onupgradeneeded and error events
- * In order to apply changes to the db scheme, increment the version and modify the onupgradeneeded callback
- * function according to your needs.
+ * Function getDb
  *
- * @return {IDBOpenDBRequest | undefined}
+ * @returns {Promise<String>}
  */
-const buildDbRequest = () => {
-  if (!indexedDB) {
-    console.error("IndexedDB is not supported by current browser. Header auth with Edu-Sharing Rendering Service is not available")
-    return
-  }
-  const request = indexedDB.open(DB_NAME, 1)
-  request.error = (event) => {
-    console.error("Error opening indexedDB")
-    console.error(event)
-  }
-  request.onupgradeneeded = () => {
-    const db = request.result
-    db.createObjectStore(DB_STORE, { keyPath: "id"})
-  }
-  return request
+const getDb = () => {
+  return new Promise((resolve, reject) => {
+    if (db !== undefined) {
+      resolve("success")
+    }
+    if (!indexedDB) {
+      reject(new Error("IndexedDB is not supported by current browser. Header auth with Edu-Sharing Rendering Service is not available"))
+    }
+    const request = indexedDB.open(DB_NAME, 1)
+    request.error = (event) => {
+      console.error(event)
+      reject(new Error("Error opening indexedDB"))
+    }
+    request.onupgradeneeded = () => {
+      const newDb = request.result
+      newDb.createObjectStore(DB_STORE, {keyPath: "id"})
+    }
+    request.onsuccess = () => {
+      db = request.result
+      resolve("success")
+    }
+  })
 }
 
 /**
  * Function storeSessionIdToDb
  *
- * @param {IDBOpenDBRequest} dbRequest
  * @param {string} sessionId
  */
-const storeSessionIdToDb = (dbRequest, sessionId) => {
+const storeSessionIdToDb = (sessionId) => {
   return new Promise((resolve, reject) => {
-    dbRequest.onsuccess = () => {
-      const db = dbRequest.result
-      const transaction = db.transaction(DB_STORE, "readwrite")
-      const store = transaction.objectStore(DB_STORE)
-      store.put({ id: 1, sessionId: sessionId})
-      transaction.oncomplete = () => {
-        db.close()
-        resolve("Indexed DB transaction completed")
-      }
-      transaction.onerror = (event) => {
-        db.close()
-        console.error("DB transaction failed. Cannot store session id.")
-        console.error(event)
-        reject(new Error("Transaction failed"))
-      }
-      transaction.onabort = (ev) => {
-        db.close()
-        console.error("DB transaction aborted. Cannot store session id.")
-        console.error(ev)
-        reject(new Error("Transaction aborted"))
-      }
+    const transaction = db.transaction(DB_STORE, "readwrite")
+    const store = transaction.objectStore(DB_STORE)
+    store.put({id: 1, sessionId: sessionId})
+    transaction.oncomplete = () => {
+      db.close()
+      resolve("Indexed DB transaction completed")
+    }
+    transaction.onerror = (event) => {
+      db.close()
+      console.error("DB transaction failed. Cannot store session id.")
+      console.error(event)
+      reject(new Error("Transaction failed"))
+    }
+    transaction.onabort = (ev) => {
+      db.close()
+      console.error("DB transaction aborted. Cannot store session id.")
+      console.error(ev)
+      reject(new Error("Transaction aborted"))
     }
   })
 }
@@ -165,39 +155,35 @@ const storeSessionIdToDb = (dbRequest, sessionId) => {
  * Gets the stored session id from the database. Returns a promise resolving to the result on success
  * and to an empty string on failure
  *
- * @param {IDBOpenDBRequest} dbRequest
  * @return {Promise<String>}
  */
-const retrieveSessionIdFromDb = (dbRequest) => {
+const retrieveSessionIdFromDb = () => {
   return new Promise((resolve, reject) => {
-    dbRequest.onsuccess = () => {
-      let result = ""
-      const db = dbRequest.result
-      const transaction = db.transaction(DB_STORE, "readwrite")
-      const store = transaction.objectStore(DB_STORE)
-      const idQuery = store.get(1)
-      idQuery.onsuccess = () => {
-        result = idQuery.result !== undefined ? idQuery.result.sessionId : ""
-      }
-      idQuery.onerror = () => {
-        console.error("Query by id failed")
-      }
-      transaction.oncomplete = () => {
-        db.close()
-        resolve(result)
-      }
-      transaction.onerror = (event) => {
-        db.close()
-        console.error("DB transaction failed. Cannot retrieve session id.")
-        console.error(event)
-        reject(new Error("Transaction failed"))
-      }
-      transaction.onabort = (ev) => {
-        db.close()
-        console.error("DB transaction aborted. Cannot retrieve session id.")
-        console.error(ev)
-        reject(new Error("Transaction aborted"))
-      }
+    let result = ""
+    const transaction = db.transaction(DB_STORE, "readonly")
+    const store = transaction.objectStore(DB_STORE)
+    const idQuery = store.get(1)
+    idQuery.onsuccess = () => {
+      result = idQuery.result !== undefined ? idQuery.result.sessionId : ""
+    }
+    idQuery.onerror = () => {
+      console.error("Query by id failed")
+    }
+    transaction.oncomplete = () => {
+      db.close()
+      resolve(result)
+    }
+    transaction.onerror = (event) => {
+      db.close()
+      console.error("DB transaction failed. Cannot retrieve session id.")
+      console.error(event)
+      reject(new Error("Transaction failed"))
+    }
+    transaction.onabort = (ev) => {
+      db.close()
+      console.error("DB transaction aborted. Cannot retrieve session id.")
+      console.error(ev)
+      reject(new Error("Transaction aborted"))
     }
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-rendering-service-lib",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "private": false,
   "dependencies": {
     "tslib": "^2.3.0"