@fugood/bricks-cli 2.25.0-beta.62 → 2.25.0-beta.64

package/lib/simulator-host-bridge.cjs

@@ -0,0 +1 @@
+const path=require("node:path"),AUTOMATION_SCREENSHOT_PROJECT_DIR=path.join(".bricks","automation_screenshots");function resolveAutomationScreenshotPath(t,e=""){let o=path.resolve(t,AUTOMATION_SCREENSHOT_PROJECT_DIR),r=String(e||AUTOMATION_SCREENSHOT_PROJECT_DIR),n=path.resolve(t,r),s=n===o||n.startsWith(`${o}${path.sep}`)?n:path.resolve(o,r);if(s!==o&&!s.startsWith(`${o}${path.sep}`))throw Error("Automation screenshot path must stay inside the project screenshot directory.");return s}function normalizeAutomationScreenshotEncoding(t){return"base64"===t?"base64":"utf8"}module.exports={AUTOMATION_SCREENSHOT_PROJECT_DIR,resolveAutomationScreenshotPath,normalizeAutomationScreenshotEncoding};

package/lib/simulator-main.mjs

@@ -1,4 +1,4 @@
-import{app as e,BrowserWindow as t,ipcMain as o}from"electron";import{mkdir as s,readdir as r,readFile as n,rm as a,writeFile as i}from"fs/promises";import{watchFile as l}from"fs";import{createServer as c}from"http";import p from"node:path";import{fileURLToPath as d}from"node:url";import{parseArgs as u}from"util";import*as w from"@toon-format/toon";for(let e of[process.stdout,process.stderr])e.on("error",e=>{if("EPIPE"!==e.code)throw e});let{values:h}=u({args:process.argv,options:{"clear-cache":{type:"boolean"},"take-screenshot":{type:"string"},"show-menu":{type:"boolean"},"test-id":{type:"string"},"test-title-like":{type:"string"},"no-keep-open":{type:"boolean"},"cdp-port":{type:"string"}},strict:!0,allowPositionals:!0}),m=process.cwd(),f=p.dirname(d(import.meta.url)),g=p.join(".bricks","automation_screenshots"),y=Object.freeze({allowedInsecureHosts:[]}),S=(e="")=>{let t=p.resolve(m,g),o=String(e||g),s=p.resolve(m,o),r=s===t||s.startsWith(`${t}${p.sep}`)?s:p.resolve(t,o);if(r!==t&&!r.startsWith(`${t}${p.sep}`))throw Error("Automation screenshot path must stay inside the project screenshot directory.");return r},b=e=>"base64"===e?"base64":"utf8",v=(e={})=>{let t=e&&"object"==typeof e&&!Array.isArray(e)?e:{};return{allowedInsecureHosts:(Array.isArray(t.allowedInsecureHosts)?t.allowedInsecureHosts:y.allowedInsecureHosts).filter(e=>"string"==typeof e).map(e=>e.trim().toLowerCase()).filter(Boolean)}},C=e=>{try{let t=new URL(String(e||""));if("http:"!==t.protocol&&"ws:"!==t.protocol)return null;return t.host.toLowerCase()}catch{return null}},k=async()=>{try{return v(JSON.parse(await n(`${m}/simulator.json`,"utf8")))}catch{return v()}},I=null;try{h["take-screenshot"]&&((I=JSON.parse(h["take-screenshot"])).path||(I.path=`${m}/screenshot.jpg`),I.width||(I.width=1280),I.height||(I.height=768),I.delay||(I.delay=1e3))}catch(e){console.error("Invalid take-screenshot config",e),process.exit(1)}let J=JSON.parse(await n(`${m}/.bricks/build/application-config.json`)),O=await k(),j=h["test-id"]||null;if(!j&&h["test-title-like"]){let e=h["test-title-like"].toLowerCase();for(let t of Object.values(J.automation_map||{})){let o=Object.entries(t.map||{}).find(([,t])=>t.title?.toLowerCase().includes(e));if(o){[j]=o;break}}if(!j)throw Error(`No automation found matching title: ${h["test-title-like"]}`)}let T=h["no-keep-open"]??!1,N=process.env.BRICKS_STAGE||"production",$={production:"https://control.bricks.tools/applicationPreview.html",beta:"https://control-beta.bricks.tools/applicationPreview.html",development:"http://localhost:3006/dev-applicationPreview.html"}[N];if(!$)throw Error(`Invalid BRICKS_STAGE: ${N}`);O=v({...O,allowedInsecureHosts:[...O.allowedInsecureHosts,C($)].filter(Boolean)});let E=async(e,t)=>{let{WebSocketServer:o}=await import("ws"),s=new Set;e.webContents.on("console-message",(e,...t)=>{let o="object"==typeof t[0]?t[0].message:t[1];if(o?.startsWith("[CDP]"))try{let e=JSON.parse(o.slice(5)),t="cdp-response"===e.type?{id:e.id,result:e.result,error:e.error}:{method:e.method,params:e.params};e.sessionId&&(t.sessionId=e.sessionId);let r=JSON.stringify(t);for(let e of s)1===e.readyState&&e.send(r)}catch{}});let r=e=>new Promise(o=>{let s=c();s.once("error",()=>{e<t+100?o(r(e+1)):o(null)}),s.listen(e,()=>s.close(()=>o(e)))}),n=await r(t);if(!n)return void console.warn(`CDP server: no available port in range ${t}-${t+99}`);let a=c((e,t)=>{if("/json/list"===e.url||"/json"===e.url){t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify([{description:"BRICKS Simulator",id:"bricks-simulator",title:"BRICKS Simulator",type:"page",url:$,webSocketDebuggerUrl:`ws://localhost:${n}/ws`}]));return}if("/json/version"===e.url){t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify({Browser:"BRICKS Simulator","Protocol-Version":"1.3"}));return}if("/devtools/info"===e.url){t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify({name:"BRICKS Simulator",port:n,protocols:["cdp"],hasPasscode:!1}));return}t.writeHead(404),t.end()});new o({server:a,path:"/ws"}).on("connection",t=>{s.add(t),e.webContents.executeJavaScript(`
+import{app as e,BrowserWindow as t,ipcMain as o}from"electron";import{mkdir as s,readdir as r,readFile as n,rm as a,writeFile as i}from"fs/promises";import{watchFile as l}from"fs";import{createServer as c}from"http";import p from"node:path";import{fileURLToPath as d}from"node:url";import{parseArgs as u}from"util";import*as w from"@toon-format/toon";import h from"./simulator-host-bridge.cjs";let{resolveAutomationScreenshotPath:m,normalizeAutomationScreenshotEncoding:f}=h;for(let e of[process.stdout,process.stderr])e.on("error",e=>{if("EPIPE"!==e.code)throw e});let{values:g}=u({args:process.argv,options:{"clear-cache":{type:"boolean"},"take-screenshot":{type:"string"},"show-menu":{type:"boolean"},"test-id":{type:"string"},"test-title-like":{type:"string"},"no-keep-open":{type:"boolean"},"cdp-port":{type:"string"}},strict:!0,allowPositionals:!0}),y=process.cwd(),S=p.dirname(d(import.meta.url)),b=Object.freeze({allowedInsecureHosts:[]}),v=(e={})=>{let t=e&&"object"==typeof e&&!Array.isArray(e)?e:{};return{allowedInsecureHosts:(Array.isArray(t.allowedInsecureHosts)?t.allowedInsecureHosts:b.allowedInsecureHosts).filter(e=>"string"==typeof e).map(e=>e.trim().toLowerCase()).filter(Boolean)}},C=e=>{try{let t=new URL(String(e||""));if("http:"!==t.protocol&&"ws:"!==t.protocol)return null;return t.host.toLowerCase()}catch{return null}},I=async()=>{try{return v(JSON.parse(await n(`${y}/simulator.json`,"utf8")))}catch{return v()}},k=null;try{g["take-screenshot"]&&((k=JSON.parse(g["take-screenshot"])).path||(k.path=`${y}/screenshot.jpg`),k.width||(k.width=1280),k.height||(k.height=768),k.delay||(k.delay=1e3))}catch(e){console.error("Invalid take-screenshot config",e),process.exit(1)}let J=JSON.parse(await n(`${y}/.bricks/build/application-config.json`)),O=await I(),T=g["test-id"]||null;if(!T&&g["test-title-like"]){let e=g["test-title-like"].toLowerCase();for(let t of Object.values(J.automation_map||{})){let o=Object.entries(t.map||{}).find(([,t])=>t.title?.toLowerCase().includes(e));if(o){[T]=o;break}}if(!T)throw Error(`No automation found matching title: ${g["test-title-like"]}`)}let j=g["no-keep-open"]??!1,N=process.env.BRICKS_STAGE||"production",L={production:"https://control.bricks.tools/applicationPreview.html",beta:"https://control-beta.bricks.tools/applicationPreview.html",development:"http://localhost:3006/dev-applicationPreview.html"}[N];if(!L)throw Error(`Invalid BRICKS_STAGE: ${N}`);O=v({...O,allowedInsecureHosts:[...O.allowedInsecureHosts,C(L)].filter(Boolean)});let R=async(e,t)=>{let{WebSocketServer:o}=await import("ws"),s=new Set;e.webContents.on("console-message",(e,...t)=>{let o="object"==typeof t[0]?t[0].message:t[1];if(o?.startsWith("[CDP]"))try{let e=JSON.parse(o.slice(5)),t="cdp-response"===e.type?{id:e.id,result:e.result,error:e.error}:{method:e.method,params:e.params};e.sessionId&&(t.sessionId=e.sessionId);let r=JSON.stringify(t);for(let e of s)1===e.readyState&&e.send(r)}catch{}});let r=e=>new Promise(o=>{let s=c();s.once("error",()=>{e<t+100?o(r(e+1)):o(null)}),s.listen(e,()=>s.close(()=>o(e)))}),n=await r(t);if(!n)return void console.warn(`CDP server: no available port in range ${t}-${t+99}`);let a=c((e,t)=>{if("/json/list"===e.url||"/json"===e.url){t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify([{description:"BRICKS Simulator",id:"bricks-simulator",title:"BRICKS Simulator",type:"page",url:L,webSocketDebuggerUrl:`ws://localhost:${n}/ws`}]));return}if("/json/version"===e.url){t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify({Browser:"BRICKS Simulator","Protocol-Version":"1.3"}));return}if("/devtools/info"===e.url){t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify({name:"BRICKS Simulator",port:n,protocols:["cdp"],hasPasscode:!1}));return}t.writeHead(404),t.end()});new o({server:a,path:"/ws"}).on("connection",t=>{s.add(t),e.webContents.executeJavaScript(`
       if (!window.__cdpRelayInstalled) {
         window.__cdpRelayInstalled = true
         window.addEventListener('message', (evt) => {
@@ -9,7 +9,7 @@ import{app as e,BrowserWindow as t,ipcMain as o}from"electron";import{mkdir as s
           } catch {}
         })
       }
-    `),t.on("message",t=>{try{let o=JSON.parse(t.toString()),s=JSON.stringify({type:"cdp-request",id:o.id,method:o.method,params:o.params||{},sessionId:o.sessionId});e.webContents.executeJavaScript(`window.postMessage(${JSON.stringify(s)})`)}catch{}}),t.on("close",()=>s.delete(t))}),a.listen(n,()=>{console.log(`CDP server: ws://localhost:${n}/ws`),console.log(`Inspect:   devtools://devtools/bundled/inspector.html?ws=localhost:${n}/ws`)})};e.on("ready",()=>{o.handle("bricks-automation-screenshots:exists",async(e,t)=>{try{return await n(S(t)),!0}catch{return!1}}),o.handle("bricks-automation-screenshots:readdir",async(e,t)=>{try{return await r(S(t))}catch{return[]}}),o.handle("bricks-automation-screenshots:mkdir",async(e,t)=>{await s(S(t),{recursive:!0})}),o.handle("bricks-automation-screenshots:unlink",async(e,t)=>{await a(S(t),{recursive:!0,force:!0})}),o.handle("bricks-automation-screenshots:read-file",async(e,t,o)=>n(S(t),b(o))),o.handle("bricks-automation-screenshots:write-file",async(e,t,o,r)=>{let n=S(t);await s(p.dirname(n),{recursive:!0}),await i(n,o,b(r))});let c=!0;I&&!I.noHeadless&&(c=!1);let d=new t({width:I?.width||1280,height:I?.height||768,frame:!I,show:c,webPreferences:{preload:p.join(f,"simulator-preload.cjs"),contextIsolation:!0,nodeIntegration:!1}});d.setBackgroundColor("#333"),d.webContents.session.webRequest.onBeforeRequest({urls:["http://*/*","ws://*/*"]},(e,t)=>{t({cancel:((e,t={})=>{let o=v(t);try{let t=new URL(String(e||""));if("http:"!==t.protocol&&"ws:"!==t.protocol)return!1;let s=t.host.toLowerCase(),r=t.hostname.toLowerCase().replace(/^\[|\]$/g,"");return!o.allowedInsecureHosts.some(e=>{let o=(e=>{let t=String(e||"").trim().toLowerCase();if(!t)return null;if(!/^[a-z][a-z0-9+.-]*:\/\//i.test(t))return{host:t,protocol:null};try{let e=new URL(t);return{host:e.host.toLowerCase(),protocol:e.protocol}}catch{return null}})(e);return!!o&&(!o.protocol||o.protocol===t.protocol)&&(o.host===s||o.host===r)})}catch{return!1}})(e.url,O)})}),d.loadURL($);let u=()=>{let t={type:"config",configFile:{_originTitle:"Test",...J,title:Math.random().toString()},workspace:{billing:{lock:{},plan:"free"}},showMenu:h["show-menu"]||!1,testId:j};if(d.webContents.executeJavaScript(`window.postMessage(JSON.stringify(${JSON.stringify(t)}))`),I){let{delay:t,width:o,height:s,path:r}=I;setTimeout(async()=>{let t=!1;console.log("Taking screenshot");try{let e=await d.webContents.capturePage();console.log("Writing screenshot to",r),await i(r,e.resize({width:o,height:s}).toJPEG(75))}catch(e){t=!0,console.error("Screenshot capture/write failed",e)}finally{T&&(console.log("Closing app"),t?e.exit(1):e.quit())}},t)}};d.webContents.once("dom-ready",()=>{u(),j&&d.webContents.executeJavaScript(`
+    `),t.on("message",t=>{try{let o=JSON.parse(t.toString()),s=JSON.stringify({type:"cdp-request",id:o.id,method:o.method,params:o.params||{},sessionId:o.sessionId});e.webContents.executeJavaScript(`window.postMessage(${JSON.stringify(s)})`)}catch{}}),t.on("close",()=>s.delete(t))}),a.listen(n,()=>{console.log(`CDP server: ws://localhost:${n}/ws`),console.log(`Inspect:   devtools://devtools/bundled/inspector.html?ws=localhost:${n}/ws`)})};e.on("ready",()=>{o.handle("bricks-automation-screenshots:exists",async(e,t)=>{try{return await n(((e="")=>m(y,e))(t)),!0}catch{return!1}}),o.handle("bricks-automation-screenshots:readdir",async(e,t)=>{try{return await r(((e="")=>m(y,e))(t))}catch{return[]}}),o.handle("bricks-automation-screenshots:mkdir",async(e,t)=>{await s(((e="")=>m(y,e))(t),{recursive:!0})}),o.handle("bricks-automation-screenshots:unlink",async(e,t)=>{await a(((e="")=>m(y,e))(t),{recursive:!0,force:!0})}),o.handle("bricks-automation-screenshots:read-file",async(e,t,o)=>n(((e="")=>m(y,e))(t),f(o))),o.handle("bricks-automation-screenshots:write-file",async(e,t,o,r)=>{let n=((e="")=>m(y,e))(t);await s(p.dirname(n),{recursive:!0}),await i(n,o,f(r))});let c=!0;k&&!k.noHeadless&&(c=!1);let d=new t({width:k?.width||1280,height:k?.height||768,frame:!k,show:c,webPreferences:{preload:p.join(S,"simulator-preload.cjs"),contextIsolation:!0,nodeIntegration:!1}});d.setBackgroundColor("#333"),d.webContents.session.webRequest.onBeforeRequest({urls:["http://*/*","ws://*/*"]},(e,t)=>{t({cancel:((e,t={})=>{let o=v(t);try{let t=new URL(String(e||""));if("http:"!==t.protocol&&"ws:"!==t.protocol)return!1;let s=t.host.toLowerCase(),r=t.hostname.toLowerCase().replace(/^\[|\]$/g,"");return!o.allowedInsecureHosts.some(e=>{let o=(e=>{let t=String(e||"").trim().toLowerCase();if(!t)return null;if(!/^[a-z][a-z0-9+.-]*:\/\//i.test(t))return{host:t,protocol:null};try{let e=new URL(t);return{host:e.host.toLowerCase(),protocol:e.protocol}}catch{return null}})(e);return!!o&&(!o.protocol||o.protocol===t.protocol)&&(o.host===s||o.host===r)})}catch{return!1}})(e.url,O)})}),d.loadURL(L);let u=()=>{let t={type:"config",configFile:{_originTitle:"Test",...J,title:Math.random().toString()},workspace:{billing:{lock:{},plan:"free"}},showMenu:g["show-menu"]||!1,testId:T};if(d.webContents.executeJavaScript(`window.postMessage(JSON.stringify(${JSON.stringify(t)}))`),k){let{delay:t,width:o,height:s,path:r}=k;setTimeout(async()=>{let t=!1;console.log("Taking screenshot");try{let e=await d.webContents.capturePage();console.log("Writing screenshot to",r),await i(r,e.resize({width:o,height:s}).toJPEG(75))}catch(e){t=!0,console.error("Screenshot capture/write failed",e)}finally{j&&(console.log("Closing app"),t?e.exit(1):e.quit())}},t)}};d.webContents.once("dom-ready",()=>{u(),T&&d.webContents.executeJavaScript(`
         window.addEventListener('message', (evt) => {
           try {
             const data = JSON.parse(evt.data)
@@ -18,4 +18,4 @@ import{app as e,BrowserWindow as t,ipcMain as o}from"electron";import{mkdir as s
             }
           } catch (e) {}
         })
-      `);let e=h["cdp-port"]?parseInt(h["cdp-port"],10):null;e&&E(d,e)}),j&&d.webContents.on("console-message",(t,...o)=>{let s="object"==typeof o[0]?o[0].message:o[1];if(s?.startsWith("[TEST_RESULT]")){let t=JSON.parse(s.replace("[TEST_RESULT]",""));console.log(`[TEST_RESULT_TOON]${w.encode(t.result)}`),!I&&T&&e.quit()}}),h["clear-cache"]&&(console.log("Clearing cache"),d.webContents.session.clearCache()),d.on("close",()=>e.quit()),l(`${m}/.bricks/build/application-config.json`,{bigint:!1,persistent:!0,interval:1e3},async()=>{console.log("Detected config changed"),J=JSON.parse(await n(`${m}/.bricks/build/application-config.json`));let e=await k();O=v({...e,allowedInsecureHosts:[...e.allowedInsecureHosts,C($)].filter(Boolean)}),u()}),l(`${m}/simulator.json`,{bigint:!1,persistent:!0,interval:1e3},async()=>{console.log("Detected simulator settings changed");let e=await k();O=v({...e,allowedInsecureHosts:[...e.allowedInsecureHosts,C($)].filter(Boolean)})})});
+      `);let e=g["cdp-port"]?parseInt(g["cdp-port"],10):null;e&&R(d,e)}),T&&d.webContents.on("console-message",(t,...o)=>{let s="object"==typeof o[0]?o[0].message:o[1];if(s?.startsWith("[TEST_RESULT]")){let t=JSON.parse(s.replace("[TEST_RESULT]",""));console.log(`[TEST_RESULT_TOON]${w.encode(t.result)}`),!k&&j&&e.quit()}}),g["clear-cache"]&&(console.log("Clearing cache"),d.webContents.session.clearCache()),d.on("close",()=>e.quit()),l(`${y}/.bricks/build/application-config.json`,{bigint:!1,persistent:!0,interval:1e3},async()=>{console.log("Detected config changed"),J=JSON.parse(await n(`${y}/.bricks/build/application-config.json`));let e=await I();O=v({...e,allowedInsecureHosts:[...e.allowedInsecureHosts,C(L)].filter(Boolean)}),u()}),l(`${y}/simulator.json`,{bigint:!1,persistent:!0,interval:1e3},async()=>{console.log("Detected simulator settings changed");let e=await I();O=v({...e,allowedInsecureHosts:[...e.allowedInsecureHosts,C(L)].filter(Boolean)})})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-cli",
-  "version": "2.25.0-beta.62",
+  "version": "2.25.0-beta.64",
   "description": "BRICKS CLI - Command-line interface for BRICKS Workspace API",
   "keywords": [
     "bricks",
@@ -56,10 +56,10 @@
     "@babel/parser": "7.28.5",
     "@babel/traverse": "7.28.5",
     "@babel/types": "7.28.5",
-    "@fugood/bricks-config-core": "^2.25.0-beta.62",
-    "@fugood/bricks-core-generated": "^2.25.0-beta.62",
+    "@fugood/bricks-config-core": "^2.25.0-beta.64",
+    "@fugood/bricks-core-generated": "^2.25.0-beta.64",
     "@fugood/bricks-system-properties-definition": "^2.24.0",
-    "@fugood/property-bank-calc-generated": "^2.25.0-beta.62",
+    "@fugood/property-bank-calc-generated": "^2.25.0-beta.64",
     "@huggingface/gguf": "^0.3.2",
     "@iarna/toml": "^3.0.0",
     "@inquirer/prompts": "^7.0.0",
@@ -90,5 +90,5 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "22ea0986230856c59dbf9acccc63bdc4fd97deed"
+  "gitHead": "5ab88b3211de83793a76d6ea97cf9552132eb3bf"
 }