meta: use node: protocol when using Node.js built-in core modules (t…

…ransloadit#3871)

`node:` protocol is available as of Node.js 14.18.0 LTS. Since we are
dropping support for all Node.js versions below that, we can take
advantage of this prefix to help differentiate built-in modules from npm
modules.

package.json

@@ -79,7 +79,7 @@
     "@types/lodash.merge": "4.6.6",
     "@types/morgan": "1.7.37",
     "@types/ms": "0.7.31",
-    "@types/node": "18.0.3",
+    "@types/node": "^18.0.3",
     "@types/react": "^17.0.13",
     "@types/request": "2.48.4",
     "@types/webpack": "^5.28.0",

src/config/companion.js

@@ -1,5 +1,5 @@
 const ms = require('ms')
-const fs = require('fs')
+const fs = require('node:fs')
 const { isURL } = require('validator')
 const logger = require('../server/logger')
 

src/server/Uploader.js

@@ -4,10 +4,10 @@ const { randomUUID } = require('node:crypto')
 const isObject = require('isobject')
 const validator = require('validator')
 const request = require('request')
-const { pipeline: pipelineCb } = require('stream')
-const { join } = require('path')
-const fs = require('fs')
-const { promisify } = require('util')
+const { pipeline: pipelineCb } = require('node:stream')
+const { join } = require('node:path')
+const fs = require('node:fs')
+const { promisify } = require('node:util')
 
 // TODO move to `require('streams/promises').pipeline` when dropping support for Node.js 14.x.
 const pipeline = promisify(pipelineCb)

src/server/controllers/oauth-redirect.js

@@ -1,5 +1,5 @@
-const qs = require('querystring')
-const { URL } = require('url')
+const qs = require('node:querystring')
+const { URL } = require('node:url')
 const { hasMatch } = require('../helpers/utils')
 const oAuthState = require('../helpers/oauth-state')
 

src/server/controllers/send-token.js

@@ -1,4 +1,4 @@
-const { URL } = require('url')
+const { URL } = require('node:url')
 const serialize = require('serialize-javascript')
 
 const tokenService = require('../helpers/jwt')

src/server/controllers/url.js

@@ -1,6 +1,6 @@
 const router = require('express').Router
 const request = require('request')
-const { URL } = require('url')
+const { URL } = require('node:url')
 const validator = require('validator')
 
 const { startDownUpload } = require('../helpers/upload')

src/server/emitter/default-emitter.js

@@ -1,4 +1,4 @@
-const { EventEmitter } = require('events')
+const { EventEmitter } = require('node:events')
 
 module.exports = () => {
   return new EventEmitter()

src/server/helpers/oauth-state.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 // @ts-ignore
 const atob = require('atob')
 const { encrypt, decrypt } = require('./utils')

src/server/helpers/request.js

@@ -1,8 +1,8 @@
 // eslint-disable-next-line max-classes-per-file
-const http = require('http')
-const https = require('https')
-const { URL } = require('url')
-const dns = require('dns')
+const http = require('node:http')
+const https = require('node:https')
+const { URL } = require('node:url')
+const dns = require('node:dns')
 const request = require('request')
 const ipaddr = require('ipaddr.js')
 

src/server/helpers/utils.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 
 /**
  *

src/server/jobs.js

@@ -1,7 +1,7 @@
 const schedule = require('node-schedule')
-const fs = require('fs')
-const path = require('path')
-const { promisify } = require('util')
+const fs = require('node:fs')
+const path = require('node:path')
+const { promisify } = require('node:util')
 const request = require('request')
 
 const { FILE_NAME_PREFIX } = require('./Uploader')

src/server/logger.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk')
 const escapeStringRegexp = require('escape-string-regexp')
-const util = require('util')
+const util = require('node:util')
 const { ProviderApiError, ProviderAuthError } = require('./provider/error')
 
 const valuesToMask = []

src/server/provider/box/adapter.js

@@ -1,5 +1,5 @@
 const mime = require('mime-types')
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 exports.isFolder = (item) => {
   return item.type === 'folder'

src/server/provider/box/index.js

@@ -1,6 +1,6 @@
 const request = require('request')
 const purest = require('purest')({ request })
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const Provider = require('../Provider')
 const logger = require('../../logger')

src/server/provider/drive/adapter.js

@@ -1,4 +1,4 @@
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 // @todo use the "about" endpoint to get the username instead
 // see: https://developers.google.com/drive/api/v2/reference/about/get

src/server/provider/drive/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 const request = require('request')
 const purest = require('purest')({ request })
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const Provider = require('../Provider')
 const logger = require('../../logger')

src/server/provider/dropbox/adapter.js

@@ -1,5 +1,5 @@
 const mime = require('mime-types')
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 exports.getUsername = (data) => {
   return data.user_email

src/server/provider/dropbox/index.js

@@ -1,6 +1,6 @@
 const request = require('request')
 const purest = require('purest')({ request })
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const Provider = require('../Provider')
 const logger = require('../../logger')

src/server/provider/facebook/adapter.js

@@ -1,4 +1,4 @@
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 exports.isFolder = (item) => {
   return !!item.type

src/server/provider/facebook/index.js

@@ -1,6 +1,6 @@
 const request = require('request')
 const purest = require('purest')({ request })
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const Provider = require('../Provider')
 const { getURLMeta } = require('../../helpers/request')

src/server/provider/instagram/graph/adapter.js

@@ -1,4 +1,4 @@
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 const MEDIA_TYPES = Object.freeze({
   video: 'VIDEO',

src/server/provider/instagram/graph/index.js

@@ -1,6 +1,6 @@
 const request = require('request')
 const purest = require('purest')({ request })
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const Provider = require('../../Provider')
 const { getURLMeta } = require('../../../helpers/request')

src/server/provider/onedrive/adapter.js

@@ -1,4 +1,4 @@
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 exports.isFolder = (item) => {
   if (item.remoteItem) {

src/server/provider/onedrive/index.js

@@ -1,6 +1,6 @@
 const request = require('request')
 const purest = require('purest')({ request })
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const Provider = require('../Provider')
 const logger = require('../../logger')

src/server/provider/unsplash/adapter.js

@@ -1,4 +1,4 @@
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 
 exports.isFolder = (item) => { // eslint-disable-line no-unused-vars
   return false

src/server/provider/unsplash/index.js

@@ -1,5 +1,5 @@
 const request = require('request')
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 
 const SearchProvider = require('../SearchProvider')
 const { getURLMeta } = require('../../helpers/request')

src/server/provider/zoom/index.js

@@ -1,4 +1,4 @@
-const { promisify } = require('util')
+const { promisify } = require('node:util')
 const request = require('request')
 const moment = require('moment-timezone')
 const purest = require('purest')({ request })

src/standalone/helper.js

@@ -1,7 +1,7 @@
-const fs = require('fs')
+const fs = require('node:fs')
 const merge = require('lodash.merge')
 const stripIndent = require('common-tags/lib/stripIndent')
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 
 const utils = require('../server/helpers/utils')
 const logger = require('../server/logger')

src/standalone/index.js

@@ -1,9 +1,9 @@
 const express = require('express')
-const qs = require('querystring')
+const qs = require('node:querystring')
 const helmet = require('helmet')
 const morgan = require('morgan')
 const bodyParser = require('body-parser')
-const { URL } = require('url')
+const { URL } = require('node:url')
 const session = require('express-session')
 const addRequestId = require('express-request-id')()
 const connectRedis = require('connect-redis')

test/__mocks__/purest.js

@@ -1,5 +1,5 @@
-const fs = require('fs')
-const qs = require('querystring')
+const fs = require('node:fs')
+const qs = require('node:querystring')
 
 const fixtures = require('../fixtures').providers
 

test/__tests__/http-agent.js

@@ -1,8 +1,8 @@
 /* global test:false, expect:false, describe:false, */
 
 const request = require('request')
-const http = require('http')
-const https = require('https')
+const http = require('node:http')
+const https = require('node:https')
 const { getProtectedHttpAgent, getRedirectEvaluator, FORBIDDEN_IP_ADDRESS } = require('../../src/server/helpers/request')
 
 describe('test getRedirectEvaluator', () => {

test/__tests__/uploader.js

@@ -3,7 +3,7 @@
 jest.mock('tus-js-client')
 
 const intoStream = require('into-stream')
-const fs = require('fs')
+const fs = require('node:fs')
 const nock = require('nock')
 
 const Uploader = require('../../src/server/Uploader')