@memberjunction/server 1.0.6 → 1.0.7-next.0

package/src/index.ts

@@ -1,137 +1,133 @@
-import dotenv from 'dotenv';
-
-dotenv.config();
-
-import { expressMiddleware } from '@apollo/server/express4';
-import { mergeSchemas } from '@graphql-tools/schema';
-import { Metadata } from '@memberjunction/core';
-import { setupSQLServerClient, SQLServerProviderConfigData } from '@memberjunction/sqlserver-dataprovider';
-import { json } from 'body-parser';
-import cors from 'cors';
-import express from 'express';
-import { globSync } from 'fast-glob';
-import { useServer } from 'graphql-ws/lib/use/ws';
-import { createServer } from 'node:http';
-import { sep } from 'node:path';
-import 'reflect-metadata';
-import { ReplaySubject } from 'rxjs';
-import { BuildSchemaOptions, buildSchemaSync, GraphQLTimestamp } from 'type-graphql';
-import { DataSource } from 'typeorm';
-import { WebSocketServer } from 'ws';
-import buildApolloServer from './apolloServer';
-import { configInfo, graphqlPort, graphqlRootPath, mj_core_schema, websiteRunFromPackage } from './config';
-import { contextFunction, getUserPayload } from './context';
-import { publicDirective } from './directives';
-import orm from './orm';
-
-const cacheRefreshInterval = configInfo.databaseSettings.metadataCacheRefreshInterval;
-
-export { MaxLength } from 'class-validator';
-export * from 'type-graphql';
-export { NewUserBase } from './auth/newUsers';
-export { configInfo } from './config';
-export * from './directives';
-export * from './entitySubclasses/userViewEntity.server';
-export * from './types';
-export { TokenExpiredError } from './auth';
-
-export * from './generic/PushStatusResolver';
-export * from './generic/ResolverBase';
-export * from './generic/RunViewResolver';
-
-export * from './resolvers/AskSkipResolver';
-export * from './resolvers/ColorResolver';
-export * from './resolvers/DatasetResolver';
-export * from './resolvers/EntityRecordNameResolver';
-//export * from '../../MJAPI/src/resolvers/EntityResolver';
-export * from './resolvers/MergeRecordsResolver';
-export * from './resolvers/ReportResolver';
-
-export * from './generated/generated'
-
-
-//export * from '../../MJAPI/src/resolvers/UserFavoriteResolver';
-//export * from '../../MJAPI/src/resolvers/UserViewResolver';
-
-import { resolve } from 'node:path';
-
-const localPath = (p: string) => resolve(__dirname, p);
-
-export const serve = async (resolverPaths: Array<string>) => {
-  const localResolverPaths = [
-    'resolvers/**/*Resolver.{js,ts}',
-    'generic/*Resolver.{js,ts}',
-    'generated/generated.{js,ts}'
-  ].map(localPath);
-
-  const combinedResolverPaths = [...resolverPaths, ...localResolverPaths];
-
-  const replaceBackslashes = sep === '\\';
-  const paths = combinedResolverPaths.flatMap((path) => globSync(replaceBackslashes ? path.replace(/\\/g, '/') : path));
-  if (paths.length === 0) {
-    console.warn(`No resolvers found in ${combinedResolverPaths.join(', ')}`);
-    console.log({ combinedResolverPaths, paths, cwd: process.cwd() });
-  }
-
-  const dataSource = new DataSource(orm(paths));
-  const setupComplete$ = new ReplaySubject(1);
-  await dataSource.initialize();
-
-  const config = new SQLServerProviderConfigData(dataSource, '', mj_core_schema, cacheRefreshInterval);
-  await setupSQLServerClient(config); // datasource is already initialized, so we can setup the client right away
-  const md = new Metadata();
-  console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);
-
-  setupComplete$.next(true);
-
-  const dynamicModules = await Promise.all(paths.map((modulePath) => import(modulePath.replace(/\.[jt]s$/, ''))));
-  const resolvers = dynamicModules.flatMap((module) =>
-    Object.values(module).filter((value) => typeof value === 'function')
-  ) as BuildSchemaOptions['resolvers'];
-
-  const schema = publicDirective.transformer(
-    mergeSchemas({
-      schemas: [
-        buildSchemaSync({
-          resolvers,
-          validate: false,
-          scalarsMap: [{ type: Date, scalar: GraphQLTimestamp }],
-          emitSchemaFile: websiteRunFromPackage !== 1,
-        }),
-      ],
-      typeDefs: [publicDirective.typeDefs],
-    })
-  );
-
-  const app = express();
-  const httpServer = createServer(app);
-
-  const webSocketServer = new WebSocketServer({ server: httpServer, path: graphqlRootPath });
-  const serverCleanup = useServer(
-    {
-      schema,
-      context: async ({ connectionParams }) => {
-        const userPayload = await getUserPayload(String(connectionParams?.Authorization), undefined, dataSource);
-        return { userPayload };
-      },
-    },
-    webSocketServer
-  );
-
-  const apolloServer = buildApolloServer({ schema }, { httpServer, serverCleanup });
-  await apolloServer.start();
-
-  app.use(
-    graphqlRootPath,
-    cors<cors.CorsRequest>(),
-    json({limit: '50mb'}),
-    expressMiddleware(apolloServer, {
-      context: contextFunction({ setupComplete$, dataSource }),
-    })
-  );
-
-  await new Promise<void>((resolve) => httpServer.listen({ port: graphqlPort }, resolve));
-  console.log(`🚀 Server ready at http://localhost:${graphqlPort}/`);
-};
-
-export default serve;
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+import { expressMiddleware } from '@apollo/server/express4';
+import { mergeSchemas } from '@graphql-tools/schema';
+import { Metadata } from '@memberjunction/core';
+import { setupSQLServerClient, SQLServerProviderConfigData } from '@memberjunction/sqlserver-dataprovider';
+import { json } from 'body-parser';
+import cors from 'cors';
+import express from 'express';
+import { globSync } from 'fast-glob';
+import { useServer } from 'graphql-ws/lib/use/ws';
+import { createServer } from 'node:http';
+import { sep } from 'node:path';
+import 'reflect-metadata';
+import { ReplaySubject } from 'rxjs';
+import { BuildSchemaOptions, buildSchemaSync, GraphQLTimestamp } from 'type-graphql';
+import { DataSource } from 'typeorm';
+import { WebSocketServer } from 'ws';
+import buildApolloServer from './apolloServer';
+import { configInfo, graphqlPort, graphqlRootPath, mj_core_schema, websiteRunFromPackage } from './config';
+import { contextFunction, getUserPayload } from './context';
+import { publicDirective } from './directives';
+import orm from './orm';
+
+const cacheRefreshInterval = configInfo.databaseSettings.metadataCacheRefreshInterval;
+
+export { MaxLength } from 'class-validator';
+export * from 'type-graphql';
+export { NewUserBase } from './auth/newUsers';
+export { configInfo } from './config';
+export * from './directives';
+export * from './entitySubclasses/userViewEntity.server';
+export * from './entitySubclasses/entityPermissions.server';
+export * from './types';
+export { TokenExpiredError } from './auth';
+
+export * from './generic/PushStatusResolver';
+export * from './generic/ResolverBase';
+export * from './generic/RunViewResolver';
+
+export * from './resolvers/AskSkipResolver';
+export * from './resolvers/ColorResolver';
+export * from './resolvers/DatasetResolver';
+export * from './resolvers/EntityRecordNameResolver';
+export * from './resolvers/MergeRecordsResolver';
+export * from './resolvers/ReportResolver';
+
+export * from './generated/generated'
+
+import { resolve } from 'node:path';
+
+const localPath = (p: string) => resolve(__dirname, p);
+
+export const serve = async (resolverPaths: Array<string>) => {
+  const localResolverPaths = [
+    'resolvers/**/*Resolver.{js,ts}',
+    'generic/*Resolver.{js,ts}',
+    'generated/generated.{js,ts}'
+  ].map(localPath);
+
+  const combinedResolverPaths = [...resolverPaths, ...localResolverPaths];
+
+  const replaceBackslashes = sep === '\\';
+  const paths = combinedResolverPaths.flatMap((path) => globSync(replaceBackslashes ? path.replace(/\\/g, '/') : path));
+  if (paths.length === 0) {
+    console.warn(`No resolvers found in ${combinedResolverPaths.join(', ')}`);
+    console.log({ combinedResolverPaths, paths, cwd: process.cwd() });
+  }
+
+  const dataSource = new DataSource(orm(paths));
+  const setupComplete$ = new ReplaySubject(1);
+  await dataSource.initialize();
+
+  const config = new SQLServerProviderConfigData(dataSource, '', mj_core_schema, cacheRefreshInterval);
+  await setupSQLServerClient(config); // datasource is already initialized, so we can setup the client right away
+  const md = new Metadata();
+  console.log(`Data Source has been initialized. ${md?.Entities ? md.Entities.length : 0} entities loaded.`);
+
+  setupComplete$.next(true);
+
+  const dynamicModules = await Promise.all(paths.map((modulePath) => import(modulePath.replace(/\.[jt]s$/, ''))));
+  const resolvers = dynamicModules.flatMap((module) =>
+    Object.values(module).filter((value) => typeof value === 'function')
+  ) as BuildSchemaOptions['resolvers'];
+
+  const schema = publicDirective.transformer(
+    mergeSchemas({
+      schemas: [
+        buildSchemaSync({
+          resolvers,
+          validate: false,
+          scalarsMap: [{ type: Date, scalar: GraphQLTimestamp }],
+          emitSchemaFile: websiteRunFromPackage !== 1,
+        }),
+      ],
+      typeDefs: [publicDirective.typeDefs],
+    })
+  );
+
+  const app = express();
+  const httpServer = createServer(app);
+
+  const webSocketServer = new WebSocketServer({ server: httpServer, path: graphqlRootPath });
+  const serverCleanup = useServer(
+    {
+      schema,
+      context: async ({ connectionParams }) => {
+        const userPayload = await getUserPayload(String(connectionParams?.Authorization), undefined, dataSource);
+        return { userPayload };
+      },
+    },
+    webSocketServer
+  );
+
+  const apolloServer = buildApolloServer({ schema }, { httpServer, serverCleanup });
+  await apolloServer.start();
+
+  app.use(
+    graphqlRootPath,
+    cors<cors.CorsRequest>(),
+    json({limit: '50mb'}),
+    expressMiddleware(apolloServer, {
+      context: contextFunction({ setupComplete$, dataSource }),
+    })
+  );
+
+  await new Promise<void>((resolve) => httpServer.listen({ port: graphqlPort }, resolve));
+  console.log(`🚀 Server ready at http://localhost:${graphqlPort}/`);
+};
+
+export default serve;

package/src/orm.ts

@@ -1,36 +1,36 @@
-import { DataSourceOptions } from 'typeorm';
-import { configInfo, dbDatabase, dbHost, dbPassword, dbPort, dbUsername, dbInstanceName, dbTrustServerCertificate } from './config';
-
-const orm = (entities: Array<string>): DataSourceOptions => {
-  const ormConfig = {
-    type: 'mssql' as const,
-    entities,
-    logging: false,
-    host: dbHost,
-    port: dbPort,
-    username: dbUsername,
-    password: dbPassword,
-    database: dbDatabase,
-    synchronize: false,
-    requestTimeout: configInfo.databaseSettings.requestTimeout,
-    connectionTimeout: configInfo.databaseSettings.connectionTimeout,
-    options: {}
-  };
-  if (dbInstanceName !== null && dbInstanceName !== undefined && dbInstanceName.trim().length > 0) {
-    ormConfig.options = {
-      ...ormConfig.options,
-      instanceName: dbInstanceName
-    };
-  }
-  if (dbTrustServerCertificate !== null && dbTrustServerCertificate !== undefined) {
-    ormConfig.options = {
-      ...ormConfig.options,
-      trustServerCertificate: dbTrustServerCertificate
-    };
-  }
-
-  //console.log({ ormConfig: { ...ormConfig, password: '***' } });
-  return ormConfig;
-};
-
-export default orm;
+import { DataSourceOptions } from 'typeorm';
+import { configInfo, dbDatabase, dbHost, dbPassword, dbPort, dbUsername, dbInstanceName, dbTrustServerCertificate } from './config';
+
+const orm = (entities: Array<string>): DataSourceOptions => {
+  const ormConfig = {
+    type: 'mssql' as const,
+    entities,
+    logging: false,
+    host: dbHost,
+    port: dbPort,
+    username: dbUsername,
+    password: dbPassword,
+    database: dbDatabase,
+    synchronize: false,
+    requestTimeout: configInfo.databaseSettings.requestTimeout,
+    connectionTimeout: configInfo.databaseSettings.connectionTimeout,
+    options: {}
+  };
+  if (dbInstanceName !== null && dbInstanceName !== undefined && dbInstanceName.trim().length > 0) {
+    ormConfig.options = {
+      ...ormConfig.options,
+      instanceName: dbInstanceName
+    };
+  }
+  if (dbTrustServerCertificate !== null && dbTrustServerCertificate !== undefined) {
+    ormConfig.options = {
+      ...ormConfig.options,
+      trustServerCertificate: dbTrustServerCertificate
+    };
+  }
+
+  //console.log({ ormConfig: { ...ormConfig, password: '***' } });
+  return ormConfig;
+};
+
+export default orm;