@resolveio/server-lib 20.7.36 → 20.7.37

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.
@@ -16,7 +16,7 @@ export declare class WorkerDispatcherManager {
16
16
  private _workers;
17
17
  private _taskQueue;
18
18
  private _clientRequests;
19
- private _runningTasks;
19
+ private _pendingTasks;
20
20
  private MAX_CONCURRENCY;
21
21
  constructor();
22
22
  static create(websocketManager: WebSocketManager, methodManager: MethodManager): WorkerDispatcherManager;
@@ -1,2 +1,2 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.WorkerDispatcherManager=void 0;var common_1=require("../util/common"),WorkerDispatcherManager=function(){function WorkerDispatcherManager(){this._workers=[],this._taskQueue=[],this._clientRequests={},this._runningTasks=[],this.MAX_CONCURRENCY=3}return WorkerDispatcherManager.create=function(e,t){var r=new WorkerDispatcherManager;return r.initialize(e,t),r},WorkerDispatcherManager.prototype.initialize=function(e,t){this._websocketManager=e,this._methodManager=t},WorkerDispatcherManager.prototype.isSafeShutdown=function(){return!this._taskQueue.length&&!this._runningTasks.length},WorkerDispatcherManager.prototype.addWorker=function(e){this._workers.push({id:e.id_worker,ws:e,activeTasks:[]})},WorkerDispatcherManager.prototype.disconnectWorker=function(t){this._workers=this._workers.filter(function(e){return e.id!==t})},WorkerDispatcherManager.prototype.sendClientTask=function(e,t,r,s){var a="task-"+(0,common_1.objectIdHexString)();this._taskQueue.push({type:"task",taskId:a,messageId:e,method:t,params:r,userContext:s}),s&&s.id_ws&&(this._clientRequests[a]=s.id_ws),this.dispatchQueue()},WorkerDispatcherManager.prototype.sendInternalTask=function(e,t){void 0===t&&(t=[]),Array.isArray(t)||(t=[t]);var r="task-"+(0,common_1.objectIdHexString)();this._taskQueue.push({type:"task",taskId:r,method:e,params:t,messageId:0,userContext:{user:"Internal System"}}),this.dispatchQueue()},WorkerDispatcherManager.prototype.dispatchQueue=function(){var e=this;if(this._taskQueue.length)for(;0<this._taskQueue.length;){var t=this.findAvailableWorker();if(!t)return void setTimeout(function(){e.dispatchQueue()},25);var r=this._taskQueue.shift();this.assignTaskToWorker(t,r)}},WorkerDispatcherManager.prototype.findAvailableWorker=function(){var t=this,e=this._workers.filter(function(e){return e.activeTasks.map(function(e){return e.weight}).reduce(function(e,t){return t},0)<t.MAX_CONCURRENCY});return e.length?(e.sort(function(e,t){return e.activeTasks.map(function(e){return e.weight}).reduce(function(e,t){return t},0)-t.activeTasks.map(function(e){return e.weight}).reduce(function(e,t){return t},0)}),e[0]):null},WorkerDispatcherManager.prototype.assignTaskToWorker=function(t,r){var e=this._methodManager.getMethod(r.method);if(e){t.activeTasks.push({taskId:r.taskId,weight:e&&e.workerTaskWeight?e.workerTaskWeight:1});e={type:"task",taskId:r.taskId,messageId:r.messageId,method:r.method,params:r.params,userContext:r.userContext||{}};try{this.sendWorkerPayload(t.ws,e)}catch(e){console.error("Failed to send task to worker:",e),t.activeTasks=t.activeTasks.filter(function(e){return e.taskId!==r.taskId}),this._taskQueue.unshift(r)}}else console.error("Failed to send task to worker - Could not find method:",r.method)},WorkerDispatcherManager.prototype.handleWorkerMessage=function(t,r){var s,e,a,o;try{e=JSON.parse(r,common_1.dateReviver)}catch(e){return void console.error("Failed to parse worker message:",r)}"taskComplete"===e.type&&((r=this._workers.find(function(e){return e.id===t}))?(s=e.taskId,a=e.messageId,o=e.error,e=e.result,r.activeTasks=r.activeTasks.filter(function(e){return e.taskId!==s}),(r=this._clientRequests[s])&&(a={messageId:a,hasError:!1,data:e},o&&(a.hasError=!0,a.data=e),o=this._websocketManager.getWebSocket(r),this._websocketManager.send(o,a),delete this._clientRequests[s]),this.dispatchQueue()):console.error("Unknown worker for taskComplete:",t))},WorkerDispatcherManager.prototype.sendWorkerPayload=function(e,t){if("string"!=typeof t&&(t=JSON.stringify(t)),e&&e.readyState===e.OPEN)try{e.send(t)}catch(e){console.error("Failed to send worker response:",e)}else e&&e.close()},WorkerDispatcherManager}();exports.WorkerDispatcherManager=WorkerDispatcherManager;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.WorkerDispatcherManager=void 0;var WebSocket=require("ws"),common_1=require("../util/common"),WorkerDispatcherManager=function(){function WorkerDispatcherManager(){this._workers=[],this._taskQueue=[],this._clientRequests={},this._pendingTasks=new Map,this.MAX_CONCURRENCY=3}return WorkerDispatcherManager.create=function(e,t){var r=new WorkerDispatcherManager;return r.initialize(e,t),r},WorkerDispatcherManager.prototype.initialize=function(e,t){this._websocketManager=e,this._methodManager=t},WorkerDispatcherManager.prototype.isSafeShutdown=function(){return!this._taskQueue.length&&!this._pendingTasks.size},WorkerDispatcherManager.prototype.addWorker=function(e){this._workers.push({id:e.id_worker,ws:e,activeTasks:[]})},WorkerDispatcherManager.prototype.disconnectWorker=function(t){this._workers=this._workers.filter(function(e){return e.id!==t})},WorkerDispatcherManager.prototype.sendClientTask=function(e,t,r,s){var a="task-"+(0,common_1.objectIdHexString)();this._taskQueue.push({type:"task",taskId:a,messageId:e,method:t,params:r,userContext:s}),s&&s.id_ws&&(this._clientRequests[a]=s.id_ws),this.dispatchQueue()},WorkerDispatcherManager.prototype.sendInternalTask=function(e,t){void 0===t&&(t=[]),Array.isArray(t)||(t=[t]);var r="task-"+(0,common_1.objectIdHexString)();this._taskQueue.push({type:"task",taskId:r,method:e,params:t,messageId:0,userContext:{user:"Internal System"}}),this.dispatchQueue()},WorkerDispatcherManager.prototype.dispatchQueue=function(){var e=this;if(this._taskQueue.length)for(;0<this._taskQueue.length;){var t=this.findAvailableWorker();if(!t)return void setTimeout(function(){e.dispatchQueue()},25);var r=this._taskQueue.shift();this.assignTaskToWorker(t,r)}},WorkerDispatcherManager.prototype.findAvailableWorker=function(){var t=this,e=this._workers.filter(function(e){return e.activeTasks.map(function(e){return e.weight}).reduce(function(e,t){return e+t},0)<t.MAX_CONCURRENCY});return e.length?(e.sort(function(e,t){return e.activeTasks.map(function(e){return e.weight}).reduce(function(e,t){return e+t},0)-t.activeTasks.map(function(e){return e.weight}).reduce(function(e,t){return e+t},0)}),e[0]):null},WorkerDispatcherManager.prototype.assignTaskToWorker=function(r,s){var a=this,e=this._methodManager.getMethod(s.method);if(e){r.activeTasks.push({taskId:s.taskId,weight:e&&e.workerTaskWeight?e.workerTaskWeight:1});var e={type:"task",taskId:s.taskId,messageId:s.messageId,method:s.method,params:s.params,userContext:s.userContext||{}},t=setTimeout(function(){var e,t;a._pendingTasks.has(s.taskId)&&a._pendingTasks.delete(s.taskId),r.activeTasks=r.activeTasks.filter(function(e){return e.taskId!==s.taskId}),s.userContext&&s.userContext.id_ws&&(e={messageId:s.messageId,hasError:!0,data:"Task timed out after 30s in WorkerDispatcherManager for method: "+s.method},t=a._websocketManager.getWebSocket(s.userContext.id_ws))&&t.readyState===WebSocket.OPEN&&a._websocketManager.send(t,e)},3e4);this._pendingTasks.set(s.taskId,{timeout:t});try{this.sendWorkerPayload(r.ws,e)}catch(e){console.error("Failed to send task to worker:",e),clearTimeout(t),r.activeTasks=r.activeTasks.filter(function(e){return e.taskId!==s.taskId}),this._taskQueue.unshift(s)}}else console.error("Failed to send task to worker - Could not find method:",s.method)},WorkerDispatcherManager.prototype.handleWorkerMessage=function(t,r){var s,e,a,o;try{e=JSON.parse(r,common_1.dateReviver)}catch(e){return void console.error("Failed to parse worker message:",r)}"taskComplete"===e.type&&((r=this._workers.find(function(e){return e.id===t}))?(s=e.taskId,a=e.messageId,o=e.error,e=e.result,r.activeTasks=r.activeTasks.filter(function(e){return e.taskId!==s}),(r=this._pendingTasks.get(s))&&(clearTimeout(r.timeout),this._pendingTasks.delete(s)),(r=this._clientRequests[s])&&(a={messageId:a,hasError:!1,data:e},o&&(a.hasError=!0,a.data=e),o=this._websocketManager.getWebSocket(r),this._websocketManager.send(o,a),this._clientRequests[s])&&delete this._clientRequests[s],this.dispatchQueue()):console.error("Unknown worker for taskComplete:",t))},WorkerDispatcherManager.prototype.sendWorkerPayload=function(e,t){if("string"!=typeof t&&(t=JSON.stringify(t)),e&&e.readyState===e.OPEN)try{e.send(t)}catch(e){console.error("Failed to send worker response:",e)}else e&&e.close()},WorkerDispatcherManager}();exports.WorkerDispatcherManager=WorkerDispatcherManager;
2
2
  //# sourceMappingURL=worker-dispatcher.manager.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/managers/worker-dispatcher.manager.ts"],"names":["common_1","require","WorkerDispatcherManager","this","_workers","_taskQueue","_clientRequests","_runningTasks","MAX_CONCURRENCY","create","websocketManager","methodManager","workerDispatcherManager","initialize","prototype","_websocketManager","_methodManager","isSafeShutdown","length","addWorker","ws","push","id","activeTasks","disconnectWorker","workerId","filter","w","sendClientTask","messageId","method","params","userContext","taskId","objectIdHexString","type","id_ws","dispatchQueue","sendInternalTask","Array","isArray","user","_this","findAvailableWorker","setTimeout","task","shift","assignTaskToWorker","candidates","x","map","a","weight","reduce","b","sort","y","worker","getMethod","workerTaskWeight","payload","sendWorkerPayload","err","console","error","unshift","handleWorkerMessage","messageStr","taskId_1","result","res","clientReqWS","data","JSON","parse","dateReviver","_a","find","clientReqId","hasError","getWebSocket","send","stringify","readyState","OPEN","close","exports"],"mappings":"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","file":"worker-dispatcher.manager.js","sourcesContent":["import * as WebSocket from 'ws';\nimport { ServerResponseModel, TaskPayload, TaskResponse } from '../models/server-message.model';\nimport { dateReviver, objectIdHexString } from '../util/common';\nimport { MethodManager } from './method.manager';\nimport { WebSocketManager } from './websocket.manager';\n\nexport interface WorkerConnection {\n id: string;\n ws: WebSocket.WebSocket;\n activeTasks: { taskId: string, weight: number }[];\n}\n\nexport class WorkerDispatcherManager {\n\tprivate _websocketManager: WebSocketManager;\n\tprivate _methodManager: MethodManager;\n private _workers: WorkerConnection[] = [];\n\tprivate _taskQueue: TaskPayload[] = [];\n private _clientRequests: { [taskId: string]: string } = {};\n\tprivate _runningTasks = [];\n\n private MAX_CONCURRENCY = 3;\n\n constructor() {}\n \n static create(websocketManager: WebSocketManager, methodManager: MethodManager) {\n const workerDispatcherManager = new WorkerDispatcherManager();\n workerDispatcherManager.initialize(websocketManager, methodManager);\n return workerDispatcherManager;\n }\n\n public initialize(websocketManager: WebSocketManager, methodManager: MethodManager) {\n\t\tthis._websocketManager = websocketManager;\n\t\tthis._methodManager = methodManager;\n }\n\n\tpublic isSafeShutdown() {\n\t\treturn !this._taskQueue.length && !this._runningTasks.length;\n\t}\n\n public addWorker(ws: WebSocket.WebSocket) {\n this._workers.push({\n\t\t\tid: ws['id_worker'],\n\t\t\tws: ws,\n\t\t\tactiveTasks: []\n\t\t});\n }\n\n\tpublic disconnectWorker(workerId: string) {\n\t\tthis._workers = this._workers.filter(w => w.id !== workerId);\n\t}\n\n /**\n\t * Add a new task to our in-memory queue and try to dispatch.\n\t */\n\tpublic sendClientTask(messageId: number, method: string, params: any[], userContext?: { id_user?: string; user?: string; id_ws?: string }) {\n\t\tlet taskId = 'task-' + objectIdHexString();\n\n\t\tthis._taskQueue.push({\n\t\t\ttype: 'task',\n\t\t\ttaskId,\n\t\t\tmessageId,\n\t\t\tmethod,\n\t\t\tparams,\n\t\t\tuserContext\n\t\t});\n\n\t\tif (userContext && userContext.id_ws) {\n\t\t\tthis._clientRequests[taskId] = userContext.id_ws;\n\t\t}\n\n\t\tthis.dispatchQueue();\n\t}\n\n\tpublic sendInternalTask(method: string, params = []) {\n\t\tif (!Array.isArray(params)) {\n\t\t\tparams = [params];\n\t\t}\n\n\t\tlet taskId = 'task-' + objectIdHexString();\n\n\t\tthis._taskQueue.push({\n\t\t\ttype: 'task',\n\t\t\ttaskId,\n\t\t\tmethod,\n\t\t\tparams,\n\t\t\tmessageId: 0,\n\t\t\tuserContext: {\n\t\t\t\tuser: 'Internal System'\n\t\t\t}\n\t\t});\n\n\t\tthis.dispatchQueue();\n\t}\n\n\t/**\n\t * The main loop that assigns tasks from _taskQueue to any worker that has capacity.\n\t */\n\tprivate dispatchQueue() {\n\t\tif (!this._taskQueue.length) {\n\t\t\treturn;\n\t\t}\n\n\t\twhile (this._taskQueue.length > 0) {\n\t\t\tlet w = this.findAvailableWorker();\n\n\t\t\tif (!w) {\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tthis.dispatchQueue();\n\t\t\t\t}, 25);\n\t\t\t\t\n\t\t\t\treturn; // no worker can take more tasks\n\t\t\t}\n\n\t\t\t// Remove from queue\n\t\t\tlet task = this._taskQueue.shift();\n\t\t\tthis.assignTaskToWorker(w, task);\n\t\t}\n\t}\n\n\t/**\n\t * Returns the worker with the fewest activeTasks that is under maxConcurrency. Or null if none.\n\t */\n\tprivate findAvailableWorker(): WorkerConnection | null {\n\t\tlet candidates = this._workers.filter(x => x.activeTasks.map(a => a.weight).reduce((a, b) => a = b, 0) < this.MAX_CONCURRENCY);\n\t\tif (!candidates.length) {\n\t\t\treturn null;\n\t\t}\n\n\t\t// Sort by how busy they are\n\t\tcandidates.sort((x, y) => x.activeTasks.map(a => a.weight).reduce((a, b) => a = b, 0) - y.activeTasks.map(a => a.weight).reduce((a, b) => a = b, 0));\n\t\treturn candidates[0];\n\t}\n\n\tprivate assignTaskToWorker(worker: WorkerConnection, task: TaskPayload) {\n\t\tlet method = this._methodManager.getMethod(task.method);\n\n\t\tif (!method) {\n\t\t\tconsole.error('Failed to send task to worker - Could not find method:', task.method);\n\t\t\treturn;\n\t\t}\n\n\t\tworker.activeTasks.push({\n\t\t\ttaskId: task.taskId,\n\t\t\tweight: method && method.workerTaskWeight ? method.workerTaskWeight : 1\n\t\t});\n\n\t\tlet payload: TaskPayload = {\n\t\t\ttype: 'task',\n\t\t\ttaskId: task.taskId,\n\t\t\tmessageId: task.messageId,\n\t\t\tmethod: task.method,\n\t\t\tparams: task.params,\n\t\t\tuserContext: task.userContext || {}\n\t\t};\n\n\t\ttry {\n\t\t\tthis.sendWorkerPayload(worker.ws, payload);\n\t\t}\n\t\tcatch (err) {\n\t\t\tconsole.error('Failed to send task to worker:', err);\n\n\t\t\tworker.activeTasks = worker.activeTasks.filter(a => a.taskId !== task.taskId);\n\t\t\t// Put task back at front\n\t\t\tthis._taskQueue.unshift(task);\n\t\t}\n\t}\n\n\t/**\n\t * Handle messages coming back from a worker (like 'taskComplete').\n\t */\n\tpublic handleWorkerMessage(workerId: string, messageStr: string) {\n\t\tlet data: TaskResponse;\n\t\t\n\t\ttry {\n\t\t\tdata = JSON.parse(messageStr, dateReviver);\n\t\t}\n\t\tcatch {\n\t\t\tconsole.error('Failed to parse worker message:', messageStr);\n\t\t\treturn;\n\t\t}\n\n\t\tif (data.type === 'taskComplete') {\n\t\t\tlet w = this._workers.find(x => x.id === workerId);\n\t\t\tif (!w) {\n\t\t\t\tconsole.error('Unknown worker for taskComplete:', workerId);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t\n\t\t\tlet { taskId, messageId, error, result } = data;\n\t\t\t\n\t\t\tw.activeTasks = w.activeTasks.filter(a => a.taskId !== taskId);\n\n\t\t\t// Look up original request\n\t\t\tlet clientReqId = this._clientRequests[taskId];\n\t\t\t\n\t\t\tif (clientReqId) {\n\t\t\t\t// Send the final response to the client\n\t\t\t\tlet res: ServerResponseModel = {\n\t\t\t\t\tmessageId: messageId,\n\t\t\t\t\thasError: false,\n\t\t\t\t\tdata: result\n\t\t\t\t};\n\n\t\t\t\tif (error) {\n\t\t\t\t\tres.hasError = true;\n\t\t\t\t\tres.data = result;\n\t\t\t\t}\n\n\t\t\t\tlet clientReqWS = this._websocketManager.getWebSocket(clientReqId);\n\t\t\t\tthis._websocketManager.send(clientReqWS, res);\n\n\t\t\t\tdelete this._clientRequests[taskId];\n\t\t\t}\n\n\t\t\t// Try to dispatch more from the queue\n\t\t\tthis.dispatchQueue();\n\t\t}\n\t}\n\n\tpublic sendWorkerPayload(ws: WebSocket.WebSocket, payload: TaskPayload | string) {\n if (typeof payload !== 'string') {\n payload = JSON.stringify(payload);\n }\n\n if (ws && ws.readyState === ws.OPEN) {\n try {\n ws.send(payload);\n }\n catch (err) {\n console.error('Failed to send worker response:', err);\n }\n }\n else if (ws) {\n ws.close();\n }\n }\n}"]}
1
+ {"version":3,"sources":["../../src/managers/worker-dispatcher.manager.ts"],"names":["WebSocket","require","common_1","WorkerDispatcherManager","this","_workers","_taskQueue","_clientRequests","_pendingTasks","Map","MAX_CONCURRENCY","create","websocketManager","methodManager","workerDispatcherManager","initialize","prototype","_websocketManager","_methodManager","isSafeShutdown","length","size","addWorker","ws","push","id","activeTasks","disconnectWorker","workerId","filter","w","sendClientTask","messageId","method","params","userContext","taskId","objectIdHexString","type","id_ws","dispatchQueue","sendInternalTask","Array","isArray","user","_this","findAvailableWorker","setTimeout","task","shift","assignTaskToWorker","candidates","x","map","a","weight","reduce","b","sort","y","worker","getMethod","workerTaskWeight","payload","timeoutHandle","timeoutRes","clientWS","has","delete","hasError","data","getWebSocket","readyState","OPEN","send","set","timeout","sendWorkerPayload","err","console","error","clearTimeout","unshift","handleWorkerMessage","messageStr","taskId_1","result","res","clientReqWS","JSON","parse","dateReviver","_a","find","pendingTask","get","clientReqId","stringify","close","exports"],"mappings":"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","file":"worker-dispatcher.manager.js","sourcesContent":["import * as WebSocket from 'ws';\nimport { ServerResponseModel, TaskPayload, TaskResponse } from '../models/server-message.model';\nimport { dateReviver, objectIdHexString } from '../util/common';\nimport { MethodManager } from './method.manager';\nimport { WebSocketManager } from './websocket.manager';\n\nexport interface WorkerConnection {\n id: string;\n ws: WebSocket.WebSocket;\n activeTasks: { taskId: string, weight: number }[];\n}\n\nexport class WorkerDispatcherManager {\n\tprivate _websocketManager: WebSocketManager;\n\tprivate _methodManager: MethodManager;\n private _workers: WorkerConnection[] = [];\n\tprivate _taskQueue: TaskPayload[] = [];\n private _clientRequests: { [taskId: string]: string } = {};\n\tprivate _pendingTasks: Map<string, {\n\t\ttimeout: NodeJS.Timeout;\n\t}> = new Map();\n\n private MAX_CONCURRENCY = 3;\n\n constructor() {}\n \n static create(websocketManager: WebSocketManager, methodManager: MethodManager) {\n const workerDispatcherManager = new WorkerDispatcherManager();\n workerDispatcherManager.initialize(websocketManager, methodManager);\n return workerDispatcherManager;\n }\n\n public initialize(websocketManager: WebSocketManager, methodManager: MethodManager) {\n\t\tthis._websocketManager = websocketManager;\n\t\tthis._methodManager = methodManager;\n }\n\n\tpublic isSafeShutdown() {\n\t\treturn !this._taskQueue.length && !this._pendingTasks.size;\n\t}\n\n public addWorker(ws: WebSocket.WebSocket) {\n this._workers.push({\n\t\t\tid: ws['id_worker'],\n\t\t\tws: ws,\n\t\t\tactiveTasks: []\n\t\t});\n }\n\n\tpublic disconnectWorker(workerId: string) {\n\t\tthis._workers = this._workers.filter(w => w.id !== workerId);\n\t}\n\n /**\n\t * Add a new task to our in-memory queue and try to dispatch.\n\t */\n\tpublic sendClientTask(messageId: number, method: string, params: any[], userContext?: { id_user?: string; user?: string; id_ws?: string }) {\n\t\tlet taskId = 'task-' + objectIdHexString();\n\n\t\tthis._taskQueue.push({\n\t\t\ttype: 'task',\n\t\t\ttaskId,\n\t\t\tmessageId,\n\t\t\tmethod,\n\t\t\tparams,\n\t\t\tuserContext\n\t\t});\n\n\t\tif (userContext && userContext.id_ws) {\n\t\t\tthis._clientRequests[taskId] = userContext.id_ws;\n\t\t}\n\n\t\tthis.dispatchQueue();\n\t}\n\n\tpublic sendInternalTask(method: string, params = []) {\n\t\tif (!Array.isArray(params)) {\n\t\t\tparams = [params];\n\t\t}\n\n\t\tlet taskId = 'task-' + objectIdHexString();\n\n\t\tthis._taskQueue.push({\n\t\t\ttype: 'task',\n\t\t\ttaskId,\n\t\t\tmethod,\n\t\t\tparams,\n\t\t\tmessageId: 0,\n\t\t\tuserContext: {\n\t\t\t\tuser: 'Internal System'\n\t\t\t}\n\t\t});\n\n\t\tthis.dispatchQueue();\n\t}\n\n\t/**\n\t * The main loop that assigns tasks from _taskQueue to any worker that has capacity.\n\t */\n\tprivate dispatchQueue() {\n\t\tif (!this._taskQueue.length) {\n\t\t\treturn;\n\t\t}\n\n\t\twhile (this._taskQueue.length > 0) {\n\t\t\tlet w = this.findAvailableWorker();\n\n\t\t\tif (!w) {\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tthis.dispatchQueue();\n\t\t\t\t}, 25);\n\t\t\t\t\n\t\t\t\treturn; // no worker can take more tasks\n\t\t\t}\n\n\t\t\t// Remove from queue\n\t\t\tlet task = this._taskQueue.shift();\n\t\t\tthis.assignTaskToWorker(w, task);\n\t\t}\n\t}\n\n\t/**\n\t * Returns the worker with the fewest activeTasks that is under maxConcurrency. Or null if none.\n\t */\n\tprivate findAvailableWorker(): WorkerConnection | null {\n\t\tlet candidates = this._workers.filter(x => x.activeTasks.map(a => a.weight).reduce((a, b) => a + b, 0) < this.MAX_CONCURRENCY);\n\t\tif (!candidates.length) {\n\t\t\treturn null;\n\t\t}\n\n\t\t// Sort by how busy they are\n\t\tcandidates.sort((x, y) => x.activeTasks.map(a => a.weight).reduce((a, b) => a + b, 0) - y.activeTasks.map(a => a.weight).reduce((a, b) => a + b, 0));\n\t\treturn candidates[0];\n\t}\n\n\tprivate assignTaskToWorker(worker: WorkerConnection, task: TaskPayload) {\n\t\tlet method = this._methodManager.getMethod(task.method);\n\n\t\tif (!method) {\n\t\t\tconsole.error('Failed to send task to worker - Could not find method:', task.method);\n\t\t\treturn;\n\t\t}\n\n\t\tworker.activeTasks.push({\n\t\t\ttaskId: task.taskId,\n\t\t\tweight: method && method.workerTaskWeight ? method.workerTaskWeight : 1\n\t\t});\n\n\t\tlet payload: TaskPayload = {\n\t\t\ttype: 'task',\n\t\t\ttaskId: task.taskId,\n\t\t\tmessageId: task.messageId,\n\t\t\tmethod: task.method,\n\t\t\tparams: task.params,\n\t\t\tuserContext: task.userContext || {}\n\t\t};\n\n\t\tlet timeoutHandle = setTimeout(() => {\n\t\t\tif (this._pendingTasks.has(task.taskId)) {\n\t\t\t\tthis._pendingTasks.delete(task.taskId);\n\t\t\t}\n\n\t\t\tworker.activeTasks = worker.activeTasks.filter(a => a.taskId !== task.taskId);\n\n\t\t\tif (task.userContext && task.userContext.id_ws) {\n\t\t\t\tlet timeoutRes: ServerResponseModel = {\n\t\t\t\t\tmessageId: task.messageId,\n\t\t\t\t\thasError: true,\n\t\t\t\t\tdata: 'Task timed out after 30s in WorkerDispatcherManager for method: ' + task.method\n\t\t\t\t};\n\n\t\t\t\tlet clientWS = this._websocketManager.getWebSocket(task.userContext.id_ws);\n\t\t\t\tif (clientWS && clientWS.readyState === WebSocket.OPEN) {\n\t\t\t\t\tthis._websocketManager.send(clientWS, timeoutRes);\n\t\t\t\t}\n\t\t\t}\n\t\t}, 30000);\n\n\t\tthis._pendingTasks.set(task.taskId, {\n\t\t\ttimeout: timeoutHandle\n\t\t});\n\n\t\ttry {\n\t\t\tthis.sendWorkerPayload(worker.ws, payload);\n\t\t}\n\t\tcatch (err) {\n\t\t\tconsole.error('Failed to send task to worker:', err);\n\n\t\t\tclearTimeout(timeoutHandle);\n\n\t\t\tworker.activeTasks = worker.activeTasks.filter(a => a.taskId !== task.taskId);\n\n\t\t\t// Put task back at front\n\t\t\tthis._taskQueue.unshift(task);\n\t\t}\n\t}\n\n\t/**\n\t * Handle messages coming back from a worker (like 'taskComplete').\n\t */\n\tpublic handleWorkerMessage(workerId: string, messageStr: string) {\n\t\tlet data: TaskResponse;\n\t\t\n\t\ttry {\n\t\t\tdata = JSON.parse(messageStr, dateReviver);\n\t\t}\n\t\tcatch {\n\t\t\tconsole.error('Failed to parse worker message:', messageStr);\n\t\t\treturn;\n\t\t}\n\n\t\tif (data.type === 'taskComplete') {\n\t\t\tlet w = this._workers.find(x => x.id === workerId);\n\t\t\tif (!w) {\n\t\t\t\tconsole.error('Unknown worker for taskComplete:', workerId);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t\n\t\t\tlet { taskId, messageId, error, result } = data;\n\t\t\t\n\t\t\tw.activeTasks = w.activeTasks.filter(a => a.taskId !== taskId);\n\n\t\t\tlet pendingTask = this._pendingTasks.get(taskId);\n\t\t\tif (pendingTask) {\n\t\t\t\tclearTimeout(pendingTask.timeout);\n\t\t\t\tthis._pendingTasks.delete(taskId);\n\t\t\t}\n\n\t\t\t// Look up original request\n\t\t\tlet clientReqId = this._clientRequests[taskId];\n\t\t\t\n\t\t\tif (clientReqId) {\n\t\t\t\t// Send the final response to the client\n\t\t\t\tlet res: ServerResponseModel = {\n\t\t\t\t\tmessageId: messageId,\n\t\t\t\t\thasError: false,\n\t\t\t\t\tdata: result\n\t\t\t\t};\n\n\t\t\t\tif (error) {\n\t\t\t\t\tres.hasError = true;\n\t\t\t\t\tres.data = result;\n\t\t\t\t}\n\n\t\t\t\tlet clientReqWS = this._websocketManager.getWebSocket(clientReqId);\n\t\t\t\tthis._websocketManager.send(clientReqWS, res);\n\n\t\t\t\tif (this._clientRequests[taskId]) {\n\t\t\t\t\tdelete this._clientRequests[taskId];\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// Try to dispatch more from the queue\n\t\t\tthis.dispatchQueue();\n\t\t}\n\t}\n\n\tpublic sendWorkerPayload(ws: WebSocket.WebSocket, payload: TaskPayload | string) {\n if (typeof payload !== 'string') {\n payload = JSON.stringify(payload);\n }\n\n if (ws && ws.readyState === ws.OPEN) {\n try {\n ws.send(payload);\n }\n catch (err) {\n console.error('Failed to send worker response:', err);\n }\n }\n else if (ws) {\n ws.close();\n }\n }\n}"]}
@@ -1,2 +1,2 @@
1
- "use strict";var __awaiter=this&&this.__awaiter||function(e,n,o,s){return new(o=o||Promise)(function(t,r){function fulfilled(e){try{step(s.next(e))}catch(e){r(e)}}function rejected(e){try{step(s.throw(e))}catch(e){r(e)}}function step(e){var r;e.done?t(e.value):((r=e.value)instanceof o?r:new o(function(e){e(r)})).then(fulfilled,rejected)}step((s=s.apply(e,n||[])).next())})},__generator=this&&this.__generator||function(n,o){var s,a,i,c={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]},l={next:verb(0),throw:verb(1),return:verb(2)};return"function"==typeof Symbol&&(l[Symbol.iterator]=function(){return this}),l;function verb(t){return function(e){var r=[t,e];if(s)throw new TypeError("Generator is already executing.");for(;c=l&&r[l=0]?0:c;)try{if(s=1,a&&(i=2&r[0]?a.return:r[0]?a.throw||((i=a.return)&&i.call(a),0):a.next)&&!(i=i.call(a,r[1])).done)return i;switch(a=0,(r=i?[2&r[0],i.value]:r)[0]){case 0:case 1:i=r;break;case 4:return c.label++,{value:r[1],done:!1};case 5:c.label++,a=r[1],r=[0];continue;case 7:r=c.ops.pop(),c.trys.pop();continue;default:if(!(i=0<(i=c.trys).length&&i[i.length-1])&&(6===r[0]||2===r[0])){c=0;continue}if(3===r[0]&&(!i||r[1]>i[0]&&r[1]<i[3]))c.label=r[1];else if(6===r[0]&&c.label<i[1])c.label=i[1],i=r;else{if(!(i&&c.label<i[2])){i[2]&&c.ops.pop(),c.trys.pop();continue}c.label=i[2],c.ops.push(r)}}r=o.call(n,c)}catch(e){r=[6,e],a=0}finally{s=i=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}}},__read=this&&this.__read||function(e,r){var t="function"==typeof Symbol&&e[Symbol.iterator];if(!t)return e;var n,o,s=t.call(e),a=[];try{for(;(void 0===r||0<r--)&&!(n=s.next()).done;)a.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(t=s.return)&&t.call(s)}finally{if(o)throw o.error}}return a},__spreadArray=this&&this.__spreadArray||function(e,r,t){if(t||2===arguments.length)for(var n,o=0,s=r.length;o<s;o++)!n&&o in r||((n=n||Array.prototype.slice.call(r,0,o))[o]=r[o]);return e.concat(n||Array.prototype.slice.call(r))},WebSocket=(Object.defineProperty(exports,"__esModule",{value:!0}),exports.WorkerServerManager=void 0,require("ws")),common_1=require("../util/common"),method_manager_1=require("./method.manager"),WorkerServerManager=function(){function WorkerServerManager(){this._runningTasks=[]}return WorkerServerManager.create=function(e,r){var t=new WorkerServerManager;return t.initialize(e,r),t},WorkerServerManager.prototype.initialize=function(e,r){this._methodManager=e,this._serverConfig=r,this.startWorkerInstance()},WorkerServerManager.prototype.startWorkerInstance=function(){var e=this,r=(console.log(new Date,"Worker instance started, connecting to main server via WebSocket..."),this._serverConfig.SERVER_URL+"/websocket?workerToken="+this._serverConfig.WORKER_TOKEN),n=new WebSocket(r),o=null,t=null;n.on("open",function(){console.log(new Date,"Connected to main server as worker",process.env.WORKER_INDEX,process.env.NODE_APP_INSTANCE),e.sendWorkerResponse(n,"ping"),t=setInterval(function(){o?(o=null,e.sendWorkerResponse(n,"ping")):n.close()},15e3)}),n.on("message",function(t){return __awaiter(e,void 0,void 0,function(){var r;return __generator(this,function(e){switch(e.label){case 0:return"ping"!==(t="string"!=typeof t?t.toString():t)?[3,1]:(this.sendWorkerResponse(n,"pong"),[3,4]);case 1:return"pong"!==t?[3,2]:(o=new Date,[3,4]);case 2:r=void 0;try{r=JSON.parse(t,common_1.dateReviver)}catch(e){return console.error("Worker parse error",e),[2]}return"task"!==r.type?[3,4]:[4,this.handleIncomingTask(n,r)];case 3:e.sent(),e.label=4;case 4:return[2]}})})}),n.on("close",function(){console.log(new Date,"Disconnected from main server. Reconnecting in 5s..."),setTimeout(function(){return e.startWorkerInstance},5e3),t&&clearInterval(t)}),n.on("error",function(e){console.error(new Date,"Worker WS error:",e),n.close()})},WorkerServerManager.prototype.handleIncomingTask=function(d,h){return __awaiter(this,void 0,void 0,function(){var r,t,n,o,s,a,i,c,l,u=this;return __generator(this,function(e){switch(e.label){case 0:if(r=h.taskId,t=h.messageId,n=h.method,o=h.params,s=h.userContext,this._runningTasks.push(r),!r||!n)return console.log("Invalid task message received",h),this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!0,result:"Invalid task"}),[2];a=!1,i=setTimeout(function(){return __awaiter(u,void 0,void 0,function(){return __generator(this,function(e){switch(e.label){case 0:return a=!0,console.error(new Date,"Worker timed out on task:",r,"Method:",n),console.error(new Date,"Error in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2))),this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!0,result:"Task timed out"}),[4,this._methodManager.callMethod("insertErrorLog","Timeout in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2)))];case 1:return e.sent(),[2]}})})},12e4),e.label=1;case 1:return e.trys.push([1,3,,5]),c=Object.assign({},this._methodManager,method_manager_1.MethodManager.prototype,{id_user:(null==s?void 0:s.id_user)||"",user:(null==s?void 0:s.user)||"",id_ws:(null==s?void 0:s.id_ws)||""}),[4,(l=this._methodManager.callMethod).call.apply(l,__spreadArray([c,n],__read(o),!1))];case 2:return l=e.sent(),a||(clearTimeout(i),this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!1,result:l})),this._runningTasks=this._runningTasks.filter(function(e){return e!==r}),[3,5];case 3:return c=e.sent(),a||(clearTimeout(i),console.error("Worker failed task:",r,"Method:",n,c),c.message="Worker failed task:"+r+" Method:"+n+" - "+c.message,this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!0,result:c||"Unknown error"})),console.error(new Date,"Error in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2))),[4,this._methodManager.callMethod("insertErrorLog","Error in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2)))];case 4:return e.sent(),this._runningTasks=this._runningTasks.filter(function(e){return e!==r}),[3,5];case 5:return[2]}})})},WorkerServerManager.prototype.sendWorkerResponse=function(e,r){if("string"!=typeof r&&(r=JSON.stringify(r)),e&&e.readyState===e.OPEN)try{e.send(r)}catch(e){console.error("Failed to send worker response:",e)}else e&&e.close()},WorkerServerManager}();exports.WorkerServerManager=WorkerServerManager;
1
+ "use strict";var __awaiter=this&&this.__awaiter||function(e,n,o,s){return new(o=o||Promise)(function(t,r){function fulfilled(e){try{step(s.next(e))}catch(e){r(e)}}function rejected(e){try{step(s.throw(e))}catch(e){r(e)}}function step(e){var r;e.done?t(e.value):((r=e.value)instanceof o?r:new o(function(e){e(r)})).then(fulfilled,rejected)}step((s=s.apply(e,n||[])).next())})},__generator=this&&this.__generator||function(n,o){var s,a,i,c={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]},l={next:verb(0),throw:verb(1),return:verb(2)};return"function"==typeof Symbol&&(l[Symbol.iterator]=function(){return this}),l;function verb(t){return function(e){var r=[t,e];if(s)throw new TypeError("Generator is already executing.");for(;c=l&&r[l=0]?0:c;)try{if(s=1,a&&(i=2&r[0]?a.return:r[0]?a.throw||((i=a.return)&&i.call(a),0):a.next)&&!(i=i.call(a,r[1])).done)return i;switch(a=0,(r=i?[2&r[0],i.value]:r)[0]){case 0:case 1:i=r;break;case 4:return c.label++,{value:r[1],done:!1};case 5:c.label++,a=r[1],r=[0];continue;case 7:r=c.ops.pop(),c.trys.pop();continue;default:if(!(i=0<(i=c.trys).length&&i[i.length-1])&&(6===r[0]||2===r[0])){c=0;continue}if(3===r[0]&&(!i||r[1]>i[0]&&r[1]<i[3]))c.label=r[1];else if(6===r[0]&&c.label<i[1])c.label=i[1],i=r;else{if(!(i&&c.label<i[2])){i[2]&&c.ops.pop(),c.trys.pop();continue}c.label=i[2],c.ops.push(r)}}r=o.call(n,c)}catch(e){r=[6,e],a=0}finally{s=i=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}}},__read=this&&this.__read||function(e,r){var t="function"==typeof Symbol&&e[Symbol.iterator];if(!t)return e;var n,o,s=t.call(e),a=[];try{for(;(void 0===r||0<r--)&&!(n=s.next()).done;)a.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(t=s.return)&&t.call(s)}finally{if(o)throw o.error}}return a},__spreadArray=this&&this.__spreadArray||function(e,r,t){if(t||2===arguments.length)for(var n,o=0,s=r.length;o<s;o++)!n&&o in r||((n=n||Array.prototype.slice.call(r,0,o))[o]=r[o]);return e.concat(n||Array.prototype.slice.call(r))},WebSocket=(Object.defineProperty(exports,"__esModule",{value:!0}),exports.WorkerServerManager=void 0,require("ws")),common_1=require("../util/common"),method_manager_1=require("./method.manager"),WorkerServerManager=function(){function WorkerServerManager(){this._runningTasks=[]}return WorkerServerManager.create=function(e,r){var t=new WorkerServerManager;return t.initialize(e,r),t},WorkerServerManager.prototype.initialize=function(e,r){this._methodManager=e,this._serverConfig=r,this.startWorkerInstance()},WorkerServerManager.prototype.startWorkerInstance=function(){var e=this,r=(console.log(new Date,"Worker instance started, connecting to main server via WebSocket..."),this._serverConfig.SERVER_URL+"/websocket?workerToken="+this._serverConfig.WORKER_TOKEN),n=new WebSocket(r),o=null,t=null;n.on("open",function(){console.log(new Date,"Connected to main server as worker",process.env.WORKER_INDEX,process.env.NODE_APP_INSTANCE),e.sendWorkerResponse(n,"ping"),t=setInterval(function(){o?(o=null,e.sendWorkerResponse(n,"ping")):n.close()},15e3)}),n.on("message",function(t){return __awaiter(e,void 0,void 0,function(){var r;return __generator(this,function(e){switch(e.label){case 0:return"ping"!==(t="string"!=typeof t?t.toString():t)?[3,1]:(this.sendWorkerResponse(n,"pong"),[3,4]);case 1:return"pong"!==t?[3,2]:(o=new Date,[3,4]);case 2:r=void 0;try{r=JSON.parse(t,common_1.dateReviver)}catch(e){return console.error("Worker parse error",e),[2]}return"task"!==r.type?[3,4]:[4,this.handleIncomingTask(n,r)];case 3:e.sent(),e.label=4;case 4:return[2]}})})}),n.on("close",function(){console.log(new Date,"Disconnected from main server. Reconnecting in 5s..."),setTimeout(function(){return e.startWorkerInstance},5e3),t&&clearInterval(t)}),n.on("error",function(e){console.error(new Date,"Worker WS error:",e),n.close()})},WorkerServerManager.prototype.handleIncomingTask=function(d,h){return __awaiter(this,void 0,void 0,function(){var r,t,n,o,s,a,i,c,l,u=this;return __generator(this,function(e){switch(e.label){case 0:if(r=h.taskId,t=h.messageId,n=h.method,o=h.params,s=h.userContext,this._runningTasks.push(r),!r||!n)return console.log("Invalid task message received",h),this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!0,result:"Invalid task"}),[2];a=!1,i=setTimeout(function(){return __awaiter(u,void 0,void 0,function(){return __generator(this,function(e){switch(e.label){case 0:return a=!0,console.error(new Date,"Worker timed out on task:",r,"Method:",n),console.error(new Date,"Error in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2))),this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!0,result:"Task timed out"}),[4,this._methodManager.callMethod("insertErrorLog","Timeout in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2)))];case 1:return e.sent(),[2]}})})},12e4),e.label=1;case 1:return e.trys.push([1,3,,5]),c=Object.assign({},this._methodManager,method_manager_1.MethodManager.prototype,{id_user:(null==s?void 0:s.id_user)||"",user:(null==s?void 0:s.user)||"",id_ws:(null==s?void 0:s.id_ws)||""}),[4,(l=this._methodManager.callMethod).call.apply(l,__spreadArray([c,n],__read(o),!1))];case 2:return l=e.sent(),a||(clearTimeout(i),this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!1,result:l})),this._runningTasks=this._runningTasks.filter(function(e){return e!==r}),[3,5];case 3:if(c=e.sent(),a)return console.error(new Date,"Error in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2))),[4,this._methodManager.callMethod("insertErrorLog","Error in Method: ".concat(n," - ").concat(JSON.stringify(h,null,2)))];throw clearTimeout(i),console.error("Worker failed task:",r,"Method:",n,c),c.message="Worker failed task:"+r+" Method:"+n+" - "+c.message,this.sendWorkerResponse(d,{type:"taskComplete",taskId:r,messageId:t,error:!0,result:c||"Unknown error"}),c;case 4:return e.sent(),this._runningTasks=this._runningTasks.filter(function(e){return e!==r}),[3,5];case 5:return[2]}})})},WorkerServerManager.prototype.sendWorkerResponse=function(e,r){if("string"!=typeof r&&(r=JSON.stringify(r)),e&&e.readyState===e.OPEN)try{e.send(r)}catch(e){console.error("Failed to send worker response:",e)}else e&&e.close()},WorkerServerManager}();exports.WorkerServerManager=WorkerServerManager;
2
2
  //# sourceMappingURL=worker-server.manager.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/managers/worker-server.manager.ts"],"names":["WebSocket","require","common_1","method_manager_1","WorkerServerManager","this","_runningTasks","create","methodManager","serverConfig","workerServerManager","initialize","prototype","_methodManager","_serverConfig","startWorkerInstance","_this","wsUrl","console","log","Date","ws","lastComm","interval","on","process","env","WORKER_INDEX","NODE_APP_INSTANCE","sendWorkerResponse","setInterval","close","rawData","__awaiter","toString","msg","JSON","parse","dateReviver","e","error","type","handleIncomingTask","_a","sent","setTimeout","clearInterval","err","data","taskId","messageId","method","params","userContext","push","result","timedOut","timeoutHandle","concat","stringify","callMethod","managerThis","Object","assign","MethodManager","id_user","user","id_ws","call","apply","__spreadArray","__read","_b","clearTimeout","filter","a","err_1","message","payload","readyState","OPEN","send","exports"],"mappings":"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","file":"worker-server.manager.js","sourcesContent":["import * as WebSocket from 'ws';\nimport { TaskPayload, TaskResponse } from '../models/server-message.model';\nimport { dateReviver } from '../util/common';\nimport { MethodManager } from './method.manager';\n\nexport class WorkerServerManager {\n private _methodManager;\n private _serverConfig;\n private _runningTasks = [];\n\n constructor() {}\n \n static create(methodManager: MethodManager, serverConfig) {\n const workerServerManager = new WorkerServerManager();\n workerServerManager.initialize(methodManager, serverConfig);\n return workerServerManager;\n }\n\n public initialize(methodManager: MethodManager, serverConfig) {\n this._methodManager = methodManager;\n this._serverConfig = serverConfig;\n this.startWorkerInstance();\n }\n\n private startWorkerInstance() {\n console.log(new Date(), 'Worker instance started, connecting to main server via WebSocket...');\n\n let wsUrl = this._serverConfig['SERVER_URL'] + '/websocket?workerToken=' + this._serverConfig['WORKER_TOKEN'];\n\n const ws = new WebSocket(wsUrl);\n\n let lastComm = null;\n let interval = null;\n\n ws.on('open', () => {\n console.log(new Date(), 'Connected to main server as worker', process.env.WORKER_INDEX, process.env.NODE_APP_INSTANCE);\n this.sendWorkerResponse(ws, 'ping');\n\n interval = setInterval(() => {\n if (!lastComm) {\n ws.close();\n }\n else {\n lastComm = null;\n this.sendWorkerResponse(ws, 'ping');\n }\n }, 15000);\n });\n\n ws.on('message', async (rawData: any) => {\n // console.log(new Date(), 'Message Recv', rawData);\n\n if (typeof rawData !== 'string') {\n rawData = rawData.toString();\n }\n\n // console.log(new Date(), 'String Message Recv', rawData);\n\n if (rawData === 'ping') {\n // console.log(new Date(), 'Recv Ping, Sending Pong');\n this.sendWorkerResponse(ws, 'pong');\n }\n else if (rawData === 'pong') {\n // console.log(new Date(), 'Recv Ping, Sending Pong');\n lastComm = new Date();\n }\n else {\n let msg: any;\n try {\n msg = JSON.parse(rawData, dateReviver);\n }\n catch (e) {\n console.error('Worker parse error', e);\n return;\n }\n\n // We expect: { type: 'task', taskId, method, params, userContext? }\n if (msg.type === 'task') {\n await this.handleIncomingTask(ws, msg);\n }\n }\n });\n\n ws.on('close', () => {\n console.log(new Date(), 'Disconnected from main server. Reconnecting in 5s...');\n setTimeout(() => this.startWorkerInstance, 5000);\n\n if (interval) {\n clearInterval(interval);\n }\n });\n\n ws.on('error', (err) => {\n console.error(new Date(), 'Worker WS error:', err);\n ws.close();\n });\n }\n\n private async handleIncomingTask(ws: WebSocket.WebSocket, data: TaskPayload) {\n let { taskId, messageId, method, params, userContext } = data;\n this._runningTasks.push(taskId);\n if (!taskId || !method) {\n console.log('Invalid task message received', data);\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: true,\n result: 'Invalid task'\n });\n\n return;\n }\n\n let timedOut = false;\n let timeoutHandle = setTimeout(async () => {\n timedOut = true;\n console.error(new Date(), 'Worker timed out on task:', taskId, 'Method:', method);\n\n console.error(new Date(), `Error in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: true,\n result: 'Task timed out'\n });\n\n await this._methodManager.callMethod('insertErrorLog', `Timeout in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n }, 120000);\n\n try {\n let managerThis = Object.assign({}, this._methodManager, MethodManager.prototype, {\n id_user: userContext?.id_user || '',\n user: userContext?.user || '',\n id_ws: userContext?.id_ws || ''\n });\n\n let result = await this._methodManager.callMethod.call(managerThis, method, ...params);\n\n if (!timedOut) {\n clearTimeout(timeoutHandle);\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: false,\n result\n });\n }\n\n this._runningTasks = this._runningTasks.filter(a => a !== taskId);\n }\n catch (err) {\n if (!timedOut) {\n clearTimeout(timeoutHandle);\n console.error('Worker failed task:', taskId, 'Method:', method, err);\n err.message = 'Worker failed task:' + taskId + ' Method:' + method + ' - ' + err.message;\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: true,\n result: err || 'Unknown error'\n });\n }\n\n console.error(new Date(), `Error in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n \n await this._methodManager.callMethod('insertErrorLog', `Error in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n \n this._runningTasks = this._runningTasks.filter(a => a !== taskId);\n }\n }\n\n public sendWorkerResponse(ws, payload: TaskResponse | string) {\n if (typeof payload !== 'string') {\n payload = JSON.stringify(payload);\n }\n\n if (ws && ws.readyState === ws.OPEN) {\n try {\n ws.send(payload);\n }\n catch (err) {\n console.error('Failed to send worker response:', err);\n }\n }\n else if (ws) {\n ws.close();\n }\n }\n}"]}
1
+ {"version":3,"sources":["../../src/managers/worker-server.manager.ts"],"names":["WebSocket","require","common_1","method_manager_1","WorkerServerManager","this","_runningTasks","create","methodManager","serverConfig","workerServerManager","initialize","prototype","_methodManager","_serverConfig","startWorkerInstance","_this","wsUrl","console","log","Date","ws","lastComm","interval","on","process","env","WORKER_INDEX","NODE_APP_INSTANCE","sendWorkerResponse","setInterval","close","rawData","__awaiter","toString","msg","JSON","parse","dateReviver","e","error","type","handleIncomingTask","_a","sent","setTimeout","clearInterval","err","data","taskId","messageId","method","params","userContext","push","result","timedOut","timeoutHandle","concat","stringify","callMethod","managerThis","Object","assign","MethodManager","id_user","user","id_ws","call","apply","__spreadArray","__read","_b","clearTimeout","filter","a","err_1","message","payload","readyState","OPEN","send","exports"],"mappings":"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","file":"worker-server.manager.js","sourcesContent":["import * as WebSocket from 'ws';\nimport { TaskPayload, TaskResponse } from '../models/server-message.model';\nimport { dateReviver } from '../util/common';\nimport { MethodManager } from './method.manager';\n\nexport class WorkerServerManager {\n private _methodManager;\n private _serverConfig;\n private _runningTasks = [];\n\n constructor() {}\n \n static create(methodManager: MethodManager, serverConfig) {\n const workerServerManager = new WorkerServerManager();\n workerServerManager.initialize(methodManager, serverConfig);\n return workerServerManager;\n }\n\n public initialize(methodManager: MethodManager, serverConfig) {\n this._methodManager = methodManager;\n this._serverConfig = serverConfig;\n this.startWorkerInstance();\n }\n\n private startWorkerInstance() {\n console.log(new Date(), 'Worker instance started, connecting to main server via WebSocket...');\n\n let wsUrl = this._serverConfig['SERVER_URL'] + '/websocket?workerToken=' + this._serverConfig['WORKER_TOKEN'];\n\n const ws = new WebSocket(wsUrl);\n\n let lastComm = null;\n let interval = null;\n\n ws.on('open', () => {\n console.log(new Date(), 'Connected to main server as worker', process.env.WORKER_INDEX, process.env.NODE_APP_INSTANCE);\n this.sendWorkerResponse(ws, 'ping');\n\n interval = setInterval(() => {\n if (!lastComm) {\n ws.close();\n }\n else {\n lastComm = null;\n this.sendWorkerResponse(ws, 'ping');\n }\n }, 15000);\n });\n\n ws.on('message', async (rawData: any) => {\n // console.log(new Date(), 'Message Recv', rawData);\n\n if (typeof rawData !== 'string') {\n rawData = rawData.toString();\n }\n\n // console.log(new Date(), 'String Message Recv', rawData);\n\n if (rawData === 'ping') {\n // console.log(new Date(), 'Recv Ping, Sending Pong');\n this.sendWorkerResponse(ws, 'pong');\n }\n else if (rawData === 'pong') {\n // console.log(new Date(), 'Recv Ping, Sending Pong');\n lastComm = new Date();\n }\n else {\n let msg: any;\n try {\n msg = JSON.parse(rawData, dateReviver);\n }\n catch (e) {\n console.error('Worker parse error', e);\n return;\n }\n\n // We expect: { type: 'task', taskId, method, params, userContext? }\n if (msg.type === 'task') {\n await this.handleIncomingTask(ws, msg);\n }\n }\n });\n\n ws.on('close', () => {\n console.log(new Date(), 'Disconnected from main server. Reconnecting in 5s...');\n setTimeout(() => this.startWorkerInstance, 5000);\n\n if (interval) {\n clearInterval(interval);\n }\n });\n\n ws.on('error', (err) => {\n console.error(new Date(), 'Worker WS error:', err);\n ws.close();\n });\n }\n\n private async handleIncomingTask(ws: WebSocket.WebSocket, data: TaskPayload) {\n let { taskId, messageId, method, params, userContext } = data;\n this._runningTasks.push(taskId);\n if (!taskId || !method) {\n console.log('Invalid task message received', data);\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: true,\n result: 'Invalid task'\n });\n\n return;\n }\n\n let timedOut = false;\n let timeoutHandle = setTimeout(async () => {\n timedOut = true;\n console.error(new Date(), 'Worker timed out on task:', taskId, 'Method:', method);\n\n console.error(new Date(), `Error in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: true,\n result: 'Task timed out'\n });\n\n await this._methodManager.callMethod('insertErrorLog', `Timeout in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n }, 120000);\n\n try {\n let managerThis = Object.assign({}, this._methodManager, MethodManager.prototype, {\n id_user: userContext?.id_user || '',\n user: userContext?.user || '',\n id_ws: userContext?.id_ws || ''\n });\n\n let result = await this._methodManager.callMethod.call(managerThis, method, ...params);\n\n if (!timedOut) {\n clearTimeout(timeoutHandle);\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: false,\n result\n });\n }\n\n this._runningTasks = this._runningTasks.filter(a => a !== taskId);\n }\n catch (err) {\n if (!timedOut) {\n clearTimeout(timeoutHandle);\n console.error('Worker failed task:', taskId, 'Method:', method, err);\n err.message = 'Worker failed task:' + taskId + ' Method:' + method + ' - ' + err.message;\n this.sendWorkerResponse(ws, {\n type: 'taskComplete',\n taskId,\n messageId,\n error: true,\n result: err || 'Unknown error'\n });\n throw err;\n }\n\n console.error(new Date(), `Error in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n \n await this._methodManager.callMethod('insertErrorLog', `Error in Method: ${method} - ${JSON.stringify(data, null, 2)}`);\n \n this._runningTasks = this._runningTasks.filter(a => a !== taskId);\n }\n }\n\n public sendWorkerResponse(ws, payload: TaskResponse | string) {\n if (typeof payload !== 'string') {\n payload = JSON.stringify(payload);\n }\n\n if (ws && ws.readyState === ws.OPEN) {\n try {\n ws.send(payload);\n }\n catch (err) {\n console.error('Failed to send worker response:', err);\n }\n }\n else if (ws) {\n ws.close();\n }\n }\n}"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@resolveio/server-lib",
3
- "version": "20.7.36",
3
+ "version": "20.7.37",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "package": "./build_package.sh",