Merge pull request #368 from runejs/kiko/reload-content-fix

Fixing the reload content functionality

Author: Katilith

package.json

@@ -12,7 +12,7 @@
         "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",
-        "game:dev": "npm run start:game",
+        "game:dev": "npm run start:game:dev",
         "login": "npm run start:login",
         "update": "npm run start:update",
         "infra": "npm run start:infra",

src/engine/action/pipe/player-command.action.ts

@@ -1,5 +1,7 @@
 import { Player } from '@engine/world/actor';
 import { ActionHook, getActionHooks, ActionPipe, RunnableHooks } from '@engine/action';
+import { reloadContent, reloadContentCommands } from '@engine/plugins/reload-content';
+import { logger } from '@runejs/common';
 
 
 /**
@@ -49,6 +51,12 @@ const playerCommandActionPipe = (player: Player, command: string, isConsole: boo
                                  inputArgs: string[]): RunnableHooks<PlayerCommandAction> => {
     command = command.toLowerCase();
 
+    // Reload game content
+    if (reloadContentCommands.indexOf(command) !== -1) {
+        reloadContent(player, isConsole).catch(logger.error);
+        return;
+    }
+
     const actionArgs = {};
 
     const plugins = getActionHooks<PlayerCommandActionHook>('player_command').filter(actionHook => {

src/engine/config/shop-config.ts

@@ -3,7 +3,7 @@ import { findItem, widgets } from '@engine/config/config-handler';
 import { loadConfigurationFiles } from '@runejs/common/fs';
 import { Player } from '@engine/world/actor/player/player';
 import { ItemDetails } from '@engine/config/item-config';
-import { WidgetClosedEvent } from '@engine/world/actor/player/interface-state';
+import { WidgetClosedEvent } from '@engine/interface';
 import { Subscription } from 'rxjs';
 
 

src/engine/interface/index.ts

@@ -0,0 +1 @@
+export * from './interface-state';

src/engine/world/actor/player/interface-state.ts renamed to src/engine/interface/interface-state.ts

@@ -0,0 +1,96 @@
+import { sep } from 'path';
+import { loadGameConfigurations } from '@engine/config';
+import { loadPackets } from '@engine/net';
+import { loadPlugins } from '@engine/plugins/loader';
+import { logger } from '@runejs/common';
+import { Player } from '@engine/world/actor';
+
+
+export const reloadContentCommands = [
+    'plugins', 'reload', 'content', 'hotload', 'refresh', 'restart', 'r'
+];
+
+export const reloadContent = async (player: Player, isConsole: boolean = false) => {
+    player.sendLogMessage(' ', isConsole);
+    player.sendLogMessage('Deleting content cache...', isConsole);
+
+    const includeList = [
+        'plugins'
+    ].map(p => sep + p + sep);
+
+    const ignoreList = [
+        'node_modules',
+        'engine',
+        'server'
+    ].map(p => sep + p + sep);
+
+    const pluginCache = [];
+    const cacheKeys = Object.keys(require.cache);
+
+    // Delete node cache for all the old JS plugins
+    cacheLoop:
+    for (const cacheKey of cacheKeys) {
+        const cachedItem = require.cache[cacheKey];
+
+        if (!cachedItem) {
+            continue;
+        }
+
+        const path = typeof cachedItem === 'string' ? cachedItem : cachedItem?.path;
+
+        if (!path) {
+            continue;
+        }
+
+        for (const ignoreItem of ignoreList) {
+            if (path.indexOf(ignoreItem) !== -1) {
+                continue cacheLoop;
+            }
+        }
+
+        let includePath = false;
+
+        for (const includeItem of includeList) {
+            if (path.indexOf(includeItem) !== -1) {
+                includePath = true;
+                break;
+            }
+        }
+
+        if (includePath) {
+            pluginCache.push(cacheKey);
+        }
+    }
+
+    console.log(pluginCache);
+
+    for (const key of pluginCache) {
+        delete require.cache[require.resolve(key)];
+    }
+
+    try {
+        player.sendLogMessage('Reloading plugins...', isConsole);
+        await loadPlugins();
+    } catch (error) {
+        player.sendLogMessage('Error reloading content.', isConsole);
+        logger.error(error);
+    }
+
+    try {
+        player.sendLogMessage('Reloading configurations...', isConsole);
+        await loadGameConfigurations();
+    } catch (error) {
+        player.sendLogMessage('Error reloading configurations.', isConsole);
+        logger.error(error);
+    }
+
+    try {
+        player.sendLogMessage('Reloading packets...', isConsole);
+        await loadPackets();
+    } catch (error) {
+        player.sendLogMessage('Error reloading packets.', isConsole);
+        logger.error(error);
+    }
+
+    player.sendLogMessage('Reload completed.', isConsole);
+};