@fluidware-it/mysql2-client 0.4.0 → 0.5.0

package/build/esm/dbClient.d.ts

@@ -8,7 +8,7 @@ interface ConnectionWrap extends Connection {
 }
 export declare class DbClient {
     private connection?;
-    private connectionOptions;
+    private readonly connectionOptions;
     constructor(connectionOptionsOrPrefix?: ConnectionOptions | string);
     open(): Promise<void>;
     getConnection(): ConnectionWrap | undefined;
@@ -17,9 +17,9 @@ export declare class DbClient {
     commit(closeTransaction?: boolean): Promise<void>;
     rollback(closeTransaction?: boolean): Promise<void>;
     all(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket[]>;
-    get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket>;
+    get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket | null>;
     insert(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
-    update(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
+    update(sql: string, phs?: (string | number | boolean | null)[], returnChangedRows?: boolean): Promise<number>;
     delete(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
     run(sql: string, phs?: (string | number | boolean | null)[]): Promise<[import("mysql2/typings/mysql/lib/protocol/packets/OkPacket").OkPacket | RowDataPacket[] | ProcedureCallPacket | ResultSetHeader[] | RowDataPacket[][] | import("mysql2/typings/mysql/lib/protocol/packets/OkPacket").OkPacket[], FieldPacket[]]>;
 }

package/build/esm/dbClient.js

@@ -228,8 +228,10 @@ var DbClient = /** @class */ (function () {
                     case 1:
                         res = _a.sent();
                         if (res.rows.length > 1)
-                            throw new Error('get returned more than one row');
-                        return [2 /*return*/, res.rows[0]];
+                            throw new Error('get() returned more than one row');
+                        if (res.rows.length === 1)
+                            return [2 /*return*/, res.rows[0]];
+                        return [2 /*return*/, null];
                 }
             });
         });
@@ -251,7 +253,8 @@ var DbClient = /** @class */ (function () {
             });
         });
     };
-    DbClient.prototype.update = function (sql, phs) {
+    DbClient.prototype.update = function (sql, phs, returnChangedRows) {
+        if (returnChangedRows === void 0) { returnChangedRows = false; }
         return __awaiter(this, void 0, void 0, function () {
             var res;
             return __generator(this, function (_a) {
@@ -263,7 +266,7 @@ var DbClient = /** @class */ (function () {
                         return [4 /*yield*/, this.connection.run(sql, phs)];
                     case 1:
                         res = _a.sent();
-                        return [2 /*return*/, res.rows.affectedRows];
+                        return [2 /*return*/, returnChangedRows ? res.rows.changedRows : res.rows.affectedRows];
                 }
             });
         });

package/build/esm/dbClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/dbClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  createConnection,\n  Connection,\n  RowDataPacket,\n  ResultSetHeader,\n  ProcedureCallPacket,\n  FieldPacket\n} from 'mysql2/promise';\nimport { getMysqlConnectionOptions, USE_READ_COMMITTED_ISOLATION } from './config';\nimport { ConnectionOptions } from 'mysql2';\n\ninterface ConnectionWrap extends Connection {\n  run<T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket>(\n    sql: string,\n    phs?: (string | number | boolean | null)[]\n  ): Promise<{\n    rows: T;\n    cols: FieldPacket[];\n  }>;\n}\n\nexport class DbClient {\n  private connection?: ConnectionWrap;\n  private connectionOptions: ConnectionOptions;\n\n  constructor(connectionOptionsOrPrefix?: ConnectionOptions | string) {\n    if (connectionOptionsOrPrefix) {\n      if (typeof connectionOptionsOrPrefix === 'string') {\n        this.connectionOptions = getMysqlConnectionOptions(connectionOptionsOrPrefix);\n      } else {\n        this.connectionOptions = connectionOptionsOrPrefix;\n      }\n    } else {\n      this.connectionOptions = getMysqlConnectionOptions('');\n    }\n  }\n\n  async open() {\n    this.connection = (await createConnection(this.connectionOptions)) as ConnectionWrap;\n    this.connection.run = async <\n      T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket\n    >(\n      sql: string,\n      phs?: (string | number | boolean | null)[]\n    ): Promise<{ rows: T; cols: FieldPacket[] }> => {\n      if (!this.connection) {\n        throw new Error('run() called but no connection available');\n      }\n      const [rows, cols] = await this.connection.execute<T>(sql, phs);\n      return {\n        rows,\n        cols\n      };\n    };\n  }\n\n  getConnection(): ConnectionWrap | undefined {\n    return this.connection;\n  }\n\n  async close() {\n    if (this.connection) {\n      await this.connection.end();\n    }\n  }\n\n  async startTransaction() {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    if (USE_READ_COMMITTED_ISOLATION) {\n      await this.connection.execute(\"SET SESSION tx_isolation='read-committed'\");\n    }\n    await this.connection.execute('SET AUTOCOMMIT=0');\n  }\n\n  async commit(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    await this.connection.execute('COMMIT');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async rollback(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n\n    await this.connection.execute('ROLLBACK');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async all(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    return res.rows;\n  }\n\n  async get(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    if (res.rows.length > 1) throw new Error('get returned more than one row');\n    return res.rows[0];\n  }\n\n  async insert(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.insertId || res.rows.affectedRows;\n  }\n\n  async update(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async delete(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async run(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    return this.connection.execute(sql, phs);\n  }\n}\n"]}
+{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/dbClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  createConnection,\n  Connection,\n  RowDataPacket,\n  ResultSetHeader,\n  ProcedureCallPacket,\n  FieldPacket\n} from 'mysql2/promise';\nimport { getMysqlConnectionOptions, USE_READ_COMMITTED_ISOLATION } from './config';\nimport { ConnectionOptions } from 'mysql2';\n\ninterface ConnectionWrap extends Connection {\n  run<T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket>(\n    sql: string,\n    phs?: (string | number | boolean | null)[]\n  ): Promise<{\n    rows: T;\n    cols: FieldPacket[];\n  }>;\n}\n\nexport class DbClient {\n  private connection?: ConnectionWrap;\n  private readonly connectionOptions: ConnectionOptions;\n\n  constructor(connectionOptionsOrPrefix?: ConnectionOptions | string) {\n    if (connectionOptionsOrPrefix) {\n      if (typeof connectionOptionsOrPrefix === 'string') {\n        this.connectionOptions = getMysqlConnectionOptions(connectionOptionsOrPrefix);\n      } else {\n        this.connectionOptions = connectionOptionsOrPrefix;\n      }\n    } else {\n      this.connectionOptions = getMysqlConnectionOptions('');\n    }\n  }\n\n  async open() {\n    this.connection = (await createConnection(this.connectionOptions)) as ConnectionWrap;\n    this.connection.run = async <\n      T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket\n    >(\n      sql: string,\n      phs?: (string | number | boolean | null)[]\n    ): Promise<{ rows: T; cols: FieldPacket[] }> => {\n      if (!this.connection) {\n        throw new Error('run() called but no connection available');\n      }\n      const [rows, cols] = await this.connection.execute<T>(sql, phs);\n      return {\n        rows,\n        cols\n      };\n    };\n  }\n\n  getConnection(): ConnectionWrap | undefined {\n    return this.connection;\n  }\n\n  async close() {\n    if (this.connection) {\n      await this.connection.end();\n    }\n  }\n\n  async startTransaction() {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    if (USE_READ_COMMITTED_ISOLATION) {\n      await this.connection.execute(\"SET SESSION tx_isolation='read-committed'\");\n    }\n    await this.connection.execute('SET AUTOCOMMIT=0');\n  }\n\n  async commit(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    await this.connection.execute('COMMIT');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async rollback(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n\n    await this.connection.execute('ROLLBACK');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async all(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    return res.rows;\n  }\n\n  async get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket | null> {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    if (res.rows.length > 1) throw new Error('get() returned more than one row');\n    if (res.rows.length === 1) return res.rows[0];\n    return null;\n  }\n\n  async insert(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.insertId || res.rows.affectedRows;\n  }\n\n  async update(sql: string, phs?: (string | number | boolean | null)[], returnChangedRows = false) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return returnChangedRows ? res.rows.changedRows : res.rows.affectedRows;\n  }\n\n  async delete(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async run(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    return this.connection.execute(sql, phs);\n  }\n}\n"]}

package/build/esm/upgradeManager.js

@@ -182,6 +182,9 @@ var UpgradeManager = /** @class */ (function () {
                         return [4 /*yield*/, this.client.get(sqlCheck)];
                     case 3:
                         row = _a.sent();
+                        if (!row) {
+                            return [2 /*return*/, false];
+                        }
                         this.logger.debug('Versions: %s vs %s', row.value, targetVersion);
                         if (!(row.value === targetVersion)) return [3 /*break*/, 5];
                         this.logger.debug('versions are equal, rollback');

package/build/esm/upgradeManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../src/upgradeManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { setTimeout } from 'node:timers/promises';\nimport { getLogger } from '@fluidware-it/saddlebag';\nimport { DbClient } from './dbClient';\nimport { Logger } from 'pino';\n\nexport type UpgradeManagerConfig = {\n  version_table_suffix?: string;\n};\n\nexport class UpgradeManager {\n  private version_table: string;\n  private client: DbClient;\n  private logger: Logger;\n  private _default_version_table = '_version';\n\n  constructor(opts?: UpgradeManagerConfig) {\n    this.version_table = this._default_version_table + (opts?.version_table_suffix || '');\n    this.logger = getLogger().child({ component: 'mysql-migrator' });\n    this.client = new DbClient();\n  }\n\n  private async loadCurrentVersion(targetVersion: number) {\n    try {\n      const row = await this.getCurrentVersion(targetVersion);\n      if (row === false) {\n        return -999;\n      } else if (row === true) {\n        this.logger.info('Check db: same version %s', targetVersion);\n        await this.client.close();\n        return true;\n      } else if (row) {\n        return row.value;\n      }\n    } catch (e) {\n      this.logger.error(`Failed to read current version: ${e.message}`);\n      throw e;\n    }\n  }\n\n  private async createDb() {\n    try {\n      return this.createVersionTable();\n    } catch (e) {\n      if (e.code === '23505') {\n        await this.client.close();\n        await setTimeout(2000);\n        return -1;\n      } else {\n        this.logger.error(`Unable to create ${this.version_table} table: [${e.code}] ${e.message}`);\n        throw e;\n      }\n    }\n  }\n\n  private async _checkDb(\n    currentVersion: number,\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    try {\n      if (currentVersion === 0) {\n        await this.initDb(targetVersion, onSchemaInit);\n        this.logger.info('Db created');\n        return true;\n      }\n      if (targetVersion === currentVersion) {\n        return true;\n      }\n      if (targetVersion > currentVersion) {\n        await this.upgradeDb(currentVersion, targetVersion, onSchemaUpgrade);\n        this.logger.info('Db updated to ', targetVersion);\n        return true;\n      }\n    } catch (e) {\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('checkDb failed %s', e.message);\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(e.stack);\n      throw e;\n    } finally {\n      await this.client.close();\n    }\n    return true;\n  }\n\n  private async getCurrentVersion(targetVersion: number) {\n    const sqlCheck = `select value from ${this.version_table} for update`;\n    await this.client.startTransaction();\n    let row;\n    try {\n      row = await this.client.get(sqlCheck);\n      this.logger.debug('Versions: %s vs %s', row.value, targetVersion);\n      if (row.value === targetVersion) {\n        this.logger.debug('versions are equal, rollback');\n        await this.client.rollback();\n        return true;\n      }\n      return row;\n    } catch (e) {\n      await this.client.rollback();\n      if (e.code === 'ER_NO_SUCH_TABLE') {\n        return false;\n      }\n      this.logger.error('Ooops: %s', e.message, e.code);\n      throw e;\n    }\n  }\n\n  private async createVersionTable() {\n    const sqlCreateTable = `create table ${this.version_table} (value INTEGER PRIMARY KEY)`;\n    try {\n      await this.client.run(sqlCreateTable);\n    } catch (e) {\n      await this.client.rollback();\n      throw e;\n    }\n    try {\n      const sqlInsertVersionZero = `insert into ${this.version_table} values (-1)`;\n      await this.client.insert(sqlInsertVersionZero);\n      await this.client.get(`select value from ${this.version_table} for update`);\n    } catch (e) {\n      this.logger.error('Unable to insert -1 version in %s table: [%s] %s', this.version_table, e.code, e.message);\n      throw e;\n    }\n    return 0;\n  }\n\n  private async updateVersion(targetVersion: number) {\n    const sql = `update ${this.version_table} set value = ?`;\n    await this.client.update(sql, [targetVersion]);\n    await this.client.commit();\n  }\n\n  private async initDb(targetVersion: number, onInit: (dbClient: DbClient) => Promise<void>) {\n    const dbConn = new DbClient();\n    try {\n      await dbConn.open();\n      await onInit(dbConn);\n      await this.updateVersion(targetVersion);\n    } finally {\n      if (dbConn) {\n        await dbConn.close();\n      }\n    }\n  }\n\n  private async upgradeDb(\n    fromVersion: number,\n    targetVersion: number,\n    onUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await onUpgrade(this.client, fromVersion);\n    await this.updateVersion(targetVersion);\n  }\n\n  async checkDb(\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await this.client.open();\n    let currentVersion = await this.loadCurrentVersion(targetVersion);\n    if (currentVersion === true) {\n      return true;\n    }\n    this.logger.info('Check db: currentVersion %s targetVersion %s', currentVersion, targetVersion);\n\n    if (currentVersion === -999) {\n      currentVersion = await this.createDb();\n      if (currentVersion < 0) {\n        await this.checkDb(targetVersion, onSchemaInit, onSchemaUpgrade);\n        return;\n      }\n    } else if (currentVersion < 0) {\n      this.logger.error('Db in initialization, exiting ');\n      throw new Error('Db in initialization, do not proceed');\n    }\n    return this._checkDb(currentVersion, targetVersion, onSchemaInit, onSchemaUpgrade);\n  }\n}\n"]}
+{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../src/upgradeManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { setTimeout } from 'node:timers/promises';\nimport { getLogger } from '@fluidware-it/saddlebag';\nimport { DbClient } from './dbClient';\nimport { Logger } from 'pino';\n\nexport type UpgradeManagerConfig = {\n  version_table_suffix?: string;\n};\n\nexport class UpgradeManager {\n  private version_table: string;\n  private client: DbClient;\n  private logger: Logger;\n  private _default_version_table = '_version';\n\n  constructor(opts?: UpgradeManagerConfig) {\n    this.version_table = this._default_version_table + (opts?.version_table_suffix || '');\n    this.logger = getLogger().child({ component: 'mysql-migrator' });\n    this.client = new DbClient();\n  }\n\n  private async loadCurrentVersion(targetVersion: number) {\n    try {\n      const row = await this.getCurrentVersion(targetVersion);\n      if (row === false) {\n        return -999;\n      } else if (row === true) {\n        this.logger.info('Check db: same version %s', targetVersion);\n        await this.client.close();\n        return true;\n      } else if (row) {\n        return row.value;\n      }\n    } catch (e) {\n      this.logger.error(`Failed to read current version: ${e.message}`);\n      throw e;\n    }\n  }\n\n  private async createDb() {\n    try {\n      return this.createVersionTable();\n    } catch (e) {\n      if (e.code === '23505') {\n        await this.client.close();\n        await setTimeout(2000);\n        return -1;\n      } else {\n        this.logger.error(`Unable to create ${this.version_table} table: [${e.code}] ${e.message}`);\n        throw e;\n      }\n    }\n  }\n\n  private async _checkDb(\n    currentVersion: number,\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    try {\n      if (currentVersion === 0) {\n        await this.initDb(targetVersion, onSchemaInit);\n        this.logger.info('Db created');\n        return true;\n      }\n      if (targetVersion === currentVersion) {\n        return true;\n      }\n      if (targetVersion > currentVersion) {\n        await this.upgradeDb(currentVersion, targetVersion, onSchemaUpgrade);\n        this.logger.info('Db updated to ', targetVersion);\n        return true;\n      }\n    } catch (e) {\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('checkDb failed %s', e.message);\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(e.stack);\n      throw e;\n    } finally {\n      await this.client.close();\n    }\n    return true;\n  }\n\n  private async getCurrentVersion(targetVersion: number) {\n    const sqlCheck = `select value from ${this.version_table} for update`;\n    await this.client.startTransaction();\n    let row;\n    try {\n      row = await this.client.get(sqlCheck);\n      if (!row) {\n        return false;\n      }\n      this.logger.debug('Versions: %s vs %s', row.value, targetVersion);\n      if (row.value === targetVersion) {\n        this.logger.debug('versions are equal, rollback');\n        await this.client.rollback();\n        return true;\n      }\n      return row;\n    } catch (e) {\n      await this.client.rollback();\n      if (e.code === 'ER_NO_SUCH_TABLE') {\n        return false;\n      }\n      this.logger.error('Ooops: %s', e.message, e.code);\n      throw e;\n    }\n  }\n\n  private async createVersionTable() {\n    const sqlCreateTable = `create table ${this.version_table} (value INTEGER PRIMARY KEY)`;\n    try {\n      await this.client.run(sqlCreateTable);\n    } catch (e) {\n      await this.client.rollback();\n      throw e;\n    }\n    try {\n      const sqlInsertVersionZero = `insert into ${this.version_table} values (-1)`;\n      await this.client.insert(sqlInsertVersionZero);\n      await this.client.get(`select value from ${this.version_table} for update`);\n    } catch (e) {\n      this.logger.error('Unable to insert -1 version in %s table: [%s] %s', this.version_table, e.code, e.message);\n      throw e;\n    }\n    return 0;\n  }\n\n  private async updateVersion(targetVersion: number) {\n    const sql = `update ${this.version_table} set value = ?`;\n    await this.client.update(sql, [targetVersion]);\n    await this.client.commit();\n  }\n\n  private async initDb(targetVersion: number, onInit: (dbClient: DbClient) => Promise<void>) {\n    const dbConn = new DbClient();\n    try {\n      await dbConn.open();\n      await onInit(dbConn);\n      await this.updateVersion(targetVersion);\n    } finally {\n      if (dbConn) {\n        await dbConn.close();\n      }\n    }\n  }\n\n  private async upgradeDb(\n    fromVersion: number,\n    targetVersion: number,\n    onUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await onUpgrade(this.client, fromVersion);\n    await this.updateVersion(targetVersion);\n  }\n\n  async checkDb(\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await this.client.open();\n    let currentVersion = await this.loadCurrentVersion(targetVersion);\n    if (currentVersion === true) {\n      return true;\n    }\n    this.logger.info('Check db: currentVersion %s targetVersion %s', currentVersion, targetVersion);\n\n    if (currentVersion === -999) {\n      currentVersion = await this.createDb();\n      if (currentVersion < 0) {\n        await this.checkDb(targetVersion, onSchemaInit, onSchemaUpgrade);\n        return;\n      }\n    } else if (currentVersion < 0) {\n      this.logger.error('Db in initialization, exiting ');\n      throw new Error('Db in initialization, do not proceed');\n    }\n    return this._checkDb(currentVersion, targetVersion, onSchemaInit, onSchemaUpgrade);\n  }\n}\n"]}

package/build/esnext/dbClient.d.ts

@@ -8,7 +8,7 @@ interface ConnectionWrap extends Connection {
 }
 export declare class DbClient {
     private connection?;
-    private connectionOptions;
+    private readonly connectionOptions;
     constructor(connectionOptionsOrPrefix?: ConnectionOptions | string);
     open(): Promise<void>;
     getConnection(): ConnectionWrap | undefined;
@@ -17,9 +17,9 @@ export declare class DbClient {
     commit(closeTransaction?: boolean): Promise<void>;
     rollback(closeTransaction?: boolean): Promise<void>;
     all(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket[]>;
-    get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket>;
+    get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket | null>;
     insert(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
-    update(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
+    update(sql: string, phs?: (string | number | boolean | null)[], returnChangedRows?: boolean): Promise<number>;
     delete(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
     run(sql: string, phs?: (string | number | boolean | null)[]): Promise<[import("mysql2/typings/mysql/lib/protocol/packets/OkPacket").OkPacket | RowDataPacket[] | ProcedureCallPacket | ResultSetHeader[] | RowDataPacket[][] | import("mysql2/typings/mysql/lib/protocol/packets/OkPacket").OkPacket[], FieldPacket[]]>;
 }

package/build/esnext/dbClient.js

@@ -90,8 +90,10 @@ export class DbClient {
         }
         const res = await this.connection.run(sql, phs);
         if (res.rows.length > 1)
-            throw new Error('get returned more than one row');
-        return res.rows[0];
+            throw new Error('get() returned more than one row');
+        if (res.rows.length === 1)
+            return res.rows[0];
+        return null;
     }
     async insert(sql, phs) {
         if (!this.connection) {
@@ -100,12 +102,12 @@ export class DbClient {
         const res = await this.connection.run(sql, phs);
         return res.rows.insertId || res.rows.affectedRows;
     }
-    async update(sql, phs) {
+    async update(sql, phs, returnChangedRows = false) {
         if (!this.connection) {
             throw new Error('no connection available');
         }
         const res = await this.connection.run(sql, phs);
-        return res.rows.affectedRows;
+        return returnChangedRows ? res.rows.changedRows : res.rows.affectedRows;
     }
     async delete(sql, phs) {
         if (!this.connection) {

package/build/esnext/dbClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/dbClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  createConnection,\n  Connection,\n  RowDataPacket,\n  ResultSetHeader,\n  ProcedureCallPacket,\n  FieldPacket\n} from 'mysql2/promise';\nimport { getMysqlConnectionOptions, USE_READ_COMMITTED_ISOLATION } from './config';\nimport { ConnectionOptions } from 'mysql2';\n\ninterface ConnectionWrap extends Connection {\n  run<T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket>(\n    sql: string,\n    phs?: (string | number | boolean | null)[]\n  ): Promise<{\n    rows: T;\n    cols: FieldPacket[];\n  }>;\n}\n\nexport class DbClient {\n  private connection?: ConnectionWrap;\n  private connectionOptions: ConnectionOptions;\n\n  constructor(connectionOptionsOrPrefix?: ConnectionOptions | string) {\n    if (connectionOptionsOrPrefix) {\n      if (typeof connectionOptionsOrPrefix === 'string') {\n        this.connectionOptions = getMysqlConnectionOptions(connectionOptionsOrPrefix);\n      } else {\n        this.connectionOptions = connectionOptionsOrPrefix;\n      }\n    } else {\n      this.connectionOptions = getMysqlConnectionOptions('');\n    }\n  }\n\n  async open() {\n    this.connection = (await createConnection(this.connectionOptions)) as ConnectionWrap;\n    this.connection.run = async <\n      T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket\n    >(\n      sql: string,\n      phs?: (string | number | boolean | null)[]\n    ): Promise<{ rows: T; cols: FieldPacket[] }> => {\n      if (!this.connection) {\n        throw new Error('run() called but no connection available');\n      }\n      const [rows, cols] = await this.connection.execute<T>(sql, phs);\n      return {\n        rows,\n        cols\n      };\n    };\n  }\n\n  getConnection(): ConnectionWrap | undefined {\n    return this.connection;\n  }\n\n  async close() {\n    if (this.connection) {\n      await this.connection.end();\n    }\n  }\n\n  async startTransaction() {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    if (USE_READ_COMMITTED_ISOLATION) {\n      await this.connection.execute(\"SET SESSION tx_isolation='read-committed'\");\n    }\n    await this.connection.execute('SET AUTOCOMMIT=0');\n  }\n\n  async commit(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    await this.connection.execute('COMMIT');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async rollback(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n\n    await this.connection.execute('ROLLBACK');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async all(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    return res.rows;\n  }\n\n  async get(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    if (res.rows.length > 1) throw new Error('get returned more than one row');\n    return res.rows[0];\n  }\n\n  async insert(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.insertId || res.rows.affectedRows;\n  }\n\n  async update(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async delete(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async run(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    return this.connection.execute(sql, phs);\n  }\n}\n"]}
+{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/dbClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  createConnection,\n  Connection,\n  RowDataPacket,\n  ResultSetHeader,\n  ProcedureCallPacket,\n  FieldPacket\n} from 'mysql2/promise';\nimport { getMysqlConnectionOptions, USE_READ_COMMITTED_ISOLATION } from './config';\nimport { ConnectionOptions } from 'mysql2';\n\ninterface ConnectionWrap extends Connection {\n  run<T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket>(\n    sql: string,\n    phs?: (string | number | boolean | null)[]\n  ): Promise<{\n    rows: T;\n    cols: FieldPacket[];\n  }>;\n}\n\nexport class DbClient {\n  private connection?: ConnectionWrap;\n  private readonly connectionOptions: ConnectionOptions;\n\n  constructor(connectionOptionsOrPrefix?: ConnectionOptions | string) {\n    if (connectionOptionsOrPrefix) {\n      if (typeof connectionOptionsOrPrefix === 'string') {\n        this.connectionOptions = getMysqlConnectionOptions(connectionOptionsOrPrefix);\n      } else {\n        this.connectionOptions = connectionOptionsOrPrefix;\n      }\n    } else {\n      this.connectionOptions = getMysqlConnectionOptions('');\n    }\n  }\n\n  async open() {\n    this.connection = (await createConnection(this.connectionOptions)) as ConnectionWrap;\n    this.connection.run = async <\n      T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket\n    >(\n      sql: string,\n      phs?: (string | number | boolean | null)[]\n    ): Promise<{ rows: T; cols: FieldPacket[] }> => {\n      if (!this.connection) {\n        throw new Error('run() called but no connection available');\n      }\n      const [rows, cols] = await this.connection.execute<T>(sql, phs);\n      return {\n        rows,\n        cols\n      };\n    };\n  }\n\n  getConnection(): ConnectionWrap | undefined {\n    return this.connection;\n  }\n\n  async close() {\n    if (this.connection) {\n      await this.connection.end();\n    }\n  }\n\n  async startTransaction() {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    if (USE_READ_COMMITTED_ISOLATION) {\n      await this.connection.execute(\"SET SESSION tx_isolation='read-committed'\");\n    }\n    await this.connection.execute('SET AUTOCOMMIT=0');\n  }\n\n  async commit(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    await this.connection.execute('COMMIT');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async rollback(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n\n    await this.connection.execute('ROLLBACK');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async all(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    return res.rows;\n  }\n\n  async get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket | null> {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    if (res.rows.length > 1) throw new Error('get() returned more than one row');\n    if (res.rows.length === 1) return res.rows[0];\n    return null;\n  }\n\n  async insert(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.insertId || res.rows.affectedRows;\n  }\n\n  async update(sql: string, phs?: (string | number | boolean | null)[], returnChangedRows = false) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return returnChangedRows ? res.rows.changedRows : res.rows.affectedRows;\n  }\n\n  async delete(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async run(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    return this.connection.execute(sql, phs);\n  }\n}\n"]}

package/build/esnext/upgradeManager.js

@@ -99,6 +99,9 @@ export class UpgradeManager {
         let row;
         try {
             row = await this.client.get(sqlCheck);
+            if (!row) {
+                return false;
+            }
             this.logger.debug('Versions: %s vs %s', row.value, targetVersion);
             if (row.value === targetVersion) {
                 this.logger.debug('versions are equal, rollback');

package/build/esnext/upgradeManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../src/upgradeManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAOtC,MAAM,OAAO,cAAc;IAMzB,YAAY,IAA2B;QAF/B,2BAAsB,GAAG,UAAU,CAAC;QAG1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,sBAAsB,GAAG,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,oBAAoB,KAAI,EAAE,CAAC,CAAC;QACtF,IAAI,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QACpD,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;YACxD,IAAI,GAAG,KAAK,KAAK,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC;aACb;iBAAM,IAAI,GAAG,KAAK,IAAI,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,aAAa,CAAC,CAAC;gBAC7D,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1B,OAAO,IAAI,CAAC;aACb;iBAAM,IAAI,GAAG,EAAE;gBACd,OAAO,GAAG,CAAC,KAAK,CAAC;aAClB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAClE,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI;YACF,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;gBACtB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1B,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;gBACvB,OAAO,CAAC,CAAC,CAAC;aACX;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,aAAa,YAAY,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5F,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CACpB,cAAsB,EACtB,aAAqB,EACrB,YAAmD,EACnD,eAAoE;QAEpE,IAAI;YACF,IAAI,cAAc,KAAK,CAAC,EAAE;gBACxB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;gBAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC/B,OAAO,IAAI,CAAC;aACb;YACD,IAAI,aAAa,KAAK,cAAc,EAAE;gBACpC,OAAO,IAAI,CAAC;aACb;YACD,IAAI,aAAa,GAAG,cAAc,EAAE;gBAClC,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;gBACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC;aACb;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,CAAC,CAAC;SACT;gBAAS;YACR,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;SAC3B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,aAAqB;QACnD,MAAM,QAAQ,GAAG,qBAAqB,IAAI,CAAC,aAAa,aAAa,CAAC;QACtE,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC;QACR,IAAI;YACF,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YAClE,IAAI,GAAG,CAAC,KAAK,KAAK,aAAa,EAAE;gBAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBAClD,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;aACb;YACD,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,CAAC,IAAI,KAAK,kBAAkB,EAAE;gBACjC,OAAO,KAAK,CAAC;aACd;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,MAAM,cAAc,GAAG,gBAAgB,IAAI,CAAC,aAAa,8BAA8B,CAAC;QACxF,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACvC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,CAAC;SACT;QACD,IAAI;YACF,MAAM,oBAAoB,GAAG,eAAe,IAAI,CAAC,aAAa,cAAc,CAAC;YAC7E,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,IAAI,CAAC,aAAa,aAAa,CAAC,CAAC;SAC7E;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAC7G,MAAM,CAAC,CAAC;SACT;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,aAAqB;QAC/C,MAAM,GAAG,GAAG,UAAU,IAAI,CAAC,aAAa,gBAAgB,CAAC;QACzD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,aAAqB,EAAE,MAA6C;QACvF,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI;YACF,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;YACrB,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;SACzC;gBAAS;YACR,IAAI,MAAM,EAAE;gBACV,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;aACtB;SACF;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CACrB,WAAmB,EACnB,aAAqB,EACrB,SAA8D;QAE9D,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC1C,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,OAAO,CACX,aAAqB,EACrB,YAAmD,EACnD,eAAoE;QAEpE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAClE,IAAI,cAAc,KAAK,IAAI,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QAEhG,IAAI,cAAc,KAAK,CAAC,GAAG,EAAE;YAC3B,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvC,IAAI,cAAc,GAAG,CAAC,EAAE;gBACtB,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;gBACjE,OAAO;aACR;SACF;aAAM,IAAI,cAAc,GAAG,CAAC,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACrF,CAAC;CACF","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { setTimeout } from 'node:timers/promises';\nimport { getLogger } from '@fluidware-it/saddlebag';\nimport { DbClient } from './dbClient';\nimport { Logger } from 'pino';\n\nexport type UpgradeManagerConfig = {\n  version_table_suffix?: string;\n};\n\nexport class UpgradeManager {\n  private version_table: string;\n  private client: DbClient;\n  private logger: Logger;\n  private _default_version_table = '_version';\n\n  constructor(opts?: UpgradeManagerConfig) {\n    this.version_table = this._default_version_table + (opts?.version_table_suffix || '');\n    this.logger = getLogger().child({ component: 'mysql-migrator' });\n    this.client = new DbClient();\n  }\n\n  private async loadCurrentVersion(targetVersion: number) {\n    try {\n      const row = await this.getCurrentVersion(targetVersion);\n      if (row === false) {\n        return -999;\n      } else if (row === true) {\n        this.logger.info('Check db: same version %s', targetVersion);\n        await this.client.close();\n        return true;\n      } else if (row) {\n        return row.value;\n      }\n    } catch (e) {\n      this.logger.error(`Failed to read current version: ${e.message}`);\n      throw e;\n    }\n  }\n\n  private async createDb() {\n    try {\n      return this.createVersionTable();\n    } catch (e) {\n      if (e.code === '23505') {\n        await this.client.close();\n        await setTimeout(2000);\n        return -1;\n      } else {\n        this.logger.error(`Unable to create ${this.version_table} table: [${e.code}] ${e.message}`);\n        throw e;\n      }\n    }\n  }\n\n  private async _checkDb(\n    currentVersion: number,\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    try {\n      if (currentVersion === 0) {\n        await this.initDb(targetVersion, onSchemaInit);\n        this.logger.info('Db created');\n        return true;\n      }\n      if (targetVersion === currentVersion) {\n        return true;\n      }\n      if (targetVersion > currentVersion) {\n        await this.upgradeDb(currentVersion, targetVersion, onSchemaUpgrade);\n        this.logger.info('Db updated to ', targetVersion);\n        return true;\n      }\n    } catch (e) {\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('checkDb failed %s', e.message);\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(e.stack);\n      throw e;\n    } finally {\n      await this.client.close();\n    }\n    return true;\n  }\n\n  private async getCurrentVersion(targetVersion: number) {\n    const sqlCheck = `select value from ${this.version_table} for update`;\n    await this.client.startTransaction();\n    let row;\n    try {\n      row = await this.client.get(sqlCheck);\n      this.logger.debug('Versions: %s vs %s', row.value, targetVersion);\n      if (row.value === targetVersion) {\n        this.logger.debug('versions are equal, rollback');\n        await this.client.rollback();\n        return true;\n      }\n      return row;\n    } catch (e) {\n      await this.client.rollback();\n      if (e.code === 'ER_NO_SUCH_TABLE') {\n        return false;\n      }\n      this.logger.error('Ooops: %s', e.message, e.code);\n      throw e;\n    }\n  }\n\n  private async createVersionTable() {\n    const sqlCreateTable = `create table ${this.version_table} (value INTEGER PRIMARY KEY)`;\n    try {\n      await this.client.run(sqlCreateTable);\n    } catch (e) {\n      await this.client.rollback();\n      throw e;\n    }\n    try {\n      const sqlInsertVersionZero = `insert into ${this.version_table} values (-1)`;\n      await this.client.insert(sqlInsertVersionZero);\n      await this.client.get(`select value from ${this.version_table} for update`);\n    } catch (e) {\n      this.logger.error('Unable to insert -1 version in %s table: [%s] %s', this.version_table, e.code, e.message);\n      throw e;\n    }\n    return 0;\n  }\n\n  private async updateVersion(targetVersion: number) {\n    const sql = `update ${this.version_table} set value = ?`;\n    await this.client.update(sql, [targetVersion]);\n    await this.client.commit();\n  }\n\n  private async initDb(targetVersion: number, onInit: (dbClient: DbClient) => Promise<void>) {\n    const dbConn = new DbClient();\n    try {\n      await dbConn.open();\n      await onInit(dbConn);\n      await this.updateVersion(targetVersion);\n    } finally {\n      if (dbConn) {\n        await dbConn.close();\n      }\n    }\n  }\n\n  private async upgradeDb(\n    fromVersion: number,\n    targetVersion: number,\n    onUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await onUpgrade(this.client, fromVersion);\n    await this.updateVersion(targetVersion);\n  }\n\n  async checkDb(\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await this.client.open();\n    let currentVersion = await this.loadCurrentVersion(targetVersion);\n    if (currentVersion === true) {\n      return true;\n    }\n    this.logger.info('Check db: currentVersion %s targetVersion %s', currentVersion, targetVersion);\n\n    if (currentVersion === -999) {\n      currentVersion = await this.createDb();\n      if (currentVersion < 0) {\n        await this.checkDb(targetVersion, onSchemaInit, onSchemaUpgrade);\n        return;\n      }\n    } else if (currentVersion < 0) {\n      this.logger.error('Db in initialization, exiting ');\n      throw new Error('Db in initialization, do not proceed');\n    }\n    return this._checkDb(currentVersion, targetVersion, onSchemaInit, onSchemaUpgrade);\n  }\n}\n"]}
+{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../src/upgradeManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { setTimeout } from 'node:timers/promises';\nimport { getLogger } from '@fluidware-it/saddlebag';\nimport { DbClient } from './dbClient';\nimport { Logger } from 'pino';\n\nexport type UpgradeManagerConfig = {\n  version_table_suffix?: string;\n};\n\nexport class UpgradeManager {\n  private version_table: string;\n  private client: DbClient;\n  private logger: Logger;\n  private _default_version_table = '_version';\n\n  constructor(opts?: UpgradeManagerConfig) {\n    this.version_table = this._default_version_table + (opts?.version_table_suffix || '');\n    this.logger = getLogger().child({ component: 'mysql-migrator' });\n    this.client = new DbClient();\n  }\n\n  private async loadCurrentVersion(targetVersion: number) {\n    try {\n      const row = await this.getCurrentVersion(targetVersion);\n      if (row === false) {\n        return -999;\n      } else if (row === true) {\n        this.logger.info('Check db: same version %s', targetVersion);\n        await this.client.close();\n        return true;\n      } else if (row) {\n        return row.value;\n      }\n    } catch (e) {\n      this.logger.error(`Failed to read current version: ${e.message}`);\n      throw e;\n    }\n  }\n\n  private async createDb() {\n    try {\n      return this.createVersionTable();\n    } catch (e) {\n      if (e.code === '23505') {\n        await this.client.close();\n        await setTimeout(2000);\n        return -1;\n      } else {\n        this.logger.error(`Unable to create ${this.version_table} table: [${e.code}] ${e.message}`);\n        throw e;\n      }\n    }\n  }\n\n  private async _checkDb(\n    currentVersion: number,\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    try {\n      if (currentVersion === 0) {\n        await this.initDb(targetVersion, onSchemaInit);\n        this.logger.info('Db created');\n        return true;\n      }\n      if (targetVersion === currentVersion) {\n        return true;\n      }\n      if (targetVersion > currentVersion) {\n        await this.upgradeDb(currentVersion, targetVersion, onSchemaUpgrade);\n        this.logger.info('Db updated to ', targetVersion);\n        return true;\n      }\n    } catch (e) {\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('checkDb failed %s', e.message);\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(e.stack);\n      throw e;\n    } finally {\n      await this.client.close();\n    }\n    return true;\n  }\n\n  private async getCurrentVersion(targetVersion: number) {\n    const sqlCheck = `select value from ${this.version_table} for update`;\n    await this.client.startTransaction();\n    let row;\n    try {\n      row = await this.client.get(sqlCheck);\n      if (!row) {\n        return false;\n      }\n      this.logger.debug('Versions: %s vs %s', row.value, targetVersion);\n      if (row.value === targetVersion) {\n        this.logger.debug('versions are equal, rollback');\n        await this.client.rollback();\n        return true;\n      }\n      return row;\n    } catch (e) {\n      await this.client.rollback();\n      if (e.code === 'ER_NO_SUCH_TABLE') {\n        return false;\n      }\n      this.logger.error('Ooops: %s', e.message, e.code);\n      throw e;\n    }\n  }\n\n  private async createVersionTable() {\n    const sqlCreateTable = `create table ${this.version_table} (value INTEGER PRIMARY KEY)`;\n    try {\n      await this.client.run(sqlCreateTable);\n    } catch (e) {\n      await this.client.rollback();\n      throw e;\n    }\n    try {\n      const sqlInsertVersionZero = `insert into ${this.version_table} values (-1)`;\n      await this.client.insert(sqlInsertVersionZero);\n      await this.client.get(`select value from ${this.version_table} for update`);\n    } catch (e) {\n      this.logger.error('Unable to insert -1 version in %s table: [%s] %s', this.version_table, e.code, e.message);\n      throw e;\n    }\n    return 0;\n  }\n\n  private async updateVersion(targetVersion: number) {\n    const sql = `update ${this.version_table} set value = ?`;\n    await this.client.update(sql, [targetVersion]);\n    await this.client.commit();\n  }\n\n  private async initDb(targetVersion: number, onInit: (dbClient: DbClient) => Promise<void>) {\n    const dbConn = new DbClient();\n    try {\n      await dbConn.open();\n      await onInit(dbConn);\n      await this.updateVersion(targetVersion);\n    } finally {\n      if (dbConn) {\n        await dbConn.close();\n      }\n    }\n  }\n\n  private async upgradeDb(\n    fromVersion: number,\n    targetVersion: number,\n    onUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await onUpgrade(this.client, fromVersion);\n    await this.updateVersion(targetVersion);\n  }\n\n  async checkDb(\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await this.client.open();\n    let currentVersion = await this.loadCurrentVersion(targetVersion);\n    if (currentVersion === true) {\n      return true;\n    }\n    this.logger.info('Check db: currentVersion %s targetVersion %s', currentVersion, targetVersion);\n\n    if (currentVersion === -999) {\n      currentVersion = await this.createDb();\n      if (currentVersion < 0) {\n        await this.checkDb(targetVersion, onSchemaInit, onSchemaUpgrade);\n        return;\n      }\n    } else if (currentVersion < 0) {\n      this.logger.error('Db in initialization, exiting ');\n      throw new Error('Db in initialization, do not proceed');\n    }\n    return this._checkDb(currentVersion, targetVersion, onSchemaInit, onSchemaUpgrade);\n  }\n}\n"]}

package/build/src/dbClient.d.ts

@@ -8,7 +8,7 @@ interface ConnectionWrap extends Connection {
 }
 export declare class DbClient {
     private connection?;
-    private connectionOptions;
+    private readonly connectionOptions;
     constructor(connectionOptionsOrPrefix?: ConnectionOptions | string);
     open(): Promise<void>;
     getConnection(): ConnectionWrap | undefined;
@@ -17,9 +17,9 @@ export declare class DbClient {
     commit(closeTransaction?: boolean): Promise<void>;
     rollback(closeTransaction?: boolean): Promise<void>;
     all(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket[]>;
-    get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket>;
+    get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket | null>;
     insert(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
-    update(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
+    update(sql: string, phs?: (string | number | boolean | null)[], returnChangedRows?: boolean): Promise<number>;
     delete(sql: string, phs?: (string | number | boolean | null)[]): Promise<number>;
     run(sql: string, phs?: (string | number | boolean | null)[]): Promise<[import("mysql2/typings/mysql/lib/protocol/packets/OkPacket").OkPacket | RowDataPacket[] | ProcedureCallPacket | ResultSetHeader[] | RowDataPacket[][] | import("mysql2/typings/mysql/lib/protocol/packets/OkPacket").OkPacket[], FieldPacket[]]>;
 }

package/build/src/dbClient.js

@@ -93,8 +93,10 @@ class DbClient {
         }
         const res = await this.connection.run(sql, phs);
         if (res.rows.length > 1)
-            throw new Error('get returned more than one row');
-        return res.rows[0];
+            throw new Error('get() returned more than one row');
+        if (res.rows.length === 1)
+            return res.rows[0];
+        return null;
     }
     async insert(sql, phs) {
         if (!this.connection) {
@@ -103,12 +105,12 @@ class DbClient {
         const res = await this.connection.run(sql, phs);
         return res.rows.insertId || res.rows.affectedRows;
     }
-    async update(sql, phs) {
+    async update(sql, phs, returnChangedRows = false) {
         if (!this.connection) {
             throw new Error('no connection available');
         }
         const res = await this.connection.run(sql, phs);
-        return res.rows.affectedRows;
+        return returnChangedRows ? res.rows.changedRows : res.rows.affectedRows;
     }
     async delete(sql, phs) {
         if (!this.connection) {

package/build/src/dbClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/dbClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  createConnection,\n  Connection,\n  RowDataPacket,\n  ResultSetHeader,\n  ProcedureCallPacket,\n  FieldPacket\n} from 'mysql2/promise';\nimport { getMysqlConnectionOptions, USE_READ_COMMITTED_ISOLATION } from './config';\nimport { ConnectionOptions } from 'mysql2';\n\ninterface ConnectionWrap extends Connection {\n  run<T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket>(\n    sql: string,\n    phs?: (string | number | boolean | null)[]\n  ): Promise<{\n    rows: T;\n    cols: FieldPacket[];\n  }>;\n}\n\nexport class DbClient {\n  private connection?: ConnectionWrap;\n  private connectionOptions: ConnectionOptions;\n\n  constructor(connectionOptionsOrPrefix?: ConnectionOptions | string) {\n    if (connectionOptionsOrPrefix) {\n      if (typeof connectionOptionsOrPrefix === 'string') {\n        this.connectionOptions = getMysqlConnectionOptions(connectionOptionsOrPrefix);\n      } else {\n        this.connectionOptions = connectionOptionsOrPrefix;\n      }\n    } else {\n      this.connectionOptions = getMysqlConnectionOptions('');\n    }\n  }\n\n  async open() {\n    this.connection = (await createConnection(this.connectionOptions)) as ConnectionWrap;\n    this.connection.run = async <\n      T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket\n    >(\n      sql: string,\n      phs?: (string | number | boolean | null)[]\n    ): Promise<{ rows: T; cols: FieldPacket[] }> => {\n      if (!this.connection) {\n        throw new Error('run() called but no connection available');\n      }\n      const [rows, cols] = await this.connection.execute<T>(sql, phs);\n      return {\n        rows,\n        cols\n      };\n    };\n  }\n\n  getConnection(): ConnectionWrap | undefined {\n    return this.connection;\n  }\n\n  async close() {\n    if (this.connection) {\n      await this.connection.end();\n    }\n  }\n\n  async startTransaction() {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    if (USE_READ_COMMITTED_ISOLATION) {\n      await this.connection.execute(\"SET SESSION tx_isolation='read-committed'\");\n    }\n    await this.connection.execute('SET AUTOCOMMIT=0');\n  }\n\n  async commit(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    await this.connection.execute('COMMIT');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async rollback(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n\n    await this.connection.execute('ROLLBACK');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async all(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    return res.rows;\n  }\n\n  async get(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    if (res.rows.length > 1) throw new Error('get returned more than one row');\n    return res.rows[0];\n  }\n\n  async insert(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.insertId || res.rows.affectedRows;\n  }\n\n  async update(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async delete(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async run(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    return this.connection.execute(sql, phs);\n  }\n}\n"]}
+{"version":3,"file":"dbClient.js","sourceRoot":"","sources":["../../src/dbClient.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAOwB;AACxB,qCAAmF;AAanF,MAAa,QAAQ;IAInB,YAAY,yBAAsD;QAChE,IAAI,yBAAyB,EAAE;YAC7B,IAAI,OAAO,yBAAyB,KAAK,QAAQ,EAAE;gBACjD,IAAI,CAAC,iBAAiB,GAAG,IAAA,kCAAyB,EAAC,yBAAyB,CAAC,CAAC;aAC/E;iBAAM;gBACL,IAAI,CAAC,iBAAiB,GAAG,yBAAyB,CAAC;aACpD;SACF;aAAM;YACL,IAAI,CAAC,iBAAiB,GAAG,IAAA,kCAAyB,EAAC,EAAE,CAAC,CAAC;SACxD;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,UAAU,GAAG,CAAC,MAAM,IAAA,0BAAgB,EAAC,IAAI,CAAC,iBAAiB,CAAC,CAAmB,CAAC;QACrF,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,KAAK,EAGzB,GAAW,EACX,GAA0C,EACC,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;aAC7D;YACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAI,GAAG,EAAE,GAAG,CAAC,CAAC;YAChE,OAAO;gBACL,IAAI;gBACJ,IAAI;aACL,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;SAC7B;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,IAAI,qCAA4B,EAAE;YAChC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;SAC5E;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI;QAClC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,gBAAgB,EAAE;YACpB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SACnD;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI;QACpC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,gBAAgB,EAAE;YACpB,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;SACnD;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,GAA0C;QAC/D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,GAA0C;QAC/D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;QACjE,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC7E,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,GAA0C;QAClE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,GAA0C,EAAE,iBAAiB,GAAG,KAAK;QAC7F,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,GAA0C;QAClE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAkB,GAAG,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,GAA0C;QAC/D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC;CACF;AA5HD,4BA4HC","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  createConnection,\n  Connection,\n  RowDataPacket,\n  ResultSetHeader,\n  ProcedureCallPacket,\n  FieldPacket\n} from 'mysql2/promise';\nimport { getMysqlConnectionOptions, USE_READ_COMMITTED_ISOLATION } from './config';\nimport { ConnectionOptions } from 'mysql2';\n\ninterface ConnectionWrap extends Connection {\n  run<T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket>(\n    sql: string,\n    phs?: (string | number | boolean | null)[]\n  ): Promise<{\n    rows: T;\n    cols: FieldPacket[];\n  }>;\n}\n\nexport class DbClient {\n  private connection?: ConnectionWrap;\n  private readonly connectionOptions: ConnectionOptions;\n\n  constructor(connectionOptionsOrPrefix?: ConnectionOptions | string) {\n    if (connectionOptionsOrPrefix) {\n      if (typeof connectionOptionsOrPrefix === 'string') {\n        this.connectionOptions = getMysqlConnectionOptions(connectionOptionsOrPrefix);\n      } else {\n        this.connectionOptions = connectionOptionsOrPrefix;\n      }\n    } else {\n      this.connectionOptions = getMysqlConnectionOptions('');\n    }\n  }\n\n  async open() {\n    this.connection = (await createConnection(this.connectionOptions)) as ConnectionWrap;\n    this.connection.run = async <\n      T extends ResultSetHeader | ResultSetHeader[] | RowDataPacket[] | RowDataPacket[][] | ProcedureCallPacket\n    >(\n      sql: string,\n      phs?: (string | number | boolean | null)[]\n    ): Promise<{ rows: T; cols: FieldPacket[] }> => {\n      if (!this.connection) {\n        throw new Error('run() called but no connection available');\n      }\n      const [rows, cols] = await this.connection.execute<T>(sql, phs);\n      return {\n        rows,\n        cols\n      };\n    };\n  }\n\n  getConnection(): ConnectionWrap | undefined {\n    return this.connection;\n  }\n\n  async close() {\n    if (this.connection) {\n      await this.connection.end();\n    }\n  }\n\n  async startTransaction() {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    if (USE_READ_COMMITTED_ISOLATION) {\n      await this.connection.execute(\"SET SESSION tx_isolation='read-committed'\");\n    }\n    await this.connection.execute('SET AUTOCOMMIT=0');\n  }\n\n  async commit(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    await this.connection.execute('COMMIT');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async rollback(closeTransaction = true) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n\n    await this.connection.execute('ROLLBACK');\n    if (closeTransaction) {\n      await this.connection.execute('SET AUTOCOMMIT=1');\n    }\n  }\n\n  async all(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    return res.rows;\n  }\n\n  async get(sql: string, phs?: (string | number | boolean | null)[]): Promise<RowDataPacket | null> {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<RowDataPacket[]>(sql, phs);\n    if (res.rows.length > 1) throw new Error('get() returned more than one row');\n    if (res.rows.length === 1) return res.rows[0];\n    return null;\n  }\n\n  async insert(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.insertId || res.rows.affectedRows;\n  }\n\n  async update(sql: string, phs?: (string | number | boolean | null)[], returnChangedRows = false) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return returnChangedRows ? res.rows.changedRows : res.rows.affectedRows;\n  }\n\n  async delete(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    const res = await this.connection.run<ResultSetHeader>(sql, phs);\n    return res.rows.affectedRows;\n  }\n\n  async run(sql: string, phs?: (string | number | boolean | null)[]) {\n    if (!this.connection) {\n      throw new Error('no connection available');\n    }\n    return this.connection.execute(sql, phs);\n  }\n}\n"]}

package/build/src/upgradeManager.js

@@ -102,6 +102,9 @@ class UpgradeManager {
         let row;
         try {
             row = await this.client.get(sqlCheck);
+            if (!row) {
+                return false;
+            }
             this.logger.debug('Versions: %s vs %s', row.value, targetVersion);
             if (row.value === targetVersion) {
                 this.logger.debug('versions are equal, rollback');

package/build/src/upgradeManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../src/upgradeManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { setTimeout } from 'node:timers/promises';\nimport { getLogger } from '@fluidware-it/saddlebag';\nimport { DbClient } from './dbClient';\nimport { Logger } from 'pino';\n\nexport type UpgradeManagerConfig = {\n  version_table_suffix?: string;\n};\n\nexport class UpgradeManager {\n  private version_table: string;\n  private client: DbClient;\n  private logger: Logger;\n  private _default_version_table = '_version';\n\n  constructor(opts?: UpgradeManagerConfig) {\n    this.version_table = this._default_version_table + (opts?.version_table_suffix || '');\n    this.logger = getLogger().child({ component: 'mysql-migrator' });\n    this.client = new DbClient();\n  }\n\n  private async loadCurrentVersion(targetVersion: number) {\n    try {\n      const row = await this.getCurrentVersion(targetVersion);\n      if (row === false) {\n        return -999;\n      } else if (row === true) {\n        this.logger.info('Check db: same version %s', targetVersion);\n        await this.client.close();\n        return true;\n      } else if (row) {\n        return row.value;\n      }\n    } catch (e) {\n      this.logger.error(`Failed to read current version: ${e.message}`);\n      throw e;\n    }\n  }\n\n  private async createDb() {\n    try {\n      return this.createVersionTable();\n    } catch (e) {\n      if (e.code === '23505') {\n        await this.client.close();\n        await setTimeout(2000);\n        return -1;\n      } else {\n        this.logger.error(`Unable to create ${this.version_table} table: [${e.code}] ${e.message}`);\n        throw e;\n      }\n    }\n  }\n\n  private async _checkDb(\n    currentVersion: number,\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    try {\n      if (currentVersion === 0) {\n        await this.initDb(targetVersion, onSchemaInit);\n        this.logger.info('Db created');\n        return true;\n      }\n      if (targetVersion === currentVersion) {\n        return true;\n      }\n      if (targetVersion > currentVersion) {\n        await this.upgradeDb(currentVersion, targetVersion, onSchemaUpgrade);\n        this.logger.info('Db updated to ', targetVersion);\n        return true;\n      }\n    } catch (e) {\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('checkDb failed %s', e.message);\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(e.stack);\n      throw e;\n    } finally {\n      await this.client.close();\n    }\n    return true;\n  }\n\n  private async getCurrentVersion(targetVersion: number) {\n    const sqlCheck = `select value from ${this.version_table} for update`;\n    await this.client.startTransaction();\n    let row;\n    try {\n      row = await this.client.get(sqlCheck);\n      this.logger.debug('Versions: %s vs %s', row.value, targetVersion);\n      if (row.value === targetVersion) {\n        this.logger.debug('versions are equal, rollback');\n        await this.client.rollback();\n        return true;\n      }\n      return row;\n    } catch (e) {\n      await this.client.rollback();\n      if (e.code === 'ER_NO_SUCH_TABLE') {\n        return false;\n      }\n      this.logger.error('Ooops: %s', e.message, e.code);\n      throw e;\n    }\n  }\n\n  private async createVersionTable() {\n    const sqlCreateTable = `create table ${this.version_table} (value INTEGER PRIMARY KEY)`;\n    try {\n      await this.client.run(sqlCreateTable);\n    } catch (e) {\n      await this.client.rollback();\n      throw e;\n    }\n    try {\n      const sqlInsertVersionZero = `insert into ${this.version_table} values (-1)`;\n      await this.client.insert(sqlInsertVersionZero);\n      await this.client.get(`select value from ${this.version_table} for update`);\n    } catch (e) {\n      this.logger.error('Unable to insert -1 version in %s table: [%s] %s', this.version_table, e.code, e.message);\n      throw e;\n    }\n    return 0;\n  }\n\n  private async updateVersion(targetVersion: number) {\n    const sql = `update ${this.version_table} set value = ?`;\n    await this.client.update(sql, [targetVersion]);\n    await this.client.commit();\n  }\n\n  private async initDb(targetVersion: number, onInit: (dbClient: DbClient) => Promise<void>) {\n    const dbConn = new DbClient();\n    try {\n      await dbConn.open();\n      await onInit(dbConn);\n      await this.updateVersion(targetVersion);\n    } finally {\n      if (dbConn) {\n        await dbConn.close();\n      }\n    }\n  }\n\n  private async upgradeDb(\n    fromVersion: number,\n    targetVersion: number,\n    onUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await onUpgrade(this.client, fromVersion);\n    await this.updateVersion(targetVersion);\n  }\n\n  async checkDb(\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await this.client.open();\n    let currentVersion = await this.loadCurrentVersion(targetVersion);\n    if (currentVersion === true) {\n      return true;\n    }\n    this.logger.info('Check db: currentVersion %s targetVersion %s', currentVersion, targetVersion);\n\n    if (currentVersion === -999) {\n      currentVersion = await this.createDb();\n      if (currentVersion < 0) {\n        await this.checkDb(targetVersion, onSchemaInit, onSchemaUpgrade);\n        return;\n      }\n    } else if (currentVersion < 0) {\n      this.logger.error('Db in initialization, exiting ');\n      throw new Error('Db in initialization, do not proceed');\n    }\n    return this._checkDb(currentVersion, targetVersion, onSchemaInit, onSchemaUpgrade);\n  }\n}\n"]}
+{"version":3,"file":"upgradeManager.js","sourceRoot":"","sources":["../../src/upgradeManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright Fluidware srl\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { setTimeout } from 'node:timers/promises';\nimport { getLogger } from '@fluidware-it/saddlebag';\nimport { DbClient } from './dbClient';\nimport { Logger } from 'pino';\n\nexport type UpgradeManagerConfig = {\n  version_table_suffix?: string;\n};\n\nexport class UpgradeManager {\n  private version_table: string;\n  private client: DbClient;\n  private logger: Logger;\n  private _default_version_table = '_version';\n\n  constructor(opts?: UpgradeManagerConfig) {\n    this.version_table = this._default_version_table + (opts?.version_table_suffix || '');\n    this.logger = getLogger().child({ component: 'mysql-migrator' });\n    this.client = new DbClient();\n  }\n\n  private async loadCurrentVersion(targetVersion: number) {\n    try {\n      const row = await this.getCurrentVersion(targetVersion);\n      if (row === false) {\n        return -999;\n      } else if (row === true) {\n        this.logger.info('Check db: same version %s', targetVersion);\n        await this.client.close();\n        return true;\n      } else if (row) {\n        return row.value;\n      }\n    } catch (e) {\n      this.logger.error(`Failed to read current version: ${e.message}`);\n      throw e;\n    }\n  }\n\n  private async createDb() {\n    try {\n      return this.createVersionTable();\n    } catch (e) {\n      if (e.code === '23505') {\n        await this.client.close();\n        await setTimeout(2000);\n        return -1;\n      } else {\n        this.logger.error(`Unable to create ${this.version_table} table: [${e.code}] ${e.message}`);\n        throw e;\n      }\n    }\n  }\n\n  private async _checkDb(\n    currentVersion: number,\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    try {\n      if (currentVersion === 0) {\n        await this.initDb(targetVersion, onSchemaInit);\n        this.logger.info('Db created');\n        return true;\n      }\n      if (targetVersion === currentVersion) {\n        return true;\n      }\n      if (targetVersion > currentVersion) {\n        await this.upgradeDb(currentVersion, targetVersion, onSchemaUpgrade);\n        this.logger.info('Db updated to ', targetVersion);\n        return true;\n      }\n    } catch (e) {\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('checkDb failed %s', e.message);\n      this.logger.error('\\n');\n      this.logger.error(' !!!!!!!! FATAL ERROR !!!!!!!!');\n      this.logger.error('\\n');\n      this.logger.error('\\n');\n      this.logger.error(e.stack);\n      throw e;\n    } finally {\n      await this.client.close();\n    }\n    return true;\n  }\n\n  private async getCurrentVersion(targetVersion: number) {\n    const sqlCheck = `select value from ${this.version_table} for update`;\n    await this.client.startTransaction();\n    let row;\n    try {\n      row = await this.client.get(sqlCheck);\n      if (!row) {\n        return false;\n      }\n      this.logger.debug('Versions: %s vs %s', row.value, targetVersion);\n      if (row.value === targetVersion) {\n        this.logger.debug('versions are equal, rollback');\n        await this.client.rollback();\n        return true;\n      }\n      return row;\n    } catch (e) {\n      await this.client.rollback();\n      if (e.code === 'ER_NO_SUCH_TABLE') {\n        return false;\n      }\n      this.logger.error('Ooops: %s', e.message, e.code);\n      throw e;\n    }\n  }\n\n  private async createVersionTable() {\n    const sqlCreateTable = `create table ${this.version_table} (value INTEGER PRIMARY KEY)`;\n    try {\n      await this.client.run(sqlCreateTable);\n    } catch (e) {\n      await this.client.rollback();\n      throw e;\n    }\n    try {\n      const sqlInsertVersionZero = `insert into ${this.version_table} values (-1)`;\n      await this.client.insert(sqlInsertVersionZero);\n      await this.client.get(`select value from ${this.version_table} for update`);\n    } catch (e) {\n      this.logger.error('Unable to insert -1 version in %s table: [%s] %s', this.version_table, e.code, e.message);\n      throw e;\n    }\n    return 0;\n  }\n\n  private async updateVersion(targetVersion: number) {\n    const sql = `update ${this.version_table} set value = ?`;\n    await this.client.update(sql, [targetVersion]);\n    await this.client.commit();\n  }\n\n  private async initDb(targetVersion: number, onInit: (dbClient: DbClient) => Promise<void>) {\n    const dbConn = new DbClient();\n    try {\n      await dbConn.open();\n      await onInit(dbConn);\n      await this.updateVersion(targetVersion);\n    } finally {\n      if (dbConn) {\n        await dbConn.close();\n      }\n    }\n  }\n\n  private async upgradeDb(\n    fromVersion: number,\n    targetVersion: number,\n    onUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await onUpgrade(this.client, fromVersion);\n    await this.updateVersion(targetVersion);\n  }\n\n  async checkDb(\n    targetVersion: number,\n    onSchemaInit: (dbClient: DbClient) => Promise<void>,\n    onSchemaUpgrade: (dbClient: DbClient, from: number) => Promise<void>\n  ) {\n    await this.client.open();\n    let currentVersion = await this.loadCurrentVersion(targetVersion);\n    if (currentVersion === true) {\n      return true;\n    }\n    this.logger.info('Check db: currentVersion %s targetVersion %s', currentVersion, targetVersion);\n\n    if (currentVersion === -999) {\n      currentVersion = await this.createDb();\n      if (currentVersion < 0) {\n        await this.checkDb(targetVersion, onSchemaInit, onSchemaUpgrade);\n        return;\n      }\n    } else if (currentVersion < 0) {\n      this.logger.error('Db in initialization, exiting ');\n      throw new Error('Db in initialization, do not proceed');\n    }\n    return this._checkDb(currentVersion, targetVersion, onSchemaInit, onSchemaUpgrade);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidware-it/mysql2-client",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
   "esnext": "build/esnext/index.js",