@feathersjs/transport-commons 5.0.0-pre.1 → 5.0.0-pre.15

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAIzB,uFAJA,eAAM,OAIA;AAHf,uCAAoC;AAGnB,wFAHR,iBAAO,OAGQ;AAFxB,yCAAsC;AAEZ,yFAFjB,mBAAQ,OAEiB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkC;AAKzB,uFALA,eAAM,OAKA;AAJf,uCAAoC;AAInB,wFAJR,iBAAO,OAIQ;AAHxB,yCAAsC;AAGZ,yFAHjB,mBAAQ,OAGiB;AADlC,+CAA+B"}

package/lib/routing/index.d.ts

@@ -0,0 +1,21 @@
+import { Application } from '@feathersjs/feathers';
+import { Router } from './router';
+declare module '@feathersjs/feathers/lib/declarations' {
+    interface RouteLookup {
+        service: Service;
+        params: {
+            [key: string]: any;
+        };
+    }
+    interface Application<Services, Settings> {
+        routes: Router<{
+            service: Service;
+            params?: {
+                [key: string]: any;
+            };
+        }>;
+        lookup(path: string): RouteLookup;
+    }
+}
+export * from './router';
+export declare const routing: () => (app: Application) => void;

package/lib/routing/index.js

@@ -0,0 +1,39 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.routing = void 0;
+const router_1 = require("./router");
+__exportStar(require("./router"), exports);
+const lookup = function (path) {
+    const result = this.routes.lookup(path);
+    if (result === null) {
+        return null;
+    }
+    const { params: colonParams, data: { service, params: dataParams } } = result;
+    const params = dataParams ? { ...dataParams, ...colonParams } : colonParams;
+    return { service, params };
+};
+const routing = () => (app) => {
+    if (typeof app.lookup === 'function') {
+        return;
+    }
+    app.routes = new router_1.Router();
+    app.lookup = lookup;
+    // Add a mixin that registers a service on the router
+    app.mixins.push((service, path, options) => {
+        const { routeParams: params = {} } = options;
+        app.routes.insert(path, { service, params });
+        app.routes.insert(`${path}/:__id`, { service, params });
+    });
+};
+exports.routing = routing;
+//# sourceMappingURL=index.js.map

package/lib/routing/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,qCAAkC;AAiBlC,2CAAyB;AAEzB,MAAM,MAAM,GAAG,UAA6B,IAAY;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,MAAM,CAAC;IAE9E,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAE5E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,GAAgB,EAAE,EAAE;IAChD,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE;QACpC,OAAO;KACR;IAED,GAAG,CAAC,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAC1B,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;IAEpB,qDAAqD;IACrD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAgB,EAAE,IAAY,EAAE,OAAuB,EAAE,EAAE;QAC1E,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;QAE7C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,OAAO,WAelB"}

package/lib/routing/router.d.ts

@@ -0,0 +1,27 @@
+export interface LookupData {
+    params: {
+        [key: string]: string;
+    };
+}
+export interface LookupResult<T> extends LookupData {
+    data?: T;
+}
+export declare class RouteNode<T = any> {
+    name: string;
+    depth: number;
+    data?: T;
+    children: {
+        [key: string]: RouteNode;
+    };
+    placeholders: RouteNode[];
+    constructor(name: string, depth: number);
+    insert(path: string[], data: T): RouteNode<T>;
+    lookup(path: string[], info: LookupData): LookupResult<T> | null;
+}
+export declare class Router<T = any> {
+    root: RouteNode<T>;
+    constructor(root?: RouteNode<T>);
+    getPath(path: string): string[];
+    insert(path: string, data: T): RouteNode<T>;
+    lookup(path: string): LookupResult<T>;
+}

package/lib/routing/router.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Router = exports.RouteNode = void 0;
+const commons_1 = require("@feathersjs/commons");
+class RouteNode {
+    constructor(name, depth) {
+        this.name = name;
+        this.depth = depth;
+        this.children = {};
+        this.placeholders = [];
+    }
+    insert(path, data) {
+        if (this.depth === path.length) {
+            if (this.data !== undefined) {
+                throw new Error(`Path ${path.join('/')} already exists`);
+            }
+            this.data = data;
+            return this;
+        }
+        const current = path[this.depth];
+        const nextDepth = this.depth + 1;
+        if (current.startsWith(':')) {
+            // Insert a placeholder node like /messages/:id
+            const placeholderName = current.substring(1);
+            let placeholder = this.placeholders.find(p => p.name === placeholderName);
+            if (!placeholder) {
+                placeholder = new RouteNode(placeholderName, nextDepth);
+                this.placeholders.push(placeholder);
+            }
+            return placeholder.insert(path, data);
+        }
+        const child = this.children[current] || new RouteNode(current, nextDepth);
+        this.children[current] = child;
+        return child.insert(path, data);
+    }
+    lookup(path, info) {
+        if (path.length === this.depth) {
+            return this.data === undefined ? null : {
+                ...info,
+                data: this.data
+            };
+        }
+        const current = path[this.depth];
+        const child = this.children[current];
+        if (child) {
+            return child.lookup(path, info);
+        }
+        // This will return the first placeholder that matches early
+        for (const placeholder of this.placeholders) {
+            const result = placeholder.lookup(path, info);
+            if (result !== null) {
+                result.params[placeholder.name] = current;
+                return result;
+            }
+        }
+        return null;
+    }
+}
+exports.RouteNode = RouteNode;
+class Router {
+    constructor(root = new RouteNode('', 0)) {
+        this.root = root;
+    }
+    getPath(path) {
+        return (0, commons_1.stripSlashes)(path).split('/');
+    }
+    insert(path, data) {
+        return this.root.insert(this.getPath(path), data);
+    }
+    lookup(path) {
+        if (typeof path !== 'string') {
+            return null;
+        }
+        return this.root.lookup(this.getPath(path), { params: {} });
+    }
+}
+exports.Router = Router;
+//# sourceMappingURL=router.js.map

package/lib/routing/router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/routing/router.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAUnD,MAAa,SAAS;IAKpB,YAAoB,IAAY,EAAS,KAAa;QAAlC,SAAI,GAAJ,IAAI,CAAQ;QAAS,UAAK,GAAL,KAAK,CAAQ;QAHtD,aAAQ,GAAiC,EAAE,CAAC;QAC5C,iBAAY,GAAgB,EAAE,CAAC;IAE0B,CAAC;IAE1D,MAAM,CAAE,IAAc,EAAE,IAAO;QAC7B,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,MAAM,EAAE;YAC9B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;aAC1D;YAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACjB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QAEjC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC3B,+CAA+C;YAC/C,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7C,IAAI,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;YAE1E,IAAI,CAAC,WAAW,EAAE;gBAChB,WAAW,GAAG,IAAI,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;gBACxD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACrC;YAED,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACvC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE1E,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QAE/B,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAE,IAAc,EAAE,IAAgB;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,EAAE;YAC9B,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtC,GAAG,IAAI;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAA;SACF;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAErC,IAAI,KAAK,EAAE;YACT,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACjC;QAED,4DAA4D;QAC5D,KAAI,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE;YAC1C,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAE9C,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;gBAC1C,OAAO,MAAM,CAAC;aACf;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAnED,8BAmEC;AAED,MAAa,MAAM;IACjB,YAAoB,OAAqB,IAAI,SAAS,CAAI,EAAE,EAAE,CAAC,CAAC;QAA5C,SAAI,GAAJ,IAAI,CAAwC;IAAG,CAAC;IAEpE,OAAO,CAAE,IAAY;QACnB,OAAO,IAAA,sBAAY,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAE,IAAY,EAAE,IAAO;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAE,IAAY;QAClB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;CACF;AAlBD,wBAkBC"}

package/lib/socket/index.js

@@ -1,14 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.socket = void 0;
-const debug_1 = __importDefault(require("debug"));
+const feathers_1 = require("@feathersjs/feathers");
+const commons_1 = require("@feathersjs/commons");
 const channels_1 = require("../channels");
 const routing_1 = require("../routing");
 const utils_1 = require("./utils");
-const debug = debug_1.default('@feathersjs/transport-commons');
+const debug = (0, commons_1.createDebug)('@feathersjs/transport-commons');
 function socket({ done, emit, socketMap, socketKey, getParams }) {
     return (app) => {
         const leaveChannels = (connection) => {
@@ -17,9 +15,9 @@ function socket({ done, emit, socketMap, socketKey, getParams }) {
                 app.channel(app.channels).leave(connection);
             }
         };
-        app.configure(channels_1.channels());
-        app.configure(routing_1.routing());
-        app.on('publish', utils_1.getDispatcher(emit, socketMap, socketKey));
+        app.configure((0, channels_1.channels)());
+        app.configure((0, routing_1.routing)());
+        app.on('publish', (0, utils_1.getDispatcher)(emit, socketMap, socketKey));
         app.on('disconnect', leaveChannels);
         app.on('logout', (_authResult, params) => {
             const { connection } = params;
@@ -31,25 +29,20 @@ function socket({ done, emit, socketMap, socketKey, getParams }) {
         done.then(provider => provider.on('connection', (connection) => app.emit('connection', getParams(connection))));
         // `socket.emit('methodName', 'serviceName', ...args)` handlers
         done.then(provider => provider.on('connection', (connection) => {
-            for (const method of app.methods) {
-                connection.on(method, (...args) => {
-                    const path = args.shift();
-                    debug(`Got '${method}' call for service '${path}'`);
-                    utils_1.runMethod(app, getParams(connection), path, method, args);
+            const methodHandlers = Object.keys(app.services).reduce((result, name) => {
+                const { methods } = (0, feathers_1.getServiceOptions)(app.service(name));
+                methods.forEach(method => {
+                    if (!result[method]) {
+                        result[method] = (...args) => {
+                            const path = args.shift();
+                            debug(`Got '${method}' call for service '${path}'`);
+                            (0, utils_1.runMethod)(app, getParams(connection), path, method, args);
+                        };
+                    }
                 });
-            }
-            connection.on('authenticate', (...args) => {
-                if (app.get('defaultAuthentication')) {
-                    debug('Got legacy authenticate event');
-                    utils_1.runMethod(app, getParams(connection), app.get('defaultAuthentication'), 'create', args);
-                }
-            });
-            connection.on('logout', (callback) => {
-                if (app.get('defaultAuthentication')) {
-                    debug('Got legacy authenticate event');
-                    utils_1.runMethod(app, getParams(connection), app.get('defaultAuthentication'), 'remove', [null, {}, callback]);
-                }
-            });
+                return result;
+            }, {});
+            Object.keys(methodHandlers).forEach(key => connection.on(key, methodHandlers[key]));
         }));
     };
 }

package/lib/socket/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":";;;AAAA,mDAA8E;AAC9E,iDAAkD;AAClD,0CAAuC;AACvC,wCAAqC;AACrC,mCAAmD;AAGnD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,+BAA+B,CAAC,CAAC;AAU3D,SAAgB,MAAM,CAAE,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAiB;IACpF,OAAO,CAAC,GAAgB,EAAE,EAAE;QAC1B,MAAM,aAAa,GAAG,CAAC,UAA8B,EAAE,EAAE;YACvD,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;YAEzB,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;aAC7C;QACH,CAAC,CAAC;QAEF,GAAG,CAAC,SAAS,CAAC,IAAA,mBAAQ,GAAE,CAAC,CAAC;QAC1B,GAAG,CAAC,SAAS,CAAC,IAAA,iBAAO,GAAE,CAAC,CAAC;QAEzB,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,IAAA,qBAAa,EAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAC7D,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACpC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,WAAgB,EAAE,MAAc,EAAE,EAAE;YACpD,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;YAE9B,IAAI,UAAU,EAAE;gBACd,aAAa,CAAC,UAAU,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QAEH,qBAAqB;QACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAe,EAAE,EAAE,CAClE,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAC/C,CAAC;QAEF,+DAA+D;QAC/D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAe,EAAE,EAAE;YAClE,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACvE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,4BAAiB,EAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAEzD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;wBACnB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;4BAClC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;4BAE1B,KAAK,CAAC,QAAQ,MAAM,uBAAuB,IAAI,GAAG,CAAC,CAAC;4BACpD,IAAA,iBAAS,EAAC,GAAG,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;wBAC5D,CAAC,CAAA;qBACF;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,MAAM,CAAC;YAChB,CAAC,EAAE,EAAS,CAAC,CAAC;YAEd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CACxC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC;IACN,CAAC,CAAC;AACJ,CAAC;AApDD,wBAoDC"}

package/lib/socket/utils.d.ts

@@ -1,9 +1,10 @@
 import { HookContext, Application } from '@feathersjs/feathers';
 import { CombinedChannel } from '../channels/channel/combined';
 import { RealTimeConnection } from '../channels/channel/base';
+export declare const DEFAULT_PARAMS_POSITION = 1;
 export declare const paramsPositions: {
     [key: string]: number;
 };
 export declare function normalizeError(e: any): any;
 export declare function getDispatcher(emit: string, socketMap: WeakMap<RealTimeConnection, any>, socketKey?: any): (event: string, channel: CombinedChannel, context: HookContext, data?: any) => void;
-export declare function runMethod(app: Application, connection: RealTimeConnection, path: string, method: string, args: any[]): void;
+export declare function runMethod(app: Application, connection: RealTimeConnection, path: string, method: string, args: any[]): Promise<void>;

package/lib/socket/utils.js

@@ -3,16 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runMethod = exports.getDispatcher = exports.normalizeError = exports.paramsPositions = void 0;
-const debug_1 = __importDefault(require("debug"));
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
+exports.runMethod = exports.getDispatcher = exports.normalizeError = exports.paramsPositions = exports.DEFAULT_PARAMS_POSITION = void 0;
+const feathers_1 = require("@feathersjs/feathers");
 const errors_1 = require("@feathersjs/errors");
-const debug = debug_1.default('@feathersjs/transport-commons');
+const commons_1 = require("@feathersjs/commons");
+const isEqual_1 = __importDefault(require("lodash/isEqual"));
+const debug = (0, commons_1.createDebug)('@feathersjs/transport-commons');
+exports.DEFAULT_PARAMS_POSITION = 1;
 exports.paramsPositions = {
     find: 0,
-    get: 1,
-    remove: 1,
-    create: 1,
     update: 2,
     patch: 2
 };
@@ -43,7 +42,7 @@ function getDispatcher(emit, socketMap, socketKey) {
                 // If we are getting events from an array but try to dispatch individual data
                 // try to get the individual item to dispatch from the correct index.
                 if (!Array.isArray(data) && Array.isArray(context.result) && Array.isArray(result)) {
-                    result = context.result.find(resultData => isEqual_1.default(resultData, data));
+                    result = context.result.find(resultData => (0, isEqual_1.default)(resultData, data));
                 }
                 debug(`Dispatching '${eventName}' to Socket ${socket.id} with`, result);
                 socket[emit](eventName, result);
@@ -52,7 +51,7 @@ function getDispatcher(emit, socketMap, socketKey) {
     };
 }
 exports.getDispatcher = getDispatcher;
-function runMethod(app, connection, path, method, args) {
+async function runMethod(app, connection, path, method, args) {
     const trace = `method '${method}' on service '${path}'`;
     const methodArgs = args.slice(0);
     const callback = typeof methodArgs[methodArgs.length - 1] === 'function'
@@ -62,36 +61,32 @@ function runMethod(app, connection, path, method, args) {
         debug(`Error in ${trace}`, error);
         callback(normalizeError(error));
     };
-    // A wrapper function that runs the method and returns a promise
-    const _run = () => {
+    try {
         const lookup = app.lookup(path);
-        // No valid service was found, return a 404
-        // just like a REST route would
+        // No valid service was found throw a NotFound error
         if (lookup === null) {
-            return Promise.reject(new errors_1.NotFound(`Service '${path}' not found`));
+            throw new errors_1.NotFound(`Service '${path}' not found`);
         }
         const { service, params: route = {} } = lookup;
+        const { methods } = (0, feathers_1.getServiceOptions)(service);
         // Only service methods are allowed
-        // @ts-ignore
-        if (exports.paramsPositions[method] === undefined || typeof service[method] !== 'function') {
-            return Promise.reject(new errors_1.MethodNotAllowed(`Method '${method}' not allowed on service '${path}'`));
+        if (!methods.includes(method)) {
+            throw new errors_1.MethodNotAllowed(`Method '${method}' not allowed on service '${path}'`);
         }
-        const position = exports.paramsPositions[method];
+        const position = exports.paramsPositions[method] !== undefined ? exports.paramsPositions[method] : exports.DEFAULT_PARAMS_POSITION;
         const query = methodArgs[position] || {};
-        // `params` have to be re-mapped to the query
-        // and added with the route
+        // `params` have to be re-mapped to the query and added with the route
         const params = Object.assign({ query, route, connection }, connection);
+        // `params` is always the last parameter. Error if we got more arguments.
+        if (methodArgs.length > (position + 1)) {
+            throw new errors_1.BadRequest(`Too many arguments for '${method}' method`);
+        }
         methodArgs[position] = params;
-        // @ts-ignore
-        return service[method](...methodArgs, true);
-    };
-    try {
-        // Run and map to the callback that is being called for Socket calls
-        _run().then((hook) => {
-            const result = hook.dispatch || hook.result;
-            debug(`Returned successfully ${trace}`, result);
-            callback(null, result);
-        }).catch((hook) => handleError(hook.type === 'error' ? hook.error : hook));
+        const ctx = (0, feathers_1.createContext)(service, method);
+        const returnedCtx = await service[method](...methodArgs, ctx);
+        const result = returnedCtx.dispatch || returnedCtx.result;
+        debug(`Returned successfully ${trace}`, result);
+        callback(null, result);
     }
     catch (error) {
         handleError(error);

package/lib/socket/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/socket/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/socket/utils.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAkG;AAClG,+CAA4E;AAC5E,iDAAkD;AAClD,6DAAqC;AAIrC,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,+BAA+B,CAAC,CAAC;AAE9C,QAAA,uBAAuB,GAAG,CAAC,CAAC;AAE5B,QAAA,eAAe,GAA8B;IACxD,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,SAAgB,cAAc,CAAE,CAAM;IACpC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC;IACjD,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3C,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC1C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACzC,OAAO,MAAM,CAAC,KAAK,CAAC;KACrB;IAED,OAAO,MAAM,CAAC,IAAI,CAAC;IAEnB,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,wCAiBC;AAED,SAAgB,aAAa,CAAE,IAAY,EAAE,SAA2C,EAAE,SAAe;IACvG,OAAO,UAAU,KAAa,EAAE,OAAwB,EAAE,OAAoB,EAAE,IAAU;QACxF,KAAK,CAAC,gBAAgB,KAAK,QAAQ,OAAO,CAAC,MAAM,cAAc,CAAC,CAAC;QAEjE,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvC,oEAAoE;YACpE,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAE7E,IAAI,MAAM,EAAE;gBACV,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;gBAE1D,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;gBAE/E,6EAA6E;gBAC7E,qEAAqE;gBACrE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBAClF,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,IAAA,iBAAO,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;iBACvE;gBAED,KAAK,CAAC,gBAAgB,SAAS,eAAe,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBAExE,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAzBD,sCAyBC;AAEM,KAAK,UAAU,SAAS,CAAE,GAAgB,EAAE,UAA8B,EAAE,IAAY,EAAE,MAAc,EAAE,IAAW;IAC1H,MAAM,KAAK,GAAG,WAAW,MAAM,iBAAiB,IAAI,GAAG,CAAC;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,UAAU;QACtE,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,cAAa,CAAC,CAAC;IAEtC,KAAK,CAAC,WAAW,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAE5C,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE;QACjC,KAAK,CAAC,YAAY,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAClC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC;IAEF,IAAI;QACF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEhC,oDAAoD;QACpD,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,MAAM,IAAI,iBAAQ,CAAC,YAAY,IAAI,aAAa,CAAC,CAAC;SACnD;QAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;QAC/C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC;QAE/C,mCAAmC;QACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC7B,MAAM,IAAI,yBAAgB,CAAC,WAAW,MAAM,6BAA6B,IAAI,GAAG,CAAC,CAAC;SACnF;QAED,MAAM,QAAQ,GAAG,uBAAe,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,+BAAuB,CAAC;QAC3G,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzC,sEAAsE;QACtE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,UAAU,CAAC,CAAC;QAEvE,yEAAyE;QACzE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,EAAE;YACtC,MAAM,IAAI,mBAAU,CAAC,2BAA2B,MAAM,UAAU,CAAC,CAAC;SACnE;QAED,UAAU,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAA,wBAAa,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAgB,MAAO,OAAe,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,CAAC;QACpF,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,CAAC;QAE1D,KAAK,CAAC,yBAAyB,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACxB;IAAC,OAAO,KAAU,EAAE;QACnB,WAAW,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC;AAlDD,8BAkDC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/transport-commons",
   "description": "Shared functionality for websocket providers",
-  "version": "5.0.0-pre.1",
+  "version": "5.0.0-pre.15",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -28,7 +28,7 @@
     "url": "https://github.com/feathersjs/feathers/issues"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 12"
   },
   "scripts": {
     "prepublish": "npm run compile",
@@ -52,21 +52,19 @@
     "*.js"
   ],
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.1",
-    "@feathersjs/errors": "^5.0.0-pre.1",
-    "debug": "^4.3.1",
-    "lodash": "^4.17.20",
-    "radix-router": "^3.0.1"
+    "@feathersjs/commons": "^5.0.0-pre.15",
+    "@feathersjs/errors": "^5.0.0-pre.15",
+    "@feathersjs/feathers": "^5.0.0-pre.15",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/feathers": "^5.0.0-pre.1",
-    "@types/debug": "^4.1.5",
-    "@types/mocha": "^8.0.4",
-    "@types/node": "^14.14.10",
-    "mocha": "^8.2.1",
+    "@types/lodash": "^4.14.176",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^16.11.6",
+    "mocha": "^9.1.3",
     "shx": "^0.3.3",
-    "ts-node": "^9.1.0",
-    "typescript": "^4.1.2"
+    "ts-node": "^10.4.0",
+    "typescript": "^4.4.4"
   },
-  "gitHead": "3756506935c520fc50d4be416ff649c2158afdac"
+  "gitHead": "8008bf4f8529a2a40b6a2f976c1f43ae13675693"
 }

package/src/channels/channel/base.ts

@@ -43,7 +43,7 @@ export class Channel extends EventEmitter {
 
   join (...connections: RealTimeConnection[]) {
     connections.forEach(connection => {
-      if (this.connections.indexOf(connection) === -1) {
+      if (connection && this.connections.indexOf(connection) === -1) {
         this.connections.push(connection);
       }
     });

package/src/channels/channel/combined.ts

@@ -48,8 +48,7 @@ export class CombinedChannel extends Channel {
   }
 
   private callChildren (method: string, connections: RealTimeConnection[]) {
-    // @ts-ignore
-    this.children.forEach(child => child[method](...connections));
+    this.children.forEach((child: any) => child[method](...connections));
     this.refresh();
 
     return this;

package/src/channels/index.ts

@@ -1,33 +1,34 @@
-import Debug from 'debug';
+import { Application, FeathersService, getServiceOptions } from '@feathersjs/feathers';
+import { createDebug } from '@feathersjs/commons';
 import { compact, flattenDeep, noop } from 'lodash';
 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';
+import EventEmitter from 'events';
 
-const debug = Debug('@feathersjs/transport-commons/channels');
+const debug = createDebug('@feathersjs/transport-commons/channels');
 const { CHANNELS } = keys;
 
 declare module '@feathersjs/feathers/lib/declarations' {
-  interface ServiceAddons<T> {
-    publish (publisher: Publisher<T>): this;
-    publish (event: Event, publisher: Publisher<T>): this;
+  interface ServiceAddons<A, S> extends EventEmitter { // eslint-disable-line
+    publish (publisher: Publisher<ServiceGenericType<S>, A, this>): this;
+    publish (event: Event, publisher: Publisher<ServiceGenericType<S>, A, this>): this;
 
-    registerPublisher (publisher: Publisher<T>): this;
-    registerPublisher (event: Event, publisher: Publisher<T>): this;
+    registerPublisher (publisher: Publisher<ServiceGenericType<S>, A, this>): this;
+    registerPublisher (event: Event, publisher: Publisher<ServiceGenericType<S>, A, this>): this;
   }
 
-  interface Application<ServiceTypes = {}> { // eslint-disable-line
+  interface Application<Services, Settings> { // eslint-disable-line
     channels: string[];
 
-    channel (name: string[]): Channel;
+    channel (name: string | string[]): Channel;
     channel (...names: string[]): Channel;
 
-    publish<T> (publisher: Publisher<T>): this;
-    publish<T> (event: Event, publisher: Publisher<T>): this;
+    publish<T> (publisher: Publisher<T, this>): this;
+    publish<T> (event: Event, publisher: Publisher<T, this>): this;
 
-    registerPublisher<T> (publisher: Publisher<T>): this;
-    registerPublisher<T> (event: Event, publisher: Publisher<T>): this;
+    registerPublisher<T> (publisher: Publisher<T, this>): this;
+    registerPublisher<T> (event: Event, publisher: Publisher<T, this>): this;
   }
 
   interface Params {
@@ -50,15 +51,16 @@ export function channels () {
       }
     });
 
-    app.mixins.push((service: Service<any>, path: string) => {
-      if (typeof service.publish === 'function' || !service._serviceEvents) {
+    app.mixins.push((service: FeathersService, path: string) => {
+      const { serviceEvents } = getServiceOptions(service);
+
+      if (typeof service.publish === 'function') {
         return;
       }
 
       Object.assign(service, publishMixin());
 
-      // @ts-ignore
-      service._serviceEvents.forEach((event: string) => {
+      serviceEvents.forEach((event: string) => {
         service.on(event, function (data, hook) {
           if (!hook) {
             // Fake hook for custom events
@@ -100,7 +102,7 @@ export function channels () {
                 debug('No connections to publish to');
               }
             }).catch(logError);
-          } catch (error) {
+          } catch (error: any) {
             logError(error);
           }
         });

package/src/channels/mixins.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
-import Debug from 'debug';
+import { Application, HookContext, getServiceOptions } from '@feathersjs/feathers';
+import { createDebug } from '@feathersjs/commons';
 import { Channel } from './channel/base';
 import { CombinedChannel } from './channel/combined';
-import { HookContext } from '@feathersjs/feathers';
 
-const debug = Debug('@feathersjs/transport-commons:channels/mixins');
+const debug = createDebug('@feathersjs/transport-commons:channels/mixins');
 const PUBLISHERS = Symbol('@feathersjs/transport-commons/publishers');
 const CHANNELS = Symbol('@feathersjs/transport-commons/channels');
 const ALL_EVENTS = Symbol('@feathersjs/transport-commons/all-events');
@@ -63,7 +63,7 @@ export function channelMixin () {
 
 export type Event = string|(typeof ALL_EVENTS);
 
-export type Publisher<T = any> = (data: T, context: HookContext<T>) => Channel | Channel[] | void | Promise<Channel | Channel[] | void>;
+export type Publisher<T = any, A = Application, S = any> = (data: T, context: HookContext<A, S>) => Channel | Channel[] | void | Promise<Channel | Channel[] | void>;
 
 export interface PublishMixin<T = any> {
   [PUBLISHERS]: { [ALL_EVENTS]?: Publisher<T>, [key: string]: Publisher<T> };
@@ -87,8 +87,9 @@ export function publishMixin () {
         event = ALL_EVENTS;
       }
 
-      // @ts-ignore
-      if (this._serviceEvents && event !== ALL_EVENTS && this._serviceEvents.indexOf(event) === -1) {
+      const { serviceEvents } = getServiceOptions(this);
+
+      if (event !== ALL_EVENTS && !serviceEvents.includes(event)) {
         throw new Error(`'${event.toString()}' is not a valid service event`);
       }