Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"babel-preset-stage-1": "^6.5.0",
"babel-register": "^6.24.1",
"chai": "^3.5.0",
"core-decorators": "^0.12.3",
"core-decorators": "^0.20.0",
"mocha": ">=1.7.4",
"rxjs": "^5.3.0",
"simple-assign": "^0.1.0",
Expand All @@ -49,7 +49,7 @@
"webpack-dev-server": "^1.15.0"
},
"peerDependencies": {
"core-decorators": ">=0.12.3 && <1.0.0",
"core-decorators": "^0.20.0",
"rxjs": "^5.3.0"
},
"main": "dist/mikronode.js",
Expand Down
25 changes: 18 additions & 7 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,22 +157,33 @@ class MikroNode {
} else if (typeof arg1===typeof function(){}) cb=arg1;

const close=()=>this.sock.getStream().sentence.complete();

const login=(user,password,cb)=>{
/** Flag added to choose between pre-v6.43 and post-v6.43 (post-v6.43 by default)*/
const login=(user,password,post,cb)=>{
if(post === undefined){
post = true;
}
this.debug>=DEBUG.DEBUG&&console.log('Logging in');
stream.write('/login');
const {promise,resolve,reject}=getUnwrappedPromise();
// Create a connection handler
this.connection=new Connection(
{...stream,close},
challenge=>{
const md5=crypto.createHash('md5');
md5.update(Buffer.concat([Buffer.from(nullString+password),Buffer.from(challenge)]));
stream.write([
if(post){
stream.write([
"/login",
"=name="+user,
"=response=00"+md5.digest("hex")
]);
"=password="+password
]);
}else{
const md5=crypto.createHash('md5');
md5.update(Buffer.concat([Buffer.from(nullString+password),Buffer.from(challenge)]));
stream.write([
"/login",
"=name="+user,
"=response=00"+md5.digest("hex")
]);
}
},{resolve,reject}
);
this.connection.setDebug(this.debug);
Expand Down
2 changes: 1 addition & 1 deletion test/close.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var device=new api('10.10.10.10');

device.connect(
function(err,login) {
login('admin','password',runProgram);
login('admin','password',true,runProgram);
}
);

Expand Down