befly 0.1.26 → 0.2.0

package/apis/health/info.js

@@ -2,7 +2,7 @@ import { Env } from '../../config/env.js';
 import { Api } from '../../utils/api.js';
 import { RYes, RNo } from '../../utils/util.js';
 
-export default Api.POST('健康检查', { auth: false }, {}, [], async (bunpii, ctx) => {
+export default Api.POST('健康检查', { auth: false }, {}, [], async (befly, ctx) => {
     const info = {
         status: 'ok',
         timestamp: new Date().toISOString(),
@@ -15,9 +15,9 @@ export default Api.POST('健康检查', { auth: false }, {}, [], async (bunpii,
     };
     // 检查 Redis 连接状态
     if (Env.REDIS_ENABLE === 1) {
-        if (bunpii.redis) {
+        if (befly.redis) {
             try {
-                await bunpii.redis.ping();
+                await befly.redis.ping();
                 info.redis = '已连接';
             } catch (error) {
                 info.redis = '未连接';

package/libs/xml/strnum.js

@@ -60,8 +60,10 @@ export default function toNumber(str, options = {}) {
                     else return str;
                 } else if (trimmedStr.indexOf('.') !== -1) {
                     //floating number
-                    if (parsedStr === '0') return num; //0.0
-                    else if (parsedStr === numTrimmedByZeros) return num; //0.456. 0.79000
+                    if (parsedStr === '0')
+                        return num; //0.0
+                    else if (parsedStr === numTrimmedByZeros)
+                        return num; //0.456. 0.79000
                     else if (parsedStr === `${sign}${numTrimmedByZeros}`) return num;
                     else return str;
                 }

package/libs/xml/util.js

@@ -6,32 +6,32 @@ export const nameRegexp = '[' + nameStartChar + '][' + nameChar + ']*';
 const regexName = new RegExp('^' + nameRegexp + '$');
 
 export function getAllMatches(string, regex) {
-  const matches = [];
-  let match = regex.exec(string);
-  while (match) {
-    const allmatches = [];
-    allmatches.startIndex = regex.lastIndex - match[0].length;
-    const len = match.length;
-    for (let index = 0; index < len; index++) {
-      allmatches.push(match[index]);
+    const matches = [];
+    let match = regex.exec(string);
+    while (match) {
+        const allmatches = [];
+        allmatches.startIndex = regex.lastIndex - match[0].length;
+        const len = match.length;
+        for (let index = 0; index < len; index++) {
+            allmatches.push(match[index]);
+        }
+        matches.push(allmatches);
+        match = regex.exec(string);
     }
-    matches.push(allmatches);
-    match = regex.exec(string);
-  }
-  return matches;
+    return matches;
 }
 
-export const isName = function(string) {
-  const match = regexName.exec(string);
-  return !(match === null || typeof match === 'undefined');
-}
+export const isName = function (string) {
+    const match = regexName.exec(string);
+    return !(match === null || typeof match === 'undefined');
+};
 
 export function isExist(v) {
-  return typeof v !== 'undefined';
+    return typeof v !== 'undefined';
 }
 
 export function isEmptyObject(obj) {
-  return Object.keys(obj).length === 0;
+    return Object.keys(obj).length === 0;
 }
 
 /**
@@ -40,29 +40,29 @@ export function isEmptyObject(obj) {
  * @param {*} a
  */
 export function merge(target, a, arrayMode) {
-  if (a) {
-    const keys = Object.keys(a); // will return an array of own properties
-    const len = keys.length; //don't make it inline
-    for (let i = 0; i < len; i++) {
-      if (arrayMode === 'strict') {
-        target[keys[i]] = [ a[keys[i]] ];
-      } else {
-        target[keys[i]] = a[keys[i]];
-      }
+    if (a) {
+        const keys = Object.keys(a); // will return an array of own properties
+        const len = keys.length; //don't make it inline
+        for (let i = 0; i < len; i++) {
+            if (arrayMode === 'strict') {
+                target[keys[i]] = [a[keys[i]]];
+            } else {
+                target[keys[i]] = a[keys[i]];
+            }
+        }
     }
-  }
 }
 /* exports.merge =function (b,a){
   return Object.assign(b,a);
 } */
 
 export function getValue(v) {
-  if (exports.isExist(v)) {
-    return v;
-  } else {
-    return '';
-  }
+    if (exports.isExist(v)) {
+        return v;
+    } else {
+        return '';
+    }
 }
 
 // const fakeCall = function(a) {return a;};
-// const fakeCallNoReturn = function() {};
+// const fakeCallNoReturn = function() {};

package/libs/xml/validator.js

@@ -1,197 +1,195 @@
 'use strict';
 
-import {getAllMatches, isName} from './util.js';
+import { getAllMatches, isName } from './util.js';
 
 const defaultOptions = {
-  allowBooleanAttributes: false, //A tag can have attributes without any value
-  unpairedTags: []
+    allowBooleanAttributes: false, //A tag can have attributes without any value
+    unpairedTags: []
 };
 
 //const tagsPattern = new RegExp("<\\/?([\\w:\\-_\.]+)\\s*\/?>","g");
 export function validate(xmlData, options) {
-  options = Object.assign({}, defaultOptions, options);
-
-  //xmlData = xmlData.replace(/(\r\n|\n|\r)/gm,"");//make it single line
-  //xmlData = xmlData.replace(/(^\s*<\?xml.*?\?>)/g,"");//Remove XML starting tag
-  //xmlData = xmlData.replace(/(<!DOCTYPE[\s\w\"\.\/\-\:]+(\[.*\])*\s*>)/g,"");//Remove DOCTYPE
-  const tags = [];
-  let tagFound = false;
-
-  //indicates that the root tag has been closed (aka. depth 0 has been reached)
-  let reachedRoot = false;
-
-  if (xmlData[0] === '\ufeff') {
-    // check for byte order mark (BOM)
-    xmlData = xmlData.substr(1);
-  }
-  
-  for (let i = 0; i < xmlData.length; i++) {
-
-    if (xmlData[i] === '<' && xmlData[i+1] === '?') {
-      i+=2;
-      i = readPI(xmlData,i);
-      if (i.err) return i;
-    }else if (xmlData[i] === '<') {
-      //starting of tag
-      //read until you reach to '>' avoiding any '>' in attribute value
-      let tagStartPos = i;
-      i++;
-      
-      if (xmlData[i] === '!') {
-        i = readCommentAndCDATA(xmlData, i);
-        continue;
-      } else {
-        let closingTag = false;
-        if (xmlData[i] === '/') {
-          //closing tag
-          closingTag = true;
-          i++;
-        }
-        //read tagname
-        let tagName = '';
-        for (; i < xmlData.length &&
-          xmlData[i] !== '>' &&
-          xmlData[i] !== ' ' &&
-          xmlData[i] !== '\t' &&
-          xmlData[i] !== '\n' &&
-          xmlData[i] !== '\r'; i++
-        ) {
-          tagName += xmlData[i];
-        }
-        tagName = tagName.trim();
-        //console.log(tagName);
-
-        if (tagName[tagName.length - 1] === '/') {
-          //self closing tag without attributes
-          tagName = tagName.substring(0, tagName.length - 1);
-          //continue;
-          i--;
-        }
-        if (!validateTagName(tagName)) {
-          let msg;
-          if (tagName.trim().length === 0) {
-            msg = "Invalid space after '<'.";
-          } else {
-            msg = "Tag '"+tagName+"' is an invalid name.";
-          }
-          return getErrorObject('InvalidTag', msg, getLineNumberForPosition(xmlData, i));
-        }
+    options = Object.assign({}, defaultOptions, options);
 
-        const result = readAttributeStr(xmlData, i);
-        if (result === false) {
-          return getErrorObject('InvalidAttr', "Attributes for '"+tagName+"' have open quote.", getLineNumberForPosition(xmlData, i));
-        }
-        let attrStr = result.value;
-        i = result.index;
-
-        if (attrStr[attrStr.length - 1] === '/') {
-          //self closing tag
-          const attrStrStart = i - attrStr.length;
-          attrStr = attrStr.substring(0, attrStr.length - 1);
-          const isValid = validateAttributeString(attrStr, options);
-          if (isValid === true) {
-            tagFound = true;
-            //continue; //text may presents after self closing tag
-          } else {
-            //the result from the nested function returns the position of the error within the attribute
-            //in order to get the 'true' error line, we need to calculate the position where the attribute begins (i - attrStr.length) and then add the position within the attribute
-            //this gives us the absolute index in the entire xml, which we can use to find the line at last
-            return getErrorObject(isValid.err.code, isValid.err.msg, getLineNumberForPosition(xmlData, attrStrStart + isValid.err.line));
-          }
-        } else if (closingTag) {
-          if (!result.tagClosed) {
-            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' doesn't have proper closing.", getLineNumberForPosition(xmlData, i));
-          } else if (attrStr.trim().length > 0) {
-            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' can't have attributes or invalid starting.", getLineNumberForPosition(xmlData, tagStartPos));
-          } else if (tags.length === 0) {
-            return getErrorObject('InvalidTag', "Closing tag '"+tagName+"' has not been opened.", getLineNumberForPosition(xmlData, tagStartPos));
-          } else {
-            const otg = tags.pop();
-            if (tagName !== otg.tagName) {
-              let openPos = getLineNumberForPosition(xmlData, otg.tagStartPos);
-              return getErrorObject('InvalidTag',
-                "Expected closing tag '"+otg.tagName+"' (opened in line "+openPos.line+", col "+openPos.col+") instead of closing tag '"+tagName+"'.",
-                getLineNumberForPosition(xmlData, tagStartPos));
-            }
+    //xmlData = xmlData.replace(/(\r\n|\n|\r)/gm,"");//make it single line
+    //xmlData = xmlData.replace(/(^\s*<\?xml.*?\?>)/g,"");//Remove XML starting tag
+    //xmlData = xmlData.replace(/(<!DOCTYPE[\s\w\"\.\/\-\:]+(\[.*\])*\s*>)/g,"");//Remove DOCTYPE
+    const tags = [];
+    let tagFound = false;
 
-            //when there are no more tags, we reached the root level.
-            if (tags.length == 0) {
-              reachedRoot = true;
-            }
-          }
-        } else {
-          const isValid = validateAttributeString(attrStr, options);
-          if (isValid !== true) {
-            //the result from the nested function returns the position of the error within the attribute
-            //in order to get the 'true' error line, we need to calculate the position where the attribute begins (i - attrStr.length) and then add the position within the attribute
-            //this gives us the absolute index in the entire xml, which we can use to find the line at last
-            return getErrorObject(isValid.err.code, isValid.err.msg, getLineNumberForPosition(xmlData, i - attrStr.length + isValid.err.line));
-          }
-
-          //if the root level has been reached before ...
-          if (reachedRoot === true) {
-            return getErrorObject('InvalidXml', 'Multiple possible root nodes found.', getLineNumberForPosition(xmlData, i));
-          } else if(options.unpairedTags.indexOf(tagName) !== -1){
-            //don't push into stack
-          } else {
-            tags.push({tagName, tagStartPos});
-          }
-          tagFound = true;
-        }
+    //indicates that the root tag has been closed (aka. depth 0 has been reached)
+    let reachedRoot = false;
+
+    if (xmlData[0] === '\ufeff') {
+        // check for byte order mark (BOM)
+        xmlData = xmlData.substr(1);
+    }
 
-        //skip tag text value
-        //It may include comments and CDATA value
-        for (i++; i < xmlData.length; i++) {
-          if (xmlData[i] === '<') {
-            if (xmlData[i + 1] === '!') {
-              //comment or CADATA
-              i++;
-              i = readCommentAndCDATA(xmlData, i);
-              continue;
-            } else if (xmlData[i+1] === '?') {
-              i = readPI(xmlData, ++i);
-              if (i.err) return i;
-            } else{
-              break;
+    for (let i = 0; i < xmlData.length; i++) {
+        if (xmlData[i] === '<' && xmlData[i + 1] === '?') {
+            i += 2;
+            i = readPI(xmlData, i);
+            if (i.err) return i;
+        } else if (xmlData[i] === '<') {
+            //starting of tag
+            //read until you reach to '>' avoiding any '>' in attribute value
+            let tagStartPos = i;
+            i++;
+
+            if (xmlData[i] === '!') {
+                i = readCommentAndCDATA(xmlData, i);
+                continue;
+            } else {
+                let closingTag = false;
+                if (xmlData[i] === '/') {
+                    //closing tag
+                    closingTag = true;
+                    i++;
+                }
+                //read tagname
+                let tagName = '';
+                for (; i < xmlData.length && xmlData[i] !== '>' && xmlData[i] !== ' ' && xmlData[i] !== '\t' && xmlData[i] !== '\n' && xmlData[i] !== '\r'; i++) {
+                    tagName += xmlData[i];
+                }
+                tagName = tagName.trim();
+                //console.log(tagName);
+
+                if (tagName[tagName.length - 1] === '/') {
+                    //self closing tag without attributes
+                    tagName = tagName.substring(0, tagName.length - 1);
+                    //continue;
+                    i--;
+                }
+                if (!validateTagName(tagName)) {
+                    let msg;
+                    if (tagName.trim().length === 0) {
+                        msg = "Invalid space after '<'.";
+                    } else {
+                        msg = "Tag '" + tagName + "' is an invalid name.";
+                    }
+                    return getErrorObject('InvalidTag', msg, getLineNumberForPosition(xmlData, i));
+                }
+
+                const result = readAttributeStr(xmlData, i);
+                if (result === false) {
+                    return getErrorObject('InvalidAttr', "Attributes for '" + tagName + "' have open quote.", getLineNumberForPosition(xmlData, i));
+                }
+                let attrStr = result.value;
+                i = result.index;
+
+                if (attrStr[attrStr.length - 1] === '/') {
+                    //self closing tag
+                    const attrStrStart = i - attrStr.length;
+                    attrStr = attrStr.substring(0, attrStr.length - 1);
+                    const isValid = validateAttributeString(attrStr, options);
+                    if (isValid === true) {
+                        tagFound = true;
+                        //continue; //text may presents after self closing tag
+                    } else {
+                        //the result from the nested function returns the position of the error within the attribute
+                        //in order to get the 'true' error line, we need to calculate the position where the attribute begins (i - attrStr.length) and then add the position within the attribute
+                        //this gives us the absolute index in the entire xml, which we can use to find the line at last
+                        return getErrorObject(isValid.err.code, isValid.err.msg, getLineNumberForPosition(xmlData, attrStrStart + isValid.err.line));
+                    }
+                } else if (closingTag) {
+                    if (!result.tagClosed) {
+                        return getErrorObject('InvalidTag', "Closing tag '" + tagName + "' doesn't have proper closing.", getLineNumberForPosition(xmlData, i));
+                    } else if (attrStr.trim().length > 0) {
+                        return getErrorObject('InvalidTag', "Closing tag '" + tagName + "' can't have attributes or invalid starting.", getLineNumberForPosition(xmlData, tagStartPos));
+                    } else if (tags.length === 0) {
+                        return getErrorObject('InvalidTag', "Closing tag '" + tagName + "' has not been opened.", getLineNumberForPosition(xmlData, tagStartPos));
+                    } else {
+                        const otg = tags.pop();
+                        if (tagName !== otg.tagName) {
+                            let openPos = getLineNumberForPosition(xmlData, otg.tagStartPos);
+                            return getErrorObject('InvalidTag', "Expected closing tag '" + otg.tagName + "' (opened in line " + openPos.line + ', col ' + openPos.col + ") instead of closing tag '" + tagName + "'.", getLineNumberForPosition(xmlData, tagStartPos));
+                        }
+
+                        //when there are no more tags, we reached the root level.
+                        if (tags.length == 0) {
+                            reachedRoot = true;
+                        }
+                    }
+                } else {
+                    const isValid = validateAttributeString(attrStr, options);
+                    if (isValid !== true) {
+                        //the result from the nested function returns the position of the error within the attribute
+                        //in order to get the 'true' error line, we need to calculate the position where the attribute begins (i - attrStr.length) and then add the position within the attribute
+                        //this gives us the absolute index in the entire xml, which we can use to find the line at last
+                        return getErrorObject(isValid.err.code, isValid.err.msg, getLineNumberForPosition(xmlData, i - attrStr.length + isValid.err.line));
+                    }
+
+                    //if the root level has been reached before ...
+                    if (reachedRoot === true) {
+                        return getErrorObject('InvalidXml', 'Multiple possible root nodes found.', getLineNumberForPosition(xmlData, i));
+                    } else if (options.unpairedTags.indexOf(tagName) !== -1) {
+                        //don't push into stack
+                    } else {
+                        tags.push({ tagName, tagStartPos });
+                    }
+                    tagFound = true;
+                }
+
+                //skip tag text value
+                //It may include comments and CDATA value
+                for (i++; i < xmlData.length; i++) {
+                    if (xmlData[i] === '<') {
+                        if (xmlData[i + 1] === '!') {
+                            //comment or CADATA
+                            i++;
+                            i = readCommentAndCDATA(xmlData, i);
+                            continue;
+                        } else if (xmlData[i + 1] === '?') {
+                            i = readPI(xmlData, ++i);
+                            if (i.err) return i;
+                        } else {
+                            break;
+                        }
+                    } else if (xmlData[i] === '&') {
+                        const afterAmp = validateAmpersand(xmlData, i);
+                        if (afterAmp == -1) return getErrorObject('InvalidChar', "char '&' is not expected.", getLineNumberForPosition(xmlData, i));
+                        i = afterAmp;
+                    } else {
+                        if (reachedRoot === true && !isWhiteSpace(xmlData[i])) {
+                            return getErrorObject('InvalidXml', 'Extra text at the end', getLineNumberForPosition(xmlData, i));
+                        }
+                    }
+                } //end of reading tag text value
+                if (xmlData[i] === '<') {
+                    i--;
+                }
             }
-          } else if (xmlData[i] === '&') {
-            const afterAmp = validateAmpersand(xmlData, i);
-            if (afterAmp == -1)
-              return getErrorObject('InvalidChar', "char '&' is not expected.", getLineNumberForPosition(xmlData, i));
-            i = afterAmp;
-          }else{
-            if (reachedRoot === true && !isWhiteSpace(xmlData[i])) {
-              return getErrorObject('InvalidXml', "Extra text at the end", getLineNumberForPosition(xmlData, i));
+        } else {
+            if (isWhiteSpace(xmlData[i])) {
+                continue;
             }
-          }
-        } //end of reading tag text value
-        if (xmlData[i] === '<') {
-          i--;
+            return getErrorObject('InvalidChar', "char '" + xmlData[i] + "' is not expected.", getLineNumberForPosition(xmlData, i));
         }
-      }
-    } else {
-      if ( isWhiteSpace(xmlData[i])) {
-        continue;
-      }
-      return getErrorObject('InvalidChar', "char '"+xmlData[i]+"' is not expected.", getLineNumberForPosition(xmlData, i));
     }
-  }
-
-  if (!tagFound) {
-    return getErrorObject('InvalidXml', 'Start tag expected.', 1);
-  }else if (tags.length == 1) {
-      return getErrorObject('InvalidTag', "Unclosed tag '"+tags[0].tagName+"'.", getLineNumberForPosition(xmlData, tags[0].tagStartPos));
-  }else if (tags.length > 0) {
-      return getErrorObject('InvalidXml', "Invalid '"+
-          JSON.stringify(tags.map(t => t.tagName), null, 4).replace(/\r?\n/g, '')+
-          "' found.", {line: 1, col: 1});
-  }
-
-  return true;
-};
 
-function isWhiteSpace(char){
-  return char === ' ' || char === '\t' || char === '\n'  || char === '\r';
+    if (!tagFound) {
+        return getErrorObject('InvalidXml', 'Start tag expected.', 1);
+    } else if (tags.length == 1) {
+        return getErrorObject('InvalidTag', "Unclosed tag '" + tags[0].tagName + "'.", getLineNumberForPosition(xmlData, tags[0].tagStartPos));
+    } else if (tags.length > 0) {
+        return getErrorObject(
+            'InvalidXml',
+            "Invalid '" +
+                JSON.stringify(
+                    tags.map((t) => t.tagName),
+                    null,
+                    4
+                ).replace(/\r?\n/g, '') +
+                "' found.",
+            { line: 1, col: 1 }
+        );
+    }
+
+    return true;
+}
+
+function isWhiteSpace(char) {
+    return char === ' ' || char === '\t' || char === '\n' || char === '\r';
 }
 /**
  * Read Processing insstructions and skip
@@ -199,74 +197,56 @@ function isWhiteSpace(char){
  * @param {*} i
  */
 function readPI(xmlData, i) {
-  const start = i;
-  for (; i < xmlData.length; i++) {
-    if (xmlData[i] == '?' || xmlData[i] == ' ') {
-      //tagname
-      const tagname = xmlData.substr(start, i - start);
-      if (i > 5 && tagname === 'xml') {
-        return getErrorObject('InvalidXml', 'XML declaration allowed only at the start of the document.', getLineNumberForPosition(xmlData, i));
-      } else if (xmlData[i] == '?' && xmlData[i + 1] == '>') {
-        //check if valid attribut string
-        i++;
-        break;
-      } else {
-        continue;
-      }
+    const start = i;
+    for (; i < xmlData.length; i++) {
+        if (xmlData[i] == '?' || xmlData[i] == ' ') {
+            //tagname
+            const tagname = xmlData.substr(start, i - start);
+            if (i > 5 && tagname === 'xml') {
+                return getErrorObject('InvalidXml', 'XML declaration allowed only at the start of the document.', getLineNumberForPosition(xmlData, i));
+            } else if (xmlData[i] == '?' && xmlData[i + 1] == '>') {
+                //check if valid attribut string
+                i++;
+                break;
+            } else {
+                continue;
+            }
+        }
     }
-  }
-  return i;
+    return i;
 }
 
 function readCommentAndCDATA(xmlData, i) {
-  if (xmlData.length > i + 5 && xmlData[i + 1] === '-' && xmlData[i + 2] === '-') {
-    //comment
-    for (i += 3; i < xmlData.length; i++) {
-      if (xmlData[i] === '-' && xmlData[i + 1] === '-' && xmlData[i + 2] === '>') {
-        i += 2;
-        break;
-      }
-    }
-  } else if (
-    xmlData.length > i + 8 &&
-    xmlData[i + 1] === 'D' &&
-    xmlData[i + 2] === 'O' &&
-    xmlData[i + 3] === 'C' &&
-    xmlData[i + 4] === 'T' &&
-    xmlData[i + 5] === 'Y' &&
-    xmlData[i + 6] === 'P' &&
-    xmlData[i + 7] === 'E'
-  ) {
-    let angleBracketsCount = 1;
-    for (i += 8; i < xmlData.length; i++) {
-      if (xmlData[i] === '<') {
-        angleBracketsCount++;
-      } else if (xmlData[i] === '>') {
-        angleBracketsCount--;
-        if (angleBracketsCount === 0) {
-          break;
+    if (xmlData.length > i + 5 && xmlData[i + 1] === '-' && xmlData[i + 2] === '-') {
+        //comment
+        for (i += 3; i < xmlData.length; i++) {
+            if (xmlData[i] === '-' && xmlData[i + 1] === '-' && xmlData[i + 2] === '>') {
+                i += 2;
+                break;
+            }
+        }
+    } else if (xmlData.length > i + 8 && xmlData[i + 1] === 'D' && xmlData[i + 2] === 'O' && xmlData[i + 3] === 'C' && xmlData[i + 4] === 'T' && xmlData[i + 5] === 'Y' && xmlData[i + 6] === 'P' && xmlData[i + 7] === 'E') {
+        let angleBracketsCount = 1;
+        for (i += 8; i < xmlData.length; i++) {
+            if (xmlData[i] === '<') {
+                angleBracketsCount++;
+            } else if (xmlData[i] === '>') {
+                angleBracketsCount--;
+                if (angleBracketsCount === 0) {
+                    break;
+                }
+            }
+        }
+    } else if (xmlData.length > i + 9 && xmlData[i + 1] === '[' && xmlData[i + 2] === 'C' && xmlData[i + 3] === 'D' && xmlData[i + 4] === 'A' && xmlData[i + 5] === 'T' && xmlData[i + 6] === 'A' && xmlData[i + 7] === '[') {
+        for (i += 8; i < xmlData.length; i++) {
+            if (xmlData[i] === ']' && xmlData[i + 1] === ']' && xmlData[i + 2] === '>') {
+                i += 2;
+                break;
+            }
         }
-      }
-    }
-  } else if (
-    xmlData.length > i + 9 &&
-    xmlData[i + 1] === '[' &&
-    xmlData[i + 2] === 'C' &&
-    xmlData[i + 3] === 'D' &&
-    xmlData[i + 4] === 'A' &&
-    xmlData[i + 5] === 'T' &&
-    xmlData[i + 6] === 'A' &&
-    xmlData[i + 7] === '['
-  ) {
-    for (i += 8; i < xmlData.length; i++) {
-      if (xmlData[i] === ']' && xmlData[i + 1] === ']' && xmlData[i + 2] === '>') {
-        i += 2;
-        break;
-      }
     }
-  }
 
-  return i;
+    return i;
 }
 
 const doubleQuote = '"';
@@ -278,35 +258,35 @@ const singleQuote = "'";
  * @param {number} i
  */
 function readAttributeStr(xmlData, i) {
-  let attrStr = '';
-  let startChar = '';
-  let tagClosed = false;
-  for (; i < xmlData.length; i++) {
-    if (xmlData[i] === doubleQuote || xmlData[i] === singleQuote) {
-      if (startChar === '') {
-        startChar = xmlData[i];
-      } else if (startChar !== xmlData[i]) {
-        //if vaue is enclosed with double quote then single quotes are allowed inside the value and vice versa
-      } else {
-        startChar = '';
-      }
-    } else if (xmlData[i] === '>') {
-      if (startChar === '') {
-        tagClosed = true;
-        break;
-      }
+    let attrStr = '';
+    let startChar = '';
+    let tagClosed = false;
+    for (; i < xmlData.length; i++) {
+        if (xmlData[i] === doubleQuote || xmlData[i] === singleQuote) {
+            if (startChar === '') {
+                startChar = xmlData[i];
+            } else if (startChar !== xmlData[i]) {
+                //if vaue is enclosed with double quote then single quotes are allowed inside the value and vice versa
+            } else {
+                startChar = '';
+            }
+        } else if (xmlData[i] === '>') {
+            if (startChar === '') {
+                tagClosed = true;
+                break;
+            }
+        }
+        attrStr += xmlData[i];
+    }
+    if (startChar !== '') {
+        return false;
     }
-    attrStr += xmlData[i];
-  }
-  if (startChar !== '') {
-    return false;
-  }
-
-  return {
-    value: attrStr,
-    index: i,
-    tagClosed: tagClosed
-  };
+
+    return {
+        value: attrStr,
+        index: i,
+        tagClosed: tagClosed
+    };
 }
 
 /**
@@ -317,109 +297,104 @@ const validAttrStrRegxp = new RegExp('(\\s*)([^\\s=]+)(\\s*=)?(\\s*([\'"])(([\\s
 //attr, ="sd", a="amit's", a="sd"b="saf", ab  cd=""
 
 function validateAttributeString(attrStr, options) {
-  //console.log("start:"+attrStr+":end");
-
-  //if(attrStr.trim().length === 0) return true; //empty string
-
-  const matches = getAllMatches(attrStr, validAttrStrRegxp);
-  const attrNames = {};
-
-  for (let i = 0; i < matches.length; i++) {
-    if (matches[i][1].length === 0) {
-      //nospace before attribute name: a="sd"b="saf"
-      return getErrorObject('InvalidAttr', "Attribute '"+matches[i][2]+"' has no space in starting.", getPositionFromMatch(matches[i]))
-    } else if (matches[i][3] !== undefined && matches[i][4] === undefined) {
-      return getErrorObject('InvalidAttr', "Attribute '"+matches[i][2]+"' is without value.", getPositionFromMatch(matches[i]));
-    } else if (matches[i][3] === undefined && !options.allowBooleanAttributes) {
-      //independent attribute: ab
-      return getErrorObject('InvalidAttr', "boolean attribute '"+matches[i][2]+"' is not allowed.", getPositionFromMatch(matches[i]));
-    }
-    /* else if(matches[i][6] === undefined){//attribute without value: ab=
+    //console.log("start:"+attrStr+":end");
+
+    //if(attrStr.trim().length === 0) return true; //empty string
+
+    const matches = getAllMatches(attrStr, validAttrStrRegxp);
+    const attrNames = {};
+
+    for (let i = 0; i < matches.length; i++) {
+        if (matches[i][1].length === 0) {
+            //nospace before attribute name: a="sd"b="saf"
+            return getErrorObject('InvalidAttr', "Attribute '" + matches[i][2] + "' has no space in starting.", getPositionFromMatch(matches[i]));
+        } else if (matches[i][3] !== undefined && matches[i][4] === undefined) {
+            return getErrorObject('InvalidAttr', "Attribute '" + matches[i][2] + "' is without value.", getPositionFromMatch(matches[i]));
+        } else if (matches[i][3] === undefined && !options.allowBooleanAttributes) {
+            //independent attribute: ab
+            return getErrorObject('InvalidAttr', "boolean attribute '" + matches[i][2] + "' is not allowed.", getPositionFromMatch(matches[i]));
+        }
+        /* else if(matches[i][6] === undefined){//attribute without value: ab=
                     return { err: { code:"InvalidAttr",msg:"attribute " + matches[i][2] + " has no value assigned."}};
                 } */
-    const attrName = matches[i][2];
-    if (!validateAttrName(attrName)) {
-      return getErrorObject('InvalidAttr', "Attribute '"+attrName+"' is an invalid name.", getPositionFromMatch(matches[i]));
-    }
-    if (!attrNames.hasOwnProperty(attrName)) {
-      //check for duplicate attribute.
-      attrNames[attrName] = 1;
-    } else {
-      return getErrorObject('InvalidAttr', "Attribute '"+attrName+"' is repeated.", getPositionFromMatch(matches[i]));
+        const attrName = matches[i][2];
+        if (!validateAttrName(attrName)) {
+            return getErrorObject('InvalidAttr', "Attribute '" + attrName + "' is an invalid name.", getPositionFromMatch(matches[i]));
+        }
+        if (!attrNames.hasOwnProperty(attrName)) {
+            //check for duplicate attribute.
+            attrNames[attrName] = 1;
+        } else {
+            return getErrorObject('InvalidAttr', "Attribute '" + attrName + "' is repeated.", getPositionFromMatch(matches[i]));
+        }
     }
-  }
 
-  return true;
+    return true;
 }
 
 function validateNumberAmpersand(xmlData, i) {
-  let re = /\d/;
-  if (xmlData[i] === 'x') {
-    i++;
-    re = /[\da-fA-F]/;
-  }
-  for (; i < xmlData.length; i++) {
-    if (xmlData[i] === ';')
-      return i;
-    if (!xmlData[i].match(re))
-      break;
-  }
-  return -1;
+    let re = /\d/;
+    if (xmlData[i] === 'x') {
+        i++;
+        re = /[\da-fA-F]/;
+    }
+    for (; i < xmlData.length; i++) {
+        if (xmlData[i] === ';') return i;
+        if (!xmlData[i].match(re)) break;
+    }
+    return -1;
 }
 
 function validateAmpersand(xmlData, i) {
-  // https://www.w3.org/TR/xml/#dt-charref
-  i++;
-  if (xmlData[i] === ';')
-    return -1;
-  if (xmlData[i] === '#') {
+    // https://www.w3.org/TR/xml/#dt-charref
     i++;
-    return validateNumberAmpersand(xmlData, i);
-  }
-  let count = 0;
-  for (; i < xmlData.length; i++, count++) {
-    if (xmlData[i].match(/\w/) && count < 20)
-      continue;
-    if (xmlData[i] === ';')
-      break;
-    return -1;
-  }
-  return i;
+    if (xmlData[i] === ';') return -1;
+    if (xmlData[i] === '#') {
+        i++;
+        return validateNumberAmpersand(xmlData, i);
+    }
+    let count = 0;
+    for (; i < xmlData.length; i++, count++) {
+        if (xmlData[i].match(/\w/) && count < 20) continue;
+        if (xmlData[i] === ';') break;
+        return -1;
+    }
+    return i;
 }
 
 function getErrorObject(code, message, lineNumber) {
-  return {
-    err: {
-      code: code,
-      msg: message,
-      line: lineNumber.line || lineNumber,
-      col: lineNumber.col,
-    },
-  };
+    return {
+        err: {
+            code: code,
+            msg: message,
+            line: lineNumber.line || lineNumber,
+            col: lineNumber.col
+        }
+    };
 }
 
 function validateAttrName(attrName) {
-  return isName(attrName);
+    return isName(attrName);
 }
 
 // const startsWithXML = /^xml/i;
 
 function validateTagName(tagname) {
-  return isName(tagname) /* && !tagname.match(startsWithXML) */;
+    return isName(tagname) /* && !tagname.match(startsWithXML) */;
 }
 
 //this function returns the line number for the character at the given index
 function getLineNumberForPosition(xmlData, index) {
-  const lines = xmlData.substring(0, index).split(/\r?\n/);
-  return {
-    line: lines.length,
+    const lines = xmlData.substring(0, index).split(/\r?\n/);
+    return {
+        line: lines.length,
 
-    // column number is last line's length + 1, because column numbering starts at 1:
-    col: lines[lines.length - 1].length + 1
-  };
+        // column number is last line's length + 1, because column numbering starts at 1:
+        col: lines[lines.length - 1].length + 1
+    };
 }
 
 //this function returns the position of the first character of match within attrStr
 function getPositionFromMatch(match) {
-  return match.startIndex + match[1].length;
+    return match.startIndex + match[1].length;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly",
-    "version": "0.1.26",
+    "version": "0.2.0",
     "description": "Buma - 为 Bun 专属打造的 API 接口框架核心引擎",
     "type": "module",
     "private": false,
@@ -49,5 +49,5 @@
         "README.md",
         "vitest.config.js"
     ],
-    "gitHead": "763f398127df3dc2471295745b8dfde3fdd84a92"
+    "gitHead": "38adc6b09eeec245f6a2ce6fae7d71f93940b617"
 }

package/plugins/cors.js

@@ -1,6 +1,6 @@
 export default {
     after: ['_redis', '_db'],
-    async onGet(bunpii, ctx, req) {
+    async onGet(befly, ctx, req) {
         // 设置 CORS 头部
         req.headers.set('Access-Control-Allow-Origin', req.headers.get('origin'));
         req.headers.set('Access-Control-Allow-Methods', 'POST,GET,OPTIONS');

package/plugins/db.js

@@ -4,7 +4,7 @@ import { Crud } from '../utils/curd.js';
 
 export default {
     after: ['_redis'],
-    async onInit(bunpii) {
+    async onInit(befly) {
         try {
             if (Env.MYSQL_ENABLE === 1) {
                 // 创建 MySQL 连接池
@@ -36,7 +36,7 @@ export default {
                 const result = await sql`SELECT VERSION() AS version`.execute(db);
                 if (result?.rows?.[0]?.version) {
                     // 扩展数据库实例
-                    return new Crud(db, bunpii.redis, sql);
+                    return new Crud(db, befly.redis, sql);
                 } else {
                     return {};
                 }

package/plugins/logger.js

@@ -3,7 +3,7 @@ import { Logger } from '../utils/logger.js';
 
 export default {
     after: [],
-    async onInit(bunpii) {
+    async onInit(befly) {
         try {
             return Logger;
         } catch (error) {

package/plugins/redis.js

@@ -3,7 +3,7 @@ import { Logger } from '../utils/logger.js';
 
 export default {
     after: ['_logger'],
-    async onInit(bunpii) {
+    async onInit(befly) {
         try {
             if (Env.REDIS_ENABLE === 1) {
                 const config = {

package/utils/api.js

@@ -1,5 +1,5 @@
-import { Logger } from '../utils/logger.js';
-import { RYes, RNo } from '../utils/util.js';
+import { Logger } from './logger.js';
+import { RYes, RNo } from './util.js';
 export class Api {
     // GET 方法
     static GET(name, auth = false, fields = {}, required = [], handler) {
@@ -9,7 +9,7 @@ export class Api {
             auth: auth,
             fields: fields,
             required: required,
-            handler: this.wrapHandler(handler)
+            handler: await handler(bp, ctx, req)
         };
     }
 
@@ -21,29 +21,7 @@ export class Api {
             auth: auth,
             fields: fields,
             required: required,
-            handler: this.wrapHandler(handler)
-        };
-    }
-
-    // 包装处理器，自动处理异常和响应格式
-    static wrapHandler(handler) {
-        return async (bp, ctx, req) => {
-            try {
-                const result = await handler(bp, ctx, req);
-
-                return result;
-            } catch (error) {
-                Logger.error({
-                    msg: '内部服务器错误',
-                    error: error.message,
-                    stack: error.stack,
-                    url: req?.url || '',
-                    user: ctx?.user || {}
-                });
-
-                // 返回错误响应
-                return RNo('内部服务器错误');
-            }
+            handler: await handler(bp, ctx, req)
         };
     }
 }

package/utils/curd.js

@@ -64,8 +64,11 @@ export class Crud {
 
     // 增强的更新方法 - 自动添加 updated_at，支持链式调用
     updData(tableName, data) {
+        // 剔除 undefined 值
+        const filteredData = Object.fromEntries(Object.entries(data).filter(([key, value]) => value !== undefined));
+
         const updateData = {
-            ...omitFields(data, ['id', 'created_at', 'deleted_at']),
+            ...omitFields(filteredData, ['id', 'created_at', 'deleted_at']),
             updated_at: Date.now()
         };