Add writeconcern support in nodered

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -201,7 +201,7 @@ export class DatabaseConnection {
             (item as any).passwordhash = await Crypt.hash((item as any).newpassword);
             delete (item as any).newpassword;
         }
-        var options = { writeConcern: { w: w, j: j } };
+        var options = { writeConcern: { w: parseInt((w as any)), j: j } };
         var result: InsertOneWriteOpResult = await this.db.collection(collectionname).insertOne(item, options);
         item = result.ops[0];
 
@@ -267,7 +267,7 @@ export class DatabaseConnection {
             delete (item as any).newpassword;
         }
         this._logger.debug("updating " + (item.name || item._name) + " in database");
-        var options = { writeConcern: { w: w, j: j } };
+        var options = { writeConcern: { w: parseInt((w as any)), j: j } };
         await this.db.collection(collectionname).replaceOne({ _id: item._id }, item, options);
         this.traversejsondecode(item);
         return item;

OpenFlowNodeRED/src/Message.ts

@@ -2,33 +2,33 @@ import { WebSocketClient, QueuedMessage } from "./WebSocketClient";
 
 function isNumber(value: string | number): boolean {
     return ((value != null) && !isNaN(Number(value.toString())));
- }
+}
 export class SocketMessage {
     public id: string;
     public replyto: string;
     public command: string;
     public data: string;
     public count: number;
     public index: number;
-    public static fromjson(json: string):SocketMessage {
-        let result:SocketMessage = new SocketMessage();
-        let obj:any = JSON.parse(json);
+    public static fromjson(json: string): SocketMessage {
+        let result: SocketMessage = new SocketMessage();
+        let obj: any = JSON.parse(json);
         result.command = obj.command;
         result.id = obj.id;
         result.replyto = obj.replyto;
         result.count = 1;
         result.index = 0;
         result.data = obj.data;
-        if(isNumber(obj.count) ) { result.count = obj.count; }
-        if(isNumber(obj.index) ) { result.index = obj.index; }
-        if(result.id === null || result.id === undefined || result.id === "") {
+        if (isNumber(obj.count)) { result.count = obj.count; }
+        if (isNumber(obj.index)) { result.index = obj.index; }
+        if (result.id === null || result.id === undefined || result.id === "") {
             // result.id = crypto.randomBytes(16).toString("hex");
             result.id = Math.random().toString(36).substr(2, 9);
         }
         return result;
     }
-    public static frommessage(msg: Message, data: string, count: number, index: number):SocketMessage {
-        var result:SocketMessage = new SocketMessage();
+    public static frommessage(msg: Message, data: string, count: number, index: number): SocketMessage {
+        var result: SocketMessage = new SocketMessage();
         result.id = msg.id;
         result.replyto = msg.replyto;
         result.command = msg.command;
@@ -37,8 +37,8 @@ export class SocketMessage {
         result.data = data;
         return result;
     }
-    public static fromcommand(command: string):SocketMessage {
-        var result:SocketMessage = new SocketMessage();
+    public static fromcommand(command: string): SocketMessage {
+        var result: SocketMessage = new SocketMessage();
         result.command = command;
         result.count = 1;
         result.index = 0;
@@ -50,31 +50,31 @@ export class SocketMessage {
 export class SigninMessage {
     public error: string;
 
-    public validate_only:boolean = false;
-    public username:string;
-    public password:string;
-    public user:TokenUser;
-    public jwt:string;
-    static assign(o:any):SigninMessage {
+    public validate_only: boolean = false;
+    public username: string;
+    public password: string;
+    public user: TokenUser;
+    public jwt: string;
+    static assign(o: any): SigninMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new SigninMessage(), JSON.parse(o.toString()));
         }
         return Object.assign(new SigninMessage(), o);
     }
 }
 export class TokenUser {
-    _type:string;
-    _id:string;
-    name:string;
-    username:string;
-    roles:Rolemember[] = [];
-    static assign<T>(o:T): T {
-        var newo:TokenUser = new TokenUser();
+    _type: string;
+    _id: string;
+    name: string;
+    username: string;
+    roles: Rolemember[] = [];
+    static assign<T>(o: T): T {
+        var newo: TokenUser = new TokenUser();
         return Object.assign(newo, o);
     }
 }
 export class Rolemember {
-    constructor(name:string, _id:string) {
+    constructor(name: string, _id: string) {
         this.name = name;
         this._id = _id;
     }
@@ -85,14 +85,14 @@ export class QueryMessage {
     public error: string;
     public jwt: string;
 
-    public query:any;
-    public projection:Object;
-    public top:number;
-    public skip:number;
-    public orderby:Object | string;
-    public collectionname:string;
-    public result:any[];
-    static assign(o:any):QueryMessage {
+    public query: any;
+    public projection: Object;
+    public top: number;
+    public skip: number;
+    public orderby: Object | string;
+    public collectionname: string;
+    public result: any[];
+    static assign(o: any): QueryMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new QueryMessage(), JSON.parse(o.toString()));
         }
@@ -102,11 +102,11 @@ export class QueryMessage {
 export class AggregateMessage {
     public error: string;
     public jwt: string;
-    
-    public aggregates:object[];
-    public collectionname:string;
-    public result:any[];
-    static assign(o:any):AggregateMessage {
+
+    public aggregates: object[];
+    public collectionname: string;
+    public result: any[];
+    static assign(o: any): AggregateMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new AggregateMessage(), JSON.parse(o.toString()));
         }
@@ -117,10 +117,17 @@ export class InsertOneMessage {
     public error: string;
     public jwt: string;
 
-    public item:any;
-    public collectionname:string;
-    public result:any;
-    static assign(o:any):InsertOneMessage {
+    // w: 1 - Requests acknowledgment that the write operation has propagated
+    // w: 0 - Requests no acknowledgment of the write operation
+    // w: 2 would require acknowledgment from the primary and one of the secondaries
+    // w: 3 would require acknowledgment from the primary and both secondaries
+    public w: number;
+    // true, requests acknowledgment that the mongod instances have written to the on-disk journal
+    public j: boolean;
+    public item: any;
+    public collectionname: string;
+    public result: any;
+    static assign(o: any): InsertOneMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new InsertOneMessage(), JSON.parse(o.toString()));
         }
@@ -131,10 +138,17 @@ export class UpdateOneMessage {
     public error: string;
     public jwt: string;
 
-    public item:object;
-    public collectionname:string;
-    public result:any;
-    static assign(o:any):UpdateOneMessage {
+    // w: 1 - Requests acknowledgment that the write operation has propagated
+    // w: 0 - Requests no acknowledgment of the write operation
+    // w: 2 would require acknowledgment from the primary and one of the secondaries
+    // w: 3 would require acknowledgment from the primary and both secondaries
+    public w: number;
+    // true, requests acknowledgment that the mongod instances have written to the on-disk journal
+    public j: boolean;
+    public item: object;
+    public collectionname: string;
+    public result: any;
+    static assign(o: any): UpdateOneMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new UpdateOneMessage(), JSON.parse(o.toString()));
         }
@@ -145,11 +159,18 @@ export class InsertOrUpdateOneMessage {
     public error: string;
     public jwt: string;
 
-    public item:object;
-    public collectionname:string;
-    public uniqeness:string
-    public result:any;
-    static assign(o:any):InsertOrUpdateOneMessage {
+    // w: 1 - Requests acknowledgment that the write operation has propagated
+    // w: 0 - Requests no acknowledgment of the write operation
+    // w: 2 would require acknowledgment from the primary and one of the secondaries
+    // w: 3 would require acknowledgment from the primary and both secondaries
+    public w: number;
+    // true, requests acknowledgment that the mongod instances have written to the on-disk journal
+    public j: boolean;
+    public item: object;
+    public collectionname: string;
+    public uniqeness: string
+    public result: any;
+    static assign(o: any): InsertOrUpdateOneMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new InsertOrUpdateOneMessage(), JSON.parse(o.toString()));
         }
@@ -161,9 +182,9 @@ export class DeleteOneMessage {
     public error: string;
     public jwt: string;
 
-    public _id:string;
-    public collectionname:string;
-    static assign(o:any):DeleteOneMessage {
+    public _id: string;
+    public collectionname: string;
+    static assign(o: any): DeleteOneMessage {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new DeleteOneMessage(), JSON.parse(o.toString()));
         }
@@ -180,13 +201,13 @@ export class MapReduceMessage<T> {
     public error: string;
     public jwt: string;
 
-    public collectionname:string;
-    public result:T[];
-    public scope:any;
+    public collectionname: string;
+    public result: T[];
+    public scope: any;
 
-    constructor(public map: mapFunc, public reduce: reduceFunc, public finalize: finalizeFunc, public query: any, public out:string | any) {
+    constructor(public map: mapFunc, public reduce: reduceFunc, public finalize: finalizeFunc, public query: any, public out: string | any) {
     }
-    static assign<T>(o:any):MapReduceMessage<T> {
+    static assign<T>(o: any): MapReduceMessage<T> {
         if (typeof o === "string" || o instanceof String) {
             return Object.assign(new MapReduceMessage(null, null, null, null, null), JSON.parse(o.toString()));
         }
@@ -195,25 +216,25 @@ export class MapReduceMessage<T> {
 }
 export class JSONfn {
     public static stringify(obj) {
-        return JSON.stringify(obj,function(key, value){
-                return (typeof value === 'function' ) ? value.toString() : value;
-            });
+        return JSON.stringify(obj, function (key, value) {
+            return (typeof value === 'function') ? value.toString() : value;
+        });
     }
     public static parse(str) {
-        return JSON.parse(str,function(key, value){
-            if(typeof value != 'string') return value;
-            return ( value.substring(0,8) == 'function') ? eval('('+value+')') : value;
+        return JSON.parse(str, function (key, value) {
+            if (typeof value != 'string') return value;
+            return (value.substring(0, 8) == 'function') ? eval('(' + value + ')') : value;
         });
-    }            
+    }
 }
 
 export class Message {
     public id: string;
     public replyto: string;
     public command: string;
     public data: string;
-    public static frommessage(msg: SocketMessage, data: string):Message {
-        var result:Message = new Message();
+    public static frommessage(msg: SocketMessage, data: string): Message {
+        var result: Message = new Message();
         result.id = msg.id;
         result.replyto = msg.replyto;
         result.command = msg.command;
@@ -224,13 +245,13 @@ export class Message {
     public Process(cli: WebSocketClient): void {
         try {
             var command: string = "";
-            if(this.command!==null && this.command!==undefined) { command = this.command.toLowerCase(); }
-            if(this.command !== "ping" && this.command !== "pong") {
-                if(this.replyto!==null && this.replyto!==undefined) {
-                    var qmsg:QueuedMessage = cli.messageQueue[this.replyto];
-                    if(qmsg!==undefined && qmsg !== null) {
+            if (this.command !== null && this.command !== undefined) { command = this.command.toLowerCase(); }
+            if (this.command !== "ping" && this.command !== "pong") {
+                if (this.replyto !== null && this.replyto !== undefined) {
+                    var qmsg: QueuedMessage = cli.messageQueue[this.replyto];
+                    if (qmsg !== undefined && qmsg !== null) {
                         qmsg.message = Object.assign(qmsg.message, JSON.parse(this.data));
-                        if(qmsg.cb!==undefined && qmsg.cb !== null) { qmsg.cb(qmsg.message); }
+                        if (qmsg.cb !== undefined && qmsg.cb !== null) { qmsg.cb(qmsg.message); }
                         delete cli.messageQueue[this.id];
                     }
                     return;
@@ -242,7 +263,7 @@ export class Message {
                     break;
                 case "pong":
                     break;
-                    case "signin":
+                case "signin":
                     this.Signin(cli);
                     break;
                 case "refreshtoken":
@@ -269,31 +290,31 @@ export class Message {
         this.Reply("pong");
         await this.Send(cli);
     }
-    public Reply(command:string): void {
+    public Reply(command: string): void {
         this.command = command;
         this.replyto = this.id;
         this.id = Math.random().toString(36).substr(2, 9);
     }
     private Signin(cli: WebSocketClient): void {
-        var msg:SigninMessage = SigninMessage.assign(this.data);
+        var msg: SigninMessage = SigninMessage.assign(this.data);
         cli.jwt = msg.jwt;
         cli.user = msg.user;
-        var qmsg:QueuedMessage = cli.messageQueue[this.replyto];
-        if(qmsg!==undefined && qmsg !== null) {
-            if(qmsg.cb!==undefined && qmsg.cb !== null) { qmsg.cb(msg); }
+        var qmsg: QueuedMessage = cli.messageQueue[this.replyto];
+        if (qmsg !== undefined && qmsg !== null) {
+            if (qmsg.cb !== undefined && qmsg.cb !== null) { qmsg.cb(msg); }
             delete cli.messageQueue[this.id];
         }
     }
     private RefreshToken(cli: WebSocketClient): void {
-        var msg:SigninMessage = SigninMessage.assign(this.data);
+        var msg: SigninMessage = SigninMessage.assign(this.data);
         cli.jwt = msg.jwt;
         cli.user = msg.user;
     }
     private Query(cli: WebSocketClient): void {
-        var msg:QueryMessage = QueryMessage.assign(this.data);
-        var qmsg:QueuedMessage = cli.messageQueue[this.replyto];
-        if(qmsg!==undefined && qmsg !== null) {
-            if(qmsg.cb!==undefined && qmsg.cb !== null) { qmsg.cb(msg); }
+        var msg: QueryMessage = QueryMessage.assign(this.data);
+        var qmsg: QueuedMessage = cli.messageQueue[this.replyto];
+        if (qmsg !== undefined && qmsg !== null) {
+            if (qmsg.cb !== undefined && qmsg.cb !== null) { qmsg.cb(msg); }
             delete cli.messageQueue[this.id];
         }