marcogll/passkit-generator
1
0
Fork 0
mirror of https://github.com/marcogll/passkit-generator.git synced 2026-03-15 16:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separed async-independent body from pass.json reading by using async.parallel

Browse Source
This commit is contained in:
Alexander Cerutti
2018-06-11 22:34:52 +02:00
parent 5c8334e40a
commit 4c18f5b4e2
1 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
index.js
View File

@@ -265,7 +265,10 @@ function generatePass(options) {
});
}
let list = removeHiddenFiles(files);
// Removing hidden files and folders
let list = removeHiddenFiles(files).filter(f => !f.includes(".lproj"));
// Getting only folders
let folderList = files.filter(f => f.includes(".lproj"));
if (!list.length) {
return reject({
@@ -287,16 +290,34 @@ function generatePass(options) {
});
}
fs.readFile(path.resolve(Configuration.passModelsDir, `${options.modelName}.pass`, "pass.json"), {}, function _parsePassJSONBuffer(err, passStructBuffer) {
editPassStructure(filterPassOptions(options.overrides), passStructBuffer)
.then(function _afterJSONParse(passFileBuffer) {
let manifest = {};
let archive = archiver("zip");
// Using async.parallel since the final part must be executed only when both are completed.
// Otherwise would had to put everything in editPassStructure's Promise .then().
async.parallel([
function _managePass(passCallback) {
fs.readFile(path.resolve(Configuration.passModelsDir, `${options.modelName}.pass`, "pass.json"), {}, function _parsePassJSONBuffer(err, passStructBuffer) {
editPassStructure(filterPassOptions(options.overrides), passStructBuffer)
.then(function _afterJSONParse(passFileBuffer) {
manifest["pass.json"] = forge.md.sha1.create().update(passFileBuffer.toString("binary")).digest().toHex();
archive.append(passFileBuffer, { name: "pass.json" });
manifest["pass.json"] = forge.md.sha1.create().update(passFileBuffer.toString("binary")).digest().toHex();
return passCallback(null)
})
.catch(function(err) {
return reject({
status: false,
error: {
message: `pass.json Buffer is not a valid buffer. Unable to continue.\n${err}`,
ecode: 418
}
});
});
});
},
function _manageBundle(bundleCallback) {
async.each(list, function getHashAndArchive(file, callback) {
if (/(manifest|signature|pass)/ig.test(file)) {
// skipping files
@@ -330,6 +351,10 @@ function generatePass(options) {
});
}
return bundleCallback(null);
});
}
], function _composeStream() {
archive.append(JSON.stringify(manifest), { name: "manifest.json" });
let signatureBuffer = createSignature(manifest);
@@ -344,17 +369,6 @@ function generatePass(options) {
});
});
});
})
.catch(function(err) {
return reject({
status: false,
error: {
message: `pass.json Buffer is not a valid buffer. Unable to continue.\n${err}`,
ecode: 418
}
});
});
});
});
});
}