win_webview2 1.0.8 → 1.0.9

package/argtype.ts

@@ -8,8 +8,15 @@ export type OpenWebArg = {
     maximize: boolean
     title: string 
     isDebugMode : boolean
+    winClassName : string
 }
 
-export type OpenDialogFileArg = {
+export type OpenDialogFileArg = { 
+    winClassName : string
     filter : string
+}
+
+
+export type OpenDialogArg = { 
+    winClassName : string 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"

package/winWebview2.d.ts

@@ -1,4 +1,4 @@
-import { OpenDialogFileArg, OpenWebArg } from "./argtype";
+import { OpenDialogArg, OpenDialogFileArg, OpenWebArg } from "./argtype";
 
  
 /**
@@ -14,5 +14,6 @@ export function openDialogFile(arg: OpenDialogFileArg): Promise<string>;
 /**
  * Open folder dialog and return selected folder path
  */
-export function openDialogFolder(): Promise<string>;
+export function openDialogFolder(arg : OpenDialogArg): Promise<string>;
+export function closeWindowWebView(arg : OpenDialogArg): Promise<string>;
   

package/winWebview2.mjs

@@ -1,12 +1,10 @@
- 
-import net from "net"
-let isOncloseSetted = false;
-const prefixWebview = "WINWEBVIEW_";
-const prefixWebviewResult = "WIN_WEBVIEW2_RESULT";
+//@ts-check
 
-/** @type {string | null} */
-let resultDataFromWebview2 = "";
-let resultInUse = false;
+import { exec, execFile } from "child_process";
+import { readFile } from "fs/promises";
+
+import { arch } from "os";
+const arc = arch();
 
 function sleep(n = 1000) {
     return new Promise((r, x) => {
@@ -14,105 +12,151 @@ function sleep(n = 1000) {
     })
 }
 
+const jsonConfigFilePath = "./win_webview2.json";
 
 /**
  * 
- * @param {object } arg 
+ * @returns {Promise<import("./ww2_builder_type").ConfigWW2> }
  */
-async function waitingResult(arg) {
-    if (resultInUse) return "";
-    resultInUse = true;
-
-    resultDataFromWebview2 = null;
+async function readConfig() {
+    let str = await readFile(jsonConfigFilePath);
+    let jsonObj = JSON.parse(str.toString());
 
-    var objstr = JSON.stringify(arg);
-    sendToPipe(`${prefixWebview}JSON` + objstr);
+    return jsonObj;
+}
 
-    while (resultDataFromWebview2 == null) {
-        await sleep(200);
-    }
+async function getExecPath() {
+    let jsonConfig = await readConfig();
+    let exeFilePath = jsonConfig.appname + ".exe";
 
-    resultInUse = false;
-    return resultDataFromWebview2;
+    return exeFilePath;
 
 }
 
- 
-  
-async function createPipe() {
-
-    // ini akan terhubung terus menerus
+/**
+* 
+* @param {import("./argtype").OpenWebArg } arg 
+*/
+export 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");
+    }
 
-    /** @type {string} */
-    // @ts-ignore
-    let PIPE_CPLUS_SENDER = process.env.PIPE_PATH + "Sender"; 
+    if (arg.kiosk) {
 
+        arrOpen.push("kiosk=true");
+    }
 
-    let client  = net.createConnection(PIPE_CPLUS_SENDER, () => {
-        console.log('Anak terhubung ke Named Pipe!');
-    });
+    if (arg.isDebugMode) {
+        arrOpen.push("isDebugMode=true");
+    }
 
-     
 
-    client.on('data', (buff) => {
-        let data = buff.toString(); 
 
-        if (!data.startsWith(prefixWebviewResult)) return false;
-        let result = data.substring(prefixWebviewResult.length);
-        resultDataFromWebview2 = result;
-    }); 
 
-    // while(true){
-    //     await sleep();
-    //     sendToPipe("ping");
-    // }
+    execFile(exeFilePath, arrOpen, (err, data) => {
+        console.log("error yaaa" + err)
+    })
 }
 
-/** 
- * @param {string} msg  
+
+
+/**
+ *
+ * @param {import("./argtype").OpenDialogFileArg} arg
+ * @returns {Promise<string>}
  */
-function sendToPipe(msg) {
-
-    /** @type {any} */
-    var PIPE_CPLUS_Reader = process.env.PIPE_PATH; 
-    let client  = net.createConnection(PIPE_CPLUS_Reader, () => {
-        console.log("PIPE_CPLUS_Reader terhubung")
-        client.write(msg);
-    });
-    client.on("error",(e)=>{
-        console.log("errornya apa  : ", e );
+export async function openDialogFile(arg) {
+    let exeFilePath = await getExecPath();
+    return new Promise((r, x) => {
+        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);
+            })
     })
 }
 
 /**
-* 
-* @param {import("./argtype").OpenWebArg } arg 
-*/
-export function openWeb(arg) {
-    if (!isOncloseSetted) {
-        isOncloseSetted = true;
-        createPipe();
-    }
-
-    arg["fun"] = "OpenWeb";
-    var objstr = JSON.stringify(arg);
-    sendToPipe(`${prefixWebview}JSON` + objstr);
+ * 
+ * @param {import("./argtype").OpenDialogArg} arg 
+ * @returns 
+ */
+export async function openDialogFolder(arg) {
+    let exeFilePath = await getExecPath();
+    return new Promise((r, x) => {
+        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);
+        })
+    })
 }
-
 /**
  * 
- * @param {import("./argtype").OpenDialogFileArg} arg 
- * @returns {Promise<string>}
+ * @param {import("./argtype").OpenDialogArg} arg 
+ * @returns 
  */
-export function openDialogFile(arg) {
-    arg["fun"] = "OpenDialogFIle";
-    return waitingResult(arg);
+export async function closeWindowWebView(arg) {
+    let exeFilePath = await getExecPath();
+    return new Promise((r, x) => {
+        execFile(exeFilePath,
+            [
+                "fun=closewindow",
+                "wndClassName=" + arg.winClassName,
+
+            ], ( 
+                /** @type {any} */
+                err,
+                /** @type {string} */
+                data) => {
+
+                 
+                r(data);
+            })
+    })
 }
 
-export async function openDialogFolder() {
-    let obj = {
-        fun: "OpenDialogFolder"
-    };
-    return waitingResult(obj);
-}
- 

package/win_lib/Win32/index.bat

@@ -0,0 +1,3 @@
+@echo off
+set exeFileDir=%cd%
+CmdWebview2.exe fun=openwebview  url=https://google.com  width=900  height=600  title=auto wndClassName=aplikasiWebView 

package/win_lib/x64/index.bat

@@ -0,0 +1,3 @@
+@echo off
+set exeFileDir=%cd%
+CmdWebview2.exe fun=openwebview  url=https://google.com  width=900  height=600  title=auto wndClassName=aplikasiWebView 

package/ww2_builder.mjs

@@ -43,6 +43,8 @@ async function askWhitList(msg, list) {
  
 
 async function run() {
+    console.log("v-22");
+
     let p = await askWhitList("menu", [
         "init_webview2",
         "deploy",

package/ww2_builder_deploy.mjs

@@ -9,7 +9,7 @@ import path from "path";
 import { logPrint } from "./ww2_builder_log.mjs";
 import { fileURLToPath } from 'url';
 import rcedit from "rcedit";
-import  sharpsToIco  from "sharp-ico"
+import sharpsToIco from "sharp-ico"
 
 
 const jsonConfigFilePath = "./win_webview2.json";
@@ -39,7 +39,7 @@ export class WW2Deploy {
             await fs.promises.mkdir(folderDist);
         }
 
-        let libFolder = path.join(folderDist,"lib");
+        let libFolder = path.join(folderDist, "lib");
         if (!fs.existsSync(libFolder)) {
             await fs.promises.mkdir(libFolder);
         }
@@ -64,15 +64,15 @@ export class WW2Deploy {
         const images = await Promise.all(sizes.map(size =>
             sharp(iconPath)
                 .resize(size, size)
-                .toFormat('png') 
+                .toFormat('png')
         ));
 
 
-        await sharpsToIco.sharpsToIco(images, outputIcon); 
+        await sharpsToIco.sharpsToIco(images, outputIcon);
 
         console.log('✅ Berhasil membuat icon.ico yang valid untuk rcedit!');
 
-         
+
     }
 
     async copyExe() {
@@ -86,15 +86,24 @@ export class WW2Deploy {
         logPrint(currentDir);
 
         let inputFileExe = path.join(currentDir, "win_lib", this.platform, "CmdWebview2.exe");
-       
-        let outFileExe = path.join(config.outdir, config.appname + ".exe"); 
-        this.outputExeFile = inputFileExe; 
+
+        let outFileExe = path.join(config.outdir, config.appname + ".exe");
+        this.outputExeFile = inputFileExe;
         await fs.promises.copyFile(inputFileExe, outFileExe);
 
         let inputFileDll = path.join(currentDir, "win_lib", this.platform, "WebView2Loader.dll");
-        let outFileDll = path.join(config.outdir,  "WebView2Loader.dll"); 
+        let outFileDll = path.join(config.outdir, "WebView2Loader.dll");
         await fs.promises.copyFile(inputFileDll, outFileDll);
 
+        await (async () => {
+            let inputFileDll = jsonConfigFilePath;
+            let outFileDll = path.join(config.outdir, "win_webview2.json");
+            await fs.promises.copyFile(inputFileDll, outFileDll);
+
+        })();
+
+
+
         logPrint("copy file success");
     }
 
@@ -120,25 +129,25 @@ export class WW2Deploy {
         this.configObjec = jsonObj;
     }
 
-    async copyNodeExe(){
-        if(this.configObjec == null) return;
+    async copyNodeExe() {
+        if (this.configObjec == null) return;
         let obj = this.configObjec;
 
         let inputNodeExe = process.execPath;
-        let outNodeExe = path.join(obj.outdir,"lib","node.exe");
+        let outNodeExe = path.join(obj.outdir, "lib", "node.exe");
         await fs.promises.copyFile(inputNodeExe, outNodeExe);
     }
 
-    async createIndexConf(){
-        if(this.configObjec == null) return;
+    async createIndexConf() {
+        if (this.configObjec == null) return;
         let obj = this.configObjec;
 
-        let oututFileConf = path.join(obj.outdir,"index.conf");
+        let oututFileConf = path.join(obj.outdir, "index.bat");
 
-        let configCtn = `./lib/node.exe ./${obj.entry_point}`
-        await fs.promises.writeFile(oututFileConf,configCtn);
+        let configCtn = `.\\\\lib\\\\node.exe ./${obj.entry_point}`
+        await fs.promises.writeFile(oututFileConf, configCtn);
     }
-    
+
     static async initWW2() {
         /** @type {ConfigWW2} */
 

package/win_lib/Win32/index.conf

@@ -1 +0,0 @@
-node ../../../../example/express_dev/index.mjs

package/win_lib/x64/index.conf

@@ -1 +0,0 @@
-node ../../../../example/express_dev/index.mjs

package/ww2_builder_deploy.d.ts

@@ -1,3 +0,0 @@
-export class WW2Deploy { 
-    static startDeploy(): Promise<void>;
-}