From 8fefe488d1bf87b468f1cbf817196a3e27fead38 Mon Sep 17 00:00:00 2001
From: Quentin Goinaud <quentin.goinaud@gmail.com>
Date: Mon, 29 Jul 2024 09:28:45 +0200
Subject: [PATCH] add disabled nodes support prevent error throwing on c3
 export fix hardcoded zip folder for electron

---
 forge.config.ts                               |  5 +--
 index.html                                    |  5 +--
 package.json                                  |  8 ++---
 src/constants.ts                              | 30 ++++++++++++++++++
 src/main/utils.ts                             |  7 +++--
 src/renderer/components/AddNodeButton.vue     | 30 ++++++++++++------
 .../components/nodes/EditorNodeAction.vue     |  2 +-
 .../components/nodes/EditorNodeCondition.vue  |  3 +-
 .../components/nodes/EditorNodeEvent.vue      |  2 +-
 .../components/nodes/EditorNodeLoop.vue       |  3 +-
 src/renderer/components/nodes/ParamEditor.vue |  6 ++--
 src/renderer/store/app.ts                     |  2 +-
 src/renderer/store/editor.ts                  | 16 +++++-----
 .../libs/plugin-construct/assets/script.ts    | 30 ++++++++++++------
 .../libs/plugin-construct/export-c3p.ts       |  4 +--
 .../libs/plugin-construct/export-project.ts   |  4 +--
 src/shared/libs/plugin-core/cyn.ts            |  8 ++++-
 src/shared/libs/plugin-electron/index.ts      |  3 ++
 src/shared/libs/plugin-electron/make.ts       |  8 +++--
 src/shared/libs/plugin-electron/package.ts    | 17 +++++++---
 src/shared/libs/plugin-itch/export.ts         |  2 +-
 .../libs/plugin-steam/upload-to-steam.ts      |  2 +-
 tests/e2e/tests/basic.spec.ts                 | 31 +++++--------------
 23 files changed, 145 insertions(+), 83 deletions(-)
 create mode 100644 src/constants.ts

diff --git a/forge.config.ts b/forge.config.ts
index 755ab55..442dd0d 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -4,6 +4,7 @@ import { MakerZIP } from '@electron-forge/maker-zip'
 import { VitePlugin } from '@electron-forge/plugin-vite'
 import { FusesPlugin } from '@electron-forge/plugin-fuses'
 import { FuseV1Options, FuseVersion } from '@electron/fuses'
+import { name } from './src/constants'
 
 const config: ForgeConfig = {
   packagerConfig: {
@@ -12,12 +13,12 @@ const config: ForgeConfig = {
     },
     // asar: false,
     extraResource: ['.vite/build/assets'],
-    name: "Cyn"
+    name
   },
   rebuildConfig: {},
   makers: [
     new MakerSquirrel({
-      name: "Cyn"
+      name
     }),
     new MakerZIP({}, ['darwin', 'linux', 'win32']),
   ],
diff --git a/index.html b/index.html
index 86eea4e..065d3e2 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,8 @@
     />
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Bricolage+Grotesque:opsz,wght@12..96,200..800&display=swap" rel="stylesheet">
+    <!-- <link href="https://fonts.googleapis.com/css2?family=Bricolage+Grotesque:opsz,wght@12..96,200..800&display=swap" rel="stylesheet"> -->
+    <link href="https://fonts.googleapis.com/css2?family=Jost:ital,wght@0,100..900;1,100..900&family=Montserrat:wght@100&display=swap" rel="stylesheet">
     <style>
       html, body, #app {
         border: none;
@@ -27,7 +28,7 @@
       }
 
       html {
-        font-family: "Bricolage Grotesque", sans-serif !important;
+        font-family: "Jost", sans-serif !important;
         font-optical-sizing: auto;
         font-weight: normal;
         font-style: normal;
diff --git a/package.json b/package.json
index cf17da9..a1bb0c4 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
   "scripts": {
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts,.vue --fix",
-    "type-check:node": "tsc --noEmit -p tsconfig.json --composite false",
-    "type-check:web": "vue-tsc --noEmit -p tsconfig.json --composite false",
-    "type-check": "npm run type-check:node && npm run type-check:web",
+    "typecheck:node": "tsc --noEmit -p tsconfig.json --composite false",
+    "typecheck:web": "vue-tsc --noEmit -p tsconfig.json --composite false",
+    "typecheck": "npm run typecheck:node && npm run typecheck:web",
     "start": "electron-forge start",
     "start:args": "electron-forge start -- --project ./tests/e2e/fixtures/folder-to-electron.json --action run",
     "dev": "pnpm start",
@@ -24,7 +24,7 @@
     "test:e2e:raw": "vitest run -c tests/e2e/vitest.config.ts",
     "test:e2e:local": "pnpm package && pnpm test:e2e:raw",
     "test:e2e:pw": "echo 1",
-    "build": "npm run type-check && electron-vite build",
+    "build": "npm run typecheck && electron-vite build",
     "build:no-check": "electron-vite build",
     "build:win": "npm run build:no-check && electron-builder --win --config",
     "build:mac": "npm run build:no-check && electron-builder --mac --config",
diff --git a/src/constants.ts b/src/constants.ts
new file mode 100644
index 0000000..de03233
--- /dev/null
+++ b/src/constants.ts
@@ -0,0 +1,30 @@
+export const name = 'Cyn'
+
+export const outFolderName = (platform: NodeJS.Platform, arch: NodeJS.Architecture) => {
+  let platformName = ''
+  let archName = ''
+
+  if (platform === 'linux') {
+    platformName = 'linux'
+  } else if (platform === 'win32') {
+    platformName = 'win32'
+  } else if (platform === 'darwin') {
+    platformName = 'darwin'
+  } else {
+    throw new Error('Unsupported platform')
+  }
+
+  if (arch === 'x64') {
+    archName = 'x64'
+  } else if (arch === 'arm') {
+    archName = 'arm'
+  } else if (arch === 'arm64') {
+    archName = 'arm64'
+  } else if (arch === 'ia32') {
+    archName = 'ia32'
+  } else {
+    throw new Error('Unsupported architecture')
+  }
+
+  return `${name}-${platformName}-${archName}`
+}
diff --git a/src/main/utils.ts b/src/main/utils.ts
index 92d7800..e1f2915 100644
--- a/src/main/utils.ts
+++ b/src/main/utils.ts
@@ -16,8 +16,11 @@ export const getFinalPlugins = () => {
 
     // send without runner
     for (const element of plugin.nodes) {
-      const { node } = element
-      finalNodes.push(node)
+      const { node, disabled } = element
+      finalNodes.push({
+        node,
+        disabled,
+      })
     }
 
     finalPlugins.push({
diff --git a/src/renderer/components/AddNodeButton.vue b/src/renderer/components/AddNodeButton.vue
index 30a2ff1..48d4bec 100644
--- a/src/renderer/components/AddNodeButton.vue
+++ b/src/renderer/components/AddNodeButton.vue
@@ -41,21 +41,23 @@
               </li>
               <li
                 v-for="node in plugin.nodes"
-                :key="node.id"
-                class="flex"
-                @click="selected = { nodeId: node.id, pluginId: plugin.id }"
+                :key="node.node.id"
+                class="flex node-item"
+                @click="selected = { nodeId: node.node.id, pluginId: plugin.id }"
+                :disabled="node.disabled"
               >
                 <a
                   class="element flex align-items-center p-3 border-round w-full transition-colors transition-duration-150 cursor-pointer"
                   style="border-radius: '10px'"
                   :class="{
-                    selected: selected?.nodeId === node.id && selected.pluginId === plugin.id
+                    selected: selected?.nodeId === node.node.id && selected.pluginId === plugin.id
                   }"
                 >
                   <i class="pi pi-home text-xl mr-3"></i>
                   <span class="flex flex-column">
-                    <span class="font-bold mb-1"> {{ node.name }}</span>
-                    <span class="m-0 text-secondary"> {{ node.description }}</span>
+                    <span class="font-bold mb-1"> {{ node.node.name }}</span>
+                    <span class="m-0 text-secondary"> {{ node.node.description }}</span>
+                    <span class="m-0 text-secondary font-bold" v-if="typeof node.disabled === 'string'">{{ node.disabled }}</span>
                   </span>
                 </a>
               </li>
@@ -163,7 +165,7 @@ const onAdd = () => {
   const insertAt = Number.parseInt(path.value.pop() ?? '0') + 1
 
   instance.addNode({
-    node,
+    node: node.node,
     plugin: def,
     path: path.value,
     insertAt
@@ -188,6 +190,7 @@ const isNodePicked = (node: CynNode, searchedValue: string) => {
 
 // TODO: refactor
 const searchedElements = computed(() => {
+  console.log('pluginDefinitions', pluginDefinitions.value)
   const searchedValue = search.value.toLowerCase()
 
   return pluginDefinitions.value
@@ -195,7 +198,7 @@ const searchedElements = computed(() => {
       const description = def.description.toLowerCase()
       const name = def.name.toLowerCase()
 
-      const someNodeMatch = def.nodes.some((node) => isNodePicked(node, searchedValue))
+      const someNodeMatch = def.nodes.some((node) => isNodePicked(node.node, searchedValue))
 
       if (description.includes(searchedValue) || name.includes(searchedValue) || someNodeMatch) {
         return true
@@ -205,7 +208,7 @@ const searchedElements = computed(() => {
     .map((def) => {
       return {
         ...def,
-        nodes: def.nodes.filter((node) => isNodePicked(node, searchedValue))
+        nodes: def.nodes.filter((node) => isNodePicked(node.node, searchedValue))
       }
     })
 })
@@ -251,6 +254,15 @@ const searchedElements = computed(() => {
 
   .node {
     flex: 1;
+
+    .node-item {
+      cursor: pointer;
+
+      &[disabled] {
+        pointer-events: none;
+        color: grey;
+      }
+    }
   }
 }
 
diff --git a/src/renderer/components/nodes/EditorNodeAction.vue b/src/renderer/components/nodes/EditorNodeAction.vue
index 5160966..3b5140e 100644
--- a/src/renderer/components/nodes/EditorNodeAction.vue
+++ b/src/renderer/components/nodes/EditorNodeAction.vue
@@ -99,7 +99,7 @@ const { getNodeDefinition, setBlockValue, addNode, getPluginDefinition, removeNo
 const { activeNode } = storeToRefs(editor)
 
 const nodeDefinition = computed(() => {
-  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId) as Action
+  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId).node as Action
 })
 
 const pluginDefinition = computed(() => {
diff --git a/src/renderer/components/nodes/EditorNodeCondition.vue b/src/renderer/components/nodes/EditorNodeCondition.vue
index a1435c1..6aa5d66 100644
--- a/src/renderer/components/nodes/EditorNodeCondition.vue
+++ b/src/renderer/components/nodes/EditorNodeCondition.vue
@@ -131,6 +131,7 @@ const { activeNode } = storeToRefs(editor)
 const onValueChanged = (newValue: unknown, paramKey: string) => {
   console.log('newValue', newValue)
 
+  // @ts-expect-error
   setBlockValue(value.value.uid, {
     ...value.value,
     params: {
@@ -141,7 +142,7 @@ const onValueChanged = (newValue: unknown, paramKey: string) => {
 }
 
 const nodeDefinition = computed(() => {
-  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId) as Condition
+  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId).node as Condition
 })
 
 const pluginDefinition = computed(() => {
diff --git a/src/renderer/components/nodes/EditorNodeEvent.vue b/src/renderer/components/nodes/EditorNodeEvent.vue
index 98db774..7d995b8 100644
--- a/src/renderer/components/nodes/EditorNodeEvent.vue
+++ b/src/renderer/components/nodes/EditorNodeEvent.vue
@@ -95,7 +95,7 @@ const { getNodeDefinition, getPluginDefinition, setTriggerValue, addNode, remove
 const { activeNode } = storeToRefs(editor)
 
 const nodeDefinition = computed(() => {
-  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId) as Event
+  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId).node as Event
 })
 
 const pluginDefinition = computed(() => {
diff --git a/src/renderer/components/nodes/EditorNodeLoop.vue b/src/renderer/components/nodes/EditorNodeLoop.vue
index feb887b..3cf2f19 100644
--- a/src/renderer/components/nodes/EditorNodeLoop.vue
+++ b/src/renderer/components/nodes/EditorNodeLoop.vue
@@ -119,7 +119,7 @@ const { activeNode } = storeToRefs(editor)
 const showSidebar = ref(false)
 
 const nodeDefinition = computed(() => {
-  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId) as Loop
+  return getNodeDefinition(value.value.origin.nodeId, value.value.origin.pluginId).node as Loop
 })
 
 const pluginDefinition = computed(() => {
@@ -144,6 +144,7 @@ const subtitle = computedAsync(
 const onValueChanged = (newValue: unknown, paramKey: string) => {
   console.log('newValue', newValue)
 
+  // @ts-expect-error
   setBlockValue(value.value.uid, {
     ...value.value,
     params: {
diff --git a/src/renderer/components/nodes/ParamEditor.vue b/src/renderer/components/nodes/ParamEditor.vue
index c1400e4..cb09a34 100644
--- a/src/renderer/components/nodes/ParamEditor.vue
+++ b/src/renderer/components/nodes/ParamEditor.vue
@@ -369,7 +369,7 @@ const getOutputLabel = (stepUid: string, key: string) => {
   const nodeOrigin = nodes.value.find((n) => n.uid === stepUid)?.origin
   console.log('nodeOrigin', nodeOrigin)
   if (nodeOrigin) {
-    const nodeDef = getNodeDefinition(nodeOrigin.nodeId, nodeOrigin.pluginId) as Action
+    const nodeDef = getNodeDefinition(nodeOrigin.nodeId, nodeOrigin.pluginId).node as Action
     if (nodeDef) {
       return nodeDef.outputs[key]?.label ?? key
     }
@@ -382,7 +382,7 @@ const getOutputDescription = (stepUid: string, key: string) => {
   const nodeOrigin = nodes.value.find((n) => n.uid === stepUid)?.origin
   console.log('nodeOrigin', nodeOrigin)
   if (nodeOrigin) {
-    const nodeDef = getNodeDefinition(nodeOrigin.nodeId, nodeOrigin.pluginId) as Action
+    const nodeDef = getNodeDefinition(nodeOrigin.nodeId, nodeOrigin.pluginId).node as Action
     if (nodeDef) {
       return nodeDef.outputs[key]?.description ?? key
     }
@@ -396,7 +396,7 @@ const getStepLabel = (key: string) => {
   if (nodeOrigin) {
     const nodeDef = getNodeDefinition(nodeOrigin.nodeId, nodeOrigin.pluginId)
     if (nodeDef) {
-      return nodeDef.name
+      return nodeDef.node.name
     }
     return key
   }
diff --git a/src/renderer/store/app.ts b/src/renderer/store/app.ts
index 08fe67b..aaab11c 100644
--- a/src/renderer/store/app.ts
+++ b/src/renderer/store/app.ts
@@ -43,7 +43,7 @@ export const useAppStore = defineStore('app', () => {
     // const getNodeDefinition = <T extends Block>(node: T extends Block ? T : never) => {
     const plugin = getPluginDefinition(pluginId)
     if (plugin) {
-      return plugin.nodes.find((pluginNode) => pluginNode.id === nodeId)
+      return plugin.nodes.find((pluginNode) => pluginNode.node.id === nodeId)
     }
     return undefined
   }
diff --git a/src/renderer/store/editor.ts b/src/renderer/store/editor.ts
index e4d4b16..52a5667 100644
--- a/src/renderer/store/editor.ts
+++ b/src/renderer/store/editor.ts
@@ -11,7 +11,7 @@ import {
   Steps
 } from '@@/model'
 import { useAPI } from '@renderer/composables/api'
-import { Action, Condition, RendererPluginDefinition, Event, Loop, CynNode, InputDefinition } from '@cyn/plugin-core'
+import { Action, Condition, RendererPluginDefinition, Event, Loop, CynNode, InputDefinition, RendererNodeDefinition } from '@cyn/plugin-core'
 import { Variable } from '@cyn/core'
 import { defineStore, storeToRefs } from 'pinia'
 import get from 'get-value'
@@ -154,12 +154,12 @@ export const useEditor = defineStore('editor', () => {
       }
 
       if (pluginDef) {
-        if (pluginDef.type === 'action') {
-          const outputs = pluginDef.outputs
+        if (pluginDef.node.type === 'action') {
+          const outputs = pluginDef.node.outputs
 
           for (const [key, output] of Object.entries(outputs)) {
             console.log('output', outputs)
-            result[node.uid]['outputs'][key] = `<div class="step">${pluginDef.name} → ${output.label}</div>`
+            result[node.uid]['outputs'][key] = `<div class="step">${pluginDef.node.name} → ${output.label}</div>`
           }
         }
       }
@@ -182,7 +182,7 @@ export const useEditor = defineStore('editor', () => {
           plugin: x.id
         }))
       )
-      .flat(3) satisfies CynNode[]
+      .flat(3) satisfies RendererNodeDefinition[]
   })
 
   const clear = () => {
@@ -213,7 +213,7 @@ export const useEditor = defineStore('editor', () => {
     const errors: ValidationError[] = []
     if (block.type === 'action') {
       const definition = getNodeDefinition(block.origin.nodeId, block.origin.pluginId)
-      const requiredParams = Object.entries(definition?.params ?? {})
+      const requiredParams = Object.entries(definition.node?.params ?? {})
       for (const [key, param] of requiredParams) {
         if (isRequired(param) && !(key in block.params)) {
           console.warn(`Missing required param "${key}" in node "${block.uid}"`)
@@ -356,7 +356,7 @@ export const useEditor = defineStore('editor', () => {
           params: {}
         }
         addNodeToBlock(node, path, insertAt)
-      } else if (isConditionDefinition(nodeDefinition)) {
+      } /* else if (isConditionDefinition(nodeDefinition)) {
         const node: BlockCondition = {
           uid: nanoid(),
           type: nodeDefinition.type,
@@ -381,7 +381,7 @@ export const useEditor = defineStore('editor', () => {
           children: []
         }
         addNodeToBlock(node, path, insertAt)
-      } else {
+      } */ else {
         console.error('Unhandled', nodeDefinition)
       }
     }
diff --git a/src/shared/libs/plugin-construct/assets/script.ts b/src/shared/libs/plugin-construct/assets/script.ts
index 360cb96..c1f123b 100644
--- a/src/shared/libs/plugin-construct/assets/script.ts
+++ b/src/shared/libs/plugin-construct/assets/script.ts
@@ -37,21 +37,31 @@ export const script = async (
   // as soon as it appear, without blocking flow
   // ignore asking for update
   const notNowBtn = page.getByText('Not now')
-  notNowBtn.waitFor().then(async () => {
-    notNowBtn.click()
-  })
+  notNowBtn
+    .waitFor()
+    .then(async () => {
+      notNowBtn.click()
+    })
+    .catch(async () => {
+      console.log('notNowBtn.click() failed')
+    })
 
   // as soon as it appear, without blocking flow
   // ignore webgl error
   const okDialog = page.locator('#okDialog')
   const webglErrorButton = okDialog.locator('.okButton')
-  webglErrorButton.waitFor().then(async () => {
-    const text = await okDialog.allInnerTexts()
-
-    if (text.join().toLowerCase().includes('webgl')) {
-      webglErrorButton.click()
-    }
-  })
+  webglErrorButton
+    .waitFor()
+    .then(async () => {
+      const text = await okDialog.allInnerTexts()
+
+      if (text.join().toLowerCase().includes('webgl')) {
+        webglErrorButton.click()
+      }
+    })
+    .catch(async () => {
+      console.log('webglErrorButton.click() failed')
+    })
 
   if (username && password) {
     log('Authenticating')
diff --git a/src/shared/libs/plugin-construct/export-c3p.ts b/src/shared/libs/plugin-construct/export-c3p.ts
index c4e5d70..73e0a84 100644
--- a/src/shared/libs/plugin-construct/export-c3p.ts
+++ b/src/shared/libs/plugin-construct/export-c3p.ts
@@ -27,9 +27,9 @@ export const exportAction = createAction({
   },
   outputs: {
     folder: {
-      type: 'data',
+      type: 'path',
       value: undefined as undefined | string,
-      label: 'Folder'
+      label: 'Exported zip'
       // schema: schema.string()
     }
   },
diff --git a/src/shared/libs/plugin-construct/export-project.ts b/src/shared/libs/plugin-construct/export-project.ts
index 88c0a78..bc03d37 100644
--- a/src/shared/libs/plugin-construct/export-project.ts
+++ b/src/shared/libs/plugin-construct/export-project.ts
@@ -28,9 +28,9 @@ export const exportProjectAction = createAction({
   },
   outputs: {
     folder: {
-      type: "data",
+      type: "path",
       value: undefined as undefined | string,
-      label: "Folder",
+      label: "Exported zip",
       // schema: schema.string()
     },
   },
diff --git a/src/shared/libs/plugin-core/cyn.ts b/src/shared/libs/plugin-core/cyn.ts
index 684ff2f..7c5012b 100644
--- a/src/shared/libs/plugin-core/cyn.ts
+++ b/src/shared/libs/plugin-core/cyn.ts
@@ -280,14 +280,20 @@ export interface PluginDefinition {
   description: string;
 }
 
+export type RendererNodeDefinition = {
+  node: CynNode;
+  disabled: boolean | string;
+}
+
 export interface RendererPluginDefinition extends PluginDefinition {
-  nodes: Array<CynNode>;
+  nodes: Array<RendererNodeDefinition>;
 }
 
 export interface MainPluginDefinition extends PluginDefinition {
   nodes: {
     node: CynNode;
     runner: Runner;
+    disabled?: boolean | string
   }[];
 }
 
diff --git a/src/shared/libs/plugin-electron/index.ts b/src/shared/libs/plugin-electron/index.ts
index 4651f55..c4441cf 100644
--- a/src/shared/libs/plugin-electron/index.ts
+++ b/src/shared/libs/plugin-electron/index.ts
@@ -4,6 +4,8 @@ import { packageApp, packageRunner } from './package.js'
 import { createNodeDefinition } from '@cyn/plugin-core'
 import icon from './public/electron.webp'
 
+import { platform } from 'process'
+
 export default createNodeDefinition({
   description: "Electron",
   name: "Electron",
@@ -17,6 +19,7 @@ export default createNodeDefinition({
     {
       node: make,
       runner: makeRunner,
+      // disabled: platform === 'linux' ? 'Electron is not supported on Linux' : undefined
     },
     // package
     {
diff --git a/src/shared/libs/plugin-electron/make.ts b/src/shared/libs/plugin-electron/make.ts
index 24de493..7d37115 100644
--- a/src/shared/libs/plugin-electron/make.ts
+++ b/src/shared/libs/plugin-electron/make.ts
@@ -77,7 +77,7 @@ export const make = createAction({
     },
     'input-folder': {
       value: '',
-      label: 'Input folder',
+      label: 'Folder to package',
       control: {
         type: 'path',
         options: {
@@ -108,6 +108,7 @@ export const makeRunner = createActionRunner<typeof make>(
 
     const { join, dirname, basename, sep, delimiter } = await import('node:path')
     const { cp } = await import('node:fs/promises')
+    const { arch, platform } = await import('process')
     const { fileURLToPath } = await import('url')
     // @ts-expect-error
     const __dirname = fileURLToPath(dirname(import.meta.url))
@@ -227,9 +228,12 @@ export const makeRunner = createActionRunner<typeof make>(
       //   skipPackage: false,
       // });
 
+      const finalPlatform = inputs.platform ?? platform ?? ''
+      const finalArch = inputs.arch ?? arch ?? ''
+
       const logs = await runWithLiveLogs(
         process.execPath,
-        [forge, 'make', '--', '--arch', inputs.arch ?? '', '--platform', inputs.platform ?? ''],
+        [forge, 'make', '--', '--arch', finalArch, '--platform', finalPlatform],
         {
           cwd: destinationFolder,
           env: {
diff --git a/src/shared/libs/plugin-electron/package.ts b/src/shared/libs/plugin-electron/package.ts
index 297a76e..9596830 100644
--- a/src/shared/libs/plugin-electron/package.ts
+++ b/src/shared/libs/plugin-electron/package.ts
@@ -1,5 +1,6 @@
 import { createAction, createActionRunner, runWithLiveLogs } from '@cyn/plugin-core'
 import type { MakeOptions } from '@electron-forge/core'
+import { outFolderName } from '../../../constants'
 
 // TODO: https://js.electronforge.io/modules/_electron_forge_core.html
 
@@ -15,7 +16,7 @@ export const packageApp = createAction({
   meta: {},
   params: {
     arch: {
-      value: '' as MakeOptions['arch'],
+      value: '' as NodeJS.Architecture, // MakeOptions['arch'],
       label: 'Architecture',
       required: false,
       control: {
@@ -52,7 +53,7 @@ export const packageApp = createAction({
       }
     },
     platform: {
-      value: '' as MakeOptions['platform'],
+      value: '' as NodeJS.Platform, // MakeOptions['platform'],
       label: 'Platform',
       required: false,
       control: {
@@ -78,7 +79,7 @@ export const packageApp = createAction({
     },
     'input-folder': {
       value: '',
-      label: 'Input folder',
+      label: 'Folder to package',
       control: {
         type: 'path',
         options: {
@@ -109,6 +110,7 @@ export const packageRunner = createActionRunner<typeof packageApp>(
 
     const { join, dirname, basename, sep, delimiter } = await import('node:path')
     const { cp } = await import('node:fs/promises')
+    const { platform, arch } = await import('process')
     const { fileURLToPath } = await import('url')
     // @ts-expect-error
     const __dirname = fileURLToPath(dirname(import.meta.url))
@@ -228,9 +230,12 @@ export const packageRunner = createActionRunner<typeof packageApp>(
       //   skipPackage: false,
       // });
 
+      const finalPlatform = inputs.platform ?? platform
+      const finalArch = inputs.arch ?? arch
+
       const logs = await runWithLiveLogs(
         process.execPath,
-        [forge, 'package', '--', '--arch', inputs.arch ?? '', '--platform', inputs.platform ?? ''],
+        [forge, 'package', '--', '--arch', finalArch, '--platform', finalPlatform],
         {
           cwd: destinationFolder,
           env: {
@@ -245,7 +250,9 @@ export const packageRunner = createActionRunner<typeof packageApp>(
 
       console.log('logs', logs)
 
-      setOutput('output', join(destinationFolder, 'out', 'app-linux-x64'))
+      const outName = outFolderName(finalPlatform, finalArch)
+
+      setOutput('output', join(destinationFolder, 'out', outName))
     } catch (e) {
       if (e instanceof Error) {
         if (e.name === 'RequestError') {
diff --git a/src/shared/libs/plugin-itch/export.ts b/src/shared/libs/plugin-itch/export.ts
index 0a0dbbbb..6bbece1 100644
--- a/src/shared/libs/plugin-itch/export.ts
+++ b/src/shared/libs/plugin-itch/export.ts
@@ -11,7 +11,7 @@ export const uploadToItch = createAction({
   meta: {},
   params: {
     "input-folder": {
-      label: "Input Folder",
+      label: "Folder to Upload",
       value: '',
       control: {
         type: 'path',
diff --git a/src/shared/libs/plugin-steam/upload-to-steam.ts b/src/shared/libs/plugin-steam/upload-to-steam.ts
index 0f0e226..3b35c8b 100644
--- a/src/shared/libs/plugin-steam/upload-to-steam.ts
+++ b/src/shared/libs/plugin-steam/upload-to-steam.ts
@@ -55,7 +55,7 @@ export const uploadToSteam = createAction({
     },
     folder: {
       value: "",
-      label: "Input Folder",
+      label: "Folder to upload",
       control: {
         type: "path",
         options: {
diff --git a/tests/e2e/tests/basic.spec.ts b/tests/e2e/tests/basic.spec.ts
index b6d78fe..c5e7406 100644
--- a/tests/e2e/tests/basic.spec.ts
+++ b/tests/e2e/tests/basic.spec.ts
@@ -1,40 +1,23 @@
 import { it, expect, describe, vi } from 'vitest'
 import { execa } from 'execa'
 import { join } from 'path'
-import { tmpdir, platform, arch } from 'os'
+import { tmpdir } from 'os'
 import { nanoid } from 'nanoid'
 import { readFile } from 'fs/promises'
-
-export const getBinFolder = () => {
-  if (platform() === 'win32') {
-    if (arch() === 'x64') {
-      return 'Cyn-win32-x64'
-    }
-    throw new Error('Unsupported platform')
-  } else if (platform() === 'darwin') {
-    if (arch() === 'x64') {
-      return 'Cyn-darwin-x64'
-    }
-    throw new Error('Unsupported platform')
-  } else if (platform() === 'linux') {
-    if (arch() === 'x64') {
-      return 'Cyn-linux-x64'
-    }
-    throw new Error('Unsupported platform')
-  }
-}
+import { name, outFolderName } from 'src/constants'
+import { platform, arch } from 'process'
 
 const getBinName = () => {
-  if (platform() === 'win32') {
-    return 'Cyn.exe'
+  if (platform === 'win32') {
+    return `${name}.exe`
   }
-  return 'Cyn'
+  return name
 }
 
 const tmpLogFile = join(tmpdir(), nanoid() + 'cyn-app-test.log.json')
 const root = process.cwd()
 
-const binFolder = getBinFolder()
+const binFolder = outFolderName(platform, arch)
 const binName = getBinName()
 
 const bin = join(root, 'out', binFolder, binName)