@cloudpss/crypto 0.6.0-alpha.8 → 0.6.0-beta.1

package/dist/encryption/index.d.ts

@@ -11,16 +11,16 @@ export declare const
  * 加密数据
  * @throws {TypeError} 如果密码无效
  */
-encrypt: (data: BufferSource, passphrase: string) => Promise<Uint8Array>, 
+encrypt: (data: BufferSource, passphrase: string) => Promise<Uint8Array<ArrayBuffer>>, 
 /**
  * 加密数据，包含不加密的附加数据
  * @throws {TypeError} 如果密码无效
  */
-encryptAad: (data: BufferSource, aad: BufferSource | undefined, passphrase: string) => Promise<Uint8Array>, 
+encryptAad: (data: BufferSource, aad: BufferSource | undefined, passphrase: string) => Promise<Uint8Array<ArrayBuffer>>, 
 /**
  * 解密数据
  * @throws {TypeError} 如果数据不是有效的加密数据
  * @throws {TypeError} 如果密码无效
  */
-decrypt: (data: BufferSource, passphrase: string) => Promise<Uint8Array>;
+decrypt: (data: BufferSource, passphrase: string) => Promise<Uint8Array<ArrayBuffer>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/encryption/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/encryption/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,0BAA0B;AAC1B,wBAAgB,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAEvD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,UAAU,GAAG,SAAS,CAQrE;AAED,eAAO;AACH;;;GAGG;AAEH,OAAO;AACP;;;GAGG;AAEH,UAAU;AACV;;;;GAIG;AAEH,OAAO,iEACW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/encryption/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,0BAA0B;AAC1B,wBAAgB,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAEvD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,GAAG,UAAU,GAAG,SAAS,CAQrE;AAED,eAAO;AACH;;;GAGG;AAEH,OAAO;AACP;;;GAGG;AAEH,UAAU;AACV;;;;GAIG;AAEH,OAAO,8EACW,CAAC"}

package/dist/encryption/module.d.ts

@@ -4,18 +4,18 @@ interface Module {
      * 加密数据
      * @throws {TypeError} 如果密码无效
      */
-    encrypt(data: BufferSource, passphrase: string): Promise<Uint8Array>;
+    encrypt(data: BufferSource, passphrase: string): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * 加密数据，包含不加密的附加数据
      * @throws {TypeError} 如果密码无效
      */
-    encryptAad(data: BufferSource, aad: BufferSource | undefined, passphrase: string): Promise<Uint8Array>;
+    encryptAad(data: BufferSource, aad: BufferSource | undefined, passphrase: string): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * 解密数据
      * @throws {TypeError} 如果数据不是有效的加密数据
      * @throws {TypeError} 如果密码无效
      */
-    decrypt(data: BufferSource, passphrase: string): Promise<Uint8Array>;
+    decrypt(data: BufferSource, passphrase: string): Promise<Uint8Array<ArrayBuffer>>;
 }
 /** 创建模块 */
 export declare function createModule(impl: typeof import('#encryption') | typeof import('./wasm.js')): Module;

package/dist/encryption/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/encryption/module.ts"],"names":[],"mappings":"AAsBA,SAAS;AACT,UAAU,MAAM;IACZ;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrE;;;OAGG;IACH,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACvG;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACxE;AAED,WAAW;AACX,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,aAAa,CAAC,GAAG,cAAc,WAAW,CAAC,GAAG,MAAM,CAkDpG"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/encryption/module.ts"],"names":[],"mappings":"AAsBA,SAAS;AACT,UAAU,MAAM;IACZ;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IAClF;;;OAGG;IACH,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IACpH;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;CACrF;AAED,WAAW;AACX,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,aAAa,CAAC,GAAG,cAAc,WAAW,CAAC,GAAG,MAAM,CAkDpG"}

package/lib/wasm.d.ts

@@ -1,10 +1,12 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * Encrypts the given data using PBKDF2 and AES-GCM.
- */
-export function encrypt(passphrase: Uint8Array, data: Uint8Array, aad: Uint8Array, nonce: Uint8Array, pbkdf2_iterations: number, aes_key_size: number, aes_tag_size: number): Uint8Array;
+
 /**
  * Decrypts the given data using PBKDF2 and AES-GCM.
  */
 export function decrypt(passphrase: Uint8Array, data: Uint8Array, aad: Uint8Array, nonce: Uint8Array, pbkdf2_iterations: number, aes_key_size: number, aes_tag_size: number): Uint8Array;
+
+/**
+ * Encrypts the given data using PBKDF2 and AES-GCM.
+ */
+export function encrypt(passphrase: Uint8Array, data: Uint8Array, aad: Uint8Array, nonce: Uint8Array, pbkdf2_iterations: number, aes_key_size: number, aes_tag_size: number): Uint8Array;

package/lib/wasm_bg.js

@@ -3,9 +3,20 @@ export function __wbg_set_wasm(val) {
     wasm = val;
 }
 
+function getArrayU8FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
 
-let cachedUint8ArrayMemory0 = null;
+let cachedDataViewMemory0 = null;
+function getDataViewMemory0() {
+    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
+        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
+    }
+    return cachedDataViewMemory0;
+}
 
+let cachedUint8ArrayMemory0 = null;
 function getUint8ArrayMemory0() {
     if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
         cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
@@ -13,8 +24,6 @@ function getUint8ArrayMemory0() {
     return cachedUint8ArrayMemory0;
 }
 
-let WASM_VECTOR_LEN = 0;
-
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -22,21 +31,10 @@ function passArray8ToWasm0(arg, malloc) {
     return ptr;
 }
 
-let cachedDataViewMemory0 = null;
-
-function getDataViewMemory0() {
-    if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
-        cachedDataViewMemory0 = new DataView(wasm.memory.buffer);
-    }
-    return cachedDataViewMemory0;
-}
+let WASM_VECTOR_LEN = 0;
 
-function getArrayU8FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
-}
 /**
- * Encrypts the given data using PBKDF2 and AES-GCM.
+ * Decrypts the given data using PBKDF2 and AES-GCM.
  * @param {Uint8Array} passphrase
  * @param {Uint8Array} data
  * @param {Uint8Array} aad
@@ -46,22 +44,22 @@ function getArrayU8FromWasm0(ptr, len) {
  * @param {number} aes_tag_size
  * @returns {Uint8Array}
  */
-export function encrypt(passphrase, data, aad, nonce, pbkdf2_iterations, aes_key_size, aes_tag_size) {
+export function decrypt(passphrase, data, aad, nonce, pbkdf2_iterations, aes_key_size, aes_tag_size) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passArray8ToWasm0(passphrase, wasm.__wbindgen_export_0);
+        const ptr0 = passArray8ToWasm0(passphrase, wasm.__wbindgen_export);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passArray8ToWasm0(data, wasm.__wbindgen_export_0);
+        const ptr1 = passArray8ToWasm0(data, wasm.__wbindgen_export);
         const len1 = WASM_VECTOR_LEN;
-        const ptr2 = passArray8ToWasm0(aad, wasm.__wbindgen_export_0);
+        const ptr2 = passArray8ToWasm0(aad, wasm.__wbindgen_export);
         const len2 = WASM_VECTOR_LEN;
-        const ptr3 = passArray8ToWasm0(nonce, wasm.__wbindgen_export_0);
+        const ptr3 = passArray8ToWasm0(nonce, wasm.__wbindgen_export);
         const len3 = WASM_VECTOR_LEN;
-        wasm.encrypt(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, pbkdf2_iterations, aes_key_size, aes_tag_size);
+        wasm.decrypt(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, pbkdf2_iterations, aes_key_size, aes_tag_size);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var v5 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export_1(r0, r1 * 1, 1);
+        wasm.__wbindgen_export2(r0, r1 * 1, 1);
         return v5;
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
@@ -69,7 +67,7 @@ export function encrypt(passphrase, data, aad, nonce, pbkdf2_iterations, aes_key
 }
 
 /**
- * Decrypts the given data using PBKDF2 and AES-GCM.
+ * Encrypts the given data using PBKDF2 and AES-GCM.
  * @param {Uint8Array} passphrase
  * @param {Uint8Array} data
  * @param {Uint8Array} aad
@@ -79,25 +77,24 @@ export function encrypt(passphrase, data, aad, nonce, pbkdf2_iterations, aes_key
  * @param {number} aes_tag_size
  * @returns {Uint8Array}
  */
-export function decrypt(passphrase, data, aad, nonce, pbkdf2_iterations, aes_key_size, aes_tag_size) {
+export function encrypt(passphrase, data, aad, nonce, pbkdf2_iterations, aes_key_size, aes_tag_size) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passArray8ToWasm0(passphrase, wasm.__wbindgen_export_0);
+        const ptr0 = passArray8ToWasm0(passphrase, wasm.__wbindgen_export);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passArray8ToWasm0(data, wasm.__wbindgen_export_0);
+        const ptr1 = passArray8ToWasm0(data, wasm.__wbindgen_export);
         const len1 = WASM_VECTOR_LEN;
-        const ptr2 = passArray8ToWasm0(aad, wasm.__wbindgen_export_0);
+        const ptr2 = passArray8ToWasm0(aad, wasm.__wbindgen_export);
         const len2 = WASM_VECTOR_LEN;
-        const ptr3 = passArray8ToWasm0(nonce, wasm.__wbindgen_export_0);
+        const ptr3 = passArray8ToWasm0(nonce, wasm.__wbindgen_export);
         const len3 = WASM_VECTOR_LEN;
-        wasm.decrypt(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, pbkdf2_iterations, aes_key_size, aes_tag_size);
+        wasm.encrypt(retptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, pbkdf2_iterations, aes_key_size, aes_tag_size);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var v5 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export_1(r0, r1 * 1, 1);
+        wasm.__wbindgen_export2(r0, r1 * 1, 1);
         return v5;
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
     }
 }
-

package/lib/wasm_bg.wasm.d.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const encrypt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number) => void;
 export const decrypt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number) => void;
+export const encrypt: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number) => void;
 export const __wbindgen_add_to_stack_pointer: (a: number) => number;
-export const __wbindgen_export_0: (a: number, b: number) => number;
-export const __wbindgen_export_1: (a: number, b: number, c: number) => void;
+export const __wbindgen_export: (a: number, b: number) => number;
+export const __wbindgen_export2: (a: number, b: number, c: number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/crypto",
-  "version": "0.6.0-alpha.8",
+  "version": "0.6.0-beta.1",
   "author": "CloudPSS",
   "license": "MIT",
   "type": "module",

package/src/encryption/module.ts

@@ -26,18 +26,18 @@ interface Module {
      * 加密数据
      * @throws {TypeError} 如果密码无效
      */
-    encrypt(data: BufferSource, passphrase: string): Promise<Uint8Array>;
+    encrypt(data: BufferSource, passphrase: string): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * 加密数据，包含不加密的附加数据
      * @throws {TypeError} 如果密码无效
      */
-    encryptAad(data: BufferSource, aad: BufferSource | undefined, passphrase: string): Promise<Uint8Array>;
+    encryptAad(data: BufferSource, aad: BufferSource | undefined, passphrase: string): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * 解密数据
      * @throws {TypeError} 如果数据不是有效的加密数据
      * @throws {TypeError} 如果密码无效
      */
-    decrypt(data: BufferSource, passphrase: string): Promise<Uint8Array>;
+    decrypt(data: BufferSource, passphrase: string): Promise<Uint8Array<ArrayBuffer>>;
 }
 
 /** 创建模块 */

package/tests/encryption.ts

@@ -97,14 +97,13 @@ describe('Encryption root export', () => {
 
 /**
  * 检查实现模块
- * @param {any} module wrapped module
  */
-function checkModule(module) {
+function checkModule(module: { encrypt: typeof encrypt; decrypt: typeof decrypt; encryptAad: typeof encryptAad }) {
     it('has correct exports', () => {
         expect(module).toMatchObject({
-            encrypt: expect.any(Function),
-            decrypt: expect.any(Function),
-            encryptAad: expect.any(Function),
+            encrypt: expect.any(Function) as unknown,
+            decrypt: expect.any(Function) as unknown,
+            encryptAad: expect.any(Function) as unknown,
         });
     });
 
@@ -148,10 +147,11 @@ function checkModule(module) {
 
 /**
  * 检查实现
- * @param {Function} encrypt encrypt
- * @param {Function} decrypt decrypt
  */
-function checkImplEncryption(encrypt, decrypt) {
+function checkImplEncryption(
+    encrypt: typeof webImpl.encrypt | typeof wasmImpl.encrypt | typeof nodeImpl.encrypt,
+    decrypt: typeof webImpl.decrypt | typeof wasmImpl.decrypt | typeof nodeImpl.decrypt,
+) {
     it.each(data)(
         `$type[$length] ($tag)`,
         async ({ raw }) => {
@@ -185,6 +185,7 @@ function checkImplEncryption(encrypt, decrypt) {
 
             await expect(async () => {
                 await decrypt(
+                    // @ts-expect-error no aad
                     {
                         nonce: encrypted.nonce,
                         data: encrypted.data,