@feathersjs/transport-commons 5.0.0-pre.6 → 5.0.0

package/lib/routing/index.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -13,26 +17,32 @@ 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;
     }
-    const routes = new router_1.Router();
-    Object.assign(app, {
-        routes,
-        lookup(path) {
-            const result = this.routes.lookup(path);
-            if (result !== null) {
-                const { params, data: service } = result;
-                return { params, service };
-            }
-            return result;
-        }
-    });
+    const { unuse } = app;
+    app.routes = new router_1.Router();
+    app.lookup = lookup;
+    app.unuse = function (path) {
+        app.routes.remove(path);
+        app.routes.remove(`${path}/:__id`);
+        return unuse.call(this, path);
+    };
     // Add a mixin that registers a service on the router
-    app.mixins.push((service, path) => {
-        app.routes.insert(path, service);
-        app.routes.insert(`${path}/:__id`, service);
+    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;

package/lib/routing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,qCAAkC;AAclC,2CAAyB;AAElB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,GAAgB,EAAE,EAAE;IAChD,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE;QACpC,OAAO;KACR;IAED,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;QACjB,MAAM;QACN,MAAM,CAAqB,IAAY;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAExC,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;gBAEzC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;aAC5B;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC,CAAC;IAEH,qDAAqD;IACrD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAqB,EAAE,IAAY,EAAE,EAAE;QACtD,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA3BW,QAAA,OAAO,WA2BlB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,qCAAiC;AAmBjC,2CAAwB;AAExB,MAAM,MAAM,GAAG,UAA6B,IAAY;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAEvC,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,OAAO,IAAI,CAAA;KACZ;IAED,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EACtC,GAAG,MAAM,CAAA;IAEV,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAA;IAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAA;AAC5B,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,GAAgB,EAAE,EAAE;IAChD,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE;QACpC,OAAM;KACP;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;IAErB,GAAG,CAAC,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IACzB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;IACnB,GAAG,CAAC,KAAK,GAAG,UAAU,IAAY;QAChC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACvB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAA;QAClC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC/B,CAAC,CAAA;IAED,qDAAqD;IACrD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAwB,EAAE,IAAY,EAAE,OAAuB,EAAE,EAAE;QAClF,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;QAE5C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;QAC5C,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAtBY,QAAA,OAAO,WAsBnB"}

package/lib/routing/router.d.ts

@@ -15,13 +15,16 @@ export declare class RouteNode<T = any> {
     };
     placeholders: RouteNode[];
     constructor(name: string, depth: number);
+    get hasChildren(): boolean;
     insert(path: string[], data: T): RouteNode<T>;
+    remove(path: string[]): void;
     lookup(path: string[], info: LookupData): LookupResult<T> | null;
 }
-export declare class Router<T> {
+export declare class Router<T = any> {
     root: RouteNode<T>;
     constructor(root?: RouteNode<T>);
     getPath(path: string): string[];
     insert(path: string, data: T): RouteNode<T>;
+    remove(path: string): void;
     lookup(path: string): LookupResult<T>;
 }

package/lib/routing/router.js

@@ -9,6 +9,9 @@ class RouteNode {
         this.children = {};
         this.placeholders = [];
     }
+    get hasChildren() {
+        return Object.keys(this.children).length !== 0 || this.placeholders.length !== 0;
+    }
     insert(path, data) {
         if (this.depth === path.length) {
             if (this.data !== undefined) {
@@ -22,7 +25,7 @@ class RouteNode {
         if (current.startsWith(':')) {
             // Insert a placeholder node like /messages/:id
             const placeholderName = current.substring(1);
-            let placeholder = this.placeholders.find(p => p.name === placeholderName);
+            let placeholder = this.placeholders.find((p) => p.name === placeholderName);
             if (!placeholder) {
                 placeholder = new RouteNode(placeholderName, nextDepth);
                 this.placeholders.push(placeholder);
@@ -33,14 +36,41 @@ class RouteNode {
         this.children[current] = child;
         return child.insert(path, data);
     }
+    remove(path) {
+        if (path.length === this.depth) {
+            return;
+        }
+        const current = path[this.depth];
+        if (current.startsWith(':')) {
+            const placeholderName = current.substring(1);
+            const placeholder = this.placeholders.find((p) => p.name === placeholderName);
+            placeholder.remove(path);
+            this.placeholders = this.placeholders.filter((p) => p !== placeholder);
+        }
+        else if (this.children[current]) {
+            const child = this.children[current];
+            child.remove(path);
+            if (!child.hasChildren) {
+                delete this.children[current];
+            }
+        }
+    }
     lookup(path, info) {
         if (path.length === this.depth) {
-            return this.data === undefined ? null : Object.assign(Object.assign({}, info), { data: this.data });
+            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);
+            const lookup = child.lookup(path, info);
+            if (lookup !== null) {
+                return lookup;
+            }
         }
         // This will return the first placeholder that matches early
         for (const placeholder of this.placeholders) {
@@ -59,11 +89,14 @@ class Router {
         this.root = root;
     }
     getPath(path) {
-        return commons_1.stripSlashes(path).split('/');
+        return (0, commons_1.stripSlashes)(path).split('/');
     }
     insert(path, data) {
         return this.root.insert(this.getPath(path), data);
     }
+    remove(path) {
+        return this.root.remove(this.getPath(path));
+    }
     lookup(path) {
         if (typeof path !== 'string') {
             return null;

package/lib/routing/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/routing/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/routing/router.ts"],"names":[],"mappings":"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"}

package/lib/socket/index.d.ts

@@ -1,5 +1,4 @@
-import { Application } from '@feathersjs/feathers';
-import { RealTimeConnection } from '../channels/channel/base';
+import { Application, RealTimeConnection } from '@feathersjs/feathers';
 export interface SocketOptions {
     done: Promise<any>;
     emit: string;

package/lib/socket/index.js

@@ -6,7 +6,7 @@ const commons_1 = require("@feathersjs/commons");
 const channels_1 = require("../channels");
 const routing_1 = require("../routing");
 const utils_1 = require("./utils");
-const debug = commons_1.createDebug('@feathersjs/transport-commons');
+const debug = (0, commons_1.createDebug)('@feathersjs/transport-commons');
 function socket({ done, emit, socketMap, socketKey, getParams }) {
     return (app) => {
         const leaveChannels = (connection) => {
@@ -15,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;
@@ -26,23 +26,23 @@ function socket({ done, emit, socketMap, socketKey, getParams }) {
             }
         });
         // `connection` event
-        done.then(provider => provider.on('connection', (connection) => app.emit('connection', getParams(connection))));
+        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) => {
+        done.then((provider) => provider.on('connection', (connection) => {
             const methodHandlers = Object.keys(app.services).reduce((result, name) => {
-                const { methods } = feathers_1.getServiceOptions(app.service(name));
-                methods.forEach(method => {
+                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}'`);
-                            utils_1.runMethod(app, getParams(connection), path, method, args);
+                            (0, utils_1.runMethod)(app, getParams(connection), path, method, args);
                         };
                     }
                 });
                 return result;
             }, {});
-            Object.keys(methodHandlers).forEach(key => connection.on(key, methodHandlers[key]));
+            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":";;;AAAA,mDAA8E;AAC9E,iDAAkD;AAClD,0CAAuC;AACvC,wCAAqC;AACrC,mCAAmD;AAGnD,MAAM,KAAK,GAAG,qBAAW,CAAC,+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,mBAAQ,EAAE,CAAC,CAAC;QAC1B,GAAG,CAAC,SAAS,CAAC,iBAAO,EAAE,CAAC,CAAC;QAEzB,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,qBAAa,CAAC,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,4BAAiB,CAAC,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,iBAAS,CAAC,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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"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"}

package/lib/socket/utils.d.ts

@@ -1,6 +1,5 @@
-import { HookContext, Application } from '@feathersjs/feathers';
+import { HookContext, Application, RealTimeConnection } 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;

package/lib/socket/utils.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,7 +8,7 @@ const feathers_1 = require("@feathersjs/feathers");
 const errors_1 = require("@feathersjs/errors");
 const commons_1 = require("@feathersjs/commons");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const debug = commons_1.createDebug('@feathersjs/transport-commons');
+const debug = (0, commons_1.createDebug)('@feathersjs/transport-commons');
 exports.DEFAULT_PARAMS_POSITION = 1;
 exports.paramsPositions = {
     find: 0,
@@ -28,7 +19,7 @@ function normalizeError(e) {
     const hasToJSON = typeof e.toJSON === 'function';
     const result = hasToJSON ? e.toJSON() : {};
     if (!hasToJSON) {
-        Object.getOwnPropertyNames(e).forEach(key => {
+        Object.getOwnPropertyNames(e).forEach((key) => {
             result[key] = e[key];
         });
     }
@@ -42,7 +33,7 @@ exports.normalizeError = normalizeError;
 function getDispatcher(emit, socketMap, socketKey) {
     return function (event, channel, context, data) {
         debug(`Dispatching '${event}' to ${channel.length} connections`);
-        channel.connections.forEach(connection => {
+        channel.connections.forEach((connection) => {
             // The reference between connection and socket is set in `app.setup`
             const socket = socketKey ? connection[socketKey] : socketMap.get(connection);
             if (socket) {
@@ -51,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);
@@ -60,48 +51,47 @@ function getDispatcher(emit, socketMap, socketKey) {
     };
 }
 exports.getDispatcher = getDispatcher;
-function runMethod(app, connection, path, method, args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const trace = `method '${method}' on service '${path}'`;
-        const methodArgs = args.slice(0);
-        const callback = typeof methodArgs[methodArgs.length - 1] === 'function'
-            ? methodArgs.pop() : function () { };
-        debug(`Running ${trace}`, connection, args);
-        const handleError = (error) => {
-            debug(`Error in ${trace}`, error);
-            callback(normalizeError(error));
-        };
-        try {
-            const lookup = app.lookup(path);
-            // No valid service was found throw a NotFound error
-            if (lookup === null) {
-                throw new errors_1.NotFound(`Service '${path}' not found`);
-            }
-            const { service, params: route = {} } = lookup;
-            const { methods } = feathers_1.getServiceOptions(service);
-            // Only service methods are allowed
-            if (!methods.includes(method)) {
-                throw new errors_1.MethodNotAllowed(`Method '${method}' not allowed on service '${path}'`);
-            }
-            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
-            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;
-            const ctx = feathers_1.createContext(service, method);
-            const returnedCtx = yield service[method](...methodArgs, ctx);
-            const result = returnedCtx.dispatch || returnedCtx.result;
-            debug(`Returned successfully ${trace}`, result);
-            callback(null, result);
+async function runMethod(app, connection, path, method, args) {
+    const trace = `method '${method}' on service '${path}'`;
+    const methodArgs = args.slice(0);
+    const callback = 
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    typeof methodArgs[methodArgs.length - 1] === 'function' ? methodArgs.pop() : function () { };
+    debug(`Running ${trace}`, connection, args);
+    const handleError = (error) => {
+        debug(`Error in ${trace}`, error);
+        callback(normalizeError(error));
+    };
+    try {
+        const lookup = app.lookup(path);
+        // No valid service was found throw a NotFound error
+        if (lookup === null) {
+            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
+        if (!methods.includes(method)) {
+            throw new errors_1.MethodNotAllowed(`Method '${method}' not allowed on service '${path}'`);
         }
-        catch (error) {
-            handleError(error);
+        const position = exports.paramsPositions[method] !== undefined ? exports.paramsPositions[method] : exports.DEFAULT_PARAMS_POSITION;
+        const query = Object.assign({}, methodArgs[position]);
+        // `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;
+        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);
+    }
 }
 exports.runMethod = runMethod;
 //# sourceMappingURL=utils.js.map

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":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/transport-commons",
   "description": "Shared functionality for websocket providers",
-  "version": "5.0.0-pre.6",
+  "version": "5.0.0",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -16,7 +16,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/feathersjs/feathers.git"
+    "url": "git://github.com/feathersjs/feathers.git",
+    "directory": "packages/transport-commons"
   },
   "author": {
     "name": "Feathers contributors",
@@ -32,8 +33,9 @@
   },
   "scripts": {
     "prepublish": "npm run compile",
-    "compile": "shx rm -rf lib/ && tsc",
-    "test": "npm run compile && npm run mocha",
+    "pack": "npm pack --pack-destination ../generators/test/build",
+    "compile": "shx rm -rf lib/ && tsc && npm run pack",
+    "test": "npm run mocha",
     "mocha": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
   },
   "directories": {
@@ -52,18 +54,21 @@
     "*.js"
   ],
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.6",
-    "@feathersjs/errors": "^5.0.0-pre.6",
+    "@feathersjs/commons": "^5.0.0",
+    "@feathersjs/errors": "^5.0.0",
+    "@feathersjs/feathers": "^5.0.0",
+    "encodeurl": "^1.0.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/feathers": "^5.0.0-pre.6",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.4.13",
-    "mocha": "^9.0.3",
-    "shx": "^0.3.3",
-    "ts-node": "^10.1.0",
-    "typescript": "^4.3.5"
+    "@types/encodeurl": "^1.0.0",
+    "@types/lodash": "^4.14.191",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.14.1",
+    "mocha": "^10.2.0",
+    "shx": "^0.3.4",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   },
-  "gitHead": "738f84f91fb72d5e10a0bf57b58db75b0b03d3ff"
+  "gitHead": "90caf635aec850550b9d37bea2762af959d9e8d5"
 }

package/src/channels/channel/base.ts

@@ -1,61 +1,58 @@
-import { EventEmitter } from 'events';
-
-export interface RealTimeConnection {
-  [key: string]: any;
-}
+import { EventEmitter } from 'events'
+import { RealTimeConnection } from '@feathersjs/feathers'
 
 export class Channel extends EventEmitter {
-  connections: RealTimeConnection[];
-  data: any;
+  connections: RealTimeConnection[]
+  data: any
 
-  constructor (connections: RealTimeConnection[] = [], data: any = null) {
-    super();
+  constructor(connections: RealTimeConnection[] = [], data: any = null) {
+    super()
 
-    this.connections = connections;
-    this.data = data;
+    this.connections = connections
+    this.data = data
   }
 
-  get length () {
-    return this.connections.length;
+  get length() {
+    return this.connections.length
   }
 
-  leave (...connections: RealTimeConnection[]) {
-    connections.forEach(current => {
+  leave(...connections: RealTimeConnection[]) {
+    connections.forEach((current) => {
       if (typeof current === 'function') {
-        const callback = current as (connection: RealTimeConnection) => boolean;
+        const callback = current as (connection: RealTimeConnection) => boolean
 
-        this.leave(...this.connections.filter(callback));
+        this.leave(...this.connections.filter(callback))
       } else {
-        const index = this.connections.indexOf(current);
+        const index = this.connections.indexOf(current)
 
         if (index !== -1) {
-          this.connections.splice(index, 1);
+          this.connections.splice(index, 1)
         }
       }
-    });
+    })
 
     if (this.length === 0) {
-      this.emit('empty');
+      this.emit('empty')
     }
 
-    return this;
+    return this
   }
 
-  join (...connections: RealTimeConnection[]) {
-    connections.forEach(connection => {
+  join(...connections: RealTimeConnection[]) {
+    connections.forEach((connection) => {
       if (connection && this.connections.indexOf(connection) === -1) {
-        this.connections.push(connection);
+        this.connections.push(connection)
       }
-    });
+    })
 
-    return this;
+    return this
   }
 
-  filter (fn: (connection: RealTimeConnection) => boolean) {
-    return new Channel(this.connections.filter(fn), this.data);
+  filter(fn: (connection: RealTimeConnection) => boolean) {
+    return new Channel(this.connections.filter(fn), this.data)
   }
 
-  send (data: any) {
-    return new Channel(this.connections, data);
+  send(data: any) {
+    return new Channel(this.connections, data)
   }
 }