@flowerforce/flowerbase 1.4.1 → 1.4.2-beta.0

package/dist/features/functions/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAoChD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAoJjC,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/features/functions/controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AA2ChD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,kBAwJjC,CAAA"}

package/dist/features/functions/controller.js

@@ -38,6 +38,14 @@ const formatFunctionExecutionError = (error) => {
     const name = typeof (err === null || err === void 0 ? void 0 : err.name) === 'string' ? err.name : 'Error';
     return JSON.stringify({ message, name });
 };
+const isReturnedError = (value) => {
+    if (value instanceof Error)
+        return true;
+    if (!value || typeof value !== 'object')
+        return false;
+    const candidate = value;
+    return typeof candidate.message === 'string' && typeof candidate.name === 'string';
+};
 /**
  * > Creates a pre handler for every query
  * @param app -> the fastify instance
@@ -96,6 +104,10 @@ const functionsController = (app_1, _a) => __awaiter(void 0, [app_1, _a], void 0
                 functionsList,
                 services: services_1.services
             });
+            if (isReturnedError(result)) {
+                res.type('application/json');
+                return JSON.stringify({ message: result.message, name: result.name });
+            }
             res.type('application/json');
             return JSON.stringify(result);
         }

package/dist/utils/context/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/context/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AA0GnD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,GAAG,EACH,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,WAAW,EACX,eAAsB,EACtB,OAAO,EACP,OAAO,EACR,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CA8J1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/context/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AA0GnD;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,GAAG,EACH,KAAK,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,WAAW,EACX,eAAsB,EACtB,OAAO,EACP,OAAO,EACR,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,CAuJ1C"}

package/dist/utils/context/index.js

@@ -157,78 +157,66 @@ function GenerateContext(_a) {
                 return (_e = getDefaultExport(moduleExports)) !== null && _e !== void 0 ? _e : getDefaultExport(contextExports);
             };
             const sandboxModule = { exports: {} };
-            try {
-                const entryFile = (_b = (_a = require.main) === null || _a === void 0 ? void 0 : _a.filename) !== null && _b !== void 0 ? _b : process.cwd();
-                const customRequire = (0, node_module_1.createRequire)(entryFile);
-                const vmContext = vm_1.default.createContext(Object.assign(Object.assign({}, contextData), { require: customRequire, exports: sandboxModule.exports, module: sandboxModule, __filename,
-                    __dirname, __fb_require: customRequire, __fb_filename: __filename, __fb_dirname: __dirname }));
-                const vmModules = vm_1.default;
-                const hasStaticImport = /\bimport\s+/.test(functionToRun.code);
-                let usedVmModules = false;
-                if (hasStaticImport && vmModules.SourceTextModule && vmModules.SyntheticModule) {
-                    try {
-                        const moduleCache = new Map();
-                        const loadModule = (specifier) => __awaiter(this, void 0, void 0, function* () {
-                            const importTarget = resolveImportTarget(specifier, customRequire);
-                            const cached = moduleCache.get(importTarget);
-                            if (cached)
-                                return cached;
-                            const namespace = yield dynamicImport(importTarget);
-                            const exportNames = Object.keys(namespace);
-                            if ('default' in namespace && !exportNames.includes('default')) {
-                                exportNames.push('default');
-                            }
-                            const syntheticModule = new vmModules.SyntheticModule(exportNames, function () {
-                                for (const name of exportNames) {
-                                    this.setExport(name, namespace[name]);
-                                }
-                            }, { context: vmContext, identifier: importTarget });
-                            moduleCache.set(importTarget, syntheticModule);
-                            return syntheticModule;
-                        });
-                        const importModuleDynamically = ((specifier) => loadModule(specifier));
-                        const sourceModule = new vmModules.SourceTextModule(wrapEsmModule(functionToRun.code), {
-                            context: vmContext,
-                            identifier: entryFile,
-                            initializeImportMeta: (meta) => {
-                                meta.url = (0, node_url_1.pathToFileURL)(entryFile).href;
-                            },
-                            importModuleDynamically
-                        });
-                        yield sourceModule.link(loadModule);
-                        yield sourceModule.evaluate();
-                        usedVmModules = true;
-                    }
-                    catch (error) {
-                        if (!shouldFallbackFromVmModules(error)) {
-                            throw error;
+            const entryFile = (_b = (_a = require.main) === null || _a === void 0 ? void 0 : _a.filename) !== null && _b !== void 0 ? _b : process.cwd();
+            const customRequire = (0, node_module_1.createRequire)(entryFile);
+            const vmContext = vm_1.default.createContext(Object.assign(Object.assign({}, contextData), { require: customRequire, exports: sandboxModule.exports, module: sandboxModule, __filename,
+                __dirname, __fb_require: customRequire, __fb_filename: __filename, __fb_dirname: __dirname }));
+            const vmModules = vm_1.default;
+            const hasStaticImport = /\bimport\s+/.test(functionToRun.code);
+            let usedVmModules = false;
+            if (hasStaticImport && vmModules.SourceTextModule && vmModules.SyntheticModule) {
+                try {
+                    const moduleCache = new Map();
+                    const loadModule = (specifier) => __awaiter(this, void 0, void 0, function* () {
+                        const importTarget = resolveImportTarget(specifier, customRequire);
+                        const cached = moduleCache.get(importTarget);
+                        if (cached)
+                            return cached;
+                        const namespace = yield dynamicImport(importTarget);
+                        const exportNames = Object.keys(namespace);
+                        if ('default' in namespace && !exportNames.includes('default')) {
+                            exportNames.push('default');
                         }
-                    }
+                        const syntheticModule = new vmModules.SyntheticModule(exportNames, function () {
+                            for (const name of exportNames) {
+                                this.setExport(name, namespace[name]);
+                            }
+                        }, { context: vmContext, identifier: importTarget });
+                        moduleCache.set(importTarget, syntheticModule);
+                        return syntheticModule;
+                    });
+                    const importModuleDynamically = ((specifier) => loadModule(specifier));
+                    const sourceModule = new vmModules.SourceTextModule(wrapEsmModule(functionToRun.code), {
+                        context: vmContext,
+                        identifier: entryFile,
+                        initializeImportMeta: (meta) => {
+                            meta.url = (0, node_url_1.pathToFileURL)(entryFile).href;
+                        },
+                        importModuleDynamically
+                    });
+                    yield sourceModule.link(loadModule);
+                    yield sourceModule.evaluate();
+                    usedVmModules = true;
                 }
-                if (!usedVmModules) {
-                    const codeToRun = functionToRun.code.includes('import ')
-                        ? transformImportsToRequire(functionToRun.code)
-                        : functionToRun.code;
-                    vm_1.default.runInContext(codeToRun, vmContext);
+                catch (error) {
+                    if (!shouldFallbackFromVmModules(error)) {
+                        throw error;
+                    }
                 }
-                sandboxModule.exports = (_c = resolveExport(vmContext)) !== null && _c !== void 0 ? _c : sandboxModule.exports;
             }
-            catch (error) {
-                console.error(error);
-                throw error;
+            if (!usedVmModules) {
+                const codeToRun = functionToRun.code.includes('import ')
+                    ? transformImportsToRequire(functionToRun.code)
+                    : functionToRun.code;
+                vm_1.default.runInContext(codeToRun, vmContext);
             }
+            sandboxModule.exports = (_c = resolveExport(vmContext)) !== null && _c !== void 0 ? _c : sandboxModule.exports;
             if (deserializeArgs) {
                 return yield sandboxModule.exports(...bson_1.EJSON.deserialize(args));
             }
             return yield sandboxModule.exports(...args);
         });
-        try {
-            const res = yield functionsQueue.add(run, enqueue);
-            return res;
-        }
-        catch (error) {
-            console.error(error);
-            throw error;
-        }
+        const res = yield functionsQueue.add(run, enqueue);
+        return res;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.4.1",
+  "version": "1.4.2-beta.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/features/functions/controller.ts

@@ -41,6 +41,13 @@ const formatFunctionExecutionError = (error: unknown) => {
   return JSON.stringify({ message, name })
 }
 
+const isReturnedError = (value: unknown): value is { message: string; name: string } => {
+  if (value instanceof Error) return true
+  if (!value || typeof value !== 'object') return false
+  const candidate = value as { message?: unknown; name?: unknown }
+  return typeof candidate.message === 'string' && typeof candidate.name === 'string'
+}
+
 /**
  * > Creates a pre handler for every query
  * @param app -> the fastify instance
@@ -122,6 +129,10 @@ export const functionsController: FunctionController = async (
         functionsList,
         services
       })
+      if (isReturnedError(result)) {
+        res.type('application/json')
+        return JSON.stringify({ message: result.message, name: result.name })
+      }
       res.type('application/json')
       return JSON.stringify(result)
     } catch (error) {

package/src/utils/context/index.ts

@@ -186,97 +186,93 @@ export async function GenerateContext({
 
     const sandboxModule: SandboxModule = { exports: {} }
 
-    try {
-      const entryFile = require.main?.filename ?? process.cwd()
-      const customRequire = createRequire(entryFile)
-
-      const vmContext: SandboxContext = vm.createContext({
-        ...contextData,
-        require: customRequire,
-        exports: sandboxModule.exports,
-        module: sandboxModule,
-        __filename,
-        __dirname,
-        __fb_require: customRequire,
-        __fb_filename: __filename,
-        __fb_dirname: __dirname
-      }) as SandboxContext
-
-      const vmModules = vm as typeof vm & {
-        SourceTextModule?: typeof vm.SourceTextModule
-        SyntheticModule?: typeof vm.SyntheticModule
-      }
-      const hasStaticImport = /\bimport\s+/.test(functionToRun.code)
-      let usedVmModules = false
-
-      if (hasStaticImport && vmModules.SourceTextModule && vmModules.SyntheticModule) {
-        try {
-          const moduleCache = new Map<string, vm.Module>()
-
-          const loadModule = async (specifier: string): Promise<vm.Module> => {
-            const importTarget = resolveImportTarget(specifier, customRequire)
-            const cached = moduleCache.get(importTarget)
-            if (cached) return cached
-
-            const namespace = await dynamicImport(importTarget)
-            const exportNames = Object.keys(namespace)
-            if ('default' in namespace && !exportNames.includes('default')) {
-              exportNames.push('default')
-            }
-
-            const syntheticModule = new vmModules.SyntheticModule(
-              exportNames,
-              function () {
-                for (const name of exportNames) {
-                  this.setExport(name, namespace[name])
-                }
-              },
-              { context: vmContext, identifier: importTarget }
-            )
-
-            moduleCache.set(importTarget, syntheticModule)
-            return syntheticModule
+    const entryFile = require.main?.filename ?? process.cwd()
+    const customRequire = createRequire(entryFile)
+
+    const vmContext: SandboxContext = vm.createContext({
+      ...contextData,
+      require: customRequire,
+      exports: sandboxModule.exports,
+      module: sandboxModule,
+      __filename,
+      __dirname,
+      __fb_require: customRequire,
+      __fb_filename: __filename,
+      __fb_dirname: __dirname
+    }) as SandboxContext
+
+    const vmModules = vm as typeof vm & {
+      SourceTextModule?: typeof vm.SourceTextModule
+      SyntheticModule?: typeof vm.SyntheticModule
+    }
+    const hasStaticImport = /\bimport\s+/.test(functionToRun.code)
+    let usedVmModules = false
+
+    if (hasStaticImport && vmModules.SourceTextModule && vmModules.SyntheticModule) {
+      try {
+        const moduleCache = new Map<string, vm.Module>()
+
+        const loadModule = async (specifier: string): Promise<vm.Module> => {
+          const importTarget = resolveImportTarget(specifier, customRequire)
+          const cached = moduleCache.get(importTarget)
+          if (cached) return cached
+
+          const namespace = await dynamicImport(importTarget)
+          const exportNames = Object.keys(namespace)
+          if ('default' in namespace && !exportNames.includes('default')) {
+            exportNames.push('default')
           }
 
-          const importModuleDynamically =
-            ((specifier: string) => loadModule(specifier) as unknown as vm.Module) as unknown as
-              vm.SourceTextModuleOptions['importModuleDynamically']
-
-          const sourceModule = new vmModules.SourceTextModule(
-            wrapEsmModule(functionToRun.code),
-            {
-              context: vmContext,
-              identifier: entryFile,
-              initializeImportMeta: (meta) => {
-                meta.url = pathToFileURL(entryFile).href
-              },
-              importModuleDynamically
-            }
+          const syntheticModule = new vmModules.SyntheticModule(
+            exportNames,
+            function () {
+              for (const name of exportNames) {
+                this.setExport(name, namespace[name])
+              }
+            },
+            { context: vmContext, identifier: importTarget }
           )
 
-          await sourceModule.link(loadModule)
-          await sourceModule.evaluate()
-          usedVmModules = true
-        } catch (error) {
-          if (!shouldFallbackFromVmModules(error)) {
-            throw error
-          }
+          moduleCache.set(importTarget, syntheticModule)
+          return syntheticModule
         }
-      }
 
-      if (!usedVmModules) {
-        const codeToRun = functionToRun.code.includes('import ')
-          ? transformImportsToRequire(functionToRun.code)
-          : functionToRun.code
-        vm.runInContext(codeToRun, vmContext)
+        const importModuleDynamically =
+          ((specifier: string) => loadModule(specifier) as unknown as vm.Module) as unknown as
+          vm.SourceTextModuleOptions['importModuleDynamically']
+
+        const sourceModule = new vmModules.SourceTextModule(
+          wrapEsmModule(functionToRun.code),
+          {
+            context: vmContext,
+            identifier: entryFile,
+            initializeImportMeta: (meta) => {
+              meta.url = pathToFileURL(entryFile).href
+            },
+            importModuleDynamically
+          }
+        )
+
+        await sourceModule.link(loadModule)
+        await sourceModule.evaluate()
+        usedVmModules = true
+      } catch (error) {
+        if (!shouldFallbackFromVmModules(error)) {
+          throw error
+        }
       }
+    }
 
-      sandboxModule.exports = resolveExport(vmContext) ?? sandboxModule.exports
-    } catch (error) {
-      console.error(error)
-      throw error
+    if (!usedVmModules) {
+      const codeToRun = functionToRun.code.includes('import ')
+        ? transformImportsToRequire(functionToRun.code)
+        : functionToRun.code
+      vm.runInContext(codeToRun, vmContext)
     }
 
+    sandboxModule.exports = resolveExport(vmContext) ?? sandboxModule.exports
+
+
     if (deserializeArgs) {
       return await (sandboxModule.exports as ExportedFunction)(
         ...EJSON.deserialize(args)
@@ -285,11 +281,8 @@ export async function GenerateContext({
 
     return await (sandboxModule.exports as ExportedFunction)(...args)
   }
-  try {
-    const res = await functionsQueue.add(run, enqueue)
-    return res
-  } catch (error) {
-    console.error(error)
-    throw error
-  }
+
+  const res = await functionsQueue.add(run, enqueue)
+  return res
+
 }