add packageJson to any-grpc

This commit is contained in:
Kelvin Jin 2017-10-25 16:35:08 -07:00
parent 689d4d0c61
commit 6a6b4eb56c
2 changed files with 22 additions and 7 deletions

View File

@ -1,16 +1,26 @@
module.exports = {};
module.exports = {
packageJson: {},
core: {
packageJson: {}
}
};
function assignExportsFromGlobal(globalField, exportsField) {
if (global[globalField] === 'js') {
module.exports[exportsField] = require('../packages/grpc-js');
} else if (global[globalField] === 'native') {
module.exports[exportsField] = require('../packages/grpc-native');
} else {
if (global[globalField] !== 'js' && global[globalField] !== 'native') {
throw new Error([
`Invalid value for global.${globalField}: ${global.globalField}.`,
'If running from the command line, please --require a fixture first.'
].join(' '));
}
const impl = global[globalField];
// (1) set global field.
module.exports[exportsField] = require(`../packages/grpc-${impl}`);
// (2) make package's package.json file accessible thru packageJson path.
module.exports.packageJson[exportsField] = require(`../packages/grpc-${impl}/package.json`);
// (3) make package's underlying core dependency accessible thru core path.
module.exports.core[exportsField] = require(`../packages/grpc-${impl}-core`);
// (4) make (3) x (2) accessible thru core.packageJson path.
module.exports.core.packageJson[exportsField] = require(`../packages/grpc-${impl}-core/package.json`);
}
// Set 'server' and 'client' fields on this module's exports.
@ -26,4 +36,7 @@ assignExportsFromGlobal('_client_implementation', 'client');
// Increase clarity when there's no distinction between client/server
if (module.exports.client === module.exports.server) {
module.exports.all = module.exports.client;
module.exports.core.all = module.exports.core.client;
module.exports.packageJson.all = module.exports.packageJson.client;
module.exports.core.packageJson.all = module.exports.core.packageJson.client;
}

View File

@ -485,10 +485,12 @@ describe('Echo metadata', function() {
call.end();
});
it('shows the correct user-agent string', function(done) {
var version = require('grpc/package.json').version;
var version = require('../any_grpc').core.packageJson.all.version;
var call = client.unary({}, metadata,
function(err, data) { assert.ifError(err); });
call.on('metadata', function(metadata) {
console.log(version);
console.log(metadata.get('user-agent')[0]);
assert(_.startsWith(metadata.get('user-agent')[0],
'grpc-node/' + version));
done();