修复base64传buffer的bug;优化各方法的类型判断

master
宇天 2020-09-24 18:02:13 +08:00
parent a938cfcbab
commit c21a72a9a2
3 changed files with 52 additions and 51 deletions

View File

@ -18,9 +18,12 @@ var __inc__ = 1024
Helper.base64encode = function(str, urlFriendly) { Helper.base64encode = function(str, urlFriendly) {
var buf, str64 var buf, str64
if (!Buffer.isBuffer(str)) { if (Buffer.isBuffer(str)) {
buf = str
} else {
buf = Buffer.from(str + '') buf = Buffer.from(str + '')
} }
str64 = buf.toString('base64') str64 = buf.toString('base64')
if (urlFriendly) { if (urlFriendly) {
@ -94,11 +97,11 @@ Helper.md5 = function(str, encode) {
if (typeof str === 'number') { if (typeof str === 'number') {
str += '' str += ''
} }
if (typeof str !== 'string' && !Buffer.isBuffer(str)) { if (typeof str === 'string' || Buffer.isBuffer(str)) {
return str return Helper.hash('md5', str, encode)
} }
return Helper.hash('md5', str, encode) return str
} }
/** /**
@ -106,12 +109,11 @@ Helper.md5 = function(str, encode) {
* @param {Str} file [文件路径] * @param {Str} file [文件路径]
*/ */
Helper.md5Sign = function(file) { Helper.md5Sign = function(file) {
if (!fs.existsSync(file)) { if (fs.accessSync(file, fs.constants.R_OK)) {
return null var buf = fs.readFileSync(file)
return Helper.hash('md5', buf)
} }
return null
var buf = fs.readFileSync(file)
return Helper.hash('md5', buf)
} }
/** /**
@ -123,11 +125,11 @@ Helper.sha1 = function(str, encode) {
if (typeof str === 'number') { if (typeof str === 'number') {
str += '' str += ''
} }
if (typeof str !== 'string' && !Buffer.isBuffer(str)) { if (typeof str === 'string' || Buffer.isBuffer(str)) {
return str return Helper.hash('sha1', str, encode)
} }
return Helper.hash('sha1', str, encode) return str
} }
/** /**
@ -135,12 +137,11 @@ Helper.sha1 = function(str, encode) {
* @param {Str} file [文件路径] * @param {Str} file [文件路径]
*/ */
Helper.sha1Sign = function(file) { Helper.sha1Sign = function(file) {
if (!fs.existsSync(file)) { if (fs.accessSync(file, fs.constants.R_OK)) {
return null var buf = fs.readFileSync(file)
return Helper.hash('sha1', buf)
} }
return null
var buf = fs.readFileSync(file)
return Helper.hash('sha1', buf)
} }
/** /**
@ -152,11 +153,11 @@ Helper.sha256 = function(str, encoding) {
if (typeof str === 'number') { if (typeof str === 'number') {
str += '' str += ''
} }
if (typeof str !== 'string' && !Buffer.isBuffer(str)) { if (typeof str === 'string' || Buffer.isBuffer(str)) {
return str return Helper.hash('sha256', str, encoding)
} }
return Helper.hash('sha256', str, encoding) return str
} }
/** /**
@ -164,12 +165,11 @@ Helper.sha256 = function(str, encoding) {
* @param {Str} file [文件路径] * @param {Str} file [文件路径]
*/ */
Helper.sha256Sign = function(file) { Helper.sha256Sign = function(file) {
if (!fs.existsSync(file)) { if (fs.accessSync(file, fs.constants.R_OK)) {
return null var buf = fs.readFileSync(file)
return Helper.hash('sha256', buf)
} }
return null
var buf = fs.readFileSync(file)
return Helper.hash('sha256', buf)
} }
module.exports = Helper module.exports = Helper

View File

@ -18,9 +18,12 @@ var __inc__ = 1024
export function base64encode(str, urlFriendly) { export function base64encode(str, urlFriendly) {
var buf, str64 var buf, str64
if (!Buffer.isBuffer(str)) { if (Buffer.isBuffer(str)) {
buf = str
} else {
buf = Buffer.from(str + '') buf = Buffer.from(str + '')
} }
str64 = buf.toString('base64') str64 = buf.toString('base64')
if (urlFriendly) { if (urlFriendly) {
@ -94,11 +97,12 @@ export function md5(str, encode) {
if (typeof str === 'number') { if (typeof str === 'number') {
str += '' str += ''
} }
if (typeof str !== 'string' && !Buffer.isBuffer(str)) {
return str if (typeof str === 'string' || Buffer.isBuffer(str)) {
return Helper.hash('md5', str, encode)
} }
return Helper.hash('md5', str, encode) return str
} }
/** /**
@ -106,12 +110,11 @@ export function md5(str, encode) {
* @param {Str} file [文件路径] * @param {Str} file [文件路径]
*/ */
export function md5Sign(file) { export function md5Sign(file) {
if (!fs.existsSync(file)) { if (fs.accessSync(file, fs.constants.R_OK)) {
return null var buf = fs.readFileSync(file)
return Helper.hash('md5', buf)
} }
return null
var buf = fs.readFileSync(file)
return Helper.hash('md5', buf)
} }
/** /**
@ -123,11 +126,11 @@ export function sha1(str, encode) {
if (typeof str === 'number') { if (typeof str === 'number') {
str += '' str += ''
} }
if (typeof str !== 'string' && !Buffer.isBuffer(str)) { if (typeof str === 'string' || Buffer.isBuffer(str)) {
return str return Helper.hash('sha1', str, encode)
} }
return Helper.hash('sha1', str, encode) return str
} }
/** /**
@ -135,12 +138,11 @@ export function sha1(str, encode) {
* @param {Str} file [文件路径] * @param {Str} file [文件路径]
*/ */
export function sha1Sign(file) { export function sha1Sign(file) {
if (!fs.existsSync(file)) { if (fs.accessSync(file, fs.constants.R_OK)) {
return null var buf = fs.readFileSync(file)
return Helper.hash('sha1', buf)
} }
return null
var buf = fs.readFileSync(file)
return Helper.hash('sha1', buf)
} }
/** /**
@ -152,11 +154,11 @@ export function sha256(str, encoding) {
if (typeof str === 'number') { if (typeof str === 'number') {
str += '' str += ''
} }
if (typeof str !== 'string' && !Buffer.isBuffer(str)) { if (typeof str === 'string' || Buffer.isBuffer(str)) {
return str return Helper.hash('sha256', str, encoding)
} }
return Helper.hash('sha256', str, encoding) return str
} }
/** /**
@ -164,12 +166,11 @@ export function sha256(str, encoding) {
* @param {Str} file [文件路径] * @param {Str} file [文件路径]
*/ */
export function sha256Sign(file) { export function sha256Sign(file) {
if (!fs.existsSync(file)) { if (fs.accessSync(file, fs.constants.R_OK)) {
return null var buf = fs.readFileSync(file)
return Helper.hash('sha256', buf)
} }
return null
var buf = fs.readFileSync(file)
return Helper.hash('sha256', buf)
} }
export default Helper export default Helper

View File

@ -1,6 +1,6 @@
{ {
"name": "crypto.js", "name": "crypto.js",
"version": "2.0.1", "version": "2.0.2",
"description": "原生crypto加密模块的二次封装,简化常用加密函数的使用", "description": "原生crypto加密模块的二次封装,简化常用加密函数的使用",
"keywords": [ "keywords": [
"md5", "md5",