template-replacement 3.3.2 → 3.3.3

package/fileSystem/db/index.ts

@@ -13,7 +13,7 @@ export default class DbFile implements FileSystem {
     async write(data: fileDataType): Promise<boolean> {
         try {
             await db.putData<File>({
-                url: this.#name,
+                key: this.#name,
                 data: new File([data], this.#name),
             })
             return true

package/fileSystem/db/indexedDBCache.ts

@@ -1,7 +1,8 @@
+import _init from '../../worker/child/base';
 
 type templateData<T> = {
-    url: string
-    data: T
+    key: string  // 主键
+    data: T // 文件数据
 }
 
 export default class indexedDBCache {
@@ -9,10 +10,12 @@ export default class indexedDBCache {
     _isInitFinish: boolean = false  //是否初始化完成
 
     _db?: IDBDatabase //数据库
-    _dbName: string = 'template_replacement' //数据库名
+    _dbName: string = 'template_replacement_db' //数据库名
     _dbversion: number  = 1 //数据库版本
-    _cacheTableName: string = 'templates' //表名
-    _tableMap: any = {} //表配置
+    _cacheTableName: string = 'template_files' //表名
+    _tableMap: unknown = {} //表配置
+
+    _init: Promise<unknown> | undefined
 
 
     // 构造函数
@@ -21,7 +24,10 @@ export default class indexedDBCache {
     }
 
     initDB(): Promise<any> {
-        return new Promise((resolve, reject) => {
+        if (this._init) {
+            return this._init
+        }
+        this._init = new Promise((resolve, reject) => {
             const request = indexedDB.open(this._dbName, this._dbversion) // 打开数据库
             // 数据库初始化成功
             request.onsuccess = (event) => {
@@ -48,12 +54,14 @@ export default class indexedDBCache {
                 let db = request.result
                 if (!db.objectStoreNames.contains(this._cacheTableName)) {
                     db.createObjectStore(this._cacheTableName, {
-                        keyPath: 'url', // 设置主键
+                        keyPath: 'key', // 设置主键
                     })
                 }
                 resolve(event)
             }
         })
+
+        return this._init
     }
 
     async awaitInit(): Promise<void> {
@@ -78,67 +86,75 @@ export default class indexedDBCache {
 
     /**
      * @description : 更新数据
-     * @param        {Object} params 添加到数据库中的数据 { url: 文件地址, data: 文件blob }
+     * @param        {templateData} params 添加到数据库中的数据 { key: 文件key, data: 文件blob }
      * @return       {*}
      */
     putData<T>(params: templateData<T>): Promise<any> {
-        return new Promise(async (resolve, reject) => {
-            const response = (await this.store('readwrite')).put(params)
-            // 操作成功
-            response.onsuccess = (event) => {
-                resolve(event)
-            }
-            // 操作失败
-            response.onerror = (event) => {
-                reject(event)
-            }
+        return new Promise((resolve, reject) => {
+            this.store('readwrite').then(store => {
+                const response = store.put(params)
+                // 操作成功
+                response.onsuccess = (event) => {
+                    resolve(event)
+                }
+                // 操作失败
+                response.onerror = (event) => {
+                    reject(event)
+                }
+            }).catch(reject)
         })
     }
 
     // 通过主键读取数据
     getDataByKey<T>(key: string): Promise<templateData<T>> {
-        return new Promise(async (resolve, reject) => {
-            // 通过主键读取数据
-            const request = (await this.store()).get(key)
-            // 操作成功
-            request.onsuccess = () => {
-                resolve(request.result)
-            }
-            // 操作失败
-            request.onerror = (event) => {
-                reject(event)
-            }
+        return new Promise((resolve, reject) => {
+             this.store().then(store => {
+                // 通过主键读取数据
+                const request = store.get(key)
+                // 操作成功
+                request.onsuccess = () => {
+                    resolve(request.result)
+                }
+                // 操作失败
+                request.onerror = (event) => {
+                    reject(event)
+                }
+             }).catch(reject)
         })
     }
 
     // 通过主键移除数据
-    deleteDataByKey<T>(key: string): Promise<void> {
-        return new Promise(async (resolve, reject) => {
-            // 通过主键读取数据
-            const request = (await this.store()).delete(key)
-            // 操作成功
-            request.onsuccess = () => {
-                resolve()
-            }
-            // 操作失败
-            request.onerror = (event) => {
-                reject(event)
-            }
+    deleteDataByKey(key: string): Promise<void> {
+        return new Promise((resolve, reject) => {
+            this.store().then(store => {
+                // 通过主键读取数据
+                const request = store.delete(key)
+                // 操作成功
+                request.onsuccess = () => {
+                    resolve(request.result)
+                }
+                // 操作失败
+                request.onerror = (event) => {
+                    reject(event)
+                }
+             }).catch(reject)
         })
     }
 
     // 清空数据库数据
     clearDB(): Promise<any> {
-        return new Promise(async (resolve, reject) => {
-            const response = (await this.store('readwrite')).clear()
-            // 操作成功
-            response.onsuccess = (event) => {
-                resolve(event)
-            }
-            // 操作失败
-            response.onerror = (event) => {
-                reject(event)
-            }
+        return new Promise((resolve, reject) => {
+            this.store('readwrite').then(store => {
+                const response = store.clear()
+                // 操作成功
+                response.onsuccess = (event) => {
+                    resolve(event)
+                }
+                // 操作失败
+                response.onerror = (event) => {
+                    reject(event)
+                }
+            }).catch(reject)
         })
     }
 

package/helper/index.ts

@@ -46,9 +46,13 @@ export function fileTypeByName(name: string): fileTypes {
 
 export async function fileTypeByBuffer(buffer: Uint8Array|ArrayBuffer|Blob): Promise<fileTypes> {
     if (buffer instanceof Blob) {
+        if (buffer.type && officeMIMETypes[buffer.type]) {
+            return officeMIMETypes[buffer.type]
+        }
         buffer = await buffer.arrayBuffer()
     }
     const type = await fileTypeFromBuffer(buffer)
+
     if (type && officeMIMETypes[type.mime]) {
         return officeMIMETypes[type.mime]
     }
@@ -64,21 +68,23 @@ export type fileArrayBufferData = {
     buffer: ArrayBuffer
 }
 
-export async function filesReaderArrayBuffer(files: File[]): Promise<fileArrayBufferData[]> {
-    const awaits = []
+export function filesReaderArrayBuffer(files: File[]): Promise<fileArrayBufferData[]> {
+    const awaits: Promise<fileArrayBufferData>[] = []
     for (const file of files) {
-        awaits.push(new Promise(async (resolve, reject) => {
+        awaits.push(new Promise((resolve, reject) => {
             try {
-                resolve({
-                    name: file.name,
-                    buffer: await file.arrayBuffer()
-                } as fileArrayBufferData)
+                file.arrayBuffer().then(buffer => {
+                    resolve({
+                        name: file.name,
+                        buffer
+                    })
+                }).catch(reject)
             } catch (error) {
                 reject(error)
             }
         }))
     }
-    return (await Promise.all(awaits)) as fileArrayBufferData[]
+    return Promise.all(awaits)
 }
 
 
@@ -87,8 +93,8 @@ export type fileBase64Data = {
     base64: string
 }
 
-export async function filesReaderBase64(files: File[]): Promise<fileBase64Data[]> {
-    const awaits = []
+export function filesReaderBase64(files: File[]): Promise<fileBase64Data[]> {
+    const awaits: Promise<fileBase64Data>[] = []
     for (const file of files) {
         awaits.push(new Promise((resolve, reject) => {
             const fileReader = new FileReader()
@@ -116,7 +122,7 @@ export async function filesReaderBase64(files: File[]): Promise<fileBase64Data[]
             fileReader.readAsDataURL(file)
         }))
     }
-    return await Promise.all(awaits) as fileBase64Data[]
+    return Promise.all(awaits)
 }
 
 export function base64ToBlob(base64: string): Blob {
@@ -157,4 +163,15 @@ export function splitArrayIntoChunks<T>(array: T[], chunkSize: number): T[][] {
         result.push(chunk)
     }
     return result
-  }
+}
+
+// 字符串SHA-1哈希值
+export async function hashString(str: string): Promise<string> {
+    const encoder = new TextEncoder();
+    const data = encoder.encode(str);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-1", data);
+    const hashArray = Array.from(new Uint8Array(hashBuffer));
+    return hashArray
+      .map((b) => b.toString(16).padStart(2, "0"))
+      .join("");
+}

package/index.ts

@@ -4,21 +4,13 @@ import workerGeneral from './dispatcher/workerGeneral'
 import workerSign from './dispatcher/workerSign'
 import ReplaceInterface from './replace/interface'
 
-export function General(): ReplaceInterface {
-  return general()
-}
+export const General = general
 
-export function Sign(): ReplaceInterface {
-  return sign()
-}
+export const  Sign = sign
 
-export function WorkerGeneral(concurrency?: number): ReplaceInterface {
-  return workerGeneral(concurrency)
-}
+export const WorkerGeneral = workerGeneral
 
-export function WorkerSign(concurrency?: number): ReplaceInterface {
-  return workerSign(concurrency)
-}
+export const WorkerSign = workerSign
 
 type signFun = (data: any) => Promise<string>;
 

package/office/zip.ts

@@ -27,7 +27,7 @@ export default class Zip {
                 const blob = this.getFileBlob()
                 if (blob) {
                     const arrayBuffer = await blob.arrayBuffer()
-                    this._unzipData = await new Promise(async (resolve, reject) => {
+                    this._unzipData = await new Promise((resolve, reject) => {
                         unzip(new Uint8Array(arrayBuffer), (err: FlateError | null, data: Unzipped) => {
                             if (err) {
                                 return reject(err)
@@ -72,12 +72,12 @@ export default class Zip {
         if (!Object.keys(data).length) {
             return undefined
         }
-        return await new Promise(async (resolve, reject) => {
+        return await new Promise((resolve, reject) => {
             zip(data, options,  (err: FlateError | null, data: Uint8Array) => {
                 if (err) {
                     return reject(err)
                 }
-                resolve(new Blob([data]))
+                resolve(new Blob([data as BlobPart]))
             })
         })
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "template-replacement",
   "description": "模板文件替换",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "author": "fushiliang <994301536@qq.com>",
   "type": "module",
   "main": "index.ts",
@@ -10,20 +10,20 @@
     "build": "npx vite build --config vite.config.ts"
   },
   "dependencies": {
-    "@types/streamsaver": "^2.0.5",
-    "axios": "^1.13.1",
+    "axios": "^1.13.2",
     "fflate": "^0.8.2",
     "file-type": "^19.6.0",
     "streamsaver": "^2.0.6",
     "template-replacement-core-wasm": "^1.4.0",
-    "template-replacement-sign-core-wasm": "^1.4.0",
-    "vite-plugin-wasm-pack": "^0.1.12"
+    "template-replacement-sign-core-wasm": "^1.4.0"
   },
   "devDependencies": {
-    "terser": "^5.44.0",
+    "@types/streamsaver": "^2.0.5",
+    "terser": "^5.44.1",
     "typescript": "^5.9.3",
-    "vite": "^7.1.12",
-    "vite-plugin-dts": "^4.5.4"
+    "vite": "^7.2.2",
+    "vite-plugin-dts": "^4.5.4",
+    "vite-plugin-wasm-pack": "^0.1.12"
   },
   "keywords": [
     "template-replacement"

package/replace/base.ts

@@ -27,12 +27,16 @@ export default class Base implements Interface{
         const data: Record<string, string[]> = {}
         const tasks = []
         for (const file of files) {
-            tasks.push(new Promise<void>(async (resolve, reject) => {
-                const buffer = await file.getBuffer()
-                if (buffer && (file.isDecode || (await file.type()) !== fileTypes.unknown)) {
-                    data[file.name] = await this.#core.extract_one_file_variable_names(buffer, file.isDecode)
+            tasks.push(new Promise<void>(async resolve => {
+                try {
+                    const buffer = await file.getBuffer()
+                    if (buffer && (file.isDecode || (await file.type()) !== fileTypes.unknown)) {
+                        data[file.name] = await this.#core.extract_one_file_variable_names(buffer, file.isDecode)
+                    }
+                    resolve()
+                } catch (error) {
+                    console.error(error)
                 }
-                resolve()
             }))
         }
         await Promise.all(tasks)
@@ -46,23 +50,27 @@ export default class Base implements Interface{
         const data: Record<string, media[]> = {}
         const tasks = []
         for (const file of files) {
-            tasks.push(new Promise<void>(async (resolve, reject) => {
-                const buffer = await file.getBuffer()
-                if (buffer && (file.isDecode || (await file.type()) !== fileTypes.unknown)) {
-                    let medias = await this.#core.extract_one_file_medias(buffer, file.isDecode)
-                    data[file.name] = []
-                    if (medias && Array.isArray(medias)) {
-                        for (const m of medias) {
-                            if (m.id && m.data) {
-                                data[file.name].push({
-                                    id: m.id,
-                                    data: new Uint8Array(m.data)
-                                })
+            tasks.push(new Promise<void>(async resolve => {
+                try {
+                    const buffer = await file.getBuffer()
+                    if (buffer && (file.isDecode || (await file.type()) !== fileTypes.unknown)) {
+                        let medias = await this.#core.extract_one_file_medias(buffer, file.isDecode)
+                        data[file.name] = []
+                        if (medias && Array.isArray(medias)) {
+                            for (const m of medias) {
+                                if (m.id && m.data) {
+                                    data[file.name].push({
+                                        id: m.id,
+                                        data: new Uint8Array(m.data)
+                                    })
+                                }
                             }
                         }
                     }
+                    resolve()
+                } catch (error) {
+                    console.error(error)
                 }
-                resolve()
             }))
         }
         await Promise.all(tasks)
@@ -218,11 +226,11 @@ export default class Base implements Interface{
         return result
     }
 
-    async fileEncrypt(file: Uint8Array): Promise<Uint8Array> {
-        return await this.#core.file_encrypt(file)
+    fileEncrypt(file: Uint8Array): Promise<Uint8Array> {
+        return this.#core.file_encrypt(file)
     }
 
-    async filesEncrypt(files: (Uint8Array)[]): Promise<(Uint8Array)[]> {
-        return await this.#core.files_encrypt(files)
+    filesEncrypt(files: (Uint8Array)[]): Promise<(Uint8Array)[]> {
+        return this.#core.files_encrypt(files)
     }
 }

package/replace/general.ts

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

package/replace/image.ts

@@ -79,14 +79,18 @@ export default class image {
             if (this.file.size) {
                 try {
                     const bitmap = await createImageBitmap(this.file)
-                    !this.wpExtent && this.setPxExtent(bitmap.width, bitmap.height)
+                    if (this.wpExtent) {
+                        this.setPxExtent(bitmap.width, bitmap.height)
+                    }
                     bitmap.close()
                     return this.wpExtent!
                 } catch (error) {
                     console.error(error)
                 }
             }
-            !this.wpExtent && this.setPxExtent(0, 0)
+            if (!this.wpExtent) {
+                this.setPxExtent(0, 0)
+            }
         }
         return this.wpExtent!
     }

package/replace/paramsData.ts

@@ -16,7 +16,7 @@ type value = {
     Text?: string
 }
 
-type replaceParams = {
+export type replaceParams = {
     text: Record<string, value>
     media: Record<string, value>
 }

package/replace/sign.ts

@@ -1,6 +1,6 @@
 import Base from './base';
 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';
+import paramsData, { replaceParams } from './paramsData';
 
 export default class Sign extends Base {
     constructor() {
@@ -9,30 +9,34 @@ export default class Sign extends Base {
 
     async handle(paramsData: paramsData, files: Uint8Array[], isDecode: boolean = false): Promise<Uint8Array[]> {
         paramsData.add_media = add_media
-        const [params] = await paramsData.toReplaceParams()
 
         const addFileTasks: Promise<number>[] = []
         for (const file of files) {
             addFileTasks.push(add_template(file, isDecode))
         }
-
+        const [tempFiles, [variables]] = await Promise.all([
+            Promise.all(addFileTasks),
+            paramsData.toReplaceParams(),
+        ])
         const encodeData = {
-            files: await Promise.all(addFileTasks),
-            variables: params
+            files: tempFiles,
+            variables
         }
 
         const paramsEncode = await replace_params_encode(encodeData)
-
         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 = []
+        let variablesTasks: Promise<replaceParams>[] = []
         for (const paramsData of paramsList) {
             paramsData.add_media = add_media
-            const [params] = await paramsData.toReplaceParams()
-            variables.push(params)
+            variablesTasks.push(new Promise((resolve, reject) => {
+                paramsData.toReplaceParams().then(([params]) => {
+                    resolve(params)
+                }).catch(reject)
+            }))
         }
 
         const addFileTasks: Promise<number>[] = []
@@ -40,8 +44,13 @@ export default class Sign extends Base {
             addFileTasks.push(add_template(file, isDecode))
         }
 
+        const [tempFiles, variables] = await Promise.all([
+            Promise.all(addFileTasks),
+            Promise.all(variablesTasks),
+        ])
+
         const encodeData = {
-            files: await Promise.all(addFileTasks),
+            files: tempFiles,
             variables
         }
 

package/task/urlDownloadTask.ts

@@ -1,16 +1,6 @@
 import axios, { AxiosProgressEvent } from "axios"
 import file from "../fileSystem"
-
-async function hashString(str: string): Promise<string> {
-    const encoder = new TextEncoder();
-    const data = encoder.encode(str);
-    const hashBuffer = await window.crypto.subtle.digest("SHA-1", data);
-    const hashArray = Array.from(new Uint8Array(hashBuffer));
-    const hashHex = hashArray
-      .map((b) => b.toString(16).padStart(2, "0"))
-      .join("");
-    return hashHex;
-}
+import { hashString } from "../helper"
 
 export default class urlDownloadTask {
     urls: string[]
@@ -23,7 +13,7 @@ export default class urlDownloadTask {
         this.urls = urls
     }
 
-    async start(): Promise<(Blob|undefined)[]> {
+    start(): Promise<(Blob|undefined)[]> {
         const tasks = []
         for (const url of this.urls) {
             tasks.push(this.getUrlData(url))
@@ -47,9 +37,7 @@ export default class urlDownloadTask {
     }
 
     async download(url: string): Promise<Blob> {
-        const response = await axios({
-            url: url,
-            method: 'get',
+        const response = await axios.get(url, {
             responseType: 'blob',
             onDownloadProgress: (progressEvent: AxiosProgressEvent) => {
                 for (const fun of this.downloadProgressListener) {
@@ -64,8 +52,13 @@ export default class urlDownloadTask {
             const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition)
             if (matches != null && matches[1]) {
                 const filename = matches[1].replace(/['"]/g, '')
-                const contentType = response.headers['content-type'] ?? 'application/octet-stream'
-                return new File([response.data], filename, { type: contentType })
+                return new File(
+                    [response.data],
+                    filename,
+                    {
+                        type: response.headers['content-type'] ?? 'application/octet-stream'
+                    }
+                )
             }
         }
         return response.data

package/temp/index.ts

@@ -81,15 +81,11 @@ export default class Temp implements TempInterface{
         if (this._type) {
             return this._type
         }
-        if (this.uint8Array) {
-            this._type = await fileTypeByBuffer(this.uint8Array)
+        const buffer = await this.getBuffer()
+        if (buffer) {
+            this._type = await fileTypeByBuffer(buffer)
         }else{
-            const file = await this.getBlob()
-            if (file) {
-                this._type = await fileTypeByBuffer(file)
-            }else{
-                this._type = fileTypes.unknown
-            }
+            this._type = fileTypes.unknown
         }
         return this._type
     }
@@ -146,17 +142,14 @@ export default class Temp implements TempInterface{
     }
 
     async getTransmitFileInfo(): Promise<transmitFileInfo|undefined> {
-        let uint8Array = this.uint8Array
-        this.uint8Array = undefined
-        if (!uint8Array) {
-            uint8Array = await this.getBuffer()
-        }
+        const uint8Array = this.uint8Array ? this.uint8Array : await this.getBuffer()
         if (!uint8Array) {
             return undefined
         }
+        this.uint8Array = undefined
         return {
             name: this.getName(),
-            uint8Array: new Uint8Array(uint8Array.buffer.slice(0)),
+            uint8Array,
             isDecode: this.isDecode,
         }
     }