@instadapp/interop-x 0.0.0-dev.c109c51 → 0.0.0-dev.d05464a
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/package.json +2 -2
- package/dist/src/api/index.js +2 -2
- package/dist/src/index.js +1 -1
- package/dist/src/tasks/AutoUpdateTask.js +12 -5
- package/package.json +2 -2
- package/src/api/index.ts +1 -1
- package/src/tasks/AutoUpdateTask.ts +15 -5
package/dist/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@instadapp/interop-x",
|
3
|
-
"version": "0.0.0-dev.
|
3
|
+
"version": "0.0.0-dev.d05464a",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"engines": {
|
@@ -24,6 +24,7 @@
|
|
24
24
|
},
|
25
25
|
"dependencies": {
|
26
26
|
"@achingbrain/libp2p-gossipsub": "^0.12.2",
|
27
|
+
"@fastify/cors": "^7.0.0",
|
27
28
|
"await-spawn": "^4.0.2",
|
28
29
|
"axios": "^0.27.1",
|
29
30
|
"axios-retry": "^3.2.4",
|
@@ -35,7 +36,6 @@
|
|
35
36
|
"ethers-multisend": "^2.1.1",
|
36
37
|
"expand-home-dir": "^0.0.3",
|
37
38
|
"fastify": "^3.28.0",
|
38
|
-
"fastify-cors": "^6.0.3",
|
39
39
|
"libp2p": "^0.36.2",
|
40
40
|
"libp2p-bootstrap": "^0.14.0",
|
41
41
|
"libp2p-kad-dht": "^0.28.6",
|
package/dist/src/api/index.js
CHANGED
@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
exports.startApiServer = void 0;
|
7
7
|
const fastify_1 = __importDefault(require("fastify"));
|
8
|
-
const
|
8
|
+
const cors_1 = __importDefault(require("@fastify/cors"));
|
9
9
|
const logger_1 = __importDefault(require("@/logger"));
|
10
10
|
const db_1 = require("@/db");
|
11
11
|
const logger = new logger_1.default("RPC");
|
12
12
|
const server = (0, fastify_1.default)({ logger: false });
|
13
|
-
server.register(
|
13
|
+
server.register(cors_1.default, {});
|
14
14
|
server.get('/', async () => 'Interop X API');
|
15
15
|
const startApiServer = async () => {
|
16
16
|
const HOST = process.env.API_HOST || '0.0.0.0';
|
package/dist/src/index.js
CHANGED
@@ -37,7 +37,7 @@ if (process.argv.at(-1) === 'help') {
|
|
37
37
|
printUsage();
|
38
38
|
process.exit(0);
|
39
39
|
}
|
40
|
-
const GIT_SHORT_HASH = '
|
40
|
+
const GIT_SHORT_HASH = 'd05464a';
|
41
41
|
if (process.argv.at(-1) === 'version') {
|
42
42
|
console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
|
43
43
|
process.exit(0);
|
@@ -5,34 +5,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
6
|
const BaseTask_1 = require("./BaseTask");
|
7
7
|
const logger_1 = __importDefault(require("@/logger"));
|
8
|
-
const package_json_1 = __importDefault(require("../../package.json"));
|
9
8
|
const utils_1 = require("@/utils");
|
10
9
|
const await_spawn_1 = __importDefault(require("await-spawn"));
|
11
10
|
const config_1 = __importDefault(require("@/config"));
|
12
|
-
const
|
11
|
+
const waait_1 = __importDefault(require("waait"));
|
13
12
|
class AutoUpdateTask extends BaseTask_1.BaseTask {
|
14
13
|
constructor() {
|
15
14
|
super({
|
16
15
|
logger: new logger_1.default("AutoUpdateTask"),
|
17
16
|
});
|
18
|
-
this.pollIntervalMs = 60 * 1000;
|
17
|
+
this.pollIntervalMs = 60 * 5 * 1000;
|
19
18
|
}
|
20
19
|
prePollHandler() {
|
21
20
|
return config_1.default.autoUpdate && !config_1.default.isLeadNode();
|
22
21
|
}
|
22
|
+
getCurrentVersion() {
|
23
|
+
return require('../../package.json').version;
|
24
|
+
}
|
23
25
|
async pollHandler() {
|
24
26
|
const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
|
25
27
|
const version = data['dist-tags'].latest;
|
28
|
+
const currentVersion = this.getCurrentVersion();
|
26
29
|
if (version === currentVersion) {
|
27
30
|
return;
|
28
31
|
}
|
29
32
|
this.logger.warn(`New version ${version} available.`);
|
30
|
-
await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x']);
|
33
|
+
await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
|
34
|
+
await (0, waait_1.default)(5000);
|
35
|
+
if (currentVersion === this.getCurrentVersion()) {
|
36
|
+
this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
|
37
|
+
return;
|
38
|
+
}
|
31
39
|
this.logger.warn(`Installed version ${version}`);
|
32
40
|
this.logger.warn(`Restarting...`);
|
33
41
|
(0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
|
34
42
|
cwd: process.cwd(),
|
35
|
-
detached: true,
|
36
43
|
stdio: "inherit"
|
37
44
|
});
|
38
45
|
process.exit();
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@instadapp/interop-x",
|
3
|
-
"version": "0.0.0-dev.
|
3
|
+
"version": "0.0.0-dev.d05464a",
|
4
4
|
"license": "MIT",
|
5
5
|
"main": "dist/index.js",
|
6
6
|
"engines": {
|
@@ -24,6 +24,7 @@
|
|
24
24
|
},
|
25
25
|
"dependencies": {
|
26
26
|
"@achingbrain/libp2p-gossipsub": "^0.12.2",
|
27
|
+
"@fastify/cors": "^7.0.0",
|
27
28
|
"await-spawn": "^4.0.2",
|
28
29
|
"axios": "^0.27.1",
|
29
30
|
"axios-retry": "^3.2.4",
|
@@ -35,7 +36,6 @@
|
|
35
36
|
"ethers-multisend": "^2.1.1",
|
36
37
|
"expand-home-dir": "^0.0.3",
|
37
38
|
"fastify": "^3.28.0",
|
38
|
-
"fastify-cors": "^6.0.3",
|
39
39
|
"libp2p": "^0.36.2",
|
40
40
|
"libp2p-bootstrap": "^0.14.0",
|
41
41
|
"libp2p-kad-dht": "^0.28.6",
|
package/src/api/index.ts
CHANGED
@@ -1,13 +1,12 @@
|
|
1
1
|
import { BaseTask } from "./BaseTask";
|
2
2
|
import Logger from '@/logger';
|
3
|
-
import packageJson from '../../package.json'
|
4
3
|
import { http } from "@/utils";
|
5
4
|
import spawn from 'await-spawn';
|
6
5
|
import config from "@/config";
|
7
|
-
|
6
|
+
import wait from "waait";
|
8
7
|
|
9
8
|
class AutoUpdateTask extends BaseTask {
|
10
|
-
pollIntervalMs: number = 60 * 1000
|
9
|
+
pollIntervalMs: number = 60 * 5 * 1000
|
11
10
|
|
12
11
|
constructor() {
|
13
12
|
super({
|
@@ -19,11 +18,15 @@ class AutoUpdateTask extends BaseTask {
|
|
19
18
|
return config.autoUpdate && !config.isLeadNode();
|
20
19
|
}
|
21
20
|
|
21
|
+
getCurrentVersion() {
|
22
|
+
return require('../../package.json').version
|
23
|
+
}
|
22
24
|
async pollHandler() {
|
23
25
|
|
24
26
|
const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
|
25
27
|
|
26
28
|
const version = data['dist-tags'].latest
|
29
|
+
const currentVersion = this.getCurrentVersion()
|
27
30
|
|
28
31
|
if (version === currentVersion) {
|
29
32
|
return;
|
@@ -32,14 +35,21 @@ class AutoUpdateTask extends BaseTask {
|
|
32
35
|
this.logger.warn(`New version ${version} available.`)
|
33
36
|
|
34
37
|
|
35
|
-
await spawn('npm', ['-g', 'install', '@instadapp/interop-x']);
|
38
|
+
await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
|
39
|
+
|
40
|
+
|
41
|
+
await wait(5000)
|
42
|
+
|
43
|
+
if (currentVersion === this.getCurrentVersion()) {
|
44
|
+
this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
|
45
|
+
return;
|
46
|
+
}
|
36
47
|
|
37
48
|
this.logger.warn(`Installed version ${version}`)
|
38
49
|
this.logger.warn(`Restarting...`)
|
39
50
|
|
40
51
|
spawn(process.argv[0], process.argv.slice(1), {
|
41
52
|
cwd: process.cwd(),
|
42
|
-
detached: true,
|
43
53
|
stdio: "inherit"
|
44
54
|
});
|
45
55
|
|