@peerbit/server 5.8.2-c30b40f → 5.8.2
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/dist/src/cli.d.ts.map +1 -1
- package/dist/src/cli.js +2 -7
- package/dist/src/cli.js.map +1 -1
- package/dist/src/domain.d.ts +1 -1
- package/dist/src/domain.d.ts.map +1 -1
- package/dist/src/domain.js +2 -10
- package/dist/src/domain.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +89 -89
- package/src/cli.ts +2 -7
- package/src/domain.ts +1 -13
package/package.json
CHANGED
|
@@ -1,91 +1,91 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
2
|
+
"name": "@peerbit/server",
|
|
3
|
+
"version": "5.8.2",
|
|
4
|
+
"author": "dao.xyz",
|
|
5
|
+
"repository": {
|
|
6
|
+
"type": "git",
|
|
7
|
+
"url": "https://github.com/dao-xyz/peerbit"
|
|
8
|
+
},
|
|
9
|
+
"license": "Apache-2.0",
|
|
10
|
+
"type": "module",
|
|
11
|
+
"sideEffects": false,
|
|
12
|
+
"bin": {
|
|
13
|
+
"peerbit": "./dist/src/bin.js"
|
|
14
|
+
},
|
|
15
|
+
"module": "dist/src/index.js",
|
|
16
|
+
"types": "dist/src/index.d.ts",
|
|
17
|
+
"exports": {
|
|
18
|
+
"import": "./dist/src/index.js"
|
|
19
|
+
},
|
|
20
|
+
"browser": {
|
|
21
|
+
"./dist/src/server.js": "./dist/src/server.browser.js",
|
|
22
|
+
"./server.js": "./dist/src/server.browser.js",
|
|
23
|
+
"./dist/src/config.js": "./dist/src/config.browser.js",
|
|
24
|
+
"./config.js": "./dist/src/config.browser.js",
|
|
25
|
+
"./dist/src/remotes.js": "./dist/src/remotes.browser.js",
|
|
26
|
+
"./remotes.js": "./dist/src/remotes.browser.js",
|
|
27
|
+
"./dist/src/docker.js": "./dist/src/docker.browser.js",
|
|
28
|
+
"./docker.js": "./dist/src/docker.browser.js",
|
|
29
|
+
"./dist/src/aws.js": "./dist/src/aws.browser.js"
|
|
30
|
+
},
|
|
31
|
+
"files": [
|
|
32
|
+
"dist",
|
|
33
|
+
"src",
|
|
34
|
+
"src/nginx-template.conf",
|
|
35
|
+
"!src/test",
|
|
36
|
+
"!src/**/__tests__",
|
|
37
|
+
"!lib/**/__tests__",
|
|
38
|
+
"patches",
|
|
39
|
+
"LICENSE"
|
|
40
|
+
],
|
|
41
|
+
"publishConfig": {
|
|
42
|
+
"access": "public"
|
|
43
|
+
},
|
|
44
|
+
"engines": {
|
|
45
|
+
"node": ">=18"
|
|
46
|
+
},
|
|
47
|
+
"eslintConfig": {
|
|
48
|
+
"extends": "peerbit",
|
|
49
|
+
"parserOptions": {
|
|
50
|
+
"project": true,
|
|
51
|
+
"sourceType": "module"
|
|
52
|
+
},
|
|
53
|
+
"ignorePatterns": [
|
|
54
|
+
"!.aegir.js",
|
|
55
|
+
"test/ts-use",
|
|
56
|
+
"*.d.ts"
|
|
57
|
+
]
|
|
58
|
+
},
|
|
59
|
+
"scripts": {
|
|
60
|
+
"clean": "shx rm -rf lib/*",
|
|
61
|
+
"build": "yarn clean && yarn build-lib && yarn build-ui",
|
|
62
|
+
"build-lib": "tsc -p tsconfig.json",
|
|
63
|
+
"build-ui": "cd ../frontend && yarn build && cd ../node",
|
|
64
|
+
"postbuild": "cp src/nginx-template.conf dist/src/ && cp -r ../frontend/dist/. dist/ui",
|
|
65
|
+
"test": "aegir test --t node",
|
|
66
|
+
"lint": "aegir lint"
|
|
67
|
+
},
|
|
68
|
+
"devDependencies": {
|
|
69
|
+
"@peerbit/test-lib": "^0.0.1",
|
|
70
|
+
"@peerbit/test-utils": "2.2.0",
|
|
71
|
+
"@types/yargs": "17.0.24",
|
|
72
|
+
"aws-sdk": "^2.1259.0",
|
|
73
|
+
"dotenv": "^16.1.4",
|
|
74
|
+
"@types/tmp": "^0.2.3",
|
|
75
|
+
"@types/tar-stream": "^3.1.3",
|
|
76
|
+
"shx": "^0.3.4"
|
|
77
|
+
},
|
|
78
|
+
"dependencies": {
|
|
79
|
+
"axios": "^1.4.0",
|
|
80
|
+
"chalk": "^5.3.0",
|
|
81
|
+
"peerbit": "4.3.0",
|
|
82
|
+
"yargs": "^17.7.2",
|
|
83
|
+
"tar-stream": "^3.1.7",
|
|
84
|
+
"tmp": "^0.2.1",
|
|
85
|
+
"tty-table": "^4.2.1"
|
|
86
|
+
},
|
|
87
|
+
"optionalDependencies": {
|
|
88
|
+
"@aws-sdk/client-ec2": "^3.390.0",
|
|
89
|
+
"@aws-sdk/client-route-53": "^3.391.0"
|
|
90
|
+
}
|
|
91
91
|
}
|
package/src/cli.ts
CHANGED
|
@@ -218,11 +218,6 @@ export const cli = async (args?: string[]) => {
|
|
|
218
218
|
describe:
|
|
219
219
|
"Setup a testing domain with SSL (no guarantess on how long the domain will be available)",
|
|
220
220
|
builder: {
|
|
221
|
-
email: {
|
|
222
|
-
describe: "Email for Lets security messages",
|
|
223
|
-
type: "string",
|
|
224
|
-
demandOption: true,
|
|
225
|
-
},
|
|
226
221
|
outdir: {
|
|
227
222
|
describe: "Output path for Nginx config",
|
|
228
223
|
type: "string",
|
|
@@ -237,7 +232,7 @@ export const cli = async (args?: string[]) => {
|
|
|
237
232
|
},
|
|
238
233
|
handler: async (args) => {
|
|
239
234
|
const domain = await createTestDomain();
|
|
240
|
-
await startCertbot(domain, args.
|
|
235
|
+
await startCertbot(domain, args.wait);
|
|
241
236
|
exit();
|
|
242
237
|
},
|
|
243
238
|
})
|
|
@@ -305,7 +300,7 @@ export const cli = async (args?: string[]) => {
|
|
|
305
300
|
}
|
|
306
301
|
: undefined,
|
|
307
302
|
});
|
|
308
|
-
await startCertbot(args.domain, args.
|
|
303
|
+
await startCertbot(args.domain, args.wait);
|
|
309
304
|
exit();
|
|
310
305
|
},
|
|
311
306
|
})
|
package/src/domain.ts
CHANGED
|
@@ -121,23 +121,11 @@ export const createTestDomain = async () => {
|
|
|
121
121
|
return domain;
|
|
122
122
|
};
|
|
123
123
|
|
|
124
|
-
const validateEmail = (email: any) => {
|
|
125
|
-
return String(email)
|
|
126
|
-
.toLowerCase()
|
|
127
|
-
.match(
|
|
128
|
-
/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
|
|
129
|
-
);
|
|
130
|
-
};
|
|
131
|
-
|
|
132
124
|
export const startCertbot = async (
|
|
133
125
|
domain: string,
|
|
134
|
-
email: string,
|
|
135
126
|
waitForUp = false,
|
|
136
127
|
dockerProcessName = "nginx-certbot",
|
|
137
128
|
): Promise<void> => {
|
|
138
|
-
if (!validateEmail(email)) {
|
|
139
|
-
throw new Error("Email for SSL renenewal is invalid");
|
|
140
|
-
}
|
|
141
129
|
const { installDocker, startContainer } = await import("./docker.js");
|
|
142
130
|
|
|
143
131
|
const nginxConfigPath = await getNginxFolderPath();
|
|
@@ -153,7 +141,7 @@ export const startCertbot = async (
|
|
|
153
141
|
// copy ui from node_modules to home for permission reasons (volume will not work otherwise)
|
|
154
142
|
const certbotDockerCommand = `cp -r ${uiPath} $(pwd)/ui && docker pull jonasal/nginx-certbot:latest && docker run -d --net=host \
|
|
155
143
|
--restart unless-stopped \
|
|
156
|
-
|
|
144
|
+
${isTest ? "--env STAGING=1" : ""}\
|
|
157
145
|
-v $(pwd)/nginx_secrets:/etc/letsencrypt \
|
|
158
146
|
-v ${nginxConfigPath}:/etc/nginx/user_conf.d:ro \
|
|
159
147
|
-v $(pwd)/ui:/usr/share/nginx/html:ro \
|