@dbos-inc/typeorm-datasource 3.0.7-preview → 3.0.8-preview

package/dist/src/typeorm_datasource.js

@@ -1,249 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeOrmDataSource = exports.IsolationLevel = void 0;
-const dbos_sdk_1 = require("@dbos-inc/dbos-sdk");
-const datasource_1 = require("@dbos-inc/dbos-sdk/datasource");
-Object.defineProperty(exports, "IsolationLevel", { enumerable: true, get: function () { return datasource_1.PGIsolationLevel; } });
-const typeorm_1 = require("typeorm");
-const async_hooks_1 = require("async_hooks");
-const superjson_1 = require("superjson");
-const asyncLocalCtx = new async_hooks_1.AsyncLocalStorage();
-function getCurrentDSContextStore() {
-    return asyncLocalCtx.getStore();
-}
-function assertCurrentDSContextStore() {
-    const ctx = getCurrentDSContextStore();
-    if (!ctx)
-        throw new dbos_sdk_1.Error.DBOSInvalidWorkflowTransitionError('Invalid use of TypeOrmDs outside of a `transaction`');
-    return ctx;
-}
-class TypeOrmDSTH {
-    name;
-    config;
-    entities;
-    dsType = 'TypeOrm';
-    dataSource;
-    constructor(name, config, 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    entities) {
-        this.name = name;
-        this.config = config;
-        this.entities = entities;
-    }
-    async createInstance() {
-        const ds = new typeorm_1.DataSource({
-            type: 'postgres',
-            url: this.config.connectionString,
-            connectTimeoutMS: this.config.connectionTimeoutMillis,
-            entities: this.entities,
-            poolSize: this.config.max,
-        });
-        await ds.initialize();
-        return ds;
-    }
-    async initialize() {
-        this.dataSource = await this.createInstance();
-        return Promise.resolve();
-    }
-    async destroy() {
-        await this.dataSource?.destroy();
-    }
-    async #checkExecution(client, workflowID, funcNum) {
-        const { rows } = await client.query(`SELECT output
-          FROM dbos.transaction_completion
-          WHERE workflow_id=$1 AND function_num=$2;`, [workflowID, funcNum]);
-        if (rows.length !== 1) {
-            return undefined;
-        }
-        if (rows[0].output === null) {
-            return undefined;
-        }
-        return { res: superjson_1.SuperJSON.parse(rows[0].output) };
-    }
-    async #recordOutput(client, workflowID, funcNum, output) {
-        const serialOutput = superjson_1.SuperJSON.stringify(output);
-        await client.query(`INSERT INTO dbos.transaction_completion (
-        workflow_id, 
-        function_num,
-        output,
-        created_at
-      ) VALUES ($1, $2, $3, $4)`, [workflowID, funcNum, serialOutput, Date.now()]);
-    }
-    async #recordError(client, workflowID, funcNum, error) {
-        const serialError = superjson_1.SuperJSON.stringify(error);
-        await client.query(`INSERT INTO dbos.transaction_completion (
-        workflow_id, 
-        function_num,
-        error,
-        created_at
-      ) VALUES ($1, $2, $3, $4)`, [workflowID, funcNum, serialError, Date.now()]);
-    }
-    /* Required by base class */
-    async invokeTransactionFunction(config, target, func, ...args) {
-        const isolationLevel = config?.isolationLevel ?? 'SERIALIZABLE';
-        const readOnly = config?.readOnly ? true : false;
-        const wfid = dbos_sdk_1.DBOS.workflowID;
-        const funcnum = dbos_sdk_1.DBOS.stepID;
-        const funcname = func.name;
-        // Retry loop if appropriate
-        let retryWaitMillis = 1;
-        const backoffFactor = 1.5;
-        const maxRetryWaitMs = 2000; // Maximum wait 2 seconds.
-        const shouldCheckOutput = false;
-        if (this.dataSource === undefined) {
-            throw new dbos_sdk_1.Error.DBOSInvalidWorkflowTransitionError('Invalid use of Datasource');
-        }
-        while (true) {
-            let failedForRetriableReasons = false;
-            try {
-                const result = this.dataSource.transaction(isolationLevel, async (transactionEntityManager) => {
-                    if (this.dataSource === undefined) {
-                        throw new dbos_sdk_1.Error.DBOSInvalidWorkflowTransitionError('Invalid use of Datasource');
-                    }
-                    if (shouldCheckOutput && !readOnly && wfid) {
-                        const executionResult = await this.#checkExecution(this.dataSource, wfid, funcnum);
-                        if (executionResult) {
-                            dbos_sdk_1.DBOS.span?.setAttribute('cached', true);
-                            return executionResult.res;
-                        }
-                    }
-                    const result = await asyncLocalCtx.run({ typeOrmEntityManager: transactionEntityManager }, async () => {
-                        return await func.call(target, ...args);
-                    });
-                    // Save result
-                    try {
-                        if (!readOnly && wfid) {
-                            await this.#recordOutput(this.dataSource, wfid, funcnum, result);
-                        }
-                    }
-                    catch (e) {
-                        const error = e;
-                        await this.#recordError(this.dataSource, wfid, funcnum, error);
-                        // Aside from a connectivity error, two kinds of error are anticipated here:
-                        //  1. The transaction is marked failed, but the user code did not throw.
-                        //      Bad on them.  We will throw an error (this will get recorded) and not retry.
-                        //  2. There was a key conflict in the statement, and we need to use the fetched output
-                        if ((0, datasource_1.isPGFailedSqlTransactionError)(error)) {
-                            dbos_sdk_1.DBOS.logger.error(`In workflow ${wfid}, Postgres aborted a transaction but the function '${funcname}' did not raise an exception.  Please ensure that the transaction method raises an exception if the database transaction is aborted.`);
-                            failedForRetriableReasons = false;
-                            throw new dbos_sdk_1.Error.DBOSFailedSqlTransactionError(wfid, funcname);
-                        }
-                        else if ((0, datasource_1.isPGKeyConflictError)(error)) {
-                            throw new dbos_sdk_1.Error.DBOSWorkflowConflictError(`In workflow ${wfid}, Postgres raised a key conflict error in transaction '${funcname}'.  This is not retriable, but the output will be fetched from the database.`);
-                        }
-                        else {
-                            dbos_sdk_1.DBOS.logger.error(`Unexpected error raised in transaction '${funcname}: ${error}`);
-                            failedForRetriableReasons = false;
-                            throw error;
-                        }
-                    }
-                    return result;
-                });
-                return result;
-            }
-            catch (e) {
-                const err = e;
-                if (failedForRetriableReasons || (0, datasource_1.isPGRetriableTransactionError)(err)) {
-                    dbos_sdk_1.DBOS.span?.addEvent('TXN SERIALIZATION FAILURE', { retryWaitMillis: retryWaitMillis }, performance.now());
-                    // Retry serialization failures.
-                    await dbos_sdk_1.DBOS.sleepms(retryWaitMillis);
-                    retryWaitMillis *= backoffFactor;
-                    retryWaitMillis = retryWaitMillis < maxRetryWaitMs ? retryWaitMillis : maxRetryWaitMs;
-                    continue;
-                }
-                else {
-                    throw err;
-                }
-            }
-        }
-    }
-}
-class TypeOrmDataSource {
-    name;
-    config;
-    entities;
-    #provider;
-    constructor(name, config, 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    entities) {
-        this.name = name;
-        this.config = config;
-        this.entities = entities;
-        this.#provider = new TypeOrmDSTH(name, config, entities);
-        (0, datasource_1.registerDataSource)(this.#provider);
-    }
-    // User calls this... DBOS not directly involved...
-    static get entityManager() {
-        const ctx = assertCurrentDSContextStore();
-        if (!dbos_sdk_1.DBOS.isInTransaction())
-            throw new dbos_sdk_1.Error.DBOSInvalidWorkflowTransitionError('Invalid use of `TypeOrmDataSource.entityManager` outside of a `transaction`');
-        return ctx.typeOrmEntityManager;
-    }
-    async initializeInternalSchema() {
-        const ds = await this.#provider.createInstance();
-        try {
-            await ds.query(datasource_1.createTransactionCompletionSchemaPG);
-            await ds.query(datasource_1.createTransactionCompletionTablePG);
-        }
-        catch (e) {
-            const error = e;
-            throw new dbos_sdk_1.Error.DBOSError(`Unexpected error initializing schema: ${error.message}`);
-        }
-        finally {
-            try {
-                await ds.destroy();
-            }
-            catch (e) { }
-        }
-    }
-    /**
-     * Run `callback` as a transaction against this DataSource
-     * @param callback Function to run within a transactional context
-     * @param funcName Name to record for the transaction
-     * @param config Transaction configuration (isolation, etc)
-     * @returns Return value from `callback`
-     */
-    async runTransaction(callback, funcName, config) {
-        return await (0, datasource_1.runTransaction)(callback, funcName, { dsName: this.name, config });
-    }
-    /**
-     * Register function as DBOS transaction, to be called within the context
-     *  of a transaction on this data source.
-     *
-     * @param func Function to wrap
-     * @param target Name of function
-     * @param config Transaction settings
-     * @returns Wrapped function, to be called instead of `func`
-     */
-    registerTransaction(func, name, config) {
-        return (0, datasource_1.registerTransaction)(this.name, func, { name }, config);
-    }
-    /**
-     * Decorator establishing function as a transaction
-     */
-    transaction(config) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const ds = this;
-        return function decorator(_target, propertyKey, descriptor) {
-            if (!descriptor.value) {
-                throw new dbos_sdk_1.Error.DBOSError('Use of decorator when original method is undefined');
-            }
-            descriptor.value = ds.registerTransaction(descriptor.value, propertyKey.toString(), config);
-            return descriptor;
-        };
-    }
-    /**
-     * For testing: Use DataSource.syncronize to install the user schema
-     */
-    async createSchema() {
-        const ds = await this.#provider.createInstance();
-        try {
-            await ds.synchronize();
-        }
-        finally {
-            await ds.destroy();
-        }
-    }
-}
-exports.TypeOrmDataSource = TypeOrmDataSource;
-//# sourceMappingURL=typeorm_datasource.js.map

package/dist/src/typeorm_datasource.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"typeorm_datasource.js","sourceRoot":"","sources":["../../src/typeorm_datasource.ts"],"names":[],"mappings":"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"}

package/src/index.ts

@@ -1 +0,0 @@
-export { IsolationLevel, TypeOrmDataSource, TypeOrmTransactionConfig } from './typeorm_datasource';

package/src/typeorm_datasource.ts

@@ -1,332 +0,0 @@
-import { PoolConfig } from 'pg';
-import { DBOS, Error } from '@dbos-inc/dbos-sdk';
-import {
-  type DataSourceTransactionHandler,
-  createTransactionCompletionSchemaPG,
-  createTransactionCompletionTablePG,
-  isPGRetriableTransactionError,
-  isPGKeyConflictError,
-  isPGFailedSqlTransactionError,
-  registerTransaction,
-  runTransaction,
-  PGIsolationLevel as IsolationLevel,
-  PGTransactionConfig as TypeOrmTransactionConfig,
-  DBOSDataSource,
-  registerDataSource,
-} from '@dbos-inc/dbos-sdk/datasource';
-import { DataSource, EntityManager } from 'typeorm';
-import { AsyncLocalStorage } from 'async_hooks';
-import { SuperJSON } from 'superjson';
-
-interface DBOSTypeOrmLocalCtx {
-  typeOrmEntityManager: EntityManager;
-}
-const asyncLocalCtx = new AsyncLocalStorage<DBOSTypeOrmLocalCtx>();
-
-function getCurrentDSContextStore(): DBOSTypeOrmLocalCtx | undefined {
-  return asyncLocalCtx.getStore();
-}
-
-function assertCurrentDSContextStore(): DBOSTypeOrmLocalCtx {
-  const ctx = getCurrentDSContextStore();
-  if (!ctx) throw new Error.DBOSInvalidWorkflowTransitionError('Invalid use of TypeOrmDs outside of a `transaction`');
-  return ctx;
-}
-
-interface transaction_completion {
-  workflow_id: string;
-  function_num: number;
-  output: string | null;
-  error: string | null;
-}
-
-export { IsolationLevel, TypeOrmTransactionConfig };
-
-class TypeOrmDSTH implements DataSourceTransactionHandler {
-  readonly dsType = 'TypeOrm';
-  dataSource: DataSource | undefined;
-
-  constructor(
-    readonly name: string,
-    readonly config: PoolConfig,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    readonly entities: Function[],
-  ) {}
-
-  async createInstance(): Promise<DataSource> {
-    const ds = new DataSource({
-      type: 'postgres',
-      url: this.config.connectionString,
-      connectTimeoutMS: this.config.connectionTimeoutMillis,
-      entities: this.entities,
-      poolSize: this.config.max,
-    });
-    await ds.initialize();
-    return ds;
-  }
-
-  async initialize(): Promise<void> {
-    this.dataSource = await this.createInstance();
-
-    return Promise.resolve();
-  }
-
-  async destroy(): Promise<void> {
-    await this.dataSource?.destroy();
-  }
-
-  async #checkExecution<R>(
-    client: DataSource,
-    workflowID: string,
-    funcNum: number,
-  ): Promise<
-    | {
-        res: R;
-      }
-    | undefined
-  > {
-    type TxOutputRow = Pick<transaction_completion, 'output'> & {
-      recorded: boolean;
-    };
-
-    const { rows } = await client.query<{ rows: TxOutputRow[] }>(
-      `SELECT output
-          FROM dbos.transaction_completion
-          WHERE workflow_id=$1 AND function_num=$2;`,
-      [workflowID, funcNum],
-    );
-
-    if (rows.length !== 1) {
-      return undefined;
-    }
-
-    if (rows[0].output === null) {
-      return undefined;
-    }
-
-    return { res: SuperJSON.parse(rows[0].output) };
-  }
-
-  async #recordOutput<R>(client: DataSource, workflowID: string, funcNum: number, output: R): Promise<void> {
-    const serialOutput = SuperJSON.stringify(output);
-    await client.query<{ rows: transaction_completion[] }>(
-      `INSERT INTO dbos.transaction_completion (
-        workflow_id, 
-        function_num,
-        output,
-        created_at
-      ) VALUES ($1, $2, $3, $4)`,
-      [workflowID, funcNum, serialOutput, Date.now()],
-    );
-  }
-
-  async #recordError<R>(client: DataSource, workflowID: string, funcNum: number, error: R): Promise<void> {
-    const serialError = SuperJSON.stringify(error);
-    await client.query<{ rows: transaction_completion[] }>(
-      `INSERT INTO dbos.transaction_completion (
-        workflow_id, 
-        function_num,
-        error,
-        created_at
-      ) VALUES ($1, $2, $3, $4)`,
-      [workflowID, funcNum, serialError, Date.now()],
-    );
-  }
-
-  /* Required by base class */
-  async invokeTransactionFunction<This, Args extends unknown[], Return>(
-    config: TypeOrmTransactionConfig,
-    target: This,
-    func: (this: This, ...args: Args) => Promise<Return>,
-    ...args: Args
-  ): Promise<Return> {
-    const isolationLevel = config?.isolationLevel ?? 'SERIALIZABLE';
-
-    const readOnly = config?.readOnly ? true : false;
-
-    const wfid = DBOS.workflowID!;
-    const funcnum = DBOS.stepID!;
-    const funcname = func.name;
-
-    // Retry loop if appropriate
-    let retryWaitMillis = 1;
-    const backoffFactor = 1.5;
-    const maxRetryWaitMs = 2000; // Maximum wait 2 seconds.
-    const shouldCheckOutput = false;
-
-    if (this.dataSource === undefined) {
-      throw new Error.DBOSInvalidWorkflowTransitionError('Invalid use of Datasource');
-    }
-
-    while (true) {
-      let failedForRetriableReasons = false;
-
-      try {
-        const result = this.dataSource.transaction(isolationLevel, async (transactionEntityManager: EntityManager) => {
-          if (this.dataSource === undefined) {
-            throw new Error.DBOSInvalidWorkflowTransitionError('Invalid use of Datasource');
-          }
-
-          if (shouldCheckOutput && !readOnly && wfid) {
-            const executionResult = await this.#checkExecution<Return>(this.dataSource, wfid, funcnum);
-
-            if (executionResult) {
-              DBOS.span?.setAttribute('cached', true);
-              return executionResult.res;
-            }
-          }
-
-          const result = await asyncLocalCtx.run({ typeOrmEntityManager: transactionEntityManager }, async () => {
-            return await func.call(target, ...args);
-          });
-
-          // Save result
-          try {
-            if (!readOnly && wfid) {
-              await this.#recordOutput(this.dataSource, wfid, funcnum, result);
-            }
-          } catch (e) {
-            const error = e as Error;
-            await this.#recordError(this.dataSource, wfid, funcnum, error);
-
-            // Aside from a connectivity error, two kinds of error are anticipated here:
-            //  1. The transaction is marked failed, but the user code did not throw.
-            //      Bad on them.  We will throw an error (this will get recorded) and not retry.
-            //  2. There was a key conflict in the statement, and we need to use the fetched output
-            if (isPGFailedSqlTransactionError(error)) {
-              DBOS.logger.error(
-                `In workflow ${wfid}, Postgres aborted a transaction but the function '${funcname}' did not raise an exception.  Please ensure that the transaction method raises an exception if the database transaction is aborted.`,
-              );
-              failedForRetriableReasons = false;
-              throw new Error.DBOSFailedSqlTransactionError(wfid, funcname);
-            } else if (isPGKeyConflictError(error)) {
-              throw new Error.DBOSWorkflowConflictError(
-                `In workflow ${wfid}, Postgres raised a key conflict error in transaction '${funcname}'.  This is not retriable, but the output will be fetched from the database.`,
-              );
-            } else {
-              DBOS.logger.error(`Unexpected error raised in transaction '${funcname}: ${error}`);
-              failedForRetriableReasons = false;
-              throw error;
-            }
-          }
-
-          return result;
-        });
-
-        return result;
-      } catch (e) {
-        const err = e as Error;
-        if (failedForRetriableReasons || isPGRetriableTransactionError(err)) {
-          DBOS.span?.addEvent('TXN SERIALIZATION FAILURE', { retryWaitMillis: retryWaitMillis }, performance.now());
-          // Retry serialization failures.
-          await DBOS.sleepms(retryWaitMillis);
-          retryWaitMillis *= backoffFactor;
-          retryWaitMillis = retryWaitMillis < maxRetryWaitMs ? retryWaitMillis : maxRetryWaitMs;
-          continue;
-        } else {
-          throw err;
-        }
-      }
-    }
-  }
-}
-
-export class TypeOrmDataSource implements DBOSDataSource<TypeOrmTransactionConfig> {
-  #provider: TypeOrmDSTH;
-  constructor(
-    readonly name: string,
-    readonly config: PoolConfig,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    readonly entities: Function[],
-  ) {
-    this.#provider = new TypeOrmDSTH(name, config, entities);
-    registerDataSource(this.#provider);
-  }
-
-  // User calls this... DBOS not directly involved...
-  static get entityManager(): EntityManager {
-    const ctx = assertCurrentDSContextStore();
-    if (!DBOS.isInTransaction())
-      throw new Error.DBOSInvalidWorkflowTransitionError(
-        'Invalid use of `TypeOrmDataSource.entityManager` outside of a `transaction`',
-      );
-    return ctx.typeOrmEntityManager;
-  }
-
-  async initializeInternalSchema(): Promise<void> {
-    const ds = await this.#provider.createInstance();
-
-    try {
-      await ds.query(createTransactionCompletionSchemaPG);
-      await ds.query(createTransactionCompletionTablePG);
-    } catch (e) {
-      const error = e as Error;
-      throw new Error.DBOSError(`Unexpected error initializing schema: ${error.message}`);
-    } finally {
-      try {
-        await ds.destroy();
-      } catch (e) {}
-    }
-  }
-
-  /**
-   * Run `callback` as a transaction against this DataSource
-   * @param callback Function to run within a transactional context
-   * @param funcName Name to record for the transaction
-   * @param config Transaction configuration (isolation, etc)
-   * @returns Return value from `callback`
-   */
-  async runTransaction<T>(callback: () => Promise<T>, funcName: string, config?: TypeOrmTransactionConfig) {
-    return await runTransaction(callback, funcName, { dsName: this.name, config });
-  }
-
-  /**
-   * Register function as DBOS transaction, to be called within the context
-   *  of a transaction on this data source.
-   *
-   * @param func Function to wrap
-   * @param target Name of function
-   * @param config Transaction settings
-   * @returns Wrapped function, to be called instead of `func`
-   */
-  registerTransaction<This, Args extends unknown[], Return>(
-    func: (this: This, ...args: Args) => Promise<Return>,
-    name: string,
-    config?: TypeOrmTransactionConfig,
-  ): (this: This, ...args: Args) => Promise<Return> {
-    return registerTransaction(this.name, func, { name }, config);
-  }
-
-  /**
-   * Decorator establishing function as a transaction
-   */
-  transaction(config?: TypeOrmTransactionConfig) {
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const ds = this;
-    return function decorator<This, Args extends unknown[], Return>(
-      _target: object,
-      propertyKey: string,
-      descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>,
-    ) {
-      if (!descriptor.value) {
-        throw new Error.DBOSError('Use of decorator when original method is undefined');
-      }
-
-      descriptor.value = ds.registerTransaction(descriptor.value, propertyKey.toString(), config);
-
-      return descriptor;
-    };
-  }
-
-  /**
-   * For testing: Use DataSource.syncronize to install the user schema
-   */
-  async createSchema() {
-    const ds = await this.#provider.createInstance();
-    try {
-      await ds.synchronize();
-    } finally {
-      await ds.destroy();
-    }
-  }
-}

package/tests/testutils.ts

@@ -1,30 +0,0 @@
-import { Client } from 'pg';
-import { DBOSConfig } from '@dbos-inc/dbos-sdk';
-
-export async function setUpDBOSTestDb(config: DBOSConfig) {
-  const pgSystemClient = new Client({
-    user: config.poolConfig?.user,
-    port: config.poolConfig?.port,
-    host: config.poolConfig?.host,
-    password: config.poolConfig?.password,
-    database: 'postgres',
-  });
-
-  try {
-    await pgSystemClient.connect();
-    await pgSystemClient.query(`DROP DATABASE IF EXISTS ${config.poolConfig?.database};`);
-    await pgSystemClient.query(`CREATE DATABASE ${config.poolConfig?.database};`);
-    await pgSystemClient.query(`DROP DATABASE IF EXISTS ${config.system_database};`);
-    await pgSystemClient.end();
-  } catch (e) {
-    if (e instanceof AggregateError) {
-      console.error(`Test database setup failed: AggregateError containing ${e.errors.length} errors:`);
-      e.errors.forEach((err, index) => {
-        console.error(`  Error ${index + 1}:`, err);
-      });
-    } else {
-      console.error(`Test database setup failed:`, e);
-    }
-    throw e;
-  }
-}