fix: relative imports for wasm module

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",
@@ -10,6 +10,8 @@
   "publish": {
     "include": [
       "src/",
+      "src/**/*.wasm",
+      "src/**/*.data",
       "examples/",
       "extensions/",
       "types.ts",

src/orm/db/postgres/in-pg/in-pg-client.ts

@@ -16,7 +16,7 @@ export class InPGClient extends PostgresClient {
     const pgDataRoot = normalizePath(`${inRoot}/pgdata`);
     this.wasmPath = `${thisDir}/src/inpg.wasm`;
 
-    this.#inPg = new InPG(this.wasmPath, {
+    this.#inPg = new InPG({
       env: {
         PGDATA: pgDataRoot,
         MODE: "REACT",

src/orm/db/postgres/in-pg/in-pg.ts

@@ -6,6 +6,8 @@ import { ExitStatus } from "./src/utils.ts";
 import { WasmLoader } from "./src/wasmLoader.ts";
 import type { InPgOptions } from "./types.ts";
 
+const fileData = Deno.readFileSync(import.meta.dirname + `/src/inpg.data`);
+const wasmData = Deno.readFileSync(import.meta.dirname + `/src/inpg.wasm`);
 export class InPG implements Deno.Conn {
   pgMem: PGMem;
   wasmLoader;
@@ -77,7 +79,6 @@ export class InPG implements Deno.Conn {
     return envs;
   }
   constructor(
-    wasmPath: string,
     options: InPgOptions,
   ) {
     this.#onStdErr = options.onStderr || ((m) => console.error(m));
@@ -88,11 +89,11 @@ export class InPG implements Deno.Conn {
     this.#bufferData = new Uint8Array(0);
     this.runtimeInitialized = false;
     this.pgMem = new PGMem(this);
-    this.wasmLoader = new WasmLoader(this, wasmPath);
+    this.wasmLoader = new WasmLoader(this, wasmData);
     this.readEmAsmArgsArray = [];
     this.fileManager = new FileManager(this, {
       debug: options?.debug,
-      pgFilesDir: options.pgFilesDir,
+      fileData,
     });
     this.sysCalls = new SysCalls(this);
 

src/orm/db/postgres/in-pg/src/fileManager/in-pg-files.ts

@@ -2,7 +2,6 @@ import { type InPG, ni } from "../../in-pg.ts";
 import type { DevType, PGFile, PGFileMem } from "../../types.ts";
 import { ERRNO_CODES } from "../constants.ts";
 import { normalizePath } from "../convert.ts";
-
 import type { PGMem } from "../pgMem.ts";
 import { MemFile, PostgresFile } from "./pg-file.ts";
 
@@ -19,18 +18,16 @@ export class FileManager {
   tmpMap: Map<string, string>;
   lastDebugMessage: string;
   messageCount: number = 0;
-  pgFilesDir: string;
   isWindows: boolean = Deno.build.os === "windows";
   tmDir!: string;
   postgresFiles: Map<string, PostgresFile>;
   constructor(inPg: InPG, options: {
     debug?: boolean;
-    pgFilesDir: string;
+    fileData: Uint8Array;
   }) {
     this.lastDebugMessage = "";
     this.dirReadOffsets = new Map();
     this.debug = options?.debug;
-    this.pgFilesDir = options.pgFilesDir;
     this.#currFD = 100;
     this.inPg = inPg;
     this.mem = inPg.pgMem;
@@ -47,11 +44,7 @@ export class FileManager {
         truncate: true,
       });
     }
-    this.init();
-  }
-
-  init() {
-    this.loadPostgresFiles();
+    this.loadPostgresFiles(options.fileData);
     this.setupStdStreams();
   }
   clearTmp() {
@@ -419,8 +412,7 @@ export class FileManager {
     }
     return null;
   }
-  loadPostgresFiles() {
-    const data = Deno.readFileSync(`${this.pgFilesDir}/src/inpg.data`);
+  loadPostgresFiles(data: Uint8Array) {
     let offset = 0;
     const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
 

src/orm/db/postgres/in-pg/src/wasmLoader.ts

@@ -27,7 +27,6 @@ class LDSO {
   }
 }
 export class WasmLoader {
-  wasmPath: string;
   wasmImports: WasmImports;
   wasmTable;
   GOT: Record<string, any>;
@@ -38,14 +37,14 @@ export class WasmLoader {
   wasmExports: WebAssembly.Exports;
   freeTableIndexes: Array<number>;
   inPg: InPG;
+  wasmData: Uint8Array;
 
   get pgMem(): PGMem {
     return this.inPg.pgMem;
   }
-  constructor(inPg: InPG, wasmPath: string) {
+  constructor(inPg: InPG, wasmData: Uint8Array) {
     this.GOT = {};
     this.inPg = inPg;
-    this.wasmPath = wasmPath;
     this.wasmExports = {};
     this.wasmImports = {};
     this.LDSO = new LDSO();
@@ -55,6 +54,7 @@ export class WasmLoader {
       initial: this.inPg.tableSize,
       element: "anyfunc",
     });
+    this.wasmData = wasmData;
 
     const GOT = this.GOT;
     const currentModuleWeakSymbols = this.currentModuleWeakSymbols;
@@ -92,8 +92,8 @@ export class WasmLoader {
         GOTHandler,
       ) as WebAssembly.ModuleImports,
     };
-    const buffer = await Deno.readFile(this.wasmPath);
-    const result = await WebAssembly.instantiate(buffer, info);
+
+    const result = await WebAssembly.instantiate(this.wasmData, info);
     this.wasmExports = result.instance.exports;
 
     for (var [sym, exp] of Object.entries(result.instance.exports)) {