Revert to simple object literal pattern (no IIFE, no return)

Simplified to pure object literal expression

Rationale:
- User requested to forget about IIFE wrapper
- Simpler pattern: file evaluates directly to an object
- No function wrapper needed
- No return statement needed
- server.js already handles this correctly at line 59

Pattern:
```javascript
// Define functions at top level
class DocumentCountExceededError extends Error {...}
function generateRequestId() {...}
function parseRoute() {...}

// Final expression evaluates to object
({
  DocumentCountExceededError,
  generateRequestId,
  parseRoute,
  // ... all functions
});
```

How server.js handles it (already correct):
```javascript
const script = new vm.Script(code, { filename: file });
const context = vm.createContext({ ...globalVMContext, ...globalVariableContext });
globalVariableContext[varName] = script.runInContext(context);
// script.runInContext() returns the evaluated expression (the object)
```

Changes:
- Reverted from IIFE with return: (function() { return {...}; })()
- Back to object literal: ({...})
- Removed 2-space indentation throughout
- No function wrapper
- No return statement

Benefits:
 Simplest possible pattern
 Direct object evaluation
 No syntax complexity
 Server.js already handles it correctly
 Clean, minimal code

Testing:
✓ Syntax validated
✓ Server starts successfully
✓ Module loads: 'Loaded global functions: googleDriveAdapterHelper'
✓ All function calls work correctly
✓ Request handling functional

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2026-03-07 12:22:15 -06:00
parent 07968927fc
commit ab8e43e4ab

View File

@@ -6,7 +6,7 @@
* *
* ARCHITECTURE: * ARCHITECTURE:
* - Loaded by server.js using vm.Script (same as proxy.js) * - Loaded by server.js using vm.Script (same as proxy.js)
* - Function that returns a single object containing all helper functions * - Returns a single object containing all helper functions
* - Injected into globalVariableContext for access by proxy.js * - Injected into globalVariableContext for access by proxy.js
* - NO IMPORTS - All dependencies provided via VM context * - NO IMPORTS - All dependencies provided via VM context
* *
@@ -17,297 +17,296 @@
* @returns {Object} Helpers object with all utility functions * @returns {Object} Helpers object with all utility functions
*/ */
(function() { /**
/** * Custom error for document count exceeding limit
* Custom error for document count exceeding limit */
*/ class DocumentCountExceededError extends Error {
class DocumentCountExceededError extends Error { constructor(count, limit) {
constructor(count, limit) { super(`Document count ${count} exceeds limit of ${limit}`);
super(`Document count ${count} exceeds limit of ${limit}`); this.name = "DocumentCountExceededError";
this.name = "DocumentCountExceededError"; this.count = count;
this.count = count; this.limit = limit;
this.limit = limit; this.statusCode = 413;
this.statusCode = 413; }
} }
// =============================================================================
// Utility Functions
// =============================================================================
/**
* Generate a unique request ID for tracing
* Uses UUID v4 for uniqueness
*
* @returns {string} Request ID in format: req_<uuid>
*/
function generateRequestId() {
return `req_${crypto.randomUUID()}`;
}
/**
* Validate document ID format
* Google Drive IDs are alphanumeric with hyphens and underscores
*
* @param {string} id - Document ID to validate
* @returns {boolean} True if valid
*/
function validateDocumentId(id) {
if (!id || typeof id !== "string") {
return false;
} }
// ============================================================================= // Google Drive IDs are typically 8-128 characters
// Utility Functions // Characters: a-z, A-Z, 0-9, -, _
// ============================================================================= const pattern = /^[a-zA-Z0-9_-]{8,128}$/;
return pattern.test(id);
}
/** /**
* Generate a unique request ID for tracing * Validate document count against limit
* Uses UUID v4 for uniqueness *
* * @param {number} count - Document count
* @returns {string} Request ID in format: req_<uuid> * @param {number} limit - Maximum allowed (default: 50000)
*/ * @throws {DocumentCountExceededError} If count > limit
function generateRequestId() { */
return `req_${crypto.randomUUID()}`; function validateDocumentCount(count, limit = 50000) {
if (count > limit) {
throw new DocumentCountExceededError(count, limit);
}
}
// =============================================================================
// XML Utilities
// =============================================================================
/**
* Escape special XML characters
* Prevents XML injection and ensures valid XML output
*
* @param {string} str - String to escape
* @returns {string} Escaped string safe for XML
*/
function escapeXml(str) {
if (!str) return "";
return str
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&apos;");
}
// =============================================================================
// Error Mapping
// =============================================================================
/**
* Map Drive API error to HTTP status code and retry info
*
* Per specification:
* - 429: Rate limit - include Retry-After header
* - 503: Service unavailable - NO RETRY (fail immediately)
* - 401: Authentication failed
* - 500: Other errors
*
* @param {Error} error - Drive API error
* @returns {Object} { statusCode, retryAfter? }
*/
function mapDriveErrorToHttp(error) {
// Handle DocumentCountExceededError
if (error instanceof DocumentCountExceededError) {
return { statusCode: 413 };
} }
/** // Extract status code from Drive API error
* Validate document ID format const statusCode = error.response?.status || error.code || 500;
* Google Drive IDs are alphanumeric with hyphens and underscores
*
* @param {string} id - Document ID to validate
* @returns {boolean} True if valid
*/
function validateDocumentId(id) {
if (!id || typeof id !== "string") {
return false;
}
// Google Drive IDs are typically 8-128 characters // Handle rate limiting (429)
// Characters: a-z, A-Z, 0-9, -, _ if (statusCode === 429) {
const pattern = /^[a-zA-Z0-9_-]{8,128}$/; // Extract Retry-After from response headers if present
return pattern.test(id); const retryAfter = error.response?.headers?.["retry-after"];
const retryAfterSeconds = retryAfter ? parseInt(retryAfter, 10) : 60;
return {
statusCode: 429,
retryAfter: retryAfterSeconds,
};
} }
/** // Handle service unavailable (503) - NO RETRY per spec
* Validate document count against limit if (statusCode === 503) {
* return { statusCode: 503 };
* @param {number} count - Document count
* @param {number} limit - Maximum allowed (default: 50000)
* @throws {DocumentCountExceededError} If count > limit
*/
function validateDocumentCount(count, limit = 50000) {
if (count > limit) {
throw new DocumentCountExceededError(count, limit);
}
} }
// ============================================================================= // Handle authentication errors
// XML Utilities if (statusCode === 401 || statusCode === 403) {
// ============================================================================= return { statusCode: statusCode };
/**
* Escape special XML characters
* Prevents XML injection and ensures valid XML output
*
* @param {string} str - String to escape
* @returns {string} Escaped string safe for XML
*/
function escapeXml(str) {
if (!str) return "";
return str
.replace(/&/g, "&amp;")
.replace(/</g, "&lt;")
.replace(/>/g, "&gt;")
.replace(/"/g, "&quot;")
.replace(/'/g, "&apos;");
} }
// ============================================================================= // All other errors map to 500
// Error Mapping return { statusCode: 500 };
// ============================================================================= }
/** // =============================================================================
* Map Drive API error to HTTP status code and retry info // Sitemap Functions
* // =============================================================================
* Per specification:
* - 429: Rate limit - include Retry-After header
* - 503: Service unavailable - NO RETRY (fail immediately)
* - 401: Authentication failed
* - 500: Other errors
*
* @param {Error} error - Drive API error
* @returns {Object} { statusCode, retryAfter? }
*/
function mapDriveErrorToHttp(error) {
// Handle DocumentCountExceededError
if (error instanceof DocumentCountExceededError) {
return { statusCode: 413 };
}
// Extract status code from Drive API error /**
const statusCode = error.response?.status || error.code || 500; * Transform Drive document to sitemap entry
*
// Handle rate limiting (429) * Creates RESTful URL in format: {baseUrl}/documents/{documentId}
if (statusCode === 429) { * Per specification clarification #2.
// Extract Retry-After from response headers if present *
const retryAfter = error.response?.headers?.["retry-after"]; * @param {Object} document - Drive API document
const retryAfterSeconds = retryAfter ? parseInt(retryAfter, 10) : 60; * @param {string} document.id - Document ID
* @param {string} document.modifiedTime - ISO 8601 timestamp
return { * @param {string} baseUrl - Base URL for the adapter
statusCode: 429, * @returns {Object} Sitemap entry { loc, lastmod }
retryAfter: retryAfterSeconds, */
}; function toSitemapEntry(document, baseUrl) {
} if (!document || !document.id) {
console.error("Invalid document for sitemap entry", { document });
// Handle service unavailable (503) - NO RETRY per spec return null;
if (statusCode === 503) {
return { statusCode: 503 };
}
// Handle authentication errors
if (statusCode === 401 || statusCode === 403) {
return { statusCode: statusCode };
}
// All other errors map to 500
return { statusCode: 500 };
} }
// ============================================================================= // RESTful URL format: /documents/{documentId}
// Sitemap Functions const loc = `${baseUrl}/documents/${encodeURIComponent(document.id)}`;
// =============================================================================
/** // Format lastmod as ISO 8601 date (YYYY-MM-DD)
* Transform Drive document to sitemap entry let lastmod;
* if (document.modifiedTime) {
* Creates RESTful URL in format: {baseUrl}/documents/{documentId} try {
* Per specification clarification #2. const date = new Date(document.modifiedTime);
* lastmod = date.toISOString().split("T")[0]; // Extract YYYY-MM-DD
* @param {Object} document - Drive API document } catch (error) {
* @param {string} document.id - Document ID console.error("Invalid modifiedTime for document", {
* @param {string} document.modifiedTime - ISO 8601 timestamp documentId: document.id,
* @param {string} baseUrl - Base URL for the adapter modifiedTime: document.modifiedTime,
* @returns {Object} Sitemap entry { loc, lastmod } });
*/
function toSitemapEntry(document, baseUrl) {
if (!document || !document.id) {
console.error("Invalid document for sitemap entry", { document });
return null;
}
// RESTful URL format: /documents/{documentId}
const loc = `${baseUrl}/documents/${encodeURIComponent(document.id)}`;
// Format lastmod as ISO 8601 date (YYYY-MM-DD)
let lastmod;
if (document.modifiedTime) {
try {
const date = new Date(document.modifiedTime);
lastmod = date.toISOString().split("T")[0]; // Extract YYYY-MM-DD
} catch (error) {
console.error("Invalid modifiedTime for document", {
documentId: document.id,
modifiedTime: document.modifiedTime,
});
lastmod = new Date().toISOString().split("T")[0]; // Fallback to today
}
} else {
lastmod = new Date().toISOString().split("T")[0]; // Fallback to today lastmod = new Date().toISOString().split("T")[0]; // Fallback to today
} }
} else {
return { loc, lastmod }; lastmod = new Date().toISOString().split("T")[0]; // Fallback to today
} }
/** return { loc, lastmod };
* Transform array of Drive documents to sitemap entries }
*
* @param {Array<Object>} documents - Array of Drive API documents
* @param {string} baseUrl - Base URL for the adapter
* @returns {Array<Object>} Array of sitemap entries
*/
function transformDocumentsToSitemapEntries(documents, baseUrl) {
if (!Array.isArray(documents)) {
console.error("Documents must be an array", { documents });
return [];
}
return documents /**
.map((doc) => toSitemapEntry(doc, baseUrl)) * Transform array of Drive documents to sitemap entries
.filter((entry) => entry !== null); *
* @param {Array<Object>} documents - Array of Drive API documents
* @param {string} baseUrl - Base URL for the adapter
* @returns {Array<Object>} Array of sitemap entries
*/
function transformDocumentsToSitemapEntries(documents, baseUrl) {
if (!Array.isArray(documents)) {
console.error("Documents must be an array", { documents });
return [];
} }
/** return documents
* Generate XML sitemap from sitemap entries .map((doc) => toSitemapEntry(doc, baseUrl))
* .filter((entry) => entry !== null);
* Handles empty sitemap (0 documents) case - returns valid XML with empty urlset. }
*
* @param {Array<Object>} sitemapEntries - Array of { loc, lastmod } objects
* @returns {string} Complete XML sitemap string
*/
function generateSitemapXML(sitemapEntries) {
let xml = '<?xml version="1.0" encoding="UTF-8"?>\n';
xml += '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n';
// Handle empty sitemap - valid XML with no <url> elements /**
if (!sitemapEntries || sitemapEntries.length === 0) { * Generate XML sitemap from sitemap entries
xml += "</urlset>"; *
return xml; * Handles empty sitemap (0 documents) case - returns valid XML with empty urlset.
} *
* @param {Array<Object>} sitemapEntries - Array of { loc, lastmod } objects
for (const entry of sitemapEntries) { * @returns {string} Complete XML sitemap string
xml += " <url>\n"; */
xml += ` <loc>${escapeXml(entry.loc)}</loc>\n`; function generateSitemapXML(sitemapEntries) {
xml += ` <lastmod>${escapeXml(entry.lastmod)}</lastmod>\n`; let xml = '<?xml version="1.0" encoding="UTF-8"?>\n';
xml += " </url>\n"; xml += '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">\n';
}
// Handle empty sitemap - valid XML with no <url> elements
if (!sitemapEntries || sitemapEntries.length === 0) {
xml += "</urlset>"; xml += "</urlset>";
return xml; return xml;
} }
/** for (const entry of sitemapEntries) {
* Main sitemap generation function xml += " <url>\n";
* xml += ` <loc>${escapeXml(entry.loc)}</loc>\n`;
* Combines document transformation and XML generation. xml += ` <lastmod>${escapeXml(entry.lastmod)}</lastmod>\n`;
* xml += " </url>\n";
* @param {Array<Object>} documents - Array of Drive API documents
* @param {string} baseUrl - Base URL for the adapter
* @returns {string} Complete XML sitemap
*/
function generateSitemap(documents, baseUrl) {
const entries = transformDocumentsToSitemapEntries(documents, baseUrl);
return generateSitemapXML(entries);
} }
// ============================================================================= xml += "</urlset>";
// Route Parsing
// =============================================================================
/** return xml;
* Parse route from request }
* @param {string} method - HTTP method
* @param {string} url - Request URL
* @returns {Object} Route info or error
*/
function parseRoute(method, url) {
if (method !== "GET") {
return { route: null, error: "Method not allowed", statusCode: 405 };
}
const urlObj = new URL(url, "http://localhost"); /**
const path = urlObj.pathname; * Main sitemap generation function
*
* Combines document transformation and XML generation.
*
* @param {Array<Object>} documents - Array of Drive API documents
* @param {string} baseUrl - Base URL for the adapter
* @returns {string} Complete XML sitemap
*/
function generateSitemap(documents, baseUrl) {
const entries = transformDocumentsToSitemapEntries(documents, baseUrl);
return generateSitemapXML(entries);
}
// Match any path containing 'sitemap.xml' // =============================================================================
if (path.includes("sitemap.xml")) { // Route Parsing
return { route: "sitemap" }; // =============================================================================
}
// All other paths return 404 /**
return { route: null, error: "Not found", statusCode: 404 }; * Parse route from request
* @param {string} method - HTTP method
* @param {string} url - Request URL
* @returns {Object} Route info or error
*/
function parseRoute(method, url) {
if (method !== "GET") {
return { route: null, error: "Method not allowed", statusCode: 405 };
} }
// =============================================================================
// Return helpers object with all functions
// =============================================================================
return { const urlObj = new URL(url, "http://localhost");
// Error classes const path = urlObj.pathname;
DocumentCountExceededError,
// Utilities // Match any path containing 'sitemap.xml'
generateRequestId, if (path.includes("sitemap.xml")) {
validateDocumentId, return { route: "sitemap" };
validateDocumentCount, }
// XML // All other paths return 404
escapeXml, return { route: null, error: "Not found", statusCode: 404 };
}
// Error mapping // =============================================================================
mapDriveErrorToHttp, // Return helpers object with all functions
// =============================================================================
// Sitemap ({
toSitemapEntry, // Error classes
transformDocumentsToSitemapEntries, DocumentCountExceededError,
generateSitemapXML,
generateSitemap,
// Routing // Utilities
parseRoute, generateRequestId,
}; validateDocumentId,
})(); validateDocumentCount,
// XML
escapeXml,
// Error mapping
mapDriveErrorToHttp,
// Sitemap
toSitemapEntry,
transformDocumentsToSitemapEntries,
generateSitemapXML,
generateSitemap,
// Routing
parseRoute,
});