updates

src/dwn-server.ts

@@ -14,7 +14,7 @@ import { HttpApi } from './http-api.js';
 import { RegistrationManager } from './registration/registration-manager.js';
 import { WsApi } from './ws-api.js';
 import { Dwn, EventEmitterStream } from '@tbd54566975/dwn-sdk-js';
-import { setProcessHandlers, unsetProcessHandlers } from './process-handlers.js';
+import { removeProcessHandlers, setProcessHandlers } from './process-handlers.js';
 
 /**
  * Options for the DwnServer constructor.
@@ -31,7 +31,10 @@ export type DwnServerOptions = {
   config?: DwnServerConfig;
 };
 
-export enum DwnServerState {
+/**
+ * State of the DwnServer, either Stopped or Started, to help short-circuit start and stop logic.
+ */
+enum DwnServerState {
   Stopped,
   Started
 }
@@ -135,7 +138,7 @@ export class DwnServer {
     }
 
     await this.dwn.close();
-    await this.#httpApi.stop();
+    await this.#httpApi.close();
 
     // close WebSocket server if it was initialized
     if (this.#wsApi !== undefined) {
@@ -148,7 +151,7 @@ export class DwnServer {
       });
     });
 
-    unsetProcessHandlers(this.processHandlers);
+    removeProcessHandlers(this.processHandlers);
 
     this.serverState = DwnServerState.Stopped;
   }

src/http-api.ts

@@ -470,7 +470,7 @@ export class HttpApi {
   /**
    * Stops the HTTP API endpoint.
    */
-  async stop(): Promise<void> {
+  async close(): Promise<void> {
     // promisify http.Server.close() and await on it
     await new Promise<void>((resolve, reject) => {
       this.#server.close((err?: Error) => {

src/process-handlers.ts

@@ -13,7 +13,6 @@ export type ProcessHandlers = {
   sigtermHandler: () => Promise<void>
 };
 
-
 export const setProcessHandlers = (dwnServer: DwnServer): ProcessHandlers => {
   const unhandledRejectionHandler = (reason: any, promise: Promise<any>): void => {
     console.error(
@@ -51,7 +50,7 @@ export const setProcessHandlers = (dwnServer: DwnServer): ProcessHandlers => {
   };
 };
 
-export const unsetProcessHandlers = (handlers: ProcessHandlers): void => {
+export const removeProcessHandlers = (handlers: ProcessHandlers): void => {
   const { 
     unhandledRejectionHandler, 
     uncaughtExceptionHandler, 

src/registration/registration-store.ts

@@ -67,10 +67,6 @@ export class RegistrationStore {
 
     return result[0];
   }
-
-  public async close(): Promise<void> {
-    this.db.destroy();
-  }
 }
 
 interface RegisteredTenants {

tests/connection/connection-manager.spec.ts

@@ -31,7 +31,7 @@ describe('InMemoryConnectionManager', () => {
   afterEach(async () => {
     await connectionManager.closeAll();
     await dwn.close();
-    await httpApi.stop();
+    await httpApi.close();
     await wsApi.close();
     sinon.restore();
   });

tests/http-api.spec.ts

@@ -81,7 +81,7 @@ describe('http api', function () {
   });
 
   afterEach(async function () {
-    await httpApi.stop();
+    await httpApi.close();
   });
 
   after(function () {
@@ -1057,7 +1057,7 @@ describe('http api', function () {
 
 
       // start server without websocket support enabled
-      await httpApi.stop();
+      await httpApi.close();
 
       config.webSocketSupport = false;
       httpApi = await HttpApi.create(config, dwn, registrationManager);
@@ -1075,7 +1075,7 @@ describe('http api', function () {
     });
 
     it('verify /info still returns when package.json file does not exist', async function () {
-      await httpApi.stop();
+      await httpApi.close();
 
       // set up spy to check for an error log by the server
       const logSpy = sinon.spy(log, 'error');
@@ -1106,7 +1106,7 @@ describe('http api', function () {
     });
 
     it('verify /info returns server name from config', async function () {
-      await httpApi.stop();
+      await httpApi.close();
 
       // set a custom name for the `serverName`
       const serverName = config.serverName;

tests/ws-api.spec.ts

@@ -45,7 +45,7 @@ describe('websocket api', function () {
 
   afterEach(async function () {
     await wsApi.close();
-    await httpApi.stop();
+    await httpApi.close();
     await dwn.close();
   });