win_webview2 1.1.14 → 1.1.15

package/dist/node/builder/versiontool.js

@@ -20,6 +20,7 @@ async function getWWvVersion() {
         result = jsonObj.version;
     }
     catch (error) {
+        console.log(error);
     }
     return result;
 }

package/dist/node/tsExport/dirnameTool.js

@@ -31,5 +31,12 @@ function getWWVNodeModuleFolder() {
     if (userRootProject == null)
         throw "root project user not found";
     let nodeModuleFolder = node_path_1.default.join(userRootProject, "node_modules/win_webview2");
+    if (!(0, node_fs_1.existsSync)(nodeModuleFolder)) {
+        if (userRootProject.endsWith("win_webview2")) {
+            console.log("on source win_webview2folder \n\n");
+            let npath = node_path_1.default.join(nodeModuleFolder, "../../");
+            nodeModuleFolder = npath;
+        }
+    }
     return nodeModuleFolder;
 }

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

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

package/dist/node/tsExport/downloadModule.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getModule = getModule;
+const node_path_1 = __importDefault(require("node:path"));
+const dirnameTool_1 = require("./dirnameTool");
+const ww2_config_1 = require("./ww2_config");
+const node_fs_1 = require("node:fs");
+const downloader_1 = require("./downloader");
+const promises_1 = require("node:fs/promises");
+function getLibFilePath(libName, platform) {
+    let modulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
+    modulePath = node_path_1.default.join(modulePath, "win_lib", platform, libName);
+    return modulePath;
+}
+const binFileVersion = "1.1.14";
+async function downloadModuleFile(libname, platform) {
+    let filePath = getLibFilePath(libname, platform);
+    let url = `https://github.com/nnttoo/win_webview2/releases/download/${binFileVersion}_${platform}/${libname}`;
+    console.log("Bin File Version : " + binFileVersion);
+    console.log("downloading :\n", url);
+    try {
+        let dir = node_path_1.default.dirname(filePath);
+        await (0, promises_1.mkdir)(dir, { recursive: true });
+    }
+    catch (error) {
+    }
+    await (0, downloader_1.downloadFile)(url, filePath);
+}
+async function downloadModule(platform) {
+    await downloadModuleFile("ww2_addon.node", platform);
+    await downloadModuleFile("WebView2Loader.dll", platform);
+    await downloadModuleFile("exeOpenner.exe", platform);
+    await downloadModuleFile("splash.png", platform);
+}
+async function getModule() {
+    let addOnName = "ww2_addon.node";
+    let config = await (0, ww2_config_1.readConfig)();
+    if (config == null)
+        throw "cannot read config";
+    let filepath = (() => {
+        let userFolder = (0, dirnameTool_1.findUserProjectRoot)();
+        if (userFolder == null)
+            return null;
+        let r = node_path_1.default.join(userFolder, addOnName);
+        if (!(0, node_fs_1.existsSync)(r))
+            return null;
+        return r;
+    })();
+    filepath = await (async () => {
+        if (filepath != null)
+            return filepath;
+        let wwvModulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
+        let r = node_path_1.default.join(wwvModulePath, `win_lib/${config.platform}/ww2_addon.node`);
+        return r;
+    })();
+    if (filepath == null)
+        throw "file path is null";
+    if (!(0, node_fs_1.existsSync)(filepath)) {
+        await downloadModule(config.platform);
+    }
+    let myAddon = require(filepath);
+    return myAddon;
+}

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

@@ -0,0 +1,6 @@
+/**
+ * Fungsi download native dengan TypeScript
+ * @param src - URL sumber file
+ * @param filePath - Path lengkap tujuan penyimpanan
+ */
+export declare function downloadFile(src: string, filePath: string): Promise<string>;

package/dist/node/tsExport/downloader.js

@@ -0,0 +1,78 @@
+"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.downloadFile = downloadFile;
+const http = __importStar(require("http"));
+const https = __importStar(require("https"));
+const fs = __importStar(require("fs"));
+const url_1 = require("url");
+/**
+ * Fungsi download native dengan TypeScript
+ * @param src - URL sumber file
+ * @param filePath - Path lengkap tujuan penyimpanan
+ */
+async function downloadFile(src, filePath) {
+    return new Promise((resolve, reject) => {
+        const url = new url_1.URL(src);
+        const protocol = url.protocol === 'https:' ? https : http;
+        // Gunakan flags 'w' untuk memastikan file dibuka untuk ditulisi
+        const file = fs.createWriteStream(filePath, { flags: 'w' });
+        protocol.get(src, (response) => {
+            const { statusCode } = response;
+            if (statusCode && statusCode >= 300 && statusCode < 400 && response.headers.location) {
+                file.destroy(); // Hancurkan stream sebelum redirect
+                return resolve(downloadFile(response.headers.location, filePath));
+            }
+            if (statusCode !== 200) {
+                file.destroy();
+                fs.unlink(filePath, () => { });
+                return reject(new Error(`Download gagal! Status: ${statusCode}`));
+            }
+            response.pipe(file);
+            // GANTI DISINI: Gunakan event 'close' bukan 'finish'
+            file.on('close', () => {
+                resolve(filePath);
+            });
+            file.on('error', (err) => {
+                fs.unlink(filePath, () => { });
+                reject(err);
+            });
+        }).on('error', (err) => {
+            file.destroy();
+            fs.unlink(filePath, () => { });
+            reject(err);
+        });
+    });
+}

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

@@ -1,37 +1,7 @@
 import { getWWVNodeModuleFolder } 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 "./downloadModule";
 export * from "./ww2_server";
 export { findUserProjectRoot } from "./dirnameTool";
 export { readConfig };

package/dist/node/tsExport/winwebview2.js

@@ -13,53 +13,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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.getWWVNodeModuleFolder = 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, "getWWVNodeModuleFolder", { enumerable: true, get: function () { return dirnameTool_1.getWWVNodeModuleFolder; } });
 const ww2_config_1 = require("./ww2_config");
 Object.defineProperty(exports, "readConfig", { enumerable: true, get: function () { return ww2_config_1.readConfig; } });
-async function getModule() {
-    let addOnName = "ww2_addon.node";
-    let filepath = (() => {
-        let userFolder = (0, dirnameTool_1.findUserProjectRoot)();
-        if (userFolder == null)
-            return null;
-        let r = node_path_1.default.join(userFolder, addOnName);
-        if (!(0, node_fs_1.existsSync)(r))
-            return null;
-        return r;
-    })();
-    filepath = await (async () => {
-        if (filepath != null)
-            return filepath;
-        let wwvModulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
-        let config = await (0, ww2_config_1.readConfig)();
-        if (config == null)
-            return null;
-        let r = node_path_1.default.join(wwvModulePath, `win_lib/${config.platform}/ww2_addon.node`);
-        return r;
-    })();
-    if (filepath == null)
-        throw "file not found";
-    let myAddon = require(filepath);
-    return myAddon;
-}
+const downloadModule_1 = require("./downloadModule");
 function closeSplash() {
-    return getModule().then((module) => {
+    return (0, downloadModule_1.getModule)().then((module) => {
         module.controlWindow({
             controlcmd: "close",
             wndClassName: "mysplashclassname"
         });
     });
 }
+__exportStar(require("./downloadModule"), exports);
 __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

@@ -1,7 +1,9 @@
+export type WwvPlatFrom = 'x86' | 'x64';
+export type WwfBinFileName = "exeOpenner.exe" | "WebView2Loader.dll" | "ww2_addon.node" | "splash.png";
 export type ConfigWW2 = {
     appname: string;
     entry_point: string;
     outdir: string;
-    platform: 'Win32' | 'x64';
+    platform: WwvPlatFrom;
 };
 export declare function readConfig(): Promise<ConfigWW2>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -25,7 +25,7 @@
   "type": "commonjs",
   "scripts": {
     "build_node": "tsc -p ./src/srcNode/tsconfig.json",
-    "build_node_watch": "npm run build -- --watch",
+    "build_node_watch": "npm run build_node -- --watch",
     "build_browser": "tsc -p ./src/srcBrowser/tsconfig.json",
     "build_browser_watch": "npm run build_browser -- --watch",
     "build_all" : "npm run build_node && npm run build_browser",

package/src/srcNode/builder/versiontool.ts

@@ -10,7 +10,7 @@ export async function  getWWvVersion(){
     let result = "";
     
     try {
-        let wwvModulePath = getWWVNodeModuleFolder();
+        let wwvModulePath = getWWVNodeModuleFolder(); 
         let jsonPath = path.join(wwvModulePath,"package.json");
         let jsontxt = await readFile(jsonPath,"utf-8");
         let jsonObj = JSON.parse(jsontxt) as {  version : string};
@@ -18,7 +18,7 @@ export async function  getWWvVersion(){
         result = jsonObj.version;
         
     } catch (error) {
-        
+        console.log(error);
     }
 
     return result;

package/src/srcNode/tsExport/dirnameTool.ts

@@ -1,5 +1,4 @@
-import { fileURLToPath } from 'node:url';
-import path, { dirname } from 'node:path';
+import path from 'node:path';
 import { existsSync } from 'node:fs';
 
  
@@ -26,11 +25,21 @@ export function findUserProjectRoot() {
     }  
     return findUserProjectRootRecrusive(process.cwd());
 }
-
+ 
 export function getWWVNodeModuleFolder(){
-    let userRootProject = findUserProjectRoot();
+    let userRootProject = findUserProjectRoot(); 
     if(userRootProject == null) throw "root project user not found";
 
     let nodeModuleFolder = path.join(userRootProject,"node_modules/win_webview2");
+
+    if(!existsSync(nodeModuleFolder)){  
+        if(userRootProject.endsWith("win_webview2")){
+            console.log("on source win_webview2folder \n\n")
+
+            let npath = path.join(nodeModuleFolder,"../../");
+            nodeModuleFolder = npath; 
+        }
+
+    }  
     return nodeModuleFolder;
-}
+}

package/src/srcNode/tsExport/downloadModule.ts

@@ -0,0 +1,128 @@
+import path from "node:path";
+import { findUserProjectRoot, getWWVNodeModuleFolder } from "./dirnameTool";
+import { readConfig, WwfBinFileName, WwvPlatFrom } from "./ww2_config";
+import { existsSync } from "node:fs";
+import { config } from "node:process";
+import { getWWvVersion } from "../builder/versiontool";
+import { downloadFile } from "./downloader";
+import { mkdir } from "node:fs/promises";
+
+
+
+
+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;
+}
+
+function getLibFilePath(libName: WwfBinFileName, platform: WwvPlatFrom) {
+    let modulePath = getWWVNodeModuleFolder();
+    modulePath = path.join(modulePath, "win_lib", platform, libName);
+ 
+    return modulePath;
+
+}
+
+const binFileVersion = "1.1.14";
+
+async function downloadModuleFile(libname: WwfBinFileName, platform: WwvPlatFrom) {
+    let filePath = getLibFilePath(libname, platform); 
+    let url = `https://github.com/nnttoo/win_webview2/releases/download/${binFileVersion}_${platform}/${libname}`;
+    console.log("Bin File Version : " + binFileVersion);
+    console.log("downloading :\n",url);
+    try {
+        
+        let dir = path.dirname(filePath);
+        await mkdir(dir,{recursive : true});
+    } catch (error) {
+        
+    }
+
+    await downloadFile(url,filePath);
+}
+
+async function downloadModule(platform: WwvPlatFrom) {
+    await downloadModuleFile("ww2_addon.node", platform);
+    await downloadModuleFile("WebView2Loader.dll", platform);
+    await downloadModuleFile("exeOpenner.exe", platform);
+    await downloadModuleFile("splash.png", platform);
+}
+
+
+
+export async function getModule() {
+    let addOnName = "ww2_addon.node";
+
+    let config = await readConfig();
+    if (config == null) throw "cannot read config";
+
+
+    let filepath = (() => {
+
+        let userFolder = findUserProjectRoot();
+        if (userFolder == null) return null;
+        let r = path.join(
+            userFolder,
+            addOnName
+        );
+
+        if (!existsSync(r)) return null;
+
+        return r;
+
+    })();
+
+    filepath = await (async () => {
+        if (filepath != null) return filepath;
+        let wwvModulePath = getWWVNodeModuleFolder();
+        let r = path.join(wwvModulePath, `win_lib/${config.platform}/ww2_addon.node`);
+
+        return r;
+
+
+    })(); 
+
+    if (filepath == null) throw "file path is null";
+    if (!existsSync(filepath)) {
+        await downloadModule(config.platform);
+    }
+
+    let myAddon = require(filepath) as Ww2Module;
+    return myAddon;
+}

package/src/srcNode/tsExport/downloader.ts

@@ -0,0 +1,51 @@
+import * as http from 'http';
+import * as https from 'https';
+import * as fs from 'fs';
+import { URL } from 'url';
+
+/**
+ * Fungsi download native dengan TypeScript
+ * @param src - URL sumber file
+ * @param filePath - Path lengkap tujuan penyimpanan
+ */
+export async function downloadFile(src: string, filePath: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const url = new URL(src);
+    const protocol = url.protocol === 'https:' ? https : http;
+
+    // Gunakan flags 'w' untuk memastikan file dibuka untuk ditulisi
+    const file = fs.createWriteStream(filePath, { flags: 'w' });
+
+    protocol.get(src, (response: http.IncomingMessage) => {
+      const { statusCode } = response;
+
+      if (statusCode && statusCode >= 300 && statusCode < 400 && response.headers.location) {
+        file.destroy(); // Hancurkan stream sebelum redirect
+        return resolve(downloadFile(response.headers.location, filePath));
+      }
+
+      if (statusCode !== 200) {
+        file.destroy();
+        fs.unlink(filePath, () => {});
+        return reject(new Error(`Download gagal! Status: ${statusCode}`));
+      }
+
+      response.pipe(file);
+
+      // GANTI DISINI: Gunakan event 'close' bukan 'finish'
+      file.on('close', () => {
+        resolve(filePath);
+      });
+
+      file.on('error', (err: Error) => {
+        fs.unlink(filePath, () => {});
+        reject(err);
+      });
+
+    }).on('error', (err: Error) => {
+      file.destroy();
+      fs.unlink(filePath, () => {});
+      reject(err);
+    });
+  });
+}

package/src/srcNode/tsExport/winwebview2.ts

@@ -1,84 +1,8 @@
-import { execFile } from "node:child_process";
-import { existsSync } from "node:fs";
-import { readFile } from "node:fs/promises";
-import path from "node:path";
-import {   findUserProjectRoot, getWWVNodeModuleFolder } from "./dirnameTool";
-import { ConfigWW2, readConfig } from "./ww2_config";
+import {   getWWVNodeModuleFolder } from "./dirnameTool";
+import { readConfig } from "./ww2_config";
+import { getModule } from "./downloadModule";
 
-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 addOnName = "ww2_addon.node";
-
-    let filepath = (()=>{
-
-        let userFolder = findUserProjectRoot();
-        if(userFolder == null) return null;
-        let r = path.join(
-            userFolder,
-            addOnName
-        );
-
-        if(!existsSync(r)) return null;
-
-        return r;
-
-    })();
-
-    filepath = await ( async ()=>{
-        if(filepath != null) return filepath;
-        let wwvModulePath = getWWVNodeModuleFolder();
-        let config = await readConfig();
-        if(config == null) return null;
-
-        let r =  path.join(wwvModulePath, `win_lib/${config.platform}/ww2_addon.node`);
-
-        return r;
-        
-
-    })(); 
-
-    if(filepath == null) throw "file not found";
-
-    let myAddon = require(filepath) as Ww2Module;
-    return myAddon;
-}
 
 export function closeSplash(){
     return getModule().then((module)=>{
@@ -90,6 +14,7 @@ export function closeSplash(){
 }
 
 
+export * from "./downloadModule"
 
 export * from "./ww2_server"
 export {findUserProjectRoot } from "./dirnameTool"

package/src/srcNode/tsExport/ww2_config.ts

@@ -3,11 +3,15 @@ import { findUserProjectRoot } from "./dirnameTool";
 import path from "node:path";
 import { existsSync } from "node:fs";
 
+export type WwvPlatFrom = 'x86' | 'x64';
+
+export type WwfBinFileName = "exeOpenner.exe" | "WebView2Loader.dll" | "ww2_addon.node" | "splash.png"
+
 export type ConfigWW2 = {
     appname: string;
     entry_point: string;
     outdir: string;
-    platform: 'Win32' | 'x64'
+    platform: WwvPlatFrom
 };
 
 

package/srcInternal/copyDll.ts

@@ -34,7 +34,7 @@ function debugDir(dirPath: string) {
 
     }
     try{ 
-        await mkdir(path.join(ww2SourcePath, "win_lib/Win32"));
+        await mkdir(path.join(ww2SourcePath, "win_lib/x86"));
 
     } catch{
 
@@ -58,21 +58,21 @@ function debugDir(dirPath: string) {
 
     await copyFromRoot(
         "exeOpener/build/x86/exeOpenner.exe",
-        "win_webview2/win_lib/Win32/exeOpenner.exe"
+        "win_webview2/win_lib/x86/exeOpenner.exe"
     );
     await copyFromRoot(
         "exeOpener/build/x86/splash.png",
-        "win_webview2/win_lib/Win32/splash.png"
+        "win_webview2/win_lib/x86/splash.png"
     );
 
     console.log("copy webview2 32");
     await copyFromRoot(
         "nodeAddOn/build/ia32/Release/ww2_addon.node",
-        "win_webview2/win_lib/Win32/ww2_addon.node"
+        "win_webview2/win_lib/x86/ww2_addon.node"
     );
     await copyFromRoot(
         "nodeAddOn/build/ia32/Release/WebView2Loader.dll",
-        "win_webview2/win_lib/Win32/WebView2Loader.dll"
+        "win_webview2/win_lib/x86/WebView2Loader.dll"
     );
 
     console.log("copy webview2 64");