template-replacement 3.2.4 → 3.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "template-replacement",
   "description": "模板文件替换",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "author": "fushiliang <994301536@qq.com>",
   "type": "module",
   "main": "index.ts",
@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@types/streamsaver": "^2.0.5",
-    "axios": "^1.11.0",
+    "axios": "^1.12.2",
     "fflate": "^0.8.2",
     "file-type": "^19.6.0",
     "streamsaver": "^2.0.6",
-    "template-replacement-core-wasm": "^1.1.2",
-    "template-replacement-sign-core-wasm": "^1.1.2",
+    "template-replacement-core-wasm": "^1.4.0",
+    "template-replacement-sign-core-wasm": "^1.4.0",
     "vite-plugin-wasm-pack": "^0.1.12"
   },
   "devDependencies": {
-    "terser": "^5.43.1",
+    "terser": "^5.44.0",
     "typescript": "^5.9.2",
-    "vite": "^6.3.5",
+    "vite": "^6.3.6",
     "vite-plugin-dts": "^4.5.4"
   },
   "keywords": [

package/replace/base.ts

@@ -52,14 +52,14 @@ export default class Base implements Interface{
                     let medias = await this.#core.extract_one_file_medias(buffer, file.isDecode)
                     data[file.name] = []
                     if (medias && Array.isArray(medias)) {
-                        medias.forEach(m => {
+                        for (const m of medias) {
                             if (m.id && m.data) {
                                 data[file.name].push({
                                     id: m.id,
                                     data: new Uint8Array(m.data)
                                 })
                             }
-                        })
+                        }
                     }
                 }
                 resolve()
@@ -72,6 +72,9 @@ export default class Base implements Interface{
     async handle(paramsData: paramsData, files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
         return []
     }
+    async handleMultipleParams(paramsData: paramsData[], files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
+        return []
+    }
 
     async sign(data: any): Promise<string> {
         return ""
@@ -133,14 +136,88 @@ export default class Base implements Interface{
             return resData
         }
         const res = await this.handle(params, uint8Arrays, isDecode)
-        res.forEach((file, i) => {
+        for (let index = 0; index < res.length; index++) {
+            const file = res[index]
             if (file.length) {
-                resData[names[i]] = file
+                resData[names[index]] = file
             }
-        })
+        }
         return resData
     }
 
+    async executeMultipleParams(paramsList: paramsData[], files: Temp[] | undefined): Promise<Record<string, Uint8Array>[]> {
+        if (!files) {
+            files = this.#files
+        }
+
+        //等待文件加载完成
+        const tasks = []
+        for (const file of files) {
+            tasks.push(file.getBuffer())
+        }
+        await Promise.all(tasks)
+
+        const fileMap: { decode: { names: string[], uint8Arrays: Uint8Array[] }, noDecode: { names: string[], uint8Arrays: Uint8Array[] }} = {
+            //需要解密的文件
+            decode: {
+                names: [],
+                uint8Arrays: [],
+            },
+            //不需要解密的文件
+            noDecode: {
+                names: [],
+                uint8Arrays: [],
+            }
+        };
+
+        //整理出需要解密和不需要解密的文件
+        for (const file of files) {
+            if (!file.uint8Array) {
+                continue;
+            }
+            if (file.isDecode) {
+                fileMap.decode.names.push(file.name)
+                fileMap.decode.uint8Arrays.push(file.uint8Array)
+            } else {
+                fileMap.noDecode.names.push(file.name)
+                fileMap.noDecode.uint8Arrays.push(file.uint8Array)
+            }
+        }
+        //分别处理需要解密和不需要解密的文件
+        const res = await Promise.all([
+            this._executeMultipleParams(paramsList, fileMap.noDecode.names, fileMap.noDecode.uint8Arrays, false),
+            this._executeMultipleParams(paramsList, fileMap.decode.names, fileMap.decode.uint8Arrays, true),
+        ])
+
+        const result = []
+        for (let i = 0; i < res[0].length; i++) {
+            result.push({...res[0][i], ...res[1][i]})
+        }
+        return result
+    }
+
+
+    async _executeMultipleParams(paramsList: paramsData[], names: string[], uint8Arrays: Uint8Array[], isDecode: boolean = false): Promise<Record<string, Uint8Array>[]> {
+        const result: Record<string, Uint8Array>[] = Array(paramsList.length) //整理出每一套参数的替换结果文件
+        if (!uint8Arrays.length) {
+            return result
+        }
+        const resFileList = await this.handleMultipleParams(paramsList, uint8Arrays, isDecode)
+
+        let resFileIndex = 0
+        for (let index = 0; index < paramsList.length; index++) {
+            const resultItem: Record<string, Uint8Array> = {}
+            for (const name of names) {
+                const file = resFileList[resFileIndex++]
+                if (file.length) {
+                    resultItem[name] = file
+                }
+            }
+            result[index] = resultItem
+        }
+        return result
+    }
+
     async fileEncrypt(file: Uint8Array): Promise<Uint8Array> {
         return await this.#core.file_encrypt(file)
     }

package/replace/general.ts

@@ -1,5 +1,5 @@
 import Base from './base';
-import core, { replace_batch } from '../core/general'
+import core, { replace_batch, replace_batch_multiple_params } from '../core/general'
 import paramsData from './paramsData';
 
 export default class General extends Base {
@@ -11,4 +11,13 @@ export default class General extends Base {
       const [params, mediaBuffers] = await paramsData.toReplaceParams()
       return replace_batch(params, mediaBuffers, files, isDecode)
     }
+
+    async handleMultipleParams(paramsList: paramsData[], files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
+      let params, mediaBuffers: Uint8Array[] = [], newParamsList: any[] = []
+      for (const paramsData of paramsList) {
+        [params, mediaBuffers] = await paramsData.toReplaceParams(mediaBuffers)
+        newParamsList.push(params)
+      }
+      return replace_batch_multiple_params(newParamsList, mediaBuffers, files, isDecode)
+    }
 }

package/replace/interface.ts

@@ -26,6 +26,9 @@ export default interface ReplaceInterface {
     //执行替换任务
     execute(params: paramsData, files: Temp[] | undefined): Promise<Record<string, Uint8Array>>
 
+    //执行替换任务（多套参数）
+    executeMultipleParams(params: paramsData[], files: Temp[] | undefined): Promise<Record<string, Uint8Array>[]>
+
     //文件加密
     fileEncrypt(file: Uint8Array): Promise<Uint8Array>
 

package/replace/paramsData.ts

@@ -36,11 +36,10 @@ export default class paramsData {
     }
 
     //转为替换参数
-    async toReplaceParams(): Promise<[replaceParams, Uint8Array[]]>  {
+    async toReplaceParams(mediaBuffers: Uint8Array[] = []): Promise<[replaceParams, Uint8Array[]]>  {
         const text: Record<string, value> = {}
         const media: Record<string, value> = {}
         const tasks = []
-        const mediaBuffers: Uint8Array[] = []
         for (const key in this.textData) {
             tasks.push(new Promise<void>(async resolve => {
                 const value = this.textData[key]

package/replace/sign.ts

@@ -1,5 +1,5 @@
 import Base from './base';
-import core, { add_template, add_media, replace_batch_verify, replace_params_encode } from '../core/sign'
+import core, { add_template, add_media, replace_batch_verify, replace_params_encode, replace_batch_verify_multiple_params, replace_params_encode_multiple_params } from '../core/sign'
 import paramsData from './paramsData';
 
 export default class Sign extends Base {
@@ -12,11 +12,9 @@ export default class Sign extends Base {
         const [params] = await paramsData.toReplaceParams()
 
         const addFileTasks: Promise<number>[] = []
-        files.forEach((file, i) => {
-            addFileTasks.push(new Promise<number>(async resolve => {
-                resolve(await add_template(file, isDecode))
-            }))
-        })
+        for (const file of files) {
+            addFileTasks.push(add_template(file, isDecode))
+        }
 
         const encodeData = {
             files: await Promise.all(addFileTasks),
@@ -28,4 +26,27 @@ export default class Sign extends Base {
         const verifyCode = await this.sign(paramsEncode)
         return replace_batch_verify(String(verifyCode), paramsEncode.data)
     }
+
+    async handleMultipleParams(paramsList: paramsData[], files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
+        let variables = []
+        for (const paramsData of paramsList) {
+            paramsData.add_media = add_media
+            const [params] = await paramsData.toReplaceParams()
+            variables.push(params)
+        }
+
+        const addFileTasks: Promise<number>[] = []
+        for (const file of files) {
+            addFileTasks.push(add_template(file, isDecode))
+        }
+
+        const encodeData = {
+            files: await Promise.all(addFileTasks),
+            variables
+        }
+
+        const paramsEncode = await replace_params_encode_multiple_params(encodeData)
+        const verifyCode = await this.sign(paramsEncode)
+        return replace_batch_verify_multiple_params(String(verifyCode), paramsEncode.data)
+    }
 }

package/worker/child/agency.ts

@@ -54,7 +54,7 @@ export default class implements ReplaceInterface {
     const text: textData = {}
     for (const key in params.textData) {
       const value = params.textData[key] as Record<keyof image, any>
-      if (value.file && value.file instanceof Blob) {
+      if (value && value.file instanceof Blob) {
         text[key] = new image(value.file)
         delete value.file
         text[key].setPropertys(value)
@@ -66,7 +66,7 @@ export default class implements ReplaceInterface {
     const media: mediaData = {}
     for (const key in params.mediaData) {
       const value = params.mediaData[key] as Record<keyof image, any>
-      if (value.file && value.file instanceof Blob) {
+      if (value && value.file instanceof Blob) {
         media[key] = new image(value.file)
         delete value.file
         media[key].setPropertys(value)
@@ -75,6 +75,41 @@ export default class implements ReplaceInterface {
     return this.replace.execute(new paramsData(text, media), files)
   }
 
+  //执行替换任务（多套参数）
+  executeMultipleParams(paramsMultiple: paramsData[], files: Temp[] | undefined): Promise<Record<string, Uint8Array>[]> {
+    if (files) {
+      for (const i in files) {
+        files[i] = transmitFileInfoToTemp(files[i] as transmitFileInfo)
+      }
+    }
+    const paramsList= []
+    for (const params of paramsMultiple) {
+      const text: textData = {}
+      for (const key in params.textData) {
+        const value = params.textData[key] as Record<keyof image, any>
+        if (value && value.file instanceof Blob) {
+          text[key] = new image(value.file)
+          delete value.file
+          text[key].setPropertys(value)
+        }else {
+          text[key] = value
+        }
+      }
+
+      const media: mediaData = {}
+      for (const key in params.mediaData) {
+        const value = params.mediaData[key] as Record<keyof image, any>
+        if (value && value.file instanceof Blob) {
+          media[key] = new image(value.file)
+          delete value.file
+          media[key].setPropertys(value)
+        }
+      }
+      paramsList.push(new paramsData(text, media))
+    }
+    return this.replace.executeMultipleParams(paramsList, files)
+  }
+
   //文件加密
   fileEncrypt(file: Uint8Array): Promise<Uint8Array> {
     return this.replace.fileEncrypt(file)

package/worker/child/base.ts

@@ -14,9 +14,10 @@ const allowCallMethodNames: Partial<Record<methodKeys<ReplaceInterface>, boolean
   execute: true,
   filesEncrypt: true,
   fileEncrypt: true,
+  executeMultipleParams: true,
 }
 
-const tasks: Record<string, Function> = {} = {}
+const tasks = new Map<string, Function>()
 
 let dispatch: ReplaceInterface
 
@@ -36,7 +37,7 @@ export async function call<T>(method: string, ...params: any[]): Promise<T> {
   })
 
   return new Promise<T>((resolve, reject) => {
-    tasks[replyId] = resolve
+    tasks.set(replyId, resolve)
   })
 }
 
@@ -66,22 +67,30 @@ addEventListener('message', async event => {
                   value.buffer && transfer.push(value.buffer)
                 }
                 break;
+              case 'executeMultipleParams':
+                for (const map of (res as Record<string, Uint8Array>[])) {
+                  for (const key in map) {
+                    const value: Uint8Array = map[key]
+                    value.buffer && transfer.push(value.buffer)
+                  }
+                }
+                break;
               case 'extractMedias':
                 for (const key in (res as Record<string, Uint8Array>)) {
                   const medias: media[] = res[key]
-                  medias.forEach(media => {
+                  for (const media of medias) {
                     transfer.push(media.data.buffer)
-                  })
+                  }
+                }
+                break;
+              case 'fileEncrypt':
+                (res as Uint8Array).length && transfer.push((res as Uint8Array).buffer)
+                break;
+              case 'filesEncrypt':
+                for (const item of (res as Uint8Array[])) {
+                  transfer.push(item.buffer)
                 }
                 break;
-                case 'fileEncrypt':
-                  (res as Uint8Array).length && transfer.push((res as Uint8Array).buffer)
-                  break;
-                case 'filesEncrypt':
-                  for (const item of (res as Uint8Array[])) {
-                    transfer.push(item.buffer)
-                  }
-                  break;
             }
           }
           postMessage({
@@ -95,7 +104,11 @@ addEventListener('message', async event => {
         break;
       case messageTypes.methodCallReply:
         // 方法调用的返回数据
-        tasks[data?.data?.replyId](data?.data?.result)
-        delete tasks[data?.data?.replyId]
+        const fn = tasks.get(data?.data?.replyId)
+        if (!fn) {
+          return
+        }
+        fn(data?.data?.result)
+        tasks.delete(data?.data?.replyId)
     }
 })

package/worker/index.ts

@@ -32,9 +32,10 @@ export default class worker implements DispatcherInterface {
             for (const fun of this.#listenerList) {
                 tasks.push(fun(event))
             }
-            (await Promise.all(tasks)).forEach((reply: any)=>{
-                reply && worker.postMessage(reply)
-            })
+            const res = await Promise.all(tasks)
+            for (const reply of res) {
+                reply as any && worker.postMessage(reply)
+            }
         }
         this.#workers.push(worker)
     }

package/worker/main/index.ts

@@ -19,7 +19,7 @@ const chunkMinNum = 20
 export default class WorkerReplace implements ReplaceInterface {
   #files: Temp[] = []
   #dispatcher: DispatcherInterface
-  #tasks: Record<string, Function> = {}
+  #tasks = new Map<string, Function>()
   #concurrency: number = 1
 
   constructor(dispatcher: DispatcherInterface) {
@@ -36,9 +36,10 @@ export default class WorkerReplace implements ReplaceInterface {
           if (!replyData) {
             return
           }
-          if (this.#tasks[replyData.replyId]) {
-            this.#tasks[replyData.replyId](replyData.result)
-            delete this.#tasks[replyData.replyId]
+          const fn = this.#tasks.get(replyData.replyId)
+          if (fn) {
+            fn(replyData.result)
+            this.#tasks.delete(replyData.replyId)
           }
           break;
         case messageTypes.methodCall:
@@ -74,15 +75,15 @@ export default class WorkerReplace implements ReplaceInterface {
   #call(method: string, params: any[]): any {
     const transfer: any = []
 
-    params.forEach(param => {
+    for (const param of params) {
       if (param instanceof Array) {
-        param.forEach(item => {
+        for (const item of param) {
           if (item?.uint8Array?.buffer?.length) {
             transfer.push(item.uint8Array.buffer)
           }
-        })
+        }
       }
-    })
+    }
 
     const replyId = generateId()
     this.#dispatcher.postMessage({
@@ -94,18 +95,18 @@ export default class WorkerReplace implements ReplaceInterface {
       }
     }, transfer.length ? { transfer } :  undefined)
     return new Promise((resolve, reject) => {
-      this.#tasks[replyId] = resolve
+      this.#tasks.set(replyId, resolve)
     })
   }
 
   //分片
-  #chunk<T>(files: T[], chunkPackage?: (chunkData: T[]) => any): (T[] | ((chunkData: T[]) => any))[] {
-    let chunks = []
-    if (this.#concurrency > 1 && files.length > chunkMinNum) {
-      const chunkSize = Math.ceil(files.length / (Math.round(files.length / chunkMinNum)))
-      chunks = splitArrayIntoChunks<T>(files, chunkSize)
+  #chunk<T>(data: T[], chunkPackage?: (chunkData: T[]) => any): (T[] | ((chunkData: T[]) => any))[] {
+    let chunks
+    if (this.#concurrency > 1 && data.length > chunkMinNum) {
+      const chunkSize = Math.ceil(data.length / (Math.round(data.length / chunkMinNum)))
+      chunks = splitArrayIntoChunks<T>(data, chunkSize)
     } else {
-      chunks = [files]
+      chunks = [data]
     }
     if (chunkPackage) {
       for (const i in chunks) {
@@ -120,9 +121,9 @@ export default class WorkerReplace implements ReplaceInterface {
       files = this.#files
     }
     const tasks: Promise<transmitFileInfo | undefined>[] = []
-    files.forEach(file => {
+    for (const file of files) {
       tasks.push(file.getTransmitFileInfo())
-    })
+    }
     const res = await Promise.all(tasks)
     return res.filter(item => !!item)
   }
@@ -134,9 +135,9 @@ export default class WorkerReplace implements ReplaceInterface {
 
   async #chunkCall(method: string, paramChunks: any[]): Promise<Record<string, any>> {
     const tasks: Promise<Record<string, any>>[] = []
-    paramChunks.forEach(chunk => {
+    for (const chunk of paramChunks) {
       tasks.push(this.#call(method, chunk))
-    })
+    }
     const tasksRes = await Promise.all(tasks)
     return tasksRes.reduce((accumulator, current) => {
       return { ...accumulator, ...current }
@@ -175,6 +176,22 @@ export default class WorkerReplace implements ReplaceInterface {
     return this.#chunkCall('execute', chunks)
   }
 
+  async executeMultipleParams(params: paramsData[], files: Temp[] | undefined): Promise<Record<string, Uint8Array>[]> {
+    const fileData = await this.#getTempFileData(files)
+    const tasks: Promise<Record<string, any>[]>[] = []
+    this.#chunk(fileData, chunkData => {
+      tasks.push(this.#call('executeMultipleParams', [params, chunkData] as any))
+    })
+    const tasksRes = (await Promise.all(tasks)) as Record<string, Uint8Array>[][]
+    const res = new Array(params.length)
+    for (const item of tasksRes) {
+      for (let index = 0; index < item.length; index++) {
+        res[index] = {...item[index], ...res[index]}
+      }
+    }
+    return res
+  }
+
   async fileEncrypt(file: Uint8Array): Promise<Uint8Array> {
     return await this.#call('fileEncrypt', [file])
   }
@@ -183,9 +200,9 @@ export default class WorkerReplace implements ReplaceInterface {
     const chunks = this.#chunk<Uint8Array>(files) as (Uint8Array[])[]
 
     const tasks: Promise<Uint8Array[]>[] = []
-    chunks.forEach(chunk => {
+    for (const chunk of chunks) {
       tasks.push(this.#call('filesEncrypt', [chunk]))
-    })
+    }
     const tasksRes = await Promise.all(tasks)
     return tasksRes.flat()
   }

package/dist/index-BkwrGCka.js

@@ -1,61 +0,0 @@
-var g = (r) => {
-  throw TypeError(r);
-};
-var p = (r, s, t) => s.has(r) || g("Cannot " + t);
-var e = (r, s, t) => (p(r, s, "read from private field"), t ? t.call(r) : s.get(r)), n = (r, s, t) => s.has(r) ? g("Cannot add the same private member more than once") : s instanceof WeakSet ? s.add(r) : s.set(r, t), a = (r, s, t, o) => (p(r, s, "write to private field"), o ? o.call(r, t) : s.set(r, t), t), k = (r, s, t) => (p(r, s, "access private method"), t);
-var l = (r, s, t, o) => ({
-  set _(f) {
-    a(r, s, f, t);
-  },
-  get _() {
-    return e(r, s, o);
-  }
-});
-var i, c, u, h, d, y;
-class v {
-  constructor(s, t) {
-    n(this, d);
-    n(this, i);
-    n(this, c, 0);
-    n(this, u, []);
-    n(this, h, []);
-    if (a(this, i, Number(t)), !e(this, i) || e(this, i) < 1)
-      try {
-        a(this, i, navigator.hardwareConcurrency < 8 ? navigator.hardwareConcurrency : 8);
-      } catch {
-      }
-    (!e(this, i) || e(this, i) < 1) && a(this, i, 1);
-    for (let o = 0; o < e(this, i); o++)
-      k(this, d, y).call(this, s);
-  }
-  concurrency() {
-    return e(this, i);
-  }
-  postMessage(s, t) {
-    e(this, u)[++l(this, c)._] || a(this, c, 0), e(this, u)[e(this, c)].postMessage(s, t);
-  }
-  addListener(s) {
-    e(this, h).push(s);
-  }
-  removeListener(s) {
-    for (const t in e(this, h))
-      if (e(this, h)[t] == s) {
-        e(this, h).splice(t, 1);
-        return;
-      }
-  }
-}
-i = new WeakMap(), c = new WeakMap(), u = new WeakMap(), h = new WeakMap(), d = new WeakSet(), y = function(s) {
-  const t = new s();
-  t.onmessage = async (o) => {
-    const f = [];
-    for (const w of e(this, h))
-      f.push(w(o));
-    (await Promise.all(f)).forEach((w) => {
-      w && t.postMessage(w);
-    });
-  }, e(this, u).push(t);
-};
-export {
-  v as w
-};