@instadapp/interop-x 0.0.0-dev.285d847 → 0.0.0-dev.4887ba6

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.285d847",
+    "version": "0.0.0-dev.4887ba6",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -24,6 +24,8 @@
     },
     "dependencies": {
         "@achingbrain/libp2p-gossipsub": "^0.12.2",
+        "@fastify/cors": "^7.0.0",
+        "await-spawn": "^4.0.2",
         "axios": "^0.27.1",
         "axios-retry": "^3.2.4",
         "bignumber.js": "^9.0.2",
@@ -34,7 +36,6 @@
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
         "fastify": "^3.28.0",
-        "fastify-cors": "^6.0.3",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
         "libp2p-kad-dht": "^0.28.6",

package/dist/src/api/index.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startApiServer = void 0;
 const fastify_1 = __importDefault(require("fastify"));
-const fastify_cors_1 = __importDefault(require("fastify-cors"));
+const cors_1 = __importDefault(require("@fastify/cors"));
 const logger_1 = __importDefault(require("@/logger"));
 const db_1 = require("@/db");
 const logger = new logger_1.default("RPC");
 const server = (0, fastify_1.default)({ logger: false });
-server.register(fastify_cors_1.default, {});
+server.register(cors_1.default, {});
 server.get('/', async () => 'Interop X API');
 const startApiServer = async () => {
     const HOST = process.env.API_HOST || '0.0.0.0';

package/dist/src/index.js

@@ -37,8 +37,9 @@ if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
+const GIT_SHORT_HASH = '4887ba6';
 if (process.argv.at(-1) === 'version') {
-    console.log(`Interop X Node (v${package_json_1.default.version} - rev.285d847)`);
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);
 }
 if (!process.env.PRIVATE_KEY) {
@@ -54,7 +55,7 @@ catch (e) {
     printUsage();
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.@GIT_SHORT_HASH@)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");

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 package_json_1 = __importDefault(require("../../package.json"));
 const utils_1 = require("@/utils");
-const child_process_1 = require("child_process");
+const await_spawn_1 = __importDefault(require("await-spawn"));
 const config_1 = __importDefault(require("@/config"));
-const currentVersion = package_json_1.default.version;
+const waait_1 = __importDefault(require("waait"));
 class AutoUpdateTask extends BaseTask_1.BaseTask {
     constructor() {
         super({
@@ -20,25 +19,29 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
+    getCurrentVersion() {
+        return require('../../package.json').version;
+    }
     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();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
-        const update = (0, child_process_1.spawn)('npm', ['-g', 'install', '@instadapp/interop-x']);
-        update.on("close", () => {
-            this.logger.warn(`Installed version ${version}`);
-            this.logger.warn(`Restarting...`);
-            (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                env: Object.create(process.env),
-                detached: true,
-                stdio: "inherit"
-            });
-            process.exit();
+        await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
+        this.logger.warn(`Installed version ${version}`);
+        this.logger.warn(`Restarting...`);
+        await (0, waait_1.default)(5000);
+        if (currentVersion === this.getCurrentVersion()) {
+            return;
+        }
+        (0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit"
         });
+        process.exit();
     }
 }
 exports.default = AutoUpdateTask;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.285d847",
+  "version": "0.0.0-dev.4887ba6",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -24,6 +24,8 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
+    "@fastify/cors": "^7.0.0",
+    "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
     "bignumber.js": "^9.0.2",
@@ -34,7 +36,6 @@
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.28.0",
-    "fastify-cors": "^6.0.3",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import cors from 'fastify-cors'
+import cors from '@fastify/cors'
 import Logger from "@/logger"
 import { Transaction } from "@/db";
 

package/src/index.ts

@@ -38,8 +38,10 @@ if (process.argv.at(-1) === 'help') {
     process.exit(0)
 }
 
+const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+
 if (process.argv.at(-1) === 'version') {
-    console.log(`Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
     process.exit(0)
 }
 
@@ -56,7 +58,7 @@ try {
     process.exit(1)
 }
 
-logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
 
 import { Tasks } from "@/tasks";
 import { startPeer, protocol, peerPool } from "@/net";

package/src/tasks/AutoUpdateTask.ts

@@ -1,10 +1,9 @@
 import { BaseTask } from "./BaseTask";
 import Logger from '@/logger';
-import packageJson from '../../package.json'
 import { http } from "@/utils";
-import { spawn } from 'child_process';
+import spawn from 'await-spawn';
 import config from "@/config";
-const currentVersion = packageJson.version;
+import wait from "waait";
 
 class AutoUpdateTask extends BaseTask {
     pollIntervalMs: number = 60 * 1000
@@ -15,16 +14,19 @@ class AutoUpdateTask extends BaseTask {
         })
     }
 
-
     prePollHandler(): boolean {
         return config.autoUpdate && !config.isLeadNode();
     }
 
+    getCurrentVersion() {
+        return require('../../package.json').version
+    }
     async pollHandler() {
 
         const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
 
         const version = data['dist-tags'].latest
+        const currentVersion = this.getCurrentVersion()
 
         if (version === currentVersion) {
             return;
@@ -33,21 +35,23 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`New version ${version} available.`)
 
 
-        const update = spawn('npm', ['-g', 'install', '@instadapp/interop-x']);
+        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
 
-        update.on("close", () => {
-            this.logger.warn(`Installed version ${version}`)
-            this.logger.warn(`Restarting...`)
+        this.logger.warn(`Installed version ${version}`)
+        this.logger.warn(`Restarting...`)
 
-            spawn(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                env: Object.create(process.env),
-                detached: true,
-                stdio: "inherit"
-            });
+        await wait(5000)
 
-            process.exit()
-        })
+        if (currentVersion === this.getCurrentVersion()) {
+            return;
+        }
+
+        spawn(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit"
+        });
+
+        process.exit()
     }
 }