@memberjunction/server 0.9.74 → 0.9.75

package/dist/index.js

@@ -1,121 +1,121 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.serve = exports.configInfo = exports.NewUserBase = exports.MaxLength = void 0;
-const dotenv_1 = __importDefault(require("dotenv"));
-dotenv_1.default.config();
-const express4_1 = require("@apollo/server/express4");
-const schema_1 = require("@graphql-tools/schema");
-const core_1 = require("@memberjunction/core");
-const sqlserver_dataprovider_1 = require("@memberjunction/sqlserver-dataprovider");
-const body_parser_1 = require("body-parser");
-const cors_1 = __importDefault(require("cors"));
-const express_1 = __importDefault(require("express"));
-const fast_glob_1 = require("fast-glob");
-const node_path_1 = require("node:path");
-const ws_1 = require("graphql-ws/lib/use/ws");
-const node_http_1 = require("node:http");
-require("reflect-metadata");
-const rxjs_1 = require("rxjs");
-const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
-const ws_2 = require("ws");
-const apolloServer_1 = __importDefault(require("./apolloServer"));
-const config_1 = require("./config");
-const context_1 = require("./context");
-const directives_1 = require("./directives");
-const orm_1 = __importDefault(require("./orm"));
-const cacheRefreshInterval = config_1.configInfo.databaseSettings.metadataCacheRefreshInterval;
-var class_validator_1 = require("class-validator");
-Object.defineProperty(exports, "MaxLength", { enumerable: true, get: function () { return class_validator_1.MaxLength; } });
-__exportStar(require("type-graphql"), exports);
-var newUsers_1 = require("./auth/newUsers");
-Object.defineProperty(exports, "NewUserBase", { enumerable: true, get: function () { return newUsers_1.NewUserBase; } });
-var config_2 = require("./config");
-Object.defineProperty(exports, "configInfo", { enumerable: true, get: function () { return config_2.configInfo; } });
-__exportStar(require("./directives"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./entitySubclasses/userViewEntity.server"), exports);
-const serve = async (resolverPaths) => {
-    const replaceBackslashes = node_path_1.sep === '\\';
-    const paths = resolverPaths.flatMap((path) => (0, fast_glob_1.globSync)(replaceBackslashes ? path.replace(/\\/g, '/') : (0, fast_glob_1.globSync)(path)));
-    if (paths.length === 0) {
-        console.warn(`No resolvers found in ${resolverPaths.join(', ')}`);
-        console.log({ resolverPaths, paths, cwd: process.cwd() });
-    }
-    const dataSource = new typeorm_1.DataSource((0, orm_1.default)(paths));
-    const setupComplete$ = new rxjs_1.ReplaySubject(1);
-    dataSource
-        .initialize()
-        .then(async () => {
-        const config = new sqlserver_dataprovider_1.SQLServerProviderConfigData(dataSource, '', config_1.mj_core_schema, cacheRefreshInterval);
-        await (0, sqlserver_dataprovider_1.setupSQLServerClient)(config);
-        const md = new core_1.Metadata();
-        console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);
-        setupComplete$.next(true);
-    })
-        .catch((err) => {
-        console.error('Error during Data Source initialization', err);
-    });
-    const dynamicModules = await Promise.all(paths.map((modulePath) => { var _a; return _a = modulePath.replace(/\.[jt]s$/, ''), Promise.resolve().then(() => __importStar(require(_a))); }));
-    const resolvers = dynamicModules.flatMap((module) => Object.values(module).filter((value) => typeof value === 'function'));
-    const schema = directives_1.publicDirective.transformer((0, schema_1.mergeSchemas)({
-        schemas: [
-            (0, type_graphql_1.buildSchemaSync)({
-                resolvers,
-                validate: false,
-                scalarsMap: [{ type: Date, scalar: type_graphql_1.GraphQLTimestamp }],
-                emitSchemaFile: config_1.websiteRunFromPackage !== 1,
-            }),
-        ],
-        typeDefs: [directives_1.publicDirective.typeDefs],
-    }));
-    const app = (0, express_1.default)();
-    const httpServer = (0, node_http_1.createServer)(app);
-    const webSocketServer = new ws_2.WebSocketServer({ server: httpServer, path: config_1.graphqlRootPath });
-    const serverCleanup = (0, ws_1.useServer)({
-        schema,
-        context: async ({ connectionParams }) => {
-            const userPayload = await (0, context_1.getUserPayload)(String(connectionParams?.Authorization), undefined, dataSource);
-            return { userPayload };
-        },
-    }, webSocketServer);
-    const apolloServer = (0, apolloServer_1.default)({ schema }, { httpServer, serverCleanup });
-    await apolloServer.start();
-    app.use(config_1.graphqlRootPath, (0, cors_1.default)(), (0, body_parser_1.json)(), (0, express4_1.expressMiddleware)(apolloServer, {
-        context: (0, context_1.contextFunction)({ setupComplete$, dataSource }),
-    }));
-    await new Promise((resolve) => httpServer.listen({ port: config_1.graphqlPort }, resolve));
-    console.log(`🚀 Server ready at http://localhost:${config_1.graphqlPort}/`);
-};
-exports.serve = serve;
-exports.default = exports.serve;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serve = exports.configInfo = exports.NewUserBase = exports.MaxLength = void 0;
+const dotenv_1 = __importDefault(require("dotenv"));
+dotenv_1.default.config();
+const express4_1 = require("@apollo/server/express4");
+const schema_1 = require("@graphql-tools/schema");
+const core_1 = require("@memberjunction/core");
+const sqlserver_dataprovider_1 = require("@memberjunction/sqlserver-dataprovider");
+const body_parser_1 = require("body-parser");
+const cors_1 = __importDefault(require("cors"));
+const express_1 = __importDefault(require("express"));
+const fast_glob_1 = require("fast-glob");
+const node_path_1 = require("node:path");
+const ws_1 = require("graphql-ws/lib/use/ws");
+const node_http_1 = require("node:http");
+require("reflect-metadata");
+const rxjs_1 = require("rxjs");
+const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
+const ws_2 = require("ws");
+const apolloServer_1 = __importDefault(require("./apolloServer"));
+const config_1 = require("./config");
+const context_1 = require("./context");
+const directives_1 = require("./directives");
+const orm_1 = __importDefault(require("./orm"));
+const cacheRefreshInterval = config_1.configInfo.databaseSettings.metadataCacheRefreshInterval;
+var class_validator_1 = require("class-validator");
+Object.defineProperty(exports, "MaxLength", { enumerable: true, get: function () { return class_validator_1.MaxLength; } });
+__exportStar(require("type-graphql"), exports);
+var newUsers_1 = require("./auth/newUsers");
+Object.defineProperty(exports, "NewUserBase", { enumerable: true, get: function () { return newUsers_1.NewUserBase; } });
+var config_2 = require("./config");
+Object.defineProperty(exports, "configInfo", { enumerable: true, get: function () { return config_2.configInfo; } });
+__exportStar(require("./directives"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./entitySubclasses/userViewEntity.server"), exports);
+const serve = async (resolverPaths) => {
+    const replaceBackslashes = node_path_1.sep === '\\';
+    const paths = resolverPaths.flatMap((path) => (0, fast_glob_1.globSync)(replaceBackslashes ? path.replace(/\\/g, '/') : (0, fast_glob_1.globSync)(path)));
+    if (paths.length === 0) {
+        console.warn(`No resolvers found in ${resolverPaths.join(', ')}`);
+        console.log({ resolverPaths, paths, cwd: process.cwd() });
+    }
+    const dataSource = new typeorm_1.DataSource((0, orm_1.default)(paths));
+    const setupComplete$ = new rxjs_1.ReplaySubject(1);
+    dataSource
+        .initialize()
+        .then(async () => {
+        const config = new sqlserver_dataprovider_1.SQLServerProviderConfigData(dataSource, '', config_1.mj_core_schema, cacheRefreshInterval);
+        await (0, sqlserver_dataprovider_1.setupSQLServerClient)(config);
+        const md = new core_1.Metadata();
+        console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);
+        setupComplete$.next(true);
+    })
+        .catch((err) => {
+        console.error('Error during Data Source initialization', err);
+    });
+    const dynamicModules = await Promise.all(paths.map((modulePath) => { var _a; return _a = modulePath.replace(/\.[jt]s$/, ''), Promise.resolve().then(() => __importStar(require(_a))); }));
+    const resolvers = dynamicModules.flatMap((module) => Object.values(module).filter((value) => typeof value === 'function'));
+    const schema = directives_1.publicDirective.transformer((0, schema_1.mergeSchemas)({
+        schemas: [
+            (0, type_graphql_1.buildSchemaSync)({
+                resolvers,
+                validate: false,
+                scalarsMap: [{ type: Date, scalar: type_graphql_1.GraphQLTimestamp }],
+                emitSchemaFile: config_1.websiteRunFromPackage !== 1,
+            }),
+        ],
+        typeDefs: [directives_1.publicDirective.typeDefs],
+    }));
+    const app = (0, express_1.default)();
+    const httpServer = (0, node_http_1.createServer)(app);
+    const webSocketServer = new ws_2.WebSocketServer({ server: httpServer, path: config_1.graphqlRootPath });
+    const serverCleanup = (0, ws_1.useServer)({
+        schema,
+        context: async ({ connectionParams }) => {
+            const userPayload = await (0, context_1.getUserPayload)(String(connectionParams?.Authorization), undefined, dataSource);
+            return { userPayload };
+        },
+    }, webSocketServer);
+    const apolloServer = (0, apolloServer_1.default)({ schema }, { httpServer, serverCleanup });
+    await apolloServer.start();
+    app.use(config_1.graphqlRootPath, (0, cors_1.default)(), (0, body_parser_1.json)(), (0, express4_1.expressMiddleware)(apolloServer, {
+        context: (0, context_1.contextFunction)({ setupComplete$, dataSource }),
+    }));
+    await new Promise((resolve) => httpServer.listen({ port: config_1.graphqlPort }, resolve));
+    console.log(`🚀 Server ready at http://localhost:${config_1.graphqlPort}/`);
+};
+exports.serve = serve;
+exports.default = exports.serve;
 //# sourceMappingURL=index.js.map

package/dist/orm.js

@@ -1,34 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("./config");
-const orm = (entities) => {
-    const ormConfig = {
-        type: 'mssql',
-        entities,
-        logging: false,
-        host: config_1.dbHost,
-        port: config_1.dbPort,
-        username: config_1.dbUsername,
-        password: config_1.dbPassword,
-        database: config_1.dbDatabase,
-        synchronize: false,
-        requestTimeout: config_1.configInfo.databaseSettings.requestTimeout,
-        connectionTimeout: config_1.configInfo.databaseSettings.connectionTimeout,
-        options: {}
-    };
-    if (config_1.dbInstanceName !== null && config_1.dbInstanceName !== undefined && config_1.dbInstanceName.trim().length > 0) {
-        ormConfig.options = {
-            ...ormConfig.options,
-            instanceName: config_1.dbInstanceName
-        };
-    }
-    if (config_1.dbTrustServerCertificate !== null && config_1.dbTrustServerCertificate !== undefined) {
-        ormConfig.options = {
-            ...ormConfig.options,
-            trustServerCertificate: config_1.dbTrustServerCertificate
-        };
-    }
-    return ormConfig;
-};
-exports.default = orm;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_1 = require("./config");
+const orm = (entities) => {
+    const ormConfig = {
+        type: 'mssql',
+        entities,
+        logging: false,
+        host: config_1.dbHost,
+        port: config_1.dbPort,
+        username: config_1.dbUsername,
+        password: config_1.dbPassword,
+        database: config_1.dbDatabase,
+        synchronize: false,
+        requestTimeout: config_1.configInfo.databaseSettings.requestTimeout,
+        connectionTimeout: config_1.configInfo.databaseSettings.connectionTimeout,
+        options: {}
+    };
+    if (config_1.dbInstanceName !== null && config_1.dbInstanceName !== undefined && config_1.dbInstanceName.trim().length > 0) {
+        ormConfig.options = {
+            ...ormConfig.options,
+            instanceName: config_1.dbInstanceName
+        };
+    }
+    if (config_1.dbTrustServerCertificate !== null && config_1.dbTrustServerCertificate !== undefined) {
+        ormConfig.options = {
+            ...ormConfig.options,
+            trustServerCertificate: config_1.dbTrustServerCertificate
+        };
+    }
+    return ormConfig;
+};
+exports.default = orm;
 //# sourceMappingURL=orm.js.map

package/dist/types.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,75 +1,75 @@
-{
-  "name": "@memberjunction/server",
-  "version": "0.9.74",
-  "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
-  "author": "MemberJunction.com",
-  "license": "ISC",
-  "scripts": {
-    "clean": "rimraf dist",
-    "build": "rimraf dist && tsc",
-    "watch": "tsc -w",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "lint:eslint": "eslint \"**/*.{ts,js,}\" --max-warnings=0",
-    "lint:tsc": "tsc --noemit",
-    "lint": "concurrently \"npm:lint:eslint\" \"npm:lint:tsc\"",
-    "pretty": "prettier --write \"**/*.{ts,js,}\"",
-    "codegen": "cpy --flat ../codegen/output/entities/*.ts src/entities",
-    "postcodegen": "npm run pretty"
-  },
-  "dependencies": {
-    "@apollo/server": "^4.9.1",
-    "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/ai": "^0.9.79",
-    "@memberjunction/core": "^0.9.87",
-    "@memberjunction/core-entities": "^0.9.58",
-    "@memberjunction/global": "^0.9.90",
-    "@memberjunction/queue": "^0.9.80",
-    "@memberjunction/sqlserver-dataprovider": "^0.9.82",
-    "@types/axios": "^0.14.0",
-    "@types/cors": "^2.8.13",
-    "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^18.11.14",
-    "@types/ws": "^8.5.5",
-    "axios": "^1.4.0",
-    "body-parser": "^1.20.2",
-    "class-validator": "^0.14.0",
-    "cors": "^2.8.5",
-    "dotenv": "^16.0.3",
-    "env-var": "^7.3.0",
-    "express": "^4.18.2",
-    "fast-glob": "^3.3.1",
-    "graphql": "^16.8.0",
-    "graphql-ws": "^5.14.0",
-    "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^3.0.0",
-    "lru-cache": "^10.0.0",
-    "mssql": "^9.1.1",
-    "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.8.1",
-    "type-graphql": "^2.0.0-beta.3",
-    "typedi": "^0.10.0",
-    "typeorm": "^0.3.17",
-    "ws": "^8.13.0",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "concurrently": "^7.6.0",
-    "cpy-cli": "^4.2.0",
-    "eslint": "^8.29.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-typescript": "^3.5.2",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.1",
-    "rimraf": "^4.4.0",
-    "ts-node": "^10.9.1",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^4.9.4"
-  }
-}
+{
+  "name": "@memberjunction/server",
+  "version": "0.9.75",
+  "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
+  "main": "dist/index.js",
+  "types": "src/index.ts",
+  "author": "MemberJunction.com",
+  "license": "ISC",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "rimraf dist && tsc",
+    "watch": "tsc -w",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint:eslint": "eslint \"**/*.{ts,js,}\" --max-warnings=0",
+    "lint:tsc": "tsc --noemit",
+    "lint": "concurrently \"npm:lint:eslint\" \"npm:lint:tsc\"",
+    "pretty": "prettier --write \"**/*.{ts,js,}\"",
+    "codegen": "cpy --flat ../codegen/output/entities/*.ts src/entities",
+    "postcodegen": "npm run pretty"
+  },
+  "dependencies": {
+    "@apollo/server": "^4.9.1",
+    "@graphql-tools/utils": "^10.0.1",
+    "@memberjunction/ai": "^0.9.79",
+    "@memberjunction/core": "^0.9.87",
+    "@memberjunction/core-entities": "^0.9.58",
+    "@memberjunction/global": "^0.9.90",
+    "@memberjunction/queue": "^0.9.80",
+    "@memberjunction/sqlserver-dataprovider": "^0.9.82",
+    "@types/axios": "^0.14.0",
+    "@types/cors": "^2.8.13",
+    "@types/jsonwebtoken": "^8.5.9",
+    "@types/node": "^18.11.14",
+    "@types/ws": "^8.5.5",
+    "axios": "^1.4.0",
+    "body-parser": "^1.20.2",
+    "class-validator": "^0.14.0",
+    "cors": "^2.8.5",
+    "dotenv": "^16.0.3",
+    "env-var": "^7.3.0",
+    "express": "^4.18.2",
+    "fast-glob": "^3.3.1",
+    "graphql": "^16.8.0",
+    "graphql-ws": "^5.14.0",
+    "jsonwebtoken": "^8.5.1",
+    "jwks-rsa": "^3.0.0",
+    "lru-cache": "^10.0.0",
+    "mssql": "^9.1.1",
+    "reflect-metadata": "^0.1.13",
+    "rxjs": "^7.8.1",
+    "type-graphql": "2.0.0-beta.3",
+    "typedi": "^0.10.0",
+    "typeorm": "^0.3.17",
+    "ws": "^8.13.0",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "concurrently": "^7.6.0",
+    "cpy-cli": "^4.2.0",
+    "eslint": "^8.29.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-import-resolver-typescript": "^3.5.2",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.1",
+    "rimraf": "^4.4.0",
+    "ts-node": "^10.9.1",
+    "ts-node-dev": "^2.0.0",
+    "typescript": "^4.9.4"
+  }
+}

package/src/apolloServer/TransactionPlugin.ts

@@ -1,54 +1,54 @@
-import { ApolloServerPlugin } from '@apollo/server';
-import { DataSource } from 'typeorm';
-import { AppContext } from '../types';
-
-export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
-  async requestDidStart(requestContext) {
-    const start = Date.now();
-    const query = requestContext.request.query || '';
-    const isMutation = /^\s*mutation\b/i.test(query);
-
-    if (!isMutation) {
-      return;
-    }
-
-    // Start transaction, one or more mutations. If it is just one mutation, this trans wrapper isn't really needed
-    // but there's no good way to know if it's one or more mutations, so we just start a transaction anyway and it isn't terribly expensive
-    // to do so with SQL Server anyway.
-    const dataSource: DataSource = requestContext.contextValue.dataSource;
-    const queryRunner = dataSource.createQueryRunner();
-
-    requestContext.contextValue.queryRunner = queryRunner;
-    console.log('Starting transaction wrapper, time spent: ', Date.now() - start, 'ms ');
-    await queryRunner.startTransaction();
-
-    return {
-      executionDidStart: async () => {
-        return {
-          executionDidEnd: async (err) => {
-            try {
-              if (err) {
-                console.log(
-                  'Error in transaction, rolling back, time spent: ',
-                  Date.now() - start,
-                  'ms '
-                );
-                console.error('Rolling back transaction', err);
-                await queryRunner.rollbackTransaction();
-              } else {
-                console.log('Committing transaction, time spent: ', Date.now() - start, 'ms ');
-                await queryRunner.commitTransaction();
-              }
-            } catch (execErr) {
-              console.log('Execution Error, time spent: ', Date.now() - start, 'ms ');
-              console.error(execErr);
-            } finally {
-              await queryRunner.release();
-              console.log('Transaction complete, time spent: ', Date.now() - start, 'ms ');
-            }
-          },
-        };
-      },
-    };
-  },
-};
+import { ApolloServerPlugin } from '@apollo/server';
+import { DataSource } from 'typeorm';
+import { AppContext } from '../types';
+
+export const TransactionPlugin: ApolloServerPlugin<AppContext> = {
+  async requestDidStart(requestContext) {
+    const start = Date.now();
+    const query = requestContext.request.query || '';
+    const isMutation = /^\s*mutation\b/i.test(query);
+
+    if (!isMutation) {
+      return;
+    }
+
+    // Start transaction, one or more mutations. If it is just one mutation, this trans wrapper isn't really needed
+    // but there's no good way to know if it's one or more mutations, so we just start a transaction anyway and it isn't terribly expensive
+    // to do so with SQL Server anyway.
+    const dataSource: DataSource = requestContext.contextValue.dataSource;
+    const queryRunner = dataSource.createQueryRunner();
+
+    requestContext.contextValue.queryRunner = queryRunner;
+    console.log('Starting transaction wrapper, time spent: ', Date.now() - start, 'ms ');
+    await queryRunner.startTransaction();
+
+    return {
+      executionDidStart: async () => {
+        return {
+          executionDidEnd: async (err) => {
+            try {
+              if (err) {
+                console.log(
+                  'Error in transaction, rolling back, time spent: ',
+                  Date.now() - start,
+                  'ms '
+                );
+                console.error('Rolling back transaction', err);
+                await queryRunner.rollbackTransaction();
+              } else {
+                console.log('Committing transaction, time spent: ', Date.now() - start, 'ms ');
+                await queryRunner.commitTransaction();
+              }
+            } catch (execErr) {
+              console.log('Execution Error, time spent: ', Date.now() - start, 'ms ');
+              console.error(execErr);
+            } finally {
+              await queryRunner.release();
+              console.log('Transaction complete, time spent: ', Date.now() - start, 'ms ');
+            }
+          },
+        };
+      },
+    };
+  },
+};

package/src/apolloServer/index.ts

@@ -1,34 +1,34 @@
-import { ApolloServer, ApolloServerOptions } from '@apollo/server';
-import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
-import { PubSub } from 'graphql-subscriptions';
-import { Disposable } from 'graphql-ws';
-import { Server } from 'http';
-import { enableIntrospection } from '../config';
-import { AppContext } from '../types';
-import { TransactionPlugin } from './TransactionPlugin';
-
-const buildApolloServer = (
-  configOverride: ApolloServerOptions<AppContext>,
-  { httpServer, serverCleanup }: { httpServer: Server; serverCleanup: Disposable }
-) =>
-  new ApolloServer({
-    csrfPrevention: true,
-    cache: 'bounded',
-    plugins: [
-      ApolloServerPluginDrainHttpServer({ httpServer }),
-      TransactionPlugin,
-      {
-        async serverWillStart() {
-          return {
-            async drainServer() {
-              await serverCleanup.dispose();
-            },
-          };
-        },
-      },
-    ],
-    introspection: enableIntrospection,
-    ...configOverride,
-  });
-
+import { ApolloServer, ApolloServerOptions } from '@apollo/server';
+import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
+import { PubSub } from 'graphql-subscriptions';
+import { Disposable } from 'graphql-ws';
+import { Server } from 'http';
+import { enableIntrospection } from '../config';
+import { AppContext } from '../types';
+import { TransactionPlugin } from './TransactionPlugin';
+
+const buildApolloServer = (
+  configOverride: ApolloServerOptions<AppContext>,
+  { httpServer, serverCleanup }: { httpServer: Server; serverCleanup: Disposable }
+) =>
+  new ApolloServer({
+    csrfPrevention: true,
+    cache: 'bounded',
+    plugins: [
+      ApolloServerPluginDrainHttpServer({ httpServer }),
+      TransactionPlugin,
+      {
+        async serverWillStart() {
+          return {
+            async drainServer() {
+              await serverCleanup.dispose();
+            },
+          };
+        },
+      },
+    ],
+    introspection: enableIntrospection,
+    ...configOverride,
+  });
+
 export default buildApolloServer;