@hailer/app-sdk 2.0.0-beta-3 → 2.0.0-beta-5

package/lib/tools/publish.cjs

@@ -1,233 +1,201 @@
 "use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// tools/publish.ts
-var import_cli = require("@hailer/cli");
-var request = __toESM(require("request"));
-var import_fs = require("fs");
-
-// tools/minimal-password-prompt.ts
-var stdin = process.stdin;
-var stdout = process.stdout;
-var captureStdin = (onData) => {
-  stdin.setEncoding("utf-8");
-  stdin.setRawMode(true);
-  stdin.on("data", onData);
-  stdin.resume();
-};
-var releaseStdin = (onData) => {
-  stdin.pause();
-  stdin.removeListener("data", onData);
-  stdin.setRawMode(false);
-  stdout.write("\n");
-};
-var prompt = (question, ctrlcExits = true) => new Promise((resolve, reject) => {
-  let input = "";
-  const onData = (data) => {
-    switch (data) {
-      case "\n":
-      case "\r":
-      case "":
-        releaseStdin(onData);
-        resolve(input);
-        break;
-      case "":
-        releaseStdin(onData);
-        if (ctrlcExits) {
-          process.exit();
-        } else {
-          reject(new Error("Ctrl+C"));
-        }
-        break;
-      case "\b":
-      case "\x7F":
-        input = input.slice(0, -1);
-        break;
-      default:
-        input += data;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-    ;
-  };
-  captureStdin(onData);
-  stdout.write(question);
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-
-// tools/publish.ts
-var import_util = require("util");
-var import_readline = require("readline");
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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 request = __importStar(require("request"));
+const fs_1 = require("fs");
+const minimal_password_prompt_1 = __importDefault(require("minimal-password-prompt"));
+const util_1 = require("util");
+const readline_1 = require("readline");
 if (!process.env.EMAIL && !process.env.LOCAL) {
-  console.log("Please set environment variable EMAIL to Hailer user name.");
-  console.log("");
-  console.log("Usage:");
-  console.log("  EMAIL=user.name@mail.com npm run publish-production");
-  process.exit(10);
+    console.log('Please set environment variable EMAIL to Hailer user name.');
+    console.log('');
+    console.log('Usage:');
+    console.log('  EMAIL=user.name@mail.com npm run publish-production');
+    process.exit(10);
 }
 (async () => {
-  let email = process.env.EMAIL;
-  let password = process.env.LOCAL || await prompt("enter password for " + email + ": ");
-  const market = process.env.MARKET === "true";
-  const appPackageFile = process.argv[2];
-  const mode = process.argv[3];
-  let host = process.env.HOST || "https://localhost:9443";
-  switch (mode) {
-    case "--development":
-      host = process.env.HOST || "https://testapi.hailer.biz";
-      break;
-    case "--staging":
-      host = process.env.HOST || "https://api.hailer.biz";
-      break;
-    case "--production":
-      host = process.env.HOST || "https://api.hailer.com";
-      break;
-  }
-  if (process.env.LOCAL || mode === "--local") {
-    console.log("Overriding credentials with local settings!");
-    email = "el@hailero.es";
-    password = "el@hailero.es";
-    host = process.env.HOST || "https://api.hailer.local.gd";
-  }
-  const cli = await import_cli.Client.create({ host, username: email, password }).catch(
-    (error) => {
-      if (error.msg === "Invalid Login Data") {
-        console.log("Invalid username or password when logging into Hailer.");
-      } else {
-        console.log("Hailer Cli Error:", error);
-      }
-      process.exit(8);
-    }
-  );
-  if (!appPackageFile?.endsWith(".tgz")) {
-    console.log("Failed getting .tgz file, found:", appPackageFile);
-    process.exit(7);
-  }
-  const manifest = JSON.parse((0, import_fs.readFileSync)("./dist/manifest.json").toString());
-  const content = (0, import_fs.readFileSync)(appPackageFile);
-  const info = await cli.request("v2.core.init", [["network", "networks", "apps"]]);
-  if (market) {
-    if (!manifest.version) {
-      manifest.version = "";
-      manifest.versionDescription = "";
-      const updatedManifestContent = JSON.stringify(manifest, null, 2);
-      (0, import_fs.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);
+    let email = process.env.EMAIL;
+    let password = process.env.LOCAL || await (0, minimal_password_prompt_1.default)('enter password for ' + email + ': ');
+    // Market code
+    const market = process.env.MARKET === 'true';
+    const appPackageFile = process.argv[2];
+    /** Alternatives: `--development` | `--staging` | `--production` */
+    const mode = process.argv[3];
+    let host = 'https://localhost:9443';
+    switch (mode) {
+        case '--development':
+            host = 'https://testapi.hailer.biz';
+            break;
+        case '--staging':
+            host = 'https://api.hailer.biz';
+            break;
+        case '--production':
+            host = 'https://api.hailer.com';
+            break;
     }
-  }
-  const getAppById = (manifestAppId) => {
-    for (const appMap of Object.values(info.apps)) {
-      for (const [appId, app2] of Object.entries(appMap)) {
-        if (appId === manifestAppId) {
-          return app2;
-        }
-      }
+    if (process.env.LOCAL || mode === '--local') {
+        console.log('Overriding credentials with local settings!');
+        email = 'el@hailero.es';
+        password = 'thispasswordshouldbestrongenough';
+        host = 'http://localhost:1337';
     }
-    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();
-  if (market) {
-    console.log("  Note: Also publishing app to Hailer market");
-  }
-  const promptOverwriteQuestion = async () => {
-    if (process.argv.includes("--yes")) {
-      return true;
+    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);
     }
-    return new Promise((resolve) => {
-      const rl = (0, import_readline.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);
+    cli.on('error', (error) => {
+        if (error.msg === 'Invalid Login Data') {
+            console.log('Invalid username or password when logging into Hailer.');
+            process.exit(8);
         }
-        rl.close();
-      });
+        console.log('Hailer Cli Error:', error);
     });
-  };
-  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,
+    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
-        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);
-        if (response.manifest && response.manifest.targetId) {
-          infoMarket = "Note! Use targetId in public/manifest.json file when creating the product in market!";
-          manifest.targetId = response.manifest.targetId;
-          const updatedManifestContent = JSON.stringify(manifest, null, 2);
-          (0, import_fs.writeFileSync)("./public/manifest.json", updatedManifestContent, "utf-8");
+        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;
+                    }
+                }
+            }
+            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);
         }
-      } catch (error2) {
-      }
-      console.log("App info:", (0, import_util.inspect)(response, { depth: 10, colors: true }));
-      console.log();
-      console.log(infoMarket);
-      console.log();
-      console.log("Published successfully!");
-      resolve();
+        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(),
+                }
+            }, 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();
+            });
+        });
+        cli.disconnect();
     });
-  });
-  cli.disconnect();
 })();
-//# sourceMappingURL=publish.cjs.map

package/lib/tools/publish.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tools/replace-private.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tools/replace-private.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const path_1 = require("path");
+const srcFolder = (0, path_1.join)(__dirname, '../src');
+const publicSrcFolder = (0, path_1.join)(__dirname, '../public-src');
+const replacePrivateComments = (fileContent) => {
+    // Replaces all occurences of /* @ private */ with private
+    return fileContent.replace(/\/\* @private \*\//g, 'private');
+};
+const copyAndReplaceFiles = (src, dest) => {
+    (0, fs_1.mkdirSync)(dest, { recursive: true });
+    console.log('Created folder: ', dest);
+    (0, fs_1.readdirSync)(src).forEach((file) => {
+        const srcFile = (0, path_1.join)(src, file);
+        const destFile = (0, path_1.join)(dest, file);
+        if ((0, fs_1.lstatSync)(srcFile).isDirectory()) {
+            copyAndReplaceFiles(srcFile, destFile);
+        }
+        else if (srcFile.endsWith('.ts')) {
+            const updatedContent = replacePrivateComments((0, fs_1.readFileSync)(srcFile, 'utf8'));
+            (0, fs_1.writeFileSync)(destFile, updatedContent, 'utf8');
+        }
+        else {
+            (0, fs_1.copyFileSync)(srcFile, destFile);
+        }
+    });
+};
+if ((0, fs_1.existsSync)(publicSrcFolder)) {
+    (0, fs_1.rmdirSync)(publicSrcFolder, { recursive: true });
+}
+copyAndReplaceFiles(srcFolder, publicSrcFolder);
+console.log('Public source files generated in /public-src/');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hailer/app-sdk",
-    "version": "2.0.0-beta-3",
+    "version": "2.0.0-beta-5",
     "description": "SDK for building Hailer Apps",
     "author": "",
     "license": "ISC",
@@ -11,7 +11,7 @@
         "./lib/**/*"
     ],
     "scripts": {
-        "build": "esbuild tools/publish.ts --platform=node --packages=external --bundle --format=cjs --sourcemap --outfile=lib/tools/publish.cjs && tsc && esbuild src/index.ts --bundle --format=esm --minify --sourcemap --outfile=lib/app-sdk.js",
+        "build": "tsc --project tools/tsconfig.json && mv lib/tools/publish.js lib/tools/publish.cjs && tsc && esbuild src/index.ts --bundle --format=esm --minify --sourcemap --outfile=lib/app-sdk.js",
         "prepublishOnly": "npm run build",
         "watch": "concurrently --kill-others \"npm run watch-tsc\" \"npm run watch-esbuild\"",
         "watch-tsc": "tsc --watch",
@@ -19,8 +19,9 @@
         "docs": "typedoc --entryPointStrategy expand ./src && open-cli ./docs/index.html"
     },
     "dependencies": {
-        "@hailer/cli": "1.1.8",
+        "@hailer-oy/hailer-cli": "^1.1.6",
         "@wishcore/wish-rpc": "0.6.11",
+        "minimal-password-prompt": "1.1.0",
         "request": "2.88.2"
     },
     "devDependencies": {