template-replacement 3.3.3 → 3.4.0

package/task/urlDownloadTask.ts

@@ -3,68 +3,66 @@ import file from "../fileSystem"
 import { hashString } from "../helper"
 
 export default class urlDownloadTask {
-    urls: string[]
-    downloadProgressListener:((progressEvent: AxiosProgressEvent) => void)[] = []
+  urls: string[]
+  #downloadProgressListener: ((progressEvent: AxiosProgressEvent) => void)[] = []
 
-    constructor(urls: string[]) {
-        if (urls.constructor !== Array) {
-            throw new Error("不是可用的链接数组数据")
-        }
-        this.urls = urls
+  constructor(urls: string[]) {
+    if (urls.constructor !== Array) {
+      throw new Error('不是可用的链接数组数据')
     }
+    this.urls = urls
+  }
 
-    start(): Promise<(Blob|undefined)[]> {
-        const tasks = []
-        for (const url of this.urls) {
-            tasks.push(this.getUrlData(url))
-        }
-        return Promise.all(tasks)
+  start(): Promise<(Blob | undefined)[]> {
+    const tasks = []
+    for (const url of this.urls) {
+      tasks.push(this.getUrlData(url))
     }
+    return Promise.all(tasks)
+  }
 
-    async getUrlData(url: string): Promise<Blob|undefined> {
-        const hash = await hashString(url)
-        const fileObj = file(hash)
-        const data = await fileObj.read()
-        if (data.size) {
-            return data
-        }
-        const getData = await this.download(url)
-        if (!getData) {
-            return undefined
-        }
-        fileObj.write(getData)
-        return getData
+  async getUrlData(url: string): Promise<Blob | undefined> {
+    const hash = await hashString(url)
+    const fileObj = file(hash)
+    const data = await fileObj.read()
+    if (data.size) {
+      return data
     }
+    const getData = await this.download(url)
+    if (!getData) {
+      return undefined
+    }
+    fileObj.write(getData)
+    return getData
+  }
 
-    async download(url: string): Promise<Blob> {
-        const response = await axios.get(url, {
-            responseType: 'blob',
-            onDownloadProgress: (progressEvent: AxiosProgressEvent) => {
-                for (const fun of this.downloadProgressListener) {
-                    fun(progressEvent)
-                }
-            }
-        })
-
-        const contentDisposition = response.headers['content-disposition']
-        // 解析文件名
-        if (contentDisposition) {
-            const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition)
-            if (matches != null && matches[1]) {
-                const filename = matches[1].replace(/['"]/g, '')
-                return new File(
-                    [response.data],
-                    filename,
-                    {
-                        type: response.headers['content-type'] ?? 'application/octet-stream'
-                    }
-                )
-            }
+  async download(url: string): Promise<Blob> {
+    const response = await axios.get(url, {
+      responseType: 'blob',
+      onDownloadProgress: (progressEvent: AxiosProgressEvent) => {
+        for (const fun of this.#downloadProgressListener) {
+          fun(progressEvent)
         }
-        return response.data
-    }
+      },
+    })
 
-    onDownloadProgress(listen: (progressEvent: AxiosProgressEvent) => void) {
-        this.downloadProgressListener.push(listen)
+    const contentDisposition = response.headers['content-disposition']
+    // 解析文件名
+    if (contentDisposition) {
+      const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(
+        contentDisposition,
+      )
+      if (matches != null && matches[1]) {
+        const filename = matches[1].replace(/['"]/g, '')
+        return new File([response.data], filename, {
+          type: response.headers['content-type'] ?? 'application/octet-stream',
+        })
+      }
     }
-}
+    return response.data
+  }
+
+  onDownloadProgress(listen: (progressEvent: AxiosProgressEvent) => void) {
+    this.#downloadProgressListener.push(listen)
+  }
+}

package/temp/index.ts

@@ -1,156 +1,171 @@
-import { fileTypeByBuffer, fileTypes, getFileNameFromUrl, urlsToFileBlobs } from '../helper'
+import {
+  fileTypeByBuffer,
+  fileTypes,
+  getFileNameFromUrl,
+  urlsToFileBlobs,
+} from '../helper'
 import { TempInterface } from './interface'
 
 export type TempImageInfo = {
-    hash: string,
-    blob: Blob,
-    path: string
+  hash: string
+  blob: Blob
+  path: string
 }
 
 export enum status {
-    waitLoad, //文件待加载
-    loaded, //文件已加载
-    replaceFinish, //完成替换
-    replaceFail, //替换失败
-    loadFail, //文件加载失败
+  waitLoad, //文件待加载
+  loaded, //文件已加载
+  replaceFinish, //完成替换
+  replaceFail, //替换失败
+  loadFail, //文件加载失败
 }
 
 //传递的文件信息
 export type transmitFileInfo = {
-    name: string,
-    uint8Array: Uint8Array,
-    isDecode: boolean,
+  name: string
+  uint8Array: Uint8Array
+  isDecode: boolean
 }
 
 //将传递的文件信息转为模板对象
-export function transmitFileInfoToTemp(data: transmitFileInfo) {
-    if (!data.uint8Array || !data.name) {
-        throw new Error("模板文件信息错误")
-    }
-    const temp = new Temp(undefined, undefined, data.uint8Array, data.name)
-    temp.isDecode = data.isDecode
-    return temp
+export function transmitFileInfoToTemp(data: transmitFileInfo): Temp {
+  if (!data.uint8Array || !data.name) {
+    throw new Error('模板文件信息错误')
+  }
+  const temp = new Temp(undefined, undefined, data.uint8Array, data.name)
+  temp.isDecode = data.isDecode
+  return temp
 }
 
-export default class Temp implements TempInterface{
-    name: string = ''
-    blob?: File|Blob
-    uint8Array?: Uint8Array
-    url?: string
-    status = status.waitLoad // 0文件待加载,1文件已加载,2完成替换,3替换失败
-    isDecode: boolean = false //文件是否被加密
-
-    _output?: File|Blob
-    _type?: fileTypes
-
-    tempImages: Record<string, TempImageInfo> = {}
-
-    constructor(file?: File|Blob, url?: string, uint8Array?: Uint8Array, name?: string) {
-        if (uint8Array) {
-            this.uint8Array = uint8Array
-            this.setStatus(status.loaded)
-        }else if (file) {
-            this.blob = file
-            this.setStatus(status.loaded)
-        }else if (url) {
-            this.url = url
-        }
-        if (name) {
-            this.name = name
-        }else{
-            this.name = (file as File)?.name ?? ''
-        }
-
-        if (!url && !file && !uint8Array) {
-            throw new Error("缺少文件数据或文件链接")
-        }
+export default class Temp implements TempInterface {
+  name: string = ''
+  blob?: File | Blob
+  uint8Array?: Uint8Array
+  url?: string
+  status = status.waitLoad // 0文件待加载,1文件已加载,2完成替换,3替换失败
+  isDecode: boolean = false //文件是否需要解密
+
+  tempImages: Record<string, TempImageInfo> = {}
+
+  private _output?: File | Blob = undefined
+  private _type?: fileTypes = undefined
+
+  constructor(
+    file?: File | Blob,
+    url?: string,
+    uint8Array?: Uint8Array,
+    name?: string,
+  ) {
+    if (uint8Array) {
+      this.uint8Array = uint8Array
+      this.setStatus(status.loaded)
+    } else if (file) {
+      this.blob = file
+      this.setStatus(status.loaded)
+    } else if (url) {
+      this.url = url
     }
-
-    getName() {
-        if (this.name) {
-            return this.name
-        }
-        if ((this.blob as File)?.name) {
-            this.name = (this.blob as File).name
-            return this.name
-        }
-        return this.url ? getFileNameFromUrl(this.url) : ''
+    if (name) {
+      this.name = name
+    } else {
+      this.name = (file as File)?.name ?? ''
     }
 
-    async type(): Promise<fileTypes> {
-        if (this._type) {
-            return this._type
-        }
-        const buffer = await this.getBuffer()
-        if (buffer) {
-            this._type = await fileTypeByBuffer(buffer)
-        }else{
-            this._type = fileTypes.unknown
-        }
-        return this._type
+    if (!url && !file && !uint8Array) {
+      throw new Error('缺少文件数据或文件链接')
     }
+  }
 
-    async getBuffer(): Promise<Uint8Array|undefined>{
-        if (this.uint8Array) {
-            return this.uint8Array
-        }
-        const blob = await this.getBlob()
-        if (blob) {
-            this.uint8Array = new Uint8Array(await blob.arrayBuffer())
-        }
-
-        return this.uint8Array
+  getName() {
+    if (this.name) {
+      return this.name
     }
-
-    async getBlob(): Promise<Blob|undefined> {
-        if (this.blob) {
-            return this.blob
-        }
-        if (!this.blob) {
-            if (this.uint8Array) {
-                this.blob = new Blob([ this.uint8Array as BlobPart ])
-            }else if (this.url) {
-                const [ blob ] = await urlsToFileBlobs([ this.url ])
-                if (blob) {
-                    this.blob = blob
-                }
-            }
-        }
-        if ((this.status === status.waitLoad || this.status === status.loadFail) && this.blob) {
-            this.setStatus(status.loaded)
-        }
-        if (!this.blob) {
-            this.setStatus(status.loadFail)
-        }
-        return this.blob
+    if ((this.blob as File)?.name) {
+      this.name = (this.blob as File).name
+      return this.name
     }
+    return this.url ? getFileNameFromUrl(this.url) : ''
+  }
 
-    setStatus(status: status): void {
-        this.status = status
+  async type(): Promise<fileTypes> {
+    if (this._type) {
+      return this._type
     }
-
-    setOutputFile(file: File|Blob): void {
-        this._output = file
+    const buffer = await this.getBuffer()
+    if (buffer) {
+      this._type = await fileTypeByBuffer(buffer)
+    } else {
+      this._type = fileTypes.unknown
     }
+    return this._type
+  }
 
-    setTempImages(images: Record<string, TempImageInfo>): void {
-        this.tempImages = images
+  async getBuffer(): Promise<Uint8Array | undefined> {
+    if (this.uint8Array) {
+      return this.uint8Array
     }
-
-    outputFile(): File|Blob|undefined {
-        return this._output ?? this.blob
+    const blob = await this.getBlob()
+    if (blob) {
+      this.uint8Array = new Uint8Array(await blob.arrayBuffer())
     }
 
-    async getTransmitFileInfo(): Promise<transmitFileInfo|undefined> {
-        const uint8Array = this.uint8Array ? this.uint8Array : await this.getBuffer()
-        if (!uint8Array) {
-            return undefined
-        }
-        this.uint8Array = undefined
-        return {
-            name: this.getName(),
-            uint8Array,
-            isDecode: this.isDecode,
+    return this.uint8Array
+  }
+
+  async getBlob(): Promise<Blob | undefined> {
+    if (this.blob) {
+      return this.blob
+    }
+    if (!this.blob) {
+      if (this.uint8Array) {
+        this.blob = new Blob([this.uint8Array as BlobPart])
+      } else if (this.url) {
+        const [blob] = await urlsToFileBlobs([this.url])
+        if (blob) {
+          this.blob = blob
         }
+      }
+    }
+    if (
+      (this.status === status.waitLoad || this.status === status.loadFail) &&
+      this.blob
+    ) {
+      this.setStatus(status.loaded)
+    }
+    if (!this.blob) {
+      this.setStatus(status.loadFail)
+    }
+    return this.blob
+  }
+
+  setStatus(status: status): void {
+    this.status = status
+  }
+
+  setOutputFile(file: File | Blob): void {
+    this._output = file
+  }
+
+  setTempImages(images: Record<string, TempImageInfo>): void {
+    this.tempImages = images
+  }
+
+  outputFile(): File | Blob | undefined {
+    return this._output ?? this.blob
+  }
+
+  async getTransmitFileInfo(): Promise<transmitFileInfo | undefined> {
+    const uint8Array = this.uint8Array
+      ? this.uint8Array
+      : await this.getBuffer()
+    if (!uint8Array) {
+      return undefined
+    }
+    this.uint8Array = undefined
+    return {
+      name: this.getName(),
+      uint8Array,
+      isDecode: this.isDecode,
     }
+  }
 }

package/temp/interface.ts

@@ -2,17 +2,17 @@ import { status, TempImageInfo } from '.'
 import { fileTypes } from '../helper'
 
 export interface TempInterface {
-    type(): Promise<fileTypes>
+  type(): Promise<fileTypes>
 
-    getBuffer(): Promise<Uint8Array|undefined>
+  getBuffer(): Promise<Uint8Array | undefined>
 
-    getBlob(): Promise<Blob|undefined>
+  getBlob(): Promise<Blob | undefined>
 
-    setStatus(status: status): void
+  setStatus(status: status): void
 
-    setOutputFile(file: File|Blob): void
+  setOutputFile(file: File | Blob): void
 
-    setTempImages(images: Record<string, TempImageInfo>): void
+  setTempImages(images: Record<string, TempImageInfo>): void
 
-    outputFile(): File|Blob|undefined
-}
+  outputFile(): File | Blob | undefined
+}

package/tsconfig.json

@@ -27,7 +27,7 @@
     /* Modules */
     "module": "es2022",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "node",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "moduleResolution": "node16",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */

package/vite.config.ts

@@ -1,26 +1,23 @@
-import { defineConfig } from 'vite';
-import wasmPack from 'vite-plugin-wasm-pack';
-import dts from 'vite-plugin-dts';
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [
-    wasmPack([], ['template-replacement-sign-core-wasm','template-replacement-core-wasm']),
-    dts({
-      entryRoot: './dist',
-      insertTypesEntry: true,
-    }),
-  ],
   build: {
+    target: 'esnext',
     outDir: './dist',
     lib: {
-      entry: ['./worker/main/sign.ts', './worker/main/general.ts', './replace/general.ts', './replace/sign.ts'],
+      entry: [
+        './worker/main/sign.ts',
+        './worker/main/general.ts',
+        './replace/general.ts',
+        './replace/sign.ts',
+      ],
       name: 'template-replacement',
       fileName: (format, entryName) => `${entryName}.js`,
       formats: ['es'],
     },
     rollupOptions: {
       output: {
-        entryFileNames: (info: { facadeModuleId: string; }) => {
+        entryFileNames: (info) => {
           const modules = info.facadeModuleId?.split('/')
           if (!modules?.length || modules?.length < 2) {
             return '[name].js'
@@ -32,5 +29,5 @@ export default defineConfig({
   },
   worker: {
     format: 'es',
-  }
-})
+  },
+})

package/worker/child/agency.ts

@@ -1,51 +1,56 @@
-import image from "../../replace/image";
-import ReplaceInterface, { media } from "../../replace/interface";
-import paramsData, { mediaData, textData } from "../../replace/paramsData";
-import Temp, { transmitFileInfo, transmitFileInfoToTemp } from "../../temp";
+import image from '../../replace/image'
+import ReplaceInterface, { media } from '../../replace/interface'
+import paramsData, { mediaData, textData } from '../../replace/paramsData'
+import Temp, { transmitFileInfo, transmitFileInfoToTemp } from '../../temp'
 
 export default class implements ReplaceInterface {
-  replace: ReplaceInterface
+  #replace: ReplaceInterface
 
   constructor(replace: ReplaceInterface) {
-    this.replace = replace
+    this.#replace = replace
   }
 
-  addTempFile(tempFile: any) {
-    tempFile = transmitFileInfoToTemp(tempFile)
-    return this.replace.addTempFile(tempFile)
+  addTempFile(tempFile: transmitFileInfo | Temp): void {
+    tempFile = transmitFileInfoToTemp(tempFile as transmitFileInfo)
+    return this.#replace.addTempFile(tempFile)
   }
 
   clear() {
-    return this.replace.clear()
+    return this.#replace.clear()
   }
 
   //提取变量
-  extractVariables(files: Temp[] | undefined): Promise<Record<string, string[]>> {
+  extractVariables(
+    files: Temp[] | transmitFileInfo[] | undefined,
+  ): Promise<Record<string, string[]>> {
     if (files) {
       for (const i in files) {
         files[i] = transmitFileInfoToTemp(files[i] as transmitFileInfo)
       }
     }
-    return this.replace.extractVariables(files)
+    return this.#replace.extractVariables(files as Temp[])
   }
 
   //提取媒体
-  extractMedias(files: Temp[] | undefined): Promise<Record<string, media[]>> {
+  extractMedias(files: Temp[] | transmitFileInfo[] | undefined): Promise<Record<string, media[]>> {
     if (files) {
       for (const i in files) {
         files[i] = transmitFileInfoToTemp(files[i] as transmitFileInfo)
       }
     }
-    return this.replace.extractMedias(files)
+    return this.#replace.extractMedias(files as Temp[])
   }
 
   //签名方法
-  sign(data: any): Promise<string> {
-    return this.replace.sign(data)
+  sign(data: unknown): Promise<string> {
+    return this.#replace.sign(data)
   }
 
   //执行替换任务
-  execute(params: paramsData, files: Temp[] | undefined): Promise<Record<string, Uint8Array>> {
+  execute(
+    params: paramsData,
+    files: Temp[] | transmitFileInfo[] | undefined,
+  ): Promise<Record<string, Uint8Array>> {
     if (files) {
       for (const i in files) {
         files[i] = transmitFileInfoToTemp(files[i] as transmitFileInfo)
@@ -53,70 +58,73 @@ 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 && value.file instanceof Blob) {
-        text[key] = new image(value.file)
-        delete value.file
-        text[key].setPropertys(value)
-      }else {
+      const value = params.textData[key]
+      if (value && (value as image).file instanceof Blob) {
+        text[key] = new image((value as image).file)
+        delete (value as Record<keyof image, unknown>).file
+        text[key].setProperties((value as Record<keyof image, unknown>))
+      } else {
         text[key] = value
       }
     }
 
     const media: mediaData = {}
     for (const key in params.mediaData) {
-      const value = params.mediaData[key] as Record<keyof image, any>
+      const value = params.mediaData[key] as Record<keyof image, unknown>
       if (value && value.file instanceof Blob) {
         media[key] = new image(value.file)
         delete value.file
-        media[key].setPropertys(value)
+        media[key].setProperties(value)
       }
     }
-    return this.replace.execute(new paramsData(text, media), files)
+    return this.#replace.execute(new paramsData(text, media), files as Temp[])
   }
 
   //执行替换任务（多套参数）
-  executeMultipleParams(paramsMultiple: paramsData[], files: Temp[] | undefined): Promise<Record<string, Uint8Array>[]> {
+  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= []
+    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 {
+        const value = params.textData[key]
+        if (value && (value as image).file instanceof Blob) {
+          text[key] = new image((value as image).file)
+          delete (value as Record<keyof image, unknown>).file
+          text[key].setProperties((value as Record<keyof image, unknown>))
+        } else {
           text[key] = value
         }
       }
 
       const media: mediaData = {}
       for (const key in params.mediaData) {
-        const value = params.mediaData[key] as Record<keyof image, any>
+        const value = params.mediaData[key] as Record<keyof image, unknown>
         if (value && value.file instanceof Blob) {
           media[key] = new image(value.file)
           delete value.file
-          media[key].setPropertys(value)
+          media[key].setProperties(value)
         }
       }
       paramsList.push(new paramsData(text, media))
     }
-    return this.replace.executeMultipleParams(paramsList, files)
+    return this.#replace.executeMultipleParams(paramsList, files)
   }
 
   //文件加密
   fileEncrypt(file: Uint8Array): Promise<Uint8Array> {
-    return this.replace.fileEncrypt(file)
+    return this.#replace.fileEncrypt(file)
   }
 
   //文件批量加密
-  filesEncrypt(files: (Uint8Array)[]): Promise<(Uint8Array)[]> {
-    return this.replace.filesEncrypt(files)
+  filesEncrypt(files: Uint8Array[]): Promise<Uint8Array[]> {
+    return this.#replace.filesEncrypt(files)
   }
-}
+}