@resolveio/server-lib 20.15.5 → 20.15.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "20.15.5",
+  "version": "20.15.6",
   "description": "",
 	"scripts": {
 		"package": "./build_package.sh",

package/server-app.js

@@ -1606,12 +1606,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, date, msgId, msgType, methodName, ack, method, forceWorker, targetWorkerIndex, hasWorkerForMethod, isExcludedFromWorker, errorRes, shouldDispatchToWorker, 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, hasWorkerForMethod, isExcludedFromWorker, errorRes, shouldDispatchToWorker, errorRes, err_3;
             var _a;
+            var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _b.trys.push([0, 24, , 25]);
+                        _b.trys.push([0, 25, , 26]);
                         messageRoute_1 = msg[0];
                         messageDate = msg[1];
                         messageId = msg[2];
@@ -1639,7 +1640,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*/, 23];
+                    case 3: return [3 /*break*/, 24];
                     case 4:
                         if (!(!this.publicProgram && type === 'offline')) return [3 /*break*/, 16];
                         serverRes = {
@@ -1739,19 +1740,19 @@ 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*/, 23];
+                        return [3 /*break*/, 24];
                     case 16:
-                        dataCopy = __spreadArray([], __read(msg), false);
-                        dataCopy.shift();
-                        date = dataCopy.shift();
-                        msgId = dataCopy.shift();
-                        msgType = dataCopy.shift();
-                        if (!(msgType === 'method')) return [3 /*break*/, 23];
-                        methodName = dataCopy.shift();
+                        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];
+                        methodName_1 = dataCopy_1.shift();
                         if (ws['user_readonly']) {
                             return [2 /*return*/];
                         }
-                        if (!(methodName !== 'reportBuilderGetResults' && methodName !== 'reportBuilderGetDistinctValue' && methodName !== 'reportBuilderBuildTree' && methodName !== 'generatePDF' && methodName !== 'getWOOfflineData' && methodName !== 'countQuery' && methodName !== 'countWithQuery' && methodName !== 'countCollectionWithQuery' && methodName !== 'find' && methodName !== 'findOne' && methodName !== 'findWithOptions' && methodName !== 'getDrivers' && methodName !== 'processAirdropDistribution')) return [3 /*break*/, 19];
+                        if (!(methodName_1 !== 'reportBuilderGetResults' && methodName_1 !== 'reportBuilderGetDistinctValue' && methodName_1 !== 'reportBuilderBuildTree' && methodName_1 !== 'generatePDF' && methodName_1 !== 'getWOOfflineData' && methodName_1 !== 'countQuery' && methodName_1 !== 'countWithQuery' && methodName_1 !== 'countCollectionWithQuery' && methodName_1 !== 'find' && methodName_1 !== 'findOne' && methodName_1 !== 'findWithOptions' && methodName_1 !== 'getDrivers' && methodName_1 !== 'processAirdropDistribution')) return [3 /*break*/, 19];
                         if (!(resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'] !== 'https://resolveio.com'
                             && resolveio_server_app_1.ResolveIOServer.getServerConfig()['ROOT_URL'] !== 'http://localhost:4200')) return [3 /*break*/, 17];
                         resolveio_server_app_1.ResolveIOServer.getLocalLogManager().writeLog({
@@ -1762,8 +1763,8 @@ var ResolveIOMainServer = /** @class */ (function () {
                                 type: 'client-request',
                                 collection: '',
                                 id_document: '',
-                                payload: (0, common_1.getBinarySize)(JSON.stringify([dataCopy])) < 1000000 ? JSON.stringify([dataCopy], null, 2) : 'Too Big',
-                                method: methodName,
+                                payload: (0, common_1.getBinarySize)(JSON.stringify([dataCopy_1])) < 1000000 ? JSON.stringify([dataCopy_1], null, 2) : 'Too Big',
+                                method: methodName_1,
                                 id_user: ws['id_user'] || '',
                                 user: ws['user'] || '',
                                 messageId: messageId,
@@ -1777,8 +1778,8 @@ var ResolveIOMainServer = /** @class */ (function () {
                             type: 'client-request',
                             collection: '',
                             id_document: '',
-                            payload: (0, common_1.getBinarySize)(JSON.stringify([dataCopy])) < 1000000 ? JSON.stringify([dataCopy], null, 2) : 'Too Big',
-                            method: methodName,
+                            payload: (0, common_1.getBinarySize)(JSON.stringify([dataCopy_1])) < 1000000 ? JSON.stringify([dataCopy_1], null, 2) : 'Too Big',
+                            method: methodName_1,
                             id_user: ws['id_user'] || '',
                             user: ws['user'] || '',
                             messageId: messageId,
@@ -1792,39 +1793,39 @@ var ResolveIOMainServer = /** @class */ (function () {
                         _b.label = 19;
                     case 19:
                         ack = {
-                            messageId: msgId,
+                            messageId: msgId_1,
                             hasError: false,
                             data: 'ACK'
                         };
                         if (ws && ws.readyState === WebSocket.OPEN) {
                             this._websocketManager.send(ws, ack);
                         }
-                        method = this._methodManager.getMethod(methodName);
+                        method = this._methodManager.getMethod(methodName_1);
                         forceWorker = this._isWorkersEnabled && !!(method === null || method === void 0 ? void 0 : method.forceWorker);
                         targetWorkerIndex = this._isWorkersEnabled && method ? method.targetWorkerIndex : null;
-                        hasWorkerForMethod = this._workerDispatcherManager ? this._workerDispatcherManager.hasWorkersForMethod(methodName) : false;
-                        isExcludedFromWorker = (methodName === 'find' ||
-                            methodName === 'insertDocument' ||
-                            methodName === 'countWithQuery' ||
-                            methodName === 'findOne' ||
-                            methodName === 'updateDocumentProps' ||
-                            methodName === 'findWithOptions' ||
-                            methodName === 'updateDocument' ||
-                            methodName === 'insertErrorLog' ||
-                            methodName === 'removeDocument' ||
-                            methodName === 'supportCreateBillingUser' ||
-                            methodName === 'getSignedUrl' ||
-                            methodName === 'getSignedUrls' ||
-                            methodName === 'getSignedUrlWithId' ||
-                            methodName === 'incorrectUser' ||
-                            methodName === 'reloadWS' ||
-                            methodName === 'reconnectWS' ||
-                            methodName === 'disconnectWS');
+                        hasWorkerForMethod = this._workerDispatcherManager ? this._workerDispatcherManager.hasWorkersForMethod(methodName_1) : false;
+                        isExcludedFromWorker = (methodName_1 === 'find' ||
+                            methodName_1 === 'insertDocument' ||
+                            methodName_1 === 'countWithQuery' ||
+                            methodName_1 === 'findOne' ||
+                            methodName_1 === 'updateDocumentProps' ||
+                            methodName_1 === 'findWithOptions' ||
+                            methodName_1 === 'updateDocument' ||
+                            methodName_1 === 'insertErrorLog' ||
+                            methodName_1 === 'removeDocument' ||
+                            methodName_1 === 'supportCreateBillingUser' ||
+                            methodName_1 === 'getSignedUrl' ||
+                            methodName_1 === 'getSignedUrls' ||
+                            methodName_1 === 'getSignedUrlWithId' ||
+                            methodName_1 === 'incorrectUser' ||
+                            methodName_1 === 'reloadWS' ||
+                            methodName_1 === 'reconnectWS' ||
+                            methodName_1 === 'disconnectWS');
                         if (targetWorkerIndex && this._isWorkersEnabled && !hasWorkerForMethod) {
                             errorRes = {
-                                messageId: msgId,
+                                messageId: msgId_1,
                                 hasError: true,
-                                data: "Target worker ".concat(targetWorkerIndex, " not available for method ").concat(methodName)
+                                data: "Target worker ".concat(targetWorkerIndex, " not available for method ").concat(methodName_1)
                             };
                             if (ws && ws.readyState === WebSocket.OPEN) {
                                 this._websocketManager.send(ws, errorRes);
@@ -1838,35 +1839,53 @@ var ResolveIOMainServer = /** @class */ (function () {
                             (hasWorkerForMethod || forceWorker) &&
                             (forceWorker || !isExcludedFromWorker));
                         if (!shouldDispatchToWorker) return [3 /*break*/, 20];
-                        this._workerDispatcherManager.sendClientTask(msgId, methodName, dataCopy, {
+                        this._workerDispatcherManager.sendClientTask(msgId_1, methodName_1, dataCopy_1, {
                             id_user: ws['id_user'],
                             user: ws['user'],
                             id_ws: ws['id_socket']
                         });
-                        return [3 /*break*/, 23];
+                        return [3 /*break*/, 24];
                     case 20:
                         if (!(forceWorker && this._isWorkersEnabled)) return [3 /*break*/, 21];
                         errorRes = {
-                            messageId: msgId,
+                            messageId: msgId_1,
                             hasError: true,
-                            data: "Worker dispatch required for method ".concat(methodName, ", but no worker dispatcher is available.")
+                            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*/, 23];
-                    case 21: 
-                    // No worker available: do method locally
-                    return [4 /*yield*/, this.callMethodLocally(ws, msgId, methodName, dataCopy)];
-                    case 22:
-                        // No worker available: do method locally
+                        return [3 /*break*/, 24];
+                    case 21:
+                        if (!(methodName_1 === 'aiCoderTerminalRunCodex')) return [3 /*break*/, 22];
+                        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                            var error_4;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, this.callMethodLocally(ws, msgId_1, methodName_1, dataCopy_1)];
+                                    case 1:
+                                        _a.sent();
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        error_4 = _a.sent();
+                                        console.error(new Date(), 'aiCoderTerminalRunCodex failed:', error_4);
+                                        return [3 /*break*/, 3];
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); }, 0);
+                        return [3 /*break*/, 24];
+                    case 22: return [4 /*yield*/, this.callMethodLocally(ws, msgId_1, methodName_1, dataCopy_1)];
+                    case 23:
                         _b.sent();
-                        _b.label = 23;
-                    case 23: return [3 /*break*/, 25];
-                    case 24:
+                        _b.label = 24;
+                    case 24: return [3 /*break*/, 26];
+                    case 25:
                         err_3 = _b.sent();
                         throw err_3;
-                    case 25: return [2 /*return*/];
+                    case 26: return [2 /*return*/];
                 }
             });
         });