node-opcua-client 2.115.0 → 2.117.0

package/source/alarms_and_conditions/client_tools.ts

@@ -14,8 +14,9 @@ import { BrowsePathResult, makeBrowsePath } from "node-opcua-service-translate-b
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant } from "node-opcua-variant";
 import { Callback, ErrorCallback } from "node-opcua-status-code";
+import { ResponseCallback } from "node-opcua-pseudo-session";
 
-import { CallMethodRequestLike, ResponseCallback } from "../client_session";
+import { CallMethodRequestLike } from "../client_session";
 import { ClientSubscription } from "../client_subscription";
 import { ClientSessionImpl } from "../private/client_session_impl";
 import { ClientSubscriptionImpl } from "../private/client_subscription_impl";

package/source/client_base.ts

@@ -13,8 +13,8 @@ import { FindServersOnNetworkRequestOptions, FindServersRequestOptions, ServerOn
 import { ApplicationDescription, EndpointDescription } from "node-opcua-service-endpoints";
 import { ChannelSecurityToken, MessageSecurityMode } from "node-opcua-service-secure-channel";
 import { ErrorCallback } from "node-opcua-status-code";
+import { ResponseCallback } from "node-opcua-pseudo-session";
 
-import { ResponseCallback } from "./client_session";
 import { Request, Response } from "./common";
 
 export type FindServersRequestLike = FindServersRequestOptions;

package/source/client_session.ts

@@ -10,7 +10,16 @@ import { Certificate, Nonce } from "node-opcua-crypto";
 import { LocalizedTextLike } from "node-opcua-data-model";
 import { DataValue, TimestampsToReturn } from "node-opcua-data-value";
 import { NodeId, NodeIdLike } from "node-opcua-nodeid";
-import { IBasicSession } from "node-opcua-pseudo-session";
+import {
+    IBasicSession,
+    IBasicSessionBrowse,
+    IBasicSessionBrowseNext,
+    IBasicSessionCall,
+    IBasicSessionRead,
+    IBasicSessionTranslateBrowsePath,
+    IBasicSessionWrite,
+    ResponseCallback
+} from "node-opcua-pseudo-session";
 import { ErrorCallback } from "node-opcua-status-code";
 import { BrowseDescriptionOptions, BrowseResult } from "node-opcua-service-browse";
 import { CallMethodRequest, CallMethodRequestOptions, CallMethodResult } from "node-opcua-service-call";
@@ -75,14 +84,6 @@ export { ArgumentDefinition, CallMethodRequestLike, MethodId } from "node-opcua-
 
 import { ClientSubscription } from "./client_subscription";
 
-export type ResponseCallback<T> = (err: Error | null, response?: T) => void;
-
-export interface NodeAttributes {
-    nodeId: NodeId;
-    statusCode: StatusCode;
-
-    [key: string]: Variant | NodeId | StatusCode;
-}
 
 export interface MonitoredItemData {
     clientHandles: Uint32Array;
@@ -98,7 +99,6 @@ export interface CreateSubscriptionOptions {
     priority?: UInt8;
 }
 
-export type BrowseDescriptionLike = string | BrowseDescriptionOptions;
 export type DeleteMonitoredItemsRequestLike = DeleteMonitoredItemsRequestOptions;
 export type CreateSubscriptionRequestLike = CreateSubscriptionRequestOptions;
 export type DeleteSubscriptionsRequestLike = DeleteSubscriptionsRequestOptions;
@@ -167,7 +167,7 @@ export interface ClientSession extends EventEmitter {
 }
 
 // browse services
-export interface ClientSessionBrowseService {
+export interface ClientSessionBrowseService extends IBasicSessionBrowse, IBasicSessionBrowseNext {
     /**
      * the maximum number of reference that the server should return per browseResult
      * Continuous points will be return by server to allow retrieving remaining references
@@ -175,32 +175,10 @@ export interface ClientSessionBrowseService {
      */
     requestedMaxReferencesPerNode: number;
 
-    browse(nodeToBrowse: BrowseDescriptionLike, callback: ResponseCallback<BrowseResult>): void;
-
-    browse(nodesToBrowse: BrowseDescriptionLike[], callback: ResponseCallback<BrowseResult[]>): void;
-
-    browse(nodeToBrowse: BrowseDescriptionLike): Promise<BrowseResult>;
-
-    browse(nodesToBrowse: BrowseDescriptionLike[]): Promise<BrowseResult[]>;
-
-    browseNext(continuationPoint: Buffer, releaseContinuationPoints: boolean, callback: ResponseCallback<BrowseResult>): void;
-
-    browseNext(continuationPoints: Buffer[], releaseContinuationPoints: boolean, callback: ResponseCallback<BrowseResult[]>): void;
-
-    browseNext(continuationPoint: Buffer, releaseContinuationPoints: boolean): Promise<BrowseResult>;
-
-    browseNext(continuationPoints: Buffer[], releaseContinuationPoints: boolean): Promise<BrowseResult[]>;
-}
+  }
 
 // translate browsePathTo NodeId services
-export interface ClientSessionTranslateBrowsePathService {
-    translateBrowsePath(browsesPath: BrowsePath[], callback: ResponseCallback<BrowsePathResult[]>): void;
-
-    translateBrowsePath(browsePath: BrowsePath, callback: ResponseCallback<BrowsePathResult>): void;
-
-    translateBrowsePath(browsePath: BrowsePath): Promise<BrowsePathResult>;
-
-    translateBrowsePath(browsePaths: BrowsePath[]): Promise<BrowsePathResult[]>;
+export interface ClientSessionTranslateBrowsePathService extends IBasicSessionTranslateBrowsePath {
 }
 
 // query services
@@ -211,7 +189,7 @@ export interface ClientSessionQueryService {
 }
 
 // call services
-export interface ClientSessionCallService {
+export interface ClientSessionCallService extends IBasicSessionCall {
     /**
      *
      * @method call
@@ -269,13 +247,6 @@ export interface ClientSessionCallService {
      * ```
      */
 
-    call(methodToCall: CallMethodRequestLike, callback: (err: Error | null, result?: CallMethodResult) => void): void;
-
-    call(methodsToCall: CallMethodRequestLike[], callback: (err: Error | null, results?: CallMethodResult[]) => void): void;
-
-    call(methodToCall: CallMethodRequestLike): Promise<CallMethodResult>;
-
-    call(methodsToCall: CallMethodRequestLike[]): Promise<CallMethodResult[]>;
 
     getArgumentDefinition(methodId: MethodId): Promise<ArgumentDefinition>;
 
@@ -294,19 +265,8 @@ export interface ClientSessionRegisterService {
 }
 
 // read services
-export interface ClientSessionReadService {
-    read(nodeToRead: ReadValueIdOptions, maxAge: number, callback: ResponseCallback<DataValue>): void;
-
-    read(nodesToRead: ReadValueIdOptions[], maxAge: number, callback: ResponseCallback<DataValue[]>): void;
-
-    read(nodeToRead: ReadValueIdOptions, callback: ResponseCallback<DataValue>): void;
-
-    read(nodesToRead: ReadValueIdOptions[], callback: ResponseCallback<DataValue[]>): void;
-
-    read(nodeToRead: ReadValueIdOptions, maxAge?: number): Promise<DataValue>;
-
-    read(nodesToRead: ReadValueIdOptions[], maxAge?: number): Promise<DataValue[]>;
-
+export interface ClientSessionReadService extends IBasicSessionRead {
+  
     /**
      * @deprecated
      */
@@ -326,14 +286,8 @@ export interface ClientSessionReadService {
 }
 
 // write services
-export interface ClientSessionWriteService {
-    write(nodeToWrite: WriteValueOptions, callback: ResponseCallback<StatusCode>): void;
-
-    write(nodesToWrite: WriteValueOptions[], callback: ResponseCallback<StatusCode[]>): void;
-
-    write(nodesToWrite: WriteValueOptions[]): Promise<StatusCode[]>;
+export interface ClientSessionWriteService extends IBasicSessionWrite {
 
-    write(nodeToWrite: WriteValueOptions): Promise<StatusCode>;
 
     /**
      * @deprecated

package/source/client_utils.ts

@@ -2,16 +2,13 @@
  * @module node-opcua-client
  */
 
-import { assert } from "node-opcua-assert";
 import { AttributeIds } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
 import { ReadValueIdOptions } from "node-opcua-service-read";
 import { BrowsePath, BrowsePathResult } from "node-opcua-service-translate-browse-path";
-import { StatusCodes } from "node-opcua-status-code";
 import { Variant } from "node-opcua-variant";
-import { ClientSession, ResponseCallback } from "./client_session";
-import { ClientSessionImpl } from "./private/client_session_impl";
+import { IBasicSessionAsync } from "node-opcua-pseudo-session";
 
 const hasPropertyRefId = resolveNodeId("HasProperty");
 
@@ -47,16 +44,7 @@ interface AnalogDataItemSnapshot {
  * @param nodeId
  * @param callback
  */
-export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike): Promise<AnalogDataItemSnapshot>;
-export function readUAAnalogItem(
-    session: ClientSession,
-    nodeId: NodeIdLike,
-    callback: ResponseCallback<AnalogDataItemSnapshot>
-): void;
-export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike, ...args: [any?, ...any[]]): any {
-    const callback = args[0] as ResponseCallback<AnalogDataItemSnapshot>;
-    assert(typeof callback === "function");
-
+export async function readUAAnalogItem(session: IBasicSessionAsync, nodeId: NodeIdLike): Promise<AnalogDataItemSnapshot> {
     const browsePath = [
         browsePathPropertyRequest(nodeId, "EngineeringUnits"),
         browsePathPropertyRequest(nodeId, "EURange"),
@@ -73,51 +61,35 @@ export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike, ...
         valuePrecision: null
     };
 
-    session.translateBrowsePath(browsePath, (err: Error | null, browsePathResults?: BrowsePathResult[]) => {
-        if (err) {
-            return callback(err);
-        }
-        browsePathResults = browsePathResults || [];
+    const browsePathResults = await session.translateBrowsePath(browsePath);
 
-        const actions: any[] = [];
-        const nodesToRead: ReadValueIdOptions[] = [];
+    const actions: (   (readResult: DataValue) =>void)[] = [];
+    const nodesToRead: ReadValueIdOptions[] = [];
 
-        function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
-            if (browsePathResult.statusCode.isGood()) {
-                browsePathResult.targets = browsePathResult.targets || [];
-                nodesToRead.push({
-                    attributeId: AttributeIds.Value,
-                    nodeId: browsePathResult.targets[0].targetId
-                });
-                actions.push((readResult: DataValue) => ((analogItemData as any)[propertyName] = readResult.value.value));
-            }
+    function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
+        if (browsePathResult.statusCode.isGood()) {
+            browsePathResult.targets = browsePathResult.targets || [];
+            nodesToRead.push({
+                attributeId: AttributeIds.Value,
+                nodeId: browsePathResult.targets[0].targetId
+            });
+            actions.push(
+                (readResult: DataValue) =>
+                    ((analogItemData as unknown as Record<string, unknown>)[propertyName] = readResult.value.value)
+            );
         }
+    }
 
-        processProperty(browsePathResults[0], "engineeringUnits");
-        processProperty(browsePathResults[1], "engineeringUnitsRange");
-        processProperty(browsePathResults[2], "instrumentRange");
-        processProperty(browsePathResults[3], "valuePrecision");
-        processProperty(browsePathResults[4], "definition");
+    processProperty(browsePathResults[0], "engineeringUnits");
+    processProperty(browsePathResults[1], "engineeringUnitsRange");
+    processProperty(browsePathResults[2], "instrumentRange");
+    processProperty(browsePathResults[3], "valuePrecision");
+    processProperty(browsePathResults[4], "definition");
 
-        session.read(nodesToRead, (err1: Error | null, dataValues?: DataValue[]) => {
-            if (err1) {
-                return callback(err1);
-            }
-            /* istanbul ignore next */
-            if (!dataValues) {
-                return callback(new Error("Internal Error"));
-            }
-
-            dataValues.forEach((result: DataValue, index: number) => {
-                actions[index].call(null, result);
-            });
+    const dataValues = await session.read(nodesToRead);
 
-            callback(err1, analogItemData);
-        });
+    dataValues.forEach((result: DataValue, index: number) => {
+        actions[index].call(null, result);
     });
+    return analogItemData;
 }
-// tslint:disable:no-var-requires
-// tslint:disable:max-line-length
-const thenify = require("thenify");
-const opts = { multiArgs: false };
-(module as any).exports.readUAAnalogItem = thenify.withCallback((module as any).exports.readUAAnalogItem, opts);

package/source/index.ts

@@ -72,5 +72,5 @@ export * from "node-opcua-service-subscription";
 export * from "node-opcua-service-translate-browse-path";
 export * from "node-opcua-service-write";
 export * from "node-opcua-service-filter";
-export { IBasicSession, browseAll, readNamespaceArray } from "node-opcua-pseudo-session";
+export * from "node-opcua-pseudo-session";
 export * from "node-opcua-client-dynamic-extension-object";

package/source/opcua_client.ts

@@ -2,16 +2,12 @@
  * @module node-opcua-client
  */
 
-import { ByteString } from "node-opcua-basic-types";
-import { Certificate, PrivateKeyPEM } from "node-opcua-crypto";
-import { ConnectionStrategyOptions, Message, SecurityPolicy } from "node-opcua-secure-channel";
-import { ApplicationDescription, EndpointDescription, UserTokenType } from "node-opcua-service-endpoints";
-import { MessageSecurityMode } from "node-opcua-service-secure-channel";
-import { X509IdentityTokenOptions } from "node-opcua-types";
+import { ApplicationDescription, EndpointDescription } from "node-opcua-service-endpoints";
 import { CallbackT, ErrorCallback, StatusCode } from "node-opcua-status-code";
+import { ResponseCallback } from "node-opcua-pseudo-session";
 import { FindServersRequestLike, GetEndpointsOptions, OPCUAClientBase, OPCUAClientBaseOptions } from "./client_base";
 
-import { ClientSession, ResponseCallback } from "./client_session";
+import { ClientSession } from "./client_session";
 import { ClientSubscription, ClientSubscriptionOptions } from "./client_subscription";
 import { OPCUAClientImpl } from "./private/opcua_client_impl";
 import { UserIdentityInfo } from "./user_identity_info";

package/source/private/client_base_impl.ts

@@ -15,7 +15,7 @@ import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "n
 
 import { makeApplicationUrn } from "node-opcua-common";
 import { getHostname } from "node-opcua-hostname";
-import { IBasicTransportSettings } from "node-opcua-pseudo-session";
+import { IBasicTransportSettings, ResponseCallback } from "node-opcua-pseudo-session";
 import {
     ClientSecureChannelLayer,
     coerceConnectionStrategy,
@@ -48,7 +48,6 @@ import { matchUri } from "node-opcua-utils";
 import { getDefaultCertificateManager, makeSubject, OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { VerificationStatus } from "node-opcua-pki";
 import { CloseSessionRequest, CloseSessionResponse } from "node-opcua-service-session";
-import { ResponseCallback } from "../client_session";
 import { Request, Response } from "../common";
 
 import {

package/source/private/client_session_impl.ts

@@ -21,7 +21,16 @@ import { DataValue } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { ExtensionObject } from "node-opcua-extension-object";
 import { coerceNodeId, NodeId, NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
-import { getBuiltInDataType, getArgumentDefinitionHelper, IBasicSession, IBasicTransportSettings } from "node-opcua-pseudo-session";
+import {
+    getBuiltInDataType,
+    getArgumentDefinitionHelper,
+    IBasicSession,
+    IBasicTransportSettings,
+    readAllAttributes,
+    NodeAttributes,
+    ResponseCallback,
+    BrowseDescriptionLike
+} from "node-opcua-pseudo-session";
 import { AnyConstructorFunc } from "node-opcua-schemas";
 import { ClientSecureChannelLayer, requestHandleNotSetValue, SignatureData } from "node-opcua-secure-channel";
 import { BrowseDescription, BrowseRequest, BrowseResponse, BrowseResult } from "node-opcua-service-browse";
@@ -98,7 +107,6 @@ import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
 import {
     ArgumentDefinition,
-    BrowseDescriptionLike,
     CallMethodRequestLike,
     ClientSession,
     CreateMonitoredItemsRequestLike,
@@ -109,7 +117,6 @@ import {
     ModifyMonitoredItemsRequestLike,
     ModifySubscriptionRequestLike,
     MonitoredItemData,
-    NodeAttributes,
     QueryFirstRequestLike,
     SetMonitoringModeRequestLike,
     SubscriptionId,
@@ -127,8 +134,6 @@ import { ClientSidePublishEngine } from "./client_publish_engine";
 import { ClientSubscriptionImpl } from "./client_subscription_impl";
 import { IClientBase } from "./i_private_client";
 
-export type ResponseCallback<T> = (err: Error | null, response?: T) => void;
-
 const helpAPIChange = process.env.DEBUG && process.env.DEBUG.match(/API/);
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
@@ -168,55 +173,6 @@ function coerceReadValueId(node: any): ReadValueId {
     }
 }
 
-const keys = Object.keys(AttributeIds).filter((k: any) => (AttributeIds as any)[k] !== AttributeIds.INVALID);
-
-const attributeNames: string[] = ((): string[] => {
-    const r: string[] = [];
-    for (let i = 1; i <= 22; i++) {
-        r.push(attributeNameById[i].toString());
-    }
-    return r;
-})();
-
-function composeResult(nodes: any[], nodesToRead: ReadValueIdOptions[], dataValues: DataValue[]): NodeAttributes[] {
-    assert(nodesToRead.length === dataValues.length);
-    let c = 0;
-    const results = [];
-    let dataValue;
-    let k;
-    let nodeToRead;
-
-    for (const node of nodes) {
-        const data: NodeAttributes = {
-            nodeId: resolveNodeId(node),
-            statusCode: StatusCodes.BadNodeIdUnknown
-        };
-
-        let addedProperty = 0;
-
-        for (const key of attributeNames) {
-            dataValue = dataValues[c];
-            nodeToRead = nodesToRead[c];
-            c++;
-            if (dataValue.statusCode.equals(StatusCodes.Good)) {
-                k = lowerFirstLetter(key);
-                data[k] = dataValue.value ? dataValue.value.value : null;
-                addedProperty += 1;
-            }
-        }
-
-        /* istanbul ignore if */
-        if (addedProperty > 0) {
-            data.statusCode = StatusCodes.Good;
-        } else {
-            data.statusCode = StatusCodes.BadNodeIdUnknown;
-        }
-        results.push(data);
-    }
-
-    return results;
-}
-
 const emptyUint32Array = new Uint32Array(0);
 
 type EmptyCallback = (err?: Error) => void;
@@ -1113,48 +1069,11 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     public readAllAttributes(nodes: NodeIdLike[], callback: (err: Error | null, data?: NodeAttributes[]) => void): void;
 
     public readAllAttributes(...args: any[]): void {
-        const arg0 = args[0];
-        const callback = args[1];
-        assert(typeof callback === "function");
-
-        const isArray = Array.isArray(arg0);
-
-        const nodes = isArray ? arg0 : [arg0];
-
-        const nodesToRead: ReadValueIdOptions[] = [];
-
-        for (const node of nodes) {
-            const nodeId = resolveNodeId(node);
-
-            /* istanbul ignore next */
-            if (!nodeId) {
-                throw new Error("cannot coerce " + node + " to a valid NodeId");
-            }
-
-            for (let attributeId = 1; attributeId <= 22; attributeId++) {
-                nodesToRead.push({
-                    attributeId,
-                    dataEncoding: undefined,
-                    indexRange: undefined,
-                    nodeId
-                });
-            }
-        }
-
-        this.read(nodesToRead, (err: Error | null, dataValues?: DataValue[]) => {
-            /* istanbul ignore next */
-            if (err) {
-                return callback(err);
-            }
-
-            /* istanbul ignore next */
-            if (!dataValues) {
-                return callback(new Error("Internal Error"));
-            }
-
-            const results = composeResult(nodes, nodesToRead, dataValues);
-            callback(err, isArray ? results : results[0]);
-        });
+        const nodes = args[0] as NodeIdLike[];
+        const callback = args[1] as (err: Error | null, data?: NodeAttributes[]) => void;
+        readAllAttributes(this, nodes)
+            .then((data: any) => callback(null, data))
+            .catch((err: Error) => callback(err));
     }
 
     /**
@@ -1797,7 +1716,6 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     public hasBeenClosed(): boolean {
         return isNullOrUndefined(this._client) || this._closed || this._closeEventHasBeenEmitted;
     }
-    
 
     public async call(methodToCall: CallMethodRequestLike): Promise<CallMethodResult>;
     public async call(methodToCall: CallMethodRequestLike[]): Promise<CallMethodResult[]>;
@@ -2085,7 +2003,9 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     public getBuiltInDataType(...args: any[]): any {
         const nodeId = args[0];
         const callback = args[1];
-        return getBuiltInDataType(this, nodeId, callback);
+        return getBuiltInDataType(this, nodeId)
+            .then((dataType: DataType) => callback(null, dataType))
+            .catch(callback);
     }
 
     public resumePublishEngine(): void {

package/source/private/i_private_client.ts

@@ -1,8 +1,8 @@
 import { ClientSecureChannelLayer } from "node-opcua-secure-channel";
 import { EndpointDescription } from "node-opcua-service-endpoints";
-import { IBasicTransportSettings } from "node-opcua-pseudo-session";
+import { IBasicTransportSettings, ResponseCallback } from "node-opcua-pseudo-session";
 
-import { ClientSession, ResponseCallback } from "../client_session";
+import { ClientSession } from "../client_session";
 import { Request, Response } from "../common";
 import { UserIdentityInfo } from "../user_identity_info";
 import { ClientSessionImpl } from "./client_session_impl";

package/source/reconnection.ts

@@ -125,6 +125,8 @@ function _ask_for_subscription_republish(session: ClientSessionImpl, callback: (
         }
         doDebug && debugLog(chalk.bgCyan.green.bold("_ask_for_subscription_republish done "), err ? err.message : "OK");
         if (err) {
+            warningLog("republish has failed with error :", err.message);
+
             doDebug && debugLog("_ask_for_subscription_republish has :  recreating subscription");
             return repair_client_session_by_recreating_a_new_session(session._client!, session, callback);
         }
@@ -190,6 +192,36 @@ function repair_client_session_by_recreating_a_new_session(
 
     const listenerCountBefore = session.listenerCount("");
 
+    function recreateSubscription(subscriptionsToRecreate: number[], innerCallback: ErrorCallback) {
+        async.forEach(
+            subscriptionsToRecreate,
+            (subscriptionId: SubscriptionId, next: ErrorCallback) => {
+                if (!session.getPublishEngine().hasSubscription(subscriptionId)) {
+                    doDebug && debugLog(chalk.red("          => CANNOT RECREATE SUBSCRIPTION  "), subscriptionId);
+                    return next();
+                }
+                const subscription = session.getPublishEngine().getSubscription(subscriptionId);
+                assert(subscription.constructor.name === "ClientSubscriptionImpl");
+                doDebug && debugLog(chalk.red("          => RECREATING SUBSCRIPTION  "), subscriptionId);
+                assert(subscription.session === newSession, "must have the session");
+
+                (subscription as ClientSubscriptionImpl).recreateSubscriptionAndMonitoredItem((err1?: Error) => {
+                    if (err1) {
+                        doDebug && debugLog("_recreateSubscription failed !" + err1.message);
+                    }
+
+                    doDebug &&
+                        debugLog(chalk.cyan("          => RECREATING SUBSCRIPTION  AND MONITORED ITEM DONE "), subscriptionId);
+
+                    next();
+                });
+            },
+            (err1?: Error | null) => {
+                innerCallback(err1!);
+            }
+        );
+    }
+
     async.series(
         [
             function suspend_old_session_publish_engine(innerCallback: ErrorCallback) {
@@ -278,28 +310,24 @@ function repair_client_session_by_recreating_a_new_session(
                 newSession.transferSubscriptions(
                     subscriptionsToTransfer,
                     (err: Error | null, transferSubscriptionsResponse?: TransferSubscriptionsResponse) => {
-                        if (err) {
-                            warningLog(chalk.bgCyan("Warning TransferSubscription has failed " + err.message));
+                        if (err || !transferSubscriptionsResponse) {
+                            warningLog(chalk.bgCyan("Warning TransferSubscription has failed " + err?.message));
                             warningLog(chalk.bgCyan("May be the server is not supporting this feature"));
                             // when transfer subscription has failed, we have no other choice but
                             // recreate the subscriptions on the server side
-                            return innerCallback();
-                        }
-
-                        // istanbul ignore next
-                        if (!transferSubscriptionsResponse) {
-                            return innerCallback(new Error("Internal Error"));
+                            const subscriptionsToRecreate = [...(subscriptionsToTransfer.subscriptionIds || [])];
+                            warningLog(chalk.bgCyan("We need to recreate entirely the subscription"));
+                            recreateSubscription(subscriptionsToRecreate, innerCallback);
+                            return;
                         }
 
                         const results = transferSubscriptionsResponse.results || [];
-
                         // istanbul ignore next
                         if (doDebug) {
-                            doDebug &&
-                                debugLog(
-                                    chalk.cyan("    =>  transfer subscriptions  done"),
-                                    results.map((x: any) => x.statusCode.toString()).join(" ")
-                                );
+                            debugLog(
+                                chalk.cyan("    =>  transfer subscriptions  done"),
+                                results.map((x: any) => x.statusCode.toString()).join(" ")
+                            );
                         }
 
                         const subscriptionsToRecreate = [];
@@ -333,36 +361,7 @@ function repair_client_session_by_recreating_a_new_session(
                         }
                         doDebug && debugLog("  new session subscriptionCount = ", newSession.getPublishEngine().subscriptionCount);
 
-                        async.forEach(
-                            subscriptionsToRecreate,
-                            (subscriptionId: SubscriptionId, next: ErrorCallback) => {
-                                if (!session.getPublishEngine().hasSubscription(subscriptionId)) {
-                                    doDebug && debugLog(chalk.red("          => CANNOT RECREATE SUBSCRIPTION  "), subscriptionId);
-                                    return next();
-                                }
-                                const subscription = session.getPublishEngine().getSubscription(subscriptionId);
-                                assert(subscription.constructor.name === "ClientSubscriptionImpl");
-                                doDebug && debugLog(chalk.red("          => RECREATING SUBSCRIPTION  "), subscriptionId);
-                                assert(subscription.session === newSession, "must have the session");
-
-                                (subscription as ClientSubscriptionImpl).recreateSubscriptionAndMonitoredItem((err1?: Error) => {
-                                    if (err1) {
-                                        doDebug && debugLog("_recreateSubscription failed !" + err1.message);
-                                    }
-
-                                    doDebug &&
-                                        debugLog(
-                                            chalk.cyan("          => RECREATING SUBSCRIPTION  AND MONITORED ITEM DONE "),
-                                            subscriptionId
-                                        );
-
-                                    next();
-                                });
-                            },
-                            (err1?: Error | null) => {
-                                innerCallback(err1!);
-                            }
-                        );
+                        recreateSubscription(subscriptionsToRecreate, innerCallback);
                     }
                 );
             },
@@ -432,12 +431,11 @@ function _repair_client_session(client: IClientBase, session: ClientSessionImpl,
 type EmptyCallback = (err?: Error) => void;
 
 export function repair_client_session(client: IClientBase, session: ClientSessionImpl, callback: EmptyCallback): void {
-    
     if (!client) {
         doDebug && debugLog("Aborting reactivation of old session because user requested session to be close");
         return callback();
     }
-    
+
     doDebug && debugLog(chalk.yellow("Starting client session repair"));
 
     const privateSession = session as any as Reconnectable;
@@ -448,13 +446,12 @@ export function repair_client_session(client: IClientBase, session: ClientSessio
         privateSession._reconnecting.pendingCallbacks.push(callback);
         return;
     }
-    
+
     privateSession._reconnecting.reconnecting = true;
 
     // get old transaction queue ...
     const transactionQueue = privateSession.pendingTransactions ? privateSession.pendingTransactions.splice(0) : [];
 
-
     const repeatedAction = (callback: EmptyCallback) => {
         _repair_client_session(client, session, (err) => {
             if (err) {
@@ -490,10 +487,10 @@ export function repair_client_session(client: IClientBase, session: ClientSessio
             privateSession._reconnecting.pendingCallbacks = [];
 
             // re-inject element in queue
-            
+
             // istanbul ignore next
             doDebug && debugLog(chalk.yellow("re-injecting transaction queue"), transactionQueue.length);
-            
+
             transactionQueue.forEach((e: any) => privateSession.pendingTransactions.push(e));
             otherCallbacks.forEach((c: EmptyCallback) => c(err));
             callback(err);