From 17f53c19bfd4bab1ff53bca4e6b48c32abae1972 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 27 Dec 2021 15:32:00 +0000 Subject: [PATCH 1/2] Update to node types 16.11.7 --- build.sbt | 2 +- .../scala/fs2/io/net/DatagramSocketOption.scala | 15 ++++++++++++--- .../main/scala/fs2/io/net/SocketPlatform.scala | 4 ++-- io/js/yarn.lock | 8 ++++---- node/js/yarn.lock | 13 ++++--------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index a16dc3e126..286d1de584 100644 --- a/build.sbt +++ b/build.sbt @@ -252,7 +252,7 @@ lazy val node = crossProject(JSPlatform) scalacOptions += "-nowarn", Compile / doc / sources := Nil, scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)), - Compile / npmDevDependencies += "@types/node" -> "16.7.13", + Compile / npmDevDependencies += "@types/node" -> "16.11.7", useYarn := true, yarnExtraArgs += "--frozen-lockfile", stOutputPackage := "fs2.internal.jsdeps", diff --git a/io/js/src/main/scala/fs2/io/net/DatagramSocketOption.scala b/io/js/src/main/scala/fs2/io/net/DatagramSocketOption.scala index 68c7969c2a..30e9c4d1bc 100644 --- a/io/js/src/main/scala/fs2/io/net/DatagramSocketOption.scala +++ b/io/js/src/main/scala/fs2/io/net/DatagramSocketOption.scala @@ -61,12 +61,18 @@ object DatagramSocketOption { private object MulticastLoopback extends Key[Boolean] { override private[net] def set[F[_]: Sync](sock: dgramMod.Socket, value: Boolean): F[Unit] = - Sync[F].delay(sock.setMulticastLoopback(value)) + Sync[F].delay { + sock.setMulticastLoopback(value) + () + } } private object MulticastTtl extends Key[Int] { override private[net] def set[F[_]: Sync](sock: dgramMod.Socket, value: Int): F[Unit] = - Sync[F].delay(sock.setMulticastTTL(value.toDouble)) + Sync[F].delay { + sock.setMulticastTTL(value.toDouble) + () + } } private object ReceiveBufferSize extends Key[Int] { @@ -81,7 +87,10 @@ object DatagramSocketOption { private object Ttl extends Key[Int] { override private[net] def set[F[_]: Sync](sock: dgramMod.Socket, value: Int): F[Unit] = - Sync[F].delay(sock.setTTL(value.toDouble)) + Sync[F].delay { + sock.setTTL(value.toDouble) + () + } } def broadcast(value: Boolean): DatagramSocketOption = apply(Broadcast, value) diff --git a/io/js/src/main/scala/fs2/io/net/SocketPlatform.scala b/io/js/src/main/scala/fs2/io/net/SocketPlatform.scala index 1e7b8d4c9b..6613d1a2cb 100644 --- a/io/js/src/main/scala/fs2/io/net/SocketPlatform.scala +++ b/io/js/src/main/scala/fs2/io/net/SocketPlatform.scala @@ -96,8 +96,8 @@ private[net] trait SocketCompanionPlatform { override def localAddress: F[SocketAddress[IpAddress]] = for { - ip <- F.delay(IpAddress.fromString(sock.localAddress).get) - port <- F.delay(Port.fromInt(sock.localPort.toInt).get) + ip <- F.delay(sock.localAddress.toOption.flatMap(IpAddress.fromString).get) + port <- F.delay(sock.localPort.toOption.map(_.toInt).flatMap(Port.fromInt).get) } yield SocketAddress(ip, port) override def write(bytes: Chunk[Byte]): F[Unit] = diff --git a/io/js/yarn.lock b/io/js/yarn.lock index 2c78f9be9c..e8522c62cd 100644 --- a/io/js/yarn.lock +++ b/io/js/yarn.lock @@ -20,10 +20,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.12.tgz#961e3091f263e6345d2d84afab4e047a60b4b11b" integrity sha512-zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA== -"@types/node@16.7.13": - version "16.7.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.13.tgz#86fae356b03b5a12f2506c6cf6cd9287b205973f" - integrity sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA== +"@types/node@16.11.7": + version "16.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" + integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== "@webassemblyjs/ast@1.8.5": version "1.8.5" diff --git a/node/js/yarn.lock b/node/js/yarn.lock index 31fa29223a..af9e0cf1d3 100644 --- a/node/js/yarn.lock +++ b/node/js/yarn.lock @@ -20,10 +20,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.12.tgz#961e3091f263e6345d2d84afab4e047a60b4b11b" integrity sha512-zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA== -"@types/node@16.7.13": - version "16.7.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.13.tgz#86fae356b03b5a12f2506c6cf6cd9287b205973f" - integrity sha512-pLUPDn+YG3FYEt/pHI74HmnJOWzeR+tOIQzUx93pi9M7D8OE7PSLr97HboXwk5F+JS+TLtWuzCOW97AHjmOXXA== +"@types/node@16.11.7": + version "16.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" + integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== "@webassemblyjs/ast@1.8.5": version "1.8.5" @@ -3504,11 +3504,6 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@4.3: - version "4.3.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" - integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== - union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" From bdf8a0a40d4533bcb4b4264a49ff9d897b64296a Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 27 Dec 2021 16:19:57 +0000 Subject: [PATCH 2/2] Update lockfile again? --- node/js/yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/node/js/yarn.lock b/node/js/yarn.lock index af9e0cf1d3..b0753620ef 100644 --- a/node/js/yarn.lock +++ b/node/js/yarn.lock @@ -3504,6 +3504,11 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +typescript@4.3: + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== + union-value@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"