Skip to content

fix(http-server-js): send bytes body directly without JSON serialization #10610

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

Open
snipd-mikel wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −16
Open

fix(http-server-js): send bytes body directly without JSON serialization #10610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 22 additions & 16 deletions packages/http-server-js/src/http/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,24 +641,30 @@ function* emitResultProcessingForType(

if (body) {
const bodyCase = parseCase(body.name);
const serializationRequired = isSerializationRequired(
ctx,
module,
body.type,
"application/json",
);
requireSerialization(ctx, body.type, "application/json");

yield `${names.ctx}.response.setHeader("content-type", "application/json");`;

if (serializationRequired) {
const typeReference = emitTypeReference(ctx, body.type, body, module, {
altName: namer.getAltName("Body"),
requireDeclaration: true,
});
yield `${names.ctx}.response.end(globalThis.JSON.stringify(${typeReference}.toJsonObject(${names.result}.${bodyCase.camelCase})))`;
if (ctx.program.checker.isStdType(body.type, "bytes")) {
// Binary response: content-type already set by @header above, send bytes directly.
yield `${names.ctx}.response.end(${names.result}.${bodyCase.camelCase});`;
} else {
yield `${names.ctx}.response.end(globalThis.JSON.stringify(${names.result}.${bodyCase.camelCase}));`;
const serializationRequired = isSerializationRequired(
ctx,
module,
body.type,
"application/json",
);
requireSerialization(ctx, body.type, "application/json");

yield `${names.ctx}.response.setHeader("content-type", "application/json");`;

if (serializationRequired) {
const typeReference = emitTypeReference(ctx, body.type, body, module, {
altName: namer.getAltName("Body"),
requireDeclaration: true,
});
yield `${names.ctx}.response.end(globalThis.JSON.stringify(${typeReference}.toJsonObject(${names.result}.${bodyCase.camelCase})))`;
} else {
yield `${names.ctx}.response.end(globalThis.JSON.stringify(${names.result}.${bodyCase.camelCase}));`;
}
}
} else if (isArrayModelType(target)) {
const itemType = target.indexer.value;
Expand Down
21 changes: 21 additions & 0 deletions packages/http-server-js/test/scalar.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,27 @@ describe("scalar", () => {
expect(serverRaw).toMatch(/response\.end\(globalThis\.JSON\.stringify\(__result_\d+\)\);/);
});

it("emits direct bytes send for binary body with custom content-type", async () => {
const { outputs } = await HttpServerEmitterTester.compile(`
@service(#{ title: "Example" })
@route("/")
namespace Example {
@post op download(): {
@statusCode statusCode: 200;
@header contentType: "application/zip";
@body content: bytes;
};
}
`);

const serverRaw = outputs["src/generated/http/operations/server-raw.ts"];

expect(serverRaw).toBeDefined();
expect(serverRaw).not.toContain('"application/json"');
expect(serverRaw).not.toContain("Uint8Array.toJsonObject");
expect(serverRaw).toMatch(/response\.end\(__result_\d+\.content\);/);
});

describe("date/time/duration types", () => {
describe("mode: temporal", () => {
const options: JsEmitterOptions = {
Expand Down