protobufjs 4.1.1 → 5.0.1

package/.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
 node_js:
-  - 0.10
   - 0.12
+  - 4.2
+sudo: false

package/README.md

@@ -1,19 +1,19 @@
-![ProtoBuf.js - Protocol Buffers for JavaScript. Finally.](https://raw.github.com/dcodeIO/ProtoBuf.js/master/ProtoBuf.png)
+![protobuf.js - Protocol Buffers for JavaScript. Finally.](https://raw.github.com/dcodeIO/protobuf.js/master/protobuf.png)
 =====================================
 **Protocol Buffers** are a language-neutral, platform-neutral, extensible way of serializing structured data for use
 in communications protocols, data storage, and more, originally designed at Google ([see](https://developers.google.com/protocol-buffers/docs/overview)).
 
-**ProtoBuf.js** is a pure JavaScript implementation on top of [ByteBuffer.js](https://github.com/dcodeIO/ByteBuffer.js)
+**protobuf.js** is a pure JavaScript implementation on top of [bytebuffer.js](https://github.com/dcodeIO/bytebuffer.js)
 including a .proto parser, message class building and simple encoding and decoding. There is no compilation step
 required, it's super easy to use and it works out of the box on .proto files!
 
-[![Build Status](https://travis-ci.org/dcodeIO/ProtoBuf.js.svg?branch=master)](https://travis-ci.org/dcodeIO/ProtoBuf.js)
-[![Donate](https://raw.githubusercontent.com/dcodeIO/Long.js/master/donate.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=info%40code-emitter.com&item_name=Open%20Source%3A%20ProtoBuf.js)
+[![Build Status](https://travis-ci.org/dcodeIO/protobuf.js.svg?branch=master)](https://travis-ci.org/dcodeIO/protobuf.js)
+[![Donate](https://raw.githubusercontent.com/dcodeIO/protobuf.js/master/donate.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=dcode%40dcode.io&item_name=%3C3%20protobuf.js)
 
 Getting started
 ---------------
 * **Step 1:** Become familar with [Google's Protocol Buffers (protobuf)](https://developers.google.com/protocol-buffers/docs/overview)
-* **Step 2:** Head straight to [our wiki for up to date usage information, changes and examples](https://github.com/dcodeIO/ProtoBuf.js/wiki)
+* **Step 2:** Head straight to [our wiki for up to date usage information, changes and examples](https://github.com/dcodeIO/protobuf.js/wiki)
 * **Step 3:** Build something cool! :-)
 
 Features
@@ -21,37 +21,37 @@ Features
 * [RequireJS](http://requirejs.org/)/AMD compatible
 * [node.js](http://nodejs.org)/CommonJS compatible, also available via [npm](https://npmjs.org/package/protobufjs)
 * Browser compatible
-* [Closure Compiler](https://developers.google.com/closure/compiler/) compatible (fully annotated, [externs](https://github.com/dcodeIO/ProtoBuf.js/tree/master/externs))
+* [Closure Compiler](https://developers.google.com/closure/compiler/) compatible (fully annotated, [externs](https://github.com/dcodeIO/protobuf.js/tree/master/externs))
 * Fully documented using [jsdoc3](https://github.com/jsdoc3/jsdoc)
 * Well tested through [test.js](https://github.com/dcodeIO/test.js)
-* [ByteBuffer.js](https://github.com/dcodeIO/ByteBuffer.js) is the only production dependency
+* [bytebuffer.js](https://github.com/dcodeIO/bytebuffer.js) is the only production dependency
 * Fully compatible to the official implementation including advanced features
 * proto2js command line utility
 
 Documentation
 -------------
 * [Read the official protobuf guide](https://developers.google.com/protocol-buffers/docs/overview)
-* [Read our wiki](https://github.com/dcodeIO/ProtoBuf.js/wiki)
-* [Read the API docs](http://htmlpreview.github.io/?https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/docs/ProtoBuf.html)
-* [Check out the examples](https://github.com/dcodeIO/ProtoBuf.js/tree/master/examples)
+* [Read our wiki](https://github.com/dcodeIO/protobuf.js/wiki)
+* [Read the API docs](http://htmlpreview.github.io/?https://raw.githubusercontent.com/dcodeIO/protobuf.js/master/docs/ProtoBuf.html)
+* [Check out the examples](https://github.com/dcodeIO/protobuf.js/tree/master/examples)
 
 Tests
 -----
-* [View source](https://github.com/dcodeIO/ProtoBuf.js/blob/master/tests/suite.js)
-* [View report](https://travis-ci.org/dcodeIO/ProtoBuf.js)
+* [View source](https://github.com/dcodeIO/protobuf.js/blob/master/tests/suite.js)
+* [View report](https://travis-ci.org/dcodeIO/protobuf.js)
 
 Downloads
 ---------
-* [Distributions](https://github.com/dcodeIO/ProtoBuf.js/tree/master/dist)
-* [ZIP-Archive](https://github.com/dcodeIO/ProtoBuf.js/archive/master.zip)
-* [Tarball](https://github.com/dcodeIO/ProtoBuf.js/tarball/master)
+* [Distributions](https://github.com/dcodeIO/protobuf.js/tree/master/dist)
+* [ZIP-Archive](https://github.com/dcodeIO/protobuf.js/archive/master.zip)
+* [Tarball](https://github.com/dcodeIO/protobuf.js/tarball/master)
 
 CDN usage
 ---------
 ```html
-<script src="//cdn.rawgit.com/dcodeIO/ProtoBuf.js/VERSION/dist/ProtoBuf.js"></script>
+<script src="//cdn.rawgit.com/dcodeIO/protobuf.js/VERSION/dist/protobuf.js"></script>
 ```
-With `VERSION` replaced by [a valid tag](https://github.com/dcodeIO/ProtoBuf.js/releases) or just `master` for testing
+With `VERSION` replaced by [a valid tag](https://github.com/dcodeIO/protobuf.js/releases) or just `master` for testing
 the latest master build.
 
 Contributors

package/bower.json

@@ -1,8 +1,8 @@
 {
     "name": "protobuf",
     "description": "Protocol Buffers for JavaScript. Finally.",
-    "version": "4.1.1",
-    "main": "dist/ProtoBuf.js",
+    "version": "5.0.1",
+    "main": "dist/protobuf.js",
     "license": "Apache-2.0",
     "homepage": "http://dcode.io/",
     "dependencies": {

package/cli/pbjs/targets/json.js

@@ -160,7 +160,7 @@ function buildMessage(msg) {
     msg.getChildren(ProtoBuf.Reflect.Message.OneOf).forEach(function(oneof) {
         oneofs[oneof.name] = buildMessageOneof(oneof);
     });
-    if (msg.extensions[0] !== ProtoBuf.ID_MIN || msg.extensions[1] !== ProtoBuf.ID_MAX)
+    if (msg.extensions)
         out["extensions"] = msg.extensions;
     if (Object.keys(oneofs).length === 0)
         delete out["oneofs"];
@@ -180,7 +180,8 @@ function buildMessageField(fld) {
         "keytype" : (typeof(fld.keyType) === 'string') ? fld.keyType : (fld.keyType !== null ? fld.keyType.name : undefined),
         "name"    : fld instanceof ProtoBuf.Reflect.Message.ExtensionField ? fld.name.substring(fld.name.lastIndexOf(".")+1): fld.name,
         "id"      : fld.id,
-        "options" : Object.keys(fld.options).length > 0 ? buildOptions(fld.options) : undefined
+        "options" : Object.keys(fld.options).length > 0 ? buildOptions(fld.options) : undefined,
+        "oneof"   : fld.oneof ? fld.oneof.name : undefined
     };
 }
 

package/cli/pbjs/targets/proto.js

@@ -61,7 +61,8 @@ var proto = module.exports = function(builder, options) {
             buildEnum(enm, indent);
         });
         ns.getChildren(ProtoBuf.Reflect.Message).forEach(function(msg) {
-            buildMessage(msg, indent);
+            if (!msg.isGroup) // legacy groups are build within the respective field
+                buildMessage(msg, indent);
         });
         var exts = util.groupExtensions(ns);
         if (exts !== null) {
@@ -98,9 +99,12 @@ var proto = module.exports = function(builder, options) {
 
     // Builds a message
     function buildMessage(msg, indent) {
-        if (!options.min)
-            out.push(indent);
-        out.push("message ", msg.name, options.min ? "{" : " {\n");
+        if (!msg.isGroup) {
+            if (!options.min)
+                out.push(indent);
+            out.push("message ", msg.name);
+        }
+        out.push(options.min ? "{" : " {\n");
         buildOptions(msg.options, indent+"    ");
         var n = 0, oneofFields = [];
         msg.getChildren(ProtoBuf.Reflect.Message.OneOf).forEach(function(oneof) {
@@ -125,10 +129,18 @@ var proto = module.exports = function(builder, options) {
         });
         if (n > 0 && !options.min)
             out[out.length-1] += "\n";
-        if (msg.extensions[0] !== ProtoBuf.ID_MIN || msg.extensions[1] !== ProtoBuf.ID_MAX) {
+        if (msg.extensions) { // array of ranges
             if (!options.min)
                 out.push(indent, "    ");
-            out.push("extensions ", value(msg.extensions[0]), " to ", msg.extensions[1] === ProtoBuf.ID_MAX ? "max" : value(msg.extensions[1]), options.min ? ";" : ";\n\n");
+            out.push("extensions ");
+            msg.extensions.forEach(function(range, index) {
+                if (index > 0)
+                    out.push(options.min ? "," : ", ");
+                out.push(value(range[0]));
+                if (range[1] !== range[0])
+                    out.push(" to ", range[1] === ProtoBuf.ID_MAX ? "max" : value(range[1]));
+            });
+            out.push(options.min ? ";" : ";\n\n");
         }
         buildNamespace(msg, indent+"    ");
         if (!options.min)
@@ -138,31 +150,43 @@ var proto = module.exports = function(builder, options) {
 
     // Builds a message field
     function buildMessageField(msg, fld, indent, isOneOf) {
+        var isGroup = false;
         if (!options.min)
             out.push(indent);
         if (!isOneOf)
             out.push(fld.required ? "required " : (fld.repeated ? "repeated " : "optional "));
-        if (fld.resolvedType !== null)
+        if (fld.resolvedType !== null) {
+            if (fld.resolvedType instanceof ProtoBuf.Reflect.Message && fld.resolvedType.isGroup) {
+                // inline legacy groups
+                out.push("group ");
+                isGroup = true;
+            }
             out.push(msg.qn(fld.resolvedType));
-        else
+        } else
             out.push(fld.type['name']);
-        out.push(" ", fld instanceof ProtoBuf.Reflect.Message.ExtensionField ? fld.name.substring(fld.name.lastIndexOf(".")+1) : fld.name, options.min ? "=" : " = ", fld.id);
-        var keys = Object.keys(fld.options);
-        if (keys.length > 0) {
-            out.push(options.min ? "[" : " [");
-            var n = 0;
-            keys.forEach(function(key) {
-                if (n > 0)
-                    out.push(options.min ? "," : ", ");
-                out.push(key, options.min ? "=" : " = ",
-                    // BEWARE: Monkey patch for string enum defaults
-                    key === "default" && fld.type === ProtoBuf.TYPES["enum"] && typeof fld.options[key] === 'string' ? fld.options[key] : value(fld.options[key])
-                );
-                n++;
-            });
-            out.push("]");
+        if (!isGroup)
+            out.push(" ", fld instanceof ProtoBuf.Reflect.Message.ExtensionField ? fld.name.substring(fld.name.lastIndexOf(".")+1) : fld.name);
+        out.push(options.min ? "=" : " = ", fld.id);
+        if (isGroup) // inline
+            buildMessage(fld.resolvedType, indent);
+        else {
+            var keys = Object.keys(fld.options);
+            if (keys.length > 0) {
+                out.push(options.min ? "[" : " [");
+                var n = 0;
+                keys.forEach(function (key) {
+                    if (n > 0)
+                        out.push(options.min ? "," : ", ");
+                    out.push(key, options.min ? "=" : " = ",
+                        // BEWARE: Monkey patch for string enum defaults
+                        key === "default" && fld.type === ProtoBuf.TYPES["enum"] && typeof fld.options[key] === 'string' ? fld.options[key] : value(fld.options[key])
+                    );
+                    n++;
+                });
+                out.push("]");
+            }
+            out.push(options.min ? ";" : ";\n");
         }
-        out.push(options.min ? ";" : ";\n");
     }
 
     // Builds an enum

package/cli/pbjs.js

@@ -13,7 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-var ProtoBuf = require(__dirname+"/../dist/ProtoBuf.js"),
+var ProtoBuf = require(__dirname+"/../index.js"),
     fs       = require("fs"),
     path     = require("path"),
     cli      = require("ascli")("pbjs"),
@@ -160,6 +160,10 @@ pbjs.main = function(argv) {
                 describe: "Suppresses any informatory output to stderr.",
                 default: false
             },
+            out: {
+                alias: "o",
+                describe: "Send output to file instead of stdout.",
+            },
             use: {
                 alias: "i",
                 describe: "Specifies an option to apply to the emitted builder\nutilized by your program, e.g. populateAccessors.",
@@ -265,6 +269,9 @@ pbjs.main = function(argv) {
     if (!options.quiet)
         cli.error("\nProcessing: "+sourceFiles.join(", ")+" ...\n");
     var res = pbjs.targets[options.target](builder, options);
+    if (options.out){
+        fs.writeFileSync(options.out, res);
+    }else
     process.stdout.write(res);
     if (!options.quiet)
         cli.error(""),

package/dist/README.md

@@ -5,31 +5,31 @@ ProtoBuf.js is available either with or without the .proto parser included.
 
 ### Full build including .proto parser (.proto and JSON)
 
-* **[ProtoBuf.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf.js)**
+* **[protobuf.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf.js)**
   contains the commented source code.
 
-* **[ProtoBuf.min.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf.min.js)**
+* **[protobuf.min.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf.min.js)**
   has been compiled with Closure Compiler.
   
-* **[ProtoBuf.min.js.gz](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf.min.js.gz)**
+* **[protobuf.min.js.gz](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf.min.js.gz)**
   has also been gzipped using `-9`.
   
-* **[ProtoBuf.min.map](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf.min.map)**
+* **[protobuf.min.map](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf.min.map)**
   is the source map generated by Closure Compiler.
   
-### Light build excluding .proto parser (JSON only) for use with [pbjs](https://github.com/dcodeIO/ProtoBuf.js/wiki/pbjs)
+### Light build excluding .proto parser (JSON only) for use with [pbjs](https://github.com/dcodeIO/Protobuf.js/wiki/pbjs)
 
-* **[ProtoBuf-light.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf-light.js)**
+* **[protobuf-light.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf-light.js)**
   contains the commented source code.
 
-* **[ProtoBuf-light.min.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf-light.min.js)**
+* **[protobuf-light.min.js](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf-light.min.js)**
   has been compiled with Closure Compiler.
   
-* **[ProtoBuf-light.min.js.gz](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf-light.min.js.gz)**
+* **[protobuf-light.min.js.gz](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf-light.min.js.gz)**
   has also been gzipped using `-9`.
   
-* **[ProtoBuf-light.min.map](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/ProtoBuf-light.min.map)**
+* **[protobuf-light.min.map](https://raw.githubusercontent.com/dcodeIO/ProtoBuf.js/master/dist/protobuf-light.min.map)**
   is the source map generated by Closure Compiler.
   
 When sending pull requests, please note that these files have been automatically generated from the sources located in
-[src/](https://github.com/dcodeIO/ProtoBuf.js/tree/master/src).
+[src/](https://github.com/dcodeIO/protobuf.js/tree/master/src).

package/dist/{ProtoBuf-light.js → protobuf-light.js}

@@ -15,20 +15,20 @@
  */
 
 /**
- * @license ProtoBuf.js (c) 2013 Daniel Wirtz <dcode@dcode.io>
+ * @license protobuf.js (c) 2013 Daniel Wirtz <dcode@dcode.io>
  * Released under the Apache License, Version 2.0
- * see: https://github.com/dcodeIO/ProtoBuf.js for details
+ * see: https://github.com/dcodeIO/protobuf.js for details
  */
 (function(global, factory) {
 
     /* AMD */ if (typeof define === 'function' && define["amd"])
-        define(["ByteBuffer"], factory);
+        define(["bytebuffer"], factory);
     /* CommonJS */ else if (typeof require === "function" && typeof module === "object" && module && module["exports"])
-        module["exports"] = factory(require("bytebuffer"), require);
+        module["exports"] = factory(require("bytebuffer"), true);
     /* Global */ else
         (global["dcodeIO"] = global["dcodeIO"] || {})["ProtoBuf"] = factory(global["dcodeIO"]["ByteBuffer"]);
 
-})(this, function(ByteBuffer, nodeRequire) {
+})(this, function(ByteBuffer, isCommonJS) {
     "use strict";
 
     /**
@@ -57,7 +57,7 @@
      * @const
      * @expose
      */
-    ProtoBuf.VERSION = "4.1.1";
+    ProtoBuf.VERSION = "5.0.1";
 
     /**
      * Wire types.
@@ -351,8 +351,9 @@
             if (callback && typeof callback != 'function')
                 callback = null;
             if (Util.IS_NODE) {
+                var fs = require("fs");
                 if (callback) {
-                    Util.require("fs").readFile(path, function(err, data) {
+                    fs.readFile(path, function(err, data) {
                         if (err)
                             callback(null);
                         else
@@ -360,7 +361,7 @@
                     });
                 } else
                     try {
-                        return Util.require("fs").readFileSync(path);
+                        return fs.readFileSync(path);
                     } catch (e) {
                         return null;
                     }
@@ -390,18 +391,6 @@
             }
         };
 
-        /**
-         * Requires a node module.
-         * @function
-         * @param {string} path
-         * @returns {*}
-         * @throws Error If node require is not supported
-         * @expose
-         */
-        Util.require = Util.IS_NODE
-            ? function(path) { return nodeRequire(path); }
-            : function(path) { throw Error("node require is not supported by this platform")};
-
         /**
          * Converts a string to camel case.
          * @param {string} str
@@ -899,9 +888,10 @@
          * @expose
          */
         ElementPrototype.verifyValue = function(value) {
-            var fail = function(val, msg) {
-                throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
-            }.bind(this);
+            var self = this;
+            function fail(val, msg) {
+                throw Error("Illegal value for "+self.toString(true)+" of type "+self.type.name+": "+val+" ("+msg+")");
+            }
             switch (this.type) {
                 // Signed 32bit
                 case ProtoBuf.TYPES["int32"]:
@@ -1391,10 +1381,10 @@
 
             /**
              * Extensions range.
-             * @type {!Array.<number>}
+             * @type {!Array.<number>|undefined}
              * @expose
              */
-            this.extensions = [ProtoBuf.ID_MIN, ProtoBuf.ID_MAX];
+            this.extensions = undefined;
 
             /**
              * Runtime message class.
@@ -1793,18 +1783,19 @@
                  * @name ProtoBuf.Builder.Message#encodeDelimited
                  * @function
                  * @param {(!ByteBuffer|boolean)=} buffer ByteBuffer to encode to. Will create a new one and flip it if omitted.
+                 * @param {boolean=} noVerify Whether to not verify field values, defaults to `false`
                  * @return {!ByteBuffer} Encoded message as a ByteBuffer
                  * @throws {Error} If the message cannot be encoded or if required fields are missing. The later still
                  *  returns the encoded ByteBuffer in the `encoded` property on the error.
                  * @expose
                  */
-                MessagePrototype.encodeDelimited = function(buffer) {
+                MessagePrototype.encodeDelimited = function(buffer, noVerify) {
                     var isNew = false;
                     if (!buffer)
                         buffer = new ByteBuffer(),
                         isNew = true;
                     var enc = new ByteBuffer().LE();
-                    T.encode(this, enc).flip();
+                    T.encode(this, enc, noVerify).flip();
                     buffer.writeVarint32(enc.remaining());
                     buffer.append(enc);
                     return isNew ? buffer.flip() : buffer;
@@ -1951,7 +1942,7 @@
                         return binaryAsBase64 ? obj.toBase64() : obj.toBuffer();
                     // Convert Longs to proper objects or strings
                     if (ProtoBuf.Long.isLong(obj))
-                        return longsAsStrings ? obj.toString() : new ProtoBuf.Long(obj);
+                        return longsAsStrings ? obj.toString() : ProtoBuf.Long.fromValue(obj);
                     var clone;
                     // Clone arrays
                     if (Array.isArray(obj)) {
@@ -2013,6 +2004,7 @@
                  * @name ProtoBuf.Builder.Message.decode
                  * @function
                  * @param {!ByteBuffer|!ArrayBuffer|!Buffer|string} buffer Buffer to decode from
+                 * @param {(number|string)=} length Message length. Defaults to decode all the remainig data.
                  * @param {string=} enc Encoding if buffer is a string: hex, utf8 (not recommended), defaults to base64
                  * @return {!ProtoBuf.Builder.Message} Decoded message
                  * @throws {Error} If the message cannot be decoded or if required fields are missing. The later still
@@ -2021,7 +2013,10 @@
                  * @see ProtoBuf.Builder.Message.decode64
                  * @see ProtoBuf.Builder.Message.decodeHex
                  */
-                Message.decode = function(buffer, enc) {
+                Message.decode = function(buffer, length, enc) {
+                    if (typeof length === 'string')
+                        enc = length,
+                        length = -1;
                     if (typeof buffer === 'string')
                         buffer = ByteBuffer.wrap(buffer, enc ? enc : "base64");
                     buffer = ByteBuffer.isByteBuffer(buffer) ? buffer : ByteBuffer.wrap(buffer); // May throw
@@ -2282,7 +2277,7 @@
         /**
          * Decodes an encoded message and returns the decoded message.
          * @param {ByteBuffer} buffer ByteBuffer to decode from
-         * @param {number=} length Message length. Defaults to decode all the available data.
+         * @param {number=} length Message length. Defaults to decode all remaining data.
          * @param {number=} expectedGroupEndId Expected GROUPEND id if this is a legacy group
          * @return {ProtoBuf.Builder.Message} Decoded message
          * @throws {Error} If the message cannot be decoded
@@ -2532,9 +2527,10 @@
          */
         FieldPrototype.verifyValue = function(value, skipRepeated) {
             skipRepeated = skipRepeated || false;
-            var fail = function(val, msg) {
-                throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
-            }.bind(this);
+            var self = this;
+            function fail(val, msg) {
+                throw Error("Illegal value for "+self.toString(true)+" of type "+self.type.name+": "+val+" ("+msg+")");
+            }
             if (value === null) { // NULL values for optional fields
                 if (this.required)
                     fail(typeof value, "required");
@@ -3148,6 +3144,9 @@
                                         callback(err);
                                         return;
                                     }
+                                    // Coalesce to empty string when service response has empty content
+                                    if (res === null)
+                                        res = ''
                                     try { res = method.resolvedResponseType.clazz.decode(res); } catch (notABuffer) {}
                                     if (!res || !(res instanceof method.resolvedResponseType.clazz)) {
                                         callback(Error("Illegal response type received in service method "+ T.name+"#"+method.name));
@@ -3591,13 +3590,12 @@
                                 subObj.push(svc);
                             });
 
-                        // Set extension range
+                        // Set extension ranges
                         if (def["extensions"]) {
-                            obj.extensions = def["extensions"];
-                            if (obj.extensions[0] < ProtoBuf.ID_MIN)
-                                obj.extensions[0] = ProtoBuf.ID_MIN;
-                            if (obj.extensions[1] > ProtoBuf.ID_MAX)
-                                obj.extensions[1] = ProtoBuf.ID_MAX;
+                            if (typeof def["extensions"][0] === 'number') // pre 5.0.1
+                                obj.extensions = [ def["extensions"] ];
+                            else
+                                obj.extensions = def["extensions"];
                         }
 
                         // Create on top of current namespace
@@ -3636,8 +3634,16 @@
                             def["fields"].forEach(function(fld) {
                                 if (obj.getChild(fld['id']|0) !== null)
                                     throw Error("duplicate extended field id in "+obj.name+": "+fld['id']);
-                                if (fld['id'] < obj.extensions[0] || fld['id'] > obj.extensions[1])
-                                    throw Error("illegal extended field id in "+obj.name+": "+fld['id']+" ("+obj.extensions.join(' to ')+" expected)");
+                                // Check if field id is allowed to be extended
+                                if (obj.extensions) {
+                                    var valid = false;
+                                    obj.extensions.forEach(function(range) {
+                                        if (fld["id"] >= range[0] && fld["id"] <= range[1])
+                                            valid = true;
+                                    });
+                                    if (!valid)
+                                        throw Error("illegal extended field id in "+obj.name+": "+fld['id']+" (not within valid ranges)");
+                                }
                                 // Convert extension field names to camel case notation if the override is set
                                 var name = fld["name"];
                                 if (this.options['convertFieldsToCamelCase'])
@@ -3706,7 +3712,7 @@
             if (typeof filename === 'string') {
 
                 if (ProtoBuf.Util.IS_NODE)
-                    filename = ProtoBuf.Util.require("path")['resolve'](filename);
+                    filename = require("path")['resolve'](filename);
                 if (this.files[filename] === true)
                     return this.reset();
                 this.files[filename] = true;
@@ -3715,7 +3721,7 @@
 
                 var root = filename.root;
                 if (ProtoBuf.Util.IS_NODE)
-                    root = ProtoBuf.Util.require("path")['resolve'](root);
+                    root = require("path")['resolve'](root);
                 if (root.indexOf("\\") >= 0 || filename.file.indexOf("\\") >= 0)
                     delim = '\\';
                 var fname = root + delim + filename.file;