defined the blockwise option with properties

AlCalzone · Dec 18, 2017 · b5caf75 · b5caf75
1 parent 7a45de2
commit b5caf75
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 4 deletions.
diff --git a/build/BlockOption.d.ts b/build/BlockOption.d.ts
@@ -0,0 +1,3 @@
+import { NumericOption } from "./Option";
+export declare class Block1Option extends NumericOption {
+}
diff --git a/build/BlockOption.js b/build/BlockOption.js
@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Option_1 = require("./Option");
+class Block1Option extends Option_1.NumericOption {
+}
+exports.Block1Option = Block1Option;
diff --git a/build/BlockwiseOptions.d.ts b/build/BlockwiseOptions.d.ts
@@ -0,0 +1,3 @@
+import { NumericOption } from "./Option";
+export declare class Block1Option extends NumericOption {
+}
diff --git a/build/BlockwiseOptions.js b/build/BlockwiseOptions.js
@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Option_1 = require("./Option");
+class Block1Option extends Option_1.NumericOption {
+}
+exports.Block1Option = Block1Option;
diff --git a/build/Option.d.ts b/build/Option.d.ts
@@ -37,6 +37,14 @@ export declare class NumericOption extends Option {
     value: number;
     static create(code: number, name: string, repeatable: boolean, maxLength: number, rawValue: Buffer): NumericOption;
 }
+/**
+ * Specialized Message optionis for blockwise transfer
+ */
+export declare class BlockOption extends NumericOption {
+    sizeExponent: number;
+    isLastBlock: boolean;
+    blockNumber: number;
+}
 /**
  * Specialized Message options for binary (and empty) content.
  */

diff --git a/build/Option.js b/build/Option.js
@@ -177,6 +177,38 @@ class NumericOption extends Option {
     }
 }
 exports.NumericOption = NumericOption;
+/**
+ * Specialized Message optionis for blockwise transfer
+ */
+class BlockOption extends NumericOption {
+    get sizeExponent() {
+        return this.value & 0b111;
+    }
+    set sizeExponent(value) {
+        if (value < 0 || value > 6) {
+            throw new Error("the size exponent must be in the range of 0..6");
+        }
+        // overwrite the last 3 bits
+        this.value = (this.value & ~0b111) | value;
+    }
+    get isLastBlock() {
+        const moreBlocks = (this.value & 0b1000) === 0b1000;
+        return !moreBlocks;
+    }
+    set isLastBlock(value) {
+        const moreBlocks = !value;
+        // overwrite the 4th bit
+        this.value = (this.value & ~0b1000) | (moreBlocks ? 0b1000 : 0);
+    }
+    get blockNumber() {
+        return this.value >>> 4;
+    }
+    set blockNumber(value) {
+        // TODO: check if we need to update the value length
+        this.value = (value << 4) | (this.value & 0b1111);
+    }
+}
+exports.BlockOption = BlockOption;
 /**
  * Specialized Message options for binary (and empty) content.
  */
@@ -254,8 +286,8 @@ defineOptionConstructor(NumericOption, 7, "Uri-Port", false, 2);
 defineOptionConstructor(NumericOption, 12, "Content-Format", false, 2);
 defineOptionConstructor(NumericOption, 14, "Max-Age", false, 4);
 defineOptionConstructor(NumericOption, 17, "Accept", false, 2);
-defineOptionConstructor(NumericOption, 23, "Block2", false, 3);
-defineOptionConstructor(NumericOption, 27, "Block1", false, 3);
+defineOptionConstructor(BlockOption, 23, "Block2", false, 3);
+defineOptionConstructor(BlockOption, 27, "Block1", false, 3);
 defineOptionConstructor(NumericOption, 28, "Size2", false, 4);
 defineOptionConstructor(NumericOption, 60, "Size1", false, 4);
 defineOptionConstructor(BinaryOption, 1, "If-Match", true, 0, 8);

diff --git a/build/options/BlockwiseOptions.d.ts b/build/options/BlockwiseOptions.d.ts
diff --git a/build/options/BlockwiseOptions.js b/build/options/BlockwiseOptions.js
diff --git a/src/Option.ts b/src/Option.ts
@@ -208,6 +208,42 @@ export class NumericOption extends Option {
 
 }
 
+/**
+ * Specialized Message optionis for blockwise transfer
+ */
+export class BlockOption extends NumericOption {
+
+	public get sizeExponent(): number {
+		return this.value & 0b111;
+	}
+	public set sizeExponent(value: number) {
+		if (value < 0 || value > 6) {
+			throw new Error("the size exponent must be in the range of 0..6");
+		}
+		// overwrite the last 3 bits
+		this.value = (this.value & ~0b111) | value;
+	}
+
+	public get isLastBlock(): boolean {
+		const moreBlocks = (this.value & 0b1000) === 0b1000;
+		return !moreBlocks;
+	}
+	public set isLastBlock(value: boolean) {
+		const moreBlocks = !value;
+		// overwrite the 4th bit
+		this.value = (this.value & ~0b1000) | (moreBlocks ? 0b1000 : 0);
+	}
+
+	public get blockNumber(): number {
+		return this.value >>> 4;
+	}
+	public set blockNumber(value: number) {
+		// TODO: check if we need to update the value length
+		this.value = (value << 4) | (this.value & 0b1111);
+	}
+
+}
+
 /**
  * Specialized Message options for binary (and empty) content.
  */
@@ -312,8 +348,8 @@ defineOptionConstructor(NumericOption, 7, "Uri-Port", false, 2);
 defineOptionConstructor(NumericOption, 12, "Content-Format", false, 2);
 defineOptionConstructor(NumericOption, 14, "Max-Age", false, 4);
 defineOptionConstructor(NumericOption, 17, "Accept", false, 2);
-defineOptionConstructor(NumericOption, 23, "Block2", false, 3);
-defineOptionConstructor(NumericOption, 27, "Block1", false, 3);
+defineOptionConstructor(BlockOption, 23, "Block2", false, 3);
+defineOptionConstructor(BlockOption, 27, "Block1", false, 3);
 defineOptionConstructor(NumericOption, 28, "Size2", false, 4);
 defineOptionConstructor(NumericOption, 60, "Size1", false, 4);
 defineOptionConstructor(BinaryOption, 1, "If-Match", true, 0, 8);