jscrambler-metro-plugin 8.4.24 → 8.4.26

package/lib/constants.js

@@ -22,6 +22,7 @@ const JSCRAMBLER_ANTI_TAMPERING_MODE_RCK = 'RCK';
 const JSCRAMBLER_ANTI_TAMPERING_MODE_SKL = 'SKL';
 const JSCRAMBLER_GLOBAL_VARIABLE_INDIRECTION = 'globalVariableIndirection';
 const JSCRAMBLER_TOLERATE_BENIGN_POISONING = 'tolerateBenignPoisoning';
+const HERMES_SHOW_SOURCE_DIRECTIVE = '"show source";';
 const JSCRAMBLER_HERMES_INCOMPATIBILITIES = [
   {
     slugName: JSCRAMBLER_SELF_DEFENDING,
@@ -56,5 +57,6 @@ module.exports = {
   JSCRAMBLER_HERMES_INCOMPATIBILITIES,
   JSCRAMBLER_HERMES_ADD_SHOW_SOURCE_DIRECTIVE,
   JSCRAMBLER_ANTI_TAMPERING_MODE_SKL,
+  HERMES_SHOW_SOURCE_DIRECTIVE,
   JSCRAMBLER_EXTS
 }

package/lib/index.js

@@ -15,6 +15,7 @@ const {
   JSCRAMBLER_BEG_ANNOTATION,
   JSCRAMBLER_END_ANNOTATION,
   BUNDLE_SOURCEMAP_OUTPUT_CLI_ARG,
+  HERMES_SHOW_SOURCE_DIRECTIVE,
   JSCRAMBLER_EXTS
 } = require('./constants');
 const {
@@ -165,7 +166,9 @@ async function obfuscateBundle(
   const addShowSource = addHermesShowSourceDirective(config);
 
   if (addShowSource) {
-    console.log(`info Jscrambler 'show source' directive added`);
+    console.log(
+      `info Jscrambler ${HERMES_SHOW_SOURCE_DIRECTIVE} directive added`,
+    );
   }
 
   const shouldGenerateSourceMaps = config.sourceMaps && bundleSourceMapPath;
@@ -209,7 +212,9 @@ async function obfuscateBundle(
       c.indexOf(JSCRAMBLER_END_ANNOTATION),
       c.length
     );
-    return `${acc}${JSCRAMBLER_BEG_ANNOTATION}${showSource ? '"show source";' : ''}${startAtFirstColumn ? '\n' : ''}${obfuscatedCode}${tillCodeEnd}`;
+    return `${acc}${JSCRAMBLER_BEG_ANNOTATION}${
+      showSource ? HERMES_SHOW_SOURCE_DIRECTIVE : ''
+    }${startAtFirstColumn ? '\n' : ''}${obfuscatedCode}${tillCodeEnd}`;
   }, '');
 
   await writeFile(bundlePath, stripJscramblerTags(finalBundle));

package/lib/sourceMaps.js

@@ -115,7 +115,11 @@ module.exports = async function generateSourceMaps(payload) {
     ) {
       /* jscrambler obfuscated files */
       const {lineStart, lineEnd, columnStart} = metroBundleLocs[fileNamesIndex];
-      const {lineStart: finalLineStart, lineEnd: finalLineEnd} = finalBundleLocs[fileNamesIndex];
+      const {
+        lineStart: finalLineStart,
+        lineEnd: finalLineEnd,
+        columnStart: finalColumnStart,
+      } = finalBundleLocs[fileNamesIndex];
       const allGeneratedPositionsFor = ofuscatedSourceMapConsumers[fileNamesIndex].allGeneratedPositionsFor({
         source: normalizePath,
         line: mapping.generatedLine - lineStart + 1 /* avoid line=0 */,
@@ -134,7 +138,7 @@ module.exports = async function generateSourceMaps(payload) {
       newMappings = allGeneratedPositionsFor.map(({line: obfLine, column: obfColumn}) => {
         const calcFinalLine = finalLineStart + obfLine - 1;
         // add columnStart only on the first line
-        const calcFinalColumn = obfLine === 1 ? columnStart + obfColumn : obfColumn;
+        const calcFinalColumn = obfLine === 1 ? finalColumnStart + obfColumn : obfColumn;
 
         debug && console.log('original', original, '->', 'final', {line: calcFinalLine, column: calcFinalColumn});
 

package/lib/utils.js

@@ -18,6 +18,7 @@ const {
   BUNDLE_OUTPUT_CLI_ARG,
   BUNDLE_SOURCEMAP_OUTPUT_CLI_ARG,
   BUNDLE_DEV_CLI_ARG,
+  HERMES_SHOW_SOURCE_DIRECTIVE,
   BUNDLE_CMD
 } = require('./constants');
 
@@ -99,9 +100,20 @@ function extractLocs(inputStr) {
         lines++;
         const startTagIndex = line.indexOf(JSCRAMBLER_BEG_ANNOTATION);
         if (startTagIndex !== -1) {
+          const columnStart = line.includes(
+            `${JSCRAMBLER_BEG_ANNOTATION}${HERMES_SHOW_SOURCE_DIRECTIVE}`,
+          )
+            ? HERMES_SHOW_SOURCE_DIRECTIVE.length + startTagIndex
+            : startTagIndex;
+          // occurs with Anti-tampering SKL mode
+          const startAtFirstColumn = line.includes(
+            `${JSCRAMBLER_BEG_ANNOTATION}\n`,
+          );
+
           locs.push({
             lineStart: lines,
-            columnStart: startTagIndex
+            columnStart,
+            startAtFirstColumn,
           });
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jscrambler-metro-plugin",
-  "version": "8.4.24",
+  "version": "8.4.26",
   "description": "A plugin to use metro with Jscrambler Code Integrity",
   "exports": "./lib/index.js",
   "peerDependencies": {
@@ -9,7 +9,7 @@
   "dependencies": {
     "commander": "^2.20.0",
     "fs-extra": "^8.0.1",
-    "jscrambler": "8.8.3"
+    "jscrambler": "8.8.4"
   },
   "keywords": [
     "jscrambler",