-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from oo-bldrs/refactor-server-endpoints
Refactor server endpoints
- Loading branch information
Showing
7 changed files
with
169 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| const healthcheckHandler = (req, res) => { | ||
| res.status(200).send() | ||
| } | ||
|
|
||
| export default healthcheckHandler |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import healthcheckHandler from './healthcheck.js'; | ||
| import { getMockRes } from '@jest-mock/express'; | ||
|
|
||
| describe('/healthcheck', () => { | ||
| it('should always return a 200 ok', () => { | ||
| const req = {} | ||
| const { res } = getMockRes() | ||
|
|
||
| healthcheckHandler(req, res) | ||
|
|
||
| expect(res.status).toHaveBeenLastCalledWith(200) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import { captureScreenshot, fitModelToFrame, initThree, parseCamera, render } from '../lib.js'; | ||
| import { parseUrl } from '../urls.js'; | ||
| import { load } from '../Loader.js'; | ||
|
|
||
| const renderHandler = async (req, res) => { | ||
| const [glCtx, renderer, scene, camera] = initThree() | ||
| const modelUrl = new URL(req.body.url) | ||
| const parsedUrl = parseUrl(modelUrl) | ||
| renderLogger.log('debug', 'server#post, parsedUrl:', parsedUrl) | ||
| if (parsedUrl.target === undefined) { | ||
| renderLogger.warn(msg) | ||
| res.status(404).send(`Cannot parse URL: ${modelUrl}`).end() | ||
| return | ||
| } | ||
| const [px, py, pz, tx, ty, tz] = parsedUrl.params.c ? parseCamera(parsedUrl.params.c) : [0,0,0,0,0,0] | ||
| const targetUrl = parsedUrl.target.url | ||
| let model | ||
| try { | ||
| model = await load(targetUrl) | ||
| } catch (e) { | ||
| const msg = `Internal server error ${e}` | ||
| renderLogger.error(msg) | ||
| res.status(500).send(msg) | ||
| return | ||
| } | ||
| if (model === undefined) { | ||
| const msg = `Could not load model for unknown reason` | ||
| renderLogger.error(msg) | ||
| res.status(500).send(msg) | ||
| return | ||
| } | ||
|
|
||
| // renderLogger.log('server#post, model:', model) | ||
| scene.add(model) | ||
|
|
||
| if (parsedUrl.params.c) { | ||
| const [px, py, pz, tx, ty, tz] = parseCamera(parsedUrl.params.c) || [0,0,0,0,0,0] | ||
| renderLogger.log('debug', `headless#camera setting: camera.pos(${px}, ${py}, ${pz}) target.pos(${tx}, ${ty}, ${tz})`) | ||
| if (isFinite(px) && isFinite(py) && isFinite(pz)) { | ||
| camera.position.set(px, py, pz) | ||
| } | ||
| if (isFinite(tx) && isFinite(ty) && isFinite(tz)) { | ||
| renderLogger.log('debug', `server#post, camera.pos(${px}, ${py}, ${pz}) target.pos(${tx}, ${ty}, ${tz})`) | ||
| camera.lookAt(tx, ty, tz) | ||
| } else { | ||
| renderLogger.log('debug', `server#post, camera.pos(${px}, ${py}, ${pz}) target.pos(0, 0, 0)`) | ||
| camera.lookAt(0, 0, 0) | ||
| } | ||
| } else { | ||
| fitModelToFrame(renderer.domElement, scene, model, camera) | ||
| } | ||
|
|
||
| const useSsaa = false | ||
| render(renderer, scene, camera, useSsaa) | ||
| res.setHeader('content-type', 'image/png') | ||
| captureScreenshot(glCtx).pipe(res) | ||
| } | ||
|
|
||
| export default renderHandler |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters