@feathersjs/transport-commons 5.0.7 → 5.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/lib/socket/index.js +2 -5
- package/lib/socket/index.js.map +1 -1
- package/lib/socket/utils.d.ts +1 -1
- package/lib/socket/utils.js +4 -2
- package/lib/socket/utils.js.map +1 -1
- package/package.json +5 -5
- package/src/socket/index.ts +2 -6
- package/src/socket/utils.ts +5 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [5.0.8](https://github.com/feathersjs/feathers/compare/v5.0.7...v5.0.8) (2023-07-19)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **transport-commons:** Handle invalid service paths on socket lookups ([#3241](https://github.com/feathersjs/feathers/issues/3241)) ([c397ab3](https://github.com/feathersjs/feathers/commit/c397ab3a0cd184044ae4f73540549b30a396821c))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [5.0.7](https://github.com/feathersjs/feathers/compare/v5.0.6...v5.0.7) (2023-07-14)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @feathersjs/transport-commons
|
package/lib/socket/index.js
CHANGED
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.socket = void 0;
|
|
4
4
|
const feathers_1 = require("@feathersjs/feathers");
|
|
5
|
-
const commons_1 = require("@feathersjs/commons");
|
|
6
5
|
const channels_1 = require("../channels");
|
|
7
6
|
const routing_1 = require("../routing");
|
|
8
7
|
const utils_1 = require("./utils");
|
|
9
|
-
const debug = (0, commons_1.createDebug)('@feathersjs/transport-commons');
|
|
10
8
|
function socket({ done, emit, socketMap, socketKey, getParams }) {
|
|
11
9
|
return (app) => {
|
|
12
10
|
const leaveChannels = (connection) => {
|
|
@@ -34,9 +32,8 @@ function socket({ done, emit, socketMap, socketKey, getParams }) {
|
|
|
34
32
|
methods.forEach((method) => {
|
|
35
33
|
if (!result[method]) {
|
|
36
34
|
result[method] = (...args) => {
|
|
37
|
-
const path = args
|
|
38
|
-
|
|
39
|
-
(0, utils_1.runMethod)(app, getParams(connection), path, method, args);
|
|
35
|
+
const [path, ...rest] = args;
|
|
36
|
+
(0, utils_1.runMethod)(app, getParams(connection), path, method, rest);
|
|
40
37
|
};
|
|
41
38
|
}
|
|
42
39
|
});
|
package/lib/socket/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":";;;AAAA,mDAAiG;AACjG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":";;;AAAA,mDAAiG;AACjG,0CAAsC;AACtC,wCAAoC;AACpC,mCAAkD;AAUlD,SAAgB,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAiB;IACnF,OAAO,CAAC,GAAgB,EAAE,EAAE;QAC1B,MAAM,aAAa,GAAG,CAAC,UAA8B,EAAE,EAAE;YACvD,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YAExB,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;aAC5C;QACH,CAAC,CAAA;QAED,GAAG,CAAC,SAAS,CAAC,IAAA,mBAAQ,GAAE,CAAC,CAAA;QACzB,GAAG,CAAC,SAAS,CAAC,IAAA,iBAAO,GAAE,CAAC,CAAA;QAExB,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,IAAA,qBAAa,EAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;QAC5D,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QACnC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,WAAgB,EAAE,MAAc,EAAE,EAAE;YACpD,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAA;YAE7B,IAAI,UAAU,EAAE;gBACd,aAAa,CAAC,UAAU,CAAC,CAAA;aAC1B;QACH,CAAC,CAAC,CAAA;QAEF,qBAAqB;QACrB,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CACrB,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAe,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAC9F,CAAA;QAED,+DAA+D;QAC/D,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CACrB,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAe,EAAE,EAAE;YAC5C,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,CAAA;gBAExD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBACzB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;wBACnB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;4BAClC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;4BAE5B,IAAA,iBAAS,EAAC,GAAG,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;wBAC3D,CAAC,CAAA;qBACF;gBACH,CAAC,CAAC,CAAA;gBAEF,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAS,CAAC,CAAA;YAEb,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QACvF,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAnDD,wBAmDC"}
|
package/lib/socket/utils.d.ts
CHANGED
|
@@ -6,4 +6,4 @@ export declare const paramsPositions: {
|
|
|
6
6
|
};
|
|
7
7
|
export declare function normalizeError(e: any): any;
|
|
8
8
|
export declare function getDispatcher(emit: string, socketMap: WeakMap<RealTimeConnection, any>, socketKey?: any): (event: string, channel: CombinedChannel, context: HookContext, data?: any) => void;
|
|
9
|
-
export declare function runMethod(app: Application, connection: RealTimeConnection,
|
|
9
|
+
export declare function runMethod(app: Application, connection: RealTimeConnection, _path: string, _method: string, args: any[]): Promise<void>;
|
package/lib/socket/utils.js
CHANGED
|
@@ -51,7 +51,9 @@ function getDispatcher(emit, socketMap, socketKey) {
|
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
exports.getDispatcher = getDispatcher;
|
|
54
|
-
async function runMethod(app, connection,
|
|
54
|
+
async function runMethod(app, connection, _path, _method, args) {
|
|
55
|
+
const path = typeof _path === 'string' ? _path : null;
|
|
56
|
+
const method = typeof _method === 'string' ? _method : null;
|
|
55
57
|
const trace = `method '${method}' on service '${path}'`;
|
|
56
58
|
const methodArgs = args.slice(0);
|
|
57
59
|
const callback =
|
|
@@ -66,7 +68,7 @@ async function runMethod(app, connection, path, method, args) {
|
|
|
66
68
|
const lookup = app.lookup(path);
|
|
67
69
|
// No valid service was found throw a NotFound error
|
|
68
70
|
if (lookup === null) {
|
|
69
|
-
throw new errors_1.NotFound(`Service '${path}' not found`);
|
|
71
|
+
throw new errors_1.NotFound(path === null ? `Invalid service path` : `Service '${path}' not found`);
|
|
70
72
|
}
|
|
71
73
|
const { service, params: route = {} } = lookup;
|
|
72
74
|
const { methods } = (0, feathers_1.getServiceOptions)(service);
|
package/lib/socket/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/socket/utils.ts"],"names":[],"mappings":";;;;;;AAAA,mDAM6B;AAC7B,+CAA2E;AAC3E,iDAAiD;AACjD,6DAAoC;AAGpC,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,+BAA+B,CAAC,CAAA;AAE7C,QAAA,uBAAuB,GAAG,CAAC,CAAA;AAE3B,QAAA,eAAe,GAA8B;IACxD,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;CACT,CAAA;AAED,SAAgB,cAAc,CAAC,CAAM;IACnC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,MAAM,KAAK,UAAU,CAAA;IAChD,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAE1C,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5C,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;KACH;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACzC,OAAO,MAAM,CAAC,KAAK,CAAA;KACpB;IAED,OAAO,MAAM,CAAC,IAAI,CAAA;IAElB,OAAO,MAAM,CAAA;AACf,CAAC;AAjBD,wCAiBC;AAED,SAAgB,aAAa,CAAC,IAAY,EAAE,SAA2C,EAAE,SAAe;IACtG,OAAO,UAAU,KAAa,EAAE,OAAwB,EAAE,OAAoB,EAAE,IAAU;QACxF,KAAK,CAAC,gBAAgB,KAAK,QAAQ,OAAO,CAAC,MAAM,cAAc,CAAC,CAAA;QAEhE,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACzC,oEAAoE;YACpE,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;YAE5E,IAAI,MAAM,EAAE;gBACV,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,IAAI,EAAE,CAAA;gBAEzD,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAA;gBAE9E,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,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAA,iBAAO,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAA;iBAChE;gBAED,KAAK,CAAC,gBAAgB,SAAS,eAAe,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;gBAEvE,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;aAChC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAzBD,sCAyBC;AAEM,KAAK,UAAU,SAAS,CAC7B,GAAgB,EAChB,UAA8B,EAC9B,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/socket/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/transport-commons",
|
|
3
3
|
"description": "Shared functionality for websocket providers",
|
|
4
|
-
"version": "5.0.
|
|
4
|
+
"version": "5.0.8",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -54,9 +54,9 @@
|
|
|
54
54
|
"*.js"
|
|
55
55
|
],
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@feathersjs/commons": "^5.0.
|
|
58
|
-
"@feathersjs/errors": "^5.0.
|
|
59
|
-
"@feathersjs/feathers": "^5.0.
|
|
57
|
+
"@feathersjs/commons": "^5.0.8",
|
|
58
|
+
"@feathersjs/errors": "^5.0.8",
|
|
59
|
+
"@feathersjs/feathers": "^5.0.8",
|
|
60
60
|
"encodeurl": "^1.0.2",
|
|
61
61
|
"lodash": "^4.17.21"
|
|
62
62
|
},
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"ts-node": "^10.9.1",
|
|
71
71
|
"typescript": "^5.1.6"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "414336a047a556f1986b4bb253416d5b8a973d9f"
|
|
74
74
|
}
|
package/src/socket/index.ts
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import { Application, getServiceOptions, Params, RealTimeConnection } from '@feathersjs/feathers'
|
|
2
|
-
import { createDebug } from '@feathersjs/commons'
|
|
3
2
|
import { channels } from '../channels'
|
|
4
3
|
import { routing } from '../routing'
|
|
5
4
|
import { getDispatcher, runMethod } from './utils'
|
|
6
5
|
|
|
7
|
-
const debug = createDebug('@feathersjs/transport-commons')
|
|
8
|
-
|
|
9
6
|
export interface SocketOptions {
|
|
10
7
|
done: Promise<any>
|
|
11
8
|
emit: string
|
|
@@ -51,10 +48,9 @@ export function socket({ done, emit, socketMap, socketKey, getParams }: SocketOp
|
|
|
51
48
|
methods.forEach((method) => {
|
|
52
49
|
if (!result[method]) {
|
|
53
50
|
result[method] = (...args: any[]) => {
|
|
54
|
-
const path = args
|
|
51
|
+
const [path, ...rest] = args
|
|
55
52
|
|
|
56
|
-
|
|
57
|
-
runMethod(app, getParams(connection), path, method, args)
|
|
53
|
+
runMethod(app, getParams(connection), path, method, rest)
|
|
58
54
|
}
|
|
59
55
|
}
|
|
60
56
|
})
|
package/src/socket/utils.ts
CHANGED
|
@@ -69,10 +69,12 @@ export function getDispatcher(emit: string, socketMap: WeakMap<RealTimeConnectio
|
|
|
69
69
|
export async function runMethod(
|
|
70
70
|
app: Application,
|
|
71
71
|
connection: RealTimeConnection,
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
_path: string,
|
|
73
|
+
_method: string,
|
|
74
74
|
args: any[]
|
|
75
75
|
) {
|
|
76
|
+
const path = typeof _path === 'string' ? _path : null
|
|
77
|
+
const method = typeof _method === 'string' ? _method : null
|
|
76
78
|
const trace = `method '${method}' on service '${path}'`
|
|
77
79
|
const methodArgs = args.slice(0)
|
|
78
80
|
const callback =
|
|
@@ -91,7 +93,7 @@ export async function runMethod(
|
|
|
91
93
|
|
|
92
94
|
// No valid service was found throw a NotFound error
|
|
93
95
|
if (lookup === null) {
|
|
94
|
-
throw new NotFound(`Service '${path}' not found`)
|
|
96
|
+
throw new NotFound(path === null ? `Invalid service path` : `Service '${path}' not found`)
|
|
95
97
|
}
|
|
96
98
|
|
|
97
99
|
const { service, params: route = {} } = lookup
|