more async, dependencies

database/addUser.d.ts

@@ -1,2 +1,2 @@
-import sqlite from 'better-sqlite3';
+import type sqlite from 'better-sqlite3';
 export declare function addUser(user: EmileUser, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): Promise<boolean>;

database/addUser.js

@@ -1,7 +1,6 @@
-import sqlite from 'better-sqlite3';
-import { databasePath } from '../helpers/functions.database.js';
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js';
 export async function addUser(user, sessionUser, connectedEmileDB) {
-    const emileDB = connectedEmileDB ?? sqlite(databasePath);
+    const emileDB = connectedEmileDB ?? (await getConnectionWhenAvailable());
     const rightNowMillis = Date.now();
     const recordDeleteTimeMillis = emileDB
         .prepare('select recordDelete_timeMillis from Users where userName = ?')

database/addUser.ts

@@ -1,13 +1,13 @@
-import sqlite from 'better-sqlite3'
+import type sqlite from 'better-sqlite3'
 
-import { databasePath } from '../helpers/functions.database.js'
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js'
 
 export async function addUser(
   user: EmileUser,
   sessionUser: EmileUser,
   connectedEmileDB?: sqlite.Database
 ): Promise<boolean> {
-  const emileDB = connectedEmileDB ?? sqlite(databasePath)
+  const emileDB = connectedEmileDB ?? (await getConnectionWhenAvailable())
 
   const rightNowMillis = Date.now()
 

database/getAssetCategories.d.ts

@@ -1,2 +1,2 @@
 import type { AssetCategory } from '../types/recordTypes.js';
-export declare function getAssetCategories(): AssetCategory[];
+export declare function getAssetCategories(): Promise<AssetCategory[]>;

database/getAssetCategories.js

@@ -1,7 +1,6 @@
-import sqlite from 'better-sqlite3';
-import { databasePath } from '../helpers/functions.database.js';
-export function getAssetCategories() {
-    const emileDB = sqlite(databasePath);
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js';
+export async function getAssetCategories() {
+    const emileDB = await getConnectionWhenAvailable();
     const assetCategories = emileDB
         .prepare(`select categoryId, category, fontAwesomeIconClasses, orderNumber
         from AssetCategories

database/getAssetCategories.ts

@@ -1,10 +1,8 @@
-import sqlite from 'better-sqlite3'
-
-import { databasePath } from '../helpers/functions.database.js'
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js'
 import type { AssetCategory } from '../types/recordTypes.js'
 
-export function getAssetCategories(): AssetCategory[] {
-  const emileDB = sqlite(databasePath)
+export async function getAssetCategories(): Promise<AssetCategory[]> {
+  const emileDB = await getConnectionWhenAvailable()
 
   const assetCategories = emileDB
     .prepare(

database/getEnergyData.d.ts

@@ -1,4 +1,4 @@
-import sqlite from 'better-sqlite3';
+import type sqlite from 'better-sqlite3';
 import type { EnergyData } from '../types/recordTypes.js';
 interface GetEnergyDataFilters {
     assetId?: number | string;

database/getEnergyData.js

@@ -1,7 +1,6 @@
 import { powerOfTenMultipliers } from '@cityssm/green-button-parser/lookups.js';
 import { dateStringToDate } from '@cityssm/utils-datetime';
-import sqlite from 'better-sqlite3';
-import { databasePath, getConnectionWhenAvailable, getTempTableName } from '../helpers/functions.database.js';
+import { getConnectionWhenAvailable, getTempTableName } from '../helpers/functions.database.js';
 import { ensureEnergyDataTablesExists } from './manageEnergyDataTables.js';
 export function userFunction_getPowerOfTenMultiplierName(powerOfTenMultiplier) {
     if (powerOfTenMultiplier === 0) {
@@ -160,10 +159,7 @@ export async function getEnergyData(filters, options) {
     return data;
 }
 export async function getEnergyDataPoint(filters, connectedEmileDB) {
-    const emileDB = connectedEmileDB ??
-        sqlite(databasePath, {
-            readonly: true
-        });
+    const emileDB = connectedEmileDB ?? (await getConnectionWhenAvailable(true));
     const tableNames = await ensureEnergyDataTablesExists(filters.assetId, emileDB);
     const dataPoint = emileDB
         .prepare(`select dataId, assetId, dataTypeId, fileId,

database/getEnergyData.ts

@@ -6,10 +6,9 @@
 
 import { powerOfTenMultipliers } from '@cityssm/green-button-parser/lookups.js'
 import { dateStringToDate } from '@cityssm/utils-datetime'
-import sqlite from 'better-sqlite3'
+import type sqlite from 'better-sqlite3'
 
 import {
-  databasePath,
   getConnectionWhenAvailable,
   getTempTableName
 } from '../helpers/functions.database.js'
@@ -252,11 +251,7 @@ export async function getEnergyDataPoint(
   },
   connectedEmileDB?: sqlite.Database
 ): Promise<EnergyData | undefined> {
-  const emileDB =
-    connectedEmileDB ??
-    sqlite(databasePath, {
-      readonly: true
-    })
+  const emileDB = connectedEmileDB ?? (await getConnectionWhenAvailable(true))
 
   const tableNames = await ensureEnergyDataTablesExists(
     filters.assetId,

database/getEnergyDataType.d.ts

@@ -1,6 +1,6 @@
-import sqlite from 'better-sqlite3';
+import type sqlite from 'better-sqlite3';
 import type { EnergyDataType } from '../types/recordTypes.js';
-export declare function getEnergyDataType(dataTypeId: number | string, connectedEmileDB?: sqlite.Database): EnergyDataType | undefined;
+export declare function getEnergyDataType(dataTypeId: number | string, connectedEmileDB?: sqlite.Database): Promise<EnergyDataType | undefined>;
 interface EnergyDataTypeGreenButtonIds {
     serviceCategoryId: string;
     unitId: string;

database/getEnergyDataType.js

@@ -1,19 +1,15 @@
 import { lookups as greenButtonLookups } from '@cityssm/green-button-parser';
-import sqlite from 'better-sqlite3';
 import NodeCache from 'node-cache';
-import { databasePath, getConnectionWhenAvailable } from '../helpers/functions.database.js';
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js';
 import { addEnergyDataType } from './addEnergyDataType.js';
 import { addEnergyUnit } from './addEnergyUnit.js';
 import { getEnergyAccumulationBehaviour } from './getEnergyAccumulationBehaviour.js';
 import { getEnergyCommodity } from './getEnergyCommodity.js';
 import { getEnergyReadingType } from './getEnergyReadingType.js';
 import { getEnergyServiceCategory } from './getEnergyServiceCategory.js';
 import { getEnergyUnit } from './getEnergyUnit.js';
-export function getEnergyDataType(dataTypeId, connectedEmileDB) {
-    const emileDB = connectedEmileDB ??
-        sqlite(databasePath, {
-            readonly: true
-        });
+export async function getEnergyDataType(dataTypeId, connectedEmileDB) {
+    const emileDB = connectedEmileDB ?? (await getConnectionWhenAvailable(true));
     const energyDataType = emileDB
         .prepare(`select t.dataTypeId,
           t.serviceCategoryId, s.serviceCategory,
@@ -181,7 +177,7 @@ export async function getEnergyDataTypeByGreenButtonIds(greenButtonIds, sessionU
                 commodityId: relatedIds.commodityId,
                 accumulationBehaviourId: relatedIds.accumulationBehaviourId
             }, sessionUser, emileDB);
-            energyDataType = getEnergyDataType(dataTypeId, emileDB);
+            energyDataType = await getEnergyDataType(dataTypeId, emileDB);
         }
         catch {
             return undefined;
@@ -256,7 +252,7 @@ export async function getEnergyDataTypeByNames(names, sessionUser, createIfUnava
                 commodityId: relatedIds.commodityId,
                 accumulationBehaviourId: relatedIds.accumulationBehaviourId
             }, sessionUser, emileDB);
-            energyDataType = getEnergyDataType(dataTypeId, emileDB);
+            energyDataType = await getEnergyDataType(dataTypeId, emileDB);
         }
         catch {
             return undefined;

database/getEnergyDataType.ts

@@ -2,13 +2,10 @@
 /* eslint-disable @typescript-eslint/indent */
 
 import { lookups as greenButtonLookups } from '@cityssm/green-button-parser'
-import sqlite from 'better-sqlite3'
+import type sqlite from 'better-sqlite3'
 import NodeCache from 'node-cache'
 
-import {
-  databasePath,
-  getConnectionWhenAvailable
-} from '../helpers/functions.database.js'
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js'
 import type { EnergyDataType } from '../types/recordTypes.js'
 
 import { addEnergyDataType } from './addEnergyDataType.js'
@@ -19,15 +16,11 @@ import { getEnergyReadingType } from './getEnergyReadingType.js'
 import { getEnergyServiceCategory } from './getEnergyServiceCategory.js'
 import { getEnergyUnit } from './getEnergyUnit.js'
 
-export function getEnergyDataType(
+export async function getEnergyDataType(
   dataTypeId: number | string,
   connectedEmileDB?: sqlite.Database
-): EnergyDataType | undefined {
-  const emileDB =
-    connectedEmileDB ??
-    sqlite(databasePath, {
-      readonly: true
-    })
+): Promise<EnergyDataType | undefined> {
+  const emileDB = connectedEmileDB ?? (await getConnectionWhenAvailable(true))
 
   const energyDataType = emileDB
     .prepare(
@@ -370,7 +363,7 @@ export async function getEnergyDataTypeByGreenButtonIds(
         emileDB
       )
 
-      energyDataType = getEnergyDataType(dataTypeId, emileDB)
+      energyDataType = await getEnergyDataType(dataTypeId, emileDB)
     } catch {
       return undefined
     } finally {
@@ -471,7 +464,7 @@ export async function getEnergyDataTypeByNames(
         emileDB
       )
 
-      energyDataType = getEnergyDataType(dataTypeId, emileDB)
+      energyDataType = await getEnergyDataType(dataTypeId, emileDB)
     } catch {
       return undefined
     } finally {

database/initializeDatabase.d.ts

@@ -1,3 +1,3 @@
-import sqlite from 'better-sqlite3';
+import type sqlite from 'better-sqlite3';
 export declare const recordColumns = " recordCreate_userName varchar(30) not null,\n    recordCreate_timeMillis integer not null,\n    recordUpdate_userName varchar(30) not null,\n    recordUpdate_timeMillis integer not null,\n    recordDelete_userName varchar(30),\n    recordDelete_timeMillis integer";
 export declare function initializeDatabase(connectedEmileDB?: sqlite.Database): Promise<void>;

database/initializeDatabase.js

@@ -1,7 +1,6 @@
 import { lookups as greenButtonLookups } from '@cityssm/green-button-parser';
-import sqlite from 'better-sqlite3';
 import Debug from 'debug';
-import { databasePath } from '../helpers/functions.database.js';
+import { databasePath, getConnectionWhenAvailable } from '../helpers/functions.database.js';
 import { addAssetAliasType } from './addAssetAliasType.js';
 import { addAssetCategory } from './addAssetCategory.js';
 import { addEnergyAccumulationBehaviour } from './addEnergyAccumulationBehaviour.js';
@@ -220,7 +219,7 @@ async function initializeAssetAliasTypes(emileDB) {
     }
 }
 export async function initializeDatabase(connectedEmileDB) {
-    const emileDB = connectedEmileDB ?? sqlite(databasePath);
+    const emileDB = connectedEmileDB ?? await getConnectionWhenAvailable();
     const row = emileDB
         .prepare(`select name from sqlite_master
         where type = 'table'

database/initializeDatabase.ts

@@ -1,8 +1,8 @@
 import { lookups as greenButtonLookups } from '@cityssm/green-button-parser'
-import sqlite from 'better-sqlite3'
+import type sqlite from 'better-sqlite3'
 import Debug from 'debug'
 
-import { databasePath } from '../helpers/functions.database.js'
+import { databasePath, getConnectionWhenAvailable } from '../helpers/functions.database.js'
 
 import { addAssetAliasType } from './addAssetAliasType.js'
 import { addAssetCategory } from './addAssetCategory.js'
@@ -358,7 +358,7 @@ async function initializeAssetAliasTypes(
 export async function initializeDatabase(
   connectedEmileDB?: sqlite.Database
 ): Promise<void> {
-  const emileDB = connectedEmileDB ?? sqlite(databasePath)
+  const emileDB = connectedEmileDB ?? await getConnectionWhenAvailable()
 
   const row = emileDB
     .prepare(

database/moveRecord.js

@@ -1,16 +1,15 @@
-import sqlite from 'better-sqlite3';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { databasePath, getConnectionWhenAvailable } from '../helpers/functions.database.js';
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js';
 import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
 const recordIdColumns = new Map();
 recordIdColumns.set('AssetCategories', 'categoryId');
 function getCurrentOrderNumber(recordTable, recordId, database) {
-    const currentOrderNumber = database
+    return database
         .prepare(`select orderNumber
-          from ${recordTable}
-          where ${recordIdColumns.get(recordTable)} = ?`)
-        .get(recordId).orderNumber;
-    return currentOrderNumber;
+        from ${recordTable}
+        where ${recordIdColumns.get(recordTable)} = ?`)
+        .pluck()
+        .get(recordId);
 }
 export async function moveRecordDown(recordTable, recordId) {
     const emileDB = await getConnectionWhenAvailable();
@@ -48,7 +47,7 @@ export async function moveRecordDownToBottom(recordTable, recordId) {
     return true;
 }
 export async function moveRecordUp(recordTable, recordId) {
-    const emileDB = sqlite(databasePath);
+    const emileDB = await getConnectionWhenAvailable();
     const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, emileDB);
     if (currentOrderNumber <= 0) {
         emileDB.close();

database/moveRecord.ts

@@ -1,10 +1,7 @@
-import sqlite from 'better-sqlite3'
+import type sqlite from 'better-sqlite3'
 
 import { clearCacheByTableName } from '../helpers/functions.cache.js'
-import {
-  databasePath,
-  getConnectionWhenAvailable
-} from '../helpers/functions.database.js'
+import { getConnectionWhenAvailable } from '../helpers/functions.database.js'
 
 import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
 
@@ -18,17 +15,14 @@ function getCurrentOrderNumber(
   recordId: number | string,
   database: sqlite.Database
 ): number {
-  const currentOrderNumber: number = (
-    database
-      .prepare(
-        `select orderNumber
-          from ${recordTable}
-          where ${recordIdColumns.get(recordTable) as string} = ?`
-      )
-      .get(recordId) as { orderNumber: number }
-  ).orderNumber
-
-  return currentOrderNumber
+  return database
+    .prepare(
+      `select orderNumber
+        from ${recordTable}
+        where ${recordIdColumns.get(recordTable) as string} = ?`
+    )
+    .pluck()
+    .get(recordId) as number
 }
 
 export async function moveRecordDown(
@@ -112,7 +106,7 @@ export async function moveRecordUp(
   recordTable: RecordTable,
   recordId: number
 ): Promise<boolean> {
-  const emileDB = sqlite(databasePath)
+  const emileDB = await getConnectionWhenAvailable()
 
   const currentOrderNumber = getCurrentOrderNumber(
     recordTable,

database/updateAsset.d.ts

@@ -1,5 +1,5 @@
-import sqlite from 'better-sqlite3';
+import type sqlite from 'better-sqlite3';
 import type { Asset } from '../types/recordTypes.js';
-export declare function updateAsset(asset: Asset, sessionUser: EmileUser): boolean;
+export declare function updateAsset(asset: Asset, sessionUser: EmileUser): Promise<boolean>;
 export declare function updateAssetTimeSeconds(assetId: number | string, connectedEmileDB?: sqlite.Database): Promise<boolean>;
 export declare function updateAllAssetTimeSeconds(): Promise<void>;

database/updateAsset.js

@@ -1,10 +1,9 @@
-import sqlite from 'better-sqlite3';
-import { databasePath, getConnectionWhenAvailable, getTempTableName, queryMaxRetryCount } from '../helpers/functions.database.js';
+import { getConnectionWhenAvailable, getTempTableName, queryMaxRetryCount } from '../helpers/functions.database.js';
 import { delay } from '../helpers/functions.utilities.js';
 import { getAssets } from './getAssets.js';
 import { ensureEnergyDataTablesExists } from './manageEnergyDataTables.js';
-export function updateAsset(asset, sessionUser) {
-    const emileDB = sqlite(databasePath);
+export async function updateAsset(asset, sessionUser) {
+    const emileDB = await getConnectionWhenAvailable();
     const result = emileDB
         .prepare(`update Assets
         set assetName = ?,

database/updateAsset.ts

@@ -1,10 +1,9 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 /* eslint-disable @typescript-eslint/indent */
 
-import sqlite from 'better-sqlite3'
+import type sqlite from 'better-sqlite3'
 
 import {
-  databasePath,
   getConnectionWhenAvailable,
   getTempTableName,
   queryMaxRetryCount
@@ -15,8 +14,11 @@ import type { Asset } from '../types/recordTypes.js'
 import { getAssets } from './getAssets.js'
 import { ensureEnergyDataTablesExists } from './manageEnergyDataTables.js'
 
-export function updateAsset(asset: Asset, sessionUser: EmileUser): boolean {
-  const emileDB = sqlite(databasePath)
+export async function updateAsset(
+  asset: Asset,
+  sessionUser: EmileUser
+): Promise<boolean> {
+  const emileDB = await getConnectionWhenAvailable()
 
   const result = emileDB
     .prepare(

database/updateAssetGroup.d.ts

@@ -1,2 +1,2 @@
 import type { AssetGroup } from '../types/recordTypes.js';
-export declare function updateAssetGroup(group: AssetGroup, sessionUser: EmileUser): boolean;
+export declare function updateAssetGroup(group: AssetGroup, sessionUser: EmileUser): Promise<boolean>;