Skip to content

Commit

Permalink
Merge e8b71a3 into 99414a2
Browse files Browse the repository at this point in the history
  • Loading branch information
brozeph committed Feb 12, 2019
2 parents 99414a2 + e8b71a3 commit d966c03
Show file tree
Hide file tree
Showing 9 changed files with 882 additions and 2,493 deletions.
7 changes: 7 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"env": {
"test": {
"plugins": [
"istanbul"
]
}
},
"presets": [
[
"@babel/preset-env"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/.nyc_output/
/coverage/
/dist/
/examples-dist/
/node_modules/
/reports/
/npm-debug.log

43 changes: 19 additions & 24 deletions examples/client-transpiled.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
'use strict';
"use strict";

require('babel-polyfill');
var _interopRequireWildcard = require("@babel/runtime-corejs2/helpers/interopRequireWildcard");

require('source-map-support/register');
var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");

var _dist = require('../dist');
var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));

var ipc = _interopRequireWildcard(_dist);
var _now = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/date/now"));

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));

function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* eslint no-console: 0 */
var ipc = _interopRequireWildcard(require("../dist"));


_asyncToGenerator(regeneratorRuntime.mark(function _callee() {
/* eslint no-console: 0 */
(0, _asyncToGenerator2.default)(
/*#__PURE__*/
_regenerator.default.mark(function _callee() {
var client, convenient;
return regeneratorRuntime.wrap(function _callee$(_context) {
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
// create a client for server.js
client = new ipc.Client('/tmp/example-ipc-server.sock');

/**
* call the method conveniently (applies JSON-RPC formatting)
* using async/await
Expand All @@ -33,64 +34,58 @@ _asyncToGenerator(regeneratorRuntime.mark(function _callee() {

case 4:
convenient = _context.sent;


console.log('result from convenient client.call: %s', convenient);
_context.next = 11;
break;

case 8:
_context.prev = 8;
_context.t0 = _context['catch'](1);

_context.t0 = _context["catch"](1);
console.error('error from convenient client.call: %s', _context.t0.message, _context.t0);

case 11:

/**
* call the method verbosely (send JSON-RPC formatted message)
* using a traditional callback
**/
client.call({
id: Date.now(),
id: (0, _now.default)(),
jsonrpc: '2.0',
method: 'services.hello',
params: ['verbose example string']
}, function (err, verbose) {
if (err) {
console.error('error from verbose client.call: %s', err.message, err);

return;
}

console.log('result from verbose client.call: %s', verbose);
});

/**
* call the method conveniently with no arguments
* using a Promise
**/

client.call('services.hello').then(function (noArguments) {
return console.log('result when passing no arguments to client.call: %s', noArguments);
}).catch(function (ex) {
return console.error('error when passing no arguments to client.call: %s', ex.message, ex);
});

/**
* call an asynchronous method and wait
* using a Promise
**/

client.call('services.helloDelayed', 'testing').then(function (response) {
return console.log('result when calling asynchronous server method via client.call: %s', response);
}).catch(function (ex) {
return console.error('error when calling asynchronous server method via client.call: %s', ex.message, ex);
});

case 14:
case 'end':
case "end":
return _context.stop();
}
}
}, _callee, undefined, [[1, 8]]);
}))();

}, _callee, this, [[1, 8]]);
}))();
3 changes: 0 additions & 3 deletions examples/client.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
/* eslint no-console: 0 */
import 'babel-polyfill';
import 'source-map-support/register';

import * as ipc from '../dist';

(async () => {
Expand Down
23 changes: 10 additions & 13 deletions examples/server-transpiled.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
'use strict';
"use strict";

require('babel-polyfill');
var _interopRequireWildcard = require("@babel/runtime-corejs2/helpers/interopRequireWildcard");

require('source-map-support/register');
var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");

var _dist = require('../dist');
var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));

var ipc = _interopRequireWildcard(_dist);

function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
var ipc = _interopRequireWildcard(require("../dist"));

/**
* The name of this object will act as a namespace for
Expand All @@ -24,15 +22,14 @@ var DELAY = 1000,
},
helloDelayed: function helloDelayed() {
var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'olleh';
return new Promise(function (resolve) {
return new _promise.default(function (resolve) {
return setTimeout(function () {
return resolve(value);
}, DELAY);
});
}
};

var server = new ipc.Server('/tmp/example-ipc-server.sock', { services: services });

server.listen();

var server = new ipc.Server('/tmp/example-ipc-server.sock', {
services: services
});
server.listen();
3 changes: 0 additions & 3 deletions examples/server.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import 'babel-polyfill';
import 'source-map-support/register';

import * as ipc from '../dist';

/**
Expand Down
18 changes: 17 additions & 1 deletion gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { dest, series, src } from 'gulp';
import babel from 'gulp-babel';
import del from 'gulp-clean';
import eslint from 'gulp-eslint';
import rename from 'gulp-rename';
import sourcemaps from 'gulp-sourcemaps';

function build () {
Expand All @@ -12,8 +13,14 @@ function build () {
.pipe(dest('dist'));
}

function buildExamples () {
return src(['examples/client.js', 'examples/server.js'])
.pipe(babel())
.pipe(dest('examples-dist'));
}

function clean () {
return src(['dist', 'reports'], { allowEmpty : true, read : false })
return src(['dist', 'examples-dist', 'reports'], { allowEmpty : true, read : false })
.pipe(del());
}

Expand All @@ -24,7 +31,16 @@ function lint () {
.pipe(eslint.failAfterError());
}

function renameExamples () {
return src(['examples-dist/*.js'])
.pipe(rename({
suffix : '-transpiled'
}))
.pipe(dest('examples'));
}

exports.build = build;
exports.buildExamples = series(clean, buildExamples, renameExamples);
exports.clean = clean;
exports.default = series(clean, lint, build);
exports.lint = lint;

0 comments on commit d966c03

Please sign in to comment.