Skip to content

handle action/sequence that does not export main #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
purplecabbage merged 2 commits into from
Apr 9, 2024
Merged

handle action/sequence that does not export main #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6593efd
handle action that does not export main, formatting, cleanup console …
purplecabbage Apr 4, 2024
1d4c28f
Merge branch 'main' into ACNA-2921
purplecabbage Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions src/lib/bundle-serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const crypto = require('node:crypto')

let actionConfig = null

module.exports = async (bundler, options, log = () => {}, _actionConfig) => {
module.exports = async (bundler, options, log = () => { }, _actionConfig) => {
actionConfig = _actionConfig

process.env.__OW_API_KEY = process.env.AIO_runtime_auth
Expand All @@ -21,8 +21,8 @@ module.exports = async (bundler, options, log = () => {}, _actionConfig) => {
}

try {
const { bundleGraph, buildTime } = await bundler.run()
const bundles = bundleGraph.getBundles()
let { bundleGraph, buildTime } = await bundler.run()
let bundles = bundleGraph.getBundles()
console.log(`✨ Built ${bundles.length} bundles in ${buildTime}ms!`)
} catch (err) {
console.log(err.diagnostics)
Expand Down Expand Up @@ -56,23 +56,13 @@ module.exports = async (bundler, options, log = () => {}, _actionConfig) => {
const serveAction = async (req, res, next) => {
const url = req.params[0]
const [packageName, actionName, ...path] = url.split('/')

// console.log('packageName is ', packageName)
// console.log('actionName is ', actionName)
// console.log('path is ', path)
// console.log('actionConfig[packageName] is', actionConfig[packageName])

const action = actionConfig[packageName]?.actions[actionName]
// console.log('action is conductor? ', action?.annotations)

if (!action) {
// action could be a sequence ... todo: refactor these 2 paths to 1 action runner
const sequence = actionConfig[packageName]?.sequences[actionName]
if (sequence) {
console.log('sequence be ', sequence)
const actions = sequence.actions?.split(',')
console.log('actions are', actions)

const params = {
__ow_body: req.body,
__ow_headers: req.headers,
Expand All @@ -95,13 +85,18 @@ const serveAction = async (req, res, next) => {
process.env.__OW_ACTIVATION_ID = crypto.randomBytes(16).toString('hex')
delete require.cache[action.function]
const actionFunction = require(action.function).main
response = await actionFunction(response ?? params)
if (response.statusCode === 404) {
throw response
if (actionFunction) {
response = await actionFunction(response ?? params)
if (response.statusCode === 404) {
throw response
}
} else {
return res
.status(500)
.send({ error: `${actionName} action not found, or does not export main` })
}
}
}
console.log('response is', response)
const headers = response.headers || {}
const status = response.statusCode || 200
return res
Expand All @@ -114,12 +109,10 @@ const serveAction = async (req, res, next) => {
.send({ error: 'not found (yet)' })
}
} else {
// check if action is protected
// check if action is protected
if (action?.annotations?.['require-adobe-auth']) {
console.log('require-adobe-auth is true')
// check if user is authenticated
if (!req.headers.authorization) {
console.log('no authorization header')
return res
.status(401)
.send({ error: 'unauthorized' })
Expand Down Expand Up @@ -149,7 +142,6 @@ const serveAction = async (req, res, next) => {
if (actionFunction) {
try {
const response = await actionFunction(params)
console.log('response is', response)
const headers = response.headers || {}
const status = response.statusCode || 200

Expand All @@ -163,8 +155,9 @@ const serveAction = async (req, res, next) => {
.send({ error: e.message })
}
} else {
console.log('no action function, or does not export main: ', action.function)
return res
.status(500)
.send({ error: `${actionName} action not found, or does not export main` })
}
res.send(action)
}
}