@cloudbase/utilities 3.0.0 → 3.0.2

package/src/libs/abortController.ts

@@ -8,6 +8,7 @@ export default class AbortController {
       }
     },
   }
+  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
   constructor() {}
 
   abort() {

package/src/libs/util.ts

@@ -28,7 +28,7 @@ export function genSeqId(): string {
 }
 export function generateRequestId() {
   let d = new Date().getTime()
-  let d2 = (Date?.now && (Date.now() * 1000)) || 0
+  let d2 = (Date?.now && Date.now() * 1000) || 0
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
     let r = Math.random() * 16
     if (d > 0) {
@@ -38,7 +38,7 @@ export function generateRequestId() {
       r = (d2 + r) % 16 | 0
       d2 = Math.floor(d2 / 16)
     }
-    return (c === 'x' ? r : ((r & 0x7) | 0x8)).toString(16)
+    return (c === 'x' ? r : (r & 0x7) | 0x8).toString(16)
   })
 }
 export function formatUrl(PROTOCOL: string, url: string, query: KV<any> = {}): string {
@@ -72,10 +72,10 @@ export function getQuery(name: string, url?: string) {
     return false
   }
   // 参数：变量名，url为空则表从当前页面的url中取
-  const u = url || window.location.search
+  const u = url || decodeURIComponent(window.location.search)
   const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`)
   const r = u.substr(u.indexOf('?') + 1).match(reg)
-  return (r !== null && r !== undefined) ? r[2] : ''
+  return r !== null && r !== undefined ? r[2] : ''
 }
 
 export const getHash = function (name: string) {
@@ -106,14 +106,14 @@ export function removeParam(key: string, sourceURL: string) {
 }
 
 export function createPromiseCallback() {
-  let cb: any
+  let cb: any = {}
   if (!Promise) {
-    cb = () => { }
+    cb = () => {}
     cb.promise = {}
 
     const throwPromiseNotDefined = () => {
       throw new Error('Your Node runtime does support ES6 Promises. '
-        + 'Set "global.Promise" to your preferred implementation of promises.')
+          + 'Set "global.Promise" to your preferred implementation of promises.',)
     }
 
     Object.defineProperty(cb.promise, 'then', { get: throwPromiseNotDefined })
@@ -158,18 +158,18 @@ export function throwError(error: string, msg: string) {
   throw new Error(JSON.stringify({
     code: error,
     msg: `[${getSdkName()}][${error}]:${msg}`,
-  }))
+  }),)
 }
 
 interface IPrintGroupLogOptions {
-  title: string;
-  subtitle: string | object;
+  title: string
+  subtitle: string | object
   content: {
-    type: 'info' | 'warn' | 'error',
-    body: string | Error;
-  }[];
-  printTrace?: boolean;
-  collapsed?: boolean;
+    type: 'info' | 'warn' | 'error'
+    body: string | Error
+  }[]
+  printTrace?: boolean
+  collapsed?: boolean
 }
 export function printGroupLog(options: IPrintGroupLogOptions) {
   const { title, subtitle = '', content = [], printTrace = false, collapsed = false } = options
@@ -204,7 +204,6 @@ export function transformPhone(phoneNumber: string) {
   return `+86${phoneNumber}`
 }
 
-
 export const parseQueryString = (queryString) => {
   queryString = queryString.replace(/^\?/, '')
   const params = {}
@@ -229,3 +228,36 @@ export const parseQueryString = (queryString) => {
 
   return params
 }
+
+// 解析URL参数
+export function parseCaptcha(url) {
+  let queryObj: any = {}
+  const matched = url.match(/^(data:.*?)(\?[^#\s]*)?$/)
+  if (matched) {
+    // eslint-disable-next-line prefer-destructuring
+    url = matched[1]
+    const search = matched[2]
+    if (search) {
+      queryObj = parseQueryString(search)
+    }
+  }
+  const { token, ...restQueryObj } = queryObj
+  if (/^data:/.test(url) && !token) {
+    return {
+      error: 'invalid_argument',
+      error_description: `invalid captcha data: ${url}`,
+    }
+  }
+  if (!token) {
+    return {
+      error: 'unimplemented',
+      error_description: 'need to impl captcha data',
+    }
+  }
+  // 解析url得到的参数
+  return {
+    state: restQueryObj.state,
+    token, // 验证码token
+    captchaData: url, // 验证码base64图片
+  }
+}

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "node16",
     "outDir": "dist/cjs",
     "rootDir": "src",
     "noImplicitAny": false,