fix (cloud-runner) invalid path to application server code modules

Author: vengrov

lib/server-code/runners/tasks/invoke-handler.js

@@ -12,7 +12,10 @@ const domain          = require('domain'),
       resultWrapper   = require('./util/result-wrapper');
 
 const TIMED_OUT_ERR = 'Task execution aborted due to timeout';
-const defaultClassMappings = { [Backendless.User.prototype.___class]: Backendless.User };
+
+const defaultClassMappings = {
+  [Backendless.User.prototype.___class]: Backendless.User
+};
 
 /**
  * @typedef {CodeRunnerTask} InvokeHandlerTask
@@ -104,7 +107,7 @@ module.exports = function(task, runnerOpts, model) {
  * @returns {ServerCodeModel}
  */
 function buildModel(task, runnerOpts) {
-  const codePath = path.resolve(runnerOpts.backendless.repoPath, task.relativePath);
+  const codePath = path.resolve(runnerOpts.backendless.repoPath, task.applicationId.toLowerCase(), task.relativePath);
 
   logger.debug(`Path to application server code resolved as ${codePath}`);
 
@@ -116,7 +119,6 @@ function buildModel(task, runnerOpts) {
   }
 
   const modelDescriptor = require(modelDescriptorPath);
-
   const handler = modelDescriptor.handlers[handlerKey];
 
   if (!handler) {
@@ -148,7 +150,7 @@ function fixTargetJSON(target) {
  * UTF8 Bytes Array -> JSON -> Array of objects classified according to classMappings
  *
  * @param {Array<number>} args
- * @param {Object} classMappings
+ * @param {Object<String, Function>} classMappings
  * @returns {Array<*>}
  */
 function decodeTaskArguments(args, classMappings) {

lib/util/json.js

@@ -34,11 +34,11 @@ exports.stringify = function(value) {
  * and resolving object references placed there by {@link json.stringify} or webORB serializer
  *
  * @param {String} text The string to parse as JSON
- * @param {Array<Object.<String, Class>>} classMappings
+ * @param {Object.<String, Function>} classMappings
  * @returns {Object}
  */
 exports.parse = function(text, classMappings) {
-  classMappings = classMappings || [];
+  classMappings = classMappings || {};
 
   /**
    * A JSON.parse reviver which transforms object class to the mapped one

lib/util/logger.js

@@ -4,13 +4,33 @@
  * Logging tool for Backendless CodeRunner
  * @module util/logger
  */
+
 'use strict';
 
 const util = require('util');
 const PREFIX = ' [JS_CODERUNNER]';
 
+function zeroPad(n, size) {
+  n = n.toString();
+
+  while (n.length < size) {
+    n = "0" + n;
+  }
+
+  return n;
+}
+
+// 16:19:34.754
 function timestamp() {
-  return new Date().toISOString();
+  const d = new Date();
+
+  const time = [
+    zeroPad(d.getHours(), 2),
+    zeroPad(d.getMinutes(), 2),
+    zeroPad(d.getSeconds(), 2)
+  ].join(':');
+
+  return [time, zeroPad(d.getMilliseconds(), 3)].join('.');
 }
 
 function prefix() {