infinispan 0.9.0 → 0.11.0

package/lib/infinispan.js

@@ -24,6 +24,7 @@
       logger.debugf('Using protocol version: %s', version);
 
       switch (version) {
+        case '3.0': return protocols.version30(clientOpts);
         case '2.9': return protocols.version29(clientOpts);
         case '2.5': return protocols.version25(clientOpts);
         case '2.2': return protocols.version22(clientOpts);
@@ -133,7 +134,7 @@
         /**
          * Returns the next entry being iterated over.
          *
-         * @returns {module:promise.Promise.<IteratorNext>}
+         * @returns {Promise.<IteratorNext>}
          * It returns a Promise which will be completed with an instance that
          * provides the next element.
          * @memberof Iterator#
@@ -168,7 +169,7 @@
         /**
          * Close the iteration.
          *
-         * @returns {module:promise.Promise}
+         * @returns {Promise}
          * A Promise which will be completed once the iteration has been closed.
          * @memberof Iterator#
          * @since 0.3
@@ -200,7 +201,7 @@
       /**
        * Disconnect client from backend server(s).
        *
-       * @returns {module:promise.Promise}
+       * @returns {Promise<void>}
        * A promise that will be completed once client has
        * completed disconnection from server(s).
        * @memberof Client#
@@ -213,7 +214,7 @@
        * Get the value associated with the given key parameter.
        *
        * @param k {(String|Object)} Key to retrieve.
-       * @returns {module:promise.Promise.<?String>}
+       * @returns {Promise.<?String>}
        * A promise that will be completed with the value associated with
        * the key, or undefined if the value is not present.
        * @memberof Client#
@@ -225,11 +226,28 @@
         var decoder = p.decodeValue();
         return futureKey(ctx, 0x03, k, p.encodeKey(k), decoder);
       },
+      /**
+       * Query the server with the given queryString.
+       *
+       * @param q {(Object)} query to retrieve.
+       * @returns {Promise.<?Object[]>}
+       * A promise that will be completed with the array of values associated with
+       * the query, or empty array if the no values matches the query.
+       * @memberof Client#
+       * @since 1.3
+       */
+      query: function(q) {
+        //TODO : extend the support of query with application/json datatypes
+        var ctx = transport.context(SMALL);
+        logger.debugf('Invoke query(msgId=%d,key=%s)', ctx.id, u.str(q));
+        var decoder = p.decodeQuery();
+        return futureKey(ctx, 0x1F, q, p.encodeQuery(q), decoder);
+      },
       /**
        * Check whether the given key is present.
        *
        * @param k {(String|Object)} Key to check for presence.
-       * @returns {module:promise.Promise.<boolean>}
+       * @returns {Promise.<boolean>}
        * A promise that will be completed with true if there is a value
        * associated with the key, or false otherwise.
        * @memberof Client#
@@ -256,7 +274,7 @@
        * Get the value and metadata associated with the given key parameter.
        *
        * @param k {(String|Object)} Key to retrieve.
-       * @returns {module:promise.Promise.<?MetadataValue>}
+       * @returns {Promise.<?MetadataValue>}
        * A promise that will be completed with the value and metadata
        * associated with the key, or undefined if the value is not present.
        * @memberof Client#
@@ -298,8 +316,8 @@
        *
        * @param k {(String|Object)} Key with which the specified value is to be associated.
        * @param v {(String|Object)} Value to be associated with the specified key.
-       * @param opts {?StoreOptions} Optional store options.
-       * @returns {module:promise.Promise.<?(String|Object)>}
+       * @param opts {StoreOptions=} Optional store options.
+       * @returns {Promise.<?(String|Object)>}
        * A promise that will be completed with undefined unless 'previous'
        * option has been enabled and a previous value exists, in which case it
        * would return the previous value.
@@ -327,8 +345,8 @@
        * Removes the mapping for a key if it is present.
        *
        * @param k {(String|Object)} Key whose mapping is to be removed.
-       * @param opts {?RemoveOptions} Optional remove options.
-       * @returns {module:promise.Promise.<(Boolean|String|Object)>}
+       * @param opts {RemoveOptions=} Optional remove options.
+       * @returns {Promise.<(Boolean|String|Object)>}
        * A promise that will be completed with true if the mapping was removed,
        * or false if the key did not exist.
        * If the 'previous' option is enabled, it returns the value
@@ -349,8 +367,8 @@
        *
        * @param k {(String|Object)} Key with which the specified value is to be associated.
        * @param v {(String|Object)} Value to be associated with the specified key.
-       * @param opts {?StoreOptions} Optional store options.
-       * @returns {module:promise.Promise.<(Boolean|String|Object)>}
+       * @param opts {StoreOptions=} Optional store options.
+       * @returns {Promise.<(Boolean|String|Object)>}
        * A promise that will be completed with true if the mapping was stored,
        * or false if the key is already present.
        * If the 'previous' option is enabled, it returns the existing value
@@ -371,8 +389,8 @@
        *
        * @param k {(String|Object)} Key with which the specified value is associated.
        * @param v {(String|Object)} Value expected to be associated with the specified key.
-       * @param opts {?StoreOptions} Optional store options.
-       * @returns {module:promise.Promise.<(Boolean|String|Object)>}
+       * @param opts {StoreOptions=} Optional store options.
+       * @returns {Promise.<(Boolean|String|Object)>}
        * A promise that will be completed with true if the mapping was replaced,
        * or false if the key does not exist.
        * If the 'previous' option is enabled, it returns the value that was
@@ -396,8 +414,8 @@
        * @param version {Buffer} binary buffer version that should match the
        * one in the server for the operation to succeed. Version information
        * can be retrieved with getWithMetadata method.
-       * @param opts {?StoreOptions} Optional store options.
-       * @returns {module:promise.Promise.<(Boolean|String|Object)>}
+       * @param opts {StoreOptions=} Optional store options.
+       * @returns {Promise.<(Boolean|String|Object)>}
        * A promise that will be completed with true if the version matches
        * and the mapping was replaced, otherwise it returns false if not
        * replaced because key does not exist or version sent does not match
@@ -424,8 +442,8 @@
        * @param version {Buffer} binary buffer version that should match the
        * one in the server for the operation to succeed. Version information
        * can be retrieved with getWithMetadata method.
-       * @param opts {?RemoveOptions} Optional remove options.
-       * @returns {module:promise.Promise.<(Boolean|String|Object)>}
+       * @param opts {RemoveOptions=} Optional remove options.
+       * @returns {Promise.<(Boolean|String|Object)>}
        * A promise that will be completed with true if the version matches
        * and the mapping was removed, otherwise it returns false if not
        * removed because key does not exist or version sent does not match
@@ -456,7 +474,7 @@
        * Retrieves all of the entries for the provided keys.
        *
        * @param keys {(String[]|Object[])} Keys to find values for.
-       * @returns {module:promise.Promise.<Entry[]>}
+       * @returns {Promise.<Entry[]>}
        * A promise that will be completed with an array of entries for all
        * keys found. If a key does not exist, there won't be an entry for that
        * key in the returned array.
@@ -484,9 +502,9 @@
        * Stores all of the mappings from the specified entry array.
        *
        * @param pairs {Entry[]} key/value pair mappings to be stored
-       * @param opts {MultiStoreOptions}
+       * @param opts {MultiStoreOptions=}
        * Optional storage options to apply to all entries.
-       * @returns {module:promise.Promise}
+       * @returns {Promise}
        * A promise that will be completed when all entries have been stored.
        * @memberof Client#
        * @since 0.3
@@ -512,8 +530,8 @@
        *
        * @param batchSize {Number}
        * The number of entries transferred from the server at a time.
-       * @param opts {?IteratorOptions} Optional iteration settings.
-       * @return {module:promise.Promise.<Iterator>}
+       * @param opts {IteratorOptions=} Optional iteration settings.
+       * @return {Promise.<Iterator>}
        * A promise that will be completed with an iterator that can be used
        * to retrieve stored elements.
        * @memberof Client#
@@ -530,7 +548,7 @@
       /**
        * Count of entries in the server(s).
        *
-       * @returns {module:promise.Promise.<Number>}
+       * @returns {Promise.<Number>}
        * A promise that will be completed with the number of entries stored.
        * @memberof Client#
        * @since 0.3
@@ -543,7 +561,7 @@
       /**
        * Clear all entries stored in server(s).
        *
-       * @returns {module:promise.Promise}
+       * @returns {Promise}
        * A promise that will be completed when the clear has been completed.
        * @memberof Client#
        * @since 0.3
@@ -556,7 +574,7 @@
       /**
        * Pings the server(s).
        *
-       * @returns {module:promise.Promise}
+       * @returns {Promise}
        * A promise that will be completed when ping response was received.
        * @memberof Client#
        * @since 0.3
@@ -564,7 +582,7 @@
       ping: function() {
         var ctx = transport.context(TINY);
         logger.debugf('Invoke ping(msgId=%d)', ctx.id);
-        return futureDecodeOnly(ctx, 0x17, p.decodeServerMediaTypes);
+        return futureDecodeOnly(ctx, 0x17, p.decodePingResponse);
       },
 
       /**
@@ -580,7 +598,7 @@
       /**
        * Retrieve various statistics from server(s).
        *
-       * @returns {module:promise.Promise<StatsItem[]>}
+       * @returns {Promise<StatsItem[]>}
        * A promise that will be completed with an array of statistics, where
        * each element will have a single property. This single property will
        * have the statistic name as property name and statistic value as
@@ -614,8 +632,8 @@
        * entry version and listener id.
        * 'remove' and 'expiry' events callback the function with key
        * and listener id.
-       * @param opts {?ListenOptions} Options for adding listener.
-       * @returns {module:promise.Promise<String>}
+       * @param opts {ListenOptions=} Options for adding listener.
+       * @returns {Promise<String>}
        * A promise that will be completed with the identifier of the listener.
        * This identifier can be used to register multiple callbacks with the
        * same listener, or to remove the listener.
@@ -645,7 +663,7 @@
        *
        * @param {String} listenerId
        * Listener identifier to identify listener to remove.
-       * @return {module:promise.Promise}
+       * @return {Promise}
        * A promise that will be completed when the listener has been removed.
        * @memberof Client#
        * @since 0.3
@@ -672,7 +690,7 @@
        *
        * @param {String} scriptName Name of the script to store.
        * @param {String} script Script to store in server.
-       * @return {module:promise.Promise}
+       * @return {Promise}
        * A promise that will be completed when the script has been stored.
        * @memberof Client#
        * @since 0.3
@@ -700,9 +718,9 @@
        * Execute the named script passing in optional parameters.
        *
        * @param {String} scriptName Name of the script to execute.
-       * @param {?ExecParams[]} params
+       * @param {ExecParams[]} [params]
        * Optional array of named parameters to pass to script in server.
-       * @returns {module:promise.Promise<String|String[]>}
+       * @returns {Promise<String|String[]>}
        * A promise that will be completed with either the value returned by the
        * script after execution for local scripts, or an array of values
        * returned by the script when executed in multiple servers for
@@ -735,6 +753,14 @@
        */
       toString: function() {
         return util.format('Client(%s)', transport);
+      },
+
+      registerProtostreamType: function(typeName,descriptorId){
+        return p.registerProtostreamType(typeName,descriptorId);
+      },
+
+      registerProtostreamRoot: function(root){
+        return p.registerProtostreamRoot(root);
       }
     }
   };
@@ -784,7 +810,7 @@
        * previously declared via configuration.
        *
        * @param clusterName name of the cluster to which to switch to
-       * @return {module:promise.Promise<Boolean>}
+       * @return {Promise<Boolean>}
        * A promise encapsulating a Boolean that indicates {@code true} if the
        * switch happened, or {@code false} otherwise.
        * @memberof Topology#
@@ -797,7 +823,7 @@
        * Switch remote cache manager to the default cluster,
        * previously declared via configuration.
        *
-       * @return {module:promise.Promise<Boolean>}
+       * @return {Promise<Boolean>}
        * A promise encapsulating a Boolean that indicates {@code true} if the
        * switch happened, or {@code false} otherwise.
        * @memberof Topology#
@@ -838,20 +864,18 @@
    * @param args {(ServerAddress|ServerAddress[])}
    * Optional single or multiple addresses to which to connect. If none
    * provided, the client will connect to localhost:11222 address by default.
-   * @param options {module:infinispan.ClientOptions}
+   * @param [options] {ClientOptions}
    * Optional configuration settings.
-   * @returns A promise that will be completed once the connection
-   * has been established. The promise will be completed with a client
-   * instance on which operations can invoked.
    * @constructs Client
+   * @returns {Promise<ReturnType<Client>>}
    * @since 0.3
    */
   exports.client = function client(args, options) {
     var merged = f.merge(Client.config, options);
     var c = new Client(u.normalizeAddresses(args), merged);
+
     return c.connect();
   };
-
   /**
    * Cluster information.
    *
@@ -868,26 +892,32 @@
    * @static
    * @typedef {Object} ClientOptions
    * @property {?(2.9|2.5|2.2)} [version=2.9] - Version of client/server protocol.
-   * @property {?String} cacheName - Optional cache name.
+   * @property {?String} [cacheName] - Optional cache name.
    * @property {?Number} [maxRetries=3] - Optional number of retries for operation.
+   * @property {?Object} [ssl] - TLS/SSL properties.
    * @property {?boolean} [ssl.enabled=false] - Optional flag to enable SSL support.
    * @property {?String} [ssl.secureProtocol=TLSv1_2_method] - Optional field with secure protocol in use.
-   * @property {?String[]} ssl.trustCerts - Optional paths of trusted SSL certificates.
-   * @property {?String} ssl.clientAuth.key - Optional path to client authentication key.
-   * @property {?String} ssl.clientAuth.passphrase - Optional password for client key.
-   * @property {?String} ssl.clientAuth.cert - Optional client certificate.
-   * @property {?String} ssl.sniHostName - Optional SNI host name.
-   * @property {?String} ssl.cryptoStore.path - Optional crypto store path.
-   * @property {?String} ssl.cryptoStore.passphrase - Optional password for crypto store.
-   * @property {?boolean} authentication.enabled - Enable authentication.
-   * @property {?String} authentication.saslMechanism - Select the SASL mechanism to use. Can be one of PLAIN, DIGEST-MD5, SCRAM-SHA-1, SCRAM-SHA-256, SCRAM-SHA-384, SCRAM-SHA-512, EXTERNAL, OAUTHBEARER
-   * @property {?String} authentication.userName - The authentication username. Required by the PLAIN, DIGEST and SCRAM mechanisms.
-   * @property {?String} authentication.password - The authentication password. Required by the PLAIN, DIGEST and SCRAM mechanisms.
-   * @property {?String} authentication.token - The OAuth token. Required by the OAUTHBEARER mechanism.
-   * @property {?String} authentication.authzid - The SASL authorization ID.
+   * @property {?String[]} [ssl.trustCerts] - Optional paths of trusted SSL certificates.
+   * @property {?String} [ssl.clientAuth.key] - Optional path to client authentication key.
+   * @property {?String} [ssl.clientAuth.passphrase] - Optional password for client key.
+   * @property {?String} [ssl.clientAuth.cert] - Optional client certificate.
+   * @property {?String} [ssl.sniHostName] - Optional SNI host name.
+   * @property {?String} [ssl.cryptoStore.path] - Optional crypto store path.
+   * @property {?String} [ssl.cryptoStore.passphrase] - Optional password for crypto store.
+   * @property {?Object} [authentication]- Authentication properties.
+   * @property {?boolean} [authentication.enabled]- Enable authentication.
+   * @property {?String} [authentication.saslMechanism] - Select the SASL mechanism to use. Can be one of PLAIN, DIGEST-MD5, SCRAM-SHA-1, SCRAM-SHA-256, SCRAM-SHA-384, SCRAM-SHA-512, EXTERNAL, OAUTHBEARER
+   * @property {?String} [authentication.userName] - The authentication username. Required by the PLAIN, DIGEST and SCRAM mechanisms.
+   * @property {?String} [authentication.password] - The authentication password. Required by the PLAIN, DIGEST and SCRAM mechanisms.
+   * @property {?String} [authentication.token] - The OAuth token. Required by the OAUTHBEARER mechanism.
+   * @property {?String} [authentication.authzid] - The SASL authorization ID.
+   * @property {?String} [authentication.authzid] - The SASL authorization ID.
+   * @property {?Object} [dataFormat] - Content-type for entry
+   * @property {?String} [dataFormat.keyType] - Content-type for key
+   * @property {?String} [dataFormat.valueType] - Content-type for value
    * @property {?boolean} [topologyUpdates=true] - Optional flag to controls whether the client deals with topology updates or not.
-   * @property {?(text/plain|application/json)} [mediaType=text/plain] - Media type of the cache contents.
-   * @property {?Cluster[]} clusters - Optional additional clusters for cross-site failovers.
+   * @property {?("text/plain"|"application/json")} [mediaType="text/plain"] - Media type of the cache contents.
+   * @property {?Cluster[]} [clusters] - Optional additional clusters for cross-site failovers.
    * @since 0.3
    */
   Client.config = {

package/lib/io.js

@@ -7,9 +7,6 @@
   var fs = require('fs');
   var net = require('net');
 
-  var promiseFinally = require('promise.prototype.finally');
-  promiseFinally.shim(); // will be a no-op if not needed
-
   var tls = require('tls');
   var util = require('util');
 
@@ -259,10 +256,19 @@
         });
       },
       write: function(buffer) {
-        var flushed = sock.write(buffer);
-        if (!flushed)
-          logger.debugf('Buffer write not fully flushed, part of of data queued for: %s',
-            buffer.toString('hex').toUpperCase());
+        return new Promise(function (fulfill, reject) {
+          var flushed = sock.write(buffer, (err) => {
+            if (err) {
+              logger.error('Error writing to socket: %s', err);
+              transport.retryRpcs(addr); // retry RPCs in case of error
+            }
+            fulfill();
+          });
+          if (!flushed)
+            logger.debugf('Buffer write not fully flushed, part of of data queued for: %s',
+              buffer.toString('hex').toUpperCase());
+        });
+
       },
       getAddress: function() {
         return addr;
@@ -745,7 +751,7 @@
       logger.debugf('Invoke ping(msgId=%d)', ctx.id);
       var p = transport.getProtocol();
       f.actions(p.stepsHeader(ctx, 0x17, undefined), codec.bytesEncoded)(ctx);
-      return transport.writeCommandPinned(ctx, p.decodeServerMediaTypes, conn);
+      return transport.writeCommandPinned(ctx, p.decodePingResponse, conn);
     }
 
     function auth(transport, conn, topologyId) {

package/lib/protocols.js

@@ -3,14 +3,14 @@
 (function() {
 
   var _ = require('underscore');
-
+  
   var f = require('./functional');
   var u = require('./utils');
   var codec = require('./codec');
 
   var logger = u.logger('protocols');
-  var s = require('saslmechanisms');
-  var factory = new s.Factory();
+  var Factory = require('./sasl/factory');
+  var factory = new Factory();
   factory.use(require('./sasl/plain'));
   factory.use(require('./sasl/external'));
   factory.use('DIGEST-MD5', require('./sasl/digest'));
@@ -55,6 +55,7 @@
   var DECODE_TIMESTAMP = f.actions([codec.decodeLong(), codec.decodeVInt()], codec.allDecoded(2));
   var DECODE_UBYTE = f.actions([codec.decodeUByte()], codec.lastDecoded);
   var DECODE_VINT = f.actions([codec.decodeVInt()], codec.lastDecoded);
+  var DECODE_SHORT = f.actions([codec.decodeShort()], codec.lastDecoded);
 
   function hasOpt(opts, name) { return _.has(opts, name) && f.truthy(opts[name]); }
   function hasOptPrev(opts) { return hasOpt(opts, 'previous'); }
@@ -117,6 +118,11 @@
           return [outer.encodeMediaKey(k)]; // key
         }
       },
+      encodeQuery: function (q) {
+        return function() {
+          return [codec.encodeQuery(q)]; // query
+        }
+      },
       encodeKeyVersion: function (k, version) {
         var outer = this;
         return function() {
@@ -361,6 +367,12 @@
           return decodeObject(header, bytebuf, decodeAction);
         }
       },
+      decodeQuery: function() {
+        return function(header, bytebuf) {
+          var decodeAction = f.actions([f.partial2(codec.decodeQuery,ProtostreamType.lookupProtostreamTypeById,ProtobufRoot.findRootByTypeName)()],codec.lastDecoded);
+          return decodeObject(header, bytebuf, decodeAction);
+        }
+      },
       decodeWithMeta: function() {
         var decoderValue = decoderMedia(this.valueMediaType);
         return function(header, bytebuf) {
@@ -749,6 +761,7 @@
       return f.dispatch(
         f.isa('application/json', encoder(2, encoderJson, decoderJson()))
         , f.isa('text/plain', encoder(13, encoderString, decoderString()))
+        , f.isa('application/x-protostream', encoder(12, encoderProtobuf, decoderProtobuf()))
       )(mediaType);
     }
 
@@ -768,6 +781,14 @@
       return codec.decodeString();
     }
 
+    function encoderProtobuf(message){
+      return codec.encodeProtobuf(message,ProtostreamType.lookupProtostreamTypeByName);
+    }
+
+    function decoderProtobuf(){
+      return f.partial2(codec.decodeProtobuf,ProtostreamType.lookupProtostreamTypeById,ProtobufRoot.findRootByTypeName)();
+    }
+
     function encoder(id, mediaEncoder, mediaDecoder) {
       return function() {
         return [
@@ -873,9 +894,9 @@
         if (keyMediaType.continue) {
           var valueMediaType = decodeServerMediaType(bytebuf);
           if (valueMediaType.continue)
+          
             return {result: undefined, continue: true};
         }
-
         return {continue: false};
       }
     }
@@ -943,6 +964,73 @@
     }
   }());
 
+  var Ping29Mixin = (function() {
+    return {
+      decodePingResponse: function(header,bytebuf){
+        logger.debugf("header and bytebuf %s %s",header,bytebuf);
+        return MediaTypesMixin.decodeServerMediaTypes(header,bytebuf);
+      }
+    }
+  }());
+
+  var Ping30Mixin = (function() {
+    return {
+      decodePingResponse: function(header,bytebuf){
+        var serverMediaTypes= MediaTypesMixin.decodeServerMediaTypes(header,bytebuf);
+        var version=DECODE_UBYTE(bytebuf);
+        var opCount=DECODE_VINT(bytebuf);
+        var opRequestCodes=[];
+        for(let i=0;i<opCount;i++){
+          opRequestCodes.push(DECODE_SHORT(bytebuf));
+        }
+        return serverMediaTypes;
+      }
+    }
+  }());
+
+  var ProtostreamType = (function() {
+    var protostreamTypes=[];
+    return {
+      registerProtostreamType: function(protostreamTypeName,protostreamDescriptorId){
+        var protostreamType={
+          protostreamTypeName,
+          protostreamDescriptorId
+        };
+        protostreamTypes.push(protostreamType);
+        return protostreamType;
+      },
+      lookupProtostreamTypeByName: function (protostreamTypeName) {
+        return _.find(protostreamTypes,function(protostreamType){
+          return _.isEqual(protostreamType.protostreamTypeName,protostreamTypeName)
+        }).protostreamDescriptorId;
+      },
+      lookupProtostreamTypeById: function(protostreamDescriptorId){
+        return _.find(protostreamTypes,function(protostreamType){
+          return _.isEqual(protostreamType.protostreamDescriptorId,protostreamDescriptorId)
+        }).protostreamTypeName;
+      }
+    }
+  }());
+
+  var ProtobufRoot = (function() {
+    var protobufRoot;
+    return {
+      registerProtostreamRoot: function(root){
+        protobufRoot=root;
+        return protobufRoot;
+      },
+      findRootByTypeName: function(typeName){
+        try{
+          var root= protobufRoot.lookupType(typeName);
+          return root;
+        }catch(err){
+          throw new Error("Protobuf root not found");
+        }
+      }
+    }
+  }());
+  
+
   function Protocol(v, clientOpts) {
     this.version = v;
     this.clientOpts = clientOpts;
@@ -963,6 +1051,10 @@
     Protocol.call(this, 29, clientOpts);
   };
 
+  var Protocol30 = function(clientOpts) {
+    Protocol.call(this, 30, clientOpts);
+  };
+
   // TODO: Missing operations, just for reference
   var IdsMixin = {
     queryId: function() { return 0x1F },
@@ -978,6 +1070,8 @@
     , ListenersMixin
     , NoListenerInterestsMixin
     , NoMediaTypesMixin
+    , ProtostreamType
+    , ProtobufRoot
   );
 
   _.extend(Protocol25.prototype
@@ -989,6 +1083,8 @@
       , NoListenerInterestsMixin
       , IteratorMixin
       , NoMediaTypesMixin
+      , ProtostreamType
+      , ProtobufRoot
   );
 
   _.extend(Protocol29.prototype
@@ -1001,6 +1097,9 @@
       , IteratorMixin
       , MediaTypesMixin
       , SASLMixin
+      , Ping29Mixin
+      , ProtostreamType
+      , ProtobufRoot
       // TODO 2.6 new ops: getStream and putStream
       // TODO 2.6 add listener change: listener event interests
       // TODO 2.7 new ops: prepare, commit and rollback
@@ -1010,6 +1109,28 @@
       // TODO 2.8 header change: media types
   );
 
+  _.extend(Protocol30.prototype
+    , EncodeMixin
+    , ExpiryEncodeMixin
+    , DecodeMixin
+    , IdsMixin
+    , ListenersMixin
+    , ListenerInterestsMixin
+    , IteratorMixin
+    , MediaTypesMixin
+    , SASLMixin
+    , Ping30Mixin
+    , ProtostreamType
+    , ProtobufRoot
+    // TODO 2.6 new ops: getStream and putStream
+    // TODO 2.6 add listener change: listener event interests
+    // TODO 2.7 new ops: prepare, commit and rollback
+    // TODO 2.7 new ops: counter operations
+    // TODO 2.7 new events: counter events
+    // TODO 2.8 listener events: can come from any connection
+    // TODO 2.8 header change: media types
+);
+
   exports.version22 = function(clientOpts) {
     return new Protocol22(clientOpts);
   };
@@ -1022,4 +1143,8 @@
     return new Protocol29(clientOpts);
   };
 
+  exports.version30 = function(clientOpts) {
+    return new Protocol30(clientOpts);
+  };
+
 }.call(this));