@hailer/app-sdk 2.0.0-beta-1 → 2.0.0-beta-2

package/lib/tools/publish.cjs

@@ -22,14 +22,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const hailer_cli_1 = require("@hailer-oy/hailer-cli");
+const cli_1 = require("@hailer/cli");
 const request = __importStar(require("request"));
 const fs_1 = require("fs");
-const minimal_password_prompt_1 = __importDefault(require("minimal-password-prompt"));
+const minimal_password_prompt_1 = require("minimal-password-prompt");
 const util_1 = require("util");
 const readline_1 = require("readline");
 if (!process.env.EMAIL && !process.env.LOCAL) {
@@ -41,7 +38,7 @@ if (!process.env.EMAIL && !process.env.LOCAL) {
 }
 (async () => {
     let email = process.env.EMAIL;
-    let password = process.env.LOCAL || await (0, minimal_password_prompt_1.default)('enter password for ' + email + ': ');
+    let password = process.env.LOCAL || await (0, minimal_password_prompt_1.prompt)('enter password for ' + email + ': ');
     // Market code
     const market = process.env.MARKET === 'true';
     const appPackageFile = process.argv[2];
@@ -65,137 +62,136 @@ if (!process.env.EMAIL && !process.env.LOCAL) {
         password = 'thispasswordshouldbestrongenough';
         host = 'http://localhost:1337';
     }
-    const cli = new hailer_cli_1.Cli(host, email, password);
-    if (!appPackageFile?.endsWith('.tgz')) {
-        console.log('Failed getting .tgz file, found:', appPackageFile);
-        process.exit(7);
-    }
-    cli.on('error', (error) => {
+    const cli = await cli_1.Client.create({ host, username: email, password }).catch((error) => {
         if (error.msg === 'Invalid Login Data') {
             console.log('Invalid username or password when logging into Hailer.');
-            process.exit(8);
         }
-        console.log('Hailer Cli Error:', error);
+        else {
+            console.log('Hailer Cli Error:', error);
+        }
+        process.exit(8);
     });
-    cli.on('ready', async () => {
-        const manifest = JSON.parse((0, fs_1.readFileSync)('./dist/manifest.json').toString());
-        const content = (0, fs_1.readFileSync)(appPackageFile);
-        const info = await cli.request('v2.core.init', [['network', 'networks', 'apps']], undefined);
-        // Market code
-        if (market) {
-            // Check if version exist in manifest.json. If not, add empty version and let user fill it in
-            if (!manifest.version) {
-                manifest.version = '';
-                manifest.versionDescription = '';
-                // Convert the modified object back to JSON
-                const updatedManifestContent = JSON.stringify(manifest, null, 2);
-                // Write the updated JSON content back to manifest.json
-                (0, fs_1.writeFileSync)('./public/manifest.json', updatedManifestContent, 'utf-8');
-                console.log('');
-                console.log('Please set version & versionDescription in file public/manifest.json! You have added MARKET=true in your publish string.');
-                console.log('');
-                process.exit(10);
-            }
+    if (!appPackageFile?.endsWith('.tgz')) {
+        console.log('Failed getting .tgz file, found:', appPackageFile);
+        process.exit(7);
+    }
+    const manifest = JSON.parse((0, fs_1.readFileSync)('./dist/manifest.json').toString());
+    const content = (0, fs_1.readFileSync)(appPackageFile);
+    const info = await cli.request('v2.core.init', [['network', 'networks', 'apps']]);
+    // Market code
+    if (market) {
+        // Check if version exist in manifest.json. If not, add empty version and let user fill it in
+        if (!manifest.version) {
+            manifest.version = '';
+            manifest.versionDescription = '';
+            // Convert the modified object back to JSON
+            const updatedManifestContent = JSON.stringify(manifest, null, 2);
+            // Write the updated JSON content back to manifest.json
+            (0, fs_1.writeFileSync)('./public/manifest.json', updatedManifestContent, 'utf-8');
+            console.log('');
+            console.log('Please set version & versionDescription in file public/manifest.json! You have added MARKET=true in your publish string.');
+            console.log('');
+            process.exit(10);
         }
-        const getAppById = (manifestAppId) => {
-            for (const appMap of Object.values(info.apps)) {
-                for (const [appId, app] of Object.entries(appMap)) {
-                    if (appId === manifestAppId) {
-                        return app;
-                    }
+    }
+    const getAppById = (manifestAppId) => {
+        for (const appMap of Object.values(info.apps)) {
+            for (const [appId, app] of Object.entries(appMap)) {
+                if (appId === manifestAppId) {
+                    return app;
                 }
             }
-            return null;
-        };
-        const app = getAppById(manifest.appId);
-        if (!app) {
-            console.log('The app was not found using this user:', email);
-            process.exit(2);
-        }
-        const personalApp = !app.cid;
-        console.log('Publishing App');
-        console.log('  Id:', manifest.appId);
-        console.log('  Name:', app.name);
-        if (personalApp) {
-            console.log('  Workspace: any (personal app)');
-        }
-        else {
-            console.log('  Workspace:', info.networks[app.cid]?.name, '(' + app.cid + ')');
-        }
-        console.log('  Environment:', host);
-        console.log();
-        // Market code
-        if (market) {
-            console.log('  Note: Also publishing app to Hailer market');
         }
-        /** Default to publish (yes) */
-        const promptOverwriteQuestion = () => {
-            return new Promise(resolve => {
-                const rl = (0, readline_1.createInterface)(process.stdin, process.stdout);
-                rl.setPrompt('Overwrite the app? (Y/n): ');
-                rl.prompt();
-                rl.on('line', (line) => {
-                    if (line.trim().toLocaleLowerCase().startsWith('n')) {
-                        resolve(false);
-                    }
-                    else {
-                        resolve(true);
-                    }
-                    rl.close();
-                });
-            });
-        };
-        const shouldOverwrite = await promptOverwriteQuestion();
-        if (!shouldOverwrite) {
-            console.log('Aborted publishing app.');
-            process.exit(0);
-        }
-        await new Promise((resolve, reject) => {
-            request.post({
-                uri: host + '/app/publish',
-                headers: { hlrkey: cli.client.sessionKey },
-                formData: {
-                    file: {
-                        value: content,
-                        options: {
-                            filename: appPackageFile,
-                        }
-                    },
-                    appId: manifest.appId,
-                    // Market code
-                    publishMarket: market.toString(),
+        return null;
+    };
+    const app = getAppById(manifest.appId);
+    if (!app) {
+        console.log('The app was not found using this user:', email);
+        process.exit(2);
+    }
+    const personalApp = !app.cid;
+    console.log('Publishing App');
+    console.log('  Id:', manifest.appId);
+    console.log('  Name:', app.name);
+    if (personalApp) {
+        console.log('  Workspace: any (personal app)');
+    }
+    else {
+        console.log('  Workspace:', info.networks[app.cid]?.name, '(' + app.cid + ')');
+    }
+    console.log('  Environment:', host);
+    console.log();
+    // Market code
+    if (market) {
+        console.log('  Note: Also publishing app to Hailer market');
+    }
+    /** Default to publish (yes) */
+    const promptOverwriteQuestion = () => {
+        return new Promise(resolve => {
+            const rl = (0, readline_1.createInterface)(process.stdin, process.stdout);
+            rl.setPrompt('Overwrite the app? (Y/n): ');
+            rl.prompt();
+            rl.on('line', (line) => {
+                if (line.trim().toLocaleLowerCase().startsWith('n')) {
+                    resolve(false);
                 }
-            }, function (error, resp, body) {
-                if (error) {
-                    console.log('Publish error uploading file:', error);
-                    process.exit(9);
+                else {
+                    resolve(true);
                 }
-                let response;
-                let infoMarket = '';
-                try {
-                    response = JSON.parse(body);
-                    // Market code
-                    if (response.manifest && response.manifest.targetId) {
-                        infoMarket = 'Note! Use targetId in public/manifest.json file when creating the product in market!';
-                        // Write targetId to manifest.json
-                        manifest.targetId = response.manifest.targetId;
-                        // Convert the modified object back to JSON
-                        const updatedManifestContent = JSON.stringify(manifest, null, 2);
-                        // Write the updated JSON content back to manifest.json
-                        (0, fs_1.writeFileSync)('./public/manifest.json', updatedManifestContent, 'utf-8');
+                rl.close();
+            });
+        });
+    };
+    const shouldOverwrite = await promptOverwriteQuestion();
+    if (!shouldOverwrite) {
+        console.log('Aborted publishing app.');
+        process.exit(0);
+    }
+    await new Promise((resolve, reject) => {
+        request.post({
+            uri: host + '/app/publish',
+            headers: { hlrkey: cli.sessionKey },
+            formData: {
+                file: {
+                    value: content,
+                    options: {
+                        filename: appPackageFile,
                     }
+                },
+                appId: manifest.appId,
+                // Market code
+                publishMarket: market.toString(),
+            }
+        }, function (error, resp, body) {
+            if (error) {
+                console.log('Publish error uploading file:', error);
+                process.exit(9);
+            }
+            let response;
+            let infoMarket = '';
+            try {
+                response = JSON.parse(body);
+                // Market code
+                if (response.manifest && response.manifest.targetId) {
+                    infoMarket = 'Note! Use targetId in public/manifest.json file when creating the product in market!';
+                    // Write targetId to manifest.json
+                    manifest.targetId = response.manifest.targetId;
+                    // Convert the modified object back to JSON
+                    const updatedManifestContent = JSON.stringify(manifest, null, 2);
+                    // Write the updated JSON content back to manifest.json
+                    (0, fs_1.writeFileSync)('./public/manifest.json', updatedManifestContent, 'utf-8');
                 }
-                catch (error) {
-                    // ingore
-                }
-                console.log('App info:', (0, util_1.inspect)(response, { depth: 10, colors: true }));
-                console.log();
-                console.log(infoMarket);
-                console.log();
-                console.log('Published successfully!');
-                resolve();
-            });
+            }
+            catch (error) {
+                // ingore
+            }
+            console.log('App info:', (0, util_1.inspect)(response, { depth: 10, colors: true }));
+            console.log();
+            console.log(infoMarket);
+            console.log();
+            console.log('Published successfully!');
+            resolve();
         });
-        cli.disconnect();
     });
+    cli.disconnect();
 })();

package/lib/types.js

@@ -0,0 +1,28 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var HailerError = /** @class */ (function (_super) {
+    __extends(HailerError, _super);
+    function HailerError(error) {
+        var _this = _super.call(this) || this;
+        _this.code = error.code;
+        _this.msg = error.msg;
+        _this.debug = error.debug;
+        Object.setPrototypeOf(_this, HailerError.prototype);
+        return _this;
+    }
+    return HailerError;
+}(Error));
+export { HailerError };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hailer/app-sdk",
-    "version": "2.0.0-beta-1",
+    "version": "2.0.0-beta-2",
     "description": "SDK for building Hailer Apps",
     "author": "",
     "license": "ISC",
@@ -19,9 +19,8 @@
         "docs": "typedoc --entryPointStrategy expand ./src && open-cli ./docs/index.html"
     },
     "dependencies": {
-        "@hailer-oy/hailer-cli": "^1.1.6",
+        "@hailer/cli": "1.1.8",
         "@wishcore/wish-rpc": "0.6.11",
-        "minimal-password-prompt": "1.1.0",
         "request": "2.88.2"
     },
     "devDependencies": {