@rsdoctor/sdk 0.1.6-beta.0 → 0.1.6-beta.1

package/dist/cjs/sdk/sdk/webpack.js

@@ -44,7 +44,7 @@ class RsdoctorWebpackSDK extends import_core.SDKCore {
     this._chunkGraph = new import_graph.ChunkGraph();
     this._rawSourceMapCache = /* @__PURE__ */ new Map();
     this._sourceMap = /* @__PURE__ */ new Map();
-    this.server = options.noServer ? new import_fakeServer.RsdoctorFakeServer(this, void 0) : new import_server.RsdoctorServer(this, options.port, options.innerClientName);
+    this.server = options.noServer ? new import_fakeServer.RsdoctorFakeServer(this, void 0) : new import_server.RsdoctorServer(this, options.port, options.innerClientPath);
     this.type = options.type || import_types.SDK.ToDataType.Normal;
     this.extraConfig = options.config;
   }

package/dist/cjs/sdk/server/apis/renderer.js

@@ -46,16 +46,14 @@ var import_path = __toESM(require("path"));
 var import_build = require("@rsdoctor/utils/build");
 var import_base = require("./base");
 var import_router = require("../router");
-var import_common = require("@rsdoctor/utils/common");
 class RendererAPI extends import_base.BaseAPI {
   constructor() {
     super(...arguments);
     this.isClientServed = false;
   }
   async entryHtml() {
-    const { server, res, req } = this.ctx;
-    const name = req.url && req.url.match(/innerClientName=([\w-|\=]+)/)?.[1];
-    const clientHtmlPath = name ? require.resolve(`${import_common.Algorithm.decompressText(name)}/react-client`) : require.resolve("@rsdoctor/client");
+    const { server, res } = this.ctx;
+    const clientHtmlPath = server.innerClientPath ? server.innerClientPath : require.resolve("@rsdoctor/client");
     if (!this.isClientServed) {
       this.isClientServed = true;
       const clientDistPath = import_path.default.resolve(clientHtmlPath, "..");

package/dist/cjs/sdk/server/index.js

@@ -45,10 +45,9 @@ var import_router = require("./router");
 var APIs = __toESM(require("./apis"));
 var import_logger = require("@rsdoctor/utils/logger");
 var import_openBrowser = require("../utils/openBrowser");
-var import_common2 = require("@rsdoctor/utils/common");
 __reExport(server_exports, require("./utils"), module.exports);
 class RsdoctorServer {
-  constructor(sdk, port = import_build.Server.defaultPort, innerClientName = "") {
+  constructor(sdk, port = import_build.Server.defaultPort, innerClientPath = "") {
     this.sdk = sdk;
     this.disposed = true;
     this.get = (route, cb) => {
@@ -75,7 +74,7 @@ class RsdoctorServer {
     (0, import_assert.default)(typeof port === "number");
     this.port = port;
     this._router = new import_router.Router({ sdk, server: this, apis: Object.values(APIs) });
-    this.innerClientName = innerClientName;
+    this._innerClientPath = innerClientPath;
   }
   get app() {
     return this._server.app;
@@ -90,6 +89,9 @@ class RsdoctorServer {
   get socketUrl() {
     return `ws://localhost:${this.port}`;
   }
+  get innerClientPath() {
+    return this._innerClientPath;
+  }
   async bootstrap() {
     if (!this.disposed) {
       return;
@@ -158,12 +160,12 @@ class RsdoctorServer {
     });
   }
   getClientUrl(route = "homepage", ...args) {
-    const relativeUrl = this.innerClientName ? `${import_types.SDK.ServerAPI.API.EntryHtml}?innerClientName=${import_common2.Algorithm.compressText(this.innerClientName)}` : import_types.SDK.ServerAPI.API.EntryHtml;
+    const relativeUrl = import_types.SDK.ServerAPI.API.EntryHtml;
     switch (route) {
       case import_types.Client.RsdoctorClientRoutes.BundleDiff: {
         const [baseline, current] = args;
         const qs = import_common.Bundle.getBundleDiffPageQueryString([baseline, current]);
-        return this.innerClientName ? `${relativeUrl}${qs.replace("?", "&")}#${import_types.Client.RsdoctorClientRoutes.BundleDiff}` : `${relativeUrl}${qs}#${import_types.Client.RsdoctorClientRoutes.BundleDiff}`;
+        return `${relativeUrl}${qs}#${import_types.Client.RsdoctorClientRoutes.BundleDiff}`;
       }
       default:
         return relativeUrl;

package/dist/esm/sdk/sdk/webpack.js

@@ -21,7 +21,7 @@ class RsdoctorWebpackSDK extends SDKCore {
     this._chunkGraph = new ChunkGraph();
     this._rawSourceMapCache = /* @__PURE__ */ new Map();
     this._sourceMap = /* @__PURE__ */ new Map();
-    this.server = options.noServer ? new RsdoctorFakeServer(this, void 0) : new RsdoctorServer(this, options.port, options.innerClientName);
+    this.server = options.noServer ? new RsdoctorFakeServer(this, void 0) : new RsdoctorServer(this, options.port, options.innerClientPath);
     this.type = options.type || SDK.ToDataType.Normal;
     this.extraConfig = options.config;
   }

package/dist/esm/sdk/server/apis/renderer.js

@@ -15,16 +15,14 @@ import path from "path";
 import { File } from "@rsdoctor/utils/build";
 import { BaseAPI } from "./base";
 import { Router } from "../router";
-import { Algorithm } from "@rsdoctor/utils/common";
 class RendererAPI extends BaseAPI {
   constructor() {
     super(...arguments);
     this.isClientServed = false;
   }
   async entryHtml() {
-    const { server, res, req } = this.ctx;
-    const name = req.url && req.url.match(/innerClientName=([\w-|\=]+)/)?.[1];
-    const clientHtmlPath = name ? require.resolve(`${Algorithm.decompressText(name)}/react-client`) : require.resolve("@rsdoctor/client");
+    const { server, res } = this.ctx;
+    const clientHtmlPath = server.innerClientPath ? server.innerClientPath : require.resolve("@rsdoctor/client");
     if (!this.isClientServed) {
       this.isClientServed = true;
       const clientDistPath = path.resolve(clientHtmlPath, "..");

package/dist/esm/sdk/server/index.js

@@ -11,10 +11,9 @@ import { Router } from "./router";
 import * as APIs from "./apis";
 import { chalk, logger } from "@rsdoctor/utils/logger";
 import { openBrowser } from "../utils/openBrowser";
-import { Algorithm } from "@rsdoctor/utils/common";
 export * from "./utils";
 class RsdoctorServer {
-  constructor(sdk, port = Server.defaultPort, innerClientName = "") {
+  constructor(sdk, port = Server.defaultPort, innerClientPath = "") {
     this.sdk = sdk;
     this.disposed = true;
     this.get = (route, cb) => {
@@ -41,7 +40,7 @@ class RsdoctorServer {
     assert(typeof port === "number");
     this.port = port;
     this._router = new Router({ sdk, server: this, apis: Object.values(APIs) });
-    this.innerClientName = innerClientName;
+    this._innerClientPath = innerClientPath;
   }
   get app() {
     return this._server.app;
@@ -56,6 +55,9 @@ class RsdoctorServer {
   get socketUrl() {
     return `ws://localhost:${this.port}`;
   }
+  get innerClientPath() {
+    return this._innerClientPath;
+  }
   async bootstrap() {
     if (!this.disposed) {
       return;
@@ -124,12 +126,12 @@ class RsdoctorServer {
     });
   }
   getClientUrl(route = "homepage", ...args) {
-    const relativeUrl = this.innerClientName ? `${SDK.ServerAPI.API.EntryHtml}?innerClientName=${Algorithm.compressText(this.innerClientName)}` : SDK.ServerAPI.API.EntryHtml;
+    const relativeUrl = SDK.ServerAPI.API.EntryHtml;
     switch (route) {
       case Client.RsdoctorClientRoutes.BundleDiff: {
         const [baseline, current] = args;
         const qs = Bundle.getBundleDiffPageQueryString([baseline, current]);
-        return this.innerClientName ? `${relativeUrl}${qs.replace("?", "&")}#${Client.RsdoctorClientRoutes.BundleDiff}` : `${relativeUrl}${qs}#${Client.RsdoctorClientRoutes.BundleDiff}`;
+        return `${relativeUrl}${qs}#${Client.RsdoctorClientRoutes.BundleDiff}`;
       }
       default:
         return relativeUrl;

package/dist/type/sdk/sdk/types.d.ts

@@ -23,7 +23,7 @@ export interface RsdoctorBuilderSDK extends RsdoctorSDKOptions {
     port?: number;
     noServer?: boolean;
     config?: SDK.SDKOptionsType;
-    innerClientName?: string;
+    innerClientPath?: string;
 }
 export interface RsdoctorWebpackSDKOptions extends RsdoctorBuilderSDK {
 }

package/dist/type/sdk/server/index.d.ts

@@ -5,15 +5,16 @@ export declare class RsdoctorServer implements SDK.RsdoctorServerInstance {
     protected sdk: SDK.RsdoctorBuilderSDKInstance;
     private _server;
     port: number;
-    innerClientName: string;
     private _socket?;
     private disposed;
     private _router;
-    constructor(sdk: SDK.RsdoctorBuilderSDKInstance, port?: number, innerClientName?: string);
+    private _innerClientPath;
+    constructor(sdk: SDK.RsdoctorBuilderSDKInstance, port?: number, innerClientPath?: string);
     get app(): SDK.RsdoctorServerInstance['app'];
     get host(): string;
     get origin(): string;
     get socketUrl(): string;
+    get innerClientPath(): string;
     bootstrap(): Promise<void>;
     protected wrapNextHandleFunction(method: 'GET' | 'POST', cb: (...args: Parameters<Thirdparty.connect.NextHandleFunction>) => Common.PlainObject | string): Thirdparty.connect.NextHandleFunction;
     proxy(api: SDK.ServerAPI.API, method: 'GET' | 'POST', cb: (...args: Parameters<Thirdparty.connect.NextHandleFunction>) => Common.PlainObject | string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/sdk",
-  "version": "0.1.6-beta.0",
+  "version": "0.1.6-beta.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -25,10 +25,10 @@
     "socket.io": "4.7.2",
     "source-map": "^0.7.4",
     "tapable": "2.2.1",
-    "@rsdoctor/client": "0.1.6-beta.0",
-    "@rsdoctor/graph": "0.1.6-beta.0",
-    "@rsdoctor/types": "0.1.6-beta.0",
-    "@rsdoctor/utils": "0.1.6-beta.0"
+    "@rsdoctor/client": "0.1.6-beta.1",
+    "@rsdoctor/types": "0.1.6-beta.1",
+    "@rsdoctor/utils": "0.1.6-beta.1",
+    "@rsdoctor/graph": "0.1.6-beta.1"
   },
   "devDependencies": {
     "@types/body-parser": "1.19.2",