@stlite/desktop 0.49.2 → 0.49.3

package/build/electron/main.js

@@ -1,164 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const electron_1 = require("electron");
-const path = require("path");
-const fsPromises = require("fs/promises");
-const file_1 = require("./file");
-if (process.env.NODE_ENV === "development") {
-    console.log("Hot-reloading Electron enabled");
-    require("electron-reload")(__dirname, {
-        electron: path.resolve(__dirname, process.platform === "win32"
-            ? "../../node_modules/electron/dist/electron.exe"
-            : "../../node_modules/.bin/electron"),
-    });
-}
-async function readManifest() {
-    const manifestPath = path.resolve(__dirname, "../stlite-manifest.json");
-    const manifestText = await fsPromises.readFile(manifestPath, {
-        encoding: "utf-8",
-    });
-    const maybeManifestData = JSON.parse(manifestText);
-    return {
-        embed: maybeManifestData.embed ?? false,
-    };
-}
-const createWindow = async () => {
-    const manifest = await readManifest();
-    const mainWindow = new electron_1.BrowserWindow({
-        width: 1280,
-        height: 720,
-        webPreferences: {
-            preload: path.join(__dirname, "preload.js"),
-            sandbox: true, // https://www.electronjs.org/docs/latest/tutorial/security#4-enable-process-sandboxing
-        },
-    });
-    const indexUrlObj = new URL(electron_1.app.isPackaged || process.env.NODE_ENV === "production"
-        ? "file:///index.html"
-        : "http://localhost:3000/");
-    const indexUrlParams = new URLSearchParams();
-    if (manifest.embed) {
-        indexUrlParams.set("embed", "true");
-    }
-    indexUrlObj.search = indexUrlParams.toString();
-    const indexUrl = indexUrlObj.toString();
-    // Check the IPC sender in every callback below,
-    // following the security best practice, "17. Validate the sender of all IPC messages."
-    // https://www.electronjs.org/docs/latest/tutorial/security#17-validate-the-sender-of-all-ipc-messages
-    const isValidIpcSender = (frame) => {
-        return frame.url === indexUrl;
-    };
-    electron_1.ipcMain.handle("readSitePackagesSnapshot", (ev) => {
-        if (!isValidIpcSender(ev.senderFrame)) {
-            throw new Error("Invalid IPC sender");
-        }
-        // This archive file has to be created by ./bin/dump_snapshot.ts
-        const archiveFilePath = path.resolve(__dirname, "../site-packages-snapshot.tar.gz");
-        return fsPromises.readFile(archiveFilePath);
-    });
-    electron_1.ipcMain.handle("readRequirements", async (ev) => {
-        if (!isValidIpcSender(ev.senderFrame)) {
-            throw new Error("Invalid IPC sender");
-        }
-        const requirementsTxtPath = path.resolve(__dirname, "../requirements.txt");
-        const requirementsTxtData = await fsPromises.readFile(requirementsTxtPath, {
-            encoding: "utf-8",
-        });
-        return requirementsTxtData
-            .split("\n")
-            .map((r) => r.trim())
-            .filter((r) => r.length > 0); // Assuming that the input `requirements.txt` file is generated by `dump-artifacts.js` and can be parsed with this simple logic.
-    });
-    electron_1.ipcMain.handle("readStreamlitAppDirectory", async (ev) => {
-        if (!isValidIpcSender(ev.senderFrame)) {
-            throw new Error("Invalid IPC sender");
-        }
-        const streamlitAppDir = path.resolve(__dirname, "../streamlit_app");
-        return (0, file_1.walkRead)(streamlitAppDir);
-    });
-    mainWindow.on("closed", () => {
-        electron_1.ipcMain.removeHandler("readSitePackagesSnapshot");
-        electron_1.ipcMain.removeHandler("readRequirements");
-        electron_1.ipcMain.removeHandler("readStreamlitAppDirectory");
-    });
-    // Even when the entrypoint is a local file like the production build,
-    // we use .loadURL() with an absolute URL with the `file://` schema
-    // instead of passing a file path to .loadFile()
-    // because absolute URLs with the file:// scheme will be resolved
-    // to absolute file paths based on the special handler
-    // registered through `interceptFileProtocol` below.
-    mainWindow.loadURL(indexUrl);
-    if (!electron_1.app.isPackaged) {
-        mainWindow.webContents.openDevTools();
-    }
-};
-// Enable process sandboxing globally (https://www.electronjs.org/docs/latest/tutorial/sandbox#enabling-the-sandbox-globally),
-// following the security best practice, "4. Enable process sandboxing."
-// https://www.electronjs.org/docs/latest/tutorial/security#4-enable-process-sandboxing
-electron_1.app.enableSandbox();
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-electron_1.app.whenReady().then(() => {
-    // Resolve absolute paths based on the bundled directory.
-    // It is assumed that the resource paths are absolute paths starting with "/",
-    // which is configured at `package.json` with the `"homepage"` field.
-    // Ref: https://github.com/electron/electron/issues/4612#issuecomment-189116655
-    const bundleBasePath = path.resolve(__dirname, "..");
-    electron_1.protocol.interceptFileProtocol("file", function (req, callback) {
-        const filePath = new URL(req.url).pathname; // `file://<absolute_path>?<query>#<hash>` -> `<absolute_path>`
-        if (path.isAbsolute(filePath)) {
-            const resolvedFilePath = path.join(bundleBasePath, filePath);
-            callback(path.normalize(resolvedFilePath));
-        }
-        else {
-            callback(filePath);
-        }
-    });
-    createWindow();
-    electron_1.app.on("activate", () => {
-        // On macOS it's common to re-create a window in the app when the
-        // dock icon is clicked and there are no other windows open.
-        if (electron_1.BrowserWindow.getAllWindows().length === 0)
-            createWindow();
-    });
-});
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
-electron_1.app.on("window-all-closed", () => {
-    if (process.platform !== "darwin")
-        electron_1.app.quit();
-});
-electron_1.app.on("web-contents-created", (event, contents) => {
-    // Intercepts webView creation events and forbid all,
-    // following the security best practice, "12. Verify WebView options before creation."
-    // https://www.electronjs.org/docs/latest/tutorial/security#12-verify-webview-options-before-creation
-    contents.on("will-attach-webview", (event, webPreferences, params) => {
-        // Cancels all webView creation request
-        event.preventDefault();
-    });
-    // Intercepts navigation and forbid all,
-    // following the security best practice, "13. Disable or limit navigation."
-    // https://www.electronjs.org/docs/latest/tutorial/security#13-disable-or-limit-navigation
-    contents.on("will-navigate", (event, navigationUrl) => {
-        console.debug("will-navigate", navigationUrl);
-        event.preventDefault();
-    });
-    // Limit new windows creation,
-    // following the security best practice, "14. Disable or limit creation of new windows."
-    // https://www.electronjs.org/docs/latest/tutorial/security#14-disable-or-limit-creation-of-new-windows
-    contents.setWindowOpenHandler(({ url }) => {
-        console.error("Opening a new window is not allowed.");
-        // TODO: Implement `isSafeForExternalOpen()` below with a configurable allowed list.
-        // We'll ask the operating system
-        // to open this event's url in the default browser.
-        // DON'T pass an arbitrary URL to `shell.openExternal()` here
-        // as advised at "15. Do not use shell.openExternal with untrusted content."
-        // if (isSafeForExternalOpen(url)) {
-        //   setImmediate(() => {
-        //     shell.openExternal(url)
-        //   })
-        // }
-        return { action: "deny" };
-    });
-});
+var b=Object.create;var w=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty;var u=(t,e,r,a)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of x(e))!y.call(t,s)&&s!==r&&w(t,s,{get:()=>e[s],enumerable:!(a=_(e,s))||a.enumerable});return t};var p=(t,e,r)=>(r=t!=null?b(R(t)):{},u(e||!t||!t.__esModule?w(r,"default",{value:t,enumerable:!0}):r,t)),D=t=>u(w({},"__esModule",{value:!0}),t);var S={};module.exports=D(S);var n=require("electron"),o=p(require("path")),f=p(require("fs/promises"));var c=p(require("fs/promises")),l=p(require("path"));async function P(t){let e={},r=await c.readdir(t);return await Promise.all(r.map(async a=>{let s=l.join(t,a);if((await c.stat(s)).isDirectory()){let i=await P(s);Object.assign(e,i)}else{let i=await c.readFile(s);e[s]=i}})),e}async function g(t){let e=await P(t),r={};return Object.keys(e).forEach(a=>{let d=l.relative(t,a).split(l.sep).join(l.posix.sep);r[d]=e[a]}),r}async function F(){let t=o.resolve(__dirname,"../stlite-manifest.json"),e=await f.readFile(t,{encoding:"utf-8"});return{embed:JSON.parse(e).embed??!1}}var v=async()=>{let t=await F(),e=new n.BrowserWindow({width:1280,height:720,webPreferences:{preload:o.join(__dirname,"preload.js"),sandbox:!0}}),r=new URL((n.app.isPackaged,"file:///index.html")),a=new URLSearchParams;t.embed&&a.set("embed","true"),r.search=a.toString();let s=r.toString(),d=i=>i.url===s;n.ipcMain.handle("readSitePackagesSnapshot",i=>{if(!d(i.senderFrame))throw new Error("Invalid IPC sender");let m=o.resolve(__dirname,"../site-packages-snapshot.tar.gz");return f.readFile(m)}),n.ipcMain.handle("readRequirements",async i=>{if(!d(i.senderFrame))throw new Error("Invalid IPC sender");let m=o.resolve(__dirname,"../requirements.txt");return(await f.readFile(m,{encoding:"utf-8"})).split(`
+`).map(h=>h.trim()).filter(h=>h.length>0)}),n.ipcMain.handle("readStreamlitAppDirectory",async i=>{if(!d(i.senderFrame))throw new Error("Invalid IPC sender");let m=o.resolve(__dirname,"../streamlit_app");return g(m)}),e.on("closed",()=>{n.ipcMain.removeHandler("readSitePackagesSnapshot"),n.ipcMain.removeHandler("readRequirements"),n.ipcMain.removeHandler("readStreamlitAppDirectory")}),e.loadURL(s),n.app.isPackaged||e.webContents.openDevTools()};n.app.enableSandbox();n.app.whenReady().then(()=>{let t=o.resolve(__dirname,"..");n.protocol.interceptFileProtocol("file",function(e,r){let a=new URL(e.url).pathname;if(o.isAbsolute(a)){let s=o.join(t,a);r(o.normalize(s))}else r(a)}),v(),n.app.on("activate",()=>{n.BrowserWindow.getAllWindows().length===0&&v()})});n.app.on("window-all-closed",()=>{process.platform!=="darwin"&&n.app.quit()});n.app.on("web-contents-created",(t,e)=>{e.on("will-attach-webview",(r,a,s)=>{r.preventDefault()}),e.on("will-navigate",(r,a)=>{console.debug("will-navigate",a),r.preventDefault()}),e.setWindowOpenHandler(({url:r})=>(console.error("Opening a new window is not allowed."),{action:"deny"}))});

package/build/electron/preload.js

@@ -1,8 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const electron_1 = require("electron");
-electron_1.contextBridge.exposeInMainWorld("archives", {
-    readSitePackagesSnapshot: () => electron_1.ipcRenderer.invoke("readSitePackagesSnapshot"),
-    readRequirements: () => electron_1.ipcRenderer.invoke("readRequirements"),
-    readStreamlitAppDirectory: () => electron_1.ipcRenderer.invoke("readStreamlitAppDirectory"),
-});
+var e=require("electron");e.contextBridge.exposeInMainWorld("archives",{readSitePackagesSnapshot:()=>e.ipcRenderer.invoke("readSitePackagesSnapshot"),readRequirements:()=>e.ipcRenderer.invoke("readRequirements"),readStreamlitAppDirectory:()=>e.ipcRenderer.invoke("readStreamlitAppDirectory")});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stlite/desktop",
-  "version": "0.49.2",
+  "version": "0.49.3",
   "license": "Apache-2.0",
   "homepage": "/",
   "main": "./build/electron/main.js",
@@ -18,10 +18,10 @@
     "build:web": "craco build && rimraf 'build/**/*.whl' && rimraf 'build/pypi'",
     "test": "craco test",
     "eject": "craco eject",
-    "start:electron": "concurrently \"tsc -p electron -w\" \"cross-env NODE_ENV=\"development\" electron .\"",
-    "build:electron": "tsc -p electron",
+    "start:electron": "tsc -p electron && cross-env NODE_ENV=development concurrently \"./scripts/build_electron.js --watch\" \"electron .\"",
+    "build:electron": "tsc -p electron && cross-env NODE_ENV=production ./scripts/build_electron.js",
     "build:pyodide": "curl -L https://github.com/pyodide/pyodide/releases/download/0.25.0/pyodide-core-0.25.0.tar.bz2 | tar xj -C ./build --files-from=./pyodide-files.txt",
-    "build:bin": "./scripts/build_bin.js",
+    "build:bin": "tsc -p bin-src && ./scripts/build_bin.js",
     "build:wheels": "./scripts/copy_wheels.js",
     "typecheck": "yarn tsc --noEmit -p electron",
     "start": "concurrently \"cross-env BROWSER=none yarn start:web\" \"wait-on http://localhost:3000 && yarn start:electron\"",
@@ -60,9 +60,9 @@
   },
   "devDependencies": {
     "@craco/craco": "^7.0.0",
-    "@stlite/common": "^0.49.2",
-    "@stlite/common-react": "^0.49.2",
-    "@stlite/kernel": "^0.49.2",
+    "@stlite/common": "^0.49.3",
+    "@stlite/common-react": "^0.49.3",
+    "@stlite/kernel": "^0.49.3",
     "@streamlit/app": "1.32.2",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.0.0",

package/build/electron/file.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkRead = void 0;
-const fsPromises = require("fs/promises");
-const path = require("path");
-/**
- * Returns an object whose keys are absolute paths of the files and values are the file contents.
- * Note that the paths are OS-specific, "/" for POSIX and "\" for Windows,
- * so this function is only expected to be called from `walkRead()` that converts the paths to be POSIX.
- */
-async function walkReadAbsPath(dirPath) {
-    const fileContents = {};
-    const childNames = await fsPromises.readdir(dirPath);
-    await Promise.all(childNames.map(async (childName) => {
-        const childPath = path.join(dirPath, childName);
-        const stat = await fsPromises.stat(childPath);
-        if (stat.isDirectory()) {
-            const childFileContents = await walkReadAbsPath(childPath);
-            Object.assign(fileContents, childFileContents);
-        }
-        else {
-            const fileBin = await fsPromises.readFile(childPath);
-            fileContents[childPath] = fileBin;
-        }
-    }));
-    return fileContents;
-}
-async function walkRead(dirPath) {
-    const fileContents = await walkReadAbsPath(dirPath);
-    const relPathFileContents = {};
-    Object.keys(fileContents).forEach((absPath) => {
-        const relPath = path.relative(dirPath, absPath);
-        const posixRelPath = relPath.split(path.sep).join(path.posix.sep); // Convert the path separators on Windows to POSIX ones.
-        relPathFileContents[posixRelPath] = fileContents[absPath];
-    });
-    return relPathFileContents;
-}
-exports.walkRead = walkRead;