hubot 6.0.0 → 8.0.0

package/bin/hubot.js

@@ -11,7 +11,7 @@ const switches = [
   ['-a', '--adapter ADAPTER', 'The Adapter to use, e.g. "shell" (to load the default hubot shell adapter)'],
   ['-f', '--file PATH', 'Path to adapter file, e.g. "./adapters/CustomAdapter.mjs"'],
   ['-c', '--create PATH', 'Create a deployable hubot'],
-  ['-d', '--disable-httpd', 'Disable the HTTP server'],
+  ['-d', '--disable-httpd DISABLE_HTTPD', 'Disable the HTTP server'],
   ['-h', '--help', 'Display the help information'],
   ['-l', '--alias ALIAS', "Enable replacing the robot's name with alias"],
   ['-n', '--name NAME', 'The name of the robot in chat'],
@@ -98,21 +98,23 @@ if (options.file) {
   options.adapter = options.file.split('/').pop().split('.')[0]
 }
 const robot = Hubot.loadBot(options.adapter, options.enableHttpd, options.name, options.alias)
+module.exports = robot
 
-function loadScripts () {
-  robot.load(pathResolve('.', 'scripts'))
-  robot.load(pathResolve('.', 'src', 'scripts'))
+async function loadScripts () {
+  await robot.load(pathResolve('.', 'scripts'))
+  await robot.load(pathResolve('.', 'src', 'scripts'))
 
   loadExternalScripts()
 
-  options.scripts.forEach((scriptPath) => {
+  const tasks = options.scripts.map((scriptPath) => {
     console.log('loadding', scriptPath)
     if (scriptPath[0] === '/') {
       return robot.load(scriptPath)
     }
 
-    robot.load(pathResolve('.', scriptPath))
+    return robot.load(pathResolve('.', scriptPath))
   })
+  await Promise.all(tasks)
 }
 
 function loadExternalScripts () {
@@ -144,7 +146,7 @@ function loadExternalScripts () {
   }
 
   if (options.configCheck) {
-    loadScripts()
+    await loadScripts()
     console.log('OK')
     process.exit(0)
   }

package/package.json

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

package/src/robot.js

@@ -346,30 +346,47 @@ class Robot {
     })
   }
 
+  async loadmjs (filePath) {
+    const script = await import(filePath)
+    if (typeof script?.default === 'function') {
+      script.default(this)
+    } else {
+      this.logger.warning(`Expected ${filePath} to assign a function to export default, got ${typeof script}`)
+    }
+  }
+
+  async loadcoffee (filePath) {
+    return await this.loadjs(filePath)
+  }
+
+  async loadjs (filePath) {
+    const script = require(filePath)
+    if (typeof script === 'function') {
+      script(this)
+    } else {
+      this.logger.warning(`Expected ${filePath} to assign a function to module.exports, got ${typeof script}`)
+    }
+  }
+
   // Public: Loads a file in path.
   //
   // filepath - A String path on the filesystem.
   // filename - A String filename in path on the filesystem.
   //
   // Returns nothing.
-  loadFile (filepath, filename) {
-    const ext = path.extname(filename)
-    const full = path.join(filepath, path.basename(filename, ext))
+  async loadFile (filepath, filename) {
+    const ext = path.extname(filename)?.replace('.', '')
+    const full = path.join(filepath, path.basename(filename))
 
     // see https://github.com/hubotio/hubot/issues/1355
-    if (['.js', '.mjs', '.coffee'].indexOf(ext) == -1) { // eslint-disable-line
+    if (['js', 'mjs', 'coffee'].indexOf(ext) === -1) {
+      this.logger.debug(`Skipping unsupported file type ${full}`)
       return
     }
 
     try {
-      const script = require(full)
-
-      if (typeof script === 'function') {
-        script(this)
-        this.parseHelp(path.join(filepath, filename))
-      } else {
-        this.logger.warning(`Expected ${full} to assign a function to module.exports, got ${typeof script}`)
-      }
+      await this[`load${ext}`](full)
+      this.parseHelp(full)
     } catch (error) {
       this.logger.error(`Unable to load ${full}: ${error.stack}`)
       process.exit(1)
@@ -381,11 +398,12 @@ class Robot {
   // path - A String path on the filesystem.
   //
   // Returns nothing.
-  load (path) {
+  async load (path) {
     this.logger.debug(`Loading scripts from ${path}`)
 
     if (fs.existsSync(path)) {
-      fs.readdirSync(path).sort().map(file => this.loadFile(path, file))
+      const tasks = fs.readdirSync(path).sort().map(file => this.loadFile(path, file))
+      await Promise.all(tasks)
     }
   }
 
@@ -504,7 +522,16 @@ class Robot {
       } else if (['.mjs'].includes(ext)) {
         this.adapter = await this.importAdapterFrom(pathToFileURL(path.resolve(adapterPath)).href)
       } else {
-        this.adapter = this.requireAdapterFrom(`hubot-${this.adapterName}`)
+        const adapterPathInCurrentWorkingDirectory = this.adapterName
+        try {
+          this.adapter = this.requireAdapterFrom(adapterPathInCurrentWorkingDirectory)
+        } catch (err) {
+          if (err.name === 'SyntaxError' && err.message.includes('Cannot use import statement outside a module')) {
+            this.adapter = await this.importAdapterFrom(adapterPathInCurrentWorkingDirectory)
+          } else {
+            throw err
+          }
+        }
       }
     } catch (err) {
       this.logger.error(`Cannot load adapter ${adapterPath ?? '[no path set]'} ${this.adapterName} - ${err}`)