@php-wasm/node 3.1.3 → 3.1.4

package/index.cjs

@@ -430,7 +430,7 @@ var import_universal12 = require("@php-wasm/universal");
 var import_promises = require("dns/promises");
 function bindUserSpace({ fileLockManager }, {
   pid,
-  memory: { HEAP16, HEAP64, HEAP32 },
+  memory,
   constants: {
     F_RDLCK,
     F_WRLCK,
@@ -470,7 +470,7 @@ function bindUserSpace({ fileLockManager }, {
     }
     getNextAsInt() {
       const fourByteOffset = this.argsAddr >> 2;
-      const value = HEAP32[fourByteOffset];
+      const value = memory.HEAP32.get(fourByteOffset);
       this.argsAddr += 4;
       return value;
     }
@@ -578,58 +578,63 @@ function bindUserSpace({ fileLockManager }, {
   const emscripten_flock_l_pid_offset = 24;
   function readFlockStruct(flockStructAddress) {
     return {
-      l_type: HEAP16[
+      l_type: memory.HEAP16.get(
         // Shift right by 1 to divide by 2^1.
         flockStructAddress + emscripten_flock_l_type_offset >> 1
-      ],
-      l_whence: HEAP16[
+      ),
+      l_whence: memory.HEAP16.get(
         // Shift right by 1 to divide by 2^1.
         flockStructAddress + emscripten_flock_l_whence_offset >> 1
-      ],
-      l_start: HEAP64[
+      ),
+      l_start: memory.HEAP64.get(
         // Shift right by 3 to divide by 2^3.
         flockStructAddress + emscripten_flock_l_start_offset >> 3
-      ],
-      l_len: HEAP64[
+      ),
+      l_len: memory.HEAP64.get(
         // Shift right by 3 to divide by 2^3.
         flockStructAddress + emscripten_flock_l_len_offset >> 3
-      ],
-      l_pid: HEAP32[
+      ),
+      l_pid: memory.HEAP32.get(
         // Shift right by 2 to divide by 2^2.
         flockStructAddress + emscripten_flock_l_pid_offset >> 2
-      ]
+      )
     };
   }
   function updateFlockStruct(flockStructAddress, fields) {
     if (fields.l_type !== void 0) {
-      HEAP16[
+      memory.HEAP16.set(
         // Shift right by 1 to divide by 2^1.
-        flockStructAddress + emscripten_flock_l_type_offset >> 1
-      ] = fields.l_type;
+        flockStructAddress + emscripten_flock_l_type_offset >> 1,
+        fields.l_type
+      );
     }
     if (fields.l_whence !== void 0) {
-      HEAP16[
+      memory.HEAP16.set(
         // Shift right by 1 to divide by 2^1.
-        flockStructAddress + emscripten_flock_l_whence_offset >> 1
-      ] = fields.l_whence;
+        flockStructAddress + emscripten_flock_l_whence_offset >> 1,
+        fields.l_whence
+      );
     }
     if (fields.l_start !== void 0) {
-      HEAP64[
+      memory.HEAP64.set(
         // Shift right by 3 to divide by 2^3.
-        flockStructAddress + emscripten_flock_l_start_offset >> 3
-      ] = fields.l_start;
+        flockStructAddress + emscripten_flock_l_start_offset >> 3,
+        fields.l_start
+      );
     }
     if (fields.l_len !== void 0) {
-      HEAP64[
+      memory.HEAP64.set(
         // Shift right by 3 to divide by 2^3.
-        flockStructAddress + emscripten_flock_l_len_offset >> 3
-      ] = fields.l_len;
+        flockStructAddress + emscripten_flock_l_len_offset >> 3,
+        fields.l_len
+      );
     }
     if (fields.l_pid !== void 0) {
-      HEAP32[
+      memory.HEAP32.set(
         // Shift right by 2 to divide by 2^2.
-        flockStructAddress + emscripten_flock_l_pid_offset >> 2
-      ] = fields.l_pid;
+        flockStructAddress + emscripten_flock_l_pid_offset >> 2,
+        fields.l_pid
+      );
     }
   }
   function getBaseAddress(fd, whence, startOffset) {

package/index.js

@@ -401,7 +401,7 @@ import {
 import { lookup as lookup2 } from "dns/promises";
 function bindUserSpace({ fileLockManager }, {
   pid,
-  memory: { HEAP16, HEAP64, HEAP32 },
+  memory,
   constants: {
     F_RDLCK,
     F_WRLCK,
@@ -441,7 +441,7 @@ function bindUserSpace({ fileLockManager }, {
     }
     getNextAsInt() {
       const fourByteOffset = this.argsAddr >> 2;
-      const value = HEAP32[fourByteOffset];
+      const value = memory.HEAP32.get(fourByteOffset);
       this.argsAddr += 4;
       return value;
     }
@@ -549,58 +549,63 @@ function bindUserSpace({ fileLockManager }, {
   const emscripten_flock_l_pid_offset = 24;
   function readFlockStruct(flockStructAddress) {
     return {
-      l_type: HEAP16[
+      l_type: memory.HEAP16.get(
         // Shift right by 1 to divide by 2^1.
         flockStructAddress + emscripten_flock_l_type_offset >> 1
-      ],
-      l_whence: HEAP16[
+      ),
+      l_whence: memory.HEAP16.get(
         // Shift right by 1 to divide by 2^1.
         flockStructAddress + emscripten_flock_l_whence_offset >> 1
-      ],
-      l_start: HEAP64[
+      ),
+      l_start: memory.HEAP64.get(
         // Shift right by 3 to divide by 2^3.
         flockStructAddress + emscripten_flock_l_start_offset >> 3
-      ],
-      l_len: HEAP64[
+      ),
+      l_len: memory.HEAP64.get(
         // Shift right by 3 to divide by 2^3.
         flockStructAddress + emscripten_flock_l_len_offset >> 3
-      ],
-      l_pid: HEAP32[
+      ),
+      l_pid: memory.HEAP32.get(
         // Shift right by 2 to divide by 2^2.
         flockStructAddress + emscripten_flock_l_pid_offset >> 2
-      ]
+      )
     };
   }
   function updateFlockStruct(flockStructAddress, fields) {
     if (fields.l_type !== void 0) {
-      HEAP16[
+      memory.HEAP16.set(
         // Shift right by 1 to divide by 2^1.
-        flockStructAddress + emscripten_flock_l_type_offset >> 1
-      ] = fields.l_type;
+        flockStructAddress + emscripten_flock_l_type_offset >> 1,
+        fields.l_type
+      );
     }
     if (fields.l_whence !== void 0) {
-      HEAP16[
+      memory.HEAP16.set(
         // Shift right by 1 to divide by 2^1.
-        flockStructAddress + emscripten_flock_l_whence_offset >> 1
-      ] = fields.l_whence;
+        flockStructAddress + emscripten_flock_l_whence_offset >> 1,
+        fields.l_whence
+      );
     }
     if (fields.l_start !== void 0) {
-      HEAP64[
+      memory.HEAP64.set(
         // Shift right by 3 to divide by 2^3.
-        flockStructAddress + emscripten_flock_l_start_offset >> 3
-      ] = fields.l_start;
+        flockStructAddress + emscripten_flock_l_start_offset >> 3,
+        fields.l_start
+      );
     }
     if (fields.l_len !== void 0) {
-      HEAP64[
+      memory.HEAP64.set(
         // Shift right by 3 to divide by 2^3.
-        flockStructAddress + emscripten_flock_l_len_offset >> 3
-      ] = fields.l_len;
+        flockStructAddress + emscripten_flock_l_len_offset >> 3,
+        fields.l_len
+      );
     }
     if (fields.l_pid !== void 0) {
-      HEAP32[
+      memory.HEAP32.set(
         // Shift right by 2 to divide by 2^2.
-        flockStructAddress + emscripten_flock_l_pid_offset >> 2
-      ] = fields.l_pid;
+        flockStructAddress + emscripten_flock_l_pid_offset >> 2,
+        fields.l_pid
+      );
     }
   }
   function getBaseAddress(fd, whence, startOffset) {

package/lib/wasm-user-space.d.ts

@@ -7,6 +7,10 @@
 import type { Emscripten } from '@php-wasm/universal';
 import type { WasmKernelSpace } from './wasm-kernel-space';
 type FSNode = Emscripten.FS.FSNode;
+type HeapAccessor<T> = {
+    get(offset: number): T;
+    set(offset: number, value: T): void;
+};
 type NonZeroNumber = Exclude<number, 0>;
 export type WasmUserSpaceContext = {
     pid: number;
@@ -40,16 +44,16 @@ export type WasmUserSpaceContext = {
         EWOULDBLOCK: NonZeroNumber;
     };
     memory: {
-        HEAP8: Int8Array;
-        HEAPU8: Uint8Array;
-        HEAP16: Int16Array;
-        HEAPU16: Uint16Array;
-        HEAP32: Int32Array;
-        HEAPU32: Uint32Array;
-        HEAPF32: Float32Array;
-        HEAP64: BigInt64Array;
-        HEAPU64: BigUint64Array;
-        HEAPF64: Float64Array;
+        HEAP8: HeapAccessor<number>;
+        HEAPU8: HeapAccessor<number>;
+        HEAP16: HeapAccessor<number>;
+        HEAPU16: HeapAccessor<number>;
+        HEAP32: HeapAccessor<number>;
+        HEAPU32: HeapAccessor<number>;
+        HEAPF32: HeapAccessor<number>;
+        HEAP64: HeapAccessor<bigint>;
+        HEAPU64: HeapAccessor<bigint>;
+        HEAPF64: HeapAccessor<bigint>;
     };
     wasmImports: {
         builtin_fcntl64: (fd: number, cmd: number, varargs?: any) => number;
@@ -77,5 +81,5 @@ export type WasmUserSpaceAPI = {
     js_release_file_locks: () => void;
     gethostbyname: (hostname: string) => Promise<string>;
 };
-export declare function bindUserSpace({ fileLockManager }: WasmKernelSpace, { pid, memory: { HEAP16, HEAP64, HEAP32 }, constants: { F_RDLCK, F_WRLCK, F_UNLCK, F_GETFL, O_ACCMODE, O_RDONLY, O_WRONLY, O_APPEND, O_NONBLOCK, F_SETFL, F_GETLK, F_SETLK, F_SETLKW, SEEK_SET, SEEK_CUR, SEEK_END, LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN, }, errnoCodes: { EBADF, EINVAL, EAGAIN, EWOULDBLOCK }, wasmImports: { builtin_fcntl64, builtin_fd_close, js_wasm_trace }, wasmExports: { wasm_get_end_offset }, syscalls: { getStreamFromFD }, FS, PROXYFS, NODEFS, }: WasmUserSpaceContext): WasmUserSpaceAPI;
+export declare function bindUserSpace({ fileLockManager }: WasmKernelSpace, { pid, memory, constants: { F_RDLCK, F_WRLCK, F_UNLCK, F_GETFL, O_ACCMODE, O_RDONLY, O_WRONLY, O_APPEND, O_NONBLOCK, F_SETFL, F_GETLK, F_SETLK, F_SETLKW, SEEK_SET, SEEK_CUR, SEEK_END, LOCK_SH, LOCK_EX, LOCK_NB, LOCK_UN, }, errnoCodes: { EBADF, EINVAL, EAGAIN, EWOULDBLOCK }, wasmImports: { builtin_fcntl64, builtin_fd_close, js_wasm_trace }, wasmExports: { wasm_get_end_offset }, syscalls: { getStreamFromFD }, FS, PROXYFS, NODEFS, }: WasmUserSpaceContext): WasmUserSpaceAPI;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
   },
   "license": "GPL-2.0-or-later",
   "types": "index.d.ts",
-  "gitHead": "54bb87ba4c9624ec02f60194a2f1938b3f42477b",
+  "gitHead": "a7cde6f2a2d3cef27f51f24e9ddadbe5ca05344b",
   "engines": {
     "node": ">=20.10.0",
     "npm": ">=10.2.3"
@@ -52,19 +52,19 @@
     "wasm-feature-detect": "1.8.0",
     "ws": "8.18.3",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "3.1.3",
-    "@php-wasm/universal": "3.1.3",
-    "@php-wasm/node-8-5": "3.1.3",
-    "@php-wasm/node-8-4": "3.1.3",
-    "@php-wasm/node-8-3": "3.1.3",
-    "@php-wasm/node-8-2": "3.1.3",
-    "@php-wasm/node-8-1": "3.1.3",
-    "@php-wasm/node-8-0": "3.1.3",
-    "@php-wasm/node-7-4": "3.1.3",
-    "@php-wasm/cli-util": "3.1.3",
-    "@php-wasm/logger": "3.1.3",
-    "@php-wasm/util": "3.1.3",
-    "@wp-playground/common": "3.1.3"
+    "@php-wasm/node-polyfills": "3.1.4",
+    "@php-wasm/universal": "3.1.4",
+    "@php-wasm/node-8-5": "3.1.4",
+    "@php-wasm/node-8-4": "3.1.4",
+    "@php-wasm/node-8-3": "3.1.4",
+    "@php-wasm/node-8-2": "3.1.4",
+    "@php-wasm/node-8-1": "3.1.4",
+    "@php-wasm/node-8-0": "3.1.4",
+    "@php-wasm/node-7-4": "3.1.4",
+    "@php-wasm/cli-util": "3.1.4",
+    "@php-wasm/logger": "3.1.4",
+    "@php-wasm/util": "3.1.4",
+    "@wp-playground/common": "3.1.4"
   },
   "packageManager": "npm@10.9.2",
   "overrides": {