@joystick.js/cli-canary 0.0.0-canary.1651 → 0.0.0-canary.1653

package/.build/index.js

@@ -45,6 +45,7 @@ const files = filesToBuild.map((path) => {
 
   const copyPaths = [
     getPlatformSafePath("commands/create/template"),
+    getPlatformSafePath("commands/push_v2/Dockerfile"), // TODO: Convert to just push/Dockerfile.
   ];
 
   const isCopyPath = copyPaths.some((copyPath) => {

package/dist/commands/push_v2/Dockerfile

@@ -0,0 +1,68 @@
+# Use Ubuntu 24.04 as the base image
+FROM ubuntu:24.04
+
+# Avoid prompts from apt
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Set up environment variables
+ENV NODE_VERSION=20.x
+
+# Install Node.js 20, common dependencies, and snapd
+RUN apt-get update && apt-get install -y \
+    curl \
+    zip \
+    unzip \
+    git \
+    build-essential \
+    snapd \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Verify Node.js version
+RUN node --version
+
+# Initialize snap
+RUN snap install core
+
+# Allow custom apt dependencies to be passed as build argument
+ARG CUSTOM_APT_DEPS=""
+
+# Install custom apt dependencies if provided
+RUN if [ ! -z "$CUSTOM_APT_DEPS" ]; then \
+        apt-get update && apt-get install -y $CUSTOM_APT_DEPS \
+        && apt-get clean \
+        && rm -rf /var/lib/apt/lists/*; \
+    fi
+
+# Allow custom snap dependencies to be passed as build argument
+ARG CUSTOM_SNAP_DEPS=""
+
+# Install custom snap dependencies if provided
+RUN if [ ! -z "$CUSTOM_SNAP_DEPS" ]; then \
+        snap install $CUSTOM_SNAP_DEPS; \
+    fi
+
+# Allow custom global npm packages to be passed as build argument
+ARG GLOBAL_NPM_PACKAGES=""
+
+# Install custom global npm packages if provided
+RUN if [ ! -z "$GLOBAL_NPM_PACKAGES" ]; then \
+        npm install -g $GLOBAL_NPM_PACKAGES; \
+    fi
+
+# Set the working directory in the container
+WORKDIR .
+
+# Copy the pre-built application
+COPY ./.build .
+
+# Expose the port the app runs on
+EXPOSE 2600
+
+# Note: Environment variables (JOYSTICK_SETTINGS, PUSH_INSTANCE_TOKEN)
+# will be passed at runtime via the container.env file
+
+# Command to run the application
+CMD ["node", "index.server.js"]

package/dist/commands/push_v2/build_docker_image.js

@@ -0,0 +1 @@
+import{exec as u}from"child_process";import i from"path";import{fileURLToPath as $}from"url";import"https";import g from"fs";import h from"os";import"tar";import"adm-zip";const y=$(import.meta.url),c=i.dirname(y),O=i.join(h.homedir(),".joystick","docker"),D=(t="",a="",{apt_deps:s=[],snap_deps:d=[],npm_deps:l=[]}={})=>new Promise(async(m,r)=>{if(!check_docker_installation()){process.loader.print("Push requires Docker to be installed on your machine. Downloading...");try{await get_docker_binary(),process.loader.print("Docker installed!")}catch(o){r(new Error(`Failed to download Docker binary: ${o.message}`));return}}process.loader.print("Building Docker image for deployment...");const p=get_docker_binary_path(),e=i.join(c,"Dockerfile");if(!g.existsSync(e)){r(new Error(`Dockerfile not found at ${e}`));return}const f=[`CUSTOM_APT_DEPS=${s.join(" ")}`,`CUSTOM_SNAP_DEPS=${d.join(" ")}`,`GLOBAL_NPM_PACKAGES=${l.join(" ")}`].map(o=>`--build-arg ${o}`).join(" "),_=`"${p}" build ${f} -t ${t} -f "${e}" "${a||c}"`;u(_,(o,k,n)=>{if(o){console.error(`Error building Docker image: ${o.message}`),r(o);return}n&&console.error(`Docker build stderr: ${n}`),process.loader.print(k),process.loader.print(`Successfully built Docker image: ${t}`),m()})});var U=D;export{U as default};

package/dist/commands/push_v2/index.js

@@ -1,8 +1,8 @@
-import p from"chalk";import"inquirer";import m from"../../lib/build/index.js";import i 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 l from"./get_settings_file.js";import a 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";const P=(o="",t="",s={})=>{let e="";for(let n=0;n<s?.errors?.length;n+=1){const r=s?.errors[n];o==="push_config"&&(e+=`${p.yellowBright(`> ${r.field}`)}
-`),e+=`${r?.error}
-${n+1===s?.errors?.length?"":`
-`}`}i(`${t?`${p.yellowBright(t)}
+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 a();return o||(i(data?.error?.message,{level:"danger",docs:"https://cheatcode.co/docs/push/cli#authentication"}),process.exit(0))},Q=(o="")=>(i(`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)),f=async(o={},t={})=>{process.loader=new _,process.loader.print("Starting deployment...");const s=await u(),e=t?.environment||"production",r=(await l({environment:e}))?.config?.push||{},g=d(t?.push_server),c={status:"undeployed",deployment_secret:"abc123"};if(!0){c?.status==="undeployed"&&console.log(`
-`);const y=new Date().toISOString();await m({environment:e,encrypt_build:!0,encryption_key:c?.deployment_secret,silence_confirmation:!0}),console.log("Now do the docker build.")}};var R=f;export{R as default};
+`:""}${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,process.cwd())}};var U=g;export{U as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1651",
-  "canary_version": "0.0.0-canary.1650",
+  "version": "0.0.0-canary.1653",
+  "canary_version": "0.0.0-canary.1652",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {
@@ -19,6 +19,7 @@
   "dependencies": {
     "@babel/code-frame": "^7.23.5",
     "acorn": "^8.11.2",
+    "adm-zip": "^0.5.15",
     "ascii-table": "^0.0.9",
     "ava": "^6.0.1",
     "chalk": "^5.3.0",
@@ -31,6 +32,7 @@
     "node-fetch": "^3.3.2",
     "pg": "^8.11.3",
     "query-string": "^8.1.0",
+    "tar": "^7.4.3",
     "ws": "^8.15.1"
   }
 }

package/src/commands/push_v2/Dockerfile

@@ -0,0 +1,68 @@
+# Use Ubuntu 24.04 as the base image
+FROM ubuntu:24.04
+
+# Avoid prompts from apt
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Set up environment variables
+ENV NODE_VERSION=20.x
+
+# Install Node.js 20, common dependencies, and snapd
+RUN apt-get update && apt-get install -y \
+    curl \
+    zip \
+    unzip \
+    git \
+    build-essential \
+    snapd \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Verify Node.js version
+RUN node --version
+
+# Initialize snap
+RUN snap install core
+
+# Allow custom apt dependencies to be passed as build argument
+ARG CUSTOM_APT_DEPS=""
+
+# Install custom apt dependencies if provided
+RUN if [ ! -z "$CUSTOM_APT_DEPS" ]; then \
+        apt-get update && apt-get install -y $CUSTOM_APT_DEPS \
+        && apt-get clean \
+        && rm -rf /var/lib/apt/lists/*; \
+    fi
+
+# Allow custom snap dependencies to be passed as build argument
+ARG CUSTOM_SNAP_DEPS=""
+
+# Install custom snap dependencies if provided
+RUN if [ ! -z "$CUSTOM_SNAP_DEPS" ]; then \
+        snap install $CUSTOM_SNAP_DEPS; \
+    fi
+
+# Allow custom global npm packages to be passed as build argument
+ARG GLOBAL_NPM_PACKAGES=""
+
+# Install custom global npm packages if provided
+RUN if [ ! -z "$GLOBAL_NPM_PACKAGES" ]; then \
+        npm install -g $GLOBAL_NPM_PACKAGES; \
+    fi
+
+# Set the working directory in the container
+WORKDIR .
+
+# Copy the pre-built application
+COPY ./.build .
+
+# Expose the port the app runs on
+EXPOSE 2600
+
+# Note: Environment variables (JOYSTICK_SETTINGS, PUSH_INSTANCE_TOKEN)
+# will be passed at runtime via the container.env file
+
+# Command to run the application
+CMD ["node", "index.server.js"]

package/src/commands/push_v2/build_docker_image.js

@@ -0,0 +1,73 @@
+import { exec, execSync } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import https from 'https';
+import fs from 'fs';
+import os from 'os';
+import tar from 'tar';
+import AdmZip from 'adm-zip';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const joystick_docker_path = path.join(os.homedir(), '.joystick', 'docker');
+
+// ... (previous functions remain the same)
+
+const build_docker_image = (
+  image_name = '',
+  context_path = '',
+  {
+    apt_deps = [],
+    snap_deps = [],
+    npm_deps = []
+  } = {}
+) => {
+  return new Promise(async (resolve, reject) => {
+    if (!check_docker_installation()) {
+      process.loader.print('Push requires Docker to be installed on your machine. Downloading...');
+      try {
+        await get_docker_binary();
+        process.loader.print('Docker installed!');
+      } catch (error) {
+        reject(new Error(`Failed to download Docker binary: ${error.message}`));
+        return;
+      }
+    }
+
+    process.loader.print('Building Docker image for deployment...');
+    
+    const docker_path = get_docker_binary_path();
+    const dockerfile_path = path.join(__dirname, 'Dockerfile');
+    
+    if (!fs.existsSync(dockerfile_path)) {
+      reject(new Error(`Dockerfile not found at ${dockerfile_path}`));
+      return;
+    }
+
+    // Prepare build arguments for dependencies
+    const build_args = [
+      `CUSTOM_APT_DEPS=${apt_deps.join(' ')}`,
+      `CUSTOM_SNAP_DEPS=${snap_deps.join(' ')}`,
+      `GLOBAL_NPM_PACKAGES=${npm_deps.join(' ')}`
+    ].map(arg => `--build-arg ${arg}`).join(' ');
+
+    const command = `"${docker_path}" build ${build_args} -t ${image_name} -f "${dockerfile_path}" "${context_path || __dirname}"`;
+
+    exec(command, (error, stdout, stderr) => {
+      if (error) {
+        console.error(`Error building Docker image: ${error.message}`);
+        reject(error);
+        return;
+      }
+      if (stderr) {
+        console.error(`Docker build stderr: ${stderr}`);
+      }
+      process.loader.print(stdout);
+      process.loader.print(`Successfully built Docker image: ${image_name}`);
+      resolve();
+    });
+  });
+};
+
+export default build_docker_image;

package/src/commands/push_v2/index.js

@@ -14,6 +14,7 @@ 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 = ``;
@@ -83,6 +84,7 @@ const push = async (args = {}, options = {}) => {
   const push_domain = get_push_domain(options?.push_server);
 
 	const deployment = {
+		domain: 'example.com',
 		status: 'undeployed',
 		deployment_secret: 'abc123',
 	} || await get_deployment({
@@ -107,13 +109,17 @@ const push = async (args = {}, options = {}) => {
 		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,
 		});
 
-		console.log('Now do the docker build.');
+		await build_docker_image(
+			deployment?.domain,
+			process.cwd(), // NOTE: Dockerfile targets the .build directory.
+		);
 
 		// process.loader.print('Uploading version...');