Пакет @tnsu/monitoring-web 0.3.0 из реестра tansu

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

config/webpack-patch.json

@@ -1,4 +1,4 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/webpack-patch.schema.json",
-  "patchFiles": ["./node_modules/@tnsu/monitoring-web/spfx/webpack-patch.cjs"]
+  "patchFiles": ["./config/webpack-patch/monitoring.js"]
 }

config/webpack-patch/monitoring.js

@@ -0,0 +1,20 @@
+// Хэш коммита сборки — в логи (git.commit) и записи экрана мониторинга: @tnsu/monitoring-web читает
+// __TNSU_GIT_COMMIT__, а webpack подставляет его при сборке. Хэш — GIT_COMMIT или GITHUB_SHA пайплайна, иначе git.
+const { execSync } = require('node:child_process');
+const webpack = require('webpack');
+
+function gitCommit() {
+  const fromEnv = process.env.GIT_COMMIT || process.env.GITHUB_SHA;
+  if (fromEnv) return fromEnv;
+  try {
+    return execSync('git rev-parse HEAD', { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
+  } catch {
+    return '';
+  }
+}
+
+module.exports = function monitoringPatch(config) {
+  config.plugins = config.plugins || [];
+  config.plugins.push(new webpack.DefinePlugin({ __TNSU_GIT_COMMIT__: JSON.stringify(gitCommit()) }));
+  return config;
+};

package-lock.json

@@ -17,8 +17,7 @@
         "@microsoft/sp-webpart-base": "1.22.1",
         "@pnp/sp": "^4.20.0",
         "@pnp/spfx-controls-react": "^3.25.0",
-        "@pnp/telemetry-js": "2.0.0",
+        "@tnsu/monitoring-web": "^0.3.0",
-        "@tnsu/monitoring-web": "^0.3.4",
         "@tnsu/ui-kit": "^0.15.0",
         "jszip": "~3.8.0",
         "react": "17.0.1",
@@ -343,7 +342,7 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
       "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -353,7 +352,7 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
       "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.29.7",
@@ -384,7 +383,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -410,7 +409,7 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
       "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.29.7",
@@ -427,7 +426,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -459,7 +458,7 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
       "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.29.7",
@@ -505,7 +504,7 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
       "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -515,7 +514,7 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
       "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.29.7",
@@ -3981,7 +3980,7 @@
       "version": "2.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
       "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -9910,9 +9909,9 @@
       "license": "0BSD"
     },
     "node_modules/@tnsu/monitoring-web": {
-      "version": "0.3.4",
+      "version": "0.3.0",
-      "resolved": "https://git.tnsu.kz/api/packages/tansu/npm/%40tnsu%2Fmonitoring-web/-/0.3.4/monitoring-web-0.3.4.tgz",
+      "resolved": "https://git.tnsu.kz/api/packages/tansu/npm/%40tnsu%2Fmonitoring-web/-/0.3.0/monitoring-web-0.3.0.tgz",
-      "integrity": "sha512-tQe0ZM1tBVO3XtbNFliRaaooqvCX3gb/Q/j2lV6+rYCXprodBZByQ6PLrCu/P0me/rW8KdQ02hu7avyLXXfkoQ==",
+      "integrity": "sha512-4b9H643hl/KyWvugmuHW6lxk10wLRqfzeBTtEW4hZ2X7dfB4K7djESudurtwZibsWlfHibQNT2wqWgUznZ1DjA==",
       "license": "UNLICENSED",
       "dependencies": {
         "@rrweb/rrweb-plugin-console-record": "^2.2.0",
@@ -10302,7 +10301,7 @@
       "version": "26.1.2",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.2.tgz",
       "integrity": "sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~8.3.0"
@@ -10331,7 +10330,6 @@
       "version": "15.7.15",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
       "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/qs": {
@@ -10361,7 +10359,6 @@
       "version": "17.0.45",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.45.tgz",
       "integrity": "sha512-YfhQ22Lah2e3CHPsb93tRwIGNiSwkuz1/blk4e6QrWS0jQzCSNbGLtOEYhPg02W0yGTTmpajp7dCTbBAMN3qsg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
@@ -10373,7 +10370,6 @@
       "version": "17.0.17",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.17.tgz",
       "integrity": "sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/react": "^17"
@@ -10396,7 +10392,6 @@
       "version": "0.26.0",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.26.0.tgz",
       "integrity": "sha512-WFHp9YUJQ6CKshqoC37iOlHnQSmxNc795UhB26CyBBttrN9svdIrUjl/NjnNmfcwtncN0h/0PPAFWv9ovP8mLA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/send": {
@@ -12608,7 +12603,7 @@
       "version": "2.11.7",
       "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.7.tgz",
       "integrity": "sha512-APw5YuIQAg6L9w4sHDI6j26DGFJI6RpYOhnkMPdC9lWbkKvsyPHzDsve1yd73lk21yz7Y09Kci8B2Pp9FonzWA==",
-      "dev": true,
+      "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.cjs"
@@ -12782,7 +12777,7 @@
       "version": "4.28.7",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz",
       "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "opencollective",
@@ -12991,7 +12986,7 @@
       "version": "1.0.30001806",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz",
       "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "opencollective",
@@ -13416,7 +13411,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/cookie": {
@@ -14305,7 +14300,7 @@
       "version": "1.5.398",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.398.tgz",
       "integrity": "sha512-AsvhAxopJGh6museTDMIjn6JpDYOfgu4RLlygomt87MUwBUqTfd/1EiPtx10/LZE8xpTvkP2E9Gafq7lkLtodQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/embla-carousel": {
@@ -14635,7 +14630,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -16055,7 +16050,7 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -19204,7 +19199,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -20153,7 +20148,7 @@
       "version": "2.0.51",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz",
       "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -24515,7 +24510,7 @@
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz",
       "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/unicorn-magic": {
@@ -24569,7 +24564,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
       "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
-      "dev": true,
+      "devOptional": true,
       "funding": [
         {
           "type": "opencollective",

package.json

@@ -21,8 +21,7 @@
     "@microsoft/sp-webpart-base": "1.22.1",
     "@pnp/sp": "^4.20.0",
     "@pnp/spfx-controls-react": "^3.25.0",
-    "@pnp/telemetry-js": "2.0.0",
+    "@tnsu/monitoring-web": "^0.3.0",
-    "@tnsu/monitoring-web": "^0.3.4",
     "@tnsu/ui-kit": "^0.15.0",
     "jszip": "~3.8.0",
     "react": "17.0.1",

src/webparts/requestPortal/RequestPortalWebPart.ts

@@ -9,7 +9,6 @@ import {
 } from '@microsoft/sp-property-pane';
 import { BaseClientSideWebPart } from '@microsoft/sp-webpart-base';
 import { IReadonlyTheme } from '@microsoft/sp-component-base';
-import PnPTelemetry from '@pnp/telemetry-js';
 import { initMonitoring, spfxTokenProvider } from '@tnsu/monitoring-web';
 
 import * as strings from 'RequestPortalWebPartStrings';
@@ -64,6 +63,9 @@ export interface IRequestPortalWebPartProps {
   chatSelfNotify?: boolean;
 }
 
+// Мониторинг — один на страницу: экземпляров веб-части на странице может быть несколько.
+let monitoringStarted = false;
+
 export default class RequestPortalWebPart extends BaseClientSideWebPart<IRequestPortalWebPartProps> {
 
   private _isDarkTheme: boolean = false;
@@ -102,12 +104,11 @@ export default class RequestPortalWebPart extends BaseClientSideWebPart<IRequest
   protected onInit(): Promise<void> {
     // Логи, ошибки, console.error и запись экрана в мониторинг (monitoring.tnsu.kz). Токен — молча через
     // AAD веб-части (разрешение Logs.Write в package-solution.json); при отладке в workbench окружение — development.
-    // Один на страницу: повторный вызов (несколько веб-частей) библиотека игнорирует сама.
+    if (!monitoringStarted) {
-    initMonitoring({ service: 'request-portal', getAccessToken: spfxTokenProvider(this.context.aadTokenProviderFactory) });
+      monitoringStarted = true;
+      initMonitoring({ service: 'requestPortal', getAccessToken: spfxTokenProvider(this.context.aadTokenProviderFactory) });
+    }
     installErrorLogging(); // до всего остального — чтобы поймать и ранние отклонения
-    // Телеметрия PnP (её включает @pnp/spfx-controls-react) шлёт fetch на pnptelemetryproxy.azurewebsites.net
-    // без catch: где адрес закрыт прокси или блокировщиком, это необработанный отказ промиса в мониторинге.
-    PnPTelemetry.getInstance().optOut();
     initSP(this.context); // единый клиент PnPjs для записи в списки
 
     // Адрес approval-route должен быть выставлен ДО загрузки партиций — они

src/webparts/requestPortal/shared/approval/approverDecision.service.ts

@@ -1,4 +1,3 @@
-import { log } from '@tnsu/monitoring-web';
 import { getSP } from '../pnp/pnpjs';
 import '@pnp/sp/webs';
 import '@pnp/sp/lists';
@@ -26,14 +25,6 @@ export interface IPendingRow extends IApprovalRow {
   isDelegator: boolean;
 }
 
-// Решение → текст события в логах мониторинга.
-const DECISION_MESSAGE: Record<ApproverDecision, string> = {
-  approve: 'Заявка согласована',
-  return: 'Заявка возвращена на доработку',
-  reject: 'Заявка отклонена',
-  execute: 'Заявка выполнена исполнителем',
-};
-
 // Решение → статус его строки в списке согласования.
 const ROW_STATUS: Record<ApproverDecision, string> = {
   approve: REQUEST_STATUS.approved,
@@ -345,7 +336,6 @@ export class ApproverService {
     const rows = await this.approval.getForRequest(requestId);
     const requestStatus = this.computeRequestStatus(rows);
     await this.updateRequestStatus(requestId, requestStatus);
-    await this.logDecision(requestId, rowId, decision, comment, requestStatus);
     emitRequestsChanged();
     return requestStatus;
   }
@@ -374,42 +364,6 @@ export class ApproverService {
     return REQUEST_STATUS.execution;
   }
 
-  /**
-   * Решение — в логи мониторинга, с кодом и названием заявки, чтобы её было видно прямо в списке логов.
-   * Код и название дочитываются отдельно; не получилось — пишем без них: решение уже применено.
-   */
-  private async logDecision(
-    requestId: number,
-    rowId: number,
-    decision: ApproverDecision,
-    comment: string,
-    requestStatus: string
-  ): Promise<void> {
-    let code = '';
-    let title = '';
-    try {
-      const item = (await this.dataList().items.getById(requestId).select('Title', 'RequestUniqueCode')()) as {
-        Title?: string;
-        RequestUniqueCode?: string;
-      };
-      code = item.RequestUniqueCode || '';
-      title = item.Title || '';
-    } catch {
-      // без кода и названия — лог всё равно нужен
-    }
-    const what = [code, title].filter(Boolean).join(' · ') || `№${requestId}`;
-    log.info(`${DECISION_MESSAGE[decision]}: ${what}`, {
-      'request.id': requestId,
-      'request.code': code,
-      'request.title': title,
-      'request.list': this.dataListRef,
-      'request.status': requestStatus,
-      'approval.decision': decision,
-      'approval.rowId': rowId,
-      'approval.comment': comment.slice(0, 500),
-    });
-  }
-
   private dataList(): IList {
     return this.dataListRef.startsWith('/')
       ? getSP().web.getList(this.dataListRef)

src/webparts/requestPortal/shared/dataList.ts

@@ -2,13 +2,10 @@ import '@pnp/sp/webs';
 import '@pnp/sp/lists';
 import '@pnp/sp/items';
 import { IList } from '@pnp/sp/lists';
-import { log } from '@tnsu/monitoring-web';
 import { getSP } from './pnp/pnpjs';
 import { buildRequestUniqueCode } from './requestCode';
 import { dataListTitle } from './listTitles';
 import { RequestTypeId } from '../models/types';
-import { REQUEST_TYPES } from '../data/requests';
-import { isSubmittedStatus } from './approval/models/statuses';
 
 /**
  * Список данных, в который фактически пишем: listId (конкретная партиция —
@@ -53,7 +50,6 @@ export async function saveRequestItem(
 
   if (existingId) {
     await list.items.getById(existingId).update(item);
-    logSaved(formId, existingId, undefined, item, false);
     return { id: existingId };
   }
 
@@ -62,34 +58,5 @@ export async function saveRequestItem(
   // Код известен только после создания элемента (нужен его Id).
   const code = buildRequestUniqueCode(codePrefix, id, new Date());
   await list.items.getById(id).update({ RequestUniqueCode: code });
-  logSaved(formId, id, code, item, true);
   return { id, code };
 }
-
-/**
- * События для мониторинга: какая заявка создана и отправлена на согласование (пользователь — из токена).
- * В тексте — вид, код и название заявки, чтобы её было видно прямо в списке логов. Решения согласующих
- * пишет approverDecision.service.ts.
- */
-function logSaved(
-  formId: RequestTypeId,
-  id: number,
-  code: string | undefined,
-  item: Record<string, unknown>,
-  created: boolean
-): void {
-  const typeTitle = REQUEST_TYPES.find((t) => t.id === formId)?.title ?? formId;
-  const title = typeof item.Title === 'string' ? item.Title : '';
-  const status = typeof item.RequestStatus === 'string' ? item.RequestStatus : '';
-  const what = [typeTitle, code, title].filter(Boolean).join(' · ');
-  const attributes = {
-    'request.type': formId,
-    'request.typeTitle': typeTitle,
-    'request.id': id,
-    'request.code': code ?? '',
-    'request.title': title,
-    'request.status': status,
-  };
-  if (created) log.info(`Создана заявка: ${what}`, attributes);
-  if (isSubmittedStatus(status)) log.info(`Заявка отправлена на согласование: ${what}`, attributes);
-}