(
+ path: PathParams,
+ ...handlers: (RequestHandler
-## A REST and realtime API layer for modern applications.
+## A framework for real-time applications and REST APIs with JavaScript and TypeScript
[](https://greenkeeper.io/)
-
-[](https://travis-ci.org/feathersjs/feathers)
-[](https://david-dm.org/feathersjs/feathers?path=packages/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://codeclimate.com/github/feathersjs/feathers/maintainability)
[](https://codeclimate.com/github/feathersjs/feathers/test_coverage)
[](https://www.npmjs.com/package/@feathersjs/feathers)
@@ -13,7 +11,23 @@
[](http://slack.feathersjs.com)
[](https://t.me/featherjs)
-Feathers is a real-time, micro-service web framework for NodeJS that gives you control over your data via RESTful resources, sockets and flexible plug-ins.
+Feathers is a lightweight web-framework for creating real-time applications and REST APIs using JavaScript or TypeScript.
+
+Feathers can interact with any backend technology, supports over a dozen databases and works with any frontend technology like React, VueJS, Angular, React Native, Android or iOS.
+
+## Getting started
+
+You can build your first real-time and REST API in just 4 commands:
+
+```bash
+$ npm install -g @feathersjs/cli
+$ mkdir my-new-app
+$ cd my-new-app/
+$ feathers generate app
+$ npm start
+```
+
+To learn more about Feathers visit the website at [feathersjs.com](http://feathersjs.com) or jump right into [the Feathers guides](http://docs.feathersjs.com/guides).
## Support
@@ -87,80 +101,10 @@ Support us with a monthly donation and help us continue our activities. [[Become
-## Getting started
-
-You can build your first real-time and REST API in just 4 commands:
-
-```bash
-$ npm install -g @feathersjs/cli
-$ mkdir my-new-app
-$ cd my-new-app/
-$ feathers generate app
-$ npm start
-```
-
-To learn more about Feathers visit the website at [feathersjs.com](http://feathersjs.com) or jump right into [the Feathers docs](http://docs.feathersjs.com).
-
-## See it in action
-
-Here is all the code you need to create a RESTful, real-time message API that uses an in-memory data store:
-
-```js
-const feathers = require('@feathersjs/feathers');
-const express = require('@feathersjs/express');
-const socketio = require('@feathersjs/socketio');
-
-const memory = require('feathers-memory');
-
-// Creates an Express compatible Feathers application
-const app = express(feathers());
-
-// Parse HTTP JSON bodies
-app.use(express.json());
-// Parse URL-encoded params
-app.use(express.urlencoded({ extended: true }));
-// Add REST API support
-app.configure(express.rest());
-// Configure Socket.io real-time APIs
-app.configure(socketio());
-// Register a messages service with pagination
-app.use('/messages', memory({
- paginate: {
- default: 10,
- max: 25
- }
-}));
-// Register a nicer error handler than the default Express one
-app.use(express.errorHandler());
-
-// Add any new real-time connection to the `everybody` channel
-app.on('connection', connection => app.channel('everybody').join(connection));
-// Publish all events to the `everybody` channel
-app.publish(data => app.channel('everybody'));
-
-// Start the server
-app.listen(3030).on('listening', () =>
- console.log('Feathers server listening on localhost:3030')
-);
-```
-
-Then run
-
-```
-npm install @feathersjs/feathers @feathersjs/socketio @feathersjs/express feathers-memory
-node app
-```
-
-and go to [http://localhost:3030/messages](http://localhost:3030/messages). That's it! There's a lot more you can do with Feathers including; using a real database, authentication, authorization, clustering and more! Head on over to [the Feathers docs](http://docs.feathersjs.com) to see just how easy it is to build scalable real-time apps.
-
## Documentation
The [Feathers docs](http://docs.feathersjs.com) are loaded with awesome stuff and tell you every thing you need to know about using and configuring Feathers.
-## Security
-
-We :heart: the community and take security very seriously. No one wants their app hacked. If you have come across a security concern please [report it responsibly](https://docs.feathersjs.com/security#where-should-i-report-security-issues). Visit the [Security section](https://docs.feathersjs.com/SECURITY.html) of the docs to learn more about how you can make sure your app is secure.
-
## License
Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
diff --git a/packages/feathers/test/hooks/error.test.js b/packages/feathers/test/hooks/error.test.js
index a4e71a2644..a9539fcf8b 100644
--- a/packages/feathers/test/hooks/error.test.js
+++ b/packages/feathers/test/hooks/error.test.js
@@ -11,7 +11,7 @@ describe('`error` hooks', () => {
});
const service = app.service('dummy');
- afterEach(() => service.__hooks.error.get.pop());
+ afterEach(() => service.__hooks.error.get = []);
it('basic error hook', () => {
service.hooks({
@@ -154,6 +154,30 @@ describe('`error` hooks', () => {
return app.service('dummy').get(1)
.then(result => assert.strictEqual(result, null));
});
+
+ it('uses the current hook object if thrown in a service method', () => {
+ const app = feathers().use('/dummy', {
+ get () {
+ return Promise.reject(new Error('Something went wrong'));
+ }
+ });
+
+ const service = app.service('dummy');
+
+ service.hooks({
+ before (hook) {
+ return { ...hook, id: 42 };
+ },
+ error (hook) {
+ assert.strictEqual(hook.id, 42);
+ }
+ });
+
+ return service.get(1).then(
+ () => assert.fail('Should never get here'),
+ error => assert.strictEqual(error.message, 'Something went wrong')
+ );
+ });
});
describe('error in hooks', () => {
diff --git a/packages/feathers/test/hooks/finally.test.js b/packages/feathers/test/hooks/finally.test.js
index 72290de223..50dbd54180 100644
--- a/packages/feathers/test/hooks/finally.test.js
+++ b/packages/feathers/test/hooks/finally.test.js
@@ -73,4 +73,36 @@ describe('`finally` hooks', () => {
}
);
});
+
+ it('runs once, sets error if throws', () => {
+ const app = feathers().use('/dummy', {
+ get (id) {
+ return Promise.resolve({ id });
+ }
+ });
+
+ const service = app.service('dummy');
+
+ let count = 0;
+
+ service.hooks({
+ error (hook) {
+ assert.fail('Should never get here (error hook)');
+ },
+ finally: [
+ function (hook) {
+ assert.strictEqual(++count, 1, 'This should be called only once');
+ throw new Error('This did not work');
+ },
+ function (hook) {
+ assert.fail('Should never get here (second finally hook)');
+ }
+ ]
+ });
+
+ return service.get(42).then(
+ () => assert.fail('Should never get here (result resolve)'),
+ error => assert.strictEqual(error.message, 'This did not work')
+ );
+ });
});
diff --git a/packages/feathers/test/hooks/hooks.test.js b/packages/feathers/test/hooks/hooks.test.js
index 020fbf25b4..efe184c633 100644
--- a/packages/feathers/test/hooks/hooks.test.js
+++ b/packages/feathers/test/hooks/hooks.test.js
@@ -18,11 +18,11 @@ describe('hooks basics', () => {
return app.service('dummy').get();
}).catch(e => {
- assert.strictEqual(e.message, `An id must be provided to the 'get' method`);
+ assert.strictEqual(e.message, `An id must be provided to the 'dummy.get' method`);
}).then(() =>
app.service('dummy').create()
).catch(e => {
- assert.strictEqual(e.message, `A data object must be provided to the 'create' method`);
+ assert.strictEqual(e.message, `A data object must be provided to the 'dummy.create' method`);
});
});
@@ -201,7 +201,7 @@ describe('hooks basics', () => {
assert.strictEqual(context.service, app.service('dummy'));
assert.strictEqual(context.type, 'error');
assert.strictEqual(context.path, 'dummy');
- assert.strictEqual(context.error.message, 'An id must be provided to the \'get\' method');
+ assert.strictEqual(context.error.message, 'An id must be provided to the \'dummy.get\' method');
});
});
diff --git a/packages/primus-client/.npmignore b/packages/primus-client/.npmignore
index 65e3ba2eda..33b30624f5 100644
--- a/packages/primus-client/.npmignore
+++ b/packages/primus-client/.npmignore
@@ -1 +1,2 @@
test/
+coverage/
diff --git a/packages/primus-client/CHANGELOG.md b/packages/primus-client/CHANGELOG.md
index fb05766ea0..646ddfe3ff 100644
--- a/packages/primus-client/CHANGELOG.md
+++ b/packages/primus-client/CHANGELOG.md
@@ -3,6 +3,201 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.4](https://github.com/feathersjs/feathers/compare/v4.5.3...v4.5.4) (2020-04-29)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.5](https://github.com/feathersjs/feathers/compare/v4.3.4...v4.3.5) (2019-10-07)
+
+
+### Bug Fixes
+
+* Change this reference in client libraries to explicitly passed app ([#1597](https://github.com/feathersjs/feathers/issues/1597)) ([4e4d10a](https://github.com/feathersjs/feathers/commit/4e4d10a))
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+**Note:** Version bump only for package @feathersjs/primus-client
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/primus-client/LICENSE b/packages/primus-client/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/primus-client/LICENSE
+++ b/packages/primus-client/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/primus-client/README.md b/packages/primus-client/README.md
index c2f40a2b29..9c8ad9129e 100644
--- a/packages/primus-client/README.md
+++ b/packages/primus-client/README.md
@@ -1,6 +1,6 @@
# @feathersjs/primus-client
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/primus-client)
[](https://www.npmjs.com/package/@feathersjs/primus-client)
@@ -12,33 +12,12 @@
npm install @feathersjs/primus-client --save
```
-Quick usage:
-
-```js
-const feathers = require('@feathersjs/feathers');
-const primus = require('@feathersjs/primus-client');
-const socket = new Primus('http://api.my-feathers-server.com');
-
-const app = feathers();
-
-app.configure(primus(socket));
-
-// Receive real-time events through Primus
-app.service('messages')
- .on('created', message => console.log('New message created', message));
-
-// Call the `messages` service
-app.service('messages').create({
- text: 'A message from a REST client'
-});
-```
-
## Documentation
-Please refer to the [@feathersjs/primus-client documentation](https://docs.feathersjs.com/api/client/primus.html) for more details.
+Refer to the [Feathers Primus client API documentation](https://docs.feathersjs.com/api/client/primus.html) for more details.
## License
-Copyright (c) 2018
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
Licensed under the [MIT license](LICENSE).
diff --git a/packages/primus-client/lib/index.js b/packages/primus-client/lib/index.js
index 9e0c1d9f6d..afd97f05b7 100644
--- a/packages/primus-client/lib/index.js
+++ b/packages/primus-client/lib/index.js
@@ -13,13 +13,13 @@ function primusClient (connection, options) {
}));
};
- const initialize = function () {
- if (typeof this.defaultService === 'function') {
+ const initialize = function (app) {
+ if (typeof app.defaultService === 'function') {
throw new Error('Only one default client provider can be configured');
}
- this.primus = connection;
- this.defaultService = defaultService;
+ app.primus = connection;
+ app.defaultService = defaultService;
};
initialize.Service = Service;
diff --git a/packages/primus-client/package.json b/packages/primus-client/package.json
index 4658b62152..376510e5f1 100644
--- a/packages/primus-client/package.json
+++ b/packages/primus-client/package.json
@@ -1,7 +1,7 @@
{
"name": "@feathersjs/primus-client",
"description": "Client services for Primus and feathers-primus",
- "version": "4.0.0-pre.3",
+ "version": "4.5.4",
"homepage": "https://feathersjs.com",
"main": "lib/index.js",
"types": "index.d.ts",
@@ -10,6 +10,10 @@
"feathers-plugin"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -24,10 +28,10 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6.0.0"
+ "node": ">= 12"
},
"scripts": {
- "test": "mocha --opts ../../mocha.opts"
+ "test": "mocha --config ../../.mocharc.json"
},
"directories": {
"lib": "lib"
@@ -36,17 +40,16 @@
"access": "public"
},
"dependencies": {
- "@feathersjs/transport-commons": "^4.2.1"
+ "@feathersjs/transport-commons": "^4.5.3"
},
"devDependencies": {
- "@feathersjs/commons": "^4.0.0-pre.3",
- "@feathersjs/feathers": "^4.0.0-pre.3",
- "@feathersjs/primus": "^4.0.0-pre.3",
- "@feathersjs/tests": "^4.0.0-pre.3",
- "chai": "^4.2.0",
- "feathers-memory": "^3.0.2",
- "mocha": "^6.1.4",
- "ws": "^7.0.0"
- },
- "gitHead": "19eb75737659e3e4b57765c1653d23c86fd2e1c3"
+ "@feathersjs/commons": "^4.5.3",
+ "@feathersjs/feathers": "^4.5.3",
+ "@feathersjs/primus": "^4.5.4",
+ "@feathersjs/tests": "^4.5.3",
+ "feathers-memory": "^4.1.0",
+ "mocha": "^8.0.1",
+ "ws": "^7.3.1"
+ },
+ "gitHead": "9b9f0f13387341bdd320f1e66feda828fca2c9f2"
}
diff --git a/packages/primus-client/test/index.test.js b/packages/primus-client/test/index.test.js
index 45353536c2..25e480ddf4 100644
--- a/packages/primus-client/test/index.test.js
+++ b/packages/primus-client/test/index.test.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const feathers = require('@feathersjs/feathers');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const server = require('./server');
const primus = require('../lib');
diff --git a/packages/primus/.npmignore b/packages/primus/.npmignore
index 65e3ba2eda..33b30624f5 100644
--- a/packages/primus/.npmignore
+++ b/packages/primus/.npmignore
@@ -1 +1,2 @@
test/
+coverage/
diff --git a/packages/primus/CHANGELOG.md b/packages/primus/CHANGELOG.md
index 3dce91c165..c2f1613483 100644
--- a/packages/primus/CHANGELOG.md
+++ b/packages/primus/CHANGELOG.md
@@ -3,6 +3,204 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.4](https://github.com/feathersjs/feathers/compare/v4.5.3...v4.5.4) (2020-04-29)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.5](https://github.com/feathersjs/feathers/compare/v4.3.4...v4.3.5) (2019-10-07)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+
+### Bug Fixes
+
+* Typing improvements ([#1580](https://github.com/feathersjs/feathers/issues/1580)) ([7818aec](https://github.com/feathersjs/feathers/commit/7818aec))
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+
+### Bug Fixes
+
+* Use WeakMap to connect socket to connection ([#1509](https://github.com/feathersjs/feathers/issues/1509)) ([64807e3](https://github.com/feathersjs/feathers/commit/64807e3))
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+**Note:** Version bump only for package @feathersjs/primus
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/primus/LICENSE b/packages/primus/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/primus/LICENSE
+++ b/packages/primus/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/primus/README.md b/packages/primus/README.md
index 8c09925800..a0a189f74e 100644
--- a/packages/primus/README.md
+++ b/packages/primus/README.md
@@ -1,6 +1,6 @@
# @feathersjs/primus
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/primus)
[](https://www.npmjs.com/package/@feathersjs/primus)
@@ -12,26 +12,12 @@
npm install @feathersjs/primus --save
```
-## Quick example
-
-```js
-const feathers = require('@feathersjs/feathers');
-const primus = require('@feathersjs/primus');
-
-const app = feathers();
-
-// Set up Primus with SockJS
-app.configure(primus({ transformer: 'ws' }));
-
-app.listen(3030);
-```
-
## Documentation
-Please refer to the [@feathersjs/primus documentation](https://docs.feathersjs.com/api/primus.html) for more details.
+Refer to the [Feathers Primus API documentation](https://docs.feathersjs.com/api/primus.html) for more details.
## License
-Copyright (c) 2018
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
Licensed under the [MIT license](LICENSE).
diff --git a/packages/primus/index.d.ts b/packages/primus/index.d.ts
index b6a0f92e54..7226d5c3ea 100644
--- a/packages/primus/index.d.ts
+++ b/packages/primus/index.d.ts
@@ -6,7 +6,6 @@ declare const configurePrimus: FeathersPrimus;
export = configurePrimus;
interface FeathersPrimus {
- (options: any, callback?: (primus: any) => void): () => void;
- readonly SOCKET_KEY: unique symbol;
+ (options?: any, callback?: (primus: any) => void): (app: any) => void;
default: FeathersPrimus;
}
diff --git a/packages/primus/lib/index.js b/packages/primus/lib/index.js
index f503ccc2e4..3ebc343185 100644
--- a/packages/primus/lib/index.js
+++ b/packages/primus/lib/index.js
@@ -6,12 +6,13 @@ const http = require('http');
const Emitter = require('primus-emitter');
const debug = makeDebug('@feathersjs/primus');
-const socketKey = Symbol('@feathersjs/primus/socket');
function configurePrimus (config, configurer) {
- return function () {
- const app = this;
+ return function (app) {
+ // Returns the connection object
const getParams = spark => spark.request.feathers;
+ // Mapping from connection back to its socket
+ const socketMap = new WeakMap();
if (!app.version || app.version < '3.0.0') {
throw new Error('@feathersjs/primus is not compatible with this version of Feathers. Use the latest at @feathersjs/feathers.');
@@ -58,12 +59,7 @@ function configurePrimus (config, configurer) {
next();
}, 0);
- primus.on('connection', spark =>
- Object.defineProperty(getParams(spark), socketKey, {
- value: spark
- })
- );
-
+ primus.on('connection', spark => socketMap.set(getParams(spark), spark));
primus.on('disconnection', spark => app.emit('disconnect', getParams(spark)));
}
@@ -81,7 +77,7 @@ function configurePrimus (config, configurer) {
app.configure(commons({
done,
- socketKey,
+ socketMap,
getParams,
emit: 'send'
}));
@@ -89,5 +85,4 @@ function configurePrimus (config, configurer) {
}
module.exports = configurePrimus;
-module.exports.SOCKET_KEY = socketKey;
module.exports.default = configurePrimus;
diff --git a/packages/primus/package.json b/packages/primus/package.json
index 9f48838bd6..5f3e01064e 100644
--- a/packages/primus/package.json
+++ b/packages/primus/package.json
@@ -1,7 +1,7 @@
{
"name": "@feathersjs/primus",
"description": "The Feathers Primus real-time API provider",
- "version": "4.0.0-pre.3",
+ "version": "4.5.4",
"homepage": "https://feathersjs.com",
"main": "lib/",
"types": "index.d.ts",
@@ -10,6 +10,10 @@
"feathers-plugin"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -24,10 +28,10 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6"
+ "node": ">= 10"
},
"scripts": {
- "test": "mocha --opts ../../mocha.opts"
+ "test": "mocha --config ../../.mocharc.json"
},
"directories": {
"lib": "lib"
@@ -36,22 +40,21 @@
"access": "public"
},
"dependencies": {
- "@feathersjs/transport-commons": "^4.2.1",
+ "@feathersjs/transport-commons": "^4.5.3",
"debug": "^4.1.1",
- "primus": "^7.3.3",
+ "primus": "^7.3.5",
"primus-emitter": "^3.1.1",
- "uberproto": "^2.0.4"
+ "uberproto": "^2.0.6"
},
"devDependencies": {
- "@feathersjs/commons": "^4.0.0-pre.3",
- "@feathersjs/express": "^4.0.0-pre.3",
- "@feathersjs/feathers": "^4.0.0-pre.3",
- "@feathersjs/tests": "^4.0.0-pre.3",
- "feathers": "^2.2.4",
- "feathers-memory": "^3.0.2",
- "lodash": "^4.17.11",
- "mocha": "^6.1.4",
- "ws": "^7.0.0"
- },
- "gitHead": "19eb75737659e3e4b57765c1653d23c86fd2e1c3"
+ "@feathersjs/commons": "^4.5.3",
+ "@feathersjs/express": "^4.5.4",
+ "@feathersjs/feathers": "^4.5.3",
+ "@feathersjs/tests": "^4.5.3",
+ "feathers-memory": "^4.1.0",
+ "lodash": "^4.17.19",
+ "mocha": "^8.0.1",
+ "ws": "^7.3.1"
+ },
+ "gitHead": "9b9f0f13387341bdd320f1e66feda828fca2c9f2"
}
diff --git a/packages/primus/test/index.test.js b/packages/primus/test/index.test.js
index cca043becc..e1b0b3b233 100644
--- a/packages/primus/test/index.test.js
+++ b/packages/primus/test/index.test.js
@@ -2,7 +2,8 @@ const feathers = require('@feathersjs/feathers');
const express = require('@feathersjs/express');
const assert = require('assert');
const request = require('request');
-const _ = require('lodash');
+const omit = require('lodash/omit');
+const extend = require('lodash/extend');
const { Service } = require('@feathersjs/tests/lib/fixture');
const primus = require('../lib');
@@ -63,8 +64,7 @@ describe('@feathersjs/primus', () => {
options.server.close(done);
});
- it('exports default and SOCKET_KEY', () => {
- assert.ok(primus.SOCKET_KEY);
+ it('exports default', () => {
assert.strictEqual(primus, primus.default);
});
@@ -72,17 +72,6 @@ describe('@feathersjs/primus', () => {
assert.strictEqual(typeof require('../lib'), 'function');
});
- it('throws an error when using an incompatible version of Feathers', () => {
- const oldFeathers = require('feathers');
-
- try {
- oldFeathers().configure(primus());
- assert.ok(false, 'Should never get here');
- } catch (e) {
- assert.strictEqual(e.message, '@feathersjs/primus is not compatible with this version of Feathers. Use the latest at @feathersjs/feathers.');
- }
- });
-
it('runs primus before setup (#131)', done => {
let counter = 0;
const app = feathers()
@@ -135,21 +124,21 @@ describe('@feathersjs/primus', () => {
};
service.find = function (params) {
- assert.deepStrictEqual(_.omit(params, 'query', 'route', 'connection'), options.socketParams,
+ assert.deepStrictEqual(omit(params, 'query', 'route', 'connection'), options.socketParams,
'Handshake parameters passed on proper position');
return old.find.apply(this, arguments);
};
service.create = function (data, params) {
- assert.deepStrictEqual(_.omit(params, 'query', 'route', 'connection'), options.socketParams,
+ assert.deepStrictEqual(omit(params, 'query', 'route', 'connection'), options.socketParams,
'Passed handshake parameters');
return old.create.apply(this, arguments);
};
service.update = function (id, data, params) {
- assert.deepStrictEqual(params, _.extend({
+ assert.deepStrictEqual(params, extend({
connection: options.socketParams,
route: {},
query: {
@@ -165,7 +154,7 @@ describe('@feathersjs/primus', () => {
options.socket.send('update', 'todo', 1, {}, { test: 'param' }, () => {
assert.ok(!error);
- _.extend(service, old);
+ extend(service, old);
done();
});
});
@@ -178,14 +167,14 @@ describe('@feathersjs/primus', () => {
};
service.find = function (params) {
- assert.deepStrictEqual(_.omit(params, 'query', 'route', 'connection'), options.socketParams,
+ assert.deepStrictEqual(omit(params, 'query', 'route', 'connection'), options.socketParams,
'Handshake parameters passed on proper position');
return old.find.apply(this, arguments);
};
options.socket.send('find', 'todo', function () {
- _.extend(service, old);
+ extend(service, old);
done();
});
});
diff --git a/packages/rest-client/.npmignore b/packages/rest-client/.npmignore
index 65e3ba2eda..33b30624f5 100644
--- a/packages/rest-client/.npmignore
+++ b/packages/rest-client/.npmignore
@@ -1 +1,2 @@
test/
+coverage/
diff --git a/packages/rest-client/CHANGELOG.md b/packages/rest-client/CHANGELOG.md
index 7eec6617b3..444f2626a3 100644
--- a/packages/rest-client/CHANGELOG.md
+++ b/packages/rest-client/CHANGELOG.md
@@ -3,6 +3,211 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.4](https://github.com/feathersjs/feathers/compare/v4.5.3...v4.5.4) (2020-04-29)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+
+### Features
+
+* **rest-client:** Allow for customising rest clients ([#1780](https://github.com/feathersjs/feathers/issues/1780)) ([c5cfec7](https://github.com/feathersjs/feathers/commit/c5cfec7a4aafcaffaab0cdacb9b5d297ff20320f))
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+
+### Bug Fixes
+
+* **core:** Improve hook missing parameter message by adding the service name ([#1703](https://github.com/feathersjs/feathers/issues/1703)) ([2331c2a](https://github.com/feathersjs/feathers/commit/2331c2a3dd70d432db7d62a76ed805d359cbbba5))
+* **rest-client:** Allow to customize getting the query ([#1594](https://github.com/feathersjs/feathers/issues/1594)) ([5f21272](https://github.com/feathersjs/feathers/commit/5f212729849414c4da6f0d51edd1986feca992ee))
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.5](https://github.com/feathersjs/feathers/compare/v4.3.4...v4.3.5) (2019-10-07)
+
+
+### Bug Fixes
+
+* Change this reference in client libraries to explicitly passed app ([#1597](https://github.com/feathersjs/feathers/issues/1597)) ([4e4d10a](https://github.com/feathersjs/feathers/commit/4e4d10a))
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+
+### Bug Fixes
+
+* Update all dependencies ([7d53a00](https://github.com/feathersjs/feathers/commit/7d53a00))
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/rest-client/LICENSE b/packages/rest-client/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/rest-client/LICENSE
+++ b/packages/rest-client/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/rest-client/README.md b/packages/rest-client/README.md
index 1fd30c34c6..85f2621cf7 100644
--- a/packages/rest-client/README.md
+++ b/packages/rest-client/README.md
@@ -1,46 +1,23 @@
# @feathersjs/rest-client
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/rest-client)
[](https://www.npmjs.com/package/@feathersjs/rest-client)
> REST client services for different Ajax libraries
-`@feathersjs/rest-client` supports [REST server](https://docs.feathersjs.com/api/rest.html#server) connectivity using [jQuery](https://jquery.com/), [request](https://github.com/request/request), [Superagent](http://visionmedia.github.io/superagent/), [Axios](https://github.com/mzabriskie/axios), [Fetch](https://facebook.github.io/react-native/docs/network.html) or [Angular HTTP](https://angularjs.org/) as the AJAX library.
-
## Installation
```
npm install @feathersjs/rest-client --save
```
-## Quick example
-
-```js
-const feathers = require('@feathersjs/feathers');
-const rest = require('@feathersjs/rest-client');
-
-const app = feathers();
-
-// Connect to the same as the browser URL (only in the browser)
-const restClient = rest();
-
-// Connect to a different URL
-const restClient = rest('http://feathers-api.com')
-
-// Configure an AJAX library (see below) with that client
-app.configure(restClient.fetch(window.fetch));
-
-// Connect to the `http://feathers-api.com/messages` service
-const messages = app.service('messages');
-```
-
## Documentation
-Please refer to the [@feathersjs/rest-client documentation](https://docs.feathersjs.com/api/client/rest.html) for more details.
+Refer to the [Feathers REST client API documentation](https://docs.feathersjs.com/api/client/rest.html) for more details.
## License
-Copyright (c) 2018
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
Licensed under the [MIT license](LICENSE).
diff --git a/packages/rest-client/lib/base.js b/packages/rest-client/lib/base.js
index 8e95f12e44..635b50bcd7 100644
--- a/packages/rest-client/lib/base.js
+++ b/packages/rest-client/lib/base.js
@@ -1,4 +1,4 @@
-const query = require('qs');
+const qs = require('qs');
const { Unavailable } = require('@feathersjs/errors');
const { _ } = require('@feathersjs/commons');
const { stripSlashes } = require('@feathersjs/commons');
@@ -20,21 +20,25 @@ class Base {
this.base = `${settings.base}/${this.name}`;
}
- makeUrl (params, id) {
- params = params || {};
+ makeUrl (query, id) {
+ query = query || {};
let url = this.base;
if (typeof id !== 'undefined' && id !== null) {
url += `/${encodeURIComponent(id)}`;
}
- if (Object.keys(params).length !== 0) {
- const queryString = query.stringify(params);
+ return url + this.getQuery(query);
+ }
+
+ getQuery (query) {
+ if (Object.keys(query).length !== 0) {
+ const queryString = qs.stringify(query);
- url += `?${queryString}`;
+ return `?${queryString}`;
}
- return url;
+ return '';
}
find (params = {}) {
diff --git a/packages/rest-client/lib/index.js b/packages/rest-client/lib/index.js
index dfa31bce8f..bbc1a75458 100644
--- a/packages/rest-client/lib/index.js
+++ b/packages/rest-client/lib/index.js
@@ -1,19 +1,19 @@
-const jQuery = require('./jquery');
-const Superagent = require('./superagent');
-const Request = require('./request');
-const Fetch = require('./fetch');
-const Axios = require('./axios');
-const Angular = require('./angular');
+const jQueryClient = require('./jquery');
+const SuperagentClient = require('./superagent');
+const RequestClient = require('./request');
+const FetchClient = require('./fetch');
+const AxiosClient = require('./axios');
+const AngularClient = require('./angular');
const Base = require('./base');
const AngularHttpClient = require('./angular-http-client');
const transports = {
- jquery: jQuery,
- superagent: Superagent,
- request: Request,
- fetch: Fetch,
- axios: Axios,
- angular: Angular,
+ jquery: jQueryClient,
+ superagent: SuperagentClient,
+ request: RequestClient,
+ fetch: FetchClient,
+ axios: AxiosClient,
+ angular: AngularClient,
angularHttpClient: AngularHttpClient
};
@@ -21,24 +21,27 @@ function restClient (base = '') {
const result = { Base };
Object.keys(transports).forEach(key => {
- const Service = transports[key];
-
- result[key] = function (connection, options = {}) {
+ result[key] = function (connection, options = {}, Service = transports[key]) {
if (!connection) {
throw new Error(`${key} has to be provided to feathers-rest`);
}
+ if (typeof options === 'function') {
+ Service = options;
+ options = {};
+ }
+
const defaultService = function (name) {
return new Service({ base, name, connection, options });
};
- const initialize = function () {
- if (typeof this.defaultService === 'function') {
+ const initialize = function (app) {
+ if (typeof app.defaultService === 'function') {
throw new Error('Only one default client provider can be configured');
}
- this.rest = connection;
- this.defaultService = defaultService;
+ app.rest = connection;
+ app.defaultService = defaultService;
};
initialize.Service = Service;
@@ -51,5 +54,5 @@ function restClient (base = '') {
return result;
}
-module.exports = restClient;
+module.exports = Object.assign(restClient, { SuperagentClient, FetchClient, jQueryClient, RequestClient, AxiosClient, AngularClient, AngularHttpClient });
module.exports.default = restClient;
diff --git a/packages/rest-client/package.json b/packages/rest-client/package.json
index 5cd660025e..d16a1a4a4b 100644
--- a/packages/rest-client/package.json
+++ b/packages/rest-client/package.json
@@ -1,7 +1,7 @@
{
"name": "@feathersjs/rest-client",
"description": "REST client services for different Ajax libraries",
- "version": "4.0.0-pre.3",
+ "version": "4.5.4",
"homepage": "https://feathersjs.com",
"main": "lib/index.js",
"types": "index.d.ts",
@@ -10,6 +10,10 @@
"feathers-plugin"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -24,10 +28,10 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6.0.0"
+ "node": ">= 10"
},
"scripts": {
- "test": "mocha --opts ../../mocha.opts"
+ "test": "mocha --config ../../.mocharc.json"
},
"directories": {
"lib": "lib"
@@ -36,27 +40,27 @@
"access": "public"
},
"dependencies": {
- "@feathersjs/commons": "^4.0.0-pre.3",
- "@feathersjs/errors": "^4.0.0-pre.3",
- "qs": "^6.7.0"
+ "@feathersjs/commons": "^4.5.3",
+ "@feathersjs/errors": "^4.5.3",
+ "qs": "^6.9.4"
},
"devDependencies": {
- "@angular/common": "^7.2.15",
- "@angular/core": "^7.2.15",
- "@angular/http": "^7.2.15",
- "@angular/platform-browser": "^7.2.15",
- "@feathersjs/express": "^4.0.0-pre.3",
- "@feathersjs/feathers": "^4.0.0-pre.3",
- "@feathersjs/tests": "^4.0.0-pre.3",
- "axios": "^0.19.0",
+ "@angular/common": "^10.0.3",
+ "@angular/core": "^10.0.3",
+ "@angular/http": "^7.2.16",
+ "@angular/platform-browser": "^10.0.3",
+ "@feathersjs/express": "^4.5.4",
+ "@feathersjs/feathers": "^4.5.3",
+ "@feathersjs/tests": "^4.5.3",
+ "axios": "^0.19.2",
"body-parser": "^1.19.0",
- "feathers-memory": "^3.0.2",
- "mocha": "^6.1.4",
+ "feathers-memory": "^4.1.0",
+ "mocha": "^8.0.1",
"node-fetch": "^2.6.0",
- "request": "^2.88.0",
- "rxjs": "^6.5.2",
+ "request": "^2.88.2",
+ "rxjs": "^6.6.0",
"shx": "^0.3.2",
- "superagent": "^5.0.5"
+ "superagent": "^5.3.1"
},
- "gitHead": "19eb75737659e3e4b57765c1653d23c86fd2e1c3"
+ "gitHead": "9b9f0f13387341bdd320f1e66feda828fca2c9f2"
}
diff --git a/packages/rest-client/test/angular-http-client.test.js b/packages/rest-client/test/angular-http-client.test.js
index b7792a20fc..0f81f06f77 100644
--- a/packages/rest-client/test/angular-http-client.test.js
+++ b/packages/rest-client/test/angular-http-client.test.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const feathers = require('@feathersjs/feathers');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const errors = require('@feathersjs/errors');
const server = require('./server');
diff --git a/packages/rest-client/test/angular.test.js b/packages/rest-client/test/angular.test.js
index a49d512630..776c4f14a4 100644
--- a/packages/rest-client/test/angular.test.js
+++ b/packages/rest-client/test/angular.test.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const feathers = require('@feathersjs/feathers');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const errors = require('@feathersjs/errors');
const server = require('./server');
const rest = require('../lib/index');
diff --git a/packages/rest-client/test/axios.test.js b/packages/rest-client/test/axios.test.js
index accb3a3ba0..04effc48a9 100644
--- a/packages/rest-client/test/axios.test.js
+++ b/packages/rest-client/test/axios.test.js
@@ -1,7 +1,7 @@
const assert = require('assert');
const axios = require('axios');
const feathers = require('@feathersjs/feathers');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const errors = require('@feathersjs/errors');
const server = require('./server');
const rest = require('../lib/index');
diff --git a/packages/rest-client/test/fetch.test.js b/packages/rest-client/test/fetch.test.js
index bc6016f01e..9c19041a87 100644
--- a/packages/rest-client/test/fetch.test.js
+++ b/packages/rest-client/test/fetch.test.js
@@ -2,7 +2,7 @@ const fetch = require('node-fetch');
const assert = require('assert');
const feathers = require('@feathersjs/feathers');
const errors = require('@feathersjs/errors');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const server = require('./server');
const rest = require('../lib/index');
diff --git a/packages/rest-client/test/index.test.js b/packages/rest-client/test/index.test.js
index 41c287f7c7..e1f6f00e1c 100644
--- a/packages/rest-client/test/index.test.js
+++ b/packages/rest-client/test/index.test.js
@@ -1,6 +1,7 @@
const fetch = require('node-fetch');
const feathers = require('@feathersjs/feathers');
const rest = require('../lib/index');
+const { FetchClient } = require('../lib/index');
const assert = require('assert');
const init = require('../lib');
@@ -79,19 +80,65 @@ describe('REST client tests', function () {
const service = app.service('todos');
return service.get().catch(error => {
- assert.strictEqual(error.message, `An id must be provided to the 'get' method`);
+ assert.strictEqual(error.message, `An id must be provided to the 'todos.get' method`);
return service.remove();
}).catch(error => {
- assert.strictEqual(error.message, `An id must be provided to the 'remove' method`);
+ assert.strictEqual(error.message, `An id must be provided to the 'todos.remove' method`);
return service.update();
}).catch(error => {
- assert.strictEqual(error.message, `An id must be provided to the 'update' method`);
+ assert.strictEqual(error.message, `An id must be provided to the 'todos.update' method`);
return service.patch();
}).catch(error => {
- assert.strictEqual(error.message, `An id must be provided to the 'patch' method`);
+ assert.strictEqual(error.message, `An id must be provided to the 'todos.patch' method`);
+ });
+ });
+
+ it('uses a custom client', () => {
+ const app = feathers();
+ class MyFetchClient extends FetchClient {
+ find () {
+ return Promise.resolve({
+ connection: this.connection,
+ base: this.base,
+ message: 'Custom fetch client'
+ });
+ }
+ }
+
+ app.configure(rest('http://localhost:8889').fetch(fetch, {}, MyFetchClient));
+
+ return app.service('messages').find().then(data => {
+ assert.deepStrictEqual(data, {
+ connection: fetch,
+ base: 'http://localhost:8889/messages',
+ message: 'Custom fetch client'
+ });
+ });
+ });
+
+ it('uses a custom client as second arg', () => {
+ const app = feathers();
+ class MyFetchClient extends FetchClient {
+ find () {
+ return Promise.resolve({
+ connection: this.connection,
+ base: this.base,
+ message: 'Custom fetch client'
+ });
+ }
+ }
+
+ app.configure(rest('http://localhost:8889').fetch(fetch, MyFetchClient));
+
+ return app.service('messages').find().then(data => {
+ assert.deepStrictEqual(data, {
+ connection: fetch,
+ base: 'http://localhost:8889/messages',
+ message: 'Custom fetch client'
+ });
});
});
});
diff --git a/packages/rest-client/test/jquery.test.js b/packages/rest-client/test/jquery.test.js
index 1f89a11fa5..79e57a6a6a 100644
--- a/packages/rest-client/test/jquery.test.js
+++ b/packages/rest-client/test/jquery.test.js
@@ -2,7 +2,7 @@ const assert = require('assert');
const feathers = require('@feathersjs/feathers');
const { JSDOM } = require('jsdom');
const jquery = require('jquery');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const errors = require('@feathersjs/errors');
const server = require('./server');
const rest = require('../lib/index');
diff --git a/packages/rest-client/test/request.test.js b/packages/rest-client/test/request.test.js
index 73347cec25..3c93c4c072 100644
--- a/packages/rest-client/test/request.test.js
+++ b/packages/rest-client/test/request.test.js
@@ -1,7 +1,7 @@
const assert = require('assert');
const request = require('request');
const feathers = require('@feathersjs/feathers');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const errors = require('@feathersjs/errors');
const server = require('./server');
const rest = require('../lib/index');
diff --git a/packages/rest-client/test/superagent.test.js b/packages/rest-client/test/superagent.test.js
index 8765927838..dae27fe82d 100644
--- a/packages/rest-client/test/superagent.test.js
+++ b/packages/rest-client/test/superagent.test.js
@@ -1,7 +1,7 @@
const assert = require('assert');
const superagent = require('superagent');
const feathers = require('@feathersjs/feathers');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const errors = require('@feathersjs/errors');
const server = require('./server');
const rest = require('../lib/index');
diff --git a/packages/socketio-client/.npmignore b/packages/socketio-client/.npmignore
index 65e3ba2eda..33b30624f5 100644
--- a/packages/socketio-client/.npmignore
+++ b/packages/socketio-client/.npmignore
@@ -1 +1,2 @@
test/
+coverage/
diff --git a/packages/socketio-client/CHANGELOG.md b/packages/socketio-client/CHANGELOG.md
index dce3d2ce87..fff3e4c020 100644
--- a/packages/socketio-client/CHANGELOG.md
+++ b/packages/socketio-client/CHANGELOG.md
@@ -3,6 +3,201 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.4](https://github.com/feathersjs/feathers/compare/v4.5.3...v4.5.4) (2020-04-29)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.5](https://github.com/feathersjs/feathers/compare/v4.3.4...v4.3.5) (2019-10-07)
+
+
+### Bug Fixes
+
+* Change this reference in client libraries to explicitly passed app ([#1597](https://github.com/feathersjs/feathers/issues/1597)) ([4e4d10a](https://github.com/feathersjs/feathers/commit/4e4d10a))
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/socketio-client/LICENSE b/packages/socketio-client/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/socketio-client/LICENSE
+++ b/packages/socketio-client/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/socketio-client/README.md b/packages/socketio-client/README.md
index cd94b5eadb..38bbbc4129 100644
--- a/packages/socketio-client/README.md
+++ b/packages/socketio-client/README.md
@@ -1,6 +1,6 @@
# @feathersjs/socketio-client
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/socketio-client)
[](https://www.npmjs.com/package/@feathersjs/socketio-client)
@@ -12,35 +12,12 @@
npm install @feathersjs/socketio-client --save
```
-## Quick example
-
-```js
-const feathers = require('@feathersjs/feathers');
-const socketio = require('@feathersjs/socketio-client');
-const io = require('socket.io-client');
-
-const socket = io('http://api.feathersjs.com');
-const app = feathers();
-
-// Set up Socket.io client with the socket
-app.configure(socketio(socket));
-
-// Receive real-time events through Socket.io
-app.service('messages')
- .on('created', message => console.log('New message created', message));
-
-// Call the `messages` service
-app.service('messages').create({
- text: 'A message from a REST client'
-});
-```
-
## Documentation
-Please refer to the [@feathersjs/socketio-client documentation](https://docs.feathersjs.com/api/client/socketio.html) for more details.
+Refer to the [Feathers SocketIO API documentation](https://docs.feathersjs.com/api/client/socketio.html) for more details.
## License
-Copyright (c) 2018
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
Licensed under the [MIT license](LICENSE).
diff --git a/packages/socketio-client/lib/index.js b/packages/socketio-client/lib/index.js
index e244945327..e31ec04f8f 100644
--- a/packages/socketio-client/lib/index.js
+++ b/packages/socketio-client/lib/index.js
@@ -19,13 +19,13 @@ function socketioClient (connection, options) {
return new Service(settings);
};
- const initialize = function () {
- if (typeof this.defaultService === 'function') {
+ const initialize = function (app) {
+ if (typeof app.defaultService === 'function') {
throw new Error('Only one default client provider can be configured');
}
- this.io = connection;
- this.defaultService = defaultService;
+ app.io = connection;
+ app.defaultService = defaultService;
};
initialize.Service = Service;
diff --git a/packages/socketio-client/package.json b/packages/socketio-client/package.json
index 980c48706d..b04b6f13c7 100644
--- a/packages/socketio-client/package.json
+++ b/packages/socketio-client/package.json
@@ -1,7 +1,7 @@
{
"name": "@feathersjs/socketio-client",
"description": "The client for Socket.io through feathers-socketio",
- "version": "4.0.0-pre.3",
+ "version": "4.5.4",
"homepage": "https://feathersjs.com",
"main": "lib/index.js",
"types": "index.d.ts",
@@ -10,6 +10,10 @@
"feathers-plugin"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -24,10 +28,10 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6.0.0"
+ "node": ">= 10"
},
"scripts": {
- "test": "mocha --opts ../../mocha.opts"
+ "test": "mocha --config ../../.mocharc.json"
},
"directories": {
"lib": "lib"
@@ -36,18 +40,17 @@
"access": "public"
},
"dependencies": {
- "@feathersjs/transport-commons": "^4.2.1",
- "@types/socket.io-client": "^1.4.32"
+ "@feathersjs/transport-commons": "^4.5.3",
+ "@types/socket.io-client": "^1.4.33"
},
"devDependencies": {
- "@feathersjs/commons": "^4.0.0-pre.3",
- "@feathersjs/feathers": "^4.0.0-pre.3",
- "@feathersjs/socketio": "^4.0.0-pre.3",
- "@feathersjs/tests": "^4.0.0-pre.3",
- "chai": "^4.2.0",
- "feathers-memory": "^3.0.2",
- "mocha": "^6.1.4",
- "socket.io-client": "^2.2.0"
- },
- "gitHead": "19eb75737659e3e4b57765c1653d23c86fd2e1c3"
+ "@feathersjs/commons": "^4.5.3",
+ "@feathersjs/feathers": "^4.5.3",
+ "@feathersjs/socketio": "^4.5.4",
+ "@feathersjs/tests": "^4.5.3",
+ "feathers-memory": "^4.1.0",
+ "mocha": "^8.0.1",
+ "socket.io-client": "^2.3.0"
+ },
+ "gitHead": "9b9f0f13387341bdd320f1e66feda828fca2c9f2"
}
diff --git a/packages/socketio-client/test/index.test.js b/packages/socketio-client/test/index.test.js
index 1326b60e0d..c027441b8a 100644
--- a/packages/socketio-client/test/index.test.js
+++ b/packages/socketio-client/test/index.test.js
@@ -1,7 +1,7 @@
const assert = require('assert');
const feathers = require('@feathersjs/feathers');
const io = require('socket.io-client');
-const baseTests = require('@feathersjs/tests/lib//client');
+const baseTests = require('@feathersjs/tests/lib/client');
const server = require('./server');
const socketio = require('../lib');
diff --git a/packages/socketio/.npmignore b/packages/socketio/.npmignore
index 65e3ba2eda..33b30624f5 100644
--- a/packages/socketio/.npmignore
+++ b/packages/socketio/.npmignore
@@ -1 +1,2 @@
test/
+coverage/
diff --git a/packages/socketio/CHANGELOG.md b/packages/socketio/CHANGELOG.md
index 0393504ac7..b455c69663 100644
--- a/packages/socketio/CHANGELOG.md
+++ b/packages/socketio/CHANGELOG.md
@@ -3,6 +3,208 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.4](https://github.com/feathersjs/feathers/compare/v4.5.3...v4.5.4) (2020-04-29)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+
+### Features
+
+* **authentication:** Add parseStrategies to allow separate strategies for creating JWTs and parsing headers ([#1708](https://github.com/feathersjs/feathers/issues/1708)) ([5e65629](https://github.com/feathersjs/feathers/commit/5e65629b924724c3e81d7c81df047e123d1c8bd7))
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.5](https://github.com/feathersjs/feathers/compare/v4.3.4...v4.3.5) (2019-10-07)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+
+### Bug Fixes
+
+* Typing improvements ([#1580](https://github.com/feathersjs/feathers/issues/1580)) ([7818aec](https://github.com/feathersjs/feathers/commit/7818aec))
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+
+### Bug Fixes
+
+* Expire and remove authenticated real-time connections ([#1512](https://github.com/feathersjs/feathers/issues/1512)) ([2707c33](https://github.com/feathersjs/feathers/commit/2707c33))
+* Use WeakMap to connect socket to connection ([#1509](https://github.com/feathersjs/feathers/issues/1509)) ([64807e3](https://github.com/feathersjs/feathers/commit/64807e3))
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/socketio/LICENSE b/packages/socketio/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/socketio/LICENSE
+++ b/packages/socketio/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/socketio/README.md b/packages/socketio/README.md
index f386381905..8b4aba5f6d 100644
--- a/packages/socketio/README.md
+++ b/packages/socketio/README.md
@@ -1,6 +1,6 @@
# @feathersjs/socketio
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/socketio)
[](https://www.npmjs.com/package/@feathersjs/socketio)
@@ -12,25 +12,12 @@
npm install @feathersjs/socketio --save
```
-## Quick example
-
-```js
-const feathers = require('@feathersjs/feathers');
-const socketio = require('@feathersjs/socketio');
-
-const app = feathers();
-
-app.configure(socketio());
-
-app.listen(3030);
-```
-
## Documentation
-Please refer to the [@feathersjs/socketio documentation](https://docs.feathersjs.com/api/socketio.html) for more details.
+Refer to the [Feathers SocketIO API documentation](https://docs.feathersjs.com/api/socketio.html) for more details.
## License
-Copyright (c) 2018
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
Licensed under the [MIT license](LICENSE).
diff --git a/packages/socketio/index.d.ts b/packages/socketio/index.d.ts
index 4c5b438ba4..3bd63b2d5c 100644
--- a/packages/socketio/index.d.ts
+++ b/packages/socketio/index.d.ts
@@ -5,9 +5,8 @@ declare const socketio: FeathersSocketIO;
export = socketio;
interface FeathersSocketIO {
- (callback?: (io: io.Server) => void): () => void;
- (options: number | io.ServerOptions, callback?: (io: io.Server) => void): () => void;
- (port: number, options?: io.ServerOptions, callback?: (io: io.Server) => void): () => void;
- readonly SOCKET_KEY: unique symbol;
+ (callback?: (io: io.Server) => void): (app: any) => void;
+ (options: number | io.ServerOptions, callback?: (io: io.Server) => void): (app: any) => void;
+ (port: number, options?: io.ServerOptions, callback?: (io: io.Server) => void): (app: any) => void;
default: FeathersSocketIO;
}
diff --git a/packages/socketio/lib/index.js b/packages/socketio/lib/index.js
index a8467849a9..36734660dd 100644
--- a/packages/socketio/lib/index.js
+++ b/packages/socketio/lib/index.js
@@ -4,7 +4,7 @@ const http = require('http');
const { socket: commons } = require('@feathersjs/transport-commons');
const debug = require('debug')('@feathersjs/socketio');
-const socketKey = Symbol('@feathersjs/socketio/socket');
+const middleware = require('./middleware');
function configureSocketio (port, options, config) {
if (typeof port !== 'number') {
@@ -18,9 +18,11 @@ function configureSocketio (port, options, config) {
options = {};
}
- return function () {
- const app = this;
+ return function (app) {
+ // Function that gets the connection
const getParams = socket => socket.feathers;
+ // A mapping from connection to socket instance
+ const socketMap = new WeakMap();
if (!app.version || app.version < '3.0.0') {
throw new Error('@feathersjs/socketio is not compatible with this version of Feathers. Use the latest at @feathersjs/feathers.');
@@ -46,28 +48,11 @@ function configureSocketio (port, options, config) {
setup (server) {
if (!this.io) {
- const io = this.io = socketio
- .listen(port || server, options);
+ const io = this.io = socketio.listen(port || server, options);
- io.use((socket, next) => {
- const connection = {
- provider: 'socketio',
- headers: socket.handshake.headers
- };
-
- Object.defineProperty(connection, socketKey, {
- value: socket
- });
-
- socket.feathers = connection;
-
- next();
- });
-
- io.use((socket, next) => {
- socket.once('disconnect', () => app.emit('disconnect', getParams(socket)));
- next();
- });
+ io.use(middleware.disconnect(app, getParams));
+ io.use(middleware.params(app, socketMap));
+ io.use(middleware.authentication(app, getParams));
// In Feathers it is easy to hit the standard Node warning limit
// of event listeners (e.g. by registering 10 services).
@@ -89,7 +74,7 @@ function configureSocketio (port, options, config) {
app.configure(commons({
done,
- socketKey,
+ socketMap,
getParams,
emit: 'emit'
}));
@@ -98,4 +83,3 @@ function configureSocketio (port, options, config) {
module.exports = configureSocketio;
module.exports.default = configureSocketio;
-module.exports.SOCKET_KEY = socketKey;
diff --git a/packages/socketio/lib/middleware.js b/packages/socketio/lib/middleware.js
new file mode 100644
index 0000000000..10f626621f
--- /dev/null
+++ b/packages/socketio/lib/middleware.js
@@ -0,0 +1,46 @@
+const debug = require('debug')('@feathersjs/socketio/middleware');
+
+exports.disconnect = (app, getParams) => (socket, next) => {
+ socket.once('disconnect', () => app.emit('disconnect', getParams(socket)));
+ next();
+};
+
+exports.params = (app, socketMap) => (socket, next) => {
+ socket.feathers = {
+ provider: 'socketio',
+ headers: socket.handshake.headers
+ };
+
+ socketMap.set(socket.feathers, socket);
+
+ next();
+};
+
+exports.authentication = (app, getParams, settings = {}) => (socket, next) => {
+ const service = app.defaultAuthentication ? app.defaultAuthentication(settings.service) : null;
+
+ if (service === null) {
+ return next();
+ }
+
+ const config = service.configuration;
+ const authStrategies = config.parseStrategies || config.authStrategies || [];
+
+ if (authStrategies.length === 0) {
+ return next();
+ }
+
+ service.parse(socket.handshake, null, ...authStrategies)
+ .then(async authentication => {
+ if (authentication) {
+ debug('Parsed authentication from HTTP header', authentication);
+ socket.feathers.authentication = authentication;
+ await service.create(authentication, {
+ provider: 'socketio',
+ connection: getParams(socket)
+ });
+ }
+
+ next();
+ }).catch(next);
+};
diff --git a/packages/socketio/package.json b/packages/socketio/package.json
index d26f87a50d..47c9f503f0 100644
--- a/packages/socketio/package.json
+++ b/packages/socketio/package.json
@@ -1,7 +1,7 @@
{
"name": "@feathersjs/socketio",
"description": "The Feathers Socket.io real-time API provider",
- "version": "4.0.0-pre.3",
+ "version": "4.5.4",
"homepage": "https://feathersjs.com",
"main": "lib/",
"types": "index.d.ts",
@@ -10,6 +10,10 @@
"feathers-plugin"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -24,10 +28,10 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6"
+ "node": ">= 10"
},
"scripts": {
- "test": "mocha --opts ../../mocha.opts"
+ "test": "mocha --config ../../.mocharc.json"
},
"directories": {
"lib": "lib"
@@ -36,22 +40,24 @@
"access": "public"
},
"dependencies": {
- "@feathersjs/transport-commons": "^4.2.1",
- "@types/socket.io": "^2.1.2",
+ "@feathersjs/transport-commons": "^4.5.3",
+ "@types/socket.io": "^2.1.8",
"debug": "^4.1.1",
- "socket.io": "^2.2.0",
- "uberproto": "^2.0.4"
+ "socket.io": "^2.3.0",
+ "uberproto": "^2.0.6"
},
"devDependencies": {
- "@feathersjs/commons": "^4.0.0-pre.3",
- "@feathersjs/express": "^4.0.0-pre.3",
- "@feathersjs/feathers": "^4.0.0-pre.3",
- "@feathersjs/tests": "^4.0.0-pre.3",
- "feathers": "^2.2.4",
- "feathers-memory": "^3.0.2",
- "lodash": "^4.17.11",
- "mocha": "^6.1.4",
- "socket.io-client": "^2.2.0"
- },
- "gitHead": "19eb75737659e3e4b57765c1653d23c86fd2e1c3"
+ "@feathersjs/commons": "^4.5.3",
+ "@feathersjs/express": "^4.5.4",
+ "@feathersjs/feathers": "^4.5.3",
+ "@feathersjs/tests": "^4.5.3",
+ "@types/mocha": "^7.0.2",
+ "@types/mongodb": "^3.5.25",
+ "@types/node": "^14.0.22",
+ "feathers-memory": "^4.1.0",
+ "lodash": "^4.17.19",
+ "mocha": "^8.0.1",
+ "socket.io-client": "^2.3.0"
+ },
+ "gitHead": "9b9f0f13387341bdd320f1e66feda828fca2c9f2"
}
diff --git a/packages/socketio/test/index.test.js b/packages/socketio/test/index.test.js
index fcef55088f..98a4983735 100644
--- a/packages/socketio/test/index.test.js
+++ b/packages/socketio/test/index.test.js
@@ -1,7 +1,8 @@
const feathers = require('@feathersjs/feathers');
const express = require('@feathersjs/express');
const assert = require('assert');
-const _ = require('lodash');
+const omit = require('lodash/omit');
+const extend = require('lodash/extend');
const io = require('socket.io-client');
const request = require('request');
const { Service } = require('@feathersjs/tests/lib/fixture');
@@ -10,7 +11,7 @@ const methodTests = require('./methods.js');
const eventTests = require('./events');
const socketio = require('../lib');
-describe.only('@feathersjs/socketio', () => {
+describe('@feathersjs/socketio', () => {
let app;
let server;
let socket;
@@ -77,22 +78,10 @@ describe.only('@feathersjs/socketio', () => {
server.close(done);
});
- it('exports default and SOCKET_KEY', () => {
- assert.ok(socketio.SOCKET_KEY);
+ it('exports default', () => {
assert.strictEqual(socketio, socketio.default);
});
- it('throws an error when using an incompatible version of Feathers', () => {
- const oldFeathers = require('feathers');
-
- try {
- oldFeathers().configure(socketio());
- assert.ok(false, 'Should never get here');
- } catch (e) {
- assert.strictEqual(e.message, '@feathersjs/socketio is not compatible with this version of Feathers. Use the latest at @feathersjs/feathers.');
- }
- });
-
it('runs io before setup (#131)', done => {
let counter = 0;
let app = feathers().configure(socketio(() => {
@@ -161,12 +150,12 @@ describe.only('@feathersjs/socketio', () => {
};
service.create = function (data, params) {
- assert.deepStrictEqual(_.omit(params, 'query', 'route', 'connection'), socketParams, 'Passed handshake parameters');
+ assert.deepStrictEqual(omit(params, 'query', 'route', 'connection'), socketParams, 'Passed handshake parameters');
return old.create.apply(this, arguments);
};
service.update = function (id, data, params) {
- assert.deepStrictEqual(params, _.extend({
+ assert.deepStrictEqual(params, extend({
route: {},
connection: socketParams,
query: {
@@ -183,7 +172,7 @@ describe.only('@feathersjs/socketio', () => {
test: 'param'
}, error => {
assert.ok(!error);
- _.extend(service, old);
+ extend(service, old);
done();
});
});
@@ -209,13 +198,13 @@ describe.only('@feathersjs/socketio', () => {
let old = { find: service.find };
service.find = function (params) {
- assert.deepStrictEqual(_.omit(params, 'query', 'route', 'connection'), socketParams, 'Handshake parameters passed on proper position');
+ assert.deepStrictEqual(omit(params, 'query', 'route', 'connection'), socketParams, 'Handshake parameters passed on proper position');
return old.find.apply(this, arguments);
};
socket.emit('find', 'todo', error => {
assert.ok(!error);
- _.extend(service, old);
+ extend(service, old);
done();
});
});
diff --git a/packages/tests/.npmignore b/packages/tests/.npmignore
index d7819044b6..ef86d5f1e7 100644
--- a/packages/tests/.npmignore
+++ b/packages/tests/.npmignore
@@ -1,3 +1,3 @@
test/
-src/
tsconfig.json
+coverage/
diff --git a/packages/tests/CHANGELOG.md b/packages/tests/CHANGELOG.md
index 687a9356f8..8cfdbafdb2 100644
--- a/packages/tests/CHANGELOG.md
+++ b/packages/tests/CHANGELOG.md
@@ -3,6 +3,185 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+
+### Bug Fixes
+
+* Update all dependencies ([7d53a00](https://github.com/feathersjs/feathers/commit/7d53a00))
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/tests/LICENSE b/packages/tests/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/tests/LICENSE
+++ b/packages/tests/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/tests/README.md b/packages/tests/README.md
index e5a80e8b8d..05d9b3e1f8 100644
--- a/packages/tests/README.md
+++ b/packages/tests/README.md
@@ -1,6 +1,6 @@
# @feathersjs/tests
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/koa)
[](https://www.npmjs.com/package/@feathersjs/tests)
diff --git a/packages/tests/package.json b/packages/tests/package.json
index e19c72bb8c..4b4a4d6032 100644
--- a/packages/tests/package.json
+++ b/packages/tests/package.json
@@ -2,13 +2,17 @@
"name": "@feathersjs/tests",
"private": true,
"description": "Feathers core module common tests",
- "version": "4.0.0-pre.3",
+ "version": "4.5.3",
"homepage": "https://feathersjs.com",
"main": "lib/",
"keywords": [
"feathers"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -23,13 +27,13 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6"
+ "node": ">= 10"
},
"scripts": {
"prepublish": "npm run compile",
"compile": "shx rm -rf lib/ && tsc",
"test": "npm run compile && npm run mocha",
- "mocha": "mocha --opts ../../mocha.ts.opts --recursive test/**.test.ts test/**/*.test.ts"
+ "mocha": "mocha --config ../../.mocharc.ts.json --recursive test/**.test.ts test/**/*.test.ts"
},
"directories": {
"lib": "lib"
@@ -38,19 +42,19 @@
"access": "public"
},
"dependencies": {
- "axios": "^0.18.0",
- "lodash": "^4.17.11"
+ "axios": "^0.19.2",
+ "lodash": "^4.17.19"
},
"devDependencies": {
- "@feathersjs/feathers": "^4.0.0-pre.3",
+ "@feathersjs/feathers": "^4.5.3",
"@types/axios": "^0.14.0",
- "@types/debug": "^4.1.4",
- "@types/lodash": "^4.14.132",
- "@types/mocha": "^5.2.6",
- "@types/node": "^12.0.2",
- "mocha": "^6.1.4",
+ "@types/debug": "^4.1.5",
+ "@types/lodash": "^4.14.157",
+ "@types/mocha": "^7.0.2",
+ "@types/node": "^14.0.22",
+ "mocha": "^8.0.1",
"shx": "^0.3.2",
- "ts-node": "^8.2.0",
- "typescript": "^3.4.5"
+ "ts-node": "^8.10.2",
+ "typescript": "^3.9.6"
}
}
diff --git a/packages/transport-commons/.npmignore b/packages/transport-commons/.npmignore
index d7819044b6..ef86d5f1e7 100644
--- a/packages/transport-commons/.npmignore
+++ b/packages/transport-commons/.npmignore
@@ -1,3 +1,3 @@
test/
-src/
tsconfig.json
+coverage/
diff --git a/packages/transport-commons/CHANGELOG.md b/packages/transport-commons/CHANGELOG.md
index aff2110805..6663eff2eb 100644
--- a/packages/transport-commons/CHANGELOG.md
+++ b/packages/transport-commons/CHANGELOG.md
@@ -3,6 +3,204 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.5.3](https://github.com/feathersjs/feathers/compare/v4.5.2...v4.5.3) (2020-04-17)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.5.2](https://github.com/feathersjs/feathers/compare/v4.5.1...v4.5.2) (2020-03-04)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.5.1](https://github.com/feathersjs/feathers/compare/v4.5.0...v4.5.1) (2020-01-24)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+# [4.5.0](https://github.com/feathersjs/feathers/compare/v4.4.3...v4.5.0) (2020-01-18)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.4.3](https://github.com/feathersjs/feathers/compare/v4.4.1...v4.4.3) (2019-12-06)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.4.1](https://github.com/feathersjs/feathers/compare/v4.4.0...v4.4.1) (2019-11-27)
+
+
+### Bug Fixes
+
+* Gracefully handle errors in publishers ([#1710](https://github.com/feathersjs/feathers/issues/1710)) ([0616306](https://github.com/feathersjs/feathers/commit/061630696762e9dbf1dc4e738094992ba16989fc))
+
+
+
+
+
+# [4.4.0](https://github.com/feathersjs/feathers/compare/v4.3.11...v4.4.0) (2019-11-27)
+
+
+### Bug Fixes
+
+* **transport-commons:** Allow to properly chain SocketIo client.off ([#1706](https://github.com/feathersjs/feathers/issues/1706)) ([a4aecbc](https://github.com/feathersjs/feathers/commit/a4aecbcd3578c1cf4ecffb3a58fb6d26e15ee513))
+
+
+
+
+
+## [4.3.11](https://github.com/feathersjs/feathers/compare/v4.3.10...v4.3.11) (2019-11-11)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.10](https://github.com/feathersjs/feathers/compare/v4.3.9...v4.3.10) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.9](https://github.com/feathersjs/feathers/compare/v4.3.8...v4.3.9) (2019-10-26)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.7](https://github.com/feathersjs/feathers/compare/v4.3.6...v4.3.7) (2019-10-14)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.4](https://github.com/feathersjs/feathers/compare/v4.3.3...v4.3.4) (2019-10-03)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.3](https://github.com/feathersjs/feathers/compare/v4.3.2...v4.3.3) (2019-09-21)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.2](https://github.com/feathersjs/feathers/compare/v4.3.1...v4.3.2) (2019-09-16)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+## [4.3.1](https://github.com/feathersjs/feathers/compare/v4.3.0...v4.3.1) (2019-09-09)
+
+
+### Bug Fixes
+
+* Fix regression in transport commons ([#1551](https://github.com/feathersjs/feathers/issues/1551)) ([ed9e934](https://github.com/feathersjs/feathers/commit/ed9e934))
+
+
+
+
+
+# [4.3.0](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.4...v4.3.0) (2019-08-27)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+# [4.3.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.3...v4.3.0-pre.4) (2019-08-22)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+# [4.3.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.2...v4.3.0-pre.3) (2019-08-19)
+
+
+### Bug Fixes
+
+* Expire and remove authenticated real-time connections ([#1512](https://github.com/feathersjs/feathers/issues/1512)) ([2707c33](https://github.com/feathersjs/feathers/commit/2707c33))
+* Update all dependencies ([7d53a00](https://github.com/feathersjs/feathers/commit/7d53a00))
+* Use WeakMap to connect socket to connection ([#1509](https://github.com/feathersjs/feathers/issues/1509)) ([64807e3](https://github.com/feathersjs/feathers/commit/64807e3))
+
+
+
+
+
+# [4.3.0-pre.2](https://github.com/feathersjs/feathers/compare/v4.3.0-pre.1...v4.3.0-pre.2) (2019-08-02)
+
+
+### Bug Fixes
+
+* Add getEntityId to JWT strategy and fix legacy Socket authentication ([#1488](https://github.com/feathersjs/feathers/issues/1488)) ([9a3b324](https://github.com/feathersjs/feathers/commit/9a3b324))
+* Improve Params typing ([#1474](https://github.com/feathersjs/feathers/issues/1474)) ([54a3aa7](https://github.com/feathersjs/feathers/commit/54a3aa7))
+
+
+
+
+
+# [4.3.0-pre.1](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.5...v4.3.0-pre.1) (2019-07-11)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+# [4.0.0-pre.5](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.4...v4.0.0-pre.5) (2019-07-10)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
+# [4.0.0-pre.4](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.3...v4.0.0-pre.4) (2019-07-05)
+
+
+### Bug Fixes
+
+* Clean up hooks code ([#1407](https://github.com/feathersjs/feathers/issues/1407)) ([f25c88b](https://github.com/feathersjs/feathers/commit/f25c88b))
+* Improve transport-commons types ([#1396](https://github.com/feathersjs/feathers/issues/1396)) ([f9d8536](https://github.com/feathersjs/feathers/commit/f9d8536))
+
+
+
+
+
# [4.0.0-pre.3](https://github.com/feathersjs/feathers/compare/v4.0.0-pre.2...v4.0.0-pre.3) (2019-06-01)
diff --git a/packages/transport-commons/LICENSE b/packages/transport-commons/LICENSE
index 6bfc0adefc..7139cac0dd 100644
--- a/packages/transport-commons/LICENSE
+++ b/packages/transport-commons/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2018 Feathers
+Copyright (c) 2020 Feathers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/packages/transport-commons/README.md b/packages/transport-commons/README.md
index 734f3bdb98..1140df064f 100644
--- a/packages/transport-commons/README.md
+++ b/packages/transport-commons/README.md
@@ -1,17 +1,13 @@
# @feathersjs/transport-commons
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://david-dm.org/feathersjs/feathers?path=packages/transport-commons)
[](https://www.npmjs.com/package/@feathersjs/transport-commons)
> Shared functionality for Feathers API transports like `@feathers/socketio` and `@feathersjs/primus`. Only intended to be used internally.
-## About
-
-`@feathersjs/transport-commons` contains internal shared functionality for Feathers real-time providers (currently Socket.io and Primus).
-
## License
-Copyright (c) 2018
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/client/graphs/contributors)
Licensed under the [MIT license](LICENSE).
diff --git a/packages/transport-commons/package.json b/packages/transport-commons/package.json
index d56892a9bd..2178852bd3 100644
--- a/packages/transport-commons/package.json
+++ b/packages/transport-commons/package.json
@@ -1,14 +1,19 @@
{
"name": "@feathersjs/transport-commons",
"description": "Shared functionality for websocket providers",
- "version": "4.0.0-pre.3",
+ "version": "4.5.3",
"homepage": "https://feathersjs.com",
"main": "lib/",
+ "types": "lib/",
"keywords": [
"feathers",
"feathers-plugin"
],
"license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/feathers"
+ },
"repository": {
"type": "git",
"url": "git://github.com/feathersjs/feathers.git"
@@ -23,13 +28,13 @@
"url": "https://github.com/feathersjs/feathers/issues"
},
"engines": {
- "node": ">= 6"
+ "node": ">= 10"
},
"scripts": {
"prepublish": "npm run compile",
"compile": "shx rm -rf lib/ && tsc",
"test": "npm run compile && npm run mocha",
- "mocha": "mocha --opts ../../mocha.ts.opts --recursive test/**.test.ts test/**/*.test.ts"
+ "mocha": "mocha --config ../../.mocharc.ts.json --recursive test/**.test.ts test/**/*.test.ts"
},
"directories": {
"lib": "lib"
@@ -38,21 +43,21 @@
"access": "public"
},
"dependencies": {
- "@feathersjs/commons": "^4.0.0-pre.3",
- "@feathersjs/errors": "^4.0.0-pre.3",
+ "@feathersjs/commons": "^4.5.3",
+ "@feathersjs/errors": "^4.5.3",
"debug": "^4.1.1",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.19",
"radix-router": "^3.0.1"
},
"devDependencies": {
- "@feathersjs/feathers": "^4.0.0-pre.3",
- "@types/debug": "^4.1.4",
- "@types/mocha": "^5.2.6",
- "@types/node": "^12.0.2",
- "mocha": "^6.1.4",
+ "@feathersjs/feathers": "^4.5.3",
+ "@types/debug": "^4.1.5",
+ "@types/mocha": "^7.0.2",
+ "@types/node": "^14.0.22",
+ "mocha": "^8.0.1",
"shx": "^0.3.2",
- "ts-node": "^8.2.0",
- "typescript": "^3.4.5"
+ "ts-node": "^8.10.2",
+ "typescript": "^3.9.6"
},
- "gitHead": "19eb75737659e3e4b57765c1653d23c86fd2e1c3"
+ "gitHead": "9b9f0f13387341bdd320f1e66feda828fca2c9f2"
}
diff --git a/packages/transport-commons/src/channels/channel/base.ts b/packages/transport-commons/src/channels/channel/base.ts
index 8b01a5bc48..7693d3c775 100644
--- a/packages/transport-commons/src/channels/channel/base.ts
+++ b/packages/transport-commons/src/channels/channel/base.ts
@@ -1,4 +1,4 @@
-import EventEmitter from 'events';
+import { EventEmitter } from 'events';
export interface RealTimeConnection {
[key: string]: any;
diff --git a/packages/transport-commons/src/channels/index.ts b/packages/transport-commons/src/channels/index.ts
index c2cf57a4bd..2ef89d880c 100644
--- a/packages/transport-commons/src/channels/index.ts
+++ b/packages/transport-commons/src/channels/index.ts
@@ -1,6 +1,8 @@
import Debug from 'debug';
-import { compact, flattenDeep, noop } from 'lodash';
-import { Channel } from './channel/base';
+import compact from 'lodash/compact';
+import flattenDeep from 'lodash/flattenDeep';
+import noop from 'lodash/noop';
+import { Channel, RealTimeConnection } from './channel/base';
import { CombinedChannel } from './channel/combined';
import { channelMixin, publishMixin, keys, PublishMixin, Event, Publisher } from './mixins';
import { Application, Service } from '@feathersjs/feathers';
@@ -29,6 +31,10 @@ declare module '@feathersjs/feathers' {
registerPublisher
-## A REST and realtime API layer for modern applications.
+## A framework for real-time applications and REST APIs with JavaScript and TypeScript
-[](https://greenkeeper.io/)
-[](https://travis-ci.org/feathersjs/feathers)
+[](https://github.com/feathersjs/feathers/actions?query=workflow%3A%22Node.js+CI%22)
[](https://codeclimate.com/github/feathersjs/feathers/maintainability)
[](https://codeclimate.com/github/feathersjs/feathers/test_coverage)
[](https://www.npmjs.com/package/@feathersjs/feathers)
@@ -11,9 +10,23 @@
[](http://slack.feathersjs.com)
[](https://t.me/featherjs)
-[](https://saucelabs.com/u/feathersjs)
+Feathers is a lightweight web-framework for creating real-time applications and REST APIs using JavaScript or TypeScript.
-Feathers is a real-time, micro-service web framework for NodeJS that gives you control over your data via RESTful resources, sockets and flexible plug-ins.
+Feathers can interact with any backend technology, supports over a dozen databases and works with any frontend technology like React, VueJS, Angular, React Native, Android or iOS.
+
+## Getting started
+
+You can build your first real-time and REST API in just 4 commands:
+
+```bash
+$ npm install -g @feathersjs/cli
+$ mkdir my-new-app
+$ cd my-new-app/
+$ feathers generate app
+$ npm start
+```
+
+To learn more about Feathers visit the website at [feathersjs.com](http://feathersjs.com) or jump right into [the Feathers guides](http://docs.feathersjs.com/guides).
## Support
@@ -87,82 +100,12 @@ Support us with a monthly donation and help us continue our activities. [[Become
-## Getting started
-
-You can build your first real-time and REST API in just 4 commands:
-
-```bash
-$ npm install -g @feathersjs/cli
-$ mkdir my-new-app
-$ cd my-new-app/
-$ feathers generate app
-$ npm start
-```
-
-To learn more about Feathers visit the website at [feathersjs.com](http://feathersjs.com) or jump right into [the Feathers docs](http://docs.feathersjs.com).
-
-## See it in action
-
-Here is all the code you need to create a RESTful, real-time message API that uses an in-memory data store:
-
-```js
-const feathers = require('@feathersjs/feathers');
-const express = require('@feathersjs/express');
-const socketio = require('@feathersjs/socketio');
-
-const memory = require('feathers-memory');
-
-// Creates an Express compatible Feathers application
-const app = express(feathers());
-
-// Parse HTTP JSON bodies
-app.use(express.json());
-// Parse URL-encoded params
-app.use(express.urlencoded({ extended: true }));
-// Add REST API support
-app.configure(express.rest());
-// Configure Socket.io real-time APIs
-app.configure(socketio());
-// Register a messages service with pagination
-app.use('/messages', memory({
- paginate: {
- default: 10,
- max: 25
- }
-}));
-// Register a nicer error handler than the default Express one
-app.use(express.errorHandler());
-
-// Add any new real-time connection to the `everybody` channel
-app.on('connection', connection => app.channel('everybody').join(connection));
-// Publish all events to the `everybody` channel
-app.registerPublisher(data => app.channel('everybody'));
-
-// Start the server
-app.listen(3030).on('listening', () =>
- console.log('Feathers server listening on localhost:3030')
-);
-```
-
-Then run
-
-```
-npm install @feathersjs/feathers @feathersjs/socketio @feathersjs/express feathers-memory
-node app
-```
-
-and go to [http://localhost:3030/messages](http://localhost:3030/messages). That's it! There's a lot more you can do with Feathers including; using a real database, authentication, authorization, clustering and more! Head on over to [the Feathers docs](http://docs.feathersjs.com) to see just how easy it is to build scalable real-time apps.
-
## Documentation
The [Feathers docs](http://docs.feathersjs.com) are loaded with awesome stuff and tell you every thing you need to know about using and configuring Feathers.
-## Security
-
-We :heart: the community and take security very seriously. No one wants their app hacked. If you have come across a security concern please [report it responsibly](https://docs.feathersjs.com/security#where-should-i-report-security-issues). Visit the [Security section](https://docs.feathersjs.com/SECURITY.html) of the docs to learn more about how you can make sure your app is secure.
-
## License
-Copyright (c) 2018 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+Copyright (c) 2019 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
Licensed under the [MIT license](LICENSE).