@dan-uni/dan-any 1.2.5 → 1.2.7

package/dist/browser/17.min.js

@@ -11461,7 +11461,7 @@ __webpack_require__.d(platform_namespaceObject, {
     PlatformVideoSource: ()=>platform_PlatformVideoSource,
     PlatformVideoSources: ()=>PlatformVideoSources
 });
-var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.7","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
 const decimalToHex = (n)=>color_pad(n.toString(16));
 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -11776,7 +11776,7 @@ class UniDM {
         if (this.attr.length > 0) result.attr = this.attr;
         if (void 0 !== this.platform) result.platform = this.platform;
         if (this.extraStr && '{}' !== this.extraStr) result.extraStr = this.extraStr;
-        if (void 0 !== this.DMID) result.DMID = this.DMID;
+        if (void 0 !== this.DMID && this.options.dmid) result.DMID = this.DMID;
         return result;
     }
     downgradeAdvcancedDan({ include, exclude, cleanExtra = false } = {}) {
@@ -11892,7 +11892,7 @@ class UniDM {
         }) ? args.midHash : id_gen_UniID.fromBili({
             midHash: args.midHash
         });
-        let mode = 0;
+        let mode;
         const pool = args.pool;
         const extra = {
             bili: {
@@ -12729,6 +12729,19 @@ const DanUniConvertTipTemplate = {
     meassage: 'Converted by DanUni!',
     version: `JS/TS ${package_namespaceObject.UU} (v${package_namespaceObject.rE})`
 };
+var src_DM_format = /*#__PURE__*/ function(DM_format) {
+    DM_format["DanuniJson"] = "danuni.json";
+    DM_format["DanuniPbBin"] = "danuni.pb.bin";
+    DM_format["BiliXml"] = "bili.xml";
+    DM_format["BiliPbBin"] = "bili.pb.bin";
+    DM_format["BiliCmdPbBin"] = "bili.cmd.pb.bin";
+    DM_format["BiliUpJson"] = "bili.up.json";
+    DM_format["DplayerJson"] = "dplayer.json";
+    DM_format["ArtplayerJson"] = "artplayer.json";
+    DM_format["DdplayJson"] = "ddplay.json";
+    DM_format["CommonAss"] = "common.ass";
+    return DM_format;
+}({});
 class UniPool {
     constructor(dans, options = {}, info = {
         fromConverted: false
@@ -12951,23 +12964,23 @@ class UniPool {
             try {
                 if (Array.isArray(json) && json.every((d)=>d.SOID)) return {
                     pool: new UniPool(json, options),
-                    fmt: 'danuni.json'
+                    fmt: "danuni.json"
                 };
                 if (json.danmuku && json.danmuku.every((d)=>d.text)) return {
                     pool: this.fromArtplayer(json, json.danuni?.data ?? '', void 0, options),
-                    fmt: 'artplayer.json'
+                    fmt: "artplayer.json"
                 };
                 if (json.count && json.comments && Array.isArray(json.comments) && json.comments.every((d)=>d.m)) return {
                     pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-                    fmt: 'ddplay.json'
+                    fmt: "ddplay.json"
                 };
                 else if (0 == json.code && json.data && Array.isArray(json.data) && json.data.every((d)=>Array.isArray(d))) return {
                     pool: this.fromDplayer(json, json.danuni?.data ?? '', void 0, options),
-                    fmt: 'dplayer.json'
+                    fmt: "dplayer.json"
                 };
                 else if (0 == json.code && '0' == json.message && json.data && json.data.page && json.data.result && Array.isArray(json.data.result) && json.data.result.every((d)=>d.id && d.oid)) return {
                     pool: this.fromBiliUp(json, options),
-                    fmt: 'bili.up.json'
+                    fmt: "bili.up.json"
                 };
             } catch  {}
         };
@@ -12986,13 +12999,13 @@ class UniPool {
                     const xml = xmlParser.parse(file);
                     if (xml?.i?.d) return {
                         pool: this.fromBiliXML(file, options),
-                        fmt: 'bili.xml'
+                        fmt: "bili.xml"
                     };
                 } catch  {}
                 try {
                     return {
                         pool: this.fromASS(file, options),
-                        fmt: 'common.ass'
+                        fmt: "common.ass"
                     };
                 } catch  {}
             }
@@ -13004,19 +13017,19 @@ class UniPool {
                     try {
                         return {
                             pool: this.fromPb(file),
-                            fmt: 'danuni.pb.bin'
+                            fmt: "danuni.pb.bin"
                         };
                     } catch  {}
                     try {
                         return {
                             pool: this.fromBiliGrpc(file),
-                            fmt: 'bili.pb.bin'
+                            fmt: "bili.pb.bin"
                         };
                     } catch  {}
                     try {
                         return {
                             pool: this.fromBiliCommandGrpc(file),
-                            fmt: 'bili.cmd.pb.bin'
+                            fmt: "bili.cmd.pb.bin"
                         };
                     } catch  {}
                 }
@@ -13283,4 +13296,4 @@ class UniPool {
         }, canvasCtx);
     }
 }
-export { UniDM, UniPool, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_PlatformVideoSource, platform_namespaceObject as platform };
+export { UniDM, UniPool, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_PlatformVideoSource, platform_namespaceObject as platform, src_DM_format as DM_format };

package/dist/browser/index.min.js

@@ -1 +1 @@
-export { UniDM, UniDMTools, UniIDTools, UniPool, platform } from "./17.min.js";
+export { DM_format, UniDM, UniDMTools, UniIDTools, UniPool, platform } from "./17.min.js";

package/dist/browser/src/index.d.ts

@@ -116,7 +116,18 @@ export interface DM_JSON_DDPlay {
         m: string;
     }[];
 }
-export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.bin' | 'bili.cmd.pb.bin' | 'bili.up.json' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
+export declare enum DM_format {
+    DanuniJson = "danuni.json",
+    DanuniPbBin = "danuni.pb.bin",
+    BiliXml = "bili.xml",
+    BiliPbBin = "bili.pb.bin",
+    BiliCmdPbBin = "bili.cmd.pb.bin",
+    BiliUpJson = "bili.up.json",
+    DplayerJson = "dplayer.json",
+    ArtplayerJson = "artplayer.json",
+    DdplayJson = "ddplay.json",
+    CommonAss = "common.ass"
+}
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type statItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'mode' | 'fontsize' | 'color' | 'senderID' | 'content' | 'weight' | 'pool' | 'platform'>>;
 type Stats<T extends keyof statItems> = Map<statItems[T], number>;

package/dist/node/17.js

@@ -39,7 +39,7 @@ __webpack_require__.d(platform_namespaceObject, {
     PlatformVideoSource: ()=>platform_PlatformVideoSource,
     PlatformVideoSources: ()=>PlatformVideoSources
 });
-var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.7","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
 const decimalToHex = (n)=>color_pad(n.toString(16));
 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -353,7 +353,7 @@ class UniDM {
         if (this.attr.length > 0) result.attr = this.attr;
         if (void 0 !== this.platform) result.platform = this.platform;
         if (this.extraStr && '{}' !== this.extraStr) result.extraStr = this.extraStr;
-        if (void 0 !== this.DMID) result.DMID = this.DMID;
+        if (void 0 !== this.DMID && this.options.dmid) result.DMID = this.DMID;
         return result;
     }
     downgradeAdvcancedDan({ include, exclude, cleanExtra = false } = {}) {
@@ -469,7 +469,7 @@ class UniDM {
         }) ? args.midHash : id_gen_UniID.fromBili({
             midHash: args.midHash
         });
-        let mode = 0;
+        let mode;
         const pool = args.pool;
         const extra = {
             bili: {
@@ -1304,6 +1304,19 @@ const DanUniConvertTipTemplate = {
     meassage: 'Converted by DanUni!',
     version: `JS/TS ${package_namespaceObject.UU} (v${package_namespaceObject.rE})`
 };
+var src_DM_format = /*#__PURE__*/ function(DM_format) {
+    DM_format["DanuniJson"] = "danuni.json";
+    DM_format["DanuniPbBin"] = "danuni.pb.bin";
+    DM_format["BiliXml"] = "bili.xml";
+    DM_format["BiliPbBin"] = "bili.pb.bin";
+    DM_format["BiliCmdPbBin"] = "bili.cmd.pb.bin";
+    DM_format["BiliUpJson"] = "bili.up.json";
+    DM_format["DplayerJson"] = "dplayer.json";
+    DM_format["ArtplayerJson"] = "artplayer.json";
+    DM_format["DdplayJson"] = "ddplay.json";
+    DM_format["CommonAss"] = "common.ass";
+    return DM_format;
+}({});
 class UniPool {
     constructor(dans, options = {}, info = {
         fromConverted: false
@@ -1526,23 +1539,23 @@ class UniPool {
             try {
                 if (Array.isArray(json) && json.every((d)=>d.SOID)) return {
                     pool: new UniPool(json, options),
-                    fmt: 'danuni.json'
+                    fmt: "danuni.json"
                 };
                 if (json.danmuku && json.danmuku.every((d)=>d.text)) return {
                     pool: this.fromArtplayer(json, json.danuni?.data ?? '', void 0, options),
-                    fmt: 'artplayer.json'
+                    fmt: "artplayer.json"
                 };
                 if (json.count && json.comments && Array.isArray(json.comments) && json.comments.every((d)=>d.m)) return {
                     pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-                    fmt: 'ddplay.json'
+                    fmt: "ddplay.json"
                 };
                 else if (0 == json.code && json.data && Array.isArray(json.data) && json.data.every((d)=>Array.isArray(d))) return {
                     pool: this.fromDplayer(json, json.danuni?.data ?? '', void 0, options),
-                    fmt: 'dplayer.json'
+                    fmt: "dplayer.json"
                 };
                 else if (0 == json.code && '0' == json.message && json.data && json.data.page && json.data.result && Array.isArray(json.data.result) && json.data.result.every((d)=>d.id && d.oid)) return {
                     pool: this.fromBiliUp(json, options),
-                    fmt: 'bili.up.json'
+                    fmt: "bili.up.json"
                 };
             } catch  {}
         };
@@ -1561,13 +1574,13 @@ class UniPool {
                     const xml = xmlParser.parse(file);
                     if (xml?.i?.d) return {
                         pool: this.fromBiliXML(file, options),
-                        fmt: 'bili.xml'
+                        fmt: "bili.xml"
                     };
                 } catch  {}
                 try {
                     return {
                         pool: this.fromASS(file, options),
-                        fmt: 'common.ass'
+                        fmt: "common.ass"
                     };
                 } catch  {}
             }
@@ -1579,19 +1592,19 @@ class UniPool {
                     try {
                         return {
                             pool: this.fromPb(file),
-                            fmt: 'danuni.pb.bin'
+                            fmt: "danuni.pb.bin"
                         };
                     } catch  {}
                     try {
                         return {
                             pool: this.fromBiliGrpc(file),
-                            fmt: 'bili.pb.bin'
+                            fmt: "bili.pb.bin"
                         };
                     } catch  {}
                     try {
                         return {
                             pool: this.fromBiliCommandGrpc(file),
-                            fmt: 'bili.cmd.pb.bin'
+                            fmt: "bili.cmd.pb.bin"
                         };
                     } catch  {}
                 }
@@ -1858,4 +1871,4 @@ class UniPool {
         }, canvasCtx);
     }
 }
-export { UniDM, UniPool, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_PlatformVideoSource, platform_namespaceObject as platform };
+export { UniDM, UniPool, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_PlatformVideoSource, platform_namespaceObject as platform, src_DM_format as DM_format };

package/dist/node/index.js

@@ -1 +1 @@
-export { UniDM, UniDMTools, UniIDTools, UniPool, platform } from "./17.js";
+export { DM_format, UniDM, UniDMTools, UniIDTools, UniPool, platform } from "./17.js";

package/dist/node/src/index.d.ts

@@ -116,7 +116,18 @@ export interface DM_JSON_DDPlay {
         m: string;
     }[];
 }
-export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.bin' | 'bili.cmd.pb.bin' | 'bili.up.json' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
+export declare enum DM_format {
+    DanuniJson = "danuni.json",
+    DanuniPbBin = "danuni.pb.bin",
+    BiliXml = "bili.xml",
+    BiliPbBin = "bili.pb.bin",
+    BiliCmdPbBin = "bili.cmd.pb.bin",
+    BiliUpJson = "bili.up.json",
+    DplayerJson = "dplayer.json",
+    ArtplayerJson = "artplayer.json",
+    DdplayJson = "ddplay.json",
+    CommonAss = "common.ass"
+}
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type statItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'mode' | 'fontsize' | 'color' | 'senderID' | 'content' | 'weight' | 'pool' | 'platform'>>;
 type Stats<T extends keyof statItems> = Map<statItems[T], number>;

package/dist/umd/index.umd.min.js

@@ -14266,6 +14266,7 @@ and limitations under the License.
                 UniDM: ()=>UniDM,
                 UniDMTools: ()=>dm_gen_namespaceObject,
                 UniPool: ()=>UniPool,
+                DM_format: ()=>src_DM_format,
                 UniIDTools: ()=>id_gen_namespaceObject
             });
             var id_gen_namespaceObject = {};
@@ -14754,10 +14755,13 @@ and limitations under the License.
                                 i += 7;
                                 let entityName, val;
                                 [entityName, val, i] = this.readEntityExp(xmlData, i + 1, this.suppressValidationErr);
-                                if (-1 === val.indexOf("&")) entities[entityName] = {
-                                    regx: RegExp(`&${entityName};`, "g"),
-                                    val: val
-                                };
+                                if (-1 === val.indexOf("&")) {
+                                    const escaped = entityName.replace(/[.\-+*:]/g, '\\.');
+                                    entities[entityName] = {
+                                        regx: RegExp(`&${escaped};`, "g"),
+                                        val: val
+                                    };
+                                }
                             } else if (hasBody && hasSeq(xmlData, "!ELEMENT", i)) {
                                 i += 8;
                                 const { index } = this.readElementExp(xmlData, i + 1);
@@ -15140,8 +15144,9 @@ and limitations under the License.
                 const entKeys = Object.keys(externalEntities);
                 for(let i = 0; i < entKeys.length; i++){
                     const ent = entKeys[i];
+                    const escaped = ent.replace(/[.\-+*:]/g, '\\.');
                     this.lastEntities[ent] = {
-                        regex: new RegExp("&" + ent + ";", "g"),
+                        regex: new RegExp("&" + escaped + ";", "g"),
                         val: externalEntities[ent]
                     };
                 }
@@ -21048,7 +21053,7 @@ and limitations under the License.
             function timestamp_timestampMs(timestamp) {
                 return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
             }
-            var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+            var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.7","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
             const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
             const decimalToHex = (n)=>color_pad(n.toString(16));
             const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -23533,7 +23538,7 @@ and limitations under the License.
                     if (this.attr.length > 0) result.attr = this.attr;
                     if (void 0 !== this.platform) result.platform = this.platform;
                     if (this.extraStr && '{}' !== this.extraStr) result.extraStr = this.extraStr;
-                    if (void 0 !== this.DMID) result.DMID = this.DMID;
+                    if (void 0 !== this.DMID && this.options.dmid) result.DMID = this.DMID;
                     return result;
                 }
                 downgradeAdvcancedDan({ include, exclude, cleanExtra = false } = {}) {
@@ -23649,7 +23654,7 @@ and limitations under the License.
                     }) ? args.midHash : id_gen_UniID.fromBili({
                         midHash: args.midHash
                     });
-                    let mode = 0;
+                    let mode;
                     const pool = args.pool;
                     const extra = {
                         bili: {
@@ -24487,6 +24492,19 @@ and limitations under the License.
                 meassage: 'Converted by DanUni!',
                 version: `JS/TS ${package_namespaceObject.UU} (v${package_namespaceObject.rE})`
             };
+            var src_DM_format = /*#__PURE__*/ function(DM_format) {
+                DM_format["DanuniJson"] = "danuni.json";
+                DM_format["DanuniPbBin"] = "danuni.pb.bin";
+                DM_format["BiliXml"] = "bili.xml";
+                DM_format["BiliPbBin"] = "bili.pb.bin";
+                DM_format["BiliCmdPbBin"] = "bili.cmd.pb.bin";
+                DM_format["BiliUpJson"] = "bili.up.json";
+                DM_format["DplayerJson"] = "dplayer.json";
+                DM_format["ArtplayerJson"] = "artplayer.json";
+                DM_format["DdplayJson"] = "ddplay.json";
+                DM_format["CommonAss"] = "common.ass";
+                return DM_format;
+            }({});
             class UniPool {
                 constructor(dans, options = {}, info = {
                     fromConverted: false
@@ -24709,23 +24727,23 @@ and limitations under the License.
                         try {
                             if (Array.isArray(json) && json.every((d)=>d.SOID)) return {
                                 pool: new UniPool(json, options),
-                                fmt: 'danuni.json'
+                                fmt: "danuni.json"
                             };
                             if (json.danmuku && json.danmuku.every((d)=>d.text)) return {
                                 pool: this.fromArtplayer(json, json.danuni?.data ?? '', void 0, options),
-                                fmt: 'artplayer.json'
+                                fmt: "artplayer.json"
                             };
                             if (json.count && json.comments && Array.isArray(json.comments) && json.comments.every((d)=>d.m)) return {
                                 pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-                                fmt: 'ddplay.json'
+                                fmt: "ddplay.json"
                             };
                             else if (0 == json.code && json.data && Array.isArray(json.data) && json.data.every((d)=>Array.isArray(d))) return {
                                 pool: this.fromDplayer(json, json.danuni?.data ?? '', void 0, options),
-                                fmt: 'dplayer.json'
+                                fmt: "dplayer.json"
                             };
                             else if (0 == json.code && '0' == json.message && json.data && json.data.page && json.data.result && Array.isArray(json.data.result) && json.data.result.every((d)=>d.id && d.oid)) return {
                                 pool: this.fromBiliUp(json, options),
-                                fmt: 'bili.up.json'
+                                fmt: "bili.up.json"
                             };
                         } catch  {}
                     };
@@ -24744,13 +24762,13 @@ and limitations under the License.
                                 const xml = xmlParser.parse(file);
                                 if (xml?.i?.d) return {
                                     pool: this.fromBiliXML(file, options),
-                                    fmt: 'bili.xml'
+                                    fmt: "bili.xml"
                                 };
                             } catch  {}
                             try {
                                 return {
                                     pool: this.fromASS(file, options),
-                                    fmt: 'common.ass'
+                                    fmt: "common.ass"
                                 };
                             } catch  {}
                         }
@@ -24762,19 +24780,19 @@ and limitations under the License.
                                 try {
                                     return {
                                         pool: this.fromPb(file),
-                                        fmt: 'danuni.pb.bin'
+                                        fmt: "danuni.pb.bin"
                                     };
                                 } catch  {}
                                 try {
                                     return {
                                         pool: this.fromBiliGrpc(file),
-                                        fmt: 'bili.pb.bin'
+                                        fmt: "bili.pb.bin"
                                     };
                                 } catch  {}
                                 try {
                                     return {
                                         pool: this.fromBiliCommandGrpc(file),
-                                        fmt: 'bili.cmd.pb.bin'
+                                        fmt: "bili.cmd.pb.bin"
                                     };
                                 } catch  {}
                             }

package/dist/umd/plugins/bili.umd.min.js

@@ -14045,10 +14045,13 @@
                                     i += 7;
                                     let entityName, val;
                                     [entityName, val, i] = this.readEntityExp(xmlData, i + 1, this.suppressValidationErr);
-                                    if (-1 === val.indexOf("&")) entities[entityName] = {
-                                        regx: RegExp(`&${entityName};`, "g"),
-                                        val: val
-                                    };
+                                    if (-1 === val.indexOf("&")) {
+                                        const escaped = entityName.replace(/[.\-+*:]/g, '\\.');
+                                        entities[entityName] = {
+                                            regx: RegExp(`&${escaped};`, "g"),
+                                            val: val
+                                        };
+                                    }
                                 } else if (hasBody && hasSeq(xmlData, "!ELEMENT", i)) {
                                     i += 8;
                                     const { index } = this.readElementExp(xmlData, i + 1);
@@ -14431,8 +14434,9 @@
                     const entKeys = Object.keys(externalEntities);
                     for(let i = 0; i < entKeys.length; i++){
                         const ent = entKeys[i];
+                        const escaped = ent.replace(/[.\-+*:]/g, '\\.');
                         this.lastEntities[ent] = {
-                            regex: new RegExp("&" + ent + ";", "g"),
+                            regex: new RegExp("&" + escaped + ";", "g"),
                             val: externalEntities[ent]
                         };
                     }
@@ -20339,7 +20343,7 @@
                 function timestamp_timestampMs(timestamp) {
                     return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
                 }
-                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.7","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
                 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
                 const decimalToHex = (n)=>color_pad(n.toString(16));
                 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -22804,7 +22808,7 @@
                         if (this.attr.length > 0) result.attr = this.attr;
                         if (void 0 !== this.platform) result.platform = this.platform;
                         if (this.extraStr && '{}' !== this.extraStr) result.extraStr = this.extraStr;
-                        if (void 0 !== this.DMID) result.DMID = this.DMID;
+                        if (void 0 !== this.DMID && this.options.dmid) result.DMID = this.DMID;
                         return result;
                     }
                     downgradeAdvcancedDan({ include, exclude, cleanExtra = false } = {}) {
@@ -22920,7 +22924,7 @@
                         }) ? args.midHash : id_gen_UniID.fromBili({
                             midHash: args.midHash
                         });
-                        let mode = 0;
+                        let mode;
                         const pool = args.pool;
                         const extra = {
                             bili: {
@@ -23980,23 +23984,23 @@
                             try {
                                 if (Array.isArray(json) && json.every((d)=>d.SOID)) return {
                                     pool: new UniPool(json, options),
-                                    fmt: 'danuni.json'
+                                    fmt: "danuni.json"
                                 };
                                 if (json.danmuku && json.danmuku.every((d)=>d.text)) return {
                                     pool: this.fromArtplayer(json, json.danuni?.data ?? '', void 0, options),
-                                    fmt: 'artplayer.json'
+                                    fmt: "artplayer.json"
                                 };
                                 if (json.count && json.comments && Array.isArray(json.comments) && json.comments.every((d)=>d.m)) return {
                                     pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-                                    fmt: 'ddplay.json'
+                                    fmt: "ddplay.json"
                                 };
                                 else if (0 == json.code && json.data && Array.isArray(json.data) && json.data.every((d)=>Array.isArray(d))) return {
                                     pool: this.fromDplayer(json, json.danuni?.data ?? '', void 0, options),
-                                    fmt: 'dplayer.json'
+                                    fmt: "dplayer.json"
                                 };
                                 else if (0 == json.code && '0' == json.message && json.data && json.data.page && json.data.result && Array.isArray(json.data.result) && json.data.result.every((d)=>d.id && d.oid)) return {
                                     pool: this.fromBiliUp(json, options),
-                                    fmt: 'bili.up.json'
+                                    fmt: "bili.up.json"
                                 };
                             } catch  {}
                         };
@@ -24015,13 +24019,13 @@
                                     const xml = xmlParser.parse(file);
                                     if (xml?.i?.d) return {
                                         pool: this.fromBiliXML(file, options),
-                                        fmt: 'bili.xml'
+                                        fmt: "bili.xml"
                                     };
                                 } catch  {}
                                 try {
                                     return {
                                         pool: this.fromASS(file, options),
-                                        fmt: 'common.ass'
+                                        fmt: "common.ass"
                                     };
                                 } catch  {}
                             }
@@ -24033,19 +24037,19 @@
                                     try {
                                         return {
                                             pool: this.fromPb(file),
-                                            fmt: 'danuni.pb.bin'
+                                            fmt: "danuni.pb.bin"
                                         };
                                     } catch  {}
                                     try {
                                         return {
                                             pool: this.fromBiliGrpc(file),
-                                            fmt: 'bili.pb.bin'
+                                            fmt: "bili.pb.bin"
                                         };
                                     } catch  {}
                                     try {
                                         return {
                                             pool: this.fromBiliCommandGrpc(file),
-                                            fmt: 'bili.cmd.pb.bin'
+                                            fmt: "bili.cmd.pb.bin"
                                         };
                                     } catch  {}
                                 }

package/dist/umd/plugins/index.umd.min.js

@@ -14045,10 +14045,13 @@
                                     i += 7;
                                     let entityName, val;
                                     [entityName, val, i] = this.readEntityExp(xmlData, i + 1, this.suppressValidationErr);
-                                    if (-1 === val.indexOf("&")) entities[entityName] = {
-                                        regx: RegExp(`&${entityName};`, "g"),
-                                        val: val
-                                    };
+                                    if (-1 === val.indexOf("&")) {
+                                        const escaped = entityName.replace(/[.\-+*:]/g, '\\.');
+                                        entities[entityName] = {
+                                            regx: RegExp(`&${escaped};`, "g"),
+                                            val: val
+                                        };
+                                    }
                                 } else if (hasBody && hasSeq(xmlData, "!ELEMENT", i)) {
                                     i += 8;
                                     const { index } = this.readElementExp(xmlData, i + 1);
@@ -14431,8 +14434,9 @@
                     const entKeys = Object.keys(externalEntities);
                     for(let i = 0; i < entKeys.length; i++){
                         const ent = entKeys[i];
+                        const escaped = ent.replace(/[.\-+*:]/g, '\\.');
                         this.lastEntities[ent] = {
-                            regex: new RegExp("&" + ent + ";", "g"),
+                            regex: new RegExp("&" + escaped + ";", "g"),
                             val: externalEntities[ent]
                         };
                     }
@@ -20339,7 +20343,7 @@
                 function timestamp_timestampMs(timestamp) {
                     return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
                 }
-                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.5","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.2.7","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
                 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
                 const decimalToHex = (n)=>color_pad(n.toString(16));
                 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -22804,7 +22808,7 @@
                         if (this.attr.length > 0) result.attr = this.attr;
                         if (void 0 !== this.platform) result.platform = this.platform;
                         if (this.extraStr && '{}' !== this.extraStr) result.extraStr = this.extraStr;
-                        if (void 0 !== this.DMID) result.DMID = this.DMID;
+                        if (void 0 !== this.DMID && this.options.dmid) result.DMID = this.DMID;
                         return result;
                     }
                     downgradeAdvcancedDan({ include, exclude, cleanExtra = false } = {}) {
@@ -22920,7 +22924,7 @@
                         }) ? args.midHash : id_gen_UniID.fromBili({
                             midHash: args.midHash
                         });
-                        let mode = 0;
+                        let mode;
                         const pool = args.pool;
                         const extra = {
                             bili: {
@@ -23980,23 +23984,23 @@
                             try {
                                 if (Array.isArray(json) && json.every((d)=>d.SOID)) return {
                                     pool: new UniPool(json, options),
-                                    fmt: 'danuni.json'
+                                    fmt: "danuni.json"
                                 };
                                 if (json.danmuku && json.danmuku.every((d)=>d.text)) return {
                                     pool: this.fromArtplayer(json, json.danuni?.data ?? '', void 0, options),
-                                    fmt: 'artplayer.json'
+                                    fmt: "artplayer.json"
                                 };
                                 if (json.count && json.comments && Array.isArray(json.comments) && json.comments.every((d)=>d.m)) return {
                                     pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-                                    fmt: 'ddplay.json'
+                                    fmt: "ddplay.json"
                                 };
                                 else if (0 == json.code && json.data && Array.isArray(json.data) && json.data.every((d)=>Array.isArray(d))) return {
                                     pool: this.fromDplayer(json, json.danuni?.data ?? '', void 0, options),
-                                    fmt: 'dplayer.json'
+                                    fmt: "dplayer.json"
                                 };
                                 else if (0 == json.code && '0' == json.message && json.data && json.data.page && json.data.result && Array.isArray(json.data.result) && json.data.result.every((d)=>d.id && d.oid)) return {
                                     pool: this.fromBiliUp(json, options),
-                                    fmt: 'bili.up.json'
+                                    fmt: "bili.up.json"
                                 };
                             } catch  {}
                         };
@@ -24015,13 +24019,13 @@
                                     const xml = xmlParser.parse(file);
                                     if (xml?.i?.d) return {
                                         pool: this.fromBiliXML(file, options),
-                                        fmt: 'bili.xml'
+                                        fmt: "bili.xml"
                                     };
                                 } catch  {}
                                 try {
                                     return {
                                         pool: this.fromASS(file, options),
-                                        fmt: 'common.ass'
+                                        fmt: "common.ass"
                                     };
                                 } catch  {}
                             }
@@ -24033,19 +24037,19 @@
                                     try {
                                         return {
                                             pool: this.fromPb(file),
-                                            fmt: 'danuni.pb.bin'
+                                            fmt: "danuni.pb.bin"
                                         };
                                     } catch  {}
                                     try {
                                         return {
                                             pool: this.fromBiliGrpc(file),
-                                            fmt: 'bili.pb.bin'
+                                            fmt: "bili.pb.bin"
                                         };
                                     } catch  {}
                                     try {
                                         return {
                                             pool: this.fromBiliCommandGrpc(file),
-                                            fmt: 'bili.cmd.pb.bin'
+                                            fmt: "bili.cmd.pb.bin"
                                         };
                                     } catch  {}
                                 }

package/dist/umd/src/index.d.ts

@@ -116,7 +116,18 @@ export interface DM_JSON_DDPlay {
         m: string;
     }[];
 }
-export type DM_format = 'danuni.json' | 'danuni.pb.bin' | 'bili.xml' | 'bili.pb.bin' | 'bili.cmd.pb.bin' | 'bili.up.json' | 'dplayer.json' | 'artplayer.json' | 'ddplay.json' | 'common.ass';
+export declare enum DM_format {
+    DanuniJson = "danuni.json",
+    DanuniPbBin = "danuni.pb.bin",
+    BiliXml = "bili.xml",
+    BiliPbBin = "bili.pb.bin",
+    BiliCmdPbBin = "bili.cmd.pb.bin",
+    BiliUpJson = "bili.up.json",
+    DplayerJson = "dplayer.json",
+    ArtplayerJson = "artplayer.json",
+    DdplayJson = "ddplay.json",
+    CommonAss = "common.ass"
+}
 type shareItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'senderID' | 'platform' | 'SOID' | 'pool' | 'mode' | 'color'>>;
 type statItems = Partial<Pick<UniDMTools.UniDMObj, 'SOID' | 'mode' | 'fontsize' | 'color' | 'senderID' | 'content' | 'weight' | 'pool' | 'platform'>>;
 type Stats<T extends keyof statItems> = Map<statItems[T], number>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dan-uni/dan-any",
   "type": "module",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "author": "rinne",
   "license": "LGPL-3.0-or-later",
@@ -36,7 +36,7 @@
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.3",
-    "fast-xml-parser": "^5.3.4",
+    "fast-xml-parser": "^5.3.5",
     "fs-extra": "^11.3.3",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
@@ -45,7 +45,7 @@
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.64.0",
+    "@bufbuild/buf": "^1.65.0",
     "@bufbuild/protoc-gen-es": "^2.11.0",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",

package/src/index.ts

@@ -151,17 +151,18 @@ export interface DM_JSON_DDPlay {
   }[]
 }
 
-export type DM_format =
-  | 'danuni.json'
-  | 'danuni.pb.bin'
-  | 'bili.xml'
-  | 'bili.pb.bin'
-  | 'bili.cmd.pb.bin'
-  | 'bili.up.json'
-  | 'dplayer.json'
-  | 'artplayer.json'
-  | 'ddplay.json'
-  | 'common.ass'
+export enum DM_format {
+  DanuniJson = 'danuni.json',
+  DanuniPbBin = 'danuni.pb.bin',
+  BiliXml = 'bili.xml',
+  BiliPbBin = 'bili.pb.bin',
+  BiliCmdPbBin = 'bili.cmd.pb.bin',
+  BiliUpJson = 'bili.up.json',
+  DplayerJson = 'dplayer.json',
+  ArtplayerJson = 'artplayer.json',
+  DdplayJson = 'ddplay.json',
+  CommonAss = 'common.ass',
+}
 
 type shareItems = Partial<
   Pick<
@@ -460,7 +461,7 @@ export class UniPool {
     ): { pool: UniPool; fmt: DM_format } | undefined => {
       try {
         if (Array.isArray(json) && json.every((d) => d.SOID)) {
-          return { pool: new UniPool(json, options), fmt: 'danuni.json' }
+          return { pool: new UniPool(json, options), fmt: DM_format.DanuniJson }
         } else if (json.danmuku && json.danmuku.every((d) => d.text)) {
           return {
             pool: this.fromArtplayer(
@@ -469,7 +470,7 @@ export class UniPool {
               undefined,
               options,
             ),
-            fmt: 'artplayer.json',
+            fmt: DM_format.ArtplayerJson,
           }
         } else if (
           json.count &&
@@ -479,7 +480,7 @@ export class UniPool {
         ) {
           return {
             pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-            fmt: 'ddplay.json',
+            fmt: DM_format.DdplayJson,
           }
         } else if (
           json.code == 0 &&
@@ -494,7 +495,7 @@ export class UniPool {
               undefined,
               options,
             ),
-            fmt: 'dplayer.json',
+            fmt: DM_format.DplayerJson,
           }
         } else if (
           json.code == 0 &&
@@ -507,7 +508,7 @@ export class UniPool {
         ) {
           return {
             pool: this.fromBiliUp(json, options),
-            fmt: 'bili.up.json',
+            fmt: DM_format.BiliUpJson,
           }
         }
       } catch {}
@@ -529,10 +530,13 @@ export class UniPool {
           const xmlParser = new XMLParser({ ignoreAttributes: false })
           const xml = xmlParser.parse(file)
           if (xml?.i?.d)
-            return { pool: this.fromBiliXML(file, options), fmt: 'bili.xml' }
+            return {
+              pool: this.fromBiliXML(file, options),
+              fmt: DM_format.BiliXml,
+            }
         } catch {}
         try {
-          return { pool: this.fromASS(file, options), fmt: 'common.ass' }
+          return { pool: this.fromASS(file, options), fmt: DM_format.CommonAss }
         } catch {}
       }
     }
@@ -542,15 +546,15 @@ export class UniPool {
         // pure-bin (pb)
         if (mod.includes('bin')) {
           try {
-            return { pool: this.fromPb(file), fmt: 'danuni.pb.bin' }
+            return { pool: this.fromPb(file), fmt: DM_format.DanuniPbBin }
           } catch {}
           try {
-            return { pool: this.fromBiliGrpc(file), fmt: 'bili.pb.bin' }
+            return { pool: this.fromBiliGrpc(file), fmt: DM_format.BiliPbBin }
           } catch {}
           try {
             return {
               pool: this.fromBiliCommandGrpc(file),
-              fmt: 'bili.cmd.pb.bin',
+              fmt: DM_format.BiliCmdPbBin,
             }
           } catch {}
         }

package/src/utils/dm-gen.ts

@@ -626,7 +626,7 @@ export class UniDM {
     if (this.attr.length > 0) result.attr = this.attr
     if (this.platform !== undefined) result.platform = this.platform
     if (this.extraStr && this.extraStr !== '{}') result.extraStr = this.extraStr
-    if (this.DMID !== undefined) result.DMID = this.DMID
+    if (this.DMID !== undefined && this.options.dmid) result.DMID = this.DMID
     return result
   }
   @Expose()
@@ -791,7 +791,7 @@ export class UniDM {
     const senderID = isEmail(args.midHash, { require_tld: false })
       ? args.midHash
       : ID.fromBili({ midHash: args.midHash })
-    let mode = Modes.Normal
+    let mode: Modes
     const pool = args.pool //暂时不做处理，兼容bili的pool格式
     const extra: TExtra = {
       bili: {