win_webview2 1.0.0 → 1.0.2

package/README.md

@@ -8,7 +8,7 @@ Win Webview2 is a GUI toolkit for building desktop applications with Node.js. It
 Run the following command:  
 
 ```sh
-npx ww2_builder
+npx win_webview2
 ```  
 
 A menu will appear in the terminal with the following options:  

package/index.js

@@ -22,19 +22,7 @@ ffi.Library(webviewDllPath);
  
 module.exports = {
 
-    
-    /**
-     * @typedef SimpleFFIcallback
-     * 
-     * @param {(string : str)=>void} jscallback 
-     * @return {SimpleFFIcallback}
-     */
-    createFFIcallback : (jscallback)=>{
-        return ffi.Callback('void', ['string'], (g) => {
-            jscallback(g);
-        })
-    },
-
+   
 
     // void OpenWebview(
     //     const char* url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -9,12 +9,12 @@
   "main": "index.js",
   "exports": "./winWebview2.mjs",
   "bin": {
-    "ww2_builder": "./ww2_builder.mjs"
+    "win_webview2": "./ww2_builder.mjs"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "prompts": "^2.4.2",
+    "prompts": "^2.4.3",
     "rcedit": "^4.0.1",
     "sharp": "^0.33.5",
     "sharp-ico": "^0.1.5"

package/winWebview2.mjs

@@ -1,4 +1,6 @@
 // @ts-check
+
+import net from "net"
 let isOncloseSetted = false;
 const prefixWebview = "WINWEBVIEW_";
 const prefixWebviewResult = "WIN_WEBVIEW2_RESULT";
@@ -7,15 +9,10 @@ const prefixWebviewResult = "WIN_WEBVIEW2_RESULT";
 let resultDataFromWebview2 = "";
 let resultInUse = false;
 
-
-/**
- * 
- * @param {number} n 
- */
-function sleep(n){
-   return new Promise((r,x)=>{
-      setTimeout(r,n);
-   })
+function sleep(n = 1000) {
+    return new Promise((r, x) => {
+        setTimeout(r, n);
+    })
 }
 
 
@@ -23,63 +20,82 @@ function sleep(n){
  * 
  * @param {object } arg 
  */
-async function waitingResult(arg){
-   if(resultInUse ) return "";
-   resultInUse = true; 
-   
-   resultDataFromWebview2 = null; 
-   
-   var objstr = JSON.stringify(arg);
-   console.log(`${prefixWebview}JSON` + objstr);
-
-   while(resultDataFromWebview2 == null){
-      await sleep(200);
-   }
-
-   resultInUse = false;
-   return resultDataFromWebview2;
+async function waitingResult(arg) {
+    if (resultInUse) return "";
+    resultInUse = true;
 
-}
+    resultDataFromWebview2 = null;
 
+    var objstr = JSON.stringify(arg);
+    sendToPipe(`${prefixWebview}JSON` + objstr);
+
+    while (resultDataFromWebview2 == null) {
+        await sleep(200);
+    }
+
+    resultInUse = false;
+    return resultDataFromWebview2;
 
-/**
- * 
- * @param {string} data 
- */
-function setToResult(data){
-   if(!data.startsWith(prefixWebviewResult)) return false;
-   let result = data.substring(prefixWebviewResult.length);
-   resultDataFromWebview2 = result; 
-   return true;
 }
 
-function setOnClosed() {
-   process.stdin.on("data", (dataIn) => {
-      let data = dataIn.toString();
-      if(setToResult(data)) return;
-
-      console.log(data);
-      if (data == `${prefixWebview}MAINPAGEISCLOSED`) {
-         console.log("server diclose");
-         process.exit();
-      }
-   })
+ 
+  
+async function createPipe() {
+
+    // ini akan terhubung terus menerus
+
+    /** @type {string} */
+    // @ts-ignore
+    let PIPE_CPLUS_SENDER = process.env.PIPE_PATH + "Sender"; 
+
+
+    let client  = net.createConnection(PIPE_CPLUS_SENDER, () => {
+        console.log('Anak terhubung ke Named Pipe!');
+    });
+
+    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");
+    // }
 }
 
+/** 
+ * @param {string} msg  
+ */
+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 );
+    })
+}
 
 /**
 * 
 * @param {import("./argtype").OpenWebArg } arg 
 */
 export function openWeb(arg) {
-   if(!isOncloseSetted){
-      isOncloseSetted = true;
-      setOnClosed();
-   }
-
-   arg["fun"] = "OpenWeb";
-   var objstr = JSON.stringify(arg);
-   console.log(`${prefixWebview}JSON` + objstr);
+    if (!isOncloseSetted) {
+        isOncloseSetted = true;
+        createPipe();
+    }
+
+    arg["fun"] = "OpenWeb";
+    var objstr = JSON.stringify(arg);
+    sendToPipe(`${prefixWebview}JSON` + objstr);
 }
 
 /**
@@ -87,14 +103,14 @@ export function openWeb(arg) {
  * @param {import("./argtype").OpenDialogFileArg} arg 
  * @returns {Promise<string>}
  */
-export  function openDialogFile(arg){
-   arg["fun"] = "OpenDialogFIle";
-   return waitingResult(arg); 
+export function openDialogFile(arg) {
+    arg["fun"] = "OpenDialogFIle";
+    return waitingResult(arg);
 }
 
-export async function openDialogFolder(){
-   let obj = {
-      fun : "OpenDialogFolder"
-   };
-   return waitingResult(obj);  
+export async function openDialogFolder() {
+    let obj = {
+        fun: "OpenDialogFolder"
+    };
+    return waitingResult(obj);
 }