@metacall/protocol 0.1.12 → 0.1.15

package/dist/language.d.ts

@@ -9,5 +9,5 @@ interface Language {
 }
 export declare const Languages: Record<LanguageId, Language>;
 export declare const DisplayNameToLanguageId: Record<string, LanguageId>;
-export declare const runnerDisplayName: (runner: string) => string;
+export declare const RunnerToDisplayName: (runner: string) => string;
 export {};

package/dist/language.js

@@ -6,13 +6,7 @@
 
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runnerDisplayName = exports.DisplayNameToLanguageId = exports.Languages = void 0;
-const displayNameMap = {
-    nodejs: 'NPM',
-    python: 'PIP',
-    ruby: 'GEM',
-    csharp: 'NuGet'
-};
+exports.RunnerToDisplayName = exports.DisplayNameToLanguageId = exports.Languages = void 0;
 exports.Languages = {
     cs: {
         tag: 'cs',
@@ -82,5 +76,13 @@ exports.Languages = {
 exports.DisplayNameToLanguageId = Object.keys(exports.Languages).reduce((obj, lang) => Object.assign(obj, {
     [exports.Languages[lang].displayName]: lang
 }), {});
-const runnerDisplayName = (runner) => displayNameMap[runner] || 'Deploy';
-exports.runnerDisplayName = runnerDisplayName;
+const RunnerToDisplayName = (runner) => {
+    const displayNameMap = {
+        nodejs: 'NPM',
+        python: 'Pip',
+        ruby: 'Gem',
+        csharp: 'NuGet'
+    };
+    return displayNameMap[runner] || 'Build';
+};
+exports.RunnerToDisplayName = RunnerToDisplayName;

package/dist/protocol.d.ts

@@ -4,6 +4,12 @@ import { Plans } from './plan';
 export declare const isProtocolError: (err: unknown) => boolean;
 export { AxiosError as ProtocolError };
 declare type SubscriptionMap = Record<string, number>;
+export interface SubscriptionDeploy {
+    id: string;
+    plan: Plans;
+    date: number;
+    deploy: string;
+}
 export declare type ResourceType = 'Package' | 'Repository';
 export interface AddResponse {
     id: string;
@@ -16,6 +22,7 @@ interface API {
     validate(): Promise<boolean>;
     deployEnabled(): Promise<boolean>;
     listSubscriptions(): Promise<SubscriptionMap>;
+    listSubscriptionsDeploys(): Promise<SubscriptionDeploy[]>;
     inspect(): Promise<Deployment[]>;
     upload(name: string, blob: unknown, jsons: MetaCallJSON[], runners: string[]): Promise<string>;
     add(url: string, branch: string, jsons: MetaCallJSON[]): Promise<AddResponse>;

package/dist/protocol.js

@@ -9,11 +9,14 @@
     validate: validates the auth token
     deployEnabled: checks if you're able to deploy
     listSubscriptions: gives you a list of the subscription available
+    listSubscriptionsDeploys: gives you a list of the subscription being used in deploys
     inspect: gives you are deploys with it's endpoints
     upload: uploads a zip (package) into the faas
     deploy: deploys the previously uploaded zip into the faas
     deployDelete: deletes the deploy and the zip
-
+    logs: retrieve the logs of a deploy by runner or deployment
+    branchList: get the branches of a repository
+    fileList: get files of a repository by branch
 */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -57,6 +60,11 @@ exports.default = (token, baseURL) => {
             }
             return subscriptions;
         },
+        listSubscriptionsDeploys: async () => axios_1.default
+            .get(baseURL + '/api/billing/list-subscriptions-deploys', {
+            headers: { Authorization: 'jwt ' + token }
+        })
+            .then(res => res.data),
         inspect: async () => axios_1.default
             .get(baseURL + '/api/inspect', {
             headers: { Authorization: 'jwt ' + token }

package/githooks/common.js

@@ -0,0 +1,37 @@
+const { spawn } = require('child_process');
+
+const debug = !!process.env.DEBUG_HOOKS;
+const debugLog = debug ? ((...params) => console.log(...params)) : (() => {});
+
+const run = (cmd, args = [], config = {}) => new Promise((ok, nope) => {
+	const child = spawn(cmd, args, config);
+	
+	let stderr = '';
+	let stdout = '';
+
+	child.stderr.on('data', data => {
+		stderr += data
+		debugLog('> stderr:', data.toString().trim());
+	});
+	child.stdout.on('data', data => {
+		stdout += data
+		debugLog('> stdout:', data.toString().trim());
+	});
+	child.on('close', (code, signal) => {
+		if (code !== 0) {
+			console.error('Exited with code', code);
+			return nope({
+				message: stderr,
+				exit: code,
+				data: { code, signal, stderr, stdout, child }
+			});
+		}
+		ok({ code, signal, stderr, stdout, child });
+	});
+});
+
+module.exports = {
+	debug,
+	debugLog,
+	run
+};

package/githooks/pre-push

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+
+const { debugLog } = require('./common');
+
+const PREFIX = 'pre-push';
+
+const hooks = [
+	'update-version'
+];
+
+if (require.main === module) {
+	for (const hook of hooks) {
+		const filename = PREFIX + '-' + hook;
+		debugLog('Executing hook:', filename);
+		const { main } = require('./' + filename);
+		main(process.argv.slice(2));
+	}
+}

package/githooks/pre-push-update-version

@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const fs = require('fs');
+
+const { debugLog, run } = require('./common');
+
+const main = async (args) => {
+	let resp;
+	try {
+		/*
+		// Not needed: https://stackoverflow.com/a/37927943/12547142
+		
+		const cwd = process.cwd();
+		debugLog('Current working directory:', cwd);
+
+		resp = await run('git', ['rev-parse', '--show-toplevel']);
+		const root = resp.stdout.trim();
+		debugLog('Repository root directory:', root);
+		
+		// Ensuring the current working directory is at the repository root
+		// ...
+		*/
+
+		const root = process.cwd();
+
+		debugLog('Inside update-version hook.');
+		debugLog('Command-line arguments:', args);
+
+		const remoteName = args[0];
+		debugLog('Remote:', remoteName);
+
+		debugLog('Fetching tags...');
+		await run('git', ['fetch', '--tags', remoteName]);
+
+		debugLog('Retrieving the latest tag version...');
+		resp = await run('git', ['rev-list', '--tags', '--max-count=1']);
+		const latestTagCommit = resp.stdout.trim();
+		debugLog('Latest tag commit hash:', latestTagCommit);
+
+		resp = await run('git', ['describe', '--tags', latestTagCommit]);
+		const latestTag = resp.stdout.trim();
+		debugLog('Latest tag:', latestTag);
+		const latestVersion = latestTag.slice(1);
+		debugLog('=> Latest version:', latestVersion);
+
+		
+		debugLog('Retrieving the version from package.json...');
+		const package = require('../package.json');
+		const lockfile = require('../package-lock.json');
+		const { version: packageVersion } = package;
+		const { version: lockfileVersion } = lockfile;
+		const { packages: { '': { version: lockfileVersion2 } } } = lockfile;
+		debugLog('package.json version:', packageVersion);
+		debugLog('package-lock.json version:', lockfileVersion);
+		debugLog('package-lock.json version (repeated):', lockfileVersion2);
+		
+		let success = latestVersion === packageVersion && latestVersion === lockfileVersion && latestVersion === lockfileVersion2;
+
+		if (success) {
+			debugLog('Versions match. No update needed.');
+		} else {
+			await run('git', ['tag', '-d', latestTag]);
+			debugLog('Versions donn\'t match. Updating versions.');
+			if (packageVersion !== latestVersion) {
+				console.log('Updating package.json with version from latest tag...');
+				package.version = latestVersion;
+				fs.writeFileSync(path.join(root, 'package.json'), JSON.stringify(package, null, '\t'));
+				debugLog('Updated package.json.');
+			}
+			if (lockfileVersion !== latestVersion) {
+				console.log('Updating package-lock.json with version from latest tag...');
+				lockfile.version = latestVersion;
+				fs.writeFileSync(path.join(root, 'package-lock.json'), JSON.stringify(lockfile, null, '\t'));
+				debugLog('Updated package-lock.json.');
+			}
+			if (lockfileVersion2 !== latestVersion) {
+				console.log('Updating package-lock.json (repeated) with version from latest tag...');
+				lockfile.packages[''].version = latestVersion;
+				fs.writeFileSync(path.join(root, 'package-lock.json'), JSON.stringify(lockfile, null, '\t'));
+				debugLog('Updated package-lock.json (repeated).');
+			}
+			debugLog('Updated versions.');
+			await run('git', ['add', 'package.json']);
+			await run('git', ['add', 'package-lock.json']);
+			await run('git', ['commit', '-m', 'Updating version to ' + latestTag]);
+			await run('git', ['tag', latestTag]);
+
+			resp = await run('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
+			const currentBranch = resp.stdout.trim();
+			debugLog('Current branch:', currentBranch);
+
+			process.stderr.write('\033[0;31mYour push has been rejected in order to update the versions in package.json and package-lock.json according to the latest tag.\033[0m\n');
+			process.stderr.write('\033[0;32mPush again with: \033[0mgit push ' + remoteName + ' ' + currentBranch + ' ' + latestTag + '\n');
+		}
+		return process.exit(success ? 0 : 1);
+	} catch (e) {
+		e && e.data && e.data.signal && debugLog('Signal:', e.data.signal);
+		e && e.data && e.data.stdout && debugLog('stdout:', '\n----------------------', e.data.stdout, '\n----------------------');
+		console.error(e.message);
+		process.exit(e.exit);
+	}
+};
+
+module.exports = { main };
+
+if (require.main === module) {
+	main(process.argv.slice(2));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@metacall/protocol",
-	"version": "0.1.12",
+	"version": "0.1.15",
 	"description": "Tool for deploying into MetaCall FaaS platform.",
 	"exports": {
 		"./*": "./dist/*.js",
@@ -17,6 +17,7 @@
 		"test": "npm run --silent build && mocha dist/test",
 		"unit": "npm run --silent test -- --ignore **/integration**",
 		"prepublishOnly": "npm run --silent build",
+		"postinstall": "git config --local core.hooksPath githooks",
 		"build": "npm run --silent lint && tsc",
 		"lint": "eslint . --ignore-pattern dist",
 		"fix": "eslint . --ignore-pattern dist --fix",
@@ -77,7 +78,10 @@
 		},
 		"rules": {
 			"tsdoc/syntax": "warn"
-		}
+		},
+		"ignorePatterns": [
+			"githooks/common.js"
+		]
 	},
 	"dependencies": {
 		"@types/ignore-walk": "^4.0.0",

package/src/language.ts

@@ -16,13 +16,6 @@ interface Language {
 	runnerFilesRegexes: RegExp[]; // Regex for generating the runners list
 }
 
-const displayNameMap: Record<string, string> = {
-	nodejs: 'NPM',
-	python: 'PIP',
-	ruby: 'GEM',
-	csharp: 'NuGet'
-};
-
 export const Languages: Record<LanguageId, Language> = {
 	cs: {
 		tag: 'cs',
@@ -100,5 +93,13 @@ export const DisplayNameToLanguageId: Record<string, LanguageId> = Object.keys(
 	{}
 );
 
-export const runnerDisplayName = (runner: string): string =>
-	displayNameMap[runner] || 'Deploy';
+export const RunnerToDisplayName = (runner: string): string => {
+	const displayNameMap: Record<string, string> = {
+		nodejs: 'NPM',
+		python: 'Pip',
+		ruby: 'Gem',
+		csharp: 'NuGet'
+	};
+
+	return displayNameMap[runner] || 'Build';
+};

package/src/protocol.ts

@@ -8,11 +8,14 @@
 	validate: validates the auth token
 	deployEnabled: checks if you're able to deploy
 	listSubscriptions: gives you a list of the subscription available
+	listSubscriptionsDeploys: gives you a list of the subscription being used in deploys
 	inspect: gives you are deploys with it's endpoints
 	upload: uploads a zip (package) into the faas
 	deploy: deploys the previously uploaded zip into the faas
 	deployDelete: deletes the deploy and the zip
-
+	logs: retrieve the logs of a deploy by runner or deployment
+	branchList: get the branches of a repository
+	fileList: get files of a repository by branch
 */
 
 import axios, { AxiosError, AxiosResponse } from 'axios';
@@ -27,6 +30,13 @@ export { AxiosError as ProtocolError };
 
 type SubscriptionMap = Record<string, number>;
 
+export interface SubscriptionDeploy {
+	id: string;
+	plan: Plans;
+	date: number;
+	deploy: string;
+}
+
 export type ResourceType = 'Package' | 'Repository';
 
 export interface AddResponse {
@@ -42,6 +52,7 @@ interface API {
 	validate(): Promise<boolean>;
 	deployEnabled(): Promise<boolean>;
 	listSubscriptions(): Promise<SubscriptionMap>;
+	listSubscriptionsDeploys(): Promise<SubscriptionDeploy[]>;
 	inspect(): Promise<Deployment[]>;
 	upload(
 		name: string,
@@ -122,6 +133,16 @@ export default (token: string, baseURL: string): API => {
 			return subscriptions;
 		},
 
+		listSubscriptionsDeploys: async (): Promise<SubscriptionDeploy[]> =>
+			axios
+				.get<SubscriptionDeploy[]>(
+					baseURL + '/api/billing/list-subscriptions-deploys',
+					{
+						headers: { Authorization: 'jwt ' + token }
+					}
+				)
+				.then(res => res.data),
+
 		inspect: async (): Promise<Deployment[]> =>
 			axios
 				.get<Deployment[]>(baseURL + '/api/inspect', {