npm - @gxp-dev/tools - Versions diffs - 2.0.6 → 2.0.8 - Mend

@gxp-dev/tools 2.0.6 → 2.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (100) hide show

package/bin/lib/commands/build.js +18 -12
package/browser-extensions/README.md +1 -0
package/browser-extensions/chrome/background.js +857 -0
package/browser-extensions/chrome/content.js +51 -0
package/browser-extensions/chrome/devtools.html +9 -0
package/browser-extensions/chrome/devtools.js +23 -0
package/browser-extensions/chrome/icons/gx_off_128.png +0 -0
package/browser-extensions/chrome/icons/gx_off_16.png +0 -0
package/browser-extensions/chrome/icons/gx_off_32.png +0 -0
package/browser-extensions/chrome/icons/gx_off_64.png +0 -0
package/browser-extensions/chrome/icons/gx_on_128.png +0 -0
package/browser-extensions/chrome/icons/gx_on_16.png +0 -0
package/browser-extensions/chrome/icons/gx_on_32.png +0 -0
package/browser-extensions/chrome/icons/gx_on_64.png +0 -0
package/browser-extensions/chrome/inspector.js +1087 -0
package/browser-extensions/chrome/manifest.json +70 -0
package/browser-extensions/chrome/panel.html +638 -0
package/browser-extensions/chrome/panel.js +862 -0
package/browser-extensions/chrome/popup.html +399 -0
package/browser-extensions/chrome/popup.js +515 -0
package/browser-extensions/chrome/rules.json +1 -0
package/browser-extensions/chrome/test-chrome.html +145 -0
package/browser-extensions/chrome/test-mixed-content.html +190 -0
package/browser-extensions/chrome/test-uri-pattern.html +199 -0
package/browser-extensions/firefox/README.md +134 -0
package/browser-extensions/firefox/background.js +804 -0
package/browser-extensions/firefox/content.js +120 -0
package/browser-extensions/firefox/debug-errors.html +229 -0
package/browser-extensions/firefox/debug-https.html +113 -0
package/browser-extensions/firefox/devtools.html +9 -0
package/browser-extensions/firefox/devtools.js +24 -0
package/browser-extensions/firefox/icons/gx_off_128.png +0 -0
package/browser-extensions/firefox/icons/gx_off_16.png +0 -0
package/browser-extensions/firefox/icons/gx_off_32.png +0 -0
package/browser-extensions/firefox/icons/gx_off_64.png +0 -0
package/browser-extensions/firefox/icons/gx_on_128.png +0 -0
package/browser-extensions/firefox/icons/gx_on_16.png +0 -0
package/browser-extensions/firefox/icons/gx_on_32.png +0 -0
package/browser-extensions/firefox/icons/gx_on_64.png +0 -0
package/browser-extensions/firefox/inspector.js +1087 -0
package/browser-extensions/firefox/manifest.json +67 -0
package/browser-extensions/firefox/panel.html +638 -0
package/browser-extensions/firefox/panel.js +862 -0
package/browser-extensions/firefox/popup.html +525 -0
package/browser-extensions/firefox/popup.js +536 -0
package/browser-extensions/firefox/test-gramercy.html +126 -0
package/browser-extensions/firefox/test-imports.html +58 -0
package/browser-extensions/firefox/test-masking.html +147 -0
package/browser-extensions/firefox/test-uri-pattern.html +199 -0
package/package.json +7 -2
package/runtime/PortalContainer.vue +326 -0
package/runtime/dev-tools/DevToolsModal.vue +217 -0
package/runtime/dev-tools/LayoutSwitcher.vue +221 -0
package/runtime/dev-tools/MockDataEditor.vue +621 -0
package/runtime/dev-tools/SocketSimulator.vue +562 -0
package/runtime/dev-tools/StoreInspector.vue +644 -0
package/runtime/dev-tools/index.js +6 -0
package/runtime/gxpStringsPlugin.js +428 -0
package/runtime/index.html +22 -0
package/runtime/main.js +32 -0
package/runtime/mock-api/auth-middleware.js +97 -0
package/runtime/mock-api/image-generator.js +221 -0
package/runtime/mock-api/index.js +197 -0
package/runtime/mock-api/response-generator.js +394 -0
package/runtime/mock-api/route-generator.js +323 -0
package/runtime/mock-api/socket-triggers.js +371 -0
package/runtime/mock-api/spec-loader.js +300 -0
package/runtime/server.js +180 -0
package/runtime/stores/gxpPortalConfigStore.js +554 -0
package/runtime/stores/index.js +6 -0
package/runtime/vite-inspector-plugin.js +749 -0
package/runtime/vite-source-tracker-plugin.js +232 -0
package/runtime/vite.config.js +402 -0
package/scripts/launch-chrome.js +90 -0
package/scripts/pack-chrome.js +91 -0
package/socket-events/AiSessionMessageCreated.json +18 -0
package/socket-events/SocialStreamPostCreated.json +24 -0
package/socket-events/SocialStreamPostVariantCompleted.json +23 -0
package/template/README.md +332 -0
package/template/app-manifest.json +32 -0
package/template/dev-assets/images/avatar-placeholder.png +0 -0
package/template/dev-assets/images/background-placeholder.jpg +0 -0
package/template/dev-assets/images/banner-placeholder.jpg +0 -0
package/template/dev-assets/images/icon-placeholder.png +0 -0
package/template/dev-assets/images/logo-placeholder.png +0 -0
package/template/dev-assets/images/product-placeholder.jpg +0 -0
package/template/dev-assets/images/thumbnail-placeholder.jpg +0 -0
package/template/env.example +51 -0
package/template/gitignore +53 -0
package/template/index.html +22 -0
package/template/main.js +28 -0
package/template/src/DemoPage.vue +459 -0
package/template/src/Plugin.vue +38 -0
package/template/src/stores/index.js +9 -0
package/template/src/stores/test-data.json +173 -0
package/template/theme-layouts/AdditionalStyling.css +0 -0
package/template/theme-layouts/PrivateLayout.vue +39 -0
package/template/theme-layouts/PublicLayout.vue +39 -0
package/template/theme-layouts/SystemLayout.vue +39 -0
package/template/vite.config.js +333 -0

package/browser-extensions/firefox/content.js ADDED Viewed

@@ -0,0 +1,120 @@
+// Override fetch to intercept requests
+(function () {
+	const originalFetch = window.fetch;
+	let isProxyEnabled = false;
+	let proxyConfig = {};
+	// Get initial state from background script
+	browser.runtime
+		.sendMessage({ action: "getConfig" })
+		.then((response) => {
+			if (response) {
+				isProxyEnabled = response.enabled;
+				proxyConfig = response;
+				console.log("[Traffic Proxy Content] Config received:", {
+					enabled: isProxyEnabled,
+					config: proxyConfig,
+					url: window.location.href,
+				});
+			}
+		})
+		.catch((err) =>
+			console.error("[Traffic Proxy Content] Failed to get proxy config:", err)
+		);
+	// Listen for config changes
+	browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
+		if (message.action === "configUpdate") {
+			isProxyEnabled = message.enabled;
+			proxyConfig = message.config;
+		}
+	});
+	// Override fetch function
+	window.fetch = function (input, init) {
+		console.log("fetch", input, init);
+		if (!isProxyEnabled) {
+			return originalFetch.apply(this, arguments);
+		}
+		let url = input;
+		if (typeof input === "object" && input.url) {
+			url = input.url;
+		}
+		// Apply proxy rules
+		const modifiedUrl = applyProxyRules(url);
+		// If URL was modified, use the new URL
+		if (modifiedUrl !== url) {
+			if (typeof input === "string") {
+				input = modifiedUrl;
+			} else if (typeof input === "object") {
+				input = new Request(modifiedUrl, input);
+			}
+		}
+		return originalFetch.apply(this, arguments);
+	};
+	// Apply proxy rules to URL
+	function applyProxyRules(url) {
+		if (!proxyConfig || !proxyConfig.rules) {
+			return url;
+		}
+		try {
+			// Check each rule type
+			for (const [ruleType, rule] of Object.entries(proxyConfig.rules)) {
+				if (!rule.enabled || !rule.pattern) continue;
+				const regex = new RegExp(rule.pattern, "i");
+				if (regex.test(url)) {
+					// Handle blank return for CSS
+					if (rule.returnBlank) {
+						console.log(
+							`[Traffic Proxy Content] Returning blank for ${ruleType}: ${url}`
+						);
+						return ruleType === "css"
+							? "data:text/css;charset=utf-8,"
+							: "data:text/javascript;charset=utf-8,";
+					}
+					// Handle redirect
+					if (rule.redirectUrl) {
+						console.log(
+							`[Traffic Proxy Content] Redirecting ${ruleType}: ${url} → ${rule.redirectUrl}`
+						);
+						return rule.redirectUrl;
+					}
+				}
+			}
+		} catch (e) {
+			console.log("Error processing URL for proxy rules:", url, e);
+		}
+		return url;
+	}
+	// Override XMLHttpRequest as well
+	const originalXHROpen = XMLHttpRequest.prototype.open;
+	XMLHttpRequest.prototype.open = function (
+		method,
+		url,
+		async,
+		user,
+		password
+	) {
+		console.log("open", method, url, async, user, password);
+		if (isProxyEnabled) {
+			url = applyProxyRules(url);
+		}
+		return originalXHROpen.call(this, method, url, async, user, password);
+	};
+	// Note: Dynamic imports (import('module')) are handled by the background script's webRequest API
+	// Static imports (import ... from 'module') are also handled by webRequest API
+	// This content script primarily handles fetch() and XHR calls
+	console.log("Traffic Proxy content script loaded");
+})();

package/browser-extensions/firefox/debug-errors.html ADDED Viewed

@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Debug Proxy Errors</title>
+    <style>
+        body { font-family: Arial, sans-serif; padding: 20px; max-width: 1000px; }
+        .section { margin: 20px 0; padding: 20px; border: 2px solid #ddd; border-radius: 8px; }
+        .error { border-color: #dc3545; background: #fff5f5; }
+        .success { border-color: #28a745; background: #f8fff8; }
+        .warning { border-color: #ffc107; background: #fffbf0; }
+        .info { border-color: #17a2b8; background: #f0f9ff; }
+        .code { background: #e9ecef; padding: 8px; font-family: monospace; margin: 8px 0; word-break: break-all; }
+        .results { background: #f5f5f5; padding: 10px; margin: 10px 0; border-radius: 4px; max-height: 300px; overflow-y: auto; }
+        button { padding: 10px 15px; margin: 5px; cursor: pointer; background: #007bff; color: white; border: none; border-radius: 4px; }
+        .error-btn { background: #dc3545; }
+        .success-btn { background: #28a745; }
+        table { width: 100%; border-collapse: collapse; margin: 10px 0; }
+        th, td { border: 1px solid #ddd; padding: 8px; text-align: left; }
+        th { background: #f8f9fa; }
+    </style>
+</head>
+<body>
+    <h1>🐛 Debug Proxy Errors</h1>
+    <div class="section error">
+        <h2>❌ Common Firefox Errors</h2>
+        <table>
+            <tr>
+                <th>Error</th>
+                <th>Meaning</th>
+                <th>Common Causes</th>
+            </tr>
+            <tr>
+                <td><code>ns_binding_aborted</code></td>
+                <td>Network request was cancelled</td>
+                <td>Redirect loops, Invalid redirects, Extension conflicts</td>
+            </tr>
+            <tr>
+                <td><code>ns_error_corrupted_content</code></td>
+                <td>Content corruption or invalid response</td>
+                <td>Header issues, CORS problems, Content-encoding conflicts</td>
+            </tr>
+            <tr>
+                <td><code>ns_error_net_reset</code></td>
+                <td>Connection was reset</td>
+                <td>Server rejection, Proxy server issues</td>
+            </tr>
+        </table>
+    </div>
+    <div class="section warning">
+        <h2>⚠️ Quick Fixes</h2>
+        <ol>
+            <li><strong>Check for redirect loops:</strong> Make sure your redirect target doesn't match your pattern</li>
+            <li><strong>Use redirect mode first:</strong> Disable "Mask URL" to test basic functionality</li>
+            <li><strong>Test with simple domains:</strong> Try redirecting to a known working server first</li>
+            <li><strong>Check proxy server:</strong> Ensure your target server can handle the requests</li>
+        </ol>
+    </div>
+    <div class="section info">
+        <h2>🔍 Diagnostic Tests</h2>
+        <button onclick="checkExtensionStatus()">Check Extension Status</button>
+        <button onclick="testSimpleRedirect()">Test Simple Redirect</button>
+        <button onclick="testProblematicURL()">Test Problematic URL</button>
+        <button onclick="analyzeRules()">Analyze Rules for Loops</button>
+        <button class="error-btn" onclick="clearLogs()">Clear Logs</button>
+        <div id="diagnosticResults" class="results"></div>
+    </div>
+    <div class="section success">
+        <h2>✅ Troubleshooting Steps</h2>
+        <div id="troubleshootingSteps">
+            <h3>Step 1: Verify Extension State</h3>
+            <button onclick="runTroubleshootingStep(1)">Run Step 1</button>
+            <div id="step1Results" class="results"></div>
+            <h3>Step 2: Test Without Masking</h3>
+            <button onclick="runTroubleshootingStep(2)">Run Step 2</button>
+            <div id="step2Results" class="results"></div>
+            <h3>Step 3: Check for Redirect Loops</h3>
+            <button onclick="runTroubleshootingStep(3)">Run Step 3</button>
+            <div id="step3Results" class="results"></div>
+        </div>
+    </div>
+    <script>
+        function log(elementId, message, type = 'info') {
+            const element = document.getElementById(elementId);
+            const timestamp = new Date().toLocaleTimeString();
+            const icon = type === 'error' ? '❌' : type === 'success' ? '✅' : type === 'warning' ? '⚠️' : 'ℹ️';
+            element.innerHTML += `<div>${timestamp} ${icon} ${message}</div>`;
+        }
+        function clearLogs() {
+            const logElements = ['diagnosticResults', 'step1Results', 'step2Results', 'step3Results'];
+            logElements.forEach(id => {
+                const element = document.getElementById(id);
+                if (element) element.innerHTML = '';
+            });
+        }
+        async function checkExtensionStatus() {
+            log('diagnosticResults', 'Checking extension status...');
+            try {
+                if (typeof browser === 'undefined') {
+                    log('diagnosticResults', 'Browser API not available - extension not loaded', 'error');
+                    return;
+                }
+                const state = await browser.runtime.sendMessage({ action: 'getState' });
+                log('diagnosticResults', `Extension enabled: ${state.enabled}`, 'success');
+                log('diagnosticResults', `Number of rules: ${state.rules.length}`, 'info');
+                state.rules.forEach((rule, index) => {
+                    log('diagnosticResults', `Rule ${index + 1}: ${rule.pattern} → ${rule.redirect} (Mask: ${rule.maskUrl || false})`, 'info');
+                });
+            } catch (error) {
+                log('diagnosticResults', `Extension communication failed: ${error.message}`, 'error');
+            }
+        }
+        async function testSimpleRedirect() {
+            log('diagnosticResults', 'Testing simple redirect with known good server...');
+            try {
+                // Test with a simple, reliable endpoint
+                const response = await fetch('https://httpbin.org/get?test=simple');
+                const data = await response.json();
+                log('diagnosticResults', `Simple test successful: ${response.status}`, 'success');
+                log('diagnosticResults', `Response URL: ${data.url}`, 'info');
+            } catch (error) {
+                log('diagnosticResults', `Simple test failed: ${error.message}`, 'error');
+                log('diagnosticResults', 'This suggests a configuration issue with your rules', 'warning');
+            }
+        }
+        async function testProblematicURL() {
+            log('diagnosticResults', 'Testing the problematic gramercy.cloud URL...');
+            const testUrl = 'https://hilton-pop-art-cytz-dani-martin-hueg.gramercy.cloud/uploads/assets/test.png';
+            try {
+                const response = await fetch(testUrl);
+                log('diagnosticResults', `Gramercy test: ${response.status} ${response.statusText}`, 'success');
+            } catch (error) {
+                log('diagnosticResults', `Gramercy test failed: ${error.message}`, 'error');
+                if (error.message.includes('ns_binding_aborted')) {
+                    log('diagnosticResults', '→ Likely cause: Redirect loop or invalid redirect target', 'warning');
+                } else if (error.message.includes('ns_error_corrupted_content')) {
+                    log('diagnosticResults', '→ Likely cause: Header modification issues or server response problems', 'warning');
+                }
+            }
+        }
+        async function analyzeRules() {
+            log('diagnosticResults', 'Analyzing rules for potential problems...');
+            try {
+                const state = await browser.runtime.sendMessage({ action: 'getState' });
+                const rules = state.rules;
+                if (rules.length === 0) {
+                    log('diagnosticResults', 'No rules configured', 'warning');
+                    return;
+                }
+                // Check for redirect loops
+                rules.forEach((rule, index) => {
+                    const pattern = new RegExp(rule.pattern, 'i');
+                    // Check if redirect target matches the pattern
+                    if (pattern.test(rule.redirect)) {
+                        log('diagnosticResults', `⚠️ LOOP DETECTED: Rule ${index + 1} redirects to a domain that matches its own pattern!`, 'error');
+                        log('diagnosticResults', `   Pattern: ${rule.pattern}`, 'error');
+                        log('diagnosticResults', `   Redirect: ${rule.redirect}`, 'error');
+                    }
+                    // Check if redirect target matches other patterns
+                    rules.forEach((otherRule, otherIndex) => {
+                        if (index !== otherIndex) {
+                            const otherPattern = new RegExp(otherRule.pattern, 'i');
+                            if (otherPattern.test(rule.redirect)) {
+                                log('diagnosticResults', `⚠️ CHAIN DETECTED: Rule ${index + 1} redirects to domain that matches Rule ${otherIndex + 1}`, 'warning');
+                            }
+                        }
+                    });
+                });
+                log('diagnosticResults', 'Rule analysis complete', 'success');
+            } catch (error) {
+                log('diagnosticResults', `Rule analysis failed: ${error.message}`, 'error');
+            }
+        }
+        async function runTroubleshootingStep(step) {
+            const resultId = `step${step}Results`;
+            switch (step) {
+                case 1:
+                    log(resultId, 'Verifying extension state...');
+                    await checkExtensionStatus();
+                    break;
+                case 2:
+                    log(resultId, 'Testing redirect mode (non-masking)...');
+                    log(resultId, '1. Disable all "Mask URL" checkboxes in extension popup', 'info');
+                    log(resultId, '2. Disable "URL Masking Mode" toggle', 'info');
+                    log(resultId, '3. Try your request again', 'info');
+                    log(resultId, '4. If it works, the issue is with masking mode', 'warning');
+                    break;
+                case 3:
+                    log(resultId, 'Checking for redirect loops...');
+                    await analyzeRules();
+                    break;
+            }
+        }
+        // Auto-run extension check on page load
+        window.addEventListener('load', checkExtensionStatus);
+    </script>
+</body>
+</html>

package/browser-extensions/firefox/debug-https.html ADDED Viewed

@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Debug HTTPS Traffic Interception</title>
+    <style>
+        body { font-family: Arial, sans-serif; padding: 20px; }
+        .test-section { margin: 20px 0; padding: 15px; border: 1px solid #ccc; }
+        .log { background: #f5f5f5; padding: 10px; margin: 10px 0; }
+        button { padding: 10px 15px; margin: 5px; }
+    </style>
+</head>
+<body>
+    <h1>Debug HTTPS Traffic Interception</h1>
+    <div class="test-section">
+        <h3>Step 1: Extension Status Check</h3>
+        <button onclick="checkExtension()">Check Extension</button>
+        <div id="extensionStatus" class="log"></div>
+    </div>
+    <div class="test-section">
+        <h3>Step 2: Test Different Request Types</h3>
+        <button onclick="testFetch()">Test Fetch</button>
+        <button onclick="testXHR()">Test XHR</button>
+        <button onclick="testDynamicImport()">Test Dynamic Import</button>
+        <button onclick="testImageLoad()">Test Image Load</button>
+        <div id="requestResults" class="log"></div>
+    </div>
+    <div class="test-section">
+        <h3>Step 3: Console Logs</h3>
+        <p>Open DevTools Console to see detailed logs from:</p>
+        <ul>
+            <li><strong>Background Script:</strong> Look for "[Traffic Proxy]" messages</li>
+            <li><strong>Content Script:</strong> Look for "[Traffic Proxy Content]" messages</li>
+        </ul>
+        <p><strong>Expected test domains:</strong> httpbin.org, api.github.com, cdn.jsdelivr.net</p>
+    </div>
+    <script>
+        function log(elementId, message) {
+            const element = document.getElementById(elementId);
+            const timestamp = new Date().toLocaleTimeString();
+            element.innerHTML += `<div>${timestamp}: ${message}</div>`;
+        }
+        async function checkExtension() {
+            const status = document.getElementById('extensionStatus');
+            status.innerHTML = '';
+            log('extensionStatus', '🔍 Checking extension status...');
+            // Check if browser API is available
+            if (typeof browser === 'undefined') {
+                log('extensionStatus', '❌ Browser API not available - extension not loaded properly');
+                return;
+            }
+            try {
+                // Try to communicate with background script
+                const response = await browser.runtime.sendMessage({ action: 'getState' });
+                log('extensionStatus', `✅ Extension responding: Enabled=${response.enabled}, Rules=${response.rules.length}`);
+                if (response.rules.length === 0) {
+                    log('extensionStatus', '⚠️ No proxy rules configured. Add some rules to test interception.');
+                }
+            } catch (error) {
+                log('extensionStatus', `❌ Failed to communicate with extension: ${error.message}`);
+            }
+        }
+        async function testFetch() {
+            log('requestResults', '🧪 Testing fetch to httpbin.org...');
+            try {
+                const response = await fetch('https://httpbin.org/get?test=fetch');
+                log('requestResults', `✅ Fetch successful: ${response.status} ${response.statusText}`);
+            } catch (error) {
+                log('requestResults', `❌ Fetch failed: ${error.message}`);
+            }
+        }
+        async function testXHR() {
+            log('requestResults', '🧪 Testing XHR to api.github.com...');
+            const xhr = new XMLHttpRequest();
+            xhr.onload = () => log('requestResults', `✅ XHR successful: ${xhr.status} ${xhr.statusText}`);
+            xhr.onerror = () => log('requestResults', `❌ XHR failed`);
+            xhr.open('GET', 'https://api.github.com/zen');
+            xhr.send();
+        }
+        async function testDynamicImport() {
+            log('requestResults', '🧪 Testing dynamic import from cdn.jsdelivr.net...');
+            try {
+                const module = await import('https://cdn.jsdelivr.net/npm/lodash@4.17.21/isNull.js');
+                log('requestResults', `✅ Dynamic import successful`);
+            } catch (error) {
+                log('requestResults', `❌ Dynamic import failed: ${error.message}`);
+            }
+        }
+        function testImageLoad() {
+            log('requestResults', '🧪 Testing image load from httpbin.org...');
+            const img = new Image();
+            img.onload = () => log('requestResults', `✅ Image load successful`);
+            img.onerror = () => log('requestResults', `❌ Image load failed`);
+            img.src = 'https://httpbin.org/image/png';
+        }
+        // Auto-run extension check on page load
+        window.addEventListener('load', checkExtension);
+    </script>
+</body>
+</html>

package/browser-extensions/firefox/devtools.html ADDED Viewed

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+</head>
+<body>
+  <script src="devtools.js"></script>
+</body>
+</html>

package/browser-extensions/firefox/devtools.js ADDED Viewed

@@ -0,0 +1,24 @@
+// Create the GxP DevTools panel
+// Firefox uses the same API as Chrome for creating panels
+browser.devtools.panels.create(
+  "GxP Inspector",           // Panel title
+  "icons/gx_on_32.png",      // Icon path (32x32)
+  "panel.html"               // Panel HTML page
+).then(function(panel) {
+  // Panel created callback
+  console.log("GxP Inspector panel created");
+  // Optional: Handle panel show/hide events
+  panel.onShown.addListener(function(panelWindow) {
+    // Panel is now visible
+    if (panelWindow.panelShown) {
+      panelWindow.panelShown();
+    }
+  });
+  panel.onHidden.addListener(function() {
+    // Panel is now hidden
+  });
+}).catch(function(error) {
+  console.error("Failed to create GxP Inspector panel:", error);
+});