diff --git a/wasm/build.js b/wasm/build.js index 4571409..cc529e2 100644 --- a/wasm/build.js +++ b/wasm/build.js @@ -27,4 +27,12 @@ execSync( { stdio: "inherit" } ); +console.log(`\n Removing .gitignore...`); + +[browserOutDir, nodeOutDir].forEach((dir) => { + try { + fs.rmSync(path.join(dir, ".gitignore")); + } catch {} +}); + console.log(`\nšŸŽ‰ All builds finished successfully!`); diff --git a/wasm/src/browser/cap_wasm.d.ts b/wasm/src/browser/cap_wasm.d.ts new file mode 100644 index 0000000..11b77b6 --- /dev/null +++ b/wasm/src/browser/cap_wasm.d.ts @@ -0,0 +1,35 @@ +/* tslint:disable */ +/* eslint-disable */ +export function solve_pow(salt: string, target: string): bigint; + +export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module; + +export interface InitOutput { + readonly memory: WebAssembly.Memory; + readonly solve_pow: (a: number, b: number, c: number, d: number) => bigint; + readonly __wbindgen_export_0: WebAssembly.Table; + readonly __wbindgen_malloc: (a: number, b: number) => number; + readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; + readonly __wbindgen_start: () => void; +} + +export type SyncInitInput = BufferSource | WebAssembly.Module; +/** +* Instantiates the given `module`, which can either be bytes or +* a precompiled `WebAssembly.Module`. +* +* @param {{ module: SyncInitInput }} module - Passing `SyncInitInput` directly is deprecated. +* +* @returns {InitOutput} +*/ +export function initSync(module: { module: SyncInitInput } | SyncInitInput): InitOutput; + +/** +* If `module_or_path` is {RequestInfo} or {URL}, makes a request and +* for everything else, calls `WebAssembly.instantiate` directly. +* +* @param {{ module_or_path: InitInput | Promise }} module_or_path - Passing `InitInput` directly is deprecated. +* +* @returns {Promise} +*/ +export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise } | InitInput | Promise): Promise; diff --git a/wasm/src/browser/cap_wasm.js b/wasm/src/browser/cap_wasm.js new file mode 100644 index 0000000..552b746 --- /dev/null +++ b/wasm/src/browser/cap_wasm.js @@ -0,0 +1,197 @@ +let wasm; + +let WASM_VECTOR_LEN = 0; + +let cachedUint8ArrayMemory0 = null; + +function getUint8ArrayMemory0() { + if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) { + cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer); + } + return cachedUint8ArrayMemory0; +} + +const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } ); + +const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' + ? function (arg, view) { + return cachedTextEncoder.encodeInto(arg, view); +} + : function (arg, view) { + const buf = cachedTextEncoder.encode(arg); + view.set(buf); + return { + read: arg.length, + written: buf.length + }; +}); + +function passStringToWasm0(arg, malloc, realloc) { + + if (realloc === undefined) { + const buf = cachedTextEncoder.encode(arg); + const ptr = malloc(buf.length, 1) >>> 0; + getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf); + WASM_VECTOR_LEN = buf.length; + return ptr; + } + + let len = arg.length; + let ptr = malloc(len, 1) >>> 0; + + const mem = getUint8ArrayMemory0(); + + let offset = 0; + + for (; offset < len; offset++) { + const code = arg.charCodeAt(offset); + if (code > 0x7F) break; + mem[ptr + offset] = code; + } + + if (offset !== len) { + if (offset !== 0) { + arg = arg.slice(offset); + } + ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0; + const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len); + const ret = encodeString(arg, view); + + offset += ret.written; + ptr = realloc(ptr, len, offset, 1) >>> 0; + } + + WASM_VECTOR_LEN = offset; + return ptr; +} +/** + * @param {string} salt + * @param {string} target + * @returns {bigint} + */ +export function solve_pow(salt, target) { + const ptr0 = passStringToWasm0(salt, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + const ptr1 = passStringToWasm0(target, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + const ret = wasm.solve_pow(ptr0, len0, ptr1, len1); + return BigInt.asUintN(64, ret); +} + +async function __wbg_load(module, imports) { + if (typeof Response === 'function' && module instanceof Response) { + if (typeof WebAssembly.instantiateStreaming === 'function') { + try { + return await WebAssembly.instantiateStreaming(module, imports); + + } catch (e) { + if (module.headers.get('Content-Type') != 'application/wasm') { + console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e); + + } else { + throw e; + } + } + } + + const bytes = await module.arrayBuffer(); + return await WebAssembly.instantiate(bytes, imports); + + } else { + const instance = await WebAssembly.instantiate(module, imports); + + if (instance instanceof WebAssembly.Instance) { + return { instance, module }; + + } else { + return instance; + } + } +} + +function __wbg_get_imports() { + const imports = {}; + imports.wbg = {}; + imports.wbg.__wbindgen_init_externref_table = function() { + const table = wasm.__wbindgen_export_0; + const offset = table.grow(4); + table.set(0, undefined); + table.set(offset + 0, undefined); + table.set(offset + 1, null); + table.set(offset + 2, true); + table.set(offset + 3, false); + ; + }; + + return imports; +} + +function __wbg_init_memory(imports, memory) { + +} + +function __wbg_finalize_init(instance, module) { + wasm = instance.exports; + __wbg_init.__wbindgen_wasm_module = module; + cachedUint8ArrayMemory0 = null; + + + wasm.__wbindgen_start(); + return wasm; +} + +function initSync(module) { + if (wasm !== undefined) return wasm; + + + if (typeof module !== 'undefined') { + if (Object.getPrototypeOf(module) === Object.prototype) { + ({module} = module) + } else { + console.warn('using deprecated parameters for `initSync()`; pass a single object instead') + } + } + + const imports = __wbg_get_imports(); + + __wbg_init_memory(imports); + + if (!(module instanceof WebAssembly.Module)) { + module = new WebAssembly.Module(module); + } + + const instance = new WebAssembly.Instance(module, imports); + + return __wbg_finalize_init(instance, module); +} + +async function __wbg_init(module_or_path) { + if (wasm !== undefined) return wasm; + + + if (typeof module_or_path !== 'undefined') { + if (Object.getPrototypeOf(module_or_path) === Object.prototype) { + ({module_or_path} = module_or_path) + } else { + console.warn('using deprecated parameters for the initialization function; pass a single object instead') + } + } + + if (typeof module_or_path === 'undefined') { + module_or_path = new URL('cap_wasm_bg.wasm', import.meta.url); + } + const imports = __wbg_get_imports(); + + if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) { + module_or_path = fetch(module_or_path); + } + + __wbg_init_memory(imports); + + const { instance, module } = await __wbg_load(await module_or_path, imports); + + return __wbg_finalize_init(instance, module); +} + +export { initSync }; +export default __wbg_init; diff --git a/wasm/src/browser/cap_wasm_bg.wasm b/wasm/src/browser/cap_wasm_bg.wasm new file mode 100644 index 0000000..0928d71 Binary files /dev/null and b/wasm/src/browser/cap_wasm_bg.wasm differ diff --git a/wasm/src/browser/cap_wasm_bg.wasm.d.ts b/wasm/src/browser/cap_wasm_bg.wasm.d.ts new file mode 100644 index 0000000..42a2803 --- /dev/null +++ b/wasm/src/browser/cap_wasm_bg.wasm.d.ts @@ -0,0 +1,8 @@ +/* tslint:disable */ +/* eslint-disable */ +export const memory: WebAssembly.Memory; +export const solve_pow: (a: number, b: number, c: number, d: number) => bigint; +export const __wbindgen_export_0: WebAssembly.Table; +export const __wbindgen_malloc: (a: number, b: number) => number; +export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; +export const __wbindgen_start: () => void; diff --git a/wasm/src/browser/package.json b/wasm/src/browser/package.json new file mode 100644 index 0000000..29aea95 --- /dev/null +++ b/wasm/src/browser/package.json @@ -0,0 +1,15 @@ +{ + "name": "cap_wasm", + "type": "module", + "version": "0.1.0", + "files": [ + "cap_wasm_bg.wasm", + "cap_wasm.js", + "cap_wasm.d.ts" + ], + "main": "cap_wasm.js", + "types": "cap_wasm.d.ts", + "sideEffects": [ + "./snippets/*" + ] +} \ No newline at end of file diff --git a/wasm/src/node/cap_wasm.d.ts b/wasm/src/node/cap_wasm.d.ts new file mode 100644 index 0000000..b5c1b6a --- /dev/null +++ b/wasm/src/node/cap_wasm.d.ts @@ -0,0 +1,3 @@ +/* tslint:disable */ +/* eslint-disable */ +export function solve_pow(salt: string, target: string): bigint; diff --git a/wasm/src/node/cap_wasm.js b/wasm/src/node/cap_wasm.js new file mode 100644 index 0000000..25423b1 --- /dev/null +++ b/wasm/src/node/cap_wasm.js @@ -0,0 +1,105 @@ + +let imports = {}; +imports['__wbindgen_placeholder__'] = module.exports; +let wasm; +const { TextEncoder } = require(`util`); + +let WASM_VECTOR_LEN = 0; + +let cachedUint8ArrayMemory0 = null; + +function getUint8ArrayMemory0() { + if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) { + cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer); + } + return cachedUint8ArrayMemory0; +} + +let cachedTextEncoder = new TextEncoder('utf-8'); + +const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' + ? function (arg, view) { + return cachedTextEncoder.encodeInto(arg, view); +} + : function (arg, view) { + const buf = cachedTextEncoder.encode(arg); + view.set(buf); + return { + read: arg.length, + written: buf.length + }; +}); + +function passStringToWasm0(arg, malloc, realloc) { + + if (realloc === undefined) { + const buf = cachedTextEncoder.encode(arg); + const ptr = malloc(buf.length, 1) >>> 0; + getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf); + WASM_VECTOR_LEN = buf.length; + return ptr; + } + + let len = arg.length; + let ptr = malloc(len, 1) >>> 0; + + const mem = getUint8ArrayMemory0(); + + let offset = 0; + + for (; offset < len; offset++) { + const code = arg.charCodeAt(offset); + if (code > 0x7F) break; + mem[ptr + offset] = code; + } + + if (offset !== len) { + if (offset !== 0) { + arg = arg.slice(offset); + } + ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0; + const view = getUint8ArrayMemory0().subarray(ptr + offset, ptr + len); + const ret = encodeString(arg, view); + + offset += ret.written; + ptr = realloc(ptr, len, offset, 1) >>> 0; + } + + WASM_VECTOR_LEN = offset; + return ptr; +} +/** + * @param {string} salt + * @param {string} target + * @returns {bigint} + */ +module.exports.solve_pow = function(salt, target) { + const ptr0 = passStringToWasm0(salt, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + const ptr1 = passStringToWasm0(target, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len1 = WASM_VECTOR_LEN; + const ret = wasm.solve_pow(ptr0, len0, ptr1, len1); + return BigInt.asUintN(64, ret); +}; + +module.exports.__wbindgen_init_externref_table = function() { + const table = wasm.__wbindgen_export_0; + const offset = table.grow(4); + table.set(0, undefined); + table.set(offset + 0, undefined); + table.set(offset + 1, null); + table.set(offset + 2, true); + table.set(offset + 3, false); + ; +}; + +const path = require('path').join(__dirname, 'cap_wasm_bg.wasm'); +const bytes = require('fs').readFileSync(path); + +const wasmModule = new WebAssembly.Module(bytes); +const wasmInstance = new WebAssembly.Instance(wasmModule, imports); +wasm = wasmInstance.exports; +module.exports.__wasm = wasm; + +wasm.__wbindgen_start(); + diff --git a/wasm/src/node/cap_wasm_bg.wasm b/wasm/src/node/cap_wasm_bg.wasm new file mode 100644 index 0000000..69aed63 Binary files /dev/null and b/wasm/src/node/cap_wasm_bg.wasm differ diff --git a/wasm/src/node/cap_wasm_bg.wasm.d.ts b/wasm/src/node/cap_wasm_bg.wasm.d.ts new file mode 100644 index 0000000..42a2803 --- /dev/null +++ b/wasm/src/node/cap_wasm_bg.wasm.d.ts @@ -0,0 +1,8 @@ +/* tslint:disable */ +/* eslint-disable */ +export const memory: WebAssembly.Memory; +export const solve_pow: (a: number, b: number, c: number, d: number) => bigint; +export const __wbindgen_export_0: WebAssembly.Table; +export const __wbindgen_malloc: (a: number, b: number) => number; +export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; +export const __wbindgen_start: () => void; diff --git a/wasm/src/node/package.json b/wasm/src/node/package.json new file mode 100644 index 0000000..5786682 --- /dev/null +++ b/wasm/src/node/package.json @@ -0,0 +1,11 @@ +{ + "name": "cap_wasm", + "version": "0.1.0", + "files": [ + "cap_wasm_bg.wasm", + "cap_wasm.js", + "cap_wasm.d.ts" + ], + "main": "cap_wasm.js", + "types": "cap_wasm.d.ts" +} \ No newline at end of file diff --git a/wasm/src/package.json b/wasm/src/package.json index ec066a5..9a06ff7 100644 --- a/wasm/src/package.json +++ b/wasm/src/package.json @@ -1,13 +1,8 @@ { "name": "@cap.js/wasm", - "version": "0.0.1", + "version": "0.0.3", "description": "WASM for Cap's solver", - "main": "index.js", - "files": [ - "node/", - "browser/", - "README.md" - ], + "main": "./node/cap_wasm.js", "keywords": [ "account security", "abuse detection", diff --git a/widget/src/src/cap.js b/widget/src/src/cap.js index b2ec478..da001f8 100644 --- a/widget/src/src/cap.js +++ b/widget/src/src/cap.js @@ -426,7 +426,9 @@ document.adoptedStyleSheets.push(sheet); // MARK: Solver worker + // TODO: Switch to using Rust WASM solver const workerFunct = function () { + // MARK: TODO: Switch to using Rust WASM solver let hasher; self.onmessage = async ({ data: { salt, target } }) => { @@ -497,6 +499,7 @@ } } + // MARK: TODO: Switch to using Rust WASM solver if (!hasher) { hasher = await hashwasm.createSHA256(); } @@ -531,6 +534,7 @@ }; }; + // MARK: TODO: Switch to using Rust WASM solver setTimeout(async function () { workerScript = (await (