markdown-magic 3.0.10 → 3.1.0

package/lib/transforms/code/index.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const remoteRequest = require('../../utils/remoteRequest')
+const { remoteRequest } = require('../../utils/remoteRequest')
 const { isLocalPath } = require('../../utils/fs')
 const { deepLog } = require('../../utils/logs')
 const { getLineCount, getTextBetweenLines } = require('../../utils/text')
@@ -183,7 +183,7 @@ async function resolveRemoteContent(options, settings, srcPath) {
 
   // Try initial remote request if public url
   if (!remoteContent) {
-    remoteContent = remoteRequest(src, settings, srcPath)
+    remoteContent = await remoteRequest(src, settings, srcPath)
   }
 
   return remoteContent

package/lib/transforms/remote.js

@@ -1,11 +1,11 @@
-const remoteRequest = require('../utils/remoteRequest')
+const { remoteRequest } = require('../utils/remoteRequest')
 
-module.exports = function REMOTE(api) {
+module.exports = async function REMOTE(api) {
   // console.log('REMOTE api', api)
   const { options, content, settings } = api
   const { regex } = settings
   // console.log('MAKE REMOTE REQUEST')
-  const remoteContent = remoteRequest(options.url, settings, api.srcPath)
+  const remoteContent = await remoteRequest(options.url, settings, api.srcPath)
   if (!remoteContent) {
     return content
   }

package/lib/utils/remoteRequest.js

@@ -1,8 +1,13 @@
+const fetch = require('node-fetch')
 const request = require('sync-request')
 
-module.exports = function remoteRequest(url, settings = {}, srcPath) {
+function formatUrl(url = '') {
+  return url.match(/^https?:\/\//) ? url : `https://${url}`
+}
+
+function remoteRequestSync(url, settings = {}, srcPath) {
   let body
-  const finalUrl = (url.match(/^https?:\/\//)) ? url : `https://${url}`
+  const finalUrl = formatUrl(url)
   try {
     // @ts-expect-error
     const res = request('GET', finalUrl)
@@ -18,6 +23,28 @@ module.exports = function remoteRequest(url, settings = {}, srcPath) {
   return body
 }
 
+async function remoteRequest(url, settings = {}, srcPath) {
+  let body
+  const finalUrl = formatUrl(url)
+  try {
+    const res = await fetch(finalUrl)
+    body = await res.text()
+  } catch (e) {
+    console.log(`⚠️  WARNING: REMOTE URL "${finalUrl}" NOT FOUND`)
+    const msg = (e.message || '').split('\n')[0] + `\nFix "${url}" value in ${srcPath}`
+    console.log(msg)
+    if (settings.failOnMissingRemote) {
+      throw new Error(msg)
+    }
+  }
+  return body
+}
+
+module.exports = {
+  remoteRequestSync,
+  remoteRequest
+}
+
 /*
 TODO add file caching?
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-magic",
-  "version": "3.0.10",
+  "version": "3.1.0",
   "description": "Automatically update markdown files with content from external sources",
   "main": "lib/index.js",
   "bin": {
@@ -53,6 +53,7 @@
     "is-valid-path": "^0.1.1",
     "micro-mdx-parser": "^1.1.0",
     "mri": "^1.2.0",
+    "node-fetch": "^2.7.0",
     "oparser": "^3.0.13",
     "smart-glob": "^1.0.2",
     "sync-request": "^6.1.0"