From 609af8d96bde06e4bfb799964993ec1fbf1819e3 Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 14:19:24 +0800 Subject: [PATCH 1/7] adopt the swagger-stats as API operation metrics collection tool. FYI: https://github.com/slanatech/swagger-stats --- bundler/node/assets/Dockerfile | 1 + bundler/node/assets/app.js | 4 ++++ bundler/node/node-packr.go | 2 +- packrd/packed-packr.go | 6 ++++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bundler/node/assets/Dockerfile b/bundler/node/assets/Dockerfile index 08e99a1b..776e920a 100644 --- a/bundler/node/assets/Dockerfile +++ b/bundler/node/assets/Dockerfile @@ -2,4 +2,5 @@ FROM metrue/fx-node-base COPY . . EXPOSE 3000 +RUN npm i swagger-stats express-to-koa CMD ["node", "app.js"] diff --git a/bundler/node/assets/app.js b/bundler/node/assets/app.js index 83f2f0f3..608114af 100644 --- a/bundler/node/assets/app.js +++ b/bundler/node/assets/app.js @@ -1,9 +1,13 @@ const Koa = require('koa'); const bodyParser = require('koa-bodyparser'); const cors = require('@koa/cors'); +const swStats = require('swagger-stats'); +const e2k = require('express-to-koa'); const fx = require('./fx'); const app = new Koa(); + +app.use(e2k(swStats.getMiddleware({}))); app.use(cors({ origin: '*', })); diff --git a/bundler/node/node-packr.go b/bundler/node/node-packr.go index 3f72edb3..bd6f8bb6 100644 --- a/bundler/node/node-packr.go +++ b/bundler/node/node-packr.go @@ -5,4 +5,4 @@ // and any other packr generated files. package node -import _ "github.com/metrue/fx/packrd" +import _ "github.com/metrue/fx/bundler/node/packrd" diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go index 0729ef26..e902914f 100644 --- a/packrd/packed-packr.go +++ b/packrd/packed-packr.go @@ -21,8 +21,9 @@ var _ = func() error { "0fd3585b12c2916bf0172d593098c679": "1f8b08000000000000ffecbdeb6e5d39ae27febd9ec2c8a7ff1f3371f32251e200e7490e1a014552a97dca978c2fd595f3f483b5b6d39ded6dd73466af15a4e74c7d2ad88e4451bcfc48915cfffeef5fcc7fb3cff9d7bffe7267b779f56f571f863da6940fbffc9e0f8f87fbbbe54770add7fce197c7fbe7075fffe6213f1f1e9f1ebefeb75f9f9ebe3cfe8fbffce5f3e1e9d7e771edf7b77f79787e7cfa7863779fffe20ff6948fd787fb8f87bbc83f3efc12f925ef22effc908f57ff76f5efbf5c7d185f9ff2fe21f2e10aafe9ba5dfd7fff474bffff1ffefb2f571f1e6de66dde5ec1355fc3052bfdf5975ffe69c6205cc3cfce99f7ce73789a37f6f9f1d589da2607fae777c46bb82ebbedf88d89afb6a4ebb6e796af795aae117f7629b9fa70b8ff3dfd0aaef19ab69736f7b35ba7bad71df8fcfcf1305fabeab5ecb6dfcdfd73d838bcda1176b39a2f8a74b52acf0e97757fffdb215ff30f773375ab65bd5addcc4512fc70b8fbbc08305fd78bd6793adce6aa08e5123f72f5e1f9e1e60aafdb2efaf470fff838d26e3f3e3f1d6e5e1b1cb9dec9de1c356be58d6c7fa8c8df0f8fafe58ef612bbe36e9ffc3ef273de5dad3b5d74dd7f5ff0212f5eed4f39f48de61fcea90d0e76f5e17f3edf3f2debc835eec9a1871f26489b99e3ab0f5f1eeefde3adf9c33d5d2db8812e5b6e23565f7d78fcba2808d66bdac196cdc34d2e26f7ecbeb6c085fb19b1ab0f3787e1ab4294cbaee921e3fe8f4f8f5f1fdd6e6e8e8ee71247f81e9b1ff3f7bc7b3ae3326e8185ff4c2dd6a0e22206bd90fef1f1ebe34f736d7fcee585d45d00e81b8cdef73ccffeebe3c13efee7e1c1ef5f7b1cfee911eeeb03bc88105f8434ff2956bd2101dbb0eb9dbd9f9e1fce024fdc31c85a96b08757700df73ce3af5fbfbc8ae4d7040c6e71c43dc3926f9cbac20be5eeeac3f29b67fb9c1f9f8e86952e8a2dae3edcdc7f5eb5412f5ae5f6182fd18576f9eef9f6937f795e94be5fe830b68ae09e1eecf0743ffe23fd695deec2d5be7e491b37797192e5eac3f3ddc16d15a972e94afb05a987b8b3338bb493b6deda93ff9a4778d02f66ed7de4c77188c3aa1c97f99f6fcbdddd3fdcdacde13fed6961c642e60e49ddf5f7b7f6e53cd9b697513edcdd3f1de6d71f9580d81418ac2ef3a88c97258c5e98f0777c7aa191df28acb83ddc1f63bfcbccf2d3fd6fcb0feed7935d18471ed77a48f3a7fb87fd94e0efb771667d76c2abbb42f035317f8eec7ee6935c7df8dbe1cebe1cd6952e31c7efb1e4d19e9e5e1b1dbcd6ff9730b8f0b6788fbceee1e9fe350e28fb8509bfe5c35dde30bda1ffb497d66c24eddf16fa389e0f377134b8db5fc74910b10b87ded9f63fbf7e7a7cb2a7c3ebb7c06d32b3ef6eea797373b6e316f8e4ed1d0fe3b5b15ef47db7edeefdb74ff6e5f5dbe36e38fbfe6f7787bbcf9f1e72ae09ea0bd3ca7eff253f3fdb43ec9593b9b9ff7c9684d9c94b1c63e9b287013d3f45d92b99b8ef0bdf4b947626ac7d2ff5b8cd5bfff53469448b55fda999b71d507839f627ff35fdb795ae4b029df72ef5adb79bbd72dd1b24acde3dc6fd7914bbd3314e53c5171bbf5db2dc5b55049d22b22d92962f3e7dad79ba041f6da7675bd8fe5502ffb65273d9a1eef289d665f8b2eb7fbcb1b19eea3272f68d046f0ff71ff38fa7077b7c65e4612f04b4a5f86d25365be47936b9eef76fe96fe70fcffbdccfc6d6662b6dda2e447ca44fdf9d6e87db5a8e7c765bbc53eaeca7c34cfbe642de4897976bd80b2e6d992e7fa9d239b2788b728ea3f85e56b4bc6d65c84be6f8684d7f2ac8f3733d09fcc3e95ead8ef6327db39bdfe2f070451757b0efacb92fcfd3af52497dafb2c25ddf14fe91c6394b2cec749cc7271b37f929f221e7a7f55dfd0af7c96f7eb187df96c3dddcbf2e7693bd4a0abf65e12e0eb14fa8ff5671cb3b73e9ad6a59de0b9e6df60662777105d7f542762fbff64fdf8ebe029dcb50f4addddc1cc366f9a9cdd997b4b362aabd9e4796bdbe2bb4dfa5c3e8fb3d7ed8b9feaf2ed7de3a7d78f5e1abdd3d1e2e7e377857001e7c818279e7f771b8fb7c5603b3db93cf776270e64d69278ff3adace88f435c5c99f60e4357713c4f89ee840f36d5a5774eb4f88c5707aa7ba589be35055ead8d801b26773748ec6ee983ffd1167499add9d7dbfd9dd21f5511f03d6b76e9477fef44bcdf63fa49d9c9998f2dbb55743cbcb6e6c71ecf9df4d6af8eddc917bf51bc143bac79e2cbfcf956fafa7cf7b4fc45c60a327600610ff7fe5bbe8ebaca357c7cf0bd14edef65fa081772f95854b67ad3cbeae1374aebaf4fd757746190bc695dfd02b23778103c8ac97711c13711d962d5e51f6eb5e4a2c1b9c11bd866fd08f7b7372b399709e85eb8beeee2e84e84e587da966333f1063dcfebffdeda97a36bf93982c41dd4e55f53aeee9e1e0ee387cad5360ee2e5b1627d3eda401236b399f910b90a7abf308bb12cf4e93f1eefefd6d52e7a7ffd73195856fba102709cb072759caa725973e1d72ff970f5d208f9b3d8a88d60c2eb8cce4ad9658e78c3f4eccf860d7e404668f93767711fbc1dff6e6a534e6df54f6aa9221f0ebfffcb58beefdf3dce8b3d767a03ccdbdf576ba5bb48e7d7e7b383ec36e7ed65dae08f4bbe3cda6d7e9c879bd70df7db8ccf7bb7a7659d2fb55727ca3feaff7fdca484a30c9e0db8dcebd57bddede3daffff70f12494f7d8f8fd263f6e9ee36aa5cea4b1efbbdf8b95dd67dbff724f7cef0ad437ff73c6e7bdca000f4ff7b632f8c211805f9fd770fd4268b70d30788fbb37761e6eeef638f90df19e3de4ed34f6e9f9ee21cd7f5de75c2c1cdc838167a544afc4749b069ff7f63e7b14ddf3f6be9e15332c2aff5fcbd6fd80c8e68df9734b40f6939740fd6bb5811f873fe41fe9cf4ff7e7b5473bbde76d36e6e34f4f75d63b86bb154aac13a68f7987cb120f1b0e40d9b1f7f56464c81993777262afc6eb6e5010be25b3b77d5bfe997a90b67caafc477deb4ad965a676a35eb85313b8c10bc976c379de55bfdbd7a51e65af0efa7d61f777b3dcdeca61ee83dfbe8d7cdba522f5cd1d5f26c3bd42c465af978c1fd261fefd48b6b34cd14ee9afad06cafd6f8e7432166e17f7f6a7dbff71789d7adb5119be0b0dcff20a3b81a5dfef0f71f183d6bb57f8524d75165aefa7dc0faf27d9b4bd14fb1077b68183da6e2ee3e6af81ef5ceb8945db254a797bdbfb57aab8ebd8c697a6bb573df3dbbc97bce5d9bf3d5e6cd088ba5190fa431e388e5b9cbd4aed36eee6cdfd78afeee217061ea4cbc72ffef16f87bbb8ffdbe3c7cf77cf1bcc867a59fc8f2e9fa46cbdfc9f5ed771fada793cbfefa5bdc5c65d7a33ff8c8645177639f89fcdccdb25d9f467e2f303d9faf7590d3f6afac5bfd424c2b5beefc7ddc65bdbd58db6bbcd270b7bb2bffef261050e8fcfb757db94a62f6409e1f4963e3a409f5da2cda1432b57f110254fad584607eb12bd0ed636998c28ac0d4dfaf0165597ccb55f882a5d431c320807620077671ce2e9eea68d536a341ec6237afa50a36163d65a04a548e113a2b6f958c842965960576e26d4d3c586074960e90a48ee90d89db069278459146d8a46868ede1141e24db22e832d2bbaa20ea5599359a40b35b786ad497ae488c6645c88a1e3f459916aed7578342fdabb78e2e9156ef4d9bf852e2db3f798c446b5601b16ae443660d686e28ecc90bdcd8611a1043cd8d83dd43366abf19aae8b53d3ab68814572501360271f5c6a0e50244b2f822691de12c48a65e9b5ab42c90e9db97ab369df13757943cf42d1c4aa31a3300b7b09e850ab416bc0399a71011910b6fca6f6122a2ad5988462b06ba09c50b4c5c89bd57c751a4307f50488651f5677e094e2593c0d262ebfe719599427f870805e1a05d188594e88daa65f71212b627a1d6a56a35468e6367ba3c88650316640326817c8de5524979f66115ad869e6659e90b549a5ec1a4f15a9b323979c462aa3386a0c2ea1a0c2cd078d09b3994d42524de2c4befca979adcd4fa9daf47d60a1ce6b5564776aaad8d06a5db8d414bb83f1c22b4701289d8014c7e421dc55741403eca7f2b549dbc242542b09651805b0d769105a8b83e0f4eeead4fbb0b098d3a9518ed19b34b5aebd482467f039511b7d6e6f157e11cfd194ba9bb2e9c870094841b26e50a840e9036ce06c551b0e020ec042e0506bb43789bbf80b77eb5dce825e75108d9a9c0e69b57aeba5659d5c7b7081c9d643a2b2559f656295a2d2a64ae927946d347669758c14b33a5af732925ab606ad750d2f6429559ba4c0602d368394030baa0dc5da7931292722b6d108a7955b658c311bd65e2c33a009028c2a52cdb12447af998371c618a5ce110573aa495fb8eb50df206b837150abc5b0d628589cb9073403a6a8dcaab14cac53ad41e1b198d5eed93c536a4fe0e6024cbd9d98d74d7bb8573c91da845d3487590ac330aeb395de7b8c22358b26551d8663c168d6026416036982353abd4fdc06d343170239dc4c2d5ba31a481e6301a616aa56b8c468308a7487057c614b408a2ea33a022e66f8540bb6793d5da1856693cac9adcc8400478a2c5461c28821201d46f70e99516bf7eaad72cf74f5ae4938be27ebd76dbeecb49095bd7119e03378382702a6574580e57f9d323d50a91301656f1dfa60e0364aa1d69af51353bb4d4fc8eac927f8225da36190c8501cc53a23a209060d2d199434d2808a57a6a1cce173766959bb7f4fd50609e555acfa04cde5b6708e5a6764e2c4561a587480b0d66c56ec62684d1c488634e5da47cb5e4a9e90b44dcbcbea2ab3a335873a9bd6d66338d6a61c7dc802337418d328b53500cec936d114bda034ed5e7b9c92b5c518ba238e1eb554d6c98a10327b9963b19d857386249b4996098b57140726ad4d903ad5aa5a1af637a8dae02337abbcb76268d69b57b59c5372923b4d138a82c30bcf5ab4d2ac552a499581dd8066d45c825e38a16c8339c5abb48f942cd8b20568ab31a4220d85a692dd9388b154f392cccead65b142bd932d40760c38e5d616cde42ba318add312172aa7ab28172d6152e798d41d9ccc048cd2d2a986d79e3419b5526acd3855c1cb8b6c57bfc820938b14ad3879c1a981c48d83d19bce11958258b2665799a13455d2dbb031c60231be2769c34189ab1a566842659096ce85d16181af7d891bb3bb89c730e54e63ce1211305b51a8b24042013d55c39b0d3fb6b7e22fc5e8bd0c11691e02324635513370d5611dd110eb74e98a351b5449876e45521955ed94b6ad6a8056cab815ef3a3446ad5d179361ad3826f72e181a990e037014a8d6a9a2a4468d5ca29148c3d7946d301e79216bb9c590699a59400d6ae15a6c7ae14a0386e66c6e44e4b2266fc8479a660b1a935be793886d8b9acb55f64189b5b4d98b55542bd5fbcc395a040eceeed05b69aacc1d6df14d4da259a751502be329abb6991a784c10e698c88a53cc2d04b27a1f851b484496da2966ab0e22da6d945211032ba00ca752c84fc9ba74c6fe6ab750b347752ec60949441ca327084ccd4eb280fd517d91f76225535516fa88101da88c738a2ea9515b038d5ed2cba8d4b482596763d256cb008c913c6b67c140af39cd03a784745f8c2d74c3e627f1cf36cfdaabc59ad3ab57e65e44a304a7610b129dd6d3b822595069549a338ca098a2299d4133c04e9dce262343d6d8da3807004da85c957422aa4ac7820d4873c17bc52c1cbc59212aa3c848556fb386d869366283af83aec6c084647493c81a4bf497e8662023462163ae9659ad9745c82a1431ce6e03db3030b68453922eae565caf0ea508334e12d48140e2ce40b337a3d1879445fe2542945b2f0b5fdcbb274c2e6d16a657246d335277857d928d0dca114f55183d3a1072892a516b314d27251a53dbf29f77a86935720a7a96d7bcbaf4a3040b49dd71d2e4813e993152ba8ad998ab27a9e1a6b0e03a571570b79666b34037aed55251bf27698b91ec2b9ba856089da30d915e4ca240099dd6a882530e9222311b2f5601c4a68384676ae2f0d94f546f93610c2ba31aa7cfe88eade8622519660164d2c0b2007546f29eb52a34545f3533eac4862d3ab453a2b629a73de627d19889b20c370d5acc921ad60594dbf0059606402dba40a962d45a5f38670d6c51c01391daec1b52c778decae869844d538c925a415ca26803755bd48fa113fa94aec5c59bf722cd7a66cb892781f37635c3eb93017458802628000f521cd6aa84b76ccac859d19d51a4a5169b237b6991b328142a1e59dfa16c8ba9c02be88b365b4a8ef0a61973ca0c1fbd59ad4308b095d94cbb26e7601c528971169bb54d80711adb6f30f061153292a0a194a581f09c9e0d8293078e2522b38984a60931a0b9713771479fe0deeb9c545f93b4d1ccd935edc012a3182af9e2e54ace1ce025114d6909b14ba7e2cec347701bc67356a402ce359a499e92b66925db4a1e024204259a33471d45ac8e82bcc4d0ac7d892039814567cfe8569344263696c55ff1092cddb00d6cf5924d50455b27998c8bb9486da5d4661306e968c4590535113995b58d3e3ab98ca0ca134e2cff262d650b5195a71119aa961130951b2d301d85a0453792d62c80a90e683c577c464d60c21c42a39e08ff0693a857c05ca478f4deb28b7a845bf6a6b46063c620f6961115a5018856813eebd0eed2320119cf48da6230e71af1a8e002f2bc04768d392acc69ca0463e224d311b5a40fa5a6348796d6a6aa21943a991bbd47d7255331578caa50878c064dd31b0fc612c55be90d708a32e6683a439b8b7437e3895dd74719269738093036eda45be3b1a661ad424f3561054b9b6d8e00b20e30c3a58cc63389a04490774b91200a8d6a71faaafeb09888e3c8cbcb5e0cbcc4906e945c27176d5864b42c5538668bd21a1b156662f09a6594d2997a32b602a5f693fcc376e35d56d137536d693d5207164432e33e688841fae4948a7392430f9a31b997694deaa8539d5cfb39655bce165c7db94b9f0aa59279ef2e8e09644a6460c439c122a14fb5d955a14a802beaa03aad35397596db0fb339deae8b71f3d116c82f3953a4f449013654db12c9dae89d1534ad4c1b3947c7682ebd462ff80685bf6e341a6e75ed2d6aad9e5d97d855162f10b30c4fcaf41e521a72946a5494bc1a0b55e7695667431d7092cb79d87066ff319fd99313cc87b8ce41b50fd421cd47b711c20eb0e833f58a6ba084158bd42265a602c3a9625c3c80605588a1a9a37b2475329d295628a24847461d73082f5868f405c66a61759905a165ed56649ebc9dbd4caad9c0e2f6702b95a97453f101ad68b2b8c74c1a304ad6628263e6ec3a87b67421ccd1134c39424fa9daa6227ca56b12781959d9bae19cc571e2a011586a83a0295c847a036d952634a0f4081a3cd52ac929b7b6fa24edb1b68a6a9f9505d026e2728b3a1b51219a925ca87aa50142a55af5a9c34115fa58b0774d3a256c8bd949abb4475bc46b9263174105722f2d2bd785808aa375f3a05ac21a06b7ea34a511845a81027c4ed436e36d8e8f7bdd3026554e37e8b5c2c829de88957c667306c53266c198954487741f2173f6591bd82bda36e8265c19561d0b4e6f402d82a45a690e0a6376293e8546595c2b511fc367c98a06ae8b4a04cf96f38ca88d26851dab0a6b24437361a091ce5dbb577463a0e95aac198ab69cd04b9d9e29a5f4c9ecc04445fd9cb62da68ead069f9b7bc848cec019b3a066f6d267f356fb1a52422dd13cd8920520795882c5aca2fd3451be41f7ed0afaa7b6262143bbccd60657179fbd88235a2c3f9c487d262cc883171fd4935badd98311e804946d344870cd6c364ee3c67d9456853b70ce8e45a9a6e84880a66adda11582917da8caeca97d0e5aa3d213b2b6fecad2f15dd4d0a805e7b42c5cd13b548446b1846d6cab9702e1eaacb5472719338d35aa8e5abcbf22f0e2a9896b54c9a5ba360ccc4938678c40606b55150c6b0e608132bd8fde2bb9751f057b26da6262e994a60d6629ad1995ec8334472584e1d5a7708660511f532da677328791401cbd71756c92d98a518cc5da7e4fd3165321d7bbeb5447420ee61986d6523a2045c5546fb3540c471365c56c331cb581c018ddab88b413e1dab47b7db511886d2c2a28633406b3513a97891053254b44ed920bf0675fc4af75e4d2c3d6caa63a22cf89bbbc13fe285c4a33c11a44f504ef9dbcb4d611c52b2e016f0cb36ecd17db15506aeb836dda0c0f233ca7eb657ec54adc65d6a2020da16a3e4a26b28fc1436174b70e8bf95c3c144798af31b088e46c15531006b439ea296d178f133f66085aa7c452a3ae610570ab5d6b9f20b916a50d8c5e0847e5820516f9ef333860cc10c913affd5d97fe85b37e561c3d036727afc205664c9449a695a38db032fb8c39872187f200e8a538d5da08110609b413c4faad957f836422168429537112060a92d492cd5d14174298cb54d0f049de14bc7412aa658ed165f67e5a20fad2ef7fb5f6f85ff812599ad4d91985472b536bf3a6cd42a9b2dbd43611780e9012acaa96a6557a804eefc6fc9aaa6f1dfb2b90be0ce1179d34025c8a74ebc4901883487dce0ea4846dc161ec4d5a5a0d813147146aa469b5447d8bb493cefb0d14530cb0c370c1e9d5b437e834a621e22cee5abdb8cdd9a636d5c9592426280a9b7233a33769bc7ce2d53179d188a13495808e3db9b6b428090081eaead88a0de27044503657d4059b1198589b7e4ad956e3dd8e789f3a426f6d66295d15637a9b106b6d5ad6a81d7a9f016935b96257a975f692d2b14cab724ad9361f37598d6cf5c05946499551c472f428bdd6180ba2d6112ab9962f88a18d5aaa32536f8252c8934e20fff3c3cdd5daa77f614fc56221202a2389b0e85a7c625626ab462b7d04afe5c8002312b3cc8953c0906070ad27398a2d6776ac612e968126ad8917575213a0c517f6e1ad5082b0d428c34796ee0c53ddad762ab341b8c609aede6060c38b325296de6b060f8749910a6912516a0e1f4364719133816b69d3620cc8b4a4d6a0f77642d2361fa85d19151a2d830b23911a96422a848c508d15a4897b51d721d66804ea646ce2da1349e7699dd5268d9eab3392b6dc826851d3d16b9b5c2a52aba988ceb314aab517729c6bfb1ab3d7ba606d0585deec4da22ee9e95d39458e0b669582494d7c1a6131a844e616b58dac5e6520f8e0d2077b456c315a9d6c5e069c13b54927eb1a720763cd4c1e5cccad346d83c2642067f44e2229214855c8c0cb9afd9f9d54a78beaf03748dbbe837e0d479c476f2e2c04852442872ae682689934e7aca50ef7310697c92341e79439c446c5d186bc41e806b31256caa6d70abd55f53a66a15e5370e6e84243a0b3f7d2c1d2bb9469d8ace38c7499a2a308da7883b23de6041c6b7c28895a2f18509b63267ad01c44d35a56ab0b41d9b3f469e4d634bd904f4765c45735889b7db97f7508553d672ea8a82b4da30889ac1d53b93160f45ac94759fcaac79cc0d5057bf3213cad9ec44e5b7c9773a549c07994eeeab1f061c18a83472fa30ee8ad404d9c862ea518da6465c812d3662a4796fe164d977cfb65b524d39bce6298ac8b717300e729423e2649456f0d2740aa639d49369c0b769011454634fcf0cbff0a0000ffff8f59f5d527af0000", "16a369da9061d595d672fbd8ca3bf170": "1f8b08000000000000ff64cd3daac3301004e05ea7106e5c49db1b7c92c72b94f5222dd892d91f92dc3e24214548390cf3cd9f0e17a48c528c34f1f80f4295d5e41ed73835b3531780cad6fc92711c20ae96f6d22bbc379947e2bed16d0a42e75e90d295adc535ceae8673f85c3cd3b75ed91680834586e8abcfb479c6fe4b8747000000ffff6d8cd729a9000000", "17bc9961cffa014e8d7ac818d8a3ec14": "1f8b08000000000000ff4c8fc16ac3300c86ef7e8a9f9e6c2826b09d0a39edb2edb08d959dc61866515a975449243bf4f18793a69bc020ebe3d36f678d7cc0634ac39e642231f13cf492f0bc7f7d59fb0f3e07d163e88c89fcd3e586eca6bdf853b771c6a84ca8b1c8d6a1e92134ee76ef3466d2b48590969b0e3d2b1900882d3ae2433a5aa1d137210587ba4635c35242ea3585941535eeab055077d54b0d41949aefe2a29edfeadfca48fc4ceca98f6c3f1f8e41ece4d0f6820991b1e67d39775b75dd71fba3cf6b679f78c869fb3fec4fd324910fb6bdd879be00e2c6946324b35599b6b8abaaca99df000000ffffa9ee463365010000", - "2c75a41a4116ea4ba707c129527fd11c": "1f8b08000000000000ff5c8ec10ac2301044eff98abd25116d0bde2c05ef5efc8558b7122ad9b869b122febbac0a091e67de63989e429ae0400e3a60bccd9ed1e8919cb6adfab2139d1f47c709f94fd908891f92ed9e3895de7e24574b9995612985aa1e16613fe862840e02dee593b1ad7231567342231be6a90088fdc5871de8955eab972d94fcd494f5b0c8bca4ab4f1306b36d9ac6b6ea1d0000ffffc9e8e169fb000000", + "2c75a41a4116ea4ba707c129527fd11c": "1f8b08000000000000ff5cd0c14ac34010c6f17b9e626e991593867a3314bc8b20f8046333094b4a669dd99248e9bbcb6a351baff3ff41beec51268bf02c040750fe387b652c47a1d2b5c54f7b97eef395d458ff912a95f05d567d14b5dc3d8d42bb745c89cd6f91e246d94cc3c05a590aabe4fd982b5e82b25915a5da2cec975cd5bb7e49ed16290438c0c473fa494c770aa13e1b23ef47bc6da9078e2fbeeb4e3c93325eaeceb9f60fa6f978290044fde0a74728efcafbe29a93f591303ff7cbef074fde224ff8d0348d6b8baf000000ffffc6e9b71c76010000", "2e6c11f0e86d189a5f33d2eda0bc7406": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02d482dcad14d4a2c4ee5e272747151d053d0e3e2728d08f00f765530363030e072f67551885602a952d251504a2c28d02b00b352125373f3f39462b900010000ffff0583b6ed50000000", + "3ca6a5d34279c5fa0304bfae8c908716": "1f8b08000000000000ff8c94d1aea32a14865fc570754e525b414434f10df6b93c73334cc82ad04aa26000f76eb3b3df7dd2ee89a94d4de692fffbd762fd287ca230c7a4e4c9bab30953b02ea11663c209e5bc6cea9a940c979cd63be4e734cd29a2f61361cc68c1cb8a114c18a7555396a8fdf9dd2ac37b5aed8bdcd9739f866bf60fd45463ce88ce48418abca8724cff15ee681d846b9bdd8b84537e1c6dca7b887d9b2d2554f31a2a46286d2a4e313be9a26a6aa62aae00035fca3424d33ef417aef731b5d98533c9680ed334985c43f8b04eb8600603d1b44f930af7f6f6e3bfecdd8468bd6bb3665f08877608fdda21cc1ad2344d419a8a1594635a71724b2ca55c3c94d6ac619435b46618f3baacf16219ec514ab90f833d2e0b7ddd5ec1b37ef83f9a100fa375fd0cee7cd8df8e6d9e0ec9fb41f5605d3cfc8991bfccaccd713e4b88d18464bd8bc24dc12b39820a5eb804e16c9284a0fa4ea0ef06022dba71da82eb041a6c4a835991f74ea007e104a31dae9d40b3b39747dd409a83e90452e37451fd19b3e34b7cbac4f0128ce3eb7e319a2d9d6c817203ac490f5142f2a3559d4098f04dc4b64849b6c8ea7c5764739b298597480e1eb48cc9df436ccdf9e47a3df2dab431fddab411646dfa9b91d6f17cbc7d72503e3e8893b72e99203fac4efdf3dea90f06b41cbc826111df8dd33e7402dd6fc3cd7dff2fbfafecd70ec5592913a3b9bd6a5f5fbf030000ffff6d24699f0d050000", "3ce2296391d96d76aaff2d829f1f612d": "1f8b08000000000000ff4c4fb16ec32014dcf98a274f586da9a58e563a66c8d00c19ab0e0f4c5d2801042f2955e57faf9c10c7b71cdc9dee20a2fac651c367e91933c718128109c2e2199df16277e5fe6685340a9b8317bbc3fe6d2fad56d433164fd21905ca61ce8031c21f0300a8722624a3e01ccc0047349e1f28193fbe7f00a631b7353ca3ae5d2a36b79bc88489f84bd7756dbf44b705bed00f4e27d880d73fb02d7c65638c22864cbc796e1e415181a7d7d5d0656cf90104696bcb5de48a8a9061f8e5edaa77c66c249d4f8e78d33cd457882bf320ed3a3fd5f3c426f61f0000ffff88067e0e6b010000", "46416dc28552c117e810b36196e043ca": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02da82cc9c8cfd34d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f6755148cb492cce56282acd53d0cd5030d0034305dd02880240000000ffff21aa3b6b52000000", "4a59b8f410ab9e2382c25781de92ce47": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd04dd14d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f6755188562a4ac94d51d25150d22d4b2d2acecccfb34dcd4d4a4d49494d89cf282929004b2516148055e816e41795805820ed4ab180000000ffff4c8673be6c000000", @@ -35,7 +36,7 @@ var _ = func() error { "76eca10e3a22b8409f5af0b284f82ee4": "1f8b08000000000000ff7ccabdaac2301407f0fd3cc59fec490af711da5e10a929115111877ee5586839a569318fefe6e8fefbf7aec23c6ceb3ed890348b6e9b3810e5aebec3c0b2d8b87696c7edb5b7a693d97e315d9d3f1607ff1b91bf9cc082761fa71e7aeac3d47084d26fe8a8a005212124c38266590c0b5179abddb9c45f9665447955e0a18c0d493de9130000ffff44ef0fc1ae000000", "93130b893788876c223c2a0f3de05793": "1f8b08000000000000ffccce41aac23010c6f1fd9ce2dbcda6bc577057a8579168a75a91a4ce4ca520de5ddad4780537e19ffc207c2af7695001db10836b602a2f574b91e9733fa8dc820f0f01f7f39f1e99c8c4d18c49bdc2aeae6ba2319983ff195d220038f98c16cfb58166f949ccd1eeb165f5251b5334c996bba079f0c916ca55e022a1135d65cb4caff5ece7650049ec88cef29bc3de010000ffff22ee4db77f010000", "973570cec900912c2cdd5c5531be70ac": "1f8b08000000000000ff3ccd410ac2301085e1fd9ce2d16c14c40308f122e2a276a674111acd4c3022de5d6262773fef8319470e931578bcc9013825796451833fa3e7e10f7a8fab4a93d69dd446cb5aa1559f171959d26fef59e1432c33e6b29bacec09f5fb653b7e3dde22bfe0312c1242c433a6c003c9caf40d0000ffff99b9e753aa000000", - "98bb98a34bd158dd2fdd41ca90f4e64d": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd0cdcb4f49d54d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f67551885602a952d251504a2c28d0cb2a568ae502040000ffff6c95391846000000", + "98bb98a34bd158dd2fdd41ca90f4e64d": "1f8b08000000000000ff14cc410ac2301005d0fd9ce293b513031ea1d65d4da9088ab818712c2a6d4226628f2f5ee0ed86d861d25a3eba7e2c3ca7bbf24d4c899ad89fe1e1a93df5f1d0621342a0e1b8c79c273c615f19472d6c55aa41975cd48c6be277126aba2d2eee8fb9159ce4ec5fe6aef40b0000ffffda8dd17f6d000000", "9d097ccc5e31491bd2ee70619fc36101": "1f8b08000000000000ff74cbc1aac2301005d07dbe62e82ae1417ea0bced83be855df40b26718ca97512922914a4ff2ed282a87897f79e9bd15f30109c9656a978cda908a412ec5813dbffa13ff46e242fad52797653f4e027ac15fe16b8290080bd8d2c70463e4ea49f27889c6731bb7c6490123900c2efb6d940a21b6c8c95b46ddab4efdabd6af7451792b930742c14a8d88ca552c7a2d1c0cf67ebf6e7aa56750f0000ffffeb12798604010000", "b3a2e75d2833aa5c271d28326dee512c": "1f8b08000000000000ff2a2e4d5248ab50a8e65250c8ad5450492ea950b05528cec84c2bb1e65250284a2d292dca5350cf48cdc9c95748ab50e7aae5e232b4e602040000ffffd1aa6a1336000000", "b3c5bd23d22e5631bb620a1ca277800f": "1f8b08000000000000ff7c8fc16eab301045f7f31513b2c1122f796b93f2015d768b1072cd90b8853119db55aa2aff5e01912aa551375ecc39be3377bba97b323109e59378db8ec68a6f4f9f47474c057664877556e034a4a363d5006ceb554b811aa04b2461b46222a178fb4eb17c346cade728eef50e06928eca3f2217a1ed48dc073dfadbbe05cf25c0e83bec39940029dcefd47a96b47e5ed56d3df910f36c9f15d87b194dc427cccc340dce9ae83cef673d2bb033d1cce82074ae32d540cfe8b8a34b2e74d638c71d7a0e5a2fcf0b9d13855829fc57fd6661f21ca8c22f40c405e73fb84f6ce7ccdd7fa5e00af39ed138ced54d5feb68ed8eec22e56a37fac4b706e253a4b0a997c31ab51b4c627bca550957f80e0000fffffd681223df010000", @@ -124,6 +125,7 @@ var _ = func() error { b.SetResolver("config", packr.Pointer{ForwardBox: gk, ForwardPath: "16a369da9061d595d672fbd8ca3bf170"}) b.SetResolver("src/fns/mod.rs", packr.Pointer{ForwardBox: gk, ForwardPath: "f2fd5f5fc855db718309059f09508191"}) b.SetResolver("src/main.rs", packr.Pointer{ForwardBox: gk, ForwardPath: "b3c5bd23d22e5631bb620a1ca277800f"}) + b.SetResolver("target/.rustc_info.json", packr.Pointer{ForwardBox: gk, ForwardPath: "3ca6a5d34279c5fa0304bfae8c908716"}) }() return nil }() From c957c8210532702f34c397d71b86dfca58773cc7 Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 14:52:47 +0800 Subject: [PATCH 2/7] no need change --- bundler/node/node-packr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundler/node/node-packr.go b/bundler/node/node-packr.go index bd6f8bb6..3f72edb3 100644 --- a/bundler/node/node-packr.go +++ b/bundler/node/node-packr.go @@ -5,4 +5,4 @@ // and any other packr generated files. package node -import _ "github.com/metrue/fx/bundler/node/packrd" +import _ "github.com/metrue/fx/packrd" From c5f11998bd58c8c489d715914813d38854d657ec Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 15:27:31 +0800 Subject: [PATCH 3/7] naming --- bundler/rust/rust.go | 14 +++++++------- bundler/rust/rust_test.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundler/rust/rust.go b/bundler/rust/rust.go index 12ea29fa..df1c0e6c 100644 --- a/bundler/rust/rust.go +++ b/bundler/rust/rust.go @@ -5,28 +5,28 @@ import ( "github.com/metrue/fx/bundler" ) -// Julia defines javascript bundler -type Julia struct { +// Rust defines javascript bundler +type Rust struct { assets *packr.Box } // New a koa bundler -func New() *Julia { - return &Julia{ +func New() *Rust { + return &Rust{ assets: packr.New("rust", "./assets"), } } // Scaffold a koa app -func (k *Julia) Scaffold(output string) error { +func (k *Rust) Scaffold(output string) error { return bundler.Restore(k.assets, output) } // Bundle a function into a koa project -func (k *Julia) Bundle(output string, fn string, deps ...string) error { +func (k *Rust) Bundle(output string, fn string, deps ...string) error { return bundler.Bundle(k.assets, output, "rust", fn, deps...) } var ( - _ bundler.Bundler = &Julia{} + _ bundler.Bundler = &Rust{} ) diff --git a/bundler/rust/rust_test.go b/bundler/rust/rust_test.go index f0eb5961..ff9a586e 100644 --- a/bundler/rust/rust_test.go +++ b/bundler/rust/rust_test.go @@ -10,7 +10,7 @@ import ( "github.com/metrue/fx/utils" ) -func TestJuliaBundler(t *testing.T) { +func TestRustBundler(t *testing.T) { t.Run("Scaffold", func(t *testing.T) { outputDir, err := ioutil.TempDir("", "fx_julia") if err != nil { From d2cd3ebe6b9c7056e72c00aff6bd56e7651abc85 Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 15:46:17 +0800 Subject: [PATCH 4/7] fix test --- bundler/rust/rust_test.go | 24 ++++++++++++------------ packrd/packed-packr.go | 2 -- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/bundler/rust/rust_test.go b/bundler/rust/rust_test.go index ff9a586e..1fa80763 100644 --- a/bundler/rust/rust_test.go +++ b/bundler/rust/rust_test.go @@ -12,14 +12,14 @@ import ( func TestRustBundler(t *testing.T) { t.Run("Scaffold", func(t *testing.T) { - outputDir, err := ioutil.TempDir("", "fx_julia") + outputDir, err := ioutil.TempDir("", "fx_rust") if err != nil { log.Fatal(err) } defer os.RemoveAll(outputDir) - julia := New() - if err := julia.Scaffold(outputDir); err != nil { + rust := New() + if err := rust.Scaffold(outputDir); err != nil { t.Fatal(err) } @@ -34,7 +34,7 @@ func TestRustBundler(t *testing.T) { }) t.Run("BundleSingleFunc", func(t *testing.T) { - fd, err := ioutil.TempFile("", "fx_func_*.julia") + fd, err := ioutil.TempFile("", "fx_func_*.rust") if err != nil { t.Fatal(err) } @@ -54,14 +54,14 @@ end t.Fatal(err) } - outputDir, err := ioutil.TempDir("", "fx_julia") + outputDir, err := ioutil.TempDir("", "fx_rust") if err != nil { log.Fatal(err) } defer os.RemoveAll(outputDir) - julia := New() - if err := julia.Bundle(outputDir, fd.Name()); err != nil { + rust := New() + if err := rust.Bundle(outputDir, fd.Name()); err != nil { t.Fatal(err) } @@ -90,7 +90,7 @@ end }) t.Run("BundleFuncAndDeps", func(t *testing.T) { - fd, err := ioutil.TempFile("", "fx_func_*.js") + fd, err := ioutil.TempFile("", "fx_func_*.rs") if err != nil { t.Fatal(err) } @@ -108,7 +108,7 @@ end addFunc := ` module.exports = (a, b) => a+b ` - addFd, err := ioutil.TempFile("", "fx_add_func_*.js") + addFd, err := ioutil.TempFile("", "fx_add_func_*.rs") if err != nil { t.Fatal(err) } @@ -118,14 +118,14 @@ module.exports = (a, b) => a+b t.Fatal(err) } - outputDir, err := ioutil.TempDir("", "fx_julia") + outputDir, err := ioutil.TempDir("", "fx_rust") if err != nil { log.Fatal(err) } defer os.RemoveAll(outputDir) - julia := New() - if err := julia.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil { + rust := New() + if err := rust.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil { t.Fatal(err) } diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go index e902914f..ae9ce65a 100644 --- a/packrd/packed-packr.go +++ b/packrd/packed-packr.go @@ -23,7 +23,6 @@ var _ = func() error { "17bc9961cffa014e8d7ac818d8a3ec14": "1f8b08000000000000ff4c8fc16ac3300c86ef7e8a9f9e6c2826b09d0a39edb2edb08d959dc61866515a975449243bf4f18793a69bc020ebe3d36f678d7cc0634ac39e642231f13cf492f0bc7f7d59fb0f3e07d163e88c89fcd3e586eca6bdf853b771c6a84ca8b1c8d6a1e92134ee76ef3466d2b48590969b0e3d2b1900882d3ae2433a5aa1d137210587ba4635c35242ea3585941535eeab055077d54b0d41949aefe2a29edfeadfca48fc4ceca98f6c3f1f8e41ece4d0f6820991b1e67d39775b75dd71fba3cf6b679f78c869fb3fec4fd324910fb6bdd879be00e2c6946324b35599b6b8abaaca99df000000ffffa9ee463365010000", "2c75a41a4116ea4ba707c129527fd11c": "1f8b08000000000000ff5cd0c14ac34010c6f17b9e626e991593867a3314bc8b20f8046333094b4a669dd99248e9bbcb6a351baff3ff41beec51268bf02c040750fe387b652c47a1d2b5c54f7b97eef395d458ff912a95f05d567d14b5dc3d8d42bb745c89cd6f91e246d94cc3c05a590aabe4fd982b5e82b25915a5da2cec975cd5bb7e49ed16290438c0c473fa494c770aa13e1b23ef47bc6da9078e2fbeeb4e3c93325eaeceb9f60fa6f978290044fde0a74728efcafbe29a93f591303ff7cbef074fde224ff8d0348d6b8baf000000ffffc6e9b71c76010000", "2e6c11f0e86d189a5f33d2eda0bc7406": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02d482dcad14d4a2c4ee5e272747151d053d0e3e2728d08f00f765530363030e072f67551885602a952d251504a2c28d02b00b352125373f3f39462b900010000ffff0583b6ed50000000", - "3ca6a5d34279c5fa0304bfae8c908716": "1f8b08000000000000ff8c94d1aea32a14865fc570754e525b414434f10df6b93c73334cc82ad04aa26000f76eb3b3df7dd2ee89a94d4de692fffbd762fd287ca230c7a4e4c9bab30953b02ea11663c209e5bc6cea9a940c979cd63be4e734cd29a2f61361cc68c1cb8a114c18a7555396a8fdf9dd2ac37b5aed8bdcd9739f866bf60fd45463ce88ce48418abca8724cff15ee681d846b9bdd8b84537e1c6dca7b887d9b2d2554f31a2a46286d2a4e313be9a26a6aa62aae00035fca3424d33ef417aef731b5d98533c9680ed334985c43f8b04eb8600603d1b44f930af7f6f6e3bfecdd8468bd6bb3665f08877608fdda21cc1ad2344d419a8a1594635a71724b2ca55c3c94d6ac619435b46618f3baacf16219ec514ab90f833d2e0b7ddd5ec1b37ef83f9a100fa375fd0cee7cd8df8e6d9e0ec9fb41f5605d3cfc8991bfccaccd713e4b88d18464bd8bc24dc12b39820a5eb804e16c9284a0fa4ea0ef06022dba71da82eb041a6c4a835991f74ea007e104a31dae9d40b3b39747dd409a83e90452e37451fd19b3e34b7cbac4f0128ce3eb7e319a2d9d6c817203ac490f5142f2a3559d4098f04dc4b64849b6c8ea7c5764739b298597480e1eb48cc9df436ccdf9e47a3df2dab431fddab411646dfa9b91d6f17cbc7d72503e3e8893b72e99203fac4efdf3dea90f06b41cbc826111df8dd33e7402dd6fc3cd7dff2fbfafecd70ec5592913a3b9bd6a5f5fbf030000ffff6d24699f0d050000", "3ce2296391d96d76aaff2d829f1f612d": "1f8b08000000000000ff4c4fb16ec32014dcf98a274f586da9a58e563a66c8d00c19ab0e0f4c5d2801042f2955e57faf9c10c7b71cdc9dee20a2fac651c367e91933c718128109c2e2199df16277e5fe6685340a9b8317bbc3fe6d2fad56d433164fd21905ca61ce8031c21f0300a8722624a3e01ccc0047349e1f28193fbe7f00a631b7353ca3ae5d2a36b79bc88489f84bd7756dbf44b705bed00f4e27d880d73fb02d7c65638c22864cbc796e1e415181a7d7d5d0656cf90104696bcb5de48a8a9061f8e5edaa77c66c249d4f8e78d33cd457882bf320ed3a3fd5f3c426f61f0000ffff88067e0e6b010000", "46416dc28552c117e810b36196e043ca": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02da82cc9c8cfd34d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f6755148cb492cce56282acd53d0cd5030d0034305dd02880240000000ffff21aa3b6b52000000", "4a59b8f410ab9e2382c25781de92ce47": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd04dd14d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f6755188562a4ac94d51d25150d22d4b2d2acecccfb34dcd4d4a4d49494d89cf282929004b2516148055e816e41795805820ed4ab180000000ffff4c8673be6c000000", @@ -125,7 +124,6 @@ var _ = func() error { b.SetResolver("config", packr.Pointer{ForwardBox: gk, ForwardPath: "16a369da9061d595d672fbd8ca3bf170"}) b.SetResolver("src/fns/mod.rs", packr.Pointer{ForwardBox: gk, ForwardPath: "f2fd5f5fc855db718309059f09508191"}) b.SetResolver("src/main.rs", packr.Pointer{ForwardBox: gk, ForwardPath: "b3c5bd23d22e5631bb620a1ca277800f"}) - b.SetResolver("target/.rustc_info.json", packr.Pointer{ForwardBox: gk, ForwardPath: "3ca6a5d34279c5fa0304bfae8c908716"}) }() return nil }() From 440b8af3b0caa599e22b195274fe38afd0e207d4 Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 17:05:53 +0800 Subject: [PATCH 5/7] move deps to base --- .../dockerfiles/base/node/package-lock.json | 573 ++++++++++++++++++ assets/dockerfiles/base/node/package.json | 4 +- bundler/node/assets/Dockerfile | 1 - 3 files changed, 576 insertions(+), 2 deletions(-) diff --git a/assets/dockerfiles/base/node/package-lock.json b/assets/dockerfiles/base/node/package-lock.json index 3035aa38..7b939ef0 100644 --- a/assets/dockerfiles/base/node/package-lock.json +++ b/assets/dockerfiles/base/node/package-lock.json @@ -12,15 +12,588 @@ "vary": "^1.1.2" } }, + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" + }, + "basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + } + }, + "bintrees": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", + "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "cookies": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz", + "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==", + "requires": { + "depd": "~2.0.0", + "keygrip": "~1.1.0" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "express-to-koa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/express-to-koa/-/express-to-koa-2.0.0.tgz", + "integrity": "sha512-71zECby9NZHFGQ+kD+cJ5VaNUdCUw3oXkSC6PCmKxxfyVA11mVQCfwQqb7VjBmQbIJ2WNeiAeTOj7M5EqrMlOQ==" + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "requires": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + } + }, + "http-errors": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "dependencies": { + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + } + } + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "keygrip": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", + "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==", + "requires": { + "tsscmp": "1.0.6" + } + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" + }, + "mime-types": { + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "requires": { + "mime-db": "1.44.0" + } + }, + "moment": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz", + "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==" + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, + "path-to-regexp": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz", + "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==" + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "prom-client": { + "version": "11.5.3", + "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz", + "integrity": "sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==", + "requires": { + "tdigest": "^0.1.1" + } + }, + "psl": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + } + } + }, + "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==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } + } + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "swagger-stats": { + "version": "0.95.17", + "resolved": "https://registry.npmjs.org/swagger-stats/-/swagger-stats-0.95.17.tgz", + "integrity": "sha512-3p+sWzWpxWES5SAM6GeKa6jWrMvh5gmczKdscdmOl4e6n9e4gfz0HioBZQqRgdLKgRR2ZeSR4f7+e3mMjqcEhQ==", + "requires": { + "basic-auth": "^2.0.1", + "cookies": "^0.8.0", + "debug": "^4.1.1", + "moment": "^2.24.0", + "path-to-regexp": "^6.1.0", + "prom-client": "^11.5.3", + "qs": "^6.9.1", + "request": "^2.88.0", + "send": "^0.17.1", + "uuid": "^3.4.0" + } + }, + "tdigest": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz", + "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=", + "requires": { + "bintrees": "1.0.1" + } + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + }, + "tsscmp": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", + "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==" + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } } } } diff --git a/assets/dockerfiles/base/node/package.json b/assets/dockerfiles/base/node/package.json index 782597b3..d3dbed46 100644 --- a/assets/dockerfiles/base/node/package.json +++ b/assets/dockerfiles/base/node/package.json @@ -11,10 +11,12 @@ "license": "ISC", "dependencies": { "@koa/cors": "^2.2.3", + "express-to-koa": "^2.0.0", "get-port": "^3.2.0", "is-generator-function": "^1.0.6", "koa": "^2.3.0", "koa-bodyparser": "^4.2.0", - "node-fetch": "^2.6.0" + "node-fetch": "^2.6.0", + "swagger-stats": "^0.95.17" } } diff --git a/bundler/node/assets/Dockerfile b/bundler/node/assets/Dockerfile index 776e920a..08e99a1b 100644 --- a/bundler/node/assets/Dockerfile +++ b/bundler/node/assets/Dockerfile @@ -2,5 +2,4 @@ FROM metrue/fx-node-base COPY . . EXPOSE 3000 -RUN npm i swagger-stats express-to-koa CMD ["node", "app.js"] From 5a07b6d753eebef60a0acf6da03ace16407ec8e8 Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 17:06:44 +0800 Subject: [PATCH 6/7] bump version --- fx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fx.go b/fx.go index 03635ff3..ce7960be 100644 --- a/fx.go +++ b/fx.go @@ -19,7 +19,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) -const version = "0.9.42" +const version = "0.9.43" func init() { go checkForUpdate() From 6d2f0f494d63d083fab4376f265f46fa21406090 Mon Sep 17 00:00:00 2001 From: Minghe Huang Date: Fri, 22 May 2020 17:15:00 +0800 Subject: [PATCH 7/7] update --- packrd/packed-packr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go index ae9ce65a..96b4e83b 100644 --- a/packrd/packed-packr.go +++ b/packrd/packed-packr.go @@ -35,7 +35,7 @@ var _ = func() error { "76eca10e3a22b8409f5af0b284f82ee4": "1f8b08000000000000ff7ccabdaac2301407f0fd3cc59fec490af711da5e10a929115111877ee5586839a569318fefe6e8fefbf7aec23c6ceb3ed890348b6e9b3810e5aebec3c0b2d8b87696c7edb5b7a693d97e315d9d3f1607ff1b91bf9cc082761fa71e7aeac3d47084d26fe8a8a005212124c38266590c0b5179abddb9c45f9665447955e0a18c0d493de9130000ffff44ef0fc1ae000000", "93130b893788876c223c2a0f3de05793": "1f8b08000000000000ffccce41aac23010c6f1fd9ce2dbcda6bc577057a8579168a75a91a4ce4ca520de5ddad4780537e19ffc207c2af7695001db10836b602a2f574b91e9733fa8dc820f0f01f7f39f1e99c8c4d18c49bdc2aeae6ba2319983ff195d220038f98c16cfb58166f949ccd1eeb165f5251b5334c996bba079f0c916ca55e022a1135d65cb4caff5ece7650049ec88cef29bc3de010000ffff22ee4db77f010000", "973570cec900912c2cdd5c5531be70ac": "1f8b08000000000000ff3ccd410ac2301085e1fd9ce2d16c14c40308f122e2a276a674111acd4c3022de5d6262773fef8319470e931578bcc9013825796451833fa3e7e10f7a8fab4a93d69dd446cb5aa1559f171959d26fef59e1432c33e6b29bacec09f5fb653b7e3dde22bfe0312c1242c433a6c003c9caf40d0000ffff99b9e753aa000000", - "98bb98a34bd158dd2fdd41ca90f4e64d": "1f8b08000000000000ff14cc410ac2301005d0fd9ce293b513031ea1d65d4da9088ab818712c2a6d4226628f2f5ee0ed86d861d25a3eba7e2c3ca7bbf24d4c899ad89fe1e1a93df5f1d0621342a0e1b8c79c273c615f19472d6c55aa41975cd48c6be277126aba2d2eee8fb9159ce4ec5fe6aef40b0000ffffda8dd17f6d000000", + "98bb98a34bd158dd2fdd41ca90f4e64d": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd0cdcb4f49d54d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f67551885602a952d251504a2c28d0cb2a568ae502040000ffff6c95391846000000", "9d097ccc5e31491bd2ee70619fc36101": "1f8b08000000000000ff74cbc1aac2301005d07dbe62e82ae1417ea0bced83be855df40b26718ca97512922914a4ff2ed282a87897f79e9bd15f30109c9656a978cda908a412ec5813dbffa13ff46e242fad52797653f4e027ac15fe16b8290080bd8d2c70463e4ea49f27889c6731bb7c6490123900c2efb6d940a21b6c8c95b46ddab4efdabd6af7451792b930742c14a8d88ca552c7a2d1c0cf67ebf6e7aa56750f0000ffffeb12798604010000", "b3a2e75d2833aa5c271d28326dee512c": "1f8b08000000000000ff2a2e4d5248ab50a8e65250c8ad5450492ea950b05528cec84c2bb1e65250284a2d292dca5350cf48cdc9c95748ab50e7aae5e232b4e602040000ffffd1aa6a1336000000", "b3c5bd23d22e5631bb620a1ca277800f": "1f8b08000000000000ff7c8fc16eab301045f7f31513b2c1122f796b93f2015d768b1072cd90b8853119db55aa2aff5e01912aa551375ecc39be3377bba97b323109e59378db8ec68a6f4f9f47474c057664877556e034a4a363d5006ceb554b811aa04b2461b46222a178fb4eb17c346cade728eef50e06928eca3f2217a1ed48dc073dfadbbe05cf25c0e83bec39940029dcefd47a96b47e5ed56d3df910f36c9f15d87b194dc427cccc340dce9ae83cef673d2bb033d1cce82074ae32d540cfe8b8a34b2e74d638c71d7a0e5a2fcf0b9d13855829fc57fd6661f21ca8c22f40c405e73fb84f6ce7ccdd7fa5e00af39ed138ced54d5feb68ed8eec22e56a37fac4b706e253a4b0a997c31ab51b4c627bca550957f80e0000fffffd681223df010000",