@flink-app/flink 0.5.0 → 0.6.0

package/cli/run.ts

@@ -40,7 +40,11 @@ module.exports = async function run(args: string[]) {
             console.warn("WARNING: --entry is ignored when using --precompiled");
         }
 
-        require("child_process").fork(dir + "/dist/.flink/start.js");
+        const forkedProcess = require("child_process").fork(dir + "/dist/.flink/start.js");
+
+        forkedProcess.on("exit", (code: any) => {
+            process.exit(code);
+        });
         return;
     }
 
@@ -58,5 +62,9 @@ module.exports = async function run(args: string[]) {
 
     compiler.emit();
 
-    require("child_process").fork(dir + "/dist/.flink/start.js");
+    const forkedProcess = require("child_process").fork(dir + "/dist/.flink/start.js");
+
+    forkedProcess.on("exit", (code: any) => {
+        process.exit(code);
+    });
 };

package/dist/cli/run.js

@@ -43,7 +43,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var TypeScriptCompiler_1 = __importDefault(require("../src/TypeScriptCompiler"));
 module.exports = function run(args) {
     return __awaiter(this, void 0, void 0, function () {
-        var startTime, dir, entry, compiler;
+        var startTime, dir, entry, forkedProcess_1, compiler, forkedProcess;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -65,7 +65,10 @@ module.exports = function run(args) {
                         if (args.includes("--entry")) {
                             console.warn("WARNING: --entry is ignored when using --precompiled");
                         }
-                        require("child_process").fork(dir + "/dist/.flink/start.js");
+                        forkedProcess_1 = require("child_process").fork(dir + "/dist/.flink/start.js");
+                        forkedProcess_1.on("exit", function (code) {
+                            process.exit(code);
+                        });
                         return [2 /*return*/];
                     }
                     return [4 /*yield*/, TypeScriptCompiler_1.default.clean(dir)];
@@ -80,7 +83,10 @@ module.exports = function run(args) {
                     _a.sent();
                     console.log("Compilation done, took " + (Date.now() - startTime) + "ms");
                     compiler.emit();
-                    require("child_process").fork(dir + "/dist/.flink/start.js");
+                    forkedProcess = require("child_process").fork(dir + "/dist/.flink/start.js");
+                    forkedProcess.on("exit", function (code) {
+                        process.exit(code);
+                    });
                     return [2 /*return*/];
             }
         });

package/dist/src/FlinkApp.js

@@ -345,6 +345,18 @@ var FlinkApp = /** @class */ (function () {
                             return [3 /*break*/, 6];
                         case 5:
                             err_1 = _a.sent();
+                            // duck typing to check if it is a FlinkError
+                            if (typeof err_1.status === "number" && err_1.status >= 400 && err_1.status < 600 && err_1.error) {
+                                return [2 /*return*/, res.status(err_1.status).json({
+                                        status: err_1.status,
+                                        error: {
+                                            id: err_1.error.id || uuid_1.v4(),
+                                            title: err_1.error.title || "Unhandled error: " + (err_1.error.code || err_1.status),
+                                            detail: err_1.error.detail,
+                                            code: err_1.error.code,
+                                        },
+                                    })];
+                            }
                             FlinkLog_1.log.warn("Handler '" + methodAndRoute_1 + "' threw unhandled exception " + err_1);
                             console.error(err_1);
                             return [2 /*return*/, res.status(500).json(FlinkErrors_1.internalServerError(err_1))];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flink-app/flink",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "description": "Typescript only framework for creating REST-like APIs on top of Express and mongodb",
     "types": "dist/src/index.d.ts",
     "main": "dist/src/index.js",
@@ -67,5 +67,5 @@
         "rimraf": "^3.0.2",
         "ts-node": "^9.1.1"
     },
-    "gitHead": "3c877c210da19119c074c7482e97a485d2334e80"
+    "gitHead": "42ab7a99632d1fba08096d51800dfc0deb4b0222"
 }

package/src/FlinkApp.ts

@@ -492,7 +492,20 @@ export class FlinkApp<C extends FlinkContext> {
                         ctx: this.ctx,
                         origin: routeProps.origin,
                     });
-                } catch (err) {
+                } catch (err: any) {
+                    // duck typing to check if it is a FlinkError
+                    if (typeof err.status === "number" && err.status >= 400 && err.status < 600 && err.error) {
+                        return res.status(err.status).json({
+                            status: err.status,
+                            error: {
+                                id: err.error.id || v4(),
+                                title: err.error.title || `Unhandled error: ${err.error.code || err.status}`,
+                                detail: err.error.detail,
+                                code: err.error.code,
+                            },
+                        });
+                    }
+
                     log.warn(`Handler '${methodAndRoute}' threw unhandled exception ${err}`);
                     console.error(err);
                     return res.status(500).json(internalServerError(err as any));