Skip to content

Commit 9a1db7e

Browse files
committed
Add SDK version into volatile
1 parent 00dcaca commit 9a1db7e

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

src/Kuzzle.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function Kuzzle (host, options, cb) {
6262
'queryError',
6363
'discarded'
6464
],
65-
writeable: false
65+
writable: false
6666
},
6767
queuing: {
6868
value: false,
@@ -198,6 +198,10 @@ function Kuzzle (host, options, cb) {
198198
value: undefined,
199199
enumerable: true,
200200
writable: true
201+
},
202+
sdkVersion: {
203+
value: (typeof SDKVERSION === 'undefined') ? require('../package.json').version : SDKVERSION,
204+
writable: false
201205
}
202206
});
203207

@@ -1437,6 +1441,8 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
14371441
object.requestId = uuid.v4();
14381442
}
14391443

1444+
object.volatile.sdkVersion = this.sdkVersion;
1445+
14401446
if (self.state === 'connected' || (options && options.queuable === false)) {
14411447
if (self.state === 'connected') {
14421448
emitRequest.call(this, object, cb);

test/kuzzle/query.test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ var
55
NetworkWrapperMock = require('../mocks/networkWrapper.mock'),
66
Kuzzle = rewire('../../src/Kuzzle');
77

8-
98
describe('Query management', function () {
109
describe('#emitRequest', function () {
1110
var
1211
emitRequest = Kuzzle.__get__('emitRequest'),
1312
kuzzle;
1413

15-
1614
beforeEach(function () {
1715
kuzzle = new Kuzzle('somewhere', {connect: 'manual'});
1816
kuzzle.network = new NetworkWrapperMock('somewhere');
@@ -125,7 +123,7 @@ describe('Query management', function () {
125123
collection: 'collection',
126124
controller: 'controller',
127125
index: 'index',
128-
volatile: {},
126+
volatile: { sdkVersion: kuzzle.sdkVersion },
129127
requestId: sinon.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i)
130128
});
131129
});
@@ -141,7 +139,7 @@ describe('Query management', function () {
141139
collection: 'collection',
142140
controller: 'controller',
143141
index: 'index',
144-
volatile: {},
142+
volatile: { sdkVersion: kuzzle.sdkVersion },
145143
requestId: sinon.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i)
146144
}, sinon.match(function(f) {return f === cb;}));
147145
});

webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ module.exports = {
4141
new webpack.IgnorePlugin(/ws/),
4242
new webpack.optimize.OccurenceOrderPlugin(),
4343
new webpack.DefinePlugin({
44-
global: 'window'
44+
global: 'window',
45+
SDKVERSION: JSON.stringify(version)
4546
}),
4647
new webpack.BannerPlugin('Kuzzle javascript SDK version ' + version),
4748
new webpack.optimize.UglifyJsPlugin({

0 commit comments

Comments
 (0)