Improved the API and tested it further.

Author: viferga

src/protocol.ts

@@ -54,7 +54,7 @@ export enum ResourceType {
 	Repository = 'Repository'
 }
 
-export interface AddResponse {
+export interface Resource {
 	id: string;
 }
 
@@ -111,12 +111,8 @@ export interface API {
 		blob: unknown,
 		jsons?: MetaCallJSON[],
 		runners?: string[]
-	): Promise<string>;
-	add(
-		url: string,
-		branch: string,
-		jsons: MetaCallJSON[]
-	): Promise<AddResponse>;
+	): Promise<Resource>;
+	add(url: string, branch: string, jsons: MetaCallJSON[]): Promise<Resource>;
 	deploy(
 		name: string,
 		env: { name: string; value: string }[],
@@ -262,7 +258,7 @@ class Request {
 }
 
 export default (token: string, baseURL: string): API => {
-	const request = () => new Request(token, baseURL);
+	const request = (url = baseURL) => new Request(token, url);
 
 	const api: API = {
 		refresh: (): Promise<string> =>
@@ -323,7 +319,7 @@ export default (token: string, baseURL: string): API => {
 			blob: Blob,
 			jsons: MetaCallJSON[] = [],
 			runners: string[] = []
-		): Promise<string> => {
+		): Promise<Resource> => {
 			const fd = new FormData();
 
 			fd.append('id', name);
@@ -336,14 +332,14 @@ export default (token: string, baseURL: string): API => {
 				.url('/api/package/create')
 				.method('POST')
 				.blob(fd)
-				.asJson<string>();
+				.asJson<Resource>();
 		},
 
 		add: (
 			url: string,
 			branch: string,
 			jsons: MetaCallJSON[] = []
-		): Promise<AddResponse> =>
+		): Promise<Resource> =>
 			request()
 				.url('/api/repository/add')
 				.method('POST')
@@ -352,7 +348,7 @@ export default (token: string, baseURL: string): API => {
 					branch,
 					jsons
 				})
-				.asJson<AddResponse>(),
+				.asJson<Resource>(),
 
 		branchList: (url: string): Promise<Branches> =>
 			request()
@@ -437,9 +433,15 @@ export default (token: string, baseURL: string): API => {
 			name: string,
 			args?: Args
 		): Promise<Result> => {
-			const req = request().url(
-				`/${prefix}/${suffix}/${version}/${type}/${name}`
-			);
+			// Old API
+			// const req = request('https://api.metacall.io').url(
+			// 	`/${prefix}/${suffix}/${version}/${type}/${name}`
+			// );
+
+			// New API
+			const req = request(
+				`https://${version}-${suffix}-${prefix}.api.metacall.io`
+			).url(`/${type}/${name}`);
 
 			if (args === undefined) {
 				req.method('GET');

src/test/api.integration.spec.ts

@@ -1,4 +1,6 @@
 import { strictEqual } from 'assert';
+import { readFile } from 'fs/promises';
+import { join } from 'path';
 import { Plans } from '../plan';
 import Protocol, { ResourceType, waitFor } from '../protocol';
 
@@ -10,12 +12,15 @@ describe('Integration API', function () {
 
 	if (token === undefined) {
 		// Skip test
+		console.warn(
+			'⚠️ Warning: Integration API Test being skipped due to API_TOKEN not defined'
+		);
 		return;
 	}
 
 	const API = Protocol(token, baseURL);
 
-	it('Should add repository', async function () {
+	it.skip('Should deploy a repository', async function () {
 		const { id } = await API.add(
 			'https://github.com/metacall/examples.git',
 			'master',
@@ -31,9 +36,6 @@ describe('Integration API', function () {
 			'v1'
 		);
 
-		console.log(JSON.stringify(resource, null, 2));
-		console.log(resource.suffix);
-
 		const deploy = await waitFor(async cancel => {
 			const deploy = await API.inspectByName(resource.suffix);
 
@@ -46,9 +48,82 @@ describe('Integration API', function () {
 			return deploy;
 		});
 
-		console.log(JSON.stringify(deploy, null, 2));
-
 		strictEqual(deploy.suffix, 'metacall-examples');
 		strictEqual(deploy.status, 'ready');
+
+		const result = await API.deployDelete(
+			deploy.prefix,
+			deploy.suffix,
+			deploy.version
+		);
+
+		strictEqual(result, 'Deploy Delete Succeed');
+	});
+
+	it.skip('Should deploy a package', async function () {
+		const basePath = join(
+			process.cwd(),
+			'src',
+			'test',
+			'resources',
+			'integration',
+			'api'
+		);
+
+		const fileBuffer = await readFile(
+			join(basePath, 'metacall-protocol-package-test.zip')
+		);
+
+		const blob = new Blob([fileBuffer], { type: 'application/zip' });
+
+		const { id } = await API.upload(
+			'metacall-protocol-package-test',
+			blob,
+			[],
+			['nodejs']
+		);
+
+		strictEqual(id, 'metacall-protocol-package-test');
+
+		const resource = await API.deploy(
+			id,
+			[],
+			Plans.Essential,
+			ResourceType.Package,
+			'19d499ed1ab',
+			'v1'
+		);
+
+		const deploy = await waitFor(async cancel => {
+			const deploy = await API.inspectByName(resource.suffix);
+
+			if (deploy.status === 'create') {
+				throw new Error('Not ready yet');
+			} else if (deploy.status === 'fail') {
+				cancel('Deploy failed');
+			}
+
+			return deploy;
+		});
+
+		strictEqual(deploy.suffix, 'metacall-protocol-package-test');
+		strictEqual(deploy.status, 'ready');
+
+		const value = await API.call<string>(
+			deploy.prefix,
+			deploy.suffix,
+			deploy.version,
+			'test'
+		);
+
+		strictEqual(value, 'OK');
+
+		const result = await API.deployDelete(
+			deploy.prefix,
+			deploy.suffix,
+			deploy.version
+		);
+
+		strictEqual(result, 'Deploy Delete Succeed');
 	});
 });