biz-a-cli 2.3.62 → 2.3.63
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/bin/hub.js +6 -2
- package/bin/hubEvent.js +2 -0
- package/callbackController.js +1 -1
- package/package.json +1 -1
- package/scheduler/datalib.js +2 -1
package/bin/hub.js
CHANGED
|
@@ -131,7 +131,11 @@ app.use(express.json({ limit: '100mb' }));
|
|
|
131
131
|
|
|
132
132
|
app.set('args', argv);
|
|
133
133
|
|
|
134
|
-
|
|
134
|
+
let socket = null
|
|
135
|
+
app.use('/cb', (req, res)=>{
|
|
136
|
+
req.socket = socket
|
|
137
|
+
runCliScript(req, res)
|
|
138
|
+
});
|
|
135
139
|
|
|
136
140
|
app.use('/status', (req, res)=>{
|
|
137
141
|
res.status(200).json(argv.cliAddress());
|
|
@@ -157,7 +161,7 @@ await streamEvent(ioClient(argv['server'], {query: {isSockStream: true }}), argv
|
|
|
157
161
|
|
|
158
162
|
// as socket client to BizA HUB
|
|
159
163
|
if (argv.hubServer) {
|
|
160
|
-
hubEvent(ioClient(argv['hubServer'], { reconnectionDelay: RECONNECT_SOCKET_DELAY, reconnectionDelayMax: RECONNECT_SOCKET_DELAY, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
|
|
164
|
+
socket = hubEvent(ioClient(argv['hubServer'], { reconnectionDelay: RECONNECT_SOCKET_DELAY, reconnectionDelayMax: RECONNECT_SOCKET_DELAY, query: {isCLI: true, room: argv['subdomain']} }), argv, (url)=>{
|
|
161
165
|
if (url!==argv.connectedHubUrl) {
|
|
162
166
|
argv.connectedHubUrl = url
|
|
163
167
|
}
|
package/bin/hubEvent.js
CHANGED
|
@@ -128,6 +128,7 @@ export const streamEvent = async (socket, argv) => new Promise((resolve, reject)
|
|
|
128
128
|
socket.io.on('reconnect', ()=>{
|
|
129
129
|
console.log(`${new Date()}: ${getIdText(id)}reconnecting to BizA Server`)
|
|
130
130
|
})
|
|
131
|
+
return socket
|
|
131
132
|
})
|
|
132
133
|
|
|
133
134
|
export const hubEvent = (socket, argv, notifier)=>{
|
|
@@ -160,6 +161,7 @@ export const hubEvent = (socket, argv, notifier)=>{
|
|
|
160
161
|
})
|
|
161
162
|
apiRequestListener(socket, argv);
|
|
162
163
|
deploymentListenerForHubServer(socket, argv);
|
|
164
|
+
return socket
|
|
163
165
|
}
|
|
164
166
|
|
|
165
167
|
export const apiRequestListener = (socket, argv)=>{
|
package/callbackController.js
CHANGED
|
@@ -26,7 +26,7 @@ export async function runCliScript(req, res) {
|
|
|
26
26
|
let script = await loadCliScript(selectedConfig, 'ID', req.body.query.scriptid);
|
|
27
27
|
let functions = await extractFunctionScript(selectedConfig, script);
|
|
28
28
|
if (functions) {
|
|
29
|
-
let respon = await functions.onInit(data);
|
|
29
|
+
let respon = await functions.onInit(data, req.socket);
|
|
30
30
|
res.send(respon);
|
|
31
31
|
|
|
32
32
|
console.log(`Run Callback Successfully!`);
|
package/package.json
CHANGED
package/scheduler/datalib.js
CHANGED
|
@@ -167,7 +167,8 @@ export async function extractFunctionScript(selectedConfig, data) {
|
|
|
167
167
|
axios: axios.default,
|
|
168
168
|
dayjs: dayjs.default,
|
|
169
169
|
crypto: crypto,
|
|
170
|
-
log: logger
|
|
170
|
+
log: logger,
|
|
171
|
+
data: {sendModel, queryData, crudData, genId, getUrlAndParam}
|
|
171
172
|
}
|
|
172
173
|
|
|
173
174
|
if (scriptFn().functions.useLibrary) {
|