update couchbase

Author: nsjames

package-lock.json

@@ -30,7 +30,7 @@
     "body-parser": "^1.18.2",
     "compression": "^1.7.3",
     "cors": "^2.8.4",
-    "couchbase": "^2.6.5",
+    "couchbase": "^3.0.6",
     "create-hash": "^1.2.0",
     "eosjs": "^20.0.0",
     "eosjs-ecc": "^4.0.4",

package.json

@@ -1,41 +1,56 @@
 import config from '../util/config';
 
-import { promisifyAll } from 'bluebird';
-
 const couchbase = require('couchbase');
 
-export const n1ql = couchbase.N1qlQuery;
-
-const cluster = new couchbase.Cluster(config('COUCHBASE_HOST'));
-cluster.authenticate(config('COUCHBASE_USERNAME'),config('COUCHBASE_PASSWORD'));
-
-export default bucketName => {
-    const bucket = cluster.openBucket(bucketName);
-    promisifyAll(bucket);
-
-    const bucketAdditions = {
-        existsAsync:(key) => {
-            return new Promise((resolve, reject) => {
-                bucket.getAsync(key)
-                    .then(res => resolve(true))
-                    .catch(error => {
-                        if(error.code === 13) resolve(false);
-                        else throw new Error(error);
-                    })
-            })
-        }
-    };
-
-    const bucketWithAdditions = Object.assign(bucket, bucketAdditions);
-
-    // Sets up a proxy to turn all methods into async using bluebird
-    return new Proxy(bucketWithAdditions, {
-        get(b, method){ return (...args) => {
-            // Mutations return the MutationBuilder and should not become async.
-            if(method.indexOf('mutate') > -1) return bucket[method](...args);
-            // Everything else will become async
-            else return bucket[`${method}Async`](...args);
-        } }
-    })
+
+const cluster = new couchbase.Cluster(config('COUCHBASE_HOST'), {
+	username: config('COUCHBASE_USERNAME'),
+	password: config('COUCHBASE_PASSWORD'),
+});
+
+let instances = {};
+
+const query = (queryString, model = null) => {
+	// Replaces placeholder param.
+	queryString = queryString.replace(/BUCKET_NAME/g, '`'+BUCKET_NAME+'`');
+
+	return cluster.query(queryString, {
+		scanConsistency: couchbase.QueryScanConsistency.RequestPlus
+	}).then(({meta, rows}) => {
+		if(!rows) return [];
+		// Fix for couchbase stupidness
+		rows = rows.map(x => x[BUCKET_NAME] ? x[BUCKET_NAME] : x);
+		rows = rows.map(x => x.data);
+
+		return rows.map(x => {
+			if(model) return model.fromJson(x);
+			return x;
+		})
+	}).catch(err => {
+		console.error(err);
+		return null
+	});
+}
+
+const get = (bucket_name) => {
+	if(instances[bucket_name]) return instances[bucket_name];
+
+	instances[bucket_name] = cluster.bucket(bucket_name).defaultCollection();
+	return instances[bucket_name];
+};
+
+export default {
+	query,
+	get,
 };
 
+
+
+
+
+
+
+
+
+
+

src/database/couchbase.js

@@ -27,7 +27,7 @@ import Blacklist from "./util/blacklist";
 import WebHookService from "./services/WebHookService";
 import FeatureFlags from "./services/FeatureFlags";
 
-const bucket = couchbase('scatter');
+const bucket = couchbase.get('scatter');
 
 
 /********************************/

src/routes.js

@@ -24,7 +24,7 @@ export default class AppService {
     }
 
     static async getApps(){
-	    if(!inRam) inRam = (await bucket.get(bucketKey)).value;
+	    if(!inRam) inRam = (await bucket.get(bucketKey)).content;
         return inRam;
     }
 

src/services/AppService.js

@@ -6,7 +6,7 @@ const COINSWITCH_KEY = config('COINSWITCH_KEY');
 import couchbase from '../database/couchbase'
 import PriceService from "./PriceService";
 import {BANCOR_EOS_PAIRS, BANCOR_RELAYS} from "../data/bancor_relays";
-const bucket = couchbase('exchange');
+const bucket = couchbase.get('exchange');
 
 const pairCaches = {};
 
@@ -346,7 +346,7 @@ export default class ExchangeService {
     }
 
     async getOrder(orderId){
-	    const original = await bucket.get(`order:${orderId}`).then(x => x.value).catch(() => null);
+	    const original = await bucket.get(`order:${orderId}`).then(x => x.content).catch(() => null);
 	    if(!original) return;
 
 	    if(original.order.service === SERVICES.BANCOR_EOS){
@@ -364,12 +364,12 @@ export default class ExchangeService {
     }
 
     static async cancelled(orderId){
-    	await bucket.remove(`order:${orderId}`).then(x => x.value).catch(() => null);
+    	await bucket.remove(`order:${orderId}`).then(x => x.content).catch(() => null);
         return true;
     }
 
     static async accepted(orderId){
-	    const original = await bucket.get(`order:${orderId}`).then(x => x.value).catch(() => null);
+	    const original = await bucket.get(`order:${orderId}`).then(x => x.content).catch(() => null);
 	    original.accepted = true;
 	    await bucket.upsert(`order:${orderId}`, original).catch(() => null);
         return true;

src/services/ExchangeService.js

@@ -20,7 +20,7 @@ export default class ExplorerService {
     }
 
     static async getApps(){
-        if(!inRam) inRam = (await bucket.get(bucketKey)).value;
+        if(!inRam) inRam = (await bucket.get(bucketKey)).content;
         return inRam;
     }
 

src/services/ExplorerService.js

@@ -22,7 +22,7 @@ export default class FiatService {
 	}
 
 	static async getConversions(){
-		if(!inRam) inRam = (await bucket.get(bucketKey)).value;
+		if(!inRam) inRam = (await bucket.get(bucketKey)).content;
 		return inRam;
 	}
 

src/services/FiatService.js

@@ -24,7 +24,7 @@ export default class LanguageService {
     }
 
     static async getLanguages(namesOnly = false, name = null){
-        if(!inRam) inRam = (await bucket.get(bucketKey)).value;
+        if(!inRam) inRam = (await bucket.get(bucketKey)).content;
 
         if(namesOnly) return inRam.map(x => x.name);
 

src/services/LanguageService.js

@@ -21,7 +21,7 @@ export default class NetworkService {
     }
 
     static async getNetworks(){
-        if(!inRam) inRam = (await bucket.get(bucketKey)).value;
+        if(!inRam) inRam = (await bucket.get(bucketKey)).content;
         return inRam;
     }