@mlightcad/libredwg-web 0.7.3 → 0.7.4

package/lib/converter/converter.d.ts

@@ -12,6 +12,7 @@ export declare class LibreDwgConverter {
     getConversionStats(): {
         unknownEntityCount: number;
     };
+    private safeObjectTio;
     private convertHeader;
     private convertClasses;
     private convertAppId;

package/lib/converter/converter.js

@@ -1,5 +1,5 @@
 import { HEADER_VARIABLES } from '../database';
-import { Dwg_Object_Type } from '../types';
+import { Dwg_Object_Supertype, Dwg_Object_Type } from '../types';
 import { LibreEntityConverter } from './entityConverter';
 import { idToString, isModelSpace, isPaperSpace } from './utils';
 /**
@@ -56,7 +56,7 @@ export class LibreDwgConverter {
         for (let i = 0; i < num_objects; i++) {
             const obj = libredwg.dwg_get_object(data, i);
             if (obj) {
-                const tio = libredwg.dwg_object_to_object_tio(obj);
+                const tio = this.safeObjectTio(obj);
                 if (tio) {
                     const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
                     switch (fixedtype) {
@@ -83,7 +83,7 @@ export class LibreDwgConverter {
         for (let i = 0; i < num_objects; i++) {
             const obj = libredwg.dwg_get_object(data, i);
             if (obj) {
-                const tio = libredwg.dwg_object_to_object_tio(obj);
+                const tio = this.safeObjectTio(obj);
                 if (tio) {
                     const fixedtype = libredwg.dwg_object_get_fixedtype(obj);
                     switch (fixedtype) {
@@ -156,6 +156,20 @@ export class LibreDwgConverter {
             unknownEntityCount: this.entityConverter.unknownEntityCount
         };
     }
+    safeObjectTio(obj) {
+        const libredwg = this.libredwg;
+        try {
+            if (libredwg.dwg_object_get_supertype(obj) !=
+                Dwg_Object_Supertype.DWG_SUPERTYPE_OBJECT) {
+                return null;
+            }
+            const tio = libredwg.dwg_object_to_object_tio(obj);
+            return tio ? tio : null;
+        }
+        catch {
+            return null;
+        }
+    }
     convertHeader(data, header) {
         const libredwg = this.libredwg;
         HEADER_VARIABLES.forEach(name => {
@@ -172,10 +186,10 @@ export class LibreDwgConverter {
                 name == 'DIMSTYLE' ||
                 name == 'DIMTXSTY' ||
                 name == 'TEXTSTYLE') {
-                value = !!value ? libredwg.dwg_ref_get_object_name(value) : '';
+                value = value ? libredwg.dwg_ref_get_object_name(value) : '';
             }
             else if (name == 'DRAGVS') {
-                value = !!value ? libredwg.dwg_ref_get_absref(value) : 2;
+                value = value ? libredwg.dwg_ref_get_absref(value) : 2;
             }
             // @ts-expect-error header variable name
             header[name] = value;
@@ -892,7 +906,7 @@ export class LibreDwgConverter {
         const viewportId = idToString(libredwg.dwg_ref_get_absref(active_viewport_ref));
         const named_ucs_ref = libredwg.dwg_dynapi_entity_value(item, 'named_ucs')
             .data;
-        const namedUcsId = !!named_ucs_ref
+        const namedUcsId = named_ucs_ref
             ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref))
             : undefined;
         // BITCODE_H base_ucs;

package/lib/converter/entityConverter.d.ts

@@ -1,4 +1,4 @@
-import { DwgDatabase, DwgEntity, DwgClassLookup } from '../database';
+import { DwgClassLookup, DwgDatabase, DwgEntity } from '../database';
 import { LibreDwgEx } from '../libredwg';
 import { Dwg_Object_Ptr } from '../types';
 export declare class LibreEntityConverter {

package/lib/libredwg.js

@@ -2,7 +2,7 @@ import createModule from '../wasm/libredwg-web.js';
 import { LibreDwgConverter } from './converter';
 import { dwgCodePageToEncoding, dwgVersions } from './database';
 import { SvgConverter } from './svg';
-import { Dwg_File_Type, Dwg_Object_Type } from './types';
+import { Dwg_Error, Dwg_File_Type, Dwg_Object_Type } from './types';
 export { createModule };
 export var DwgThumbnailImageType;
 (function (DwgThumbnailImageType) {
@@ -32,8 +32,12 @@ export class LibreDwg {
             try {
                 this.wasmInstance.FS.writeFile(fileName, new Uint8Array(fileContent));
                 const result = this.wasmInstance.dwg_read_file(fileName);
+                if (result.error & Dwg_Error.OUTOFMEM) {
+                    this.wasmInstance.dwg_abandon(result.data);
+                    throw new Error('Failed to decode DWG: out of WASM memory. Rebuild with pnpm build:wasm (INITIAL_MEMORY=1GB) or use a smaller file.');
+                }
                 if (result.error != 0) {
-                    console.log('Open dwg file with error code: ', result.error);
+                    console.warn('Open dwg file with error code:', result.error);
                 }
                 return result.data;
             }
@@ -168,7 +172,20 @@ export class LibreDwg {
      * @param data Pointer to Dwg_Data instance.
      */
     dwg_free(data) {
-        this.wasmInstance.dwg_free(data);
+        if (!data) {
+            return;
+        }
+        try {
+            this.wasmInstance.dwg_free(data);
+        }
+        catch {
+            try {
+                this.wasmInstance.dwg_abandon(data);
+            }
+            catch {
+                // best effort; wasm heap may already be corrupt
+            }
+        }
     }
     /**
      * Frees the object (all three structs and its fields)

package/lib/types/enums.d.ts

@@ -2,6 +2,23 @@ export declare enum Dwg_Object_Supertype {
     DWG_SUPERTYPE_ENTITY = 0,
     DWG_SUPERTYPE_OBJECT = 1
 }
+/** Bit flags returned by dwg_read_file (see include/dwg.h DWG_ERROR). */
+export declare enum Dwg_Error {
+    WRONGCRC = 1,
+    NOTYETSUPPORTED = 2,
+    UNHANDLEDCLASS = 4,
+    INVALIDTYPE = 8,
+    INVALIDHANDLE = 16,
+    INVALIDEED = 32,
+    VALUEOUTOFBOUNDS = 64,
+    CLASSESNOTFOUND = 128,
+    SECTIONNOTFOUND = 256,
+    PAGENOTFOUND = 512,
+    INTERNALERROR = 1024,
+    INVALIDDWG = 2048,
+    IOERROR = 4096,
+    OUTOFMEM = 8192
+}
 export declare enum Dwg_Object_Type {
     DWG_TYPE_UNUSED = 0,
     DWG_TYPE_TEXT = 1,

package/lib/types/enums.js

@@ -3,6 +3,24 @@ export var Dwg_Object_Supertype;
     Dwg_Object_Supertype[Dwg_Object_Supertype["DWG_SUPERTYPE_ENTITY"] = 0] = "DWG_SUPERTYPE_ENTITY";
     Dwg_Object_Supertype[Dwg_Object_Supertype["DWG_SUPERTYPE_OBJECT"] = 1] = "DWG_SUPERTYPE_OBJECT";
 })(Dwg_Object_Supertype || (Dwg_Object_Supertype = {}));
+/** Bit flags returned by dwg_read_file (see include/dwg.h DWG_ERROR). */
+export var Dwg_Error;
+(function (Dwg_Error) {
+    Dwg_Error[Dwg_Error["WRONGCRC"] = 1] = "WRONGCRC";
+    Dwg_Error[Dwg_Error["NOTYETSUPPORTED"] = 2] = "NOTYETSUPPORTED";
+    Dwg_Error[Dwg_Error["UNHANDLEDCLASS"] = 4] = "UNHANDLEDCLASS";
+    Dwg_Error[Dwg_Error["INVALIDTYPE"] = 8] = "INVALIDTYPE";
+    Dwg_Error[Dwg_Error["INVALIDHANDLE"] = 16] = "INVALIDHANDLE";
+    Dwg_Error[Dwg_Error["INVALIDEED"] = 32] = "INVALIDEED";
+    Dwg_Error[Dwg_Error["VALUEOUTOFBOUNDS"] = 64] = "VALUEOUTOFBOUNDS";
+    Dwg_Error[Dwg_Error["CLASSESNOTFOUND"] = 128] = "CLASSESNOTFOUND";
+    Dwg_Error[Dwg_Error["SECTIONNOTFOUND"] = 256] = "SECTIONNOTFOUND";
+    Dwg_Error[Dwg_Error["PAGENOTFOUND"] = 512] = "PAGENOTFOUND";
+    Dwg_Error[Dwg_Error["INTERNALERROR"] = 1024] = "INTERNALERROR";
+    Dwg_Error[Dwg_Error["INVALIDDWG"] = 2048] = "INVALIDDWG";
+    Dwg_Error[Dwg_Error["IOERROR"] = 4096] = "IOERROR";
+    Dwg_Error[Dwg_Error["OUTOFMEM"] = 8192] = "OUTOFMEM";
+})(Dwg_Error || (Dwg_Error = {}));
 export var Dwg_Object_Type;
 (function (Dwg_Object_Type) {
     Dwg_Object_Type[Dwg_Object_Type["DWG_TYPE_UNUSED"] = 0] = "DWG_TYPE_UNUSED";

package/package.json

@@ -3,9 +3,12 @@
   "description": "A DWG/DXF JavaScript parser based on libredwg",
   "license": "GPL-3.0",
   "private": false,
-  "version": "0.7.3",
+  "version": "0.7.4",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "type": "module",
+  "engines": {
+    "node": ">=20"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/mlightcad/libredwg-web"
@@ -41,6 +44,7 @@
     "require": "./dist/libredwg-web.umd.cjs"
   },
   "devDependencies": {
+    "@eslint/js": "^9.9.1",
     "@typescript-eslint/parser": "^8.4.0",
     "eslint": "^9.9.1",
     "eslint-config-prettier": "^9.1.0",
@@ -70,15 +74,18 @@
     "demo": "live-server examples --entry-file=index.html",
     "doc": "typedoc",
     "build": "tsc && vite build && cp -rf wasm examples/ && cp -rf dist examples/",
-    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1\" CC=emcc --enable-release --disable-docs --disable-write --disable-python --disable-bindings --disable-shared --disable-json --enable-partial --enable-experimental",
+    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1 -DNDEBUG\" CC=emcc --enable-release --disable-docs --disable-write --disable-python --disable-bindings --disable-shared --disable-json --enable-partial --enable-experimental",
     "build:obj": "cd ../../build-wasm && emmake make",
-    "build:wasm": "cd ../../build-wasm && emcc ../bindings/javascript/embind/*.cpp src/*.o -O2 -lembind -std=c++17 -Isrc -I../src -I../include -o libredwg-web.js -s ALLOW_MEMORY_GROWTH=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\"createModule\" -sEXPORTED_RUNTIME_METHODS=FS,ENV,ccall,cwrap,UTF8ToString,stringToNewUTF8,setValue --emit-tsd libredwg-web.d.ts",
+    "build:wasm": "cd ../../build-wasm && emcc ../bindings/javascript/embind/*.cpp src/*.o -O2 -lembind -std=c++17 -Isrc -I../src -I../include -o libredwg-web.js -s ALLOW_MEMORY_GROWTH=1 -s INITIAL_MEMORY=1GB -s MAXIMUM_MEMORY=4GB -s MALLOC=mimalloc -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\"createModule\" -sEXPORTED_RUNTIME_METHODS=FS,ENV,ccall,cwrap,UTF8ToString,stringToNewUTF8,setValue --emit-tsd libredwg-web.d.ts",
     "clean": "rm -rf ../../build-wasm ./docs ./dist ./lib",
     "copy": "cp -f ../../build-wasm/libredwg-web.d.ts ../../build-wasm/libredwg-web.js ../../build-wasm/libredwg-web.wasm wasm/ && cp -f ../../build-wasm/libredwg-web.js src/",
     "format": "prettier --config ./.prettierrc.js --write src/**/*.{ts,js}",
     "install:emsdk": "cd $EMSDK && ./emsdk install latest && ./emsdk activate latest",
     "link": "node script/create-symlink.js ./wasm/libredwg-web.js ./src/libredwg-web.js",
     "lint": "eslint src/",
-    "lint:fix": "eslint --fix --quiet src/"
+    "lint:fix": "eslint --fix --quiet src/",
+    "test": "node --test test/node-api.test.mjs",
+    "test:node": "pnpm build && pnpm test",
+    "publish:npm": "pnpm publish --access public --no-git-checks"
   }
 }

package/wasm/libredwg-web.d.ts

@@ -224,6 +224,26 @@ declare class FSNode {
     get isDevice(): any;
 }
 interface WasmModule {
+  __Znwm(_0: number): number;
+  __ZdlPvm(_0: number, _1: number): void;
+  _strndup(_0: number, _1: number): number;
+  __ZdaPv(_0: number): void;
+  __ZdaPvm(_0: number, _1: number): void;
+  __ZdlPv(_0: number): void;
+  _emscripten_builtin_malloc(_0: number): number;
+  __Znam(_0: number): number;
+  __ZnamSt11align_val_t(_0: number, _1: number): number;
+  __ZnwmSt11align_val_t(_0: number, _1: number): number;
+  ___libc_calloc(_0: number, _1: number): number;
+  ___libc_free(_0: number): void;
+  ___libc_malloc(_0: number): number;
+  ___libc_realloc(_0: number, _1: number): number;
+  _emscripten_builtin_calloc(_0: number, _1: number): number;
+  _emscripten_builtin_free(_0: number): void;
+  _emscripten_builtin_realloc(_0: number, _1: number): number;
+  _malloc_size(_0: number): number;
+  _malloc_usable_size(_0: number): number;
+  _reallocf(_0: number, _1: number): number;
 }
 
 type EmbindString = ArrayBuffer|Uint8Array|Uint8ClampedArray|Int8Array|string;
@@ -389,6 +409,7 @@ interface EmbindModule {
   dwg_get_next_object(_0: number, _1: Dwg_Object_Type, _2: number): number;
   dwg_resolve_jump(_0: number): number;
   dwg_free(_0: number): void;
+  dwg_abandon(_0: number): void;
   dwg_free_object(_0: number): void;
   dwg_new_ref(_0: number): number;
   dwg_dup_handleref(_0: number, _1: number): number;