mybase 1.1.16 → 1.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -1
- package/ts/funcs/getMysql1.d.ts +8 -0
- package/ts/funcs/getMysql1.js +72 -0
- package/ts/funcs/getMysql1.ts +41 -0
- package/ts/funcs/getMysql2.d.ts +8 -0
- package/ts/funcs/getMysql2.js +72 -0
- package/ts/funcs/getMysql2.ts +42 -0
- package/ts/funcs/initMysql2Pool.d.ts +3 -0
- package/ts/funcs/initMysql2Pool.js +38 -0
- package/ts/funcs/initMysql2Pool.ts +11 -0
- package/ts/index.d.ts +3 -0
- package/ts/index.js +3 -0
- package/ts/index.ts +3 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mybase",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.17",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "mybase.js",
|
|
6
6
|
"scripts": {
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
"ip6": "=0.2.7",
|
|
18
18
|
"ip6addr": "^0.2.5",
|
|
19
19
|
"js-sha512": "^0.8.0",
|
|
20
|
+
"mysql": "^2.18.1",
|
|
21
|
+
"mysql2": "^3.9.1",
|
|
20
22
|
"node-vault": "^0.10.2",
|
|
21
23
|
"psl": "^1.9.0",
|
|
22
24
|
"punycode": "^2.1.1",
|
|
@@ -27,6 +29,7 @@
|
|
|
27
29
|
"@types/debug": "^4.1.12",
|
|
28
30
|
"@types/ip6addr": "^0.2.6",
|
|
29
31
|
"@types/jest": "^29.5.11",
|
|
32
|
+
"@types/mysql": "^2.15.25",
|
|
30
33
|
"@types/node": "^20.11.5",
|
|
31
34
|
"@types/validator": "^13.11.8",
|
|
32
35
|
"chai": "^4.2.0",
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
37
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
exports.getMysql1 = void 0;
|
|
39
|
+
const mysql1 = __importStar(require("mysql"));
|
|
40
|
+
const debug_1 = __importDefault(require("debug"));
|
|
41
|
+
const dbg = (0, debug_1.default)("getMysql1");
|
|
42
|
+
function getMysql1(config, pingInterval = 0) {
|
|
43
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
44
|
+
return new Promise((resolve, reject) => {
|
|
45
|
+
const mysql_client = mysql1.createConnection({
|
|
46
|
+
host: config.host,
|
|
47
|
+
port: config.port ? config.port : 3306,
|
|
48
|
+
user: config.login,
|
|
49
|
+
password: config.password,
|
|
50
|
+
database: config.db
|
|
51
|
+
});
|
|
52
|
+
mysql_client.connect((err, res) => {
|
|
53
|
+
if (err) {
|
|
54
|
+
dbg(`mysql connection has failed to ${config.host}@${config.db}`, err);
|
|
55
|
+
return reject(err);
|
|
56
|
+
}
|
|
57
|
+
dbg(`mysql connection has been established to ${config.host}@${config.db}`);
|
|
58
|
+
// install a pinger every 30 seconds to keep the connection alive
|
|
59
|
+
if (pingInterval > 0)
|
|
60
|
+
setInterval(() => {
|
|
61
|
+
mysql_client.ping(function (err) {
|
|
62
|
+
if (err)
|
|
63
|
+
return console.log(`could not ping mysql ${config.host}@${config.db}`, err.code);
|
|
64
|
+
dbg(`mysql ${config.host}@${config.db} is pinging properly`);
|
|
65
|
+
});
|
|
66
|
+
}, pingInterval);
|
|
67
|
+
resolve(mysql_client);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
exports.getMysql1 = getMysql1;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import * as mysql1 from "mysql"
|
|
2
|
+
import { MysqlError } from "mysql"
|
|
3
|
+
import debug from "debug"
|
|
4
|
+
const dbg = debug("getMysql1")
|
|
5
|
+
|
|
6
|
+
export type Mysql1ServerConfiguration = {
|
|
7
|
+
host: string,
|
|
8
|
+
port: number,
|
|
9
|
+
login: string,
|
|
10
|
+
password: string,
|
|
11
|
+
db: string
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export async function getMysql1(config: Mysql1ServerConfiguration, pingInterval: number = 0) {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
|
+
const mysql_client = mysql1.createConnection({
|
|
17
|
+
host: config.host,
|
|
18
|
+
port: config.port ? config.port : 3306,
|
|
19
|
+
user: config.login,
|
|
20
|
+
password: config.password,
|
|
21
|
+
database: config.db
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
mysql_client.connect((err:MysqlError, res) => {
|
|
25
|
+
if (err) {
|
|
26
|
+
dbg(`mysql connection has failed to ${config.host}@${config.db}`, err)
|
|
27
|
+
return reject(err)
|
|
28
|
+
}
|
|
29
|
+
dbg(`mysql connection has been established to ${config.host}@${config.db}`)
|
|
30
|
+
// install a pinger every 30 seconds to keep the connection alive
|
|
31
|
+
if (pingInterval > 0)
|
|
32
|
+
setInterval(() => {
|
|
33
|
+
mysql_client.ping(function (err:MysqlError) {
|
|
34
|
+
if (err) return console.log(`could not ping mysql ${config.host}@${config.db}`, err.code)
|
|
35
|
+
dbg(`mysql ${config.host}@${config.db} is pinging properly`)
|
|
36
|
+
})
|
|
37
|
+
}, pingInterval)
|
|
38
|
+
resolve(mysql_client)
|
|
39
|
+
})
|
|
40
|
+
})
|
|
41
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
37
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
exports.getMysql2 = void 0;
|
|
39
|
+
const mysql2 = __importStar(require("mysql2"));
|
|
40
|
+
const debug_1 = __importDefault(require("debug"));
|
|
41
|
+
const dbg = (0, debug_1.default)("getMysql2");
|
|
42
|
+
function getMysql2(config, pingInterval = 0) {
|
|
43
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
44
|
+
return new Promise((resolve, reject) => {
|
|
45
|
+
const mysql_client = mysql2.createConnection({
|
|
46
|
+
host: config.host,
|
|
47
|
+
port: config.port ? config.port : 3306,
|
|
48
|
+
user: config.login,
|
|
49
|
+
password: config.password,
|
|
50
|
+
database: config.db
|
|
51
|
+
});
|
|
52
|
+
mysql_client.connect((err) => {
|
|
53
|
+
if (err) {
|
|
54
|
+
dbg(`mysql connection has failed to ${config.host}@${config.db}`, err);
|
|
55
|
+
return reject(err);
|
|
56
|
+
}
|
|
57
|
+
dbg(`mysql connection has been established to ${config.host}@${config.db}`);
|
|
58
|
+
// install a pinger every 30 seconds to keep the connection alive
|
|
59
|
+
if (pingInterval > 0)
|
|
60
|
+
setInterval(() => {
|
|
61
|
+
mysql_client.ping(function (err) {
|
|
62
|
+
if (err)
|
|
63
|
+
return console.log(`could not ping mysql ${config.host}@${config.db}`, err.code);
|
|
64
|
+
dbg(`mysql ${config.host}@${config.db} is pinging properly`);
|
|
65
|
+
});
|
|
66
|
+
}, pingInterval);
|
|
67
|
+
resolve(mysql_client);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
exports.getMysql2 = getMysql2;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import * as mysql2 from "mysql2"
|
|
2
|
+
import { QueryError } from "mysql2"
|
|
3
|
+
import debug from "debug"
|
|
4
|
+
const dbg = debug("getMysql2")
|
|
5
|
+
|
|
6
|
+
export type Mysql2ServerConfiguration = {
|
|
7
|
+
host: string,
|
|
8
|
+
port: number,
|
|
9
|
+
login: string,
|
|
10
|
+
password: string,
|
|
11
|
+
db: string
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export async function getMysql2(config: Mysql2ServerConfiguration, pingInterval: number = 0) {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
|
+
const mysql_client = mysql2.createConnection({
|
|
17
|
+
host: config.host,
|
|
18
|
+
port: config.port ? config.port : 3306,
|
|
19
|
+
user: config.login,
|
|
20
|
+
password: config.password,
|
|
21
|
+
database: config.db
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
mysql_client.connect((err: QueryError | null) => {
|
|
25
|
+
if (err) {
|
|
26
|
+
dbg(`mysql connection has failed to ${config.host}@${config.db}`, err)
|
|
27
|
+
return reject(err)
|
|
28
|
+
}
|
|
29
|
+
dbg(`mysql connection has been established to ${config.host}@${config.db}`)
|
|
30
|
+
// install a pinger every 30 seconds to keep the connection alive
|
|
31
|
+
if (pingInterval > 0)
|
|
32
|
+
setInterval(() => {
|
|
33
|
+
mysql_client.ping(function (err:QueryError | null) {
|
|
34
|
+
if (err)
|
|
35
|
+
return console.log(`could not ping mysql ${config.host}@${config.db}`, err.code)
|
|
36
|
+
dbg(`mysql ${config.host}@${config.db} is pinging properly`)
|
|
37
|
+
})
|
|
38
|
+
}, pingInterval)
|
|
39
|
+
resolve(mysql_client)
|
|
40
|
+
})
|
|
41
|
+
})
|
|
42
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.initMysql2Pool = void 0;
|
|
30
|
+
const mysql2 = __importStar(require("mysql2"));
|
|
31
|
+
const debug_1 = __importDefault(require("debug"));
|
|
32
|
+
const dbg = (0, debug_1.default)("initMysql2Pool");
|
|
33
|
+
function initMysql2Pool(sqlServer) {
|
|
34
|
+
const connectionUri = `mysql://${sqlServer.login}:${sqlServer.password}@${sqlServer.host}`;
|
|
35
|
+
dbg(`creating mysql pool to ${sqlServer.host}@${sqlServer.db} as connectionUri=${connectionUri}`);
|
|
36
|
+
return mysql2.createPool(connectionUri);
|
|
37
|
+
}
|
|
38
|
+
exports.initMysql2Pool = initMysql2Pool;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import * as mysql2 from "mysql2"
|
|
2
|
+
import { Pool } from "mysql2"
|
|
3
|
+
import debug from "debug"
|
|
4
|
+
import { Mysql2ServerConfiguration } from "./getMysql2"
|
|
5
|
+
const dbg = debug("initMysql2Pool")
|
|
6
|
+
|
|
7
|
+
export function initMysql2Pool(sqlServer: Mysql2ServerConfiguration): Pool {
|
|
8
|
+
const connectionUri = `mysql://${sqlServer.login}:${sqlServer.password}@${sqlServer.host}`
|
|
9
|
+
dbg(`creating mysql pool to ${sqlServer.host}@${sqlServer.db} as connectionUri=${connectionUri}`)
|
|
10
|
+
return mysql2.createPool(connectionUri)
|
|
11
|
+
}
|
package/ts/index.d.ts
CHANGED
|
@@ -18,3 +18,6 @@ export * from "./funcs/randomTCPPort";
|
|
|
18
18
|
export * from "./funcs/validEmail";
|
|
19
19
|
export * from "./funcs/isLoopbackIP";
|
|
20
20
|
export * from "./funcs/isLANIp";
|
|
21
|
+
export * from "./funcs/getMysql1";
|
|
22
|
+
export * from "./funcs/getMysql2";
|
|
23
|
+
export * from "./funcs/initMysql2Pool";
|
package/ts/index.js
CHANGED
|
@@ -34,3 +34,6 @@ __exportStar(require("./funcs/randomTCPPort"), exports);
|
|
|
34
34
|
__exportStar(require("./funcs/validEmail"), exports);
|
|
35
35
|
__exportStar(require("./funcs/isLoopbackIP"), exports);
|
|
36
36
|
__exportStar(require("./funcs/isLANIp"), exports);
|
|
37
|
+
__exportStar(require("./funcs/getMysql1"), exports);
|
|
38
|
+
__exportStar(require("./funcs/getMysql2"), exports);
|
|
39
|
+
__exportStar(require("./funcs/initMysql2Pool"), exports);
|
package/ts/index.ts
CHANGED