hubot 11.1.4 → 11.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hubot",
-  "version": "11.1.4",
+  "version": "11.1.6",
   "author": "hubot",
   "keywords": [
     "github",

package/src/Brain.mjs

@@ -157,9 +157,9 @@ class Brain extends EventEmitter {
     this.emit('loaded', this.data)
   }
 
-  // Public: Get an Array of User objects stored in the brain.
+  // Public: Get an object of User objects stored in the brain.
   //
-  // Returns an Array of User objects.
+  // Returns an object of User objects.
   users () {
     return this.data.users
   }

package/src/GenHubot.mjs

@@ -49,7 +49,7 @@ function runCommands (hubotDirectory, options) {
 //   This is a test script.
 //
 
-export default (robot) => {
+export default async (robot) => {
   robot.respond(/helo$/, async res => {
     await res.reply("HELO World! I'm Dumbotheelephant.")
   })
@@ -92,7 +92,7 @@ export default (robot) => {
       this.robot.emit('play', envelope, ...strings)
     }
   
-    run () {
+    async run () {
       // This is required to get the scripts loaded
       this.emit('connected')
     }
@@ -108,7 +108,7 @@ export default (robot) => {
     }
   }
   export default {
-    use (robot) {
+    async use (robot) {
       return new DummyAdapter(robot)
     }
   }
@@ -128,12 +128,14 @@ export default (robot) => {
   describe('Xample testing Hubot scripts', () => {
     let robot = null
     beforeEach(async () => {
+      process.env.EXPRESS_PORT = 0
       robot = new Robot(dummyRobot, true, 'Dumbotheelephant')
       await robot.loadAdapter()
       await robot.run()
       await robot.loadFile('./scripts', 'Xample.mjs')
     })
     afterEach(() => {
+      delete process.env.EXPRESS_PORT
       robot.shutdown()
     })
     it('should handle /helo request', async () => {

package/src/Robot.mjs

@@ -12,6 +12,7 @@ import { Listener, TextListener } from './Listener.mjs'
 import Message from './Message.mjs'
 import Middleware from './Middleware.mjs'
 
+const File = fs.promises
 const HUBOT_DEFAULT_ADAPTERS = ['Campfire', 'Shell']
 const HUBOT_DOCUMENTATION_SECTIONS = ['description', 'dependencies', 'configuration', 'commands', 'notes', 'author', 'authors', 'examples', 'tags', 'urls']
 
@@ -331,21 +332,25 @@ class Robot {
   async loadmjs (filePath) {
     const forImport = this.prepareForImport(filePath)
     const script = await import(forImport)
+    let result = null
     if (typeof script?.default === 'function') {
-      script.default(this)
+      result = await script.default(this)
     } else {
       this.logger.warning(`Expected ${filePath} (after preparing for import ${forImport}) to assign a function to export default, got ${typeof script}`)
     }
+    return result
   }
 
   async loadjs (filePath) {
     const forImport = this.prepareForImport(filePath)
     const script = (await import(forImport)).default
+    let result = null
     if (typeof script === 'function') {
-      script(this)
+      result = await script(this)
     } else {
       this.logger.warning(`Expected ${filePath} (after preparing for import ${forImport}) to assign a function to module.exports, got ${typeof script}`)
     }
+    return result
   }
 
   // Public: Loads a file in path.
@@ -361,16 +366,17 @@ class Robot {
     // see https://github.com/hubotio/hubot/issues/1355
     if (['js', 'mjs'].indexOf(ext) === -1) {
       this.logger.debug(`Skipping unsupported file type ${full}`)
-      return
+      return null
     }
-
+    let result = null
     try {
-      await this[`load${ext}`](full)
+      result = await this[`load${ext}`](full)
       this.parseHelp(full)
     } catch (error) {
       this.logger.error(`Unable to load ${full}: ${error.stack}`)
       throw error
     }
+    return result
   }
 
   // Public: Loads every script in the given path.
@@ -380,11 +386,22 @@ class Robot {
   // Returns nothing.
   async load (path) {
     this.logger.debug(`Loading scripts from ${path}`)
-
-    if (fs.existsSync(path)) {
-      const tasks = fs.readdirSync(path).sort().map(file => this.loadFile(path, file))
-      await Promise.all(tasks)
+    const results = []
+    try {
+      const folder = await File.readdir(path, { withFileTypes: true })
+      for await (const file of folder) {
+        if (file.isDirectory()) continue
+        try {
+          const result = await this.loadFile(path, file.name)
+          results.push(result)
+        } catch (e) {
+          this.logger.error(`Error loading file ${file.name} - ${e.stack}`)
+        }
+      }
+    } catch (e) {
+      this.logger.error(`Path ${path} does not exist`)
     }
+    return results
   }
 
   // Public: Load scripts from packages specified in the
@@ -451,7 +468,7 @@ class Robot {
     if (stat) {
       app.use(express.static(stat))
     }
-    const p = new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       try {
         this.server = app.listen(port, address, () => {
           this.router = app
@@ -462,7 +479,6 @@ class Robot {
         reject(err)
       }
     })
-    return p
   }
 
   // Setup an empty router object