fix rust generation

server/routers/plugins.js

@@ -267,7 +267,8 @@ function addPluginToBuildQueue(folder, plugin, req, res, zipHash, release, saveI
                     pluginType: plugin.type,
                     metadata: opaMetadata ? opaMetadata : (metadata ? metadata : {}),
                     release,
-                    saveInLocal
+                    saveInLocal,
+                    pluginName
                   });
 
                   res.json({

server/routers/templates.js

@@ -17,8 +17,6 @@ router.get('/', (req, res) => {
     const { type } = req.query;
     const template = !req.query.template || req.query.template === 'undefined' ? 'empty' : req.query.template;
 
-    console.log(req.query, template)
-
     if (['rust', 'js', 'go', 'ts', 'opa'].includes(type)) {
       getTemplates(type, template, res);
     } else {

server/services/compiler/compiler.js

@@ -37,7 +37,8 @@ class BuildOptions {
     metadata,
     isReleaseBuild,
     wasi,
-    saveInLocal
+    saveInLocal,
+    pluginName
   }) {
     this.folderPath = folderPath;
     this.userEmail = userEmail;
@@ -50,6 +51,7 @@ class BuildOptions {
     this.isReleaseBuild = isReleaseBuild;
     this.wasi = wasi;
     this.saveInLocal = saveInLocal;
+    this.pluginName = pluginName;
   }
 }
 

server/services/compiler/rust.js

@@ -23,7 +23,7 @@ module.exports = options => new Compiler({
   name: 'RUST',
   options,
   commands: [
-    `cargo build --manifest-path ./Cargo.toml ${options.isReleaseBuild ? '--release ' : ''}--target ${options.wasi ? "wasm32-wasi" : "wasm32-unknown-unknown"}`
+    `cargo build --manifest-path ./Cargo.toml ${options.isReleaseBuild ? '--release ' : ''}--target ${options.wasi ? "wasm32-wasi" : "wasm32-unknown-unknown"}`,
   ],
   outputWasmFolder
 });

server/services/queue.js

@@ -52,7 +52,8 @@ const loop = () => {
       metadata: nextBuild.metadata,
       isReleaseBuild: nextBuild.release,
       wasi: nextBuild.metadata?.wasi,
-      saveInLocal: nextBuild.saveInLocal
+      saveInLocal: nextBuild.saveInLocal,
+      pluginName: nextBuild.pluginName
     }))
       .then(() => {
         WebSocket.emit(nextBuild.plugin, "JOB", "You can now use the generated wasm")

server/services/wasmgc.js

@@ -3,41 +3,54 @@ const fs = require('fs-extra');
 const p = require('path');
 
 function wasmgc(options, buildOptions, path, log) {
-  const outputFilepath = p.join(path.split("/").slice(0, -1).join("/"), options.wasmName);
+  let outputFilepath = p.join(path.split("/").slice(0, -1).join("/"), options.wasmName);
+
+  if (!outputFilepath.endsWith('.wasm'))
+    outputFilepath = `${outputFilepath}.wasm`
 
   const command = {
     executable: 'wasm-opt',
     args: ['-O', outputFilepath, '-o', outputFilepath]
   }
 
   return new Promise((resolve) => {
-    exec(`mv ${path} ${outputFilepath}`, () => {
-      getFileSize(outputFilepath)
-        .then(originalSize => {
-          log(`File size before optimizing: ${originalSize} bytes`)
-          log(`${command.executable} ${command.args.join(" ")}`);
-          exec(`${command.executable} ${command.args.join(" ")}`, (error, stdout, stderr) => {
-            if (error) {
-              log(error.message, true);
-              return resolve(outputFilepath);
-            }
-            if (stderr) {
-              log(stderr, true);
-              return resolve(outputFilepath);
-            }
-
-            getFileSize(outputFilepath)
-              .then(newSize => {
-                log(`File size after optimizing: ${newSize} bytes - ${(1 - (newSize / originalSize)) * 100}%`)
-
-                resolve(outputFilepath);
-              });
-          });
-        });
-    })
+    exec(`mv ${path} ${outputFilepath}`, (error) => {
+      if (error) {
+        exec(`mv ${p.join(path.split("/").slice(0, -1).join("/"), buildOptions.pluginName.replace('-', '_'))}.wasm ${outputFilepath}`, () => {
+          optimizeFile(outputFilepath, command, log, resolve)
+        })
+      } else {
+        optimizeFile(outputFilepath, command, log, resolve)
+      }
+    });
   });
 }
 
+function optimizeFile(outputFilepath, command, log, resolve) {
+  return getFileSize(outputFilepath)
+    .then(originalSize => {
+      log(`File size before optimizing: ${originalSize} bytes`)
+      log(`${command.executable} ${command.args.join(" ")}`);
+      exec(`${command.executable} ${command.args.join(" ")}`, (error, stdout, stderr) => {
+        if (error) {
+          log(error.message, true);
+          return resolve(outputFilepath);
+        }
+        if (stderr) {
+          log(stderr, true);
+          return resolve(outputFilepath);
+        }
+
+        getFileSize(outputFilepath)
+          .then(newSize => {
+            log(`File size after optimizing: ${newSize} bytes - ${(1 - (newSize / originalSize)) * 100}%`)
+
+            resolve(outputFilepath);
+          });
+      });
+    });
+}
+
 function getFileSize(path) {
   return new Promise(resolve => {
     fs.stat(path, (_, stats) => {

server/templates/izanami/opa/policies.rego

@@ -1,3 +1,7 @@
 package example
 
-default can_access = true
+default can_access = false
+
+can_access {
+    true
+}

server/utils.js

@@ -64,7 +64,6 @@ const unzipTo = (zipString, outputPaths) => {
             content
           )
         } catch (err) {
-          console.log(err)
           return Promise.reject(err)
         }
       }))

ui/src/App.js

@@ -31,21 +31,7 @@ class App extends React.Component {
     })
   }
 
-  // componentDidUpdate() {
-  //   const { selectedPlugin } = this.state;
-
-  //   const params = new URLSearchParams(window.location.search);
-  //   const pluginId = params.get('plugin');
-
-  //   if (selectedPlugin && selectedPlugin.pluginId !== pluginId) {
-  //     window.history.replaceState(null, "", '?plugin=' + selectedPlugin.pluginId);
-  //   } else if (!selectedPlugin) {
-  //     window.history.replaceState(null, null, '/');
-  //   }
-  // }
-
   updateSelectedPlugin = (newValue, callback) => {
-    console.log(newValue)
     if (newValue.selectedPlugin)
       this.props.navigate(`?pluginId=${newValue.selectedPlugin.pluginId}`)