ts-glitter 22.2.2 → 22.2.4
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/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/package.json +1 -1
- package/src/modules/database.js +14 -0
- package/src/modules/database.js.map +1 -1
- package/src/modules/database.ts +16 -0
package/lowcode/Entry.js
CHANGED
|
@@ -154,7 +154,7 @@ export class Entry {
|
|
|
154
154
|
}
|
|
155
155
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
|
|
156
156
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
157
|
-
glitter.share.editerVersion = 'V_22.2.
|
|
157
|
+
glitter.share.editerVersion = 'V_22.2.4';
|
|
158
158
|
glitter.share.start = new Date();
|
|
159
159
|
const vm = { appConfig: [] };
|
|
160
160
|
window.saasConfig = {
|
package/lowcode/Entry.ts
CHANGED
|
@@ -159,7 +159,7 @@ export class Entry {
|
|
|
159
159
|
}
|
|
160
160
|
(window as any).renderClock = (window as any).renderClock ?? createClock();
|
|
161
161
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
162
|
-
glitter.share.editerVersion = 'V_22.2.
|
|
162
|
+
glitter.share.editerVersion = 'V_22.2.4';
|
|
163
163
|
glitter.share.start = new Date();
|
|
164
164
|
const vm = { appConfig: [] };
|
|
165
165
|
(window as any).saasConfig = {
|
package/package.json
CHANGED
package/src/modules/database.js
CHANGED
|
@@ -9,6 +9,7 @@ const config_1 = __importDefault(require("../config"));
|
|
|
9
9
|
const logger_1 = __importDefault(require("./logger"));
|
|
10
10
|
const exception_1 = __importDefault(require("./exception"));
|
|
11
11
|
const process_1 = __importDefault(require("process"));
|
|
12
|
+
const server_cache_js_1 = require("./server-cache.js");
|
|
12
13
|
const TAG = '[Database]';
|
|
13
14
|
let pool;
|
|
14
15
|
let block_create = false;
|
|
@@ -91,6 +92,19 @@ const query = async (sql, params) => {
|
|
|
91
92
|
if (`${err}`.includes('Too many connections') || `${err}`.includes('Queue limit reached')) {
|
|
92
93
|
process_1.default.exit(1);
|
|
93
94
|
}
|
|
95
|
+
else if (`${err}`.includes(`The client was disconnected`)) {
|
|
96
|
+
return await new Promise(resolve => {
|
|
97
|
+
server_cache_js_1.ServerCache.setCache("client_reconnect", async (response) => {
|
|
98
|
+
await createPool();
|
|
99
|
+
response(true);
|
|
100
|
+
setTimeout(() => {
|
|
101
|
+
delete server_cache_js_1.ServerCache.share["client_reconnect"];
|
|
102
|
+
}, 1000);
|
|
103
|
+
}, async () => {
|
|
104
|
+
resolve(await query(sql, params));
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
}
|
|
94
108
|
throw exception_1.default.ServerError('INTERNAL_SERVER_ERROR', 'Failed to query statement ' + sql + ' because ' + err);
|
|
95
109
|
}
|
|
96
110
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["database.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["database.ts"],"names":[],"mappings":"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"}
|
package/src/modules/database.ts
CHANGED
|
@@ -4,6 +4,8 @@ import Logger from './logger';
|
|
|
4
4
|
import exception from './exception';
|
|
5
5
|
import process from 'process';
|
|
6
6
|
import { fa } from '@faker-js/faker';
|
|
7
|
+
import { ThreadsQueue } from './threads-queue.js';
|
|
8
|
+
import { ServerCache } from './server-cache.js';
|
|
7
9
|
|
|
8
10
|
const TAG = '[Database]';
|
|
9
11
|
let pool: mysql.Pool;
|
|
@@ -78,6 +80,7 @@ const execute = async (sql: string, params: any[]): Promise<any> => {
|
|
|
78
80
|
export const limit = (map: any) => {
|
|
79
81
|
return ` limit ${parseInt(map.page, 10) * parseInt(map.limit, 10)}, ${parseInt(map.limit, 10)} `;
|
|
80
82
|
};
|
|
83
|
+
|
|
81
84
|
const query = async (sql: string, params: unknown[]): Promise<any> => {
|
|
82
85
|
const logger = new Logger();
|
|
83
86
|
const TAG = '[Database][Query]';
|
|
@@ -89,6 +92,19 @@ const query = async (sql: string, params: unknown[]): Promise<any> => {
|
|
|
89
92
|
//連線過多重啟應用
|
|
90
93
|
if(`${err}`.includes('Too many connections') || `${err}`.includes('Queue limit reached')){
|
|
91
94
|
process.exit(1)
|
|
95
|
+
}else if(`${err}`.includes(`The client was disconnected`)){
|
|
96
|
+
return await new Promise(resolve => {
|
|
97
|
+
ServerCache.setCache("client_reconnect",async (response)=>{
|
|
98
|
+
await createPool()
|
|
99
|
+
response(true)
|
|
100
|
+
//移除所有快取
|
|
101
|
+
setTimeout(()=>{
|
|
102
|
+
delete ServerCache.share["client_reconnect"]
|
|
103
|
+
},1000)
|
|
104
|
+
},async ()=>{
|
|
105
|
+
resolve(await query(sql, params))
|
|
106
|
+
})
|
|
107
|
+
});
|
|
92
108
|
}
|
|
93
109
|
throw exception.ServerError('INTERNAL_SERVER_ERROR', 'Failed to query statement ' + sql + ' because ' + err);
|
|
94
110
|
}
|