cordova-plugin-iosrtc - npm Package Compare versions

Comparing version 6.0.17 to 6.0.18

.github/ISSUE_TEMPLATE.md

@@ -1,7 +0,7 @@
-# Please read first!
-Please use [Public Google Group (mailing list)](https://groups.google.com/forum/#!forum/cordova-plugin-iosrtc) for general technical discussions and questions.
+# YOU MUST read first!
+Please use [Community Forum](https://github.com/cordova-rtc/cordova-plugin-iosrtc/discussions) for general technical discussions and questions.
 
-- [ ] I have used Google with the error message or bug in association with the library and Cordova words to make sure the issue I'm reporting is only related to iOSRTC.
-- [ ] I have provided steps to reproduce (e.g. sample code or updated `extra/renderer-and-libwebrtc-tests.js` file).
-- [ ] I have provided third party library name and version, ios, Xcode and plugin version and adapter.js version if used.
+- [ ] **I have used Google with the error message** or bug in association with the library and Cordova words to make sure the issue I'm reporting is only related to iOSRTC.
+- [ ] **I have provided steps to reproduce** (e.g. using sample app code https://github.com/cordova-rtc/cordova-plugin-iosrtc-sample or updated `extra/renderer-and-libwebrtc-tests.js` file).
+- [ ] **I have provided versions** of third party library name, ios, Xcode and plugin version and adapter.js version if used.
 
@@ -8,0 +8,0 @@ **Note: If the checkboxes above are not checked (which you do after the issue is posted), the issue will be closed, removing this checkbox will result in automatic closed issue.**

CHANGELOG.md

@@ -0,1 +1,6 @@
+#### Version 6.0.18
+* fix: update ios_arch.js to generate WebRTC.xcframework, Include WebRTC.xcframework instead of WebRTC.framework
+* fix: ignore empty IceCandidate, fix RTCPeerConnection_addIceCandidate pluginRTCPeerConnection argument is NIL
+* fix: allow registerGlobals to be called multiple time without error: Attempting to change value of a readonly property.
+
 #### Version 6.0.17
@@ -2,0 +7,0 @@ * fix: fix possible duplicate pluginMediaStream and pluginMediaTrack causing no video

docs/Building.md

@@ -111,2 +111,19 @@ # Building
 
-  > Note for Capacitor users: The plugins will be in the node_modules folder so ios_arch will be run in `node_modules/cordova-plugin-iosrtc/extra`
+###### Capacitor
+Using Capacitor; The plugins will be in the node_modules folder so ios_arch will be run in `node_modules/cordova-plugin-iosrtc/extra`
+
+
+> node node_modules/cordova-plugin-iosrtc/extraios_arch.js --list   
+> node node_modules/cordova-plugin-iosrtc/extraios_arch.js --simulator
+
+You will need to remove and add ios platform again.
+
+###### Meteor
+
+Using Meteor; The plugins will be in the node_modules folder so ios_arch.js will be run in `.meteor/local/cordova-build/node_modules/cordova-plugin-iosrtc/extra/`
+
+> node .meteor/local/cordova-build/node_modules/cordova-plugin-iosrtc/extra/ios_arch.js --list   
+> node .meteor/local/cordova-build/node_modules/cordova-plugin-iosrtc/extra/ios_arch.js --simulator
+
+You will need to copy manually the updated WebRTC file, since remove/add platform does not work like cordova:
+> cp .meteor/local/cordova-build/node_modules/cordova-plugin-iosrtc/lib/WebRTC.framework/WebRTC .meteor/local/cordova-build/platforms/ios/*/Plugins/cordova-plugin-iosrtc/WebRTC.framework/WebRTC

extra/ios_arch.js

@@ -6,8 +6,19 @@ #!/usr/bin/env node
 
+const os = require('os');
+const fs = require('fs');
 const path = require('path');
 const exec = require('child_process').execSync;
 
-const WEBRTC_BIN_PATH = path.join(__dirname, '../lib/WebRTC.framework');
-const ARCH_TYPES = ['i386', 'x86_64', 'armv7', 'arm64'];
+const LIB_PATH = path.join(__dirname, '../lib');
+const WEBRTC_LIB_PATH = path.join(LIB_PATH, 'WebRTC.framework');
+const WEBRTC_XC_LIB_PATH = path.join(LIB_PATH, 'WebRTC.xcframework');
 
+const TMP_PATH = os.tmpdir();
+const WEBRTC_SIM_LIB_PATH = path.join(TMP_PATH, '/sim/WebRTC.framework');
+const WEBRTC_DEVICE_LIB_PATH = path.join(TMP_PATH, '/device/WebRTC.framework');
+
+const ARCH_SIM_TYPES = ['i386', 'x86_64'];
+const ARCH_DEVICE_TYPES = ['armv7', 'arm64'];
+const ARCH_TYPES = ARCH_SIM_TYPES.concat(ARCH_DEVICE_TYPES);
+
 /* === Example to strip simulator archs for Apple Store Submission ===
@@ -29,27 +40,68 @@ *
 
-// TODO: consider add a handy option to extract/package/delete automatically
+function extractArchitecture(archs, cwd) {
+	archs.forEach((arch) => {
+		exec(`lipo -extract ${arch} WebRTC -o WebRTC-${arch}`, { cwd: cwd });
+	});
+}
 
+function exportArchitecture(archs, cwd) {
+	exec(
+		`lipo -o WebRTC -create ${archs
+			.map(function (arch) {
+				return `WebRTC-${arch}`;
+			})
+			.join(' ')}`,
+		{ cwd: cwd }
+	);
+}
+
 if (process.argv[2] === '--extract' || process.argv[2] === '-e') {
 	console.log('Extracting...');
 	// extract all archs, you might want to delete it later.
-	ARCH_TYPES.forEach((elm) => {
-		exec(`lipo -extract ${elm} WebRTC -o WebRTC-${elm}`, { cwd: WEBRTC_BIN_PATH });
-	});
-	exec('cp WebRTC WebRTC-all', { cwd: WEBRTC_BIN_PATH }); // make a backup
+	extractArchitecture(ARCH_TYPES, WEBRTC_LIB_PATH);
+	exec('cp WebRTC WebRTC-all', { cwd: WEBRTC_LIB_PATH }); // make a backup
 } else if (process.argv[2] === '--simulator' || process.argv[2] === '-s') {
 	// re-package simulator related archs only. ( i386, x86_64 )
 	console.log('Compiling simulator...');
-	exec(`lipo -o WebRTC -create WebRTC-x86_64 WebRTC-i386`, { cwd: WEBRTC_BIN_PATH });
+	exportArchitecture(ARCH_SIM_TYPES, WEBRTC_LIB_PATH);
 } else if (process.argv[2] === '--device' || process.argv[2] === '-d') {
 	// re-package device related archs only. ( armv7, arm64 )
 	console.log('Compiling device...');
-	exec(`lipo -o WebRTC -create WebRTC-armv7 WebRTC-arm64`, { cwd: WEBRTC_BIN_PATH });
+	exportArchitecture(ARCH_DEVICE_TYPES, WEBRTC_LIB_PATH);
+} else if (process.argv[2] === '--xcframework' || process.argv[2] === '-x') {
+	// extract all archs, you might want to delete it later.
+	extractArchitecture(ARCH_TYPES, WEBRTC_LIB_PATH);
+
+	// xcframework
+	console.log('Generating WebRTC.framework for device...');
+	fs.mkdirSync(WEBRTC_DEVICE_LIB_PATH, { recursive: true });
+	exec(`cp -r 'WebRTC.framework/'* '${WEBRTC_DEVICE_LIB_PATH}'`, { cwd: LIB_PATH });
+	exportArchitecture(ARCH_DEVICE_TYPES, WEBRTC_DEVICE_LIB_PATH);
+	exec(`rm -f WebRTC-*`, { cwd: WEBRTC_DEVICE_LIB_PATH });
+
+	console.log('Generating WebRTC.framework for simulator...');
+	fs.mkdirSync(WEBRTC_SIM_LIB_PATH, { recursive: true });
+	exec(`cp -r 'WebRTC.framework/'* '${WEBRTC_SIM_LIB_PATH}'`, { cwd: LIB_PATH });
+	exportArchitecture(ARCH_SIM_TYPES, WEBRTC_SIM_LIB_PATH);
+	exec(`rm -f WebRTC-*`, { cwd: WEBRTC_SIM_LIB_PATH });
+
+	console.log('Generating WebRTC.xcframework...');
+	exec(`rm -rf ${WEBRTC_XC_LIB_PATH}`, { cwd: LIB_PATH });
+
+	exec(
+		`xcodebuild -create-xcframework -framework ${WEBRTC_DEVICE_LIB_PATH} -framework ${WEBRTC_SIM_LIB_PATH} -output '${WEBRTC_XC_LIB_PATH}'`,
+		{ cwd: LIB_PATH }
+	);
+
+	exec(`rm -f WebRTC-*`, { cwd: WEBRTC_LIB_PATH });
+	exec(`rm -fr ${WEBRTC_DEVICE_LIB_PATH}`, { cwd: TMP_PATH });
+	exec(`rm -fr ${WEBRTC_SIM_LIB_PATH}`, { cwd: TMP_PATH });
 } else if (process.argv[2] === '--list' || process.argv[2] === '-l') {
 	// List WebRTC architectures
 	console.log('List WebRTC architectures...');
-	console.log(exec(`file WebRTC`, { cwd: WEBRTC_BIN_PATH }).toString().trim());
+	console.log(exec(`file WebRTC`, { cwd: WEBRTC_LIB_PATH }).toString().trim());
 } else if (process.argv[2] === '--clean' || process.argv[2] === '-l') {
 	// Delete WebRTC-* architectures
 	console.log('Clean WebRTC architectures...');
-	console.log(exec(`rm -f WebRTC-*`, { cwd: WEBRTC_BIN_PATH }).toString().trim());
+	exec(`rm -f WebRTC-*`, { cwd: WEBRTC_LIB_PATH });
 } else {
@@ -60,3 +112,2 @@ console.log('Unknow options');
 console.log('List WebRTC files...');
-console.log(exec('ls -ahl | grep WebRTC', { cwd: WEBRTC_BIN_PATH }).toString().trim());
-console.log('Done! Remember to delete generated files ("WebRTC-*") if needed.');
+console.log(exec('ls -ahl | grep WebRTC', { cwd: LIB_PATH }).toString().trim());

js/iosrtc.js

@@ -196,16 +196,18 @@ /**
 	// Prevent WebRTC-adapter to overide navigator.mediaDevices after shim is applied since ios 14.3
-	Object.defineProperty(
-		navigator,
-		'mediaDevices',
-		{
-			value: new MediaDevices(),
-			writable: false
-		},
-		{
-			enumerable: false,
-			configurable: false,
-			writable: false,
-			value: 'static'
-		}
-	);
+	if (!(navigator.mediaDevices instanceof MediaDevices)) {
+		Object.defineProperty(
+			navigator,
+			'mediaDevices',
+			{
+				value: new MediaDevices(),
+				writable: false
+			},
+			{
+				enumerable: false,
+				configurable: false,
+				writable: false,
+				value: 'static'
+			}
+		);
+	}
 
@@ -212,0 +214,0 @@ window.RTCPeerConnection = RTCPeerConnection;

package.json

 {
   "name": "cordova-plugin-iosrtc",
-  "version": "6.0.17",
+  "version": "6.0.18",
   "description": "Cordova iOS plugin exposing the full WebRTC W3C JavaScript APIs",
@@ -5,0 +5,0 @@ "author": "Iñaki Baz Castillo (https://inakibaz.me)",

README.md

@@ -12,3 +12,3 @@ ![cordova-rtc-logo](https://raw.githubusercontent.com/cordova-rtc/cordova-plugin-iosrtc/master/art/cordova-rtc-logo.png)
 
-* [Public Google Group (mailing list)](https://groups.google.com/forum/#!forum/cordova-plugin-iosrtc) for questions and discussions about *cordova-plugin-iosrtc*.
+* [Community Forum](https://github.com/cordova-rtc/cordova-plugin-iosrtc/discussions) for questions and discussions about *cordova-plugin-iosrtc*.
 * [Bug Tracker](https://github.com/cordova-rtc/cordova-plugin-iosrtc/issues) for reporting issues and requesting new features (**please** don't use the bug tracker for questions or problems, use the mailing list instead).
@@ -15,0 +15,0 @@ * [NPM package](https://www.npmjs.com/package/cordova-plugin-iosrtc).

No alert changes

Improved metrics

Total package byte prevSize

57440388

increased by0.29%

Number of package files

197

increased by47.01%

Lines of code

8819

increased by0.54%

Worsened metrics

Number of low supply chain risk alerts

11

increased by10%

No dependency changes