Cleanup some more functions, work towards eliminating global DB variable.

package-lock.json

@@ -11897,9 +11897,9 @@
       "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw=="
     },
     "eslint-plugin-vue": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.3.0.tgz",
-      "integrity": "sha512-4rc9xrZgwT4aLz3XE6lrHu+FZtDLWennYvtzVvvS81kW9c65U4DUzQQWAFjDCgCFvN6HYWxi7ueEtxZVSB+f0g==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.0.tgz",
+      "integrity": "sha512-bYJV3nHSGV5IL40Ti1231vlY8I2DzjDHYyDjRv9Z1koEI7qyV2RR3+uKMafHdOioXYH9W3e1+iwe4wy7FIBNCQ==",
       "dev": true,
       "requires": {
         "eslint-utils": "^2.1.0",
@@ -25423,23 +25423,6 @@
             "estraverse": "^4.1.1"
           }
         },
-        "esrecurse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-          "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-          "dev": true,
-          "requires": {
-            "estraverse": "^5.2.0"
-          },
-          "dependencies": {
-            "estraverse": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-              "dev": true
-            }
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

package.json

@@ -104,7 +104,7 @@
     "eslint-config-prettier": "^7.1.0",
     "eslint-loader": "^4.0.2",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-vue": "^7.3.0",
+    "eslint-plugin-vue": "^7.4.0",
     "file-loader": "^6.2.0",
     "folder-hash": "^4.0.0",
     "husky": "^4.3.6",

src-electron/importexport/export.js

@@ -36,7 +36,7 @@ const dbEnum = require('../../src-shared/db-enum.js')
  * @param {*} sessionId
  * @returns Promise to retrieve all session key values.
  */
-function exportSessionKeyValues(db, sessionId) {
+async function exportSessionKeyValues(db, sessionId) {
   return queryConfig.getAllSessionKeyValues(db, sessionId)
 }
 
@@ -47,7 +47,7 @@ function exportSessionKeyValues(db, sessionId) {
  * @param {*} sessionId
  * @returns Promise to retrieve all endpoints.
  */
-function exportEndpoints(db, sessionId, endpointTypes) {
+async function exportEndpoints(db, sessionId, endpointTypes) {
   return queryImpExp.exportEndpoints(db, sessionId, endpointTypes)
 }
 
@@ -59,7 +59,7 @@ function exportEndpoints(db, sessionId, endpointTypes) {
  * @param {*} sessionId
  * @returns Promise to retrieve all endpoint types.
  */
-function exportEndpointTypes(db, sessionId) {
+async function exportEndpointTypes(db, sessionId) {
   return queryImpExp
     .exportEndpointTypes(db, sessionId)
     .then((endpointTypes) => {
@@ -127,7 +127,7 @@ function exportEndpointTypes(db, sessionId) {
  * @param {*} db
  * @param {*} sessionId
  */
-function exportSessionPackages(db, sessionId, zapFileLocation) {
+async function exportSessionPackages(db, sessionId, zapFileLocation) {
   return queryImpExp.exportPackagesFromSession(db, sessionId).then((packages) =>
     packages.map((p) => {
       var pathRelativity = dbEnum.pathRelativity.relativeToUserHome
@@ -185,7 +185,7 @@ async function exportDataIntoFile(db, sessionId, filePath) {
  * @param {*} sessionId
  * @returns state object that needs to be saved into a file.
  */
-function createStateFromDatabase(db, sessionId) {
+async function createStateFromDatabase(db, sessionId) {
   return new Promise((resolve, reject) => {
     var state = {
       writeTime: new Date().toString(),

src-electron/main-process/ui.js

@@ -48,7 +48,7 @@ function showErrorMessage(title, err) {
 function readAndOpenFile(db, filePath, httpPort) {
   env.logInfo(`Read and open: ${filePath}`)
   return importJs
-    .importDataFromFile(env.mainDatabase(), filePath)
+    .importDataFromFile(db, filePath)
     .then((sessionId) => {
       windowJs.windowCreate(httpPort, {
         filePath: filePath,

src-electron/util/util.js

@@ -30,7 +30,6 @@ const queryEndpoint = require('../db/query-endpoint.js')
 const queryConfig = require(`../db/query-config.js`)
 const dbEnum = require('../../src-shared/db-enum.js')
 const args = require('./args.js')
-const { O_DIRECTORY } = require('constants')
 
 /**
  * Promises to calculate the CRC of the file, and resolve with an object { filePath, data, actualCrc }
@@ -39,11 +38,8 @@ const { O_DIRECTORY } = require('constants')
  * @returns Promise that resolves with the same object, just adds the 'crc' key into it.
  */
 function calculateCrc(context) {
-  return new Promise((resolve, reject) => {
-    context.crc = crc.crc32(context.data)
-    env.logInfo(`For file: ${context.filePath}, got CRC: ${context.crc}`)
-    resolve(context)
-  })
+  context.crc = crc.crc32(context.data)
+  return context
 }
 
 /**

src-electron/zcl/zcl-loader.js

@@ -39,14 +39,10 @@ const defaultValidator = (zclData) => {
  * @returns Promise to populate data, filePath and crc into the context.
  */
 async function readMetadataFile(ctx) {
-  return fsp
-    .readFile(ctx.metadataFile, { encoding: 'utf-8' })
-    .then((data) => {
-      ctx.data = data
-      ctx.filePath = ctx.metadataFile
-      return Promise.resolve(ctx)
-    })
-    .then((ctx) => util.calculateCrc(ctx))
+  var data = await fsp.readFile(ctx.metadataFile, { encoding: 'utf-8' })
+  ctx.data = data
+  ctx.filePath = ctx.metadataFile
+  return util.calculateCrc(ctx)
 }
 
 /**
@@ -55,17 +51,14 @@ async function readMetadataFile(ctx) {
  * @param {*} ctx
  */
 async function recordToplevelPackage(db, ctx) {
-  return queryPackage
-    .registerTopLevelPackage(
-      db,
-      ctx.metadataFile,
-      ctx.crc,
-      dbEnum.packageType.zclProperties
-    )
-    .then((id) => {
-      ctx.packageId = id
-      return ctx
-    })
+  var id = await queryPackage.registerTopLevelPackage(
+    db,
+    ctx.metadataFile,
+    ctx.crc,
+    dbEnum.packageType.zclProperties
+  )
+  ctx.packageId = id
+  return ctx
 }
 
 /**
@@ -130,7 +123,8 @@ function loadIndividualFile(db, filePath, sessionId) {
 }
 
 /**
- * This funciton creates a validator function with signatuee fn(stringToValidateOn)
+ * This function creates a validator function with signatuee fn(stringToValidateOn)
+ *
  * @param {*} db
  * @param {*} basePackageId
  */
@@ -141,7 +135,7 @@ function bindValidationScript(db, basePackageId) {
         !(dbEnum.packageType.zclSchema in data) ||
         !(dbEnum.packageType.zclValidation in data)
       ) {
-        return Promise.resolve(defaultValidator)
+        return defaultValidator
       }
       let zclSchema = data[dbEnum.packageType.zclSchema]
       let zclValidation = data[dbEnum.packageType.zclValidation]