@soonspacejs/plugin-soonbuilder-loader 2.16.9 → 2.16.11

package/README.md

@@ -3,3 +3,15 @@
 > Soonbuilder-loader plugin for SoonSpace.js
 
 Document: [http://www.xwbuilders.com:8800/plugin/soonbuilder-loader.html](http://www.xwbuilders.com:8800/plugin/soonbuilder-loader.html)
+
+清单中的资源文件名按原始路径读取，加载时逐段进行 URL 编码，保留目录分隔符。
+楼层模型、附属构件和场景 XML 文件名中的 `#`、`?`、`&`、`+`、`%` 均作为文件名的一部分发送。
+
+资源 URL 回归验证（在仓库根目录执行，无需额外安装测试框架）：
+
+```sh
+npm run build:package -- plugin-soonbuilder-loader
+node --test packages/@soonspacejs/plugin-soonbuilder-loader/test/resource-url.test.mjs
+```
+
+用例通过本地 HTTP 服务模拟签名接口和存储重定向，验证两次请求收到的对象路径均完整。

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 const y = ["FACILITY", "DOOR", "WINDOW"];
-class v {
+class $ {
   constructor(t) {
     this.ssp = t, this.treeData = [], this.modelData = [];
   }
@@ -7,11 +7,11 @@ class v {
   sceneInfo;
   treeData;
   modelData;
-  async load(t, e = !1) {
-    const { xmlToJson: i, isArray: s, isObject: r } = this.ssp.utils, h = e ? `${t}/FileInfo.xml` : t;
-    this.fileInfo = await i(h);
+  async load(t, i = !1) {
+    const { xmlToJson: n, isArray: o, isObject: e } = this.ssp.utils, h = i ? `${t}/FileInfo.xml` : t;
+    this.fileInfo = await n(h);
     const x = this._getFileExtensionFc(this.fileInfo), p = h.split("FileInfo.xml")[0], D = this.fileInfo.folder._attributes.name;
-    this.sceneInfo = await i(`${p}${D}.xml`);
+    this.sceneInfo = await n(this._pathModeChange(p, `${D}.xml`));
     const {
       Project: {
         Building: { Floors: c, ObjectHierarchy: u }
@@ -25,86 +25,86 @@ class v {
         userData: l
       };
       this._pushModelData(f);
-      const E = await this.ssp.loadModelToGroup(
+      const I = await this.ssp.loadModelToGroup(
         {
           id: `${f.id}_group`
         },
         [f]
       );
-      if (!E) return;
-      let n = null;
-      if (s(u.Entity))
-        n = u.Entity.find(
-          ({ _attributes: { id: o, type: d } }) => d === "Floor" && o === _
+      if (!I) return;
+      let r = null;
+      if (o(u.Entity))
+        r = u.Entity.find(
+          ({ _attributes: { id: s, type: d } }) => d === "Floor" && s === _
         );
-      else if (r(u.Entity)) {
-        const { id: o, type: d } = u.Entity._attributes;
-        o === _ && d === "Floor" && (n = u.Entity);
+      else if (e(u.Entity)) {
+        const { id: s, type: d } = u.Entity._attributes;
+        s === _ && d === "Floor" && (r = u.Entity);
       }
-      if (!n) return;
+      if (!r) return;
       let a = [];
-      s(n.Entity) ? a = n.Entity.filter(
-        ({ _attributes: { type: o } }) => y.includes(o)
-      ) : r(n.Entity) && y.includes(n.Entity._attributes.type) && (a = [n.Entity]);
-      for (let o = 0; o < a.length; o++) {
-        const { id: d, longname: F, visible: O, position: T, eular: $, scale: w } = {
-          ...a[o]._attributes,
-          ...a[o].Properties?._attributes ?? {}
+      o(r.Entity) ? a = r.Entity.filter(
+        ({ _attributes: { type: s } }) => y.includes(s)
+      ) : e(r.Entity) && y.includes(r.Entity._attributes.type) && (a = [r.Entity]);
+      for (let s = 0; s < a.length; s++) {
+        const { id: d, longname: E, visible: O, position: T, eular: w, scale: C } = {
+          ...a[s]._attributes,
+          ...a[s].Properties?._attributes ?? {}
         }, b = {
           id: d,
-          name: F,
-          url: this._pathModeChange(p, `/${x(F)}`),
+          name: E,
+          url: this._pathModeChange(p, `/${x(E)}`),
           visible: this._text2Bool(O),
           position: this._text2IVector3(T),
-          rotation: this._text2IVector3($),
-          scale: this._text2IVector3(w),
-          userData: a[o]
-        }, I = await this.ssp.loadModel(b);
-        I && (this.ssp.addObject(I, E), this._pushModelData(b), f.children?.push(b));
+          rotation: this._text2IVector3(w),
+          scale: this._text2IVector3(C),
+          userData: a[s]
+        }, F = await this.ssp.loadModel(b);
+        F && (this.ssp.addObject(F, I), this._pushModelData(b), f.children?.push(b));
       }
       this.treeData.push(f);
     };
-    if (s(c.Floor))
+    if (o(c.Floor))
       for (let l = 0; l < c.Floor.length; l++)
         await m(c.Floor[l]);
-    else r(c.Floor) && await m(c.Floor);
+    else e(c.Floor) && await m(c.Floor);
   }
   _pushModelData(t) {
-    this.modelData.find(({ url: i }) => i === t.url) || this.modelData.push(t);
+    this.modelData.find(({ url: n }) => n === t.url) || this.modelData.push(t);
   }
   _text2IVector3(t) {
     if (!t) return;
-    const e = t.split(", ");
+    const i = t.split(", ");
     return {
-      x: Number(e[0]),
-      y: Number(e[1]),
-      z: Number(e[2])
+      x: Number(i[0]),
+      y: Number(i[1]),
+      z: Number(i[2])
     };
   }
   _text2Bool(t) {
     if (t !== void 0)
       return t === "True";
   }
-  _pathModeChange(t, e) {
-    const i = t + e;
-    if (i.includes("://")) {
-      const s = i.split("://");
-      return s[0] + "://" + s[1].replace("\\", "/").replace("./", "/").replace("//", "/");
+  _pathModeChange(t, i) {
+    const n = i.replace(/\\/g, "/").split("/").map((e) => encodeURIComponent(e)).join("/"), o = t + n;
+    if (o.includes("://")) {
+      const e = o.split("://");
+      return e[0] + "://" + e[1].replace("\\", "/").replace("./", "/").replace("//", "/");
     } else
-      return i.replace("\\", "/").replace("./", "/").replace("//", "/");
+      return o.replace("\\", "/").replace("./", "/").replace("//", "/");
   }
   _getFileExtensionFc(t) {
-    const e = t?.folder?.file;
-    let i = [];
-    return e && Array.isArray(e) && (i = e.filter(((s) => {
-      const { Extension: r } = s._attributes;
-      return r === ".sbm" || r === ".sbmx";
-    }))), (s) => {
-      const r = i.find((h) => h?._attributes?.name.startsWith(s))?._attributes;
-      return `${s}${r?.Extension || ".sbm"}`;
+    const i = t?.folder?.file;
+    let n = [];
+    return i && Array.isArray(i) && (n = i.filter(((o) => {
+      const { Extension: e } = o._attributes;
+      return e === ".sbm" || e === ".sbmx";
+    }))), (o) => {
+      const e = n.find((h) => h?._attributes?.name.startsWith(o))?._attributes;
+      return `${o}${e?.Extension || ".sbm"}`;
     };
   }
 }
 export {
-  v as default
+  $ as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soonspacejs/plugin-soonbuilder-loader",
   "pluginName": "SoonbuilderLoaderPlugin",
-  "version": "2.16.9",
+  "version": "2.16.11",
   "description": "soonbuilder-loader plugin for SoonSpace.js",
   "main": "dist/index.esm.js",
   "module": "dist/index.esm.js",
@@ -15,6 +15,6 @@
   "license": "UNLICENSED",
   "gitHead": "4a87dd85050651088e11c3da777c49fab3db7e5d",
   "peerDependencies": {
-    "soonspacejs": "2.16.9"
+    "soonspacejs": "2.16.11"
   }
 }

package/test/resource-url.test.mjs

@@ -0,0 +1,180 @@
+import assert from 'node:assert/strict'
+import { once, } from 'node:events'
+import { createServer, } from 'node:http'
+import test from 'node:test'
+
+import SoonbuilderLoaderPlugin from '../dist/index.esm.js'
+
+const encodePath = ( path ) => path.split( '/' ).map( encodeURIComponent ).join( '/' )
+
+async function loadProject ( t, { directory, sceneName, floors, component, query, } ) {
+
+  const resources = new Map( [
+    [ `${directory}FileInfo.xml`, {
+      folder: {
+        _attributes: { name: sceneName, },
+        file: [ { _attributes: { name: `${component}.sbmx`, Extension: '.sbmx', }, } ],
+      },
+    } ],
+    [ `${directory}${sceneName}.xml`, {
+      Project: {
+        Building: {
+          Floors: {
+            Floor: floors.map( ( name, index ) => ( {
+              _attributes: { id: `${index}`, name: `Floor ${index}`, },
+              FileSource: { _attributes: { name, }, },
+            } ) ),
+          },
+          ObjectHierarchy: {
+            Entity: floors.map( ( _, index ) => ( {
+              _attributes: { id: `${index}`, type: 'Floor', },
+              Entity: [ {
+                _attributes: {
+                  id: `${index}-component`,
+                  type: 'FACILITY',
+                  longname: component,
+                  position: '0, 0, 0',
+                  eular: '0, 0, 0',
+                  scale: '1, 1, 1',
+                },
+              } ],
+            } ) ),
+          },
+        },
+      },
+    } ],
+    ...floors.map( ( name ) => [ `${directory}${name.replace( /\\/g, '/' )}`, {} ] ),
+    [ `${directory}${component}.sbmx`, {} ]
+  ] )
+  const signingKeys = []
+  const storageKeys = []
+  const server = createServer( ( req, res ) => {
+
+    const url = new URL( req.url, 'http://localhost' )
+    const isStorage = url.pathname.startsWith( '/obs/' )
+    const key = isStorage ?
+      decodeURIComponent( url.pathname.slice( '/obs/'.length ) ) :
+      query ?
+        url.searchParams.get( 'path' ) :
+        decodeURIComponent( url.pathname.slice( '/tempPath/'.length ) )
+
+    ;( isStorage ? storageKeys : signingKeys ).push( key )
+
+    if ( !resources.has( key ) ) {
+
+      res.writeHead( 404 )
+      res.end( `NoSuchKey: ${key}` )
+
+    } else if ( !isStorage ) {
+
+      // Simulate the signing gateway redirecting to the complete object key.
+      res.writeHead( 302, {
+        Location: `/obs/${encodePath( key )}?X-Amz-Signature=test`,
+      } )
+      res.end()
+
+    } else {
+
+      res.setHeader( 'Content-Type', 'application/json' )
+      res.end( JSON.stringify( resources.get( key ) ) )
+
+    }
+
+  } )
+
+  t.after( () => new Promise( ( resolve ) => {
+
+    server.close( resolve )
+    server.closeAllConnections()
+
+  } ) )
+  server.listen( 0, '127.0.0.1' )
+  await once( server, 'listening' )
+
+  async function readResource ( url ) {
+
+    const response = await fetch( url )
+
+    assert.equal( response.status, 200, `Resource request failed: ${url}` )
+    return response.json()
+
+  }
+
+  const ssp = {
+    utils: {
+      xmlToJson: readResource,
+      isArray: Array.isArray,
+      isObject: ( value ) => value !== null && typeof value === 'object',
+    },
+    async loadModelToGroup ( group, models ) {
+
+      await Promise.all( models.map( ( { url, } ) => readResource( url ) ) )
+      return group
+
+    },
+    async loadModel ( model ) {
+
+      await readResource( model.url )
+      return model
+
+    },
+    addObject () {},
+  }
+  const loader = new SoonbuilderLoaderPlugin( ssp )
+  const origin = `http://127.0.0.1:${server.address().port}`
+  const prefix = query ? '/tempUrl?path=' : '/tempPath/'
+
+  await loader.load( `${origin}${prefix}${encodePath( directory )}FileInfo.xml` )
+
+  const expectedKeys = [
+    `${directory}FileInfo.xml`,
+    `${directory}${sceneName}.xml`,
+    ...floors.flatMap( ( name ) => [
+      `${directory}${name.replace( /\\/g, '/' )}`,
+      `${directory}${component}.sbmx`
+    ] )
+  ]
+
+  assert.deepEqual( signingKeys, expectedKeys )
+  assert.deepEqual( storageKeys, expectedKeys )
+  assert.equal( loader.treeData.length, floors.length )
+  assert.equal( loader.treeData[ 0 ].children[ 0 ].name, component )
+
+}
+
+test( 'builder preview requests complete floor names containing # before signing', async ( t ) => {
+
+  await loadProject( t, {
+    directory: '2026-10-20/project/builder/9nzxlpl2yk1s/',
+    sceneName: '兼容性测试-2.2.7.zip',
+    floors: [
+      '兼容性测试-2.2.7.zip22_地下层01#T_0.sbmx',
+      '兼容性测试-2.2.7.zip22_地上01#层T_1.sbmx'
+    ],
+    component: '设备#1',
+  } )
+
+} )
+
+test( 'builder query URLs preserve special characters, nested paths and literal escapes', async ( t ) => {
+
+  await loadProject( t, {
+    directory: 'project/目录 # &+%23/',
+    sceneName: '场景 #&+?%23',
+    floors: [ '模型/地下层 #&+?%23.sbmx', '模型\\地上层 #2.sbmx' ],
+    component: '设备/门 #&+?%23',
+    query: true,
+  } )
+
+} )
+
+test( 'builder preview still loads ordinary resource names', async ( t ) => {
+
+  await loadProject( t, {
+    directory: 'project/builder/example/',
+    sceneName: 'scene',
+    floors: [ 'floor-1.sbmx', 'models/floor-2.sbmx' ],
+    component: 'equipment',
+  } )
+
+} )