win_webview2 1.0.13 → 1.1.5

package/srcNode/tsExport/dirnameTool.ts

@@ -0,0 +1,34 @@
+import { fileURLToPath } from 'node:url';
+import path, { dirname } from 'node:path';
+import { existsSync } from 'node:fs';
+
+
+export function getWw2Dirname() {
+    // Trik deteksi lingkungan
+    const _filename = typeof __filename !== 'undefined'
+        ? __filename
+         // @ts-ignore:
+        : fileURLToPath(eval('import.meta.url'));
+
+    const _dirname = typeof __dirname !== 'undefined'
+        ? __dirname
+        : dirname(_filename);
+
+    let ww2ModulePath = path.join(_dirname,"../../../")
+
+    return { _dirname, _filename , ww2ModulePath};
+}
+
+export function findUserProjectRoot(currentDir : string = process.cwd()) { 
+
+    const packagePath = path.join(currentDir, 'package.json'); 
+    if (existsSync(packagePath)) {
+        return currentDir;
+    } 
+    const parentDir = path.dirname(currentDir);
+    if (parentDir === currentDir) {
+        return null;
+    } 
+    return findUserProjectRoot(parentDir);
+}
+ 

package/srcNode/tsExport/winwebview2.ts

@@ -0,0 +1,78 @@
+import { execFile } from "node:child_process";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { getWw2Dirname } from "./dirnameTool";
+import { ConfigWW2, readConfig } from "./ww2_config";
+
+interface Ww2WebConfig {
+    callback: (err: any, data: any) => void;
+    wclassname: string;
+    url: string;
+    title: string;
+
+    width: number;
+    height: number;
+    isKiosk: boolean;
+    isMaximize: boolean;
+    isDebug: boolean;
+
+}
+
+interface WW2FileDialogArg {
+    callback: (err: any, data: any) => void;
+    filter: string;
+    ownerClassName: string;
+}
+
+export interface WW2ControlWindowsArg {
+    wndClassName: string;
+    controlcmd: "close" | "move" | "maximize" | "minimize" | "resize" | "check",
+    left?: number;
+    top?: number;
+    height?: number;
+    width?: number;
+}
+
+interface Ww2Module {
+    openWeb: (arg: Ww2WebConfig) => void;
+    openFileDialog: (arg: WW2FileDialogArg) => void;
+    openFolderDialog: (arg: WW2FileDialogArg) => void;
+    controlWindow: (arg: WW2ControlWindowsArg) => void;
+}
+
+
+
+export async function getModule() {
+    let dirname = getWw2Dirname();
+
+    let filepath = path.join(
+        dirname._dirname,
+        "./ww2_addon.node"
+    );
+
+    if (!existsSync(filepath)) {
+
+        let config = await readConfig();
+        if(config == null) throw "user config null";
+        filepath = path.join(dirname._dirname, `../../../win_lib/${config.platform}/ww2_addon.node`);
+
+    }
+
+    let myAddon = require(filepath) as Ww2Module;
+    return myAddon;
+}
+
+export function closeSplash(){
+    return getModule().then((module)=>{
+        module.controlWindow({
+            controlcmd : "close",
+            wndClassName : "mysplashclassname"
+        })
+    });
+}
+
+export * from "./ww2_server"
+export {findUserProjectRoot } from "./dirnameTool"
+export {readConfig} ;
+export {getWw2Dirname}

package/srcNode/tsExport/ww2_config.ts

@@ -0,0 +1,24 @@
+import { readFile } from "node:fs/promises";
+import { findUserProjectRoot } from "./dirnameTool";
+import path from "node:path";
+
+export type ConfigWW2 = {
+    appname: string; 
+    entry_point: string;
+    outdir: string;
+    platform: 'Win32' | 'x64'
+};
+
+
+const jsonConfigFilePath = "./win_webview2.json";
+export async function readConfig() {
+    let userDir = findUserProjectRoot();
+    if (userDir == null) return null;
+
+
+
+    let str = await readFile(path.join(userDir, jsonConfigFilePath));
+    let jsonObj = JSON.parse(str.toString());
+
+    return jsonObj as ConfigWW2;
+}

package/srcNode/tsExport/ww2_server.ts

@@ -0,0 +1,157 @@
+
+import express from 'express';
+import path from 'path';
+import { Server } from 'http';
+import { AddressInfo } from 'net';
+import { getModule, WW2ControlWindowsArg } from './winwebview2';
+
+interface WW2FileDialogArg {
+    filter: string;
+    ownerClassName: string;
+}
+
+
+export type PostData = {
+    openWeb?: {
+        wclassname: string,
+        url: string,
+        title: string,
+
+        width: number,
+        height: number,
+        isKiosk: boolean,
+        isMaximize: boolean,
+        isDebug: boolean,
+    },
+    openFileDialog?: WW2FileDialogArg,
+    openFolderDialog?: WW2FileDialogArg,
+    controlWindow?: WW2ControlWindowsArg,
+}
+
+export async function ww2_CreateServer(arg: {
+    port: number,
+    onExpressCreate: (app: express.Express) => void,
+    uiConfig: {
+
+        wclassname: string,
+        title: string,
+        width: number,
+        height: number,
+        isKiosk: boolean,
+        isMaximize: boolean,
+        isDebug: boolean,
+    },
+    htmlfolder : string
+}) {
+    let port = arg.port ? arg.port : 0;
+
+    let app = express(); 
+    app.use(express.json());
+    app.use(express.static(arg.htmlfolder));
+    arg.onExpressCreate(app);
+
+    app.post("/ww2_post", async (req, res) => {
+
+        let body = req.body as PostData;
+        console.log("ww2_post", body);
+        let result = "";
+        let err = "";
+        try {
+
+
+
+            if (body.openWeb) {
+                let openWebArg = body.openWeb;
+                ww2Module.openWeb({
+                    callback: () => {
+
+                    },
+                    height: openWebArg.height,
+                    wclassname: openWebArg.wclassname,
+                    isDebug: openWebArg.isDebug,
+                    isKiosk: openWebArg.isKiosk,
+                    isMaximize: openWebArg.isMaximize,
+                    title: openWebArg.title,
+                    url: openWebArg.url,
+                    width: openWebArg.width
+                });
+
+                result = openWebArg.url;
+
+            } else if (body.controlWindow) {
+                ww2Module.controlWindow(body.controlWindow);
+            } else if (body.openFileDialog) {
+                let openFileDialogArg = body.openFileDialog;
+                result = await new Promise((r, x) => {
+                    ww2Module.openFileDialog({
+                        callback: (err, d) => {
+                            r(d);
+                        },
+                        filter: openFileDialogArg.filter,
+                        ownerClassName: openFileDialogArg.ownerClassName
+                    })
+                });
+            } else if(body.openFolderDialog){
+
+                let ofArg = body.openFolderDialog;
+                result = await new Promise((r,x)=>{
+                    ww2Module.openFolderDialog({
+                        callback : (err,data)=>{
+                            r(data);
+                        },
+                        filter : ofArg.filter,
+                        ownerClassName : ofArg.ownerClassName
+                    });
+                });
+
+            }
+        } catch (error) {
+            err = error + "";
+        }
+
+        res.json({
+            error : err,
+            result : result
+        });
+
+    });
+
+    let ww2Module = await getModule();
+
+    let server = app.listen(port, async (err) => {
+        let add = server.address();
+        if (add == null) {
+            console.log("build server failed : " + err);
+            process.exit();
+        }
+
+        let addr = add as AddressInfo;
+
+        let resultPort = addr.port;
+        let url = `http://localhost:${resultPort}`;
+
+        console.log(url);
+
+        console.log("open UI");
+
+        let uiConfig = arg.uiConfig;
+
+        ww2Module.openWeb({
+            callback: (err, data) => {
+                process.exit();
+            },
+            wclassname: uiConfig.wclassname,
+            height: uiConfig.height,
+            isDebug: uiConfig.isDebug,
+            isKiosk: uiConfig.isKiosk,
+            isMaximize: uiConfig.isMaximize,
+            title: uiConfig.title,
+            width: uiConfig.width,
+            url: url,
+
+        })
+
+    })
+
+
+}

package/srcNode/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "nodenext",
+    "declaration": true, 
+    "rootDir": "./",
+    "outDir": "../dist/node",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true
+  },
+  "include": ["./**/*"] 
+}

package/tsDistRun.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-
-const path = require("path");
-
-const entry = path.resolve(__dirname, "./tsDist/srcBuilder/ww2_build_promp.js");
-
+
+const path = require("path");
+
+const entry = path.resolve(__dirname, "./dist/node/builder/builder_promps.js");
+
 require(entry);

package/tsDist/logprint.d.ts

@@ -1 +0,0 @@
-export declare function logPrint(msg: any): void;

package/tsDist/logprint.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logPrint = logPrint;
-function logPrint(msg) {
-    console.log(new Date().toLocaleString() + ": ", msg);
-}

package/tsDist/srcBuilder/ww2_build_promp.d.ts

@@ -1 +0,0 @@
-export declare function buildForServer(): Promise<void>;

package/tsDist/srcBuilder/ww2_build_promp.js

@@ -1,31 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildForServer = buildForServer;
-const prompts_1 = __importDefault(require("prompts"));
-const ww2_buildercore_1 = require("./ww2_buildercore");
-async function buildForServer() {
-    const response = await (0, prompts_1.default)({
-        type: 'select',
-        name: 'menu',
-        message: 'Pilih menu',
-        choices: [
-            {
-                title: 'init_webview2', value: async () => {
-                    await ww2_buildercore_1.WW2Deploy.initWW2();
-                }
-            },
-            {
-                title: 'deploy', value: async () => {
-                    await ww2_buildercore_1.WW2Deploy.startDeploy();
-                }
-            },
-        ]
-    });
-    if (response && response.menu) {
-        response.menu();
-    }
-}
-buildForServer();

package/tsDist/srcBuilder/ww2_buildercore.d.ts

@@ -1,14 +0,0 @@
-import { ConfigWW2 } from './builder_tp';
-export declare class WW2Deploy {
-    configObjec?: ConfigWW2;
-    outputExeFile?: string;
-    makeDistFolder(): Promise<void>;
-    buildIcon(): Promise<void>;
-    copyExe(): Promise<void>;
-    editIcon(): Promise<void>;
-    readConfig(): Promise<void>;
-    copyNodeExe(): Promise<void>;
-    createIndexConf(): Promise<void>;
-    static initWW2(): Promise<void>;
-    static startDeploy(): Promise<void>;
-}

package/tsDist/srcBuilder/ww2_buildercore.js

@@ -1,124 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WW2Deploy = void 0;
-const fs_1 = __importDefault(require("fs"));
-const promises_1 = __importDefault(require("fs/promises"));
-const sharp_1 = __importDefault(require("sharp"));
-const path_1 = __importDefault(require("path"));
-const rcedit_1 = __importDefault(require("rcedit"));
-const sharp_ico_1 = __importDefault(require("sharp-ico"));
-const logprint_1 = require("../logprint");
-const build_copyDir_1 = require("./build_copyDir");
-const jsonConfigFilePath = "./win_webview2.json";
-class WW2Deploy {
-    async makeDistFolder() {
-        if (this.configObjec == null)
-            return;
-        let config = this.configObjec;
-        let folderDist = config.outdir;
-        if (!fs_1.default.existsSync(folderDist)) {
-            await fs_1.default.promises.mkdir(folderDist);
-        }
-        let libFolder = path_1.default.join(folderDist, "lib");
-        if (!fs_1.default.existsSync(libFolder)) {
-            await fs_1.default.promises.mkdir(libFolder);
-        }
-    }
-    async buildIcon() {
-        if (this.configObjec == null)
-            return;
-        let config = this.configObjec;
-        let iconPath = config.icon_path;
-        if (!fs_1.default.existsSync(iconPath)) {
-            (0, logprint_1.logPrint)("icon notfound");
-            return;
-        }
-        let outputIcon = path_1.default.join(config.outdir, "icon.ico");
-        const sizes = [16, 32, 48, 256]; // Ukuran standar untuk rcedit
-        const images = await Promise.all(sizes.map(size => (0, sharp_1.default)(iconPath)
-            .resize(size, size)
-            .toFormat('png')));
-        await sharp_ico_1.default.sharpsToIco(images, outputIcon);
-        console.log('✅ Berhasil membuat icon.ico yang valid untuk rcedit!');
-    }
-    async copyExe() {
-        let currentDir = path_1.default.join(__dirname, "../../");
-        if (this.configObjec == null)
-            return;
-        let config = this.configObjec;
-        let platform = config.platform;
-        let inputDir = path_1.default.join(currentDir, "win_lib", platform);
-        this.outputExeFile = path_1.default.join(config.outdir, config.appname + ".exe");
-        await (0, build_copyDir_1.copyDir)(inputDir, config.outdir);
-        await promises_1.default.rename(path_1.default.join(config.outdir, "CmdWebview2.exe"), this.outputExeFile);
-        await (async () => {
-            let inputFileDll = jsonConfigFilePath;
-            let outFileDll = path_1.default.join(config.outdir, "win_webview2.json");
-            await fs_1.default.promises.copyFile(inputFileDll, outFileDll);
-        })();
-        (0, logprint_1.logPrint)("copy file success");
-    }
-    async editIcon() {
-        if (this.outputExeFile == null)
-            return;
-        if (this.configObjec == null)
-            return;
-        let object = this.configObjec;
-        let iconPath = path_1.default.join(object.outdir, "icon.ico");
-        iconPath = path_1.default.resolve(iconPath);
-        await (0, rcedit_1.default)(this.outputExeFile, {
-            icon: iconPath,
-        });
-    }
-    async readConfig() {
-        let str = await fs_1.default.promises.readFile(jsonConfigFilePath);
-        let jsonObj = JSON.parse(str.toString());
-        this.configObjec = jsonObj;
-    }
-    async copyNodeExe() {
-        if (this.configObjec == null)
-            return;
-        let obj = this.configObjec;
-        let inputNodeExe = process.execPath;
-        let outNodeExe = path_1.default.join(obj.outdir, "lib", "node.exe");
-        await fs_1.default.promises.copyFile(inputNodeExe, outNodeExe);
-    }
-    async createIndexConf() {
-        if (this.configObjec == null)
-            return;
-        let obj = this.configObjec;
-        let oututFileConf = path_1.default.join(obj.outdir, "index.bat");
-        let configCtn = `.\\\\lib\\\\node.exe ./${obj.entry_point}`;
-        await fs_1.default.promises.writeFile(oututFileConf, configCtn);
-    }
-    static async initWW2() {
-        let objConfig = {
-            entry_point: "app.js",
-            appname: "openweb",
-            icon_path: "./icon.png",
-            outdir: "./dist",
-            platform: 'Win32'
-        };
-        let objstr = JSON.stringify(objConfig, null, 2);
-        if (fs_1.default.existsSync(jsonConfigFilePath)) {
-            (0, logprint_1.logPrint)("file config is exits");
-            return;
-        }
-        await fs_1.default.promises.writeFile(jsonConfigFilePath, objstr);
-    }
-    static async startDeploy() {
-        (0, logprint_1.logPrint)("Start Deploy win_webview2");
-        let c = new WW2Deploy();
-        await c.readConfig();
-        await c.makeDistFolder();
-        await c.buildIcon();
-        await c.copyExe();
-        await c.editIcon();
-        await c.copyNodeExe();
-        await c.createIndexConf();
-    }
-}
-exports.WW2Deploy = WW2Deploy;

package/tsDist/tsExport/winwebview2.d.ts

@@ -1,28 +0,0 @@
-export type OpenWebArg = {
-    url: string;
-    width: number;
-    height: number;
-    kiosk: boolean;
-    maximize: boolean;
-    title: string;
-    isDebugMode: boolean;
-    winClassName: string;
-};
-export type OpenDialogFileArg = {
-    winClassName: string;
-    filter: string;
-};
-export type OpenDialogArg = {
-    winClassName: string;
-};
-export declare function openWeb(arg: OpenWebArg): Promise<void>;
-export declare function openDialogFile(arg: OpenDialogFileArg): Promise<unknown>;
-export declare function openDialogFolder(arg: OpenDialogArg): Promise<unknown>;
-export declare function controlWindow(arg: {
-    winClassName: string;
-    controlcmd: "close" | "maximize" | "minimize" | "move" | "resize";
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-}): Promise<unknown>;

package/tsDist/tsExport/winwebview2.js

@@ -1,105 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.openWeb = openWeb;
-exports.openDialogFile = openDialogFile;
-exports.openDialogFolder = openDialogFolder;
-exports.controlWindow = controlWindow;
-const node_child_process_1 = require("node:child_process");
-const promises_1 = require("node:fs/promises");
-const jsonConfigFilePath = "./win_webview2.json";
-async function readConfig() {
-    let str = await (0, promises_1.readFile)(jsonConfigFilePath);
-    let jsonObj = JSON.parse(str.toString());
-    return jsonObj;
-}
-async function getExecPath() {
-    let jsonConfig = await readConfig();
-    let exeFilePath = jsonConfig.appname + ".exe";
-    return exeFilePath;
-}
-async function openWeb(arg) {
-    let jsonConfig = await readConfig();
-    let exeFilePath = jsonConfig.appname + ".exe";
-    let arrOpen = [
-        "fun=openwebview",
-        "wndClassName=" + arg.winClassName,
-        "url=" + arg.url,
-        "width=" + arg.width,
-        "height=" + arg.height,
-        //"kiosk=true",
-        //"maximize=true",
-        "title=auto",
-        //"isDebugMode=true"
-    ];
-    if (arg.maximize) {
-        arrOpen.push("maximize=true");
-    }
-    if (arg.kiosk) {
-        arrOpen.push("kiosk=true");
-    }
-    if (arg.isDebugMode) {
-        arrOpen.push("isDebugMode=true");
-    }
-    (0, node_child_process_1.execFile)(exeFilePath, arrOpen, (err, data) => {
-        console.log(err);
-    });
-}
-async function openDialogFile(arg) {
-    let exeFilePath = await getExecPath();
-    return new Promise((r, x) => {
-        (0, node_child_process_1.execFile)(exeFilePath, [
-            "fun=openFileDialog",
-            "wndClassName=" + arg.winClassName,
-            "filter=" + arg.filter,
-        ], (/** @type {any} */ err, /** @type {string} */ data) => {
-            let filepath = "";
-            for (let l of data.split("\r\n")) {
-                if (l.startsWith("result:")) {
-                    filepath = l.substring(7, l.length);
-                }
-            }
-            r(filepath);
-        });
-    });
-}
-async function openDialogFolder(arg) {
-    let exeFilePath = await getExecPath();
-    return new Promise((r, x) => {
-        (0, node_child_process_1.execFile)(exeFilePath, [
-            "fun=openFolderDialog",
-            "wndClassName=" + arg.winClassName,
-        ], (
-        /** @type {any} */
-        err, 
-        /** @type {string} */
-        data) => {
-            let filepath = "";
-            for (let l of data.split("\r\n")) {
-                if (l.startsWith("result:")) {
-                    filepath = l.substring(7, l.length);
-                }
-            }
-            r(filepath);
-        });
-    });
-}
-async function controlWindow(arg) {
-    let exeFilePath = await getExecPath();
-    return new Promise((r, x) => {
-        (0, node_child_process_1.execFile)(exeFilePath, [
-            "fun=controlwindow",
-            "wndClassName=" + arg.winClassName,
-            "controlcmd=" + arg.controlcmd,
-            "left=" + arg.left,
-            "top=" + arg.top,
-            "width=" + arg.width,
-            "height=" + arg.height,
-        ], (
-        /** @type {any} */
-        err, 
-        /** @type {string} */
-        data) => {
-            r(data);
-        });
-    });
-}

package/tsSrc/logprint.ts

@@ -1,3 +0,0 @@
-export function logPrint(msg : any) {
-    console.log(new Date().toLocaleString() + ": ", msg);
-}