CERBERUS/outline-server
1
0
Fork 0
mirror of https://github.com/OutlineFoundation/outline-server.git synced 2026-05-13 13:58:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update outline-shadowsocksconfig

Browse source
This commit is contained in:
Vinicius Fortuna 2022-03-08 21:33:24 +00:00
parent 76ce87223f
commit 7e928bb5d9
3 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

79
package-lock.json generated
View file

@ -20,8 +20,8 @@
"typescript": "^4"
},
"engines": {
"node": ">=16.13.0",
"npm": ">=8.1.0"
"node": "^16.13.0",
"npm": "^8.1.0"
}
},
"node_modules/@babel/code-frame": {
@ -13611,6 +13611,24 @@
"resolved": "src/shadowbox",
"link": true
},
"node_modules/outline-shadowsocksconfig": {
"version": "0.2.0",
"resolved": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#add590ed57277653d02dd2031ae301500ae881e1",
"license": "Apache-2.0",
"dependencies": {
"ipaddr.js": "^2.0.0",
"js-base64": "^3.5.2",
"punycode": "^1.4.1"
}
},
"node_modules/outline-shadowsocksconfig/node_modules/ipaddr.js": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
"engines": {
"node": ">= 10"
}
},
"node_modules/p-cancelable": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
@ -16858,25 +16876,6 @@
"sha.js": "bin.js"
}
},
"node_modules/ShadowsocksConfig": {
"name": "outline-shadowsocksconfig",
"version": "0.1.4",
"resolved": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#88c9459b12d8810748d76295110f71c988d8a196",
"license": "Apache-2.0",
"dependencies": {
"ipaddr.js": "^2.0.0",
"js-base64": "^3.5.2",
"punycode": "^1.4.1"
}
},
"node_modules/ShadowsocksConfig/node_modules/ipaddr.js": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
"engines": {
"node": ">= 10"
}
},
"node_modules/shallow-clone": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@ -21471,18 +21470,18 @@
},
"src/shadowbox": {
"name": "outline-server",
"version": "1.6.1",
"version": "1.6.2",
"license": "Apache",
"dependencies": {
"ip-regex": "^4.1.0",
"js-yaml": "^3.12.0",
"node-fetch": "^2.6.1",
"outline-shadowsocksconfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.0",
"prom-client": "^11.1.3",
"randomstring": "^1.1.5",
"restify": "^8.5.1",
"restify-cors-middleware": "^1.1.1",
"restify-errors": "^8.0.2",
"ShadowsocksConfig": "Jigsaw-Code/outline-shadowsocksconfig#v0.1.4",
"uuid": "^3.1.0"
},
"devDependencies": {
@ -32935,12 +32934,12 @@
"ip-regex": "^4.1.0",
"js-yaml": "^3.12.0",
"node-fetch": "^2.6.1",
"outline-shadowsocksconfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.0",
"prom-client": "^11.1.3",
"randomstring": "^1.1.5",
"restify": "^8.5.1",
"restify-cors-middleware": "^1.1.1",
"restify-errors": "^8.0.2",
"ShadowsocksConfig": "Jigsaw-Code/outline-shadowsocksconfig#v0.1.4",
"tmp": "^0.2.1",
"ts-loader": "^7.0.4",
"uuid": "^3.1.0",
@ -32956,6 +32955,22 @@
}
}
},
"outline-shadowsocksconfig": {
"version": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#add590ed57277653d02dd2031ae301500ae881e1",
"from": "outline-shadowsocksconfig@github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.0",
"requires": {
"ipaddr.js": "^2.0.0",
"js-base64": "^3.5.2",
"punycode": "^1.4.1"
},
"dependencies": {
"ipaddr.js": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
}
}
},
"p-cancelable": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
@ -35610,22 +35625,6 @@
"safe-buffer": "^5.0.1"
}
},
"ShadowsocksConfig": {
"version": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#88c9459b12d8810748d76295110f71c988d8a196",
"from": "ShadowsocksConfig@Jigsaw-Code/outline-shadowsocksconfig#v0.1.4",
"requires": {
"ipaddr.js": "^2.0.0",
"js-base64": "^3.5.2",
"punycode": "^1.4.1"
},
"dependencies": {
"ipaddr.js": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
}
}
},
"shallow-clone": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",

4
src/shadowbox/package.json
View file

@ -1,7 +1,7 @@
{
"name": "outline-server",
"private": true,
"version": "1.6.1",
"version": "1.6.2",
"description": "Outline server",
"main": "build/server/main.js",
"author": "Outline",
@ -10,10 +10,10 @@
"Using https:// for ShadowsocksConfig to avoid adding git in the Docker image"
],
"dependencies": {
"ShadowsocksConfig": "Jigsaw-Code/outline-shadowsocksconfig#v0.1.4",
"ip-regex": "^4.1.0",
"js-yaml": "^3.12.0",
"node-fetch": "^2.6.1",
"outline-shadowsocksconfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.0",
"prom-client": "^11.1.3",
"randomstring": "^1.1.5",
"restify": "^8.5.1",

2
src/shadowbox/server/manager_service.ts
View file

@ -16,7 +16,7 @@ import * as crypto from 'crypto';
import * as ipRegex from 'ip-regex';
import * as restify from 'restify';
import * as restifyErrors from 'restify-errors';
import {makeConfig, SIP002_URI} from 'ShadowsocksConfig';
import {makeConfig, SIP002_URI} from 'outline-shadowsocksconfig';
import {JsonConfig} from '../infrastructure/json_config';
import * as logging from '../infrastructure/logging';