bugfix in source extraction

mauricedoepke · mauricedoepke · commit de8050311eb5 · 2019-06-25T22:01:32.000+02:00
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -1,9 +1,9 @@
 import { Compiler } from 'webpack';
-import { IOptions as JavaScriptObfuscatorOptions } from 'javascript-obfuscator/src/interfaces/options/IOptions';
+import { TInputOptions as JavascriptObfuscatorOptions } from 'javascript-obfuscator/src/types/options/TInputOptions';
 declare class WebpackObfuscator {
-    options: Partial<JavaScriptObfuscatorOptions>;
+    options: JavascriptObfuscatorOptions;
     excludes: string[];
-    constructor(options: Partial<JavaScriptObfuscatorOptions>, excludes?: string | string[]);
+    constructor(options: JavascriptObfuscatorOptions, excludes?: string | string[]);
     apply(compiler: Compiler): void;
     private shouldExclude;
     private extractSourceAndSourceMap;
diff --git a/dist/index.js b/dist/index.js
@@ -2,35 +2,33 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var javascript_obfuscator_1 = require("javascript-obfuscator");
-var webpack_sources_1 = require("webpack-sources");
-var multimatch_1 = __importDefault(require("multimatch"));
-var transferSourceMap = require("multi-stage-sourcemap").transfer;
-var WebpackObfuscator = (function () {
-    function WebpackObfuscator(options, excludes) {
+const javascript_obfuscator_1 = __importDefault(require("javascript-obfuscator"));
+const webpack_sources_1 = require("webpack-sources");
+const multimatch_1 = __importDefault(require("multimatch"));
+const transferSourceMap = require("multi-stage-sourcemap").transfer;
+class WebpackObfuscator {
+    constructor(options, excludes) {
         this.options = options;
         this.excludes = [];
-        this.options = options;
         this.excludes = this.excludes.concat(excludes || []);
     }
-    WebpackObfuscator.prototype.apply = function (compiler) {
-        var _this = this;
-        var isDevServer = process.argv.find(function (v) { return v.includes('webpack-dev-server'); });
+    apply(compiler) {
+        const isDevServer = process.argv.find(v => v.includes('webpack-dev-server'));
         if (isDevServer) {
             console.info('JavascriptObfuscator is disabled on webpack-dev-server as the reloading scripts ', 'and the obfuscator can interfere with each other and break the build');
             return;
         }
-        var pluginName = this.constructor.name;
-        compiler.hooks.emit.tap(pluginName, function (compilation) {
-            for (var fileName in compilation.assets) {
-                if (fileName.toLowerCase().endsWith('.js') || _this.shouldExclude(fileName)) {
+        const pluginName = this.constructor.name;
+        compiler.hooks.emit.tap(pluginName, (compilation) => {
+            for (const fileName in compilation.assets) {
+                if (!fileName.toLowerCase().endsWith('.js') || this.shouldExclude(fileName)) {
                     return;
                 }
-                var asset = compilation.assets[fileName];
-                var _a = _this.extractSourceAndSourceMap(asset), inputSource = _a.inputSource, inputSourceMap = _a.inputSourceMap;
-                var _b = _this.obfuscate(inputSource), obfuscatedSource = _b.obfuscatedSource, obfuscationSourceMap = _b.obfuscationSourceMap;
-                if (_this.options.sourceMap && inputSourceMap) {
-                    var transferredSourceMap = transferSourceMap({
+                const asset = compilation.assets[fileName];
+                const { inputSource, inputSourceMap } = this.extractSourceAndSourceMap(asset);
+                const { obfuscatedSource, obfuscationSourceMap } = this.obfuscate(inputSource);
+                if (this.options.sourceMap && inputSourceMap) {
+                    const transferredSourceMap = transferSourceMap({
                         fromSourceMap: obfuscationSourceMap,
                         toSourceMap: inputSource
                     });
@@ -41,29 +39,29 @@ var WebpackObfuscator = (function () {
                 }
             }
         });
-    };
-    WebpackObfuscator.prototype.shouldExclude = function (filePath) {
+    }
+    shouldExclude(filePath) {
         return multimatch_1.default(filePath, this.excludes).length > 0;
-    };
-    WebpackObfuscator.prototype.extractSourceAndSourceMap = function (asset) {
+    }
+    extractSourceAndSourceMap(asset) {
         if (asset.sourceAndMap) {
-            var _a = asset.sourceAndMap(), inputSource = _a.inputSource, inputSourceMap = _a.inputSourceMap;
-            return { inputSource: inputSource, inputSourceMap: inputSourceMap };
+            const { source, map } = asset.sourceAndMap();
+            return { inputSource: source, inputSourceMap: map };
         }
         else {
             return {
                 inputSource: asset.source(),
                 inputSourceMap: asset.map()
             };
         }
-    };
-    WebpackObfuscator.prototype.obfuscate = function (javascript) {
-        var obfuscationResult = javascript_obfuscator_1.JavaScriptObfuscator.obfuscate(javascript, this.options);
+    }
+    obfuscate(javascript) {
+        console.log('js', javascript);
+        const obfuscationResult = javascript_obfuscator_1.default.obfuscate(javascript, this.options);
         return {
-            obfuscatedSource: obfuscationResult.toString(),
+            obfuscatedSource: obfuscationResult.getObfuscatedCode(),
             obfuscationSourceMap: obfuscationResult.getSourceMap()
         };
-    };
-    return WebpackObfuscator;
-}());
+    }
+}
 module.exports = WebpackObfuscator;
diff --git a/index.ts b/index.ts
@@ -1,22 +1,21 @@
 "use strict";
 
 import { Compiler, compilation } from 'webpack';
-import { JavaScriptObfuscator } from 'javascript-obfuscator';
-import { IOptions as JavaScriptObfuscatorOptions } from 'javascript-obfuscator/src/interfaces/options/IOptions';
+import JavaScriptObfuscator from 'javascript-obfuscator';
 import { RawSource, SourceMapSource } from 'webpack-sources';
 import multimatch from 'multimatch';
 import { RawSourceMap } from 'source-map';
+import { TInputOptions as JavascriptObfuscatorOptions } from 'javascript-obfuscator/src/types/options/TInputOptions';
 const transferSourceMap = require("multi-stage-sourcemap").transfer;
 
 class WebpackObfuscator {
 
     public excludes: string[] = [];
 
     constructor(
-        public options: Partial<JavaScriptObfuscatorOptions>,
+        public options: JavascriptObfuscatorOptions,
         excludes?: string | string[]
     ) {
-        this.options = options;
         this.excludes = this.excludes.concat(excludes || []);
     }
 
@@ -28,14 +27,13 @@ class WebpackObfuscator {
                 'and the obfuscator can interfere with each other and break the build');
             return;
         }
-
+        
         const pluginName = this.constructor.name;
         compiler.hooks.emit.tap(pluginName, (compilation: compilation.Compilation) => {
             for (const fileName in compilation.assets) {
                 if (!fileName.toLowerCase().endsWith('.js') || this.shouldExclude(fileName)) {
                     return;
                 }
-
                 const asset = compilation.assets[fileName]
                 const { inputSource, inputSourceMap } = this.extractSourceAndSourceMap(asset);
                 const { obfuscatedSource, obfuscationSourceMap } = this.obfuscate(inputSource);
@@ -66,8 +64,8 @@ class WebpackObfuscator {
 
     private extractSourceAndSourceMap(asset: any): { inputSource: string, inputSourceMap: RawSourceMap } {
         if (asset.sourceAndMap) {
-            const { inputSource, inputSourceMap } = asset.sourceAndMap();
-            return { inputSource, inputSourceMap };
+            const { source, map } = asset.sourceAndMap();
+            return { inputSource: source, inputSourceMap: map };
         } else {
             return {
                 inputSource: asset.source(),
@@ -77,14 +75,14 @@ class WebpackObfuscator {
     }
 
     private obfuscate(javascript: string): { obfuscatedSource: string, obfuscationSourceMap: string } {
-        //use any here, as the JavaScriptObfuscator seem to get this one wrong
-        const obfuscationResult: any = JavaScriptObfuscator.obfuscate(
+        console.log('js', javascript);
+        const obfuscationResult = JavaScriptObfuscator.obfuscate(
             javascript,
             this.options
         );
 
         return {
-            obfuscatedSource: obfuscationResult.toString(),
+            obfuscatedSource: obfuscationResult.getObfuscatedCode(),
             obfuscationSourceMap: obfuscationResult.getSourceMap()
         }
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "webpack-obfuscator",
-    "version": "0.18.0",
+    "version": "0.18.1",
     "description": "javascript-obfuscator plugin for Webpack",
     "keywords": [
         "obfuscator",
@@ -21,7 +21,6 @@
         "webpack-sources": "^1.3.0"
     },
     "devDependencies": {
-        "@types/javascript-obfuscator": "0.0.5",
         "@types/multimatch": "^2.1.3",
         "@types/node": "8.0.47",
         "@types/webpack": "^4.4.34",
@@ -45,4 +44,4 @@
         "name": "Timofey Kachalov"
     },
     "license": "BSD-2-Clause"
-}
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES5",
+    "target": "ES6",
     "lib": ["ES6"],
     "module": "commonjs",
     "sourceMap": false,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "target": "ES5",`
	`3`	`+ "target": "ES6",`
`4`	`4`	`"lib": ["ES6"],`
`5`	`5`	`"module": "commonjs",`
`6`	`6`	`"sourceMap": false,`