aerospike 5.0.0 → 5.0.1

package/binding.gyp

@@ -138,7 +138,6 @@
       'conditions': [
         ['OS=="linux"',{
           'libraries': [
-            '../libuv-v1.8.0/.libs/libuv.a',
             '../aerospike-client-c/target/Linux-x86_64/lib/libaerospike.a',
             '-lz',
             '-lssl'
@@ -156,9 +155,9 @@
         }],
         ['OS=="mac"',{
           'libraries': [
-            '../libuv-v1.8.0/.libs/libuv.a',
             '../aerospike-client-c/target/Darwin-x86_64/lib/libaerospike.a',
-            '-lz'
+            '-lz',
+            '-lssl'
           ],
           'defines': [
             'AS_USE_LIBUV'

package/examples/put_test.js

@@ -0,0 +1,72 @@
+const Aerospike = require('aerospike')
+
+const config = {
+  hosts: '172.17.0.3:3000',
+  log: {
+    level: Aerospike.log.DEBUG,
+    file: process.stdout.fd
+  }
+}
+const key = new Aerospike.Key('test', 'demo', 'demo')
+
+// process.on('uncaughtException', (err, origin) => {
+//   fs.writeSync(
+//     process.stderr.fd,
+//     `Caught exception: ${err}\n` +
+//     `Exception origin: ${origin}`
+//   );
+// });
+
+console.log('Connect')
+Aerospike.connect(config)
+  .then(client => {
+    const bins = {
+      i: 123,
+      s: 'hello',
+      b: Buffer.from('world'),
+      d: new Aerospike.Double(3.1415),
+      g: new Aerospike.GeoJSON({ type: 'Point', coordinates: [103.913, 1.308] }),
+      l: [1, 'a', { x: 'y' }],
+      m: { foo: 4, bar: 7 }
+    }
+    const meta = { ttl: 0 }
+    const policy = new Aerospike.WritePolicy({
+      exists: Aerospike.policy.exists.CREATE_OR_REPLACE,
+      timeout: 20000
+    })
+
+    console.log('Put')
+    return client.put(key, bins, meta, policy)
+      .then(() => {
+        const ops = [
+          Aerospike.operations.incr('i', 1),
+          Aerospike.operations.read('i'),
+          Aerospike.lists.append('l', 'z'),
+          Aerospike.maps.removeByKey('m', 'bar')
+        ]
+
+        console.log('Operate')
+        return client.operate(key, ops)
+      })
+      .then(result => {
+        console.log(result.bins) // => { c: 4, i: 124, m: null }
+
+        return client.get(key)
+      })
+      .then(record => {
+        console.log(record.bins) // => { i: 124,
+        //      s: 'hello',
+        //      b: <Buffer 77 6f 72 6c 64>,
+        //      d: 3.1415,
+        //      g: '{"type":"Point","coordinates":[103.913,1.308]}',
+        //      l: [ 1, 'a', { x: 'y' }, 'z' ],
+        //      m: { foo: 4 } }
+      })
+      .then(() => client.close())
+      .catch(error => {
+        console.log('Error')
+        client.close()
+        return Promise.reject(error)
+      })
+  })
+  .catch(error => console.log(error))

package/lib/client.js

@@ -346,8 +346,9 @@ Client.prototype.batchGet = function (keys, policy, callback) {
  * This method allows different namespaces/bins to be requested for each key in
  * the batch. This method requires server >= 3.6.0.
  *
- * @param {object[]} records - List of keys and bins to retrieve.
- * @param {Key} records[].key - Key to retrieve.
+ * @param {object[]} records - {@link Record} List of keys and bins to retrieve.
+ * @param {type} records[].type - {@link Record#type} Batch type.
+ * @param {Key} records[].key - Record Key.
  * @param {string[]} [records[].bins] - List of bins to retrieve.
  * @param {boolean} [records[].readAllBins] - Whether to retrieve all bins or
  * just the meta data of the record. If true, ignore <code>bins</code> and read
@@ -404,7 +405,9 @@ Client.prototype.batchRead = function (records, policy, callback) {
  * This method allows different sub-commands for each key in the batch.
  * This method requires server >= 6.0.0.
  *
- * @param {object[]} records - List of batch sub-commands to perform.
+ * @param {object[]} records - {@link Record} List of batch sub-commands to perform.
+ * @param {type} records[].type - {@link Record#type} Batch type.
+ * @param {Key} records[].key - Record Key.
  * @param {BatchPolicy} [policy] - The Batch Policy to use for this operation.
  * @param {batchRecordsCallback} [callback] - The function to call when
  * the operation completes, with the results of the batch operation.
@@ -479,7 +482,9 @@ Client.prototype.batchWrite = function (records, policy, callback) {
  * This method allows multiple sub-commands for each key in the batch.
  * This method requires server >= 6.0.0.
  *
- * @param {object[]} records - List of batch sub-commands to perform.
+ * @param {object[]} records - {@link Record} List of batch sub-commands to perform.
+ * @param {type} records[].type - {@link Record#type} Batch type.
+ * @param {Key} records[].key - Record Key.
  * @param {object[]} udf - Server UDF module/function and argList to apply.
  * @param {BatchPolicy} [batchPolicy] - The Batch Policy to use for this operation.
  * @param {BatchApplyPolicy} [batchApplyPolicy] UDF policy configuration parameters.
@@ -566,7 +571,9 @@ Client.prototype.batchApply = function (records, udf, batchPolicy, batchApplyPol
  * This method allows multi sub-commands for each key in the batch.
  * This method requires server >= 6.0.0.
  *
- * @param {object[]} records - List of batch sub-commands to perform.
+ * @param {object[]} records - {@link Record} List of batch sub-commands to perform.
+ * @param {type} records[].type - {@link Record#type} Batch type.
+ * @param {Key} records[].key - Record Key.
  * @param {BatchPolicy} [batchPolicy] - The Batch Policy to use for this operation.
  * @param {BatchRemovePolicy} [batchRemovePolicy] Remove policy configuration parameters.
  * @param {batchRecordsCallback} [callback] - The function to call when

package/lib/record.js

@@ -17,6 +17,11 @@
 'use strict'
 
 /**
+ * @class Record
+ * @classdesc Aerospike Record
+ *
+ * @summary Construct a new Aerospike Record instance.
+ *
  * A record with the Aerospike database consists of one or more record "bins"
  * (name-value pairs) and meta-data, incl. time-to-live and generation; a
  * record is uniquely identified by it's key within a given namespace.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aerospike",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Aerospike Client Library",
   "keywords": [
     "aerospike",
@@ -92,6 +92,7 @@
     "lib/",
     "scripts/",
     "src/",
-    "test/"
+    "test/",
+    "typings/"
   ]
 }

package/scripts/build-commands.sh

@@ -33,21 +33,27 @@ LIBUV_DIR=libuv-v${LIBUV_VERSION}
 LIBUV_TAR=${LIBUV_DIR}.tar.gz
 LIBUV_URL=http://dist.libuv.org/dist/v1.8.0/${LIBUV_TAR}
 LIBUV_ABS_DIR=${CWD}/${LIBUV_DIR}
+LIBUV_BUILD=0
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
   AEROSPIKE_LIB_HOME=${AEROSPIKE_C_HOME}/target/Linux-x86_64
   AEROSPIKE_LIBRARY=${AEROSPIKE_LIB_HOME}/lib/libaerospike.a
   AEROSPIKE_INCLUDE=${AEROSPIKE_LIB_HOME}/include
   LIBUV_LIBRARY_DIR=${LIBUV_DIR}/.libs
+  LIBUV_INCLUDE_DIR=${CWD}/${LIBUV_DIR}/include
   LIBUV_LIBRARY=${CWD}/${LIBUV_LIBRARY_DIR}/libuv.a
   OS_FLAVOR=linux
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-        # Mac OSX
+  # Mac OSX
   AEROSPIKE_LIB_HOME=${AEROSPIKE_C_HOME}/target/Darwin-x86_64
   AEROSPIKE_LIBRARY=${AEROSPIKE_LIB_HOME}/lib/libaerospike.a
   AEROSPIKE_INCLUDE=${AEROSPIKE_LIB_HOME}/include
-  LIBUV_LIBRARY_DIR=${LIBUV_DIR}/.libs
-  LIBUV_LIBRARY=${CWD}/${LIBUV_LIBRARY_DIR}/libuv.a
+
+  LIBUV_DIR=/usr/local/opt/libuv
+  LIBUV_ABS_DIR=${LIBUV_DIR}
+  LIBUV_LIBRARY_DIR=${LIBUV_DIR}/lib
+  LIBUV_INCLUDE_DIR=${LIBUV_DIR}/include
+  LIBUV_LIBRARY=${LIBUV_LIBRARY_DIR}/libuv.a
   OS_FLAVOR=darwin
 else
     # Unknown.
@@ -77,29 +83,34 @@ configure_nvm() {
 }
 
 download_libuv() {
-  if [ ! -f ${LIBUV_TAR} ]; then
-      echo Download ${LIBUV_URL}
-      wget ${LIBUV_URL}
-  fi
+  if [[ "$OSTYPE" != "darwin"* ]]; then
+    if [ ! -f ${LIBUV_TAR} ]; then
+        echo Download ${LIBUV_URL}
+        wget ${LIBUV_URL}
+    fi
 
-  if [ ! -d ${LIBUV_DIR} ]; then
-      echo Extract ${LIBUV_TAR} 
-      tar xf ${LIBUV_TAR}
+    if [ ! -d ${LIBUV_DIR} ]; then
+        echo Extract ${LIBUV_TAR}
+        tar xf ${LIBUV_TAR}
+    fi
   fi
 }
 
 rebuild_libuv() {
-  # if [ ! -f ${LIBUV_LIBRARY} ]; then
-      echo Make ${LIBUV_DIR}
-      cd ${LIBUV_DIR}
-      sh autogen.sh
-      ./configure -q
-      make clean
-      make V=1 LIBUV_VERSIONBOSE=1 CFLAGS="-w -fPIC" 2>&1 | tee ${CWD}/${0}-libuv-output.log
-      # make V=1 LIBUV_VERSIONBOSE=1 CFLAGS="-w -fPIC -DDEBUG" 2>&1 | tee ${CWD}/${0}-libuv-output.log
-      # make V=1 LIBUV_VERSIONBOSE=1 install
-      cd ..
-  # fi
+  echo "rebuild_libuv"
+  if [ $LIBUV_BUILD -eq 1 ]; then
+    if [ ! -f ${LIBUV_LIBRARY} ]; then
+        echo "Make ${LIBUV_ABS_DIR}"
+        cd ${LIBUV_ABS_DIR}
+        sh autogen.sh
+        ./configure -q
+        make clean
+        make V=1 LIBUV_VERSIONBOSE=1 CFLAGS="-w -fPIC" 2>&1 | tee ${CWD}/${0}-libuv-output.log
+        # make V=1 LIBUV_VERSIONBOSE=1 CFLAGS="-w -fPIC -DDEBUG" 2>&1 | tee ${CWD}/${0}-libuv-output.log
+        # make V=1 LIBUV_VERSIONBOSE=1 install
+        cd ..
+    fi
+  fi
 }
 
 check_libuv() {
@@ -107,12 +118,20 @@ check_libuv() {
   cd ${CWD}
 
   printf "\n" >&1
-  printf "CHECK\n" >&1
 
-  if [ -f ${LIBUV_LIBRARY} ]; then
-    printf "   [✓] %s\n" "${LIBUV_LIBRARY}" >&1
+  if [ $LIBUV_BUILD -eq 1 ]; then
+    if [ -f ${LIBUV_LIBRARY} ]; then
+      printf "   [✓] %s\n" "${LIBUV_LIBRARY}" >&1
+    else
+      printf "   [✗] %s\n" "${LIBUV_LIBRARY}" >&1
+      FAILED=1
+    fi
+  fi
+
+  if [ -f ${LIBUV_INCLUDE_DIR}/uv.h ]; then
+    printf "   [✓] %s\n" "${LIBUV_INCLUDE_DIR}/uv.h" >&1
   else
-    printf "   [✗] %s\n" "${LIBUV_LIBRARY}" >&1
+    printf "   [✗] %s\n" "${LIBUV_INCLUDE_DIR}/uv.h" >&1
     FAILED=1
   fi
 
@@ -132,19 +151,11 @@ rebuild_c_client() {
   # fi
 }
 
-perform_check() {
+check_aerospike() {
 
   cd ${CWD}
-
+  
   printf "\n" >&1
-  printf "CHECK\n" >&1
-
-  if [ -f ${LIBUV_LIBRARY} ]; then
-    printf "   [✓] %s\n" "${LIBUV_LIBRARY}" >&1
-  else
-    printf "   [✗] %s\n" "${LIBUV_LIBRARY}" >&1
-    FAILED=1
-  fi
 
   if [ -f ${AEROSPIKE_LIBRARY} ]; then
     printf "   [✓] %s\n" "${AEROSPIKE_LIBRARY}" >&1
@@ -166,3 +177,14 @@ perform_check() {
     exit 1
   fi
 }
+
+perform_check() {
+
+  cd ${CWD}
+
+  printf "\n" >&1
+  printf "CHECK\n" >&1
+
+  check_libuv
+  check_aerospike
+}

package/scripts/build-package.sh

@@ -61,6 +61,6 @@ build_nodejs_client v16.14.0
 build_nodejs_client v17.8.0
 build_nodejs_client v18.0.0
 
-nvm use v16.14.0
+nvm use v18.0.0
 
 cd ${CWD}