Moving action pipe files into a new /pipe/ directory for organization

Author: Tynarus

src/engine/action/action-pipeline.ts

@@ -3,7 +3,6 @@ import { Subscription } from 'rxjs';
 import { logger } from '@runejs/core';
 import { LandscapeObject } from '@runejs/filestore';
 
-import { gameEngineDist, getFiles } from '@engine/util';
 import { Actor, Player } from '@engine/world/actor';
 import { ActionHook, TaskExecutor } from '@engine/action';
 import { Position } from '@engine/world';
@@ -224,39 +223,3 @@ export class ActionPipeline {
     }
 
 }
-
-
-/**
- * Finds and loads all available action pipe files (`*.action.ts`).
- */
-export async function loadActionFiles(): Promise<void> {
-    const ACTION_DIRECTORY = `${gameEngineDist}/world/action`;
-    const blacklist = [];
-    const loadedActions: string[] = [];
-
-    for await(const path of getFiles(ACTION_DIRECTORY, blacklist)) {
-        if(!path.endsWith('.action.ts') && !path.endsWith('.action.js')) {
-            continue;
-        }
-
-        const location = '.' + path.substring(ACTION_DIRECTORY.length).replace('.js', '');
-
-        try {
-            const importedAction = (require(location)?.default || null) as ActionPipe | null;
-            if(importedAction && Array.isArray(importedAction) && importedAction[0] && importedAction[1]) {
-                ActionPipeline.register(importedAction[0], importedAction[1]);
-                loadedActions.push(importedAction[0]);
-            }
-        } catch(error) {
-            logger.error(`Error loading action file at ${location}:`);
-            logger.error(error);
-        }
-    }
-
-    logger.info(`Loaded action pipes: ${loadedActions.join(', ')}.`);
-
-    return Promise.resolve();
-}
-
-
-export * from './hooks';

src/engine/action/hooks/action-hook.ts src/engine/action/hook/action-hook.tssrc/engine/action/hooks/action-hook.ts renamed to src/engine/action/hook/action-hook.ts

@@ -1,21 +1,4 @@
 export * from './action-pipeline';
-export * from './button.action';
-export * from './equipment-change.action';
-export * from './item-interaction.action';
-export * from './item-on-item.action';
-export * from './item-on-npc.action';
-export * from './item-on-object.action';
-export * from './item-on-player.action';
-export * from './item-swap.action';
-export * from './magic-on-npc.action';
-export * from './move-item.action';
-export * from './npc-init.action';
-export * from './npc-interaction.action';
-export * from './object-interaction.action';
-export * from './player-command.action';
-export * from './player-init.action';
-export * from './player-interaction.action';
-export * from './prayer.action';
-export * from './region-change.action';
-export * from './spawned-item-interaction.action';
-export * from './widget-interaction.action';
+export * from './hook';
+export * from './pipe';
+export * from './loader';

src/engine/action/hooks/hook-filters.ts src/engine/action/hook/hook-filters.tssrc/engine/action/hooks/hook-filters.ts renamed to src/engine/action/hook/hook-filters.ts

@@ -0,0 +1,40 @@
+import { logger } from '@runejs/core';
+
+import { ActionPipe, ActionPipeline } from '@engine/action';
+import { getFiles } from '@engine/util';
+import { BUILD_DIR } from '@engine/config';
+import { join } from 'path';
+
+
+/**
+ * Finds and loads all available action pipe files (`*.action.ts`).
+ */
+export async function loadActionFiles(): Promise<void> {
+    const ACTION_DIRECTORY = join(BUILD_DIR, 'action');
+    const PIPE_DIRECTORY = join(ACTION_DIRECTORY, 'pipe');
+    const blacklist = [];
+    const loadedActions: string[] = [];
+
+    for await(const path of getFiles(PIPE_DIRECTORY, blacklist)) {
+        if(!path.endsWith('.action.ts') && !path.endsWith('.action.js')) {
+            continue;
+        }
+
+        const location = '.' + path.substring(ACTION_DIRECTORY.length).replace('.js', '');
+
+        try {
+            const importedAction = (require(location)?.default || null) as ActionPipe | null;
+            if(importedAction && Array.isArray(importedAction) && importedAction[0] && importedAction[1]) {
+                ActionPipeline.register(importedAction[0], importedAction[1]);
+                loadedActions.push(importedAction[0]);
+            }
+        } catch(error) {
+            logger.error(`Error loading action file at ${location}:`);
+            logger.error(error);
+        }
+    }
+
+    logger.info(`Loaded action pipes: ${loadedActions.join(', ')}.`);
+
+    return Promise.resolve();
+}

src/engine/action/hooks/index.ts src/engine/action/hook/index.tssrc/engine/action/hooks/index.ts renamed to src/engine/action/hook/index.ts

@@ -0,0 +1,20 @@
+export * from './button.action';
+export * from './equipment-change.action';
+export * from './item-interaction.action';
+export * from './item-on-item.action';
+export * from './item-on-npc.action';
+export * from './item-on-object.action';
+export * from './item-on-player.action';
+export * from './item-swap.action';
+export * from './magic-on-npc.action';
+export * from './move-item.action';
+export * from './npc-init.action';
+export * from './npc-interaction.action';
+export * from './object-interaction.action';
+export * from './player-command.action';
+export * from './player-init.action';
+export * from './player-interaction.action';
+export * from './prayer.action';
+export * from './region-change.action';
+export * from './spawned-item-interaction.action';
+export * from './widget-interaction.action';