@joystick.js/cli-canary 0.0.0-canary.1668 → 0.0.0-canary.1669

package/dist/commands/push_v2/definition.js

@@ -1 +1 @@
-import n from"./index.js";const[o,d,...e]=process.argv,s={description:"Deploy your Joystick app using Push.",args:{},options:{domain:{flags:{"-d":{set:!!e.includes("-d"),value:!!e.includes("-d")&&e[e.indexOf("-d")+1],parent:"push"},"--domain":{set:!!e.includes("--domain"),value:!!e.includes("--domain")&&e[e.indexOf("--domain")+1],parent:"push"}},description:"The domain of the app Push should deploy to."},environment:{flags:{"-e":{set:!!e.includes("-e"),value:!!e.includes("-e")&&e[e.indexOf("-e")+1],parent:"push"},"--environment":{set:!!e.includes("--environment"),value:!!e.includes("--environment")&&e[e.indexOf("--environment")+1],parent:"push"}},description:"The value you want to use for NODE_ENV in the deployed app (e.g., staging or production). Default is production."},push_server:{flags:{"-s":{set:!!e.includes("-s"),value:!!e.includes("-s")&&e[e.indexOf("-s")+1],parent:"push"},"--server":{set:!!e.includes("--server"),value:!!e.includes("--server")&&e[e.indexOf("--server")+1],parent:"push"}},description:"The Push provision server to target (development or production)."}},command:n};var r=s;export{r as default};
+import n from"./index.js";const[o,t,...e]=process.argv,s={description:"Deploy your Joystick app using Push.",args:{},options:{domain:{flags:{"-d":{set:!!e.includes("-d"),value:!!e.includes("-d")&&e[e.indexOf("-d")+1],parent:"push"},"--domain":{set:!!e.includes("--domain"),value:!!e.includes("--domain")&&e[e.indexOf("--domain")+1],parent:"push"}},description:"The domain of the app Push should deploy to."},environment:{flags:{"-e":{set:!!e.includes("-e"),value:!!e.includes("-e")&&e[e.indexOf("-e")+1],parent:"push"},"--environment":{set:!!e.includes("--environment"),value:!!e.includes("--environment")&&e[e.indexOf("--environment")+1],parent:"push"}},description:"The value you want to use for NODE_ENV in the deployed app (e.g., staging or production). Default is production."},push_server:{flags:{"-s":{set:!!e.includes("-s"),value:!!e.includes("-s")&&e[e.indexOf("-s")+1],parent:"push"},"--server":{set:!!e.includes("--server"),value:!!e.includes("--server")&&e[e.indexOf("--server")+1],parent:"push"}},description:"The Push provision server to target (development or production)."},deployment_token:{flags:{"-t":{set:!!e.includes("-t"),value:!!e.includes("-t")&&e[e.indexOf("-t")+1],parent:"push"},"--token":{set:!!e.includes("--token"),value:!!e.includes("--token")&&e[e.indexOf("--token")+1],parent:"push"}},description:"The deployment token for your Push user account."}},command:n};var d=s;export{d as default};

package/dist/commands/push_v2/get_deployment.js

@@ -1 +1 @@
-import a from"node-fetch";const n=(e={})=>a(`${e?.push_domain}/api/deployments/${e?.domain}`,{method:"GET",headers:{"x-push-session-token":e?.session_token,Accept:"application/json"}})?.then(async t=>(await t.json())?.data).catch(t=>{console.warn(t)});var c=n;export{c as default};
+import a from"node-fetch";const n=(e={})=>a(`${e?.push_domain}/api/deployments/${e?.domain}`,{method:"GET",headers:{"x-push-deployment-token":e?.deployment,Accept:"application/json"}})?.then(async t=>await t.json()).catch(t=>{console.warn(t)});var c=n;export{c as default};

package/dist/commands/push_v2/get_deployment_token.js

@@ -0,0 +1 @@
+import i from"os";import r from"fs";import o from"../../lib/path_exists.js";const{readFile:n,mkdir:a,writeFile:p}=r.promises,m=async(s="")=>{if(s)return await o(`${t}/.push`)||await a(`${t}/.push`),await p(`${t}/.push/deployment_token`,s),s;const t=i.homedir(),e=`${t}/.push/deployment_token`;return await o(e)?n(e,"utf-8"):null};var c=m;export{c as default};

package/dist/commands/push_v2/get_push_domain.js

@@ -1 +1 @@
-const t=(o="production")=>({development:"http://localhost:2603",staging:"https://staging.provision.cheatcode.co",production:"https://provision.cheatcode.co"})[o];var e=t;export{e as default};
+const o=(t="production")=>({development:"http://localhost:2603",production:"https://push.cheatcode.co"})[t];var e=o;export{e as default};

package/dist/commands/push_v2/index.js

@@ -1,8 +1 @@
-import m from"chalk";import"inquirer";import p from"../../lib/build/index.js";import c from"../../lib/cli_log.js";import"./prompts/confirm_deployment.js";import"./create_version.js";import"./get_deployment.js";import d from"./get_push_domain.js";import a from"./get_settings_file.js";import l from"./get_session_token.js";import"./handle_initial_deployment.js";import"./handle_version_deployment.js";import _ from"../../lib/loader.js";import"./upload_build_to_cdn.js";import"./validate_deployment.js";import"./validate_push_config.js";import f from"./build_docker_image.js";const R=(o="",t="",r={})=>{let e="";for(let n=0;n<r?.errors?.length;n+=1){const s=r?.errors[n];o==="push_config"&&(e+=`${m.yellowBright(`> ${s.field}`)}
-`),e+=`${s?.error}
-${n+1===r?.errors?.length?"":`
-`}`}c(`${t?`${m.yellowBright(t)}
-
-
-`:""}${e}`,{level:"danger",docs:{push_config:"https://cheatcode.co/docs/push/config",deployment:"https://cheatcode.co/docs/push/subscription"}[o]}),process.exit(0)},u=async()=>{const o=await l();return o||(c(data?.error?.message,{level:"danger",docs:"https://cheatcode.co/docs/push/cli#authentication"}),process.exit(0))},T=(o="")=>(c(`settings.${o}.json must contain a push config object. Add this following the docs link below and try again.`,{level:"danger",docs:"https://cheatcode.co/docs/push/config"}),process.exit(0)),g=async(o={},t={})=>{process.loader=new _,process.loader.print("Starting deployment...");const r=await u(),e=t?.environment||"production",s=(await a({environment:e}))?.config?.push||{},h=d(t?.push_server),i={domain:"example.com",status:"undeployed",deployment_secret:"abc123"};if(!0){i?.status==="undeployed"&&console.log(`
-`);const w=new Date().toISOString();await p({type:"directory",environment:e,encrypt_build:!0,encryption_key:i?.deployment_secret,silence_confirmation:!0}),await f(`${i?.domain}:latest`,process.cwd())}};var U=g;export{U as default};
+import a from"../../lib/build/index.js";import n from"../../lib/cli_log.js";import i from"./get_deployment.js";import p from"./get_push_domain.js";import c from"./get_settings_file.js";import m from"./get_deployment_token.js";import"./upload_build_to_push.js";import l from"../../lib/loader.js";const u=async(r="")=>{const e=await m(r);return e||(n(data?.error?.message,{level:"danger",docs:"https://cheatcode.co/docs/push/authentication"}),process.exit(0))},y=async(r={},e={})=>{if(!e?.domain)return n("Must pass a deployment via -d or --domain flag.",{level:"danger",docs:"https://cheatcode.co/docs/push/cli"}),process.exit(0);process.loader=new l,process.loader.print("Starting deployment...");const d=await u(e?.deployment_token),s=e?.environment||"production",_=await c({environment:s}),o=p(e?.push_server),t=await i({domain:e?.domain,deployment_token:d,push_domain:o});if(console.log(t),!t)return n(`Sorry, we couldn't find a deployment with the domain ${e?.domain} on your account. If you haven't created it yet, head over to the Push dashboard: https://push.cheatcode.co/deployments/create`,{level:"danger",docs:"https://cheatcode.co/docs/push/deployments/create-a-new-deployment"}),process.exit(0);const h=new Date().toISOString();await a({environment:s,encrypt_build:!0,encryption_key:t?.deployment_secret,silence_confirmation:!0}),process.loader.print("Deploying to Push..."),process.loader.print(t?.intial_deployment_completed?`Deploying. Monitor your deployment at ${o}/deployments/${t?._id}.`:`Deploying. Finish your deployment's setup at ${o}/deployments/${t?._id}/setup.`)};var S=y;export{S as default};

package/dist/commands/push_v2/upload_build_to_push.js

@@ -0,0 +1 @@
+import d from"node-fetch";import m from"form-data";import o from"fs";import"lodash";const{readFile:r}=o.promises,n=async(e={})=>{const a=new m;return a.append("version_tar",await r(".build/build.encrypted.tar.gz"),`${e?.build_timestamp}.tar.gz`),a.append("build_timestamp",e?.build_timestamp),a.append("domain",e?.deployment?.domain),a.append("deployment_id",e?.deployment?._id),d(`${e?.push_domain}/api/deploy`,{method:"POST",headers:{...a.getHeaders(),"x-push-deployment-token":e?.deployment_token},body:a}).then(async t=>(await t.json())?.data).catch(t=>{console.warn(t)})};var c=n;export{c as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1668",
-  "canary_version": "0.0.0-canary.1667",
+  "version": "0.0.0-canary.1669",
+  "canary_version": "0.0.0-canary.1668",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/commands/push_v2/definition.js

@@ -51,6 +51,21 @@ const definition = {
      },
      description: 'The Push provision server to target (development or production).',
     },
+    deployment_token: {
+      flags: {
+        '-t': {
+          set: !!raw_args.includes('-t'),
+          value: !!raw_args.includes('-t') && raw_args[raw_args.indexOf('-t') + 1],
+          parent: 'push',
+        },
+        '--token': {
+          set: !!raw_args.includes('--token'),
+          value: !!raw_args.includes('--token') && raw_args[raw_args.indexOf('--token') + 1],
+          parent: 'push',
+        },
+      },
+      description: 'The deployment token for your Push user account.',
+     },    
   },
   command: push,
 };

package/src/commands/push_v2/get_deployment.js

@@ -4,13 +4,13 @@ const get_deployment = (options = {}) => {
 	return fetch(`${options?.push_domain}/api/deployments/${options?.domain}`, {
 		method: 'GET',
 		headers: {
-			'x-push-session-token': options?.session_token,
+			'x-push-deployment-token': options?.deployment,
 			Accept: 'application/json',
 		},
 	})?.then(async (response) => {
 		// NOTE: We only care about the data in the response here so just return it.
 		const data = await response.json();
-		return data?.data;
+		return data;
 	}).catch((error) => {
 		console.warn(error);
 	});

package/src/commands/push_v2/{get_session_token.js → get_deployment_token.js}

@@ -1,31 +1,29 @@
 import os from 'os';
 import fs from 'fs';
-import inquirer from 'inquirer';
 import path_exists from '../../lib/path_exists.js';
-import session_token_prompt from './prompts/session_token.js';
 
 const { readFile, mkdir, writeFile } = fs.promises;
 
-const get_session_token = async () => {
+const get_deployment_token = async (deployment_token = '') => { 
+  if (deployment_token) {
+	  if (!(await path_exists(`${home_directory}/.push`))) {
+	    await mkdir(`${home_directory}/.push`);
+	  }
+
+	  await writeFile(`${home_directory}/.push/deployment_token`, deployment_token);
+
+	  return deployment_token;
+  }
+
   const home_directory = os.homedir();
-  const session_token_path = `${home_directory}/.push/session_token`;
+  const session_token_path = `${home_directory}/.push/deployment_token`;
   const session_token_exists = await path_exists(session_token_path);
 
   if (session_token_exists) {
     return readFile(session_token_path, 'utf-8');
   }
- 
-  const { session_token } = await inquirer.prompt(session_token_prompt());
 
-  if (session_token) {
-	  if (!(await path_exists(`${home_directory}/.push`))) {
-	    await mkdir(`${home_directory}/.push`);
-	  }
-
-	  await writeFile(`${home_directory}/.push/session_token`, session_token);
-
-	  return session_token;
-  }
+  return null;
 };
 
-export default get_session_token;
+export default get_deployment_token;

package/src/commands/push_v2/get_push_domain.js

@@ -1,9 +1,8 @@
-const get_provision_domain = (provision_server = 'production') => {
+const get_push_domain = (push_server = 'production') => {
 	return {
 		development: 'http://localhost:2603',
-		staging: 'https://staging.provision.cheatcode.co',
-		production: 'https://provision.cheatcode.co',
-	}[provision_server];
+		production: 'https://push.cheatcode.co',
+	}[push_server];
 };
 
-export default get_provision_domain;
+export default get_push_domain;

package/src/commands/push_v2/index.js

@@ -1,167 +1,91 @@
-import chalk from 'chalk';
-import inquirer from "inquirer";
 import build from '../../lib/build/index.js';
 import cli_log from '../../lib/cli_log.js';
-import confirm_deployment_prompt from './prompts/confirm_deployment.js';
-import create_version from './create_version.js';
 import get_deployment from './get_deployment.js';
 import get_push_domain from './get_push_domain.js';
 import get_settings_file from './get_settings_file.js';
-import get_session_token from './get_session_token.js';
-import handle_initial_deployment from './handle_initial_deployment.js';
-import handle_version_deployment from './handle_version_deployment.js';
+import get_deployment_token from './get_deployment_token.js';
+import upload_build_to_push from './upload_build_to_push.js';
 import Loader from '../../lib/loader.js';
-import upload_build_to_cdn from './upload_build_to_cdn.js';
-import validate_deployment from './validate_deployment.js';
-import validate_push_config from './validate_push_config.js';
-import build_docker_image from './build_docker_image.js';
 
-const log_validation_error_response = (validation_type = '', root_error = '', validation_response = {}) => {
-	let errors_list = ``;
+const get_token_for_deployment = async (input_deployment_token = '') => {
+	const deployment_token = await get_deployment_token(input_deployment_token);
 
-	for (let i = 0; i < validation_response?.errors?.length; i += 1) {
-		const validation_error = validation_response?.errors[i];
-
-		if (validation_type === 'push_config') {
-			errors_list += `${chalk.yellowBright(`> ${validation_error.field}`)}\n`;
-		}
-
-		errors_list += `${validation_error?.error}\n${i + 1 === validation_response?.errors?.length ? '' : '\n'}`;
-	}
-
-	cli_log(
-    `${root_error ? `${chalk.yellowBright(root_error)}\n\n\n` : ''}${errors_list}`,
-    {
-      level: "danger",
-      docs: {
-      	push_config: "https://cheatcode.co/docs/push/config",
-      	deployment: "https://cheatcode.co/docs/push/subscription",
-      }[validation_type],
-    }
-  );
-
-  process.exit(0);
-};
-
-const get_session_for_deployment = async () => {
-	const session_token = await get_session_token();
-
-	if (!session_token) {
+	if (!deployment_token) {
     cli_log(
       data?.error?.message,
       {
         level: "danger",
-        docs: "https://cheatcode.co/docs/push/cli#authentication"
+        docs: "https://cheatcode.co/docs/push/authentication"
       }
     );
 
     return process.exit(0);
 	}
 
-	return session_token;
+	return deployment_token;
 };
 
-const warn_no_push_config = (environment = '') => {
-  cli_log(
-    `settings.${environment}.json must contain a push config object. Add this following the docs link below and try again.`,
-    {
-      level: "danger",
-      docs: "https://cheatcode.co/docs/push/config"
-    }
-  );
+const push = async (args = {}, options = {}) => {
+	if (!options?.domain) {
+    cli_log(
+      `Must pass a deployment via -d or --domain flag.`,
+      {
+        level: "danger",
+        docs: "https://cheatcode.co/docs/push/cli"
+      }
+    );
 
-  return process.exit(0);
-};
+    return process.exit(0);	
+	}
 
-const push = async (args = {}, options = {}) => {
 	process.loader = new Loader();
 	process.loader.print('Starting deployment...');
 
-	const session_token = await get_session_for_deployment();
+	const deployment_token = await get_token_for_deployment(options?.deployment_token);
 	const environment = options?.environment || 'production';
   const settings = await get_settings_file({ environment });
-	const push_settings = settings?.config?.push || {};
   const push_domain = get_push_domain(options?.push_server);
 
-	const deployment = {
-		domain: 'example.com',
-		status: 'undeployed',
-		deployment_secret: 'abc123',
-	} || await get_deployment({
-		domain: settings?.push?.domain,
-		session_token,
+	const deployment = await get_deployment({
+		domain: options?.domain,
+		deployment_token,
 		push_domain,
 	});
 
-	// NOTE: A bit hacky but removes need for weird if {} statement nesting.
-	const confirm_deployment = true;
-	// const { confirm_deployment } = { confirm_deployment: true } || deployment?.status === 'undeployed' ? await inquirer.prompt(
-	// 	confirm_deployment_prompt([] || push_config_validation_response?.instances)
-	// ) : { confirm_deployment: true };
+	console.log(deployment);
+
+	if (!deployment) {
+    cli_log(
+      `Sorry, we couldn\'t find a deployment with the domain ${options?.domain} on your account. If you haven\'t created it yet, head over to the Push dashboard: https://push.cheatcode.co/deployments/create`,
+      {
+        level: "danger",
+        docs: "https://cheatcode.co/docs/push/deployments/create-a-new-deployment"
+      }
+    );
 
-	if (confirm_deployment) {
-		// NOTE: Do this to create a gap between the confirmation text above (only applies if
-		// the deployment is a first-run).
-		if (deployment?.status === 'undeployed') {
-			console.log('\n');
-		}
+    return process.exit(0);		
+	}
 
-		const build_timestamp = new Date().toISOString();
+	const build_timestamp = new Date().toISOString();
 		
-		await build({
-			type: 'directory', // NOTE: Use this so we can copy it into the Docker image.
-			environment,
-			encrypt_build: true,
-			encryption_key: deployment?.deployment_secret,
-			silence_confirmation: true,
-		});
-
-		await build_docker_image(
-			`${deployment?.domain}:latest`,
-			process.cwd(), // NOTE: Dockerfile targets the .build directory.
-		);
-
-		// process.loader.print('Uploading version...');
-
-		// await upload_build_to_cdn(
-		// 	build_timestamp,
-		// 	deployment,
-		// 	session_token,
-		// );
-
-		// const create_version_response = await create_version({
-		// 	push_domain,
-		// 	domain: settings?.push?.domain,
-		// 	session_token,
-		// 	body: {
-		// 		// NOTE: Endpoint anticipates a stringified version of settings.
-		// 		settings: JSON.stringify(settings),
-		// 		build_timestamp,
-		// 	},
-		// });
-
-		// process.loader.print('Deploying app...');
-
-		// if (deployment?.status === 'undeployed') {
-		// 	return handle_initial_deployment({
-		// 		push_domain,
-		// 		push_domain,
-		// 		session_token,
-		// 		environment,
-		// 		build_timestamp,
-		// 		deployment,
-		// 	});
-		// }
-
-		// return handle_version_deployment({
-		// 	push_domain,
-		// 	push_domain,
-		// 	session_token,
-		// 	environment,
-		// 	build_timestamp,
-		// 	deployment,
-		// });
-	}
+	await build({
+		environment,
+		encrypt_build: true,
+		encryption_key: deployment?.deployment_secret,
+		silence_confirmation: true,
+	});
+
+	process.loader.print('Deploying to Push...');
+
+	// await upload_build_to_push({
+	// 	build_timestamp,
+	// 	deployment,
+	// 	deployment_token,
+	// 	push_domain,
+	// 	settings,
+	// });
+
+	process.loader.print(deployment?.intial_deployment_completed ? `Deploying. Monitor your deployment at ${push_domain}/deployments/${deployment?._id}.` : `Deploying. Finish your deployment's setup at ${push_domain}/deployments/${deployment?._id}/setup.`);
 };
 
 export default push;

package/src/commands/push_v2/upload_build_to_push.js

@@ -0,0 +1,36 @@
+import fetch from "node-fetch";
+import FormData from "form-data";
+import fs from "fs";
+import _ from 'lodash';
+
+const { readFile } = fs.promises;
+
+const upload_build_to_push = async (options = {}) => {
+  const form_data = new FormData();
+
+  form_data.append(
+    "version_tar",
+    await readFile(`.build/build.encrypted.tar.gz`),
+    `${options?.build_timestamp}.tar.gz`
+  );
+
+  form_data.append("build_timestamp", options?.build_timestamp);
+  form_data.append("domain", options?.deployment?.domain);
+  form_data.append("deployment_id", options?.deployment?._id);
+
+  return fetch(`${options?.push_domain}/api/deploy`, {
+   method: "POST",
+   headers: {
+     ...form_data.getHeaders(),
+     "x-push-deployment-token": options?.deployment_token,
+   },
+   body: form_data,
+  }).then(async (response) => {
+   const data = await response.json();
+   return data?.data;
+  }).catch((error) => {
+    console.warn(error);
+  });
+};
+
+export default upload_build_to_push;

package/dist/commands/push_v2/get_session_token.js

@@ -1 +0,0 @@
-import i from"os";import n from"fs";import r from"inquirer";import e from"../../lib/path_exists.js";import p from"./prompts/session_token.js";const{readFile:m,mkdir:a,writeFile:_}=n.promises,f=async()=>{const s=i.homedir(),t=`${s}/.push/session_token`;if(await e(t))return m(t,"utf-8");const{session_token:o}=await r.prompt(p());if(o)return await e(`${s}/.push`)||await a(`${s}/.push`),await _(`${s}/.push/session_token`,o),o};var x=f;export{x as default};

package/dist/commands/push_v2/upload_build_to_cdn.js

@@ -1 +0,0 @@
-import n from"node-fetch";import i from"form-data";import d from"fs";import m from"lodash";import c from"./cdn_mirrors.js";const{readFile:l}=d.promises,p=async()=>{const a=(await Promise.allSettled(c?.map(async t=>{const o=new AbortController;setTimeout(()=>o.abort(),2e3);const e=await n(`${t}/api/ping`,{signal:o.signal}).catch(r=>({status:503}));return{mirror:t,status:e.status}})))?.map(t=>t.value);return m.orderBy(a,["status","mirror"])[0]},u=async(a="",t={},o="")=>{const e=await p(),r=new i;return r.append("version_tar",await l(".build/build.encrypted.tar.gz"),`${a}.tar.gz`),r.append("build_timestamp",a),r.append("domain",t?.domain),r.append("deployment_id",t?._id),n(`${e?.mirror}/api/versions`,{method:"POST",headers:{...r.getHeaders(),"x-push-session-token":o},body:r}).then(async s=>(await s.json())?.data).catch(s=>{console.warn(s)})};var y=u;export{y as default};

package/src/commands/push_v2/upload_build_to_cdn.js

@@ -1,59 +0,0 @@
-import fetch from "node-fetch";
-import FormData from "form-data";
-import fs from "fs";
-import _ from 'lodash';
-import cdn_mirrors from './cdn_mirrors.js';
-
-const { readFile } = fs.promises;
-
-const get_first_available_mirror = async () => {
-  const results = (await Promise.allSettled(cdn_mirrors?.map(async (mirror) => {
-    const controller = new AbortController();
-    setTimeout(() => controller.abort(), 2000);
-    
-    const result = await fetch(`${mirror}/api/ping`, { signal: controller.signal }).catch((error) => {
-      return { status: 503 };
-    });
-
-    return {
-      mirror,
-      status: result.status,
-    };
-  })))?.map((result) => {
-    return result.value;
-  });
-
-  return _.orderBy(results, ['status', 'mirror'])[0];
-};
-
-const upload_build_to_cdn = async (build_timestamp = '', deployment = {}, session_token = '') => {
-  const first_available_mirror = await get_first_available_mirror();
-  const form_data = new FormData();
-
-  form_data.append(
-    "version_tar",
-    await readFile(`.build/build.encrypted.tar.gz`),
-    `${build_timestamp}.tar.gz`
-  );
-
-  form_data.append("build_timestamp", build_timestamp);
-  form_data.append("domain", deployment?.domain);
-  form_data.append("deployment_id", deployment?._id);
-
-  return fetch(`${first_available_mirror?.mirror}/api/versions`, {
-   method: "POST",
-   headers: {
-     ...form_data.getHeaders(),
-     "x-push-session-token": session_token,
-   },
-   body: form_data,
-  }).then(async (response) => {
-   const data = await response.json();
-   return data?.data;
-  }).catch((error) => {
-    console.warn(error);
-  });
-};
-
-export default upload_build_to_cdn;
-