diff --git a/.gitignore b/.gitignore index e225d74..09fa5bd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ node_modules/ .DS_Store UI/dist/ UI/yarn* + + diff --git a/README.md b/README.md index a8f1d0a..f968936 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,13 @@ Simply open the `ardustim` sub-folder in PlatformIO or the Arduino IDE and it sh Intended hardware platform is the Arduino Nano or Uno. +## Map sensor Configuration +The wheel defination is diffrent in the a 10 or over is a tooth on the flywheel. 1x = a tooth +The right hand digit specifies the vaccum signal to output for a MAP sensor input. 0-9 for the output amount. +Since the Uno doesn't have a real DAC onboard it uses a simple R-2R network and can be made from a about 20 1K resistors on pins 2-7. +Is only a 6 bit DAC as the lower 2 pins of portd are used for the serial communications, plus you only have 10 settings of 0-9. + + ## Installing GUI from Source ### Pre-Requisites diff --git a/UI/firmwares/nano.hex b/UI/firmwares/nano.hex index 85c7132..09a8f79 100644 --- a/UI/firmwares/nano.hex +++ b/UI/firmwares/nano.hex @@ -1,1408 +1,1436 @@ -:100000000C94091F0C94311F0C94311F0C94311F58 -:100010000C94311F0C94311F0C94311F0C94311F20 -:100020000C94311F0C94311F0C94311F0C947D22C1 -:100030000C94311F0C94311F0C94311F0C94311F00 -:100040000C94DB210C94311F0C944B220C94252230 -:100050000C94311F0C940B230C94311F0C94311F02 -:100060000C94311F0C94311F0100010001000100AC -:100070000100010001000302030201000100010070 -:100080000100010001000100010001000100010068 -:100090000100010001000100010001000100010058 -:1000A000010001000100010001000100000000004A -:1000B0000100010001000100010001000100010038 -:1000C0000100010001000100010001000100010028 -:1000D0000100010001000100010001000100010018 -:1000E0000100010001000100010001000100010008 -:1000F000010001000000000033362D3220776974C2 -:1001000068203120746F6F74682063616D00020293 -:1001100002020202030302020202030302020202BB -:1001200002020202020202020202020203030202AD -:10013000020203030202020202020202020202029D -:10014000020202020303020202020303020202028B -:10015000020202020202020202020202030302027D -:10016000020203030202020202020202020202026D -:10017000020202020303020202020303020202025B -:100180000202020202020000000000000101000061 -:10019000000001010000000000000000000000005D -:1001A000000000000101000000000101000000004B -:1001B000000000000000000000000000010100003D -:1001C000000001010000000000000000000000002D -:1001D000000000000101000000000101000000001B -:1001E000000000000000000000000000010100000D -:1001F0000000010100000000000000000000446F4A -:100200006467652056697065722056313020313937 -:1002100039362D323030320001000100010001007A -:1002200001000100010001000100010001000100C6 -:10023000010001000100070607060706070607067A -:100240000706070607060100010001000100010082 -:100250000100010001000100010001000100010096 -:100260000100010001000100010001000100010086 -:100270000100070607060706070607060706070622 -:100280000706070607060706070607060606060608 -:1002900007060706070607060706070607060706F6 -:1002A00007060706070607060706070607060100F2 -:1002B000010001000100010001000100070607061E -:1002C00007060706070607060706070607060706C6 -:1002D00007060706070607060706070607060706B6 -:1002E00007060706070607060706010001000100CA +:100000000C945C1F0C94841F0C94841F0C94841F0C +:100010000C94841F0C94841F0C94841F0C94841FD4 +:100020000C94841F0C94841F0C94841F0C9415232F +:100030000C94841F0C94841F0C94841F0C94841FB4 +:100040000C9473220C94841F0C94E3220C94BD2214 +:100050000C94841F0C94DE230C94841F0C94841F36 +:100060000C94841F0C94841F1D0808080707112492 +:100070001A050F2218040D2218040E2218040F234B +:10008000190610241A0711251C0812271D09132709 +:100090001D0913271D0913271D0913271D091327E0 +:1000A0001D0913271D0913271D0913271D091327D0 +:1000B0001D090909090913271D0913271D091327FC +:1000C0001D0913271D0913271D0913271D091327B0 +:1000D0001D0913271D0913271D0913271D091327A0 +:1000E0001D0913271D0913271D0913271D09132790 +:1000F0001D0913271D09132731382D312041426D69 +:100100006F6465204D415020617343414D000100F3 +:1001100001000100010001000100010003020302CF +:1001200001000100010001000100010001000100C7 +:1001300001000100010001000100010001000100B7 +:1001400001000100010001000100010001000100A7 +:100150000100000000000100010001000100010099 +:100160000100010001000100010001000100010087 +:100170000100010001000100010001000100010077 +:100180000100010001000100010001000100010067 +:1001900001000100010001000100000000003336F1 +:1001A0002D322077697468203120746F6F74682055 +:1001B00063616D00020202020202030302020202F4 +:1001C000030302020202020202020202020202020D +:1001D00002020303020202020303020202020202FB +:1001E00002020202020202020202030302020202ED +:1001F00003030202020202020202020202020202DD +:1002000002020303020202020303020202020202CA +:1002100002020202020202020202030302020202BC +:1002200003030202020202020202020200000000B4 +:1002300000000101000000000101000000000000BA +:1002400000000000000000000000010100000000AC +:10025000010100000000000000000000000000009C +:10026000000001010000000001010000000000008A +:10027000000000000000000000000101000000007C +:10028000010100000000000000000000000000006C +:10029000000001010000000001010000000000005A +:1002A00000000000446F6467652056697065722025 +:1002B00056313020313939362D323030320001009C +:1002C0000100010001000100010001000100010026 +:1002D00001000100010001000100010007060706FE +:1002E00007060706070607060706070601000100BE :1002F00001000100010001000100010001000100F6 -:100300000100010000000000424D57204E32300035 -:1003100000000000000000000000000000000000DD -:1003200000000000000000000000000100000000CC -:1003300000000000000100000000000000000001BB -:1003400000000000000000000001000000000000AC -:10035000000000000000000000020202020202028F -:10036000020202020202020302020202020202026C -:10037000020302020202020202020203020202025B -:10038000020202020203020202020202020202024C -:10039000020202020202020202020202020202023D -:1003A000020202030202020202020202020302022B -:1003B000020202020202020302020202020202021C -:1003C000020302020202020202020202020202020C -:1003D00002020202020202020202020202020203FC -:1003E00002020202020202020203020202020202EC -:1003F00002020203020202020202020202030202DB -:1004000002020202020202020202020202000000D2 -:1004100000000000000000000000000100000000DB -:1004200000000000000100000000000000000001CA -:1004300000000000000000000001000000000000BB -:1004400000000000000000000000000000000000AC -:10045000000000000000000100000000000000009B -:10046000000100000000000000000001000000008A -:1004700000000000000100004A6565702032303045 -:100480003000010101010101020202020000030328 -:100490000303030302020000000001010101010146 -:1004A0000000000000000101010101010000000046 -:1004B0000000010101010101000000000000010134 -:1004C0000101010100000000000053757A756B699D -:1004D0002044525A34303000010102000000000074 -:1004E000000000000101000000000000000000000A -:1004F00001010000000000000000000001010000F8 -:1005000000000000000000000101000000000000E9 -:1005100000000000010100000000000000000000D9 -:1005200001010000000000000000000001010000C7 -:1005300000000000000000000101000000000000B9 -:1005400000000000010100000000000000000000A9 -:100550000101000000000000000000000101000097 -:100560000000000000000000546F796F74612034B7 -:1005700041475A450001010202000000000000004E -:10058000000000000000000000000000000000006B -:100590000000000000000000000101000000000059 -:1005A000000000000000000000000000000000004B -:1005B0000000000000000000000000000001010039 -:1005C000000000000000000000000000000000002B -:1005D000000000000000000000000000000000001B -:1005E0000001010000000000000000000000000009 -:1005F00000000000000000000000000000000000FB -:100600000000000000546F796F7461203441474549 -:1006100000010001000100010001000100010001D2 -:1006200000010001000200010001000100010001C1 -:1006300000010001000100010001000100000001B3 -:1006400000010001000100010001000100010001A2 -:100650000001000100020002000100010001000190 -:100660000001000100010001000100010000000183 -:100670000001000100010001000100010001000172 -:100680000001000100020001000100010001000161 -:100690000001000100010001000100010000000054 -:1006A000004D69747375626973686920334139322A -:1006B0000000010101010000000000000000000036 -:1006C0000000000101010101010100000000000122 -:1006D0000101010100000000000101010101000011 -:1006E0000000010101010100000000000101010101 -:1006F00001000000000003030303030202020202E0 -:1007000003030303030202020202030303030302BF -:1007100002020202030303030100000000000101C2 -:1007200001010100000000000101010101000000C1 -:1007300000000101010101000000000001010101B0 -:1007400001000000000001010101010000000000A3 -:100750000101010103020202020203030303030277 -:100760000202020203030303030202020202030362 -:10077000030101000000000001010101010000006F -:100780000000010101010100000000000101010160 -:100790000100000000000101010101000000000053 -:1007A0000101010101000000000001010103030239 -:1007B0000202020203030303030202020202030312 -:1007C000030303020202020203030301010100000A -:1007D000000001010101010100000000010101010F -:1007E0000101000000000001010101010000000002 -:1007F00000010101010100000000000101010101EF -:1008000000000000000101010101000000000001E2 -:1008100001010101000000000001010101010000CF -:1008200000000000000000000000000001010101C4 -:1008300001010000000000010101010100000000B1 -:10084000000101010101000000000001010101019E -:100850000000000000010101010100000000000390 -:10086000030303030202020202030303030302025F -:100870000202020303030303020202020203030350 -:10088000030100000000000101010101000000005F -:10089000000101010101000000000001010101014E -:1008A0000100000000010101010101000000000041 -:1008B000010101010100000000000101010101002E -:1008C0000000000001010101010000000000010121 -:1008D0000101010000000000010101010100000010 -:1008E00000000101010101000000000001010101FF -:1008F00001000000000001010101010000000000F2 -:1009000001010101010000000000010101010100DD -:1009100000000000010303030302020202020303BA -:10092000030303020202020203030303030302029E -:1009300002020303030101010000000000010101A4 -:1009400001010000000000010101010100000000A0 -:10095000000101010101000000000001010101018D -:100960000000000000010101010100000000000181 -:10097000010101010000000000010101010100006E -:1009800000466F726420535431373000000000007D -:100990000000000000000002020202020202020245 -:1009A000020303020203030202030302020303021F -:1009B0000202020202000000000000010101010128 -:1009C000010101010101010000010100000101001C -:1009D0000001010000000000000000000000000213 -:1009E00002020202020202020203030202030302E3 -:1009F00002030302020303020202020202020202D3 -:100A000002020203030303030301010101010100C8 -:100A100000010100000101000001010044534D20CC -:100A200034323061000000000000000000000000CF -:100A300000000000000000000000010100000000B4 -:100A400000000000000000000000000000000000A6 -:100A50000000000000000000010100000001010092 -:100A60000000000000000000000000000000000086 -:100A70000000000000000101000000000000000074 -:100A80000000000000000000000000000000000066 -:100A90000000000001010000000000000000000054 -:100AA0000000000000000000000000000000000046 -:100AB0000000010100000000000000000000000034 -:100AC0000000000000000000000000000000000026 -:100AD000010100000000000000474D2037580000D1 -:100AE00000000000020202000000020202000000FA -:100AF00002020200000000000000000000000000F0 -:100B000000000000000000000000000000000000E5 -:100B100000000000000000000000000000000000D5 +:1003000001000100010001000100010001000100E5 +:1003100001000100010001000706070607060706A5 +:100320000706070607060706070607060706070665 +:100330000706060606060706070607060706070657 +:100340000706070607060706070607060706070645 +:10035000070607060100010001000100010001007D +:100360000100070607060706070607060706070631 +:100370000706070607060706070607060706070615 +:100380000706070607060706070607060706070605 +:100390000100010001000100010001000100010055 +:1003A0000100010001000100010000000000424DB9 +:1003B00057204E3230000000000000000000000016 +:1003C000000000000000000000000000000000002D +:1003D000000100000000000000000001000000001B +:1003E000000000000001000000000000000000010B +:1003F00000000000000000000000000000000002FB +:1004000002020202020202020202020202030202CB +:1004100002020202020202030202020202020202BB +:1004200002030202020202020202020302020202AA +:10043000020202020202020202020202020202029C +:10044000020202020202020202030202020202028B +:10045000020202030202020202020202020302027A +:10046000020202020202020302020202020202026B +:10047000020202020202020202020202020202025C +:10048000020202020203020202020202020202034A +:10049000020202020202020202030202020202023B +:1004A000020202030202020202020202020202022B +:1004B0000202020000000000000000000000000036 +:1004C000000100000000000000000001000000002A +:1004D000000000000001000000000000000000011A +:1004E000000000000000000000000000000000000C +:1004F00000000000000000000000000000010000FB +:1005000000000000000000010000000000000000EA +:1005100000010000000000000000000100004A652A +:10052000657020323030300001010101010102020A +:1005300002020000030303030303020200000000A1 +:1005400001010101010100000000000001010101A1 +:100550000101000000000000010101010101000093 +:100560000000000001010101010100000000000085 +:1005700053757A756B692044525A3430300001014A +:100580000200000000000000000001010000000067 +:100590000000000000000101000000000000000059 +:1005A0000000010100000000000000000000010147 +:1005B0000000000000000000000001010000000039 +:1005C0000000000000000101000000000000000029 +:1005D0000000010100000000000000000000010117 +:1005E0000000000000000000000001010000000009 +:1005F00000000000000001010000000000000000F9 +:100600000000010100000000000000000000546F25 +:10061000796F7461203441475A450001010202009C +:1006200000000000000000000000000000000000CA +:1006300000000000000000000000000000000001B9 +:1006400001000000000000000000000000000000A9 +:10065000000000000000000000000000000000009A +:100660000000000101000000000000000000000088 +:10067000000000000000000000000000000000007A +:100680000000000000000001010000000000000068 +:10069000000000000000000000000000000000005A +:1006A0000000000000000000000000546F796F742B +:1006B00061203441474500010001000100010001B3 +:1006C0000001000100010001000100020001000121 +:1006D0000001000100010001000100010001000112 +:1006E0000001000000010001000100010001000103 +:1006F00000010001000100010001000200020001F0 +:1007000000010001000100010001000100010001E1 +:1007100000010000000100010001000100010001D2 +:1007200000010001000100010001000200010001C0 +:1007300000010001000100010001000100010001B1 +:10074000000100000000004D6974737562697368F0 +:10075000692033413932000001010101000000002D +:100760000000000000000000000101010101010182 +:100770000000000000010101010100000000000173 +:100780000101010100000000010101010100000060 +:100790000000010101010100000000000303030348 +:1007A0000302020202020303030303020202020223 +:1007B0000303030303020202020203030303010013 +:1007C0000000000001010101010000000000010122 +:1007D0000101010000000000010101010100000011 +:1007E0000000010101010100000000000101010100 +:1007F00001000000000001010101030202020202E7 +:1008000003030303030202020202030303030302BE +:1008100002020202030303010100000000000101C3 +:1008200001010100000000000101010101000000C0 +:1008300000000101010101000000000001010101AF +:1008400001000000000001010101010000000000A2 +:100850000101010303020202020203030303030274 +:100860000202020203030303030202020202030361 +:10087000030101010000000001010101010100006C +:10088000000001010101010100000000000101015F +:100890000101000000000001010101010000000051 +:1008A000000101010101000000000001010101013E +:1008B0000000000000010101010100000000000132 +:1008C0000101010100000000000000000000000024 +:1008D000000001010101010100000000000101010F +:1008E0000101000000000001010101010000000001 +:1008F00000010101010100000000000101010101EE +:1009000000000000000303030303020202020203CB +:1009100003030303020202020203030303030202AE +:1009200002020203030303010000000000010101B1 +:1009300001010000000000010101010100000000B0 +:10094000000101010101010000000001010101019C +:100950000100000000000101010101000000000091 +:10096000010101010100000000000101010101007D +:100970000000000001010101010000000000010170 +:10098000010101000000000001010101010000005F +:10099000000001010101010000000000010101014E +:1009A0000100000000000101010101000000000041 +:1009B0000101010101000000000001030303030223 +:1009C0000202020203030303030202020202030300 +:1009D00003030303020202020303030101010000F7 +:1009E00000000001010101010000000000010101FF +:1009F00001010000000000010101010100000000F0 +:100A000000010101010100000000000101010101DC +:100A100000000000000101010101000000000001D0 +:100A200001010101000000466F7264205354313708 +:100A30003000000000000000000000000002020280 +:100A40000202020202020203030202030302020381 +:100A5000030202030302020202020200000000007D +:100A60000001010101010101010101010100000179 +:100A70000100000101000001010000000000000071 +:100A8000000000000002020202020202020202034F +:100A9000030202030302020303020203030202022F +:100AA0000202020202020202020303030303030121 +:100AB000010101010100000101000001010000012C +:100AC000010044534D20343230610000000000002A +:100AD0000000000000000000000000000000000016 +:100AE0000101000000000000000000000000000004 +:100AF00000000000000000000000000000000101F4 +:100B000000000001010000000000000000000000E3 +:100B100000000000000000000000000001010000D3 :100B200000000000000000000000000000000000C5 -:100B300000000101010000000000000000000000B2 +:100B300000000000000000000000010100000000B3 :100B400000000000000000000000000000000000A5 -:100B50000000010101000000000000000000000092 +:100B50000000000000000000010100000000000093 :100B60000000000000000000000000000000000085 -:100B70000000000000000000000000000000000075 -:100B80000000000000000000000101010000000062 -:100B90000000000000000000000000000000000055 -:100BA000000000000000000202020000000000003F +:100B7000000000000000010100000000000000472C +:100B80004D20375800000000000002020200000063 +:100B90000202020000000202020000000000000049 +:100BA0000000000000000000000000000000000045 :100BB0000000000000000000000000000000000035 :100BC0000000000000000000000000000000000025 -:100BD0000000000000000000000000000000000015 -:100BE0000000000000000101010000000000000002 -:100BF00000000000000000000000000000000000F5 -:100C000000000000000001010100000000000000E1 +:100BD0000000000000000000010101000000000012 +:100BE0000000000000000000000000000000000005 +:100BF00000000000000000000101010000000000F2 +:100C000000000000000000000000000000000000E4 :100C100000000000000000000000000000000000D4 -:100C200000000000000000000000000000000000C4 -:100C300000000000000000000000000000010101B1 -:100C400000000000000000000000000000000000A4 -:100C5000000000000000000000000002020200008E -:100C6000000202020000000000000000000000007E +:100C200000000000000000000000000000000001C3 +:100C300001010000000000000000000000000000B2 +:100C4000000000000000000000000000000202029E +:100C50000000000000000000000000000000000094 +:100C60000000000000000000000000000000000084 :100C70000000000000000000000000000000000074 -:100C80000000000000000000000000000000000064 -:100C90000000000000000000000001010100000051 -:100CA0000000000000000000000000000000000044 -:100CB0000000000000000000000001010100000031 +:100C80000000000000000000000000000101010061 +:100C90000000000000000000000000000000000054 +:100CA0000000000000000000000000000101010041 +:100CB0000000000000000000000000000000000034 :100CC0000000000000000000000000000000000024 :100CD0000000000000000000000000000000000014 -:100CE0000000000000000000000000000000000004 -:100CF00000010101000000000000000000000000F1 -:100D000000000000000000000000000000000002E1 -:100D100002020000000000000000000000000000CF +:100CE0000000000101010000000000000000000001 +:100CF00000000000000000000000000000000000F4 +:100D000000020202000000020202000000000000D7 +:100D100000000000000000000000000000000000D3 :100D200000000000000000000000000000000000C3 :100D300000000000000000000000000000000000B3 -:100D400000000000000000000000000000000101A1 -:100D50000100000000000000000000000000000092 -:100D60000000000000000000000000000000010181 -:100D70000100000000000000000000000000000072 +:100D400001010100000000000000000000000000A0 +:100D50000000000000000000000000000000000093 +:100D60000101010000000000000000000000000080 +:100D70000000000000000000000000000000000073 :100D80000000000000000000000000000000000063 -:100D90000000000000000000000000000000000053 -:100DA00000000000000101010000000000000053ED -:100DB000756261727520362F37206372616E6B2009 -:100DC000616E642063616D0000000100000100009D -:100DD000010000010000010000010000010000010D -:100DE00000000100000100000100000100000100FE -:100DF00000010000010000010000010000010000EE -:100E000001000001000001000001000001000001DC -:100E100000000100000100000100000100000100CD -:100E200000010000010000010000010000010000BD -:100E300001000001000001000001000001000001AC -:100E40000000010000010202030202010000010093 -:100E5000000100000100000132342F31202832341B -:100E6000206372616E6B20776974682063616D29FD -:100E70000000000000000100000000000100000070 -:100E8000000001000000000001000000000001005F -:100E90000000000001000000000001000000000050 -:100EA000010000000000010000000000010000003F -:100EB000000001000000000001000000000001002F -:100EC0000000000001000000000001000000000020 -:100ED000010000000000010000000000010000000F -:100EE00000000100000000000100000000000102FD -:100EF00002020202010000000000010000000000E8 -:100F00000131322F3120283132206372616E6B2023 -:100F1000776974682063616D29000000000000009B -:100F200002020000000000000000000000010100BB -:100F300000000000000000000000000101000000AF -:100F400000000000000000000000000000000000A1 -:100F5000000101000000000000000000000000018E -:100F60000100000002020000020200000000000078 -:100F7000000000000001010000000000000000006F -:100F8000000000010100000000000000000000005F -:100F9000000000000000000000010100000000004F -:100FA000000000000000000101004D696174612033 -:100FB00039392D3035000101000000000101000029 -:100FC0000000000000000000000000000000000021 -:100FD0000000000000000000000000000000000011 -:100FE00000000000000001010000000000000000FF -:100FF00000000000000000000000000000000000F1 -:1010000000000000000000000000000000000000E0 -:1010100000000000000001010000000000000000CE -:1010200000000000000000000000000000000000C0 -:1010300000000000000000000000000000000000B0 -:10104000000000000000446169686174737520331A -:101050002B31206469737472696275746F72202811 -:10106000332063796C696E64657273290000000037 -:10107000000002000001000000000001000000006C -:1010800000020002010000000000014D617A64616D -:10109000203332332041552076657273696F6E00BC -:1010A000010000000000010000000000010000003D -:1010B000000001000000000001000000000001002D -:1010C000000000000100000000000100000000001E -:1010D000010000000000010000000000010000000D -:1010E00000000100010000000100000000000100FC -:1010F00000000000010000000000010000000000EE -:1011000001000000000001000000000001000000DC -:1011100000000100000000000100000000000100CC -:1011200000000000010000000000010001000000BC -:10113000486F6E646120443137204372616E6B20CA -:101140002831322B31290003030202030302020378 -:101150000302000101000001010000010100000183 -:101160000100000101000001010000010100000177 -:101170000100000101000001010000010100000167 -:101180000100000101000001010000010100000157 -:101190000100000101000001010000010100000147 -:1011A0000100000101000001010000010100000137 -:1011B0000100000101000001010000010100000127 -:1011C0000100000101000001010000010100000117 -:1011D0000100000101000001010000010100000107 -:1011E00001000001010000010100000101000001F7 -:1011F00001000001010000010100000101000001E7 -:1012000001000001010000010100000101000001D6 -:1012100001000001010000010100000101000001C6 -:1012200001000001010000010100000101000001B6 -:1012300001000001010000010100000101000001A6 -:101240000100000101000001010000010100000196 -:101250000100000101000001010000010100000186 -:101260000100000101000001010000010100000176 -:101270000100000101000001010000010100000166 -:101280000100000101000001010000010100000156 -:101290000100000101000001010000010100000146 -:1012A0000100000101000001010000010100000136 -:1012B0000100000101000001010000010100000126 -:1012C0000100000101000001010000010100000116 -:1012D0000100000101000001010000010100000106 -:1012E00001000001010000010100000101000001F6 -:1012F00001000001010000010100000101000001E6 -:1013000001000001010000010100000101000001D5 -:1013100001000001010000010100000101000001C5 -:1013200001000001010000010100000101000001B5 -:1013300001000001010000010100000101000001A5 -:101340000100000101000001010000010100000195 -:101350000100000101000001010000010100000185 -:101360000100000101000001010000010100000175 -:101370000100000101000001010000010100000165 -:101380000100000101000001010000010100000155 -:101390000100000101000001010000010100000145 -:1013A0000100000101000001010000010100000135 -:1013B0000100000101000001010000010100000125 -:1013C0000100000101000001010000010100000115 -:1013D0000100000101000001010000010100000105 -:1013E00001000001010000010100000101000001F5 -:1013F00001000001010000010100000101000001E5 -:1014000001000001010000010100000101000001D4 -:1014100001000001010000010100000101000001C4 -:1014200001000001010000010100000101000001B4 -:1014300001000001010000010100000101000001A4 -:101440000100000101000001010000010100000194 -:101450000100000101000001010000010100000184 -:101460000100000101000001010000010100000174 -:101470000100000101000001010000010100000164 -:101480000100000101000001010000010100000154 -:101490000100000101000001010000010100000144 -:1014A0000100000101000001010000010100000134 -:1014B0000100000101000001010000010100000124 -:1014C0000100000101000001010000010100000114 -:1014D0000100000101000001010000010100000104 -:1014E00001000001010000010100000101000001F4 -:1014F00001000001010000010100000101000001E4 -:1015000001000001010000010100000101000001D3 -:1015100001000001010000010100000101000001C3 -:1015200001000001010000010100000101000001B3 -:1015300001000001010000010100000101000001A3 -:101540000100000101000001010000010100000193 -:101550000100000101000001010000010100000183 -:101560000100000101000001010000010100000173 -:101570000100000101000001010000010100024121 -:101580007564692031333520746F6F74682063721D -:10159000616E6B20616E642063616D000202020265 -:1015A000020202020202020000000000000000002D -:1015B000000101010101010101010101010101001D -:1015C000000000000000000000000000000000001B -:1015D00000000202020303030303030303030303E4 -:1015E00001010100000000000000000000000000F8 -:1015F00000000000000000000001010101010101E4 -:1016000001010101010101000000000000000000D3 -:1016100000000000000000000000000002030303BF -:101620000303030303030303030303024D697473FA -:10163000756269736869203467363320616B612095 -:10164000342F32206372616E6B20616E642063619F -:101650006D00010100000001010000000101000017 -:101660000001010000000101000000010100000074 -:10167000010100000001030202020303020202034F -:101680000100000001010000000000000000000057 -:101690000000000103020202020202020202000034 -:1016A0000000010100000001010000000101000034 -:1016B0000001010000000101000000010100000024 -:1016C0000101000000010100000001010000000113 -:1016D00003020202030302020203010000000101EF -:1016E00000000000000000000000000000010302F4 -:1016F00002020303020202030100000001010000D4 -:1017000000010100000001010000000101000000D3 -:1017100001010000000101000000010100000001C2 -:1017200001000000010100000001010000000101B2 -:1017300000000001010000000101000000000000A5 -:101740000000000000000001030202020202020287 -:101750000202000000000101000000010100000081 -:101760000101000000010100000001010000000172 -:101770000100000001010000000101000000010162 -:101780000000000101000000010100000001010053 -:101790000000010100000000000000000000000047 -:1017A000000103020202030302020203010000001F -:1017B000010100000001010000004D617A64612018 -:1017C00033362D322D322D32207769746820362041 -:1017D000746F6F74682063616D0000010101000186 -:1017E00001010001010100010101000101010001ED -:1017F00001010001010100010101000101010001DD -:1018000001010001010100010101020101010001CA -:1018100001010001010100010101000101010201BA -:1018200001010101010101010101000101010001AA -:10183000010100010101000101010001010100019C -:10184000010100010101000101010001010100018C -:10185000010100010101000101010001010100017C -:10186000010100010101000101010001010102016A -:10187000010101010101010101010001010100015A -:10188000010100010101000101010001010100014C -:10189000010100010101000101010001010100013C -:1018A000010100010101000101010001010100012C -:1018B000010100010101000101010001010102011A -:1018C000010101010101010101010001010100010A -:1018D00001010001010100010101000101010001FC -:1018E00001010001010100010101000101010001EC -:1018F00001010001010100010101000101010001DC -:1019000001010001010100010101000101010201C9 -:1019100001010101010101010101000101010001B9 -:1019200001010001010100010101000101010001AB -:10193000010100010101000101010001010100019B -:10194000010100010101000101010001010100018B -:101950000101000101010001010100010101020179 -:101960000101010101010101010100010101000169 -:10197000010100010101000101010001010100015B -:10198000010100010101000101010001010100014B -:10199000010100010101000101010001010100013B -:1019A0000101000101010001010100010101020129 -:1019B00001010101010101010101566F6C766F20E7 -:1019C0006431325B6163645D206372616E6B2077AA -:1019D000697468203720746F6F74682063616D00CC -:1019E00001000100010001000302030203020302DF -:1019F000474D2038206576656E2D746F6F746820B2 -:101A00006372616E6B2077697468203120746F6F28 -:101A100074682063616D000100010001000302038E -:101A2000020302474D2036206576656E2D746F6F78 -:101A30007468206372616E6B20776974682031204E -:101A4000746F6F74682063616D0001000100030210 -:101A50000302474D2034206576656E2D746F6F74D8 -:101A600068206372616E6B2077697468203120741E -:101A70006F6F74682063616D00000000010000005A -:101A80000100000001000000010000000100000052 -:101A9000010000000100000001000202030200003A -:101AA0000100000001000000010000000100000032 -:101AB00001000000010000000159616D61686120B2 -:101AC000323030322D303320523120382065766567 -:101AD0006E2D746F6F7468206372616E6B2077690E -:101AE0007468203120746F6F74682063616D000129 -:101AF00000000100000100000100000100000100E1 -:101B000000010000010000010000010000030202CA -:101B100002020203000001000001000001000001B8 -:101B200000000100000100000100000100000100B0 -:101B3000000100000000004D617A646120434153C0 -:101B40002032342D3220776974682073696E676C97 -:101B5000652070756C7365206F757465722072698D -:101B60006E67000201000100010001000302030290 -:101B7000030203020302030203020302030203023D -:101B8000030203020302030203020302030203022D -:101B9000030203020302030203020302030203021D -:101BA000030203020302030203020302030203020D -:101BB00003020302030203020302030203020302FD -:101BC00003020302030203020302030203020302ED -:101BD00003020302030203020302030201000100E5 -:101BE00001000100010001000100010003020302E5 -:101BF00003020302030203020302030203020302BD -:101C000003020302030203020302030203020302AC -:101C1000030203020302030203020302030203029C +:100D90000000000000000001010100000000000050 +:100DA0000000000000000000000000000000000043 +:100DB000000000000002020200000000000000002D +:100DC0000000000000000000000000000000000023 +:100DD0000000000000000000000000000000000013 +:100DE0000000000000000000000000000000000003 +:100DF00000000000010101000000000000000000F0 +:100E000000000000000000000000000000000000E2 +:100E100000000000010101000000000000000000CF +:100E200000000000000000000000000000000000C2 +:100E300000000000000000000000000000000000B2 +:100E4000000000000000000000000001010100009F +:100E5000000000000053756261727520362F372044 +:100E60006372616E6B20616E642063616D000000CF +:100E7000010000010000010000010000010000016C +:100E8000000001000001000001000001000001005D +:100E9000000100000100000100000100000100004D +:100EA000010000010000010000010000010000013C +:100EB000000001000001000001000001000001002D +:100EC000000100000100000100000100000100001D +:100ED000010000010000010000010000010000010C +:100EE00000000100000100000100000102020302F5 +:100EF0000201000001000001000001000001323485 +:100F00002F3120283234206372616E6B2077697430 +:100F1000682063616D2900000000000001000000EE +:100F200000000100000000000100000000000100BE +:100F300000000000010000000000010000000000AF +:100F4000010000000000010000000000010000009E +:100F5000000001000000000001000000000001008E +:100F6000000000000100000000000100000000007F +:100F7000010000000000010000000000010000006E +:100F8000000001000000000001000000000001005E +:100F90000000000001020202020201000000000045 +:100FA0000100000000000131322F312028313220B1 +:100FB0006372616E6B20776974682063616D2900CC +:100FC000000000000000020200000000000000001D +:100FD000000000010100000000000000000000000F +:100FE00000010100000000000000000000000000FF +:100FF00000000000000000010100000000000000EF +:1010000000000000000101000000020200000202D6 +:1010100000000000000000000000000101000000CE +:1010200000000000000000000001010000000000BE +:1010300000000000000000000000000000000001AF +:10104000010000000000000000000000000101009D +:101050004D696174612039392D303500010100007E +:10106000000001010000000000000000000000007E +:101070000000000000000000000000000000000070 +:10108000000000000000000000000000010100005E +:101090000000000000000000000000000000000050 +:1010A0000000000000000000000000000000000040 +:1010B000000000000000000000000000010100002E +:1010C0000000000000000000000000000000000020 +:1010D0000000000000000000000000000000000010 +:1010E000000000000000000000000000446169688A +:1010F0006174737520332B31206469737472696273 +:1011000075746F722028332063796C696E64657220 +:101110007329000000000000020000010000000030 +:1011200000010000000000020002010000000000B9 +:10113000014D617A64612033323320415520766558 +:101140007273696F6E000100000000000100000072 +:10115000000001000000000001000000000001008C +:10116000000000000100000000000100000000007D +:10117000010000000000010000000000010000006C +:10118000000001000000000001000100000001005B +:10119000000000000100000000000100000000004D +:1011A000010000000000010000000000010000003C +:1011B000000001000000000001000000000001002C +:1011C000000000000100000000000100000000001D +:1011D000010001000000486F6E6461204431372037 +:1011E0004372616E6B202831322B312900030302D8 +:1011F00002030302020303020001010000010100D7 +:1012000000010100000101000001010000010100D6 +:1012100000010100000101000001010000010100C6 +:1012200000010100000101000001010000010100B6 +:1012300000010100000101000001010000010100A6 +:101240000001010000010100000101000001010096 +:101250000001010000010100000101000001010086 +:101260000001010000010100000101000001010076 +:101270000001010000010100000101000001010066 +:101280000001010000010100000101000001010056 +:101290000001010000010100000101000001010046 +:1012A0000001010000010100000101000001010036 +:1012B0000001010000010100000101000001010026 +:1012C0000001010000010100000101000001010016 +:1012D0000001010000010100000101000001010006 +:1012E00000010100000101000001010000010100F6 +:1012F00000010100000101000001010000010100E6 +:1013000000010100000101000001010000010100D5 +:1013100000010100000101000001010000010100C5 +:1013200000010100000101000001010000010100B5 +:1013300000010100000101000001010000010100A5 +:101340000001010000010100000101000001010095 +:101350000001010000010100000101000001010085 +:101360000001010000010100000101000001010075 +:101370000001010000010100000101000001010065 +:101380000001010000010100000101000001010055 +:101390000001010000010100000101000001010045 +:1013A0000001010000010100000101000001010035 +:1013B0000001010000010100000101000001010025 +:1013C0000001010000010100000101000001010015 +:1013D0000001010000010100000101000001010005 +:1013E00000010100000101000001010000010100F5 +:1013F00000010100000101000001010000010100E5 +:1014000000010100000101000001010000010100D4 +:1014100000010100000101000001010000010100C4 +:1014200000010100000101000001010000010100B4 +:1014300000010100000101000001010000010100A4 +:101440000001010000010100000101000001010094 +:101450000001010000010100000101000001010084 +:101460000001010000010100000101000001010074 +:101470000001010000010100000101000001010064 +:101480000001010000010100000101000001010054 +:101490000001010000010100000101000001010044 +:1014A0000001010000010100000101000001010034 +:1014B0000001010000010100000101000001010024 +:1014C0000001010000010100000101000001010014 +:1014D0000001010000010100000101000001010004 +:1014E00000010100000101000001010000010100F4 +:1014F00000010100000101000001010000010100E4 +:1015000000010100000101000001010000010100D3 +:1015100000010100000101000001010000010100C3 +:1015200000010100000101000001010000010100B3 +:1015300000010100000101000001010000010100A3 +:101540000001010000010100000101000001010093 +:101550000001010000010100000101000001010083 +:101560000001010000010100000101000001010073 +:101570000001010000010100000101000001010063 +:101580000001010000010100000101000001010053 +:101590000001010000010100000101000001010043 +:1015A0000001010000010100000101000001010033 +:1015B0000001010000010100000101000001010023 +:1015C0000001010000010100000101000001010013 +:1015D0000001010000010100000101000001010003 +:1015E00000010100000101000001010000010100F3 +:1015F00000010100000101000001010000010100E3 +:1016000000010100000101000001010000010100D2 +:1016100000010100000101000001010000010100C2 +:101620000001010002417564692031333520746F77 +:101630006F7468206372616E6B20616E64206361F9 +:101640006D00020202020202020202020200000017 +:101650000000000000000001010101010101010181 +:101660000101010101000000000000000000000075 +:101670000000000000000000020202030303030355 +:101680000303030303030101010000000000000045 +:101690000000000000000000000000000000000149 +:1016A000010101010101010101010101010000002D +:1016B000000000000000000000000000000000002A +:1016C00000000203030303030303030303030303F1 +:1016D00003024D69747375626973686920346736F3 +:1016E0003320616B6120342F32206372616E6B2076 +:1016F000616E642063616D00010100000001010062 +:1017000000000101000000010100000001010000D3 +:1017100000010100000001010000000103020202BB +:1017200003030202020301000000010100000000A7 +:10173000000000000000000000010302020202029B +:10174000020202020000000001010000000101008D +:101750000000010100000001010000000101000083 +:101760000001010000000101000000010100000073 +:10177000010100000001030202020303020202034E +:101780000100000001010000000000000000000056 +:10179000000000010302020203030202020301002F +:1017A0000000010100000001010000000101000033 +:1017B0000001010000000101000000010100000023 +:1017C0000101000000010100000001010000000112 +:1017D0000100000001010000000101000000010102 +:1017E00000000000000000000000000000010302F3 +:1017F00002020202020202020000000001010000D7 +:1018000000010100000001010000000101000000D2 +:1018100001010000000101000000010100000001C1 +:1018200001000000010100000001010000000101B1 +:1018300000000001010000000101000000000000A4 +:101840000000000000000001030202020303020284 +:10185000020301000000010100000001010000007E +:101860004D617A64612033362D322D322D3220774E +:10187000697468203620746F6F74682063616D002E +:10188000000101010001010100010101000101014C +:10189000000101010001010100010101000101013C +:1018A000000101010001010100010101000101012C +:1018B000020101010001010100010101000101011A +:1018C0000001010102010101010101010101010108 +:1018D00000010101000101010001010100010101FC +:1018E00000010101000101010001010100010101EC +:1018F00000010101000101010001010100010101DC +:1019000000010101000101010001010100010101CB +:1019100000010101020101010101010101010101B7 +:1019200000010101000101010001010100010101AB +:10193000000101010001010100010101000101019B +:10194000000101010001010100010101000101018B +:10195000000101010001010100010101000101017B +:101960000001010102010101010101010101010167 +:10197000000101010001010100010101000101015B +:10198000000101010001010100010101000101014B +:10199000000101010001010100010101000101013B +:1019A000000101010001010100010101000101012B +:1019B0000001010102010101010101010101010117 +:1019C000000101010001010100010101000101010B +:1019D00000010101000101010001010100010101FB +:1019E00000010101000101010001010100010101EB +:1019F00000010101000101010001010100010101DB +:101A000000010101020101010101010101010101C6 +:101A100000010101000101010001010100010101BA +:101A200000010101000101010001010100010101AA +:101A3000000101010001010100010101000101019A +:101A4000000101010001010100010101000101018A +:101A50000001010102010101010101010101010176 +:101A6000566F6C766F206431325B6163645D206316 +:101A700072616E6B2077697468203720746F6F74A1 +:101A8000682063616D000100010001000100030294 +:101A9000030203020302474D2038206576656E2D50 +:101AA000746F6F7468206372616E6B2077697468FD +:101AB000203120746F6F74682063616D0001000134 +:101AC000000100030203020302474D203620657621 +:101AD000656E2D746F6F7468206372616E6B207712 +:101AE000697468203120746F6F74682063616D00C1 +:101AF0000100010003020302474D20342065766592 +:101B00006E2D746F6F7468206372616E6B207769DD +:101B10007468203120746F6F74682063616D0000F9 +:101B200000000100000001000000010000000100B1 +:101B300000000100000001000000010000000100A1 +:101B40000202030200000100000001000000010089 +:101B50000000010000000100000001000000015928 +:101B6000616D61686120323030322D303320523166 +:101B70002038206576656E2D746F6F7468206372EF +:101B8000616E6B2077697468203120746F6F7468A0 +:101B90002063616D000100000100000100000100F0 +:101BA0000001000001000001000001000001000030 +:101BB0000100000302020202020300000100000112 +:101BC0000000010000010000010000010000010010 +:101BD000000100000100000100000000004D617ADA +:101BE0006461204341532032342D32207769746878 +:101BF0002073696E676C652070756C7365206F75F6 +:101C00007465722072696E670002010001000100B4 +:101C100001000302030203020302030203020302A0 :101C2000030203020302030203020302030203028C :101C3000030203020302030203020302030203027C :101C4000030203020302030203020302030203026C -:101C50000302030201000100010001000100010074 -:101C60000100010001000100010001000302030264 +:101C5000030203020302030203020302030203025C +:101C6000030203020302030203020302030203024C :101C7000030203020302030203020302030203023C -:101C8000030203020302030203020302030203022C -:101C9000030203020302030203020302030203021C +:101C80000302010001000100010001000100010048 +:101C90000100030203020302030203020302030220 :101CA000030203020302030203020302030203020C :101CB00003020302030203020302030203020302FC -:101CC00003020302030203020302030201000100F4 -:101CD00001000100010001000100010001000100FC -:101CE00001000100010001000100010003020302E4 -:101CF00003020302030203020302030203020302BC -:101D000003020302030203020302030203020302AB -:101D1000030203020302030203020302030203029B +:101CC00003020302030203020302030203020302EC +:101CD00003020302030203020302030203020302DC +:101CE00003020302030203020302030203020302CC +:101CF00003020302030203020302010001000100C8 +:101D000001000100010001000100010001000100CB +:101D1000010003020302030203020302030203029F :101D2000030203020302030203020302030203028B :101D3000030203020302030203020302030203027B -:101D40000302030201000100010001000100010083 -:101D5000010001000100010001000100010001007B -:101D60000100010001000100010001000302030263 -:101D7000030203020302030203020302030203023B -:101D8000030203020302030203020302030203022B -:101D9000030203020302030203020302030203021B +:101D4000030203020302030203020302030203026B +:101D5000030203020302030203020302030203025B +:101D6000030203020302030203020302030203024B +:101D70000302010001000100010001000100010057 +:101D8000010001000100010001000100010001004B +:101D9000010003020302030203020302030203021F :101DA000030203020302030203020302030203020B -:101DB0000302030203020302030203020100010003 -:101DC000010001000100010001000100010001000B -:101DD00001000100010001000100010001000100FB -:101DE00001000100010001000100010003020302E3 -:101DF00003020302030203020302030203020302BB -:101E000003020302030203020302030203020302AA -:101E1000030203020302030203020302030203029A +:101DB00003020302030203020302030203020302FB +:101DC00003020302030203020302030203020302EB +:101DD00003020302030203020302030203020302DB +:101DE00003020302030203020302010001000100D7 +:101DF00001000100010001000100010001000100DB +:101E000001000100010001000100010001000100CA +:101E1000010003020302030203020302030203029E :101E2000030203020302030203020302030203028A -:101E30000302034E697373616E20333630204341D1 -:101E4000532077697468203620736C6F74730002B6 -:101E50000202020202020202020202020202020262 -:101E60000202020202020202020202020202020252 -:101E70000202020202020200000000000000000054 -:101E80000000000000000000000000020202020248 -:101E90000202020202020202020202020202020222 -:101EA000020203030303030202020202020202020D -:101EB0000202020202020202020202020202020202 -:101EC00002020303030303020202020202020202ED -:101ED00002020202020202020202020202020202E2 -:101EE00002020202020202020202020202020202D2 -:101EF00002020202020202020203030303030202BD +:101E3000030203020302030203020302030203027A +:101E4000030203020302030203020302030203026A +:101E5000030203020302030203020302030203025A +:101E60000302010001000100010001000100010066 +:101E7000010001000100010001000100010001005A +:101E8000010001000100010001000100010001004A +:101E9000010003020302030203020302030203021E +:101EA000030203020302030203020302030203020A +:101EB00003020302030203020302030203020302FA +:101EC00003020302030203020302030203020302EA +:101ED0000302030203020302034E697373616E205F +:101EE000333630204341532077697468203620739D +:101EF0006C6F74730002020202020202020202020A :101F000002020202020202020202020202020202B1 -:101F100002020202020202020202020202020202A1 -:101F20000202020202020202020202020202020291 -:101F30000202020202000000000000000000000097 -:101F40000000000000000000000000000000000091 -:101F5000000000000000010101010100000000007C -:101F60000000000000000000000000000000000071 -:101F7000000000000000010101010100000000005C -:101F80000000000000000000000000000000000051 -:101F90000000000000000000000000000000000041 -:101FA000000000000000000000000000000101012E -:101FB000010100000000000000000000000000001F -:101FC0000000000000000000000000000000000011 -:101FD00000000000000000000000000000000002FF -:101FE00002020202020202020202020202020202D1 -:101FF00002020200000000000000000000000000DB -:1020000000000000000000000000010101010100CB -:1020100000000000000000000000000000000000C0 -:1020200000000000000000000000010101010100AB +:101F100002020202020202020202020202000000A7 +:101F200000000000000000000000000000000000B1 +:101F30000002020202020202020202020202020283 +:101F4000020202020202020203030303030202026C +:101F50000202020202020202020202020202020261 +:101F6000020202020202020203030303030202024C +:101F70000202020202020202020202020202020241 +:101F80000202020202020202020202020202020231 +:101F90000202020202020202020202020202020320 +:101FA000030303030202020202020202020202020D +:101FB0000202020202020202020202020202020201 +:101FC00002020202020202020202020202020202F1 +:101FD00002020202020202020202020000000000EB +:101FE00000000000000000000000000000000000F1 +:101FF00000000000000000000000000001010101DD +:1020000001000000000000000000000000000000CF +:1020100000000000000000000000000001010101BC +:1020200001000000000000000000000000000000AF :1020300000000000000000000000000000000000A0 :102040000000000000000000000000000000000090 -:102050000000000000000000000000000000000080 -:10206000000101010101000000000000000000006B +:10205000000000010101010100000000000000007B +:102060000000000000000000000000000000000070 :102070000000000000000000000000000000000060 -:102080000000000000000000000000000000000050 -:10209000000000000000000000000000000202023A -:1020A0000202020202020202020202020202020210 -:1020B00002020202020202020202020202020303FE -:1020C00003030302020202020202020202020202ED -:1020D00002020202020202020202020202020303DE -:1020E00003030302020202020202020202020202CD -:1020F00002020202020202020202020202020202C0 -:1021000002020202020202020202020202020202AF -:102110000202020202030303030302020202024656 -:1021200069617420312E3820313656206372616E19 -:102130006B20616E642063616D0000000000000090 -:10214000000000000000000000000101000000008D -:102150000202020200000000000000000101000075 -:10216000000000000000000000000000000001016D -:102170000000000002020202000000000000000057 -:10218000010100000000000000000000000000004D -:10219000000001010000000000000000000000003D -:1021A000000000000101000000000000000000002D -:1021B000000000000000010100000000000000001D -:1021C0000000000000000000010157656265722DEB -:1021D0004D6172656C6C692038206372616E6B2B87 -:1021E000322063616D207061747465726E0000004E -:1021F00000000000000000000000000000000000DF -:1022000000000000000000010101010100000000C9 -:1022100000010101010100000000000101010101B4 -:1022200000000000000101010101000000000001A8 -:10223000010101010000000000010103030302028B -:102240000202020101010101000000000001010180 -:102250000101000000000001010101010000000077 -:102260000001010101010000000000010101010164 -:102270000000000000010101010100000000000158 -:102280000101010100000000000101010101000045 -:102290000000000101030303020202020201010126 -:1022A0000101000000000001010103030303030317 -:1022B000030301010101010101010101010101010A -:1022C0000000000000010101010100000000000108 -:1022D00001010101000000000001010101010000F5 -:1022E00000000001010101010000000000010103E4 -:1022F00003030202020202010101010100000000C9 -:1023000000010101030302020202020301010101B3 -:1023100000000000000101010103020202020203A9 -:1023200003010101000000000001010101010000A2 -:102330000000000101010101000000000001010195 -:102340000101000000000001010303030202020278 -:102350000201010101010000000000000000020272 -:102360000202020202020000000000000000000160 -:102370000101010100000000000101010101000054 -:102380000000000101010101000000000001010145 -:102390000101000000000001010101010000000036 -:1023A0000001010303030202020202010101010113 -:1023B0000000000000010101030302020202020307 -:1023C0000101010100000000000101010101000004 -:1023D00000000001010101010000000000010101F5 -:1023E00001010000000000010101010100000000E6 -:1023F00000010101010100000000000101030303CD -:1024000002020202020101010101000000000001BC -:1024100001010101010101010101010101010101AC -:1024200001010101010101010000000000010101A1 -:102430000101000000000001010101010000000095 -:102440000001010101010000000000010101010182 -:102450000000000000010103030302020202020166 -:10246000010101010000000000010101030302025B -:10247000020202030101010100000000000101014C -:102480000103020202020203030101010000000035 -:102490000001010101010000000000010101010132 -:1024A0000000000000010101010100000000000126 -:1024B0000103030302020202020101010101436858 -:1024C0007279736C6572204E47432033362D322B60 -:1024D00032206372616E6B2C204E474320382D638F -:1024E000796C2063616D00020200000000000000B2 -:1024F00000000000020202020202020202020000C8 -:1025000001010101010000000002030303030302B3 -:1025100002020200010101010100000000000101AE -:1025200001010100000000000101010101000000A3 -:102530000000010101010100000000000101010192 -:102540000100000000000101010101000000000085 -:10255000010101010100000202020303030303025F -:102560000200000001010101010000000000010162 -:102570000101010000000000010101010100000053 -:102580000000010101010100000000000101010142 -:102590000100000000000101010101000000000035 -:1025A000010101010101010101010101010101011B -:1025B0000101010101010101010000000000010110 -:1025C0000101010000000000010101010100000201 -:1025D00002020303030303020200000001010101E0 -:1025E00001000000020203030303030202020000D1 -:1025F00001010101010000000000010101010100D1 -:1026000000000000010101010100000000000101C3 -:1026100001010100000000000101010101000000B2 -:1026200000000101010101000000000001010101A1 -:102630000100000000000101010101000000000094 -:10264000010101010100000202020303030303026E -:102650000200000000000000000000000202020270 -:102660000202020202020000010101010100000059 -:10267000000203030303030202020200010101013D -:102680000100000000000101010101000000000044 -:102690000101010101000000000001010101010030 -:1026A0000000000001010101010000000000010123 -:1026B0000101010000000000010101010100000210 -:1026C00002020303030303020200000001010101EF -:1026D00001000000020203030303030202020000E0 -:1026E00001010101010000000000010101010100E0 -:1026F00000000000010101010100000000000101D3 -:1027000001010100000000000101010101010101BE -:1027100001010101010101010101010101010101A9 -:1027200001000000000001010101010000000000A3 -:10273000010101010100000202020303030303027D -:102740000200000001010101010000000000010180 -:102750000101010000000000010101010100000071 -:102760000000010101010100000000000101010160 -:102770000100000000000101010101000000000053 -:10278000010101010100000000000101010101003F -:102790000000000001010101010000000000010132 -:1027A000010101000000000001010101010000021F -:1027B0000202030303030343687279736C6572209A -:1027C0004E47432033362D322B32206372616E6BBD -:1027D0002C204E474320362D63796C2063616D00B9 -:1027E00000000000000101010101010101010101DE -:1027F00001010101010101010103030303030202BD -:1028000002020203030303030202020202030303A0 -:102810000303020202020203030303030200000097 -:10282000000101010101000000000001010101019E -:102830000000000000010101010100000000000192 -:102840000103030302020202020303030303020261 -:102850000202020303030303020202020203030350 -:102860000303020202000001010101010000000057 -:10287000000101010101000000000001010101014E -:102880000000000000010101010302020202020334 -:102890000303030302020202020202020202020214 -:1028A0000202020202020202020202020203030305 -:1028B00003030202020202030303030302020202F1 -:1028C00002030303030302020202020303030303DE -:1028D00002020202020303030303020202020203D2 -:1028E00003030303020202020203030303030202BF -:1028F00002020203030303030202020202030303B0 -:1029000003030202020202030303030302020202A0 -:10291000020303030303020202000001010101019B -:1029200000000000000101010101000000000001A1 -:102930000101010100000000000101010103020288 -:10294000020202030303030302020202020303035F -:102950000303030303030303030303030303030347 -:10296000030101010101000000000001010101015A -:102970000000000000010101010100000000000151 -:102980000101010100020202020303030303020228 -:10299000020202030303030302020202020303030F -:1029A000030302020202020303010101000000000E -:1029B000000101010101000000000001010101010D -:1029C00000000000000101010101000000020203FB -:1029D00003030303020202020203030303030202CE -:1029E00002020203030303030202020202030303BF -:1029F00003010000000000010101010100000000CE -:102A000000000000000000000000000000000000C6 -:102A100000000000000101010101000000000001B0 -:102A2000010101010000000000010101010100009D -:102A3000000000010101010100000000000101018E -:102A4000010100000000000101010101000000007F -:102A5000000101010101000000000001010101016C -:102A60000000000000010101010100000000000160 -:102A7000010101010000000000010101010100004D -:102A80000002020303030303020202020203030320 -:102A9000030302020202020303030303020202020F -:102AA0000203030303010000000000010101010112 -:102AB00043687279736C6572204E47432033362B1E -:102AC000322D32206372616E6B2C204E47432034CE -:102AD0002D63796C2063616D00010001000100012C -:102AE00000010001000100010001000100010001DE -:102AF00000010001000100010001000100010001CE -:102B000000010001000100010001000100010001BD -:102B100000010001000100010003020302010000A6 -:102B2000000100010001000100010001000100019D -:102B3000000100010001000100010001000100018D -:102B4000000100010001000100010001000100017D -:102B5000000100010001000100010001000100016D -:102B600000010001000100000033362D31206372A6 -:102B7000616E6B207769746820326E6420747269AC -:102B800067676572206F6E207465657468203333E3 -:102B90002D33340000010001000100010001000399 +:10208000000000000002020202020202020202023A +:10209000020202020202020202000000000000002E +:1020A0000000000000000000000000000000000030 +:1020B000010101010100000000000000000000001B +:1020C0000000000000000000000000000000000010 +:1020D00001010101010000000000000000000000FB +:1020E00000000000000000000000000000000000F0 +:1020F00000000000000000000000000000000000E0 +:1021000000000000000000010101010100000000CA +:1021100000000000000000000000000000000000BF +:1021200000000000000000000000000000000000AF +:10213000000000000000000000000000000000009F +:102140000000000202020202020202020202020275 +:10215000020202020202020202020202020202025F +:10216000020202020303030303020202020202024A +:10217000020202020202020202020202020202023F +:10218000020202020303030303020202020202022A +:10219000020202020202020202020202020202021F +:1021A000020202020202020202020202020202020F +:1021B00002020202020202020202020303030303FA +:1021C00002020202024669617420312E3820313643 +:1021D00056206372616E6B20616E642063616D00D6 +:1021E00000000000000000000000000000000000EF +:1021F00001010000000002020202000000000000D5 +:1022000000000101000000000000000000000000CC +:1022100000000000010100000000020202020000B4 +:1022200000000000000001010000000000000000AC +:10223000000000000000000001010000000000009C +:10224000000000000000000000000101000000008C +:10225000000000000000000000000000010100007C +:10226000000000000000000000000000000001016C +:1022700057656265722D4D6172656C6C69203820FE +:102280006372616E6B2B322063616D2070617474B8 +:1022900065726E00000000000000000000000000F9 +:1022A000000000000000000000000000000101012B +:1022B0000101000000000001010101010000000017 +:1022C0000001010101010000000000010101010104 +:1022D00000000000000101010101000000000001F8 +:1022E00001030303020202020201010101010000D5 +:1022F00000000001010101010000000000010101D6 +:1023000001010000000000010101010100000000C6 +:1023100000010101010100000000000101010101B3 +:1023200000000000000101010101000000000001A7 +:10233000010101010000000000010103030302028A +:10234000020202010101010100000000000101017F +:10235000030303030303030301010101010101015D +:102360000101010101010000000000010101010162 +:102370000000000000010101010100000000000157 +:102380000101010100000000000101010101000044 +:102390000000000101030303020202020201010125 +:1023A000010100000000000101010303020202021A +:1023B000020301010101000000000001010101030D +:1023C00002020202020303010101000000000001F9 +:1023D00001010101000000000001010101010000F4 +:1023E00000000001010101010000000000010103E3 +:1023F00003030202020202010101010100000000C8 +:1024000000000000020202020202020200000000BC +:1024100000000000000101010101000000000001B6 +:1024200001010101000000000001010101010000A3 +:102430000000000101010101000000000001010194 +:102440000101000000000001010303030202020277 +:10245000020101010101000000000001010103036C +:10246000020202020203010101010000000000015A +:102470000101010100000000000101010101000053 +:102480000000000101010101000000000001010144 +:102490000101000000000001010101010000000035 +:1024A0000001010303030202020202010101010112 +:1024B0000000000000010101010101010101010111 +:1024C00001010101010101010101010101010000FE +:1024D00000000001010101010000000000010101F4 +:1024E00001010000000000010101010100000000E5 +:1024F00000010101010100000000000101030303CC +:1025000002020202020101010101000000000001BB +:1025100001010303020202020203010101010000A2 +:102520000000000101010103020202020203030193 +:102530000101000000000001010101010000000094 +:102540000001010101010000000000010101010181 +:102550000000000000010103030302020202020165 +:102560000101010143687279736C6572204E474323 +:102570002033362D322B32206372616E6B2C204E4D +:10258000474320382D63796C2063616D000202009F +:10259000000000000000000000000202020202022F +:1025A000020202020000010101010100000000021C +:1025B00003030303030202020200010101010100FF +:1025C0000000000001010101010000000000010104 +:1025D00001010100000000000101010101000000F3 +:1025E00000000101010101000000000001010101E2 +:1025F00001000000000001010101010000020202CF +:1026000003030303030202000000010101010100B2 +:1026100000000000010101010100000000000101B3 +:1026200001010100000000000101010101000000A2 +:102630000000010101010100000000000101010191 +:10264000010000000000010101010101010101017F +:10265000010101010101010101010101010101006B +:102660000000000001010101010000000000010163 +:10267000010101000002020203030303030202003E +:102680000000010101010100000002020303030335 +:10269000030202020000010101010100000000002C +:1026A0000101010101000000000001010101010020 +:1026B0000000000001010101010000000000010113 +:1026C0000101010000000000010101010100000002 +:1026D00000000101010101000000000001010101F1 +:1026E00001000000000001010101010000020202DE +:1026F00003030303030202000000000000000000C7 +:1027000000000202020202020202020200000101B3 +:10271000010101000000000203030303030202029F +:10272000020001010101010000000000010101019E +:102730000100000000000101010101000000000093 +:10274000010101010100000000000101010101007F +:102750000000000001010101010000000000010172 +:10276000010101000002020203030303030202004D +:102770000000010101010100000002020303030344 +:10278000030202020000010101010100000000003B +:10279000010101010100000000000101010101002F +:1027A0000000000001010101010000000000010122 +:1027B0000101010101010101010101010101010109 +:1027C00001010101010101000000000001010101FE +:1027D00001000000000001010101010000020202ED +:1027E00003030303030202000000010101010100D1 +:1027F00000000000010101010100000000000101D2 +:1028000001010100000000000101010101000000C0 +:1028100000000101010101000000000001010101AF +:1028200001000000000001010101010000000000A2 +:10283000010101010100000000000101010101008E +:102840000000000001010101010000000000010181 +:102850000101010000020202030303030343687243 +:1028600079736C6572204E47432033362D322B32FC +:10287000206372616E6B2C204E474320362D6379A6 +:102880006C2063616D000000000000010101010186 +:102890000101010101010101010101010101010326 +:1028A00003030303020202020203030303030202FF +:1028B00002020203030303030202020202030303F0 +:1028C00003030200000000010101010100000000FB +:1028D00000010101010100000000000101010101EE +:1028E00000000000000101030303020202020203D0 +:1028F00003030303020202020203030303030202AF +:1029000002020203030303030202020000010101A9 +:1029100001010000000000010101010100000000B0 +:10292000000101010101000000000001010101039B +:102930000202020202030303030302020202020272 +:102940000202020202020202020202020202020267 +:10295000020202030303030302020202020303034F +:102960000303020202020203030303030202020240 +:10297000020303030303020202020203030303032D +:102980000202020202030303030302020202020321 +:10299000030303030202020202030303030302020E +:1029A00002020203030303030202020202030303FF +:1029B00003030202020202030303030302020200F2 +:1029C00000010101010100000000000101010101FD +:1029D00000000000000101010101000000000001F1 +:1029E00001010103020202020203030303030202C4 +:1029F00002020203030303030303030303030303AA +:102A000003030303030303010101010100000000AC +:102A100000010101010100000000000101010101AC +:102A20000000000000010101010100020202020396 +:102A3000030303030202020202030303030302026D +:102A40000202020303030303020202020203030160 +:102A5000010100000000000101010101000000006F +:102A6000000101010101000000000001010101015C +:102A70000000000202030303030302020202020336 +:102A8000030303030202020202030303030302021D +:102A90000202020303030301000000000001010120 +:102AA0000101000000000000000000000000000024 +:102AB0000000000000000000000000010101010111 +:102AC0000000000000010101010100000000000100 +:102AD00001010101000000000001010101010000ED +:102AE00000000001010101010000000000010101DE +:102AF00001010000000000010101010100000000CF +:102B000000010101010100000000000101010101BB +:102B100000000000000101010101000000000001AF +:102B2000010101010000000202030303030302028A +:102B3000020202030303030302020202020303036D +:102B40000303020202020203030303010000000068 +:102B500000010101010143687279736C6572204EB6 +:102B600047432033362B322D32206372616E6B2C3B +:102B7000204E474320342D63796C2063616D000142 +:102B8000000100010001000100010001000100013D +:102B9000000100010001000100010001000100012D :102BA000000100010001000100010001000100011D -:102BB0000001000300010003000100010001000109 -:102BC00000010001486F6E64612052433531207767 -:102BD0006974682063616D0001000100010001005B -:102BE00001000100010001000100010001000100DD -:102BF00001000000010001000000010001000100CF -:102C000001000100010001000100010001000100BC -:102C100001000100010000000100010001000000AE -:102C20004F6464204C6F7475732033362D312D3111 -:102C30002D312D3120666C79776865656C00010057 -:102C40000100030203020302030203020302010064 -:102C5000010001000100010001000100010001006C -:102C6000010001000100010001000100010001005C -:102C70000100010001000100010001000100030248 -:102C80000302030203020302030201000100010028 -:102C90000100030203020302030203020302030210 -:102CA00003020302030203020302030203020302FC -:102CB00003020202020203020302030203020302EE -:102CC00003020302030201000100010001000302EC -:102CD00003020302030203020302030203020302CC -:102CE00003020302030203020302030203020302BC -:102CF00003020302030203020302030203020302AC -:102D000003020100010001000100010001000100B7 +:102BB000000100010001000100010001000100030B +:102BC00002030201000000010001000100010001F8 +:102BD00000010001000100010001000100010001ED +:102BE00000010001000100010001000100010001DD +:102BF00000010001000100010001000100010001CD +:102C0000000100010001000100010001000000338B +:102C1000362D31206372616E6B20776974682032C3 +:102C20006E642074726967676572206F6E207465C8 +:102C30006574682033332D33340000010001000136 +:102C4000000100010003000100010001000100017A +:102C50000001000100010001000300010003000168 +:102C600000010001000100010001486F6E64612055 +:102C70005243353120776974682063616D0001002B +:102C8000010001000100010001000100010001003C +:102C9000010001000100010000000100010000002E +:102CA000010001000100010001000100010001001C +:102CB000010001000100010001000100000001000D +:102CC0000100010000004F6464204C6F7475732094 +:102CD00033362D312D312D312D3120666C797768C9 +:102CE00065656C0001000100030203020302030298 +:102CF00003020302010001000100010001000100C4 +:102D000001000100010001000100010001000100BB :102D100001000100010001000100010001000100AB -:102D20000100010001000100010000000000474D0A -:102D300020353878206372616E6B20616E642034B8 -:102D4000782063616D0004000000000000000000B6 -:102D50000000010101000000010101010101010168 -:102D60000101010100000001010101010101010156 -:102D70000101010000000101010101010101010146 -:102D80000101000000010101010101010101010136 -:102D90000100000001010101010101010101010126 -:102DA0000000000000000000000000000101010020 -:102DB0000000010101010101010101010101000007 -:102DC00000010101010101010101010101000000F7 -:102DD00001010101010101010101010100000000E7 -:102DE00000000000000000000101010000000000E0 -:102DF00000000000000000010101000000010101CD -:102E000001010101010101010100000001010101B5 -:102E100001010101010101010000000000000000AA -:102E2000000000000101010000000000000000009F -:102E3000000000010101000000000000000000008F -:102E40000000010101000000010101010101010177 -:102E5000010101010000000000000000000000006E -:102E60000101010000000101010101010101010155 -:102E7000010100000000000000000000000001014E -:102E8000010000000000000000000000000101013E -:102E9000000000000000000000000000010101002F -:102EA000000000000000000000000001010102021B -:102EB00002020202020202020202030303020202EF -:102EC00003030303030303030303030302020203D5 -:102ED00003030303030303030303030202020303C5 -:102EE00003030303030303030303020202030303B5 -:102EF00003030303030303030302020203030303A5 -:102F00000303030303030303020202020202020299 -:102F10000202020203030302020203030303030388 -:102F20000303030303030202020303030303030374 -:102F30000303030303020202030303030303030364 -:102F4000030303030202020202020202020202025D -:102F5000030303020202020202020202020202034D -:102F60000303020202030303030303030303030334 -:102F70000302020203030303030303030303030324 -:102F8000020202020202020202020202030303021E -:102F9000020202020202020202020203030302020E -:102FA00002020202020202020202030303020202FE -:102FB00003030303030303030303030302020202E5 -:102FC00002020202020202020303030202020303DC -:102FD00003030303030303030303020202020202C7 -:102FE00002020202020203030302020202020202BE -:102FF00002020202020303030202020202020202AE -:10300000020202020303030202020202020202029D -:10301000020202030303474D204C533120637261C7 -:103020006E6B20616E642063616D0001010101001F -:10303000000000000001010101000000000000018B -:10304000010101000000000000000000000000007D -:10305000000000000000000001010101000000006C -:103060000000010101010000000000000101010158 -:1030700000000000000000000000004275656C6C5C -:10308000204F6464666972652043414D207768650E -:10309000656C00030303030303030303020202023C -:1030A0000200000000000000000001010101010118 -:1030B00001030303020202020200000000000000FC -:1030C00000000101010101010101010100000000F6 -:1030D00000000000000000020202030303030301DA -:1030E00001010101000000000000000000000000DC -:1030F00000000101010101010103030302020202B8 -:1031000002000000000000000000010101010101B7 -:1031100001010101000000000000000000000000AB -:103120000202034D697473756269736869203667BA -:10313000373220776974682063616D0001000100F7 -:103140000100010001000100010001000100030273 -:103150000300010001000100010001000100010065 -:103160000100010001000100010001000100010057 -:103170000100010001000100010001000100010047 -:103180000100000001000100010001000100010038 -:10319000030203000100030203000100010001001B -:1031A0000100010001000100010001000100010017 -:1031B0000100010001000100010001000100010007 -:1031C0000100010001000100010000004D617A646E -:1031D00061204645332033362D31207769746820CD -:1031E00063616D00010101010101010101010100A3 -:1031F00001010101010101010101010001000101C1 -:1032000001010101010101000101010101010101AF -:10321000010101000101010101010101010101019F -:10322000010001010101010101010100474D2034AC -:10323000323030206372616E6B20776865656C0098 -:103240000100000200000100000000000100010078 +:102D20000100010003020302030203020302030283 +:102D3000010001000100010003020302030203027B +:102D4000030203020302030203020302030203025B +:102D5000030203020302030202020202030203024D +:102D60000302030203020302030203020100010043 +:102D70000100010003020302030203020302030233 +:102D8000030203020302030203020302030203021B +:102D9000030203020302030203020302030203020B +:102DA000030203020302030201000100010001000B +:102DB000010001000100010001000100010001000B +:102DC00001000100010001000100010001000100FB +:102DD00000000000474D20353878206372616E6B2B +:102DE00020616E642034782063616D00040000006F +:102DF00000000000000000000101010000000101CE +:102E000001010101010101010101000000010101B5 +:102E100001010101010101010100000001010101A5 +:102E20000101010101010101000000010101010195 +:102E30000101010101010100000001010101010185 +:102E4000010101010101000000000000000000007C +:102E50000000010101000000010101010101010167 +:102E60000101010100000001010101010101010155 +:102E70000101010000000101010101010101010145 +:102E8000010100000000000000000000000001013E +:102E9000010000000000000000000000000101012E +:102EA0000000000101010101010101010101010016 +:102EB0000000010101010101010101010101000006 +:102EC00000000000000000000000010101000000FF +:102ED00000000000000000000001010100000000EF +:102EE00000000000000000000101010000000101DD +:102EF00001010101010101010101000000000000C8 +:102F000000000000000001010100000001010101BA +:102F100001010101010101010000000000000000A9 +:102F2000000000000101010000000000000000009E +:102F3000000000010101000000000000000000008E +:102F4000000001010100000000000000000000007E +:102F50000001010102020202020202020202020256 +:102F60000303030202020303030303030303030334 +:102F70000303020202030303030303030303030324 +:102F80000302020203030303030303030303030314 +:102F90000202020303030303030303030303030205 +:102FA00002020303030303030303030303030202F5 +:102FB00002020202020202020202030303020202EE +:102FC00003030303030303030303030302020203D4 +:102FD00003030303030303030303030202020303C4 +:102FE00003030303030303030303020202020202B7 +:102FF00002020202020203030302020202020202AE +:103000000202020202030303020202030303030398 +:103010000303030303030302020203030303030383 +:10302000030303030303020202020202020202027A +:10303000020203030302020202020202020202026D +:10304000020303030202020202020202020202025D +:103050000303030202020303030303030303030343 +:10306000030302020202020202020202020203033C +:103070000302020203030303030303030303030323 +:10308000020202020202020202020202030303021D +:10309000020202020202020202020203030302020D +:1030A00002020202020202020202030303020202FD +:1030B000020202020202020202030303474D204CF5 +:1030C0005331206372616E6B20616E642063616DA9 +:1030D00000010101010000000000000101010100E8 +:1030E00000000000000101010100000000000000DC +:1030F00000000000000000000000000000000101CE +:1031000001010000000000000101010100000000B9 +:1031100000000101010100000000000000000000AB +:10312000004275656C6C204F64646669726520436B +:10313000414D20776865656C0003030303030303B7 +:10314000030302020202020000000000000000006F +:103150000101010101010103030302020202020055 +:103160000000000000000000010101010101010157 +:103170000101000000000000000000000002020247 +:10318000030303030301010101010000000000002B +:103190000000000000000000010101010101010325 +:1031A000030302020202020000000000000000000F +:1031B0000101010101010101010100000000000005 +:1031C0000000000000000202034D6974737562691B +:1031D00073686920366737322077697468206361C5 +:1031E0006D0001000100010001000100010001006B +:1031F00001000100030203000100010001000100C1 +:1032000001000100010001000100010001000100B6 +:1032100001000100010001000100010001000100A6 +:103220000100010001000100000001000100010097 +:10323000010001000100030203000100030203007A +:103240000100010001000100010001000100010076 :103250000100010001000100010001000100010066 -:103260000100010001000100010001000002000056 -:103270000100010001000100010001000100010046 -:103280000100010001000100010000000000010038 -:103290000000000001000102010001000100010026 -:1032A0000100010001000100010001000100010016 -:1032B0000100010000000000010001000100010008 -:1032C00001000100010001000100010001000100F6 -:1032D00033362D322D322D32204372616E6B2061D8 -:1032E0006E642063616D00010001000100010001B6 -:1032F00000010001000100010001000100010001C6 -:1033000000010001000100010001000100000000B7 -:1033100000010001000100010001000100010001A5 -:103320000001000100000000000100000000003367 -:10333000362D322D322D32204836204372616E6B8D -:10334000206F6E6C79000100010001000100010096 -:103350000100010001000100010001000100010065 -:103360000000000001000000000001000100010059 -:103370000100010001000100010001000100010045 -:1033800001000100000000000100010001003336CF -:103390002D322D322D32204834204372616E6B2045 -:1033A0006F6E6C7900010000000100000001000058 -:1033B0000001000000010000000100000001000009 -:1033C00000010000000100000000000000000000FB -:1033D000000000000031322D33206F646462616CA4 -:1033E0006C0000010001000100010001000100016A -:1033F00000010001000100010001000100010001C5 -:1034000000010001000100010001000100010001B4 -:1034100000010001000100010001000100010001A4 -:103420000001000100010001000100010001000194 -:103430000001000100010001020302030203020374 -:103440000203020302030001000100010001000168 -:103450000001000100010001000100010001000164 -:103460000001000100010001000100010001000154 -:103470000001000100010001000100010001000144 -:103480000001000100010001000100010001000134 -:10349000000102030203000100010001000100011C +:103260000100010001000100010001000100010056 +:1032700000004D617A6461204645332033362D319C +:1032800020776974682063616D000101010101010B +:10329000010101010100010101010101010101011F +:1032A0000100010001010101010101010100010111 +:1032B00001010101010101010100010101010101FF +:1032C00001010101010101000101010101010101EF +:1032D0000100474D2034323030206372616E6B2024 +:1032E000776865656C0001000002000001000000C5 +:1032F00000000100010001000100010001000100C7 +:1033000001000100010001000100010001000100B5 +:1033100001000002000001000100010001000100A5 +:103320000100010001000100010001000100010095 +:103330000000000001000000000001000102010087 +:103340000100010001000100010001000100010075 +:103350000100010001000100010000000000010067 +:103360000100010001000100010001000100010055 +:1033700001000100010033362D322D322D32204361 +:1033800072616E6B20616E642063616D00010001EB +:103390000001000100010001000100010001000125 +:1033A0000001000100010001000100010001000115 +:1033B0000001000000000001000100010001000107 +:1033C00000010001000100010001000000000001F7 +:1033D000000000000033362D322D322D32204836C9 +:1033E000204372616E6B206F6E6C790001000100EA +:1033F00001000100010001000100010001000100C5 +:1034000001000100010000000000010000000000B8 +:1034100001000100010001000100010001000100A4 +:103420000100010001000100010000000000010096 +:103430000100010033362D322D322D322048342048 +:103440004372616E6B206F6E6C79000100000001A9 +:103450000000000100000001000000010000000168 +:103460000000000100000001000000010000000059 +:10347000000000000000000000000031322D332069 +:103480006F646462616C6C00000100010001000166 +:103490000001000100010001000100010001000124 :1034A0000001000100010001000100010001000114 :1034B0000001000100010001000100010001000104 :1034C00000010001000100010001000100010001F4 -:1034D00000010001000100010001000100010001E4 -:1034E00000010001000100010001000102030203CC -:1034F00002030203020302030203020302030203A4 -:1035000002030203000100010001000100010001AB +:1034D00000010001000100010001000100010203E0 +:1034E00002030203020302030203020300010001BC +:1034F00000010001000100010001000100010001C4 +:1035000000010001000100010001000100010001B3 :1035100000010001000100010001000100010001A3 :103520000001000100010001000100010001000193 -:103530000001000100010001000100010001000183 -:10354000000100010001020302030001000100016B +:10353000000100010001000102030203000100017B +:103540000001000100010001000100010001000173 :103550000001000100010001000100010001000163 :103560000001000100010001000100010001000153 :103570000001000100010001000100010001000143 :103580000001000100010001000100010001000133 -:103590000001000100010001000100010001000123 -:1035A00002030203020302030203020302030203F3 -:1035B00002030203020302030203020302030203E3 -:1035C00002030001000100010001000100010001EF +:103590000001020302030203020302030203020307 +:1035A00002030203020302030203000100010001FF +:1035B0000001000100010001000100010001000103 +:1035C00000010001000100010001000100010001F3 :1035D00000010001000100010001000100010001E3 -:1035E00000010001000100010001000100010001D3 -:1035F00000010001000100010001020302030001BB +:1035E00000010001000100010001000102030203CB +:1035F00000010001000100010001000100010001C3 :1036000000010001000100010001000100010001B2 :1036100000010001000100010001000100010001A2 :103620000001000100010001000100010001000192 :103630000001000100010001000100010001000182 -:103640000001000100010001000100010001000172 -:10365000000100010203020302030203020302034A -:103660000203020302030203020302030203020332 -:103670000203020302030203020302030203020322 +:10364000000100010001020302030203020302035E +:103650000203020302030203020302030203020342 +:103660000203020302030203000100010001000142 +:103670000001000100010001000100010001000142 :103680000001000100010001000100010001000132 :103690000001000100010001000100010001000122 -:1036A000000100010001000100010001000102030E -:1036B0000203474D204F707469537061726B204C48 -:1036C00054312033363020616E6420380001000010 -:1036D00000000000000001000000000000000000E9 -:1036E00000000000006F6464206669726520393054 -:1036F00020646567207061747465726E203020618B -:103700006E64203133352070756C73657300000072 -:1037100000000001010101446973747269627574EB -:103720006F72207374796C6520342063796C203556 -:1037300030646567206F66662C20343020646567CE -:10374000206F6E0000010001000100010001000176 -:103750000001000100010001000100010001000161 -:103760000001000100010001000100010001000151 -:103770000001000100010001000100010001000141 -:103780000001000100010001000100010001000131 -:103790000001000034302D31206372616E6B206FA8 -:1037A0006E6C792028466F726420563130290000F3 -:1037B0000000000001000000000001000000000007 -:1037C00001000000000001000000000001000000F6 -:1037D00000000100000000000100000000000100E6 -:1037E00000000000010000000000010000000000D7 -:1037F00001000000000000000000000001000000C7 -:1038000000000100000000000100000000000100B5 -:1038100000000000010000000000010000000000A6 -:10382000010000000000010000000000010202028F -:103830000202010000000000010000000000003151 -:10384000322D31206372616E6B207769746820635A -:10385000616D000000010000010000010000010096 -:103860000001000000000001000001020201000050 -:1038700001000001000000362D31206372616E6B83 -:1038800020776974682063616D0000010001000108 -:1038900000010001000100010000382D3120637299 -:1038A000616E6B206F6E6C79202852362900000102 -:1038B0000001000100000001020100010000342DA0 -:1038C00031206372616E6B20776865656C20776963 -:1038D00074682063616D00010001000100010001B6 -:1038E00000010001000100010001000100010001D0 -:1038F00000010001000100010001000100010001C0 -:103900000001000100000032342D31206372616E2D -:103910006B206F6E6C790001000100010001000155 -:10392000000100010001000100010001000100018F -:10393000000100010001000100010001000100017F -:10394000000100010001000100010001000100016F -:10395000000100010001000100010001000000332E -:10396000362D31206372616E6B206F6E6C790001B1 -:10397000000100010001000100010001000100013F +:1036A000020302030001000100010001000100010A +:1036B0000001000100010001000100010001000102 +:1036C00000010001000100010001000100010001F2 +:1036D00000010001000100010001000100010001E2 +:1036E00000010001000100010001000100010001D2 +:1036F00000010001000100010001020302030203B6 +:103700000203020302030203020302030203020391 +:103710000203020302030203020302030203020381 +:103720000203020302030001000100010001000185 +:103730000001000100010001000100010001000181 +:103740000001000100010001000100010001000171 +:103750000001000102030203474D204F70746953BA +:103760007061726B204C54312033363020616E64AE +:1037700020380001000000000000000001000000EF +:1037800000000000000000000000006F646420667C +:1037900069726520393020646567207061747465D2 +:1037A000726E203020616E64203133352070756C6C +:1037B000736573000000000000010101014469739A +:1037C0007472696275746F72207374796C652034D9 +:1037D0002063796C203530646567206F66662C2025 +:1037E000343020646567206F6E0000010001000125 +:1037F00000010001000100010001000100010001C1 +:1038000000010001000100010001000100010001B0 +:1038100000010001000100010001000100010001A0 +:103820000001000100010001000100010001000190 +:103830000001000100010001000034302D3120633F +:1038400072616E6B206F6E6C792028466F726420F7 +:103850005631302900000000000001000000000087 +:103860000100000000000100000000000100000055 +:103870000000010000000000010000000000010045 +:103880000000000001000000000001000000000036 +:103890000100000000000100000000000000000026 +:1038A0000000010000000000010000000000010015 +:1038B0000000000001000000000001000000000006 +:1038C00001000000000001000000000001000000F5 +:1038D00000000102020202020100000000000100DB +:1038E000000000000031322D31206372616E6B20C8 +:1038F000776974682063616D0000000100000100B9 +:1039000000010000010000010000000000010000B3 +:1039100001020201000001000001000000362D310B +:10392000206372616E6B20776974682063616D003B +:103930000001000100010001000100010001000080 +:10394000382D31206372616E6B206F6E6C79202888 +:1039500052362900000100010001000000010201AF +:1039600000010000342D31206372616E6B20776896 +:1039700065656C20776974682063616D00010001E2 :10398000000100010001000100010001000100012F :10399000000100010001000100010001000100011F -:1039A000000100010001000100010001000100010F -:1039B00000010001000100010001000100010001FF -:1039C00000010001000302030203020302030203D9 -:1039D00002030203020302030203020302030203BF -:1039E00002030202020202030203020302030203B1 -:1039F000020302030203020302030203020302039F -:103A0000020302030203020302030203020302038E -:103A1000020302030203020302030203020302037E -:103A2000020302030203020302030203020302036E -:103A30000203020302030203020302030201000164 +:1039A0000001000100010001000100000032342D7F +:1039B00031206372616E6B206F6E6C7900010001C3 +:1039C00000010001000100010001000100010001EF +:1039D00000010001000100010001000100010001DF +:1039E00000010001000100010001000100010001CF +:1039F00000010001000100010001000100010001BF +:103A0000000100000033362D31206372616E6B209F +:103A10006F6E6C79000100010001000100010001DE +:103A2000000100010001000100010001000100018E +:103A3000000100010001000100010001000100017E :103A4000000100010001000100010001000100016E -:103A5000000100010001000100010000000000362B -:103A6000302D32206372616E6B20616E6420276896 -:103A7000616C66206D6F6F6E272063616D000100C1 -:103A8000010001000100010001000100010001002E -:103A9000010001000100010001000100010001001E -:103AA000010001000100010001000100010001000E -:103AB00001000100010001000100010001000100FE -:103AC00001000100010001000100010001000100EE -:103AD00001000100010001000100010001000100DE -:103AE00001000100010001000100010001000100CE -:103AF00001000000000001000100010001000100C0 -:103B000001000100010001000100010001000100AD -:103B1000010001000100010001000100010001009D -:103B2000010001000100010001000100010001008D -:103B3000010001000100010001000100010201007B +:103A5000000100010001000100010001000100015E +:103A60000001000100010001000100030203020344 +:103A7000020302030203020302030203020302031E +:103A80000203020302030203020202020203020310 +:103A900002030203020302030203020302030203FE +:103AA00002030203020302030203020302030203EE +:103AB00002030203020302030203020302030203DE +:103AC00002030203020302030203020302030203CE +:103AD00002030203020302030203020302030203BE +:103AE00002030201000100010001000100010001C8 +:103AF00000010001000100010001000100010001BE +:103B0000000000000036302D32206372616E6B20A1 +:103B1000616E64202768616C66206D6F6F6E272070 +:103B200063616D000100010001000100010001005E +:103B3000010001000100010001000100010001007D :103B4000010001000100010001000100010001006D :103B5000010001000100010001000100010001005D -:103B600001000100010001000100000000003630EA -:103B70002D32206372616E6B20616E642063616D13 -:103B8000000100010001000100010001000100012D -:103B9000000100010001000100010001000100011D -:103BA000000100010001000100010001000100010D -:103BB00000010001000100010001000100010001FD -:103BC00000010001000100010001000100010001ED -:103BD00000010001000100010001000100010001DD -:103BE00000010001000100010001000100010001CD -:103BF00000010001000000000036302D3220637209 -:103C0000616E6B206F6E6C79000100010001000194 -:103C100000382063796C696E6465722064697A7A11 -:103C20007900010001000100362063796C696E643F -:103C300065722064697A7A7900010001003420639A -:103C4000796C696E6465722064697A7A7900000023 -:103C5000000102030406080A0C0E111316191C1F9A -:103C60002326292D3034373B3E4145484B4E515396 -:103C700056585A5C5E606162636464646464636243 -:103C800061605E5C5A585653514E4B4845413E3B2D -:103C90003734302D2926231F1C191613110E0C0A38 -:103CA00008060403020100000000000101020203F3 -:103CB000040507080A0B0D0F11131517191B1E20F9 -:103CC0002325282A2D2F3235373A3C3F4144464997 -:103CD0004B4D4F51535557595A5C5D5F606162625D -:103CE000636364646464646363626261605F5D5CB7 -:103CF0005A59575553514F4D4B494644413F3C3A11 -:103D00003735322F2D2A282523201E1B191715136E -:103D1000110F0D0B0A080705040302020101000040 -:103D2000000000000001010102020304040506076F -:103D300008090A0B0C0D0E0F111213151618191B7A -:103D40001C1E1F2123242628292B2D2F30323435E9 -:103D500037393B3C3E404143454648494B4C4E4F2A -:103D600051525355565758595A5B5C5D5E5F6060BF -:103D7000616262636363646464646464646464630E -:103D8000636362626160605F5E5D5C5B5A59585755 -:103D900056555352514F4E4C4B494846454341406E -:103DA0003E3C3B3937353432302F2D2B2928262401 -:103DB00023211F1E1C1B191816151312110F0E0D8F -:103DC0000C0B0A090807060504040302020101019D -:103DD0000000000000000000250028002B0000006B -:103DE0000000240027002A0004040404040404043E -:103DF0000202020202020303030303030102040896 -:103E00001020408001020408102001020408102044 -:103E10002B2311241FBECFEFD8E0DEBFCDBF14E0AF -:103E2000A0E0B1E0ECEDF4E502C005900D92A23007 -:103E3000B107D9F724E0A2E0B4E001C01D92AB3D88 -:103E4000B207E1F71FE1C9E0DFE104C02197FE01FD -:103E50000E94CA28C830D107C9F70E947F230C945A -:103E60006C2A0C94000090E0FC01E450F24C249188 -:103E70008851924CFC018491882399F090E0880F3E -:103E8000991FFC01E252F24CA591B491FC01EC5255 -:103E9000F24C859194918FB7F894EC91E22BEC93CE -:103EA0008FBF08953FB7F894809124049091250422 -:103EB000A0912604B091270426B5A89B05C02F3FEA -:103EC00019F00196A11DB11D3FBFBA2FA92F982F40 -:103ED0008827BC01CD01620F711D811D911D42E03B -:103EE000660F771F881F991F4A95D1F70895AF92E3 -:103EF000BF92CF92DF92EF92FF920F931F93CF93D7 -:103F0000DF936C017B018B01040F151FEB015E0138 -:103F1000AE18BF08C017D10759F06991D601ED91CD -:103F2000FC910190F081E02DC6010995892B79F76C -:103F3000C501DF91CF911F910F91FF90EF90DF901E -:103F4000CF90BF90AF900895FC01538D448D252FE5 -:103F500030E0842F90E0821B930B541710F0CF9623 -:103F6000089501970895FC01918D828D981761F055 -:103F7000A28DAE0FBF2FB11D5D968C91928D9F5F6C -:103F80009F73928F90E008958FEF9FEF0895FC014B -:103F9000918D828D981731F0828DE80FF11D858DFE -:103FA00090E008958FEF9FEF0895FC01918D228D91 -:103FB000892F90E0805C9F4F821B91098F73992716 -:103FC000089588E294E00E94D51F21E0892B09F42E -:103FD00020E0822F089580E090E0892B29F00E9454 -:103FE000E11F81110C9400000895FC01A48DA80F1D -:103FF000B92FB11DA35ABF4F2C91848D90E001962B -:104000008F739927848FA689B7892C93A089B1894A -:104010008C91837080648C93938D848D981306C0EB -:104020000288F389E02D80818F7D80830895EF924F -:10403000FF920F931F93CF93DF93EC0181E0888F62 -:104040009B8D8C8D98131AC0E889F989808185FF32 -:1040500015C09FB7F894EE89FF896083E889F989D4 -:1040600080818370806480839FBF81E090E0DF91D6 -:10407000CF911F910F91FF90EF900895F62E0B8D29 -:1040800010E00F5F1F4F0F731127E02E8C8D8E11E4 -:104090000CC00FB607FCFACFE889F989808185FF4B -:1040A000F5CFCE010E94F51FF1CFEB8DEC0FFD2F68 -:1040B000F11DE35AFF4FF0829FB7F8940B8FEA8906 -:1040C000FB8980818062CFCFCF93DF93EC01888D15 -:1040D0008823B9F0AA89BB89E889F9898C9185FD83 -:1040E00003C0808186FD0DC00FB607FCF7CF8C9111 -:1040F00085FFF2CF808185FFEDCFCE010E94F51FB5 -:10410000E9CFDF91CF910895CF93DF93382FC091FE -:10411000CA048CE0C89FE0011124CD5FDE4F832FDD -:104120006A3071058105910520F46AE070E080E055 -:1041300090E00E9471292C813D814E815F810E9417 -:10414000FF299B01AC0160E074E284EF9AE40E94D5 -:10415000D0280E94422961157105810521E092074E -:1041600038F56115710520E48207910520F5611588 -:10417000710528E08207910508F56115710521E0B8 -:1041800082079105F0F430E021E004C09695879510 -:10419000779567953A95D2F7709301016093000186 -:1041A0002093090481E080930804DF91CF91089562 -:1041B0003AE025E0EACF38E024E0E7CF36E023E03C -:1041C000E4CF33E022E0E1CFFC0101900020E9F7E9 -:1041D0003197AF01481B590BBC0188E294E00C9465 -:1041E000771F8F929F92AF92BF920F931F93CF939F -:1041F000DF93CDB7DEB7A1970FB6F894DEBF0FBE41 -:10420000CDBF19A2423008F44AE08E010F5D1F4F66 -:10421000842E912CB12CA12CA50194010E948528FB -:10422000E62FB901CA01EA30F4F4E05DD801EE935B -:104230008D01232B242B252B79F790E080E010971C -:1042400019F0CD010E94E420A1960FB6F894DEBFCC -:104250000FBECDBFDF91CF911F910F91BF90AF9057 -:104260009F908F900895E95CE1CFCF93DF930E94F8 -:10427000E420EC018DEF93E00E94E4208C0F9D1F61 -:10428000DF91CF910895CF93DF93BC0190E080E060 -:104290004AE00E94F120EC018DEF93E00E94E420BF -:1042A0008C0F9D1FDF91CF9108951F93CF93DF93C4 -:1042B000EC01162F0E946428181739F0612FCE01E7 -:1042C000DF91CF911F910C946C28DF91CF911F91BA -:1042D00008951F93CF93DF93C9ECD4E0698182E006 -:1042E00090E00E9455216A8183E090E00E94552170 -:1042F00062E081E090E00E945521E9E1F4E0148160 -:10430000658184E090E00E945521612F85E090E076 -:104310000E9455211B816C818CE090E00E94552108 -:10432000612F8DE090E00E9455211D816E8186E015 -:1043300090E00E945521612F87E090E00E94552176 -:104340001F81688588E090E00E945521612F89E0F7 -:1043500090E00E94552119856A858AE090E00E94CC -:104360005521612F8BE090E00E9455216B858EE0F6 -:1043700090E00E9455216C858FE090E00E945521CD -:104380001D856E8580E190E00E945521612F81E1BD -:1043900090E00E9455211F85688982E190E00E948B -:1043A0005521612F83E190E0DF91CF911F910C9413 -:1043B00055210C9464281F920F920FB60F9211246E -:1043C0002F933F938F939F93AF93BF93809120043C -:1043D00090912104A0912204B091230430911F04F4 -:1043E00023E0230F2D3758F50196A11DB11D209311 -:1043F0001F048093200490932104A0932204B0937F -:1044000023048091240490912504A0912604B09166 -:1044100027040196A11DB11D8093240490932504C7 -:10442000A0932604B0932704BF91AF919F918F91E1 -:104430003F912F910F900FBE0F901F90189526E877 -:10444000230F0296A11DB11DD2CF1F920F920FB65E -:104450000F9211242F933F934F935F936F937F930A -:104460008F939F93AF93BF93EF93FF9388E294E072 -:104470000E94F51FFF91EF91BF91AF919F918F9196 -:104480007F916F915F914F913F912F910F900FBE50 -:104490000F901F9018951F920F920FB60F92112434 -:1044A0002F938F939F93EF93FF93E0913804F091B4 -:1044B00039048081E0913E04F0913F0482FD1BC0ED -:1044C0009081809141048F5F8F7320914204821705 -:1044D00041F0E0914104F0E0E85DFB4F958F80935F -:1044E0004104FF91EF919F918F912F910F900FBEFB -:1044F0000F901F9018958081F4CF1F920F920FB6E6 -:104500000F9211240F931F932F933F934F935F9319 -:104510006F937F938F939F93AF93BF93EF93FF938B -:1045200080910A0490910B04A091CA042CE0A29FF0 -:10453000D0011124AD5FBE4F1296ED91FC911397FF -:10454000E80FF91FE49180910704E827E5B980910D -:104550000A0490910B04019690930B0480930A0433 -:1045600080910A0490910B0418962D913C91281784 -:10457000390721F510920B0410920A040E94521F71 -:104580000091C5041091C6042091C7043091C8045D -:10459000601B710B820B930B60930E0470930F04DE -:1045A00080931004909311040E94521F6093C504DD -:1045B0007093C6048093C7049093C8048091080444 -:1045C000882371F080918100887F80938100909191 -:1045D000090480918100892B809381001092080446 -:1045E000809100019091010190938900809388004F -:1045F000FF91EF91BF91AF919F918F917F916F91BB -:104600005F914F913F912F911F910F910F900FBE8E -:104610000F901F9018951F920F920FB60F921124B2 -:104620008F939F938091060481110EC09091780022 -:104630008091790089279827892790931704809380 -:10464000160481E0809318049F918F910F900FBE04 -:104650000F901F901895E8E2F4E01382128288EE22 -:1046600093E0A0E0B0E084839583A683B7838FEEC8 -:1046700093E09183808385EC90E09587848784EC38 -:1046800090E09787868780EC90E0918B808B81EC1F -:1046900090E0938B828B82EC90E0958B848B86EC00 -:1046A00090E0978B868B118E128E138E148EE9EC10 -:1046B000F4E084E3818384EC99E0948383838AEF3C -:1046C00090E09683858380EA9FE09087878388EED9 -:1046D00093E0928781871386148680E991E096871C -:1046E0008587108A1786118A0E94521F6093C5041D -:1046F0007093C6048093C7049093C8040895CF9321 -:10470000DF93CDB7DEB7C055D1090FB6F894DEBF41 -:104710000FBECDBF789484B5826084BD84B58160BE -:1047200084BD85B5826085BD85B5816085BD80917C -:104730006E00816080936E001092810080918100F4 -:1047400082608093810080918100816080938100EC -:10475000809180008160809380008091B1008460AE -:104760008093B1008091B00081608093B00080910F -:104770007A00846080937A0080917A0082608093CE -:104780007A0080917A00816080937A0080917A002B -:10479000806880937A001092C10012E01093C904DF -:1047A00081E090E00E94D9218F3F09F08CC185E023 -:1047B0008093CA0488EB9BE090931E0480931D04B1 -:1047C00090931A04809319041093CB048CEA9DE013 -:1047D0009093CD048093CC0480E797E19093D1042B -:1047E0008093D00488EE93E09093CF048093CE041E -:1047F0009093D3048093D2041092D40483E08093E6 -:10480000D50480E991E09093D7048093D604109268 -:10481000D9041092D8040E946921E0913804F091E3 -:10482000390482E08083E0913404F09135041082F1 -:10483000E0913604F091370480E1808310924004C7 -:10484000E0913C04F0913D0486E08083E0913A04DD -:10485000F0913B04808180618083E0913A04F09183 -:104860003B04808188608083E0913A04F0913B04AE -:10487000808180688083E0913A04F0913B048081DC -:104880008F7D808310920D04F89410928000109216 -:104890008100109285001092840088EE93E090933E -:1048A00089008093880080918100886080938100D6 -:1048B0008091810081608093810080916F0082608F -:1048C00080936F001092B0001092B1001092B2006D -:1048D00089EF8093B3008091B00082608093B00034 -:1048E0008091B10084608093B10080917C008F7DC5 -:1048F00080937C0080917C00806480937C00809118 -:104900007C00807F80937C0080917A008068809317 -:104910007A0080917A00806280937A0080917B0097 -:10492000887F80937B0080917A00876080937A00F3 -:1049300080917A00886080937A0088E00E94331F1B -:1049400089E00E94331F8AE00E94331F8BE00E949F -:10495000331F789480917A00806480937A0060910C -:104960001D0470911E0490E080E00E9484200AE5FE -:10497000802E912C1CE0F12EEE24E394009119047A -:1049800010911A0488E294E00E94D51F18161906A7 -:1049900014F580910D04811106C088E294E00E9414 -:1049A000B31F80930C0480910C04833509F47BC2FF -:1049B00008F090C18E3409F4F6C108F080C1833448 -:1049C00009F4BEC1E3E0CE2EE1E0DE2E8C3409F422 -:1049D000CAC110920D048091CB04823009F0A8C2A4 -:1049E00080911804882389F010921804009116040D -:1049F0001091170474E0000F111F7A95E1F7093246 -:104A000063E2160710F008E213E210931A04009311 -:104A100019048091D6049091D7048017910708F467 -:104A200044C38091D404882309F43FC380910E04C9 -:104A300090910F04A0911004B0911104892B8A2B3E -:104A40008B2B09F4C5C20E94521F2091C5043091DE -:104A5000C6044091C7045091C8045B016C01A21ABE -:104A6000B30AC40AD50AA6019501E091CA04FE9EC4 -:104A7000F0011124ED5FFE4F82859385803D9240C9 -:104A800021F4220F331F441F551FA0900E04B09035 -:104A90000F04C0901004D0901104A8E6B1E00E9469 -:104AA0007A28A60195010E9485288091D8049091CA -:104AB000D904820F931F8936E1E09E0708F48AC269 -:104AC00088569140F8CF82E090E00E94D921A82E2C -:104AD0008093CA0483E090E00E94D921B82E80938D -:104AE000CB0484E090E00E94D921C82E85E090E0BC -:104AF0000E94D921DC2CC82ED0921E04C0921D0425 -:104B00008CE090E00E94D921182F8DE090E00E9467 -:104B1000D921912F893223E2920710F088E293E2A3 -:104B20008436910510F484E690E09093CD04809350 -:104B3000CC0486E090E00E94D921E82E87E090E046 -:104B40000E94D921FE2CE82E49E2E41643E2F40645 -:104B500020F048E2E42E43E2F42E64E6E616F10487 -:104B600018F434E6E32EF12CF092CF04E092CE0458 -:104B700088E090E00E94D921082F89E090E00E940F -:104B8000D921102F082F093283E2180710F008E20C -:104B900013E20436110510F404E610E01093D1047A -:104BA0000093D0048AE090E00E94D921982E8BE0F7 -:104BB00090E00E94D921992D8131E7E29E0710F003 -:104BC00080E197E2883C910510F488EC90E09093A6 -:104BD000D3048093D204E016F10630F00456110994 -:104BE0001093CF040093CE048EE090E00E94D92170 -:104BF00091E0811101C090E09093D4048FE090E0A7 -:104C00000E94D921F82E8093D50480E190E00E9483 -:104C1000D921082F81E190E00E94D921102F082F7F -:104C20001093D7040093D60482E190E00E94D9212A -:104C3000E82E83E190E00E94D9219E2D9093D90423 -:104C40008093D804FDE3FA1518F425E02093CA04F4 -:104C500022E0A22EAB1418F421E02093CB0429E922 -:104C6000C2162AE3D20630F020EA3FE030931E0459 -:104C700020931D042091190430911A0429393A43D4 -:104C800030F020EA3FE030931A042093190465E0E5 -:104C90006F1518F423E02093D504093E134030F03B -:104CA00020E931E03093D7042093D6048836914030 -:104CB00008F4B3CD1092D9041092D804AECD80354B -:104CC00009F478C0823509F084CE80911D0490915A -:104CD0001E0433C08E3609F45AC0E8F4883509F44E -:104CE000FFC0833609F075CE88E294E00E94D51F9C -:104CF0004197D0F3BAECCB2EB4E0DB2E88E294E0FF -:104D00000E94B31FF60181936F01FBEDCF16F4E013 -:104D1000DF06A1F75ECE823709F486C0833709F437 -:104D2000BFC0803709F055CEE091CA04FE9EF00165 -:104D30001124ED5FFE4F808591850E94432149CE6D -:104D4000A9ECCA2EA4E0DA2EF60161916F0188E287 -:104D500094E00E941720FBEDAF2EF4E0BF2EAC14C0 -:104D6000BD0491F736CEF60160817181CE010196C6 -:104D70000E945D28CE0101960E943521FCE0CF0EF5 -:104D8000D11C2BEEC21623E0D20669F722CE4AE0F0 -:104D90006EE370E080E090E00E94F1208DEF93E000 -:104DA0000E94E42016CE6091CA0470E090E080E09A -:104DB0004AE0F2CFD12CC12CE091CA04FE9EF00152 -:104DC0001124ED5FFE4F80859185C816D906F0F459 -:104DD000C114D10421F080E094E00E94E420E0912D -:104DE000CA04FE9EF0011124ED5FFE4F0280F381A4 -:104DF000E02DEC0DFD1D649170E090E080E04AE054 -:104E00000E94F1204FEFC41AD40AD6CF8FEF93E05F -:104E10000E943521E091CA04FE9EF0011124ED5F4D -:104E2000FE4F8285938589CF1092CB0488E294E06F -:104E30000E94D51F0697D4F388E294E00E94B31F26 -:104E4000D82E88E294E00E94B31F782E612CC30113 -:104E50008D299093CF048093CE0488E294E00E9441 -:104E6000B31FD82E88E294E00E94B31F582E412C25 -:104E7000C2018D299093D1048093D00488E294E0FC -:104E80000E94B31FD82E88E294E00E94B31F382EF0 -:104E9000212CC1018D299093D3048093D20499CD04 -:104EA0000E94692196CD88E294E00E94D51F1816D1 -:104EB0001906CCF788E294E00E94B31F8E3308F005 -:104EC00088CD8093CA0460911D0470911E0490E007 -:104ED00080E00E94842010920B0410920A0479CD85 -:104EE0008091CA048D3301F51092CA0460911D04AB -:104EF00070911E0490E080E00E94842010920B04C8 -:104F000010920A04E091CA04FE9EF0011124ED5FA4 -:104F1000FE4F60817181CE0101960E945D28CE0115 -:104F200001960E94352155CD8F5F8093CA04DECF54 -:104F3000811146C00E94521FAB01BC012091D204D6 -:104F40003091D3048091120490911304A091140421 -:104F5000B0911504820F931FA11DB11D84179507F1 -:104F6000A607B70708F051CD0E94521F60931204A4 -:104F70007093130480931404909315040091190402 -:104F800010911A0480910201813069F40F5F1F4F64 -:104F90008091D0049091D1040817190708F435CDF9 -:104FA0001092020132CD015011098091CE049091EE -:104FB000CF048017910708F428CDE092020125CD97 -:104FC000813009F022CD0091CC041091CD041DCD8B -:104FD00090E080E02091D504233019F038F421309E -:104FE00081F064EB70E00E94B6280DC0243079F0A7 -:104FF0002530B9F7B4010E94B628FC01E25BF34CFE -:105000000DC096958795FC01E05EF24C07C068E7FD -:1050100070E00E94B628FC01E855F34CE4916E2F35 -:1050200070E08091DA04882389F00F38F2E01F07DE -:1050300068F4069FC001079F900D169F900D1124E4 -:105040006091D6047091D7040E94B628601771074A -:1050500078F570931C0460931B0480911B0490915D -:105060001C04081B190B0A30110580F080911D04E7 -:1050700090911E040817190729F0B80190E080E00C -:105080000E94842010931E0400931D0480E0A82E2B -:1050900080E0B82EAB2809F471CC0E94E11F882370 -:1050A00009F46ACC0E94000065CC70E060E0CECFCD -:1050B00010921C0410921B04D0CFFB01DC01059060 -:1050C0000D920020E1F70895F999FECF92BD81BDC0 -:1050D000F89A992780B50895262FF999FECF1FBA1F -:1050E00092BD81BD20BD0FB6F894FA9AF99A0FBE11 -:1050F000019608950E94A728A59F900DB49F900D3A -:10510000A49F800D911D11240895A1E21A2EAA1BBF -:10511000BB1BFD010DC0AA1FBB1FEE1FFF1FA21767 -:10512000B307E407F50720F0A21BB30BE40BF50B64 -:10513000661F771F881F991F1A9469F760957095ED -:10514000809590959B01AC01BD01CF010895A29F70 -:10515000B001B39FC001A39F700D811D1124911D4B -:10516000B29F700D811D1124911D0895AA1BBB1BB8 -:1051700051E107C0AA1FBB1FA617B70710F0A61B57 -:10518000B70B881F991F5A95A9F780959095BC0178 -:10519000CD010895EE0FFF1F0590F491E02D0994C5 -:1051A0000E94E4280C94C5290E94BE2958F00E9450 -:1051B000B72940F029F45F3F29F00C94AE29511132 -:1051C0000C94F9290C94B4290E94D62968F39923E8 -:1051D000B1F3552391F3951B550BBB27AA276217F3 -:1051E0007307840738F09F5F5F4F220F331F441F00 -:1051F000AA1FA9F335D00E2E3AF0E0E832D0915034 -:105200005040E695001CCAF72BD0FE2F29D0660F20 -:10521000771F881FBB1F261737074807AB07B0E863 -:1052200009F0BB0B802DBF01FF2793585F4F3AF069 -:105230009E3F510578F00C94AE290C94F9295F3FFC -:10524000E4F3983ED4F3869577956795B795F795EF -:105250009F5FC9F7880F911D9695879597F90895D7 -:10526000E1E0660F771F881FBB1F62177307840773 -:10527000BA0720F0621B730B840BBA0BEE1F88F782 -:10528000E09508950E94DE2988F09F5798F0B92F85 -:105290009927B751B0F0E1F0660F771F881F991F6B -:1052A0001AF0BA95C9F714C0B13091F00E94F829EC -:1052B000B1E008950C94F829672F782F8827B85FFC -:1052C00039F0B93FCCF3869577956795B395D9F7C3 -:1052D0003EF490958095709561957F4F8F4F9F4FCD -:1052E0000895E89409C097FB3EF4909580957095D9 -:1052F00061957F4F8F4F9F4F9923A9F0F92F96E922 -:10530000BB279395F695879577956795B795F11196 -:10531000F8CFFAF4BB0F11F460FF1BC06F5F7F4F33 -:105320008F4F9F4F16C0882311F096E911C0772345 -:1053300021F09EE8872F762F05C0662371F096E84E -:10534000862F70E060E02AF09A95660F771F881F1D -:10535000DAF7880F9695879597F9089597F99F67DB -:1053600080E870E060E008959FEF80EC08950024ED -:105370000A941616170618060906089500240A94BA -:1053800012161306140605060895092E0394000C40 -:1053900011F4882352F0BB0F40F4BF2B11F460FFCF -:1053A00004C06F5F7F4F8F4F9F4F089557FD9058F8 -:1053B000440F551F59F05F3F71F04795880F97FBD9 -:1053C000991F61F09F3F79F0879508951216130693 -:1053D0001406551FF2CF4695F1DF08C016161706C2 -:1053E0001806991FF1CF86957105610508940895F7 -:1053F000E894BB2766277727CB0197F908950E9489 -:10540000122A0C94C5290E94B72938F00E94BE299F -:1054100020F0952311F00C94AE290C94B42911249A -:105420000C94F9290E94D62970F3959FC1F3950F2A -:1054300050E0551F629FF001729FBB27F00DB11D18 -:10544000639FAA27F00DB11DAA1F649F6627B00DA8 -:10545000A11D661F829F2227B00DA11D621F739F91 -:10546000B00DA11D621F839FA00D611D221F749F9F -:105470003327A00D611D231F849F600D211D822FE6 -:10548000762F6A2F11249F5750409AF0F1F088230D -:105490004AF0EE0FFF1FBB1F661F771F881F91503A -:1054A0005040A9F79E3F510580F00C94AE290C9412 -:1054B000F9295F3FE4F3983ED4F386957795679595 -:1054C000B795F795E7959F5FC1F7FE2B880F911D64 -:0C54D0009695879597F90895F894FFCF02 -:1054DC008813013D3C393C0A85083D0400680128CD -:1054EC003C223CCDCC4C3D06006801113C093C48AB -:1054FC008A883D08006801F93B813B0000803F78B9 -:10550C000068016E3B7E3A0000803FF000D0025FE5 -:10551C003A6F390000803FF000D0025F3917399A9A -:10552C0099193F480068010739D7380000003F300F -:10553C00006801BE38AE38488A883D1000D0029A07 -:10554C00388A38A987083E10006801773853389A92 -:10555C0099193E2400D0023F38AF379A99193F90E1 -:10556C0000D00294374437E3AA2A3F500068011751 -:10557C00370E379A99193E0900D002E536CD36CD53 -:10558C00CC4C3E18006801B236E23300004040D0EB -:10559C0002D002D533A533CDCCCC3E300068018E81 -:1055AC003346339A99193F480068012F33E7329AF2 -:1055BC0099193F48006801D03240329A99193F90AE -:1055CC0000D0022C32E4319A99193F48006801CC82 -:1055DC00313C319A99193F9000D002233193309A83 -:1055EC0099193F9000D0027B302B303BAAAA3E5039 -:1055FC0000D0021630462D0000C040D002D0022E42 -:10560C002D3E2C0000803FF000D002202CD82B9A8D -:10561C0099193F48006801C42B942BCDCC4C3E30DB -:10562C0000D002692BD92A9A99193F9000D002B068 -:10563C002AE02700004040D002D002B727E7240020 -:10564C00004040D002D002BE24EE2100004040D0E9 -:10565C0002D002CA213A219A99993F9000D0021F98 -:10566C00214F1E00004040D002D002331E631B00AD -:10567C00004040D002D002371BEF1A9A99993E484D -:10568C0000D002B91A791AF888883E4000D002522C -:10569C001A4A1A0A85883D0800D002231A171ACD17 -:1056AC00CCCC3D0C00D002F019E019A987083E10B3 -:1056BC0000D002BA19DA1700008040E001D002BA1B -:1056CC001752160000C03F6801D0022C169C159A88 -:1056DC0099193F9000D0027F1547110000C03F3848 -:1056EC0004D0023011A0109A99193F9000D0028B6F -:1056FC00106D100000803F1E00D0024610B60FCD7A -:10570C00CC4C3F90006801AA0F1A0F9A99193F9040 -:10571C0000D002010F710E9A99193F9000D00258D7 -:10572C000EC80D9A99193F9000D002AF0DDF0A00F8 -:10573C00004040D002D002D90A250A8941C03FB4AA -:10574C0000D0021C0A8C099A99193F9000D0028152 -:10575C0009B10600004040D002D002A10611069A01 -:10576C0099193F9000D00205067505FA7EAA3E9065 -:10577C0000D0026805D804FA7EAA3E9000D002CA76 -:10578C000482049A99193F480068017804100300B8 -:10579C0000C03F6801D002080318020000803FF0EF -:1057AC0000D002FE010E010000803FF000D002F894 -:1057BC000068009A99193F9000D002000000001771 -:1057CC0020771FA41F6420D51FB31FC71F0D0A000D -:0257DC002C009F +:103B6000010001000100010001000100010001004D +:103B7000010001000100010001000100010001003D +:103B8000010001000100010001000100010001002D +:103B9000010001000100010000000000010001001F +:103BA000010001000100010001000100010001000D +:103BB00001000100010001000100010001000100FD +:103BC00001000100010001000100010001000100ED +:103BD00001000100010001000100010001000100DD +:103BE00001000102010001000100010001000100CB +:103BF00001000100010001000100010001000100BD +:103C000001000100010001000100010001000100AC +:103C10000000000036302D32206372616E6B20612F +:103C20006E642063616D000100010001000100016C +:103C3000000100010001000100010001000100017C +:103C4000000100010001000100010001000100016C +:103C5000000100010001000100010001000100015C +:103C6000000100010001000100010001000100014C +:103C7000000100010001000100010001000100013C +:103C8000000100010001000100010001000100012C +:103C900000010001000100010001000000000036E9 +:103CA000302D32206372616E6B206F6E6C79000173 +:103CB00000010001000100382063796C696E6465C1 +:103CC000722064697A7A79000100010001003620CF +:103CD00063796C696E6465722064697A7A7900012F +:103CE000000100342063796C696E64657220646938 +:103CF0007A7A79000000000102030406080A0C0E1B +:103D0000111316191C1F2326292D3034373B3E4131 +:103D100045484B4E515356585A5C5E60616263642D +:103D200064646464636261605E5C5A585653514EC9 +:103D30004B4845413E3B3734302D2926231F1C1963 +:103D40001613110E0C0A08060403020100000000FD +:103D5000000101020203040507080A0B0D0F1113ED +:103D60001517191B1E202325282A2D2F3235373AE7 +:103D70003C3F414446494B4D4F51535557595A5C6E +:103D80005D5F606162626363646464646463636210 +:103D90006261605F5D5C5A59575553514F4D4B49B5 +:103DA0004644413F3C3A3735322F2D2A28252320DF +:103DB0001E1B19171513110F0D0B0A080705040315 +:103DC00002020101000000000000000101010202E6 +:103DD00003040405060708090A0B0C0D0E0F111247 +:103DE00013151618191B1C1E1F2123242628292BE6 +:103DF0002D2F3032343537393B3C3E404143454628 +:103E000048494B4C4E4F51525355565758595A5B8F +:103E10005C5D5E5F6060616262636363646464648E +:103E2000646464646463636362626160605F5E5D76 +:103E30005C5B5A59585756555352514F4E4C4B494B +:103E40004846454341403E3C3B3937353432302FBC +:103E50002D2B2928262423211F1E1C1B191816155B +:103E60001312110F0E0D0C0B0A09080706050404A6 +:103E70000302020101010000000000000000250013 +:103E800028002B0000000000240027002A00040462 +:103E900004040404040402020202020203030303F2 +:103EA00003030102040810204080010204081020CE +:103EB000010204081020FE2311241FBECFEFD8E01A +:103EC000DEBFCDBF14E0A0E0B1E0E6E9F6E502C058 +:103ED00005900D92AE30B107D9F724E0AEE0B4E022 +:103EE00001C01D92A93EB207E1F71FE1CCE5DFE179 +:103EF00004C02197FE010E94432BCB35D107C9F79F +:103F00000E9453240C94492B0C94000090E0FC0177 +:103F1000EE55F14C24918257914CFC0184918823F9 +:103F200099F090E0880F991FFC01EC57F14CA59196 +:103F3000B491FC01E658F14C859194918FB7F894B7 +:103F4000EC91E22BEC938FBF08953FB7F8948091EA +:103F5000310490913204A0913304B091340426B519 +:103F6000A89B05C02F3F19F00196A11DB11D3FBFB1 +:103F7000BA2FA92F982F8827BC01CD01620F711D80 +:103F8000811D911D42E0660F771F881F991F4A957A +:103F9000D1F70895AF92BF92CF92DF92EF92FF9246 +:103FA0000F931F93CF93DF936C017B018B01040F61 +:103FB000151FEB015E01AE18BF08C017D10759F0FD +:103FC0006991D601ED91FC910190F081E02DC6013F +:103FD0000995892B79F7C501DF91CF911F910F9139 +:103FE000FF90EF90DF90CF90BF90AF900895FC01CD +:103FF000538D448D252F30E0842F90E0821B930B4E +:10400000541710F0CF96089501970895FC01918DF3 +:10401000828D981761F0A28DAE0FBF2FB11D5D96F6 +:104020008C91928D9F5F9F73928F90E008958FEF98 +:104030009FEF0895FC01918D828D981731F0828D4C +:10404000E80FF11D858D90E008958FEF9FEF0895A3 +:10405000FC01918D228D892F90E0805C9F4F821B07 +:1040600091098F739927089585E394E00E94282091 +:1040700021E0892B09F420E0822F089580E090E070 +:10408000892B29F00E94342081110C94000008959E +:10409000FC01A48DA80FB92FB11DA35ABF4F2C91BD +:1040A000848D90E001968F739927848FA689B789B4 +:1040B0002C93A089B1898C91837080648C93938DAB +:1040C000848D981306C00288F389E02D80818F7D4E +:1040D00080830895EF92FF920F931F93CF93DF9306 +:1040E000EC0181E0888F9B8D8C8D98131AC0E88934 +:1040F000F989808185FF15C09FB7F894EE89FF8903 +:104100006083E889F98980818370806480839FBFA0 +:1041100081E090E0DF91CF911F910F91FF90EF90A0 +:104120000895F62E0B8D10E00F5F1F4F0F731127B0 +:10413000E02E8C8D8E110CC00FB607FCFACFE889EB +:10414000F989808185FFF5CFCE010E944820F1CF0B +:10415000EB8DEC0FFD2FF11DE35AFF4FF0829FB75F +:10416000F8940B8FEA89FB8980818062CFCFCF934F +:10417000DF93EC01888D8823B9F0AA89BB89E8898F +:10418000F9898C9185FD03C0808186FD0DC00FB635 +:1041900007FCF7CF8C9185FFF2CF808185FFEDCFB3 +:1041A000CE010E944820E9CFDF91CF910895CF93AF +:1041B000DF93382FC091D7048CE0C89FE001112411 +:1041C000CD5FDE4F832F6A3071058105910520F4A4 +:1041D0006AE070E080E090E00E94342A2C813D810A +:1041E0004E815F810E94C22A9B01AC0160E074E2B3 +:1041F00084EF9AE40E9493290E94052A61157105B3 +:10420000810521E0920738F56115710520E48207E8 +:10421000910520F56115710528E08207910508F5E3 +:104220006115710521E082079105F0F430E021E08D +:1042300004C096958795779567953A95D2F77093D0 +:104240000101609300012093160481E0809315041E +:10425000DF91CF9108953AE025E0EACF38E024E0FD +:10426000E7CF36E023E0E4CF33E022E0E1CF609116 +:104270002A0470912B0490E080E00E94D7201092D5 +:104280001804109217041092E104E091D7048CE016 +:10429000E89FF0011124ED5FFE4F4085518520E03D +:1042A000DF011296809117049091180484179507E6 +:1042B000B8F48091170490911804ED91FC91119736 +:1042C000E80FF91FE491EA3008F021E0809117042B +:1042D0009091180401969093180480931704E2CFEC +:1042E0002093E10410921804109217040895FC0121 +:1042F00001900020E9F73197AF01481B590BBC0131 +:1043000085E394E00C94CA1F8F929F92AF92BF9264 +:104310000F931F93CF93DF93CDB7DEB7A1970FB65F +:10432000F894DEBF0FBECDBF19A2423008F44AE0B8 +:104330008E010F5D1F4F842E912CB12CA12CA50155 +:1043400094010E946229E62FB901CA01EA30F4F40F +:10435000E05DD801EE938D01232B242B252B79F7DB +:1043600090E080E0109719F0CD010E947721A1968E +:104370000FB6F894DEBF0FBECDBFDF91CF911F9176 +:104380000F91BF90AF909F908F900895E95CE1CF1F +:10439000CF93DF930E947721EC0189E094E00E94A3 +:1043A00077218C0F9D1FDF91CF910895CF93DF93DD +:1043B000BC0190E080E04AE00E948421EC0189E0A9 +:1043C00094E00E9477218C0F9D1FDF91CF9108957B +:1043D0001F93CF93DF93EC01162F0E9441291817EA +:1043E00039F0612FCE01DF91CF911F910C944929B3 +:1043F000DF91CF911F9108951F93CF93DF93C6ED67 +:10440000D4E0698182E090E00E94E8216A8183E043 +:1044100090E00E94E82162E081E090E00E94E821C3 +:10442000E6E2F4E01481658184E090E00E94E821F6 +:10443000612F85E090E00E94E8211B816C818CE077 +:1044400090E00E94E821612F8DE090E00E94E82139 +:104450001D816E8186E090E00E94E821612F87E057 +:1044600090E00E94E8211F81688588E090E00E942A +:10447000E821612F89E090E00E94E82119856A8592 +:104480008AE090E00E94E821612F8BE090E00E949A +:10449000E8216C858EE090E00E94E8216D858FE038 +:1044A00090E00E94E8211E856F8580E190E00E94E7 +:1044B000E821612F81E190E00E94E8211889698953 +:1044C00082E190E00E94E821612F83E190E00E9468 +:1044D000E8216B8584E190E0DF91CF911F910C94EE +:1044E000E8210C9441291F920F920FB60F921124CC +:1044F0002F933F938F939F93AF93BF9380912D04FE +:1045000090912E04A0912F04B091300430912C048E +:1045100023E0230F2D3758F50196A11DB11D2093DF +:104520002C0480932D0490932E04A0932F04B09319 +:1045300030048091310490913204A0913304B09101 +:1045400034040196A11DB11D80933104909332046F +:10455000A0933304B0933404BF91AF919F918F9196 +:104560003F912F910F900FBE0F901F90189526E846 +:10457000230F0296A11DB11DD2CF1F920F920FB62D +:104580000F9211242F933F934F935F936F937F93D9 +:104590008F939F93AF93BF93EF93FF9385E394E043 +:1045A0000E944820FF91EF91BF91AF919F918F9111 +:1045B0007F916F915F914F913F912F910F900FBE1F +:1045C0000F901F9018951F920F920FB60F92112403 +:1045D0002F938F939F93EF93FF93E0914504F09176 +:1045E00046048081E0914B04F0914C0482FD1BC095 +:1045F000908180914E048F5F8F7320914F048217BA +:1046000041F0E0914E04F0E0EB5CFB4F958F80931E +:104610004E04FF91EF919F918F912F910F900FBEBC +:104620000F901F9018958081F4CF1F920F920FB6B4 +:104630000F9211240F931F932F933F934F935F93E8 +:104640006F937F938F939F93AF93BF93CF93DF939A +:10465000EF93FF934091D7042CE0429FF001112487 +:10466000ED5FFE4F0280F381E02D8091E104811126 +:1046700076C08091170490911804E80FF91FE49117 +:1046800080911404E827E5B98091170490911804EB +:1046900001969093180480931704809117049091C9 +:1046A00018042CE0429FF0011124ED5FFE4F20859D +:1046B00031852817390721F5109218041092170434 +:1046C0000E94A51F0091D2041091D3042091D4041C +:1046D0003091D504601B710B820B930B60931B040C +:1046E00070931C0480931D0490931E040E94A51FC8 +:1046F0006093D2047093D3048093D4049093D50430 +:1047000080911504882371F080918100887F8093C7 +:1047100081009091160480918100892B8093810003 +:1047200010921504809100019091010190938900ED +:1047300080938800FF91EF91DF91CF91BF91AF916E +:104740009F918F917F916F915F914F913F912F91A9 +:104750001F910F910F900FBE0F901F901895809191 +:10476000170490911804E80FF91FE4912E2F30E000 +:104770002A303105D4F0E0911404CAE0D0E0C90138 +:10478000BE010E942F2BCB01BE010E942F2BE827D8 +:10479000E5B92B3031051CF02A503109FACF8CE1F4 +:1047A000289F202D11242BB96FCF8CE1E89FE02D9D +:1047B0001124EBB98091140485B966CF1F920F9232 +:1047C0000FB60F9211248F939F9380911304811140 +:1047D0000EC09091780080917900892798278927C9 +:1047E000909324048093230481E0809325049F9177 +:1047F0008F910F900FBE0F901F901895E5E3F4E096 +:104800001382128288EE93E0A0E0B0E08483958367 +:10481000A683B7838BEF93E09183808385EC90E050 +:104820009587848784EC90E09787868780EC90E07A +:10483000918B808B81EC90E0938B828B82EC90E06B +:10484000958B848B86EC90E0978B868B118E128EE5 +:10485000138E148EE6EDF4E084E3818384EC99E01A +:10486000948383838AEF90E09683858380EA9FE038 +:104870009087878388EE93E09287818713861486DA +:10488000158680E991E097878687118A108A128AB7 +:104890000E94A51F6093D2047093D3048093D40424 +:1048A0009093D5040895CF93DF93CDB7DEB7C0556D +:1048B000D1090FB6F894DEBF0FBECDBF789484B592 +:1048C000826084BD84B5816084BD85B5826085BD0C +:1048D00085B5816085BD80916E00816080936E009A +:1048E000109281008091810082608093810080918C +:1048F000810081608093810080918000816080933D +:1049000080008091B10084608093B1008091B000FC +:1049100081608093B00080917A00846080937A00F7 +:1049200080917A00826080937A0080917A00816021 +:1049300080937A0080917A00806880937A00109248 +:10494000C10012E01093D60481E090E00E94712231 +:104950008F3F09F0A1C185E08093D70488EB9BE0ED +:1049600090932B0480932A04909327048093260429 +:104970001093D8048CEA9DE09093DA048093D904D4 +:1049800080E797E19093DE048093DD0488EE93E066 +:104990009093DC048093DB049093E0048093DF0425 +:1049A0001092E20483E08093E30480E991E0909325 +:1049B000E5048093E4041092E7041092E604109258 +:1049C000E1040E94FC21E0914504F091460482E05C +:1049D0008083E0914104F09142041082E09143040D +:1049E000F091440480E1808310924D04E0914904E9 +:1049F000F0914A0486E08083E0914704F0914804F6 +:104A0000808180618083E0914704F0914804808137 +:104A100088608083E0914704F09148048081806839 +:104A20008083E0914704F091480480818F7D8083EA +:104A300010921A04F8941092800010928100109243 +:104A400085001092840088EE93E090938900809313 +:104A5000880080918100886080938100809181002E +:104A600081608093810080916F00826080936F00ED +:104A70001092B0001092B1001092B20089EF8093B2 +:104A8000B3008091B00082608093B0008091B1004B +:104A900084608093B10080917C008F7D80937C0046 +:104AA00080917C00806480937C0080917C00807F7A +:104AB00080937C0080917A00806880937A00809156 +:104AC0007A00806280937A0080917B00887F809357 +:104AD0007B0080917A00876080937A0080917A00D1 +:104AE000886080937A0082E00E94861F83E00E94A3 +:104AF000861F84E00E94861F85E00E94861F86E054 +:104B00000E94861F87E00E94861F88E00E94861F01 +:104B100089E00E94861F8AE00E94861F8BE00E9427 +:104B2000861F789480917A00806480937A006091E7 +:104B30002A0470912B0490E080E00E94D7201CE0B2 +:104B4000F12EEE24E39400E0802E00E0902E009100 +:104B500026041091270485E394E00E94282018166B +:104B6000190614F580911A04811106C085E394E0BA +:104B70000E9406208093190480911904833509F45A +:104B800085C208F09AC18E3409F400C208F08AC1C7 +:104B9000833409F4C8C1E3E0CE2EE1E0DE2E8C348C +:104BA00009F4D4C110921A048091D804823009F01B +:104BB0009EC280912504882389F0109225040091DB +:104BC00023041091240474E0000F111F7A95E1F77B +:104BD000093263E2160710F008E213E2109327048B +:104BE000009326048091E4049091E50480179107D6 +:104BF00008F438C38091E204882309F433C3809118 +:104C00001B0490911C04A0911D04B0911E04892BDB +:104C10008A2B8B2B09F4BBC20E94A51F2091D204C2 +:104C20003091D3044091D4045091D5045B016C01C0 +:104C3000A21AB30AC40AD50AA6019501E091D704C5 +:104C4000FE9EF0011124ED5FFE4F82859385803D2D +:104C5000924021F4220F331F441F551FA0901B04C4 +:104C6000B0901C04C0901D04D0901E04A8E6B1E0D2 +:104C70000E945729A60195010E9462298091E604AD +:104C80009091E704820F931F8936E1E09E0708F4B4 +:104C900080C288569140F8CF82E090E00E94712255 +:104CA000A82E8093D70483E090E00E947122B82E52 +:104CB0008093D80484E190E00E94712291E08111F8 +:104CC00001C090E09093E10484E090E00E947122A2 +:104CD000C82E85E090E00E947122DC2CC82ED09274 +:104CE0002B04C0922A048CE090E00E947122182FBD +:104CF0008DE090E00E947122912F893223E2920789 +:104D000010F088E293E28436910510F484E690E096 +:104D10009093DA048093D90486E090E00E94712297 +:104D2000E82E87E090E00E947122FE2CE82E49E2F6 +:104D3000E41643E2F40620F048E2E42E43E2F42EC7 +:104D400064E6E616F10418F434E6E32EF12CF09252 +:104D5000DC04E092DB0488E090E00E947122082FDE +:104D600089E090E00E947122102F082F093283E21F +:104D7000180710F008E213E20436110510F404E6F7 +:104D800010E01093DE040093DD048AE090E00E94BE +:104D90007122982E8BE090E00E947122992D813132 +:104DA000E7E29E0710F080E197E2883C910510F45D +:104DB00088EC90E09093E0048093DF04E016F10625 +:104DC00030F0045611091093DC040093DB048EE0EC +:104DD00090E00E94712291E0811101C090E09093D7 +:104DE000E2048FE090E00E947122F82E8093E304A9 +:104DF00080E190E00E947122082F81E190E00E9402 +:104E00007122102F082F1093E5040093E40482E12F +:104E100090E00E947122E82E83E190E00E947122CE +:104E20009E2D9093E7048093E604FEE3FA1518F4B0 +:104E300025E02093D70422E0A22EAB1418F421E041 +:104E40002093D80429E9C2162AE3D20630F020EADA +:104E50003FE030932B0420932A04209126043091C4 +:104E6000270429393A4330F020EA3FE03093270401 +:104E70002093260465E06F1518F423E02093E304E3 +:104E8000093E134030F020E931E03093E5042093EF +:104E9000E4048836914008F496CD1092E70410920D +:104EA000E60491CD803509F478C0823509F07ACED8 +:104EB00080912A0490912B0433C08E3609F45AC095 +:104EC000E8F4883509F4F5C0833609F06BCE85E344 +:104ED00094E00E9428204297D0F3B7EDCB2EB4E0A7 +:104EE000DB2E85E394E00E940620F60181936F019A +:104EF000F9EECF16F4E0DF06A1F754CE823709F4BD +:104F000086C0833709F4BFC0803709F04BCEE091EB +:104F1000D704FE9EF0011124ED5FFE4F8085918540 +:104F20000E94D6213FCEA6EDCA2EA4E0DA2EF601CD +:104F300061916F0185E394E00E946A20F9EEAF2E43 +:104F4000F4E0BF2EAC14BD0491F72CCEF6016081C5 +:104F50007181CE0101960E943A29CE0101960E94EC +:104F6000C821FCE0CF0ED11C27EFC21623E0D206E9 +:104F700069F718CE4AE06FE370E080E090E00E94AD +:104F8000842189E094E00E9477210CCE6091D704BF +:104F900070E090E080E04AE0F2CFD12CC12CE091AB +:104FA000D704FE9EF0011124ED5FFE4F80859185B0 +:104FB000C816D906F0F4C114D10421F08CE094E0B5 +:104FC0000E947721E091D704FE9EF0011124ED5F4D +:104FD000FE4F0280F381E02DEC0DFD1D649170E029 +:104FE00090E080E04AE00E9484214FEFC41AD40A86 +:104FF000D6CF8BE094E00E94C821E091D704FE9EBA +:10500000F0011124ED5FFE4F8285938589CF1092C8 +:10501000D80485E394E00E9428200697D4F385E322 +:1050200094E00E940620D82E85E394E00E9406209A +:10503000782E612CC3018D299093DC048093DB04CE +:1050400085E394E00E940620D82E85E394E00E9438 +:105050000620582E412CC2018D299093DE048093A6 +:10506000DD0485E394E00E940620D82E85E394E0D9 +:105070000E940620382E212CC1018D299093E00436 +:105080008093DF048FCD0E94FC218CCD85E394E0DA +:105090000E94282018161906CCF785E394E00E9498 +:1050A00006208F3308F07ECD8093D7040E943721ED +:1050B00079CD8091D7048E33B1F41092D7040E9439 +:1050C0003721E091D704FE9EF0011124ED5FFE4FE1 +:1050D00060817181CE0101960E943A29CE0101962C +:1050E0000E94C8215FCD8F5F8093D704E8CF8111E4 +:1050F00046C00E94A51FAB01BC012091DF04309186 +:10510000E00480911F0490912004A0912104B091AB +:105110002204820F931FA11DB11D84179507A607B6 +:10512000B70708F05BCD0E94A51F60931F04709322 +:10513000200480932104909322040091260410916E +:10514000270480910201813069F40F5F1F4F809125 +:10515000DD049091DE040817190708F43FCD109282 +:1051600002013CCD015011098091DB049091DC04D7 +:105170008017910708F432CDE09202012FCD8130E3 +:1051800009F02CCD0091D9041091DA0427CD90E0DC +:1051900080E02091E304233019F038F4213089F0C5 +:1051A00064EB70E00E942F2B0EC0243081F025307C +:1051B000B9F76AE570E00E942F2BFC01EC50F34C2C +:1051C0000DC096958795FC01EA53F24C07C068E73D +:1051D00070E00E942F2BFC01E25BF24CE4916E2FF9 +:1051E00070E08091E804882389F00F38F2E01F070F +:1051F00068F4069FC001079F900D169F900D112423 +:105200006091E4047091E5040E942F2B60177107F0 +:1052100060F570932904609328048091280490918C +:105220002904081B190B0A30110580F080912A040B +:1052300090912B040817190729F0B80190E080E03D +:105240000E94D72010932B0400932A048114910408 +:1052500009F47DCC0E943420882309F470CC0E948C +:1052600000006DCC70E060E0D1CF10922904109264 +:105270002804D3CFFB01DC0105900D920020E1F75B +:105280000895F999FECF92BD81BDF89A992780B50E +:105290000895262FF999FECF1FBA92BD81BD20BD7A +:1052A0000FB6F894FA9AF99A0FBE019608950E94E3 +:1052B0008429A59F900DB49F900DA49F800D911DF2 +:1052C00011240895A1E21A2EAA1BBB1BFD010DC0DB +:1052D000AA1FBB1FEE1FFF1FA217B307E407F507A6 +:1052E00020F0A21BB30BE40BF50B661F771F881F82 +:1052F000991F1A9469F760957095809590959B0118 +:10530000AC01BD01CF010895A29FB001B39FC001C0 +:10531000A39F700D811D1124911DB29F700D811DE1 +:105320001124911D08950E94A7290C94882A0E9497 +:10533000812A58F00E947A2A40F029F45F3F29F030 +:105340000C94712A51110C94BC2A0C94772A0E9457 +:10535000992A68F39923B1F3552391F3951B550BC3 +:10536000BB27AA2762177307840738F09F5F5F4F38 +:10537000220F331F441FAA1FA9F335D00E2E3AF077 +:10538000E0E832D091505040E695001CCAF72BD08F +:10539000FE2F29D0660F771F881FBB1F26173707E0 +:1053A0004807AB07B0E809F0BB0B802DBF01FF2712 +:1053B00093585F4F3AF09E3F510578F00C94712A54 +:1053C0000C94BC2A5F3FE4F3983ED4F3869577951E +:1053D0006795B795F7959F5FC9F7880F911D9695CB +:1053E000879597F90895E1E0660F771F881FBB1F27 +:1053F000621773078407BA0720F0621B730B840BD4 +:10540000BA0BEE1F88F7E09508950E94A12A88F054 +:105410009F5798F0B92F9927B751B0F0E1F0660F78 +:10542000771F881F991F1AF0BA95C9F714C0B130B9 +:1054300091F00E94BB2AB1E008950C94BB2A672F1B +:10544000782F8827B85F39F0B93FCCF386957795E8 +:105450006795B395D9F73EF49095809570956195D1 +:105460007F4F8F4F9F4F0895E89409C097FB3EF4FC +:1054700090958095709561957F4F8F4F9F4F9923A1 +:10548000A9F0F92F96E9BB279395F695879577951F +:105490006795B795F111F8CFFAF4BB0F11F460FFDF +:1054A0001BC06F5F7F4F8F4F9F4F16C0882311F037 +:1054B00096E911C0772321F09EE8872F762F05C04B +:1054C000662371F096E8862F70E060E02AF09A95E6 +:1054D000660F771F881FDAF7880F9695879597F9DB +:1054E000089597F99F6780E870E060E008959FEF66 +:1054F00080EC089500240A9416161706180609066B +:10550000089500240A941216130614060506089539 +:10551000092E0394000C11F4882352F0BB0F40F4C1 +:10552000BF2B11F460FF04C06F5F7F4F8F4F9F4F01 +:10553000089557FD9058440F551F59F05F3F71F083 +:105540004795880F97FB991F61F09F3F79F08795EA +:105550000895121613061406551FF2CF4695F1DF73 +:1055600008C0161617061806991FF1CF8695710503 +:10557000610508940895E894BB2766277727CB0137 +:1055800097F908950E94D52A0C94882A0E947A2AB5 +:1055900038F00E94812A20F0952311F00C94712A92 +:1055A0000C94772A11240C94BC2A0E94992A70F337 +:1055B000959FC1F3950F50E0551F629FF001729FB8 +:1055C000BB27F00DB11D639FAA27F00DB11DAA1FC7 +:1055D000649F6627B00DA11D661F829F2227B00D14 +:1055E000A11D621F739FB00DA11D621F839FA00D9F +:1055F000611D221F749F3327A00D611D231F849FEF +:10560000600D211D822F762F6A2F11249F57504045 +:105610009AF0F1F088234AF0EE0FFF1FBB1F661FC0 +:10562000771F881F91505040A9F79E3F510580F089 +:105630000C94712A0C94BC2A5F3FE4F3983ED4F397 +:10564000869577956795B795F795E7959F5FC1F72D +:10565000FE2B880F911D9695879597F90895AA1BA3 +:10566000BB1B51E107C0AA1FBB1FA617B70710F04D +:10567000A61BB70B881F991F5A95A9F7809590957F +:10568000BC01CD010895EE0FFF1F0590F491E02DB0 +:065690000994F894FFCF1D +:10569600881301E33CDF3C0A85083D04006801CE1F +:1056A6003CC83CCDCC4C3D06006801B73CAF3C48FD +:1056B6008A883D080068019F3C273C0000803F78AF +:1056C600006801143C243B0000803FF000D0020536 +:1056D6003B153A0000803FF000D002053ABD399AEA +:1056E60099193F48006801AD397D390000003F3007 +:1056F60000680164395439488A883D1000D0024058 +:10570600393039A987083E100068011D39F9389AE1 +:1057160099193E2400D002E53855389A99193F90D8 +:1057260000D0023A38EA37E3AA2A3F50006801BDA2 +:1057360037B4379A99193E0900D0028B377337CDA3 +:10574600CC4C3E180068015837883400004040D0E1 +:1057560002D0027B344B34CDCCCC3E3000680134D1 +:1057660034EC339A99193F48006801D5338D339A42 +:1057760099193F480068017633E6329A99193F90A5 +:1057860000D002D2328A329A99193F4800680172D3 +:1057960032E2319A99193F9000D002C93139319AD3 +:1057A60099193F9000D0022131D1303BAAAA3E5030 +:1057B60000D002BC30EC2D0000C040D002D002D494 +:1057C6002DE42C0000803FF000D002C62C7E2C9ADF +:1057D60099193F480068016A2C3A2CCDCC4C3E30D2 +:1057E60000D0020F2C7F2B9A99193F9000D00256B9 +:1057F6002B862800004040D002D0025D288D25006F +:10580600004040D002D0026425942200004040D0DF +:1058160002D0027022E0219A99993F9000D002C5E9 +:1058260021F51E00004040D002D002D91E091C00FE +:10583600004040D002D002DD1B951B9A99993E4844 +:1058460000D0025F1B1F1BF888883E4000D002F87C +:105856001AF01A0A85883D0800D002C91ABD1ACD69 +:10586600CCCC3D0C00D002961A861AA987083E10A9 +:1058760000D002601A801800008040E001D002606B +:1058860018F8160000C03F6801D002D21642169AD8 +:1058960099193F9000D0022516ED110000C03F383F +:1058A60004D002D61146119A99193F9000D00231C0 +:1058B6001113110000803F1E00D002EC105C10CDC9 +:1058C600CC4C3F900068015010C00F9A99193F9038 +:1058D60000D002A70F170F9A99193F9000D002FE29 +:1058E6000E6E0E9A99193F9000D002550E850B0048 +:1058F600004040D002D0027F0BCB0A8941C03FB4A2 +:1059060000D002C20A320A9A99193F9000D00227A3 +:105916000A570700004040D002D0024707B7069A50 +:1059260099193F9000D002AB061B06FA7EAA3E905C +:1059360000D0020E067E05FA7EAA3E9000D00270C6 +:105946000528059A99193F480068011E05B6030007 +:1059560000C03F6801D002AE03BE020000803FF0E7 +:1059660000D002A402B4010000803FF000D0029EE5 +:10597600010E019A99193F9000D002F80068009A2A +:1059860099193F9000D002000000006A20CA1FF754 +:0E5996001FB720282006201A200D0A002C0022 :00000001FF diff --git a/UI/gear_generator.js b/UI/gear_generator.js index bff04b8..ee699af 100644 --- a/UI/gear_generator.js +++ b/UI/gear_generator.js @@ -74,53 +74,98 @@ function draw_crank_gear(toothPattern, depth, radius, width, line, halfspeed) { var teeth = toothPattern.length / 2; if(halfspeed) { teeth = teeth / 2; } var firstEnd - + var analogMapMode = 0; depth = (radius / 100) * depth; + for (var i = 0; i < toothPattern.length; i++) + { + if (toothPattern[i] >= 10) {analogMapMode = 1;} + } c.beginPath(); //Draw an inner ring c.arc(x, y, radius/5, 0, 2 * Math.PI); c.moveTo(x+radius-depth, y); //Move to the starting point - for (var i = 0; i <= (teeth * 2)-1; i++) + if (analogMapMode == 0) { - - var start, end, newEnd, diff; - diff = ((((100 - width) / 100) / 2) * arcToRad(teeth)); - newEnd = lastEnd + arcToRad(teeth); - - start = lastEnd + diff; - end = newEnd - diff; - - /* - * Values to use within a wheel definition. - * 0 means no tooth on any wheel definition - * 1 means crank tooth - * 2 means cam1 tooth - * 4 means cam2 tooth - * - * combinations of numbers mean all of the related teeth are present, - * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 - */ - if (toothPattern[i] == 1 || toothPattern[i] == 3 || toothPattern[i] == 5 || toothPattern[i] == 7) + for (var i = 0; i <= (teeth * 2)-1; i++) { - c.arc(x, y, radius, start, end, false); - } else + + var start, end, newEnd, diff; + diff = ((((100 - width) / 100) / 2) * arcToRad(teeth)); + newEnd = lastEnd + arcToRad(teeth); + + start = lastEnd + diff; + end = newEnd - diff; + + /* + * Values to use within a wheel definition. + * 0 means no tooth on any wheel definition + * 1 means crank tooth + * 2 means cam1 tooth + * 4 means cam2 tooth + * + * combinations of numbers mean all of the related teeth are present, + * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 + */ + if (toothPattern[i] == 1 || toothPattern[i] == 3 || toothPattern[i] == 5 || toothPattern[i] == 7 ) + { + c.arc(x, y, radius, start, end, false); + } else + { + c.arc(x, y, (radius - depth), start, end, false); + } + lastEnd = newEnd; + } + } else + { + for (var i = 0; i <= (teeth * 2)-1; i++) { - c.arc(x, y, (radius - depth), start, end, false); + + var start, end, newEnd, diff; + diff = ((((100 - width) / 100) / 2) * arcToRad(teeth)); + newEnd = lastEnd + arcToRad(teeth); + + start = lastEnd + diff; + end = newEnd - diff; + + /* + * Values to use within a wheel definition. + * 0 means no tooth on any wheel definition + * 1 means crank tooth + * 2 means cam1 tooth + * 4 means cam2 tooth + * + * combinations of numbers mean all of the related teeth are present, + * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 + */ + dataNow = (toothPattern[i]); + remainder = 0; + while (dataNow >= 10) + { + dataNow -= 10; + remainder ++; + } + if (remainder == 1 || remainder == 3 || remainder == 5 || remainder == 7 ) + { + c.arc(x, y, radius, start, end, false); + } else + { + c.arc(x, y, (radius - depth), start, end, false); + } + lastEnd = newEnd; } - lastEnd = newEnd; } //Draw the final connecting line //c.lineTo(x+radius, y); - - c.strokeStyle = '#fefefe'; + c.strokeStyle = '#fefefe'; c.fillStyle = "rgba( 51,141,198, 0.8 )"; c.fill(); c.lineWidth = line; c.stroke(); } + function draw_cam_gear(toothPattern, depth, radius, width, line) { var canvas = document.getElementById('cam'); var c = canvas.getContext('2d'); @@ -130,44 +175,89 @@ function draw_cam_gear(toothPattern, depth, radius, width, line) { var x = canvas.width / 2; var y = canvas.height / 2 var lastEnd = 0; + if(analogMapMode) { teeth = teeth / 2; } var teeth = toothPattern.length / 2; - + var analogMapMode = 0; depth = (radius / 100) * depth; + for (var i = 0; i < toothPattern.length; i++) + { + if (toothPattern[i] >= 10) {analogMapMode = 1;} + } + if(analogMapMode) { teeth = teeth / 2; } c.beginPath(); //Draw an inner ring c.arc(x, y, radius/5, 0, 2 * Math.PI); c.moveTo(x+radius-depth, y); //Move to the starting point - - for (var i = 0; i <= (teeth * 2)-1; i++) - { - var start, end, newEnd, diff; - diff = ((((100 - width) / 100) / 2) * arcToRad(teeth)); - newEnd = lastEnd + arcToRad(teeth); - - start = lastEnd + diff; - end = newEnd - diff; - - /* - * Values to use within a wheel definition. - * 0 means no tooth on any wheel definition - * 1 means crank tooth - * 2 means cam1 tooth - * 4 means cam2 tooth - * - * combinations of numbers mean all of the related teeth are present, - * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 - */ - if (toothPattern[i] == 2 || toothPattern[i] == 3 || toothPattern[i] == 6 || toothPattern[i] == 7) - { - c.arc(x, y, radius, start, end, false); - } else + if (analogMapMode == 0) + { + for (var i = 0; i <= (teeth * 2)-1; i++) { - c.arc(x, y, (radius - depth), start, end, false); + + var start, end, newEnd, diff; + diff = ((((100 - width) / 100) / 2) * arcToRad(teeth)); + newEnd = lastEnd + arcToRad(teeth); + start = lastEnd + diff; + end = newEnd - diff; + /* + * Values to use within a wheel definition. + * 0 means no tooth on any wheel definition + * 1 means crank tooth + * 2 means cam1 tooth + * 4 means cam2 tooth + * + * combinations of numbers mean all of the related teeth are present, + * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 + */ + + if (toothPattern[i] == 2 || toothPattern[i] == 3 || toothPattern[i] == 6 || toothPattern[i] == 7) + { + c.arc(x, y, radius, start, end, false); + } else + { + c.arc(x, y, (radius - depth), start, end, false); + } + lastEnd = newEnd; + } + } else /* CAM GEAR for MAP simulation mode */ + { + for (var i = 0; i <= (teeth * 2)-1; i++) + { + + var start, end, newEnd, diff; + diff = ((((100 - width) / 100) / 2) * arcToRad(teeth)); + newEnd = lastEnd + arcToRad(teeth); + start = lastEnd + diff; + end = newEnd - diff; + /* + * Values to use within a wheel definition. + * 0 means no tooth on any wheel definition + * 1 means crank tooth + * 2 means cam1 tooth + * 4 means cam2 tooth + * + * combinations of numbers mean all of the related teeth are present, + * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 + */ + dataNow = (toothPattern[i]); + remainder = 0; + while (dataNow >= 10) + { + dataNow -= 10; + remainder ++; + } + if (remainder == 2 || remainder == 3 || remainder == 6 || remainder == 7) + { + c.arc(x, y, radius, start, end, false); + } else + { + c.arc(x, y, (radius - depth), start, end, false); + } + lastEnd = newEnd; } - lastEnd = newEnd; } + //Draw the final connecting line //c.lineTo(x+radius, y); diff --git a/UI/package-lock.json b/UI/package-lock.json index 0bf1745..3d11ded 100644 --- a/UI/package-lock.json +++ b/UI/package-lock.json @@ -10,6 +10,7 @@ "hasInstallScript": true, "license": "GPL v3", "dependencies": { + "electron-rebuild": "^3.2.9", "semver": "^7.3.5", "serialport": "^10.0.2", "usb": "^2.12.1" @@ -17,7 +18,7 @@ "devDependencies": { "@electron/packager": "^18.3.2", "@electron/rebuild": "^3.6.0", - "electron": "^30.0.8", + "electron": "^30.5.1", "electron-builder": "^24.13.3" } }, @@ -457,108 +458,6 @@ "node": ">= 12.13.0" } }, - "node_modules/@electron/rebuild/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@electron/rebuild/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@electron/rebuild/node_modules/detect-libc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", - "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@electron/rebuild/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -573,20 +472,6 @@ "node": ">=12" } }, - "node_modules/@electron/rebuild/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@electron/rebuild/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -599,83 +484,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/@electron/rebuild/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/rebuild/node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/rebuild/node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/@electron/rebuild/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@electron/rebuild/node_modules/node-api-version": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz", @@ -685,96 +493,6 @@ "semver": "^7.3.5" } }, - "node_modules/@electron/rebuild/node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/@electron/rebuild/node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@electron/rebuild/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@electron/rebuild/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/@electron/rebuild/node_modules/universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", @@ -896,7 +614,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true + "license": "MIT" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", @@ -1067,6 +785,33 @@ "node": ">= 10.0.0" } }, + "node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/move-file": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", + "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "license": "MIT", + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1228,7 +973,6 @@ "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "dev": true, "engines": { "node": ">=10" }, @@ -1240,7 +984,6 @@ "version": "4.0.6", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", - "dev": true, "dependencies": { "defer-to-connect": "^2.0.0" }, @@ -1248,11 +991,19 @@ "node": ">=10" } }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, "node_modules/@types/cacheable-request": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==", - "dev": true, "dependencies": { "@types/http-cache-semantics": "*", "@types/keyv": "*", @@ -1281,14 +1032,12 @@ "node_modules/@types/http-cache-semantics": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", - "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", - "dev": true + "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==" }, "node_modules/@types/keyv": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", - "dev": true, "dependencies": { "@types/node": "*" } @@ -1303,7 +1052,6 @@ "version": "20.12.12", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", - "dev": true, "dependencies": { "undici-types": "~5.26.4" } @@ -1323,7 +1071,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", - "dev": true, "dependencies": { "@types/node": "*" } @@ -1369,13 +1116,12 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "license": "ISC" }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, "dependencies": { "debug": "4" }, @@ -1387,7 +1133,7 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", - "dev": true, + "license": "MIT", "dependencies": { "humanize-ms": "^1.2.1" }, @@ -1399,7 +1145,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, + "license": "MIT", "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -1437,7 +1183,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -1446,7 +1191,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -1564,8 +1308,7 @@ "node_modules/aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" }, "node_modules/archiver": { "version": "5.3.2", @@ -1627,7 +1370,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", - "dev": true, "dependencies": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" @@ -1640,7 +1382,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -1718,14 +1459,12 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, "funding": [ { "type": "github", @@ -1745,7 +1484,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -1756,7 +1494,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -1792,7 +1529,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1802,7 +1538,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, "funding": [ { "type": "github", @@ -1886,69 +1621,124 @@ "node": ">=12.0.0" } }, - "node_modules/builder-util/node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" + "node_modules/builder-util/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/builder-util/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/builder-util/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/cacache/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" } }, - "node_modules/builder-util/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, + "node_modules/cacache/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/builder-util/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", "engines": { - "node": ">= 6" + "node": ">=12" } }, - "node_modules/builder-util/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, + "node_modules/cacache/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", "dependencies": { - "universalify": "^2.0.0" + "brace-expansion": "^2.0.1" }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/builder-util/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, "engines": { - "node": ">= 10.0.0" + "node": ">=10" } }, "node_modules/cacheable-lookup": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "dev": true, "engines": { "node": ">=10.6.0" } @@ -1957,7 +1747,6 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", - "dev": true, "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -1975,7 +1764,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1991,7 +1779,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, "engines": { "node": ">=10" } @@ -2021,7 +1808,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2030,7 +1817,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, "dependencies": { "restore-cursor": "^3.1.0" }, @@ -2042,7 +1828,6 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true, "engines": { "node": ">=6" }, @@ -2071,7 +1856,6 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -2085,7 +1869,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true, "engines": { "node": ">=0.8" } @@ -2094,7 +1877,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", - "dev": true, "dependencies": { "mimic-response": "^1.0.0" }, @@ -2106,7 +1888,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -2117,14 +1898,12 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, "bin": { "color-support": "bin.js" } @@ -2193,8 +1972,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "node_modules/config-file-ts": { "version": "0.2.6", @@ -2264,8 +2042,7 @@ "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "node_modules/core-util-is": { "version": "1.0.3", @@ -2336,7 +2113,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -2366,7 +2142,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, "dependencies": { "mimic-response": "^3.1.0" }, @@ -2381,7 +2156,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, "engines": { "node": ">=10" }, @@ -2393,7 +2167,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, "dependencies": { "clone": "^1.0.2" } @@ -2402,7 +2175,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, "engines": { "node": ">=10" } @@ -2432,8 +2204,16 @@ "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "node_modules/detect-libc": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } }, "node_modules/detect-node": { "version": "2.1.0", @@ -2567,11 +2347,12 @@ } }, "node_modules/electron": { - "version": "30.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.8.tgz", - "integrity": "sha512-ivzXJJ/9gdb4oOw+5SDuaZpSInz8C+Z021dKZfFLMltKbDa4sSqt5cRBiUg7J36Z2kdus+Jai0bdHWutYE9wAA==", + "version": "30.5.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz", + "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^20.9.0", @@ -2746,17 +2527,102 @@ "node": ">= 10.0.0" } }, + "node_modules/electron-rebuild": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.9.tgz", + "integrity": "sha512-FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw==", + "deprecated": "Please use @electron/rebuild moving forward. There is no API change, just a package name change", + "license": "MIT", + "dependencies": { + "@malept/cross-spawn-promise": "^2.0.0", + "chalk": "^4.0.0", + "debug": "^4.1.1", + "detect-libc": "^2.0.1", + "fs-extra": "^10.0.0", + "got": "^11.7.0", + "lzma-native": "^8.0.5", + "node-abi": "^3.0.0", + "node-api-version": "^0.1.4", + "node-gyp": "^9.0.0", + "ora": "^5.1.0", + "semver": "^7.3.5", + "tar": "^6.0.5", + "yargs": "^17.0.1" + }, + "bin": { + "electron-rebuild": "lib/src/cli.js" + }, + "engines": { + "node": ">=12.13.0" + } + }, + "node_modules/electron-rebuild/node_modules/@malept/cross-spawn-promise": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz", + "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/malept" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" + } + ], + "license": "Apache-2.0", + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "engines": { + "node": ">= 12.13.0" + } + }, + "node_modules/electron-rebuild/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/electron-rebuild/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/electron-rebuild/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -2766,7 +2632,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, "dependencies": { "once": "^1.4.0" } @@ -2775,7 +2640,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, "engines": { "node": ">=6" } @@ -2783,8 +2647,7 @@ "node_modules/err-code": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" }, "node_modules/error-ex": { "version": "1.3.2", @@ -2806,7 +2669,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } @@ -2827,8 +2689,7 @@ "node_modules/exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" }, "node_modules/extract-zip": { "version": "2.0.1", @@ -3064,7 +2925,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, "dependencies": { "minipass": "^3.0.0" }, @@ -3075,8 +2935,7 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/function-bind": { "version": "1.1.1", @@ -3137,7 +2996,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1", "aproba": "^1.0.3 || ^2.0.0", @@ -3157,7 +3015,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -3196,7 +3053,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, "dependencies": { "pump": "^3.0.0" }, @@ -3211,7 +3067,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3265,7 +3120,6 @@ "version": "11.8.6", "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", - "dev": true, "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -3289,8 +3143,7 @@ "node_modules/graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "node_modules/has": { "version": "1.0.3", @@ -3308,7 +3161,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -3316,8 +3168,7 @@ "node_modules/has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "node_modules/hosted-git-info": { "version": "4.1.0", @@ -3334,14 +3185,26 @@ "node_modules/http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } }, "node_modules/http2-wrapper": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dev": true, "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -3354,7 +3217,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, "dependencies": { "agent-base": "6", "debug": "4" @@ -3366,8 +3228,8 @@ "node_modules/humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", - "dev": true, + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "license": "MIT", "dependencies": { "ms": "^2.0.0" } @@ -3393,7 +3255,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, + "devOptional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -3405,7 +3267,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, "funding": [ { "type": "github", @@ -3424,8 +3285,8 @@ "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true, + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -3434,7 +3295,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3443,13 +3304,12 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true + "license": "ISC" }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3458,14 +3318,13 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ip-address": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", - "dev": true, + "license": "MIT", "dependencies": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -3508,7 +3367,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -3517,7 +3375,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, "engines": { "node": ">=8" } @@ -3525,14 +3382,13 @@ "node_modules/is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=", - "dev": true + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "license": "MIT" }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, "engines": { "node": ">=10" }, @@ -3562,8 +3418,7 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "node_modules/jackspeak": { "version": "2.3.6", @@ -3617,13 +3472,12 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true + "license": "MIT" }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -3672,7 +3526,6 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, "dependencies": { "json-buffer": "3.0.1" } @@ -3784,36 +3637,108 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/lzma-native": { + "version": "8.0.6", + "resolved": "https://registry.npmjs.org/lzma-native/-/lzma-native-8.0.6.tgz", + "integrity": "sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^3.1.0", + "node-gyp-build": "^4.2.1", + "readable-stream": "^3.6.0" + }, + "bin": { + "lzmajs": "bin/lzmajs" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/lzma-native/node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "license": "MIT" + }, + "node_modules/lzma-native/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 6" } }, - "node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true, + "node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, "engines": { - "node": ">=8" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, + "node_modules/make-fetch-happen/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/matcher": { @@ -3866,7 +3791,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, "engines": { "node": ">=6" } @@ -3875,7 +3799,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true, "engines": { "node": ">=4" } @@ -3884,7 +3807,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -3905,7 +3827,6 @@ "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -3917,7 +3838,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -3925,11 +3846,28 @@ "node": ">= 8" } }, + "node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "license": "MIT", + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, "node_modules/minipass-flush": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -3941,7 +3879,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -3953,7 +3891,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -3965,7 +3903,6 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -3974,6 +3911,18 @@ "node": ">= 8" } }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3983,7 +3932,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3992,7 +3941,6 @@ "version": "3.56.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.56.0.tgz", "integrity": "sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==", - "dev": true, "dependencies": { "semver": "^7.3.5" }, @@ -4007,6 +3955,40 @@ "dev": true, "optional": true }, + "node_modules/node-api-version": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz", + "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==", + "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + } + }, + "node_modules/node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^12.13 || ^14.13 || >=16" + } + }, "node_modules/node-gyp-build": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz", @@ -4017,6 +3999,21 @@ "node-gyp-build-test": "build-test.js" } }, + "node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -4058,7 +4055,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true, "engines": { "node": ">=10" }, @@ -4070,7 +4066,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", - "dev": true, "dependencies": { "are-we-there-yet": "^2.0.0", "console-control-strings": "^1.1.0", @@ -4095,7 +4090,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "dependencies": { "wrappy": "1" } @@ -4104,7 +4098,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -4119,7 +4112,6 @@ "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -4142,7 +4134,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "dev": true, "engines": { "node": ">=8" } @@ -4175,7 +4166,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -4232,7 +4223,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4241,7 +4231,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -4384,14 +4373,13 @@ "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "license": "ISC" }, "node_modules/promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -4404,7 +4392,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -4423,7 +4410,6 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, "engines": { "node": ">=10" }, @@ -4540,7 +4526,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -4582,14 +4567,12 @@ "node_modules/resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" }, "node_modules/responselike": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", - "dev": true, "dependencies": { "lowercase-keys": "^2.0.0" }, @@ -4601,7 +4584,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -4614,7 +4596,6 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true, "engines": { "node": ">= 4" } @@ -4623,7 +4604,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -4655,14 +4635,13 @@ "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "devOptional": true }, "node_modules/sanitize-filename": { "version": "1.6.3", @@ -4743,14 +4722,12 @@ "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -4762,7 +4739,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -4770,8 +4746,7 @@ "node_modules/signal-exit": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", - "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", - "dev": true + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" }, "node_modules/simple-update-notifier": { "version": "2.0.0", @@ -4804,17 +4779,16 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" } }, "node_modules/socks": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz", - "integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==", - "dev": true, + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "license": "MIT", "dependencies": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" @@ -4824,6 +4798,20 @@ "npm": ">= 3.0.0" } }, + "node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "license": "MIT", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -4878,8 +4866,19 @@ "node_modules/sprintf-js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, + "node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "license": "ISC", + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } }, "node_modules/stat-mode": { "version": "1.0.0", @@ -4894,7 +4893,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -4903,7 +4901,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -4932,7 +4929,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -4999,7 +4995,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -5023,7 +5018,6 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dev": true, "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -5072,23 +5066,10 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, "engines": { "node": ">=8" } }, - "node_modules/tar/node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/temp-file": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", @@ -5211,8 +5192,31 @@ "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, + "node_modules/unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "license": "ISC", + "dependencies": { + "unique-slug": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } }, "node_modules/universalify": { "version": "0.1.2", @@ -5260,8 +5264,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/validate-npm-package-license": { "version": "3.0.4", @@ -5299,7 +5302,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, "dependencies": { "defaults": "^1.0.3" } @@ -5308,7 +5310,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -5323,7 +5324,6 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } @@ -5332,7 +5332,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5366,8 +5365,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/xmlbuilder": { "version": "15.1.1", @@ -5382,7 +5380,6 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, "engines": { "node": ">=10" } @@ -5396,7 +5393,6 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -5414,7 +5410,6 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, "engines": { "node": ">=12" } @@ -5809,96 +5804,14 @@ }, "dependencies": { "@malept/cross-spawn-promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz", - "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.1" - } - }, - "@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "requires": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - } - }, - "@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "dev": true, - "requires": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - } - }, - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, - "brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0" - } - }, - "cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz", + "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==", "dev": true, "requires": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "dependencies": { - "glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - } - } + "cross-spawn": "^7.0.1" } }, - "detect-libc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", - "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", - "dev": true - }, "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -5910,17 +5823,6 @@ "universalify": "^2.0.0" } }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -5931,63 +5833,6 @@ "universalify": "^2.0.0" } }, - "lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true - }, - "make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "requires": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - } - }, - "minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - }, - "minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "requires": { - "encoding": "^0.1.13", - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "node-api-version": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz", @@ -5997,72 +5842,6 @@ "semver": "^7.3.5" } }, - "node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "requires": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - } - }, - "nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "requires": { - "abbrev": "^1.0.0" - } - }, - "socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "requires": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - } - }, - "ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "requires": { - "minipass": "^3.1.1" - } - }, - "unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "requires": { - "unique-slug": "^3.0.0" - } - }, - "unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, "universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", @@ -6161,8 +5940,7 @@ "@gar/promisify": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" }, "@isaacs/cliui": { "version": "8.0.2", @@ -6280,6 +6058,24 @@ } } }, + "@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "requires": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + } + }, + "@npmcli/move-file": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", + "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", + "requires": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + } + }, "@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -6372,23 +6168,25 @@ "@sindresorhus/is": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "dev": true + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==" }, "@szmarczak/http-timer": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", - "dev": true, "requires": { "defer-to-connect": "^2.0.0" } }, + "@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==" + }, "@types/cacheable-request": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==", - "dev": true, "requires": { "@types/http-cache-semantics": "*", "@types/keyv": "*", @@ -6417,14 +6215,12 @@ "@types/http-cache-semantics": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", - "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", - "dev": true + "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==" }, "@types/keyv": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", - "dev": true, "requires": { "@types/node": "*" } @@ -6439,7 +6235,6 @@ "version": "20.12.12", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", - "dev": true, "requires": { "undici-types": "~5.26.4" } @@ -6459,7 +6254,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", - "dev": true, "requires": { "@types/node": "*" } @@ -6501,14 +6295,12 @@ "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, "requires": { "debug": "4" } @@ -6517,7 +6309,6 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", - "dev": true, "requires": { "humanize-ms": "^1.2.1" } @@ -6526,7 +6317,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, "requires": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -6554,14 +6344,12 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -6657,8 +6445,7 @@ "aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" }, "archiver": { "version": "5.3.2", @@ -6713,7 +6500,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", - "dev": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" @@ -6723,7 +6509,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -6785,20 +6570,17 @@ "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, "requires": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -6809,7 +6591,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -6844,7 +6625,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6854,7 +6634,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -6902,12 +6681,6 @@ "temp-file": "^3.4.0" }, "dependencies": { - "@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true - }, "fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -6919,17 +6692,6 @@ "universalify": "^2.0.0" } }, - "http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "requires": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - } - }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -6958,17 +6720,75 @@ "sax": "^1.2.4" } }, + "cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "requires": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + } + }, + "lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==" + }, + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, "cacheable-lookup": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "dev": true + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==" }, "cacheable-request": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", - "dev": true, "requires": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -6983,7 +6803,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -6992,8 +6811,7 @@ "chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" }, "chromium-pickle-js": { "version": "0.2.0", @@ -7010,14 +6828,12 @@ "clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" }, "cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, "requires": { "restore-cursor": "^3.1.0" } @@ -7025,8 +6841,7 @@ "cli-spinners": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "dev": true + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==" }, "cli-truncate": { "version": "2.1.0", @@ -7043,7 +6858,6 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -7053,14 +6867,12 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" }, "clone-response": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", - "dev": true, "requires": { "mimic-response": "^1.0.0" } @@ -7069,7 +6881,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -7077,14 +6888,12 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" }, "combined-stream": { "version": "1.0.8", @@ -7137,8 +6946,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "config-file-ts": { "version": "0.2.6", @@ -7192,8 +7000,7 @@ "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-util-is": { "version": "1.0.3", @@ -7254,7 +7061,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -7273,7 +7079,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, "requires": { "mimic-response": "^3.1.0" }, @@ -7281,8 +7086,7 @@ "mimic-response": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" } } }, @@ -7290,7 +7094,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, "requires": { "clone": "^1.0.2" } @@ -7298,8 +7101,7 @@ "defer-to-connect": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==" }, "define-properties": { "version": "1.1.3", @@ -7320,8 +7122,12 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "detect-libc": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", + "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==" }, "detect-node": { "version": "2.1.0", @@ -7429,9 +7235,9 @@ } }, "electron": { - "version": "30.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.8.tgz", - "integrity": "sha512-ivzXJJ/9gdb4oOw+5SDuaZpSInz8C+Z021dKZfFLMltKbDa4sSqt5cRBiUg7J36Z2kdus+Jai0bdHWutYE9wAA==", + "version": "30.5.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz", + "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==", "dev": true, "requires": { "@electron/get": "^2.0.0", @@ -7551,7 +7357,64 @@ "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true + } + } + }, + "electron-rebuild": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.9.tgz", + "integrity": "sha512-FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw==", + "requires": { + "@malept/cross-spawn-promise": "^2.0.0", + "chalk": "^4.0.0", + "debug": "^4.1.1", + "detect-libc": "^2.0.1", + "fs-extra": "^10.0.0", + "got": "^11.7.0", + "lzma-native": "^8.0.5", + "node-abi": "^3.0.0", + "node-api-version": "^0.1.4", + "node-gyp": "^9.0.0", + "ora": "^5.1.0", + "semver": "^7.3.5", + "tar": "^6.0.5", + "yargs": "^17.0.1" + }, + "dependencies": { + "@malept/cross-spawn-promise": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz", + "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==", + "requires": { + "cross-spawn": "^7.0.1" + } + }, + "fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -7562,7 +7425,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" @@ -7571,22 +7433,19 @@ "universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==" } } }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, "optional": true, "requires": { "iconv-lite": "^0.6.2" @@ -7596,7 +7455,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, "requires": { "once": "^1.4.0" } @@ -7604,14 +7462,12 @@ "env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" }, "err-code": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" }, "error-ex": { "version": "1.3.2", @@ -7632,8 +7488,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-string-regexp": { "version": "4.0.0", @@ -7645,8 +7500,7 @@ "exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" }, "extract-zip": { "version": "2.0.1", @@ -7833,7 +7687,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, "requires": { "minipass": "^3.0.0" } @@ -7841,8 +7694,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "function-bind": { "version": "1.1.1", @@ -7894,7 +7746,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", - "dev": true, "requires": { "ansi-regex": "^5.0.1", "aproba": "^1.0.3 || ^2.0.0", @@ -7910,8 +7761,7 @@ "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-package-info": { "version": "1.0.0", @@ -7946,7 +7796,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, "requires": { "pump": "^3.0.0" } @@ -7955,7 +7804,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -7994,7 +7842,6 @@ "version": "11.8.6", "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", - "dev": true, "requires": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -8012,8 +7859,7 @@ "graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", - "dev": true + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "has": { "version": "1.0.3", @@ -8027,14 +7873,12 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "hosted-git-info": { "version": "4.1.0", @@ -8048,14 +7892,22 @@ "http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "requires": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + } }, "http2-wrapper": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dev": true, "requires": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -8065,7 +7917,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, "requires": { "agent-base": "6", "debug": "4" @@ -8074,8 +7925,7 @@ "humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", - "dev": true, + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", "requires": { "ms": "^2.0.0" } @@ -8095,7 +7945,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, + "devOptional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3.0.0" } @@ -8103,32 +7953,27 @@ "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -8137,14 +7982,12 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ip-address": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", - "dev": true, "requires": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -8177,26 +8020,22 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-interactive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==" }, "is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=", - "dev": true + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" }, "is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==" }, "isarray": { "version": "1.0.0", @@ -8214,8 +8053,7 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "jackspeak": { "version": "2.3.6", @@ -8251,14 +8089,12 @@ "jsbn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" }, "json-schema-traverse": { "version": "0.4.1", @@ -8298,7 +8134,6 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, "requires": { "json-buffer": "3.0.1" } @@ -8400,7 +8235,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, "requires": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -8409,8 +8243,7 @@ "lowercase-keys": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" }, "lru-cache": { "version": "6.0.0", @@ -8420,6 +8253,63 @@ "yallist": "^4.0.0" } }, + "lzma-native": { + "version": "8.0.6", + "resolved": "https://registry.npmjs.org/lzma-native/-/lzma-native-8.0.6.tgz", + "integrity": "sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==", + "requires": { + "node-addon-api": "^3.1.0", + "node-gyp-build": "^4.2.1", + "readable-stream": "^3.6.0" + }, + "dependencies": { + "node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" + }, + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, + "make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "requires": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==" + } + } + }, "matcher": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", @@ -8454,20 +8344,17 @@ "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "mimic-response": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -8482,7 +8369,6 @@ "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", - "dev": true, "requires": { "yallist": "^4.0.0" } @@ -8491,16 +8377,25 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, "requires": { "minipass": "^3.0.0" } }, + "minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "requires": { + "encoding": "^0.1.13", + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + } + }, "minipass-flush": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, "requires": { "minipass": "^3.0.0" } @@ -8509,7 +8404,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, "requires": { "minipass": "^3.0.0" } @@ -8518,7 +8412,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, "requires": { "minipass": "^3.0.0" } @@ -8527,12 +8420,16 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, "requires": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -8541,14 +8438,12 @@ "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, "node-abi": { "version": "3.56.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.56.0.tgz", "integrity": "sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==", - "dev": true, "requires": { "semver": "^7.3.5" } @@ -8560,11 +8455,45 @@ "dev": true, "optional": true }, + "node-api-version": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz", + "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==", + "requires": { + "semver": "^7.3.5" + } + }, + "node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "requires": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + } + }, "node-gyp-build": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz", "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==" }, + "nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "requires": { + "abbrev": "^1.0.0" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -8601,14 +8530,12 @@ "normalize-url": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==" }, "npmlog": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", - "dev": true, "requires": { "are-we-there-yet": "^2.0.0", "console-control-strings": "^1.1.0", @@ -8627,7 +8554,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -8636,7 +8562,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, "requires": { "mimic-fn": "^2.1.0" } @@ -8645,7 +8570,6 @@ "version": "5.4.1", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, "requires": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -8661,8 +8585,7 @@ "p-cancelable": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "dev": true + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==" }, "p-limit": { "version": "1.3.0", @@ -8686,7 +8609,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, "requires": { "aggregate-error": "^3.0.0" } @@ -8724,14 +8646,12 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "path-parse": { "version": "1.0.7", @@ -8836,14 +8756,12 @@ "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" }, "promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, "requires": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -8853,7 +8771,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -8868,8 +8785,7 @@ "quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==" }, "read-binary-file-arch": { "version": "1.0.6", @@ -8966,8 +8882,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "resedit": { "version": "2.0.2", @@ -8992,14 +8907,12 @@ "resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" }, "responselike": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", - "dev": true, "requires": { "lowercase-keys": "^2.0.0" } @@ -9008,7 +8921,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, "requires": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -9017,14 +8929,12 @@ "retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "requires": { "glob": "^7.1.3" } @@ -9047,14 +8957,13 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "devOptional": true }, "sanitize-filename": { "version": "1.6.3", @@ -9117,14 +9026,12 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -9132,14 +9039,12 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "signal-exit": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", - "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", - "dev": true + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" }, "simple-update-notifier": { "version": "2.0.0", @@ -9165,19 +9070,27 @@ "smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" }, "socks": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.1.tgz", - "integrity": "sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==", - "dev": true, + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", "requires": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" } }, + "socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "requires": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -9229,8 +9142,15 @@ "sprintf-js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, + "ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "requires": { + "minipass": "^3.1.1" + } }, "stat-mode": { "version": "1.0.0", @@ -9242,7 +9162,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -9251,7 +9170,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -9273,7 +9191,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "requires": { "ansi-regex": "^5.0.1" } @@ -9323,7 +9240,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -9338,7 +9254,6 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dev": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -9351,14 +9266,7 @@ "minipass": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" } } }, @@ -9486,8 +9394,23 @@ "undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, + "unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "requires": { + "unique-slug": "^3.0.0" + } + }, + "unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "requires": { + "imurmurhash": "^0.1.4" + } }, "universalify": { "version": "0.1.2", @@ -9530,8 +9453,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "validate-npm-package-license": { "version": "3.0.4", @@ -9568,7 +9490,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, "requires": { "defaults": "^1.0.3" } @@ -9577,7 +9498,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -9586,7 +9506,6 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, "requires": { "string-width": "^1.0.2 || 2 || 3 || 4" } @@ -9595,7 +9514,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -9616,8 +9534,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "xmlbuilder": { "version": "15.1.1", @@ -9628,8 +9545,7 @@ "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yallist": { "version": "4.0.0", @@ -9640,7 +9556,6 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, "requires": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -9654,8 +9569,7 @@ "yargs-parser": { "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" }, "yauzl": { "version": "2.10.0", diff --git a/UI/package.json b/UI/package.json index 44711cd..45cf512 100644 --- a/UI/package.json +++ b/UI/package.json @@ -31,10 +31,11 @@ "devDependencies": { "@electron/packager": "^18.3.2", "@electron/rebuild": "^3.6.0", - "electron": "^30.0.8", + "electron": "^30.5.1", "electron-builder": "^24.13.3" }, "dependencies": { + "electron-rebuild": "^3.2.9", "semver": "^7.3.5", "serialport": "^10.0.2", "usb": "^2.12.1" diff --git a/UI/renderer.js b/UI/renderer.js index 1be2630..068e63d 100644 --- a/UI/renderer.js +++ b/UI/renderer.js @@ -6,7 +6,7 @@ const InterByteTimeoutParser = require('@serialport/parser-inter-byte-timeout') const {ipcRenderer} = require("electron") var port = new serialport('/dev/tty-usbserial1', { autoOpen: false }) -const CONFIG_SIZE = 18; +const CONFIG_SIZE = 20; const FW_VERSION = 2; var onConnectIntervalConfig; var onConnectIntervalWheels; diff --git a/UI/scope_generator.js b/UI/scope_generator.js index 1eb55e5..41c5136 100644 --- a/UI/scope_generator.js +++ b/UI/scope_generator.js @@ -1,5 +1,6 @@ var teeth, depth, radius; + function arcToRad(num) { return (360 / num) * (Math.PI / 180) / 2; } @@ -19,32 +20,63 @@ function draw_crank_scope(toothPattern, depth, radius, width, line, halfspeed) { var toothWidth; if(halfspeed) { toothWidth = (canvas.width / toothPattern.length); } else { toothWidth = (canvas.width / toothPattern.length); } + var analogMapMode = 0; console.log("Halfspeed is: " + halfspeed); + for (var i = 0; i < toothPattern.length; i++) + { + if (toothPattern[i] >= 10) {analogMapMode = 1;} + } c.beginPath(); - - for (var i = 0; i < toothPattern.length; i++) - { - var newEnd; - - newEnd = lastEnd + toothWidth; - if (toothPattern[i] == 1 || toothPattern[i] == 3 || toothPattern[i] == 5 || toothPattern[i] == 7) + if (analogMapMode == 0){ + + for (var i = 0; i < toothPattern.length; i++) { - if(lastState == 0) { c.lineTo(newEnd, depth); } - c.lineTo(newEnd, 0); - lastState = 1; - - } else + var newEnd; + + newEnd = lastEnd + toothWidth; + + if (toothPattern[i] == 1 || toothPattern[i] == 3 || toothPattern[i] == 5 || toothPattern[i] == 7) + { + if(lastState == 0) { c.lineTo(newEnd, depth); } + c.lineTo(newEnd, 0); + lastState = 1; + + } else + { + if(lastState == 1) { c.lineTo(newEnd, 0); } + c.lineTo(newEnd, depth); + lastState = 0; + } + lastEnd = newEnd; + } + + }else + { + for (var i = 0; i < toothPattern.length; i++) { - if(lastState == 1) { c.lineTo(newEnd, 0); } - c.lineTo(newEnd, depth); - lastState = 0; + var newEnd; + + newEnd = lastEnd + toothWidth; + + if (toothPattern[i] >= 10) + { + if(lastState == 0) { c.lineTo(newEnd, depth); } + c.lineTo(newEnd, 0); + lastState = 1; + + } else + { + if(lastState == 1) { c.lineTo(newEnd, 0); } + c.lineTo(newEnd, depth); + lastState = 0; + } + lastEnd = newEnd; } - lastEnd = newEnd; } - + c.strokeStyle = '#ffff00'; c.lineWidth = line; c.stroke(); @@ -63,30 +95,51 @@ function draw_cam_scope(toothPattern, depth, radius, width, line) { var teeth = toothPattern.length * 2; //if(halfspeed) { teeth = teeth * 2; } var toothWidth = (canvas.width / teeth) * 2; + var analogMapMode = 0; //depth = (radius / 100) * depth; - + for (var i = 0; i < toothPattern.length; i++) + { + if (toothPattern[i] >= 10) {analogMapMode = 1;} + } c.beginPath(); - - for (var i = 0; i <= (teeth * 2)-1; i++) { - var newEnd; - - newEnd = lastEnd + toothWidth; - if (toothPattern[i] == 2 || toothPattern[i] == 3 || toothPattern[i] == 6 || toothPattern[i] == 7) - { - if(lastState == 0) { c.lineTo(newEnd, depth); } - c.lineTo(newEnd, 0); - lastState = 1; - } else - { - if(lastState == 1) { c.lineTo(newEnd, 0); } - c.lineTo(newEnd, depth); - lastState = 0; + + if (analogMapMode == 0) { + + for (var i = 0; i <= (teeth * 2)-1; i++) { + var newEnd; + newEnd = lastEnd + toothWidth; + + if (toothPattern[i] == 2 || toothPattern[i] == 3 || toothPattern[i] == 6 || toothPattern[i] == 7) + { + if(lastState == 0) { c.lineTo(newEnd, depth); } + c.lineTo(newEnd, 0); + lastState = 1; + } else + { + if(lastState == 1) { c.lineTo(newEnd, 0); } + c.lineTo(newEnd, depth); + lastState = 0; + } + lastEnd = newEnd; + } + }else + { + for (var i = 0; i <= (teeth * 2)-1; i++) { + var newEnd; + dataNow = toothPattern[i]; + while (dataNow >= 10) + { + dataNow -= 10; + } + dataNow = depth - dataNow*.1*depth; + newEnd = lastEnd + toothWidth; + c.lineTo(newEnd, dataNow); + lastEnd = newEnd; } - lastEnd = newEnd; } - + c.strokeStyle = '#0000FF'; c.lineWidth = line; c.stroke(); diff --git a/ardustim/ardustim/ardustim.ino b/ardustim/ardustim/ardustim.ino index 05b8b75..b5c82f3 100644 --- a/ardustim/ardustim/ardustim.ino +++ b/ardustim/ardustim/ardustim.ino @@ -49,6 +49,8 @@ volatile uint32_t cycleStartTime = micros(); volatile uint32_t cycleDuration = 0; uint32_t sweep_time_counter = 0; uint8_t sweep_direction = ASCENDING; +volatile bool analog_map_mode = false; /*mode to convert cam signal to analog for using MAP as CAM sensor */ +const byte portD_1_mask = B11111100; /*mask for analog port to not step on serial port*/ /* Less sensitive globals */ uint8_t bitshift = 0; @@ -120,6 +122,7 @@ wheels Wheels[MAX_WHEELS] = { { BMW_N20_friendly_name, bmw_n20, 1.0, 240, 720}, { VIPER9602_friendly_name, viper9602wheel, 1.0, 240, 720}, { thirty_six_minus_two_with_second_trigger_friendly_name, thirty_six_minus_two_with_second_trigger, 0.6, 144, 720 }, + { eighteen_minus_one_ABmode_MAP_as_CAM_friendly_name, eighteen_minus_one_ABmode_MAP_as_CAM, 0.6, 144, 720 }, }; /* Initialization */ @@ -202,6 +205,12 @@ void setup() { ADCSRA |= B00001000; // pinMode(7, OUTPUT); /* Debug pin for Saleae to track sweep ISR execution speed */ + pinMode(2, OUTPUT); /* pins 2-7 for R-R2 DAC */ + pinMode(3, OUTPUT); + pinMode(4, OUTPUT); + pinMode(5, OUTPUT); + pinMode(6, OUTPUT); + pinMode(7, OUTPUT); pinMode(8, OUTPUT); /* Primary (crank usually) output */ pinMode(9, OUTPUT); /* Secondary (cam1 usually) output */ pinMode(10, OUTPUT); /* Tertiary (cam2 usually) output */ @@ -210,6 +219,7 @@ void setup() { pinMode(53, OUTPUT); /* crank */ pinMode(52, OUTPUT); /* cam 1 */ pinMode(51, OUTPUT); /* untested - should be cam2*/ + #endif sei(); // Enable interrupts @@ -258,8 +268,35 @@ ISR(ADC_vect){ ISR(TIMER1_COMPA_vect) { /* This is VERY simple, just walk the array and wrap when we hit the limit */ - PORTB = output_invert_mask ^ pgm_read_byte(&Wheels[config.wheel].edge_states_ptr[edge_counter]); /* Write it to the port */ - + /* OR output the crank signal and then output the MAP value*/ + + if (config.analogMode == false) //normal mode + { + PORTB = output_invert_mask ^ pgm_read_byte(&Wheels[config.wheel].edge_states_ptr[edge_counter]); /* Write it to the port */ + } + else // analog map mode + { + int x = pgm_read_byte(&Wheels[config.wheel].edge_states_ptr[edge_counter]); + if (x >= 10) + { + int y = (x / 10U) % 10; + PORTB = output_invert_mask ^ y ; /* Write it to the port */; + int z = x; + while (z>10) + { + z = z-10; + } + PORTD = portD_1_mask & z *28; /*mask out the serial port pins, and write the data to the port */ + + } + else + { + PORTD = portD_1_mask & (x*28); /*mask out the serial port pins, and write the data to the port */ + PORTB = output_invert_mask ^ 0; /* Write it to the port */; + } + + } + edge_counter++; if (edge_counter == Wheels[config.wheel].wheel_max_edges) { @@ -326,6 +363,7 @@ void loop() if(currentStatus.compressionModifier >= currentStatus.base_rpm ) { currentStatus.compressionModifier = 0; } setRPM( (currentStatus.base_rpm - currentStatus.compressionModifier) ); + } uint16_t calculateCompressionModifier() diff --git a/ardustim/ardustim/comms.cpp b/ardustim/ardustim/comms.cpp index 63eb966..983ebb7 100644 --- a/ardustim/ardustim/comms.cpp +++ b/ardustim/ardustim/comms.cpp @@ -31,12 +31,12 @@ /* External Globla Variables */ extern wheels Wheels[]; +extern bool analog_map_mode; /* Volatile variables (USED in ISR's) */ extern volatile bool normal; extern volatile uint16_t edge_counter; extern volatile uint16_t new_OCR1A; - bool cmdPending; byte currentCommand; @@ -191,6 +191,16 @@ void display_new_wheel() { reset_new_OCR1A(currentStatus.rpm); edge_counter = 0; // Reset to beginning of the wheel pattern */ + config.analogMode = false; //default to standard mode */ + while (edge_counter < Wheels[config.wheel].wheel_max_edges) + { + if (pgm_read_byte(&Wheels[config.wheel].edge_states_ptr[edge_counter]) >= 10) /* lets see if any values of this wheel are 10 or more */ + { + config.analogMode = true; /* we are in analog mode*/ + } + edge_counter++; + } + edge_counter = 0; // Reset to beginning of the wheel pattern */ } diff --git a/ardustim/ardustim/globals.h b/ardustim/ardustim/globals.h index 2482564..e5b00c4 100644 --- a/ardustim/ardustim/globals.h +++ b/ardustim/ardustim/globals.h @@ -46,6 +46,7 @@ struct configTable uint16_t sweep_low_rpm = 250; uint16_t sweep_high_rpm = 4000; uint16_t sweep_interval = 1000; + bool analogMode = false; //11 bool useCompression = false; diff --git a/ardustim/ardustim/storage.h b/ardustim/ardustim/storage.h index fd27b35..9814cb5 100644 --- a/ardustim/ardustim/storage.h +++ b/ardustim/ardustim/storage.h @@ -10,6 +10,6 @@ #define EEPROM_COMPRESSION_TYPE 15 #define EEPROM_COMPRESSION_RPM 16 //Note this is 2 bytes #define EEPROM_COMPRESSION_OFFSET 18 //Note this is 2 bytes - +#define EEPROM_ANALOG_MODE 20 void loadConfig(); void saveConfig(); diff --git a/ardustim/ardustim/storage.ino b/ardustim/ardustim/storage.ino index 491a4ee..a1e5ffd 100644 --- a/ardustim/ardustim/storage.ino +++ b/ardustim/ardustim/storage.ino @@ -25,13 +25,14 @@ void loadConfig() config.compressionType = COMPRESSION_TYPE_4CYL_4STROKE; config.compressionRPM = 400; config.compressionOffset = 0; - + config.analogMode = false; saveConfig(); } else { config.wheel = EEPROM.read(EEPROM_WHEEL); config.mode = EEPROM.read(EEPROM_RPM_MODE); + config.analogMode = EEPROM.read(EEPROM_ANALOG_MODE); byte highByte = EEPROM.read(EEPROM_CURRENT_RPM); byte lowByte = EEPROM.read(EEPROM_CURRENT_RPM+1); @@ -121,4 +122,5 @@ void saveConfig() lowByte = lowByte(config.compressionOffset); EEPROM.update(EEPROM_COMPRESSION_OFFSET, highByte); EEPROM.update(EEPROM_COMPRESSION_OFFSET+1, lowByte); + EEPROM.update(EEPROM_ANALOG_MODE, config.analogMode); } diff --git a/ardustim/ardustim/wheel_defs.h b/ardustim/ardustim/wheel_defs.h index 0f44490..e4368bf 100644 --- a/ardustim/ardustim/wheel_defs.h +++ b/ardustim/ardustim/wheel_defs.h @@ -63,6 +63,14 @@ * eg 3 means crank and cam1, 5 means crank and cam2, 6 means cam1 and cam2, 7 means crank, cam1 and cam2 */ + /* for analog output to simulate a MAP sensor being used as a CAM sensor. + right hand digit is map pressure, left digit works like other modes: + 0 means no tooth + 1 means crank1 tooth + 2 means crank 2 tooth + 3 means both crank 1 and 2 + */ + /* Wheel types we know about... * This enumerations is the INDEX into the Wheels[] array of structures @@ -72,6 +80,7 @@ * RPM scaling factor (num_edges/120 for crank wheels) * Number of edges in the edge array above, needed by the ISR */ + typedef enum { DIZZY_FOUR_CYLINDER, /* 2 evenly spaced teeth */ DIZZY_SIX_CYLINDER, /* 3 evenly spaced teeth */ @@ -135,6 +144,7 @@ BMW_N20, //BMW N20 58x and custom cam wheels VIPER_96_02, // Dodge Viper 1996-2002 wheel pattern THIRTY_SIX_MINUS_TWO_WITH_ONE_CAM, // 36-2 with 1 tooth cam - 2jz-gte VVTI crank pulley + non-vvti cam + EIGHTEEN_MINUS_ONE_ABMODE_MAP_AS_CAM, // 18-1 using AB signals for crank and with map sensor used as cam signal MAX_WHEELS, }WheelType; @@ -201,7 +211,10 @@ const char BMW_N20_friendly_name[] PROGMEM = "BMW N20"; const char VIPER9602_friendly_name[] PROGMEM = "Dodge Viper V10 1996-2002"; const char thirty_six_minus_two_with_second_trigger_friendly_name[] PROGMEM = "36-2 with 1 tooth cam"; + const char eighteen_minus_one_ABmode_MAP_as_CAM_friendly_name[] PROGMEM = "18-1 ABmode MAP asCAM"; + + /* Very simple 50% duty cycle */ const unsigned char dizzy_four_cylinder[] PROGMEM = { /* dizzy 4 cylinder */ @@ -1486,4 +1499,21 @@ 0,0 /* 36th MISSING tooth */ }; + + + /* V-twin using AB mode with 2 crank sensors and map sensor as cam signal */ + const unsigned char eighteen_minus_one_ABmode_MAP_as_CAM[] PROGMEM = + { /* 18-1 AB mode + MAP as cam */ + 29, 8, 8, 8, 7, 7, 17, 36, 26, 5, 15, 34, 24, 4, 13, 34, 24, 4, + 14, 34, 24, 4, 15, 35, 25, 6, 16, 36, 26, 7, 17, 37, 28, 8, 18, + 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, + 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, + 9, 19, 39, 29, 9, 9, 9, 9, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, + 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, + 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, + 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, 19, 39, 29, 9, + 19, 39, 29, 9, 19, 39 + }; + + #endif