From 6b254582b6dfbc36cb2b55e850bedbdaab625216 Mon Sep 17 00:00:00 2001 From: sunnylqm Date: Sun, 24 Nov 2019 21:58:12 +0800 Subject: [PATCH] Read build time for ipa --- ios/pushy_build_time.txt | 1 - local-cli/src/package.js | 9 +- local-cli/src/utils/index.js | 25 +++--- local-cli/src/utils/ipaReader.js | 58 ------------ package.json | 4 - yarn.lock | 148 +------------------------------ 6 files changed, 21 insertions(+), 224 deletions(-) delete mode 100644 ios/pushy_build_time.txt delete mode 100644 local-cli/src/utils/ipaReader.js diff --git a/ios/pushy_build_time.txt b/ios/pushy_build_time.txt deleted file mode 100644 index 1f364fc..0000000 --- a/ios/pushy_build_time.txt +++ /dev/null @@ -1 +0,0 @@ -1573835204 diff --git a/local-cli/src/package.js b/local-cli/src/package.js index 195d5a6..8dfc80a 100644 --- a/local-cli/src/package.js +++ b/local-cli/src/package.js @@ -7,7 +7,7 @@ import { question } from './utils'; import { checkPlatform, getSelectedApp } from './app'; -import { getIPAVersion, getAppInfo } from './utils'; +import { getApkInfo, getIpaInfo } from './utils'; const Table = require('tty-table'); export async function listPackage(appId) { @@ -50,14 +50,15 @@ export const commands = { if (!fn) { throw new Error('Usage: pushy uploadIpa '); } - const name = await getIPAVersion(fn); + const { versionName, buildTime } = await getIpaInfo(fn); const { appId } = await getSelectedApp('ios'); const { hash } = await uploadFile(fn); const { id } = await post(`/app/${appId}/package/create`, { - name, + name: versionName, hash, + buildTime, }); console.log(`Ipa uploaded: ${id}`); }, @@ -66,7 +67,7 @@ export const commands = { if (!fn) { throw new Error('Usage: pushy uploadApk '); } - const { versionName, buildTime } = await getAppInfo(fn); + const { versionName, buildTime } = await getApkInfo(fn); const { appId } = await getSelectedApp('android'); const { hash } = await uploadFile(fn); diff --git a/local-cli/src/utils/index.js b/local-cli/src/utils/index.js index 4e8a1b2..8831f64 100644 --- a/local-cli/src/utils/index.js +++ b/local-cli/src/utils/index.js @@ -4,7 +4,6 @@ import * as path from 'path'; import * as fs from 'fs-extra'; -import ipaReader from './ipaReader'; const AppInfoParser = require('app-info-parser'); var read = require('read'); @@ -52,9 +51,9 @@ export function getRNVersion() { }; } -export async function getAppInfo(fn) { - const parser = new AppInfoParser(fn); - const { versionName, application } = await parser.parse(); +export async function getApkInfo(fn) { + const appInfoParser = new AppInfoParser(fn); + const { versionName, application } = await appInfoParser.parse(); let buildTime = 0; if (Array.isArray(application.metaData)) { for (const meta of application.metaData) { @@ -64,15 +63,19 @@ export async function getAppInfo(fn) { } } if (buildTime == 0) { - throw new Error('Can not get build time for this app.') + throw new Error('Can not get build time for this app.'); } return { versionName, buildTime }; } -export function getIPAVersion(fn) { - return new Promise((resolve, reject) => { - ipaReader(fn, (err, data) => { - err ? reject(err) : resolve(data.metadata.CFBundleShortVersionString); - }); - }); +export async function getIpaInfo(fn) { + const appInfoParser = new AppInfoParser(fn); + const { CFBundleShortVersionString: versionName } = await appInfoParser.parse(); + try { + const buildTimeTxtBuffer = await appInfoParser.parser.getEntry(/payload\/.+?\.app\/pushy_build_time.txt/); + const buildTime = buildTimeTxtBuffer.toString().replace('\n', ''); + return { versionName, buildTime }; + } catch (e) { + throw new Error('Can not get build time for this app.'); + } } diff --git a/local-cli/src/utils/ipaReader.js b/local-cli/src/utils/ipaReader.js deleted file mode 100644 index 957e61a..0000000 --- a/local-cli/src/utils/ipaReader.js +++ /dev/null @@ -1,58 +0,0 @@ -// var async = require('async'); -var plist = require('simple-plist'); -var decompress = require('decompress-zip'); -// var provisioning = require('provisioning'); -// var entitlements = require('entitlements'); - -var rimraf = require('rimraf'); -var tmp = require('temporary'); -var glob = require('glob'); - -var output = new tmp.Dir(); - -module.exports = function(file, callback) { - var data = {}; - - var unzipper = new decompress(file); - unzipper.extract({ - path: output.path - }); - - unzipper.on('error', cleanUp); - unzipper.on('extract', function() { - var path = glob.sync(output.path + '/Payload/*/')[0]; - - data.metadata = plist.readFileSync(path + 'Info.plist'); - - cleanUp(); - /* - var tasks = [async.apply(provisioning, path + 'embedded.mobileprovision')]; - - // `entitlements` relies on a OS X only CLI tool called `codesign` - if (process.platform === 'darwin') { - tasks.push(async.apply(entitlements, path)); - } - - async.parallel(tasks, function(error, results) { - if (error) { - return cleanUp(error); - } - - data.provisioning = results[0]; - - // Hard to serialize and it looks messy in output - delete data.provisioning.DeveloperCertificates; - - // Will be undefined on non-OSX platforms - data.entitlements = results[1]; - - return cleanUp(); - }); - */ - }); - - function cleanUp(error) { - rimraf.sync(output.path); - return callback(error, data); - } -}; diff --git a/package.json b/package.json index 4793216..c41819d 100644 --- a/package.json +++ b/package.json @@ -30,16 +30,12 @@ "dependencies": { "app-info-parser": "^0.3.5", "cli-arguments": "^0.2.1", - "decompress-zip": "^0.3.1", "fs-extra": "^8.1.0", - "glob": "^7.1.2", "gradle-to-js": "^2.0.0", "isomorphic-fetch": "^2.2.1", "progress": "^1.1.8", "read": "^1.0.7", "request": "^2.69.0", - "simple-plist": "^0.3.0", - "temporary": "^0.0.8", "tty-table": "^2.7.0", "yauzl": "2.4.1", "yazl": "2.3.0" diff --git a/yarn.lock b/yarn.lock index b50f6e9..d96e7f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -530,14 +530,6 @@ balanced-match@^0.4.1: version "0.4.2" resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" -balanced-match@^1.0.0: - version "1.0.0" - resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base64-js@1.2.0: - version "1.2.0" - resolved "http://registry.npm.taobao.org/base64-js/download/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" - base64-js@^1.0.2, base64-js@^1.2.3: version "1.3.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" @@ -554,21 +546,10 @@ big-integer@^1.6.44: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== -big-integer@^1.6.7: - version "1.6.32" - resolved "http://registry.npm.taobao.org/big-integer/download/big-integer-1.6.32.tgz#5867458b25ecd5bcb36b627c30bb501a13c07e89" - binary-extensions@^1.0.0: version "1.8.0" resolved "http://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774" -binary@^0.3.0: - version "0.3.0" - resolved "http://registry.npm.taobao.org/binary/download/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - block-stream@*: version "0.0.9" resolved "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -585,18 +566,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bplist-creator@0.0.7: - version "0.0.7" - resolved "http://registry.npm.taobao.org/bplist-creator/download/bplist-creator-0.0.7.tgz#37df1536092824b87c42f957b01344117372ae45" - dependencies: - stream-buffers "~2.2.0" - -bplist-parser@0.1.1: - version "0.1.1" - resolved "http://registry.npm.taobao.org/bplist-parser/download/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6" - dependencies: - big-integer "^1.6.7" - bplist-parser@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e" @@ -611,13 +580,6 @@ brace-expansion@^1.0.0: balanced-match "^0.4.1" concat-map "0.0.1" -brace-expansion@^1.1.7: - version "1.1.11" - resolved "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - braces@^1.8.2: version "1.8.5" resolved "http://registry.npm.taobao.org/braces/download/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" @@ -658,10 +620,6 @@ bufferpack@0.0.6: resolved "https://registry.yarnpkg.com/bufferpack/-/bufferpack-0.0.6.tgz#fb3d8738a0e1e4e03bcff99f9a75f9ec18a9d73e" integrity sha1-+z2HOKDh5OA7z/mfmnX57Bip1z4= -buffers@~0.1.1: - version "0.1.1" - resolved "http://registry.npm.taobao.org/buffers/download/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - bytebuffer@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" @@ -699,12 +657,6 @@ cgbi-to-png@^1.0.7: stream-to-buffer "^0.1.0" streamifier "^0.1.1" -chainsaw@~0.1.0: - version "0.1.0" - resolved "http://registry.npm.taobao.org/chainsaw/download/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - dependencies: - traverse ">=0.3.0 <0.4" - chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1: version "1.1.3" resolved "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -904,18 +856,6 @@ decamelize@^1.0.0, decamelize@^1.2.0: version "1.2.0" resolved "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -decompress-zip@^0.3.1: - version "0.3.1" - resolved "http://registry.npm.taobao.org/decompress-zip/download/decompress-zip-0.3.1.tgz#3e4c6972fe80d89bb0fa9542e30044019ae6f626" - dependencies: - binary "^0.3.0" - graceful-fs "^4.1.3" - mkpath "^0.1.0" - nopt "^3.0.1" - q "^1.1.2" - readable-stream "^1.1.8" - touch "0.0.3" - deep-extend@~0.4.0: version "0.4.1" resolved "http://registry.npm.taobao.org/deep-extend/download/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253" @@ -1233,17 +1173,6 @@ glob@^7.0.0, glob@^7.0.5: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.2: - version "7.1.2" - resolved "http://registry.npm.taobao.org/glob/download/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - globals@^6.4.0: version "6.4.1" resolved "http://registry.npm.taobao.org/globals/download/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f" @@ -1252,7 +1181,7 @@ globals@^9.0.0: version "9.16.0" resolved "http://registry.npm.taobao.org/globals/download/globals-9.16.0.tgz#63e903658171ec2d9f51b1d31de5e2b8dc01fb80" -graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4: +graceful-fs@^4.1.2, graceful-fs@^4.1.4: version "4.1.11" resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -1462,10 +1391,6 @@ is-typedarray@~1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" -isarray@0.0.1: - version "0.0.1" - resolved "http://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -1788,12 +1713,6 @@ minimatch@^2.0.3: dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.4: - version "3.0.4" - resolved "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - minimist@0.0.8: version "0.0.8" resolved "http://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" @@ -1808,10 +1727,6 @@ minimist@^1.1.0, minimist@^1.2.0: dependencies: minimist "0.0.8" -mkpath@^0.1.0: - version "0.1.0" - resolved "http://registry.npm.taobao.org/mkpath/download/mkpath-0.1.0.tgz#7554a6f8d871834cc97b5462b122c4c124d6de91" - ms@0.7.1: version "0.7.1" resolved "http://registry.npm.taobao.org/ms/download/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" @@ -1854,18 +1769,12 @@ node-pre-gyp@^0.6.29: tar "~2.2.1" tar-pack "~3.3.0" -nopt@^3.0.1, nopt@~3.0.6: +nopt@~3.0.6: version "3.0.6" resolved "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: abbrev "1" -nopt@~1.0.10: - version "1.0.10" - resolved "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - dependencies: - abbrev "1" - normalize-path@^2.0.1: version "2.0.1" resolved "http://registry.npm.taobao.org/normalize-path/download/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" @@ -1982,10 +1891,6 @@ p-try@^2.0.0: resolved "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= -"package@>= 1.0.0 < 1.2.0": - version "1.0.1" - resolved "http://registry.npm.taobao.org/package/download/package-1.0.1.tgz#d25a1f99e2506dcb27d6704b83dca8a312e4edcc" - parse-glob@^3.0.4: version "3.0.4" resolved "http://registry.npm.taobao.org/parse-glob/download/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" @@ -2031,14 +1936,6 @@ pinkie@^2.0.0: version "2.0.4" resolved "http://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -plist@2.1.0: - version "2.1.0" - resolved "http://registry.npm.taobao.org/plist/download/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025" - dependencies: - base64-js "1.2.0" - xmlbuilder "8.2.2" - xmldom "0.1.x" - plist@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" @@ -2106,15 +2003,6 @@ read@^1.0.7: dependencies: mute-stream "~0.0.4" -readable-stream@^1.1.8: - version "1.1.14" - resolved "http://registry.npm.taobao.org/readable-stream/download/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2: version "2.2.3" resolved "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.2.3.tgz#9cf49463985df016c8ae8813097a9293a9b33729" @@ -2331,14 +2219,6 @@ simple-is@~0.2.0: version "0.2.0" resolved "http://registry.npm.taobao.org/simple-is/download/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" -simple-plist@^0.3.0: - version "0.3.0" - resolved "http://registry.npm.taobao.org/simple-plist/download/simple-plist-0.3.0.tgz#929b0e81e826b47929f7561c324a3d348e700a09" - dependencies: - bplist-creator "0.0.7" - bplist-parser "0.1.1" - plist "2.1.0" - slash@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/slash/download/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -2399,10 +2279,6 @@ stable@~0.1.3: version "0.1.5" resolved "http://registry.npm.taobao.org/stable/download/stable-0.1.5.tgz#08232f60c732e9890784b5bed0734f8b32a887b9" -stream-buffers@~2.2.0: - version "2.2.0" - resolved "http://registry.npm.taobao.org/stream-buffers/download/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" - stream-to-buffer@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz#26799d903ab2025c9bd550ac47171b00f8dd80a9" @@ -2518,12 +2394,6 @@ tar@~2.2.1: fstream "^1.0.2" inherits "2" -temporary@^0.0.8: - version "0.0.8" - resolved "http://registry.npm.taobao.org/temporary/download/temporary-0.0.8.tgz#a18a981d28ba8ca36027fb3c30538c3ecb740ac0" - dependencies: - package ">= 1.0.0 < 1.2.0" - through@~2.3.8: version "2.3.8" resolved "http://registry.npm.taobao.org/through/download/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -2532,22 +2402,12 @@ to-fast-properties@^1.0.0, to-fast-properties@^1.0.1: version "1.0.2" resolved "http://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" -touch@0.0.3: - version "0.0.3" - resolved "http://registry.npm.taobao.org/touch/download/touch-0.0.3.tgz#51aef3d449571d4f287a5d87c9c8b49181a0db1d" - dependencies: - nopt "~1.0.10" - tough-cookie@~2.3.0: version "2.3.2" resolved "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" dependencies: punycode "^1.4.1" -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "http://registry.npm.taobao.org/traverse/download/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - trim-right@^1.0.0, trim-right@^1.0.1: version "1.0.1" resolved "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -2662,10 +2522,6 @@ wrappy@1: version "1.0.2" resolved "http://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -xmlbuilder@8.2.2: - version "8.2.2" - resolved "http://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" - xmlbuilder@^9.0.7: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"