fix(utils): 调整sha256, 移除 getWindow, isWeb

Author: shenjunjian

examples/nuxt/playground/package.json

@@ -26,12 +26,11 @@
     "@opentiny/vue-vite-import": "workspace:~",
     "@tiptap/vue-3": "^2.1.0",
     "@vitejs/plugin-vue-jsx": "^3.0.0",
-    "js-sha256": "^0.9.0",
     "onigasm": "^2.2.5",
     "postcss": "^8.4.16",
     "typescript": "^5.0.0",
     "vite-plugin-checker": "^0.5.2",
     "vite-plugin-dynamic-import": "^1.2.4",
     "vite-svg-loader": "^3.6.0"
   }
-}
+}

examples/vue2/package.json

@@ -37,7 +37,6 @@
     "@vue/composition-api": "1.7.2",
     "@vue/runtime-dom": "^3.2.31",
     "@vue/test-utils": "^1.3.3",
-    "js-sha256": "^0.9.0",
     "jsdom": "^21.0.0",
     "onigasm": "^2.2.5",
     "postcss": "^8.4.16",
@@ -60,4 +59,4 @@
     "vue-template-compiler": "2.6.14",
     "vue-tsc": "^1.0.16"
   }
-}
+}

examples/vue3/package.json

@@ -40,7 +40,6 @@
     "@vitest/ui": "^0.31.0",
     "@vue/runtime-core": "3.2.31",
     "@vue/test-utils": "^2.2.7",
-    "js-sha256": "^0.9.0",
     "jsdom": "^21.0.0",
     "onigasm": "^2.2.5",
     "postcss": "^8.4.16",
@@ -59,4 +58,4 @@
     "vue": "^3.3.9",
     "vue-i18n": "^9.1.7"
   }
-}
+}

packages/renderless/src/file-upload/index.ts

@@ -30,7 +30,7 @@ import type {
 } from '@/types'
 
 import { extend } from '../common/object'
-import { xss, logger, crypt } from '@opentiny/utils'
+import { xss, logger, sha256 } from '@opentiny/utils'
 import uploadAjax from '../common/deps/upload-ajax'
 import { isObject } from '../common/type'
 import { isEmptyObject } from '../common/type'
@@ -513,7 +513,7 @@ export const getFileHash =
       reader.readAsArrayBuffer(file.raw)
       reader.onload = async (e) => {
         if (file.status === constants.FILE_STATUS.FAIL) return
-        const hash = await crypt.sha256(e.target && e.target.result)
+        const hash = sha256(e.target && e.target.result)
         file.hash = file.raw.hash = hash
         resolve(hash)
         emit('hash-progress', 100)
@@ -2046,7 +2046,7 @@ export const segmentUpload =
               reader.readAsArrayBuffer(file)
               reader.onload = async (e) => {
                 if (props.edm.isCheckCode === true) {
-                  const hash = await crypt.sha256(e.target && e.target.result)
+                  const hash = sha256(e.target && e.target.result)
                   file.hash = hash
                 }
                 resolve(file)

packages/utils/src/crypt/index.ts

@@ -1,14 +1,10 @@
-import { getWindow } from '../globalConfig'
-
 /** 生成字节流或字符串的sha256编码 */
-export async function sha256(message: ArrayBuffer | string) {
+export function sha256(message: ArrayBuffer | string) {
   const isArrayBuffer = Object.prototype.toString.call(message) === '[object ArrayBuffer]'
   const msgUint8 = isArrayBuffer ? message : new TextEncoder().encode(message as string) // 编码为（utf-8）Uint8Array
-  const hashBuffer = await getWindow().crypto.subtle.digest('SHA-256', msgUint8) // 计算消息的哈希值
+  const hashBuffer = globalThis.crypto.subtle.digest('SHA-256', msgUint8) // 计算消息的哈希值
   const hashArray = Array.from(new Uint8Array(hashBuffer)) // 将缓冲区转换为字节数组
   const hashHex = hashArray.map((b) => b.toString(16).padStart(2, '0')).join('') // 将字节数组转换为十六进制字符串
 
   return hashHex
 }
-
-export default { sha256 }

packages/utils/src/globalConfig/index.ts

@@ -1,11 +1,3 @@
-export const isWeb = () =>
-  typeof window !== 'undefined' && typeof document !== 'undefined' && window.document === document
-
-/** 获取globalThis.  在web上， window===globalThis  在node.js中， global=== globalThis。
- * 所以该函数没必要存在，待移除
- */
-export const getWindow = () => (isWeb() ? window : global)
-
 // 需要微前端的用户传入该变量
 export const globalConfig = {
   viewportWindow: null // 获取真实视口的window，解决在微前端中某些bug

packages/utils/src/index.ts

@@ -1,12 +1,14 @@
 import xss from './xss'
 import logger from './logger'
-import crypt from './crypt'
 import ResizeObserver from './resize-observer'
 
-export { xss, logger, crypt, ResizeObserver }
+export { xss, logger, ResizeObserver }
+
+export { sha256 } from './crypt'
+export { globalConfig, getViewportWindow } from './globalConfig'
 
-export { getWindow, isWeb, globalConfig, getViewportWindow } from './globalConfig'
 export { getDays, getWeek, lastMonth, nextMonth, getCalendar, transformArray, parseDate } from './calendar'
+
 export {
   isLeapYear,
   toDate,

packages/utils/src/logger/index.ts

@@ -1,6 +1,4 @@
-import { getWindow } from '../globalConfig'
-
-const _win: any = getWindow()
+const _win: any = globalThis
 /** 使用 logger.xxx 代替 window.console.xxx, 避免语法警告 */
 export const logger = _win.console as Console