support up to 50mb file upload

ArvinCheng2019 · Mar 3, 2019 · d7494a0 · d7494a0
1 parent 39e5cd0
commit d7494a0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -27,11 +27,14 @@ class App implements IApp {
 
     private config(): void{
         // to support JSON-encoded bodies
-        this._express.use(express.json());
+        this._express.use(express.json({
+            limit: '50mb'
+        }));
 
         // to support URL-encoded bodies
         this._express.use(bodyParser.urlencoded({
-          extended: true
+            extended: true,
+            limit: '50mb'
         }));
 
         this._express.use(function(req, res, next) {

diff --git a/test_client/envmap_demo.html b/test_client/envmap_demo.html
@@ -28,9 +28,16 @@
 			}
 		</style>
 
-        <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/three.js/91/three.js"></script>
-        <script type="text/javascript" src="https://threejs.org/examples/js/controls/OrbitControls.js"></script>
-        <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+                <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/three.js/91/three.js"></script>
+                <script type="text/javascript" src="https://threejs.org/examples/js/controls/OrbitControls.js"></script>
+		<script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+
+		<script>
+			var urlString = window.location.href;
+			var url = new URL(urlString);
+			var envmapGuid = url.searchParams.get("guid");
+			console.log(envmapGuid);
+		</script>
 
 	</head>
 	<body>
@@ -66,7 +73,7 @@
 				geometry.scale( - 1, 1, 1 );
 
 				var material = new THREE.MeshBasicMaterial( {
-					map: new THREE.TextureLoader().load( 'http://mbnsay.com/rayys/images/vray_360_envmap1.jpg' )
+					map: new THREE.TextureLoader().load( `https://acc.renderfarmjs.com/v1/renderoutput/${envmapGuid}.png` )
 				} );
 
 				mesh = new THREE.Mesh( geometry, material );

diff --git a/test_client/js/demo.js b/test_client/js/demo.js
@@ -29,7 +29,6 @@ function initScene() {
         camera.position.z = 9.45;
         camera.lookAt(0, 0.5, 0);
         camera.updateProjectionMatrix();
-        camera.userData = { vr: { camera_overrideFOV: true, camera_type: 1 } };
         scene.add(camera);
         window.demo.camera = camera;
 
@@ -152,7 +151,7 @@ function renderScene(scene, camera, onRenderComplete) {
     // have session? just do it
     if (window.demo.sessionGuid) {
         updateCamera(window.demo.camera);
-        postJob(window.demo.sessionGuid, onRenderComplete);
+        postJob(window.demo.sessionGuid, window.demo.camera.name, onRenderComplete);
         return;
     }
 
@@ -189,7 +188,7 @@ function renderScene(scene, camera, onRenderComplete) {
                 rfarm.postScene(newSession.guid, sceneJson, function(result) {
                     console.log(result);
 
-                    postJob(newSession.guid, onRenderComplete);
+                    postJob(newSession.guid, window.demo.camera.name, onRenderComplete);
                 });
 
             });
@@ -202,9 +201,9 @@ function renderScene(scene, camera, onRenderComplete) {
     })
 }
 
-function postJob(sessionGuid, onRenderComplete) {
+function postJob(sessionGuid, cameraName, onRenderComplete) {
     $("#renderStatus").text("Starting render...");
-    rfarm.createJob(sessionGuid, function(job) {
+    rfarm.createJob(sessionGuid, cameraName, 3000, 1500, { camera_type: 1, camera_overrideFOV: true, camera_fov: 360 }, function(job) {
         $("#renderStatus").text(`Rendering... 0 sec.`);
 
         let t0 = new Date();

diff --git a/test_client/js/rfarm_client.js b/test_client/js/rfarm_client.js
@@ -222,16 +222,17 @@ rfarm.createSpotlight = function(spotlight, spotlightTarget, onCreated) {
 }.bind(rfarm);
 
 //public
-rfarm.createJob = function(sessionGuid, onStarted) {
+rfarm.createJob = function(sessionGuid, cameraName, width, height, renderSettings, onStarted) {
     console.log("Creating new render job...");
 
     $.ajax({
         url: rfarm.baseUrl  + "/v1/job",
         data: { 
             session_guid: sessionGuid,
-            camera_name: "Camera001",
-            render_width: 640,
-            render_height: 480,
+            camera_name: cameraName,
+            render_width: width,
+            render_height: height,
+            render_settings: renderSettings,
         },
         type: 'POST',
         success: function(result) {