adapt-cli 3.0.6 → 3.0.8

package/lib/api.js

@@ -19,6 +19,7 @@ import Plugin from './integration/Plugin.js'
 import Project from './integration/Project.js'
 import fs from 'fs-extra'
 import async from 'async'
+import './econnreset.js'
 
 // TODO: api, check no interactivity, should be sorted, will fail silently if it absolutely cannot do what you've asked
 // TODO: api, console and error output, error on fail when isInteractive: false? or something else? return Targets?
@@ -36,17 +37,20 @@ class API {
   async installFramework ({
     version = null,
     repository = ADAPT_FRAMEWORK,
-    cwd = process.cwd()
+    cwd = process.cwd(),
+    logger
   } = {}) {
     if (!version) version = await getLatestVersion({ repository })
     await erase({
       isInteractive: false,
-      cwd
+      cwd,
+      logger
     })
     await download({
       repository,
       branch: version,
-      cwd
+      cwd,
+      logger
     })
     await deleteSrcCourse({
       cwd
@@ -55,7 +59,8 @@ class API {
       cwd
     })
     await npmInstall({
-      cwd
+      cwd,
+      logger
     })
   }
 
@@ -87,7 +92,8 @@ class API {
     cache = true,
     outputDir = null,
     cachePath = './build/.cache',
-    cwd = process.cwd()
+    cwd = process.cwd(),
+    logger
   } = {}) {
     await build({
       sourceMaps,
@@ -95,7 +101,8 @@ class API {
       cache,
       cwd,
       outputDir,
-      cachePath
+      cachePath,
+      logger
     })
   }
 
@@ -109,12 +116,14 @@ class API {
    */
   async installPlugins ({
     plugins = null,
-    cwd = process.cwd()
+    cwd = process.cwd(),
+    logger
   } = {}) {
     return await install({
       plugins,
       isInteractive: false,
-      cwd
+      cwd,
+      logger
     })
   }
 
@@ -127,12 +136,14 @@ class API {
    */
   async uninstallPlugins ({
     plugins = null,
-    cwd = process.cwd()
+    cwd = process.cwd(),
+    logger
   } = {}) {
     return await uninstall({
       plugins,
       isInteractive: false,
-      cwd
+      cwd,
+      logger
     })
   }
 
@@ -146,12 +157,14 @@ class API {
    */
   async updatePlugins ({
     plugins = null,
-    cwd = process.cwd()
+    cwd = process.cwd(),
+    logger
   } = {}) {
     return await update({
       plugins,
       isInteractive: false,
-      cwd
+      cwd,
+      logger
     })
   }
 

package/lib/cli.js

@@ -12,6 +12,7 @@ import unregister from './commands/unregister.js'
 import update from './commands/update.js'
 import version from './commands/version.js'
 import logger from './logger.js'
+import './econnreset.js'
 
 const commands = {
   authenticate,

package/lib/commands/ls.js

@@ -1,9 +1,35 @@
 import chalk from 'chalk'
+import _ from 'lodash'
 import Project from '../integration/Project.js'
+import { eachOfLimitProgress } from '../util/promises.js'
 
 export default async function ls (logger) {
   const project = new Project({ logger })
+  const frameworkVersion = project.version
   project.tryThrowInvalidPath()
-  const installTargets = await project.getInstallTargets()
-  installTargets.forEach(p => logger?.log(`${chalk.cyan(p.name || p.sourcePath)} ${p.sourcePath || p.requestedVersion}`))
+  const installTargets = (await project.getInstallTargets())
+  const installTargetsIndex = installTargets.reduce((hash, p) => {
+    const name = (p.name || p.sourcePath)
+    hash[name] = p
+    return hash
+  }, {})
+  const installedPlugins = await project.getInstalledPlugins();
+  const notInstalled = _.difference(installTargets.map(p => (p.name || p.sourcePath)), installedPlugins.map(p => (p.name || p.sourcePath)))
+  const plugins = installedPlugins.concat(notInstalled.map(name => installTargetsIndex[name]))
+  await eachOfLimitProgress(
+    plugins,
+    async (target) => {
+      await target.fetchProjectInfo()
+      await target.fetchSourceInfo()
+      await target.findCompatibleVersion(frameworkVersion)
+    },
+    percentage => logger?.logProgress?.(`${chalk.bold.cyan('<info>')} Getting plugin info ${percentage}% complete`)
+  )
+  logger?.log(`${chalk.bold.cyan('<info>')} Getting plugin info 100% complete`)
+  plugins
+    .sort((a, b) => a.name.localeCompare(b.name))
+    .forEach(p => {
+      const name = (p.name || p.sourcePath)
+      logger?.log(`${chalk.cyan(p.name || p.sourcePath)} ${chalk.green('adapt.json')}: ${installTargetsIndex[name]?.requestedVersion || 'n/a'} ${chalk.green('installed')}: ${p.sourcePath || p.projectVersion || 'n/a'} ${chalk.green('latest')}: ${p.sourcePath || p.latestCompatibleSourceVersion || 'n/a'}`)
+    })
 }

package/lib/econnreset.js

@@ -0,0 +1,7 @@
+// guard against ECONNRESET issues https://github.com/adaptlearning/adapt-cli/issues/169
+process.on('uncaughtException', (error, origin) => {
+  if (error?.code === 'ECONNRESET') return
+  console.error('UNCAUGHT EXCEPTION')
+  console.error(error)
+  console.error(origin)
+})

package/lib/integration/AdaptFramework/getLatestVersion.js

@@ -1,4 +1,4 @@
-import request from 'request'
+import fetch from 'node-fetch'
 import semver from 'semver'
 import gh from 'parse-github-url'
 import { ADAPT_DEFAULT_USER_AGENT, ADAPT_FRAMEWORK, ADAPT_ALLOW_PRERELEASE } from '../../util/constants.js'
@@ -29,24 +29,19 @@ export default async function getLatestVersion ({ versionLimit, repository = ADA
     return links
   }
   const processPage = async () => {
-    const [response, body] = await new Promise((resolve, reject) => {
-      request({
-        headers: {
-          'User-Agent': ADAPT_DEFAULT_USER_AGENT
-        },
-        uri: nextPage,
-        method: 'GET'
-      }, (error, response, body) => {
-        if (error) return reject(error)
-        resolve([response, body])
-      })
+    const response = await fetch(nextPage, {
+      headers: {
+        'User-Agent': ADAPT_DEFAULT_USER_AGENT
+      },
+      method: 'GET'
     })
-    if (response?.statusCode === 403 && response?.headers['x-ratelimit-remaining'] === '0') {
+    const body = await response.text()
+    if (response?.status === 403 && response?.headers['x-ratelimit-remaining'] === '0') {
       // we've exceeded the API limit
       const reqsReset = new Date(response.headers['x-ratelimit-reset'] * 1000)
       throw new Error(`Couldn't check latest version of ${NAME}. You have exceeded GitHub's request limit of ${response.headers['x-ratelimit-limit']} requests per hour. Please wait until at least ${reqsReset.toTimeString()} before trying again.`)
     }
-    if (response?.statusCode !== 200) {
+    if (response?.status !== 200) {
       throw new Error(`Couldn't check latest version of ${NAME}. GitubAPI did not respond with a 200 status code.`)
     }
     nextPage = parseLinkHeader(response.headers.link).next

package/lib/integration/PluginManagement/autenticate.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk'
 import inquirer from 'inquirer'
-import request from 'request'
+import fetch from 'node-fetch'
 import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
 import path from 'path'
 
@@ -36,21 +36,12 @@ export default async function authenticate ({
     ({ pluginName } = confirmation)
   }
   const { username, token } = confirmation
-  return new Promise((resolve, reject) => {
-    request({
-      uri: `${BOWER_REGISTRY_CONFIG.register}authenticate/${username}/${pluginName}?access_token=${token}`,
-      method: 'GET',
-      headers: { 'User-Agent': 'adapt-cli' },
-      followRedirect: false
-    }, (err, res, body) => {
-      if (err) return reject(err)
-      if (res.statusCode !== 200) reject(new Error(`The server responded with ${res.statusCode}`))
-      try {
-        const bodyJSON = JSON.parse(body)
-        resolve({ username, token, pluginName, ...bodyJSON })
-      } catch (err) {
-        reject(err)
-      }
-    })
+  const response = await fetch(`${BOWER_REGISTRY_CONFIG.register}authenticate/${username}/${pluginName}?access_token=${token}`, {
+    headers: { 'User-Agent': 'adapt-cli' },
+    followRedirect: false,
+    method: 'GET'
   })
+  if (response.status !== 200) throw new Error(`The server responded with ${response.status}`)
+  const body = await response.json()
+  return { username, token, pluginName, ...body }
 }

package/lib/integration/PluginManagement/install.js

@@ -131,7 +131,7 @@ async function conflictResolution ({ logger, targets, isInteractive, dev }) {
         ? { name: `latest compatible version [${target.latestCompatibleSourceVersion}]`, value: 'l' }
         : target.latestSourceVersion
           ? { name: `latest version [${target.latestSourceVersion}]`, value: 'l' }
-          : { name: `master [master]`, value: 'm' },
+          : { name: 'master [master]', value: 'm' },
       { name: 'skip', value: 's' }
     ].filter(Boolean)
     const result = await createPromptTask({ message: chalk.reset(target.packageName), choices, type: 'list', default: 's' })

package/lib/integration/PluginManagement/rename.js

@@ -3,7 +3,7 @@ import authenticate from './autenticate.js'
 import bower from 'bower'
 import chalk from 'chalk'
 import inquirer from 'inquirer'
-import request from 'request'
+import fetch from 'node-fetch'
 import path from 'path'
 import Plugin from '../Plugin.js'
 
@@ -68,18 +68,12 @@ async function renameInBowerRepo ({
 }) {
   const path = 'packages/rename/' + username + '/' + oldName + '/' + newName
   const query = '?access_token=' + token
-  return new Promise((resolve, reject) => {
-    request({
-      url: BOWER_REGISTRY_CONFIG.register + path + query,
-      method: 'GET',
-      headers: { 'User-Agent': 'adapt-cli' },
-      followRedirect: false
-    }, (err, res) => {
-      if (err) return reject(err)
-      if (res.statusCode !== 201) reject(new Error(`The server responded with ${res.statusCode}`))
-      resolve()
-    })
+  const response = await fetch(BOWER_REGISTRY_CONFIG.register + path + query, {
+    method: 'GET',
+    headers: { 'User-Agent': 'adapt-cli' },
+    followRedirect: false
   })
+  if (response.status !== 201) throw new Error(`The server responded with ${response.status}`)
 }
 
 /**

package/lib/integration/PluginManagement/search.js

@@ -1,6 +1,6 @@
 import getBowerRegistryConfig from '../getBowerRegistryConfig.js'
 import chalk from 'chalk'
-import request from 'request'
+import fetch from 'node-fetch'
 import path from 'path'
 
 export default async function search ({
@@ -14,22 +14,13 @@ export default async function search ({
     const uniqueResults = {}
     for (const serverURI of BOWER_REGISTRY_CONFIG.search) {
       try {
-        const immediateResults = await new Promise((resolve, reject) => {
-          request({
-            uri: `${serverURI}packages/search/${searchTerm}`,
-            method: 'GET',
-            headers: { 'User-Agent': 'adapt-cli' },
-            followRedirect: false
-          }, (err, res, body) => {
-            if (err) return reject(err)
-            if (res.statusCode !== 200) reject(new Error(`The server responded with ${res.statusCode}`))
-            try {
-              resolve(JSON.parse(body))
-            } catch (err) {
-              reject(err)
-            }
-          })
+        const response = await fetch(`${serverURI}packages/search/${searchTerm}`, {
+          method: 'GET',
+          headers: { 'User-Agent': 'adapt-cli' },
+          followRedirect: false
         })
+        if (response.status !== 200) throw new Error(`The server responded with ${response.status}`)
+        const immediateResults = await response.json()
         immediateResults?.forEach(result => (uniqueResults[result.name] = uniqueResults[result.name] ?? result))
       } catch (err) {}
     }

package/lib/integration/PluginManagement/unregister.js

@@ -6,7 +6,7 @@ import chalk from 'chalk'
 import inquirer from 'inquirer'
 import { readValidateJSON } from '../../util/JSONReadValidate.js'
 import Plugin from '../Plugin.js'
-import request from 'request'
+import fetch from 'node-fetch'
 
 export default async function unregister ({
   logger,
@@ -82,20 +82,10 @@ async function unregisterInBowerRepo ({
   BOWER_REGISTRY_CONFIG
 }) {
   const uri = `${BOWER_REGISTRY_CONFIG.register}packages/${username}/${pluginName}?access_token=${token}`
-  return new Promise((resolve, reject) => {
-    request({
-      uri,
-      method: 'DELETE',
-      headers: { 'User-Agent': 'adapt-cli' },
-      followRedirect: false
-    }, (err, res, body) => {
-      if (err) return reject(err)
-      if (res.statusCode !== 204) reject(new Error(`The server responded with ${res.statusCode}`))
-      try {
-        resolve()
-      } catch (err) {
-        reject(err)
-      }
-    })
+  const response = await fetch(uri, {
+    method: 'DELETE',
+    headers: { 'User-Agent': 'adapt-cli' },
+    followRedirect: false
   })
+  if (response.status !== 204) throw new Error(`The server responded with ${response.status}`)
 }

package/lib/util/download.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk'
-import uuid from 'uuid'
+import { v4 as uuid } from 'uuid'
 import fs from 'fs-extra'
 import path from 'path'
 import urljoin from 'url-join'
@@ -17,7 +17,7 @@ export default async function download ({
   if (!branch && !repository) throw new Error('Repository details are required.')
   const repositoryName = gh(repository).name
   logger?.write(chalk.cyan(`downloading ${repositoryName} to ${cwd}\t`))
-  tmp = (tmp || path.join(HOME_DIRECTORY, '.adapt', 'tmp', uuid.v1()))
+  tmp = (tmp || path.join(HOME_DIRECTORY, '.adapt', 'tmp', uuid()))
   const downloadFileName = await new Promise((resolve, reject) => {
     let downloadFileName = ''
     const url = urljoin(repository, 'archive', branch + '.zip')

package/lib/util/extract.js

@@ -1,4 +1,4 @@
-import uuid from 'uuid'
+import { v4 as uuid } from 'uuid'
 import path from 'path'
 import decompress from 'decompress'
 import { HOME_DIRECTORY } from './constants.js'
@@ -7,7 +7,7 @@ export default async function extract ({
   sourcePath,
   cwd
 } = {}) {
-  const rootPath = path.join(HOME_DIRECTORY, '.adapt', 'tmp', uuid.v1()).replace(/\\/g, '/')
+  const rootPath = path.join(HOME_DIRECTORY, '.adapt', 'tmp', uuid()).replace(/\\/g, '/')
   const files = await decompress(path.join(cwd, sourcePath), rootPath, {
     filter: file => !file.path.endsWith('/')
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-cli",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "description": "Command line tools for Adapt",
   "main": "./lib/api.js",
   "type": "module",
@@ -17,12 +17,12 @@
     "inquirer": "^7.3.3",
     "json-lint": "^0.1.0",
     "lodash-es": "^4.17.21",
+    "node-fetch": "^3.2.10",
     "parse-github-url": "^1.0.2",
-    "request": "^2.88.0",
     "semver": "^7.3.5",
     "speakingurl": "^14.0.1",
     "url-join": "^4.0.0",
-    "uuid": "^3.3.2"
+    "uuid": "^8.3.2"
   },
   "license": "GPL-3.0",
   "preferGlobal": true,