create-fuzionx 0.1.45 → 0.1.47

package/fx.js

@@ -49,10 +49,10 @@ if (existsSync(localBin) || existsSync(localCli)) {
   fx — FuzionX CLI
 
   프로젝트 생성:
-    fx new <name>                  새 프로젝트 스캐폴딩
+    fx new <name> --type=ssr|spa                 새 프로젝트 스캐폴딩
 
   프로젝트 내 명령어 (@fuzionx/framework 필요):
-    fx make:app --type=ssr|spa       Create app (fixed name: app/ssr or app/spa)
+    fx make:app --type=ssr|spa [--name=<appName>]  Create app
     fx make:controller <Name> --app=  Create controller (app-specific)
     fx make:service <Name> --app=     Create service (app-specific)
     fx make:model <Name>              Create model (database/models)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fuzionx",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "description": "Create a new FuzionX application — npx create-fuzionx my-app",
   "type": "module",
   "bin": {

package/templates/common/fuzionx.yaml.tpl

@@ -132,7 +132,7 @@ bridge:
 
   # ── ASP 암호화 ──
   asp:
-    enabled: true
+    enabled: false
     master_secret: "${ASP_SECRET:change-me-in-production}"
     header_signal: Ruxy-Enc-Mode
 
@@ -157,6 +157,8 @@ app:
   name: '{{name}}'
   environment: development                # development | production
 
+  # fuzionx 서버가 앞단이고 암/복호화를 하는 경우 bridge에서는 암/복호화를 하면 안된다. 이중 암/복호화가 된다. wasm이 암호화한 걸 이미 fuzionx가 서버가 복호화를 했기에 bridge에서는 결국 오류
+  # bridge.asp.enabled가 true이면 bridge 서버에서 패킷도 암/복호화를 하지만 아래 asp.enabled만 true인 경우에는 wasm에서만 암/복호화를 처리하게 해야 한다.
   asp:
     enabled: false
 

package/templates/common/package.json.tpl

@@ -9,8 +9,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@fuzionx/framework": "^0.1.45",
-    "@fuzionx/client": "^0.1.45",
+    "@fuzionx/framework": "^0.1.47",
+    "@fuzionx/client": "^0.1.47",
     "joi": "^18.1.1"
   },
   "devDependencies": {

package/templates/spa/controllers/HomeController.js

@@ -28,8 +28,7 @@ export default class HomeController extends Controller {
     const bridge = this.app._bridge;
 
     // ASP config에서 masterSecret 가져오기
-    const aspConfig = JSON.parse(bridge.getAspConfig());
-    const masterSecret = aspConfig.masterSecret || '';
+    const aspConfig = JSON.parse(bridge.getAspConfig());        
 
     // 세션에서 유저 조회 (인증 안 되어 있으면 null)
     let user = null;
@@ -50,17 +49,16 @@ export default class HomeController extends Controller {
       locales: this.app?.i18n?.locales?.() || [],
       translations: ctx.t.all(),
       isDev,
-      asp: { headerSignal: aspConfig.headerSignal || 'Ruxy-Enc-Mode' },
+      asp: { headerSignal: aspConfig.headerSignal || 'Ruxy-Enc-Mode', masterSecret: aspConfig.masterSecret },
       app: { name: this.config.get('app.name'), theme: this.config.get('app.themes.default') },
     };
 
     // 암호화 (bridge crypto_encrypt_custom — WASM decrypt_custom과 호환)
-    const encryptedPayload = bridge.cryptoEncryptCustom(clientSecret, JSON.stringify(payload));
-    const encryptedSecret = bridge.cryptoEncryptCustom(clientSecret, masterSecret);
-
+    const encryptedPayload = bridge.cryptoEncryptCustom(clientSecret, JSON.stringify(payload));    
+    
     ctx.render('home', {
-      __fx__: encryptedPayload,
-      __fx_secret__: encryptedSecret,
+      __fx__: encryptedPayload,      
+      __fx__enabled: aspConfig.enabled || this.config.get('app.asp').enabled,
       client_secret: clientSecret,
       isDev,
     });

package/templates/spa/meta.json

@@ -4,7 +4,7 @@
   "description": "Vue.js 3 SPA + Tera SSR 하이브리드. WASM 암호화 통신.",
   "features": ["auth", "board", "i18n", "asp", "wasm"],
   "dependencies": {
-    "@fuzionx/client": "^0.1.45"
+    "@fuzionx/client": "^0.1.47"
   },
   "devDependencies": {},
   "spaDevDependencies": {

package/templates/spa/views/default/pages/home.html

@@ -17,6 +17,6 @@
 <script>
   window.__FX_CLIENT_SECRET__ = "{{ client_secret | safe }}";
   window.__FX__ = "{{ __fx__ | safe }}";
-  window.__FX_SECRET__ = "{{ __fx_secret__ | safe }}";
+  window.__FX__ENC_ENABLED = {{ __fx__enabled | safe }}  
 </script>
 {% endblock %}

package/templates/spa/views/default/spa/src/composables/useApi.js

@@ -59,12 +59,12 @@ export function useApi() {
     // WASM client 메서드 사용 — 자동 ASP 암/복호화
     let res;
     switch (method) {
-      case 'GET':    res = _aspClient.get(url); break;
-      case 'POST':   res = _aspClient.post(url, bodyObj); break;
-      case 'PUT':    res = _aspClient.put(url, bodyObj); break;
-      case 'PATCH':  res = _aspClient.patch(url, bodyObj); break;
-      case 'DELETE': res = _aspClient.delete(url); break;
-      default:       res = _aspClient.get(url); break;
+      case 'GET':    res = _aspClient.get(url, window.__FX__ENC_ENABLED); break;
+      case 'POST':   res = _aspClient.post(url, bodyObj, window.__FX__ENC_ENABLED); break;
+      case 'PUT':    res = _aspClient.put(url, bodyObj, window.__FX__ENC_ENABLED); break;
+      case 'PATCH':  res = _aspClient.patch(url, bodyObj, window.__FX__ENC_ENABLED); break;
+      case 'DELETE': res = _aspClient.delete(url, window.__FX__ENC_ENABLED); break;
+      default:       res = _aspClient.get(url, window.__FX__ENC_ENABLED); break;
     }
 
     if (res.status === 401) {

package/templates/spa/views/default/spa/src/main.js

@@ -41,10 +41,8 @@ router.beforeEach((to) => {
 async function bootstrap() {
   const clientSecret = window.__FX_CLIENT_SECRET__;
   const encPayload = window.__FX__;
-  const encSecret = window.__FX_SECRET__;
-
-  let fxConfig = {};
   let masterSecret = '';
+  let fxConfig = {};  
 
   // WASM 초기화 Promise를 useApi에 등록 (aspFetch가 대기할 수 있도록)
   const wasmInit = (async () => {
@@ -58,7 +56,7 @@ async function bootstrap() {
     const configJson = client.decrypt_custom(clientSecret, encPayload);
     fxConfig = JSON.parse(configJson);
 
-    masterSecret = client.decrypt_custom(clientSecret, encSecret);
+    masterSecret = fxConfig.asp.masterSecret;    
 
     // ASP 활성 클라이언트
     const headerSignal = fxConfig.asp?.headerSignal || 'Ruxy-Enc-Mode';

package/templates/spa/views/default/spa/src/views/ChatView.vue

@@ -200,20 +200,10 @@ async function connectWS() {
 
   // masterSecret는 main.js에서 inject('masterSecret')로 제공됨
   const masterSecret = injectedMasterSecret || '';
-  const aspEnabled = !!masterSecret; // masterSecret이 있으면 ASP 활성
-
-  // 🔍 디버그 로그 — ASP 암호화 변수 확인
-  console.log('[Chat] ASP Debug:', {
-    masterSecret: masterSecret ? `${masterSecret.substring(0, 8)}...` : '(empty)',
-    aspEnabled,
-    fxConfigAsp: fxConfig.asp,
-    injectedMasterSecret: injectedMasterSecret ? `${injectedMasterSecret.substring(0, 8)}...` : '(empty)',
-    hasFuzionXSocket: !!window.FuzionXSocket,
-  });
-
-  ws = new window.FuzionXSocket(url, masterSecret, aspEnabled);
+  
+  ws = new window.FuzionXSocket(url, masterSecret, window.__FX_ENC_ENABLED__);
 
-  ws.on('connect', () => { setStatus('connected', aspEnabled ? 'connected (ASP 🔐)' : 'connected'); });
+  ws.on('connect', () => { setStatus('connected', window.__FX_ENC_ENABLED__ ? 'connected (ASP 🔐)' : 'connected'); });
 
   ws.on('message', (raw) => { console.log('[Chat] raw:', JSON.stringify(raw)); });
 

package/templates/ssr/public/js/fx-client.js

@@ -91,17 +91,17 @@
     }
 
     switch (method) {
-      case 'GET':    return window._aspClient.get(url);
-      case 'POST':   return window._aspClient.post(url, bodyObj);
-      case 'PUT':    return window._aspClient.put(url, bodyObj);
-      case 'PATCH':  return window._aspClient.patch(url, bodyObj);
-      case 'DELETE': return window._aspClient.delete(url);
-      default:       return window._aspClient.get(url);
+      case 'GET':    return window._aspClient.get(url, window.__FX__ENC_ENABLED);
+      case 'POST':   return window._aspClient.post(url, bodyObj, window.__FX__ENC_ENABLED);
+      case 'PUT':    return window._aspClient.put(url, bodyObj, window.__FX__ENC_ENABLED);
+      case 'PATCH':  return window._aspClient.patch(url, bodyObj, window.__FX__ENC_ENABLED);
+      case 'DELETE': return window._aspClient.delete(url, window.__FX__ENC_ENABLED);
+      default:       return window._aspClient.get(url, window.__FX__ENC_ENABLED);
     }
   };
 
   // 글로벌 노출
   window.FxClient = { init, initPublic };
-  window.aspEnabled = false;
+  window.aspEnabled = window.__FX__ENC_ENABLED;
   window._aspReady = Promise.resolve();
 })();

package/templates/ssr/views/default/layouts/main.html

@@ -11,6 +11,9 @@
   <link rel="stylesheet" href="/public/css/landing.css">
   <link rel="stylesheet" href="/public/css/fx-ui.css">
   {% block head %}{% endblock %}
+  <script>
+    window.__FX__ENC_ENABLED = {{ config.bridge.asp.enabled | default(value=false) }} || {{ config.app.asp.enabled | default(value=false) }}
+  </script>
 </head>
 <body>
   <div class="orb orb-1"></div>

package/templates/ssr/views/default/pages/chat.html

@@ -121,7 +121,7 @@ async function connectWS() {
     }
   }
 
-  ws = new window.FuzionXSocket(url, '{{ config.bridge.asp.master_secret | default(value="") }}', {{ config.bridge.asp.enabled | default(value="false") }});
+  ws = new window.FuzionXSocket(url, '{{ config.bridge.asp.master_secret | default(value="") }}', {{ config.bridge.asp.enabled | default(value="false") }} || {{ config.app.asp.enabled | default(value="false") }});
 
   ws.on('connect', () => {
     setStatus('connected', window.aspEnabled ? 'connected (ASP 🔐)' : 'connected');