@joystick.js/cli-canary 0.0.0-canary.659 → 0.0.0-canary.660

package/dist/lib/development_server/databases/mongodb/index.js

@@ -1,5 +1,5 @@
-import a from"child_process";import g from"fs";import p from"../../../cli_log.js";import l from"../../../command_exists.js";import f from"../../../get_platform_safe_path.js";import u from"../../../get_process_id_from_port.js";import w from"../../../kill_port_process.js";import r from"../../../path_exists.js";const{rename:y,readdir:b,mkdir:h}=g.promises,k=()=>{p(` MongoDB is not installed on this computer.
+import e from"child_process";import m from"fs";import _ from"../../../cli_log.js";import g from"../../../command_exists.js";import p from"../../../get_platform_safe_path.js";import l from"../../../get_process_id_from_port.js";import f from"../../../kill_port_process.js";import a from"../../../path_exists.js";const{rename:u,readdir:w,mkdir:y}=m.promises,b=()=>{_(` MongoDB is not installed on this computer.
 
  Download MongoDB at https://www.mongodb.com/try/download/community
 
- After you've installed MongoDB, run joystick start again, or, remove MongoDB from your config.databases array in your settings.development.json file to skip starting it up.`,{level:"danger",docs:"https://github.com/cheatcode/joystick#databases"})},v=async()=>{if(process.platform==="win32"){const o=await i();return o&&o.length>0}return l("mongod")},i=async()=>await b("C:\\Program Files\\MongoDB\\Server\\"),x=(o=[])=>process.platform==="win32"&&["6.0","7.0","8.0","9.0","10.0"].some(t=>o.includes(t))?"mongosh":"mongo",j=(o=2610,s=[])=>new Promise(t=>{const n=["--port",o,"--dbpath",f(`./.joystick/data/mongodb_${o}`),"--quiet","--replSet",`joystick_${o}`];a.spawn("mongod",n.filter(e=>!!e)).stdout.on("data",async e=>{if((e?.toString()).includes("Waiting for connections")){const c=x(s);a.exec(`${c} --eval "rs.initiate()" --verbose --port ${o}`,async(d,S,m)=>{if(!(d||m)){const _=await u(o);return t(parseInt(_,10))}})}})}),$=async(o=2610)=>{const s=await r(".joystick/data/mongodb"),t=await r(`.joystick/data/mongodb_${o}`);return s&&!t&&await y(".joystick/data/mongodb",`.joystick/data/mongodb_${o}`),t||await h(`.joystick/data/mongodb_${o}`,{recursive:!0}),t},D=async(o=2610)=>{const s=await v(),t=process.platform==="win32"?await i():null;s||(k(),process.exit(1)),await $(o);try{return await w(o),await j(o,t)}catch(n){console.warn(n),process.exit(1)}};var E=D;export{E as default};
+ After you've installed MongoDB, run joystick start again, or, remove MongoDB from your config.databases array in your settings.development.json file to skip starting it up.`,{level:"danger",docs:"https://github.com/cheatcode/joystick#databases"})},h=async()=>{if(process.platform==="win32"){const o=await i();return o&&o.length>0}return g("mongod")},i=async()=>await w("C:\\Program Files\\MongoDB\\Server\\"),k=(o=[])=>process.platform==="win32"&&["6.0","7.0","8.0","9.0","10.0"].some(t=>o.includes(t))?"mongosh":"mongo",v=(o=2610,s=[])=>new Promise(t=>{const n=["--port",o,"--dbpath",p(`./.joystick/data/mongodb_${o}`),"--quiet","--replSet",`joystick_${o}`];e.spawn("mongod",n.filter(r=>!!r)).stdout.on("data",async r=>{if((r?.toString()).includes("Waiting for connections")){const c=k(s);e.exec(`${c} --eval "rs.initiate()" --verbose --port ${o}`,async(B,M,S)=>{const d=await l(o);return t(parseInt(d,10))})}})}),x=async(o=2610)=>{const s=await a(".joystick/data/mongodb"),t=await a(`.joystick/data/mongodb_${o}`);return s&&!t&&await u(".joystick/data/mongodb",`.joystick/data/mongodb_${o}`),t||await y(`.joystick/data/mongodb_${o}`,{recursive:!0}),t},j=async(o=2610)=>{const s=await h(),t=process.platform==="win32"?await i():null;s||(b(),process.exit(1)),await x(o);try{return await f(o),await v(o,t)}catch(n){console.warn(n),process.exit(1)}};var E=j;export{E as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.659",
+  "version": "0.0.0-canary.660",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/lib/development_server/databases/mongodb/index.js

@@ -68,12 +68,8 @@ const start_mongodb_process = (mongodb_port = 2610, mongodb_windows_versions = [
       if (stdout.includes('Waiting for connections')) {
         const mongo_command = get_mongo_command(mongodb_windows_versions);
         child_process.exec(`${mongo_command} --eval "rs.initiate()" --verbose --port ${mongodb_port}`, async (error, _stdout, stderr) => {
-          if (error || stderr) {
-            // NOTE: Just capture error as it means the replicaSet is already initialized.
-          } else {
-            const process_id = await get_process_id_from_port(mongodb_port);
-            return resolve(parseInt(process_id, 10));
-          }
+          const process_id = await get_process_id_from_port(mongodb_port);
+          return resolve(parseInt(process_id, 10));
         });
       }
     });