vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-09 02:59:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: replace require() with ESM imports in bun eval scripts (#1682)

Browse source 
* fix: replace require() with ESM imports in bun eval scripts (#1669)

Fixes #1669

Agent: security-auditor
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

* fix: update test assertion to match ESM import pattern

The test expected require('http') but the PR changed shared/common.sh
to use ESM imports. Update assertion to expect import http from 'http'.

Agent: pr-maintainer
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

---------

Co-authored-by: B <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
A 2026-02-21 22:50:08 -08:00 • committed by GitHub
parent 9f43113452
commit e381ca2412
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aws/lib/common.sh
View file

@ -364,7 +364,7 @@ ensure_ssh_key() {
# Build JSON body with bun so the key content is properly escaped
local import_body
import_body=$(bun eval \
"const k=require('fs').readFileSync(process.argv[2],'utf8').trim();process.stdout.write(JSON.stringify({keyPairName:process.argv[3],publicKeyBase64:k}));" \
"const {readFileSync}=await import('fs');const k=readFileSync(process.argv[2],'utf8').trim();process.stdout.write(JSON.stringify({keyPairName:process.argv[3],publicKeyBase64:k}));" \
"${pub_path}" "${key_name}")
_lightsail_rest "Lightsail_20161128.ImportKeyPair" "${import_body}" >/dev/null || {
@ -492,7 +492,7 @@ create_server() {
local ud_tmp create_body
ud_tmp=$(mktemp)
printf '%s' "${userdata}" > "${ud_tmp}"
create_body=$(bun eval "const ud=require('fs').readFileSync(process.argv[2],'utf8');process.stdout.write(JSON.stringify({instanceNames:[process.argv[3]],availabilityZone:process.argv[4],blueprintId:'ubuntu_24_04',bundleId:process.argv[5],keyPairName:'spawn-key',userData:ud}));" \
create_body=$(bun eval "const {readFileSync}=await import('fs');const ud=readFileSync(process.argv[2],'utf8');process.stdout.write(JSON.stringify({instanceNames:[process.argv[3]],availabilityZone:process.argv[4],blueprintId:'ubuntu_24_04',bundleId:process.argv[5],keyPairName:'spawn-key',userData:ud}));" \
"${ud_tmp}" "${name}" "${az}" "${bundle}")
rm -f "${ud_tmp}"

2
cli/src/__tests__/shared-common-oauth-flow.test.ts
View file

@ -320,7 +320,7 @@ describe("_generate_oauth_server_script", () => {
"${testDir}/code" "${testDir}/port" 5180
`);
expect(result.exitCode).toBe(0);
expect(result.stdout).toContain("require('http')");
expect(result.stdout).toContain("import http from 'http'");
});
it("should embed the expected CSRF state", () => {

6
shared/common.sh
View file

@ -790,9 +790,9 @@ _generate_oauth_server_script() {
port_file="${port_file//\'/\\\'}"
printf '%s' "
const http = require('http');
const fs = require('fs');
const url = require('url');
import http from 'http';
import fs from 'fs';
import url from 'url';
const expectedState = '${expected_state}';
const html = '${success_html}';
const errorHtml = '${error_html}';