@feathersjs/transport-commons 5.0.23 → 5.0.25
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 +12 -0
- package/lib/channels/index.js +8 -3
- package/lib/channels/index.js.map +1 -1
- package/lib/client.js +12 -3
- package/lib/client.js.map +1 -1
- package/package.json +10 -10
- package/src/channels/index.ts +5 -3
- package/src/client.ts +11 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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.25](https://github.com/feathersjs/feathers/compare/v5.0.24...v5.0.25) (2024-05-03)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- Reduce usage of lodash ([#3455](https://github.com/feathersjs/feathers/issues/3455)) ([8ce807a](https://github.com/feathersjs/feathers/commit/8ce807a5ca53ff5b8d5107a0656c6329404e6e6c))
|
|
11
|
+
|
|
12
|
+
## [5.0.24](https://github.com/feathersjs/feathers/compare/v5.0.23...v5.0.24) (2024-03-13)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- **socketio:** Handle ackTimeout of socket.io ([#3437](https://github.com/feathersjs/feathers/issues/3437)) ([2642072](https://github.com/feathersjs/feathers/commit/26420721f3eb16f716a9e68ab3ed9f415bab7a9c))
|
|
17
|
+
|
|
6
18
|
## [5.0.23](https://github.com/feathersjs/feathers/compare/v5.0.22...v5.0.23) (2024-02-25)
|
|
7
19
|
|
|
8
20
|
### Bug Fixes
|
package/lib/channels/index.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.CombinedChannel = exports.Channel = exports.channels = exports.keys = void 0;
|
|
4
7
|
const feathers_1 = require("@feathersjs/feathers");
|
|
5
8
|
const commons_1 = require("@feathersjs/commons");
|
|
6
|
-
const
|
|
9
|
+
const flattenDeep_1 = __importDefault(require("lodash/flattenDeep"));
|
|
7
10
|
const base_1 = require("./channel/base");
|
|
8
11
|
Object.defineProperty(exports, "Channel", { enumerable: true, get: function () { return base_1.Channel; } });
|
|
9
12
|
const combined_1 = require("./channel/combined");
|
|
@@ -51,14 +54,16 @@ function channels() {
|
|
|
51
54
|
// 4. App publisher for all events
|
|
52
55
|
appPublishers[mixins_1.keys.ALL_EVENTS] ||
|
|
53
56
|
// 5. No publisher
|
|
54
|
-
|
|
57
|
+
(() => { });
|
|
55
58
|
try {
|
|
56
59
|
Promise.resolve(publisher(data, hook))
|
|
57
60
|
.then((result) => {
|
|
58
61
|
if (!result) {
|
|
59
62
|
return;
|
|
60
63
|
}
|
|
61
|
-
const results = Array.isArray(result)
|
|
64
|
+
const results = Array.isArray(result)
|
|
65
|
+
? (0, flattenDeep_1.default)(result).filter(Boolean)
|
|
66
|
+
: [result];
|
|
62
67
|
const channel = new combined_1.CombinedChannel(results);
|
|
63
68
|
if (channel && channel.length > 0) {
|
|
64
69
|
app.emit('publish', event, channel, hook, data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/channels/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/channels/index.ts"],"names":[],"mappings":"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"}
|
package/lib/client.js
CHANGED
|
@@ -52,6 +52,7 @@ class Service {
|
|
|
52
52
|
}
|
|
53
53
|
send(method, ...args) {
|
|
54
54
|
return new Promise((resolve, reject) => {
|
|
55
|
+
var _a, _b;
|
|
55
56
|
const route = args.pop();
|
|
56
57
|
let path = this.path;
|
|
57
58
|
if (route) {
|
|
@@ -60,9 +61,17 @@ class Service {
|
|
|
60
61
|
});
|
|
61
62
|
}
|
|
62
63
|
args.unshift(method, path);
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
const socketTimeout = ((_a = this.connection.flags) === null || _a === void 0 ? void 0 : _a.timeout) || ((_b = this.connection._opts) === null || _b === void 0 ? void 0 : _b.ackTimeout);
|
|
65
|
+
if (socketTimeout !== undefined) {
|
|
66
|
+
args.push(function (timeoutError, error, data) {
|
|
67
|
+
return timeoutError || error ? reject((0, errors_1.convert)(timeoutError || error)) : resolve(data);
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
args.push(function (error, data) {
|
|
72
|
+
return error ? reject((0, errors_1.convert)(error)) : resolve(data);
|
|
73
|
+
});
|
|
74
|
+
}
|
|
66
75
|
debug(`Sending socket.${this.method}`, args);
|
|
67
76
|
this.connection[this.method](...args);
|
|
68
77
|
});
|
package/lib/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,+CAA4C;AAC5C,iDAAiD;AAGjD,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,sCAAsC,CAAC,CAAA;AAEjE,MAAM,wBAAwB,GAAG;IAC/B,aAAa;IACb,kBAAkB;IAClB,MAAM;IACN,eAAe;IACf,WAAW;IACX,IAAI;IACJ,MAAM;IACN,iBAAiB;IACjB,qBAAqB;IACrB,oBAAoB;IACpB,qBAAqB;IACrB,gBAAgB;CACjB,CAAA;AACD,MAAM,mBAAmB,GAAG,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;AAEhF,MAAM,iBAAiB,GAAG,CAAC,OAAY,EAAE,EAAE;IACzC,mBAAmB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,GAAG,IAAW;YACxC,IAAI,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;gBAClD,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,oCAAoC,CAAC,CAAA;YAC9E,CAAC;YAED,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;QACzC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,uDAAuD;IACvD,wBAAwB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1C,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,IAAY,EAAE,GAAG,IAAW;YACtD,IAAI,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;gBAClD,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,oCAAoC,CAAC,CAAA;YAC9E,CAAC;YAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAA;YAExC,KAAK,CAAC,0BAA0B,MAAM,QAAQ,GAAG,qBAAqB,SAAS,GAAG,CAAC,CAAA;YAEnF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAA;YAE1D,OAAO,MAAM,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAA;QACnD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAWD,MAAa,OAAO;IAQlB,YAAY,OAAuB;QACjC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QACpC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAE5B,iBAAiB,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,CAAU,MAAc,EAAE,GAAG,IAAW;QAC1C,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.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.25",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -54,21 +54,21 @@
|
|
|
54
54
|
"*.js"
|
|
55
55
|
],
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@feathersjs/commons": "^5.0.
|
|
58
|
-
"@feathersjs/errors": "^5.0.
|
|
59
|
-
"@feathersjs/feathers": "^5.0.
|
|
60
|
-
"encodeurl": "^
|
|
57
|
+
"@feathersjs/commons": "^5.0.25",
|
|
58
|
+
"@feathersjs/errors": "^5.0.25",
|
|
59
|
+
"@feathersjs/feathers": "^5.0.25",
|
|
60
|
+
"encodeurl": "^2.0.0",
|
|
61
61
|
"lodash": "^4.17.21"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
64
|
"@types/encodeurl": "^1.0.2",
|
|
65
|
-
"@types/lodash": "^4.
|
|
65
|
+
"@types/lodash": "^4.17.0",
|
|
66
66
|
"@types/mocha": "^10.0.6",
|
|
67
|
-
"@types/node": "^20.
|
|
68
|
-
"mocha": "^10.
|
|
67
|
+
"@types/node": "^20.12.8",
|
|
68
|
+
"mocha": "^10.4.0",
|
|
69
69
|
"shx": "^0.3.4",
|
|
70
70
|
"ts-node": "^10.9.2",
|
|
71
|
-
"typescript": "^5.
|
|
71
|
+
"typescript": "^5.4.5"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "01bc3339efd27df1b3e8d4f6a82152faf6c5ced3"
|
|
74
74
|
}
|
package/src/channels/index.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Application, FeathersService, RealTimeConnection, getServiceOptions } from '@feathersjs/feathers'
|
|
2
2
|
import { createDebug } from '@feathersjs/commons'
|
|
3
|
-
import
|
|
3
|
+
import flattenDeep from 'lodash/flattenDeep'
|
|
4
4
|
import { Channel } from './channel/base'
|
|
5
5
|
import { CombinedChannel } from './channel/combined'
|
|
6
6
|
import { channelMixin, publishMixin, keys, PublishMixin, Event, Publisher } from './mixins'
|
|
@@ -87,7 +87,7 @@ export function channels() {
|
|
|
87
87
|
// 4. App publisher for all events
|
|
88
88
|
appPublishers[keys.ALL_EVENTS] ||
|
|
89
89
|
// 5. No publisher
|
|
90
|
-
|
|
90
|
+
(() => {})
|
|
91
91
|
|
|
92
92
|
try {
|
|
93
93
|
Promise.resolve(publisher(data, hook))
|
|
@@ -96,7 +96,9 @@ export function channels() {
|
|
|
96
96
|
return
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
const results = Array.isArray(result)
|
|
99
|
+
const results = Array.isArray(result)
|
|
100
|
+
? flattenDeep(result).filter(Boolean)
|
|
101
|
+
: ([result] as Channel[])
|
|
100
102
|
const channel = new CombinedChannel(results)
|
|
101
103
|
|
|
102
104
|
if (channel && channel.length > 0) {
|
package/src/client.ts
CHANGED
|
@@ -86,9 +86,17 @@ export class Service<T = any, D = Partial<T>, P extends Params = Params>
|
|
|
86
86
|
})
|
|
87
87
|
}
|
|
88
88
|
args.unshift(method, path)
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
89
|
+
|
|
90
|
+
const socketTimeout = this.connection.flags?.timeout || this.connection._opts?.ackTimeout
|
|
91
|
+
if (socketTimeout !== undefined) {
|
|
92
|
+
args.push(function (timeoutError: any, error: any, data: any) {
|
|
93
|
+
return timeoutError || error ? reject(convert(timeoutError || error)) : resolve(data)
|
|
94
|
+
})
|
|
95
|
+
} else {
|
|
96
|
+
args.push(function (error: any, data: any) {
|
|
97
|
+
return error ? reject(convert(error)) : resolve(data)
|
|
98
|
+
})
|
|
99
|
+
}
|
|
92
100
|
|
|
93
101
|
debug(`Sending socket.${this.method}`, args)
|
|
94
102
|
|