@joystick.js/cli-canary 0.0.0-canary.1655 → 0.0.0-canary.1656

package/dist/commands/push_v2/build_docker_image.js

@@ -1 +1 @@
-import{exec as y,execSync as $}from"child_process";import l from"path";import{fileURLToPath as b}from"url";import D from"https";import a from"fs";import d from"os";import S from"tar";import x from"adm-zip";const P=b(import.meta.url),u=l.dirname(P),s=l.join(d.homedir(),".joystick","docker"),k=()=>l.join(s,d.platform()==="win32"?"docker.exe":"docker"),j=()=>{const o=k();try{return $(`"${o}" --version`,{stdio:"ignore"}),!0}catch{return console.warn("Warning: Docker is not installed or the binary is not accessible."),!1}},z=(o,e)=>new Promise((t,i)=>{const r=a.createWriteStream(e);D.get(o,c=>{c.pipe(r),r.on("finish",()=>{r.close(t)})}).on("error",c=>{a.unlink(e,()=>i(c))})}),A=async()=>{const o=d.platform(),e=d.arch();let t,i;if(o==="linux")t=`https://download.docker.com/linux/static/stable/${e}/docker-24.0.7.tgz`,i="docker.tgz";else if(o==="darwin")t=`https://download.docker.com/mac/static/stable/${e}/docker-24.0.7.tgz`,i="docker.tgz";else if(o==="win32")t="https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip",i="docker.zip";else throw new Error("Unsupported operating system");a.mkdirSync(s,{recursive:!0});const r=l.join(s,i);await z(t,r),o==="win32"?new x(r).extractAllTo(s,!0):await S.x({file:r,cwd:s,strip:1}),a.unlinkSync(r),o!=="win32"&&a.chmodSync(k(),"755"),process.loader.print(`Docker binaries downloaded and extracted to ${s}`)},E=(o="",e="",{apt_deps:t=[],snap_deps:i=[],npm_deps:r=[]}={})=>new Promise(async(c,p)=>{if(!j()){process.loader.print("Push requires Docker to be installed on your machine. Downloading...");try{await A(),process.loader.print("Docker installed!")}catch(n){p(new Error(`Failed to download Docker binary: ${n.message}`));return}}process.loader.print("Building Docker image for deployment...");const _=k(),m=l.join(u,"Dockerfile");if(!a.existsSync(m)){p(new Error(`Dockerfile not found at ${m}`));return}const h=[`CUSTOM_APT_DEPS=${t.join(" ")}`,`CUSTOM_SNAP_DEPS=${i.join(" ")}`,`GLOBAL_NPM_PACKAGES=${r.join(" ")}`].map(n=>`--build-arg ${n}`).join(" "),w=`"${_}" build ${h} -t ${o} -f "${m}" "${e||u}"`;y(w,(n,g,f)=>{if(n){console.error(`Error building Docker image: ${n.message}`),p(n);return}f&&console.error(`Docker build stderr: ${f}`),process.loader.print(g),process.loader.print(`Successfully built Docker image: ${o}`),c()})});var G=E;export{G as default};
+import{exec as g,execSync as $}from"child_process";import l from"path";import{fileURLToPath as b}from"url";import n from"fs";import p from"os";import D from"tar";import x from"adm-zip";import{promisify as S}from"util";import{pipeline as E}from"stream";import P from"node-fetch";const j=S(E),z=b(import.meta.url),u=l.dirname(z),a=l.join(p.homedir(),".joystick","docker"),f=()=>l.join(a,p.platform()==="win32"?"docker.exe":"docker"),A=()=>{const r=f();try{return $(`"${r}" --version`,{stdio:"ignore"}),!0}catch{return console.warn("Warning: Docker is not installed or the binary is not accessible."),!1}},T=async()=>{const r=p.platform(),s=p.arch();let t,c;if(r==="linux")t=`https://download.docker.com/linux/static/stable/${s}/docker-24.0.7.tgz`,c="docker.tgz";else if(r==="darwin")t=`https://download.docker.com/mac/static/stable/${s}/docker-24.0.7.tgz`,c="docker.tgz";else if(r==="win32")t="https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip",c="docker.zip";else throw new Error("Unsupported operating system");n.mkdirSync(a,{recursive:!0});const o=l.join(a,c);try{process.loader.print(`Downloading Docker binary from ${t}`);const e=await P(t);if(!e.ok)throw new Error(`Unexpected response ${e.statusText}`);await j(e.body,n.createWriteStream(o)),process.loader.print("Download completed"),r==="win32"?(process.loader.print("Extracting ZIP file"),new x(o).extractAllTo(a,!0)):(process.loader.print("Extracting TAR file"),await D.x({file:o,cwd:a,strip:1})),n.unlinkSync(o),r!=="win32"&&n.chmodSync(f(),"755"),process.loader.print(`Docker binaries downloaded and extracted to ${a}`)}catch(e){throw process.loader.print(`Error: ${e.message}`),n.existsSync(o)&&(process.loader.print("Cleaning up partial download"),n.unlinkSync(o)),new Error(`Failed to download or extract Docker binary: ${e.message}`)}},U=(r="",s="",{apt_deps:t=[],snap_deps:c=[],npm_deps:o=[]}={})=>new Promise(async(e,d)=>{if(!A()){process.loader.print("Push requires Docker to be installed on your machine. Downloading...");try{await T(),process.loader.print("Docker installed!")}catch(i){d(new Error(`Failed to download Docker binary: ${i.message}`));return}}process.loader.print("Building Docker image for deployment...");const w=f(),m=l.join(u,"Dockerfile");if(!n.existsSync(m)){d(new Error(`Dockerfile not found at ${m}`));return}const h=[`CUSTOM_APT_DEPS=${t.join(" ")}`,`CUSTOM_SNAP_DEPS=${c.join(" ")}`,`GLOBAL_NPM_PACKAGES=${o.join(" ")}`].map(i=>`--build-arg ${i}`).join(" "),_=`"${w}" build ${h} -t ${r} -f "${m}" "${s||u}"`;g(_,(i,y,k)=>{if(i){console.error(`Error building Docker image: ${i.message}`),d(i);return}k&&console.error(`Docker build stderr: ${k}`),process.loader.print(y),process.loader.print(`Successfully built Docker image: ${r}`),e()})});var W=U;export{W as default};

package/dist/commands/push_v2/index.js

@@ -5,4 +5,4 @@ ${n+1===r?.errors?.length?"":`
 
 
 `:""}${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};
+`);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};

package/package.json

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

package/src/commands/push_v2/build_docker_image.js

@@ -1,11 +1,15 @@
 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';
+import { promisify } from 'util';
+import { pipeline } from 'stream';
+import fetch from 'node-fetch';
+
+const streamPipeline = promisify(pipeline);
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -27,20 +31,6 @@ const check_docker_installation = () => {
   }
 };
 
-const download_file = (url, dest) => {
-  return new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(dest);
-    https.get(url, (response) => {
-      response.pipe(file);
-      file.on('finish', () => {
-        file.close(resolve);
-      });
-    }).on('error', (error) => {
-      fs.unlink(dest, () => reject(error));
-    });
-  });
-};
-
 const get_docker_binary = async () => {
   const platform = os.platform();
   const arch = os.arch();
@@ -62,27 +52,43 @@ const get_docker_binary = async () => {
 
   fs.mkdirSync(joystick_docker_path, { recursive: true });
   const archive_path = path.join(joystick_docker_path, archive_name);
-  await download_file(url, archive_path);
 
-  if (platform === 'win32') {
-    const zip = new AdmZip(archive_path);
-    zip.extractAllTo(joystick_docker_path, true);
-  } else {
-    await tar.x({
-      file: archive_path,
-      cwd: joystick_docker_path,
-      strip: 1
-    });
-  }
+  try {
+    process.loader.print(`Downloading Docker binary from ${url}`);
+    const response = await fetch(url);
+    if (!response.ok) throw new Error(`Unexpected response ${response.statusText}`);
+    await streamPipeline(response.body, fs.createWriteStream(archive_path));
+    process.loader.print('Download completed');
+
+    if (platform === 'win32') {
+      process.loader.print('Extracting ZIP file');
+      const zip = new AdmZip(archive_path);
+      zip.extractAllTo(joystick_docker_path, true);
+    } else {
+      process.loader.print('Extracting TAR file');
+      await tar.x({
+        file: archive_path,
+        cwd: joystick_docker_path,
+        strip: 1
+      });
+    }
 
-  fs.unlinkSync(archive_path);
+    fs.unlinkSync(archive_path);
 
-  // Make the docker binary executable on Unix-like systems
-  if (platform !== 'win32') {
-    fs.chmodSync(get_docker_binary_path(), '755');
-  }
+    // Make the docker binary executable on Unix-like systems
+    if (platform !== 'win32') {
+      fs.chmodSync(get_docker_binary_path(), '755');
+    }
 
-  process.loader.print(`Docker binaries downloaded and extracted to ${joystick_docker_path}`);
+    process.loader.print(`Docker binaries downloaded and extracted to ${joystick_docker_path}`);
+  } catch (error) {
+    process.loader.print(`Error: ${error.message}`);
+    if (fs.existsSync(archive_path)) {
+      process.loader.print('Cleaning up partial download');
+      fs.unlinkSync(archive_path);
+    }
+    throw new Error(`Failed to download or extract Docker binary: ${error.message}`);
+  }
 };
 
 const build_docker_image = (

package/src/commands/push_v2/index.js

@@ -117,7 +117,7 @@ const push = async (args = {}, options = {}) => {
 		});
 
 		await build_docker_image(
-			deployment?.domain,
+			`${deployment?.domain}:latest`,
 			process.cwd(), // NOTE: Dockerfile targets the .build directory.
 		);