Skip to content

fix(reacant-share): fix portDetector onClient & onServer issue and fix port issue #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2022
Merged

fix(reacant-share): fix portDetector onClient & onServer issue and fix port issue #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85611dd
fix(webpack): use port 7001 instead of 7000 about macOS Monterey port…
unadlib May 8, 2022
838176b
fix(reacant-share): fix portDetector onClient and onServer issue abou…
unadlib May 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/js-counter/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = {
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 7000,
port: 7001,
open: true,
},
plugins: [new CopyWebpackPlugin([path.join(__dirname, './src/index.html')])],
Expand Down
2 changes: 1 addition & 1 deletion examples/reactant-share-hybrid/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = {
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 7000,
port: 7001,
open: true,
},
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion examples/reactant-share-serviceworker/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = {
mode: 'development',
devServer: {
compress: true,
port: 7000,
port: 7001,
open: true,
https: true,
},
Expand Down
2 changes: 1 addition & 1 deletion examples/reactant-share-sharedtab/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 7000,
port: 7001,
open: true,
},
plugins: [new CopyWebpackPlugin([path.join(__dirname, './src/index.html')])],
Expand Down
2 changes: 1 addition & 1 deletion examples/reactant-share-sharedworker/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = {
mode: 'development',
devServer: {
compress: true,
port: 7000,
port: 7001,
open: true,
},
output: {
Expand Down
2 changes: 1 addition & 1 deletion examples/reactant-share-webrtc/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = {
mode: 'development',
devServer: {
compress: true,
port: 7000,
port: 7001,
open: true,
},
output: {
Expand Down
2 changes: 1 addition & 1 deletion examples/ts-bookstore/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module.exports = {
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 7000,
port: 7001,
open: true,
},
plugins: [new CopyWebpackPlugin([path.join(__dirname, './src/index.html')])],
Expand Down
2 changes: 1 addition & 1 deletion examples/ts-counter/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = {
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 7000,
port: 7001,
open: true,
},
plugins: [new CopyWebpackPlugin([path.join(__dirname, './src/index.html')])],
Expand Down
2 changes: 2 additions & 0 deletions packages/reactant-share/src/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import {
} from './constants';
import type { RouterChangeNameOptions } from './router';

export type { Transport } from 'data-transport';

export type Port = 'server' | 'client';

export interface Transports {
Expand Down
34 changes: 34 additions & 0 deletions packages/reactant-share/src/portDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
Port,
PortApp,
Transports,
Transport,
} from './interfaces';

export const PortDetectorOptions = Symbol('PortDetectorOptions');
Expand Down Expand Up @@ -116,6 +117,21 @@ export class PortDetector {
throw new Error(`'onServer' argument should be a function.`);
}
this.serverCallbacks.add(callback);

if (
this.lastHooks &&
this.lastHooks.size > 0 &&
this.isServer &&
this.transport
) {
try {
const hook = callback(this.transport);
this.lastHooks.add(hook);
} catch (e) {
console.error(e);
}
}

return () => {
this.serverCallbacks.delete(callback);
};
Expand All @@ -132,6 +148,21 @@ export class PortDetector {
throw new Error(`'onClient' argument should be a function.`);
}
this.clientCallbacks.add(callback);

if (
this.lastHooks &&
this.lastHooks.size > 0 &&
this.isClient &&
this.transport
) {
try {
const hook = callback(this.transport);
this.lastHooks.add(hook);
} catch (e) {
console.error(e);
}
}

return () => {
this.clientCallbacks.delete(callback);
};
Expand All @@ -149,10 +180,13 @@ export class PortDetector {
return this.options.transports ?? {};
}

transport?: Transport;

setPort(
currentPortApp: PortApp,
transport: Required<Transports>[keyof Transports]
) {
this.transport = transport;
if (this.lastHooks) {
for (const hook of this.lastHooks) {
try {
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/service-worker/javascript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
https: true, // TODO: use https://github.com/FiloSottile/mkcert
},
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/service-worker/typescript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
https: true, // TODO: use https://github.com/FiloSottile/mkcert
},
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/shared-tab/javascript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
},
plugins: [
new CopyWebpackPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/shared-tab/typescript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
},
plugins: [
new CopyWebpackPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/shared-worker/javascript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
},
plugins: [
new CopyWebpackPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/shared-worker/typescript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
},
plugins: [
new CopyWebpackPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/web/javascript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
},
plugins: [
new CopyWebpackPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/reactant-template/templates/web/typescript/template/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = {
directory: path.join(__dirname, 'public'),
},
compress: true,
port: 7000,
port: 7001,
},
plugins: [
new CopyWebpackPlugin({
Expand Down