win_webview2 1.1.10 → 1.1.12

package/dist/node/builder/builder_promps.js

@@ -7,6 +7,7 @@ exports.buildForServer = buildForServer;
 const prompts_1 = __importDefault(require("prompts"));
 const builder_init_1 = require("./builder_init");
 const userExec_1 = require("./userExec");
+const versiontool_1 = require("./versiontool");
 let ww2Choise = {
     "init_win_webview2": {
         description: "init win_webview2",
@@ -16,6 +17,8 @@ let ww2Choise = {
     }
 };
 async function buildForServer() {
+    let version = await (0, versiontool_1.getWWvVersion)();
+    console.log("win_webview2 : " + version);
     let userChoise = await (0, userExec_1.readUserScripts)();
     if (userChoise != null) {
         ww2Choise = {

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

@@ -0,0 +1,4 @@
+/** Ini hanya bisa dipakai dengan cara tidak bundle
+karena package json mungkin gak ada
+ */
+export declare function getWWvVersion(): Promise<string>;

package/dist/node/builder/versiontool.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWWvVersion = getWWvVersion;
+const node_path_1 = __importDefault(require("node:path"));
+const dirnameTool_1 = require("../tsExport/dirnameTool");
+const promises_1 = require("node:fs/promises");
+/** Ini hanya bisa dipakai dengan cara tidak bundle
+karena package json mungkin gak ada
+ */
+async function getWWvVersion() {
+    let result = "";
+    try {
+        let wwvModulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
+        let jsonPath = node_path_1.default.join(wwvModulePath, "package.json");
+        let jsontxt = await (0, promises_1.readFile)(jsonPath, "utf-8");
+        let jsonObj = JSON.parse(jsontxt);
+        result = jsonObj.version;
+    }
+    catch (error) {
+    }
+    return result;
+}

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

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

package/dist/node/tsExport/dirnameTool.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 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_fs_1 = require("node:fs");
@@ -55,10 +56,9 @@ function getWw2Dirname() {
     const _dirname = typeof __dirname !== 'undefined'
         ? __dirname
         : (0, node_path_1.dirname)(_filename);
-    let ww2ModulePath = node_path_1.default.join(_dirname, "../../../");
-    return { _dirname, _filename, ww2ModulePath };
+    return { _dirname, _filename };
 }
-function findUserProjectRoot(currentDir = process.cwd()) {
+function findUserProjectRootRecrusive(currentDir = process.cwd()) {
     const packagePath = node_path_1.default.join(currentDir, 'package.json');
     if ((0, node_fs_1.existsSync)(packagePath)) {
         return currentDir;
@@ -67,5 +67,20 @@ function findUserProjectRoot(currentDir = process.cwd()) {
     if (parentDir === currentDir) {
         return null;
     }
-    return findUserProjectRoot(parentDir);
+    return findUserProjectRootRecrusive(parentDir);
+}
+function findUserProjectRoot() {
+    // - Deployed Condition 
+    const packagePath = node_path_1.default.join(node_path_1.default.dirname(process.execPath), 'package.json');
+    if ((0, node_fs_1.existsSync)(packagePath)) {
+        return node_path_1.default.dirname(packagePath);
+    }
+    return findUserProjectRootRecrusive(process.cwd());
+}
+function getWWVNodeModuleFolder() {
+    let userRootProject = findUserProjectRoot();
+    if (userRootProject == null)
+        throw "root project user not found";
+    let nodeModuleFolder = node_path_1.default.join(userRootProject, "node_modules/win_webview2");
+    return nodeModuleFolder;
 }

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

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

package/dist/node/tsExport/ww2_config.js

@@ -7,16 +7,12 @@ exports.readConfig = readConfig;
 const promises_1 = require("node:fs/promises");
 const dirnameTool_1 = require("./dirnameTool");
 const node_path_1 = __importDefault(require("node:path"));
-const node_fs_1 = require("node:fs");
 const jsonConfigFilePath = "./win_webview2.json";
 async function readConfig() {
-    let jsonPath = node_path_1.default.join(__dirname, jsonConfigFilePath);
-    if (!(0, node_fs_1.existsSync)(jsonPath)) {
-        let userDir = (0, dirnameTool_1.findUserProjectRoot)();
-        if (userDir == null)
-            return null;
-        jsonPath = node_path_1.default.join(userDir, jsonConfigFilePath);
-    }
+    let userDir = (0, dirnameTool_1.findUserProjectRoot)();
+    if (userDir == null)
+        throw "readConfig() => findProjectUser failed";
+    let jsonPath = node_path_1.default.join(userDir, jsonConfigFilePath);
     let str = await (0, promises_1.readFile)(jsonPath);
     let jsonObj = JSON.parse(str.toString());
     return jsonObj;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"
@@ -29,7 +29,7 @@
     "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 ./src/srcNode/builder/copyDll.ts"
+    "copy_dll": "tsx ./srcInternal/copyDll.ts"
   },
   "author": "",
   "license": "ISC",

package/src/srcNode/builder/builder_promps.ts

@@ -2,6 +2,7 @@
 import prompts from 'prompts'; 
 import { ww2Init } from './builder_init';
 import { readUserScripts } from './userExec';
+import { getWWvVersion } from './versiontool';
 
 interface ChoiseItem {
     fun: () => any;
@@ -28,6 +29,9 @@ type promChoise = {
 }
 
 export async function buildForServer() {
+    let version = await getWWvVersion();
+    console.log("win_webview2 : " + version);
+
     let userChoise = await readUserScripts();
     if(userChoise != null){
         ww2Choise = {

package/src/srcNode/builder/versiontool.ts

@@ -0,0 +1,26 @@
+import path from "node:path";
+import { getWw2Dirname, getWWVNodeModuleFolder } from "../tsExport/dirnameTool";
+import { readFile } from "node:fs/promises";
+
+
+/** Ini hanya bisa dipakai dengan cara tidak bundle
+karena package json mungkin gak ada
+ */
+export async function  getWWvVersion(){
+    let result = "";
+    
+    try {
+        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};
+
+        result = jsonObj.version;
+        
+    } catch (error) {
+        
+    }
+
+    return result;
+}
+ 

package/src/srcNode/tsExport/dirnameTool.ts

@@ -21,15 +21,12 @@ export function getWw2Dirname() {
     const _dirname = typeof __dirname !== 'undefined'
         ? __dirname
         : dirname(_filename);
+ 
 
-
-
-    let ww2ModulePath = path.join(_dirname,"../../../")
-
-    return { _dirname, _filename , ww2ModulePath};
+    return { _dirname, _filename };
 }
 
-export function findUserProjectRoot(currentDir : string = process.cwd()) { 
+function findUserProjectRootRecrusive(currentDir : string = process.cwd()) { 
 
     const packagePath = path.join(currentDir, 'package.json'); 
     if (existsSync(packagePath)) {
@@ -39,6 +36,23 @@ export function findUserProjectRoot(currentDir : string = process.cwd()) {
     if (parentDir === currentDir) {
         return null;
     } 
-    return findUserProjectRoot(parentDir);
+    return findUserProjectRootRecrusive(parentDir);
 }
- 
+
+export function findUserProjectRoot() { 
+
+    // - Deployed Condition 
+    const packagePath = path.join(path.dirname(process.execPath), 'package.json'); 
+    if (existsSync(packagePath)) {
+        return path.dirname(packagePath);
+    }  
+    return findUserProjectRootRecrusive(process.cwd());
+}
+
+export function getWWVNodeModuleFolder(){
+    let userRootProject = findUserProjectRoot();
+    if(userRootProject == null) throw "root project user not found";
+
+    let nodeModuleFolder = path.join(userRootProject,"node_modules/win_webview2");
+    return nodeModuleFolder;
+}

package/src/srcNode/tsExport/ww2_config.ts

@@ -1,5 +1,5 @@
 import { readFile } from "node:fs/promises";
-import { findUserProjectRoot } from "./dirnameTool";
+import { findUserProjectRoot, getWw2Dirname } from "./dirnameTool";
 import path from "node:path";
 import { existsSync } from "node:fs";
 
@@ -13,15 +13,11 @@ export type ConfigWW2 = {
 
 const jsonConfigFilePath = "./win_webview2.json";
 export async function readConfig() {
-    let jsonPath = path.join(__dirname, jsonConfigFilePath);
-    if (!existsSync(jsonPath)) {
-        let userDir = findUserProjectRoot();
-        if (userDir == null) return null; 
-        jsonPath = path.join(userDir, jsonConfigFilePath); 
-    }
-
+    let userDir = findUserProjectRoot();
+    if (userDir == null) throw "readConfig() => findProjectUser failed"
 
+    let jsonPath = path.join(userDir, jsonConfigFilePath); 
     let str = await readFile(jsonPath);
-    let jsonObj = JSON.parse(str.toString()); 
+    let jsonObj = JSON.parse(str.toString());
     return jsonObj as ConfigWW2;
 }

package/src/srcNode/tsconfig.json

@@ -9,5 +9,5 @@
     "esModuleInterop": true,
     "skipLibCheck": true
   },
-  "include": ["./**/*"] 
+  "include": ["./**/*" ] 
 }

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

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

package/srcInternal/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "nodenext",
+    "declaration": true, 
+    "rootDir": "./", 
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*"] 
+}