Add compatibility for v5 and update dependencies (#167)

lib/adapters/redis.js

@@ -13,7 +13,7 @@ module.exports = config => {
     if (!redisClient && typeof db !== 'undefined') {
       debug(`Setting up Redis client for db: ${db}`);
     }
-    
+
     const pub = redisClient || redis.createClient(db, config.redisOptions);
     const sub = pub.duplicate();
 

lib/core.js

@@ -1,7 +1,17 @@
 const debug = require('debug')('feathers-sync');
-const { hooks, _ } = require('@feathersjs/commons');
+const feathers = require('@feathersjs/feathers');
+const { _ } = require('@feathersjs/commons');
 const SYNC = Symbol('feathers-sync/enabled');
 
+const defaultEvents = ['created', 'updated', 'removed', 'patched'];
+const getServiceOptions = service => {
+  if (typeof feathers.getServiceOptions === 'function') {
+    return feathers.getServiceOptions(service);
+  }
+
+  return {};
+};
+
 module.exports = app => {
   if (app[SYNC]) {
     return;
@@ -30,17 +40,20 @@ module.exports = app => {
 
   app.mixins.push((service, path) => {
     if (typeof service._emit !== 'function') {
+      const { events: customEvents = service.events } = getServiceOptions(service);
+      const events = defaultEvents.concat(customEvents);
+
       service._emit = service.emit;
       service.emit = function (event, data, ctx) {
         const disabled = ctx && ctx[SYNC] === false;
 
-        if (!service._serviceEvents.includes(event) || disabled) {
+        if (!events.includes(event) || disabled) {
           debug(`Passing through non-service event '${path} ${event}'`);
           return this._emit(event, data, ctx);
         }
 
-        const context = hooks.isHookObject(ctx)
-          ? _.omit(ctx, 'app', 'service')
+        const context = ctx && (ctx.app === app || ctx.service === service)
+          ? _.omit(ctx, 'app', 'service', 'self')
           : ctx;
 
         debug(`Sending sync-out event '${path} ${event}'`);

package.json

@@ -44,26 +44,27 @@
     "src": "src"
   },
   "dependencies": {
-    "amqp-connection-manager": "^3.2.1",
-    "amqplib": "^0.6.0",
+    "amqp-connection-manager": "^3.2.2",
+    "amqplib": "^0.8.0",
     "debug": "^4.3.1",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "nats": "^1.4.12",
-    "redis": "^3.0.2"
+    "redis": "^3.1.2"
   },
   "devDependencies": {
-    "@feathersjs/feathers": "^4.5.11",
+    "@feathersjs/feathers": "^5.0.0-pre.5",
     "@semantic-release/commit-analyzer": "^8.0.1",
-    "@semantic-release/npm": "^7.0.10",
-    "@semantic-release/release-notes-generator": "^9.0.1",
-    "@types/node": "^14.14.22",
-    "bson": "^4.2.2",
-    "dtslint": "^4.0.6",
-    "mocha": "^8.2.1",
+    "@semantic-release/npm": "^7.1.3",
+    "@semantic-release/release-notes-generator": "^9.0.3",
+    "@types/node": "^15.12.5",
+    "bson": "^4.4.0",
+    "dtslint": "^4.1.0",
+    "mocha": "^9.0.1",
+    "npm-check-updates": "^11.7.1",
     "nyc": "^15.1.0",
-    "semantic-release": "^17.3.7",
-    "semistandard": "^16.0.0",
-    "typescript": "^4.1.3"
+    "semantic-release": "^17.4.4",
+    "semistandard": "^16.0.1",
+    "typescript": "^4.3.4"
   },
   "mocha": {
     "timeout": 30000,

test/adapters/amqp.test.js

@@ -14,7 +14,7 @@ describe('feathers-sync AMQP tests', () => {
   before(async () => {
     app1 = createApp();
     await app1.sync.ready;
-    
+
     app2 = createApp();
     await app2.sync.ready;
 
@@ -36,7 +36,7 @@ describe('feathers-sync AMQP tests', () => {
         assert.ok(context);
         assert.deepStrictEqual(context.result, data);
         assert.strictEqual(context.method, 'create');
-        assert.strictEqual(context.type, 'after');
+        assert.strictEqual(context.type, null);
         assert.strictEqual(context.service, app.service('todo'));
         assert.strictEqual(context.app, app);
 

test/adapters/nats.test.js

@@ -12,7 +12,7 @@ describe('feathers-sync NATS tests', () => {
   before(async () => {
     app1 = createApp();
     await app1.sync.ready;
-    
+
     app2 = createApp();
     await app2.sync.ready;
 
@@ -34,7 +34,7 @@ describe('feathers-sync NATS tests', () => {
         assert.ok(context);
         assert.deepStrictEqual(context.result, data);
         assert.strictEqual(context.method, 'create');
-        assert.strictEqual(context.type, 'after');
+        assert.strictEqual(context.type, null);
         assert.strictEqual(context.service, app.service('todo'));
         assert.strictEqual(context.app, app);
 

test/adapters/redis.test.js

@@ -34,7 +34,7 @@ describe('feathers-sync Redis tests', () => {
         assert.ok(context);
         assert.deepStrictEqual(context.result, data);
         assert.strictEqual(context.method, 'create');
-        assert.strictEqual(context.type, 'after');
+        assert.strictEqual(context.type, null);
         assert.strictEqual(context.service, app.service('todo'));
         assert.strictEqual(context.app, app);
 

test/core.test.js

@@ -31,11 +31,12 @@ describe('feathers-sync core tests', () => {
           path: 'todo',
           data: message,
           context: {
-            arguments: [message],
+            arguments: [message, {}],
             data: message,
             params: {},
-            type: 'after',
+            type: null,
             method: 'create',
+            event: 'created',
             path: 'todo',
             result: message
           }
@@ -126,10 +127,14 @@ describe('feathers-sync core tests', () => {
     });
   });
 
-  it('sync-in does nothing for invalid event (path)', () => {
-    app.emit('sync-in', {
-      event: 'something',
-      path: 'todos'
-    });
+  it('sync-in fails for invalid event (path)', () => {
+    try {
+      app.emit('sync-in', {
+        event: 'something',
+        path: 'todos'
+      });
+    } catch (error) {
+      assert.strictEqual(error.message, 'Can not find service \'todos\'');
+    }
   });
 });

types/index.d.ts

@@ -1,6 +1,6 @@
 import { Application } from "@feathersjs/feathers";
 
-// TypeScript Version: 3.0
+// TypeScript Version: 4.0
 export interface SyncOptions {
   key?: string;
   uri: string;

types/index.test.ts

@@ -1,4 +1,4 @@
-import feathers from '@feathersjs/feathers';
+import { feathers } from '@feathersjs/feathers';
 import sync, { redis } from 'feathers-sync';
 
 const app = feathers();