Merge pull request #351 from runejs/feature/server-module

Splitting server-specific code out into a new @server submodule

Author: Tynarus

.babelrc

@@ -14,7 +14,8 @@
         [ "babel-plugin-module-resolver", {
             "root": [ "./src" ],
             "alias": {
-                "@engine": "./dist/game-engine",
+                "@engine": "./dist/engine",
+                "@server": "./dist/server",
                 "@plugins": "./dist/plugins"
             }
         } ]

package.json

@@ -5,10 +5,10 @@
     "main": "dist/index.js",
     "scripts": {
         "start": "npm run build && concurrently \"npm run build:watch\" \"npm run start:infra\" \"npm run start:game\"",
-        "start:game": "nodemon --delay 5000ms --max-old-space-size=2048 dist/main.js",
+        "start:game": "nodemon --delay 5000ms --max-old-space-size=2048 dist/server/runner.js -- -game",
         "start:game:dev": "npm run build && concurrently \"npm run build:watch\" \"npm run start:game\"",
-        "start:login": "node --max-old-space-size=1024 dist/game-engine/login-server.js",
-        "start:update": "node --max-old-space-size=1024 dist/game-engine/update-server.js",
+        "start:login": "node --max-old-space-size=1024 dist/server/runner.js -- -login",
+        "start:update": "node --max-old-space-size=1024 dist/server/runner.js -- -update",
         "start:infra": "concurrently \"npm run start:update\" \"npm run start:login\"",
         "start:standalone": "concurrently \"npm run start:infra\" \"npm run start:game\"",
         "game": "npm run start:game",

src/game-engine/config/config-handler.ts src/engine/config/config-handler.tssrc/game-engine/config/config-handler.ts renamed to src/engine/config/config-handler.ts

@@ -1,3 +1,4 @@
+import 'json5/lib/register';
 import { logger } from '@runejs/core';
 import _ from 'lodash';
 import {
@@ -6,7 +7,7 @@ import {
     loadItemConfigurations,
     translateItemConfig
 } from '@engine/config/item-config';
-import { filestore, questMap } from '@engine/game-server';
+import { filestore } from '@server/game/game-server';
 import {
     loadNpcConfigurations,
     NpcDetails,
@@ -15,13 +16,11 @@ import {
 } from '@engine/config/npc-config';
 import { loadNpcSpawnConfigurations, NpcSpawn } from '@engine/config/npc-spawn-config';
 import { loadShopConfigurations, Shop } from '@engine/config/shop-config';
-import { Quest } from '@engine/world/actor/player/quest';
+import { Quest } from '@engine/world/actor';
 import { ItemSpawn, loadItemSpawnConfigurations } from '@engine/config/item-spawn-config';
 import { loadMusicRegionConfigurations, MusicTrack } from '@engine/config/music-regions-config';
 import { loadXteaRegionFiles, ObjectConfig, XteaRegion } from '@runejs/filestore';
-
-require('json5/lib/register');
-
+import { questMap } from '@engine/plugins';
 
 
 export let itemMap: { [key: string]: ItemDetails };

src/game-engine/config/data-dump.ts src/engine/config/data-dump.tssrc/game-engine/config/data-dump.ts renamed to src/engine/config/data-dump.ts

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { writeFileSync } from 'fs';
-import { filestore } from '@engine/game-server';
+import { filestore } from '@server/game/game-server';
 import { logger } from '@runejs/core';
 import { ItemConfig, NpcConfig, ObjectConfig, WidgetBase } from '@runejs/filestore';
 

src/game-engine/config/index.ts src/engine/config/index.tssrc/game-engine/config/index.ts renamed to src/engine/config/index.ts

@@ -5,5 +5,4 @@ export * from './music-regions-config';
 export * from './npc-config';
 export * from './npc-spawn-config';
 export * from './quest-config';
-export * from './server-config';
 export * from './shop-config';

src/game-engine/config/item-config.ts src/engine/config/item-config.tssrc/game-engine/config/item-config.ts renamed to src/engine/config/item-config.ts

@@ -1,6 +1,6 @@
 import { DefensiveBonuses } from '@engine/config/item-config';
 import { loadConfigurationFiles } from '@runejs/core/fs';
-import { filestore } from '@engine/game-server';
+import { filestore } from '@server/game/game-server';
 import _ from 'lodash';
 import { NpcConfig } from '@runejs/filestore';
 import { logger } from '@runejs/core';