Skip to content
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.

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

feat: introduce code generation for file upload #66

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions fern/definition/imdb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ service:
errors:
- MovieDoesNotExistError

uploadMovie:
method: POST
path: /{movieId}/upload
path-parameters:
movieId: MovieId
request:
name: UploadMovieRequest
body:
properties:
length: double
video: file
errors:
- MovieDoesNotExistError

errors:
MovieDoesNotExistError:
status-code: 404
2 changes: 1 addition & 1 deletion fern/fern.config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"organization": "fern",
"version": "0.40.4"
"version": "0.47.1"
}
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@
},
"dependencies": {
"cors": "^2.8.5",
"express": "^4.18.2"
"express": "^4.18.2",
"multer": "^1.4.5-lts.1"
},
"devDependencies": {
"@types/cors": "^2.8.13",
"@types/express": "^4.17.16",
"@types/express": "4.17.13",
"@types/multer": "1.4.7",
"@types/node": "^22.5.0",
"@typescript-eslint/eslint-plugin": "latest",
"@typescript-eslint/parser": "latest",
"prettier": "^3.1.0",
"nodemon": "^3.0.2",
"eslint": "^8.55.0",
"nodemon": "^3.0.2",
"prettier": "^3.1.0",
"ts-node": "^10.9.2",
"typescript": "4.6.4"
}
}
}
106 changes: 103 additions & 3 deletions src/api/generated/api/resources/imdb/service/ImdbService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
* This file was auto-generated by Fern from our API Definition.
*/

import * as FernApi from "../../../index";
import express from "express";
import * as serializers from "../../../../serialization/index";
import multer from "multer";
import * as errors from "../../../../errors/index";
import * as serializers from "../../../../serialization/index";
import * as FernApi from "../../../index";

export interface ImdbServiceMethods {
createMovie(
Expand Down Expand Up @@ -33,10 +34,30 @@ export interface ImdbServiceMethods {
},
next: express.NextFunction
): void | Promise<void>;
uploadMovie(
req: express.Request<
{
movieId: serializers.MovieId.Raw;
},
never,
{
length: number;
video: Express.Multer.File;
},
never
>,
res: {
send: (responseBody: void) => Promise<void>;
cookie: (cookie: string, value: string, options?: express.CookieOptions) => void;
locals: any;
},
next: express.NextFunction
): void | Promise<void>;
}

export class ImdbService {
private router;
// private upload;

constructor(private readonly methods: ImdbServiceMethods, middleware: express.RequestHandler[] = []) {
this.router = express.Router({ mergeParams: true }).use(
Expand All @@ -52,7 +73,12 @@ export class ImdbService {
return this;
}

public toRouter(): express.Router {
public toRouter(multerConfig?: {
storage?: multer.StorageEngine;
limits?: {
fileSize?: number;
};
}): express.Router {
this.router.post("/create-movie", async (req, res, next) => {
const request = serializers.CreateMovieRequest.parse(req.body);
if (request.ok) {
Expand Down Expand Up @@ -127,6 +153,80 @@ export class ImdbService {
next(error);
}
});
this.router.post("/:movieId/upload", (multer(multerConfig).single('video') as unknown as express.RequestHandler), async (req, res, next) => {
console.log('Starting upload movie request...');
try {
console.log('Request headers:', req.headers);
console.log('Request params:', req.params);
console.log('Request body:', req.body);

if (!req.file) {
console.log('Error: Missing video file');
res.status(400).json({
error: "Missing required video file"
});
return;
}
console.log('Uploaded file details:', {
filename: req.file.filename,
size: req.file.size,
mimetype: req.file.mimetype
});

const length = parseFloat(req.body.length);
if (!length) {
console.log('Error: Missing or invalid length parameter');
res.status(400).json({
error: "Missing required length parameter"
});
return;
}
console.log('Movie length:', length);

console.log('Calling uploadMovie method...');
await this.methods.uploadMovie(
req as any,
{
send: async (responseBody) => {
console.log('Upload successful, sending response');
res.json(responseBody);
},
cookie: res.cookie.bind(res),
locals: res.locals,
},
next
);
next();
} catch (error) {
console.log('Error occurred during upload:', error);
if (error instanceof multer.MulterError) {
if (error.code === 'LIMIT_FILE_SIZE') {
console.log('File size limit exceeded');
res.status(400).json({
error: 'File size is too large. Max size is 100MB'
});
} else {
console.log('Multer error:', error.code);
res.status(400).json({
error: error.message
});
}
return;
}
if (error instanceof errors.FernApiError) {
console.warn(
`Endpoint 'uploadMovie' unexpectedly threw ${error.constructor.name}.` +
` If this was intentional, please add ${error.constructor.name} to` +
" the endpoint's errors list in your Fern Definition."
);
await error.send(res);
} else {
console.error('Internal server error:', error);
res.status(500).json("Internal Server Error");
}
next(error);
}
});
return this.router;
}
}
9 changes: 8 additions & 1 deletion src/api/generated/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@
*/

import express from "express";
import multer from "multer";
import { ImdbService } from "./api/resources/imdb/service/ImdbService";

export function register(
expressApp: express.Express | express.Router,
services: {
imdb: ImdbService;
},
multerConfig: {
storage?: multer.StorageEngine;
limits?: {
fileSize?: number;
};
}
): void {
(expressApp as any).use("/movies", services.imdb.toRouter());
(expressApp as any).use("/movies", services.imdb.toRouter(multerConfig));
}
27 changes: 24 additions & 3 deletions src/server.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import cors from "cors";
import express from "express";
import multer from "multer";
import path from "path";
import { register } from "./api/generated";
import imdb from "./services/imdb";

Expand All @@ -10,9 +12,28 @@ const app = express();
//enable cors
app.use(cors());

register(app, {
imdb,
});
register(
app,
{
imdb,
},
{
storage: multer.diskStorage({
destination: (req, file, cb) => {
cb(null, "../");
},
filename: (req, file, cb) => {
cb(
null,
`${file.fieldname}-${Date.now()}${path.extname(file.originalname)}`,
);
},
}),
limits: {
fileSize: 1024 * 1024 * 100, // 100MB file size limit for videos
},
},
);

app.listen(PORT);
console.log(`🎉 Listening on port ${PORT}...`);
9 changes: 9 additions & 0 deletions src/services/imdb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,13 @@ export default new ImdbService({
throw new FernApi.MovieDoesNotExistError();
}
},
uploadMovie: async (req, res) => {
console.log("Request:", {
file: req.file,
body: req.body,
params: req.params,
});
// Handle the uploaded movie
await res.send();
},
});
Loading
Loading