@metamask/snaps-execution-environments 6.7.1 → 6.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +110 -1
- package/dist/browserify/iframe/bundle.js +9 -0
- package/dist/browserify/iframe/index.html +13394 -0
- package/dist/browserify/node-process/bundle.js +13390 -0
- package/dist/browserify/node-thread/bundle.js +13390 -0
- package/dist/browserify/webview/index.html +13402 -0
- package/dist/browserify/worker-executor/bundle.js +13392 -0
- package/dist/browserify/worker-pool/bundle.js +9 -0
- package/dist/browserify/worker-pool/index.html +13394 -0
- package/dist/common/BaseSnapExecutor.cjs +58 -58
- package/dist/common/BaseSnapExecutor.cjs.map +1 -1
- package/dist/common/BaseSnapExecutor.mjs +58 -58
- package/dist/common/BaseSnapExecutor.mjs.map +1 -1
- package/dist/common/endowments/network.cjs +39 -52
- package/dist/common/endowments/network.cjs.map +1 -1
- package/dist/common/endowments/network.mjs +39 -52
- package/dist/common/endowments/network.mjs.map +1 -1
- package/dist/proxy/ProxySnapExecutor.cjs +72 -69
- package/dist/proxy/ProxySnapExecutor.cjs.map +1 -1
- package/dist/proxy/ProxySnapExecutor.mjs +71 -68
- package/dist/proxy/ProxySnapExecutor.mjs.map +1 -1
- package/dist/webview/WebViewExecutorStream.cjs +9 -22
- package/dist/webview/WebViewExecutorStream.cjs.map +1 -1
- package/dist/webview/WebViewExecutorStream.mjs +9 -22
- package/dist/webview/WebViewExecutorStream.mjs.map +1 -1
- package/dist/webworker/pool/WebWorkerPool.cjs +133 -130
- package/dist/webworker/pool/WebWorkerPool.cjs.map +1 -1
- package/dist/webworker/pool/WebWorkerPool.mjs +132 -129
- package/dist/webworker/pool/WebWorkerPool.mjs.map +1 -1
- package/package.json +37 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebWorkerPool.mjs","sourceRoot":"","sources":["../../../src/webworker/pool/WebWorkerPool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebWorkerPool.mjs","sourceRoot":"","sources":["../../../src/webworker/pool/WebWorkerPool.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BasePostMessageStream } from '@metamask/post-message-stream';\nimport {\n WebWorkerParentPostMessageStream,\n WindowPostMessageStream,\n} from '@metamask/post-message-stream';\nimport { logError } from '@metamask/snaps-utils';\nimport type { JsonRpcRequest } from '@metamask/utils';\nimport { assert } from '@metamask/utils';\nimport { nanoid } from 'nanoid/non-secure';\n\ntype ExecutorJob = {\n id: string;\n worker: Worker;\n stream: WebWorkerParentPostMessageStream;\n};\n\n/**\n * A snap executor using the WebWorker API.\n *\n * This is not a traditional snap executor, as it does not execute snaps itself.\n * Instead, it creates a pool of webworkers for each snap execution, and sends\n * the snap execution request to the webworker. The webworker is responsible for\n * executing the snap.\n */\nexport class WebWorkerPool {\n readonly #poolSize;\n\n readonly #stream: BasePostMessageStream;\n\n readonly #url: string;\n\n readonly pool: Worker[] = [];\n\n readonly jobs: Map<string, ExecutorJob> = new Map();\n\n #workerSourceURL?: string;\n\n /* istanbul ignore next - Constructor arguments. */\n static initialize(\n stream: BasePostMessageStream = new WindowPostMessageStream({\n name: 'child',\n target: 'parent',\n targetWindow: self.parent,\n targetOrigin: '*',\n }),\n url = '../executor/bundle.js',\n poolSize?: number,\n ) {\n return new WebWorkerPool(stream, url, poolSize);\n }\n\n constructor(stream: BasePostMessageStream, url: string, poolSize = 3) {\n this.#stream = stream;\n this.#url = url;\n this.#poolSize = poolSize;\n\n this.#stream.on('data', this.#onData.bind(this));\n }\n\n /**\n * Handle an incoming message from the `WebWorkerExecutionService`. This\n * assumes that the message contains a `jobId` property, and a JSON-RPC\n * request in the `data` property.\n *\n * @param data - The message data.\n * @param data.data - The JSON-RPC request.\n * @param data.jobId - The job ID.\n */\n #onData(data: { data: JsonRpcRequest; jobId: string }) {\n const { jobId, data: request } = data;\n\n const job = this.jobs.get(jobId);\n if (!job) {\n // This ensures that a job is initialized before it is used. To avoid\n // code duplication, we call the `#onData` method again, which will\n // run the rest of the logic after initialization.\n this.#initializeJob(jobId)\n .then(() => {\n this.#onData(data);\n })\n .catch((error) => {\n logError('[Worker] Error initializing job:', error.toString());\n\n this.#stream.write({\n jobId,\n data: {\n name: 'command',\n data: {\n jsonrpc: '2.0',\n id: request.id ?? null,\n error: {\n code: -32000,\n message: 'Internal error',\n },\n },\n },\n });\n });\n\n return;\n }\n\n // This is a method specific to the `WebWorkerPool`, as the service itself\n // does not have access to the workers directly.\n if (request.method === 'terminateJob') {\n this.#terminateJob(jobId);\n return;\n }\n\n job.stream.write(request);\n }\n\n /**\n * Create a new worker and set up a stream to communicate with it.\n *\n * @param jobId - The job ID.\n * @returns The job.\n */\n async #initializeJob(jobId: string): Promise<ExecutorJob> {\n const worker = await this.#getWorker();\n const jobStream = new WebWorkerParentPostMessageStream({\n worker,\n });\n\n // Write messages from the worker to the parent, wrapped with the job ID.\n jobStream.on('data', (data) => {\n this.#stream.write({ data, jobId });\n });\n\n const job = { id: jobId, worker, stream: jobStream };\n this.jobs.set(jobId, job);\n return job;\n }\n\n /**\n * Terminate the job with the given ID. This will close the worker and delete\n * the job from the internal job map.\n *\n * @param jobId - The job ID.\n */\n #terminateJob(jobId: string) {\n const job = this.jobs.get(jobId);\n assert(job, `Job \"${jobId}\" not found.`);\n\n job.stream.destroy();\n job.worker.terminate();\n\n this.jobs.delete(jobId);\n }\n\n /**\n * Get a worker from the pool. A new worker will be created automatically.\n *\n * @returns The worker.\n */\n async #getWorker() {\n // Lazily create the pool of workers.\n if (this.pool.length === 0) {\n await this.#updatePool();\n }\n\n const worker = this.pool.shift();\n assert(worker, 'Worker not found.');\n\n await this.#updatePool();\n\n return worker;\n }\n\n /**\n * Update the pool of workers. This will create new workers if the pool is\n * below the minimum size.\n */\n async #updatePool() {\n while (this.pool.length < this.#poolSize) {\n const worker = await this.#createWorker();\n this.pool.push(worker);\n }\n }\n\n /**\n * Create a new worker. This will fetch the worker source if it has not\n * already been fetched.\n *\n * @returns The worker.\n */\n async #createWorker() {\n return new Worker(await this.#getWorkerURL(), {\n name: `worker-${nanoid()}`,\n });\n }\n\n /**\n * Get the URL of the worker source. This will fetch the worker source if it\n * has not already been fetched.\n *\n * @returns The worker source URL, as a `blob:` URL.\n */\n async #getWorkerURL() {\n if (this.#workerSourceURL) {\n return this.#workerSourceURL;\n }\n\n const blob = await fetch(this.#url)\n .then(async (response) => response.blob())\n .then(URL.createObjectURL.bind(URL));\n\n this.#workerSourceURL = blob;\n return blob;\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@metamask/snaps-execution-environments",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.8.0",
|
|
4
4
|
"description": "Snap sandbox environments for executing SES javascript",
|
|
5
|
+
"keywords": [
|
|
6
|
+
"MetaMask",
|
|
7
|
+
"Snaps",
|
|
8
|
+
"Ethereum"
|
|
9
|
+
],
|
|
10
|
+
"homepage": "https://github.com/MetaMask/snaps/tree/main/packages/snaps-execution-environments#readme",
|
|
11
|
+
"bugs": {
|
|
12
|
+
"url": "https://github.com/MetaMask/snaps/issues"
|
|
13
|
+
},
|
|
5
14
|
"repository": {
|
|
6
15
|
"type": "git",
|
|
7
16
|
"url": "https://github.com/MetaMask/snaps.git"
|
|
8
17
|
},
|
|
18
|
+
"license": "SEE LICENSE IN LICENSE",
|
|
9
19
|
"sideEffects": false,
|
|
10
20
|
"exports": {
|
|
11
21
|
".": {
|
|
@@ -18,12 +28,8 @@
|
|
|
18
28
|
"default": "./dist/index.cjs"
|
|
19
29
|
}
|
|
20
30
|
},
|
|
21
|
-
"./dist/browserify/node-process/bundle.js":
|
|
22
|
-
|
|
23
|
-
},
|
|
24
|
-
"./dist/browserify/node-thread/bundle.js": {
|
|
25
|
-
"default": "./dist/browserify/node-thread/bundle.js"
|
|
26
|
-
},
|
|
31
|
+
"./dist/browserify/node-process/bundle.js": "./dist/browserify/node-process/bundle.js",
|
|
32
|
+
"./dist/browserify/node-thread/bundle.js": "./dist/browserify/node-thread/bundle.js",
|
|
27
33
|
"./package.json": "./package.json"
|
|
28
34
|
},
|
|
29
35
|
"main": "./dist/index.cjs",
|
|
@@ -33,25 +39,29 @@
|
|
|
33
39
|
"dist"
|
|
34
40
|
],
|
|
35
41
|
"scripts": {
|
|
36
|
-
"
|
|
37
|
-
"
|
|
38
|
-
"test:browser": "wdio run wdio.config.js",
|
|
39
|
-
"test:ci": "yarn test",
|
|
40
|
-
"test:watch": "jest --watch",
|
|
41
|
-
"lint:eslint": "eslint . --cache --ext js,ts,jsx,tsx",
|
|
42
|
-
"lint:misc": "prettier --no-error-on-unmatched-pattern --loglevel warn \"**/*.json\" \"**/*.md\" \"**/*.html\" \"!CHANGELOG.md\" --ignore-path ./.prettierignore",
|
|
43
|
-
"lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
|
|
44
|
-
"lint:changelog": "../../scripts/validate-changelog.sh @metamask/snaps-execution-environments",
|
|
45
|
-
"lint": "yarn lint:eslint && yarn lint:misc --check && yarn lint:changelog && yarn lint:dependencies",
|
|
46
|
-
"clean": "rimraf '*.tsbuildinfo' 'dist' 'src/__GENERATED__/' 'coverage/*' '__test__/*'",
|
|
47
|
-
"build": "ts-bridge --project tsconfig.build.json --verbose --no-references && yarn build:lavamoat",
|
|
42
|
+
"auto-changelog-init": "auto-changelog init",
|
|
43
|
+
"build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
|
|
48
44
|
"build:lavamoat": "lavamoat scripts/build.js --policy lavamoat/build-system/policy.json --policyOverride lavamoat/build-system/policy-override.json",
|
|
49
45
|
"build:lavamoat:policy": "yarn build:lavamoat --writeAutoPolicy && node scripts/build.js --writeAutoPolicy",
|
|
50
|
-
"
|
|
51
|
-
"
|
|
46
|
+
"build:post": "yarn build:lavamoat",
|
|
47
|
+
"changelog:update": "../../scripts/update-changelog.sh @metamask/snaps-execution-environments",
|
|
48
|
+
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/snaps-execution-environments",
|
|
49
|
+
"clean": "rimraf '*.tsbuildinfo' 'dist' 'src/__GENERATED__/' 'coverage/*' '__test__/*'",
|
|
50
|
+
"lint": "yarn lint:eslint && yarn lint:misc --check && yarn changelog:validate && yarn lint:dependencies",
|
|
52
51
|
"lint:ci": "yarn lint",
|
|
52
|
+
"lint:dependencies": "depcheck",
|
|
53
|
+
"lint:eslint": "eslint . --cache --ext js,ts,jsx,tsx",
|
|
54
|
+
"lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
|
|
55
|
+
"lint:misc": "prettier --no-error-on-unmatched-pattern --loglevel warn \"**/*.json\" \"**/*.md\" \"**/*.html\" \"!CHANGELOG.md\" --ignore-path ./.prettierignore",
|
|
56
|
+
"publish:preview": "yarn npm publish --tag preview",
|
|
57
|
+
"since-latest-release": "../../scripts/since-latest-release.sh",
|
|
53
58
|
"start": "node scripts/start.js",
|
|
54
|
-
"
|
|
59
|
+
"test": "jest --reporters=jest-silent-reporter && yarn test:browser",
|
|
60
|
+
"test:browser": "wdio run wdio.config.js",
|
|
61
|
+
"test:clean": "jest --clearCache",
|
|
62
|
+
"test:post": "ts-node scripts/coverage.ts && rimraf coverage/jest coverage/wdio",
|
|
63
|
+
"test:verbose": "jest --verbose",
|
|
64
|
+
"test:watch": "jest --watch"
|
|
55
65
|
},
|
|
56
66
|
"dependencies": {
|
|
57
67
|
"@metamask/json-rpc-engine": "^9.0.2",
|
|
@@ -59,8 +69,8 @@
|
|
|
59
69
|
"@metamask/post-message-stream": "^8.1.1",
|
|
60
70
|
"@metamask/providers": "^17.1.2",
|
|
61
71
|
"@metamask/rpc-errors": "^6.3.1",
|
|
62
|
-
"@metamask/snaps-sdk": "^6.
|
|
63
|
-
"@metamask/snaps-utils": "^8.
|
|
72
|
+
"@metamask/snaps-sdk": "^6.6.0",
|
|
73
|
+
"@metamask/snaps-utils": "^8.2.0",
|
|
64
74
|
"@metamask/superstruct": "^3.1.0",
|
|
65
75
|
"@metamask/utils": "^9.2.1",
|
|
66
76
|
"nanoid": "^3.1.31",
|
|
@@ -115,10 +125,11 @@
|
|
|
115
125
|
"jest": "^29.0.2",
|
|
116
126
|
"jest-environment-node": "^29.5.0",
|
|
117
127
|
"jest-fetch-mock": "^3.0.3",
|
|
128
|
+
"jest-silent-reporter": "^0.6.0",
|
|
118
129
|
"lavamoat": "^8.0.4",
|
|
119
130
|
"lavamoat-browserify": "^17.0.5",
|
|
120
|
-
"prettier": "^2.
|
|
121
|
-
"prettier-plugin-packagejson": "^2.2
|
|
131
|
+
"prettier": "^2.8.8",
|
|
132
|
+
"prettier-plugin-packagejson": "^2.5.2",
|
|
122
133
|
"rimraf": "^4.1.2",
|
|
123
134
|
"serve-handler": "^6.1.5",
|
|
124
135
|
"ses": "^1.1.0",
|