infinispan 0.10.0 → 0.12.0

package/spec/configs/infinispan-ssl.xml

@@ -46,7 +46,7 @@
                 <security-realm name="default">
                     <server-identities>
                         <ssl>
-                            <keystore path="server.p12" keystore-password="secret" alias="server"/>
+                            <keystore path="server.p12" password="secret" alias="server"/>
                         </ssl>
                     </server-identities>
                     <properties-realm groups-attribute="Roles">
@@ -57,33 +57,33 @@
                 <security-realm name="client-cert">
                     <server-identities>
                         <ssl>
-                            <keystore path="server.p12" keystore-password="secret" alias="server"/>
+                            <keystore path="server.p12" password="secret" alias="server"/>
                         </ssl>
                     </server-identities>
                     <properties-realm groups-attribute="Roles">
                         <user-properties path="users.properties"/>
                         <group-properties path="groups.properties"/>
                     </properties-realm>
-                    <!--truststore-realm path="client.p12" keystore-password="secret"/-->
+                    <!--truststore-realm path="client.p12" password="secret"/-->
                 </security-realm>
                 <security-realm name="Trust1Realm">
                     <server-identities>
                         <ssl>
-                            <keystore path="trust1.p12" keystore-password="secret"/>
+                            <keystore path="trust1.p12" password="secret"/>
                         </ssl>
                     </server-identities>
                 </security-realm>
                 <security-realm name="Trust2Realm">
                     <server-identities>
                         <ssl>
-                            <keystore path="trust2.p12" keystore-password="secret"/>
+                            <keystore path="trust2.p12" password="secret"/>
                         </ssl>
                     </server-identities>
                 </security-realm>
                 <security-realm name="UntrustRealm">
                     <server-identities>
                         <ssl>
-                            <keystore path="untrust.p12" keystore-password="secret"/>
+                            <keystore path="untrust.p12" password="secret"/>
                         </ssl>
                     </server-identities>
                 </security-realm>

package/spec/configs/infinispan-xsite-EARTH.xml

@@ -19,9 +19,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -49,7 +47,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -74,9 +72,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -104,7 +100,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -161,7 +157,7 @@
                     <!-- server-identities>
                        <ssl>
                           <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                                    keystore-password="password" alias="server" key-password="password"
+                                    password="password" alias="server" key-password="password"
                                     generate-self-signed-certificate-host="localhost"/>
                        </ssl>
                     </server-identities-->

package/spec/configs/infinispan-xsite-MOON.xml

@@ -19,9 +19,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -49,7 +47,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -74,9 +72,7 @@
                  mcast_recv_buf_size="25m"
                  ip_ttl="${jgroups.ip_ttl:2}"
                  thread_naming_pattern="pl"
-                 enable_diagnostics="false"
                  bundler_type="no-bundler"
-                 max_bundle_size="8500"
 
                  thread_pool.min_threads="${jgroups.thread_pool.min_threads:0}"
                  thread_pool.max_threads="${jgroups.thread_pool.max_threads:200}"
@@ -104,7 +100,7 @@
                       xmit_table_msgs_per_row="1024"
                       xmit_table_max_compaction_time="30000"
             />
-            <pbcast.STABLE stability_delay="500"
+            <pbcast.STABLE 
                            desired_avg_gossip="5000"
                            max_bytes="1M"
             />
@@ -163,7 +159,7 @@
                     <!-- server-identities>
                        <ssl>
                           <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                                    keystore-password="password" alias="server" key-password="password"
+                                    password="password" alias="server" key-password="password"
                                     generate-self-signed-certificate-host="localhost"/>
                        </ssl>
                     </server-identities-->

package/spec/configs/infinispan.xml

@@ -50,7 +50,7 @@
                <!-- server-identities>
                   <ssl>
                      <keystore path="application.keystore" relative-to="infinispan.server.config.path"
-                               keystore-password="password" alias="server" key-password="password"
+                               password="password" alias="server" key-password="password"
                                generate-self-signed-certificate-host="localhost"/>
                   </ssl>
                </server-identities-->

package/spec/infinispan_ssl_spec.js

@@ -27,7 +27,7 @@ describe('Infinispan TLS/SSL client', function() {
   );
 
   it('fails to operate if default server name (SNI) does not match default server realm',
-     testError(expectContainsError("self signed certificate in certificate chain"),
+     testError(expectContainsAnyErrors(["self signed certificate in certificate chain", "self-signed certificate in certificate chain"]),
                sslSniDefault())
   );
 
@@ -37,6 +37,7 @@ describe('Infinispan TLS/SSL client', function() {
          ['CERT_SIGNATURE_FAILURE'
            , 'certificate signature failure'
            , 'self signed certificate in certificate chain'
+           , 'self-signed certificate in certificate chain'
          ])
        , sslSniUntrusted()
      )
@@ -53,7 +54,7 @@ describe('Infinispan TLS/SSL client', function() {
   );
 
   it('fails to operate if no encrypted transport is provided',
-      testError(expectAnyExactErrors(['self signed certificate in certificate chain']),
+      testError(expectAnyExactErrors(['self signed certificate in certificate chain',  'self-signed certificate in certificate chain']),
                 sslStoreNoCryptoStore())
   );
 
@@ -78,7 +79,7 @@ describe('Infinispan TLS/SSL client', function() {
   // );
 
   it('fails to operate if trusted certificate is missing for authenticated encrypted transport',
-      testError(expectAnyExactErrors(['self signed certificate in certificate chain']),
+      testError(expectAnyExactErrors(['self signed certificate in certificate chain', 'self-signed certificate in certificate chain']),
                 sslAuthWithMissingTrustCertificate())
   );
 
@@ -253,10 +254,10 @@ describe('Infinispan TLS/SSL client', function() {
     }
   }
 
-  function expectContainsError(msg) {
+  function expectContainsAnyErrors(msg) {
     return function(done) {
       return function(err) {
-        toContainAnyOf([msg], err, done);
+        toContainAnyOf(msg, err, done);
       }
     }
   }

package/spec/utils/testing.js

@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc */
 // Commons functions
 
 var _ = require('underscore');
@@ -5,7 +6,7 @@ var _ = require('underscore');
 var log4js = require('log4js');
 
 var readFile = require('fs').readFile;
-var httpRequest = require('request');
+var httpRequest = require('urllib');
 var util = require('util');
 
 var f = require('../../lib/functional');
@@ -719,65 +720,36 @@ function getClusterMembers(port) {
 
     return invokeDmrHttpGet('GET', opUrl, port)
       .then(function(response) {
-        logger.debugf("Server '%s' replied with cluster members: %s", port, response.cluster_size);
+        logger.debugf('Server %s replied with cluster members: %s', port, response.cluster_size);
         var members = response.cluster_size;
-        logger.debugf("Members are: %s", members);
+        logger.debugf('Members are: %s', members);
         return members;
       });
-  }
+  };
 }
 
 function invokeDmrHttp(op, port) {
-  return new Promise(function(fulfil, reject) {
-    httpRequest({
-      method: 'POST',
-      url: 'http://localhost:' + port + '/rest/v2',
-      auth: {
-        user: 'admin',
-        pass: 'pass',
-        sendImmediately: false
-      },
-      headers: {
-        'Content-Type' : 'application/json'
-      },
-      body: JSON.stringify(op)
-    }, function(error, response, body) {
-      if (!error && response.statusCode == 200) {
-        fulfil(JSON.parse(body));
-      } else {
-        reject(util.format('Error (%s), body (%s), response(%s)',
-          error, body, JSON.stringify(response)));
-      }
-    });
-  });
+   return httpRequest.request(`http://localhost:${port}/rest/v2`,
+                              {method:'POST',
+                              digestAuth: 'admin:pass',
+                              headers:{
+                                 'Content-Type': 'application/json',
+                                 'body': op
+                               }}).then(res => res.statusCode==200 ? JSON.parse(res.data) : {},
+                                        error => (util.format('Error (%s)', error)));
 }
 
 function invokeDmrHttpGet(method, opUrl, port) {
-    return new Promise(function(fulfil, reject) {
-        httpRequest({
-            method: method,
-            url: 'http://localhost:' + port + '/rest/v2' + opUrl,
-            auth: {
-                user: 'admin',
-                pass: 'pass',
-                sendImmediately: false
-            },
-            headers: {
-                'Content-Type' : 'application/json'
-            }
-        }, function(error, response, body) {
-            if (!error && response.statusCode >= 200 && response.statusCode <= 204) {
-              var resp = "";
-              if (body) {
-                resp = JSON.parse(body);
-              }
-              fulfil(resp);
-            } else {
-                reject(util.format('Error (%s), body (%s), response(%s)',
-                    error, body, JSON.stringify(response)));
-            }
-        });
-    });
+
+   logger.debugf(`URL http://localhost:${port}/rest/v2${opUrl}`);
+   return httpRequest.request(`http://localhost:${port}/rest/v2${opUrl}`, {
+                   method: method,
+                   digestAuth: 'admin:pass',
+                   headers: {
+                       'Content-Type' : 'application/json'
+                     }
+               }).then( res => res.statusCode==200 ? JSON.parse(res.data) : {},
+                        error => (util.format('Error (%s)', error)));
 }
 
 function readFileAsync(path) {

package/types/README.md

@@ -0,0 +1,91 @@
+This directory contains all the type definitions that are used in this libray.
+
+The below code can be used for testing the type support.
+
+```
+const protobuf = require("protobufjs");
+const infinispan = require("./lib/infinispan.js");
+
+
+var client = infinispan.client(
+  { port: 11222, host: "127.0.0.1" },
+  {
+    dataFormat: {
+      keyType: "application/x-protostream",
+      valueType: "application/x-protostream",
+    },
+    authentication: {
+      enabled: true,
+      saslMechanism: "DIGEST-MD5",
+      userName: "admin",
+      password: "pass",
+      serverName: "infinispan",
+    },
+    cacheName: "protoStreamCache",
+  }
+);
+
+var protoMetaClient = infinispan.client({ port: 11222, host: "127.0.0.1" }, {
+  authentication: {
+    enabled: true,
+    saslMechanism: "DIGEST-MD5",
+    userName: "admin",
+    password: "pass",
+    serverName: "infinispan",
+  },
+  cacheName: "___protobuf_metadata",
+  dataFormat: { keyType: "text/plain", valueType: "text/plain" },
+});
+
+protoMetaClient.then(async function (client) {
+  var myMsg2 = `package awesomepackage;
+  /**
+   * @TypeId(1000042)
+   */
+  message AwesomeMessages {
+      required string name = 1;
+      required int64 age = 2;
+  
+  }`
+  await client.put("awesomepackage/AwesomeMessage.proto", myMsg2);
+  await client.disconnect();
+})
+
+
+client.then(async function (client) {
+  var myMsg2 = `package awesomepackage;
+    /**
+     * @TypeId(1000042)
+     */
+    message AwesomeMessages {
+        required string name = 1;
+        required int64 age = 2;
+    
+    }`;
+
+
+  let root = protobuf.parse(myMsg2).root;
+  let user = root.lookupType('awesomepackage.AwesomeMessages');
+  client.registerProtostreamType('.awesomepackage.AwesomeMessages', 1000042);
+  client.registerProtostreamRoot(root);
+  try {
+    for (let i = 0; i < 10; i++) {
+      let payload = { name: "Neeraj" + i, age: 20 + i };
+      let buf = user.create(payload);
+      await client.put(i + 1, buf);
+      console.log(await client.getWithMetadata(1));
+    }
+    var decoded = await client.query({ queryString: `select u.name,u.age from awesomepackage.AwesomeMessages u where u.age>20` });
+    console.log(decoded);
+    await client.disconnect();
+  } catch (error) {
+    console.log(error);
+  }
+
+});
+```
+
+In the put method, if someone provides only one argument then the compiler will throw the error as below :
+`index.ts:70:18 - error TS2554: Expected 2-3 arguments, but got 1.`
+
+The same follows for all the operations. There is a validation on client config also.