Add some logging and change some imports

packages/cli/src/cli.ts

@@ -57,7 +57,7 @@ async function main() {
     log.info(`Processsed args: ${JSON.stringify(processedArgs, null, 4)}`)
     if (processedArgs.api) {
         await new ReloadingAPI(envPath, config, pair, processedArgs).start().then(() => {
-            log.info('Running API restart process...')
+            log.info('Reloading API started...')
         })
     } else {
         process.exit(0)

packages/cli/src/reloader.ts

@@ -59,6 +59,7 @@ export default class ReloadingAPI {
 
     private async _watchEnv() {
         return fs.watchFile(this._envPath, async () => {
+            log.info('env file change detected')
             if (!this._restarting) {
                 this._restarting = true
                 await this.stop()

packages/cli/src/start.ts

@@ -11,9 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { CombinedApiPaths } from '@prosopo/types'
+import type { CombinedApiPaths } from '@prosopo/types'
 import { ProviderEnvironment } from '@prosopo/env'
-import { Server } from 'node:net'
+import type { Server } from 'node:net'
 import { getDB, getSecret } from './process.env.js'
 import { getPairAsync } from '@prosopo/contract'
 import { i18nMiddleware } from '@prosopo/common'
@@ -25,7 +25,7 @@ import getConfig from './prosopo.config.js'
 import rateLimit from 'express-rate-limit'
 
 function startApi(env: ProviderEnvironment, admin = false): Server {
-    env.logger.info(`Starting Prosopo API`)
+    env.logger.info('Starting Prosopo API')
     const apiApp = express()
     const apiPort = env.config.server.port
 
@@ -55,9 +55,6 @@ export async function start(env?: ProviderEnvironment, admin?: boolean) {
     if (!env) {
         loadEnv()
 
-        // Fail to start api if db is not defined
-        getDB()
-
         const secret = getSecret()
         const config = getConfig(undefined, undefined, undefined, {
             solved: { count: 2 },
@@ -67,6 +64,9 @@ export async function start(env?: ProviderEnvironment, admin?: boolean) {
         const pair = await getPairAsync(config.networks[config.defaultNetwork], secret, '')
         env = new ProviderEnvironment(config, pair)
     }
+    // Fail to start api if db env var is not defined
+    getDB()
+
     await env.isReady()
 
     // Start the scheduled job

packages/env/src/env.ts

@@ -116,9 +116,9 @@ export class Environment implements ProsopoEnvironment {
                 })
             }
             if (this.db && this.db.connection?.readyState !== 1) {
-                this.logger.warn(`Database connection is not ready, reconnecting...`)
+                this.logger.warn('Database connection is not ready, reconnecting...')
                 await this.db.connect()
-                this.logger.info(`Connected to db`)
+                this.logger.info('Connected to db')
             }
         } catch (err) {
             throw new ProsopoEnvError('GENERAL.ENVIRONMENT_NOT_READY', { context: { error: err }, logger: this.logger })

packages/provider/src/tasks/powCaptcha/powTasks.ts

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { u8aToHex } from '@polkadot/util'
-import { PoWCaptcha } from '@prosopo/types'
-import { Database } from '@prosopo/types-database'
+import type { PoWCaptcha } from '@prosopo/types'
+import type { Database } from '@prosopo/types-database'
 import { ProsopoEnvError } from '@prosopo/common'
 import { stringToHex } from '@polkadot/util'
-import { KeyringPair } from '@polkadot/keyring/types'
+import type { KeyringPair } from '@polkadot/keyring/types'
 import { checkRecentPowSolution, checkPowSignature, checkPowSolution } from './powTasksUtils.js'
 
 export class PowCaptchaManager {

packages/provider/src/tasks/tasks.ts

@@ -35,7 +35,7 @@ export class Tasks {
 
     constructor(env: ProviderEnvironment) {
         this.config = env.config
-        this.db = env.db as Database
+        this.db = env.getDb()
         this.captchaConfig = env.config.captchas
         this.logger = getLogger(env.config.logLevel, 'Tasks')
         if (!env.pair) {

packages/types-env/src/env.ts

@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { ApiPromise } from '@polkadot/api/promise/Api'
-import { AssetsResolver, EnvironmentTypes, NetworkNames } from '@prosopo/types'
-import { Database } from '@prosopo/types-database'
-import { Keyring } from '@polkadot/keyring'
-import { KeyringPair } from '@polkadot/keyring/types'
-import { Logger } from '@prosopo/common'
-import { ProsopoBasicConfigOutput } from '@prosopo/types'
+import type { AssetsResolver, EnvironmentTypes, NetworkNames } from '@prosopo/types'
+import type { Database } from '@prosopo/types-database'
+import type { Keyring } from '@polkadot/keyring'
+import type { KeyringPair } from '@polkadot/keyring/types'
+import type { Logger } from '@prosopo/common'
+import type { ProsopoBasicConfigOutput } from '@prosopo/types'
 
 export interface ProsopoEnvironment {
     config: ProsopoBasicConfigOutput
@@ -30,6 +29,7 @@ export interface ProsopoEnvironment {
     assetsResolver: AssetsResolver | undefined
     keyring: Keyring
     pair: KeyringPair | undefined
+    getDb(): Database
     isReady(): Promise<void>
     importDatabase(): Promise<void>
 }