@rpgjs/server 4.0.0-rc.12 → 4.0.0-rc.13
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 +8 -0
- package/lib/express/server.js +8 -11
- package/lib/express/server.js.map +1 -1
- package/package.json +7 -7
- package/src/express/server.ts +8 -12
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
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
|
+
# 4.0.0-rc.13 (2023-09-09)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rpgjs/server
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
# 4.0.0-rc.12 (2023-09-08)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @rpgjs/server
|
package/lib/express/server.js
CHANGED
|
@@ -10,8 +10,9 @@ import { Query } from '../Query.js';
|
|
|
10
10
|
export function expressServer(modules, options) {
|
|
11
11
|
return new Promise((resolve, reject) => {
|
|
12
12
|
const envs = options.envs || {};
|
|
13
|
+
const { express: expressConfig = {} } = options.globalConfig || {};
|
|
13
14
|
const dirname = options.basePath;
|
|
14
|
-
const PORT = process.env.PORT || 3000;
|
|
15
|
+
const PORT = process.env.PORT || expressConfig.port || 3000;
|
|
15
16
|
const pe = new PrettyError();
|
|
16
17
|
const app = express();
|
|
17
18
|
const server = http.createServer(app);
|
|
@@ -20,23 +21,19 @@ export function expressServer(modules, options) {
|
|
|
20
21
|
cors: {
|
|
21
22
|
origin: "*",
|
|
22
23
|
methods: ["GET", "POST"]
|
|
23
|
-
}
|
|
24
|
+
},
|
|
25
|
+
...(expressConfig.socketIo || {})
|
|
24
26
|
});
|
|
25
27
|
// @ts-ignore
|
|
26
28
|
const isBuilt = !!envs.VITE_BUILT;
|
|
27
29
|
// @ts-ignore
|
|
28
30
|
const hasStatic = process.env.STATIC_DIRECTORY_ENABLED;
|
|
29
|
-
const staticDirectory = isBuilt ?
|
|
31
|
+
const staticDirectory = isBuilt ? expressConfig.static : 'dist';
|
|
30
32
|
// @ts-ignore
|
|
31
33
|
const staticEnabled = (isBuilt && hasStatic === undefined) || hasStatic === 'true';
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
limit: '50mb'
|
|
36
|
-
}));
|
|
37
|
-
}
|
|
38
|
-
app.use(cors());
|
|
39
|
-
if (staticEnabled) {
|
|
34
|
+
app.use(express.json(expressConfig.json));
|
|
35
|
+
app.use(cors(expressConfig.cors));
|
|
36
|
+
if (staticEnabled || expressConfig.static) {
|
|
40
37
|
app.use('/', express.static(path.join(dirname, '..', staticDirectory, 'client')));
|
|
41
38
|
}
|
|
42
39
|
let rpgGame;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/express/server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,UAAU,MAAM,gBAAgB,CAAA;AACvC,OAAO,WAAW,MAAM,cAAc,CAAA;AAGtC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAQhC,MAAM,UAAU,aAAa,CAAC,OAAqB,EAAE,OAA6B;IAK9E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;QAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/express/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rpgjs/server",
|
|
3
|
-
"version": "4.0.0-rc.
|
|
3
|
+
"version": "4.0.0-rc.13",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"author": "Samuel Ronce",
|
|
28
28
|
"license": "MIT",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@rpgjs/common": "^4.0.0-rc.
|
|
31
|
-
"@rpgjs/database": "^4.0.0-rc.
|
|
32
|
-
"@rpgjs/tiled": "^4.0.0-rc.
|
|
33
|
-
"@rpgjs/types": "^4.0.0-rc.
|
|
30
|
+
"@rpgjs/common": "^4.0.0-rc.13",
|
|
31
|
+
"@rpgjs/database": "^4.0.0-rc.13",
|
|
32
|
+
"@rpgjs/tiled": "^4.0.0-rc.13",
|
|
33
|
+
"@rpgjs/types": "^4.0.0-rc.13",
|
|
34
34
|
"axios": "^1.3.6",
|
|
35
35
|
"cors": "^2.8.5",
|
|
36
36
|
"express": "^4.18.2",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
"simple-room": "^2.4.1",
|
|
43
43
|
"socket.io": "^4.6.1"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "09fc1bcbcf5912c751652a28452bf5674cf251e5",
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@rpgjs/compiler": "^4.0.0-rc.
|
|
47
|
+
"@rpgjs/compiler": "^4.0.0-rc.13",
|
|
48
48
|
"typescript": "^5.0.4"
|
|
49
49
|
},
|
|
50
50
|
"alias": {
|
package/src/express/server.ts
CHANGED
|
@@ -23,8 +23,9 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
|
|
|
23
23
|
}> {
|
|
24
24
|
return new Promise((resolve, reject) => {
|
|
25
25
|
const envs = options.envs || {}
|
|
26
|
+
const { express: expressConfig = {} } = options.globalConfig || {}
|
|
26
27
|
const dirname = options.basePath
|
|
27
|
-
const PORT = process.env.PORT || 3000
|
|
28
|
+
const PORT = process.env.PORT || expressConfig.port || 3000
|
|
28
29
|
const pe = new PrettyError()
|
|
29
30
|
const app = express()
|
|
30
31
|
const server = http.createServer(app)
|
|
@@ -33,7 +34,8 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
|
|
|
33
34
|
cors: {
|
|
34
35
|
origin: "*",
|
|
35
36
|
methods: ["GET", "POST"]
|
|
36
|
-
}
|
|
37
|
+
},
|
|
38
|
+
...(expressConfig.socketIo || {})
|
|
37
39
|
})
|
|
38
40
|
|
|
39
41
|
// @ts-ignore
|
|
@@ -41,20 +43,14 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
|
|
|
41
43
|
|
|
42
44
|
// @ts-ignore
|
|
43
45
|
const hasStatic = process.env.STATIC_DIRECTORY_ENABLED
|
|
44
|
-
const staticDirectory = isBuilt ?
|
|
46
|
+
const staticDirectory = isBuilt ? expressConfig.static : 'dist'
|
|
45
47
|
// @ts-ignore
|
|
46
48
|
const staticEnabled = (isBuilt && hasStatic === undefined) || hasStatic === 'true'
|
|
47
49
|
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
// TODO
|
|
51
|
-
limit: '50mb'
|
|
52
|
-
}))
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
app.use(cors())
|
|
50
|
+
app.use(express.json(expressConfig.json))
|
|
51
|
+
app.use(cors(expressConfig.cors))
|
|
56
52
|
|
|
57
|
-
if (staticEnabled) {
|
|
53
|
+
if (staticEnabled || expressConfig.static) {
|
|
58
54
|
app.use('/', express.static(path.join(dirname, '..', staticDirectory, 'client')))
|
|
59
55
|
}
|
|
60
56
|
|