mirror of
https://github.com/LukeHagar/vercel.git
synced 2025-12-26 11:49:15 +00:00
Compare commits
10 Commits
@now/lambd
...
@now/cgi@0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e83d4d4249 | ||
|
|
d2ca763079 | ||
|
|
2a95388f89 | ||
|
|
be9fedfdc4 | ||
|
|
f0dee65f69 | ||
|
|
5514753c07 | ||
|
|
7028556919 | ||
|
|
a1f24853fc | ||
|
|
9804e82f8f | ||
|
|
e96596634b |
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"name": "now-builders",
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
||||
2
packages/now-bash/.gitignore
vendored
Normal file
2
packages/now-bash/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
node_modules
|
||||
handler
|
||||
14
packages/now-bash/bootstrap
Executable file
14
packages/now-bash/bootstrap
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
cd "$LAMBDA_TASK_ROOT"
|
||||
|
||||
# Configure `import`
|
||||
export IMPORT_CACHE="$LAMBDA_TASK_ROOT/.import-cache"
|
||||
export PATH="$IMPORT_CACHE/bin:$PATH"
|
||||
|
||||
# Load `import` and runtime
|
||||
. "$(which import)"
|
||||
. "$IMPORT_CACHE/runtime.sh"
|
||||
|
||||
# Load user code and process events in a loop forever
|
||||
_lambda_runtime_init
|
||||
49
packages/now-bash/builder.sh
Executable file
49
packages/now-bash/builder.sh
Executable file
@@ -0,0 +1,49 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
# `import` debug logs are always enabled during build
|
||||
export IMPORT_DEBUG=1
|
||||
|
||||
# Install `import`
|
||||
IMPORT_BIN="$IMPORT_CACHE/bin/import"
|
||||
mkdir -p "$(dirname "$IMPORT_BIN")"
|
||||
curl -sfLS https://import.pw > "$IMPORT_BIN"
|
||||
chmod +x "$IMPORT_BIN"
|
||||
|
||||
# For now only the entrypoint file is copied into the lambda
|
||||
mkdir -p "$(dirname "$ENTRYPOINT")"
|
||||
cp "$SRC/$ENTRYPOINT" "$ENTRYPOINT"
|
||||
|
||||
# Copy in the runtime
|
||||
cp "$BUILDER/runtime.sh" "$IMPORT_CACHE"
|
||||
cp "$BUILDER/bootstrap" .
|
||||
|
||||
# Load `import`
|
||||
. "$(which import)"
|
||||
|
||||
# Cache runtime and user dependencies
|
||||
echo "Caching imports in \"$ENTRYPOINT\"…"
|
||||
. "$IMPORT_CACHE/runtime.sh"
|
||||
. "$ENTRYPOINT"
|
||||
echo "Done caching imports"
|
||||
|
||||
# Run user build script
|
||||
if declare -f build > /dev/null; then
|
||||
echo "Running \`build\` function in \"$ENTRYPOINT\"…"
|
||||
build "$@"
|
||||
fi
|
||||
|
||||
# Ensure the entrypoint defined a `serve` function
|
||||
if ! declare -f serve > /dev/null; then
|
||||
echo "ERROR: A \`serve\` function must be defined in \"$ENTRYPOINT\"!" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Show a tree of the final lambda build
|
||||
show_tree() {
|
||||
import "static-binaries@0.0.6"
|
||||
static_binaries tree
|
||||
echo "Final lambda file tree:"
|
||||
tree -a .
|
||||
}
|
||||
IMPORT_DEBUG= IMPORT_CACHE="$(mktemp -d)" show_tree
|
||||
55
packages/now-bash/index.js
Normal file
55
packages/now-bash/index.js
Normal file
@@ -0,0 +1,55 @@
|
||||
const execa = require('execa');
|
||||
const { join } = require('path');
|
||||
const snakeCase = require('snake-case');
|
||||
const glob = require('@now/build-utils/fs/glob');
|
||||
const download = require('@now/build-utils/fs/download');
|
||||
const { createLambda } = require('@now/build-utils/lambda');
|
||||
const getWritableDirectory = require('@now/build-utils/fs/get-writable-directory');
|
||||
|
||||
exports.config = {
|
||||
maxLambdaSize: '10mb',
|
||||
};
|
||||
|
||||
exports.analyze = ({ files, entrypoint }) => files[entrypoint].digest;
|
||||
|
||||
exports.build = async ({ files, entrypoint, config }) => {
|
||||
const srcDir = await getWritableDirectory();
|
||||
const workDir = await getWritableDirectory();
|
||||
|
||||
console.log('downloading files...');
|
||||
await download(files, srcDir);
|
||||
|
||||
const configEnv = Object.keys(config).reduce((o, v) => {
|
||||
o[`IMPORT_${snakeCase(v).toUpperCase()}`] = config[v]; // eslint-disable-line no-param-reassign
|
||||
return o;
|
||||
}, {});
|
||||
|
||||
const IMPORT_CACHE = `${workDir}/.import-cache`;
|
||||
const env = Object.assign({}, process.env, configEnv, {
|
||||
PATH: `${IMPORT_CACHE}/bin:${process.env.PATH}`,
|
||||
IMPORT_CACHE,
|
||||
SRC: srcDir,
|
||||
BUILDER: __dirname,
|
||||
ENTRYPOINT: entrypoint,
|
||||
});
|
||||
|
||||
const builderPath = join(__dirname, 'builder.sh');
|
||||
|
||||
await execa(builderPath, [entrypoint], {
|
||||
env,
|
||||
cwd: workDir,
|
||||
});
|
||||
|
||||
const lambda = await createLambda({
|
||||
files: await glob('**', workDir),
|
||||
handler: entrypoint, // not actually used in `bootstrap`
|
||||
runtime: 'provided',
|
||||
environment: Object.assign({}, configEnv, {
|
||||
SCRIPT_FILENAME: entrypoint,
|
||||
}),
|
||||
});
|
||||
|
||||
return {
|
||||
[entrypoint]: lambda,
|
||||
};
|
||||
};
|
||||
22
packages/now-bash/package.json
Normal file
22
packages/now-bash/package.json
Normal file
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"name": "@now/bash",
|
||||
"version": "0.0.3",
|
||||
"description": "Now 2.0 builder for HTTP endpoints written in Bash",
|
||||
"main": "index.js",
|
||||
"author": "Nathan Rajlich <nate@zeit.co>",
|
||||
"license": "MIT",
|
||||
"files": [
|
||||
"builder.sh",
|
||||
"runtime.sh",
|
||||
"bootstrap",
|
||||
"index.js",
|
||||
"package.json"
|
||||
],
|
||||
"dependencies": {
|
||||
"execa": "^1.0.0",
|
||||
"snake-case": "^2.1.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@now/build-utils": ">=0.0.1"
|
||||
}
|
||||
}
|
||||
115
packages/now-bash/runtime.sh
Normal file
115
packages/now-bash/runtime.sh
Normal file
@@ -0,0 +1,115 @@
|
||||
import "static-binaries@0.0.6"
|
||||
static_binaries jq
|
||||
|
||||
# These get reset upon each request
|
||||
_STATUS_CODE="$(mktemp)"
|
||||
_HEADERS="$(mktemp)"
|
||||
|
||||
_lambda_runtime_api() {
|
||||
local endpoint="$1"
|
||||
shift
|
||||
curl -sfLS "http://$AWS_LAMBDA_RUNTIME_API/2018-06-01/runtime/$endpoint" "$@"
|
||||
}
|
||||
|
||||
_lambda_runtime_init() {
|
||||
# Initialize user code
|
||||
. "$SCRIPT_FILENAME" || {
|
||||
local exit_code="$?"
|
||||
local error
|
||||
error='{"exitCode":'"$exit_code"'}'
|
||||
_lambda_runtime_api "init/error" -X POST -d "$error"
|
||||
exit "$EXIT_CODE"
|
||||
}
|
||||
|
||||
# Process events
|
||||
while true; do _lambda_runtime_next; done
|
||||
}
|
||||
|
||||
_lambda_runtime_next() {
|
||||
echo 200 > "$_STATUS_CODE"
|
||||
echo '{"content-type":"text/plain; charset=utf8"}' > "$_HEADERS"
|
||||
|
||||
local headers
|
||||
headers="$(mktemp)"
|
||||
|
||||
# Get an event
|
||||
local event
|
||||
event="$(mktemp)"
|
||||
_lambda_runtime_api invocation/next -D "$headers" | jq -r '.body' > "$event"
|
||||
|
||||
local request_id
|
||||
request_id="$(grep -Fi Lambda-Runtime-Aws-Request-Id "$headers" | tr -d '[:space:]' | cut -d: -f2)"
|
||||
echo "Request-Id: $request_id" >&2
|
||||
rm -f "$headers"
|
||||
|
||||
# Execute the handler function from the script
|
||||
local body
|
||||
body="$(mktemp)"
|
||||
|
||||
local exit_code=0
|
||||
REQUEST="$event"
|
||||
|
||||
# Stdin of the `serve` function is the HTTP request body.
|
||||
# Need to use a fifo here instead of bash <() because Lambda
|
||||
# errors with "/dev/fd/63 not found" for some reason :/
|
||||
local stdin
|
||||
stdin="$(mktemp --dry-run)"
|
||||
mkfifo "$stdin"
|
||||
_lambda_runtime_body "$event" > "$stdin" &
|
||||
|
||||
serve "$event" < "$stdin" > "$body" || exit_code="$?"
|
||||
rm -f "$event" "$stdin"
|
||||
|
||||
if [ "$exit_code" -eq 0 ]; then
|
||||
# Send the response
|
||||
local response
|
||||
response="$(jq -cnMr \
|
||||
--arg statusCode "$(cat "$_STATUS_CODE")" \
|
||||
--argjson headers "$(cat "$_HEADERS")" \
|
||||
--arg body "$(base64 --wrap=0 < "$body")" \
|
||||
'{statusCode:$statusCode|tonumber, headers:$headers, encoding:"base64", body:$body}')"
|
||||
rm -f "$body" "$_HEADERS"
|
||||
_lambda_runtime_api "invocation/$request_id/response" -X POST -d "$response"
|
||||
else
|
||||
local error
|
||||
error='{"exitCode":'"$exit_code"'}'
|
||||
_lambda_runtime_api "invocation/$request_id/error" -X POST -d "$error"
|
||||
fi
|
||||
}
|
||||
|
||||
_lambda_runtime_body() {
|
||||
if [ "$(jq -r '.body | type' < "$1")" = "string" ]; then
|
||||
if [ "$(jq -r '.encoding' < "$1")" = "base64" ]; then
|
||||
jq -r '.body' < "$1" | base64 -d
|
||||
else
|
||||
# assume plain-text body
|
||||
jq -r '.body' < "$1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Set the response status code.
|
||||
http_response_code() {
|
||||
echo "$1" > "$_STATUS_CODE"
|
||||
}
|
||||
|
||||
# Sets a response header.
|
||||
# Overrides existing header if it has already been set.
|
||||
http_response_header() {
|
||||
local name="$1"
|
||||
local value="$2"
|
||||
local tmp
|
||||
tmp="$(mktemp)"
|
||||
jq --arg name "$name" --arg value "$value" '.[$name] = $value' < "$_HEADERS" > "$tmp"
|
||||
mv -f "$tmp" "$_HEADERS"
|
||||
}
|
||||
|
||||
http_response_redirect() {
|
||||
http_response_code "${2:-302}"
|
||||
http_response_header "location" "$1"
|
||||
}
|
||||
|
||||
http_response_json() {
|
||||
http_response_header "content-type" "application/json; charset=utf8"
|
||||
}
|
||||
146
packages/now-bash/yarn.lock
Normal file
146
packages/now-bash/yarn.lock
Normal file
@@ -0,0 +1,146 @@
|
||||
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
cross-spawn@^6.0.0:
|
||||
version "6.0.5"
|
||||
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
|
||||
integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
|
||||
dependencies:
|
||||
nice-try "^1.0.4"
|
||||
path-key "^2.0.1"
|
||||
semver "^5.5.0"
|
||||
shebang-command "^1.2.0"
|
||||
which "^1.2.9"
|
||||
|
||||
end-of-stream@^1.1.0:
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
|
||||
integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
|
||||
dependencies:
|
||||
once "^1.4.0"
|
||||
|
||||
execa@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
|
||||
integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
|
||||
dependencies:
|
||||
cross-spawn "^6.0.0"
|
||||
get-stream "^4.0.0"
|
||||
is-stream "^1.1.0"
|
||||
npm-run-path "^2.0.0"
|
||||
p-finally "^1.0.0"
|
||||
signal-exit "^3.0.0"
|
||||
strip-eof "^1.0.0"
|
||||
|
||||
get-stream@^4.0.0:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
|
||||
integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
|
||||
dependencies:
|
||||
pump "^3.0.0"
|
||||
|
||||
is-stream@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
|
||||
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
|
||||
|
||||
isexe@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
|
||||
integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
|
||||
|
||||
lower-case@^1.1.1:
|
||||
version "1.1.4"
|
||||
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
|
||||
integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
|
||||
|
||||
nice-try@^1.0.4:
|
||||
version "1.0.5"
|
||||
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
|
||||
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
|
||||
|
||||
no-case@^2.2.0:
|
||||
version "2.3.2"
|
||||
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
|
||||
integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
|
||||
dependencies:
|
||||
lower-case "^1.1.1"
|
||||
|
||||
npm-run-path@^2.0.0:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
|
||||
integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
|
||||
dependencies:
|
||||
path-key "^2.0.0"
|
||||
|
||||
once@^1.3.1, once@^1.4.0:
|
||||
version "1.4.0"
|
||||
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
|
||||
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
|
||||
dependencies:
|
||||
wrappy "1"
|
||||
|
||||
p-finally@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
|
||||
integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
|
||||
|
||||
path-key@^2.0.0, path-key@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
|
||||
integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
|
||||
|
||||
pump@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
|
||||
integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
|
||||
dependencies:
|
||||
end-of-stream "^1.1.0"
|
||||
once "^1.3.1"
|
||||
|
||||
semver@^5.5.0:
|
||||
version "5.6.0"
|
||||
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
|
||||
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
|
||||
|
||||
shebang-command@^1.2.0:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
|
||||
integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
|
||||
dependencies:
|
||||
shebang-regex "^1.0.0"
|
||||
|
||||
shebang-regex@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
|
||||
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
|
||||
|
||||
signal-exit@^3.0.0:
|
||||
version "3.0.2"
|
||||
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
|
||||
integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
|
||||
|
||||
snake-case@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
|
||||
integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=
|
||||
dependencies:
|
||||
no-case "^2.2.0"
|
||||
|
||||
strip-eof@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
|
||||
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
|
||||
|
||||
which@^1.2.9:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
|
||||
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
|
||||
dependencies:
|
||||
isexe "^2.0.0"
|
||||
|
||||
wrappy@1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
|
||||
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/build-utils",
|
||||
"version": "0.4.31-canary.1",
|
||||
"version": "0.4.31",
|
||||
"dependencies": {
|
||||
"async-retry": "1.2.3",
|
||||
"async-sema": "2.1.4",
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const builderUrl = '@canary';
|
||||
let buildUtilsUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -25,7 +26,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ buildUtilsUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
@@ -48,7 +52,10 @@ for (const builder of buildersToTestWith) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${builder}/${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ buildUtilsUrl }, path.join(fixturesPath2, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath2, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,152 +1,36 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
"io/ioutil"
|
||||
now "../../utils/go/bridge"
|
||||
"net/http"
|
||||
"net/http/cgi"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"encoding/json"
|
||||
b64 "encoding/base64"
|
||||
"github.com/aws/aws-lambda-go/events"
|
||||
"github.com/aws/aws-lambda-go/lambda"
|
||||
)
|
||||
|
||||
type Request struct {
|
||||
Host string `json:"host"`
|
||||
Path string `json:"path"`
|
||||
Method string `json:"method"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitempty"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
type Response struct {
|
||||
StatusCode int `json:"statusCode"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitemtpy"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
type ResponseError struct {
|
||||
Code string `json:"code"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
type ResponseErrorWrapper struct {
|
||||
Error ResponseError `json:"error"`
|
||||
}
|
||||
|
||||
type CgiHandler struct {
|
||||
http.Handler
|
||||
Dir string
|
||||
Script string
|
||||
}
|
||||
|
||||
func createErrorResponse(message string, code string, statusCode int) (Response, error) {
|
||||
obj := ResponseErrorWrapper{
|
||||
Error: ResponseError{
|
||||
Code: code,
|
||||
Message: message,
|
||||
},
|
||||
}
|
||||
|
||||
body, _ := json.Marshal(obj)
|
||||
|
||||
return Response{
|
||||
StatusCode: statusCode,
|
||||
Headers: map[string]string{
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
Body: string(body),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (h *CgiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
cgih := cgi.Handler{
|
||||
handler := cgi.Handler{
|
||||
Path: h.Script,
|
||||
Root: "/" + h.Script,
|
||||
Dir: h.Dir,
|
||||
Env: []string{"SERVER_PORT=443", "HTTPS=on", "SERVER_SOFTWARE=@now/cgi"},
|
||||
Dir: h.Dir,
|
||||
Env: []string{
|
||||
"HTTPS=on",
|
||||
"SERVER_PORT=443",
|
||||
"SERVER_SOFTWARE=@now/cgi",
|
||||
},
|
||||
}
|
||||
cgih.ServeHTTP(w, r)
|
||||
handler.ServeHTTP(w, r)
|
||||
}
|
||||
|
||||
func main() {
|
||||
l, err := net.Listen("tcp", ":0")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
workdir, _ := filepath.Abs(".")
|
||||
script := os.Getenv("SCRIPT_FILENAME")
|
||||
h := &CgiHandler{nil, workdir, script}
|
||||
|
||||
http.Handle("/", h)
|
||||
go http.Serve(l, nil)
|
||||
|
||||
handler := func(_req events.APIGatewayProxyRequest) (Response, error) {
|
||||
var req Request
|
||||
|
||||
err := json.Unmarshal([]byte(_req.Body), &req)
|
||||
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return createErrorResponse("Invalid payload", "bad_request", 400)
|
||||
}
|
||||
|
||||
if req.Encoding == "base64" {
|
||||
decoded, _ := b64.StdEncoding.DecodeString(req.Body)
|
||||
req.Body = string(decoded)
|
||||
}
|
||||
|
||||
url := "http://" + l.Addr().String() + req.Path
|
||||
|
||||
internalReq, err := http.NewRequest(req.Method, url, strings.NewReader(req.Body))
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return createErrorResponse("Bad gateway internal req failed", "bad_gateway", 502)
|
||||
}
|
||||
|
||||
for k, v := range req.Headers {
|
||||
internalReq.Header.Add(k, v)
|
||||
if strings.ToLower(k) == "host" {
|
||||
internalReq.Host = v
|
||||
}
|
||||
}
|
||||
|
||||
client := &http.Client{}
|
||||
internalRes, err := client.Do(internalReq)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return createErrorResponse("Bad gateway internal req Do failed", "bad_gateway", 502)
|
||||
}
|
||||
defer internalRes.Body.Close()
|
||||
|
||||
resHeaders := make(map[string]string, len(internalRes.Header))
|
||||
for k, v := range internalRes.Header {
|
||||
// FIXME: support multiple values via concatenating with ','
|
||||
// see RFC 7230, section 3.2.2
|
||||
resHeaders[k] = v[0]
|
||||
}
|
||||
|
||||
bodyBytes, err := ioutil.ReadAll(internalRes.Body)
|
||||
if err != nil {
|
||||
return createErrorResponse("Bad gateway ReadAll bytes from response failed", "bad_gateway", 502)
|
||||
}
|
||||
|
||||
resBody := b64.StdEncoding.EncodeToString(bodyBytes)
|
||||
|
||||
return Response{
|
||||
StatusCode: internalRes.StatusCode,
|
||||
Headers: resHeaders,
|
||||
Encoding: "base64",
|
||||
Body: resBody,
|
||||
}, nil
|
||||
}
|
||||
|
||||
lambda.Start(handler)
|
||||
handler := &CgiHandler{nil, workdir, script}
|
||||
now.Start(handler)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/cgi",
|
||||
"version": "0.0.13",
|
||||
"version": "0.0.14",
|
||||
"scripts": {
|
||||
"test": "best -I test/*.js",
|
||||
"prepublish": "./build.sh"
|
||||
|
||||
1
packages/now-go/.gitignore
vendored
1
packages/now-go/.gitignore
vendored
@@ -1,3 +1,4 @@
|
||||
node_modules
|
||||
*.log
|
||||
launcher
|
||||
bin
|
||||
|
||||
@@ -9,7 +9,7 @@ const downloadGit = require('lambda-git');
|
||||
const glob = require('@now/build-utils/fs/glob.js');
|
||||
const downloadGoBin = require('./download-go-bin');
|
||||
|
||||
// creates a `$GOPATH` direcotry tree, as per
|
||||
// creates a `$GOPATH` directory tree, as per
|
||||
// `go help gopath`'s instructions.
|
||||
// without this, Go won't recognize the `$GOPATH`
|
||||
async function createGoPathTree(goPath) {
|
||||
|
||||
@@ -1,133 +1,10 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
b64 "encoding/base64"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/aws/aws-lambda-go/events"
|
||||
"github.com/aws/aws-lambda-go/lambda"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
now "../../utils/go/bridge"
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Request struct {
|
||||
Host string `json:"host"`
|
||||
Path string `json:"path"`
|
||||
Method string `json`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json"encoding,omitempty"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
type Response struct {
|
||||
StatusCode int `json:"statusCode"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitemtpy"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
type ResponseError struct {
|
||||
Code string `json:"code"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
type ResponseErrorWrapper struct {
|
||||
Error ResponseError `json:"error"`
|
||||
}
|
||||
|
||||
func createErrorResponse(message string, code string, statusCode int) (Response, error) {
|
||||
obj := ResponseErrorWrapper{
|
||||
Error: ResponseError{
|
||||
Code: code,
|
||||
Message: message,
|
||||
},
|
||||
}
|
||||
|
||||
body, _ := json.Marshal(obj)
|
||||
|
||||
return Response{
|
||||
StatusCode: statusCode,
|
||||
Headers: map[string]string{
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
Body: string(body),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
l, err := net.Listen("tcp", ":0")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
http.HandleFunc("/", __NOW_HANDLER_FUNC_NAME)
|
||||
go http.Serve(l, nil)
|
||||
|
||||
handler := func(_req events.APIGatewayProxyRequest) (Response, error) {
|
||||
var req Request
|
||||
|
||||
err := json.Unmarshal([]byte(_req.Body), &req)
|
||||
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return createErrorResponse("Invalid payload", "bad_request", 400)
|
||||
}
|
||||
|
||||
if req.Encoding == "base64" {
|
||||
decoded, _ := b64.StdEncoding.DecodeString(req.Body)
|
||||
req.Body = string(decoded)
|
||||
}
|
||||
|
||||
url := "http://" + l.Addr().String() + req.Path
|
||||
|
||||
internalReq, err := http.NewRequest(req.Method, url, strings.NewReader(req.Body))
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return createErrorResponse("Bad gateway", "bad_gateway", 502)
|
||||
}
|
||||
|
||||
for k, v := range req.Headers {
|
||||
internalReq.Header.Add(k, v)
|
||||
if strings.ToLower(k) == "host" {
|
||||
// we need to set `Host` in the request
|
||||
// because Go likes to ignore the `Host` header
|
||||
// see https://github.com/golang/go/issues/7682
|
||||
internalReq.Host = v
|
||||
}
|
||||
}
|
||||
|
||||
client := &http.Client{}
|
||||
internalRes, err := client.Do(internalReq)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return createErrorResponse("Bad gateway", "bad_gateway", 502)
|
||||
}
|
||||
defer internalRes.Body.Close()
|
||||
|
||||
resHeaders := make(map[string]string, len(internalRes.Header))
|
||||
var resEncoding string
|
||||
for k, v := range internalRes.Header {
|
||||
// FIXME: support multiple values via concatenating with ','
|
||||
// see RFC 7230, section 3.2.2
|
||||
resHeaders[k] = v[0]
|
||||
}
|
||||
|
||||
bodyBytes, err := ioutil.ReadAll(internalRes.Body)
|
||||
if err != nil {
|
||||
return createErrorResponse("Bad gateway", "bad_gateway", 502)
|
||||
}
|
||||
|
||||
resBody = b64.StdEncoding.EncodeToString(bodyBytes)
|
||||
|
||||
return Response{
|
||||
StatusCode: internalRes.StatusCode,
|
||||
Headers: resHeaders,
|
||||
Encoding: "base64",
|
||||
Body: resBody,
|
||||
}, nil
|
||||
}
|
||||
|
||||
lambda.Start(handler)
|
||||
now.Start(http.HandlerFunc(__NOW_HANDLER_FUNC_NAME))
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/go",
|
||||
"version": "0.2.11-canary.0",
|
||||
"version": "0.2.11",
|
||||
"scripts": {
|
||||
"test": "best -I test/*.js",
|
||||
"prepublish": "./build.sh"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/lambda",
|
||||
"version": "0.4.8-canary.0",
|
||||
"version": "0.4.8",
|
||||
"peerDependencies": {
|
||||
"@now/build-utils": ">=0.0.1"
|
||||
},
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/md",
|
||||
"version": "0.4.8-canary.1",
|
||||
"version": "0.4.8",
|
||||
"dependencies": {
|
||||
"rehype-document": "^2.2.0",
|
||||
"rehype-format": "^2.3.0",
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/mdx-deck",
|
||||
"version": "0.4.17-canary.2",
|
||||
"version": "0.4.17",
|
||||
"peerDependencies": {
|
||||
"@now/build-utils": ">=0.0.1"
|
||||
},
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/next",
|
||||
"version": "0.0.81-canary.1",
|
||||
"version": "0.0.81",
|
||||
"dependencies": {
|
||||
"@now/node-bridge": "0.1.4",
|
||||
"execa": "^1.0.0",
|
||||
|
||||
@@ -47,7 +47,7 @@ async function downloadInstallAndBundle(
|
||||
'package.json': new FileBlob({
|
||||
data: JSON.stringify({
|
||||
dependencies: {
|
||||
'@zeit/ncc': '0.3.0',
|
||||
'@zeit/ncc': '0.4.1',
|
||||
},
|
||||
}),
|
||||
}),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/node-server",
|
||||
"version": "0.4.25-canary.2",
|
||||
"version": "0.4.25",
|
||||
"dependencies": {
|
||||
"@now/node-bridge": "^0.1.9",
|
||||
"fs-extra": "7.0.1"
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ async function downloadInstallAndBundle(
|
||||
'package.json': new FileBlob({
|
||||
data: JSON.stringify({
|
||||
dependencies: {
|
||||
'@zeit/ncc': '0.3.0',
|
||||
'@zeit/ncc': '0.4.1',
|
||||
},
|
||||
}),
|
||||
}),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/node",
|
||||
"version": "0.4.27-canary.2",
|
||||
"version": "0.4.27",
|
||||
"dependencies": {
|
||||
"@now/node-bridge": "^0.1.9",
|
||||
"fs-extra": "7.0.1"
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
BIN
packages/now-php/dist/launcher
vendored
BIN
packages/now-php/dist/launcher
vendored
Binary file not shown.
@@ -12,6 +12,7 @@ RUN go get -v github.com/aws/aws-lambda-go/events
|
||||
RUN go get -v github.com/deuill/go-php
|
||||
|
||||
WORKDIR /root/go/app
|
||||
COPY ./utils/bridge.go /root/go/app/utils/bridge.go
|
||||
COPY ./launcher.go /root/go/app/launcher.go
|
||||
COPY ./php.ini /root/go/app/php.ini
|
||||
COPY ./test.go /root/go/app/test.go
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
rm -rf ../dist
|
||||
mkdir -p ../dist/modules
|
||||
mkdir ./utils
|
||||
cp ../../../utils/go/bridge/bridge.go ./utils/bridge.go
|
||||
docker rmi go-php-builder --force
|
||||
docker build . -t go-php-builder
|
||||
docker run go-php-builder
|
||||
@@ -10,3 +12,4 @@ docker run go-php-builder /bin/cat /usr/lib64/php/modules/curl.so > ../dist/modu
|
||||
docker run go-php-builder /bin/cat /usr/lib64/php/modules/json.so > ../dist/modules/json.so
|
||||
docker run go-php-builder /bin/cat /usr/lib64/php/modules/mbstring.so > ../dist/modules/mbstring.so
|
||||
chmod +x ../dist/launcher
|
||||
rm -rf ./utils
|
||||
|
||||
@@ -1,63 +1,26 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
now "./utils"
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
php "github.com/deuill/go-php"
|
||||
"net/http"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/aws/aws-lambda-go/events"
|
||||
"github.com/aws/aws-lambda-go/lambda"
|
||||
php "github.com/deuill/go-php"
|
||||
)
|
||||
|
||||
type Request struct {
|
||||
Host string `json:"host"`
|
||||
Path string `json:"path"`
|
||||
Method string `json:"method"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitempty"`
|
||||
Body string `json:"body"`
|
||||
type PhpHandler struct {
|
||||
http.Handler
|
||||
ScriptFull string
|
||||
}
|
||||
|
||||
type Response struct {
|
||||
StatusCode int `json:"statusCode"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitemtpy"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
var phpScript = ""
|
||||
var phpScriptFull = ""
|
||||
|
||||
func handler(ctx context.Context, event events.APIGatewayProxyRequest) (Response, error) {
|
||||
func (h *PhpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
engine, _ := php.New()
|
||||
context, _ := engine.NewContext()
|
||||
|
||||
var req Request
|
||||
json.Unmarshal([]byte(event.Body), &req)
|
||||
|
||||
var body string
|
||||
if req.Encoding == "base64" {
|
||||
decoded, _ := base64.StdEncoding.DecodeString(req.Body)
|
||||
body = string(decoded)
|
||||
} else {
|
||||
body = string(req.Body)
|
||||
}
|
||||
|
||||
var bodyReader = strings.NewReader(body)
|
||||
var httpReq, _ = http.NewRequest(req.Method, req.Path, bodyReader)
|
||||
|
||||
for k, v := range req.Headers {
|
||||
httpReq.Header.Add(k, v)
|
||||
}
|
||||
|
||||
var query = httpReq.URL.Query()
|
||||
var query = r.URL.Query()
|
||||
getMap := make(map[string]string)
|
||||
for k, v := range query {
|
||||
for _, s := range v {
|
||||
@@ -66,9 +29,9 @@ func handler(ctx context.Context, event events.APIGatewayProxyRequest) (Response
|
||||
}
|
||||
context.Bind("_GET", getMap)
|
||||
|
||||
httpReq.ParseForm()
|
||||
r.ParseForm()
|
||||
postMap := make(map[string]string)
|
||||
for k, v := range httpReq.PostForm {
|
||||
for k, v := range r.PostForm {
|
||||
for _, s := range v {
|
||||
postMap[k] = s
|
||||
}
|
||||
@@ -82,40 +45,36 @@ func handler(ctx context.Context, event events.APIGatewayProxyRequest) (Response
|
||||
}
|
||||
context.Bind("_ENV", envMap)
|
||||
|
||||
context.Eval("$_SERVER[\"SERVER_NAME\"]=\"" + req.Host + "\";")
|
||||
context.Eval("$_SERVER[\"SERVER_NAME\"]=\"" + r.Host + "\";")
|
||||
context.Eval("$_SERVER[\"SERVER_PORT\"]=\"443\";")
|
||||
context.Eval("$_SERVER[\"HTTPS\"]=\"on\";")
|
||||
context.Eval("http_response_code(200);")
|
||||
|
||||
var stdout bytes.Buffer
|
||||
context.Output = &stdout
|
||||
context.Exec(phpScriptFull)
|
||||
context.Exec(h.ScriptFull)
|
||||
|
||||
statusCodeVal, _ := context.Eval("return http_response_code();")
|
||||
statusCode := int(statusCodeVal.Int())
|
||||
w.WriteHeader(int(statusCodeVal.Int()))
|
||||
|
||||
headers := make(map[string]string)
|
||||
headers["content-type"] = "text/html"
|
||||
headers := w.Header()
|
||||
headers.Add("content-type", "text/html")
|
||||
for k, v := range context.Header {
|
||||
for _, s := range v {
|
||||
headers[k] = s
|
||||
headers.Add(k, s)
|
||||
}
|
||||
}
|
||||
|
||||
resBody := base64.StdEncoding.EncodeToString(stdout.Bytes())
|
||||
w.Write(stdout.Bytes())
|
||||
|
||||
engine.Destroy()
|
||||
return Response{
|
||||
StatusCode: statusCode,
|
||||
Headers: headers,
|
||||
Encoding: "base64",
|
||||
Body: resBody,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func main() {
|
||||
ex, _ := os.Executable()
|
||||
phpScript = os.Getenv("NOW_PHP_SCRIPT")
|
||||
phpScriptFull = path.Join(filepath.Dir(ex), phpScript)
|
||||
lambda.Start(handler)
|
||||
handler := &PhpHandler{
|
||||
nil,
|
||||
path.Join(filepath.Dir(ex), os.Getenv("NOW_PHP_SCRIPT")),
|
||||
}
|
||||
now.Start(handler)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/php",
|
||||
"version": "0.4.12-canary.2",
|
||||
"version": "0.4.12",
|
||||
"peerDependencies": {
|
||||
"@now/build-utils": ">=0.0.1"
|
||||
},
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@now/static-build",
|
||||
"version": "0.4.16-canary.1",
|
||||
"version": "0.4.16",
|
||||
"peerDependencies": {
|
||||
"@now/build-utils": ">=0.0.1"
|
||||
},
|
||||
|
||||
@@ -8,6 +8,7 @@ const {
|
||||
} = require('../../../test/lib/deployment/test-deployment.js');
|
||||
|
||||
jest.setTimeout(2 * 60 * 1000);
|
||||
const buildUtilsUrl = '@canary';
|
||||
let builderUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
@@ -23,7 +24,10 @@ for (const fixture of fs.readdirSync(fixturesPath)) {
|
||||
// eslint-disable-next-line no-loop-func
|
||||
it(`should build ${fixture}`, async () => {
|
||||
await expect(
|
||||
testDeployment({ builderUrl }, path.join(fixturesPath, fixture)),
|
||||
testDeployment(
|
||||
{ builderUrl, buildUtilsUrl },
|
||||
path.join(fixturesPath, fixture),
|
||||
),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -47,16 +47,21 @@ async function testDeployment ({ builderUrl, buildUtilsUrl }, fixturePath) {
|
||||
const nowJson = JSON.parse(bodies['now.json']);
|
||||
for (const build of nowJson.builds) {
|
||||
if (builderUrl) {
|
||||
build.use = `https://${builderUrl}`;
|
||||
if (!buildUtilsUrl) {
|
||||
build.config = build.config || {};
|
||||
build.config.useBuildUtils = '@now/build-utils@canary';
|
||||
if (builderUrl === '@canary') {
|
||||
build.use = `${build.use}@canary`;
|
||||
} else {
|
||||
build.use = `https://${builderUrl}`;
|
||||
}
|
||||
}
|
||||
if (buildUtilsUrl) {
|
||||
if (!builderUrl) build.use = `${build.use}@canary`;
|
||||
build.config = build.config || {};
|
||||
build.config.useBuildUtils = `https://${buildUtilsUrl}`;
|
||||
const { config } = build;
|
||||
if (buildUtilsUrl === '@canary') {
|
||||
config.useBuildUtils = config.useBuildUtils || '@now/build-utils';
|
||||
config.useBuildUtils = `${config.useBuildUtils}@canary`;
|
||||
} else {
|
||||
config.useBuildUtils = `https://${buildUtilsUrl}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
130
utils/go/bridge/bridge.go
Normal file
130
utils/go/bridge/bridge.go
Normal file
@@ -0,0 +1,130 @@
|
||||
package bridge
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"github.com/aws/aws-lambda-go/events"
|
||||
"github.com/aws/aws-lambda-go/lambda"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Request struct {
|
||||
Host string `json:"host"`
|
||||
Path string `json:"path"`
|
||||
Method string `json:"method"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitempty"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
type Response struct {
|
||||
StatusCode int `json:"statusCode"`
|
||||
Headers map[string]string `json:"headers"`
|
||||
Encoding string `json:"encoding,omitemtpy"`
|
||||
Body string `json:"body"`
|
||||
}
|
||||
|
||||
type ResponseWriter struct {
|
||||
http.ResponseWriter
|
||||
statusCode int
|
||||
headers http.Header
|
||||
body *bytes.Buffer
|
||||
}
|
||||
|
||||
func (w *ResponseWriter) Header() http.Header {
|
||||
return w.headers
|
||||
}
|
||||
|
||||
func (w *ResponseWriter) Write(p []byte) (n int, err error) {
|
||||
n, err = w.body.Write(p)
|
||||
return
|
||||
}
|
||||
|
||||
func (w *ResponseWriter) WriteHeader(statusCode int) {
|
||||
w.statusCode = statusCode
|
||||
}
|
||||
|
||||
var userHandler http.Handler
|
||||
|
||||
func Serve(handler http.Handler, req *Request) (res Response, err error) {
|
||||
var body []byte
|
||||
if req.Encoding == "base64" {
|
||||
body, err = base64.StdEncoding.DecodeString(req.Body)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
body = []byte(req.Body)
|
||||
}
|
||||
|
||||
r, err := http.NewRequest(req.Method, req.Path, bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
for k, v := range req.Headers {
|
||||
r.Header.Add(k, v)
|
||||
switch strings.ToLower(k) {
|
||||
case "host":
|
||||
r.Host = v
|
||||
case "content-length":
|
||||
contentLength, _ := strconv.ParseInt(v, 10, 64)
|
||||
r.ContentLength = contentLength
|
||||
case "x-forwarded-for":
|
||||
case "x-real-ip":
|
||||
r.RemoteAddr = v
|
||||
}
|
||||
if strings.ToLower(k) == "host" {
|
||||
// we need to set `Host` in the request
|
||||
// because Go likes to ignore the `Host` header
|
||||
// see https://github.com/golang/go/issues/7682
|
||||
r.Host = v
|
||||
}
|
||||
}
|
||||
|
||||
var bodyBuf bytes.Buffer
|
||||
w := &ResponseWriter{
|
||||
nil,
|
||||
http.StatusOK,
|
||||
make(http.Header),
|
||||
&bodyBuf,
|
||||
}
|
||||
|
||||
handler.ServeHTTP(w, r)
|
||||
defer r.Body.Close()
|
||||
|
||||
headers := make(map[string]string)
|
||||
for k, v := range w.headers {
|
||||
for _, s := range v {
|
||||
headers[k] = s
|
||||
}
|
||||
}
|
||||
|
||||
res = Response{
|
||||
StatusCode: w.statusCode,
|
||||
Headers: headers,
|
||||
Encoding: "base64",
|
||||
Body: base64.StdEncoding.EncodeToString(bodyBuf.Bytes()),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Maps the `APIGatewayProxyRequest` to a `Request` instance and invokes `Serve()`
|
||||
func handler(event events.APIGatewayProxyRequest) (res Response, err error) {
|
||||
var req Request
|
||||
err = json.Unmarshal([]byte(event.Body), &req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
res, err = Serve(userHandler, &req)
|
||||
return
|
||||
}
|
||||
|
||||
// Starts the Lambda
|
||||
func Start(h http.Handler) {
|
||||
userHandler = h
|
||||
lambda.Start(handler)
|
||||
}
|
||||
43
utils/go/bridge/bridge_test.go
Normal file
43
utils/go/bridge/bridge_test.go
Normal file
@@ -0,0 +1,43 @@
|
||||
package bridge
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type HttpHandler struct {
|
||||
http.Handler
|
||||
t *testing.T
|
||||
}
|
||||
|
||||
func (h *HttpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Add("X-Foo", "bar")
|
||||
w.WriteHeader(404)
|
||||
w.Write([]byte("test"))
|
||||
}
|
||||
|
||||
func TestServe(t *testing.T) {
|
||||
h := &HttpHandler{nil, t}
|
||||
req := &Request{
|
||||
"test.com",
|
||||
"/path?foo=bar",
|
||||
"POST",
|
||||
map[string]string{"Content-Length": "1", "X-Foo": "bar"},
|
||||
"",
|
||||
"a",
|
||||
}
|
||||
res, err := Serve(h, req)
|
||||
if err != nil {
|
||||
t.Fail()
|
||||
}
|
||||
if res.StatusCode != 404 {
|
||||
t.Fail()
|
||||
}
|
||||
fmt.Printf("status code: %d\n", res.StatusCode)
|
||||
fmt.Printf("header: %v\n", res.Headers)
|
||||
fmt.Printf("base64 body: %s\n", res.Body)
|
||||
body, err := base64.StdEncoding.DecodeString(res.Body)
|
||||
fmt.Printf("body: %s\n", body)
|
||||
}
|
||||
@@ -7246,6 +7246,13 @@ smart-buffer@^4.0.1:
|
||||
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
|
||||
integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
|
||||
|
||||
snake-case@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
|
||||
integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=
|
||||
dependencies:
|
||||
no-case "^2.2.0"
|
||||
|
||||
snapdragon-node@^2.0.1:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
|
||||
|
||||
Reference in New Issue
Block a user