defang 0.5.15 → 0.5.18

package/bin/cli.js

@@ -18,10 +18,17 @@ function getPathToExecutable() {
     }
 }
 function run() {
-    const args = process.argv.slice(2);
-    const processResult = child_process.spawnSync(getPathToExecutable(), args, {
-        stdio: "inherit",
-    });
-    process.exit(processResult.status ?? 0);
+    try {
+        const args = process.argv.slice(2);
+        const processResult = child_process.spawnSync(getPathToExecutable(), args, {
+            stdio: "inherit",
+        });
+        processResult.error && console.error(processResult.error);
+        process.exitCode = processResult.status ?? 1;
+    }
+    catch (error) {
+        console.error(error);
+        process.exitCode = 2;
+    }
 }
 run();

package/bin/installer.js

@@ -1,20 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("graceful-fs");
 const os = require("os");
 const path = require("path");
 const tar = require("tar");
 const AdmZip = require("adm-zip");
 const axios_1 = require("axios");
+const fs_1 = require("fs");
 async function downloadAppArchive(version, archiveFilename, outputPath) {
-    const repo = "defang-io/defang";
+    const repo = "DefangLabs/defang";
     const downloadUrl = `https://github.com/${repo}/releases/download/v${version}/${archiveFilename}`;
     const downloadTargetFile = path.join(outputPath, archiveFilename);
     return downloadFile(downloadUrl, downloadTargetFile);
 }
 async function downloadFile(downloadUrl, downloadTargetFile) {
     try {
-        const writeFileStream = fs.createWriteStream(downloadTargetFile);
         console.log(`Downloading ${downloadUrl}`);
         const response = await axios_1.default.get(downloadUrl, {
             responseType: "arraybuffer",
@@ -25,12 +24,12 @@ async function downloadFile(downloadUrl, downloadTargetFile) {
         if (response?.data === undefined) {
             throw new Error(`Failed to download ${downloadUrl}. No data in response.`);
         }
-        fs.writeFileSync(downloadTargetFile, response.data);
+        await fs_1.promises.writeFile(downloadTargetFile, response.data);
         return downloadTargetFile;
     }
     catch (error) {
-        console.error(`Failed to download ${downloadUrl}. ${error}`);
-        fs.unlinkSync(downloadTargetFile);
+        console.error(error);
+        await fs_1.promises.unlink(downloadTargetFile);
         return "";
     }
 }
@@ -76,11 +75,11 @@ function extractTarGz(tarGzFilePath, outputPath) {
         return false;
     }
 }
-function deleteArchive(archiveFilePath) {
-    fs.unlinkSync(archiveFilePath);
+async function deleteArchive(archiveFilePath) {
+    await fs_1.promises.unlink(archiveFilePath);
 }
-function getVersion(filename) {
-    const data = fs.readFileSync(filename, "utf8");
+async function getVersion(filename) {
+    const data = await fs_1.promises.readFile(filename, "utf8");
     const pkg = JSON.parse(data);
     return pkg.version;
 }
@@ -118,7 +117,7 @@ function getAppArchiveFilename(version, platform, arch) {
 async function install() {
     try {
         console.log(`Starting install of defang cli`);
-        const version = getVersion("package.json");
+        const version = await getVersion("package.json");
         const filename = getAppArchiveFilename(version, os.platform(), os.arch());
         const archiveFile = await downloadAppArchive(version, filename, __dirname);
         if (archiveFile.length === 0) {
@@ -129,11 +128,10 @@ async function install() {
             throw new Error(`Failed to install binaries!`);
         }
         console.log(`Successfully installed defang cli!`);
-        deleteArchive(archiveFile);
+        await deleteArchive(archiveFile);
     }
     catch (error) {
         console.error(error);
-        process.exit(1);
     }
 }
 install();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defang",
-  "version": "0.5.15",
+  "version": "0.5.18",
   "author": "Defang Software Labs Inc.",
   "description": "CLI for the Defang Opinionated Platform",
   "license": "MIT",
@@ -8,13 +8,13 @@
     "defang": "./bin/cli.js"
   },
   "keywords": [],
-  "homepage": "https://github.com/defang-io/defang#readme",
+  "homepage": "https://github.com/DefangLabs/defang#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/defang-io/defang.git"
+    "url": "git+https://github.com/DefangLabs/defang.git"
   },
   "bugs": {
-    "url": "https://github.com/defang-io/defang/issues"
+    "url": "https://github.com/DefangLabs/defang/issues"
   },
   "scripts": {
     "build": "tsc",
@@ -23,14 +23,12 @@
   "dependencies": {
     "adm-zip": "^0.5.12",
     "axios": "^1.6.8",
-    "graceful-fs": "^4.2.11",
     "https": "^1.0.0",
     "os": "^0.1.2",
     "tar": "^7.0.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",
-    "@types/graceful-fs": "^4.1.9",
     "@types/node": "^20.12.7",
     "@types/tar": "^6.1.13",
     "typescript": "^5.4.5"