Solve bugs and fully implemented testing.

Author: viferga

Dockerfile

@@ -49,4 +49,8 @@ EXPOSE 9000
 
 CMD ["node", "dist/index.js"]
 
-# TODO: testing
+FROM base AS test
+
+RUN apt-get update \
+	&& apt-get install curl ca-certificates jq -y --no-install-recommends \
+	&& npm install -g @metacall/deploy

README.md

@@ -44,3 +44,14 @@ metacall-deploy --dev
 -   This project is developed using [MetaCall Core] itself in order to provide polyglot support, we are using its [Node Port](https://github.com/metacall/core/tree/develop/source/ports/node_port) of this library to use all the functions and methods `MetaCall Core C API` provides.
 
 -   Also, [Here](https://github.com/metacall/faas/blob/master/types/metacall.d.ts) are all the functions of `MetaCall Core` we are using.
+
+### Testing
+
+This will run a test, and if the `docker compose up test` command exits with exit code 0, it will mean that the test has passed.
+If you want to see the output of the FaaS, run `docker compose up` instead. But when running this, the command won't terminate once the test finishes and the FaaS will keep running. You will need to press `Ctrl+C` in order to close it.
+
+```sh
+docker compose build
+docker compose up test
+docker compose down
+```

TODO.md

@@ -1,6 +1,6 @@
 #
-#	MetaCall Library by Parra Studios
-#	Docker compose infrastructure for MetaCall.
+#	MetaCall FaaS Script by Parra Studios
+#	Reimplementation of MetaCall FaaS platform written in TypeScript.
 #
 #	Copyright (C) 2016 - 2024 Vicente Eduardo Ferrer Garcia <[email protected]>
 #
@@ -30,4 +30,16 @@ services:
     ports:
       - "9000:9000"
 
-# TODO: testing
+  test:
+    image: metacall/faas:test
+    container_name: metacall_faas_test
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: test
+    network_mode: host
+    depends_on:
+      - faas
+    volumes:
+      - ./test/:/metacall/
+    command: /metacall/test.sh

docker-compose.yml

@@ -12,9 +12,11 @@ const host = hostname();
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
+app.get('/readiness', (_req: Request, res: Response) => res.sendStatus(200));
 app.get('/validate', api.validate);
 app.get('/api/account/deploy-enabled', api.validate);
 
+app.get(`/${host}/:appName/:version/call/:name`, api.callFunction);
 app.post(`/${host}/:appName/:version/call/:name`, api.callFunction);
 app.get(
 	`/${host}/:appName/:version/static/.metacall/faas/apps/:app/:file`,

src/app.ts

@@ -10,7 +10,7 @@ export interface Deployment {
 	blob?: string;
 }
 
-export const deploymentMap: Record<string, Deployment> = {};
+export const deploymentMap: Record<string, Promise<Deployment>> = {};
 
 export const createInstallDependenciesScript = (
 	runner: string,

src/constants.ts

@@ -20,8 +20,6 @@ import {
 	logProcessOutput
 } from '../utils/utils';
 
-import { PackageError } from '@metacall/protocol/package';
-
 // TODO: Isn't this available inside protocol package? We MUST reuse it
 export type DeployBody = {
 	suffix: string; // name of deployment
@@ -43,7 +41,7 @@ export const deploy = catchAsync(
 			// req.body.resourceType == 'Repository' &&
 			// 	(await calculatePackages(next));
 
-			const deployment = deploymentMap[req.body.suffix];
+			const deployment = await deploymentMap[req.body.suffix];
 
 			if (deployment === undefined) {
 				return next(
@@ -86,15 +84,11 @@ export const deploy = catchAsync(
 			});
 
 			return res.status(200).json({
-				suffix: hostname(),
-				prefix: deployment.id,
+				prefix: hostname(),
+				suffix: deployment.id,
 				version: 'v1'
 			});
 		} catch (err) {
-			// Check if the error is PackageError.Empty
-			if (err === PackageError.Empty) {
-				return next(err);
-			}
 			return next(err);
 		}
 	}

src/controller/deploy.ts

@@ -162,20 +162,30 @@ export const uploadPackage = (
 
 		const options: ParseOptions = { path: deployment.path };
 
+		let deployResolve: (
+			value: Deployment | PromiseLike<Deployment>
+		) => void;
+		let deployReject: (reason?: unknown) => void;
+
+		deploymentMap[deployment.id] = new Promise((resolve, reject) => {
+			deployResolve = resolve;
+			deployReject = reject;
+		});
+
 		fs.createReadStream(deployment.blob)
 			.pipe(Extract(options))
 			.on('close', () => {
 				deleteBlob();
-				deploymentMap[deployment.id] = deployment;
+				deployResolve(deployment);
 			})
 			.on('error', error => {
 				deleteBlob();
-				errorHandler(
-					new AppError(
-						`Failed to unzip the deployment at: ${error.toString()}`,
-						500
-					)
+				const appError = new AppError(
+					`Failed to unzip the deployment at: ${error.toString()}`,
+					500
 				);
+				errorHandler(appError);
+				deployReject(appError);
 			});
 	});
 

src/controller/upload.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 
-export const validate = (req: Request, res: Response): Response =>
+export const validate = (_req: Request, res: Response): Response =>
 	res.status(200).json({
 		status: 'success',
 		data: true

src/controller/validate.ts

@@ -17,7 +17,7 @@ void (async (): Promise<void> => {
 		// TODO: Refactor this
 		await findJsonFilesRecursively(appsDirectory);
 
-		console.log('Previously deployed apllications deployed successfully');
+		console.log('Previously deployed applications deployed successfully');
 		// END-TODO
 
 		const port = process.env.PORT || 9000;

src/index.ts

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+def number():
+  return 100
+
+def text():
+  return 'asd'

test/data/python-base-app/index.py

@@ -0,0 +1,7 @@
+{
+	"language_id": "py",
+	"path": ".",
+	"scripts": [
+		"index.py"
+	]
+}

test/data/python-base-app/metacall.json

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+#
+#	MetaCall FaaS Script by Parra Studios
+#	Reimplementation of MetaCall FaaS platform written in TypeScript.
+#
+#	Copyright (C) 2016 - 2024 Vicente Eduardo Ferrer Garcia <[email protected]>
+#
+#	Licensed under the Apache License, Version 2.0 (the "License");
+#	you may not use this file except in compliance with the License.
+#	You may obtain a copy of the License at
+#
+#		http://www.apache.org/licenses/LICENSE-2.0
+#
+#	Unless required by applicable law or agreed to in writing, software
+#	distributed under the License is distributed on an "AS IS" BASIS,
+#	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#	See the License for the specific language governing permissions and
+#	limitations under the License.
+#
+
+set -exuo pipefail
+
+# FaaS base URL
+BASE_URL="http://localhost:9000"
+
+# Get the prefix of a deployment
+function getPrefix() {
+	prefix=$(metacall-deploy --dev --inspect Raw | jq -r ".[] | select(.suffix == \"$1\") | .prefix")
+	echo $prefix
+}
+
+# Wait for the FaaS to be ready
+while [[ ! $(curl -s -o /dev/null -w "%{http_code}" $BASE_URL/readiness) = "200" ]]; do
+	sleep 1
+done
+
+echo "FaaS ready, starting tests."
+
+# Test deploy (Python) without dependencies
+app="python-base-app"
+pushd data/$app
+	metacall-deploy --dev
+	prefix=$(getPrefix $app)
+	url=$BASE_URL/$prefix/$app/v1/call
+	[[ $(curl -s $url/number) = 100 ]] || exit 1
+	[[ $(curl -s $url/text) = '"asd"' ]] || exit 1
+popd