Skip to content

Fix conflict invoker hash and bound hash separator #376

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
Mortaro merged 7 commits into from
Aug 18, 2023
Merged

Fix conflict invoker hash and bound hash separator #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
355f6ca
Merge pull request #358 from nullstack/next
Mortaro Jun 13, 2023
fc6f555
Merge pull request #369 from nullstack/next
Mortaro Jul 3, 2023
6033054
Merge pull request #371 from nullstack/next
Mortaro Jul 7, 2023
7a74807
add utility function symbolHashSplit
HallexCosta Aug 18, 2023
05ec145
change seperator hash to ---
HallexCosta Aug 18, 2023
a4fe03b
use utility function symbolHashSplit
HallexCosta Aug 18, 2023
7079434
feat: add new func symbolHashJoin and rename shared file to symbolHas…
HallexCosta Aug 18, 2023
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
3 changes: 2 additions & 1 deletion client/invoke.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import deserialize from '../shared/deserialize'
import prefix from '../shared/prefix'
import { symbolHashJoin } from '../shared/symbolHash'
import page from './page'
import worker from './worker'
import client from './client'
Expand All @@ -13,7 +14,7 @@ export default function invoke(name, hash) {
} else {
worker.queues[name] = [...worker.queues[name], params]
}
let finalHash = hash === this.hash ? hash : `${hash}-${this.hash}`
let finalHash = hash === this.hash ? hash : symbolHashJoin(hash, this.hash)
let url = `${worker.api}/${prefix}/${finalHash}/${name}.json`
if (module.hot) {
const version = client.klasses[hash].__hashes[name]
Expand Down
5 changes: 3 additions & 2 deletions server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import bodyParser from 'body-parser'
import express from 'express'
import path from 'path'
import deserialize from '../shared/deserialize'
import { symbolHashSplit } from '../shared/symbolHash'
import prefix from '../shared/prefix'
import context, { getCurrentContext, generateCurrentContext } from './context'
import emulatePrerender from './emulatePrerender'
Expand Down Expand Up @@ -123,7 +124,7 @@ server.start = function () {
const payload = request.method === 'GET' ? request.query.payload : request.body
const args = deserialize(payload)
const { hash, methodName } = request.params
const [invokerHash, boundHash] = hash.split('-')
const [invokerHash, boundHash] = symbolHashSplit(hash)
const key = `${invokerHash}.${methodName}`
await load(boundHash || invokerHash)
const invokerKlass = registry[invokerHash]
Expand Down Expand Up @@ -154,7 +155,7 @@ server.start = function () {
const payload = request.method === 'GET' ? request.query.payload : request.body
const args = deserialize(payload)
const { version, hash, methodName } = request.params
const [invokerHash, boundHash] = hash.split('-')
const [invokerHash, boundHash] = symbolHashSplit(hash)
let [filePath, klassName] = (invokerHash || boundHash).split("___")
const file = path.resolve('..', filePath.replaceAll('__', '/'))
console.info('\x1b[1;37m%s\x1b[0m', ` [${request.method}] ${request.path}`)
Expand Down
7 changes: 7 additions & 0 deletions shared/symbolHash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export function symbolHashSplit(hash) {
return hash.split('---')
}

export function symbolHashJoin(hash, joinHash) {
return `${hash}---${joinHash}`
}