win_webview2 1.1.12 → 1.1.14

package/dist/node/builder/builder_init.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (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) {
@@ -18,7 +17,6 @@ function runCommand(command) {
     }
 }
 const jsonConfigFilePath = "./win_webview2.json";
-let mdirname = (0, dirnameTool_1.getWw2Dirname)();
 let ww2Choise = {
     "ww2_typescript": {
         description: "init win_webview2",

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

@@ -1,14 +1,2 @@
-/**
- *
- * 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;
-};
 export declare function findUserProjectRoot(): string | null;
 export declare function getWWVNodeModuleFolder(): string;

package/dist/node/tsExport/dirnameTool.js

@@ -1,63 +1,12 @@
 "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;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWw2Dirname = getWw2Dirname;
 exports.findUserProjectRoot = findUserProjectRoot;
 exports.getWWVNodeModuleFolder = getWWVNodeModuleFolder;
-const node_url_1 = require("node:url");
-const node_path_1 = __importStar(require("node:path"));
+const node_path_1 = __importDefault(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'
-        ? __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 };
-}
 function findUserProjectRootRecrusive(currentDir = process.cwd()) {
     const packagePath = node_path_1.default.join(currentDir, 'package.json');
     if ((0, node_fs_1.existsSync)(packagePath)) {

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

@@ -1,4 +1,4 @@
-import { getWw2Dirname } from "./dirnameTool";
+import { getWWVNodeModuleFolder } from "./dirnameTool";
 import { readConfig } from "./ww2_config";
 interface Ww2WebConfig {
     callback: (err: any, data: any) => void;
@@ -35,4 +35,4 @@ export declare function closeSplash(): Promise<void>;
 export * from "./ww2_server";
 export { findUserProjectRoot } from "./dirnameTool";
 export { readConfig };
-export { getWw2Dirname };
+export { getWWVNodeModuleFolder };

package/dist/node/tsExport/winwebview2.js

@@ -17,24 +17,38 @@ 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.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, "getWw2Dirname", { enumerable: true, get: function () { return dirnameTool_1.getWw2Dirname; } });
+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 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 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)
-            throw "user config null";
-        filepath = node_path_1.default.join(dirname._dirname, `../../../win_lib/${config.platform}/ww2_addon.node`);
-    }
+            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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"

package/src/srcNode/builder/builder_init.ts

@@ -1,9 +1,5 @@
-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 { exec, execSync } from "child_process"; 
 import prompts from "prompts";
 
 
@@ -17,8 +13,7 @@ function runCommand(command: string) {
     }
 }
 
-const jsonConfigFilePath = "./win_webview2.json";
-let mdirname = getWw2Dirname();
+const jsonConfigFilePath = "./win_webview2.json"; 
 
 
 interface ChoiseItem {

package/src/srcNode/builder/versiontool.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { getWw2Dirname, getWWVNodeModuleFolder } from "../tsExport/dirnameTool";
+import {   getWWVNodeModuleFolder } from "../tsExport/dirnameTool";
 import { readFile } from "node:fs/promises";
 
 

package/src/srcNode/tsExport/dirnameTool.ts

@@ -2,30 +2,8 @@ import { fileURLToPath } from 'node:url';
 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'
-        ? __filename
-         // @ts-ignore:
-        : fileURLToPath(eval('import.meta.url'));
-
-    const _dirname = typeof __dirname !== 'undefined'
-        ? __dirname
-        : dirname(_filename);
  
 
-    return { _dirname, _filename };
-}
-
 function findUserProjectRootRecrusive(currentDir : string = process.cwd()) { 
 
     const packagePath = path.join(currentDir, 'package.json'); 

package/src/srcNode/tsExport/winwebview2.ts

@@ -2,7 +2,7 @@ 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 {   findUserProjectRoot, getWWVNodeModuleFolder } from "./dirnameTool";
 import { ConfigWW2, readConfig } from "./ww2_config";
 
 interface Ww2WebConfig {
@@ -44,20 +44,37 @@ interface Ww2Module {
 
 
 export async function getModule() {
-    let dirname = getWw2Dirname();
+    let addOnName = "ww2_addon.node";
 
-    let filepath = path.join(
-        dirname._dirname,
-        "./ww2_addon.node"
-    );
+    let filepath = (()=>{
 
-    if (!existsSync(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) throw "user config null";
-        filepath = path.join(dirname._dirname, `../../../win_lib/${config.platform}/ww2_addon.node`);
+        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;
@@ -72,7 +89,9 @@ export function closeSplash(){
     });
 }
 
+
+
 export * from "./ww2_server"
 export {findUserProjectRoot } from "./dirnameTool"
-export {readConfig} ;
-export {getWw2Dirname}
+export {readConfig} ; 
+export {getWWVNodeModuleFolder}

package/src/srcNode/tsExport/ww2_config.ts

@@ -1,5 +1,5 @@
 import { readFile } from "node:fs/promises";
-import { findUserProjectRoot, getWw2Dirname } from "./dirnameTool";
+import { findUserProjectRoot } from "./dirnameTool";
 import path from "node:path";
 import { existsSync } from "node:fs";