win_webview2 1.0.13 → 1.1.3

package/dist/node/tsExport/ww2_server.d.ts

@@ -0,0 +1,36 @@
+import express from 'express';
+import { 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 declare 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;
+}): Promise<void>;
+export {};

package/dist/node/tsExport/ww2_server.js

@@ -0,0 +1,100 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ww2_CreateServer = ww2_CreateServer;
+const express_1 = __importDefault(require("express"));
+const winwebview2_1 = require("./winwebview2");
+async function ww2_CreateServer(arg) {
+    let port = arg.port ? arg.port : 0;
+    let app = (0, express_1.default)();
+    app.use(express_1.default.json());
+    app.use(express_1.default.static(arg.htmlfolder));
+    arg.onExpressCreate(app);
+    app.post("/ww2_post", async (req, res) => {
+        let body = req.body;
+        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 (0, winwebview2_1.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;
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.0.13",
+  "version": "1.1.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -8,25 +8,39 @@
   "description": "",
   "main": "./tsDist/tsExport/winwebview2.js",
   "types": "./tsDist/tsExport/winwebview2.d.ts",
+  "exports": {
+    "./browser": {
+      "types": "./dist/browser/ww2_browser.d.ts",
+      "default": "./dist/browser/ww2_browser.js"
+    },
+    "./node": {
+      "types": "./dist/node/tsExport/winwebview2.dt.ts",
+      "default": "./dist/node/tsExport/winwebview2.js"
+    }
+  },
   "bin": {
     "win_webview2": "tsDistRun.js"
   },
   "type": "commonjs",
   "scripts": {
-    "build": "tsc",
-    "build_watch": "tsc --watch"
+    "build": "tsc -p ./srcNode/tsconfig.json",
+    "build_watch": "npm run build -- --watch",
+    "build_browser": "tsc -p ./srcBrowser/tsconfig.json",
+    "build_browser_watch": "npm run build_browser -- --watch",
+    "copy_dll": "tsx ./buildtools/copyDll.ts"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "comment-json": "^4.6.2",
+    "degit": "^2.8.4",
+    "express": "^5.2.1",
     "prompts": "^2.4.2",
-    "rcedit": "^4.0.1",
-    "sharp": "^0.33.5",
-    "sharp-ico": "^0.1.5",
     "tsx": "^4.21.0"
   },
   "devDependencies": {
-    "@types/node": "^25.5.0",
+    "@types/express": "^5.0.6",
+    "@types/node": "^25.5.2",
     "@types/prompts": "^2.4.9",
     "typescript": "^6.0.2"
   }

package/srcBrowser/tsconfig.json

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

package/srcBrowser/ww2_browser.ts

@@ -0,0 +1,47 @@
+interface WW2FileDialogArg {
+    filter: string;
+    ownerClassName: string;
+}
+interface WW2ControlWindowsArg {
+    wndClassName: string;
+    controlcmd: "close" | "move" | "maximize" | "minimize" | "resize" | "check",
+    left?: number;
+    top?: number;
+    height?: number;
+    width?: number;
+}
+
+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 callWw2(arg : PostData){
+    let response = await fetch("/ww2_post",{
+        method : "POST",
+        body : JSON.stringify(arg),
+        headers: {
+            "Content-Type": "application/json"  
+        },
+    });
+
+    let result = await response.json() as {
+        err : string,
+        result : string,
+    }
+
+    return result;
+    
+}

package/srcNode/builder/builder_init.ts

@@ -0,0 +1,78 @@
+import { existsSync } from "fs";
+import { copyFile, mkdir, readFile, writeFile } from "fs/promises";
+import { getWw2Dirname } from "../tsExport/dirnameTool";
+import path from "path";
+import { exec, execSync } from "child_process";
+import { ConfigWW2 } from "../tsExport/ww2_config";
+import prompts from "prompts";
+ 
+
+function runCommand(command : string) {
+  try { 
+    const currentShell = process.platform === 'win32' ? 'cmd.exe' : '/bin/sh'; 
+    execSync(command, { stdio: 'inherit', shell: currentShell, killSignal : "SIGINT" });
+  } catch (error) {
+    console.error(`Command Error: ${command}`);
+    process.exit();
+  }
+}
+
+const jsonConfigFilePath = "./win_webview2.json";
+let mdirname = getWw2Dirname();
+ 
+
+interface ChoiseItem {
+    fun: () => any;
+    description: string;
+}
+
+export type WW2Choise = { [key: string]: ChoiseItem }
+
+let ww2Choise: WW2Choise = {
+
+    "ww2_typescript": {
+        description: "init win_webview2",
+        fun: async () => {
+             runCommand('npx degit nnttoo/win_webview2/example/ww2_typescript#master ww2_typescript')
+        }
+    } 
+}
+
+
+type promChoise = {
+    title: string,
+    value: () => any,
+    description: string,
+    disable? :boolean
+}
+
+export async function ww2Init() {
+     const response = await prompts({
+             type: 'select',
+             name: 'menu',
+             message: 'Pick one  example',
+             instructions: '(Use arrow keys to navigate, press enter to select)',
+             choices: (() => {
+                 let result: promChoise[] = [];
+     
+                 for (let item in ww2Choise) {
+                     let val = ww2Choise[item];
+     
+                     result.push({
+                         title: item,
+                         value: val.fun,
+                         description : val.description,
+                     });
+                 } 
+                 return result;
+     
+     
+             })(),
+         });
+         if (response && response.menu) {
+     
+            await  response.menu();
+         }
+     
+
+}

package/srcNode/builder/builder_promps.ts

@@ -0,0 +1,93 @@
+
+import prompts from 'prompts'; 
+import { ww2Init } from './builder_init';
+import { readUserScripts } from './userExec';
+
+interface ChoiseItem {
+    fun: () => any;
+    description: string;
+}
+
+export type WW2Choise = { [key: string]: ChoiseItem }
+
+let ww2Choise: WW2Choise = {
+
+    "init_win_webview2": {
+        description: "init win_webview2",
+        fun: async () => {
+            await ww2Init();
+        }
+    } 
+}
+
+type promChoise = {
+    title: string,
+    value: () => any,
+    description: string,
+    disable? :boolean
+}
+
+export async function buildForServer() {
+    let userChoise = await readUserScripts();
+    if(userChoise != null){
+        ww2Choise = {
+            ...ww2Choise,
+            ...userChoise
+        }
+    }
+
+    const response = await prompts({
+        type: 'select',
+        name: 'menu',
+        message: 'Pick one',
+        instructions: '(Use arrow keys to navigate, press enter to select)',
+        choices: (() => {
+            let result: promChoise[] = [];
+
+            for (let item in ww2Choise) {
+                let val = ww2Choise[item];
+
+                result.push({
+                    title: item,
+                    value: val.fun,
+                    description : val.description,
+                });
+            } 
+            return result;
+
+
+        })(),
+    });
+    if (response && response.menu) {
+
+       await  response.menu();
+    }
+}
+console.log("ww2 version : v6 \n\n");
+const args = process.argv.slice(2);
+
+
+if (args.length > 0) {
+
+    let argument = args[0] as string;
+    if (argument.startsWith("--")) {
+        argument = argument.substring(2);
+    }
+
+    console.log(argument);
+    if (ww2Choise[argument]) {
+        ww2Choise[argument].fun();
+    }
+
+} else {
+
+    buildForServer();
+}
+
+process.on('SIGINT', () => {
+  console.log('\n[Sinyal SIGINT Terdeteksi]');
+  console.log('User menekan Ctrl+C. Membersihkan data...');
+  
+  // Anda harus memanggil exit secara manual jika menggunakan listener ini
+  process.exit(0); 
+});

package/srcNode/builder/userExec.ts

@@ -0,0 +1,54 @@
+import path from "node:path";
+import { findUserProjectRoot } from "../tsExport/dirnameTool";
+import { readFile } from "node:fs/promises";
+import { parse } from "comment-json";
+import { WW2Choise } from "./builder_promps";
+import { execSync } from "node:child_process";
+
+interface MyPkg{
+    name? : string,
+    scripts? : {[key : string] : string} 
+}
+
+function runNpm(command : string) {
+  try { 
+    const currentShell = process.platform === 'win32' ? 'cmd.exe' : '/bin/sh';
+    let cmd = `npm run ${command}`;
+    console.log(cmd);
+    execSync(cmd, { stdio: 'inherit', shell: currentShell, killSignal : "SIGINT" });
+  } catch (error) {
+    console.error(`Command Error: ${command}`);
+    process.exit();
+  }
+}
+
+export async function readUserScripts(){
+    let dirUser = findUserProjectRoot();
+    if(dirUser == null) return;
+
+    let pkgJson = path.join(dirUser, "package.json");
+    let pkgTxt = await readFile(pkgJson,"utf-8");
+
+    let obj = parse(pkgTxt) as MyPkg;
+ 
+    if(obj.scripts == null) return;
+
+    let ww2Choise : WW2Choise = {};
+
+    let name = obj.name? obj.name : "";
+
+    for(let kscript in obj.scripts){
+        let cmd = obj.scripts[kscript];
+
+        ww2Choise["--"+kscript] = {
+            description :  name + " : " + cmd,
+            fun : ()=>{
+                runNpm(kscript);
+            }
+        }
+
+    }
+
+    return ww2Choise;
+
+}

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;
+}