@qingfu/core-env 0.5.14 → 0.5.16

package/lib/utils.js

@@ -5,11 +5,13 @@ const xml2js  = require( 'xml2js' );
 const xlsx    = require( 'xlsx' );
 const baseX   = require( 'base-x' ).default;
 const pinyin  = require( 'pinyin' ).default;
-const idcard  = require( 'idcard' );
 const qrcode  = require( 'qr-image' );
 const request = require( 'superagent' );
+const { spawn }    = require( 'child_process' );
+const { pipeline } = require( 'stream/promises' );
 const { serializeError } = require( 'serialize-error' );
-const utils   = global.utils = module.exports = {};
+const { diff: areaDiff, history: areaHistory } = require( './area.json' );
+const utils = global.utils = module.exports = {};
 
 utils.serializeError = serializeError;
 
@@ -247,7 +249,6 @@ utils.minaDecrypt = ({ encrypted, session, iv }) => {
     }
 };
 
-utils.identityDetail = idcard.info;
 utils.identityValidate = identity => {
     if ( !identity || identity.length !== 18 ) return false;
     if ( !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i.test( identity )) return false;
@@ -264,18 +265,47 @@ utils.identityValidate = identity => {
     else return true;
 };
 
-utils.fetchBig = async ({ url, dest, method = 'GET', header = {}, retry = 0 }) => {
+utils.identityDetail = ( identity, returnNew = true ) => {
+    let getItem = code => {
+        code = _.padEnd( code, 6, '0' );
+        if ( returnNew ) code = _.last( areaDiff[ code ]) || code;
+        return { code, text: areaHistory[ code ]};
+    };
+    let result = {
+        valid: utils.identityValidate( identity ),
+        province: getItem( identity.slice( 0, 2 )),
+        city: getItem( identity.slice( 0, 4 )),
+        area: getItem( identity.slice( 0, 6 ))
+    };
+    if ( result.valid ) Object.assign( result, {
+        gender: utils.getGender( identity ),
+        age: utils.getAge( identity )
+    });
+    return result;
+};
+
+utils.fetchBig = async ({ url, dest, method = 'GET', header = {}, retry = 0, timeout = 300000 }) => {
+    let code = `
+        const fs           = require( 'fs' );
+        const request      = require( 'superagent' );
+        const { pipeline } = require( 'stream/promises' );
+        ( async () => {
+            let writeStream = fs.createWriteStream('${ dest }');
+            let readStream = request['${ method.toLowerCase() }']('${ url }').set(${ JSON.stringify( header )});
+            if (${ timeout }) readStream.timeout(${ timeout });
+            await pipeline( readStream, writeStream );            
+        })();
+    `;
     try {
         return await new Promise(( resolve, reject ) => {
-            let writeStream = fs.createWriteStream( dest );
-            let readStream = request[ method.toLowerCase() ]( url ).set( header );
-            readStream.pipe( writeStream );
-            readStream.on( 'error', reject );
-            writeStream.on( 'finish', resolve );
+            let child = spawn( 'node', [ '-e', code ], { timeout, stdio: [ 'pipe', 'inherit', 'inherit' ]});
+            child.on( 'close', code => code ? reject( new Error( `Process exited with code ${ code }` )) : resolve() );
+            child.on( 'error', reject );
         });
     } catch ( err ) {
         if ( !retry-- ) throw err;
-        return utils.fetchBig({ url, dest, method, header, retry });
+        await new Promise( resolve => setTimeout( resolve, 1000 ));
+        return await utils.fetchBig({ url, dest, method, header, retry, timeout });
     }
 };
 

package/package.json

@@ -1,47 +1,46 @@
 {
   "name": "@qingfu/core-env",
-  "version": "0.5.14",
+  "version": "0.5.16",
   "readmeFilename": "README.md",
   "dependencies": {
     "@koa/cors": "5.0.0",
-    "@koa/router": "13.1.0",
-    "base-x": "5.0.0",
-    "bullmq": "5.41.2",
+    "@koa/router": "13.1.1",
+    "base-x": "5.0.1",
+    "bullmq": "5.66.4",
     "busboy": "1.6.0",
     "cookie": "1.0.2",
     "dotenv-extended": "2.9.0",
     "glob": "8.1.0",
-    "helmet": "8.0.0",
-    "idcard": "4.2.0",
-    "ioredis": "5.5.0",
-    "jsonwebtoken": "9.0.2",
-    "koa": "2.15.4",
+    "helmet": "8.1.0",
+    "ioredis": "5.8.2",
+    "jsonwebtoken": "9.0.3",
+    "koa": "2.16.3",
     "koa-bodyparser": "4.4.1",
     "koa-compress": "5.1.1",
     "koa-favicon": "2.1.0",
     "koa-helmet": "8.0.1",
-    "koa-logger": "3.2.1",
+    "koa-logger": "4.0.0",
     "koa-methodoverride": "2.0.0",
     "koa-qs": "3.0.0",
     "lodash": "4.17.21",
     "moleculer": "0.14.35",
-    "mongoose": "7.8.4",
+    "mongoose": "7.8.8",
     "mongoose-cast-aggregation": "0.3.1",
-    "mongoose-geojson-schema": "2.2.5",
-    "mongoose-lean-defaults": "2.2.1",
-    "mongoose-lean-getters": "2.1.1",
-    "mongoose-lean-virtuals": "1.1.0",
+    "mongoose-geojson-schema": "3.1.1",
+    "mongoose-lean-defaults": "2.3.1",
+    "mongoose-lean-getters": "2.2.2",
+    "mongoose-lean-virtuals": "1.1.1",
     "ms": "2.1.3",
     "notepack.io": "3.0.1",
-    "pinyin": "3.1.0",
+    "pinyin": "4.0.0",
     "primus": "8.0.9",
     "primus-rooms": "3.4.3",
     "qr-image": "3.2.0",
     "serialize-error": "8.1.0",
-    "superagent": "10.1.1",
+    "superagent": "10.2.3",
     "wechat-encrypt": "1.1.1",
-    "winston": "3.17.0",
-    "winston-mongodb": "6.0.0",
+    "winston": "3.19.0",
+    "winston-mongodb": "7.0.1",
     "xlsx": "0.18.5",
     "xml2js": "0.6.2"
   }