win_webview2 1.1.16 → 1.1.18

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

@@ -1,3 +1,4 @@
+import { WwvPlatFrom } from "./ww2_config";
 interface Ww2WebConfig {
     callback: (err: any, data: any) => void;
     wclassname: string;
@@ -28,5 +29,6 @@ interface Ww2Module {
     openFolderDialog: (arg: WW2FileDialogArg) => void;
     controlWindow: (arg: WW2ControlWindowsArg) => void;
 }
+export declare function downloadModuleAndExtract(platform: WwvPlatFrom): Promise<void>;
 export declare function getModule(): Promise<Ww2Module>;
 export {};

package/dist/node/tsExport/downloadModule.js

@@ -3,22 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadModuleAndExtract = downloadModuleAndExtract;
 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 adm_zip_1 = __importDefault(require("adm-zip"));
+function extractZip(zipPath, targetDir) {
+    try {
+        const zip = new adm_zip_1.default(zipPath);
+        zip.extractAllTo(targetDir, true);
+        console.log(`✅ Extract done to: ${targetDir}`);
+    }
+    catch (err) {
+        console.error("❌ Error extract:", err);
+    }
 }
-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}`;
+;
+const binFileVersion = "1.1.16";
+async function downloadModuleFile(platform) {
+    let modulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
+    let winlibPath = node_path_1.default.join(modulePath, "win_lib");
+    let fileName = platform + ".zip";
+    let filePath = node_path_1.default.join(winlibPath, fileName);
+    let url = `https://github.com/nnttoo/win_webview2/releases/download/${binFileVersion}/${fileName}`;
     console.log("Bin File Version : " + binFileVersion);
     console.log("downloading :\n", url);
     try {
@@ -29,17 +39,32 @@ async function downloadModuleFile(libname, platform) {
     }
     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 sleep(n) {
+    return new Promise((r, x) => {
+        setTimeout(() => {
+            r(null);
+        }, n);
+    });
+}
+async function downloadModuleAndExtract(platform) {
+    await downloadModuleFile(platform);
+    let modulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
+    let winlibPath = node_path_1.default.join(modulePath, "win_lib");
+    let fileName = platform + ".zip";
+    let filePath = node_path_1.default.join(winlibPath, fileName);
+    extractZip(filePath, node_path_1.default.join(winlibPath, platform));
+    await sleep(1000);
+}
+function getCurrentPlatform() {
+    let result = "x64";
+    if (process.arch != 'x64') {
+        result = "x86";
+    }
+    return result;
 }
 async function getModule() {
     let addOnName = "ww2_addon.node";
-    let config = await (0, ww2_config_1.readConfig)();
-    if (config == null)
-        throw "cannot read config";
+    let platform = getCurrentPlatform();
     let filepath = (() => {
         let userFolder = (0, dirnameTool_1.findUserProjectRoot)();
         if (userFolder == null)
@@ -53,13 +78,13 @@ async function getModule() {
         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`);
+        let r = node_path_1.default.join(wwvModulePath, `win_lib/${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);
+        await downloadModuleAndExtract(platform);
     }
     let myAddon = require(filepath);
     return myAddon;

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

@@ -1,8 +1,9 @@
 import { getWWVNodeModuleFolder } from "./dirnameTool";
 import { readConfig } from "./ww2_config";
+import { downloadModuleAndExtract } from "./downloadModule";
 export declare function closeSplash(): Promise<void>;
 export * from "./downloadModule";
 export * from "./ww2_server";
 export { findUserProjectRoot } from "./dirnameTool";
 export { readConfig };
-export { getWWVNodeModuleFolder };
+export { getWWVNodeModuleFolder, downloadModuleAndExtract };

package/dist/node/tsExport/winwebview2.js

@@ -14,13 +14,14 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWWVNodeModuleFolder = exports.readConfig = exports.findUserProjectRoot = void 0;
+exports.downloadModuleAndExtract = exports.getWWVNodeModuleFolder = exports.readConfig = exports.findUserProjectRoot = void 0;
 exports.closeSplash = closeSplash;
 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; } });
 const downloadModule_1 = require("./downloadModule");
+Object.defineProperty(exports, "downloadModuleAndExtract", { enumerable: true, get: function () { return downloadModule_1.downloadModuleAndExtract; } });
 function closeSplash() {
     return (0, downloadModule_1.getModule)().then((module) => {
         module.controlWindow({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -28,12 +28,14 @@
     "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",
-    "copy_dll": "tsx ./srcInternal/copyDll.ts"
+    "build_all": "npm run build_node && npm run build_browser",
+    "copy_dll": "tsx ./srcInternal/copyDll.ts",
+    "Clean_WinLib": "rm -rf ./win_lib"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "adm-zip": "^0.5.17",
     "comment-json": "^4.6.2",
     "degit": "^2.8.4",
     "express": "^5.2.1",
@@ -41,6 +43,7 @@
     "tsx": "^4.21.0"
   },
   "devDependencies": {
+    "@types/adm-zip": "^0.5.8",
     "@types/express": "^5.0.6",
     "@types/node": "^25.5.2",
     "@types/prompts": "^2.4.9",