@haiiro/docuflow 0.0.12 → 0.0.15

package/src/logic-functions/bitrix-install.logic-function.mjs

@@ -119538,7 +119538,6 @@ var renderBitrixPage = ({
   title,
   message,
   crmUrl,
-  tasks,
   isInstall
 }) => `<!doctype html>
 <html lang="ru">
@@ -119552,28 +119551,46 @@ var renderBitrixPage = ({
   h1 { font-size: 20px; margin: 0 0 8px; }
   p { color: #666; margin: 0 0 16px; }
   a.button { display: inline-block; padding: 8px 16px; border-radius: 8px; background: #1961ed; color: #fff; text-decoration: none; }
-  ul { list-style: none; padding: 0; margin: 16px 0 0; }
-  li { padding: 8px 0; border-top: 1px solid #eee; display: flex; justify-content: space-between; gap: 16px; }
-  li a { color: #1961ed; text-decoration: none; }
-  .due { color: #999; white-space: nowrap; }
 </style>
 </head>
 <body>
 <h1>${escapeHtml(title)}</h1>
 <p>${escapeHtml(message)}</p>
 ${crmUrl !== void 0 ? `<a class="button" href="${escapeHtml(crmUrl)}" target="_blank" rel="noopener">\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442</a>` : ""}
-${tasks.length > 0 ? `<ul>${tasks.map(
-  (task) => `<li>${task.url !== void 0 ? `<a href="${escapeHtml(task.url)}" target="_blank" rel="noopener">${escapeHtml(task.title)}</a>` : escapeHtml(task.title)}<span class="due">${escapeHtml(task.dueAt ?? "")}</span></li>`
-).join("")}</ul>` : ""}
 ${isInstall ? "<script>if (window.BX24) { BX24.init(function () { BX24.installFinish(); }); }</script>" : ""}
 </body>
 </html>`;
 
+// src/shared/log.util.ts
+var PREFIX = "[docflow]";
+var describeError = (error) => {
+  if (error instanceof Error) {
+    const { status, body } = error;
+    return { name: error.name, message: error.message, status, body };
+  }
+  return error;
+};
+var logDocflowError = (event, error, details) => console.error(PREFIX, event, describeError(error), details ?? "");
+
 // src/server/http-response.ts
+var jsonResponse = (status, body) => new AL(JSON.stringify(body), {
+  status,
+  headers: { "content-type": "application/json; charset=utf-8" }
+});
 var htmlResponse = (status, html) => new AL(html, {
   status,
   headers: { "content-type": "text/html; charset=utf-8" }
 });
+var withRouteErrors = (name, handler2) => async (...args) => {
+  try {
+    return await handler2(...args);
+  } catch (error) {
+    logDocflowError(`${name}: unexpected error`, error);
+    return jsonResponse(500, {
+      message: `\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442\u0430: ${error instanceof Error ? error.message : String(error)}`
+    });
+  }
+};
 
 // src/universal-identifiers.ts
 var BITRIX_INSTALL_LOGIC_FUNCTION_UNIVERSAL_IDENTIFIER = "896071e0-0964-4b28-bc39-ed50c19d592a";
@@ -119586,7 +119603,6 @@ var handler = async (event) => {
       renderBitrixPage({
         title: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442",
         message: "\u0412 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0432 CRM \u043D\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u044B BITRIX_CLIENT_ID \u0438 BITRIX_CLIENT_SECRET.",
-        tasks: [],
         isInstall: false
       })
     );
@@ -119613,7 +119629,6 @@ var handler = async (event) => {
       renderBitrixPage({
         title: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0451\u043D",
         message: `\u041F\u043E\u0440\u0442\u0430\u043B ${portal.portalDomain} \u0441\u0432\u044F\u0437\u0430\u043D \u0441 CRM.`,
-        tasks: [],
         isInstall: true
       })
     );
@@ -119623,7 +119638,6 @@ var handler = async (event) => {
       renderBitrixPage({
         title: "\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442",
         message: error instanceof BitrixError ? `\u041F\u043E\u0440\u0442\u0430\u043B \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D: ${error.message}` : "\u041F\u043E\u0440\u0442\u0430\u043B \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D.",
-        tasks: [],
         isInstall: false
       })
     );
@@ -119634,7 +119648,7 @@ var bitrix_install_logic_function_default = defineLogicFunction({
   name: "docflow-bitrix-install",
   description: "\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u043D\u0430 \u043F\u043E\u0440\u0442\u0430\u043B\u0435 \u0411\u0438\u0442\u0440\u0438\u043A\u044124",
   timeoutSeconds: 30,
-  handler,
+  handler: withRouteErrors("bitrix-install", handler),
   httpRouteTriggerSettings: {
     path: "/bitrix/install",
     httpMethod: "POST",

package/src/logic-functions/bitrix-install.logic-function.ts

@@ -6,7 +6,7 @@ import { BitrixError, callBitrix, isBitrixConfigured } from 'src/shared/bitrix/b
 import { parseBitrixRequest } from 'src/shared/bitrix/bitrix.util';
 import { proveAndLinkBitrixPortal } from 'src/server/bitrix-portal';
 import { renderBitrixPage } from 'src/server/bitrix-page';
-import { htmlResponse } from 'src/server/http-response';
+import { htmlResponse, withRouteErrors } from 'src/server/http-response';
 import { BITRIX_INSTALL_LOGIC_FUNCTION_UNIVERSAL_IDENTIFIER } from 'src/universal-identifiers';
 
 // "Путь для первоначальной установки" of the local Bitrix24 application.
@@ -17,7 +17,6 @@ const handler = async (event: RoutePayload) => {
       renderBitrixPage({
         title: 'Документооборот',
         message: 'В настройках приложения в CRM не указаны BITRIX_CLIENT_ID и BITRIX_CLIENT_SECRET.',
-        tasks: [],
         isInstall: false,
       }),
     );
@@ -47,7 +46,6 @@ const handler = async (event: RoutePayload) => {
       renderBitrixPage({
         title: 'Документооборот подключён',
         message: `Портал ${portal.portalDomain} связан с CRM.`,
-        tasks: [],
         isInstall: true,
       }),
     );
@@ -60,7 +58,6 @@ const handler = async (event: RoutePayload) => {
           error instanceof BitrixError
             ? `Портал не подтверждён: ${error.message}`
             : 'Портал не подтверждён.',
-        tasks: [],
         isInstall: false,
       }),
     );
@@ -72,7 +69,7 @@ export default defineLogicFunction({
   name: 'docflow-bitrix-install',
   description: 'Установка приложения на портале Битрикс24',
   timeoutSeconds: 30,
-  handler,
+  handler: withRouteErrors('bitrix-install', handler),
   httpRouteTriggerSettings: {
     path: '/bitrix/install',
     httpMethod: 'POST',

package/src/logic-functions/complete-task.logic-function.mjs

@@ -119363,12 +119363,33 @@ var AL = class {
   }
 };
 
+// src/shared/log.util.ts
+var PREFIX = "[docflow]";
+var describeError = (error) => {
+  if (error instanceof Error) {
+    const { status, body } = error;
+    return { name: error.name, message: error.message, status, body };
+  }
+  return error;
+};
+var logDocflowError = (event, error, details) => console.error(PREFIX, event, describeError(error), details ?? "");
+
 // src/server/http-response.ts
 var jsonResponse = (status, body) => new AL(JSON.stringify(body), {
   status,
   headers: { "content-type": "application/json; charset=utf-8" }
 });
 var readJsonBody = (body) => typeof body === "object" && body !== null && !Array.isArray(body) ? body : {};
+var withRouteErrors = (name, handler2) => async (...args) => {
+  try {
+    return await handler2(...args);
+  } catch (error) {
+    logDocflowError(`${name}: unexpected error`, error);
+    return jsonResponse(500, {
+      message: `\u041E\u0448\u0438\u0431\u043A\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442\u0430: ${error instanceof Error ? error.message : String(error)}`
+    });
+  }
+};
 
 // src/shared/api/core-graphql.util.ts
 var CoreGraphqlError = class extends Error {
@@ -119633,7 +119654,7 @@ var complete_task_logic_function_default = defineLogicFunction({
   name: "docflow-complete-task",
   description: "\u0412\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442 \u0437\u0430\u0434\u0430\u043D\u0438\u0435: \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u0435\u0442 \u043F\u043E\u043B\u044F \u0438 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 \u043F\u0440\u043E\u0446\u0435\u0441\u0441",
   timeoutSeconds: 30,
-  handler,
+  handler: withRouteErrors("complete-task", handler),
   httpRouteTriggerSettings: {
     path: "/docflow/tasks/complete",
     httpMethod: "POST",

package/src/logic-functions/complete-task.logic-function.ts

@@ -2,7 +2,7 @@ import { defineLogicFunction } from 'twenty-sdk/define';
 import { type RoutePayload } from 'twenty-sdk/logic-function';
 
 import { parseFormValues } from 'src/shared/form/form-fields.util';
-import { jsonResponse, readJsonBody } from 'src/server/http-response';
+import { jsonResponse, readJsonBody, withRouteErrors } from 'src/server/http-response';
 import { completeTask } from 'src/server/task-completion';
 import { COMPLETE_TASK_LOGIC_FUNCTION_UNIVERSAL_IDENTIFIER } from 'src/universal-identifiers';
 
@@ -37,7 +37,7 @@ export default defineLogicFunction({
   name: 'docflow-complete-task',
   description: 'Выполняет задание: проверяет поля и продолжает процесс',
   timeoutSeconds: 30,
-  handler,
+  handler: withRouteErrors('complete-task', handler),
   httpRouteTriggerSettings: {
     path: '/docflow/tasks/complete',
     httpMethod: 'POST',