fix wasm build

2026-01-09 15:07:59 -05:00 · 2023-11-16 09:46:19 +03:00
parent 3eaba9477b
commit d43ede2d49
8 changed files with 32 additions and 293 deletions
--- a/package.json
+++ b/package.json
@@ -17,12 +17,15 @@
    "build:wasm": "wasm-pack build --target web wasm/prover",
    "build:test": "webpack --config webpack.test.config.js",
    "watch:test": "webpack --config webpack.test.config.js --watch",
-    "serve:test": "serve  --config ../serve.json ./test-build -l 3000",
+    "serve:test": "serve  --config ../serve.json ./test-build -l 3001",
    "test": "concurrently npm:watch:test npm:serve:test",
    "lint:eslint": "eslint . --fix",
    "lint:tsc": "tsc --noEmit",
    "lint": "concurrently npm:lint:tsc npm:lint:eslint"
  },
+  "dependencies": {
+    "comlink": "^4.4.1"
+  },
  "devDependencies": {
    "browserify": "^17.0.0",
    "concurrently": "^5.1.0",
@@ -43,7 +46,6 @@
    "stream-browserify": "^3.0.0",
    "ts-loader": "^6.2.1",
    "typescript": "^4.9.3",
-    "wasm-pack": "^0.12.1",
    "webpack": "^5.75.0",
    "webpack-cli": "^5.0.0",
    "webpack-dev-server": "^4.11.1",
--- a/5
+++ b/5
@@ -0,0 +1,5 @@
+[toolchain]
+# channel = "nightly-2022-12-12"
+# channel = "stable"
+# channel = "nightly-x86_64-apple-darwin"
+channel = "nightly"
--- a/src/index.js
+++ b/src/index.js
@@ -1,74 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-exports.verify = exports.prove = exports.NOTARY_SERVER_PUBKEY = void 0;
-var worker_1 = require("./worker");
-var tlsn = new worker_1["default"]();
-exports.NOTARY_SERVER_PUBKEY = "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBv36FI4ZFszJa0DQFJ3wWCXvVLFr\ncRzMG5kaTeHGoSzDu6cFqx3uEWYpFGo6C0EOUgf+mEgbktLrXocv5yHzKg==\n-----END PUBLIC KEY-----";
-var prove = function (url, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var method, headers, body, _a, maxTranscriptSize, notaryUrl, websocketProxyUrl, secretHeaders, secretResps;
-    return __generator(this, function (_b) {
-        method = options.method, headers = options.headers, body = options.body, _a = options.maxTranscriptSize, maxTranscriptSize = _a === void 0 ? 32768 : _a, notaryUrl = options.notaryUrl, websocketProxyUrl = options.websocketProxyUrl, secretHeaders = options.secretHeaders, secretResps = options.secretResps;
-        return [2 /*return*/, tlsn.prover(url, {
-                method: method,
-                headers: headers,
-                body: body,
-                maxTranscriptSize: maxTranscriptSize,
-                notaryUrl: notaryUrl,
-                websocketProxyUrl: websocketProxyUrl,
-                secretHeaders: secretHeaders,
-                secretResps: secretResps
-            })];
-    });
-}); };
-exports.prove = prove;
-var verify = function (proof, pubkey) {
-    if (pubkey === void 0) { pubkey = exports.NOTARY_SERVER_PUBKEY; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, tlsn.verify(proof, pubkey)];
-                case 1:
-                    result = _a.sent();
-                    return [2 /*return*/, result];
-            }
-        });
-    });
-};
-exports.verify = verify;
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,16 @@
-import TLSN from "./worker";
+import * as Comlink from 'comlink';

-const tlsn = new TLSN();
+const TLSN: any = Comlink.wrap(
+  new Worker(new URL('./worker.ts', import.meta.url)),
+);
+
+let _tlsn: any | null = null;
+
+async function getTLSN(): Promise<any | null> {
+  if (_tlsn) return _tlsn;
+  _tlsn = await new TLSN();
+  return _tlsn;
+}

 export const NOTARY_SERVER_PUBKEY = `-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBv36FI4ZFszJa0DQFJ3wWCXvVLFr\ncRzMG5kaTeHGoSzDu6cFqx3uEWYpFGo6C0EOUgf+mEgbktLrXocv5yHzKg==\n-----END PUBLIC KEY-----`;

@@ -28,6 +38,7 @@ export const prove = async (
    secretResps,
  } = options;

+  const tlsn = await getTLSN();
  return tlsn.prover(url, {
    method,
    headers,
@@ -44,6 +55,7 @@ export const verify = async (
  proof: { session: any; substrings: any },
  pubkey = NOTARY_SERVER_PUBKEY,
 ) => {
+  const tlsn = await getTLSN();
  const result = await tlsn.verify(proof, pubkey);
  return result;
 };
--- a/src/worker.js
+++ b/src/worker.js
@@ -1,139 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-var tlsn_extension_rs_1 = require("../wasm/prover/pkg/tlsn_extension_rs");
-var TLSN = /** @class */ (function () {
-    function TLSN() {
-        var _this = this;
-        console.log('worker module initiated.');
-        this.startPromise = new Promise(function (resolve) {
-            _this.resolveStart = resolve;
-        });
-        this.start();
-    }
-    TLSN.prototype.start = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var numConcurrency, res;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        console.log('start');
-                        numConcurrency = navigator.hardwareConcurrency;
-                        console.log('!@# navigator.hardwareConcurrency=', numConcurrency);
-                        return [4 /*yield*/, (0, tlsn_extension_rs_1["default"])()];
-                    case 1:
-                        res = _a.sent();
-                        console.log('!@# res.memory=', res.memory);
-                        // 6422528 ~= 6.12 mb
-                        console.log('!@# res.memory.buffer.length=', res.memory.buffer.byteLength);
-                        return [4 /*yield*/, (0, tlsn_extension_rs_1.initThreadPool)(numConcurrency)];
-                    case 2:
-                        _a.sent();
-                        this.resolveStart();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    TLSN.prototype.waitForStart = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.startPromise];
-            });
-        });
-    };
-    TLSN.prototype.prover = function (url, options) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var resProver, resJSON, e_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.waitForStart()];
-                    case 1:
-                        _c.sent();
-                        console.log('worker', url, __assign(__assign({}, options), { notaryUrl: options === null || options === void 0 ? void 0 : options.notaryUrl, websocketProxyUrl: options === null || options === void 0 ? void 0 : options.websocketProxyUrl }));
-                        return [4 /*yield*/, (0, tlsn_extension_rs_1.prover)(url, __assign(__assign({}, options), { notaryUrl: options === null || options === void 0 ? void 0 : options.notaryUrl, websocketProxyUrl: options === null || options === void 0 ? void 0 : options.websocketProxyUrl }), (options === null || options === void 0 ? void 0 : options.secretHeaders) || [], (options === null || options === void 0 ? void 0 : options.secretResps) || [])];
-                    case 2:
-                        resProver = _c.sent();
-                        resJSON = JSON.parse(resProver);
-                        console.log('!@# resProver,resJSON=', { resProver: resProver, resJSON: resJSON });
-                        console.log('!@# resAfter.memory=', resJSON.memory);
-                        // 1105920000 ~= 1.03 gb
-                        console.log('!@# resAfter.memory.buffer.length=', (_b = (_a = resJSON.memory) === null || _a === void 0 ? void 0 : _a.buffer) === null || _b === void 0 ? void 0 : _b.byteLength);
-                        return [2 /*return*/, resJSON];
-                    case 3:
-                        e_1 = _c.sent();
-                        console.log(e_1);
-                        return [2 /*return*/, e_1];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    TLSN.prototype.verify = function (proof, pubkey) {
-        return __awaiter(this, void 0, void 0, function () {
-            var raw;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.waitForStart()];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, tlsn_extension_rs_1.verify)(JSON.stringify(proof), pubkey)];
-                    case 2:
-                        raw = _a.sent();
-                        return [2 /*return*/, JSON.parse(raw)];
-                }
-            });
-        });
-    };
-    return TLSN;
-}());
-exports["default"] = TLSN;
--- a/src/worker.ts
+++ b/src/worker.ts
@@ -1,3 +1,4 @@
+import * as Comlink from 'comlink';
 import init, {
  initThreadPool,
  prover,
@@ -84,3 +85,5 @@ export default class TLSN {
    return JSON.parse(raw);
  }
 }
+
+Comlink.expose(TLSN);
--- a/utils/test.js
+++ b/utils/test.js
@@ -1,67 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-var app_1 = require("../src/app");
-(function runTest() {
-    return __awaiter(this, void 0, void 0, function () {
-        var proof, result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, app_1.prove)('https://swapi.dev/api/people/1', {
-                        method: 'GET',
-                        headers: {
-                            Connection: 'close',
-                            Accept: 'application/json',
-                            'Accept-Encoding': 'identity'
-                        },
-                        body: '',
-                        maxTranscriptSize: 20000,
-                        notaryUrl: 'https://127.0.0.1:7047',
-                        websocketProxyUrl: 'ws://127.0.0.1:55688'
-                    })];
-                case 1:
-                    proof = _a.sent();
-                    return [4 /*yield*/, (0, app_1.verify)(proof, app_1.NOTARY_SERVER_PUBKEY)];
-                case 2:
-                    result = _a.sent();
-                    console.log(result);
-                    return [2 /*return*/];
-            }
-        });
-    });
-})();
--- a/utils/test.ts
+++ b/utils/test.ts
@@ -1,21 +1,18 @@
 import { prove, verify, NOTARY_SERVER_PUBKEY } from '../src';

 (async function runTest() {
-  console.log('hi1')
-  const proof = await prove('https://swapi.dev/api/people/1', {
+  const proof = await prove('https://api.coindesk.com/v1/bpi/currentprice.json', {
    method: 'GET',
    headers: {
-      Connection: 'close',
-      Accept: 'application/json',
-      'Accept-Encoding': 'identity',
+      // Connection: 'close',
+      // Accept: 'application/json',
+      // "accept-encoding": "identity"
    },
    body: '',
-    maxTranscriptSize: 20000,
+    maxTranscriptSize: 16384,
    notaryUrl: 'https://127.0.0.1:7047',
-    websocketProxyUrl: 'ws://127.0.0.1:55688',
+    websocketProxyUrl: 'ws://127.0.0.1:55688?token=api.coindesk.com',
  });

  const result = await verify(proof, NOTARY_SERVER_PUBKEY);
-
-  console.log(result);
 })();