Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
chore(js-sdk,cli): Compat with Node 16 (#163)
Pavel 'Strajk' Dolecek4eba0e1232ce
diff --git a/.changeset/lovely-dodos-beam.md b/.changeset/lovely-dodos-beam.mdnew file mode 100644index 000000000..26c0a1e97--- /dev/null+++ b/.changeset/lovely-dodos-beam.md@@ -0,0 +1,5 @@+---+'@e2b/cli': patch+---++Fix support for Node16diff --git a/.github/workflows/js_sdk_compat_tests.yml b/.github/workflows/js_sdk_compat_tests.ymlnew file mode 100644index 000000000..8d3a27907--- /dev/null+++ b/.github/workflows/js_sdk_compat_tests.yml@@ -0,0 +1,48 @@+name: Test JS SDK compatibility (across node versions and OSes)++on:+ push:+ # Tests should already be run on PRs+ branches:+ - '**'+ - '!main'+ paths:+ - packages/js-sdk/**/*+ - .github/workflows/js_sdk_compat_tests.yml++permissions:+ contents: read++jobs:+ test:+ defaults:+ run:+ working-directory: ./packages/js-sdk++ name: Build and test SDK on Node ${{ matrix.node-version }} on ${{ matrix.os }}+ runs-on: ${{ matrix.os }}+ strategy:+ matrix:+ node-version: [ 20, 18, 16 ]+ os: [ macos-latest, ubuntu-latest, windows-latest ]++ steps:+ - name: Checkout+ uses: actions/checkout@v3++ - name: Setup Node+ uses: actions/setup-node@v3+ with:+ node-version: ${{ matrix.node-version }}+ cache: pnpm++ - name: Install dependencies+ run: pnpm install --frozen-lockfile++ - name: Build SDK+ run: pnpm run build++ - name: Run tests+ run: pnpm run test-smoke+ env:+ E2B_API_KEY: ${{ secrets.E2B_API_KEY }}diff --git a/.github/workflows/js_tests.yml b/.github/workflows/js_sdk_tests.ymlsimilarity index 82%rename from .github/workflows/js_tests.ymlrename to .github/workflows/js_sdk_tests.ymlindex 33e99c02f..86c2f0942 100644--- a/.github/workflows/js_tests.yml+++ b/.github/workflows/js_sdk_tests.yml@@ -2,13 +2,13 @@ name: Test JS SDKon:push:-# Tests are already running on main before release+ # Tests are already running on main before releasebranches:- - '*'+ - '**'- '!main'paths:- packages/js-sdk/**/*- - .github/workflows/js_tests.yml+ - .github/workflows/js_sdk_tests.ymlpermissions:contents: read@@ -23,6 +23,8 @@ jobs:steps:- name: Checkout repositoryuses: actions/checkout@v3++ - uses: pnpm/action-setup@v2- name: Setup Nodeuses: actions/setup-node@v3diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_sdk_tests.ymlsimilarity index 89%rename from .github/workflows/python_tests.ymlrename to .github/workflows/python_sdk_tests.ymlindex d8c5c9e1e..5d9e9eef5 100644--- a/.github/workflows/python_tests.yml+++ b/.github/workflows/python_sdk_tests.yml@@ -2,13 +2,13 @@ name: Test Python SDKon:push:- # Tests are already running on main before release+ # Tests are already running on main before releasebranches:- - '*'+ - '**'- '!main'paths:- packages/python-sdk/**/*- - .github/workflows/python_tests.yml+ - .github/workflows/python_sdk_tests.ymlpermissions:contents: readdiff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 8c00cd456..f797c3a71 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -56,7 +56,9 @@"chokidar": "^3.5.3","commander": "^9.4.1","common-tags": "^1.8.2",+ "cross-blob": "^3.0.2","docker-names": "^1.2.1",+ "formdata-node": "^5.0.1","get-port": "^7.0.0","ignore": "^5.2.4","inquirer": "^8.0.0",diff --git a/packages/cli/src/commands/env/create.ts b/packages/cli/src/commands/env/create.tsindex e42ce9f14..8da06dece 100644--- a/packages/cli/src/commands/env/create.ts+++ b/packages/cli/src/commands/env/create.ts@@ -1,6 +1,8 @@import * as commander from 'commander'import { stripIndent } from 'common-tags'import * as fs from 'fs'+import Blob from 'cross-blob' // Remove cross-blob when dropping node 16 support+import { FormData } from 'formdata-node' // Remove formdata-node when dropping node 16 supportimport fsPromise from 'fs/promises'import fetch from 'node-fetch'import { apiBaseUrl, ensureAccessToken } from 'src/api'@@ -140,9 +142,9 @@ export const createCommand = new commander.Command('create')if (elapsed > 1000 * 60 * 2) {// TODOconsole.log(stripIndent`- ⚠️ Build taking longer than 2 minutes, something might be wrong.\n- Stopping to wait for result, but it might still finish -\n- Check by yourself by running ${asLocal('e2b env list')}\n+ ⚠️ Build taking longer than 2 minutes, something might be wrong.+ Stopping to wait for result, but it might still finish.+ Check by yourself by running ${asLocal('e2b env list')}`)completed = true}diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.jsonindex 50aaaeead..3957540cf 100644--- a/packages/js-sdk/package.json+++ b/packages/js-sdk/package.json@@ -30,6 +30,7 @@"run": "node test/run.mjs","test": "vitest run","test:coverage": "vitest run --coverage",+ "test-smoke": "vitest run _smoke","generate": "openapi-typescript ../../openapi.yml -x api_key --support-array-length --alphabetize --output src/api/schema.gen.ts"},"devDependencies": {diff --git a/packages/js-sdk/rollup.config.js b/packages/js-sdk/rollup.config.jsindex 064707e40..af6153217 100644--- a/packages/js-sdk/rollup.config.js+++ b/packages/js-sdk/rollup.config.js@@ -34,7 +34,7 @@ export default {autoExternal({ builtins: false }),typescript({clean: false,- check: false, // uncomment when TS gives you weird erros when running vitest+ check: false, // uncomment when TS gives you weird errors when running vitest}),nodePolyfills(),nodeResolve({diff --git a/packages/js-sdk/test/_smoke.test.mjs b/packages/js-sdk/test/_smoke.test.mjsnew file mode 100644index 000000000..3b3125b43--- /dev/null+++ b/packages/js-sdk/test/_smoke.test.mjs@@ -0,0 +1,15 @@+import { Session } from '../src'+import { expect, test } from 'vitest'++const E2B_API_KEY = process.env.E2B_API_KEY++// Smoke test = quick, high-level, basic functionality test+test('Smoke test', async () => {+ const session = await Session.create({ id: 'Nodejs', apiKey: E2B_API_KEY })+ await session.filesystem.makeDir('/test/new')++ const ls = await session.filesystem.list('/test')+ expect(ls.map(x => x.name)).toEqual(['new'])++ await session.close()+})diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex fc47e8783..0efb46549 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -365,9 +365,15 @@ importers:common-tags:specifier: ^1.8.2version: 1.8.2+ cross-blob:+ specifier: ^3.0.2+ version: 3.0.2docker-names:specifier: ^1.2.1version: 1.2.1+ formdata-node:+ specifier: ^5.0.1+ version: 5.0.1get-port:specifier: ^7.0.0version: 7.0.0@@ -4043,6 +4049,10 @@ packages:inherits: 2.0.4readable-stream: 3.6.2+ resolution: {integrity: sha512-oD8Ydw+5lNoqq+en24iuPt1QixdPpe/nUF8azTHnviCZYu9zUC+TwdzIp5orpblJosNlgNbVmmAb//c6d6ImUQ==}+ dev: false+resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}dev: true@@ -4552,6 +4562,14 @@ packages:optional: truedev: false+ resolution: {integrity: sha512-u+7xq68MAjIqvoEKrdgIEupKJNBeU8MSl/cpfPmJ3rm9yvxrgbMPr8TkZS9qnwCgiVC8BsEt9kDkeD7He2zmNA==}+ engines: {node: ^12.20 || >=14.13}+ dependencies:+ blob-polyfill: 7.0.20220408+ fetch-blob: 3.2.0+ dev: false+resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==}dependencies:@@ -5935,6 +5953,14 @@ packages:combined-stream: 1.0.8mime-types: 2.1.35+ resolution: {integrity: sha512-8xnIjMYGKPj+rY2BTbAmpqVpi8der/2FT4d9f7J32FlsCpO5EzZPq3C/N56zdv8KweHzVF6TGijsS1JT6r1H2g==}+ engines: {node: '>= 14.17'}+ dependencies:+ node-domexception: 1.0.0+ web-streams-polyfill: 4.0.0-beta.3+ dev: false+resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}engines: {node: '>=12.20.0'}@@ -11202,6 +11228,11 @@ packages:resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}engines: {node: '>= 8'}+ resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}+ engines: {node: '>= 14'}+ dev: false+resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}dev: false