agora-toolchain 3.10.0-alpha → 3.10.0-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-toolchain",
-  "version": "3.10.0-alpha",
+  "version": "3.10.0-beta",
   "license": "MIT",
   "bin": {
     "agora-tc-transpile": "./scripts/transpile.js",
@@ -60,6 +60,7 @@
     "karma": "^6.4.2",
     "karma-chrome-launcher": "^3.2.0",
     "karma-jasmine": "^5.1.0",
+    "karma-spec-reporter": "^0.0.36",
     "karma-webpack": "^5.0.0",
     "mini-css-extract-plugin": "^2.9.1",
     "postcss-loader": "^8.1.1",

package/presets/karma.conf.js

@@ -6,6 +6,7 @@ const cwd = process.cwd();
 
 const pattern = opts.file ?? '**/*.test.ts';
 const singleRun = opts.singleRun ?? false;
+const useSpecReporter = opts.spec ?? false;
 const fakeMedia = opts.fakeMedia ?? false;
 const headless = opts.headless ?? false;
 
@@ -84,7 +85,7 @@ module.exports = (config) => {
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://www.npmjs.com/search?q=keywords:karma-reporter
-    reporters: ['progress'],
+    reporters: [useSpecReporter ? 'spec' : 'progress'],
 
     // web server port
     port: 9876,

package/presets/webpack.prod.js

@@ -233,9 +233,15 @@ module.exports = createConfig = ({ entry, analyze, out = 'dist' }) => {
             to: resolveCwd('dist/extensions'),
             noErrorOnMissing: true,
           },
-          // meeting-manager.js
+          // js files (init.js and meeting-manager.js) - 复制到 dist/js/ 目录（HTML 引用的位置）
           {
-            from: resolveAtBaseModule('public/meeting-manager.js'),
+            from: resolveAtBaseModule('public/js'),
+            to: resolveCwd('dist/js'),
+            noErrorOnMissing: true,
+          },
+          // 同时也在根目录保留 meeting-manager.js（向后兼容，如果有其他代码引用）
+          {
+            from: resolveAtBaseModule('public/js/meeting-manager.js'),
             to: resolveCwd('dist/meeting-manager.js'),
             noErrorOnMissing: true,
           },

package/scripts/pack-client-app.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 const builder = require('electron-builder');
+const fs = require('fs');
 const path = require('path');
 const { platform, arch, cpp } = require('../tools/pack-options');
 const { notarizeMac } = require('../tools/notarize');
@@ -13,6 +14,100 @@ const targetPlatform = platform;
 
 const targetArch = arch;
 
+// 读取 package.json 获取版本号
+const packageJsonPath = resolveCwd('package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+const originalVersion = packageJson.version;
+let builderVersion = packageJson.version;
+let jobNumber = '0';
+
+// Windows 和 Linux 平台不支持预发布版本号（如 3.7.8-rc.2），需要转换为标准版本号
+if (targetPlatform === 'win32' || targetPlatform === 'linux') {
+  // 移除预发布标识符（-rc.2, -beta.1 等）
+  const baseVersion = builderVersion.split('-')[0];
+  // 获取 job 号（从环境变量）
+  jobNumber = process.env.BUILD_NUMBER || process.env.JOB_NUMBER || '0';
+  
+  // 版本号格式: major.minor.patch.jobNumber
+  builderVersion = `${baseVersion}.${jobNumber}`;
+  
+  console.log(`${targetPlatform} Platform version number from ${originalVersion} Convert to ${builderVersion}`);
+}
+
+// 调试输出
+console.log('Platform:', targetPlatform);
+console.log('Arch input:', arch);
+console.log('Target arch:', arch);
+console.log('Builder.Arch enum:', builder.Arch);
+console.log('Builder.Arch[arch]:', builder.Arch[targetArch]);
+
+// 获取平台特定的 Native 库资源配置
+function getNativeLibsResources() {
+  const platformConfigs = {
+    win32: {
+      from: resolveBase('public/electron-native-libs/win/'),
+      to: 'Libs',
+    },
+    darwin: {
+      from: resolveBase('public/electron-native-libs/mac/'),
+      to: 'Frameworks',
+    },
+    linux: {
+      from: resolveBase('public/electron-native-libs/linux/'),
+      to: 'lib',
+    },
+  };
+
+  return platformConfigs[targetPlatform] ? [platformConfigs[targetPlatform]] : [];
+}
+
+// 获取通用资源配置（JS Bundle 模式）
+function getCommonResources() {
+  return [
+    {
+      from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/sound_effects/'),
+      to: 'assets/sound_effects/',
+    },
+    {
+      from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/images/'),
+      to: 'assets/images/',
+    },
+    {
+      from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/videos/'),
+      to: 'assets/videos/',
+    },
+  ];
+}
+
+// 获取文件打包配置
+function getFilesConfig() {
+  if (cpp) {
+    // Native Bundle 模式：排除不需要的文件
+    return [
+      '!**/node_modules/agora-electron-sdk/**/*',
+      '!**/artifactory_deps/**/*',
+      '!**/mac-release/**/*',
+      '!**/node_modules/fcr-ui-scene/release/**/*',
+      '!**/node_modules/fcr-ui-scene/src/**/*',
+      '!**/node_modules/agora-rte-sdk/src/**/*',
+      '!**/node_modules/agora-ui-foundation/src/**/*',
+      '!**/node_modules/agora-foundation/src/**/*',
+      '!**/node_modules/fcr-ui-scene/linux-release/**/*',
+      '!**/node_modules/fcr-ui-scene/linux-release-x64/**/*',
+    ];
+  } else {
+    // JS Bundle 模式
+    return [
+      '**/*',
+      '!**/artifactory_deps/**/*',
+      '!**/mac-release/**/*',
+      // 交叉编译时排除平台特定的原生模块构建文件
+      '!**/node_modules/extract-file-icon/build/**/*',
+      '!**/node_modules/node-window-manager/build/**/*',
+    ];
+  }
+}
+
 // Let's get that intellisense working
 /**
  * @type {import('electron-builder').Configuration}
@@ -26,9 +121,11 @@ const options = {
     schemes: ['fcr-meeting'],
   },
 
-  // "store” | “normal” | "maximum". - For testing builds, use 'store' to reduce build time significantly.
+  // "store" | "normal" | "maximum". - For testing builds, use 'store' to reduce build time significantly.
   compression: isDebug ? 'store' : 'normal',
   removePackageScripts: true,
+  buildVersion: builderVersion,
+  buildNumber: jobNumber,
 
   afterSign: async (context) => {
     // Mac releases require hardening+notarization: https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution
@@ -46,47 +143,8 @@ const options = {
     output: resolveCwd('release'),
     buildResources: resolveCwd('installer/resources'),
   },
-  extraResources: cpp
-    ? targetPlatform === 'win32'
-      ? [
-        {
-          from: resolveBase('public/electron-native-libs/win/'),
-          to: 'Libs',
-        },
-      ]
-      : [
-        {
-          from: resolveBase('public/electron-native-libs/mac/'),
-          to: 'Frameworks',
-        },
-      ]
-    : [
-      // 内置资源
-      {
-        from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/sound_effects/'),
-        to: 'assets/sound_effects/',
-      },
-      {
-        from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/images/'),
-        to: 'assets/images/',
-      },
-      {
-        from: path.join(resolveModule('fcr-ui-scene'), 'public/assets/electron/videos/'),
-        to: 'assets/videos/',
-      },
-    ],
-  files: cpp
-    ? ['!**/node_modules/agora-electron-sdk/**/*', 
-      '!**/artifactory_deps/**/*', 
-      '!**/mac-release/**/*', 
-      '!**/node_modules/fcr-ui-scene/release/**/*',
-      '!**/node_modules/fcr-ui-scene/src/**/*',
-      '!**/node_modules/agora-rte-sdk/src/**/*',
-      '!**/node_modules/agora-ui-foundation/src/**/*',
-      '!**/node_modules/agora-foundation/src/**/*',
-     
-    ]
-    : ['**/*', '!**/artifactory_deps/**/*', '!**/mac-release/**/*'],
+  extraResources: cpp ? getNativeLibsResources() : getCommonResources(),
+  files: getFilesConfig(),
   win: {
     icon: resolveCwd('installer/icons/favicon.png'),
     target: 'nsis',
@@ -95,6 +153,20 @@ const options = {
     shortcutName: 'FcrMeeting',
     installerIcon: resolveCwd('installer/icons/favicon.ico'),
   },
+  linux: {
+    icon: resolveCwd('installer/icons/favicon.png'),
+    target: [
+      {
+        target: 'AppImage',
+        // arch: [arch],
+      }
+    ],
+    // category: 'Development',
+    // maintainer: 'Agora.io <support@agora.io>',
+  },
+  appImage: {
+    artifactName: '${name}.${ext}',
+  },
   mac: {
     target: 'dmg',
     icon: resolveCwd('installer/icons/favicon.png'),
@@ -128,18 +200,34 @@ const options = {
   },
 };
 
-// Promise is returned
+// 创建构建目标
+function createBuildTargets() {
+  // if (targetPlatform === 'linux') {
+  //   // Linux 构建时直接使用配置中的 target，避免 Arch 枚举问题
+  //   return Platform.LINUX.createTarget();
+  // }
+  const platformTargets = {
+    win32: () => Platform.WINDOWS.createTarget(['nsis'], [builder.Arch[targetArch]]),
+    darwin: () => Platform.MAC.createTarget(['dmg'], [builder.Arch[targetArch]]),
+    linux: () => Platform.LINUX.createTarget(['AppImage'], [builder.Arch[targetArch]]),
+  };
+
+  const createTarget = platformTargets[targetPlatform] || platformTargets.darwin;
+  return createTarget();
+}
+
+const targets = createBuildTargets();
+
+// 执行构建
 builder
   .build({
-    targets:
-      targetPlatform === 'win32'
-        ? Platform.WINDOWS.createTarget(['nsis'], ...targetArch.map((arch) => builder.Arch[arch]))
-        : Platform.MAC.createTarget(['dmg'], ...targetArch.map((arch) => builder.Arch[arch])),
+    targets,
     config: options,
     publish: 'never',
   })
   .then((result) => {
-    console.log(JSON.stringify(result));
+    console.log('Build completed successfully:');
+    console.log(JSON.stringify(result, null, 2));
   })
   .catch((error) => {
     console.error(error);

package/scripts/pack-client-sdk.js

@@ -5,10 +5,12 @@ const path = require('path');
 const crypto = require('crypto');
 const { platform, arch, main: _mainScript } = require('../tools/pack-options');
 const { resolveCwd } = require('../tools/paths');
+const { notarizeMac } = require('../tools/notarize');
 
 const Platform = builder.Platform;
 const AES_KEY = 'FCRUISCENE';
 const AES_ALGORITHM = 'aes-256-ecb';
+const isDebug = false; // 生产构建
 
 function getAesKey() {
   return crypto.createHash('sha256').update(AES_KEY).digest();
@@ -78,6 +80,13 @@ const builderOptions = {
   removePackageScripts: true,
   buildVersion: builderVersion,
   buildNumber: jobNumber,
+
+  afterSign: async (context) => {
+    // Mac releases require hardening+notarization: https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution
+    if (!isDebug && context.electronPlatformName === 'darwin') {
+      await notarizeMac(context);
+    }
+  },
   nodeGypRebuild: false,
   buildDependenciesFromSource: false,
   extraMetadata: {
@@ -149,6 +158,26 @@ const builderOptions = {
     shortcutName: 'FcrMeeting',
     installerIcon: resolveCwd('installer/icons/favicon.ico'),
   },
+  appImage: {
+    artifactName: '${name}.${ext}',
+  },
+  linux: {
+    icon: resolveCwd('installer/icons/favicon.png'),
+    target: [
+      {
+        target: 'AppImage',
+      },
+    ],
+    category: 'Utility',
+    desktop: {
+      Name: packageJson.productName || packageJson.name,
+      Comment: packageJson.description || '',
+      Icon: 'favicon',
+      Terminal: false,
+      Type: 'Application',
+      Categories: 'Utility;',
+    },
+  },
   mac: {
     target: 'dmg',
     icon: resolveCwd('installer/icons/favicon.png'),
@@ -280,7 +309,7 @@ async function packWithElectronBuilder() {
   } else if (targetPlatform === 'win32') {
     targets = Platform.WINDOWS.createTarget(['nsis'], [builder.Arch[targetArch]]);
   } else if (targetPlatform === 'linux') {
-    targets = Platform.LINUX.createTarget();
+    targets = Platform.LINUX.createTarget(['AppImage'], [builder.Arch[targetArch]]);
   }
 
   try {

package/tools/karma-options.js

@@ -3,6 +3,7 @@ const { program } = require('commander');
 const opts = program
   .option('--file <file>', 'Specify an UT to run')
   .option('--single-run', 'Run tests once and exit', false)
+  .option('--spec', 'Use spec reporter for detailed test output', false)
   .option('--fake-media', 'Use fake media devices in browser tests', false)
   .option('--headless', 'Run browser tests in headless mode', false)
   .parse(process.argv)