@gjsify/webrtc 0.64.13-next.283 → 0.64.14

package/lib/esm/get-user-media.js

@@ -1 +1 @@
-import"./_virtual/_rolldown/runtime.js";import{Gst as e,ensureGstInit as t}from"./gst-init.js";import{MediaStreamTrack as n}from"./media-stream-track.js";import{MediaStream as r}from"./media-stream.js";async function getUserMedia(i){if(t(),!i.audio&&!i.video)throw TypeError(`Failed to execute 'getUserMedia': At least one of audio or video must be requested`);let a=[];if(i.audio){let t=typeof i.audio==`object`?i.audio:{},r=_createAudioSource(t),o=new e.Pipeline;o.add(r);let s=_buildAudioCaps(t);if(s){let t=e.ElementFactory.make(`capsfilter`,null);t.caps=e.Caps.from_string(s),o.add(t),r.link(t)}a.push(new n({kind:`audio`,label:r.name??`audio`,_gst:{source:r,pipeline:o}}))}if(i.video){let t=typeof i.video==`object`?i.video:{},r=_createVideoSource(t),o=new e.Pipeline;o.add(r);let s=_buildVideoCaps(t);if(s){let t=e.ElementFactory.make(`capsfilter`,null);t.caps=e.Caps.from_string(s),o.add(t),r.link(t)}a.push(new n({kind:`video`,label:r.name??`video`,_gst:{source:r,pipeline:o}}))}return new r(a)}function _buildAudioCaps(e){let t=[];return e.sampleRate!=null&&t.push(`rate=${Math.trunc(e.sampleRate)}`),e.channelCount!=null&&t.push(`channels=${Math.trunc(e.channelCount)}`),t.length===0?null:`audio/x-raw,${t.join(`,`)}`}function _buildVideoCaps(e){let t=[];return e.width!=null&&t.push(`width=${Math.trunc(e.width)}`),e.height!=null&&t.push(`height=${Math.trunc(e.height)}`),e.frameRate!=null&&t.push(`framerate=${Math.trunc(e.frameRate)}/1`),t.length===0?null:`video/x-raw,${t.join(`,`)}`}function _probeSource(t,n){let r=e.ElementFactory.make(t,null);if(!r)return null;let i=e.ElementFactory.make(n,null),a=e.ElementFactory.make(`fakesink`,null);if(!i||!a)return r;let o=new e.Pipeline;o.add(r),o.add(i),o.add(a),r.link(i),i.link(a);let s=o.set_state(e.State.PLAYING);return s!==e.StateChangeReturn.FAILURE&&(s=o.get_state(500*Number(e.MSECOND))[0]),o.set_state(e.State.NULL),r.unlink(i),o.remove(r),s===e.StateChangeReturn.FAILURE?null:r}const i=new Map;function _chooseSource(t,n,r,a){let o=i.get(t);if(o)return e.ElementFactory.make(o,null);for(let e of n){let n=_probeSource(e,r);if(n)return i.set(t,e),n}return i.set(t,a),e.ElementFactory.make(a,null)}const a=[`device`,`target_object`,`path`],o=new Set;function _bindDevice(e,t,n){if(n){for(let e of a)if(e in t){t[e]=n;return}o.has(e)||(o.add(e),console.warn(`getUserMedia: deviceId ${JSON.stringify(n)} ignored — ${t.name} has no device property, so the ${e} source is the host default. getSupportedConstraints() reports deviceId: true.`))}}function _createAudioSource(e){let t=_chooseSource(`audio`,[`pipewiresrc`,`pulsesrc`,`autoaudiosrc`],`audioconvert`,`audiotestsrc`);try{t.is_live=!0}catch{}return i.get(`audio`)===`audiotestsrc`&&(t.wave=0),_bindDevice(`audio`,t,e.deviceId),t}function _createVideoSource(e){let t=_chooseSource(`video`,[`pipewiresrc`,`v4l2src`,`autovideosrc`],`videoconvert`,`videotestsrc`);return i.get(`video`)===`videotestsrc`&&(t.is_live=!0,t.pattern=0),_bindDevice(`video`,t,e.deviceId),t}export{getUserMedia};
+import"./_virtual/_rolldown/runtime.js";import{MediaStreamTrack as e}from"./media-stream-track.js";import{MediaStream as t}from"./media-stream.js";import{ensureGstInit as n,openCapture as r}from"@gjsify/media-capture";async function getUserMedia(i){if(n(),!i.audio&&!i.video)throw TypeError(`Failed to execute 'getUserMedia': At least one of audio or video must be requested`);let a=[];for(let t of[`audio`,`video`]){let n=i[t];if(!n)continue;let{source:o,pipeline:s}=r(t,typeof n==`object`?n:{});a.push(new e({kind:t,label:o.name??t,_gst:{source:o,pipeline:s}}))}return new t(a)}export{getUserMedia};

package/lib/esm/gst-init.js

@@ -1,4 +1,4 @@
-import"./_virtual/_rolldown/runtime.js";import e from"gi://Gst?version=1.0";import t from"gi://GLib?version=2.0";import{DOMException as n}from"@gjsify/dom-exception";let r=!1;const i=[`openalsrc`,`openalsink`];function excludeUnboundedAutodetectCandidates(n=t.getenv(`GJSIFY_GST_KEEP_OPENAL`)===`1`){if(n)return;let r=e.Registry.get();for(let t of i)r.lookup_feature(t)?.set_rank(e.Rank.NONE)}function ensureGstInit(){r||=(e.init(null),excludeUnboundedAutodetectCandidates(),!0)}function ensureWebrtcbinAvailable(){ensureGstInit(),e.ElementFactory.find(`webrtcbin`)||throwNotSupported(e.ElementFactory.find(`dtlsenc`)!==null||e.ElementFactory.find(`sctpenc`)!==null?`GStreamer element "webrtcbin" not available, but gst-plugins-bad IS installed
+import"./_virtual/_rolldown/runtime.js";import{Gst as e,ensureGstInit as t,excludeUnboundedAutodetectCandidates as n}from"@gjsify/media-capture";import{DOMException as r}from"@gjsify/dom-exception";function ensureWebrtcbinAvailable(){t(),e.ElementFactory.find(`webrtcbin`)||throwNotSupported(e.ElementFactory.find(`dtlsenc`)!==null||e.ElementFactory.find(`sctpenc`)!==null?`GStreamer element "webrtcbin" not available, but gst-plugins-bad IS installed
 (its dtls/sctp elements are registered). This distro does not ship the
 plugin — verify with: ls /usr/lib/gstreamer-1.0/libgstwebrtc.so
   Alpine/postmarketOS: absent since Alpine v3.24; no package provides it.
@@ -10,4 +10,4 @@ plugin — verify with: ls /usr/lib/gstreamer-1.0/libgstwebrtc.so
   Fedora:        dnf install libnice-gstreamer1
   Ubuntu/Debian: apt install gstreamer1.0-nice
   macOS:         brew install libnice-gstreamer
-  Verify with:   gst-inspect-1.0 nicesrc`)}function throwNotSupported(e){throw new n(e,`NotSupportedError`)}export{e as Gst,ensureGstInit,ensureWebrtcbinAvailable,excludeUnboundedAutodetectCandidates};
+  Verify with:   gst-inspect-1.0 nicesrc`)}function throwNotSupported(e){throw new r(e,`NotSupportedError`)}export{e as Gst,t as ensureGstInit,ensureWebrtcbinAvailable,n as excludeUnboundedAutodetectCandidates};

package/lib/esm/media-devices.js

@@ -1 +1 @@
-import"./_virtual/_rolldown/runtime.js";import{Gst as e,ensureGstInit as t}from"./gst-init.js";import{getUserMedia as n}from"./get-user-media.js";import{MediaDeviceInfo as r}from"./media-device-info.js";import i from"gi://GLib?version=2.0";import"@gjsify/dom-events/register/event-target";const a={"Audio/Source":`audioinput`,"Video/Source":`videoinput`,"Audio/Sink":`audiooutput`};let o=!1;function isDeviceMonitorSafe(){return!(i.getenv(`CI`)||!i.getenv(`DISPLAY`)&&!i.getenv(`WAYLAND_DISPLAY`))}var MediaDevices=class extends EventTarget{_ondevicechange=null;get ondevicechange(){return this._ondevicechange}set ondevicechange(e){this._ondevicechange=e}async getUserMedia(e){if(!e)throw TypeError(`Failed to execute 'getUserMedia' on 'MediaDevices': At least one of audio or video must be requested`);let t=await n(e);return o=!0,t}async enumerateDevices(){t();let n=null,i=[];try{if(!isDeviceMonitorSafe())return i;n=new e.DeviceMonitor,n.set_show_all_devices(!0);let t=e.Caps.from_string(`audio/x-raw`),s=e.Caps.from_string(`video/x-raw`);if(t&&(n.add_filter(`Audio/Source`,t),n.add_filter(`Audio/Sink`,t)),s&&n.add_filter(`Video/Source`,s),!n.start())return i;let c;try{c=n.get_devices()??[]}catch{return i}for(let e of c){let t=e.get_device_class?.()??``,n=a[t];if(!n)continue;let s=e.get_display_name?.()??``,c=``,l=``;try{let t=e.get_properties?.();if(t){let e=t.n_fields();for(let n=0;n<e;n++){let e=t.nth_field_name(n);if(e===`persistent-id`||e===`node.name`){let n=t.get_value(e);n&&!c&&(c=String(n))}if(e===`group-id`){let n=t.get_value(e);n&&(l=String(n))}}}}catch{}c||=s||`${n}-${i.length}`,o?i.push(new r({deviceId:c,kind:n,label:s,groupId:l})):i.some(e=>e.kind===n)||i.push(new r({deviceId:``,kind:n,label:``,groupId:``}))}}catch{return i}finally{try{n?.stop()}catch{}}let s={audioinput:0,videoinput:1,audiooutput:2};return i.sort((e,t)=>(s[e.kind]??3)-(s[t.kind]??3)),i}getSupportedConstraints(){return{deviceId:!0,width:!0,height:!0,frameRate:!0,sampleRate:!0,channelCount:!0,aspectRatio:!1,facingMode:!1,resizeMode:!1,echoCancellation:!1,autoGainControl:!1,noiseSuppression:!1,latency:!1,groupId:!1}}};export{MediaDevices};
+import"./_virtual/_rolldown/runtime.js";import{Gst as e,ensureGstInit as t}from"./gst-init.js";import{getUserMedia as n}from"./get-user-media.js";import{MediaDeviceInfo as r}from"./media-device-info.js";import"@gjsify/dom-events/register/event-target";import i from"gi://GLib?version=2.0";const a={"Audio/Source":`audioinput`,"Video/Source":`videoinput`,"Audio/Sink":`audiooutput`};let o=!1;function isDeviceMonitorSafe(){return!(i.getenv(`CI`)||!i.getenv(`DISPLAY`)&&!i.getenv(`WAYLAND_DISPLAY`))}var MediaDevices=class extends EventTarget{_ondevicechange=null;get ondevicechange(){return this._ondevicechange}set ondevicechange(e){this._ondevicechange=e}async getUserMedia(e){if(!e)throw TypeError(`Failed to execute 'getUserMedia' on 'MediaDevices': At least one of audio or video must be requested`);let t=await n(e);return o=!0,t}async enumerateDevices(){t();let n=null,i=[];try{if(!isDeviceMonitorSafe())return i;n=new e.DeviceMonitor,n.set_show_all_devices(!0);let t=e.Caps.from_string(`audio/x-raw`),s=e.Caps.from_string(`video/x-raw`);if(t&&(n.add_filter(`Audio/Source`,t),n.add_filter(`Audio/Sink`,t)),s&&n.add_filter(`Video/Source`,s),!n.start())return i;let c;try{c=n.get_devices()??[]}catch{return i}for(let e of c){let t=e.get_device_class?.()??``,n=a[t];if(!n)continue;let s=e.get_display_name?.()??``,c=``,l=``;try{let t=e.get_properties?.();if(t){let e=t.n_fields();for(let n=0;n<e;n++){let e=t.nth_field_name(n);if(e===`persistent-id`||e===`node.name`){let n=t.get_value(e);n&&!c&&(c=String(n))}if(e===`group-id`){let n=t.get_value(e);n&&(l=String(n))}}}}catch{}c||=s||`${n}-${i.length}`,o?i.push(new r({deviceId:c,kind:n,label:s,groupId:l})):i.some(e=>e.kind===n)||i.push(new r({deviceId:``,kind:n,label:``,groupId:``}))}}catch{return i}finally{try{n?.stop()}catch{}}let s={audioinput:0,videoinput:1,audiooutput:2};return i.sort((e,t)=>(s[e.kind]??3)-(s[t.kind]??3)),i}getSupportedConstraints(){return{deviceId:!0,width:!0,height:!0,frameRate:!0,sampleRate:!0,channelCount:!0,aspectRatio:!1,facingMode:!1,resizeMode:!1,echoCancellation:!1,autoGainControl:!1,noiseSuppression:!1,latency:!1,groupId:!1}}};export{MediaDevices};

package/lib/esm/media-stream-track.js

@@ -1 +1 @@
-import"./_virtual/_rolldown/runtime.js";import{Gst as e}from"./gst-init.js";import t from"gi://GLib?version=2.0";import"@gjsify/dom-events/register/event-target";var n=class MediaStreamTrack extends EventTarget{id;kind;label;_enabled=!0;_muted;_ended=!1;_contentHint=``;_onended=null;_onmute=null;_onunmute=null;_gstSource=null;_gstPipeline=null;_gstTee=null;_teeMultiplexer=null;_senderConsumers=0;_enableCallback=null;constructor(e){super(),this.id=e.id??t.uuid_string_random(),this.kind=e.kind,this.label=e.label??``,this._muted=e.muted??!1,e._gst&&(this._gstSource=e._gst.source,this._gstPipeline=e._gst.pipeline)}get enabled(){return this._enabled}set enabled(e){let t=!!e;this._enabled!==t&&(this._enabled=t,this._enableCallback?.(t))}get muted(){return this._muted}get readyState(){return this._ended?`ended`:`live`}get contentHint(){return this._contentHint}set contentHint(e){if(this.kind===`audio`){if(e!==``&&e!==`speech`&&e!==`speech-recognition`&&e!==`music`)return}else if(e!==``&&e!==`motion`&&e!==`detail`&&e!==`text`)return;this._contentHint=e}get onended(){return this._onended}set onended(e){this._onended=e}get onmute(){return this._onmute}set onmute(e){this._onmute=e}get onunmute(){return this._onunmute}set onunmute(e){this._onunmute=e}clone(){let e=new MediaStreamTrack({kind:this.kind,label:this.label,muted:this._muted});return e._enabled=this._enabled,e}stop(){if(this._ended)return;if(this._ended=!0,this._gstSource||this._gstPipeline){try{this._gstPipeline?.set_state(e.State.NULL)}catch{}try{this._gstSource?.set_state(e.State.NULL)}catch{}this._gstSource=null,this._gstPipeline=null}let t=new Event(`ended`);this._onended?.call(this,t),this.dispatchEvent(t)}getCapabilities(){return{}}getConstraints(){return{}}getSettings(){return{}}applyConstraints(e){return Promise.reject(new DOMException(`applyConstraints is not supported`,`NotSupportedError`))}_setMuted(e){if(this._muted===e)return;this._muted=e;let t=new Event(e?`mute`:`unmute`);e?this._onmute?.call(this,t):this._onunmute?.call(this,t),this.dispatchEvent(t)}_setEnableCallback(e){this._enableCallback=e}};export{n as MediaStreamTrack};
+import"./_virtual/_rolldown/runtime.js";import{Gst as e}from"./gst-init.js";import"@gjsify/dom-events/register/event-target";import t from"gi://GLib?version=2.0";var n=class MediaStreamTrack extends EventTarget{id;kind;label;_enabled=!0;_muted;_ended=!1;_contentHint=``;_onended=null;_onmute=null;_onunmute=null;_gstSource=null;_gstPipeline=null;_gstTee=null;_teeMultiplexer=null;_senderConsumers=0;_enableCallback=null;constructor(e){super(),this.id=e.id??t.uuid_string_random(),this.kind=e.kind,this.label=e.label??``,this._muted=e.muted??!1,e._gst&&(this._gstSource=e._gst.source,this._gstPipeline=e._gst.pipeline)}get enabled(){return this._enabled}set enabled(e){let t=!!e;this._enabled!==t&&(this._enabled=t,this._enableCallback?.(t))}get muted(){return this._muted}get readyState(){return this._ended?`ended`:`live`}get contentHint(){return this._contentHint}set contentHint(e){if(this.kind===`audio`){if(e!==``&&e!==`speech`&&e!==`speech-recognition`&&e!==`music`)return}else if(e!==``&&e!==`motion`&&e!==`detail`&&e!==`text`)return;this._contentHint=e}get onended(){return this._onended}set onended(e){this._onended=e}get onmute(){return this._onmute}set onmute(e){this._onmute=e}get onunmute(){return this._onunmute}set onunmute(e){this._onunmute=e}clone(){let e=new MediaStreamTrack({kind:this.kind,label:this.label,muted:this._muted});return e._enabled=this._enabled,e}stop(){if(this._ended)return;if(this._ended=!0,this._gstSource||this._gstPipeline){try{this._gstPipeline?.set_state(e.State.NULL)}catch{}try{this._gstSource?.set_state(e.State.NULL)}catch{}this._gstSource=null,this._gstPipeline=null}let t=new Event(`ended`);this._onended?.call(this,t),this.dispatchEvent(t)}getCapabilities(){return{}}getConstraints(){return{}}getSettings(){return{}}applyConstraints(e){return Promise.reject(new DOMException(`applyConstraints is not supported`,`NotSupportedError`))}_setMuted(e){if(this._muted===e)return;this._muted=e;let t=new Event(e?`mute`:`unmute`);e?this._onmute?.call(this,t):this._onunmute?.call(this,t),this.dispatchEvent(t)}_setEnableCallback(e){this._enableCallback=e}};export{n as MediaStreamTrack};

package/lib/esm/media-stream.js

@@ -1 +1 @@
-import"./_virtual/_rolldown/runtime.js";import e from"gi://GLib?version=2.0";import"@gjsify/dom-events/register/event-target";var t=class MediaStream extends EventTarget{id;_tracks=new Map;_onaddtrack=null;_onremovetrack=null;constructor(t){if(super(),this.id=e.uuid_string_random(),t instanceof MediaStream)for(let e of t.getTracks())this._tracks.set(e.id,e.clone());else if(Array.isArray(t))for(let e of t)this._tracks.set(e.id,e)}get active(){for(let e of this._tracks.values())if(e.readyState===`live`)return!0;return!1}get onaddtrack(){return this._onaddtrack}set onaddtrack(e){this._onaddtrack=e}get onremovetrack(){return this._onremovetrack}set onremovetrack(e){this._onremovetrack=e}getTracks(){return[...this._tracks.values()]}getAudioTracks(){return this.getTracks().filter(e=>e.kind===`audio`)}getVideoTracks(){return this.getTracks().filter(e=>e.kind===`video`)}getTrackById(e){return this._tracks.get(e)??null}addTrack(e){if(this._tracks.has(e.id))return;this._tracks.set(e.id,e);let t=new MediaStreamTrackEvent(`addtrack`,{track:e});this._onaddtrack?.call(this,t),this.dispatchEvent(t)}removeTrack(e){if(!this._tracks.delete(e.id))return;let t=new MediaStreamTrackEvent(`removetrack`,{track:e});this._onremovetrack?.call(this,t),this.dispatchEvent(t)}clone(){return new MediaStream(this)}},MediaStreamTrackEvent=class extends Event{track;constructor(e,t){super(e,t),this.track=t.track}};export{t as MediaStream,MediaStreamTrackEvent};
+import"./_virtual/_rolldown/runtime.js";import"@gjsify/dom-events/register/event-target";import e from"gi://GLib?version=2.0";var t=class MediaStream extends EventTarget{id;_tracks=new Map;_onaddtrack=null;_onremovetrack=null;constructor(t){if(super(),this.id=e.uuid_string_random(),t instanceof MediaStream)for(let e of t.getTracks())this._tracks.set(e.id,e.clone());else if(Array.isArray(t))for(let e of t)this._tracks.set(e.id,e)}get active(){for(let e of this._tracks.values())if(e.readyState===`live`)return!0;return!1}get onaddtrack(){return this._onaddtrack}set onaddtrack(e){this._onaddtrack=e}get onremovetrack(){return this._onremovetrack}set onremovetrack(e){this._onremovetrack=e}getTracks(){return[...this._tracks.values()]}getAudioTracks(){return this.getTracks().filter(e=>e.kind===`audio`)}getVideoTracks(){return this.getTracks().filter(e=>e.kind===`video`)}getTrackById(e){return this._tracks.get(e)??null}addTrack(e){if(this._tracks.has(e.id))return;this._tracks.set(e.id,e);let t=new MediaStreamTrackEvent(`addtrack`,{track:e});this._onaddtrack?.call(this,t),this.dispatchEvent(t)}removeTrack(e){if(!this._tracks.delete(e.id))return;let t=new MediaStreamTrackEvent(`removetrack`,{track:e});this._onremovetrack?.call(this,t),this.dispatchEvent(t)}clone(){return new MediaStream(this)}},MediaStreamTrackEvent=class extends Event{track;constructor(e,t){super(e,t),this.track=t.track}};export{t as MediaStream,MediaStreamTrackEvent};

package/lib/types/get-user-media.d.ts

@@ -1,12 +1,6 @@
+import { type CaptureConstraints } from '@gjsify/media-capture';
 import { MediaStream } from './media-stream.js';
-export interface MediaTrackConstraints {
-    deviceId?: string;
-    sampleRate?: number;
-    channelCount?: number;
-    width?: number;
-    height?: number;
-    frameRate?: number;
-}
+export type MediaTrackConstraints = CaptureConstraints;
 export interface MediaStreamConstraints {
     audio?: boolean | MediaTrackConstraints;
     video?: boolean | MediaTrackConstraints;

package/lib/types/gst-init.d.ts

@@ -1,7 +1,4 @@
-import Gst from 'gi://Gst?version=1.0';
-/** TEST SEAM (exported) — see the `keepOpenal` parameter doc above. */
-export declare function excludeUnboundedAutodetectCandidates(keepOpenal?: boolean): void;
-export declare function ensureGstInit(): void;
+import { Gst, ensureGstInit, excludeUnboundedAutodetectCandidates } from '@gjsify/media-capture';
 /** Throws if the `webrtcbin` element is not registered (gst-plugins-bad missing). */
 export declare function ensureWebrtcbinAvailable(): void;
-export { Gst };
+export { Gst, ensureGstInit, excludeUnboundedAutodetectCandidates };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/webrtc",
-    "version": "0.64.13-next.283",
+    "version": "0.64.14",
     "description": "W3C WebRTC API for GJS using GStreamer webrtcbin as the peer-connection backend",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -61,12 +61,13 @@
         "peer-connection"
     ],
     "dependencies": {
-        "@gjsify/buffer": "0.64.13-next.283",
-        "@gjsify/dom-events": "0.64.13-next.283",
-        "@gjsify/dom-exception": "0.64.13-next.283",
-        "@gjsify/node-globals": "0.64.13-next.283",
-        "@gjsify/webcrypto": "0.64.13-next.283",
-        "@gjsify/webrtc-native": "0.64.13-next.283"
+        "@gjsify/buffer": "^0.64.14",
+        "@gjsify/dom-events": "^0.64.14",
+        "@gjsify/dom-exception": "^0.64.14",
+        "@gjsify/media-capture": "^0.64.14",
+        "@gjsify/node-globals": "^0.64.14",
+        "@gjsify/webcrypto": "^0.64.14",
+        "@gjsify/webrtc-native": "^0.64.14"
     },
     "devDependencies": {
         "@girs/gio-2.0": "5.4.0",
@@ -76,8 +77,8 @@
         "@girs/gst-1.0": "5.4.0",
         "@girs/gstsdp-1.0": "5.4.0",
         "@girs/gstwebrtc-1.0": "5.4.0",
-        "@gjsify/cli": "0.64.13-next.283",
-        "@gjsify/unit": "0.64.13-next.283",
+        "@gjsify/cli": "^0.64.14",
+        "@gjsify/unit": "^0.64.14",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },
@@ -99,6 +100,5 @@
     "bugs": {
         "url": "https://github.com/gjsify/gjsify/issues"
     },
-    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/web/webrtc#readme",
-    "gitHead": "05fae97125a374e84bf57c2d2d086fb53523f205"
+    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/web/webrtc#readme"
 }