增加esm模块

index.es7

@@ -0,0 +1,175 @@
+/**
+ * 加密类 md5/sha1/base64
+ * @author yutent<yutent.io@gmail.com>
+ * @date 2020/09/16 18:11:51
+ */
+
+import fs from 'fs'
+import Helper from './lib/helper.es7'
+
+var __stamp__ = ''
+var __inc__ = 1024
+
+/**
+ * [base64encode base64编码]
+ * @param  {Str/Num/Buffer} str         [要编码的字符串]
+ * @param  {bool} urlFriendly [是否对URL友好，默认否，是则会把+转成-，/转成_]
+ */
+export function base64encode(str, urlFriendly) {
+  var buf, str64
+
+  if (!Buffer.isBuffer(str)) {
+    buf = Buffer.from(str + '')
+  }
+  str64 = buf.toString('base64')
+
+  if (urlFriendly) {
+    return str64
+      .replace(/\+/g, '-')
+      .replace(/\//g, '_')
+      .replace(/=/g, '')
+  }
+  return str64
+}
+
+/**
+ * [base64decode base64解码, 返回Buffer对象]
+ * @param  {Str} str         [要解码的字符串]
+ * @param  {bool} urlFriendly [之前是否对结果采用了URL友好处理]
+ */
+export function base64decode(str, urlFriendly) {
+  if (urlFriendly) {
+    str = str
+      .replace(/-/g, '+')
+      .replace(/_/g, '/')
+      .replace(/[^A-Za-z0-9\+\/]/g, '')
+  }
+  return Buffer.from(str, 'base64')
+}
+
+/**
+ * [rand 生成指定长度的随机字符串]
+ * @param  {[type]} len      [要得到的字符串长度]
+ * @param  {[type]} forceNum [是否强制返回纯数字]
+ */
+export function rand(len, forceNum) {
+  let str = 'qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM0123456789'
+  if (forceNum) {
+    str = '0123456789'
+  }
+  let max = str.length
+  let tmp = ''
+  for (let i = 0; i < len; i++) {
+    let r = (Math.random() * max) >> 0
+    tmp += str[r]
+  }
+  return tmp
+}
+
+// 返回一个如下格式的 xxxxxxxx-xxxx-xxxx-xxxxxxxx 的唯一ID
+export function uuid(pipe = '') {
+  var rand = Helper.origin.randomBytes(8).toString('hex')
+  var now = ~~(Date.now() / 1000).toString(16)
+  var inc
+
+  if (__stamp__ === now) {
+    __inc__++
+  } else {
+    __stamp__ = now
+    __inc__ = 1024
+  }
+  inc = __inc__.toString(16).padStart(4, '0')
+
+  return (
+    __stamp__ + pipe + inc + pipe + rand.slice(0, 4) + pipe + rand.slice(-8)
+  )
+}
+
+/**
+ * [md5 md5加密]
+ * @param  {Str/Num} str    [要加密的字符串]
+ * @param  {Str} encode [hex/base64]
+ */
+export function md5(str, encode) {
+  if (typeof str === 'number') {
+    str += ''
+  }
+  if (typeof str !== 'string' && !Buffer.isBuffer(str)) {
+    return str
+  }
+
+  return Helper.hash('md5', str, encode)
+}
+
+/**
+ * [md5Sign 获取文件的md5签名]
+ * @param  {Str} file [文件路径]
+ */
+export function md5Sign(file) {
+  if (!fs.existsSync(file)) {
+    return null
+  }
+
+  var buf = fs.readFileSync(file)
+  return Helper.hash('md5', buf)
+}
+
+/**
+ * [sha1 sha1加密]
+ * @param  {Str/Num} str    [要加密的字符串]
+ * @param  {Str} encode [hex/base64]
+ */
+export function sha1(str, encode) {
+  if (typeof str === 'number') {
+    str += ''
+  }
+  if (typeof str !== 'string' && !Buffer.isBuffer(str)) {
+    return str
+  }
+
+  return Helper.hash('sha1', str, encode)
+}
+
+/**
+ * [sha1Sign 获取文件的sha1签名]
+ * @param  {Str} file [文件路径]
+ */
+export function sha1Sign(file) {
+  if (!fs.existsSync(file)) {
+    return null
+  }
+
+  var buf = fs.readFileSync(file)
+  return Helper.hash('sha1', buf)
+}
+
+/**
+ * [sha256 sha256加密]
+ * @param  {Str/Num} str    [要加密的字符串]
+ * @param  {Str} encoding [hex/base64]
+ */
+export function sha256(str, encoding) {
+  if (typeof str === 'number') {
+    str += ''
+  }
+  if (typeof str !== 'string' && !Buffer.isBuffer(str)) {
+    return str
+  }
+
+  return Helper.hash('sha256', str, encoding)
+}
+
+/**
+ * [sha256Sign 获取文件的sha256签名]
+ * @param  {Str} file [文件路径]
+ */
+export function sha256Sign(file) {
+  if (!fs.existsSync(file)) {
+    return null
+  }
+
+  var buf = fs.readFileSync(file)
+  return Helper.hash('sha256', buf)
+}
+
+export default Helper

index.js

@@ -1,107 +1,58 @@
 /**
  * 加密类 md5/sha1/base64
- * @authors yutent (yutent@doui.cc)
+ * @author yutent<yutent.io@gmail.com>
- * @date    2015-09-10 13:56:18
+ * @date 2020/09/16 18:11:51
  */
 
-'use strict'
+const fs = require('fs')
+const Helper = require('./lib/helper.js')
 
-const CRYPTO = require('crypto')
+var __stamp__ = ''
-const FS = require('fs')
+var __inc__ = 1024
-const GCM_MODE = ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm']
 
-module.exports = {
+/**
-  origin: CRYPTO,
+ * [base64encode base64编码]
-  __stamp__: '',
+ * @param  {Str/Num/Buffer} str         [要编码的字符串]
-  __inc__: 0,
+ * @param  {bool} urlFriendly [是否对URL友好，默认否，是则会把+转成-，/转成_]
+ */
+exports.base64encode = function(str, urlFriendly) {
+  var buf, str64
 
-  hash(mode, data, outEncode) {
+  if (!Buffer.isBuffer(str)) {
-    let sum = CRYPTO.createHash(mode)
+    buf = Buffer.from(str + '')
-    let isBuffer = Buffer.isBuffer(data)
-
-    sum.update(data, isBuffer ? 'binary' : 'utf8')
-    return sum.digest(outEncode || 'hex')
-  },
-
-  hmac(mode, data, key, outEncode) {
-    key = key || ''
-    let sum = CRYPTO.createHmac(mode, key)
-    let isBuffer = Buffer.isBuffer(data)
-
-    sum.update(data, isBuffer ? 'binary' : 'utf8')
-    return sum.digest(outEncode || 'hex')
-  },
-
-  cipher(mode, data, key, inEncode, outEncode) {
-    key = key || ''
-    let isBuffer = Buffer.isBuffer(data)
-    inEncode = isBuffer ? 'binary' : inEncode || 'utf8'
-    outEncode = outEncode || 'base64'
-
-    let cc = CRYPTO.createCipher(mode, key)
-    let enStr = cc.update(data, inEncode, outEncode)
-    enStr += cc.final(outEncode)
-    if (GCM_MODE.indexOf(mode) > -1) {
-      let authTag = cc.getAuthTag()
-      return { enStr: enStr, authTag: authTag }
   }
-    return enStr
+  str64 = buf.toString('base64')
-  },
 
-  decipher(mode, data, key, tag, inEncode, outEncode) {
+  if (urlFriendly) {
-    key = key || ''
+    return str64
-    let isBuffer = Buffer.isBuffer(data)
+      .replace(/\+/g, '-')
-    inEncode = isBuffer ? 'binary' : inEncode || 'base64'
+      .replace(/\//g, '_')
-    outEncode = outEncode || 'utf8'
+      .replace(/=/g, '')
-
-    let cd = CRYPTO.createDecipher(mode, key)
-    if (GCM_MODE.indexOf(mode) > -1) {
-      cd.setAuthTag(tag)
   }
-    let deStr = cd.update(data, inEncode, outEncode)
+  return str64
-    deStr += cd.final(outEncode)
-    return deStr
-  },
-
-  cipheriv(mode, data, key, iv, inEncode, outEncode) {
-    key = key || '0000000000000000'
-    iv = iv || ''
-    let isBuffer = Buffer.isBuffer(data)
-    inEncode = isBuffer ? 'binary' : inEncode || 'utf8'
-    outEncode = outEncode || 'base64'
-
-    let cciv = CRYPTO.createCipheriv(mode, key, iv)
-    let enStr = cciv.update(data, inEncode, outEncode)
-    enStr += cciv.final(outEncode)
-    if (GCM_MODE.indexOf(mode) > -1) {
-      let authTag = cciv.getAuthTag()
-      return { enStr: enStr, authTag: authTag }
 }
-    return enStr
-  },
 
-  decipheriv(mode, data, key, iv, tag, inEncode, outEncode) {
+/**
-    key = key || '0000000000000000'
+ * [base64decode base64解码, 返回Buffer对象]
-    iv = iv || ''
+ * @param  {Str} str         [要解码的字符串]
-    let isBuffer = Buffer.isBuffer(data)
+ * @param  {bool} urlFriendly [之前是否对结果采用了URL友好处理]
-    inEncode = isBuffer ? 'binary' : inEncode || 'base64'
+ */
-    outEncode = outEncode || 'utf8'
+exports.base64decode = function(str, urlFriendly) {
-
+  if (urlFriendly) {
-    let dcpiv = CRYPTO.createDecipheriv(mode, key, iv)
+    str = str
-    if (GCM_MODE.indexOf(mode) > -1) {
+      .replace(/-/g, '+')
-      dcpiv.setAuthTag(tag)
+      .replace(/_/g, '/')
+      .replace(/[^A-Za-z0-9\+\/]/g, '')
+  }
+  return Buffer.from(str, 'base64')
 }
-    let deStr = dcpiv.update(data, inEncode, outEncode)
-    deStr += dcpiv.final(outEncode)
-    return deStr
-  },
 
 /**
  * [rand 生成指定长度的随机字符串]
  * @param  {[type]} len      [要得到的字符串长度]
  * @param  {[type]} forceNum [是否强制返回纯数字]
  */
-  rand(len, forceNum) {
+exports.rand = function(len, forceNum) {
   let str = 'qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM0123456789'
   if (forceNum) {
     str = '0123456789'
@@ -113,38 +64,33 @@ module.exports = {
     tmp += str[r]
   }
   return tmp
-  },
+}
 
 // 返回一个如下格式的 xxxxxxxx-xxxx-xxxx-xxxxxxxx 的唯一ID
-  uuid(pipe = '-') {
+exports.uuid = function(pipe = '') {
-    let rand = CRYPTO.randomBytes(8).toString('hex')
+  var rand = Helper.origin.randomBytes(8).toString('hex')
-    let now = (Date.now() / 1000).toString(16).slice(0, 8)
+  var now = ~~(Date.now() / 1000).toString(16)
+  var inc
 
-    if (this.__stamp__ === now) {
+  if (__stamp__ === now) {
-      this.__inc__++
+    __inc__++
   } else {
-      this.__stamp__ = now
+    __stamp__ = now
-      this.__inc__ = 0
+    __inc__ = 1024
   }
-    rand = this.__inc__.toString(16) + rand
+  inc = __inc__.toString(16).padStart(4, '0')
 
   return (
-      this.__stamp__ +
+    __stamp__ + pipe + inc + pipe + rand.slice(0, 4) + pipe + rand.slice(-8)
-      pipe +
-      rand.slice(0, 4) +
-      pipe +
-      rand.slice(4, 8) +
-      pipe +
-      rand.slice(8, 16)
   )
-  },
+}
 
 /**
  * [md5 md5加密]
  * @param  {Str/Num} str    [要加密的字符串]
  * @param  {Str} encode [hex/base64]
  */
-  md5(str, encode) {
+exports.md5 = function(str, encode) {
   if (typeof str === 'number') {
     str += ''
   }
@@ -152,28 +98,28 @@ module.exports = {
     return str
   }
 
-    return this.hash('md5', str, encode)
+  return Helper.hash('md5', str, encode)
-  },
+}
 
 /**
  * [md5Sign 获取文件的md5签名]
  * @param  {Str} file [文件路径]
  */
-  md5Sign(file) {
+exports.md5Sign = function(file) {
-    if (!FS.existsSync(file)) {
+  if (!fs.existsSync(file)) {
     return null
   }
 
-    let fileStream = FS.readFileSync(file)
+  var buf = fs.readFileSync(file)
-    return this.hash('md5', fileStream)
+  return Helper.hash('md5', buf)
-  },
+}
 
 /**
  * [sha1 sha1加密]
  * @param  {Str/Num} str    [要加密的字符串]
  * @param  {Str} encode [hex/base64]
  */
-  sha1(str, encode) {
+exports.sha1 = function(str, encode) {
   if (typeof str === 'number') {
     str += ''
   }
@@ -181,28 +127,28 @@ module.exports = {
     return str
   }
 
-    return this.hash('sha1', str, encode)
+  return Helper.hash('sha1', str, encode)
-  },
+}
 
 /**
  * [sha1Sign 获取文件的sha1签名]
  * @param  {Str} file [文件路径]
  */
-  sha1Sign(file) {
+exports.sha1Sign = function(file) {
-    if (!FS.existsSync(file)) {
+  if (!fs.existsSync(file)) {
     return null
   }
 
-    let fileStream = FS.readFileSync(file)
+  var buf = fs.readFileSync(file)
-    return this.hash('sha1', fileStream)
+  return Helper.hash('sha1', buf)
-  },
+}
 
 /**
  * [sha256 sha256加密]
  * @param  {Str/Num} str    [要加密的字符串]
  * @param  {Str} encoding [hex/base64]
  */
-  sha256(str, encoding) {
+exports.sha256 = function(str, encoding) {
   if (typeof str === 'number') {
     str += ''
   }
@@ -210,55 +156,20 @@ module.exports = {
     return str
   }
 
-    return this.hash('sha256', str, encoding)
+  return Helper.hash('sha256', str, encoding)
-  },
+}
 
 /**
  * [sha256Sign 获取文件的sha256签名]
  * @param  {Str} file [文件路径]
  */
-  sha256Sign(file) {
+exports.sha256Sign = function(file) {
-    if (!FS.existsSync(file)) {
+  if (!fs.existsSync(file)) {
     return null
   }
 
-    let fileStream = FS.readFileSync(file)
+  var buf = fs.readFileSync(file)
-    return this.hash('sha256', fileStream)
+  return Helper.hash('sha256', buf)
-  },
-
-  /**
-   * [base64encode base64加密]
-   * @param  {Str/Num/Buffer} str         [要加密的字符串]
-   * @param  {bool} urlFriendly [是否对URL友好，默认否，是则会把+转成-，/转成_]
-   */
-  base64encode(str, urlFriendly) {
-    let buf
-    if (!Buffer.isBuffer(str)) {
-      buf = Buffer.from(str + '')
-    }
-    let encode = buf.toString('base64')
-    if (urlFriendly) {
-      return encode
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=/g, '')
-    }
-    return encode
-  },
-
-  /**
-   * [base64decode base64解密, 返回Buffer对象]
-   * @param  {Str} str         [要解密的字符串]
-   * @param  {bool} urlFriendly [之前是否对结果采用了URL友好处理]
-   */
-  base64decode(str, urlFriendly, encoding) {
-    if (urlFriendly) {
-      str = str
-        .replace(/-/g, '+')
-        .replace(/_/g, '/')
-        .replace(/[^A-Za-z0-9\+\/]/g, '')
 }
 
-    return Buffer.from(str, 'base64')
+module.exports = Helper
-  }
-}

lib/helper.es7

@@ -0,0 +1,88 @@
+import crypto from 'crypto'
+
+const GCM_MODE = ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm']
+
+export default {
+  origin: crypto,
+
+  hash(mode, data, outEncode) {
+    let sum = crypto.createHash(mode)
+    let isBuffer = Buffer.isBuffer(data)
+
+    sum.update(data, isBuffer ? 'binary' : 'utf8')
+    return sum.digest(outEncode || 'hex')
+  },
+
+  hmac(mode, data, key, outEncode) {
+    key = key || ''
+    let sum = crypto.createHmac(mode, key)
+    let isBuffer = Buffer.isBuffer(data)
+
+    sum.update(data, isBuffer ? 'binary' : 'utf8')
+    return sum.digest(outEncode || 'hex')
+  },
+
+  cipher(mode, data, key, inEncode, outEncode) {
+    key = key || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'utf8'
+    outEncode = outEncode || 'base64'
+
+    let cc = crypto.createCipher(mode, key)
+    let enStr = cc.update(data, inEncode, outEncode)
+    enStr += cc.final(outEncode)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      let authTag = cc.getAuthTag()
+      return { enStr: enStr, authTag: authTag }
+    }
+    return enStr
+  },
+
+  decipher(mode, data, key, tag, inEncode, outEncode) {
+    key = key || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'base64'
+    outEncode = outEncode || 'utf8'
+
+    let cd = crypto.createDecipher(mode, key)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      cd.setAuthTag(tag)
+    }
+    let deStr = cd.update(data, inEncode, outEncode)
+    deStr += cd.final(outEncode)
+    return deStr
+  },
+
+  cipheriv(mode, data, key, iv, inEncode, outEncode) {
+    key = key || '0000000000000000'
+    iv = iv || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'utf8'
+    outEncode = outEncode || 'base64'
+
+    let cciv = crypto.createCipheriv(mode, key, iv)
+    let enStr = cciv.update(data, inEncode, outEncode)
+    enStr += cciv.final(outEncode)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      let authTag = cciv.getAuthTag()
+      return { enStr: enStr, authTag: authTag }
+    }
+    return enStr
+  },
+
+  decipheriv(mode, data, key, iv, tag, inEncode, outEncode) {
+    key = key || '0000000000000000'
+    iv = iv || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'base64'
+    outEncode = outEncode || 'utf8'
+
+    let dcpiv = crypto.createDecipheriv(mode, key, iv)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      dcpiv.setAuthTag(tag)
+    }
+    let deStr = dcpiv.update(data, inEncode, outEncode)
+    deStr += dcpiv.final(outEncode)
+    return deStr
+  }
+}

lib/helper.js

@@ -0,0 +1,88 @@
+const crypto = require('crypto')
+
+const GCM_MODE = ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm']
+
+module.exports = {
+  origin: crypto,
+
+  hash(mode, data, outEncode) {
+    let sum = crypto.createHash(mode)
+    let isBuffer = Buffer.isBuffer(data)
+
+    sum.update(data, isBuffer ? 'binary' : 'utf8')
+    return sum.digest(outEncode || 'hex')
+  },
+
+  hmac(mode, data, key, outEncode) {
+    key = key || ''
+    let sum = crypto.createHmac(mode, key)
+    let isBuffer = Buffer.isBuffer(data)
+
+    sum.update(data, isBuffer ? 'binary' : 'utf8')
+    return sum.digest(outEncode || 'hex')
+  },
+
+  cipher(mode, data, key, inEncode, outEncode) {
+    key = key || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'utf8'
+    outEncode = outEncode || 'base64'
+
+    let cc = crypto.createCipher(mode, key)
+    let enStr = cc.update(data, inEncode, outEncode)
+    enStr += cc.final(outEncode)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      let authTag = cc.getAuthTag()
+      return { enStr: enStr, authTag: authTag }
+    }
+    return enStr
+  },
+
+  decipher(mode, data, key, tag, inEncode, outEncode) {
+    key = key || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'base64'
+    outEncode = outEncode || 'utf8'
+
+    let cd = crypto.createDecipher(mode, key)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      cd.setAuthTag(tag)
+    }
+    let deStr = cd.update(data, inEncode, outEncode)
+    deStr += cd.final(outEncode)
+    return deStr
+  },
+
+  cipheriv(mode, data, key, iv, inEncode, outEncode) {
+    key = key || '0000000000000000'
+    iv = iv || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'utf8'
+    outEncode = outEncode || 'base64'
+
+    let cciv = crypto.createCipheriv(mode, key, iv)
+    let enStr = cciv.update(data, inEncode, outEncode)
+    enStr += cciv.final(outEncode)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      let authTag = cciv.getAuthTag()
+      return { enStr: enStr, authTag: authTag }
+    }
+    return enStr
+  },
+
+  decipheriv(mode, data, key, iv, tag, inEncode, outEncode) {
+    key = key || '0000000000000000'
+    iv = iv || ''
+    let isBuffer = Buffer.isBuffer(data)
+    inEncode = isBuffer ? 'binary' : inEncode || 'base64'
+    outEncode = outEncode || 'utf8'
+
+    let dcpiv = crypto.createDecipheriv(mode, key, iv)
+    if (GCM_MODE.indexOf(mode) > -1) {
+      dcpiv.setAuthTag(tag)
+    }
+    let deStr = dcpiv.update(data, inEncode, outEncode)
+    deStr += dcpiv.final(outEncode)
+    return deStr
+  }
+}

package.json

@@ -1,14 +1,25 @@
 {
   "name": "crypto.js",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "description": "原生crypto加密模块的二次封装,简化常用加密函数的使用",
-  "keywords": ["md5", "sha1", "base64", "fivejs", "crypto"],
+  "keywords": [
-  "author": "yutent <yutent@doui.cc>",
+    "md5",
+    "sha1",
+    "sha256",
+    "hmac",
+    "base64",
+    "fivejs",
+    "crypto",
+    "crypto-js",
+    "crypto.js"
+  ],
+  "author": "yutent <yutent.io@gmail.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/yutent/crypto.js.git"
   },
   "dependencies": {},
   "devDependencies": {},
-  "main": "index.js"
+  "main": "index.js",
+  "module": "index.es.js"
 }