@abtnode/util 1.16.29-beta-a3a3b40e → 1.16.29-beta-bc7cae11
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/lib/format-context.js +2 -1
- package/lib/get-request-ip.js +20 -0
- package/package.json +11 -10
package/lib/format-context.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const omit = require('lodash/omit');
|
|
2
2
|
const get = require('lodash/get');
|
|
3
|
+
const getRequestIP = require('./get-request-ip');
|
|
3
4
|
|
|
4
5
|
// Format context: https://github.com/graphql/express-graphql
|
|
5
6
|
/**
|
|
@@ -19,7 +20,7 @@ module.exports = (ctx = {}) => {
|
|
|
19
20
|
(typeof ctx.get === 'function' ? ctx.get(key) : get(ctx, `headers[${key}]`)) || _default;
|
|
20
21
|
const port = process.env.NODE_ENV === 'production' ? safeGet('x-real-port') : '';
|
|
21
22
|
const result = {
|
|
22
|
-
ip: safeGet('x-real-ip', '127.0.0.1'),
|
|
23
|
+
ip: getRequestIP(ctx) || safeGet('x-real-ip', '127.0.0.1'),
|
|
23
24
|
ua: safeGet('user-agent'),
|
|
24
25
|
protocol: safeGet('x-real-protocol').replace(/:$/, '') || 'http',
|
|
25
26
|
user: contextUser,
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
const requestIp = require('request-ip');
|
|
2
|
+
|
|
3
|
+
const emptyIp = '';
|
|
4
|
+
|
|
5
|
+
const getRequestIP = (request) => {
|
|
6
|
+
if (!request) {
|
|
7
|
+
return emptyIp;
|
|
8
|
+
}
|
|
9
|
+
let clientIp = request?.clientIp;
|
|
10
|
+
if (!clientIp) {
|
|
11
|
+
clientIp = requestIp.getClientIp(request);
|
|
12
|
+
}
|
|
13
|
+
if (!clientIp) {
|
|
14
|
+
clientIp = request.get?.('x-real-ip');
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
return clientIp || emptyIp;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
module.exports = getRequestIP;
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "1.16.29-beta-
|
|
6
|
+
"version": "1.16.29-beta-bc7cae11",
|
|
7
7
|
"description": "ArcBlock's JavaScript utility",
|
|
8
8
|
"main": "lib/index.js",
|
|
9
9
|
"files": [
|
|
@@ -18,15 +18,15 @@
|
|
|
18
18
|
"author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
|
|
19
19
|
"license": "Apache-2.0",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@abtnode/constant": "1.16.29-beta-
|
|
22
|
-
"@abtnode/logger": "1.16.29-beta-
|
|
21
|
+
"@abtnode/constant": "1.16.29-beta-bc7cae11",
|
|
22
|
+
"@abtnode/logger": "1.16.29-beta-bc7cae11",
|
|
23
23
|
"@arcblock/pm2": "^5.4.0",
|
|
24
|
-
"@blocklet/constant": "1.16.29-beta-
|
|
25
|
-
"@blocklet/meta": "1.16.29-beta-
|
|
26
|
-
"@ocap/client": "1.18.
|
|
27
|
-
"@ocap/mcrypto": "1.18.
|
|
28
|
-
"@ocap/util": "1.18.
|
|
29
|
-
"@ocap/wallet": "1.18.
|
|
24
|
+
"@blocklet/constant": "1.16.29-beta-bc7cae11",
|
|
25
|
+
"@blocklet/meta": "1.16.29-beta-bc7cae11",
|
|
26
|
+
"@ocap/client": "1.18.128",
|
|
27
|
+
"@ocap/mcrypto": "1.18.128",
|
|
28
|
+
"@ocap/util": "1.18.128",
|
|
29
|
+
"@ocap/wallet": "1.18.128",
|
|
30
30
|
"archiver": "^7.0.1",
|
|
31
31
|
"axios": "^1.7.2",
|
|
32
32
|
"axios-mock-adapter": "^1.21.2",
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"parallel-transform": "^1.2.0",
|
|
57
57
|
"public-ip": "^4.0.4",
|
|
58
58
|
"pump": "^3.0.0",
|
|
59
|
+
"request-ip": "^3.3.0",
|
|
59
60
|
"resolve": "^1.22.8",
|
|
60
61
|
"semver": "^7.6.2",
|
|
61
62
|
"semver-sort": "^1.0.0",
|
|
@@ -79,5 +80,5 @@
|
|
|
79
80
|
"fs-extra": "^11.2.0",
|
|
80
81
|
"jest": "^29.7.0"
|
|
81
82
|
},
|
|
82
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "bb2ff5fc40838a48a59db65871d5640f6b427f0e"
|
|
83
84
|
}
|