Further cleanup.

src-electron/db/db-api.js

@@ -72,7 +72,7 @@ function delayBeginTransaction(db, resolve, reject) {
  * @param {*} db
  * @returns A promise that resolves without an argument and rejects with an error from BEGIN TRANSACTION query.
  */
-function dbBeginTransaction(db) {
+async function dbBeginTransaction(db) {
   return new Promise((resolve, reject) => {
     if (inTransaction) {
       delayBeginTransaction(db, resolve, reject)
@@ -90,7 +90,7 @@ function dbBeginTransaction(db) {
  * @param {*} db
  * @returns A promise that resolves without an argument or rejects with an error from COMMIT query.
  */
-function dbCommit(db) {
+async function dbCommit(db) {
   return new Promise((resolve, reject) => {
     db.run('COMMIT', [], function (err) {
       if (err) {
@@ -112,7 +112,7 @@ function dbCommit(db) {
  * @param {*} db
  * @returns A promise that resolves without an argument or rejects with an error from ROLLBACK query.
  */
-function dbRollback(db) {
+async function dbRollback(db) {
   return new Promise((resolve, reject) => {
     db.run('ROLLBACK', [], function (err) {
       if (err) {
@@ -136,7 +136,7 @@ function dbRollback(db) {
  * @param {*} args
  * @returns A promise that resolve with the number of delete rows, or rejects with an error from query.
  */
-function dbRemove(db, query, args) {
+async function dbRemove(db, query, args) {
   return new Promise((resolve, reject) => {
     db.run(query, args, function (err) {
       if (err) {
@@ -159,7 +159,7 @@ function dbRemove(db, query, args) {
  * @param {*} args
  * @returns A promise that resolves without an argument, or rejects with an error from the query.
  */
-function dbUpdate(db, query, args) {
+async function dbUpdate(db, query, args) {
   return new Promise((resolve, reject) => {
     db.run(query, args, function (err) {
       if (err) {
@@ -182,7 +182,7 @@ function dbUpdate(db, query, args) {
  * @param {*} args
  * @returns A promise that resolves with the rowid from the inserted row, or rejects with an error from the query.
  */
-function dbInsert(db, query, args) {
+async function dbInsert(db, query, args) {
   return new Promise((resolve, reject) => {
     db.run(query, args, function (err) {
       if (err) {
@@ -207,7 +207,7 @@ function dbInsert(db, query, args) {
  * @param {*} args
  * @returns A promise that resolves with the rows that got retrieved from the database, or rejects with an error from the query.
  */
-function dbAll(db, query, args) {
+async function dbAll(db, query, args) {
   return new Promise((resolve, reject) => {
     db.all(query, args, (err, rows) => {
       if (err) {
@@ -230,7 +230,7 @@ function dbAll(db, query, args) {
  * @param {*} args
  * @returns A promise that resolves with a single row that got retrieved from the database, or rejects with an error from the query.
  */
-function dbGet(db, query, args, reportError = true) {
+async function dbGet(db, query, args, reportError = true) {
   return new Promise((resolve, reject) => {
     db.get(query, args, (err, row) => {
       if (err) {
@@ -252,7 +252,7 @@ function dbGet(db, query, args, reportError = true) {
  * @param {*} sql
  * @param {*} arrayOfArrays
  */
-function dbMultiSelect(db, sql, arrayOfArrays) {
+async function dbMultiSelect(db, sql, arrayOfArrays) {
   return new Promise((resolve, reject) => {
     env.logSql(
       `Preparing statement: ${sql} to select ${arrayOfArrays.length} rows.`
@@ -290,7 +290,7 @@ function dbMultiSelect(db, sql, arrayOfArrays) {
  * @param {*} arrayOfArrays
  * @returns A promise that resolves with the array of rowids for the rows that got inserted, or rejects with an error from the query.
  */
-function dbMultiInsert(db, sql, arrayOfArrays) {
+async function dbMultiInsert(db, sql, arrayOfArrays) {
   return new Promise((resolve, reject) => {
     env.logSql(
       `Preparing statement: ${sql} to insert ${arrayOfArrays.length} records.`
@@ -320,7 +320,7 @@ function dbMultiInsert(db, sql, arrayOfArrays) {
  * @param {*} database
  * @returns A promise that resolves without an argument or rejects with error from the database closing.
  */
-function closeDatabase(database) {
+async function closeDatabase(database) {
   return new Promise((resolve, reject) => {
     env.logSql('About to close database.')
     database.close((err) => {
@@ -336,7 +336,7 @@ function closeDatabase(database) {
  *
  *  @returns Promise that resolve with the Db.
  */
-function initRamDatabase() {
+async function initRamDatabase() {
   return new Promise((resolve, reject) => {
     var db = new sqlite.Database(':memory:', (err) => {
       if (err) {
@@ -356,7 +356,7 @@ function initRamDatabase() {
  * @param {*} sqlitePath
  * @returns A promise that resolves with the database object that got created, or rejects with an error if something went wrong.
  */
-function initDatabase(sqlitePath) {
+async function initDatabase(sqlitePath) {
   return new Promise((resolve, reject) => {
     var db = new sqlite.Database(sqlitePath, (err) => {
       if (err) {
@@ -376,7 +376,7 @@ function initDatabase(sqlitePath) {
  * @param {*} version
  * @returns  A promise that resolves with a rowid of created setting row or rejects with error if something goes wrong.
  */
-function insertOrReplaceSetting(db, category, key, value) {
+async function insertOrReplaceSetting(db, category, key, value) {
   return dbInsert(
     db,
     'INSERT OR REPLACE INTO SETTING ( CATEGORY, KEY, VALUE ) VALUES ( ?, ?, ? )',
@@ -384,7 +384,7 @@ function insertOrReplaceSetting(db, category, key, value) {
   )
 }
 
-function determineIfSchemaShouldLoad(db, context) {
+async function determineIfSchemaShouldLoad(db, context) {
   return new Promise((resolve, reject) => {
     return dbGet(
       db,
@@ -410,7 +410,7 @@ function determineIfSchemaShouldLoad(db, context) {
   })
 }
 
-function updateCurrentSchemaCrc(db, context) {
+async function updateCurrentSchemaCrc(db, context) {
   return new Promise((resolve, reject) => {
     dbInsert(
       db,
@@ -431,7 +431,7 @@ function updateCurrentSchemaCrc(db, context) {
  * @param {*} zapVersion
  * @returns A promise that resolves with the same db that got passed in, or rejects with an error.
  */
-function loadSchema(db, schemaPath, zapVersion, sqliteFile = null) {
+async function loadSchema(db, schemaPath, zapVersion, sqliteFile = null) {
   return new Promise((resolve, reject) => {
     fs.readFile(schemaPath, 'utf8', (err, data) => {
       if (err) return reject(err)
@@ -508,7 +508,7 @@ function loadSchema(db, schemaPath, zapVersion, sqliteFile = null) {
  * @param {*} zapVersion
  * @returns Promise that resolves into the database object.
  */
-function initDatabaseAndLoadSchema(sqliteFile, schemaFile, zapVersion) {
+async function initDatabaseAndLoadSchema(sqliteFile, schemaFile, zapVersion) {
   return initDatabase(sqliteFile).then((db) =>
     loadSchema(db, schemaFile, zapVersion, sqliteFile)
   )

src-electron/db/query-config.js

@@ -143,7 +143,7 @@ DO UPDATE SET ENABLED = ?`,
  * @param {*} clusterRef
  * @param {*} side
  */
-function getClusterState(db, endpointTypeId, clusterRef, side) {
+async function getClusterState(db, endpointTypeId, clusterRef, side) {
   return dbApi
     .dbGet(
       db,

src-electron/db/query-endpoint.js

@@ -31,7 +31,7 @@ const bin = require('../util/bin.js')
  * @param {*} sessionId
  * @returns promise that resolves into endpoints rows
  */
-function queryEndpoints(db, sessionId) {
+async function queryEndpoints(db, sessionId) {
   return queryConfig.getAllEndpoints(db, sessionId)
 }
 
@@ -42,7 +42,7 @@ function queryEndpoints(db, sessionId) {
  * @param {*} sessionId
  * @returns promise that resolves into endpoint types rows
  */
-function queryEndpointTypes(db, sessionId) {
+async function queryEndpointTypes(db, sessionId) {
   return queryConfig.getAllEndpointTypes(db, sessionId)
 }
 
@@ -53,7 +53,7 @@ function queryEndpointTypes(db, sessionId) {
  * @param {*} endpointTypeId
  * @returns promise that resolves into endpoint type
  */
-function queryEndpointType(db, endpointTypeId) {
+async function queryEndpointType(db, endpointTypeId) {
   return queryConfig.getEndpointType(db, endpointTypeId)
 }
 
@@ -64,7 +64,7 @@ function queryEndpointType(db, endpointTypeId) {
  * @param {*} endpointTypeId
  * @returns promise that resolves into endpoint clusters.
  */
-function queryEndpointClusters(db, endpointTypeId) {
+async function queryEndpointClusters(db, endpointTypeId) {
   return dbApi
     .dbAll(
       db,
@@ -113,7 +113,12 @@ ORDER BY C.CODE
  * @param {*} endpointTypeId
  * @returns promise that resolves into endpoint cluster attributes
  */
-function queryEndpointClusterAttributes(db, clusterId, side, endpointTypeId) {
+async function queryEndpointClusterAttributes(
+  db,
+  clusterId,
+  side,
+  endpointTypeId
+) {
   return dbApi
     .dbAll(
       db,
@@ -191,7 +196,7 @@ WHERE
  * @param {*} endpointTypeId
  * @returns promise that resolves into endpoint cluster commands
  */
-function queryEndpointClusterCommands(db, clusterId, endpointTypeId) {
+async function queryEndpointClusterCommands(db, clusterId, endpointTypeId) {
   return dbApi
     .dbAll(
       db,

src-electron/db/query-generic.js

@@ -30,7 +30,7 @@ const dbApi = require('./db-api.js')
  * @param {*} table
  * @returns a promise that resolves into the count of the rows in the table.
  */
-function selectCountFrom(db, table) {
+async function selectCountFrom(db, table) {
   return dbApi
     .dbGet(db, `SELECT COUNT(*) AS COUNT FROM ${table}`)
     .then((x) => x.COUNT)
@@ -44,7 +44,7 @@ function selectCountFrom(db, table) {
  * @param {*} filePath
  * @param {*} category
  */
-function insertFileLocation(db, filePath, category) {
+async function insertFileLocation(db, filePath, category) {
   return dbApi.dbInsert(
     db,
     'INSERT OR REPLACE INTO FILE_LOCATION (CATEGORY, FILE_PATH, ACCESS_TIME) VALUES (?,?,?)',
@@ -59,18 +59,17 @@ function insertFileLocation(db, filePath, category) {
  * @param {*} db
  * @param {*} category
  */
-function selectFileLocation(db, category) {
-  return dbApi
-    .dbGet(db, 'SELECT FILE_PATH FROM FILE_LOCATION WHERE CATEGORY = ?', [
-      category,
-    ])
-    .then((row) => {
-      if (row == null) {
-        return ''
-      } else {
-        return row.FILE_PATH
-      }
-    })
+async function selectFileLocation(db, category) {
+  var row = await dbApi.dbGet(
+    db,
+    'SELECT FILE_PATH FROM FILE_LOCATION WHERE CATEGORY = ?',
+    [category]
+  )
+  if (row == null) {
+    return ''
+  } else {
+    return row.FILE_PATH
+  }
 }
 // exports
 exports.selectCountFrom = selectCountFrom

src-electron/db/query-impexp.js

@@ -30,7 +30,7 @@ const env = require('../util/env.js')
  * @param {*} endpoint
  * @param {*} endpointTypeRef
  */
-function importEndpoint(db, sessionId, endpoint, endpointTypeRef) {
+async function importEndpoint(db, sessionId, endpoint, endpointTypeRef) {
   return dbApi.dbInsert(
     db,
     `
@@ -64,7 +64,7 @@ INSERT INTO ENDPOINT (
  * @param {*} db
  * @param {*} sessionId
  */
-function exportEndpoints(db, sessionId, endpointTypes) {
+async function exportEndpoints(db, sessionId, endpointTypes) {
   var endpointTypeIndex = (epts, endpointTypeRef) => {
     return epts.findIndex((value) => value.endpointTypeId == endpointTypeRef)
   }
@@ -111,7 +111,7 @@ ORDER BY ENDPOINT.ENDPOINT_IDENTIFIER
  * @param {*} sessionId
  * @returns promise that resolves into rows in the database table.
  */
-function exportEndpointTypes(db, sessionId) {
+async function exportEndpointTypes(db, sessionId) {
   var mapFunction = (x) => {
     return {
       endpointTypeId: x.ENDPOINT_TYPE_ID,
@@ -154,7 +154,7 @@ ORDER BY ENDPOINT_TYPE.NAME, DEVICE_TYPE_CODE, DEVICE_TYPE_PROFILE_ID`,
  * @param {*} endpointType
  * @returns Promise of endpoint insertion.
  */
-function importEndpointType(db, sessionId, packageId, endpointType) {
+async function importEndpointType(db, sessionId, packageId, endpointType) {
   // Each endpoint has: 'name', 'deviceTypeName', 'deviceTypeCode', `deviceTypeProfileId`, 'clusters', 'commands', 'attributes'
   return dbApi.dbInsert(
     db,
@@ -185,7 +185,7 @@ INSERT INTO ENDPOINT_TYPE (
  * @param {*} sessionId
  * @returns Promise of a data that is listing all the packages in the session.
  */
-function exportPackagesFromSession(db, sessionId) {
+async function exportPackagesFromSession(db, sessionId) {
   var mapFunction = (x) => {
     return {
       path: x.PATH,
@@ -219,7 +219,7 @@ WHERE SESSION_PACKAGE.SESSION_REF = ?`,
  * @param {*} endpointTypeId
  * @returns Promise that resolves with the data that should go into the external form.
  */
-function exportClustersFromEndpointType(db, endpointTypeId) {
+async function exportClustersFromEndpointType(db, endpointTypeId) {
   var mapFunction = (x) => {
     return {
       name: x.NAME,
@@ -262,7 +262,12 @@ ORDER BY CLUSTER.CODE, CLUSTER.NAME`,
  * @param {*} cluster Object populated same way as export method leaves it.
  * @returns Promise of an imported cluster.
  */
-function importClusterForEndpointType(db, packageId, endpointTypeId, cluster) {
+async function importClusterForEndpointType(
+  db,
+  packageId,
+  endpointTypeId,
+  cluster
+) {
   return dbApi.dbInsert(
     db,
     `
@@ -297,7 +302,7 @@ VALUES
  * @param {*} endpointTypeId
  * @returns Promise that resolves with the attribute data.
  */
-function exportAttributesFromEndpointTypeCluster(
+async function exportAttributesFromEndpointTypeCluster(
   db,
   endpointTypeId,
   endpointClusterId
@@ -358,7 +363,7 @@ WHERE ENDPOINT_TYPE_ATTRIBUTE.ENDPOINT_TYPE_REF = ?
  * @param {*} attribute
  * @returns Promise of an attribute insertion.
  */
-function importAttributeForEndpointType(
+async function importAttributeForEndpointType(
   db,
   packageId,
   endpointTypeId,
@@ -428,7 +433,7 @@ VALUES
  * @param {*} endpointTypeId
  * @returns Promise that resolves with the command data.
  */
-function exportCommandsFromEndpointTypeCluster(
+async function exportCommandsFromEndpointTypeCluster(
   db,
   endpointTypeId,
   endpointClusterId
@@ -474,7 +479,7 @@ function exportCommandsFromEndpointTypeCluster(
  * @param {*} command
  * @returns Promise of a command insertion.
  */
-function importCommandForEndpointType(
+async function importCommandForEndpointType(
   db,
   packageId,
   endpointTypeId,
@@ -530,7 +535,7 @@ VALUES
  * @param {*} sessionId
  * @returns promise that resolves into rows in the database table.
  */
-function exportendPointTypeIds(db, sessionId) {
+async function exportendPointTypeIds(db, sessionId) {
   var mapFunction = (x) => {
     return {
       endpointTypeId: x.ENDPOINT_TYPE_ID,
@@ -560,7 +565,7 @@ WHERE ENDPOINT_TYPE.SESSION_REF = ? ORDER BY ENDPOINT_TYPE.NAME`,
  * @param {*} endpointTypes
  * @param {*} endpointClusterId
  */
-function exportCliCommandCountFromEndpointTypeCluster(
+async function exportCliCommandCountFromEndpointTypeCluster(
   db,
   endpointTypes,
   endpointClusterId

src-electron/db/query-package.js

@@ -32,7 +32,7 @@ const dbEnum = require('../../src-shared/db-enum.js')
  * @param {*} db
  * @param {*} path Path of a file to check.
  */
-function getPackageByPathAndParent(db, path, parentId) {
+async function getPackageByPathAndParent(db, path, parentId) {
   return dbApi
     .dbGet(
       db,
@@ -49,7 +49,7 @@ function getPackageByPathAndParent(db, path, parentId) {
  * @param {*} parentId
  * @returns promise that resolves into an array of packages.
  */
-function getPackageByParent(db, parentId) {
+async function getPackageByParent(db, parentId) {
   return dbApi
     .dbAll(
       db,
@@ -67,7 +67,7 @@ function getPackageByParent(db, parentId) {
  * @param {*} type
  * @returns Promise of a query.
  */
-function getPackageByPathAndType(db, path, type) {
+async function getPackageByPathAndType(db, path, type) {
   return dbApi
     .dbGet(
       db,
@@ -86,7 +86,7 @@ function getPackageByPathAndType(db, path, type) {
  * @param {*} version
  * @returns Promise of a query.
  */
-function getPackageIdByPathAndTypeAndVersion(db, path, type, version) {
+async function getPackageIdByPathAndTypeAndVersion(db, path, type, version) {
   return dbApi
     .dbGet(
       db,
@@ -106,7 +106,7 @@ function getPackageIdByPathAndTypeAndVersion(db, path, type, version) {
  * @param {*} type
  * @returns A promise that resolves into the rows array of packages.
  */
-function getPackagesByType(db, type) {
+async function getPackagesByType(db, type) {
   return dbApi
     .dbAll(
       db,
@@ -123,7 +123,7 @@ function getPackagesByType(db, type) {
  * @param {*} type
  * @returns A promise that resolves into the rows array of packages.
  */
-function getPackagesByParentAndType(db, parentId, type) {
+async function getPackagesByParentAndType(db, parentId, type) {
   return dbApi
     .dbAll(
       db,
@@ -141,7 +141,7 @@ function getPackagesByParentAndType(db, parentId, type) {
  * @param {*} db
  * @param {*} path Path of a file to check.
  */
-function getPackageByPackageId(db, packageId) {
+async function getPackageByPackageId(db, packageId) {
   return dbApi
     .dbGet(
       db,
@@ -159,7 +159,7 @@ function getPackageByPackageId(db, packageId) {
  * @param {*} path
  * @returns Promise resolving with a CRC or null.
  */
-function getPathCrc(db, path) {
+async function getPathCrc(db, path) {
   return dbApi.dbGet(db, 'SELECT CRC FROM PACKAGE WHERE PATH = ?', [path]).then(
     (row) =>
       new Promise((resolve, reject) => {
@@ -180,7 +180,7 @@ function getPathCrc(db, path) {
  * @param {*} version
  * @returns A promise of an updated version.
  */
-function updateVersion(db, packageId, version) {
+async function updateVersion(db, packageId, version) {
   return dbApi.dbUpdate(
     db,
     'UPDATE PACKAGE SET VERSION = ? WHERE PACKAGE_ID = ?',
@@ -196,7 +196,14 @@ function updateVersion(db, packageId, version) {
  * @param {*} crc CRC of the file.
  * @returns Promise of an insertion.
  */
-function insertPathCrc(db, path, crc, type, parentId = null, version = null) {
+async function insertPathCrc(
+  db,
+  path,
+  crc,
+  type,
+  parentId = null,
+  version = null
+) {
   return dbApi.dbInsert(
     db,
     'INSERT INTO PACKAGE ( PATH, CRC, TYPE, PARENT_PACKAGE_REF, VERSION ) VALUES (?, ?, ?, ?, ?)',
@@ -213,7 +220,7 @@ function insertPathCrc(db, path, crc, type, parentId = null, version = null) {
  * @param {*} [parentId=null]
  * @returns Promise of an insert or update.
  */
-function registerTopLevelPackage(db, path, crc, type, version = null) {
+async function registerTopLevelPackage(db, path, crc, type, version = null) {
   return getPackageByPathAndType(db, path, type).then((row) => {
     if (row == null) {
       return dbApi.dbInsert(
@@ -236,7 +243,7 @@ function registerTopLevelPackage(db, path, crc, type, version = null) {
  * @param {*} crc
  * @returns Promise of an update.
  */
-function updatePathCrc(db, path, crc, parentId) {
+async function updatePathCrc(db, path, crc, parentId) {
   return dbApi.dbUpdate(
     db,
     'UPDATE PACKAGE SET CRC = ? WHERE PATH = ? AND PARENT_PACKAGE_REF = ?',
@@ -252,7 +259,12 @@ function updatePathCrc(db, path, crc, parentId) {
  * @param {*} packageId
  * @returns Promise of an insert.
  */
-function insertSessionPackage(db, sessionId, packageId, required = false) {
+async function insertSessionPackage(
+  db,
+  sessionId,
+  packageId,
+  required = false
+) {
   return dbApi.dbInsert(
     db,
     'INSERT OR REPLACE INTO SESSION_PACKAGE (SESSION_REF, PACKAGE_REF, REQUIRED) VALUES (?,?, ?)',
@@ -265,7 +277,7 @@ function insertSessionPackage(db, sessionId, packageId, required = false) {
  * @param {*} sessionId
  * @param {*} packageType
  */
-function deleteSessionPackage(db, sessionId, packageId) {
+async function deleteSessionPackage(db, sessionId, packageId) {
   return dbApi.dbRemove(
     db,
     `DELETE FROM SESSION_PACKAGE WHERE SESSION_REF = ? AND PACKAGE_REF = ?`,
@@ -281,7 +293,7 @@ function deleteSessionPackage(db, sessionId, packageId) {
  * @param {*} packageType
  * @returns Promise that resolves into array of retrieve packages.
  */
-function getSessionPackagesByType(db, sessionId, packageType) {
+async function getSessionPackagesByType(db, sessionId, packageType) {
   return dbApi
     .dbAll(
       db,
@@ -309,7 +321,7 @@ WHERE SESSION_PACKAGE.SESSION_REF = ?
  * @param {*} sessionId
  * @returns Promise that resolves into array of retrieve packages.
  */
-function getSessionGenTemplates(db, sessionId) {
+async function getSessionGenTemplates(db, sessionId) {
   return dbApi
     .dbAll(
       db,
@@ -346,7 +358,7 @@ function getSessionGenTemplates(db, sessionId) {
  * @param {*} db
  * @param {*} sessionId
  */
-function getSessionZclPackages(db, sessionId) {
+async function getSessionZclPackages(db, sessionId) {
   var inList = `('${dbEnum.packageType.zclProperties}', '${dbEnum.packageType.zclXmlStandalone}')`
   return dbApi
     .dbAll(
@@ -376,7 +388,7 @@ WHERE
  * @param {*} sessionId
  * @returns The promise that resolves into an array of package IDs.
  */
-function getSessionPackages(db, sessionId) {
+async function getSessionPackages(db, sessionId) {
   return dbApi
     .dbAll(
       db,
@@ -392,7 +404,7 @@ function getSessionPackages(db, sessionId) {
  * @param {*} packageId
  * @param {*} sessionId
  */
-function getPackageSessionPackagePairBySessionId(db, sessionId) {
+async function getPackageSessionPackagePairBySessionId(db, sessionId) {
   return dbApi
     .dbAll(
       db,
@@ -425,14 +437,14 @@ function getPackageSessionPackagePairBySessionId(db, sessionId) {
 }
 
 /**
- * This function inserts an option and its values into the DB.
+ * This async function inserts an option and its values into the DB.
  *
  * @param {*} db
  * @param {*} packageId - Package Reference
  * @param {*} optionCategory - The name of the option.
  * @param {*} optionCodeLabels - The array of values associated with this option.
  */
-function insertOptionsKeyValues(
+async function insertOptionsKeyValues(
   db,
   packageId,
   optionCategory,
@@ -454,13 +466,13 @@ function insertOptionsKeyValues(
 }
 
 /**
- * This function returns all options associated with a specific category.
+ * This async function returns all options associated with a specific category.
  * @param {*} db
  * @param {*} packageId
  * @param {*} optionCategory
  * @returns promise to return option that matches arguments.
  */
-function selectAllOptionsValues(db, packageId, optionCategory) {
+async function selectAllOptionsValues(db, packageId, optionCategory) {
   return dbApi
     .dbAll(
       db,
@@ -472,14 +484,19 @@ function selectAllOptionsValues(db, packageId, optionCategory) {
 
 /**
  *
- * This function returns option associated with a specific category and code.
+ * This async function returns option associated with a specific category and code.
  * @param {*} db
  * @param {*} packageId
  * @param {*} optionCategory
  * @param {*} optionCode
  * @returns promise to return option that matches arguments.
  */
-function selectSpecificOptionValue(db, packageId, optionCategory, optionCode) {
+async function selectSpecificOptionValue(
+  db,
+  packageId,
+  optionCategory,
+  optionCode
+) {
   return dbApi
     .dbGet(
       db,
@@ -490,11 +507,11 @@ function selectSpecificOptionValue(db, packageId, optionCategory, optionCode) {
 }
 
 /**
- * This function returns a specific option value given an option reference.
+ * This async function returns a specific option value given an option reference.
  * @param {*} db
  * @param {*} optionDefaultId
  */
-function selectOptionValueByOptionDefaultId(db, optionDefaultId) {
+async function selectOptionValueByOptionDefaultId(db, optionDefaultId) {
   return dbApi
     .dbGet(
       db,
@@ -513,7 +530,12 @@ function selectOptionValueByOptionDefaultId(db, optionDefaultId) {
  * @param {*} optionRef
  * @returns promise to insert option value
  */
-function insertDefaultOptionValue(db, packageId, optionCategory, optionRef) {
+async function insertDefaultOptionValue(
+  db,
+  packageId,
+  optionCategory,
+  optionRef
+) {
   return dbApi.dbInsert(
     db,
     'INSERT INTO PACKAGE_OPTION_DEFAULT ( PACKAGE_REF, OPTION_CATEGORY, OPTION_REF) VALUES (?, ?, ?) ON CONFLICT DO NOTHING',
@@ -526,7 +548,7 @@ function insertDefaultOptionValue(db, packageId, optionCategory, optionRef) {
  * @param {*} db
  * @param {*} packageId
  */
-function selectAllDefaultOptions(db, packageId) {
+async function selectAllDefaultOptions(db, packageId) {
   return dbApi
     .dbAll(
       db,
@@ -544,7 +566,11 @@ function selectAllDefaultOptions(db, packageId) {
  * @param {*} defaultArray Array containing objects with 'entityCode', 'parentCode', 'value'
  * @returns Promise of insertion for defaults.
  */
-function insertPackageExtensionDefault(db, packageExtensionId, defaultArray) {
+async function insertPackageExtensionDefault(
+  db,
+  packageExtensionId,
+  defaultArray
+) {
   return dbApi.dbMultiInsert(
     db,
     `
@@ -568,7 +594,7 @@ ON CONFLICT DO NOTHING
  * @param propertyArray. Array of objects that contain property, type, configurability, label, globalDefault
  * @param defaultsArrayOfArrays For each item in propertyArray, it contains array of default rows, or null.
  */
-function insertPackageExtension(
+async function insertPackageExtension(
   db,
   packageId,
   entity,
@@ -622,7 +648,7 @@ ON CONFLICT DO NOTHING`,
  * @param {*} entity
  * @returns promise that resolve into an array of packageExtensions for a given entity
  */
-function selectPackageExtension(db, packageId, entity) {
+async function selectPackageExtension(db, packageId, entity) {
   var acc = []
   return dbApi
     .dbAll(

src-electron/db/query-session.js

@@ -29,7 +29,7 @@ const dbApi = require('./db-api.js')
  * @param {*} db
  * @returns A promise of executing a query.
  */
-function getAllSessions(db) {
+async function getAllSessions(db) {
   return dbApi
     .dbAll(db, 'SELECT SESSION_ID, SESSION_KEY, CREATION_TIME FROM SESSION', [])
     .then((rows) => {
@@ -56,7 +56,7 @@ function getAllSessions(db) {
  * @param {*} sessionId
  * @returns A promise that resolves with the number of rows updated.
  */
-function setSessionClean(db, sessionId) {
+async function setSessionClean(db, sessionId) {
   return dbApi.dbUpdate(
     db,
     'UPDATE SESSION SET DIRTY = ? WHERE SESSION_ID = ?',
@@ -71,7 +71,7 @@ function setSessionClean(db, sessionId) {
  * @param {*} sessionId
  * @returns A promise that resolves into true or false, reflecting session dirty state.
  */
-function getSessionDirtyFlag(db, sessionId) {
+async function getSessionDirtyFlag(db, sessionId) {
   return dbApi
     .dbGet(db, 'SELECT DIRTY FROM SESSION WHERE SESSION_ID = ?', [sessionId])
     .then((row) => {
@@ -91,7 +91,7 @@ function getSessionDirtyFlag(db, sessionId) {
  * @param {*} windowId
  * @param {*} fn
  */
-function getSessionDirtyFlagWithCallback(db, sessionKey, fn) {
+async function getSessionDirtyFlagWithCallback(db, sessionKey, fn) {
   db.get(
     'SELECT DIRTY FROM SESSION WHERE SESSION_KEY = ?',
     [sessionKey],
@@ -117,7 +117,7 @@ function getSessionDirtyFlagWithCallback(db, sessionKey, fn) {
  * @param {*} sessionKey
  * @returns A promise that resolves into an object containing sessionId, sessionKey and creationTime.
  */
-function getSessionInfoFromSessionKey(db, sessionKey) {
+async function getSessionInfoFromSessionKey(db, sessionKey) {
   return dbApi
     .dbGet(
       db,
@@ -155,7 +155,7 @@ function getSessionInfoFromSessionKey(db, sessionKey) {
  * @param {*} sessionId If sessionId exists already, then it's passed in. If it doesn't then this is null.
  * @returns promise that resolves into a session id.
  */
-function ensureZapSessionId(db, sessionKey, sessionId = null) {
+async function ensureZapSessionId(db, sessionKey, sessionId = null) {
   if (sessionId == null) {
     // There is no sessionId from before, so we check if there is one mapped to sessionKey already
     return dbApi
@@ -190,7 +190,7 @@ function ensureZapSessionId(db, sessionKey, sessionId = null) {
  * @export
  * @param {*} db
  */
-function createBlankSession(db) {
+async function createBlankSession(db) {
   return dbApi.dbInsert(
     db,
     'INSERT INTO SESSION (SESSION_KEY, CREATION_TIME, DIRTY) VALUES (?,?,?)',
@@ -206,7 +206,7 @@ function createBlankSession(db) {
  * @param {*} sessionId
  * @returns A promise of a removal of session.
  */
-function deleteSession(db, sessionId) {
+async function deleteSession(db, sessionId) {
   return dbApi.dbRemove(db, 'DELETE FROM SESSION WHERE SESSION_ID = ?', [
     sessionId,
   ])

src-electron/importexport/export.js

@@ -158,7 +158,7 @@ function exportSessionPackages(db, sessionId, zapFileLocation) {
  * @param {*} filePath
  * @returns A promise that resolves with the path of the file written.
  */
-function exportDataIntoFile(db, sessionId, filePath) {
+async function exportDataIntoFile(db, sessionId, filePath) {
   env.logInfo(`Writing state from session ${sessionId} into file ${filePath}`)
   return createStateFromDatabase(db, sessionId)
     .then((state) => {
@@ -172,12 +172,8 @@ function exportDataIntoFile(db, sessionId, filePath) {
         })
       })
     })
-    .then(() => {
-      return querySession.setSessionClean(db, sessionId)
-    })
-    .then(() => {
-      return Promise.resolve(filePath)
-    })
+    .then(() => querySession.setSessionClean(db, sessionId))
+    .then(() => filePath)
 }
 
 /**