@instadapp/interop-x 0.0.0-dev.3d62ebf → 0.0.0-dev.43cb9e6

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.3d62ebf",
+    "version": "0.0.0-dev.43cb9e6",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {

package/dist/src/index.js

@@ -37,7 +37,7 @@ if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
-const GIT_SHORT_HASH = '3d62ebf';
+const GIT_SHORT_HASH = '43cb9e6';
 if (process.argv.at(-1) === 'version') {
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);

package/dist/src/tasks/AutoUpdateTask.js

@@ -5,11 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseTask_1 = require("./BaseTask");
 const logger_1 = __importDefault(require("@/logger"));
+const utils_1 = require("@/utils");
 const await_spawn_1 = __importDefault(require("await-spawn"));
 const config_1 = __importDefault(require("@/config"));
 const waait_1 = __importDefault(require("waait"));
-const package_json_1 = __importDefault(require("../../package.json"));
-const currentVersion = package_json_1.default.version;
 class AutoUpdateTask extends BaseTask_1.BaseTask {
     constructor() {
         super({
@@ -20,36 +19,20 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
-    async getInstalledVersion() {
-        try {
-            const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
-            return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
-        }
-        catch (error) {
-            this.logger.error(error);
-            return currentVersion;
-        }
-    }
-    async getLatestVersion() {
-        try {
-            const stdout = await (0, await_spawn_1.default)('npm', ['view', package_json_1.default.name, 'version']);
-            return stdout.toString();
-        }
-        catch (error) {
-            this.logger.error(error);
-            return currentVersion;
-        }
+    getCurrentVersion() {
+        return require('../../package.json').version;
     }
     async pollHandler() {
-        const version = await this.getLatestVersion();
+        const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
+        const version = data['dist-tags'].latest;
+        const currentVersion = this.getCurrentVersion();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
-        this.logger.info('Updating...');
         await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
         await (0, waait_1.default)(5000);
-        if (version !== await this.getInstalledVersion()) {
+        if (currentVersion === this.getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.3d62ebf",
+  "version": "0.0.0-dev.43cb9e6",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {

package/src/tasks/AutoUpdateTask.ts

@@ -4,9 +4,6 @@ import { http } from "@/utils";
 import spawn from 'await-spawn';
 import config from "@/config";
 import wait from "waait";
-import packageJson from "../../package.json";
-
-const currentVersion = packageJson.version;
 
 class AutoUpdateTask extends BaseTask {
     pollIntervalMs: number = 60 * 5 * 1000
@@ -21,30 +18,15 @@ class AutoUpdateTask extends BaseTask {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    async getInstalledVersion() {
-        try {
-            const stdout = await spawn('npm', ['-g', 'ls', '--depth=0', '--json'])
-            return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
-        } catch (error) {
-            this.logger.error(error)
-            
-            return currentVersion
-        }
+    getCurrentVersion() {
+        return require('../../package.json').version
     }
+    async pollHandler() {
 
-    async getLatestVersion() {
-        try {
-            const stdout = await spawn('npm', ['view', packageJson.name, 'version'])
-            return stdout.toString()
-        } catch (error) {
-            this.logger.error(error)
-            
-            return currentVersion
-        }
-    }
+        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
 
-    async pollHandler() {
-        const version = await this.getLatestVersion()
+        const version = data['dist-tags'].latest
+        const currentVersion = this.getCurrentVersion()
 
         if (version === currentVersion) {
             return;
@@ -53,13 +35,12 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`New version ${version} available.`)
 
 
-        this.logger.info('Updating...')
-
         await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
 
+
         await wait(5000)
 
-        if (version !== await this.getInstalledVersion()) {
+        if (currentVersion === this.getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
             return;
         }