@plasosdk/plaso-electron-sdk 1.3.12-beta.0 → 1.3.12-beta.2

package/README.md

@@ -43,11 +43,45 @@ npm install @plasosdk/plaso-electron-sdk --global-style
 
 ## electron-builder打包特别说明
 
-### extraResources配置
+### 文件拷贝相关配置
 
-> ⚠️ 注意：该配置在 1.3.7 版本有所调整。如果你正在从 < 1.3.7 升级到 >= 1.3.7，请参照下列说明进行调整。
+> ⚠️ 该配置在升级到 1.3.12 以后有所调整
 
-agora-electron-sdk-v4包是在安装plaso-electron-sdk时通过脚本动态安装的，不在dependencies依赖树中，electron-builder打包时不会包含它。为了保留它，需要配置[extraResources](https://www.electron.build/configuration#extraresources)来单独拷贝一份，把它包含进来。
+agora-v4包在plaso-electron-sdk内部作为第三方依赖存在，由于electron-builder拷贝应用代码到app目录时对node_modules文件夹的特殊处理和多级符号链接拷贝上的bug，不能够走[files](https://www.electron.build/configuration#files)配置项去对agora-v4包进行拷贝，而应走[extraResources](https://www.electron.build/configuration#extraresources)配置项去拷贝。
+
+同时，由于这个包是通过extraResources进行拷贝的，需要在签名脚本中额外配置这个包的路径。
+
+<details open>
+<summary><strong>版本 >= 1.3.12 的配置</strong></summary>
+
+```json
+{
+    "files": [
+        "!node_modules/@plasosdk/plaso-electron-sdk/lib/agora-v4/*"
+    ],
+    "extraResources": [
+        {
+            "from": "node_modules/@plasosdk/plaso-electron-sdk/lib/agora-v4",
+            "to": "app/node_modules/@plasosdk/plaso-electron-sdk/lib/agora-v4",
+            "filter": [
+                "**/*"
+            ]
+        },
+        {
+            "from": "node_modules/@plasosdk/plaso-electron-sdk/lib/agora-v4/node_modules",
+            "to": "app/node_modules/@plasosdk/plaso-electron-sdk/lib/agora-v4/node_modules",
+            "filter": [
+                "**/*"
+            ]
+        }
+    ]
+}
+```
+</details>
+
+<details>
+<summary><strong>版本 1.3.7 ~ 1.3.11 的配置</strong></summary>
+该版本已知问题：给项目安装新依赖时，可能会导致agora-v4包被npm清理掉
 
 ```json
 {
@@ -69,8 +103,29 @@ agora-electron-sdk-v4包是在安装plaso-electron-sdk时通过脚本动态安
     ]
 }
 ```
+</details>
 
-同时，由于这个包是通过extraResources进行拷贝的，需要在签名脚本中额外配置这个包的路径。
+<details>
+<summary><strong>版本 <= 1.3.6 的配置</strong></summary>
+该版本已知问题：给项目安装新依赖时，可能会导致agora-v4包被npm清理掉
+
+```json
+{
+    "extraResources": [
+        {
+            "from": "node_modules/agora-electron-sdk-v4",
+            "to": "app/node_modules/agora-electron-sdk-v4",
+            "filter": ["**/*"]
+        },
+        {
+            "from": "node_modules/agora-electron-sdk-v4/node_modules",
+            "to": "app/node_modules/agora-electron-sdk-v4/node_modules",
+            "filter": ["**/*"]
+        }
+    ]
+}
+```
+</details>
 
 ### 关闭asar
 

package/js/render.js

@@ -110,7 +110,7 @@ function createClassWindow(classWindowProps) {
                     rhost = `https://${env}.plaso.cn/static/yxtelectronsdk/`;
                     dhost = `https://${env}.plaso.cn/`;
                 } else {
-                    rhost = `https://wwwr.plaso.cn/static/sdk/styleupime/${classOptions.version ?? '1.60.127'}/`;
+                    rhost = `https://wwwr.plaso.cn/static/sdk/styleupime/${classOptions.version ?? '1.60.128'}/`;
                     dhost = 'https://www.plaso.cn/';
                 }
 

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@plasosdk/plaso-electron-sdk",
-  "version": "1.3.12-beta.0",
+  "version": "1.3.12-beta.2",
   "description": "伯索课堂Electron SDK",
   "main": "index.js",
   "scripts": {
     "start": "electron .",
-    "install": "npm run download",
-    "download": "node ./scripts/downloadPrebuild.js"
+    "install": "node ./scripts/install.js"
   },
   "keywords": [
     "plaso",

package/scripts/{downloadPrebuild.js → install.js}

@@ -164,6 +164,41 @@ const downloadFile = (zipFileName, localDir) => {
         });
 };
 
+const versionUpgradeWarn = () => {
+    let prevVersion = null;
+    const pkgPath = INIT_CWD
+        ? path.join(INIT_CWD, 'node_modules/@plasosdk/plaso-electron-sdk/package.json')
+        : path.join(__dirname, '../../node_modules/@plasosdk/plaso-electron-sdk/package.json');
+    
+    if (fs.existsSync(pkgPath)) {
+        try {
+            prevVersion = fs.readJsonSync(pkgPath).version;
+        } catch {}
+    }
+
+    if (!prevVersion && INIT_CWD) {
+        const lockPath = path.join(INIT_CWD, 'package-lock.json');
+        if (fs.existsSync(lockPath)) {
+            try {
+                const lock = fs.readJsonSync(lockPath);
+                const info = lock?.packages?.['node_modules/@plasosdk/plaso-electron-sdk'] || 
+                            lock?.dependencies?.['@plasosdk/plaso-electron-sdk'];
+                prevVersion = info.version;
+            } catch {}
+        }
+    }
+
+    if (prevVersion) {
+        try {
+            const semver = require('semver');
+            if (semver.lt(prevVersion, '1.3.12')) {
+                console.log('\n⚠️  检测到 plaso-electron-sdk 从版本', prevVersion, '升级到', packageVersion);
+                console.log('📌 版本 >= 1.3.12 的 electron-builder 配置有调整，如果你使用 electron-builder 打包，请查看 README.md 中"文件拷贝相关配置"章节\n');
+            }
+        } catch {}
+    }
+};
+
 const downloadPrebuild = async () => {
     logger.info('Package Version: %s', packageVersion);
     logger.info('Platform: %s', platform);
@@ -182,4 +217,5 @@ const downloadPrebuild = async () => {
     }
 };
 
+versionUpgradeWarn();
 downloadPrebuild();