template-replacement 3.3.2 → 3.4.0

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)
   }
-}
+}

package/worker/child/base.ts

@@ -1,114 +1,150 @@
 import agency from './agency'
-import { messageData, messageTypes, methodCall } from '../type';
-import ReplaceInterface, { media } from '../../replace/interface';
-import { generateId } from '../../helper';
+import { messageData, messageTypes, methodCall, methodCallReply } from '../type'
+import ReplaceInterface, { media } from '../../replace/interface'
+import { generateId } from '../../helper'
 
 type methodKeys<T> = {
-  [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
-}[keyof T];
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+  [K in keyof T]: T[K] extends Function ? K : never
+}[keyof T]
 
-const allowCallMethodNames: Partial<Record<methodKeys<ReplaceInterface>, boolean>> = {
-  addTempFile: true,
-  extractVariables: true,
-  extractMedias: true,
-  execute: true,
-  filesEncrypt: true,
-  fileEncrypt: true,
-  executeMultipleParams: true,
-}
+//允许调用的方法
+const allowCallMethodNames: Set<methodKeys<ReplaceInterface>> = new Set(["addTempFile", "extractVariables", "extractMedias", "execute", "filesEncrypt", "fileEncrypt", "executeMultipleParams"])
 
-const tasks = new Map<string, Function>()
+//处理方法调用的返回值
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const resultHandles = new Map<methodKeys<ReplaceInterface>, (result: any, transfer: Transferable[]) => Transferable[]>([
+  ['execute', (result: Record<string, Uint8Array>, transfer: Transferable[] = []) => {
+    for (const key in result) {
+      const value = result[key]
+      if (value?.length) {
+        transfer.push(value.buffer)
+      }
+    }
+    return transfer
+  }],
+  ['executeMultipleParams', (result: Record<string, Uint8Array>[], transfer: Transferable[] = []) => {
+    for (const map of result) {
+      for (const key in map) {
+        const value = map[key]
+        if (value?.length) {
+          transfer.push(value.buffer)
+        }
+      }
+    }
+    return transfer
+  }],
+  ['extractMedias', (result: Record<string, media[]>, transfer: Transferable[] = []) => {
+    for (const key in result) {
+      const medias = result[key]
+      for (const media of medias) {
+        if (media.data?.length) {
+          transfer.push(media.data.buffer)
+        }
+      }
+    }
+    return transfer
+  }],
+  ['fileEncrypt', (result: Uint8Array, transfer: Transferable[] = []) => {
+    if (result?.length) {
+      transfer.push(result.buffer)
+    }
+    return transfer
+  }],
+  ['filesEncrypt', (result: Uint8Array[], transfer: Transferable[] = []) => {
+    for (const item of result) {
+      if (item?.length) {
+        transfer.push(item.buffer)
+      }
+    }
+    return transfer
+  }],
+])
+
+const tasks = new Map<string, (value: unknown) => void>()
 
 let dispatch: ReplaceInterface
 
 export default function _init(replace: ReplaceInterface) {
-    dispatch = new agency(replace)
+  dispatch = new agency(replace)
 }
 
-export async function call<T>(method: string, ...params: any[]): Promise<T> {
+export function call<T>(method: string, ...params: unknown[]): Promise<T> {
   const replyId = generateId()
   postMessage({
     type: messageTypes.methodCall,
     data: {
       replyId,
       method: method,
-      params: params
-    }
+      params: params,
+    },
   })
 
   return new Promise<T>((resolve, reject) => {
-    tasks.set(replyId, resolve)
+    tasks.set(replyId, resolve as (value: unknown) => void)
   })
 }
 
-
-addEventListener('message', async event => {
-    const data = event.data as messageData
-    switch (data.type) {
-      case messageTypes.methodCall:
-        // 调用方法
-        const callData = data.data as methodCall
-        const method = callData.method as methodKeys<ReplaceInterface>
-        if (!allowCallMethodNames[method]) {
-          return
-        }
-        const fun = dispatch[method]
-        if (!dispatch[method]) {
-          return
+addEventListener('message', async (event) => {
+  const data = event.data as messageData
+  if (!data?.data) {
+    return
+  }
+  switch (data.type) {
+    case messageTypes.methodCall:
+      // 调用方法
+      const callData = data.data as methodCall<methodKeys<ReplaceInterface>>
+      const method = callData.method
+      if (!allowCallMethodNames.has(method)) {
+        //跳过不允许被调用的方法
+        return
+      }
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+      const fun = dispatch[method] as Function | undefined
+      if (!fun) {
+        return
+      }
+      let result: unknown
+      let error: unknown = undefined
+      try {
+        result = await Promise.resolve(fun.apply(dispatch, callData.params))
+      } catch (e) {
+        console.error(e)
+        error = (e as Error).message || ((e as Error).name || "error")
+      }
+      if (!callData.replyId) {
+        return
+      }
+      const transfer: Transferable[] = []
+      if (result) {
+        const resultHandle = resultHandles.get(method)
+        if (resultHandle) {
+          resultHandle(result, transfer)
         }
-        const res = await Promise.resolve(fun.apply(dispatch, callData.params))
-        if (callData.replyId) {
-          const transfer: any = []
-          if (res) {
-            switch (method) {
-              case 'execute':
-                for (const key in (res as Record<string, Uint8Array>)) {
-                  const value: Uint8Array = res[key]
-                  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]
-                  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;
-            }
-          }
-          postMessage({
-            type: messageTypes.methodCallReply,
-            data: {
-              replyId: callData.replyId,
-              result: res
-            }
-          }, transfer.length ? { transfer } : undefined)
-        }
-        break;
-      case messageTypes.methodCallReply:
-        // 方法调用的返回数据
-        const fn = tasks.get(data?.data?.replyId)
-        if (!fn) {
-          return
-        }
-        fn(data?.data?.result)
-        tasks.delete(data?.data?.replyId)
-    }
+      }
+      postMessage(
+        {
+          type: messageTypes.methodCallReply,
+          data: {
+            replyId: callData.replyId,
+            result,
+            error
+          },
+        },
+        transfer.length ? { transfer } : undefined,
+      )
+      break
+    case messageTypes.methodCallReply:
+      // 方法调用的返回数据
+      const replyId = (data.data as methodCallReply).replyId
+      if (!replyId) {
+        return
+      }
+      const fn = tasks.get(replyId)
+      if (!fn) {
+        return
+      }
+      fn((data.data as methodCallReply).result)
+      tasks.delete(replyId)
+  }
 })

package/worker/child/general.ts

@@ -1,5 +1,4 @@
-import Replace from '../../replace/general';
-import init from './base';
+import Replace from '../../replace/general'
+import init from './base'
 
 init(new Replace())
-

package/worker/child/sign.ts

@@ -1,9 +1,9 @@
-import Replace from '../../replace/sign';
-import init, { call } from './base';
+import Replace from '../../replace/sign'
+import init, { call } from './base'
 
 const replace = new Replace()
 init(replace)
 
-replace.sign = async (data: any): Promise<string> => {
-  return await call<string>('sign', data)
+replace.sign = (data: unknown): Promise<string> => {
+  return call<string>('sign', data)
 }

package/worker/index.ts

@@ -1,66 +1,67 @@
-import { messageData } from "./type"
-import DispatcherInterface from "./interface"
+import { messageData } from './type'
+import DispatcherInterface from './interface'
 
 export type webworker = new () => Worker
 
 export default class worker implements DispatcherInterface {
-    #concurrency: number
-    #counter: number = 0
-    #workers: Worker[] = []
-    #listenerList: ((event: MessageEvent)=>void)[] = []
+  #concurrency: number
+  #counter: number = 0
+  #workers: Worker[] = []
+  #listenerList: ((event: MessageEvent) => void)[] = []
 
-    constructor(webworker: webworker, concurrency?: number) {
-        this.#concurrency = Number(concurrency)
-        if (!this.#concurrency || this.#concurrency < 1) {
-            try {
-                this.#concurrency = navigator.hardwareConcurrency < 8 ? navigator.hardwareConcurrency : 8
-            } catch (error) {
-            }
-        }
-        if (!this.#concurrency || this.#concurrency < 1) {
-            this.#concurrency = 1
-        }
-        for (let index = 0; index < this.#concurrency; index++) {
-            this.#addOneWorker(webworker)
-        }
+  constructor(webworker: webworker, concurrency?: number) {
+    this.#concurrency = Number(concurrency)
+    if (this.#concurrency < 1) {
+      try {
+        this.#concurrency = navigator.hardwareConcurrency < 8 ? navigator.hardwareConcurrency : 8
+      } catch (error) { }
     }
-
-    #addOneWorker(webworker: webworker) {
-        const worker: Worker = new webworker()
-        worker.onmessage = async (event: MessageEvent) => {
-            const tasks = []
-            for (const fun of this.#listenerList) {
-                tasks.push(fun(event))
-            }
-            const res = await Promise.all(tasks)
-            for (const reply of res) {
-                reply as any && worker.postMessage(reply)
-            }
-        }
-        this.#workers.push(worker)
+    if (this.#concurrency < 1) {
+      this.#concurrency = 1
     }
-
-    concurrency(): number {
-        return this.#concurrency
+    for (let index = 0; index < this.#concurrency; index++) {
+      this.#addOneWorker(webworker)
     }
+  }
 
-    postMessage(message: messageData, options?: StructuredSerializeOptions) {
-        if (!this.#workers[++this.#counter]) {
-            this.#counter = 0
+  #addOneWorker(webworker: webworker) {
+    const worker: Worker = new webworker()
+    worker.onmessage = async (event: MessageEvent) => {
+      const tasks: unknown[] = []
+      for (const fun of this.#listenerList) {
+        tasks.push(fun(event))
+      }
+      const res = await Promise.all(tasks)
+      for (const reply of res) {
+        if (reply) {
+          worker.postMessage(reply)
         }
-        this.#workers[this.#counter].postMessage(message, options)
+      }
     }
+    this.#workers.push(worker)
+  }
+
+  concurrency(): number {
+    return this.#concurrency
+  }
 
-    addListener(fun: (event: MessageEvent) => void) {
-        this.#listenerList.push(fun)
+  postMessage(message: messageData, options?: StructuredSerializeOptions) {
+    if (!this.#workers[++this.#counter]) {
+      this.#counter = 0
     }
+    this.#workers[this.#counter].postMessage(message, options)
+  }
 
-    removeListener(fun: (event: MessageEvent) => void) {
-        for (const i in this.#listenerList) {
-            if (this.#listenerList[i] == fun) {
-                this.#listenerList.splice((i as unknown) as number, 1)
-                return
-            }
-        }
+  addListener(fun: (event: MessageEvent) => void) {
+    this.#listenerList.push(fun)
+  }
+
+  removeListener(fun: (event: MessageEvent) => void) {
+    for (const i in this.#listenerList) {
+      if (this.#listenerList[i] == fun) {
+        this.#listenerList.splice(i as unknown as number, 1)
+        return
+      }
     }
-}
+  }
+}

package/worker/interface.ts

@@ -1,11 +1,14 @@
-import { messageData, methodCall } from "./type";
+import { messageData, methodCall } from './type'
 
 export default interface DispatcherInterface {
-    concurrency(): number
+  concurrency(): number
 
-    postMessage(message: messageData|methodCall, options?: StructuredSerializeOptions): void
+  postMessage(
+    message: messageData | methodCall,
+    options?: StructuredSerializeOptions,
+  ): void
 
-    addListener(fun: (event: MessageEvent) => void): void
+  addListener<T>(fun: (event: MessageEvent<T>) => void): void
 
-    removeListener(fun: (event: MessageEvent) => void): void
-}
+  removeListener<T>(fun: (event: MessageEvent<T>) => void): void
+}

package/worker/main/general.ts

@@ -1,8 +1,8 @@
-import webworker from "../child/general.ts?worker&inline"
-import base from ".."
+import webworker from '../child/general.ts?worker&inline'
+import base from '../index'
 
 export default class extends base {
-    constructor(concurrency?: number) {
-        super(webworker, concurrency)
-    }
+  constructor(concurrency?: number) {
+    super(webworker, concurrency)
+  }
 }