@resolveio/server-lib 22.2.18 → 22.2.20

package/server-app.js

@@ -2388,13 +2388,13 @@ var ResolveIOMainServer = /** @class */ (function () {
     };
     ResolveIOMainServer.prototype.handleClientMessage = function (ws, msg) {
         return __awaiter(this, void 0, void 0, function () {
-            var messageRoute_1, messageDate, messageId, type, subType, pub, serverRes, offlineUpdates, i, update, data, updateRoute, updateDate, updateMessageId, updateType, method, serverResMethod, err_2, dataCopy_1, date, msgId_1, msgType, methodName_1, ack, method, forceWorker, targetWorkerIndex, targetWorkerInstance, hasWorkerForMethod, isAiCodex, isExcludedFromWorker, errorRes, shouldDispatchToWorker, queueSnapshot, errorRes, err_3;
+            var messageRoute_1, messageDate, messageId, type, subType, pub, serverRes, offlineUpdates, i, update, data, updateRoute, updateDate, updateMessageId, updateType, method, serverResMethod, err_2, dataCopy_1, date, msgId_1, msgType, methodName_1, ack, method, forceWorker, targetWorkerIndex, targetWorkerInstance, hasWorkerForMethod, isAiCodex, isExcludedFromWorker, shouldDispatchToWorker, queueSnapshot, err_3;
             var _a;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _b.trys.push([0, 25, , 26]);
+                        _b.trys.push([0, 24, , 25]);
                         messageRoute_1 = msg[0];
                         messageDate = msg[1];
                         messageId = msg[2];
@@ -2422,7 +2422,7 @@ var ResolveIOMainServer = /** @class */ (function () {
                     case 2:
                         this._subscriptionManager.unsubscribe(messageRoute_1, messageDate, ws, messageId, pub, msg.slice(6));
                         _b.label = 3;
-                    case 3: return [3 /*break*/, 24];
+                    case 3: return [3 /*break*/, 23];
                     case 4:
                         if (!(!this.publicProgram && type === 'offline')) return [3 /*break*/, 16];
                         serverRes = {
@@ -2521,14 +2521,14 @@ var ResolveIOMainServer = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 15:
                         this._offlineUpdates.splice(this._offlineUpdates.map(function (a) { return a['id_socket']; }).indexOf(ws['id_socket']), 1);
-                        return [3 /*break*/, 24];
+                        return [3 /*break*/, 23];
                     case 16:
                         dataCopy_1 = __spreadArray([], __read(msg), false);
                         dataCopy_1.shift();
                         date = dataCopy_1.shift();
                         msgId_1 = dataCopy_1.shift();
                         msgType = dataCopy_1.shift();
-                        if (!(msgType === 'method')) return [3 /*break*/, 24];
+                        if (!(msgType === 'method')) return [3 /*break*/, 23];
                         methodName_1 = dataCopy_1.shift();
                         if (ws['user_readonly']) {
                             return [2 /*return*/];
@@ -2603,22 +2603,19 @@ var ResolveIOMainServer = /** @class */ (function () {
                             methodName_1 === 'reloadWS' ||
                             methodName_1 === 'reconnectWS' ||
                             methodName_1 === 'disconnectWS');
-                        if (targetWorkerIndex && this._isWorkersEnabled && !hasWorkerForMethod) {
-                            errorRes = {
-                                messageId: msgId_1,
-                                hasError: true,
-                                data: "Target worker ".concat(targetWorkerIndex, " not available for method ").concat(methodName_1)
-                            };
-                            if (ws && ws.readyState === WebSocket.OPEN) {
-                                this._websocketManager.send(ws, errorRes);
-                            }
-                            return [2 /*return*/];
+                        if ((targetWorkerIndex || targetWorkerInstance || forceWorker) && this._isWorkersEnabled && !hasWorkerForMethod && this._methodManager.getEnableDebug()) {
+                            console.warn(new Date(), '[WorkerDispatcher] Worker unavailable, running method locally', {
+                                method: methodName_1,
+                                targetWorkerIndex: targetWorkerIndex || null,
+                                targetWorkerInstance: targetWorkerInstance || null,
+                                forceWorker: forceWorker
+                            });
                         }
                         shouldDispatchToWorker = (method &&
                             !method.skipWorker &&
                             this._isWorkersEnabled &&
                             this._workerDispatcherManager &&
-                            (hasWorkerForMethod || forceWorker) &&
+                            hasWorkerForMethod &&
                             (forceWorker || !isExcludedFromWorker));
                         if (isAiCodex && this._aiWorkerDebug) {
                             queueSnapshot = this._workerDispatcherManager ? this._workerDispatcherManager.getQueueSnapshot() : null;
@@ -2639,20 +2636,9 @@ var ResolveIOMainServer = /** @class */ (function () {
                             user: ws['user'],
                             id_ws: ws['id_socket']
                         });
-                        return [3 /*break*/, 24];
+                        return [3 /*break*/, 23];
                     case 20:
-                        if (!(forceWorker && this._isWorkersEnabled)) return [3 /*break*/, 21];
-                        errorRes = {
-                            messageId: msgId_1,
-                            hasError: true,
-                            data: "Worker dispatch required for method ".concat(methodName_1, ", but no worker dispatcher is available.")
-                        };
-                        if (ws && ws.readyState === WebSocket.OPEN) {
-                            this._websocketManager.send(ws, errorRes);
-                        }
-                        return [3 /*break*/, 24];
-                    case 21:
-                        if (!(methodName_1 === 'aiCoderTerminalRunCodex' || methodName_1 === 'aiCoderAppRunCodex')) return [3 /*break*/, 22];
+                        if (!(methodName_1 === 'aiCoderTerminalRunCodex' || methodName_1 === 'aiCoderAppRunCodex')) return [3 /*break*/, 21];
                         if (this._aiWorkerDebug) {
                             console.warn(new Date(), '[AI Worker Debug] AI execution running locally', {
                                 isWorkersEnabled: this._isWorkersEnabled,
@@ -2680,16 +2666,16 @@ var ResolveIOMainServer = /** @class */ (function () {
                                 }
                             });
                         }); }, 0);
-                        return [3 /*break*/, 24];
-                    case 22: return [4 /*yield*/, this.callMethodLocally(ws, msgId_1, methodName_1, dataCopy_1)];
-                    case 23:
+                        return [3 /*break*/, 23];
+                    case 21: return [4 /*yield*/, this.callMethodLocally(ws, msgId_1, methodName_1, dataCopy_1)];
+                    case 22:
                         _b.sent();
-                        _b.label = 24;
-                    case 24: return [3 /*break*/, 26];
-                    case 25:
+                        _b.label = 23;
+                    case 23: return [3 /*break*/, 25];
+                    case 24:
                         err_3 = _b.sent();
                         throw err_3;
-                    case 26: return [2 /*return*/];
+                    case 25: return [2 /*return*/];
                 }
             });
         });