Skip to content

Commit

Permalink
ws fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@ditesh
ditesh committed Dec 19, 2011
1 parent 2b9d834 commit eeadc17
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 134 deletions.
40 changes: 20 additions & 20 deletions demo.js
View file
@@ -1,25 +1,25 @@
/*
node-mboxrd demo file
Copyright (C) 2011 Ditesh Shashikant Gathani <ditesh@gathani.org>
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
node-mboxrd demo file
Copyright (C) 2011 Ditesh Shashikant Gathani <ditesh@gathani.org>
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

Expand Down
228 changes: 114 additions & 114 deletions main.js
View file
@@ -1,25 +1,25 @@
/*
node-mboxrd library
Copyright (C) 2011 Ditesh Shashikant Gathani <ditesh@gathani.org>
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
node-mboxrd library
Copyright (C) 2011 Ditesh Shashikant Gathani <ditesh@gathani.org>
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

Expand All @@ -40,23 +40,23 @@ this.mboxrd = function(fd, options) {

var debug = options.debug || false;

// This structure is the original data structure
var omessages = {
size: 0,
count: 0,
sizes: [],
deleted: [],
offsets: [],
};

// This structure can be manipulated (thru message deletion)
var messages = {
size: 0,
count: 0,
sizes: [],
deleted: [],
offsets: [],
};
// This structure is the original data structure
var omessages = {
size: 0,
count: 0,
sizes: [],
deleted: [],
offsets: [],
};

// This structure can be manipulated (thru message deletion)
var messages = {
size: 0,
count: 0,
sizes: [],
deleted: [],
offsets: [],
};

// Priviledged methods follow
this.count = function() {
Expand All @@ -74,7 +74,7 @@ this.mboxrd = function(fd, options) {

}

if (msgnumber > omessages.count || messages.deleted[msgnumber] !== undefined) {
if (msgnumber > omessages.count || messages.deleted[msgnumber] !== undefined) {

self.emit("get", false, msgnumber);
return false;
Expand All @@ -101,7 +101,7 @@ this.mboxrd = function(fd, options) {

}

messages = omessages;
messages = omessages;
self.emit("reset", true);

};
Expand All @@ -117,7 +117,7 @@ this.mboxrd = function(fd, options) {

}

if (msgnumber > omessages.count || messages.deleted[msgnumber] !== undefined) {
if (msgnumber > omessages.count || messages.deleted[msgnumber] !== undefined) {

self.emit("delete", false, msgnumber);
return false;
Expand Down Expand Up @@ -148,7 +148,7 @@ this.mboxrd = function(fd, options) {

}

if (msgnumber > omessages.count || messages.deleted[msgnumber] !== undefined) {
if (msgnumber > omessages.count || messages.deleted[msgnumber] !== undefined) {

self.emit("top", false, msgnumber);
return false;
Expand Down Expand Up @@ -210,125 +210,125 @@ this.mboxrd = function(fd, options) {

// Private methods follow
// Write modifications to temp file
function syncToTmp(tmpfd, msgnumber, cb) {
function syncToTmp(tmpfd, msgnumber, cb) {

// Pass the last msg
if (msgnumber > messages.offsets.length) cb();
// Pass the last msg
if (msgnumber > messages.offsets.length) cb();

// Skip deleted messages
else if (messages.offsets[msgnumber] === undefined) syncToTmp(tmpfd, msgnumber + 1, cb);
else {
// Skip deleted messages
else if (messages.offsets[msgnumber] === undefined) syncToTmp(tmpfd, msgnumber + 1, cb);
else {

var buffer = new Buffer(omessages.sizes[msgnumber]);
var buffer = new Buffer(omessages.sizes[msgnumber]);

fs.read(fd, buffer, 0, omessages.sizes[msgnumber], messages.offsets[msgnumber], function(err, bytesRead, buffer) {
fs.read(fd, buffer, 0, omessages.sizes[msgnumber], messages.offsets[msgnumber], function(err, bytesRead, buffer) {

fs.write(tmpfd, buffer, 0, bytesRead, null, function(err, written, buffer) {
fs.write(tmpfd, buffer, 0, bytesRead, null, function(err, written, buffer) {

syncToTmp(tmpfd, msgnumber + 1, cb);
syncToTmp(tmpfd, msgnumber + 1, cb);

});
});
}
}
});
});
}
}

function read(position, previousbuf, cb) {
function read(position, previousbuf, cb) {

var i = 0;
var minlen = 0;
var msgsize = 0;
var buffer = new Buffer(options.bufsize);
var i = 0;
var minlen = 0;
var msgsize = 0;
var buffer = new Buffer(options.bufsize);

fs.read(fd, buffer, 0, options.bufsize, position, function(err, bytesRead, buffer) {
fs.read(fd, buffer, 0, options.bufsize, position, function(err, bytesRead, buffer) {

var previousbuflen = 0;

if (err) cb(err);
else {
if (err) cb(err);
else {

// This combines previous buffer with the newly read buffer
if (previousbuf !== null) {
if (previousbuf !== null) {

if (position > 0) previousbuflen = previousbuf.length;

var newbuffer = new Buffer(previousbuf.length + buffer.length)
var newbuffer = new Buffer(previousbuf.length + buffer.length)

// Fast memcpy()'s for the win
previousbuf.copy(newbuffer);
buffer.copy(newbuffer, previousbuf.length);
buffer = newbuffer;
previousbuf = null;
delete newbuffer;
// Fast memcpy()'s for the win
previousbuf.copy(newbuffer);
buffer.copy(newbuffer, previousbuf.length);
buffer = newbuffer;
previousbuf = null;
delete newbuffer;

}
}

i = 0;
minlen = (bytesRead === buffer.length) ? buffer.length : bytesRead;
while (i < minlen) {
i = 0;
minlen = (bytesRead === buffer.length) ? buffer.length : bytesRead;
while (i < minlen) {

// Match for newline (\n), ASCII code 10
if (buffer[i] === 10) {
// Match for newline (\n), ASCII code 10
if (buffer[i] === 10) {

// We're at the end of the buffer
if (i === buffer.length-1) break;

// \nFrom may be split between the buffers
else if (i+5 > buffer.length-1) {
// \nFrom may be split between the buffers
else if (i+5 > buffer.length-1) {

previousbuf = new Buffer(buffer.length-i-1);
previousbuf = new Buffer(buffer.length-i-1);
buffer.copy(previousbuf, 0, i+1);
break;
break;

// \nFrom is within buffer
} else if (buffer.slice(i+1, i+6).toString() === "From ") {
// \nFrom is within buffer
} else if (buffer.slice(i+1, i+6).toString() === "From ") {

messages.offsets.push(position + (i+1)-previousbuflen);
messages.offsets.push(position + (i+1)-previousbuflen);

}
}
}

i++;
i++;

}
}

// There is more to read!
if (bytesRead === options.bufsize) read(position + options.bufsize + 1, previousbuf, cb);
else {
// There is more to read!
if (bytesRead === options.bufsize) read(position + options.bufsize + 1, previousbuf, cb);
else {

i = 0;
i = 0;

while (i < messages.offsets.length - 1) {
while (i < messages.offsets.length - 1) {

msgsize = messages.offsets[i+1] - messages.offsets[i];
messages.size += msgsize;
messages.sizes.push(msgsize);
i++;
msgsize = messages.offsets[i+1] - messages.offsets[i];
messages.size += msgsize;
messages.sizes.push(msgsize);
i++;

}
}

if (messages.offsets.length > 0) {
if (messages.offsets.length > 0) {

msgsize = position + bytesRead - messages.offsets[i];
messages.sizes.push(msgsize);
messages.size += msgsize;
messages.count = messages.offsets.length;
msgsize = position + bytesRead - messages.offsets[i];
messages.sizes.push(msgsize);
messages.size += msgsize;
messages.count = messages.offsets.length;

}
}

// Make a copy
// JS seriously needs a good, fast and built-in object clone() method
omessages.size = messages.size;
omessages.count = messages.count;
// Make a copy
// JS seriously needs a good, fast and built-in object clone() method
omessages.size = messages.size;
omessages.count = messages.count;

for (var i in messages.sizes) omessages.sizes.push(messages.sizes[i]);
for (var i in messages.offsets) omessages.offsets.push(messages.offsets[i]);
for (var i in messages.sizes) omessages.sizes.push(messages.sizes[i]);
for (var i in messages.offsets) omessages.offsets.push(messages.offsets[i]);

cb(null);
cb(null);

}
}
});
}
}
}
});
}

// Constructor code follows
read(-1, new Buffer("\n"), function(err) {
Expand Down

0 comments on commit eeadc17

Please sign in to comment.