fix: remove padding for nintendo guids (#173)

* fix: remove padding for nintendo guids

* fix: sea module parsing warning for worker

Author: bobbyg603

package.json

@@ -44,12 +44,12 @@
     "build": "npm run build:esm && npm run build:cjs",
     "build:esm": "tsc -p tsconfig.esm.json && npm run copy:compression:esm",
     "build:cjs": "tsc -p tsconfig.cjs.json && npm run copy:compression:cjs",
-    "copy:compression:esm": "copyfiles -u 1 src/compression.js src/compression.mjs dist/esm/",
-    "copy:compression:cjs": "copyfiles -u 1 src/compression.js dist/cjs/",
+    "copy:compression:esm": "copyfiles -u 1 src/compression.cjs src/compression.mjs dist/esm/",
+    "copy:compression:cjs": "copyfiles -u 1 src/compression.cjs dist/cjs/",
     "prerelease": "npm run build",
     "release": "npm publish --access public",
     "bundle": "esbuild ./dist/esm/bin/index.js --bundle --platform=node --target=node18 --format=cjs --outfile=./dist/cjs/index.js --external:node-dump-syms",
-    "bpkg:compression": "npx bpkg ./src/compression.js ./dist/cjs/compression.js",
+    "bpkg:compression": "npx bpkg ./src/compression.cjs ./dist/cjs/compression.cjs",
     "bpkg:node-dump-syms": "npx bpkg ./node_modules/node-dump-syms ./dist/cjs/node-dump-syms.js",
     "prebuild:sea": "npm run clean",
     "prestart:sea": "npm run build:sea && npm run sea:macos",

sea-config.json

@@ -4,7 +4,7 @@
     "disableExperimentalSEAWarning": true,
     "assets": {
       "node-dump-syms.js": "dist/cjs/node-dump-syms.js",
-      "compression.js": "dist/cjs/compression.js",
+      "compression.cjs": "dist/cjs/compression.cjs",
       "package.json": "package.json"
     }
   }

src/compression.js renamed to src/compression.cjs

@@ -1,8 +1,8 @@
-// ESM wrapper for compression.js (CommonJS)
+// ESM wrapper for compression.cjs (CommonJS)
 // This allows the package to be imported as ESM while keeping the worker as CommonJS for SEA compatibility
 
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
 // Export the CommonJS module through the ESM wrapper
-export default require('./compression.js');
+export default require('./compression.cjs');

src/compression.mjs

@@ -1,5 +1,4 @@
 import { ElfFile } from '@bugsplat/elfy';
-import { extname } from 'node:path';
 
 export async function tryGetElfUUID(path: string) {
   let success: boolean, section: Buffer | undefined;
@@ -8,26 +7,18 @@ export async function tryGetElfUUID(path: string) {
   ({ success, section } = await elfFile.tryReadSection('.note.gnu.build-id'));
 
   if (success) {
-    return getUUID(section!, path, 16);
+    return getUUID(section!, 16);
   }
 
   ({ success, section } = await elfFile.tryReadSection('.sce_special'));
 
   if (success) {
-    return getUUID(section!, path);
+    return getUUID(section!);
   }
 
   return '';
 }
 
-function getUUID(section: Buffer, path: string, offset = 0) {
-  let uuid = section.subarray(offset, offset + 20).toString('hex');
-  
-  // Nintendo GUIDs seem to be 32 or 40 hex chars 0 padded to 64 hex chars
-  // Until we know more, pad it ourselves with this hacky workaround
-  if (extname(path)?.toLowerCase() === '.nss') {
-    uuid = uuid.padEnd(64, '0');
-  }
-
-  return uuid;
+function getUUID(section: Buffer, offset = 0) {
+  return section.subarray(offset, offset + 20).toString('hex');
 }

src/elf.ts

@@ -40,7 +40,7 @@ export function findCompressionWorkerPath(): string {
     if (!isSea()) {
         // @ts-ignore - Check if we're in an ESM environment
         const isESM = typeof import.meta?.url === 'string';
-        const workerFile = isESM ? 'compression.mjs' : 'compression.js';
+        const workerFile = isESM ? 'compression.mjs' : 'compression.cjs';
         return join(__dirname, workerFile);
     }
 
@@ -49,8 +49,8 @@ export function findCompressionWorkerPath(): string {
         mkdirSync(nativeModuleDir, { recursive: true });
     }
 
-    const nativeModuleStream = getAsset('compression.js');
-    const targetPath = join(nativeModuleDir, 'compression.js');
+    const nativeModuleStream = getAsset('compression.cjs');
+    const targetPath = join(nativeModuleDir, 'compression.cjs');
     writeFileSync(targetPath, Buffer.from((nativeModuleStream)));
 
     return targetPath;

src/preload.ts

@@ -15,5 +15,5 @@
     "forceConsistentCasingInFileNames": true,
     "allowJs": true
   },
-  "files": ["./index.ts", "./bin/index.ts", "src/compression.js", "src/compression.mjs", "src/compat.ts"]
+  "files": ["./index.ts", "./bin/index.ts", "src/compression.cjs", "src/compression.mjs", "src/compat.ts"]
 }

tsconfig.cjs.json

@@ -19,5 +19,5 @@
     "isolatedModules": true,
     "verbatimModuleSyntax": false
   },
-  "files": ["./index.ts", "./bin/index.ts", "src/compression.js", "src/compression.mjs", "src/compat.ts"]
+  "files": ["./index.ts", "./bin/index.ts", "src/compression.cjs", "src/compression.mjs", "src/compat.ts"]
 }

tsconfig.esm.json

@@ -18,5 +18,5 @@
     "isolatedModules": true,
     "verbatimModuleSyntax": false
   },
-  "files": ["./index.ts", "./bin/index.ts", "src/compression.js", "src/compression.mjs", "src/compat.ts"]
+  "files": ["./index.ts", "./bin/index.ts", "src/compression.cjs", "src/compression.mjs", "src/compat.ts"]
 }