include samples & scripts for testing

Author: Javran

.npmignore

@@ -4,4 +4,7 @@ src/
 test/
 private/
 
+scripts/
+samples/
+
 *.tgz

samples/sample1-lzma.swf

@@ -0,0 +1 @@
+sample1.swf

samples/sample1-raw.swf

@@ -0,0 +1,33 @@
+/* eslint-disable no-console */
+const fs = require('fs')
+const _ = require('lodash')
+
+const { readFromBufferP } = require('../dist')
+
+const cmp = (x,y) => {
+  const newX = Object.assign({},x)
+  delete newX.fileLength
+  const newY = Object.assign({},y)
+  delete newY.fileLength
+  return _.isEqual(newX,newY)
+}
+
+[
+  ['raw', '../samples/sample1-raw.swf'],
+  ['zlib', '../samples/sample1-zlib.swf'],
+  ['lzma', '../samples/sample1-lzma.swf'],
+].reduce(
+  (p, [ty, fName]) => p.then(results => {
+    const rawData = fs.readFileSync(fName)
+    const testLabel = `test.${ty}`
+    console.time(testLabel)
+    return readFromBufferP(rawData).then(d => {
+      console.timeEnd(testLabel)
+      return (results.push(d), results)
+    })
+  }),
+  Promise.resolve([]))
+ .then(results => {
+   console.log(_.sum(results[0].tags.map(x => x.rawData.length)))
+   console.log(cmp(results[0],results[1]))
+ })

samples/sample1-zlib.swf

@@ -0,0 +1,56 @@
+/* eslint-disable no-console */
+const fs = require('fs')
+const { readFromBufferP, extractImages } = require('../dist')
+
+const rawData = fs.readFileSync('../samples/sample1.swf');
+
+(async () => {
+  const swf = await readFromBufferP(rawData)
+  console.time('extract')
+  const tr = ({code, characterId, imgType, imgData}) =>
+    ({code, characterId, imgType, imgDataLen: imgData.length})
+  const ts = await Promise.all(extractImages(swf.tags))
+  console.timeEnd('extract')
+
+  ts.map(t => console.log(tr(t)))
+})()
+
+/*
+
+   coverage:
+
+   - SwfTags.DefineBits
+
+     - empty JPEGTables: sample1.swf
+     - non-empty JPEGTables
+
+   - SwfTags.DefineBitsJPEG2
+
+     - png: sample1.swf
+     - gif: sample1.swf
+     - jpeg: sample1.swf
+
+   - SwfTags.DefineBitsJPEG3
+
+     - png: sample1.swf
+     - gif: sample1.swf
+     - jpeg: sample1.swf
+
+   - SwfTags.DefineBitsLossless
+
+     - 15-bit RGB
+     - 24-bit RGB: sample1.swf
+     - 8-bit colormapped image: sample1.swf
+
+   - SwfTags.DefineBitsLossless2
+
+     - 32-bit ARGB image: sample1.swf
+     - 8-bit colormapped image: sample1.swf
+
+   - SwfTags.DefineBitsJPEG4
+
+     - png: sample1.swf
+     - gif: sample1.swf
+     - jpeg: sample1.swf
+
+ */

samples/sample1.swf

@@ -18,6 +18,12 @@ const imageTagCodes = [
   SwfTags.DefineBitsJPEG4,
 ]
 
+const coverageFlag = false
+const coverage =
+  coverageFlag ?
+    // eslint-disable-next-line no-console
+    msg => console.log(`coverage: ${msg}`) :
+    () => undefined
 
 // each extractor either returns either a value or a Promise
 const extractors = {}
@@ -33,9 +39,9 @@ const define = (code, extractor) => {
 const pngMagic = Buffer.from('0x89 0x50 0x4E 0x47 0x0D 0x0A 0x1A 0x0A'.split(' ').map(Number))
 const gifMagic = Buffer.from('0x47 0x49 0x46 0x38 0x39 0x61'.split(' ').map(Number))
 const recognizeHeader = buffer => {
-  if (pngMagic.equals(Buffer.from(buffer.buffer, 0, pngMagic.length)))
+  if (pngMagic.equals(buffer.slice(0, pngMagic.length)))
     return 'png'
-  if (gifMagic.equals(Buffer.from(buffer.buffer, 0, gifMagic.length)))
+  if (gifMagic.equals(buffer.slice(0, gifMagic.length)))
     return 'gif'
   return 'jpeg'
 }
@@ -96,7 +102,6 @@ const gDefineBitsJPEG3or4Handler = code => tagData => {
           enc.end(output)
         }))
     })
-
     toArray(enc).then(parts => {
       const buffers = parts
         .map(part => Buffer.isBuffer(part) ? part : Buffer.from(part))
@@ -115,7 +120,6 @@ extractors[SwfTags.DefineBitsJPEG3] =
 extractors[SwfTags.DefineBitsJPEG4] =
   gDefineBitsJPEG3or4Handler(SwfTags.DefineBitsJPEG4)
 
-
 extractors[SwfTags.DefineBitsLossless] = tagData => new Promise(
   (resolve,reject) => {
     const {
@@ -126,8 +130,9 @@ extractors[SwfTags.DefineBitsLossless] = tagData => new Promise(
 
     const enc = new PNGEncoder(bitmapWidth, bitmapHeight, {colorSpace: 'rgb'})
     zlib.unzip(zlibBitmapData, (err, dataBuf) => {
-      if (err) throw reject(new Error(err))
-      const output = new Buffer(bitmapHeight * bitmapHeight * 3)
+      if (err)
+        reject(new Error(err))
+      const output = new Buffer(bitmapWidth * bitmapHeight * 3)
       let index = 0
       let ptr = 0
       /* eslint-disable no-bitwise */
@@ -137,6 +142,9 @@ extractors[SwfTags.DefineBitsLossless] = tagData => new Promise(
         // 24-bit RGB image
         bitmapFormat === 5
       ) {
+        if (bitmapFormat === 4)
+          coverage(`DefineBitsLossless 15-bit`)
+
         for (let y = 0; y < bitmapHeight; y++) {
           for (let x = 0; x < bitmapWidth; x++) {
             if (bitmapFormat === 4) {
@@ -285,6 +293,7 @@ const mkContext = rawTags => ({
     if (jpegTablesTag.jpegData.length === 0) {
       return _.identity
     } else {
+      coverage('JPEGTables non-empty')
       return imgBuffer =>
         Buffer.concat([
           jpegTablesTag.jpegData,