win_webview2 1.0.13 → 1.1.3

package/buildtools/copyDll.ts

@@ -0,0 +1,71 @@
+import { exec } from "node:child_process";
+import { copyFile, mkdir } from "node:fs/promises";
+import path from "node:path";
+
+function debugDir(dirPath: string) {
+    exec("cd " + dirPath + "&& dir", (s, o) => {
+        console.log(o);
+    })
+}
+
+(async () => {
+
+    let result = "\n";
+
+    let rootPath = path.join(__dirname, "../../");
+    let copyFromRoot = async (src: string, target: string) => {
+        result += "\n" + target;
+        await copyFile(path.join(rootPath, src), path.join(rootPath, target));
+    }
+
+    try {
+
+        await mkdir(path.join(rootPath, "win_webview2/win_lib/Win32"));
+        await mkdir(path.join(rootPath, "win_webview2/win_lib/x64"));
+    } catch (error) {
+
+    }
+
+    await copyFromRoot(
+        "exeOpener/build/x64/exeOpenner.exe",
+        "win_webview2/win_lib/x64/exeOpenner.exe"
+    );
+    await copyFromRoot(
+        "exeOpener/build/x64/splash.png",
+        "win_webview2/win_lib/x64/splash.png"
+    );
+
+    await copyFromRoot(
+        "exeOpener/build/x86/exeOpenner.exe",
+        "win_webview2/win_lib/Win32/exeOpenner.exe"
+    );
+    await copyFromRoot(
+        "exeOpener/build/x86/splash.png",
+        "win_webview2/win_lib/Win32/splash.png"
+    );
+
+    console.log("copy webview2 32");
+    await copyFromRoot(
+        "nodeAddOn/build/ia32/Release/ww2_addon.node",
+        "win_webview2/win_lib/Win32/ww2_addon.node"
+    );
+    await copyFromRoot(
+        "nodeAddOn/build/ia32/Release/WebView2Loader.dll",
+        "win_webview2/win_lib/Win32/WebView2Loader.dll"
+    );
+
+    console.log("copy webview2 64");
+    await copyFromRoot(
+        "nodeAddOn/build/x64/Release/ww2_addon.node",
+        "win_webview2/win_lib/x64/ww2_addon.node"
+    );
+    await copyFromRoot(
+        "nodeAddOn/build/x64/Release/WebView2Loader.dll",
+        "win_webview2/win_lib/x64/WebView2Loader.dll"
+    );
+
+
+
+    console.log("copy done :" + result);
+
+})();

package/{tsconfig.json → buildtools/tsconfig.json}

@@ -1,13 +1,13 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "CommonJS",
-    "declaration": true,
-    "rootDir": "./tsSrc",
-    "outDir": "./tsDist",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true
-  },
-  "include": ["tsSrc"]
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "CommonJS",
+    "declaration": true,
+    "rootDir": "./",
+    "outDir": "./tsDist",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true
+  },
+  "include": ["./"]
 }

package/dist/browser/ww2_browser.d.ts

@@ -0,0 +1,32 @@
+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 declare function callWw2(arg: PostData): Promise<{
+    err: string;
+    result: string;
+}>;
+export {};

package/dist/browser/ww2_browser.js

@@ -0,0 +1,11 @@
+export async function callWw2(arg) {
+    let response = await fetch("/ww2_post", {
+        method: "POST",
+        body: JSON.stringify(arg),
+        headers: {
+            "Content-Type": "application/json"
+        },
+    });
+    let result = await response.json();
+    return result;
+}

package/{tsDist/srcBuilder → dist/node/builder}/build_copyDir.d.ts

@@ -1 +1 @@
-export declare function copyDir(source: string, destination: string): Promise<void>;
+export declare function copyDir(source: string, destination: string): Promise<void>;

package/{tsDist/srcBuilder → dist/node/builder}/build_copyDir.js

@@ -1,24 +1,24 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyDir = copyDir;
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-async function copyDir(source, destination) {
-    // pastikan folder tujuan ada
-    await fs_1.promises.mkdir(destination, { recursive: true });
-    const entries = await fs_1.promises.readdir(source, { withFileTypes: true });
-    for (const entry of entries) {
-        let srcPath = path_1.default.join(source, entry.name);
-        let destPath = path_1.default.join(destination, entry.name);
-        if (entry.isDirectory()) {
-            // rekursif ke subfolder
-            await copyDir(srcPath, destPath);
-        }
-        else {
-            await fs_1.promises.copyFile(srcPath, destPath);
-        }
-    }
-}
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.copyDir = copyDir;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+async function copyDir(source, destination) {
+    // pastikan folder tujuan ada
+    await fs_1.promises.mkdir(destination, { recursive: true });
+    const entries = await fs_1.promises.readdir(source, { withFileTypes: true });
+    for (const entry of entries) {
+        let srcPath = path_1.default.join(source, entry.name);
+        let destPath = path_1.default.join(destination, entry.name);
+        if (entry.isDirectory()) {
+            // rekursif ke subfolder
+            await copyDir(srcPath, destPath);
+        }
+        else {
+            await fs_1.promises.copyFile(srcPath, destPath);
+        }
+    }
+}

package/dist/node/builder/builder_deploy.d.ts

@@ -0,0 +1,2 @@
+export declare namespace WW2Builder {
+}

package/{tsDist/srcBuilder/builder_tp.js → dist/node/builder/builder_deploy.js}

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/node/builder/builder_init.d.ts

@@ -0,0 +1,9 @@
+interface ChoiseItem {
+    fun: () => any;
+    description: string;
+}
+export type WW2Choise = {
+    [key: string]: ChoiseItem;
+};
+export declare function ww2Init(): Promise<void>;
+export {};

package/dist/node/builder/builder_init.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ww2Init = ww2Init;
+const dirnameTool_1 = require("../tsExport/dirnameTool");
+const child_process_1 = require("child_process");
+const prompts_1 = __importDefault(require("prompts"));
+function runCommand(command) {
+    try {
+        const currentShell = process.platform === 'win32' ? 'cmd.exe' : '/bin/sh';
+        (0, child_process_1.execSync)(command, { stdio: 'inherit', shell: currentShell, killSignal: "SIGINT" });
+    }
+    catch (error) {
+        console.error(`Command Error: ${command}`);
+        process.exit();
+    }
+}
+const jsonConfigFilePath = "./win_webview2.json";
+let mdirname = (0, dirnameTool_1.getWw2Dirname)();
+let ww2Choise = {
+    "ww2_typescript": {
+        description: "init win_webview2",
+        fun: async () => {
+            runCommand('npx degit nnttoo/win_webview2/example/ww2_typescript#master ww2_typescript');
+        }
+    }
+};
+async function ww2Init() {
+    const response = await (0, prompts_1.default)({
+        type: 'select',
+        name: 'menu',
+        message: 'Pick one  example',
+        instructions: '(Use arrow keys to navigate, press enter to select)',
+        choices: (() => {
+            let result = [];
+            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/dist/node/builder/builder_promps.d.ts

@@ -0,0 +1,9 @@
+interface ChoiseItem {
+    fun: () => any;
+    description: string;
+}
+export type WW2Choise = {
+    [key: string]: ChoiseItem;
+};
+export declare function buildForServer(): Promise<void>;
+export {};

package/dist/node/builder/builder_promps.js

@@ -0,0 +1,68 @@
+"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 builder_init_1 = require("./builder_init");
+const userExec_1 = require("./userExec");
+let ww2Choise = {
+    "init_win_webview2": {
+        description: "init win_webview2",
+        fun: async () => {
+            await (0, builder_init_1.ww2Init)();
+        }
+    }
+};
+async function buildForServer() {
+    let userChoise = await (0, userExec_1.readUserScripts)();
+    if (userChoise != null) {
+        ww2Choise = {
+            ...ww2Choise,
+            ...userChoise
+        };
+    }
+    const response = await (0, prompts_1.default)({
+        type: 'select',
+        name: 'menu',
+        message: 'Pick one',
+        instructions: '(Use arrow keys to navigate, press enter to select)',
+        choices: (() => {
+            let result = [];
+            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];
+    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/dist/node/builder/dirnameTool.d.ts

@@ -0,0 +1,4 @@
+export declare function getDirname(): {
+    _dirname: string;
+    _filename: string;
+};

package/dist/node/builder/dirnameTool.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDirname = getDirname;
+const node_url_1 = require("node:url");
+const node_path_1 = require("node:path");
+function getDirname() {
+    // Trik deteksi lingkungan
+    const _filename = typeof __filename !== 'undefined'
+        ? __filename
+        // @ts-ignore:
+        : (0, node_url_1.fileURLToPath)(eval('import.meta.url'));
+    const _dirname = typeof __dirname !== 'undefined'
+        ? __dirname
+        : (0, node_path_1.dirname)(_filename);
+    return { _dirname, _filename };
+}

package/dist/node/builder/tools.d.ts

@@ -0,0 +1,4 @@
+export declare function getDirname(): {
+    _dirname: string;
+    _filename: string;
+};

package/dist/node/builder/tools.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDirname = getDirname;
+const node_url_1 = require("node:url");
+const node_path_1 = require("node:path");
+function getDirname() {
+    // Trik deteksi lingkungan
+    const _filename = typeof __filename !== 'undefined'
+        ? __filename
+        : (0, node_url_1.fileURLToPath)(import.meta.url);
+    const _dirname = typeof __dirname !== 'undefined'
+        ? __dirname
+        : (0, node_path_1.dirname)(_filename);
+    return { _dirname, _filename };
+}

package/dist/node/builder/userExec.d.ts

@@ -0,0 +1,2 @@
+import { WW2Choise } from "./builder_promps";
+export declare function readUserScripts(): Promise<WW2Choise | undefined>;

package/dist/node/builder/userExec.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readUserScripts = readUserScripts;
+const node_path_1 = __importDefault(require("node:path"));
+const dirnameTool_1 = require("../tsExport/dirnameTool");
+const promises_1 = require("node:fs/promises");
+const comment_json_1 = require("comment-json");
+const node_child_process_1 = require("node:child_process");
+function runNpm(command) {
+    try {
+        const currentShell = process.platform === 'win32' ? 'cmd.exe' : '/bin/sh';
+        let cmd = `npm run ${command}`;
+        console.log(cmd);
+        (0, node_child_process_1.execSync)(cmd, { stdio: 'inherit', shell: currentShell, killSignal: "SIGINT" });
+    }
+    catch (error) {
+        console.error(`Command Error: ${command}`);
+        process.exit();
+    }
+}
+async function readUserScripts() {
+    let dirUser = (0, dirnameTool_1.findUserProjectRoot)();
+    if (dirUser == null)
+        return;
+    let pkgJson = node_path_1.default.join(dirUser, "package.json");
+    let pkgTxt = await (0, promises_1.readFile)(pkgJson, "utf-8");
+    let obj = (0, comment_json_1.parse)(pkgTxt);
+    if (obj.scripts == null)
+        return;
+    let 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/{tsDist/srcBuilder/builder_tp.d.ts → dist/node/tsExport/config.d.ts}

@@ -1,7 +1,7 @@
-export type ConfigWW2 = {
-    appname: string;
-    icon_path: string;
-    entry_point: string;
-    outdir: string;
-    platform: 'Win32' | 'x64';
-};
+export type ConfigWW2 = {
+    appname: string;
+    icon_path: string;
+    entry_point: string;
+    outdir: string;
+    platform: 'Win32' | 'x64';
+};

package/dist/node/tsExport/config.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,6 @@
+export declare function getWw2Dirname(): {
+    _dirname: string;
+    _filename: string;
+    ww2ModulePath: string;
+};
+export declare function findUserProjectRoot(currentDir?: string): string | null;

package/dist/node/tsExport/dirnameTool.js

@@ -0,0 +1,63 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWw2Dirname = getWw2Dirname;
+exports.findUserProjectRoot = findUserProjectRoot;
+const node_url_1 = require("node:url");
+const node_path_1 = __importStar(require("node:path"));
+const node_fs_1 = require("node:fs");
+function getWw2Dirname() {
+    // Trik deteksi lingkungan
+    const _filename = typeof __filename !== 'undefined'
+        ? __filename
+        // @ts-ignore:
+        : (0, node_url_1.fileURLToPath)(eval('import.meta.url'));
+    const _dirname = typeof __dirname !== 'undefined'
+        ? __dirname
+        : (0, node_path_1.dirname)(_filename);
+    let ww2ModulePath = node_path_1.default.join(_dirname, "../../../");
+    return { _dirname, _filename, ww2ModulePath };
+}
+function findUserProjectRoot(currentDir = process.cwd()) {
+    const packagePath = node_path_1.default.join(currentDir, 'package.json');
+    if ((0, node_fs_1.existsSync)(packagePath)) {
+        return currentDir;
+    }
+    const parentDir = node_path_1.default.dirname(currentDir);
+    if (parentDir === currentDir) {
+        return null;
+    }
+    return findUserProjectRoot(parentDir);
+}

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

@@ -0,0 +1,38 @@
+import { getWw2Dirname } from "./dirnameTool";
+import { 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 declare function getModule(): Promise<Ww2Module>;
+export declare function closeSplash(): Promise<void>;
+export * from "./ww2_server";
+export { findUserProjectRoot } from "./dirnameTool";
+export { readConfig };
+export { getWw2Dirname };

package/dist/node/tsExport/winwebview2.js

@@ -0,0 +1,51 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWw2Dirname = exports.readConfig = exports.findUserProjectRoot = void 0;
+exports.getModule = getModule;
+exports.closeSplash = closeSplash;
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const dirnameTool_1 = require("./dirnameTool");
+Object.defineProperty(exports, "getWw2Dirname", { enumerable: true, get: function () { return dirnameTool_1.getWw2Dirname; } });
+const ww2_config_1 = require("./ww2_config");
+Object.defineProperty(exports, "readConfig", { enumerable: true, get: function () { return ww2_config_1.readConfig; } });
+async function getModule() {
+    let dirname = (0, dirnameTool_1.getWw2Dirname)();
+    let filepath = node_path_1.default.join(dirname._dirname, "./ww2_addon.node");
+    if (!(0, node_fs_1.existsSync)(filepath)) {
+        let config = await (0, ww2_config_1.readConfig)();
+        if (config == null)
+            throw "user config null";
+        filepath = node_path_1.default.join(dirname._dirname, `../../../win_lib/${config.platform}/ww2_addon.node`);
+    }
+    let myAddon = require(filepath);
+    return myAddon;
+}
+function closeSplash() {
+    return getModule().then((module) => {
+        module.controlWindow({
+            controlcmd: "close",
+            wndClassName: "mysplashclassname"
+        });
+    });
+}
+__exportStar(require("./ww2_server"), exports);
+var dirnameTool_2 = require("./dirnameTool");
+Object.defineProperty(exports, "findUserProjectRoot", { enumerable: true, get: function () { return dirnameTool_2.findUserProjectRoot; } });

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

@@ -0,0 +1,7 @@
+export type ConfigWW2 = {
+    appname: string;
+    entry_point: string;
+    outdir: string;
+    platform: 'Win32' | 'x64';
+};
+export declare function readConfig(): Promise<ConfigWW2 | null>;

package/dist/node/tsExport/ww2_config.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readConfig = readConfig;
+const promises_1 = require("node:fs/promises");
+const dirnameTool_1 = require("./dirnameTool");
+const node_path_1 = __importDefault(require("node:path"));
+const jsonConfigFilePath = "./win_webview2.json";
+async function readConfig() {
+    let userDir = (0, dirnameTool_1.findUserProjectRoot)();
+    if (userDir == null)
+        return null;
+    let str = await (0, promises_1.readFile)(node_path_1.default.join(userDir, jsonConfigFilePath));
+    let jsonObj = JSON.parse(str.toString());
+    return jsonObj;
+}