@choochmeque/tauri-windows-bundle 0.1.7 → 0.1.9

package/README.md

@@ -61,7 +61,9 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 {
   "publisher": "CN=YourCompany",
   "publisherDisplayName": "Your Company Name",
-  "capabilities": ["internetClient"],
+  "capabilities": {
+    "general": ["internetClient"]
+  },
   "signing": {
     "pfx": null,
     "pfxPassword": null
@@ -69,6 +71,24 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 }
 ```
 
+**Capabilities** are validated at build time. Three types are supported:
+
+```json
+{
+  "capabilities": {
+    "general": ["internetClient", "internetClientServer", "privateNetworkClientServer"],
+    "device": ["webcam", "microphone", "location", "bluetooth"],
+    "restricted": ["broadFileSystemAccess", "allowElevation"]
+  }
+}
+```
+
+- `general` - Standard capabilities (`<Capability>`)
+- `device` - Device access (`<DeviceCapability>`)
+- `restricted` - Requires Store approval (`<rescap:Capability>`)
+
+Note: `runFullTrust` is always auto-added (required for Tauri apps).
+
 **Auto-read from tauri.conf.json:**
 - `displayName` ← `productName`
 - `version` ← `version` (auto-converted to 4-part: `1.0.0` → `1.0.0.0`)

package/dist/cli.js

@@ -74,7 +74,80 @@ const MSIX_ASSETS = [
     { name: 'LargeTile.png', size: 310 },
 ];
 const DEFAULT_MIN_WINDOWS_VERSION = '10.0.17763.0';
-const DEFAULT_CAPABILITIES = ['internetClient'];
+// Valid Windows capabilities by type
+// Reference: https://learn.microsoft.com/en-us/windows/uwp/packaging/app-capability-declarations
+const GENERAL_CAPABILITIES = [
+    'internetClient',
+    'internetClientServer',
+    'privateNetworkClientServer',
+    'allJoyn',
+    'codeGeneration',
+];
+const DEVICE_CAPABILITIES = [
+    'webcam',
+    'microphone',
+    'location',
+    'proximity',
+    'bluetooth',
+    'serialcommunication',
+    'usb',
+    'humaninterfacedevice',
+    'pointOfService',
+    'lowLevelDevices',
+    'gazeInput',
+    'radios',
+];
+const RESTRICTED_CAPABILITIES = [
+    'broadFileSystemAccess',
+    'allowElevation',
+    'appCaptureSettings',
+    'appDiagnostics',
+    'backgroundSpatialPerception',
+    'deviceUnlock',
+    'expandedResources',
+    'extendedBackgroundTaskTime',
+    'extendedExecutionBackgroundAudio',
+    'extendedExecutionCritical',
+    'extendedExecutionUnconstrained',
+    'inputForegroundObservation',
+    'locationHistory',
+    'locationSystem',
+    'networkingVpnProvider',
+    'packageManagement',
+    'packageQuery',
+    'previewStore',
+    'systemManagement',
+    'unvirtualizedResources',
+    'userSystemId',
+];
+const DEFAULT_CAPABILITIES = {
+    general: ['internetClient'],
+};
+function validateCapabilities(config) {
+    const errors = [];
+    if (config.general) {
+        for (const cap of config.general) {
+            if (!GENERAL_CAPABILITIES.includes(cap)) {
+                errors.push(`Invalid general capability: "${cap}". Valid: ${GENERAL_CAPABILITIES.join(', ')}`);
+            }
+        }
+    }
+    if (config.device) {
+        for (const cap of config.device) {
+            if (!DEVICE_CAPABILITIES.includes(cap)) {
+                errors.push(`Invalid device capability: "${cap}". Valid: ${DEVICE_CAPABILITIES.join(', ')}`);
+            }
+        }
+    }
+    if (config.restricted) {
+        for (const cap of config.restricted) {
+            if (!RESTRICTED_CAPABILITIES.includes(cap)) {
+                errors.push(`Invalid restricted capability: "${cap}". Valid: ${RESTRICTED_CAPABILITIES.join(', ')}`);
+            }
+        }
+    }
+    return errors;
+}
 
 function generateBundleConfig(windowsDir, _tauriConfig) {
     const config = {
@@ -318,7 +391,7 @@ function generateManifest(config, arch, minVersion) {
         EXECUTABLE: `${config.displayName.replace(/\s+/g, '')}.exe`,
         DESCRIPTION: config.description || config.displayName,
         EXTENSIONS: generateExtensions(config),
-        CAPABILITIES: generateCapabilities(config.capabilities || []),
+        CAPABILITIES: generateCapabilities(config.capabilities || DEFAULT_CAPABILITIES),
     };
     return replaceTemplateVariables(getManifestTemplate(), variables);
 }
@@ -476,13 +549,27 @@ function generateExtensions(config) {
     }
     return `      <Extensions>\n${extensions.join('\n\n')}\n      </Extensions>`;
 }
-function generateCapabilities(capabilities) {
+function generateCapabilities(config) {
     const caps = [];
     // runFullTrust is always required for Tauri apps using Windows.FullTrustApplication
     caps.push('    <rescap:Capability Name="runFullTrust" />');
-    // Add user-specified capabilities
-    for (const cap of capabilities) {
-        caps.push(`    <Capability Name="${cap}" />`);
+    // Add general capabilities
+    if (config.general) {
+        for (const cap of config.general) {
+            caps.push(`    <Capability Name="${cap}" />`);
+        }
+    }
+    // Add device capabilities
+    if (config.device) {
+        for (const cap of config.device) {
+            caps.push(`    <DeviceCapability Name="${cap}" />`);
+        }
+    }
+    // Add restricted capabilities
+    if (config.restricted) {
+        for (const cap of config.restricted) {
+            caps.push(`    <rescap:Capability Name="${cap}" />`);
+        }
     }
     return caps.join('\n');
 }
@@ -695,7 +782,7 @@ function isVersionSufficient(version, minVersion) {
         return false;
     return patch >= minPatch;
 }
-const MIN_MSIXBUNDLE_CLI_VERSION = '1.0.0';
+const MIN_MSIXBUNDLE_CLI_VERSION = '1.0.2';
 async function promptInstall(message) {
     const rl = readline.createInterface({
         input: process.stdin,
@@ -804,6 +891,17 @@ async function build(options) {
     // Read configs
     const tauriConfig = readTauriConfig(projectRoot);
     const bundleConfig = readBundleConfig$1(windowsDir);
+    // Validate capabilities
+    if (bundleConfig.capabilities) {
+        const errors = validateCapabilities(bundleConfig.capabilities);
+        if (errors.length > 0) {
+            console.error('Invalid capabilities in bundle.config.json:');
+            for (const error of errors) {
+                console.error(`  - ${error}`);
+            }
+            process.exit(1);
+        }
+    }
     // Merge config
     const config = {
         displayName: tauriConfig.productName || 'App',
@@ -856,6 +954,7 @@ async function build(options) {
     console.log('\nCreating MSIX package...');
     const outDir = path.join(projectRoot, 'src-tauri', 'target', 'msix');
     const args = [
+        '--force',
         '--out-dir',
         outDir,
         ...appxDirs.flatMap(({ arch, dir }) => [`--dir-${arch}`, dir]),

package/dist/index.js

@@ -16,7 +16,80 @@ const MSIX_ASSETS = [
     { name: 'LargeTile.png', size: 310 },
 ];
 const DEFAULT_MIN_WINDOWS_VERSION = '10.0.17763.0';
-const DEFAULT_CAPABILITIES = ['internetClient'];
+// Valid Windows capabilities by type
+// Reference: https://learn.microsoft.com/en-us/windows/uwp/packaging/app-capability-declarations
+const GENERAL_CAPABILITIES = [
+    'internetClient',
+    'internetClientServer',
+    'privateNetworkClientServer',
+    'allJoyn',
+    'codeGeneration',
+];
+const DEVICE_CAPABILITIES = [
+    'webcam',
+    'microphone',
+    'location',
+    'proximity',
+    'bluetooth',
+    'serialcommunication',
+    'usb',
+    'humaninterfacedevice',
+    'pointOfService',
+    'lowLevelDevices',
+    'gazeInput',
+    'radios',
+];
+const RESTRICTED_CAPABILITIES = [
+    'broadFileSystemAccess',
+    'allowElevation',
+    'appCaptureSettings',
+    'appDiagnostics',
+    'backgroundSpatialPerception',
+    'deviceUnlock',
+    'expandedResources',
+    'extendedBackgroundTaskTime',
+    'extendedExecutionBackgroundAudio',
+    'extendedExecutionCritical',
+    'extendedExecutionUnconstrained',
+    'inputForegroundObservation',
+    'locationHistory',
+    'locationSystem',
+    'networkingVpnProvider',
+    'packageManagement',
+    'packageQuery',
+    'previewStore',
+    'systemManagement',
+    'unvirtualizedResources',
+    'userSystemId',
+];
+const DEFAULT_CAPABILITIES = {
+    general: ['internetClient'],
+};
+function validateCapabilities(config) {
+    const errors = [];
+    if (config.general) {
+        for (const cap of config.general) {
+            if (!GENERAL_CAPABILITIES.includes(cap)) {
+                errors.push(`Invalid general capability: "${cap}". Valid: ${GENERAL_CAPABILITIES.join(', ')}`);
+            }
+        }
+    }
+    if (config.device) {
+        for (const cap of config.device) {
+            if (!DEVICE_CAPABILITIES.includes(cap)) {
+                errors.push(`Invalid device capability: "${cap}". Valid: ${DEVICE_CAPABILITIES.join(', ')}`);
+            }
+        }
+    }
+    if (config.restricted) {
+        for (const cap of config.restricted) {
+            if (!RESTRICTED_CAPABILITIES.includes(cap)) {
+                errors.push(`Invalid restricted capability: "${cap}". Valid: ${RESTRICTED_CAPABILITIES.join(', ')}`);
+            }
+        }
+    }
+    return errors;
+}
 
 function findProjectRoot(startDir) {
     let dir = startDir || process.cwd();
@@ -316,7 +389,7 @@ function generateManifest(config, arch, minVersion) {
         EXECUTABLE: `${config.displayName.replace(/\s+/g, '')}.exe`,
         DESCRIPTION: config.description || config.displayName,
         EXTENSIONS: generateExtensions(config),
-        CAPABILITIES: generateCapabilities(config.capabilities || []),
+        CAPABILITIES: generateCapabilities(config.capabilities || DEFAULT_CAPABILITIES),
     };
     return replaceTemplateVariables(getManifestTemplate(), variables);
 }
@@ -474,13 +547,27 @@ function generateExtensions(config) {
     }
     return `      <Extensions>\n${extensions.join('\n\n')}\n      </Extensions>`;
 }
-function generateCapabilities(capabilities) {
+function generateCapabilities(config) {
     const caps = [];
     // runFullTrust is always required for Tauri apps using Windows.FullTrustApplication
     caps.push('    <rescap:Capability Name="runFullTrust" />');
-    // Add user-specified capabilities
-    for (const cap of capabilities) {
-        caps.push(`    <Capability Name="${cap}" />`);
+    // Add general capabilities
+    if (config.general) {
+        for (const cap of config.general) {
+            caps.push(`    <Capability Name="${cap}" />`);
+        }
+    }
+    // Add device capabilities
+    if (config.device) {
+        for (const cap of config.device) {
+            caps.push(`    <DeviceCapability Name="${cap}" />`);
+        }
+    }
+    // Add restricted capabilities
+    if (config.restricted) {
+        for (const cap of config.restricted) {
+            caps.push(`    <rescap:Capability Name="${cap}" />`);
+        }
     }
     return caps.join('\n');
 }
@@ -693,7 +780,7 @@ function isVersionSufficient(version, minVersion) {
         return false;
     return patch >= minPatch;
 }
-const MIN_MSIXBUNDLE_CLI_VERSION = '1.0.0';
+const MIN_MSIXBUNDLE_CLI_VERSION = '1.0.2';
 async function promptInstall(message) {
     const rl = readline.createInterface({
         input: process.stdin,
@@ -802,6 +889,17 @@ async function build(options) {
     // Read configs
     const tauriConfig = readTauriConfig(projectRoot);
     const bundleConfig = readBundleConfig$1(windowsDir);
+    // Validate capabilities
+    if (bundleConfig.capabilities) {
+        const errors = validateCapabilities(bundleConfig.capabilities);
+        if (errors.length > 0) {
+            console.error('Invalid capabilities in bundle.config.json:');
+            for (const error of errors) {
+                console.error(`  - ${error}`);
+            }
+            process.exit(1);
+        }
+    }
     // Merge config
     const config = {
         displayName: tauriConfig.productName || 'App',
@@ -854,6 +952,7 @@ async function build(options) {
     console.log('\nCreating MSIX package...');
     const outDir = path.join(projectRoot, 'src-tauri', 'target', 'msix');
     const args = [
+        '--force',
         '--out-dir',
         outDir,
         ...appxDirs.flatMap(({ arch, dir }) => [`--dir-${arch}`, dir]),
@@ -1587,4 +1686,4 @@ async function extensionRemove(type, name, options) {
     }
 }
 
-export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, MSIX_ASSETS, build, extensionAddAppExecutionAlias, extensionAddAppService, extensionAddAutoplay, extensionAddBackgroundTask, extensionAddContextMenu, extensionAddFileAssociation, extensionAddPreviewHandler, extensionAddProtocol, extensionAddThumbnailHandler, extensionDisablePrintTaskSettings, extensionDisableShareTarget, extensionDisableStartupTask, extensionDisableToastActivation, extensionEnablePrintTaskSettings, extensionEnableShareTarget, extensionEnableStartupTask, extensionEnableToastActivation, extensionList, extensionRemove, findProjectRoot, generateManifest, generateManifestTemplate, getPackageVersion, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, toFourPartVersion };
+export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, DEVICE_CAPABILITIES, GENERAL_CAPABILITIES, MSIX_ASSETS, RESTRICTED_CAPABILITIES, build, extensionAddAppExecutionAlias, extensionAddAppService, extensionAddAutoplay, extensionAddBackgroundTask, extensionAddContextMenu, extensionAddFileAssociation, extensionAddPreviewHandler, extensionAddProtocol, extensionAddThumbnailHandler, extensionDisablePrintTaskSettings, extensionDisableShareTarget, extensionDisableStartupTask, extensionDisableToastActivation, extensionEnablePrintTaskSettings, extensionEnableShareTarget, extensionEnableStartupTask, extensionEnableToastActivation, extensionList, extensionRemove, findProjectRoot, generateManifest, generateManifestTemplate, getPackageVersion, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, toFourPartVersion, validateCapabilities };

package/dist/types.d.ts

@@ -15,10 +15,15 @@ export interface TauriConfig {
         };
     };
 }
+export interface CapabilitiesConfig {
+    general?: string[];
+    device?: string[];
+    restricted?: string[];
+}
 export interface BundleConfig {
     publisher: string;
     publisherDisplayName: string;
-    capabilities?: string[];
+    capabilities?: CapabilitiesConfig;
     extensions?: {
         shareTarget?: boolean;
         fileAssociations?: FileAssociation[];
@@ -114,4 +119,8 @@ export interface MsixAsset {
 }
 export declare const MSIX_ASSETS: MsixAsset[];
 export declare const DEFAULT_MIN_WINDOWS_VERSION = "10.0.17763.0";
-export declare const DEFAULT_CAPABILITIES: string[];
+export declare const GENERAL_CAPABILITIES: readonly ["internetClient", "internetClientServer", "privateNetworkClientServer", "allJoyn", "codeGeneration"];
+export declare const DEVICE_CAPABILITIES: readonly ["webcam", "microphone", "location", "proximity", "bluetooth", "serialcommunication", "usb", "humaninterfacedevice", "pointOfService", "lowLevelDevices", "gazeInput", "radios"];
+export declare const RESTRICTED_CAPABILITIES: readonly ["broadFileSystemAccess", "allowElevation", "appCaptureSettings", "appDiagnostics", "backgroundSpatialPerception", "deviceUnlock", "expandedResources", "extendedBackgroundTaskTime", "extendedExecutionBackgroundAudio", "extendedExecutionCritical", "extendedExecutionUnconstrained", "inputForegroundObservation", "locationHistory", "locationSystem", "networkingVpnProvider", "packageManagement", "packageQuery", "previewStore", "systemManagement", "unvirtualizedResources", "userSystemId"];
+export declare const DEFAULT_CAPABILITIES: CapabilitiesConfig;
+export declare function validateCapabilities(config: CapabilitiesConfig): string[];

package/dist/utils/exec.d.ts

@@ -16,7 +16,7 @@ export declare function execAsync(command: string, options?: {
 export declare function isMsixbundleCliInstalled(): Promise<boolean>;
 export declare function getMsixbundleCliVersion(): Promise<string | null>;
 export declare function isVersionSufficient(version: string, minVersion: string): boolean;
-export declare const MIN_MSIXBUNDLE_CLI_VERSION = "1.0.0";
+export declare const MIN_MSIXBUNDLE_CLI_VERSION = "1.0.2";
 export declare function promptInstall(message: string): Promise<boolean>;
 export interface ExecWithProgressOptions {
     cwd?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choochmeque/tauri-windows-bundle",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "MSIX packaging tool for Tauri apps - Windows Store ready bundles",
   "type": "module",
   "bin": {