Added slotindexer and table status constructor

diff --git a/src/js/iotjs/orig/compat.txt b/src/js/iotjs/orig/compat.txt
index af5aedfd1ff0aeeee1fda2fdd84548d365bc9e4e..a5d98b9e4f53babcda2138a49a84373de46548d9 100644 (file)
--- a/src/js/iotjs/orig/compat.txt
+++ b/src/js/iotjs/orig/compat.txt
@@ -1,3 +1,4 @@
 1.Byte[] -> Uint8Array
 2.Static decode method in slot.js takes the table, uint8array and the secret key as the argument
 1.Byte[] -> Uint8Array
 2.Static decode method in slot.js takes the table, uint8array and the secret key as the argument

-3.Vector<Entries> = array of entries []
\ No newline at end of file
+3.Vector<Entries> = array of entries []
+4.A Byte in a 'number' in javascript
\ No newline at end of file

diff --git a/src/js/iotjs/orig/slotbuffer.js b/src/js/iotjs/orig/slotbuffer.js
index 7c29463b2122d7b3db2db2cf93002ed58c7a3280..1e769719e22f6baf70e8fe2092d8e136b136f652 100644 (file)
--- a/src/js/iotjs/orig/slotbuffer.js
+++ b/src/js/iotjs/orig/slotbuffer.js
@@ -7,8 +7,8 @@ class SlotBuffer{
                this.oldestseqn = 0;
        }
        size(){
                this.oldestseqn = 0;
        }
        size(){

-               if(this.head>=tail){
-                       return head-tail;
+               if(this.head>=this.tail){
+                       return this.head-this.tail;

                }
                return (this.array.length + this.head - this.tail);
        }
                }
                return (this.array.length + this.head - this.tail);
        }


@@ -73,7 +73,7 @@ class SlotBuffer{
                        return null;
                }
 
                        return null;
                }
 

-               if(this.head >= this.tail && index >= head){
+               if(this.head >= this.tail && index >= this.head){

                        return null;
                }
 
                        return null;
                }
 

diff --git a/src/js/iotjs/orig/slotindexer.js b/src/js/iotjs/orig/slotindexer.js
new file mode 100644 (file)
index 0000000..da738ff
--- /dev/null
+++ b/src/js/iotjs/orig/slotindexer.js
@@ -0,0 +1,27 @@
+class SlotIndexer{
+       constructor(_updates,_buffer){
+               // updates is an array of slot objects
+               // buffer is an instanceof slotbuffer constructor object in slotbuffer.js
+               this.updates = _updates;
+               if(_buffer && _buffer instanceof SlotBuffer){
+                       this.buffer = _buffer;
+               }else{
+                       throw new Error("Argument error Buffer should be an instance of SlotBuffer");
+               }
+               this.firstslotseqnum = this.updates[0].getSequenceNumber();     
+       }
+
+       getSlot(seqnum){
+               if(seqnum >= this.firstslotseqnum){
+                       var offset = seqnum - this.firstslotseqnum;
+                       if(offset >= this.updates.length){
+                               throw new Error('Invalid Slot Sequence Number Reference');
+                       }else{
+                               return this.updates[offset];
+                       }
+               }else{
+                       return this.buffer.getSlot(seqnum);
+               }
+       }
+
+}
\ No newline at end of file

diff --git a/src/js/iotjs/orig/tablestatus.js b/src/js/iotjs/orig/tablestatus.js
new file mode 100644 (file)
index 0000000..06f8f25
--- /dev/null
+++ b/src/js/iotjs/orig/tablestatus.js
@@ -0,0 +1,34 @@
+class TableStatus extends Entry{
+       constructor(slot,_maxslots){
+               super(slot);
+               this.maxslots = _maxslots;
+       }
+       getMaxSlots(){
+               return this.maxslots;
+       }
+       static decode(slot,bb){
+               //bb is an object of the type bytebuffer See main.js file and its require section 
+               //for more details
+               if(!(bb instanceof ByteBuffer && slot instanceof Slot)){
+                       throw new Error('Argument Error: bb is not an instanceof Bytebuffer');
+               }
+               this.maxslots = bb.readByte();
+               return new TableStatus(slot,this.maxslots);
+       }
+       encode(bb){
+               bb.writeByte(Entry.TypeTableStatus);
+               bb.writeInt8(this.maxslots);
+       }
+       getSize(){
+               return 4+1;
+       }
+       getType(){
+               return Entry.TypeTableStatus;
+       }
+       getcopy(s){
+               if(!(s instanceof Slot)){
+                       throw new Error('Argument Error: s is not an instanceof Slot');
+               }
+               return new TableStatus(s,this.maxslots);
+       }
+}
\ No newline at end of file

diff --git a/src/js/iotjs/src/slotbuffer.js b/src/js/iotjs/src/slotbuffer.js
index 18288ffb0f4cd144bd0e8e6dc621f0b6902c32b2..97048529fe575a8432570a29b794aa4c502a7e65 100644 (file)
--- a/src/js/iotjs/src/slotbuffer.js
+++ b/src/js/iotjs/src/slotbuffer.js
@@ -18,8 +18,8 @@ var SlotBuffer = function () {
        _createClass(SlotBuffer, [{
                key: "size",
                value: function size() {
        _createClass(SlotBuffer, [{
                key: "size",
                value: function size() {

-                       if (this.head >= tail) {
-                               return head - tail;
+                       if (this.head >= this.tail) {
+                               return this.head - this.tail;

                        }
                        return this.array.length + this.head - this.tail;
                }
                        }
                        return this.array.length + this.head - this.tail;
                }


@@ -96,7 +96,7 @@ var SlotBuffer = function () {
                                return null;
                        }
 
                                return null;
                        }
 

-                       if (this.head >= this.tail && index >= head) {
+                       if (this.head >= this.tail && index >= this.head) {

                                return null;
                        }
 
                                return null;
                        }
 

diff --git a/src/js/iotjs/src/slotindexer.js b/src/js/iotjs/src/slotindexer.js
new file mode 100644 (file)
index 0000000..66f4b4d
--- /dev/null
+++ b/src/js/iotjs/src/slotindexer.js
@@ -0,0 +1,39 @@
+"use strict";
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var SlotIndexer = function () {
+       function SlotIndexer(_updates, _buffer) {
+               _classCallCheck(this, SlotIndexer);
+
+               // updates is an array of slot objects
+               // buffer is an instanceof slotbuffer constructor object in slotbuffer.js
+               this.updates = _updates;
+               if (_buffer && _buffer instanceof SlotBuffer) {
+                       this.buffer = _buffer;
+               } else {
+                       throw new Error("Argument error Buffer should be an instance of SlotBuffer");
+               }
+               this.firstslotseqnum = this.updates[0].getSequenceNumber();
+       }
+
+       _createClass(SlotIndexer, [{
+               key: "getSlot",
+               value: function getSlot(seqnum) {
+                       if (seqnum >= this.firstslotseqnum) {
+                               var offset = seqnum - this.firstslotseqnum;
+                               if (offset >= this.updates.length) {
+                                       throw new Error('Invalid Slot Sequence Number Reference');
+                               } else {
+                                       return this.updates[offset];
+                               }
+                       } else {
+                               return this.buffer.getSlot(seqnum);
+                       }
+               }
+       }]);
+
+       return SlotIndexer;
+}();
\ No newline at end of file

diff --git a/src/js/iotjs/src/tablestatus.js b/src/js/iotjs/src/tablestatus.js
new file mode 100644 (file)
index 0000000..64c14fc
--- /dev/null
+++ b/src/js/iotjs/src/tablestatus.js
@@ -0,0 +1,66 @@
+'use strict';
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var TableStatus = function (_Entry) {
+       _inherits(TableStatus, _Entry);
+
+       function TableStatus(slot, _maxslots) {
+               _classCallCheck(this, TableStatus);
+
+               var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(TableStatus).call(this, slot));
+
+               _this.maxslots = _maxslots;
+               return _this;
+       }
+
+       _createClass(TableStatus, [{
+               key: 'getMaxSlots',
+               value: function getMaxSlots() {
+                       return this.maxslots;
+               }
+       }, {
+               key: 'encode',
+               value: function encode(bb) {
+                       bb.writeByte(Entry.TypeTableStatus);
+                       bb.writeInt8(this.maxslots);
+               }
+       }, {
+               key: 'getSize',
+               value: function getSize() {
+                       return 4 + 1;
+               }
+       }, {
+               key: 'getType',
+               value: function getType() {
+                       return Entry.TypeTableStatus;
+               }
+       }, {
+               key: 'getcopy',
+               value: function getcopy(s) {
+                       if (!(s instanceof Slot)) {
+                               throw new Error('Argument Error: s is not an instanceof Slot');
+                       }
+                       return new TableStatus(s, this.maxslots);
+               }
+       }], [{
+               key: 'decode',
+               value: function decode(slot, bb) {
+                       //bb is an object of the type bytebuffer See main.js file and its require section 
+                       //for more details
+                       if (!(bb instanceof ByteBuffer && slot instanceof Slot)) {
+                               throw new Error('Argument Error: bb is not an instanceof Bytebuffer');
+                       }
+                       this.maxslots = bb.readByte();
+                       return new TableStatus(slot, this.maxslots);
+               }
+       }]);
+
+       return TableStatus;
+}(Entry);
\ No newline at end of file