Refactor API server to not depend on Mockttp directly

Author: pimterry

src/api-server.ts

@@ -114,7 +114,7 @@ const INTERCEPTOR_TIMEOUT = 1000;
 const buildResolvers = (
     config: HtkConfig,
     interceptors: _.Dictionary<Interceptor>,
-    mockttpAdminServer: MockttpAdminServer,
+    ruleParamKeys: string[],
     eventEmitter: events.EventEmitter
 ) => {
     return {
@@ -140,7 +140,7 @@ const buildResolvers = (
                 return [`127.0.0.1:${dnsServer.address().port}`];
             },
             ruleParameterKeys: async (): Promise<String[]> => {
-                return mockttpAdminServer.ruleParameterKeys;
+                return ruleParamKeys;
             }
         },
 
@@ -276,14 +276,14 @@ export class HttpToolkitServerApi extends events.EventEmitter {
 
     private server: express.Application;
 
-    constructor(config: HtkConfig, mockttpAdminServer: MockttpAdminServer) {
+    constructor(config: HtkConfig, ruleParamKeys: string[]) {
         super();
 
         let interceptors = buildInterceptors(config);
 
         const schema = makeExecutableSchema({
             typeDefs,
-            resolvers: buildResolvers(config, interceptors, mockttpAdminServer, this)
+            resolvers: buildResolvers(config, interceptors, ruleParamKeys, this)
         });
 
         this.server = express();

src/index.ts

@@ -144,7 +144,7 @@ export async function runHTK(options: {
         configPath,
         authToken: options.authToken,
         https: httpsConfig
-    }, standalone);
+    }, standalone.ruleParameterKeys);
 
     const updateMutex = new Mutex();
     apiServer.on('update-requested', () => {