diff --git a/src/globalVariables/googleDriveAdapterHelper.js b/src/globalVariables/googleDriveAdapterHelper.js index c706049..15126c9 100644 --- a/src/globalVariables/googleDriveAdapterHelper.js +++ b/src/globalVariables/googleDriveAdapterHelper.js @@ -5,8 +5,9 @@ * to improve code organization while maintaining vm.Script isolation pattern. * * ARCHITECTURE: - * - Loaded by server.js using vm.Script (same as proxy.js) - * - Returns a single object containing all helper functions + * - This file contains the LITERAL BODY of a function + * - server.js wraps this in a function: (function() { })() + * - Function returns a single object containing all helper functions * - Injected into globalVariableContext for access by proxy.js * - NO IMPORTS - All dependencies provided via VM context * @@ -286,27 +287,27 @@ return { route: null, error: "Not found", statusCode: 404 }; // Return helpers object with all functions // ============================================================================= -({ -// Error classes -DocumentCountExceededError, +return { + // Error classes + DocumentCountExceededError, -// Utilities -generateRequestId, -validateDocumentId, -validateDocumentCount, + // Utilities + generateRequestId, + validateDocumentId, + validateDocumentCount, -// XML -escapeXml, + // XML + escapeXml, -// Error mapping -mapDriveErrorToHttp, + // Error mapping + mapDriveErrorToHttp, -// Sitemap -toSitemapEntry, -transformDocumentsToSitemapEntries, -generateSitemapXML, -generateSitemap, + // Sitemap + toSitemapEntry, + transformDocumentsToSitemapEntries, + generateSitemapXML, + generateSitemap, -// Routing -parseRoute, -}); + // Routing + parseRoute, +}; diff --git a/src/server.js b/src/server.js index 6cbab1a..60f5958 100644 --- a/src/server.js +++ b/src/server.js @@ -54,7 +54,10 @@ function loadGlobalVariables() { jsFiles.forEach((file) => { const varName = file.replace(".js", ""); const code = readFileSync(join(globalDir, file), "utf-8"); - const script = new vm.Script(code, { filename: file }); + + // Wrap the literal function body in a function and execute + const wrappedCode = `(function() {\n${code}\n})()`; + const script = new vm.Script(wrappedCode, { filename: file }); const context = vm.createContext({ ...globalVMContext, ...globalVariableContext }); // Execute script and capture returned object