@juzi/wechaty-puppet-service 1.0.28 → 1.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +11 -2
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/package-json.js +3 -3
- package/dist/cjs/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/cjs/src/server/puppet-implementation.js +12 -0
- package/dist/cjs/src/server/puppet-implementation.js.map +1 -1
- package/dist/cjs/src/server/puppet-server.js +22 -22
- package/dist/cjs/src/server/puppet-server.js.map +1 -1
- package/dist/cjs/tests/integration.spec.js +17 -16
- package/dist/cjs/tests/integration.spec.js.map +1 -1
- package/dist/cjs/tests/ready-event.spec.js +1 -1
- package/dist/cjs/tests/ready-event.spec.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +11 -2
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/package-json.js +3 -3
- package/dist/esm/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/esm/src/server/puppet-implementation.js +12 -0
- package/dist/esm/src/server/puppet-implementation.js.map +1 -1
- package/dist/esm/src/server/puppet-server.js +22 -22
- package/dist/esm/src/server/puppet-server.js.map +1 -1
- package/dist/esm/tests/integration.spec.js +17 -16
- package/dist/esm/tests/integration.spec.js.map +1 -1
- package/dist/esm/tests/ready-event.spec.js +1 -1
- package/dist/esm/tests/ready-event.spec.js.map +1 -1
- package/package.json +3 -3
- package/src/client/puppet-service.ts +15 -2
- package/src/package-json.ts +3 -3
- package/src/server/puppet-implementation.ts +14 -0
- package/src/server/puppet-server.ts +22 -22
|
@@ -88,19 +88,19 @@ export class PuppetServer {
|
|
|
88
88
|
}
|
|
89
89
|
|
|
90
90
|
public async start (): Promise<void> {
|
|
91
|
-
log.
|
|
91
|
+
log.info('PuppetServer', 'start()')
|
|
92
92
|
|
|
93
93
|
if (this.grpcServer) {
|
|
94
94
|
throw new Error('grpc server existed!')
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
if (!this.urnRegistry) {
|
|
98
|
-
log.
|
|
98
|
+
log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ...')
|
|
99
99
|
this.urnRegistry = new UniformResourceNameRegistry({
|
|
100
100
|
expireMilliseconds: 2 * 60 * 60 * 1000, // 2h
|
|
101
101
|
})
|
|
102
102
|
await this.urnRegistry.init()
|
|
103
|
-
log.
|
|
103
|
+
log.info('PuppetServer', 'start() initializing FileBox UUID URN Registry ... done')
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
/**
|
|
@@ -108,26 +108,26 @@ export class PuppetServer {
|
|
|
108
108
|
*/
|
|
109
109
|
const FileBoxUuid = uuidifyFileBoxLocal(this.urnRegistry)
|
|
110
110
|
|
|
111
|
-
log.
|
|
111
|
+
log.info('PuppetServer', 'start() initializing gRPC Server with options "%s"', JSON.stringify(GRPC_OPTIONS))
|
|
112
112
|
this.grpcServer = new grpc.Server(GRPC_OPTIONS)
|
|
113
|
-
log.
|
|
113
|
+
log.info('PuppetServer', 'start() initializing gRPC Server ... done', JSON.stringify(GRPC_OPTIONS))
|
|
114
114
|
|
|
115
|
-
log.
|
|
115
|
+
log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid...')
|
|
116
116
|
const puppetImpl = puppetImplementation(
|
|
117
117
|
this.options.puppet,
|
|
118
118
|
FileBoxUuid,
|
|
119
119
|
)
|
|
120
|
-
log.
|
|
120
|
+
log.info('PuppetServer', 'start() initializing puppet implementation with FileBoxUuid... done')
|
|
121
121
|
|
|
122
|
-
log.
|
|
122
|
+
log.info('PuppetServer', 'start() initializing authorization with token ...')
|
|
123
123
|
const puppetImplAuth = authImplToken(this.options.token)(puppetImpl)
|
|
124
124
|
this.grpcServer.addService(
|
|
125
125
|
grpcPuppet.PuppetService,
|
|
126
126
|
puppetImplAuth,
|
|
127
127
|
)
|
|
128
|
-
log.
|
|
128
|
+
log.info('PuppetServer', 'start() initializing authorization with token ... done')
|
|
129
129
|
|
|
130
|
-
log.
|
|
130
|
+
log.info('PuppetServer', 'start() initializing gRPC health service ...')
|
|
131
131
|
const healthImpl = healthImplementation(
|
|
132
132
|
this.options.puppet,
|
|
133
133
|
)
|
|
@@ -135,9 +135,9 @@ export class PuppetServer {
|
|
|
135
135
|
grpcGoogle.HealthService,
|
|
136
136
|
healthImpl,
|
|
137
137
|
)
|
|
138
|
-
log.
|
|
138
|
+
log.info('PuppetServer', 'start() initializing gRPC health service ... done')
|
|
139
139
|
|
|
140
|
-
log.
|
|
140
|
+
log.info('PuppetServer', 'start() initializing TLS CA ...')
|
|
141
141
|
const caCerts = envVars.WECHATY_PUPPET_SERVICE_TLS_CA_CERT()
|
|
142
142
|
const caCertBuf = caCerts
|
|
143
143
|
? Buffer.from(caCerts)
|
|
@@ -163,7 +163,7 @@ export class PuppetServer {
|
|
|
163
163
|
* we introduced the WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_{SERVER,CLIENT} environment variables.
|
|
164
164
|
* if it has been set, then we will run under HTTP instead of HTTPS
|
|
165
165
|
*/
|
|
166
|
-
log.
|
|
166
|
+
log.info('PuppetServer', 'start() initializing gRPC server credentials ...')
|
|
167
167
|
let credential
|
|
168
168
|
if (envVars.WECHATY_PUPPET_SERVICE_NO_TLS_INSECURE_SERVER(this.options.tls?.disable)) {
|
|
169
169
|
log.warn('PuppetServer', 'start() TLS disabled: INSECURE!')
|
|
@@ -172,12 +172,12 @@ export class PuppetServer {
|
|
|
172
172
|
log.verbose('PuppetServer', 'start() TLS enabled.')
|
|
173
173
|
credential = grpc.ServerCredentials.createSsl(caCertBuf, keyCertPairs)
|
|
174
174
|
}
|
|
175
|
-
log.
|
|
175
|
+
log.info('PuppetServer', 'start() initializing gRPC server credentials ... done')
|
|
176
176
|
|
|
177
177
|
/***
|
|
178
178
|
* Start Grpc Server
|
|
179
179
|
*/
|
|
180
|
-
log.
|
|
180
|
+
log.info('PuppetServer', 'start() gRPC server starting ...')
|
|
181
181
|
const port = await util.promisify(
|
|
182
182
|
this.grpcServer.bindAsync
|
|
183
183
|
.bind(this.grpcServer),
|
|
@@ -191,17 +191,17 @@ export class PuppetServer {
|
|
|
191
191
|
}
|
|
192
192
|
|
|
193
193
|
this.grpcServer.start()
|
|
194
|
-
log.
|
|
194
|
+
log.info('PuppetServer', 'start() gRPC server starting ... done')
|
|
195
195
|
}
|
|
196
196
|
|
|
197
197
|
public async stop (): Promise<void> {
|
|
198
|
-
log.
|
|
198
|
+
log.info('PuppetServer', 'stop()')
|
|
199
199
|
|
|
200
200
|
if (this.grpcServer) {
|
|
201
201
|
const grpcServer = this.grpcServer
|
|
202
202
|
this.grpcServer = undefined
|
|
203
203
|
|
|
204
|
-
log.
|
|
204
|
+
log.info('PuppetServer', 'stop() shuting down gRPC server ...')
|
|
205
205
|
// const future = await util.promisify(
|
|
206
206
|
// grpcServer.tryShutdown
|
|
207
207
|
// .bind(grpcServer),
|
|
@@ -222,18 +222,18 @@ export class PuppetServer {
|
|
|
222
222
|
} catch (e) {
|
|
223
223
|
log.warn('PuppetServer', 'stop() gRPC shutdown rejection: %s', (e as Error).message)
|
|
224
224
|
} finally {
|
|
225
|
-
log.
|
|
225
|
+
log.info('PuppetServer', 'stop() shuting down gRPC server ... done')
|
|
226
226
|
}
|
|
227
227
|
|
|
228
228
|
} else {
|
|
229
|
-
log.
|
|
229
|
+
log.info('PuppetServer', 'stop() no grpcServer exist')
|
|
230
230
|
}
|
|
231
231
|
|
|
232
232
|
if (this.urnRegistry) {
|
|
233
|
-
log.
|
|
233
|
+
log.info('PuppetServer', 'stop() destory URN Registry ...')
|
|
234
234
|
await this.urnRegistry.destroy()
|
|
235
235
|
this.urnRegistry = undefined
|
|
236
|
-
log.
|
|
236
|
+
log.info('PuppetServer', 'stop() destory URN Registry ... done')
|
|
237
237
|
}
|
|
238
238
|
|
|
239
239
|
}
|