gavin/note2any
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

update at 2025-10-08 09:18:20

Browse Source
This commit is contained in:
douboer
2025-10-08 09:18:20 +08:00
parent a49e389fe2
commit 584d4151fc
67 changed files with 5363 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/imagelib.ts
View File

@@ -1,23 +1,6 @@
/*
* Copyright (c) 2024-2025 Sun Booshi
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
/**
* 文件：imagelib.ts
* 作用：图像相关工具（路径解析 / wikilink 处理 / 资源定位）。
*/
import { getBlobArrayBuffer } from "obsidian";
@@ -26,7 +9,7 @@ import { NMPSettings } from "./settings";
import { IsWasmReady, LoadWasm } from "./wasm/wasm";
import AssetsManager from "./assets";
declare function GoWebpToJPG(data: Uint8Array): Uint8Array;
declare function GoWebpToJPG(data: Uint8Array): Uint8Array; // wasm 返回 Uint8Array
declare function GoWebpToPNG(data: Uint8Array): Uint8Array;
declare function GoAddWatermark(img: Uint8Array, watermark: Uint8Array): Uint8Array;
@@ -38,15 +21,15 @@ export async function PrepareImageLib() {
await LoadWasm();
}
export function WebpToJPG(data: ArrayBuffer): ArrayBuffer {
export function WebpToJPG(data: ArrayBuffer): Uint8Array {
return GoWebpToJPG(new Uint8Array(data));
}
export function WebpToPNG(data: ArrayBuffer): ArrayBuffer {
export function WebpToPNG(data: ArrayBuffer): Uint8Array {
return GoWebpToPNG(new Uint8Array(data));
}
export function AddWatermark(img: ArrayBuffer, watermark: ArrayBuffer): ArrayBuffer {
export function AddWatermark(img: ArrayBuffer, watermark: ArrayBuffer): Uint8Array {
return GoAddWatermark(new Uint8Array(img), new Uint8Array(watermark));
}
@@ -61,8 +44,11 @@ export async function UploadImageToWx(data: Blob, filename: string, token: strin
if (watermarkData == null) {
throw new Error('水印图片不存在: ' + watermark);
}
const watermarkImg = AddWatermark(await data.arrayBuffer(), watermarkData);
data = new Blob([watermarkImg], { type: data.type });
const watermarkImg = AddWatermark(await data.arrayBuffer(), watermarkData);
// AddWatermark 返回 Uint8Array，Blob 的类型签名对某些 TS 配置可能对 ArrayBufferLike 有严格区分
// 此处使用其底层 ArrayBuffer 来构造 Blob，避免类型不兼容错误
const bufferPart = watermarkImg.buffer as ArrayBuffer;
data = new Blob([bufferPart], { type: data.type });
}
return await wxUploadImage(data, filename, token, type);
}