Skip to content

Commit 31b15b6

Browse files
andinuxandinux
committed
Merge branch 'master' into no-sqlite-mode
2 parents c7b16e2 + 9417277 commit 31b15b6

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎JS/example/test-js-sdk/index.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
114114
<!-- MAIN WEBSOCKET AND PUB/SUB WEBSOCKET STATE AND MAINWEBSOCKET PENDING REQUEST-->
115115
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
116116
<div class='absolute top-2 right-8 group w-4'>
117-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/connectionState" target="_blank">
117+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/connectionstate" target="_blank">
118118
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
119119
<path
120120
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
121121
</svg>
122122
</a>
123123
</div>
124124
<div class='absolute top-2 right-2 group w-4'>
125-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/pubSubState" target="_blank">
125+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/pubsubstate" target="_blank">
126126
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
127127
<path
128128
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -148,7 +148,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
148148
<!-- LIST CHANNELS -->
149149
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
150150
<div class='absolute top-2 right-8 group w-4'>
151-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/listChannels" target="_blank">
151+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/listchannels" target="_blank">
152152
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
153153
<path
154154
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -172,7 +172,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
172172
<!-- CREATE CHANNEL -->
173173
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
174174
<div class='absolute top-2 right-8 group w-4'>
175-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/createChannel" target="_blank">
175+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/createchannel" target="_blank">
176176
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
177177
<path
178178
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -204,7 +204,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
204204
<!-- REMOVE CHANNEL -->
205205
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
206206
<div class='absolute top-2 right-8 group w-4'>
207-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/removeChannel" target="_blank">
207+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/removechannel" target="_blank">
208208
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
209209
<path
210210
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -308,7 +308,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
308308
<!-- LISTEN CHANNEL -->
309309
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
310310
<div class='absolute top-2 right-8 group w-4'>
311-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/listenChannel" target="_blank">
311+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/listenchannel" target="_blank">
312312
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
313313
<path
314314
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -343,7 +343,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
343343
<!-- UNLISTEN CHANNEL -->
344344
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
345345
<div class='absolute top-2 right-8 group w-4'>
346-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/unlistenChannel" target="_blank">
346+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/unlistenchannel" target="_blank">
347347
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
348348
<path
349349
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -376,7 +376,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
376376
<!-- LISTEN TABLE -->
377377
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
378378
<div class='absolute top-2 right-8 group w-4'>
379-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/listenTable" target="_blank">
379+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/listentable" target="_blank">
380380
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
381381
<path
382382
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -410,7 +410,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
410410
<!-- UNLISTEN TABLE -->
411411
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
412412
<div class='absolute top-2 right-8 group w-4'>
413-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/unlistenTable" target="_blank">
413+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/unlistentable" target="_blank">
414414
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
415415
<path
416416
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />
@@ -442,7 +442,7 @@ <h3 class="pt-4 text-xl font-semibold leading-6 text-gray-900">Use this tool to
442442
<!-- ACTUAL SUBSCRIPTIONS STATE-->
443443
<div class="relative h-80 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow sm:px-0 sm:pt-6">
444444
<div class='absolute top-2 right-8 group w-4'>
445-
<a href="https://docs.sqlitecloud.io/docs/sdk/js/subscriptionsStackState" target="_blank">
445+
<a href="https://docs.sqlitecloud.io/docs/sdk/js/subscriptionsstackstate" target="_blank">
446446
<svg aria-hidden="true" viewBox="0 0 16 16" class="fill-gray-500 hover:fill-gray-700">
447447
<path
448448
d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" />

‎PROTOCOL.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ The format is `*LEN 0:VERS NROWS NCOLS DATA`. The whole command is built by ten
7474
2. LEN is a string representation of Rowset length (theoretically the maximum supported value is UINT64_MAX but it is usually much lower. LEN does not include the length of the first `*LEN ` part.
7575
3. A single space is used to separate LEN from 0:VERS
7676
4. a single `0:` string followed by a VERS number (a string representation of the number) which specifies the version of the Rowset.
77-
* `0`: means that only column names are included in the header
78-
* `1`: means that column names, declared types, database names, table names, origin names, not null flags, primary key flags and autoincrement flags are included in the header (one value for each column)
77+
* `1`: means that only column names are included in the header
78+
* `2`: means that column names, declared types, database names, table names, origin names, not null flags, primary key flags and autoincrement flags are included in the header (one value for each column)
7979
5. A single space is used to separate 0:VERS from NROWS
8080
6. NROWS is a string representation of the number of rows contained in the Rowset (can be zero)
8181
7. A single space is used to separate NROWS from NCOLS
@@ -95,7 +95,8 @@ The format is `/LEN IDX:VERS NROWS NCOLS DATA`. The command is equal to the SCSP
9595
3. NROWS represents the number of rows contained in the chunk. The total number of rows in the final Rowset will be the sum of each NROWS contained in each chunk
9696
4. NCOLS will be the same for all chunks, which means that it does not need to be computed (as a sum) in the final Rowset, and it means that a logical line is never break
9797
5. To mark the end of the Rowset, the special string `/LEN 0 0 0 ` is sent (LEN is always 6 in this case)
98-
6. After receiving a chuck the client must send an ACK message `+2 OK` to the server (to notify that it is ready to receive the next chunk). Any other ACK message is considered an ABORT and the Rowset processing is immediately aborted.
98+
99+
When the Rowset is sent in chuck, it is guaranteed that the first chuck contains a complete header and that all the chunks contain complete rows (the individual fields are not truncated in any way).
99100

100101
### SCSP RAW JSON
101102
When the first character is `{` that means that the whole packet is guarantee to be a valid JSON value that can be parsed with a JSON parser.

0 commit comments

Comments
 (0)