@stlite/desktop 0.69.2 → 0.70.0

package/README.md

@@ -15,8 +15,8 @@ Convert your [Streamlit](https://streamlit.io/) application into a desktop app w
      "scripts": {
        "dump": "dump-stlite-desktop-artifacts",
        "serve": "cross-env NODE_ENV=production electron .",
-       "pack": "electron-builder --dir",
-       "dist": "electron-builder",
+       "app:dir": "electron-builder --dir",
+       "app:dist": "electron-builder",
        "postinstall": "electron-builder install-app-deps"
      },
      "build": {
@@ -26,10 +26,10 @@ Convert your [Streamlit](https://streamlit.io/) application into a desktop app w
        }
      },
      "devDependencies": {
-       "@stlite/desktop": "^0.63.1",
+       "@stlite/desktop": "^0.69.2",
        "cross-env": "^7.0.3",
-       "electron": "30.0.8",
-       "electron-builder": "^24.13.3"
+       "electron": "31.0.0",
+       "electron-builder": "^25.1.7"
      },
      "stlite": {
        "desktop": {
@@ -85,7 +85,7 @@ Convert your [Streamlit](https://streamlit.io/) application into a desktop app w
    - This `dump` command creates `./build` directory that contains the copied Streamlit app files, dumped installed packages, Pyodide runtime, Electron app files, etc.
 7. Run `npm run serve` or `yarn serve` for preview.
    - This command is just a wrapper of `electron` command as you can see at the `"scripts"` field in the `package.json`. It launches Electron and starts the app with `./build/electron/main.js`, which is specified at the `"main"` field in the `package.json`.
-8. Run `npm run dist` or `yarn dist` for packaging.
+8. Run `npm run app:dist` or `yarn app:dist` for packaging.
    - This command bundles the `./build` directory created in the step above into application files (`.app`, `.exe`, `.dmg` etc.) in the `./dist` directory. To customize the built app, e.g. setting the icon, follow the [`electron-builder`](https://www.electron.build/) instructions.
 
 See the [./samples](./samples) directory for sample projects.

package/build/asset-manifest.json

@@ -162,8 +162,8 @@
     "static/media/KaTeX_Size3-Regular.woff2": "/static/media/KaTeX_Size3-Regular.e1951519f6f0596f7356.woff2",
     "static/media/icon_running.gif": "/static/media/icon_running.de1119daebe465fa5263.gif",
     "static/media/logo.svg": "/static/media/logo.83ae4f2fb87e38be7cbb8a5d2beb64d2.svg",
-    "static/media/checkmark.svg": "/static/media/checkmark.29851c8e9e6ef0c3d6c1e4efe3c1bb9e.svg",
-    "index.html": "/index.html"
+    "index.html": "/index.html",
+    "static/media/checkmark.svg": "/static/media/checkmark.29851c8e9e6ef0c3d6c1e4efe3c1bb9e.svg"
   },
   "entrypoints": [
     "static/css/main.43acb583.css",

package/build/electron/main.js

@@ -1,2 +1,2 @@
-var Le=Object.create;var G=Object.defineProperty;var Be=Object.getOwnPropertyDescriptor;var He=Object.getOwnPropertyNames;var qe=Object.getPrototypeOf,Ve=Object.prototype.hasOwnProperty;var Ye=(i,s)=>()=>(s||i((s={exports:{}}).exports,s),s.exports);var Ge=(i,s,f,c)=>{if(s&&typeof s=="object"||typeof s=="function")for(let y of He(s))!Ve.call(i,y)&&y!==f&&G(i,y,{get:()=>s[y],enumerable:!(c=Be(s,y))||c.enumerable});return i};var _=(i,s,f)=>(f=i!=null?Le(qe(i)):{},Ge(s||!i||!i.__esModule?G(f,"default",{value:i,enumerable:!0}):f,i));var x=Ye((T,K)=>{(function(i,s){typeof T=="object"&&typeof K<"u"?s(T):typeof define=="function"&&define.amd?define(["exports"],s):(i=typeof globalThis<"u"?globalThis:i||self,s(i.Superstruct={}))})(T,function(i){"use strict";class s extends TypeError{constructor(n,t){let r,{message:o,explanation:a,...u}=n,{path:g}=n,w=g.length===0?o:`At path: ${g.join(".")} -- ${o}`;super(a??w),a!=null&&(this.cause=w),Object.assign(this,u),this.name=this.constructor.name,this.failures=()=>r??(r=[n,...t()])}}function f(e){return c(e)&&typeof e[Symbol.iterator]=="function"}function c(e){return typeof e=="object"&&e!=null}function y(e){if(Object.prototype.toString.call(e)!=="[object Object]")return!1;let n=Object.getPrototypeOf(e);return n===null||n===Object.prototype}function p(e){return typeof e=="symbol"?e.toString():typeof e=="string"?JSON.stringify(e):`${e}`}function S(e){let{done:n,value:t}=e.next();return n?void 0:t}function M(e,n,t,r){if(e===!0)return;e===!1?e={}:typeof e=="string"&&(e={message:e});let{path:o,branch:a}=n,{type:u}=t,{refinement:g,message:w=`Expected a value of type \`${u}\`${g?` with refinement \`${g}\``:""}, but received: \`${p(r)}\``}=e;return{value:r,type:u,refinement:g,key:o[o.length-1],path:o,branch:a,...e,message:w}}function*m(e,n,t,r){f(e)||(e=[e]);for(let o of e){let a=M(o,n,t,r);a&&(yield a)}}function*k(e,n,t={}){let{path:r=[],branch:o=[e],coerce:a=!1,mask:u=!1}=t,g={path:r,branch:o};if(a&&(e=n.coercer(e,g),u&&n.type!=="type"&&c(n.schema)&&c(e)&&!Array.isArray(e)))for(let h in e)n.schema[h]===void 0&&delete e[h];let w="valid";for(let h of n.validator(e,g))h.explanation=t.message,w="not_valid",yield[h,void 0];for(let[h,N,Je]of n.entries(e,g)){let Ce=k(N,Je,{path:h===void 0?r:[...r,h],branch:h===void 0?o:[...o,N],coerce:a,mask:u,message:t.message});for(let I of Ce)I[0]?(w=I[0].refinement!=null?"not_refined":"not_valid",yield[I[0],void 0]):a&&(N=I[1],h===void 0?e=N:e instanceof Map?e.set(h,N):e instanceof Set?e.add(N):c(e)&&(N!==void 0||h in e)&&(e[h]=N))}if(w!=="not_valid")for(let h of n.refiner(e,g))h.explanation=t.message,w="not_refined",yield[h,void 0];w==="valid"&&(yield[void 0,e])}class d{constructor(n){let{type:t,schema:r,validator:o,refiner:a,coercer:u=w=>w,entries:g=function*(){}}=n;this.type=t,this.schema=r,this.entries=g,this.coercer=u,o?this.validator=(w,h)=>{let N=o(w,h);return m(N,h,this,w)}:this.validator=()=>[],a?this.refiner=(w,h)=>{let N=a(w,h);return m(N,h,this,w)}:this.refiner=()=>[]}assert(n,t){return j(n,this,t)}create(n,t){return E(n,this,t)}is(n){return U(n,this)}mask(n,t){return z(n,this,t)}validate(n,t={}){return D(n,this,t)}}function j(e,n,t){let r=D(e,n,{message:t});if(r[0])throw r[0]}function E(e,n,t){let r=D(e,n,{coerce:!0,message:t});if(r[0])throw r[0];return r[1]}function z(e,n,t){let r=D(e,n,{coerce:!0,mask:!0,message:t});if(r[0])throw r[0];return r[1]}function U(e,n){return!D(e,n)[0]}function D(e,n,t={}){let r=k(e,n,t),o=S(r);return o[0]?[new s(o[0],function*(){for(let u of r)u[0]&&(yield u[0])}),void 0]:[void 0,o[1]]}function oe(...e){let n=e[0].type==="type",t=e.map(o=>o.schema),r=Object.assign({},...t);return n?W(r):R(r)}function $(e,n){return new d({type:e,schema:null,validator:n})}function se(e,n){return new d({...e,refiner:(t,r)=>t===void 0||e.refiner(t,r),validator(t,r){return t===void 0?!0:(n(t,r),e.validator(t,r))}})}function ae(e){return new d({type:"dynamic",schema:null,*entries(n,t){yield*e(n,t).entries(n,t)},validator(n,t){return e(n,t).validator(n,t)},coercer(n,t){return e(n,t).coercer(n,t)},refiner(n,t){return e(n,t).refiner(n,t)}})}function ce(e){let n;return new d({type:"lazy",schema:null,*entries(t,r){n??(n=e()),yield*n.entries(t,r)},validator(t,r){return n??(n=e()),n.validator(t,r)},coercer(t,r){return n??(n=e()),n.coercer(t,r)},refiner(t,r){return n??(n=e()),n.refiner(t,r)}})}function fe(e,n){let{schema:t}=e,r={...t};for(let o of n)delete r[o];switch(e.type){case"type":return W(r);default:return R(r)}}function de(e){let n=e instanceof d,t=n?{...e.schema}:{...e};for(let r in t)t[r]=H(t[r]);return n&&e.type==="type"?W(t):R(t)}function ue(e,n){let{schema:t}=e,r={};for(let o of n)r[o]=t[o];switch(e.type){case"type":return W(r);default:return R(r)}}function le(e,n){return console.warn("superstruct@0.11 - The `struct` helper has been renamed to `define`."),$(e,n)}function pe(){return $("any",()=>!0)}function me(e){return new d({type:"array",schema:e,*entries(n){if(e&&Array.isArray(n))for(let[t,r]of n.entries())yield[t,r,e]},coercer(n){return Array.isArray(n)?n.slice():n},validator(n){return Array.isArray(n)||`Expected an array value, but received: ${p(n)}`}})}function ye(){return $("bigint",e=>typeof e=="bigint")}function he(){return $("boolean",e=>typeof e=="boolean")}function be(){return $("date",e=>e instanceof Date&&!isNaN(e.getTime())||`Expected a valid \`Date\` object, but received: ${p(e)}`)}function ge(e){let n={},t=e.map(r=>p(r)).join();for(let r of e)n[r]=r;return new d({type:"enums",schema:n,validator(r){return e.includes(r)||`Expected one of \`${t}\`, but received: ${p(r)}`}})}function we(){return $("func",e=>typeof e=="function"||`Expected a function, but received: ${p(e)}`)}function ke(e){return $("instance",n=>n instanceof e||`Expected a \`${e.name}\` instance, but received: ${p(n)}`)}function $e(){return $("integer",e=>typeof e=="number"&&!isNaN(e)&&Number.isInteger(e)||`Expected an integer, but received: ${p(e)}`)}function Pe(e){return new d({type:"intersection",schema:null,*entries(n,t){for(let r of e)yield*r.entries(n,t)},*validator(n,t){for(let r of e)yield*r.validator(n,t)},*refiner(n,t){for(let r of e)yield*r.refiner(n,t)}})}function Se(e){let n=p(e),t=typeof e;return new d({type:"literal",schema:t==="string"||t==="number"||t==="boolean"?e:null,validator(r){return r===e||`Expected the literal \`${n}\`, but received: ${p(r)}`}})}function je(e,n){return new d({type:"map",schema:null,*entries(t){if(e&&n&&t instanceof Map)for(let[r,o]of t.entries())yield[r,r,e],yield[r,o,n]},coercer(t){return t instanceof Map?new Map(t):t},validator(t){return t instanceof Map||`Expected a \`Map\` object, but received: ${p(t)}`}})}function J(){return $("never",()=>!1)}function Ne(e){return new d({...e,validator:(n,t)=>n===null||e.validator(n,t),refiner:(n,t)=>n===null||e.refiner(n,t)})}function Me(){return $("number",e=>typeof e=="number"&&!isNaN(e)||`Expected a number, but received: ${p(e)}`)}function R(e){let n=e?Object.keys(e):[],t=J();return new d({type:"object",schema:e||null,*entries(r){if(e&&c(r)){let o=new Set(Object.keys(r));for(let a of n)o.delete(a),yield[a,r[a],e[a]];for(let a of o)yield[a,r[a],t]}},validator(r){return c(r)||`Expected an object, but received: ${p(r)}`},coercer(r){return c(r)?{...r}:r}})}function H(e){return new d({...e,validator:(n,t)=>n===void 0||e.validator(n,t),refiner:(n,t)=>n===void 0||e.refiner(n,t)})}function Ee(e,n){return new d({type:"record",schema:null,*entries(t){if(c(t))for(let r in t){let o=t[r];yield[r,r,e],yield[r,o,n]}},validator(t){return c(t)||`Expected an object, but received: ${p(t)}`}})}function _e(){return $("regexp",e=>e instanceof RegExp)}function Ae(e){return new d({type:"set",schema:null,*entries(n){if(e&&n instanceof Set)for(let t of n)yield[t,t,e]},coercer(n){return n instanceof Set?new Set(n):n},validator(n){return n instanceof Set||`Expected a \`Set\` object, but received: ${p(n)}`}})}function q(){return $("string",e=>typeof e=="string"||`Expected a string, but received: ${p(e)}`)}function Oe(e){let n=J();return new d({type:"tuple",schema:null,*entries(t){if(Array.isArray(t)){let r=Math.max(e.length,t.length);for(let o=0;o<r;o++)yield[o,t[o],e[o]||n]}},validator(t){return Array.isArray(t)||`Expected an array, but received: ${p(t)}`}})}function W(e){let n=Object.keys(e);return new d({type:"type",schema:e,*entries(t){if(c(t))for(let r of n)yield[r,t[r],e[r]]},validator(t){return c(t)||`Expected an object, but received: ${p(t)}`},coercer(t){return c(t)?{...t}:t}})}function De(e){let n=e.map(t=>t.type).join(" | ");return new d({type:"union",schema:null,coercer(t){for(let r of e){let[o,a]=r.validate(t,{coerce:!0});if(!o)return a}return t},validator(t,r){let o=[];for(let a of e){let[...u]=k(t,a,r),[g]=u;if(g[0])for(let[w]of u)w&&o.push(w);else return[]}return[`Expected the value to satisfy a union of \`${n}\`, but received: ${p(t)}`,...o]}})}function V(){return $("unknown",()=>!0)}function C(e,n,t){return new d({...e,coercer:(r,o)=>U(r,n)?e.coercer(t(r,o),o):e.coercer(r,o)})}function Fe(e,n,t={}){return C(e,V(),r=>{let o=typeof n=="function"?n():n;if(r===void 0)return o;if(!t.strict&&y(r)&&y(o)){let a={...r},u=!1;for(let g in o)a[g]===void 0&&(a[g]=o[g],u=!0);if(u)return a}return r})}function Re(e){return C(e,q(),n=>n.trim())}function We(e){return O(e,"empty",n=>{let t=Y(n);return t===0||`Expected an empty ${e.type} but received one with a size of \`${t}\``})}function Y(e){return e instanceof Map||e instanceof Set?e.size:e.length}function ze(e,n,t={}){let{exclusive:r}=t;return O(e,"max",o=>r?o<n:o<=n||`Expected a ${e.type} less than ${r?"":"or equal to "}${n} but received \`${o}\``)}function Ie(e,n,t={}){let{exclusive:r}=t;return O(e,"min",o=>r?o>n:o>=n||`Expected a ${e.type} greater than ${r?"":"or equal to "}${n} but received \`${o}\``)}function Te(e){return O(e,"nonempty",n=>Y(n)>0||`Expected a nonempty ${e.type} but received an empty one`)}function ve(e,n){return O(e,"pattern",t=>n.test(t)||`Expected a ${e.type} matching \`/${n.source}/\` but received "${t}"`)}function Ue(e,n,t=n){let r=`Expected a ${e.type}`,o=n===t?`of \`${n}\``:`between \`${n}\` and \`${t}\``;return O(e,"size",a=>{if(typeof a=="number"||a instanceof Date)return n<=a&&a<=t||`${r} ${o} but received \`${a}\``;if(a instanceof Map||a instanceof Set){let{size:u}=a;return n<=u&&u<=t||`${r} with a size ${o} but received one with a size of \`${u}\``}else{let{length:u}=a;return n<=u&&u<=t||`${r} with a length ${o} but received one with a length of \`${u}\``}})}function O(e,n,t){return new d({...e,*refiner(r,o){yield*e.refiner(r,o);let a=t(r,o),u=m(a,o,e,r);for(let g of u)yield{...g,refinement:n}}})}i.Struct=d,i.StructError=s,i.any=pe,i.array=me,i.assert=j,i.assign=oe,i.bigint=ye,i.boolean=he,i.coerce=C,i.create=E,i.date=be,i.defaulted=Fe,i.define=$,i.deprecated=se,i.dynamic=ae,i.empty=We,i.enums=ge,i.func=we,i.instance=ke,i.integer=$e,i.intersection=Pe,i.is=U,i.lazy=ce,i.literal=Se,i.map=je,i.mask=z,i.max=ze,i.min=Ie,i.never=J,i.nonempty=Te,i.nullable=Ne,i.number=Me,i.object=R,i.omit=fe,i.optional=H,i.partial=de,i.pattern=ve,i.pick=ue,i.record=Ee,i.refine=O,i.regexp=_e,i.set=Ae,i.size=Ue,i.string=q,i.struct=le,i.trimmed=Re,i.tuple=Oe,i.type=W,i.union=De,i.unknown=V,i.validate=D})});var l=require("electron"),P=_(require("node:path")),L=_(require("node:fs/promises")),B=_(require("node:worker_threads"));function Q(i,s){let f=new URL(i),c=new URL(s);return f.search="",f.hash="",c.search="",c.hash="",c.toString().startsWith(f.toString())}var F=_(require("fs/promises")),A=_(require("path"));async function X(i){let s={},f=await F.readdir(i);return await Promise.all(f.map(async c=>{let y=A.join(i,c);if((await F.stat(y)).isDirectory()){let S=await X(y);Object.assign(s,S)}else{let S=await F.readFile(y);s[y]=S}})),s}async function Z(i){let s=await X(i),f={};return Object.keys(s).forEach(c=>{let p=A.relative(i,c).split(A.sep).join(A.posix.sep);f[p]=s[c]}),f}var ee=_(require("path")),v=_(require("fs/promises")),b=_(x()),Qe=b.object({entrypoint:b.string(),embed:b.defaulted(b.boolean(),!1),idbfsMountpoints:b.optional(b.array(b.string())),nodeJsWorker:b.defaulted(b.boolean(),!1),nodefsMountpoints:b.optional(b.record(b.string(),b.string()))});async function ne(){let i=ee.resolve(__dirname,"../stlite-manifest.json"),s=await v.readFile(i,{encoding:"utf-8"}),f=JSON.parse(s);return b.assert(f,Qe),f}function Xe(i,s){let f=/\{\{(.*?)\}\}/g;return s.replace(f,(c,y)=>{try{return i.getPath(y)}catch{return console.warn(`Unknown placeholder: ${y}`),c}})}function te(i,s){return Object.fromEntries(Object.entries(s).map(([f,c])=>[f,Xe(i,c)]))}function re(i){return Promise.all(Object.values(i).map(s=>v.mkdir(s,{recursive:!0}))).catch(s=>{console.error("Failed to create nodefs mountpoints",s)}).then()}var ie=async()=>{let i=await ne(),s=[];s.push(`--entrypoint=${JSON.stringify(i.entrypoint)}`),i.idbfsMountpoints&&s.push(`--idbfs-mountpoints=${JSON.stringify(i.idbfsMountpoints)}`),i.nodeJsWorker&&s.push("--nodejs-worker");let f=new l.BrowserWindow({width:1280,height:720,webPreferences:{preload:P.join(__dirname,"preload.js"),sandbox:!0,additionalArguments:s}}),c=new URL((l.app.isPackaged,"file:///index.html")),y=new URLSearchParams;i.embed&&y.set("embed","true"),c.search=y.toString();let p=c.toString(),S=m=>Q(p,m.url);l.ipcMain.handle("readSitePackagesSnapshot",m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (readSitePackagesSnapshot) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"../site-packages-snapshot.tar.gz");return L.readFile(k)}),l.ipcMain.handle("readPrebuiltPackageNames",async m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (readPrebuiltPackageNames) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"../prebuilt-packages.txt");return(await L.readFile(k,{encoding:"utf-8"})).split(`
-`).map(j=>j.trim()).filter(j=>j.length>0)}),l.ipcMain.handle("readStreamlitAppDirectory",async m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (readStreamlitAppDirectory) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"../app_files");return Z(k)}),f.on("closed",()=>{l.ipcMain.removeHandler("readSitePackagesSnapshot"),l.ipcMain.removeHandler("readPrebuiltPackageNames"),l.ipcMain.removeHandler("readStreamlitAppDirectory")});let M=null;l.ipcMain.handle("initializeNodeJsWorker",async m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (initializeNodeJsWorker) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"..","pyodide","pyodide.mjs"),d=i.nodefsMountpoints&&te(l.app,i.nodefsMountpoints);d&&await re(d);function j(E){f.webContents.send("messageFromNodeJsWorker",E)}M=new B.default.Worker(P.resolve(__dirname,"worker.js"),{env:{PYODIDE_URL:k,...i.nodefsMountpoints&&{NODEFS_MOUNTPOINTS:JSON.stringify(d)}}}),M.on("message",E=>{j(E)})}),l.ipcMain.on("messageToNodeJsWorker",(m,{data:k,portId:d})=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (messageToNodeJsWorker) ${m.senderFrame.url}`);if(M==null)return;let j=new B.default.MessageChannel;j.port1.on("message",z=>{m.reply(`nodeJsWorker-portMessage-${d}`,z)});let E={data:k,port:j.port2};M.postMessage(E,[j.port2])}),l.ipcMain.handle("terminate",(m,{data:k,portId:d})=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (terminate) ${m.senderFrame.url}`);M?.terminate(),M=null}),f.on("closed",()=>{l.ipcMain.removeHandler("initializeNodeJsWorker"),l.ipcMain.removeHandler("messageToNodeJsWorker"),l.ipcMain.removeHandler("terminate")}),f.loadURL(p),l.app.isPackaged||f.webContents.openDevTools()};l.app.enableSandbox();l.app.whenReady().then(()=>{let i=P.resolve(__dirname,"..");l.protocol.interceptFileProtocol("file",function(s,f){let c=new URL(s.url).pathname;if(P.isAbsolute(c)){let y=P.join(i,c);f(P.normalize(y))}else f(c)}),ie(),l.app.on("activate",()=>{l.BrowserWindow.getAllWindows().length===0&&ie()})});l.app.on("window-all-closed",()=>{process.platform!=="darwin"&&l.app.quit()});l.app.on("web-contents-created",(i,s)=>{s.on("will-attach-webview",(f,c,y)=>{f.preventDefault()}),s.on("will-navigate",(f,c)=>{console.debug("will-navigate",c),f.preventDefault()}),s.setWindowOpenHandler(({url:f})=>(console.error("Opening a new window is not allowed."),{action:"deny"}))});
+var He=Object.create;var G=Object.defineProperty;var Le=Object.getOwnPropertyDescriptor;var Be=Object.getOwnPropertyNames;var qe=Object.getPrototypeOf,Ve=Object.prototype.hasOwnProperty;var Ye=(i,s)=>()=>(s||i((s={exports:{}}).exports,s),s.exports);var Ge=(i,s,c,f)=>{if(s&&typeof s=="object"||typeof s=="function")for(let y of Be(s))!Ve.call(i,y)&&y!==c&&G(i,y,{get:()=>s[y],enumerable:!(f=Le(s,y))||f.enumerable});return i};var _=(i,s,c)=>(c=i!=null?He(qe(i)):{},Ge(s||!i||!i.__esModule?G(c,"default",{value:i,enumerable:!0}):c,i));var x=Ye((T,K)=>{(function(i,s){typeof T=="object"&&typeof K<"u"?s(T):typeof define=="function"&&define.amd?define(["exports"],s):(i=typeof globalThis<"u"?globalThis:i||self,s(i.Superstruct={}))})(T,function(i){"use strict";class s extends TypeError{constructor(n,t){let r,{message:o,explanation:a,...l}=n,{path:g}=n,w=g.length===0?o:`At path: ${g.join(".")} -- ${o}`;super(a??w),a!=null&&(this.cause=w),Object.assign(this,l),this.name=this.constructor.name,this.failures=()=>r??(r=[n,...t()])}}function c(e){return f(e)&&typeof e[Symbol.iterator]=="function"}function f(e){return typeof e=="object"&&e!=null}function y(e){if(Object.prototype.toString.call(e)!=="[object Object]")return!1;let n=Object.getPrototypeOf(e);return n===null||n===Object.prototype}function p(e){return typeof e=="symbol"?e.toString():typeof e=="string"?JSON.stringify(e):`${e}`}function S(e){let{done:n,value:t}=e.next();return n?void 0:t}function M(e,n,t,r){if(e===!0)return;e===!1?e={}:typeof e=="string"&&(e={message:e});let{path:o,branch:a}=n,{type:l}=t,{refinement:g,message:w=`Expected a value of type \`${l}\`${g?` with refinement \`${g}\``:""}, but received: \`${p(r)}\``}=e;return{value:r,type:l,refinement:g,key:o[o.length-1],path:o,branch:a,...e,message:w}}function*m(e,n,t,r){c(e)||(e=[e]);for(let o of e){let a=M(o,n,t,r);a&&(yield a)}}function*k(e,n,t={}){let{path:r=[],branch:o=[e],coerce:a=!1,mask:l=!1}=t,g={path:r,branch:o};if(a&&(e=n.coercer(e,g),l&&n.type!=="type"&&f(n.schema)&&f(e)&&!Array.isArray(e)))for(let h in e)n.schema[h]===void 0&&delete e[h];let w="valid";for(let h of n.validator(e,g))h.explanation=t.message,w="not_valid",yield[h,void 0];for(let[h,N,Je]of n.entries(e,g)){let Ce=k(N,Je,{path:h===void 0?r:[...r,h],branch:h===void 0?o:[...o,N],coerce:a,mask:l,message:t.message});for(let I of Ce)I[0]?(w=I[0].refinement!=null?"not_refined":"not_valid",yield[I[0],void 0]):a&&(N=I[1],h===void 0?e=N:e instanceof Map?e.set(h,N):e instanceof Set?e.add(N):f(e)&&(N!==void 0||h in e)&&(e[h]=N))}if(w!=="not_valid")for(let h of n.refiner(e,g))h.explanation=t.message,w="not_refined",yield[h,void 0];w==="valid"&&(yield[void 0,e])}class u{constructor(n){let{type:t,schema:r,validator:o,refiner:a,coercer:l=w=>w,entries:g=function*(){}}=n;this.type=t,this.schema=r,this.entries=g,this.coercer=l,o?this.validator=(w,h)=>{let N=o(w,h);return m(N,h,this,w)}:this.validator=()=>[],a?this.refiner=(w,h)=>{let N=a(w,h);return m(N,h,this,w)}:this.refiner=()=>[]}assert(n,t){return j(n,this,t)}create(n,t){return E(n,this,t)}is(n){return U(n,this)}mask(n,t){return z(n,this,t)}validate(n,t={}){return D(n,this,t)}}function j(e,n,t){let r=D(e,n,{message:t});if(r[0])throw r[0]}function E(e,n,t){let r=D(e,n,{coerce:!0,message:t});if(r[0])throw r[0];return r[1]}function z(e,n,t){let r=D(e,n,{coerce:!0,mask:!0,message:t});if(r[0])throw r[0];return r[1]}function U(e,n){return!D(e,n)[0]}function D(e,n,t={}){let r=k(e,n,t),o=S(r);return o[0]?[new s(o[0],function*(){for(let l of r)l[0]&&(yield l[0])}),void 0]:[void 0,o[1]]}function oe(...e){let n=e[0].type==="type",t=e.map(o=>o.schema),r=Object.assign({},...t);return n?W(r):R(r)}function $(e,n){return new u({type:e,schema:null,validator:n})}function se(e,n){return new u({...e,refiner:(t,r)=>t===void 0||e.refiner(t,r),validator(t,r){return t===void 0?!0:(n(t,r),e.validator(t,r))}})}function ae(e){return new u({type:"dynamic",schema:null,*entries(n,t){yield*e(n,t).entries(n,t)},validator(n,t){return e(n,t).validator(n,t)},coercer(n,t){return e(n,t).coercer(n,t)},refiner(n,t){return e(n,t).refiner(n,t)}})}function ce(e){let n;return new u({type:"lazy",schema:null,*entries(t,r){n??(n=e()),yield*n.entries(t,r)},validator(t,r){return n??(n=e()),n.validator(t,r)},coercer(t,r){return n??(n=e()),n.coercer(t,r)},refiner(t,r){return n??(n=e()),n.refiner(t,r)}})}function fe(e,n){let{schema:t}=e,r={...t};for(let o of n)delete r[o];switch(e.type){case"type":return W(r);default:return R(r)}}function de(e){let n=e instanceof u,t=n?{...e.schema}:{...e};for(let r in t)t[r]=B(t[r]);return n&&e.type==="type"?W(t):R(t)}function ue(e,n){let{schema:t}=e,r={};for(let o of n)r[o]=t[o];switch(e.type){case"type":return W(r);default:return R(r)}}function le(e,n){return console.warn("superstruct@0.11 - The `struct` helper has been renamed to `define`."),$(e,n)}function pe(){return $("any",()=>!0)}function me(e){return new u({type:"array",schema:e,*entries(n){if(e&&Array.isArray(n))for(let[t,r]of n.entries())yield[t,r,e]},coercer(n){return Array.isArray(n)?n.slice():n},validator(n){return Array.isArray(n)||`Expected an array value, but received: ${p(n)}`}})}function ye(){return $("bigint",e=>typeof e=="bigint")}function he(){return $("boolean",e=>typeof e=="boolean")}function be(){return $("date",e=>e instanceof Date&&!isNaN(e.getTime())||`Expected a valid \`Date\` object, but received: ${p(e)}`)}function ge(e){let n={},t=e.map(r=>p(r)).join();for(let r of e)n[r]=r;return new u({type:"enums",schema:n,validator(r){return e.includes(r)||`Expected one of \`${t}\`, but received: ${p(r)}`}})}function we(){return $("func",e=>typeof e=="function"||`Expected a function, but received: ${p(e)}`)}function ke(e){return $("instance",n=>n instanceof e||`Expected a \`${e.name}\` instance, but received: ${p(n)}`)}function $e(){return $("integer",e=>typeof e=="number"&&!isNaN(e)&&Number.isInteger(e)||`Expected an integer, but received: ${p(e)}`)}function Pe(e){return new u({type:"intersection",schema:null,*entries(n,t){for(let r of e)yield*r.entries(n,t)},*validator(n,t){for(let r of e)yield*r.validator(n,t)},*refiner(n,t){for(let r of e)yield*r.refiner(n,t)}})}function Se(e){let n=p(e),t=typeof e;return new u({type:"literal",schema:t==="string"||t==="number"||t==="boolean"?e:null,validator(r){return r===e||`Expected the literal \`${n}\`, but received: ${p(r)}`}})}function je(e,n){return new u({type:"map",schema:null,*entries(t){if(e&&n&&t instanceof Map)for(let[r,o]of t.entries())yield[r,r,e],yield[r,o,n]},coercer(t){return t instanceof Map?new Map(t):t},validator(t){return t instanceof Map||`Expected a \`Map\` object, but received: ${p(t)}`}})}function J(){return $("never",()=>!1)}function Ne(e){return new u({...e,validator:(n,t)=>n===null||e.validator(n,t),refiner:(n,t)=>n===null||e.refiner(n,t)})}function Me(){return $("number",e=>typeof e=="number"&&!isNaN(e)||`Expected a number, but received: ${p(e)}`)}function R(e){let n=e?Object.keys(e):[],t=J();return new u({type:"object",schema:e||null,*entries(r){if(e&&f(r)){let o=new Set(Object.keys(r));for(let a of n)o.delete(a),yield[a,r[a],e[a]];for(let a of o)yield[a,r[a],t]}},validator(r){return f(r)||`Expected an object, but received: ${p(r)}`},coercer(r){return f(r)?{...r}:r}})}function B(e){return new u({...e,validator:(n,t)=>n===void 0||e.validator(n,t),refiner:(n,t)=>n===void 0||e.refiner(n,t)})}function Ee(e,n){return new u({type:"record",schema:null,*entries(t){if(f(t))for(let r in t){let o=t[r];yield[r,r,e],yield[r,o,n]}},validator(t){return f(t)||`Expected an object, but received: ${p(t)}`}})}function _e(){return $("regexp",e=>e instanceof RegExp)}function Ae(e){return new u({type:"set",schema:null,*entries(n){if(e&&n instanceof Set)for(let t of n)yield[t,t,e]},coercer(n){return n instanceof Set?new Set(n):n},validator(n){return n instanceof Set||`Expected a \`Set\` object, but received: ${p(n)}`}})}function q(){return $("string",e=>typeof e=="string"||`Expected a string, but received: ${p(e)}`)}function Oe(e){let n=J();return new u({type:"tuple",schema:null,*entries(t){if(Array.isArray(t)){let r=Math.max(e.length,t.length);for(let o=0;o<r;o++)yield[o,t[o],e[o]||n]}},validator(t){return Array.isArray(t)||`Expected an array, but received: ${p(t)}`}})}function W(e){let n=Object.keys(e);return new u({type:"type",schema:e,*entries(t){if(f(t))for(let r of n)yield[r,t[r],e[r]]},validator(t){return f(t)||`Expected an object, but received: ${p(t)}`},coercer(t){return f(t)?{...t}:t}})}function De(e){let n=e.map(t=>t.type).join(" | ");return new u({type:"union",schema:null,coercer(t){for(let r of e){let[o,a]=r.validate(t,{coerce:!0});if(!o)return a}return t},validator(t,r){let o=[];for(let a of e){let[...l]=k(t,a,r),[g]=l;if(g[0])for(let[w]of l)w&&o.push(w);else return[]}return[`Expected the value to satisfy a union of \`${n}\`, but received: ${p(t)}`,...o]}})}function V(){return $("unknown",()=>!0)}function C(e,n,t){return new u({...e,coercer:(r,o)=>U(r,n)?e.coercer(t(r,o),o):e.coercer(r,o)})}function Fe(e,n,t={}){return C(e,V(),r=>{let o=typeof n=="function"?n():n;if(r===void 0)return o;if(!t.strict&&y(r)&&y(o)){let a={...r},l=!1;for(let g in o)a[g]===void 0&&(a[g]=o[g],l=!0);if(l)return a}return r})}function Re(e){return C(e,q(),n=>n.trim())}function We(e){return O(e,"empty",n=>{let t=Y(n);return t===0||`Expected an empty ${e.type} but received one with a size of \`${t}\``})}function Y(e){return e instanceof Map||e instanceof Set?e.size:e.length}function ze(e,n,t={}){let{exclusive:r}=t;return O(e,"max",o=>r?o<n:o<=n||`Expected a ${e.type} less than ${r?"":"or equal to "}${n} but received \`${o}\``)}function Ie(e,n,t={}){let{exclusive:r}=t;return O(e,"min",o=>r?o>n:o>=n||`Expected a ${e.type} greater than ${r?"":"or equal to "}${n} but received \`${o}\``)}function Te(e){return O(e,"nonempty",n=>Y(n)>0||`Expected a nonempty ${e.type} but received an empty one`)}function ve(e,n){return O(e,"pattern",t=>n.test(t)||`Expected a ${e.type} matching \`/${n.source}/\` but received "${t}"`)}function Ue(e,n,t=n){let r=`Expected a ${e.type}`,o=n===t?`of \`${n}\``:`between \`${n}\` and \`${t}\``;return O(e,"size",a=>{if(typeof a=="number"||a instanceof Date)return n<=a&&a<=t||`${r} ${o} but received \`${a}\``;if(a instanceof Map||a instanceof Set){let{size:l}=a;return n<=l&&l<=t||`${r} with a size ${o} but received one with a size of \`${l}\``}else{let{length:l}=a;return n<=l&&l<=t||`${r} with a length ${o} but received one with a length of \`${l}\``}})}function O(e,n,t){return new u({...e,*refiner(r,o){yield*e.refiner(r,o);let a=t(r,o),l=m(a,o,e,r);for(let g of l)yield{...g,refinement:n}}})}i.Struct=u,i.StructError=s,i.any=pe,i.array=me,i.assert=j,i.assign=oe,i.bigint=ye,i.boolean=he,i.coerce=C,i.create=E,i.date=be,i.defaulted=Fe,i.define=$,i.deprecated=se,i.dynamic=ae,i.empty=We,i.enums=ge,i.func=we,i.instance=ke,i.integer=$e,i.intersection=Pe,i.is=U,i.lazy=ce,i.literal=Se,i.map=je,i.mask=z,i.max=ze,i.min=Ie,i.never=J,i.nonempty=Te,i.nullable=Ne,i.number=Me,i.object=R,i.omit=fe,i.optional=B,i.partial=de,i.pattern=ve,i.pick=ue,i.record=Ee,i.refine=O,i.regexp=_e,i.set=Ae,i.size=Ue,i.string=q,i.struct=le,i.trimmed=Re,i.tuple=Oe,i.type=W,i.union=De,i.unknown=V,i.validate=D})});var d=require("electron"),P=_(require("node:path")),H=_(require("node:fs/promises")),L=_(require("node:worker_threads"));function Q(i,s){let c=new URL(i),f=new URL(s);return c.search="",c.hash="",f.search="",f.hash="",f.toString().startsWith(c.toString())}var F=_(require("fs/promises")),A=_(require("path"));async function X(i){let s={},c=await F.readdir(i);return await Promise.all(c.map(async f=>{let y=A.join(i,f);if((await F.stat(y)).isDirectory()){let S=await X(y);Object.assign(s,S)}else{let S=await F.readFile(y);s[y]=S}})),s}async function Z(i){let s=await X(i),c={};return Object.keys(s).forEach(f=>{let p=A.relative(i,f).split(A.sep).join(A.posix.sep);c[p]=s[f]}),c}var ee=_(require("path")),v=_(require("fs/promises")),b=_(x()),Qe=b.object({entrypoint:b.string(),embed:b.defaulted(b.boolean(),!1),idbfsMountpoints:b.optional(b.array(b.string())),nodeJsWorker:b.defaulted(b.boolean(),!1),nodefsMountpoints:b.optional(b.record(b.string(),b.string()))});async function ne(){let i=ee.resolve(__dirname,"../stlite-manifest.json"),s=await v.readFile(i,{encoding:"utf-8"}),c=JSON.parse(s);return b.assert(c,Qe),c}function Xe(i,s){let c=/\{\{(.*?)\}\}/g;return s.replace(c,(f,y)=>{try{return i.getPath(y)}catch{return console.warn(`Unknown placeholder: ${y}`),f}})}function te(i,s){return Object.fromEntries(Object.entries(s).map(([c,f])=>[c,Xe(i,f)]))}function re(i){return Promise.all(Object.values(i).map(s=>v.mkdir(s,{recursive:!0}))).catch(s=>{console.error("Failed to create nodefs mountpoints",s)}).then()}var ie=async()=>{let i=await ne(),s=[];s.push(`--entrypoint=${JSON.stringify(i.entrypoint)}`),i.idbfsMountpoints&&s.push(`--idbfs-mountpoints=${JSON.stringify(i.idbfsMountpoints)}`),i.nodeJsWorker&&s.push("--nodejs-worker");let c=new d.BrowserWindow({width:1280,height:720,webPreferences:{preload:P.join(__dirname,"preload.js"),sandbox:!0,additionalArguments:s}}),f=new URL((d.app.isPackaged,"file:///index.html")),y=new URLSearchParams;i.embed&&y.set("embed","true"),f.search=y.toString();let p=f.toString(),S=m=>Q(p,m.url);d.ipcMain.handle("readSitePackagesSnapshot",m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (readSitePackagesSnapshot) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"../site-packages-snapshot.tar.gz");return H.readFile(k)}),d.ipcMain.handle("readPrebuiltPackageNames",async m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (readPrebuiltPackageNames) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"../prebuilt-packages.txt");return(await H.readFile(k,{encoding:"utf-8"})).split(`
+`).map(j=>j.trim()).filter(j=>j.length>0)}),d.ipcMain.handle("readStreamlitAppDirectory",async m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (readStreamlitAppDirectory) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"../app_files");return Z(k)}),c.on("closed",()=>{d.ipcMain.removeHandler("readSitePackagesSnapshot"),d.ipcMain.removeHandler("readPrebuiltPackageNames"),d.ipcMain.removeHandler("readStreamlitAppDirectory")});let M=null;d.ipcMain.handle("initializeNodeJsWorker",async m=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (initializeNodeJsWorker) ${m.senderFrame.url}`);let k=P.resolve(__dirname,"..","pyodide","pyodide.mjs"),u=i.nodefsMountpoints&&te(d.app,i.nodefsMountpoints);u&&await re(u);function j(E){c.webContents.send("messageFromNodeJsWorker",E)}M=new L.default.Worker(P.resolve(__dirname,"worker.js"),{env:{PYODIDE_URL:k,...i.nodefsMountpoints&&{NODEFS_MOUNTPOINTS:JSON.stringify(u)}}}),M.on("message",E=>{j(E)})}),d.ipcMain.on("messageToNodeJsWorker",(m,{data:k,portId:u})=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (messageToNodeJsWorker) ${m.senderFrame.url}`);if(M==null)return;let j=new L.default.MessageChannel;j.port1.on("message",z=>{m.reply(`nodeJsWorker-portMessage-${u}`,z)});let E={data:k,port:j.port2};M.postMessage(E,[j.port2])}),d.ipcMain.handle("terminate",(m,{data:k,portId:u})=>{if(!S(m.senderFrame))throw new Error(`Invalid IPC sender (terminate) ${m.senderFrame.url}`);M?.terminate(),M=null}),c.on("closed",()=>{d.ipcMain.removeHandler("initializeNodeJsWorker"),d.ipcMain.removeHandler("messageToNodeJsWorker"),d.ipcMain.removeHandler("terminate")}),c.loadURL(p),d.app.isPackaged||c.webContents.openDevTools()};d.app.enableSandbox();d.app.whenReady().then(()=>{let i=P.resolve(__dirname,"..");d.protocol.handle("file",s=>{let c=new URL(s.url).pathname;if(!P.isAbsolute(c))return d.net.fetch(s,{bypassCustomProtocolHandlers:!0});let f=P.normalize(P.join(i,c)),y=new Request("file://"+f,s);return d.net.fetch(y,{bypassCustomProtocolHandlers:!0})}),ie(),d.app.on("activate",()=>{d.BrowserWindow.getAllWindows().length===0&&ie()})});d.app.on("window-all-closed",()=>{process.platform!=="darwin"&&d.app.quit()});d.app.on("web-contents-created",(i,s)=>{s.on("will-attach-webview",(c,f,y)=>{c.preventDefault()}),s.on("will-navigate",(c,f)=>{console.debug("will-navigate",f),c.preventDefault()}),s.setWindowOpenHandler(({url:c})=>(console.error("Opening a new window is not allowed."),{action:"deny"}))});

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>stlite</title><script defer="defer" src="/static/js/main.02fd259c.js"></script><link href="/static/css/main.43acb583.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>stlite</title><meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'wasm-unsafe-eval' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; worker-src 'self' blob:; script-src-elem 'self' 'unsafe-inline' https:; style-src-elem 'self' 'unsafe-inline' https:; font-src 'self' data: https:; connect-src https://data.streamlit.io/ https://*.mapbox.com/ 'self' https: data:; img-src https: blob: data: file:; media-src https: blob:; frame-src https:"><script defer="defer" src="/static/js/main.02fd259c.js"></script><link href="/static/css/main.43acb583.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stlite/desktop",
-  "version": "0.69.2",
+  "version": "0.70.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -34,6 +34,7 @@
     "build:pyodide": "curl -L https://github.com/pyodide/pyodide/releases/download/0.26.2/pyodide-core-0.26.2.tar.bz2 | tar xj -C ./build --files-from=./pyodide-files.txt",
     "build:bin": "tsc -p bin-src && ./scripts/build_bin.js",
     "build:wheels": "./scripts/copy_wheels.js",
+    "postbuild:web": "./scripts/post_build_web.js",
     "typecheck": "yarn tsc --noEmit -p electron",
     "start": "concurrently \"cross-env BROWSER=none yarn start:web\" \"wait-on http://localhost:3000 && yarn start:electron\"",
     "build:app": "yarn build:web && yarn build:electron && yarn build:pyodide",
@@ -41,8 +42,6 @@
     "dump:dev": "ts-node ./bin-src/dump_artifacts/index.ts",
     "dump": "dump-stlite-desktop-artifacts",
     "serve": "cross-env NODE_ENV=production electron .",
-    "pack": "electron-builder --dir",
-    "dist": "electron-builder",
     "fix:eslint": "eslint --fix '{src,electron,bin}/**/*.{ts,tsx}'",
     "fix:prettier": "prettier --write .",
     "check:eslint": "eslint '{src,electron,bin}/**/*.{ts,tsx}'",
@@ -70,9 +69,9 @@
   },
   "devDependencies": {
     "@craco/craco": "^7.0.0",
-    "@stlite/common": "^0.69.2",
-    "@stlite/common-react": "^0.69.2",
-    "@stlite/kernel": "^0.69.2",
+    "@stlite/common": "^0.70.0",
+    "@stlite/common-react": "^0.70.0",
+    "@stlite/kernel": "^0.70.0",
     "@streamlit/app": "1.39.0",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.0.0",
@@ -81,11 +80,10 @@
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
     "@types/yargs": "^17.0.32",
-    "electron": "30.0.8",
-    "electron-builder": "^24.13.2",
     "electron-reload": "^2.0.0-alpha.1",
     "esbuild": "^0.20.0",
     "glob": "^10.3.12",
+    "node-html-parser": "^6.1.13",
     "raw-loader": "^4.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",