win_webview2 1.1.8 → 1.1.9

package/dist/browser/ww2_browser.d.ts

@@ -1,32 +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 {};
+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

@@ -1,11 +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;
-}
+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/dist/node/builder/copyDll.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/builder/copyDll.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_child_process_1 = require("node:child_process");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = __importDefault(require("node:path"));
+const dirnameTool_1 = require("../tsExport/dirnameTool");
+function debugDir(dirPath) {
+    (0, node_child_process_1.exec)("cd " + dirPath + "&& dir", (s, o) => {
+        console.log(o);
+    });
+}
+(async () => {
+    let result = "\n";
+    let dirname = (0, dirnameTool_1.getWw2Dirname)();
+    let ww2ModulePath = dirname.ww2ModulePath;
+    let copyFromRoot = async (src, target) => {
+        try {
+            let rootPath = node_path_1.default.join(ww2ModulePath, "../");
+            console.log("ModulePath : ", ww2ModulePath);
+            console.log("rootPath : ", rootPath);
+            result += "\n" + target;
+            await (0, promises_1.copyFile)(node_path_1.default.join(rootPath, src), node_path_1.default.join(rootPath, target));
+        }
+        catch (error) {
+            console.log(error);
+        }
+    };
+    try {
+        await (0, promises_1.mkdir)(node_path_1.default.join(ww2ModulePath, "win_lib"));
+    }
+    catch {
+    }
+    try {
+        await (0, promises_1.mkdir)(node_path_1.default.join(ww2ModulePath, "win_lib/Win32"));
+    }
+    catch {
+    }
+    try {
+        await (0, promises_1.mkdir)(node_path_1.default.join(ww2ModulePath, "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/dist/node/tsExport/dirnameTool.d.ts

@@ -1,3 +1,11 @@
+/**
+ *
+ * Penting!! jangan pindah file ini ketempat lain,
+ * Sesuaikan ulang jika file ini dipindah karena ini menggunakan __dirname
+ * dan juga file ini akan ditranspile ke js ke folder Dist, posisi file ini terhadap root antara file ts dan
+ * file js harus sama,
+ *
+ */
 export declare function getWw2Dirname(): {
     _dirname: string;
     _filename: string;

package/dist/node/tsExport/dirnameTool.js

@@ -38,6 +38,14 @@ 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");
+/**
+ *
+ * Penting!! jangan pindah file ini ketempat lain,
+ * Sesuaikan ulang jika file ini dipindah karena ini menggunakan __dirname
+ * dan juga file ini akan ditranspile ke js ke folder Dist, posisi file ini terhadap root antara file ts dan
+ * file js harus sama,
+ *
+ */
 function getWw2Dirname() {
     // Trik deteksi lingkungan
     const _filename = typeof __filename !== 'undefined'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -19,15 +19,17 @@
     }
   },
   "bin": {
-    "win_webview2": "tsDistRun.js"
+    "win_webview2": "tsDistRun.js",
+    "wwv": "tsDistRun.js"
   },
   "type": "commonjs",
   "scripts": {
-    "build": "tsc -p ./srcNode/tsconfig.json",
-    "build_watch": "npm run build -- --watch",
-    "build_browser": "tsc -p ./srcBrowser/tsconfig.json",
+    "build_node": "tsc -p ./src/srcNode/tsconfig.json",
+    "build_node_watch": "npm run build -- --watch",
+    "build_browser": "tsc -p ./src/srcBrowser/tsconfig.json",
     "build_browser_watch": "npm run build_browser -- --watch",
-    "copy_dll": "tsx ./buildtools/copyDll.ts"
+    "build_all" : "npm run build_node && npm run build_browser",
+    "copy_dll": "tsx ./src/srcNode/builder/copyDll.ts"
   },
   "author": "",
   "license": "ISC",

package/{srcBrowser → src/srcBrowser}/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "esnext",
     "declaration": true, 
     "rootDir": "./",
-    "outDir": "../dist/browser",
+    "outDir": "../../dist/browser",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true

package/{buildtools → src/srcNode/builder}/copyDll.ts

@@ -1,6 +1,7 @@
 import { exec } from "node:child_process";
 import { copyFile, mkdir } from "node:fs/promises";
 import path from "node:path";
+import { getWw2Dirname } from "../tsExport/dirnameTool";
 
 function debugDir(dirPath: string) {
     exec("cd " + dirPath + "&& dir", (s, o) => {
@@ -12,21 +13,39 @@ function debugDir(dirPath: string) {
 
     let result = "\n";
 
-    let rootPath = path.join(__dirname, "../../");
+    let dirname = getWw2Dirname();
+
+    let ww2ModulePath = dirname.ww2ModulePath;
+ 
     let copyFromRoot = async (src: string, target: string) => {
         try {
 
+            let rootPath = path.join(ww2ModulePath,"../");
+            console.log("ModulePath : ", ww2ModulePath);
+            console.log("rootPath : ", rootPath);
             result += "\n" + target;
             await copyFile(path.join(rootPath, src), path.join(rootPath, target));
         } catch (error) {
-
+            console.log(error);
         }
     }
+    
+    try{ 
+        await mkdir(path.join(ww2ModulePath, "win_lib"));
+
+    } catch{
+
+    }
+    try{ 
+        await mkdir(path.join(ww2ModulePath, "win_lib/Win32"));
+
+    } catch{
+
+    }
 
     try {
 
-        await mkdir(path.join(rootPath, "win_webview2/win_lib/Win32"));
-        await mkdir(path.join(rootPath, "win_webview2/win_lib/x64"));
+        await mkdir(path.join(ww2ModulePath, "win_lib/x64"));
     } catch (error) {
 
     }

package/{srcNode → src/srcNode}/tsExport/dirnameTool.ts

@@ -3,6 +3,14 @@ import path, { dirname } from 'node:path';
 import { existsSync } from 'node:fs';
 
 
+/**
+ * 
+ * Penting!! jangan pindah file ini ketempat lain,
+ * Sesuaikan ulang jika file ini dipindah karena ini menggunakan __dirname
+ * dan juga file ini akan ditranspile ke js ke folder Dist, posisi file ini terhadap root antara file ts dan
+ * file js harus sama,
+ * 
+ */
 export function getWw2Dirname() {
     // Trik deteksi lingkungan
     const _filename = typeof __filename !== 'undefined'
@@ -14,6 +22,8 @@ export function getWw2Dirname() {
         ? __dirname
         : dirname(_filename);
 
+
+
     let ww2ModulePath = path.join(_dirname,"../../../")
 
     return { _dirname, _filename , ww2ModulePath};

package/{srcNode → src/srcNode}/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "nodenext",
     "declaration": true, 
     "rootDir": "./",
-    "outDir": "../dist/node",
+    "outDir": "../../dist/node",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true

package/buildtools/tsconfig.json

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