Added callback for soap.listen (#1055)

* Added on ready callback for soap.listen * Fix: removed early return in wsdl.onReady
vpulim · Mar 28, 2019 · 33e170e · 33e170e
1 parent 0144895
commit 33e170e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -81,6 +81,7 @@ export class Server extends EventEmitter {
   private onewayOptions: IOneWayOptions & { statusCode?: number; };
   private enableChunkedEncoding: boolean;
   private soapHeaders: any[];
+  private callback?: (err: any, res: any) => void;
 
   constructor(server: ServerType, path: string, services: IServices, wsdl: WSDL, options?: IServerOptions) {
     super();
@@ -97,7 +98,7 @@ export class Server extends EventEmitter {
     this.onewayOptions = options && options.oneWay || {};
     this.enableChunkedEncoding =
       options.enableChunkedEncoding === undefined ? true : !!options.enableChunkedEncoding;
-
+    this.callback = options.callback ? options.callback : () => { };
     if (path[path.length - 1] !== '/') {
       path += '/';
     }
@@ -113,6 +114,7 @@ export class Server extends EventEmitter {
           }
           this._requestListener(req, res);
         });
+        this.callback(err, this);
       } else {
         const listeners = server.listeners('request').slice();
         server.removeAllListeners('request');
@@ -135,6 +137,7 @@ export class Server extends EventEmitter {
             }
           }
         });
+        this.callback(err, this);
       }
     });
 

diff --git a/src/soap.ts b/src/soap.ts
@@ -98,9 +98,9 @@ export function createClientAsync(url: string, options: IOptions, endpoint?: str
   });
 }
 
-export function listen(server: ServerType, path: string, services: IServices, wsdl: string): Server;
+export function listen(server: ServerType, path: string, services: IServices, wsdl: string, callback?: (err: any, res: any) => void): Server;
 export function listen(server: ServerType, options: IServerOptions): Server;
-export function listen(server: ServerType, p2: string | IServerOptions, services?: IServices, xml?: string): Server {
+export function listen(server: ServerType, p2: string | IServerOptions, services?: IServices, xml?: string, callback?: (err: any, res: any) => void): Server {
   let options: IServerOptions;
   let path: string;
   let uri = '';
@@ -120,6 +120,7 @@ export function listen(server: ServerType, p2: string | IServerOptions, services
     options = {
       path: p2,
       services: services,
+      callback: callback,
     };
   }
 

diff --git a/src/types.ts b/src/types.ts
@@ -128,6 +128,7 @@ export interface IServerOptions extends IWsdlBaseOptions {
   services: IServices;
   xml?: string;
   uri?: string;
+  callback?: (err: any, res: any) => void;
   /** suppress the full stack trace for error messages. */
   suppressStack?: boolean;
   oneWay?: IOneWayOptions;

diff --git a/test/server-options-test.js b/test/server-options-test.js
@@ -104,6 +104,37 @@ describe('SOAP Server with Options', function() {
     });
   });
 
+  it('should start server with callback in options parameter', function(done) {
+    test.server.listen(15099, null, null, function() {
+      test.soapServer = soap.listen(test.server, {
+        path: '/stockquote',
+        services: test.service,
+        xml: test.wsdl,
+        uri: __dirname + '/wsdl/strict/',
+        escapeXML: false,
+        callback: function (err) {
+          assert.ifError(err);
+          done();
+        }
+      }, test.service, test.wsdl);
+    });
+  });
+
+  it('should start server with callback as normal parameter', function(done) {
+    test.server.listen(15099, null, null, function () {
+      test.soapServer = soap.listen(
+        test.server,
+        "/stockquote",
+        test.service,
+        test.wsdl,
+        function (err) {
+          assert.ifError(err);
+          done();
+        }
+      );
+    });
+  });
+
   it('should be running with escapeXML false', function(done) {
     test.server.listen(15099, null, null, function() {
       test.soapServer = soap.listen(test.server, {