@webspatial/builder 0.1.21 → 0.1.22

package/dist/index.js

@@ -8,6 +8,7 @@ const version_1 = require("./lib/cmds/version");
 const fetch_1 = require("./lib/utils/fetch");
 const launch_1 = require("./lib/cmds/launch");
 const shutdown_1 = require("./lib/cmds/shutdown");
+const test_1 = require("./lib/cmds/test");
 module.exports = async () => {
     if ((0, semver_1.major)(process.versions.node) < 14) {
         throw new Error(`Current Node.js version is ${process.versions.node}.` +
@@ -96,4 +97,8 @@ async function setupCommands(program) {
         console.log(options);
         await (0, shutdown_1.shutdown)(options);
     });
+    program.command('test').action(async (options) => {
+        console.log(options);
+        (0, test_1.test)();
+    });
 }

package/dist/lib/cmds/build.js

@@ -12,7 +12,7 @@ const history_1 = require("../utils/history");
 async function build(args) {
     var _a;
     console.log('------------------- parse start -------------------');
-    resource_1.ResourceManager.checkPlatformPath(args['platform']);
+    resource_1.ResourceManager.initPlatform(args['platform']);
     const manifestInfo = await doPwa(args);
     const icon = await doReadyProject((_a = args['project']) !== null && _a !== void 0 ? _a : 'dist', manifestInfo);
     await doXcode(args, icon, manifestInfo);
@@ -22,7 +22,7 @@ async function build(args) {
 }
 // build and upload ipa to App Store Connect
 async function store(args) {
-    resource_1.ResourceManager.checkPlatformPath(args['platform']);
+    resource_1.ResourceManager.initPlatform(args['platform']);
     (0, check_1.checkStoreParams)(args);
     /*
       There are two ways to upload ipa to App Store Connect:
@@ -45,8 +45,8 @@ async function run(args) {
     var _a;
     const runCmd = JSON.stringify(args);
     history_1.default.init(runCmd);
+    resource_1.ResourceManager.setupTempPath(args['platform']);
     console.log('------------------- parse start -------------------');
-    resource_1.ResourceManager.checkPlatformPath(args['platform']);
     const manifestInfo = await doPwa(args, true);
     history_1.default.recordManifest(manifestInfo.json);
     /*
@@ -64,6 +64,7 @@ async function run(args) {
             return;
         }
     }
+    resource_1.ResourceManager.pullPlatformModule(args['platform']);
     const icon = await doReadyProject((_a = args['project']) !== null && _a !== void 0 ? _a : 'dist', manifestInfo);
     await doXcode(args, icon, manifestInfo, true);
     console.log('------------------- parse end -------------------');

package/dist/lib/cmds/test.d.ts

@@ -0,0 +1 @@
+export declare function test(): void;

package/dist/lib/cmds/test.js

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.test = test;
+const path_1 = require("path");
+function configStartUrl(manifestStartUrl, base, manifestUrl, isNet) {
+    let start_url = manifestStartUrl !== null && manifestStartUrl !== void 0 ? manifestStartUrl : '/index.html';
+    if (!start_url.match(/\.html(\?|$)/)) {
+        const [path, query] = start_url.split('?');
+        start_url = path.endsWith('/') ? `${path}index.html` : `${path}/index.html`;
+        if (query)
+            start_url += `?${query}`;
+    }
+    const isStartUrl = validateURL(start_url);
+    const hasBase = base.length > 0;
+    if (hasBase) {
+        const isBaseUrl = validateURL(base);
+        if (!isStartUrl && !isBaseUrl) {
+            const staticWebRoot = (0, path_1.resolve)('./static-web');
+            let resolvedPath = (0, path_1.join)(base, start_url);
+            const normalizedPath = (0, path_1.normalize)(resolvedPath);
+            const safePath = (0, path_1.join)(staticWebRoot, normalizedPath);
+            start_url = (0, path_1.relative)(process.cwd(), safePath)
+                .replace(/^(\.\.\/)+/, './')
+                .replace(/\/$/, '');
+        }
+        else if (isStartUrl && !isBaseUrl) {
+            const startUrl = new URL(start_url);
+            const fullPath = (0, path_1.join)(base, startUrl.pathname) + startUrl.search + startUrl.hash;
+            let newBase = new URL('/', startUrl.origin);
+            start_url = new URL(fullPath, newBase).href;
+        }
+        else if (!isStartUrl && isBaseUrl) {
+            if (start_url.startsWith('/')) {
+                const baseUrl = new URL(base);
+                start_url = baseUrl.origin + (0, path_1.join)(baseUrl.pathname, start_url);
+            }
+            else {
+                start_url = new URL(start_url, base).href;
+            }
+        }
+        else if (isStartUrl && isBaseUrl) {
+            const startUrl = new URL(start_url);
+            const baseUrl = new URL(base);
+            const startFullPath = startUrl.pathname + startUrl.search + startUrl.hash;
+            start_url = new URL(startFullPath, baseUrl.origin + baseUrl.pathname).href;
+        }
+    }
+    else {
+        if (isNet) {
+            const murl = new URL(manifestUrl);
+            if (!isStartUrl) {
+                const newStartUrl = new URL(start_url, murl.origin);
+                start_url = newStartUrl.href;
+            }
+            else {
+                const startUrl = new URL(start_url);
+                start_url =
+                    murl.origin + startUrl.pathname + startUrl.search + startUrl.hash;
+            }
+        }
+        else if (!isStartUrl) {
+            const staticWebRoot = (0, path_1.resolve)('./static-web');
+            const resolvedPath = (0, path_1.resolve)(staticWebRoot, start_url);
+            const normalizedPath = (0, path_1.normalize)(resolvedPath);
+            const safePath = (0, path_1.join)(staticWebRoot, normalizedPath);
+            start_url = (0, path_1.relative)(process.cwd(), safePath)
+                .replace(/^(\.\.\/)+/, './')
+                .replace(/\/$/, '');
+        }
+    }
+    return start_url;
+}
+function configScope(start_url, scope) {
+    const isStartUrl = validateURL(start_url);
+    const isUrl = validateURL(scope);
+    if (isStartUrl && isUrl) {
+        const scopeURL = new URL(scope);
+        const startURL = new URL(start_url);
+        if (scopeURL.host !== startURL.host || start_url.indexOf(scope) !== 0) {
+            scope = parseRouter(start_url);
+        }
+    }
+    else if (isStartUrl && !isUrl) {
+        scope = new URL(scope, start_url).href;
+    }
+    else if (!isStartUrl && isUrl) {
+        const cleanPath = start_url.replace(/\/[^\/]+$/, '');
+        scope = (0, path_1.normalize)(cleanPath + '/');
+    }
+    //  else {
+    //   scope = join(parseRouter(start_url), scope)
+    // }
+    // scope = scope
+    return scope;
+}
+function validateURL(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
+}
+function parseRouter(url) {
+    let urlParts = url.split('/');
+    urlParts.pop();
+    let pathUrl = urlParts.join();
+    while (pathUrl.indexOf(',') >= 0) {
+        pathUrl = pathUrl.replace(',', '/');
+    }
+    return pathUrl;
+}
+function testStartUrl() {
+    console.log(configStartUrl('/', '', '/manifest.json', false));
+    console.log(configStartUrl('http://www.baidu.com', '', 'http://www.baidu.com/manifest.json', true));
+    console.log(configStartUrl('/', '/', '/manifest.json', false));
+    console.log(configStartUrl('/a.html?a=1', '/', '/manifest.json', false));
+    console.log(configStartUrl('http://www.baidu.com/test/a.html?a=1', '/xx', '/manifest.json', false));
+    console.log(configStartUrl('http://www.baidu.com/a.html?a=1', 'http://www.google.com/test', '/manifest.json', false));
+    console.log(configStartUrl('/test/index.html', '/public/aaa', '/manifest.json', false));
+}
+function testScope() {
+    console.log(configScope('/test/index.html', '/test'));
+}
+function test() {
+    // testStartUrl()
+    // testScope()
+}

package/dist/lib/pwa/config.js

@@ -28,12 +28,6 @@ function configId(manifestJson, bundleId) {
 function configStartUrl(manifestJson, base, manifestUrl, isNet) {
     var _a;
     let start_url = (_a = manifestJson.start_url) !== null && _a !== void 0 ? _a : '/index.html';
-    if (!start_url.match(/\.html(\?|$)/)) {
-        const [path, query] = start_url.split('?');
-        start_url = path.endsWith('/') ? `${path}index.html` : `${path}/index.html`;
-        if (query)
-            start_url += `?${query}`;
-    }
     const isStartUrl = (0, validate_1.validateURL)(start_url);
     const hasBase = base.length > 0;
     if (hasBase) {
@@ -92,6 +86,13 @@ function configStartUrl(manifestJson, base, manifestUrl, isNet) {
                 .replace(/\/$/, '');
         }
     }
+    if (!start_url.match(/\.html(\?|$)/) &&
+        !(start_url.startsWith('http://') || start_url.startsWith('https://'))) {
+        const [path, query] = start_url.split('?');
+        start_url = path.endsWith('/') ? `${path}index.html` : `${path}/index.html`;
+        if (query)
+            start_url += `?${query}`;
+    }
     return start_url;
 }
 function configScope(manifestJson) {

package/dist/lib/pwa/validate.js

@@ -44,46 +44,18 @@ function checkManifestJson(manifestJson, isDev = false) {
     }
 }
 function checkStartUrl(startUrl, manifestUrl, isNet, isDev = false) {
-    var isNetWeb = false;
     if (isDev) {
         return startUrl.startsWith('https://') || startUrl.startsWith('http://');
     }
-    if (isNet) {
-        // Determine whether it is of the same origin as the manifest
-        if (startUrl.startsWith('https://')) {
-            const urlStart = new URL(startUrl);
-            const urlManifest = new URL(manifestUrl);
-            // The start_url and manifest need to be of the same origin
-            if (urlStart.host !== urlManifest.host) {
-                throw new CustomError_1.CustomError({
-                    code: 4000,
-                    // eslint-disable-next-line @typescript-eslint/camelcase
-                    message: 'In the WebSpatial App Manifest, the start_url must be the same origin with manifest',
-                    message_staring_params: {},
-                });
-            }
-        }
-        // Start_url must be HTTPS protocol
-        else if (startUrl.startsWith('http://')) {
-            throw new CustomError_1.CustomError({
-                code: 4000,
-                // eslint-disable-next-line @typescript-eslint/camelcase
-                message: 'In the Web Spatial App Manifest, the start_url must use https',
-                message_staring_params: {},
-            });
-        }
-    }
-    else {
-        if (startUrl.startsWith('https://') || startUrl.startsWith('http://')) {
-            throw new CustomError_1.CustomError({
-                code: 4000,
-                // eslint-disable-next-line @typescript-eslint/camelcase
-                message: 'Local manifest cannot package network project',
-                message_staring_params: {},
-            });
-        }
+    if (startUrl.startsWith('http://')) {
+        throw new CustomError_1.CustomError({
+            code: 4000,
+            // eslint-disable-next-line @typescript-eslint/camelcase
+            message: 'In the Web Spatial App Manifest, the start_url must use https',
+            message_staring_params: {},
+        });
     }
-    return isNetWeb;
+    return startUrl.startsWith('https://');
 }
 async function checkIcons(manifest, manifestUrl, isDev = false) {
     var _a, _b;

package/dist/lib/resource/index.d.ts

@@ -12,11 +12,13 @@ export declare const LOGO_DIRECTORY: string;
 export declare class ResourceManager {
     static moveProjectFrom(dir: string): Promise<void>;
     static generateIcon(info: ManifestInfo): Promise<Jimp>;
+    static initPlatform(platform: string): void;
+    static setupTempPath(platform: string): void;
     /**
      * @description Check and set the platform path to ensure the existence of the specified platform module.
      * If the module does not exist, it will be installed automatically.
      * Also set the project directory, build directory, and export directory.
      * @param platform The name of the platform to check, defaulting to 'visionos'
      */
-    static checkPlatformPath(platform: string): void;
+    static pullPlatformModule(platform: string): void;
 }

package/dist/lib/resource/index.js

@@ -47,13 +47,39 @@ class ResourceManager {
         icon.resize(1024, 1024);
         return icon;
     }
+    static initPlatform(platform) {
+        this.setupTempPath(platform);
+        this.pullPlatformModule(platform);
+    }
+    static setupTempPath(platform) {
+        const usePlatform = platform !== null && platform !== void 0 ? platform : supportPlatform[0];
+        if (!supportPlatform.includes(usePlatform)) {
+            throw new Error(`not support platform ${usePlatform}, now WebSpatial only support ${supportPlatform.join(',')}`);
+        }
+        let tempDir = './node_modules/.webspatial-builder-temp';
+        let tempPlatformDir = (0, path_1.join)(tempDir, `platform-${usePlatform}`);
+        let tempProjectDir = (0, path_1.join)(tempPlatformDir, './project');
+        let temBuildDir = (0, path_1.join)(tempPlatformDir, './build');
+        let temExportDir = (0, path_1.join)(tempPlatformDir, './export');
+        let temTestDir = (0, path_1.join)(tempPlatformDir, './test');
+        if (!fs.existsSync(tempDir)) {
+            fs.mkdirSync(tempDir);
+        }
+        if (!fs.existsSync(tempPlatformDir)) {
+            fs.mkdirSync(tempPlatformDir);
+        }
+        exports.PROJECT_DIRECTORY = tempProjectDir;
+        exports.PROJECT_BUILD_DIRECTORY = temBuildDir;
+        exports.PROJECT_EXPORT_DIRECTORY = temExportDir;
+        exports.PROJECT_TEST_DIRECTORY = temTestDir;
+    }
     /**
      * @description Check and set the platform path to ensure the existence of the specified platform module.
      * If the module does not exist, it will be installed automatically.
      * Also set the project directory, build directory, and export directory.
      * @param platform The name of the platform to check, defaulting to 'visionos'
      */
-    static checkPlatformPath(platform) {
+    static pullPlatformModule(platform) {
         const usePlatform = platform !== null && platform !== void 0 ? platform : supportPlatform[0];
         if (!supportPlatform.includes(usePlatform)) {
             throw new Error(`not support platform ${usePlatform}, now WebSpatial only support ${supportPlatform.join(',')}`);
@@ -68,36 +94,20 @@ class ResourceManager {
         if (!hasModule) {
             (0, child_process_1.execSync)(`cd ${(0, path_1.join)(__dirname, '../../../')} && pnpm add @webspatial/platform-${usePlatform}`);
         }
-        let tempDir = './node_modules/.webspatial-builder-temp';
-        let tempPlatformDir = (0, path_1.join)(tempDir, `platform-${usePlatform}`);
-        let tempProjectDir = (0, path_1.join)(tempPlatformDir, './project');
-        let temBuildDir = (0, path_1.join)(tempPlatformDir, './build');
-        let temExportDir = (0, path_1.join)(tempPlatformDir, './export');
-        let temTestDir = (0, path_1.join)(tempPlatformDir, './test');
-        if (!fs.existsSync(tempDir)) {
-            fs.mkdirSync(tempDir);
-        }
-        if (!fs.existsSync(tempPlatformDir)) {
-            fs.mkdirSync(tempPlatformDir);
-        }
-        if (fs.existsSync(tempProjectDir)) {
-            (0, child_process_1.execSync)(`rm -rf ${tempProjectDir}`);
+        if (fs.existsSync(exports.PROJECT_DIRECTORY)) {
+            (0, child_process_1.execSync)(`rm -rf ${exports.PROJECT_DIRECTORY}`);
         }
-        if (!fs.existsSync(temBuildDir)) {
-            fs.mkdirSync(temBuildDir);
+        if (!fs.existsSync(exports.PROJECT_BUILD_DIRECTORY)) {
+            fs.mkdirSync(exports.PROJECT_BUILD_DIRECTORY);
         }
-        if (!fs.existsSync(temExportDir)) {
-            fs.mkdirSync(temExportDir);
+        if (!fs.existsSync(exports.PROJECT_EXPORT_DIRECTORY)) {
+            fs.mkdirSync(exports.PROJECT_EXPORT_DIRECTORY);
         }
-        if (!fs.existsSync(temTestDir)) {
-            fs.mkdirSync(temTestDir);
+        if (!fs.existsSync(exports.PROJECT_TEST_DIRECTORY)) {
+            fs.mkdirSync(exports.PROJECT_TEST_DIRECTORY);
         }
-        fs.mkdirSync(tempProjectDir);
-        (0, file_1.copyDir)(modulePath, tempProjectDir);
-        exports.PROJECT_DIRECTORY = tempProjectDir;
-        exports.PROJECT_BUILD_DIRECTORY = temBuildDir;
-        exports.PROJECT_EXPORT_DIRECTORY = temExportDir;
-        exports.PROJECT_TEST_DIRECTORY = temTestDir;
+        fs.mkdirSync(exports.PROJECT_DIRECTORY);
+        (0, file_1.copyDir)(modulePath, exports.PROJECT_DIRECTORY);
     }
 }
 exports.ResourceManager = ResourceManager;

package/dist/lib/xcode/xcodeproject.js

@@ -193,7 +193,7 @@ class XcodeProject {
         var _a;
         xcodeProject.updateProductName(manifest.name);
         // set PRODUCT_BUNDLE_IDENTIFIER need ""
-        if (manifest.id && !isDev) {
+        if (manifest.id) {
             xcodeProject.updateBuildProperty('PRODUCT_BUNDLE_IDENTIFIER', `"${manifest.id}"`);
         }
         this.updateDeeplink((_a = manifest.protocol_handlers) !== null && _a !== void 0 ? _a : []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/builder",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Client CLI tool to Generate XRApp project for Apple Vision Pro",
   "type": "commonjs",
   "engines": {
@@ -40,7 +40,7 @@
     "sharp": "^0.33.5",
     "valid-url": "^1.0.9",
     "xcode": "^3.0.1",
-    "@webspatial/platform-visionos": "^0.1.21"
+    "@webspatial/platform-visionos": "^0.1.22"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.3",
@@ -65,6 +65,7 @@
   },
   "scripts": {
     "start": "tsc -w",
+    "test": "npm run build && bin/bundlepwa.js test",
     "test1": "npm run build && bin/bundlepwa.js build --manifest=../testLocal/manifest.json --project=../testLocal --export=./export --version=1.0 --teamId=teamId",
     "test2": "npm run build && bin/bundlepwa.js publish --manifest=../pack-test/pwa_test.json --project=../pack-test --version=1.0 --teamId=teamId --u=username --p=password",
     "test3": "npm run build && bin/bundlepwa.js publish --name=webspatial --version=1.0 --u=username --p=password",