package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squeebot/core",
-  "version": "3.7.0",
+  "version": "3.6.3",
   "description": "Squeebot v3 core for the execution environment",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

src/channel/index.ts

@@ -17,9 +17,9 @@ export interface IChannel {
  * list are the handlers.
  */
 export class ChannelManager {
-  protected channels: IChannel[] = [];
+  private channels: IChannel[] = [];
 
-  constructor(protected stream: ScopedEventEmitter) {}
+  constructor(private stream: ScopedEventEmitter) {}
 
   /**
    * Ensure that the message or event source is a plugin
@@ -68,10 +68,8 @@ export class ChannelManager {
           }
 
           for (const pl of chan.plugins) {
-            if (
+            if (pl !== source &&
-              pl !== source &&
+              !(pl.indexOf('/') !== -1 && pl.split('/')[0] === source)) {
-              !(pl.indexOf('/') !== -1 && pl.split('/')[0] === source)
-            ) {
               this.stream.emitTo(pl, event, data, chan, msr);
             }
           }
@@ -86,10 +84,7 @@ export class ChannelManager {
    * @param source Source protocol of the event
    * @returns List of channels to send to
    */
-  protected getChannelsByPluginName(
+  private getChannelsByPluginName(plugin: string, source: Protocol): IChannel[] {
-    plugin: string,
-    source: Protocol
-  ): IChannel[] {
     const list = [];
     for (const chan of this.channels) {
       if (chan.enabled === false) {
@@ -113,7 +108,7 @@ export class ChannelManager {
    * Validate a preconfigured channel list and add them to the list
    * @param channels Preconfigured channel list
    */
-  protected addPreconfiguredChannels(channels: IChannel[]): void {
+  private addPreconfiguredChannels(channels: IChannel[]): void {
     for (const chan of channels) {
       if (!chan.name) {
         throw new Error('Channel name is mandatory.');
@@ -133,7 +128,7 @@ export class ChannelManager {
    * @returns Channel or undefined
    */
   public getChannelByName(name: string): IChannel | undefined {
-    return this.channels.find((c) => c.name === name);
+    return this.channels.find(c => c.name === name);
   }
 
   /**

src/common/full-matcher.ts

@@ -1,9 +1,6 @@
 
 /**
  * Compare full IDs of rooms or users.
- * @example
- * // returns true
- * fullIDMatcher('foo/bar/#test', 'foo/bar/*')
  * @param compare ID to compare
  * @param id ID to compare against
  */

src/core/coreref.ts

@@ -10,45 +10,15 @@ import { ScopedEventEmitter } from '../util';
  * Recommended implementation of a squeebot runner implements this interface.
  */
 export interface ISqueebotCore {
-  /**
-   * Squeebot environment information, mainly paths
-   */
   environment: IEnvironment;
-  /**
-   * NPM executor. Used to install and upgrade packages programmatically.
-   */
   npm: NPMExecutor;
-  /**
-   * Main scoped event stream.
-   */
   stream: ScopedEventEmitter;
-  /**
-   * Squeebot plugin manager. Hot load/unload/restart functionality.
-   */
   pluginManager: PluginManager;
-  /**
-   * Squeebot plugin repository manager. Hot install/uninstall/update functionality.
-   */
   repositoryManager: RepositoryManager;
-  /**
-   * Squeebot message channel manager. Used to route events between plugins.
-   */
   channelManager: ChannelManager;
-  /**
-   * Squeebot plugin metadata/manifest loader.
-   */
   pluginLoader: PluginMetaLoader;
-  /**
-   * Squeebot main configuration file.
-   */
   config: Configuration;
-  /**
+
-   * Initialize all Squeebot components.
-   * @param autostart Automatically start everything (load plugins, etc)
-   */
   initialize(autostart: boolean): Promise<void>;
-  /**
-   * Trigger a graceful shutdown.
-   */
   shutdown(): void;
 }

src/core/environment.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 
 import { IEnvironment } from '../types/environment';
 
-const dirs: { [key: string]: string } = {
+const dirs: {[key: string]: string} = {
   configurationPath: 'configs',
   pluginsPath: 'plugins',
   repositoryPath: 'repos',
@@ -15,11 +15,8 @@ const dirs: { [key: string]: string } = {
  * @param chroot Change bot root to this instead of the path in the environment
  * @returns Squeebot environment
  */
-export async function loadEnvironment(
+export async function loadEnvironment(enviroFile = 'squeebot.env.json', chroot?: string): Promise<IEnvironment> {
-  enviroFile = 'squeebot.env.json',
+  if (!await fs.pathExists(enviroFile)) {
-  chroot?: string
-): Promise<IEnvironment> {
-  if (!(await fs.pathExists(enviroFile))) {
     throw new Error('Environment file does not exist.');
   }
 
@@ -34,7 +31,7 @@ export async function loadEnvironment(
     env.path = chroot;
   }
 
-  if (!(await fs.pathExists(root))) {
+  if (!await fs.pathExists(root)) {
     throw new Error('Root path does not exist.');
   }
 

src/core/logger.ts

@@ -1,78 +1,26 @@
-import { format } from 'util';
+import util from 'util';
+
+type LogType = 'info' | 'debug' | 'warn' | 'error';
 
 /**
- * Log level
+ * Logger for all of Squeebot. Use this instead of console.log/warn/error!
- */
-export enum LogLevel {
-  INFO,
-  WARN,
-  ERROR,
-  DEBUG,
-}
-
-export type LogListener = (
-  logLevel: LogLevel,
-  ...data: any[]
-) => void | Promise<void>;
-
-export type ConsoleFunction = (...data: any[]) => void;
-export type ConsoleLogFunction = ConsoleFunction;
-export type ConsoleWarnFunction = ConsoleFunction;
-export type ConsoleErrorFunction = ConsoleFunction;
-
-/**
- * Logger for all of Squeebot. Use this instead of console.log/warn/error in your plugins!
  */
 export class Logger {
-  /**
+  private console = [console.log, console.warn, console.error];
-   * The `console.*` functions used for logging convenience.
-   *
-   * Defaults to `console.log`, `console.warn`, `console.error`.
-   *
-   * Can really be anything that accepts the input for `node:util.format`.
-   */
-  public console: [
-    ConsoleLogFunction,
-    ConsoleWarnFunction,
-    ConsoleErrorFunction
-  ] = [console.log, console.warn, console.error];
 
-  /**
+  constructor(
-   * External Logger log event listeners.
+    public timestamp = 'dd/mm/yy HH:MM:ss'
-   */
+  ) {}
-  protected listeners: LogListener[] = [];
 
-  constructor(public timestamp = 'dd/mm/yy HH:MM:ss') {}
+  public dateFmt(date: Date) {
-
+    return date.toISOString()
-  public formatDate(date: Date): string {
+      .replace(/T/, ' ')
-    return date.toISOString().replace(/T/, ' ').replace(/\..+/, '');
+      .replace(/\..+/, '');
   }
 
   /**
-   * Add a logger listener, useful for redirecting logger output somewhere else.
+   * Set node.js readline consideration
-   * Will not await any Promises but it will catch unhandled rejections - please do not depend on this.
-   * @param fn Log listener
-   */
-  public listen(fn: LogListener): void {
-    this.listeners.push(fn);
-  }
-
-  /**
-   * Remove a logger listener.
-   * @param fn Log listener
-   * @returns nothing
-   */
-  public unlisten(fn: LogListener): void {
-    const inx = this.listeners.indexOf(fn);
-    if (inx === -1) return;
-    this.listeners.splice(inx, 1);
-  }
-
-  /**
-   * Set node.js readline consideration.
    * @param rl Readline instance
-   * @see Logger.console - the array modified by this function
-   * @see Logger.resetConsole - the "undo" to this function
    */
   public setReadline(rl: any): void {
     for (const index in this.console) {
@@ -85,42 +33,33 @@ export class Logger {
     }
   }
 
-  /**
-   * Reset output consoles to default. Useful for dynamically detaching readline.
-   * @see Logger.console
-   */
-  public resetConsole() {
-    this.console = [console.log, console.warn, console.error];
-  }
-
   /**
    * Write out to log
-   * @param logLevel Logger level
+   * @param ltype Logger level
-   * @param data Data to log. Will be sent to `node:util.format`
+   * @param data Data to log
-   * @see util.format
    */
-  public write(logLevel: LogLevel, ...data: any[]): void {
+  private write(ltype: LogType, ...data: any[]): void {
     const message = [];
-    let outputFunction = this.console[0];
+    let cfunc = this.console[0];
 
     if (this.timestamp) {
-      message.push(`[${this.formatDate(new Date())}]`);
+      message.push(`[${this.dateFmt(new Date())}]`);
     }
 
-    switch (logLevel) {
+    switch (ltype) {
-    case LogLevel.INFO:
+    case 'info':
       message.push('[ INFO]');
       break;
-    case LogLevel.DEBUG:
+    case 'debug':
       message.push('[DEBUG]');
       break;
-    case LogLevel.WARN:
+    case 'warn':
       message.push('[ WARN]');
-      outputFunction = this.console[1];
+      cfunc = this.console[1];
       break;
-    case LogLevel.ERROR:
+    case 'error':
       message.push('[ERROR]');
-      outputFunction = this.console[2];
+      cfunc = this.console[2];
       break;
     }
 
@@ -128,13 +67,10 @@ export class Logger {
     let final = data[0];
     if (data.length > 1) {
       const fargs = data.slice(1);
-      final = format(data[0], ...fargs);
+      final = util.format(data[0], ...fargs);
     }
     message.push(final);
-
+    cfunc(...message);
-    // Notify listeners and output
-    this.notify(logLevel, ...message);
-    outputFunction(...message);
   }
 
   /**
@@ -143,7 +79,7 @@ export class Logger {
    * See `console.log` for more information.
    */
   public log(...data: any[]): void {
-    this.write(LogLevel.INFO, ...data);
+    this.write('info', ...data);
   }
 
   /**
@@ -152,7 +88,7 @@ export class Logger {
    * See `console.warn` for more information.
    */
   public warn(...data: any[]): void {
-    this.write(LogLevel.WARN, ...data);
+    this.write('warn', ...data);
   }
 
   /**
@@ -161,7 +97,7 @@ export class Logger {
    * See `console.log` for more information.
    */
   public info(...data: any[]): void {
-    this.write(LogLevel.INFO, ...data);
+    this.write('info', ...data);
   }
 
   /**
@@ -170,7 +106,7 @@ export class Logger {
    * See `console.error` for more information.
    */
   public error(...data: any[]): void {
-    this.write(LogLevel.ERROR, ...data);
+    this.write('error', ...data);
   }
 
   /**
@@ -179,42 +115,10 @@ export class Logger {
    * See `console.log` for more information.
    */
   public debug(...data: any[]): void {
-    this.write(LogLevel.DEBUG, ...data);
+    this.write('debug', ...data);
-  }
-
-  /**
-   * Notify logger listeners about new lines. Catches uncaught errors.
-   * @param level Log level
-   * @param data Log data
-   */
-  protected notify(level: LogLevel, ...data: any): void {
-    for (const listener of this.listeners) {
-      try {
-        const resp = listener.call(null, level, ...data);
-        // Catch Promise errors
-        if (resp instanceof Promise) {
-          resp.catch((err) =>
-            process.stderr.write(
-              `A Logger listener threw an unhandled rejection: ${err.stack}\r\n`
-            )
-          );
-        }
-      } catch (err) {
-        process.stderr.write(
-          `A Logger listener threw an unhandled error: ${
-            (err as Error).stack
-          }\r\n`
-        );
-      }
-    }
   }
 }
 
 // Create singleton for Logger to be used anywhere
-/**
- * Logger for all of Squeebot. Use this instead of console.log/warn/error in your plugins!
- * 
- * This is a global singleton.
- */
 const logger = new Logger();
 export { logger };

src/npm/executor.ts

@@ -5,19 +5,16 @@ import { IEnvironment } from '../types/environment';
 import { spawnProcess } from '../util/run';
 
 /**
- * Execute NPM commands. Can be extended to implement different package managers.
+ * Execute NPM commands
  */
 export class NPMExecutor {
-  protected installed: Record<string, string> = {};
+  private installed: Record<string, string> = {};
-  protected packageFile: string = path.join(
+  private packageFile: string = path.join(
     this.environment.path,
     'package.json'
   );
 
-  constructor(
+  constructor(private environment: IEnvironment, private coreModule: string) {}
-    protected environment: IEnvironment,
-    protected coreModule: string
-  ) {}
 
   /**
    * Create a package.json file and install the core.
@@ -129,7 +126,7 @@ export class NPMExecutor {
     await this.loadPackageFile();
   }
 
-  protected removeVersionWildcard(str?: string): string | undefined {
+  private removeVersionWildcard(str?: string): string | undefined {
     return str?.replace(/\^|>|=/, '');
   }
 }

src/plugin/plugin.ts

@@ -2,23 +2,9 @@ import { PluginConfiguration, Service } from '../types';
 import { ScopedEventEmitter } from '../util/events';
 
 export interface IPlugin {
-  /**
-   * Plugin manifest information.
-   */
   manifest: IPluginManifest;
-  /**
-   * Core scoped event stream.
-   * This is how you talk to other plugins and the core using events.
-   */
   stream: ScopedEventEmitter;
-  /**
-   * Plugin configuration file.
-   * Note: `@Configurable` decorator is required for the configuration file.
-   */
   config: PluginConfiguration;
-  /**
-   * Service provider, only used for Protocol service plugins, such as `irc`.
-   */
   service: Service | null;
 }
 
@@ -32,102 +18,44 @@ export class Plugin implements IPlugin {
   constructor(
     public manifest: IPluginManifest,
     public stream: ScopedEventEmitter,
-    public config: PluginConfiguration
+    public config: PluginConfiguration) {}
-  ) {}
 
   /**
    * Called when plugin first starts.
-   *
+   * Please use this instead of the constructor.
-   * Please use this instead of the constructor to set up your plugin,
-   * as this will be called at the appropriate time for initialization.
    */
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   public initialize(): void {}
 
-  /**
-   * Shortcut to the plugin's manifest name.
-   */
   public get name(): string {
     return this.manifest.name;
   }
 
-  /**
-   * Shortcut to the plugin's manifest version.
-   */
   public get version(): string {
     return this.manifest.version;
   }
 
-  /**
-   * Shortcut to the core event stream.
-   * @param name Event name
-   * @param fn Listener
-   */
   protected addEventListener(name: string, fn: any): void {
     this.stream.on(this.name, name, fn);
   }
 
-  /**
-   * Shortcut to the core stream event emitter.
-   * @param event Event name
-   * @param data Data
-   */
   protected emit(event: string, data: any): void {
     this.stream.emit.call(this.stream, event, data);
   }
 
-  /**
-   * Shortcut to the core stream event emitter, named variant.
-   * Emit events to a particular recipient.
-   * @param name Scope name
-   * @param event Event name
-   * @param data Data
-   */
   protected emitTo(name: string, event: string, data: any): void {
     this.stream.emitTo.call(this.stream, name, event, data);
   }
 }
 
-/**
- * A plugin's manifest JSON.
- */
 export interface IPluginManifest {
-  /**
-   * Source repository name.
-   * Populated automatically, not present in file.
-   */
   repository: string;
-  /**
-   * Full path for the plugin directory.
-   * Populated automatically, not present in file.
-   */
   fullPath: string;
-  /**
-   * Main file name.
-   */
   main: string;
-  /**
-   * Plugin name.
-   */
   name: string;
-  /**
-   * Plugin tags for organization.
-   */
   tags?: string[];
-  /**
-   * Plugin version (semver).
-   */
   version: string;
-  /**
-   * Plugin description.
-   */
   description: string;
-  /**
-   * Other plugins this plugin depends on.
-   */
   dependencies: string[];
-  /**
-   * NPM packages, including version number, the plugin depends on.
-   */
   npmDependencies: string[];
 }

src/types/environment.ts

@@ -1,26 +1,8 @@
 
-/**
- * Squeebot environment configuration and paths.
- */
 export interface IEnvironment {
-  /**
-   * Root path of the current environment.
-   */
   path: string;
-  /**
-   * Plugins directory path.
-   */
   pluginsPath: string;
-  /**
-   * Repositories directory path.
-   */
   repositoryPath: string;
-  /**
-   * Configuration files directory path.
-   */
   configurationPath: string;
-  /**
-   * Environment name.
-   */
   environment: string;
 }

src/types/staged-handler.ts

@@ -15,7 +15,6 @@ export type IMessageHandler = (data: IMessageData | string, reject: (error: Erro
 
 /**
  * Staged messaging handler
- * @deprecated Do not use for new plugins.
  */
 export class MessageResolver {
   private handlers: IMessageHandler[] = [];

src/util/events.ts

@@ -4,29 +4,13 @@ import { logger } from '../core';
  * Event emitter that can be scoped by plugin name or core.
  */
 export class ScopedEventEmitter {
-  protected listeners: {[key: string]: any[]};
+  private listeners: {[key: string]: any[]};
-
-  /**
-   * Add an event listener on `name` scope for event `event`. Alias of `on`.
-   * @param name Event scope
-   * @param event Event name
-   * @param func Listener
-   * @param once Listen once
-   * @see on
-   */
   public addEventListener = this.on;
 
   constructor() {
     this.listeners = {};
   }
 
-  /**
-   * Add an event listener on `name` scope for event `event`.
-   * @param name Event scope
-   * @param event Event name
-   * @param func Listener
-   * @param once Listen once
-   */
   public on(name: string, event: string, func: any, once = false): void {
     if (!func || !event || !name) {
       throw new Error('missing arguments');
@@ -41,21 +25,10 @@ export class ScopedEventEmitter {
     });
   }
 
-  /**
-   * Add an one-off event listener on `name` scope for event `event`.
-   * @param name Event scope
-   * @param event Event name
-   * @param func Listener
-   */
   public once(name: string, event: string, func: any): void {
     this.on(name, event, func, true);
   }
 
-  /**
-   * Emit an event `event` to all listeners in all scopes.
-   * @param event Event name
-   * @param args Data
-   */
   public emit(event: string, ...args: any[]): void {
     for (const name in this.listeners) {
       for (const i in this.listeners[name]) {
@@ -80,12 +53,6 @@ export class ScopedEventEmitter {
     }
   }
 
-  /**
-   * Emit an event `event` to listeners listening for scope `name`.
-   * @param name Scope name
-   * @param event Event name
-   * @param args Data
-   */
   public emitTo(name: string, event: string, ...args: any[]): void {
     if (!this.listeners[name]) {
       return;
@@ -113,10 +80,6 @@ export class ScopedEventEmitter {
     }
   }
 
-  /**
-   * Remove all listeners for scope `name`.
-   * @param name Scope name
-   */
   public removeName(name: string): void {
     if (this.listeners[name]) {
       delete this.listeners[name];