@notix-hub/sdk 0.3.1 → 0.3.3

package/dist/capture.d.ts

@@ -1,9 +1,9 @@
-import type { NotifyPayload } from './types';
+import type { NotifyPayload, NotixResponse } from './types';
 interface FormMeta {
     title?: string;
     fieldsCount: number;
 }
 type OnSubmit = (payload: NotifyPayload, meta: FormMeta) => void;
-export declare function initFormCapture(onSubmit: OnSubmit, root: Element | Document, debug: boolean): void;
+export declare function initFormCapture(onSubmit: OnSubmit, root: Element | Document, debug: boolean, onCapture?: (response: NotixResponse, payload: NotifyPayload) => void): void;
 export declare function destroyFormCapture(): void;
 export {};

package/dist/errors.d.ts

@@ -5,14 +5,21 @@ interface ErrorEntry {
     col: number;
     stack: string;
     ts: string;
+    source: string;
+}
+interface ErrorBatch {
+    page: string;
+    errors: ErrorEntry[];
 }
 export declare class ErrorBatcher {
     private sendFn;
-    private errors;
-    private timer;
-    constructor(sendFn: (errors: ErrorEntry[]) => void);
+    private currentPage;
+    constructor(sendFn: (batches: ErrorBatch[]) => void);
     private bindGlobal;
-    private startTimer;
+    private addError;
+    private load;
+    private save;
     flush(): void;
+    clearAll(): void;
 }
 export {};

package/dist/index.cjs

@@ -13,6 +13,7 @@ function sendWebhook(endpoint, token, payload, timeout = DEFAULT_TIMEOUT) {
         ...(payload.type !== undefined && { notification_type: payload.type }),
         ...(payload.priority !== undefined && { priority: payload.priority }),
         ...(payload.tag !== undefined && { tag: payload.tag }),
+        ...(payload.tags !== undefined && { tags: payload.tags }),
         ...(payload.payload !== undefined && { payload: payload.payload }),
     };
     const controller = new AbortController();
@@ -27,6 +28,7 @@ function sendWebhook(endpoint, token, payload, timeout = DEFAULT_TIMEOUT) {
             },
             body: JSON.stringify(body),
             signal: controller.signal,
+            keepalive: true,
         })
             .then(async (res) => {
             clearTimeout(timer);
@@ -73,17 +75,17 @@ function xhrSend(endpoint, token, body, timeout) {
 
 const SUBMIT_DEBOUNCE_MS = 500;
 const pendingForms = new WeakMap();
-function initFormCapture(onSubmit, root, debug) {
-    const forms = root.querySelectorAll('form[data-notify]');
+function initFormCapture(onSubmit, root, debug, onCapture) {
+    const forms = root.querySelectorAll('form[data-notix], form[data-notify]');
     forms.forEach((form) => {
         if (form.dataset.notixBound)
             return;
         form.dataset.notixBound = '1';
         form.addEventListener('submit', (e) => {
+            e.preventDefault();
             const now = Date.now();
             const last = pendingForms.get(form) ?? 0;
             if (now - last < SUBMIT_DEBOUNCE_MS) {
-                e.preventDefault();
                 return;
             }
             pendingForms.set(form, now);
@@ -92,10 +94,19 @@ function initFormCapture(onSubmit, root, debug) {
                 if (debug) {
                     console.log('[Notix] Form captured:', payload.title);
                 }
-                onSubmit(payload, { title: payload.title, fieldsCount: Object.keys(form.elements).length });
+                onSubmit(payload, { title: payload.title, fieldsCount: payload.payload ? Object.keys(payload.payload).length : 0 });
+                // Per-form callback: data-notix-onsuccess="funcName"
+                const callbackName = attr(form, 'onsuccess');
+                if (callbackName) {
+                    const fn = window[callbackName];
+                    if (typeof fn === 'function') {
+                        // The actual callback fires after notify() resolves — handled in notix.ts
+                        form.dataset.notixCallback = callbackName;
+                    }
+                }
+                if (onCapture) ;
             }
             catch (err) {
-                // don't block form submission
                 if (debug) {
                     console.warn('[Notix] Form capture failed:', err);
                 }
@@ -106,64 +117,91 @@ function initFormCapture(onSubmit, root, debug) {
 function destroyFormCapture() {
     document.querySelectorAll('form[data-notix-bound]').forEach((form) => {
         delete form.dataset.notixBound;
-        // listeners are removed by page navigation; for SPA use Notix.destroy() before unmount
     });
 }
+function attr(form, name) {
+    const camel = name.charAt(0).toUpperCase() + name.slice(1);
+    return form.dataset[`notix${camel}`] ?? form.dataset[`notify${camel}`];
+}
+function elLabel(el) {
+    return el.getAttribute('data-notix-label') ?? el.getAttribute('data-notify-label') ?? el.name;
+}
 function extractPayload(form) {
-    const title = form.dataset.notifyTitle ?? form.dataset.notify_title ?? document.title;
-    const type = form.dataset.notifyType ?? form.dataset.notify_type;
-    const tag = form.dataset.notifyTag ?? form.dataset.notify_tag;
-    const priority = form.dataset.notifyPriority ?? form.dataset.notify_priority;
-    const staticBody = form.dataset.notifyBody ?? form.dataset.notify_body;
-    const template = form.dataset.notifyTemplate ?? form.dataset.notify_template;
-    const specifiedFields = (form.dataset.notifyFields ?? form.dataset.notify_fields)
-        ?.split(',')
-        .map((s) => s.trim())
-        .filter(Boolean);
-    if (staticBody) {
-        return {
-            title,
-            body: staticBody,
-            ...(type && { type }),
-            ...(tag && { tag }),
-            ...(priority && { priority: priority }),
-        };
+    const title = attr(form, 'title') ?? document.title;
+    const typeSlug = attr(form, 'type');
+    const tag = attr(form, 'tag');
+    const tagsStr = attr(form, 'tags');
+    const priority = attr(form, 'priority');
+    const bodyTemplate = attr(form, 'body');
+    const fieldsStr = attr(form, 'fields');
+    const allowedNames = new Set();
+    if (fieldsStr) {
+        fieldsStr.split(',').map(s => s.trim()).filter(Boolean).forEach(name => allowedNames.add(name));
     }
+    if (bodyTemplate) {
+        const matches = bodyTemplate.matchAll(/\{(\w+)\}/g);
+        for (const m of matches) {
+            allowedNames.add(m[1]);
+        }
+    }
+    let tags;
+    if (tag) {
+        tags = [tag];
+    }
+    if (tagsStr) {
+        try {
+            const parsed = JSON.parse(tagsStr);
+            tags = [...(tags || []), ...(Array.isArray(parsed) ? parsed : [parsed])];
+        }
+        catch {
+            tags = tags || [];
+            tags.push(tagsStr);
+        }
+    }
+    const fieldValues = {};
     const elements = form.querySelectorAll('input[name], textarea[name], select[name]');
-    const fieldMap = new Map();
     elements.forEach((el) => {
         if (!el.name)
             return;
+        if (!allowedNames.has(el.name))
+            return;
         if (el.type === 'checkbox' || el.type === 'radio') {
             if (!el.checked)
                 return;
         }
-        if (specifiedFields && !specifiedFields.includes(el.name))
-            return;
-        const isMarked = el.hasAttribute('data-notify-field');
-        if (specifiedFields || isMarked || (!specifiedFields && !template)) {
-            const label = el.getAttribute('data-notify-label') ?? el.name;
-            fieldMap.set(label, el.value || '');
-        }
+        fieldValues[el.name] = el.value || '';
     });
     let body;
-    if (template) {
-        body = template.replace(/\{(\w+)\}/g, (_, key) => {
-            if (fieldMap.has(key))
-                return fieldMap.get(key);
-            const el = form.elements.namedItem(key);
-            return el?.value || `{${key}}`;
-        });
+    if (bodyTemplate) {
+        body = bodyTemplate.replace(/\{(\w+)\}/g, (_, fieldName) => fieldValues[fieldName] ?? `{${fieldName}}`);
     }
-    else if (fieldMap.size > 0) {
-        body = Array.from(fieldMap, ([k, v]) => `${k}: ${v}`).join('\n');
+    const payloadData = {};
+    elements.forEach((el) => {
+        if (!el.name)
+            return;
+        if (!allowedNames.has(el.name))
+            return;
+        if ((el.type === 'checkbox' || el.type === 'radio') && !el.checked)
+            return;
+        payloadData[elLabel(el)] = el.value || '';
+    });
+    let extraPayload = {};
+    const payloadJson = attr(form, 'payload');
+    if (payloadJson) {
+        try {
+            extraPayload = JSON.parse(payloadJson);
+        }
+        catch {
+            // ignore invalid JSON
+        }
     }
     return {
         title,
         ...(body && { body }),
-        ...(type && { type }),
-        ...(tag && { tag }),
+        ...(typeSlug && { type: typeSlug }),
+        ...(tags && tags.length > 0 && { tags }),
         ...(priority && { priority: priority }),
+        payload: { ...payloadData, ...extraPayload },
     };
 }
 
@@ -224,44 +262,39 @@ class MetrikaTracker {
     }
 }
 
-const BATCH_SIZE = 10;
-const FLUSH_INTERVAL = 60000;
+const STORAGE_KEY = 'notix_errors';
+const MAX_ERRORS = 500;
 class ErrorBatcher {
     constructor(sendFn) {
         this.sendFn = sendFn;
-        this.errors = [];
-        this.timer = null;
+        this.currentPage = location.pathname;
         this.bindGlobal();
     }
     bindGlobal() {
         if (typeof window === 'undefined')
             return;
-        const collect = (ev) => {
-            this.errors.push({
+        const collect = (source) => (ev) => {
+            this.addError({
                 message: ev.message || 'Unknown error',
                 file: ev.filename || '',
                 line: ev.lineno || 0,
                 col: ev.colno || 0,
                 stack: ev.error?.stack || '',
                 ts: new Date().toISOString(),
+                source,
             });
-            if (this.errors.length >= BATCH_SIZE)
-                this.flush();
-            this.startTimer();
         };
-        window.addEventListener('error', collect);
+        window.addEventListener('error', collect('onerror'));
         window.addEventListener('unhandledrejection', (ev) => {
-            this.errors.push({
+            this.addError({
                 message: ev.reason?.message || String(ev.reason),
                 file: '',
                 line: 0,
                 col: 0,
                 stack: ev.reason?.stack || '',
                 ts: new Date().toISOString(),
+                source: 'unhandledrejection',
             });
-            if (this.errors.length >= BATCH_SIZE)
-                this.flush();
-            this.startTimer();
         });
         window.addEventListener('beforeunload', () => this.flush());
         document.addEventListener('visibilitychange', () => {
@@ -269,19 +302,49 @@ class ErrorBatcher {
                 this.flush();
         });
     }
-    startTimer() {
-        if (this.timer)
-            return;
-        this.timer = setTimeout(() => this.flush(), FLUSH_INTERVAL);
+    addError(entry) {
+        const batches = this.load();
+        let batch = batches.find(b => b.page === this.currentPage);
+        if (!batch) {
+            batch = { page: this.currentPage, errors: [] };
+            batches.push(batch);
+        }
+        batch.errors.push(entry);
+        if (batch.errors.length > MAX_ERRORS) {
+            batch.errors = batch.errors.slice(-MAX_ERRORS);
+        }
+        this.save(batches);
+    }
+    load() {
+        try {
+            const raw = localStorage.getItem(STORAGE_KEY);
+            return raw ? JSON.parse(raw) : [];
+        }
+        catch {
+            return [];
+        }
+    }
+    save(batches) {
+        try {
+            localStorage.setItem(STORAGE_KEY, JSON.stringify(batches));
+        }
+        catch {
+            // localStorage full — noop
+        }
     }
     flush() {
-        if (this.errors.length === 0)
+        const batches = this.load();
+        if (batches.length === 0)
             return;
-        this.sendFn([...this.errors]);
-        this.errors = [];
-        if (this.timer) {
-            clearTimeout(this.timer);
-            this.timer = null;
+        this.sendFn(batches);
+        this.clearAll();
+    }
+    clearAll() {
+        try {
+            localStorage.removeItem(STORAGE_KEY);
+        }
+        catch {
+            // noop
         }
     }
 }
@@ -298,7 +361,8 @@ class Notix {
         this.timeout = config.timeout ?? 10000;
         this.debug = config.debug ?? false;
         this.metrika = createMetrikaTracker(config.metrika);
-        if (config.autoCapture !== false) {
+        this.onCapture = config.onCapture;
+        if (config.autoCapture === true) {
             this.capture();
         }
         if (config.metricEnabled) {
@@ -330,8 +394,19 @@ class Notix {
         if (this.captureActive)
             return;
         initFormCapture((payload, meta) => {
-            this.notify(payload).then(() => {
+            this.notify(payload).then((response) => {
                 this.metrika?.trackFormCaptured(meta.title ?? payload.title, meta.fieldsCount);
+                // Per-form callback from data-notix-onsuccess
+                const form = (root instanceof Element ? root : document).querySelector('form[data-notix-bound]');
+                if (form instanceof HTMLFormElement && form.dataset.notixCallback) {
+                    const fn = window[form.dataset.notixCallback];
+                    if (typeof fn === 'function') {
+                        fn(response);
+                    }
+                    delete form.dataset.notixCallback;
+                }
+                // Global callback from config
+                this.onCapture?.(response, payload);
             }).catch(() => { });
         }, root, this.debug);
         this.captureActive = true;
@@ -361,11 +436,13 @@ class Notix {
     enableErrorTracking() {
         if (typeof window === 'undefined')
             return;
-        new ErrorBatcher((errors) => {
+        const pageDomain = location.hostname;
+        new ErrorBatcher((batches) => {
+            const totalErrors = batches.reduce((sum, b) => sum + b.errors.length, 0);
             this.notify({
-                title: `Ошибки на странице (${errors.length})`,
+                title: `Ошибки на ${pageDomain}: ${totalErrors}`,
                 type: 'error_batch',
-                payload: { errors },
+                payload: { batches },
             }).catch(() => { });
         });
         this.log('Error tracking activated');
@@ -400,7 +477,7 @@ if (typeof document !== 'undefined') {
         const token = thisScript.dataset.token;
         if (token) {
             const endpoint = thisScript.dataset.endpoint;
-            const autoCapture = thisScript.dataset.autoCapture !== 'false';
+            const autoCapture = thisScript.dataset.autoCapture === 'true';
             const debug = thisScript.dataset.debug === 'true';
             const timeout = thisScript.dataset.timeout ? parseInt(thisScript.dataset.timeout, 10) : undefined;
             const ready = document.readyState !== 'loading';

package/dist/index.mjs

@@ -11,6 +11,7 @@ function sendWebhook(endpoint, token, payload, timeout = DEFAULT_TIMEOUT) {
         ...(payload.type !== undefined && { notification_type: payload.type }),
         ...(payload.priority !== undefined && { priority: payload.priority }),
         ...(payload.tag !== undefined && { tag: payload.tag }),
+        ...(payload.tags !== undefined && { tags: payload.tags }),
         ...(payload.payload !== undefined && { payload: payload.payload }),
     };
     const controller = new AbortController();
@@ -25,6 +26,7 @@ function sendWebhook(endpoint, token, payload, timeout = DEFAULT_TIMEOUT) {
             },
             body: JSON.stringify(body),
             signal: controller.signal,
+            keepalive: true,
         })
             .then(async (res) => {
             clearTimeout(timer);
@@ -71,17 +73,17 @@ function xhrSend(endpoint, token, body, timeout) {
 
 const SUBMIT_DEBOUNCE_MS = 500;
 const pendingForms = new WeakMap();
-function initFormCapture(onSubmit, root, debug) {
-    const forms = root.querySelectorAll('form[data-notify]');
+function initFormCapture(onSubmit, root, debug, onCapture) {
+    const forms = root.querySelectorAll('form[data-notix], form[data-notify]');
     forms.forEach((form) => {
         if (form.dataset.notixBound)
             return;
         form.dataset.notixBound = '1';
         form.addEventListener('submit', (e) => {
+            e.preventDefault();
             const now = Date.now();
             const last = pendingForms.get(form) ?? 0;
             if (now - last < SUBMIT_DEBOUNCE_MS) {
-                e.preventDefault();
                 return;
             }
             pendingForms.set(form, now);
@@ -90,10 +92,19 @@ function initFormCapture(onSubmit, root, debug) {
                 if (debug) {
                     console.log('[Notix] Form captured:', payload.title);
                 }
-                onSubmit(payload, { title: payload.title, fieldsCount: Object.keys(form.elements).length });
+                onSubmit(payload, { title: payload.title, fieldsCount: payload.payload ? Object.keys(payload.payload).length : 0 });
+                // Per-form callback: data-notix-onsuccess="funcName"
+                const callbackName = attr(form, 'onsuccess');
+                if (callbackName) {
+                    const fn = window[callbackName];
+                    if (typeof fn === 'function') {
+                        // The actual callback fires after notify() resolves — handled in notix.ts
+                        form.dataset.notixCallback = callbackName;
+                    }
+                }
+                if (onCapture) ;
             }
             catch (err) {
-                // don't block form submission
                 if (debug) {
                     console.warn('[Notix] Form capture failed:', err);
                 }
@@ -104,64 +115,91 @@ function initFormCapture(onSubmit, root, debug) {
 function destroyFormCapture() {
     document.querySelectorAll('form[data-notix-bound]').forEach((form) => {
         delete form.dataset.notixBound;
-        // listeners are removed by page navigation; for SPA use Notix.destroy() before unmount
     });
 }
+function attr(form, name) {
+    const camel = name.charAt(0).toUpperCase() + name.slice(1);
+    return form.dataset[`notix${camel}`] ?? form.dataset[`notify${camel}`];
+}
+function elLabel(el) {
+    return el.getAttribute('data-notix-label') ?? el.getAttribute('data-notify-label') ?? el.name;
+}
 function extractPayload(form) {
-    const title = form.dataset.notifyTitle ?? form.dataset.notify_title ?? document.title;
-    const type = form.dataset.notifyType ?? form.dataset.notify_type;
-    const tag = form.dataset.notifyTag ?? form.dataset.notify_tag;
-    const priority = form.dataset.notifyPriority ?? form.dataset.notify_priority;
-    const staticBody = form.dataset.notifyBody ?? form.dataset.notify_body;
-    const template = form.dataset.notifyTemplate ?? form.dataset.notify_template;
-    const specifiedFields = (form.dataset.notifyFields ?? form.dataset.notify_fields)
-        ?.split(',')
-        .map((s) => s.trim())
-        .filter(Boolean);
-    if (staticBody) {
-        return {
-            title,
-            body: staticBody,
-            ...(type && { type }),
-            ...(tag && { tag }),
-            ...(priority && { priority: priority }),
-        };
+    const title = attr(form, 'title') ?? document.title;
+    const typeSlug = attr(form, 'type');
+    const tag = attr(form, 'tag');
+    const tagsStr = attr(form, 'tags');
+    const priority = attr(form, 'priority');
+    const bodyTemplate = attr(form, 'body');
+    const fieldsStr = attr(form, 'fields');
+    const allowedNames = new Set();
+    if (fieldsStr) {
+        fieldsStr.split(',').map(s => s.trim()).filter(Boolean).forEach(name => allowedNames.add(name));
     }
+    if (bodyTemplate) {
+        const matches = bodyTemplate.matchAll(/\{(\w+)\}/g);
+        for (const m of matches) {
+            allowedNames.add(m[1]);
+        }
+    }
+    let tags;
+    if (tag) {
+        tags = [tag];
+    }
+    if (tagsStr) {
+        try {
+            const parsed = JSON.parse(tagsStr);
+            tags = [...(tags || []), ...(Array.isArray(parsed) ? parsed : [parsed])];
+        }
+        catch {
+            tags = tags || [];
+            tags.push(tagsStr);
+        }
+    }
+    const fieldValues = {};
     const elements = form.querySelectorAll('input[name], textarea[name], select[name]');
-    const fieldMap = new Map();
     elements.forEach((el) => {
         if (!el.name)
             return;
+        if (!allowedNames.has(el.name))
+            return;
         if (el.type === 'checkbox' || el.type === 'radio') {
             if (!el.checked)
                 return;
         }
-        if (specifiedFields && !specifiedFields.includes(el.name))
-            return;
-        const isMarked = el.hasAttribute('data-notify-field');
-        if (specifiedFields || isMarked || (!specifiedFields && !template)) {
-            const label = el.getAttribute('data-notify-label') ?? el.name;
-            fieldMap.set(label, el.value || '');
-        }
+        fieldValues[el.name] = el.value || '';
     });
     let body;
-    if (template) {
-        body = template.replace(/\{(\w+)\}/g, (_, key) => {
-            if (fieldMap.has(key))
-                return fieldMap.get(key);
-            const el = form.elements.namedItem(key);
-            return el?.value || `{${key}}`;
-        });
+    if (bodyTemplate) {
+        body = bodyTemplate.replace(/\{(\w+)\}/g, (_, fieldName) => fieldValues[fieldName] ?? `{${fieldName}}`);
     }
-    else if (fieldMap.size > 0) {
-        body = Array.from(fieldMap, ([k, v]) => `${k}: ${v}`).join('\n');
+    const payloadData = {};
+    elements.forEach((el) => {
+        if (!el.name)
+            return;
+        if (!allowedNames.has(el.name))
+            return;
+        if ((el.type === 'checkbox' || el.type === 'radio') && !el.checked)
+            return;
+        payloadData[elLabel(el)] = el.value || '';
+    });
+    let extraPayload = {};
+    const payloadJson = attr(form, 'payload');
+    if (payloadJson) {
+        try {
+            extraPayload = JSON.parse(payloadJson);
+        }
+        catch {
+            // ignore invalid JSON
+        }
     }
     return {
         title,
         ...(body && { body }),
-        ...(type && { type }),
-        ...(tag && { tag }),
+        ...(typeSlug && { type: typeSlug }),
+        ...(tags && tags.length > 0 && { tags }),
         ...(priority && { priority: priority }),
+        payload: { ...payloadData, ...extraPayload },
     };
 }
 
@@ -222,44 +260,39 @@ class MetrikaTracker {
     }
 }
 
-const BATCH_SIZE = 10;
-const FLUSH_INTERVAL = 60000;
+const STORAGE_KEY = 'notix_errors';
+const MAX_ERRORS = 500;
 class ErrorBatcher {
     constructor(sendFn) {
         this.sendFn = sendFn;
-        this.errors = [];
-        this.timer = null;
+        this.currentPage = location.pathname;
         this.bindGlobal();
     }
     bindGlobal() {
         if (typeof window === 'undefined')
             return;
-        const collect = (ev) => {
-            this.errors.push({
+        const collect = (source) => (ev) => {
+            this.addError({
                 message: ev.message || 'Unknown error',
                 file: ev.filename || '',
                 line: ev.lineno || 0,
                 col: ev.colno || 0,
                 stack: ev.error?.stack || '',
                 ts: new Date().toISOString(),
+                source,
             });
-            if (this.errors.length >= BATCH_SIZE)
-                this.flush();
-            this.startTimer();
         };
-        window.addEventListener('error', collect);
+        window.addEventListener('error', collect('onerror'));
         window.addEventListener('unhandledrejection', (ev) => {
-            this.errors.push({
+            this.addError({
                 message: ev.reason?.message || String(ev.reason),
                 file: '',
                 line: 0,
                 col: 0,
                 stack: ev.reason?.stack || '',
                 ts: new Date().toISOString(),
+                source: 'unhandledrejection',
             });
-            if (this.errors.length >= BATCH_SIZE)
-                this.flush();
-            this.startTimer();
         });
         window.addEventListener('beforeunload', () => this.flush());
         document.addEventListener('visibilitychange', () => {
@@ -267,19 +300,49 @@ class ErrorBatcher {
                 this.flush();
         });
     }
-    startTimer() {
-        if (this.timer)
-            return;
-        this.timer = setTimeout(() => this.flush(), FLUSH_INTERVAL);
+    addError(entry) {
+        const batches = this.load();
+        let batch = batches.find(b => b.page === this.currentPage);
+        if (!batch) {
+            batch = { page: this.currentPage, errors: [] };
+            batches.push(batch);
+        }
+        batch.errors.push(entry);
+        if (batch.errors.length > MAX_ERRORS) {
+            batch.errors = batch.errors.slice(-MAX_ERRORS);
+        }
+        this.save(batches);
+    }
+    load() {
+        try {
+            const raw = localStorage.getItem(STORAGE_KEY);
+            return raw ? JSON.parse(raw) : [];
+        }
+        catch {
+            return [];
+        }
+    }
+    save(batches) {
+        try {
+            localStorage.setItem(STORAGE_KEY, JSON.stringify(batches));
+        }
+        catch {
+            // localStorage full — noop
+        }
     }
     flush() {
-        if (this.errors.length === 0)
+        const batches = this.load();
+        if (batches.length === 0)
             return;
-        this.sendFn([...this.errors]);
-        this.errors = [];
-        if (this.timer) {
-            clearTimeout(this.timer);
-            this.timer = null;
+        this.sendFn(batches);
+        this.clearAll();
+    }
+    clearAll() {
+        try {
+            localStorage.removeItem(STORAGE_KEY);
+        }
+        catch {
+            // noop
         }
     }
 }
@@ -296,7 +359,8 @@ class Notix {
         this.timeout = config.timeout ?? 10000;
         this.debug = config.debug ?? false;
         this.metrika = createMetrikaTracker(config.metrika);
-        if (config.autoCapture !== false) {
+        this.onCapture = config.onCapture;
+        if (config.autoCapture === true) {
             this.capture();
         }
         if (config.metricEnabled) {
@@ -328,8 +392,19 @@ class Notix {
         if (this.captureActive)
             return;
         initFormCapture((payload, meta) => {
-            this.notify(payload).then(() => {
+            this.notify(payload).then((response) => {
                 this.metrika?.trackFormCaptured(meta.title ?? payload.title, meta.fieldsCount);
+                // Per-form callback from data-notix-onsuccess
+                const form = (root instanceof Element ? root : document).querySelector('form[data-notix-bound]');
+                if (form instanceof HTMLFormElement && form.dataset.notixCallback) {
+                    const fn = window[form.dataset.notixCallback];
+                    if (typeof fn === 'function') {
+                        fn(response);
+                    }
+                    delete form.dataset.notixCallback;
+                }
+                // Global callback from config
+                this.onCapture?.(response, payload);
             }).catch(() => { });
         }, root, this.debug);
         this.captureActive = true;
@@ -359,11 +434,13 @@ class Notix {
     enableErrorTracking() {
         if (typeof window === 'undefined')
             return;
-        new ErrorBatcher((errors) => {
+        const pageDomain = location.hostname;
+        new ErrorBatcher((batches) => {
+            const totalErrors = batches.reduce((sum, b) => sum + b.errors.length, 0);
             this.notify({
-                title: `Ошибки на странице (${errors.length})`,
+                title: `Ошибки на ${pageDomain}: ${totalErrors}`,
                 type: 'error_batch',
-                payload: { errors },
+                payload: { batches },
             }).catch(() => { });
         });
         this.log('Error tracking activated');
@@ -398,7 +475,7 @@ if (typeof document !== 'undefined') {
         const token = thisScript.dataset.token;
         if (token) {
             const endpoint = thisScript.dataset.endpoint;
-            const autoCapture = thisScript.dataset.autoCapture !== 'false';
+            const autoCapture = thisScript.dataset.autoCapture === 'true';
             const debug = thisScript.dataset.debug === 'true';
             const timeout = thisScript.dataset.timeout ? parseInt(thisScript.dataset.timeout, 10) : undefined;
             const ready = document.readyState !== 'loading';

package/dist/notify.min.js

@@ -3,4 +3,4 @@
  * @version <%= pkg.version %>
  * @license MIT
  */
-var Notix=function(t){"use strict";function e(t,e,r,i=1e4){const o={title:r.title,...void 0!==r.body&&{body:r.body},...void 0!==r.type&&{notification_type:r.type},...void 0!==r.priority&&{priority:r.priority},...void 0!==r.tag&&{tag:r.tag},...void 0!==r.payload&&{payload:r.payload}},n=new AbortController,a=setTimeout(()=>n.abort(),i);return"undefined"!=typeof fetch?fetch(t,{method:"POST",headers:{Authorization:`Bearer ${e}`,"Content-Type":"application/json",Accept:"application/json"},body:JSON.stringify(o),signal:n.signal}).then(async t=>{clearTimeout(a);const e=await t.json();if(!t.ok)throw new Error(e.error||e.message||`HTTP ${t.status}`);return e}).catch(t=>{throw clearTimeout(a),t}):function(t,e,r,i){return new Promise((o,n)=>{const a=new XMLHttpRequest;a.open("POST",t,!0),a.setRequestHeader("Authorization",`Bearer ${e}`),a.setRequestHeader("Content-Type","application/json"),a.setRequestHeader("Accept","application/json"),a.timeout=i,a.onload=()=>{try{const t=JSON.parse(a.responseText);a.status>=200&&a.status<300?o(t):n(new Error(t.error||t.message||`HTTP ${a.status}`))}catch{n(new Error("Invalid response"))}},a.onerror=()=>n(new Error("Network error")),a.ontimeout=()=>n(new Error("Request timeout")),a.send(JSON.stringify(r))})}(t,e,o,i)}const r=new WeakMap;function i(t,e,i){e.querySelectorAll("form[data-notify]").forEach(e=>{e.dataset.notixBound||(e.dataset.notixBound="1",e.addEventListener("submit",o=>{const n=Date.now();if(n-(r.get(e)??0)<500)o.preventDefault();else{r.set(e,n);try{const r=function(t){const e=t.dataset.notifyTitle??t.dataset.notify_title??document.title,r=t.dataset.notifyType??t.dataset.notify_type,i=t.dataset.notifyTag??t.dataset.notify_tag,o=t.dataset.notifyPriority??t.dataset.notify_priority,n=t.dataset.notifyBody??t.dataset.notify_body,a=t.dataset.notifyTemplate??t.dataset.notify_template,s=(t.dataset.notifyFields??t.dataset.notify_fields)?.split(",").map(t=>t.trim()).filter(Boolean);if(n)return{title:e,body:n,...r&&{type:r},...i&&{tag:i},...o&&{priority:o}};const d=t.querySelectorAll("input[name], textarea[name], select[name]"),c=new Map;let l;d.forEach(t=>{if(!t.name)return;if(("checkbox"===t.type||"radio"===t.type)&&!t.checked)return;if(s&&!s.includes(t.name))return;const e=t.hasAttribute("data-notify-field");if(s||e||!s&&!a){const e=t.getAttribute("data-notify-label")??t.name;c.set(e,t.value||"")}}),a?l=a.replace(/\{(\w+)\}/g,(e,r)=>{if(c.has(r))return c.get(r);const i=t.elements.namedItem(r);return i?.value||`{${r}}`}):c.size>0&&(l=Array.from(c,([t,e])=>`${t}: ${e}`).join("\n"));return{title:e,...l&&{body:l},...r&&{type:r},...i&&{tag:i},...o&&{priority:o}}}(e);i&&console.log("[Notix] Form captured:",r.title),t(r,{title:r.title,fieldsCount:Object.keys(e.elements).length})}catch(t){i&&console.warn("[Notix] Form capture failed:",t)}}}))})}function o(t){if(!1===t?.enabled)return null;const e="undefined"!=typeof window&&"function"==typeof window.ym;if(!e&&!t?.enabled)return null;let r=t?.counterId;return!r&&e&&(r=function(){for(const t of Object.keys(window))if(t.startsWith("yaCounter")){const e=parseInt(t.replace("yaCounter",""),10);if(!isNaN(e))return e}return}()),r?new n(r,t?.prefix??"notix"):null}class n{constructor(t,e){this.counterId=t,this.prefix=e}trackSent(t){this.reachGoal(`${this.prefix}_sent`,{id:t.id,message:t.message})}trackError(t){this.reachGoal(`${this.prefix}_error`,{error:t.message})}trackFormCaptured(t,e){this.reachGoal(`${this.prefix}_form_captured`,{title:t,fields:e})}trackGoal(t){this.reachGoal(t,{})}reachGoal(t,e){"function"==typeof window.ym&&window.ym(this.counterId,"reachGoal",t,e)}}class a{constructor(t){this.sendFn=t,this.errors=[],this.timer=null,this.bindGlobal()}bindGlobal(){if("undefined"==typeof window)return;window.addEventListener("error",t=>{this.errors.push({message:t.message||"Unknown error",file:t.filename||"",line:t.lineno||0,col:t.colno||0,stack:t.error?.stack||"",ts:(new Date).toISOString()}),this.errors.length>=10&&this.flush(),this.startTimer()}),window.addEventListener("unhandledrejection",t=>{this.errors.push({message:t.reason?.message||String(t.reason),file:"",line:0,col:0,stack:t.reason?.stack||"",ts:(new Date).toISOString()}),this.errors.length>=10&&this.flush(),this.startTimer()}),window.addEventListener("beforeunload",()=>this.flush()),document.addEventListener("visibilitychange",()=>{"hidden"===document.visibilityState&&this.flush()})}startTimer(){this.timer||(this.timer=setTimeout(()=>this.flush(),6e4))}flush(){0!==this.errors.length&&(this.sendFn([...this.errors]),this.errors=[],this.timer&&(clearTimeout(this.timer),this.timer=null))}}class s{constructor(t){if(this.captureActive=!1,!t.token||!t.token.startsWith("ntx_"))throw new Error('Notix: token must start with "ntx_"');this.token=t.token,this.endpoint=t.endpoint??"https://notix-hub.ru/api/v1/webhook",this.timeout=t.timeout??1e4,this.debug=t.debug??!1,this.metrika=o(t.metrika),!1!==t.autoCapture&&this.capture(),t.metricEnabled&&this.sendPageview(),t.errorTrackingEnabled&&this.enableErrorTracking()}async notify(t){if(!t.title)throw new Error("Notix: title is required");this.log("Sending notification:",t.title);try{const r=await e(this.endpoint,this.token,t,this.timeout);return this.log("Notification sent:",r.id),this.metrika?.trackSent(r),r}catch(t){const e=t instanceof Error?t:new Error(String(t));throw this.log("Error sending notification:",e.message),this.metrika?.trackError(e),e}}capture(t=document){this.captureActive||(i((t,e)=>{this.notify(t).then(()=>{this.metrika?.trackFormCaptured(e.title??t.title,e.fieldsCount)}).catch(()=>{})},t,this.debug),this.captureActive=!0,this.log("Form capture activated"))}destroy(){document.querySelectorAll("form[data-notix-bound]").forEach(t=>{delete t.dataset.notixBound}),this.captureActive=!1,this.log("Notix destroyed")}sendPageview(t,e){const r={title:"Посетитель на сайте",type:"metric",payload:{event_type:"pageview",visitor_id:c(),page:t||location.pathname,referrer:e||document.referrer||void 0,value:1}};this.notify(r).catch(()=>{}),this.log("Pageview sent:",t||location.pathname)}enableErrorTracking(){"undefined"!=typeof window&&(new a(t=>{this.notify({title:`Ошибки на странице (${t.length})`,type:"error_batch",payload:{errors:t}}).catch(()=>{})}),this.log("Error tracking activated"))}static getVisitorId(){return c()}log(...t){this.debug&&console.log("[Notix]",...t)}}const d="notix_vid";function c(){try{let t=localStorage.getItem(d);return t||(t=crypto.randomUUID(),localStorage.setItem(d,t)),t}catch{return"unknown"}}if("undefined"!=typeof document){const t=document.currentScript;if(t){const e=t.dataset.token;if(e){const r=t.dataset.endpoint,i="false"!==t.dataset.autoCapture,o="true"===t.dataset.debug,n=t.dataset.timeout?parseInt(t.dataset.timeout,10):void 0,a=()=>{const a="true"===t.dataset.metric,d="true"===t.dataset.errors,c=new s({token:e,...r&&{endpoint:r},autoCapture:i,debug:o,metricEnabled:a,errorTrackingEnabled:d,...n&&{timeout:n}});window.notix=c};"loading"!==document.readyState?a():document.addEventListener("DOMContentLoaded",a)}else"true"===t.dataset.debug&&console.warn("[Notix] data-token attribute is required on script tag")}}return t.Notix=s,t}({});
+var Notix=function(t){"use strict";function e(t,e,o,r=1e4){const n={title:o.title,...void 0!==o.body&&{body:o.body},...void 0!==o.type&&{notification_type:o.type},...void 0!==o.priority&&{priority:o.priority},...void 0!==o.tag&&{tag:o.tag},...void 0!==o.tags&&{tags:o.tags},...void 0!==o.payload&&{payload:o.payload}},a=new AbortController,i=setTimeout(()=>a.abort(),r);return"undefined"!=typeof fetch?fetch(t,{method:"POST",headers:{Authorization:`Bearer ${e}`,"Content-Type":"application/json",Accept:"application/json"},body:JSON.stringify(n),signal:a.signal,keepalive:!0}).then(async t=>{clearTimeout(i);const e=await t.json();if(!t.ok)throw new Error(e.error||e.message||`HTTP ${t.status}`);return e}).catch(t=>{throw clearTimeout(i),t}):function(t,e,o,r){return new Promise((n,a)=>{const i=new XMLHttpRequest;i.open("POST",t,!0),i.setRequestHeader("Authorization",`Bearer ${e}`),i.setRequestHeader("Content-Type","application/json"),i.setRequestHeader("Accept","application/json"),i.timeout=r,i.onload=()=>{try{const t=JSON.parse(i.responseText);i.status>=200&&i.status<300?n(t):a(new Error(t.error||t.message||`HTTP ${i.status}`))}catch{a(new Error("Invalid response"))}},i.onerror=()=>a(new Error("Network error")),i.ontimeout=()=>a(new Error("Request timeout")),i.send(JSON.stringify(o))})}(t,e,n,r)}const o=new WeakMap;function r(t,e,r,a){e.querySelectorAll("form[data-notix], form[data-notify]").forEach(e=>{e.dataset.notixBound||(e.dataset.notixBound="1",e.addEventListener("submit",a=>{a.preventDefault();const i=Date.now();if(!(i-(o.get(e)??0)<500)){o.set(e,i);try{const o=function(t){const e=n(t,"title")??document.title,o=n(t,"type"),r=n(t,"tag"),a=n(t,"tags"),i=n(t,"priority"),s=n(t,"body"),c=n(t,"fields"),d=new Set;c&&c.split(",").map(t=>t.trim()).filter(Boolean).forEach(t=>d.add(t));if(s){const t=s.matchAll(/\{(\w+)\}/g);for(const e of t)d.add(e[1])}let l;r&&(l=[r]);if(a)try{const t=JSON.parse(a);l=[...l||[],...Array.isArray(t)?t:[t]]}catch{l=l||[],l.push(a)}const u={},h=t.querySelectorAll("input[name], textarea[name], select[name]");let p;h.forEach(t=>{t.name&&d.has(t.name)&&("checkbox"!==t.type&&"radio"!==t.type||t.checked)&&(u[t.name]=t.value||"")}),s&&(p=s.replace(/\{(\w+)\}/g,(t,e)=>u[e]??`{${e}}`));const f={};h.forEach(t=>{t.name&&d.has(t.name)&&("checkbox"!==t.type&&"radio"!==t.type||t.checked)&&(f[function(t){return t.getAttribute("data-notix-label")??t.getAttribute("data-notify-label")??t.name}(t)]=t.value||"")});let m={};const g=n(t,"payload");if(g)try{m=JSON.parse(g)}catch{}return{title:e,...p&&{body:p},...o&&{type:o},...l&&l.length>0&&{tags:l},...i&&{priority:i},payload:{...f,...m}}}(e);r&&console.log("[Notix] Form captured:",o.title),t(o,{title:o.title,fieldsCount:o.payload?Object.keys(o.payload).length:0});const a=n(e,"onsuccess");if(a){"function"==typeof window[a]&&(e.dataset.notixCallback=a)}}catch(t){r&&console.warn("[Notix] Form capture failed:",t)}}}))})}function n(t,e){const o=e.charAt(0).toUpperCase()+e.slice(1);return t.dataset[`notix${o}`]??t.dataset[`notify${o}`]}function a(t){if(!1===t?.enabled)return null;const e="undefined"!=typeof window&&"function"==typeof window.ym;if(!e&&!t?.enabled)return null;let o=t?.counterId;return!o&&e&&(o=function(){for(const t of Object.keys(window))if(t.startsWith("yaCounter")){const e=parseInt(t.replace("yaCounter",""),10);if(!isNaN(e))return e}return}()),o?new i(o,t?.prefix??"notix"):null}class i{constructor(t,e){this.counterId=t,this.prefix=e}trackSent(t){this.reachGoal(`${this.prefix}_sent`,{id:t.id,message:t.message})}trackError(t){this.reachGoal(`${this.prefix}_error`,{error:t.message})}trackFormCaptured(t,e){this.reachGoal(`${this.prefix}_form_captured`,{title:t,fields:e})}trackGoal(t){this.reachGoal(t,{})}reachGoal(t,e){"function"==typeof window.ym&&window.ym(this.counterId,"reachGoal",t,e)}}const s="notix_errors";class c{constructor(t){this.sendFn=t,this.currentPage=location.pathname,this.bindGlobal()}bindGlobal(){if("undefined"==typeof window)return;window.addEventListener("error",(t=>e=>{this.addError({message:e.message||"Unknown error",file:e.filename||"",line:e.lineno||0,col:e.colno||0,stack:e.error?.stack||"",ts:(new Date).toISOString(),source:t})})("onerror")),window.addEventListener("unhandledrejection",t=>{this.addError({message:t.reason?.message||String(t.reason),file:"",line:0,col:0,stack:t.reason?.stack||"",ts:(new Date).toISOString(),source:"unhandledrejection"})}),window.addEventListener("beforeunload",()=>this.flush()),document.addEventListener("visibilitychange",()=>{"hidden"===document.visibilityState&&this.flush()})}addError(t){const e=this.load();let o=e.find(t=>t.page===this.currentPage);o||(o={page:this.currentPage,errors:[]},e.push(o)),o.errors.push(t),o.errors.length>500&&(o.errors=o.errors.slice(-500)),this.save(e)}load(){try{const t=localStorage.getItem(s);return t?JSON.parse(t):[]}catch{return[]}}save(t){try{localStorage.setItem(s,JSON.stringify(t))}catch{}}flush(){const t=this.load();0!==t.length&&(this.sendFn(t),this.clearAll())}clearAll(){try{localStorage.removeItem(s)}catch{}}}class d{constructor(t){if(this.captureActive=!1,!t.token||!t.token.startsWith("ntx_"))throw new Error('Notix: token must start with "ntx_"');this.token=t.token,this.endpoint=t.endpoint??"https://notix-hub.ru/api/v1/webhook",this.timeout=t.timeout??1e4,this.debug=t.debug??!1,this.metrika=a(t.metrika),this.onCapture=t.onCapture,!0===t.autoCapture&&this.capture(),t.metricEnabled&&this.sendPageview(),t.errorTrackingEnabled&&this.enableErrorTracking()}async notify(t){if(!t.title)throw new Error("Notix: title is required");this.log("Sending notification:",t.title);try{const o=await e(this.endpoint,this.token,t,this.timeout);return this.log("Notification sent:",o.id),this.metrika?.trackSent(o),o}catch(t){const e=t instanceof Error?t:new Error(String(t));throw this.log("Error sending notification:",e.message),this.metrika?.trackError(e),e}}capture(t=document){this.captureActive||(r((e,o)=>{this.notify(e).then(r=>{this.metrika?.trackFormCaptured(o.title??e.title,o.fieldsCount);const n=(t instanceof Element?t:document).querySelector("form[data-notix-bound]");if(n instanceof HTMLFormElement&&n.dataset.notixCallback){const t=window[n.dataset.notixCallback];"function"==typeof t&&t(r),delete n.dataset.notixCallback}this.onCapture?.(r,e)}).catch(()=>{})},t,this.debug),this.captureActive=!0,this.log("Form capture activated"))}destroy(){document.querySelectorAll("form[data-notix-bound]").forEach(t=>{delete t.dataset.notixBound}),this.captureActive=!1,this.log("Notix destroyed")}sendPageview(t,e){const o={title:"Посетитель на сайте",type:"metric",payload:{event_type:"pageview",visitor_id:u(),page:t||location.pathname,referrer:e||document.referrer||void 0,value:1}};this.notify(o).catch(()=>{}),this.log("Pageview sent:",t||location.pathname)}enableErrorTracking(){if("undefined"==typeof window)return;const t=location.hostname;new c(e=>{const o=e.reduce((t,e)=>t+e.errors.length,0);this.notify({title:`Ошибки на ${t}: ${o}`,type:"error_batch",payload:{batches:e}}).catch(()=>{})}),this.log("Error tracking activated")}static getVisitorId(){return u()}log(...t){this.debug&&console.log("[Notix]",...t)}}const l="notix_vid";function u(){try{let t=localStorage.getItem(l);return t||(t=crypto.randomUUID(),localStorage.setItem(l,t)),t}catch{return"unknown"}}if("undefined"!=typeof document){const t=document.currentScript;if(t){const e=t.dataset.token;if(e){const o=t.dataset.endpoint,r="true"===t.dataset.autoCapture,n="true"===t.dataset.debug,a=t.dataset.timeout?parseInt(t.dataset.timeout,10):void 0,i=()=>{const i="true"===t.dataset.metric,s="true"===t.dataset.errors,c=new d({token:e,...o&&{endpoint:o},autoCapture:r,debug:n,metricEnabled:i,errorTrackingEnabled:s,...a&&{timeout:a}});window.notix=c};"loading"!==document.readyState?i():document.addEventListener("DOMContentLoaded",i)}else"true"===t.dataset.debug&&console.warn("[Notix] data-token attribute is required on script tag")}}return t.Notix=d,t}({});

package/dist/notix.d.ts

@@ -6,6 +6,7 @@ export declare class Notix {
     private debug;
     private metrika;
     private captureActive;
+    private onCapture?;
     constructor(config: NotixConfig);
     notify(payload: NotifyPayload): Promise<{
         message: string;

package/dist/types.d.ts

@@ -1,15 +1,25 @@
 export type NotificationPriority = 'low' | 'normal' | 'high' | 'urgent';
+export interface TagObject {
+    name: string;
+    color?: string;
+}
 export interface NotifyPayload {
     title: string;
     body?: string;
     type?: string;
     tag?: string;
+    tags?: Array<string | TagObject>;
     priority?: NotificationPriority;
     payload?: Record<string, unknown>;
 }
-export interface NotifyRequestBody extends NotifyPayload {
+export interface NotifyRequestBody {
+    title: string;
+    body?: string;
     notification_type?: string;
     tag?: string;
+    tags?: Array<string | TagObject>;
+    priority?: string;
+    payload?: Record<string, unknown>;
 }
 export interface NotixResponse {
     message: string;
@@ -29,4 +39,5 @@ export interface NotixConfig {
     metrika?: MetrikaConfig;
     timeout?: number;
     debug?: boolean;
+    onCapture?: (response: NotixResponse, payload: NotifyPayload) => void;
 }

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@notix-hub/sdk",
-  "version": "0.3.1",
-  "description": "JavaScript SDK for Notix (Нотикс) — notification aggregation service",
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w",
-    "typecheck": "tsc --noEmit",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "notix",
-    "notifications",
-    "webhook",
-    "notify"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "@rollup/plugin-typescript": "^12.0.0",
-    "@rollup/plugin-terser": "^0.4.0",
-    "rollup": "^4.0.0",
-    "tslib": "^2.0.0",
-    "typescript": "^5.0.0"
-  }
-}
+{
+  "name": "@notix-hub/sdk",
+  "version": "0.3.3",
+  "description": "JavaScript SDK for Notix (Нотикс) — notification aggregation service",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "rollup -c",
+    "dev": "rollup -c -w",
+    "typecheck": "tsc --noEmit",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "notix",
+    "notifications",
+    "webhook",
+    "notify"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@rollup/plugin-typescript": "^12.0.0",
+    "@rollup/plugin-terser": "^0.4.0",
+    "rollup": "^4.0.0",
+    "tslib": "^2.0.0",
+    "typescript": "^5.0.0"
+  }
+}