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

package/dist/commands/push_v2/build_docker_image.js

@@ -1 +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};
+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};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1653",
-  "canary_version": "0.0.0-canary.1652",
+  "version": "0.0.0-canary.1655",
+  "canary_version": "0.0.0-canary.1654",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {
@@ -32,7 +32,6 @@
     "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/build_docker_image.js

@@ -12,7 +12,78 @@ const __dirname = path.dirname(__filename);
 
 const joystick_docker_path = path.join(os.homedir(), '.joystick', 'docker');
 
-// ... (previous functions remain the same)
+const get_docker_binary_path = () => {
+  return path.join(joystick_docker_path, os.platform() === 'win32' ? 'docker.exe' : 'docker');
+};
+
+const check_docker_installation = () => {
+  const docker_path = get_docker_binary_path();
+  try {
+    execSync(`"${docker_path}" --version`, { stdio: 'ignore' });
+    return true;
+  } catch (error) {
+    console.warn('Warning: Docker is not installed or the binary is not accessible.');
+    return false;
+  }
+};
+
+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();
+  let url;
+  let archive_name;
+
+  if (platform === 'linux') {
+    url = `https://download.docker.com/linux/static/stable/${arch}/docker-24.0.7.tgz`;
+    archive_name = 'docker.tgz';
+  } else if (platform === 'darwin') {
+    url = `https://download.docker.com/mac/static/stable/${arch}/docker-24.0.7.tgz`;
+    archive_name = 'docker.tgz';
+  } else if (platform === 'win32') {
+    url = 'https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip';
+    archive_name = 'docker.zip';
+  } else {
+    throw new Error('Unsupported operating system');
+  }
+
+  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
+    });
+  }
+
+  fs.unlinkSync(archive_path);
+
+  // 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}`);
+};
 
 const build_docker_image = (
   image_name = '',