node-opcua-server 2.132.0 → 2.134.0

package/source/opcua_server.ts

@@ -2,10 +2,6 @@
 /**
  * @module node-opcua-server
  */
-// tslint:disable:no-console
-// tslint:disable:max-line-length
-// tslint:disable:unified-signatures
-
 import { randomBytes } from "crypto";
 import { EventEmitter } from "events";
 import { callbackify, types } from "util";
@@ -44,7 +40,7 @@ import {
 } from "node-opcua-address-space";
 import { getDefaultCertificateManager, OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { ServerState } from "node-opcua-common";
-import { Certificate, exploreCertificate, Nonce } from "node-opcua-crypto";
+import { Certificate, exploreCertificate, Nonce } from "node-opcua-crypto/web";
 import {
     AttributeIds,
     filterDiagnosticOperationLevel,
@@ -422,12 +418,7 @@ function monitoredItem_read_and_record_value(
 }
 
 /*== private
- * @method monitoredItem_read_and_record_value_async
  * this method applies to Variable Values attribute
- * @param self
- * @param oldValue
- * @param node
- * @param itemToMonitor
  * @private
  */
 function monitoredItem_read_and_record_value_async(
@@ -928,11 +919,6 @@ export interface OPCUAServerOptions extends OPCUABaseServerOptions, OPCUAServerE
      * @default false
      */
     skipOwnNamespace?: boolean;
-
-    /**
-     * @private
-     * @optional
-     */
     transportSettings?: IServerTransportSettings;
 }
 
@@ -1303,7 +1289,6 @@ export class OPCUAServer extends OPCUABaseServer {
 
     /**
      * Initiate the server by starting all its endpoints
-     * @async
      */
     public start(): Promise<void>;
     public start(done: () => void): void;
@@ -1341,8 +1326,6 @@ export class OPCUAServer extends OPCUABaseServer {
 
     /**
      * shutdown all server endpoints
-     * @method shutdown
-     * @async
      * @param  timeout the timeout (in ms) before the server is actually shutdown
      *
      * @example
@@ -1472,7 +1455,7 @@ export class OPCUAServer extends OPCUABaseServer {
 
     /**
      * create and register a new session
-     * @internal
+     * @private
      */
     protected createSession(options: CreateSessionOption): ServerSession {
         /* istanbul ignore next */
@@ -1484,7 +1467,6 @@ export class OPCUAServer extends OPCUABaseServer {
 
     /**
      * retrieve a session by authentication token
-     * @internal
      * @private
      */
     public getSession(authenticationToken: NodeId, activeOnly?: boolean): ServerSession | null {
@@ -1496,7 +1478,7 @@ export class OPCUAServer extends OPCUABaseServer {
      * @param channel
      * @param clientCertificate
      * @param clientNonce
-     * @internal
+     * @private
      */
     protected computeServerSignature(
         channel: ServerSecureChannelLayer,
@@ -1511,7 +1493,6 @@ export class OPCUAServer extends OPCUABaseServer {
      * @param session
      * @param channel
      * @param clientSignature
-     * @internal
      */
     protected verifyClientSignature(
         session: ServerSession,
@@ -2086,7 +2067,6 @@ export class OPCUAServer extends OPCUABaseServer {
     // reject requests sent via the old SecureChannel.
     /**
      *
-     * @method _on_ActivateSessionRequest
      * @private
      *
      *
@@ -2288,7 +2268,6 @@ export class OPCUAServer extends OPCUABaseServer {
 
     /**
      * ensure that action is performed on a valid session object,
-     * @method _apply_on_SessionObject
      * @param ResponseClass the constructor of the response Class
      * @param message
      * @param channel
@@ -2518,7 +2497,6 @@ export class OPCUAServer extends OPCUABaseServer {
         await this.engine.closeSession(authenticationToken, deleteSubscriptions, reason);
     }
     /**
-     * @method _on_CloseSessionRequest
      * @param message
      * @param channel
      * @private
@@ -2569,7 +2547,6 @@ export class OPCUAServer extends OPCUABaseServer {
 
     // browse services
     /**
-     * @method _on_BrowseRequest
      * @param message
      * @param channel
      * @private
@@ -2646,10 +2623,6 @@ export class OPCUAServer extends OPCUABaseServer {
     }
 
     /**
-     * @method _on_BrowseNextRequest
-     * @param message
-     * @param channel
-     * @private
      */
     protected _on_BrowseNextRequest(message: Message, channel: ServerSecureChannelLayer): void {
         const request = message.request as BrowseNextRequest;

package/source/register_server_manager.ts

@@ -25,7 +25,7 @@ import {
     RegisterServerResponse
 } from "node-opcua-service-discovery";
 import { ApplicationType, EndpointDescription, MdnsDiscoveryConfiguration, RegisteredServerOptions } from "node-opcua-types";
-import { exploreCertificate } from "node-opcua-crypto";
+import { exploreCertificate } from "node-opcua-crypto/web";
 import { OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { IRegisterServerManager } from "./i_register_server_manager";
 
@@ -290,10 +290,6 @@ let g_registeringClientCounter = 0;
  *
  *
  * (LDS => Local Discovery Server)
- * @param options
- * @param options.server {OPCUAServer}
- * @param options.discoveryServerEndpointUrl {String}
- * @constructor
  */
 export class RegisterServerManager extends EventEmitter implements IRegisterServerManager {
     public discoveryServerEndpointUrl: string;

package/source/server_end_point.ts

@@ -11,7 +11,7 @@ import async from "async";
 
 import { assert } from "node-opcua-assert";
 import { OPCUACertificateManager } from "node-opcua-certificate-manager";
-import { Certificate, PrivateKey, makePrivateKeyThumbPrint, makeSHA1Thumbprint, split_der } from "node-opcua-crypto";
+import { Certificate, PrivateKey, makeSHA1Thumbprint, split_der } from "node-opcua-crypto/web";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { getFullyQualifiedDomainName, resolveFullyQualifiedDomainName } from "node-opcua-hostname";
 import {
@@ -307,8 +307,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     public toString(): string {
-        const privateKeyThumpPrint = makePrivateKeyThumbPrint(this.getPrivateKey());
-
+    
         const txt =
             " end point" +
             this._counter +
@@ -317,9 +316,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
             " l = " +
             this._endpoints.length +
             " " +
-            makeSHA1Thumbprint(this.getCertificateChain()).toString("hex") +
-            " " +
-            privateKeyThumpPrint.toString("hex");
+            makeSHA1Thumbprint(this.getCertificateChain()).toString("hex")          
         return txt;
     }
 
@@ -356,10 +353,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     /**
-     * @method getEndpointDescription
-     * @param securityMode
-     * @param securityPolicy
-     * @return endpoint_description {EndpointDescription|null}
      */
     public getEndpointDescription(
         securityMode: MessageSecurityMode,
@@ -504,8 +497,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     /**
-     * @method listen
-     * @async
      */
     public listen(callback: (err?: Error) => void): void {
         assert(typeof callback === "function");
@@ -585,8 +576,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     /**
-     * @method shutdown
-     * @async
      */
     public shutdown(callback: (err?: Error) => void): void {
         debugLog("OPCUAServerEndPoint#shutdown ");
@@ -617,9 +606,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     /**
-     * @method start
-     * @async
-     * @param callback
      */
     public start(callback: (err?: Error) => void): void {
         assert(typeof callback === "function");
@@ -824,8 +810,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     /**
-     * @method _registerChannel
-     * @param channel
      * @private
      */
     private _registerChannel(channel: ServerSecureChannelLayer) {
@@ -854,9 +838,6 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     /**
-     * @method _unregisterChannel
-     * @param channel
-     * @private
      */
     private _unregisterChannel(channel: ServerSecureChannelLayer): void {
         debugLog("_un-registerChannel channel.hashKey", channel.hashKey);