@instadapp/interop-x 0.0.0-dev.43cb9e6 → 0.0.0-dev.5535f84

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.43cb9e6",
+    "version": "0.0.0-dev.5535f84",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -28,7 +28,6 @@
         "await-spawn": "^4.0.2",
         "axios": "^0.27.1",
         "axios-retry": "^3.2.4",
-        "bignumber.js": "^9.0.2",
         "chalk": "4.1.2",
         "dotenv": "^16.0.0",
         "ethereumjs-util": "^7.1.4",

package/dist/src/index.js

@@ -37,7 +37,7 @@ if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
-const GIT_SHORT_HASH = '43cb9e6';
+const GIT_SHORT_HASH = '5535f84';
 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,10 +5,11 @@ 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({
@@ -19,20 +20,36 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
-    getCurrentVersion() {
-        return require('../../package.json').version;
+    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().trim();
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
     }
     async pollHandler() {
-        const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
-        const version = data['dist-tags'].latest;
-        const currentVersion = this.getCurrentVersion();
+        const version = await this.getLatestVersion();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
-        await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
+        this.logger.info('Updating...');
+        await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${version}`, '-f']);
         await (0, waait_1.default)(5000);
-        if (currentVersion === this.getCurrentVersion()) {
+        if (version !== await this.getInstalledVersion()) {
             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.43cb9e6",
+  "version": "0.0.0-dev.5535f84",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -28,7 +28,6 @@
     "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
-    "bignumber.js": "^9.0.2",
     "chalk": "4.1.2",
     "dotenv": "^16.0.0",
     "ethereumjs-util": "^7.1.4",

package/src/tasks/AutoUpdateTask.ts

@@ -4,6 +4,9 @@ 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
@@ -18,15 +21,30 @@ class AutoUpdateTask extends BaseTask {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    getCurrentVersion() {
-        return require('../../package.json').version
+    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
+        }
     }
-    async pollHandler() {
 
-        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
+    async getLatestVersion() {
+        try {
+            const stdout = await spawn('npm', ['view', packageJson.name, 'version'])
+            return stdout.toString().trim()
+        } catch (error) {
+            this.logger.error(error)
+            
+            return currentVersion
+        }
+    }
 
-        const version = data['dist-tags'].latest
-        const currentVersion = this.getCurrentVersion()
+    async pollHandler() {
+        const version = await this.getLatestVersion()
 
         if (version === currentVersion) {
             return;
@@ -35,12 +53,13 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`New version ${version} available.`)
 
 
-        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
+        this.logger.info('Updating...')
 
+        await spawn('npm', ['-g', 'install', `@instadapp/interop-x@${version}`, '-f']);
 
         await wait(5000)
 
-        if (currentVersion === this.getCurrentVersion()) {
+        if (version !== await this.getInstalledVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
             return;
         }